diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java
index 8b5ddb134..8f03f37db 100644
--- a/app/src/processing/app/Editor.java
+++ b/app/src/processing/app/Editor.java
@@ -306,7 +306,7 @@ public abstract class Editor extends JFrame implements RunnerListener {
     contentPain.add(box);
 
     // get shift down/up events so we can show the alt version of toolbar buttons
-    textarea.addKeyListener(toolbar);
+    //textarea.addKeyListener(toolbar);
 
     // end an undo-chunk any time the caret moves unless it's when text is edited
     textarea.addCaretListener(new CaretListener() {
diff --git a/app/src/processing/app/EditorToolbar.java b/app/src/processing/app/EditorToolbar.java
index 034553bbf..43345733a 100644
--- a/app/src/processing/app/EditorToolbar.java
+++ b/app/src/processing/app/EditorToolbar.java
@@ -3,7 +3,8 @@
 /*
   Part of the Processing project - http://processing.org
 
-  Copyright (c) 2004-13 Ben Fry and Casey Reas
+  Copyirght (c) 2012-15 The Processing Foundation
+  Copyright (c) 2004-12 Ben Fry and Casey Reas
   Copyright (c) 2001-04 Massachusetts Institute of Technology
 
   This program is free software; you can redistribute it and/or modify
@@ -22,564 +23,599 @@
 
 package processing.app;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.awt.image.BufferedImage;
-import java.util.ArrayList;
+//import java.awt.event.ActionEvent;
 
-import javax.swing.*;
-import javax.swing.event.*;
+import javax.swing.JPanel;
 
 
 /**
  * Run/Stop button plus Mode selection
  */
-public abstract class EditorToolbar extends JComponent implements MouseInputListener, KeyListener {
-
-  /** Width of each toolbar button. */
-  static final int BUTTON_WIDTH = 27;
-  /** Height of each toolbar button. */
-//  static final int BUTTON_HEIGHT = 32;
-  /** The amount of space between groups of buttons on the toolbar. */
-  static final int BUTTON_GAP = 5;
-  /** Size (both width and height) of the buttons in the source image. */
-  static final int BUTTON_IMAGE_SIZE = 33;
-
-  static final int INACTIVE = 0;
-  static final int ROLLOVER = 1;
-  static final int ACTIVE   = 2;
-
-  protected Base base;
+public class EditorToolbar extends JPanel {
   protected Editor editor;
+  protected Base base;
   protected Mode mode;
 
-  Image offscreen;
-  int width, height;
-
-  Color bgColor;
-  boolean hiding;
-  Color hideColor;
-
-  protected Button rollover;
-
-  Font statusFont;
-  int statusAscent;
-  Color statusColor;
+  EditorButton runButton;
+  EditorButton stopButton;
   
-  boolean shiftPressed;
-
-  // what the mode indicator looks like
-  Color modeButtonColor;
-  Font modeTextFont;
-  int modeTextAscent;
-  Color modeTextColor;
-  String modeTitle;
-  int modeX1, modeY1;
-  int modeX2, modeY2;
-  JMenu modeMenu;
   
-  protected ArrayList<Button> buttons;
-
-  static final int ARROW_WIDTH = 7;
-  static final int ARROW_HEIGHT = 6;
-  static Image modeArrow;
-
-  
-  public EditorToolbar(Editor editor, Base base) {  //, JMenu menu) {
+  public EditorToolbar(Editor editor) {
     this.editor = editor;
-    this.base = base;
-//    this.menu = menu;
-
-    buttons = new ArrayList<Button>();
-    rollover = null;
-
+    base = editor.getBase();
     mode = editor.getMode();
-    bgColor = mode.getColor("buttons.bgcolor");
-    statusFont = mode.getFont("buttons.status.font");
-    statusColor = mode.getColor("buttons.status.color");
-//    modeTitle = mode.getTitle().toUpperCase();
-    modeTitle = mode.getTitle();
-    modeTextFont = mode.getFont("mode.button.font");
-    modeButtonColor = mode.getColor("mode.button.color");
     
-    hiding = Preferences.getBoolean("buttons.hide.image");
-    hideColor = mode.getColor("buttons.hide.color");
-
-    if (modeArrow == null) {
-      String suffix = Toolkit.highResDisplay() ? "-2x.png" : ".png";
-      modeArrow = Toolkit.getLibImage("mode-arrow" + suffix);
-    }
-
-    addMouseListener(this);
-    addMouseMotionListener(this);
-  }
-
-
-  /** Load images and add toolbar buttons */
-  abstract public void init();
-
-
-  /**
-   * Load button images and slice them up. Only call this from paintComponent,  
-   * or when the comp is displayable, otherwise createImage() might fail.
-   * (Using BufferedImage instead of createImage() nowadays, so that may 
-   * no longer be relevant.) 
-   */
-  public Image[][] loadImages() {
-    int res = Toolkit.highResDisplay() ? 2 : 1;
-    
-    String suffix = null; 
-    Image allButtons = null;
-    // Some modes may not have a 2x version. If a mode doesn't have a 1x 
-    // version, this will cause an error... they should always have 1x.
-    if (res == 2) {
-      suffix = "-2x.png";
-      allButtons = mode.loadImage("theme/buttons" + suffix);
-      if (allButtons == null) {
-        res = 1;  // take him down a notch
-      }
-    }
-    if (res == 1) {
-      suffix = ".png";
-      allButtons = mode.loadImage("theme/buttons" + suffix);
-      if (allButtons == null) {
-        // use the old (pre-2.0b9) file name
-        suffix = ".gif";
-        allButtons = mode.loadImage("theme/buttons" + suffix);
-      }
-    }
-
-    int count = allButtons.getWidth(this) / BUTTON_WIDTH*res;
-    Image[][] buttonImages = new Image[count][3];
-    
-    for (int i = 0; i < count; i++) {
-      for (int state = 0; state < 3; state++) {
-        Image image = new BufferedImage(BUTTON_WIDTH*res, Preferences.GRID_SIZE*res, BufferedImage.TYPE_INT_ARGB);
-        Graphics g = image.getGraphics();
-        g.drawImage(allButtons, 
-                    -(i*BUTTON_IMAGE_SIZE*res) - 3, 
-                    (state-2)*BUTTON_IMAGE_SIZE*res, null);
-        g.dispose();
-        buttonImages[i][state] = image;
-      }
-    }
-    
-    return buttonImages;
-  }
-  
-  
-//  abstract static public String getTitle(int index, boolean shift);
-
-
-  @Override
-  public void paintComponent(Graphics screen) {
-    if (buttons.size() == 0) {
-      init();
-    }
-
-    Dimension size = getSize();
-    if ((offscreen == null) ||
-        (size.width != width) || (size.height != height)) {
-      if (Toolkit.highResDisplay()) {
-        offscreen = createImage(size.width*2, size.height*2);
-      } else {
-        offscreen = createImage(size.width, size.height);
-      }
-
-      width = size.width;
-      height = size.height;
-
-      int offsetX = 3;
-      for (Button b : buttons) {
-        b.left = offsetX;
-        if (b.gap) {
-          b.left += BUTTON_GAP;
-        }
-        b.right = b.left + BUTTON_WIDTH; 
-        offsetX = b.right;
-      }
-//      for (int i = 0; i < buttons.size(); i++) {
-//        x1[i] = offsetX;
-//        if (i == 2) x1[i] += BUTTON_GAP;
-//        x2[i] = x1[i] + BUTTON_WIDTH;
-//        offsetX = x2[i];
+//    runButton = new EditorButton() {
+//      
+//      @Override
+//      public void actionPerformed(ActionEvent e) {
+//        // TODO Auto-generated method stub
+//        
 //      }
-    }
-    Graphics g = offscreen.getGraphics();
-    /*Graphics2D g2 =*/ Toolkit.prepareGraphics(g);
-
-    g.setColor(hiding ? hideColor : bgColor);
-    g.fillRect(0, 0, width, height);
-//    if (backgroundImage != null) {
-//      g.drawImage(backgroundImage, 0, 0, BACKGROUND_WIDTH, BACKGROUND_HEIGHT, null);
-//    }
-//    if (!hiding) {
-//      mode.drawBackground(g, 0);
-//    }
-
-//    for (int i = 0; i < buttonCount; i++) {
-//      g.drawImage(stateImage[i], x1[i], y1, null);
-//    }
-    for (Button b : buttons) {
-      g.drawImage(b.stateImage, b.left, 0, BUTTON_WIDTH, Preferences.GRID_SIZE, null);
-    }
-
-    g.setColor(statusColor);
-    g.setFont(statusFont);
-    if (statusAscent == 0) {
-      statusAscent = (int) Toolkit.getAscent(g);
-    }
-
-    // If I ever find the guy who wrote the Java2D API, I will hurt him.
-//    Graphics2D g2 = (Graphics2D) g;
-//    FontRenderContext frc = g2.getFontRenderContext();
-//    float statusW = (float) statusFont.getStringBounds(status, frc).getWidth();
-//    float statusX = (getSize().width - statusW) / 2;
-//    g2.drawString(status, statusX, statusY);
-
-//    if (currentRollover != -1) {
-    if (rollover != null) {
-      //int statusY = (BUTTON_HEIGHT + g.getFontMetrics().getAscent()) / 2;
-      int statusY = (Preferences.GRID_SIZE + statusAscent) / 2;
-      //String status = shiftPressed ? titleShift[currentRollover] : title[currentRollover];
-      String status = shiftPressed ? rollover.titleShift : rollover.title;
-      g.drawString(status, buttons.size() * BUTTON_WIDTH + 3 * BUTTON_GAP, statusY);
-    }
-
-    g.setFont(modeTextFont);
-    FontMetrics metrics = g.getFontMetrics();
-    if (modeTextAscent == 0) {
-      modeTextAscent = (int) Toolkit.getAscent(g); //metrics.getAscent();
-    }
-    int modeTextWidth = metrics.stringWidth(modeTitle);
-    final int modeGapWidth = 8;
-    final int modeBoxHeight = 20;
-    modeX2 = getWidth() - 16;
-    modeX1 = modeX2 - (modeGapWidth + modeTextWidth + modeGapWidth + ARROW_WIDTH + modeGapWidth);
-//    modeY1 = 8; //(getHeight() - modeBoxHeight) / 2;
-    modeY1 = (getHeight() - modeBoxHeight) / 2;
-    modeY2 = modeY1 + modeBoxHeight; //modeY1 + modeH + modeGapV*2;
-    g.setColor(modeButtonColor);
-    g.drawRect(modeX1, modeY1, modeX2 - modeX1, modeY2 - modeY1 - 1);
-    
-    g.drawString(modeTitle, 
-                 modeX1 + modeGapWidth, 
-                 modeY1 + (modeBoxHeight + modeTextAscent) / 2);
-                 //modeY1 + modeTextAscent + (modeBoxHeight - modeTextAscent) / 2);
-    g.drawImage(modeArrow, 
-                modeX2 - ARROW_WIDTH - modeGapWidth, 
-                modeY1 + (modeBoxHeight - ARROW_HEIGHT) / 2, 
-                ARROW_WIDTH, ARROW_HEIGHT, null);
-
-//    g.drawLine(modeX1, modeY2, modeX2, modeY2);
-//    g.drawLine(0, size.height, size.width, size.height);
-//    g.fillRect(modeX1 - modeGapWidth*2,  modeY1, modeGapWidth, modeBoxHeight);
-    
-    screen.drawImage(offscreen, 0, 0, size.width, size.height, null);
-
-    // dim things out when not enabled (not currently in use) 
-//    if (!isEnabled()) {
-//      screen.setColor(new Color(0, 0, 0, 100));
-//      screen.fillRect(0, 0, getWidth(), getHeight());
-//    }
+//    };
   }
-
   
-  protected void checkRollover(int x, int y) {
-    Button over = findSelection(x, y);
-    if (over != null) {
-      //        if (state[sel] != ACTIVE) {
-      if (over.state != ACTIVE) {
-        //          setState(sel, ROLLOVER, true);
-        over.setState(ROLLOVER, true);
-        //          currentRollover = sel;
-        rollover = over;
-      }
-    }
+  
+  public void activateRun() { 
+    
   }
-
-
-  public void mouseMoved(MouseEvent e) {
-    if (!isEnabled()) return;
-
-    // ignore mouse events before the first paintComponent() call
-    if (offscreen == null) return;
-
-    // TODO this isn't quite right, since it's gonna kill rollovers too
-//    if (state[OPEN] != INACTIVE) {
-//      // avoid flicker, since there should be another update event soon
-//      setState(OPEN, INACTIVE, false);
+  
+  
+  public void deactivateRun() { 
+    
+  }
+  
+  
+  public void activateStop() { 
+    
+  }
+  
+  
+  public void deactivateStop() { 
+    
+  }
+}
+//public abstract class EditorToolbar extends JComponent implements MouseInputListener, KeyListener {
+//
+//  /** Width of each toolbar button. */
+//  static final int BUTTON_WIDTH = 27;
+//  /** The amount of space between groups of buttons on the toolbar. */
+//  static final int BUTTON_GAP = 5;
+//  /** Size (both width and height) of the buttons in the source image. */
+//  static final int BUTTON_IMAGE_SIZE = 33;
+//
+//  static final int INACTIVE = 0;
+//  static final int ROLLOVER = 1;
+//  static final int ACTIVE   = 2;
+//
+//
+//  Image offscreen;
+//  int width, height;
+//
+//  Color bgColor;
+//  boolean hiding;
+//  Color hideColor;
+//
+//  protected Button rollover;
+//
+//  Font statusFont;
+//  int statusAscent;
+//  Color statusColor;
+//  
+//  boolean shiftPressed;
+//
+//  // what the mode indicator looks like
+//  Color modeButtonColor;
+//  Font modeTextFont;
+//  int modeTextAscent;
+//  Color modeTextColor;
+//  String modeTitle;
+//  int modeX1, modeY1;
+//  int modeX2, modeY2;
+//  JMenu modeMenu;
+//  
+//  protected ArrayList<Button> buttons;
+//
+//  static final int ARROW_WIDTH = 7;
+//  static final int ARROW_HEIGHT = 6;
+//  static Image modeArrow;
+//
+//  
+//  public EditorToolbar(Editor editor, Base base) {  //, JMenu menu) {
+//    this.editor = editor;
+//    this.base = base;
+////    this.menu = menu;
+//
+//    buttons = new ArrayList<Button>();
+//    rollover = null;
+//
+//    mode = editor.getMode();
+//    bgColor = mode.getColor("buttons.bgcolor");
+//    statusFont = mode.getFont("buttons.status.font");
+//    statusColor = mode.getColor("buttons.status.color");
+////    modeTitle = mode.getTitle().toUpperCase();
+//    modeTitle = mode.getTitle();
+//    modeTextFont = mode.getFont("mode.button.font");
+//    modeButtonColor = mode.getColor("mode.button.color");
+//    
+//    hiding = Preferences.getBoolean("buttons.hide.image");
+//    hideColor = mode.getColor("buttons.hide.color");
+//
+//    if (modeArrow == null) {
+//      String suffix = Toolkit.highResDisplay() ? "-2x.png" : ".png";
+//      modeArrow = Toolkit.getLibImage("mode-arrow" + suffix);
 //    }
-
-    int x = e.getX();
-    int y = e.getY();
-
-    if (rollover != null) {
-      //if (y > TOP && y < BOTTOM && x > rollover.left && x < rollover.right) {
-      if (y > 0 && y < getHeight() && x > rollover.left && x < rollover.right) {
-        // nothing has changed
-        return;
-
-      } else {
-        if (rollover.state == ROLLOVER) {
-          rollover.setState(INACTIVE, true);
-        }
-        rollover = null;
-      }
-    }
-    checkRollover(x, y);
-  }
-
-
-  public void mouseDragged(MouseEvent e) { }
-
-
-//  public void handleMouse(MouseEvent e) {
-//    int x = e.getX();
-//    int y = e.getY();
+//
+//    addMouseListener(this);
+//    addMouseMotionListener(this);
+//  }
+//
+//
+//  /** Load images and add toolbar buttons */
+//  abstract public void init();
+//
+//
+//  /**
+//   * Load button images and slice them up. Only call this from paintComponent,  
+//   * or when the comp is displayable, otherwise createImage() might fail.
+//   * (Using BufferedImage instead of createImage() nowadays, so that may 
+//   * no longer be relevant.) 
+//   */
+//  public Image[][] loadImages() {
+//    int res = Toolkit.highResDisplay() ? 2 : 1;
+//    
+//    String suffix = null; 
+//    Image allButtons = null;
+//    // Some modes may not have a 2x version. If a mode doesn't have a 1x 
+//    // version, this will cause an error... they should always have 1x.
+//    if (res == 2) {
+//      suffix = "-2x.png";
+//      allButtons = mode.loadImage("theme/buttons" + suffix);
+//      if (allButtons == null) {
+//        res = 1;  // take him down a notch
+//      }
+//    }
+//    if (res == 1) {
+//      suffix = ".png";
+//      allButtons = mode.loadImage("theme/buttons" + suffix);
+//      if (allButtons == null) {
+//        // use the old (pre-2.0b9) file name
+//        suffix = ".gif";
+//        allButtons = mode.loadImage("theme/buttons" + suffix);
+//      }
+//    }
+//
+//    int count = allButtons.getWidth(this) / BUTTON_WIDTH*res;
+//    Image[][] buttonImages = new Image[count][3];
+//    
+//    for (int i = 0; i < count; i++) {
+//      for (int state = 0; state < 3; state++) {
+//        Image image = new BufferedImage(BUTTON_WIDTH*res, Preferences.GRID_SIZE*res, BufferedImage.TYPE_INT_ARGB);
+//        Graphics g = image.getGraphics();
+//        g.drawImage(allButtons, 
+//                    -(i*BUTTON_IMAGE_SIZE*res) - 3, 
+//                    (state-2)*BUTTON_IMAGE_SIZE*res, null);
+//        g.dispose();
+//        buttonImages[i][state] = image;
+//      }
+//    }
+//    
+//    return buttonImages;
+//  }
+//  
+//  
+////  abstract static public String getTitle(int index, boolean shift);
+//
+//
+//  @Override
+//  public void paintComponent(Graphics screen) {
+//    if (buttons.size() == 0) {
+//      init();
+//    }
+//
+//    Dimension size = getSize();
+//    if ((offscreen == null) ||
+//        (size.width != width) || (size.height != height)) {
+//      if (Toolkit.highResDisplay()) {
+//        offscreen = createImage(size.width*2, size.height*2);
+//      } else {
+//        offscreen = createImage(size.width, size.height);
+//      }
+//
+//      width = size.width;
+//      height = size.height;
+//
+//      int offsetX = 3;
+//      for (Button b : buttons) {
+//        b.left = offsetX;
+//        if (b.gap) {
+//          b.left += BUTTON_GAP;
+//        }
+//        b.right = b.left + BUTTON_WIDTH; 
+//        offsetX = b.right;
+//      }
+////      for (int i = 0; i < buttons.size(); i++) {
+////        x1[i] = offsetX;
+////        if (i == 2) x1[i] += BUTTON_GAP;
+////        x2[i] = x1[i] + BUTTON_WIDTH;
+////        offsetX = x2[i];
+////      }
+//    }
+//    Graphics g = offscreen.getGraphics();
+//    /*Graphics2D g2 =*/ Toolkit.prepareGraphics(g);
+//
+//    g.setColor(hiding ? hideColor : bgColor);
+//    g.fillRect(0, 0, width, height);
+////    if (backgroundImage != null) {
+////      g.drawImage(backgroundImage, 0, 0, BACKGROUND_WIDTH, BACKGROUND_HEIGHT, null);
+////    }
+////    if (!hiding) {
+////      mode.drawBackground(g, 0);
+////    }
+//
+////    for (int i = 0; i < buttonCount; i++) {
+////      g.drawImage(stateImage[i], x1[i], y1, null);
+////    }
+//    for (Button b : buttons) {
+//      g.drawImage(b.stateImage, b.left, 0, BUTTON_WIDTH, Preferences.GRID_SIZE, null);
+//    }
+//
+//    g.setColor(statusColor);
+//    g.setFont(statusFont);
+//    if (statusAscent == 0) {
+//      statusAscent = (int) Toolkit.getAscent(g);
+//    }
+//
+//    // If I ever find the guy who wrote the Java2D API, I will hurt him.
+////    Graphics2D g2 = (Graphics2D) g;
+////    FontRenderContext frc = g2.getFontRenderContext();
+////    float statusW = (float) statusFont.getStringBounds(status, frc).getWidth();
+////    float statusX = (getSize().width - statusW) / 2;
+////    g2.drawString(status, statusX, statusY);
 //
 ////    if (currentRollover != -1) {
 //    if (rollover != null) {
-////      if ((x > x1[currentRollover]) && (y > y1) &&
-////          (x < x2[currentRollover]) && (y < y2)) {
-//      if (y > y1 && y < y2 && x > rollover.left && x < rollover.right) {
-//        // nothing has changed
-//        return;
-//
-//      } else {
-////        setState(currentRollover, INACTIVE, true);
-//        rollover.setState(INACTIVE, true);
-////        currentRollover = -1;
-//        rollover = null;
-//      }
+//      //int statusY = (BUTTON_HEIGHT + g.getFontMetrics().getAscent()) / 2;
+//      int statusY = (Preferences.GRID_SIZE + statusAscent) / 2;
+//      //String status = shiftPressed ? titleShift[currentRollover] : title[currentRollover];
+//      String status = shiftPressed ? rollover.titleShift : rollover.title;
+//      g.drawString(status, buttons.size() * BUTTON_WIDTH + 3 * BUTTON_GAP, statusY);
 //    }
-////    int sel = findSelection(x, y);
+//
+//    g.setFont(modeTextFont);
+//    FontMetrics metrics = g.getFontMetrics();
+//    if (modeTextAscent == 0) {
+//      modeTextAscent = (int) Toolkit.getAscent(g); //metrics.getAscent();
+//    }
+//    int modeTextWidth = metrics.stringWidth(modeTitle);
+//    final int modeGapWidth = 8;
+//    final int modeBoxHeight = 20;
+//    modeX2 = getWidth() - 16;
+//    modeX1 = modeX2 - (modeGapWidth + modeTextWidth + modeGapWidth + ARROW_WIDTH + modeGapWidth);
+////    modeY1 = 8; //(getHeight() - modeBoxHeight) / 2;
+//    modeY1 = (getHeight() - modeBoxHeight) / 2;
+//    modeY2 = modeY1 + modeBoxHeight; //modeY1 + modeH + modeGapV*2;
+//    g.setColor(modeButtonColor);
+//    g.drawRect(modeX1, modeY1, modeX2 - modeX1, modeY2 - modeY1 - 1);
+//    
+//    g.drawString(modeTitle, 
+//                 modeX1 + modeGapWidth, 
+//                 modeY1 + (modeBoxHeight + modeTextAscent) / 2);
+//                 //modeY1 + modeTextAscent + (modeBoxHeight - modeTextAscent) / 2);
+//    g.drawImage(modeArrow, 
+//                modeX2 - ARROW_WIDTH - modeGapWidth, 
+//                modeY1 + (modeBoxHeight - ARROW_HEIGHT) / 2, 
+//                ARROW_WIDTH, ARROW_HEIGHT, null);
+//
+////    g.drawLine(modeX1, modeY2, modeX2, modeY2);
+////    g.drawLine(0, size.height, size.width, size.height);
+////    g.fillRect(modeX1 - modeGapWidth*2,  modeY1, modeGapWidth, modeBoxHeight);
+//    
+//    screen.drawImage(offscreen, 0, 0, size.width, size.height, null);
+//
+//    // dim things out when not enabled (not currently in use) 
+////    if (!isEnabled()) {
+////      screen.setColor(new Color(0, 0, 0, 100));
+////      screen.fillRect(0, 0, getWidth(), getHeight());
+////    }
+//  }
+//
+//  
+//  protected void checkRollover(int x, int y) {
 //    Button over = findSelection(x, y);
 //    if (over != null) {
-////      if (state[sel] != ACTIVE) {
+//      //        if (state[sel] != ACTIVE) {
 //      if (over.state != ACTIVE) {
-////        setState(sel, ROLLOVER, true);
+//        //          setState(sel, ROLLOVER, true);
 //        over.setState(ROLLOVER, true);
-////        currentRollover = sel;
+//        //          currentRollover = sel;
 //        rollover = over;
 //      }
 //    }
 //  }
-
-
-//  private int findSelection(int x, int y) {
-//    // if app loads slowly and cursor is near the buttons
-//    // when it comes up, the app may not have time to load
-//    if ((x1 == null) || (x2 == null)) return -1;
 //
-//    for (int i = 0; i < buttonCount; i++) {
-//      if ((y > y1) && (x > x1[i]) &&
-//          (y < y2) && (x < x2[i])) {
-//        //System.out.println("sel is " + i);
-//        return i;
+//
+//  public void mouseMoved(MouseEvent e) {
+//    if (!isEnabled()) return;
+//
+//    // ignore mouse events before the first paintComponent() call
+//    if (offscreen == null) return;
+//
+//    // TODO this isn't quite right, since it's gonna kill rollovers too
+////    if (state[OPEN] != INACTIVE) {
+////      // avoid flicker, since there should be another update event soon
+////      setState(OPEN, INACTIVE, false);
+////    }
+//
+//    int x = e.getX();
+//    int y = e.getY();
+//
+//    if (rollover != null) {
+//      //if (y > TOP && y < BOTTOM && x > rollover.left && x < rollover.right) {
+//      if (y > 0 && y < getHeight() && x > rollover.left && x < rollover.right) {
+//        // nothing has changed
+//        return;
+//
+//      } else {
+//        if (rollover.state == ROLLOVER) {
+//          rollover.setState(INACTIVE, true);
+//        }
+//        rollover = null;
 //      }
 //    }
-//    return -1;
+//    checkRollover(x, y);
 //  }
-
-  
-  private Button findSelection(int x, int y) {
-    // if app loads slowly and cursor is near the buttons
-    // when it comes up, the app may not have time to load
-    if (offscreen != null && y > 0 && y < getHeight()) {
-      for (Button b : buttons) {
-        if (x > b.left && x < b.right) {
-          return b;
-        }
-      }
-    }
-    return null;
-  }
-
-
-//  private void setState(int slot, int newState, boolean updateAfter) {
-//    if (buttonImages != null) {
-//      state[slot] = newState;
-//      stateImage[slot] = buttonImages[which[slot]][newState];
+//
+//
+//  public void mouseDragged(MouseEvent e) { }
+//
+//
+////  public void handleMouse(MouseEvent e) {
+////    int x = e.getX();
+////    int y = e.getY();
+////
+//////    if (currentRollover != -1) {
+////    if (rollover != null) {
+//////      if ((x > x1[currentRollover]) && (y > y1) &&
+//////          (x < x2[currentRollover]) && (y < y2)) {
+////      if (y > y1 && y < y2 && x > rollover.left && x < rollover.right) {
+////        // nothing has changed
+////        return;
+////
+////      } else {
+//////        setState(currentRollover, INACTIVE, true);
+////        rollover.setState(INACTIVE, true);
+//////        currentRollover = -1;
+////        rollover = null;
+////      }
+////    }
+//////    int sel = findSelection(x, y);
+////    Button over = findSelection(x, y);
+////    if (over != null) {
+//////      if (state[sel] != ACTIVE) {
+////      if (over.state != ACTIVE) {
+//////        setState(sel, ROLLOVER, true);
+////        over.setState(ROLLOVER, true);
+//////        currentRollover = sel;
+////        rollover = over;
+////      }
+////    }
+////  }
+//
+//
+////  private int findSelection(int x, int y) {
+////    // if app loads slowly and cursor is near the buttons
+////    // when it comes up, the app may not have time to load
+////    if ((x1 == null) || (x2 == null)) return -1;
+////
+////    for (int i = 0; i < buttonCount; i++) {
+////      if ((y > y1) && (x > x1[i]) &&
+////          (y < y2) && (x < x2[i])) {
+////        //System.out.println("sel is " + i);
+////        return i;
+////      }
+////    }
+////    return -1;
+////  }
+//
+//  
+//  private Button findSelection(int x, int y) {
+//    // if app loads slowly and cursor is near the buttons
+//    // when it comes up, the app may not have time to load
+//    if (offscreen != null && y > 0 && y < getHeight()) {
+//      for (Button b : buttons) {
+//        if (x > b.left && x < b.right) {
+//          return b;
+//        }
+//      }
+//    }
+//    return null;
+//  }
+//
+//
+////  private void setState(int slot, int newState, boolean updateAfter) {
+////    if (buttonImages != null) {
+////      state[slot] = newState;
+////      stateImage[slot] = buttonImages[which[slot]][newState];
+////      if (updateAfter) {
+////        repaint();
+////      }
+////    }
+////  }
+//
+//
+//  public void mouseEntered(MouseEvent e) {
+////    handleMouse(e);
+//  }
+//
+//
+//  public void mouseExited(MouseEvent e) {
+////    // if the 'open' popup menu is visible, don't register this,
+////    // because the popup being set visible will fire a mouseExited() event
+////    if ((popup != null) && popup.isVisible()) return;
+//    // this might be better
+//    if (e.getComponent() != this) {
+//      return;
+//    }
+//
+//    // TODO another weird one.. come back to this
+////    if (state[OPEN] != INACTIVE) {
+////      setState(OPEN, INACTIVE, true);
+////    }
+////    handleMouse(e);
+//    
+//    // there is no more rollover, make sure that the rollover text goes away
+////    currentRollover = -1;
+//    if (rollover != null) {
+//      if (rollover.state == ROLLOVER) {
+//        rollover.setState(INACTIVE, true);
+//      }
+//      rollover = null;
+//    }
+//  }
+//
+////  int wasDown = -1;
+//
+//
+//  public void mousePressed(MouseEvent e) {
+//    // ignore mouse presses so hitting 'run' twice doesn't cause problems
+//    if (isEnabled()) {
+//      int x = e.getX();
+//      int y = e.getY();
+//      if (x > modeX1 && x < modeX2 && y > modeY1 && y < modeY2) {
+//        JPopupMenu popup = editor.getModeMenu().getPopupMenu();
+//        popup.show(this, x, y);
+//      }
+//      
+//      // Need to reset the rollover here. If the window isn't active, 
+//      // the rollover wouldn't have been updated.
+//      // http://code.google.com/p/processing/issues/detail?id=561
+//      checkRollover(x, y);
+//      if (rollover != null) {
+//        //handlePressed(rollover);
+//        handlePressed(e, buttons.indexOf(rollover));
+//      }
+//    }
+//  }
+//  
+//  
+//  public void mouseClicked(MouseEvent e) { }
+//
+//
+//  public void mouseReleased(MouseEvent e) { }
+//
+//
+////  public void handlePressed(Button b) {
+////    handlePressed(buttons.indexOf(b));
+////  }
+//  
+//  
+//  abstract public void handlePressed(MouseEvent e, int index);
+//  
+//  
+//  /**
+//   * Set a particular button to be active.
+//   */
+//  public void activate(int what) {
+////    setState(what, ACTIVE, true);
+//    buttons.get(what).setState(ACTIVE, true);
+//  }
+//
+//
+//  /**
+//   * Set a particular button to be active.
+//   */
+//  public void deactivate(int what) {
+////    setState(what, INACTIVE, true);
+//    buttons.get(what).setState(INACTIVE, true);
+//  }
+//
+//
+//  public Dimension getPreferredSize() {
+//    return getMinimumSize();
+//  }
+//
+//
+//  public Dimension getMinimumSize() {
+//    return new Dimension((buttons.size() + 1)*BUTTON_WIDTH, Preferences.GRID_SIZE);
+//  }
+//
+//
+//  public Dimension getMaximumSize() {
+//    return new Dimension(3000, Preferences.GRID_SIZE);
+//  }
+//
+//
+//  public void keyPressed(KeyEvent e) {
+//    if (e.getKeyCode() == KeyEvent.VK_SHIFT) {
+//      shiftPressed = true;
+//      repaint();
+//    }
+//  }
+//
+//
+//  public void keyReleased(KeyEvent e) {
+//    if (e.getKeyCode() == KeyEvent.VK_SHIFT) {
+//      shiftPressed = false;
+//      repaint();
+//    }
+//  }
+//
+//
+//  public void keyTyped(KeyEvent e) { }
+//
+//  
+//  // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
+//
+//  
+//  public void addButton(String title, String shiftTitle, Image[] images, boolean gap) {
+//    Button b = new Button(title, shiftTitle, images, gap);
+//    buttons.add(b);
+//  }
+//  
+//
+//  public class Button {
+//    /** Button's description. */ 
+//    String title;
+//    /** Description of alternate behavior when shift is down. */ 
+//    String titleShift;
+//    /** Three state images. */
+//    Image[] images;
+//    /** Current state value, one of ACTIVE, INACTIVE, ROLLOVER. */
+//    int state;
+//    /** Current state image. */
+//    Image stateImage;
+//    /** Left and right coordinates. */
+//    int left, right;
+//    /** Whether there's a gap before this button. */
+//    boolean gap;
+//    
+////    JPopupMenu popup;
+////    JMenu menu;
+//
+//
+//    public Button(String title, String titleShift, Image[] images, boolean gap) {
+//      this.title = title;
+//      this.titleShift = titleShift;
+//      this.images = images;
+//      this.gap = gap;
+//      
+//      state = INACTIVE;
+//      stateImage = images[INACTIVE];
+//    }
+//    
+//    
+////    public void setMenu(JMenu menu) {
+////      this.menu = menu;
+////    }
+//
+//    
+//    public void setState(int newState, boolean updateAfter) {
+//      state = newState;
+//      stateImage = images[newState];
 //      if (updateAfter) {
 //        repaint();
 //      }
 //    }
 //  }
-
-
-  public void mouseEntered(MouseEvent e) {
-//    handleMouse(e);
-  }
-
-
-  public void mouseExited(MouseEvent e) {
-//    // if the 'open' popup menu is visible, don't register this,
-//    // because the popup being set visible will fire a mouseExited() event
-//    if ((popup != null) && popup.isVisible()) return;
-    // this might be better
-    if (e.getComponent() != this) {
-      return;
-    }
-
-    // TODO another weird one.. come back to this
-//    if (state[OPEN] != INACTIVE) {
-//      setState(OPEN, INACTIVE, true);
-//    }
-//    handleMouse(e);
-    
-    // there is no more rollover, make sure that the rollover text goes away
-//    currentRollover = -1;
-    if (rollover != null) {
-      if (rollover.state == ROLLOVER) {
-        rollover.setState(INACTIVE, true);
-      }
-      rollover = null;
-    }
-  }
-
-//  int wasDown = -1;
-
-
-  public void mousePressed(MouseEvent e) {
-    // ignore mouse presses so hitting 'run' twice doesn't cause problems
-    if (isEnabled()) {
-      int x = e.getX();
-      int y = e.getY();
-      if (x > modeX1 && x < modeX2 && y > modeY1 && y < modeY2) {
-        JPopupMenu popup = editor.getModeMenu().getPopupMenu();
-        popup.show(this, x, y);
-      }
-      
-      // Need to reset the rollover here. If the window isn't active, 
-      // the rollover wouldn't have been updated.
-      // http://code.google.com/p/processing/issues/detail?id=561
-      checkRollover(x, y);
-      if (rollover != null) {
-        //handlePressed(rollover);
-        handlePressed(e, buttons.indexOf(rollover));
-      }
-    }
-  }
-  
-  
-  public void mouseClicked(MouseEvent e) { }
-
-
-  public void mouseReleased(MouseEvent e) { }
-
-
-//  public void handlePressed(Button b) {
-//    handlePressed(buttons.indexOf(b));
-//  }
-  
-  
-  abstract public void handlePressed(MouseEvent e, int index);
-  
-  
-  /**
-   * Set a particular button to be active.
-   */
-  public void activate(int what) {
-//    setState(what, ACTIVE, true);
-    buttons.get(what).setState(ACTIVE, true);
-  }
-
-
-  /**
-   * Set a particular button to be active.
-   */
-  public void deactivate(int what) {
-//    setState(what, INACTIVE, true);
-    buttons.get(what).setState(INACTIVE, true);
-  }
-
-
-  public Dimension getPreferredSize() {
-    return getMinimumSize();
-  }
-
-
-  public Dimension getMinimumSize() {
-    return new Dimension((buttons.size() + 1)*BUTTON_WIDTH, Preferences.GRID_SIZE);
-  }
-
-
-  public Dimension getMaximumSize() {
-    return new Dimension(3000, Preferences.GRID_SIZE);
-  }
-
-
-  public void keyPressed(KeyEvent e) {
-    if (e.getKeyCode() == KeyEvent.VK_SHIFT) {
-      shiftPressed = true;
-      repaint();
-    }
-  }
-
-
-  public void keyReleased(KeyEvent e) {
-    if (e.getKeyCode() == KeyEvent.VK_SHIFT) {
-      shiftPressed = false;
-      repaint();
-    }
-  }
-
-
-  public void keyTyped(KeyEvent e) { }
-
-  
-  // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
-
-  
-  public void addButton(String title, String shiftTitle, Image[] images, boolean gap) {
-    Button b = new Button(title, shiftTitle, images, gap);
-    buttons.add(b);
-  }
-  
-
-  public class Button {
-    /** Button's description. */ 
-    String title;
-    /** Description of alternate behavior when shift is down. */ 
-    String titleShift;
-    /** Three state images. */
-    Image[] images;
-    /** Current state value, one of ACTIVE, INACTIVE, ROLLOVER. */
-    int state;
-    /** Current state image. */
-    Image stateImage;
-    /** Left and right coordinates. */
-    int left, right;
-    /** Whether there's a gap before this button. */
-    boolean gap;
-    
-//    JPopupMenu popup;
-//    JMenu menu;
-
-
-    public Button(String title, String titleShift, Image[] images, boolean gap) {
-      this.title = title;
-      this.titleShift = titleShift;
-      this.images = images;
-      this.gap = gap;
-      
-      state = INACTIVE;
-      stateImage = images[INACTIVE];
-    }
-    
-    
-//    public void setMenu(JMenu menu) {
-//      this.menu = menu;
-//    }
-
-    
-    public void setState(int newState, boolean updateAfter) {
-      state = newState;
-      stateImage = images[newState];
-      if (updateAfter) {
-        repaint();
-      }
-    }
-  }
-}
\ No newline at end of file
+//}
\ No newline at end of file
diff --git a/java/src/processing/mode/java/JavaEditor.java b/java/src/processing/mode/java/JavaEditor.java
index e93ca1536..160668a68 100644
--- a/java/src/processing/mode/java/JavaEditor.java
+++ b/java/src/processing/mode/java/JavaEditor.java
@@ -153,7 +153,7 @@ public class JavaEditor extends Editor {
 
 
   public EditorToolbar createToolbar() {
-    return new JavaToolbar(this, base);
+    return new JavaToolbar(this);
   }
 
 
@@ -188,7 +188,7 @@ public class JavaEditor extends Editor {
 
 
   public JMenu buildSketchMenu() {
-    JMenuItem runItem = Toolkit.newJMenuItem(JavaToolbar.getTitle(JavaToolbar.RUN, false), 'R');
+    JMenuItem runItem = Toolkit.newJMenuItem(Language.text("toolbar.run"), 'R');
     runItem.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent e) {
         if (isDebuggerEnabled()) {
@@ -200,14 +200,14 @@ public class JavaEditor extends Editor {
       }
     });
     
-    JMenuItem presentItem = Toolkit.newJMenuItemShift(JavaToolbar.getTitle(JavaToolbar.RUN, true), 'R');
+    JMenuItem presentItem = Toolkit.newJMenuItemShift(Language.text("toolbar.present"), 'R');
     presentItem.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent e) {
         handlePresent();
       }
     });
 
-    JMenuItem stopItem = new JMenuItem(JavaToolbar.getTitle(JavaToolbar.STOP, false));
+    JMenuItem stopItem = new JMenuItem(Language.text("toolbar.stop"));
     stopItem.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent e) {
         if (isDebuggerEnabled()) {
@@ -1017,7 +1017,8 @@ public class JavaEditor extends Editor {
       public void run() {
         prepareRun();
         try {
-          toolbar.activate(JavaToolbar.RUN);
+//          toolbar.activate(JavaToolbar.RUN);
+          toolbar.activateRun();
           runtime = jmode.handleRun(sketch, JavaEditor.this);
 //          System.out.println("runtime now " + runtime);
         } catch (Exception e) {
@@ -1033,7 +1034,8 @@ public class JavaEditor extends Editor {
       public void run() {
         prepareRun();
         try {
-          toolbar.activate(JavaToolbar.RUN);
+//          toolbar.activate(JavaToolbar.RUN);
+          toolbar.activateRun();
           runtime = jmode.handlePresent(sketch, JavaEditor.this);
         } catch (Exception e) {
           statusError(e);
@@ -1052,7 +1054,8 @@ public class JavaEditor extends Editor {
       debugger.stopDebug();
 
     } else {
-      toolbar.activate(JavaToolbar.STOP);
+//      toolbar.activate(JavaToolbar.STOP);
+      toolbar.activateStop();
 
       try {
         //jmode.handleStop();
@@ -1066,8 +1069,10 @@ public class JavaEditor extends Editor {
         statusError(e);
       }
 
-      toolbar.deactivate(JavaToolbar.RUN);
-      toolbar.deactivate(JavaToolbar.STOP);
+//      toolbar.deactivate(JavaToolbar.RUN);
+//      toolbar.deactivate(JavaToolbar.STOP);
+      toolbar.deactivateStop();
+      toolbar.deactivateRun();
 
       // focus the PDE again after quitting presentation mode [toxi 030903]
       toFront();
@@ -1161,7 +1166,8 @@ public class JavaEditor extends Editor {
   public void statusError(String what) {
     super.statusError(what);
 //    new Exception("deactivating RUN").printStackTrace();
-    toolbar.deactivate(JavaToolbar.RUN);
+//    toolbar.deactivate(JavaToolbar.RUN);
+    toolbar.deactivateRun();
   }
 
 
@@ -1946,7 +1952,8 @@ public class JavaEditor extends Editor {
 
   protected void activateRun() {
     enableDebug.setEnabled(false);
-    toolbar.activate(JavaToolbar.RUN);
+//    toolbar.activate(JavaToolbar.RUN);
+    toolbar.activateRun();
   }
   
   
@@ -1960,7 +1967,8 @@ public class JavaEditor extends Editor {
 //    if (toolbar instanceof DebugToolbar){
 //      toolbar.deactivate(DebugToolbar.RUN);
 //    } else {
-    toolbar.deactivate(JavaToolbar.RUN);
+//    toolbar.deactivate(JavaToolbar.RUN);
+    toolbar.deactivateRun();
     enableDebug.setEnabled(true);
 //    }
   }
diff --git a/java/src/processing/mode/java/JavaToolbar.java b/java/src/processing/mode/java/JavaToolbar.java
index 2b97d866d..8b5b6a51a 100644
--- a/java/src/processing/mode/java/JavaToolbar.java
+++ b/java/src/processing/mode/java/JavaToolbar.java
@@ -24,12 +24,24 @@ import java.awt.event.MouseEvent;
 
 //import javax.swing.JPopupMenu;
 
+
+import javax.swing.JPanel;
+
 import processing.app.Base;
 import processing.app.Editor;
 import processing.app.EditorToolbar;
 import processing.app.Language;
 
 
+public class JavaToolbar extends EditorToolbar {
+  
+  public JavaToolbar(Editor editor) {
+    super(editor);
+  }
+}
+
+
+/*
 public class JavaToolbar extends EditorToolbar {
   static protected final int RUN    = 0;
   static protected final int STOP   = 1;
@@ -75,4 +87,5 @@ public class JavaToolbar extends EditorToolbar {
       break;
     }
   }
-}
\ No newline at end of file
+}
+*/
\ No newline at end of file
diff --git a/java/src/processing/mode/java/tweak/TweakToolbar.java b/java/src/processing/mode/java/tweak/TweakToolbar.java
deleted file mode 100644
index fe251b497..000000000
--- a/java/src/processing/mode/java/tweak/TweakToolbar.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
-
-/*
-Part of the Processing project - http://processing.org
-Copyright (c) 2012-15 The Processing Foundation
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License version 2
-as published by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software Foundation, Inc.
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-package processing.mode.java.tweak;
-
-import processing.app.Base;
-import processing.app.Editor;
-import processing.mode.java.JavaToolbar;
-
-public class TweakToolbar extends JavaToolbar {
-
-	static protected final int RUN    = 0;
-	static protected final int STOP   = 1;
-
-	static protected final int NEW    = 2;
-	static protected final int OPEN   = 3;
-	static protected final int SAVE   = 4;
-	static protected final int EXPORT = 5;
-
-	public TweakToolbar(Editor editor, Base base) {
-		super(editor, base);
-	}
-}
diff --git a/todo.txt b/todo.txt
index ae5c651d6..dd010f237 100644
--- a/todo.txt
+++ b/todo.txt
@@ -10,6 +10,10 @@ X   https://github.com/processing/processing/issues/3014
 X add more bulletproofing to the save process
 X   https://github.com/processing/processing/issues/2923
 X serious text improvements (at least on retina)
+_ finish adding 'examples' contribs
+_   https://github.com/processing/processing/issues/2953
+_   don't return here, allow contrib types to fail:
+_   https://github.com/processing/processing/blob/master/app/src/processing/app/contrib/ContributionListing.java#L509
 
 update components
 X moving to Java 8 because Java 7 will be discontinued
@@ -20,6 +24,8 @@ X requires ECJ update (using 4.4.1)
 X   http://download.eclipse.org/eclipse/downloads/drops4/R-4.4.1-201409250400/
 X update to launch4j 3.6
 X   http://sourceforge.net/projects/launch4j/files/launch4j-3/3.6/
+o   update ld and windres: https://github.com/processing/processing/tree/master/java/application/launch4j/bin
+o   also xstream.jar https://github.com/processing/processing/tree/master/java/application/launch4j/lib
 
 earlier
 X any problems with new code signing crap? 
@@ -95,9 +101,6 @@ X   this whole setup is really gross at the moment
 X finish Ant task to download JRE and JDK from Oracle
 X remove public 'ta' object in DebugEditor, also dmode
 
-update ld and windres: https://github.com/processing/processing/tree/master/java/application/launch4j/bin
-also xstream.jar https://github.com/processing/processing/tree/master/java/application/launch4j/lib
-
 _ fix hasJavaTabs() function
 _   almost always used as a negative, or tied to a 'return' from fxn
 _   name isn't tied to its function, but the symptom
@@ -115,6 +118,10 @@ _ can we animate its appearance?
 
 _ do the right thing on passing around List vs ArrayList and others
 
+breakage
+_ break out a gui package (get class count down in .app)
+_ remove deprecated methods
+
 gui
 _ need 'actively pressed' version of 'play' and 'stop'
 _   could do rollover as well, but do other apps use them?