@@ -254,16 +254,18 @@ public void paintComponent(Graphics screen) {
       menuRight = menuLeft + ARROW_TAB_WIDTH;
     }
 
+    /*
     // draw the two pixel line that extends left/right below the tabs
     g.setColor(tabColor[SELECTED]);
     // can't be done with lines, b/c retina leaves tiny hairlines
     g.fillRect(Editor.LEFT_GUTTER, TAB_BOTTOM,
                editor.getTextArea().getWidth() - Editor.LEFT_GUTTER,
                Toolkit.zoom(2));
+     */
 
     // draw the tab for the menu
     g.setColor(tabColor[UNSELECTED]);
-    drawTab(g, menuLeft, menuRight, false, true);
+    drawTab(g, menuLeft, menuRight, false, true, false);
 
     // draw the arrow on the menu tab
     g.setColor(arrowColor);
@@ -284,116 +286,51 @@ private boolean placeTabs(int left, int right, Graphics2D g) {
     Sketch sketch = editor.getSketch();
     int x = left;
 
-//    final int bottom = getHeight(); // - TAB_STRETCH;
-//    final int top = bottom - TAB_HEIGHT;
-//    GeneralPath path = null;
-
     for (int i = 0; i < sketch.getCodeCount(); i++) {
       SketchCode code = sketch.getCode(i);
       Tab tab = tabs[i];
 
-//      int pieceCount = 2 + (tab.textWidth / PIECE_WIDTH);
-//      if (tab.textVisible == false) {
-//        pieceCount = 4;
-//      }
-//      int pieceWidth = pieceCount * PIECE_WIDTH;
-
       int state = (code == sketch.getCurrentCode()) ? SELECTED : UNSELECTED;
-//      if (g != null) {
-//        //g.drawImage(pieces[state][LEFT], x, 0, PIECE_WIDTH, PIECE_HEIGHT, null);
-//        path = new GeneralPath();
-//        path.moveTo(x, bottom);
-//        path.lineTo(x, top + NOTCH);
-//        path.lineTo(x + NOTCH, top);
-//      }
       tab.left = x;
       x += TEXT_MARGIN;
-//      x += PIECE_WIDTH;
-
-//      int contentLeft = x;
-//      for (int j = 0; j < pieceCount; j++) {
-//        if (g != null) {
-//          g.drawImage(pieces[state][MIDDLE], x, 0, PIECE_WIDTH, PIECE_HEIGHT, null);
-//        }
-//        x += PIECE_WIDTH;
-//      }
-//      if (g != null) {
+
       int drawWidth = tab.textVisible ? tab.textWidth : NO_TEXT_WIDTH;
       x += drawWidth + TEXT_MARGIN;
-//        path.moveTo(x, top);
-//      }
       tab.right = x;
 
       if (g != null && tab.right < right) {
         g.setColor(tabColor[state]);
-        drawTab(g, tab.left, tab.right, i == 0, false);
-//        path.lineTo(x - NOTCH, top);
-//        path.lineTo(x, top + NOTCH);
-//        path.lineTo(x, bottom);
-//        path.closePath();
-//        g.setColor(tabColor[state]);
-//        g.fill(path);
-//        // have to draw an extra outline to make things line up on retina
-//        g.draw(path);
-//        //g.drawImage(pieces[state][RIGHT], x, 0, PIECE_WIDTH, PIECE_HEIGHT, null);
+        drawTab(g, tab.left, tab.right, i == 0, false, state == SELECTED);
 
         if (tab.textVisible) {
           int textLeft = tab.left + ((tab.right - tab.left) - tab.textWidth) / 2;
           g.setColor(textColor[state]);
-//          int baseline = (int) Math.ceil((sizeH + fontAscent) / 2.0);
-          //int baseline = bottom - (TAB_HEIGHT - fontAscent)/2;
           int tabHeight = TAB_BOTTOM - TAB_TOP;
           int baseline = TAB_TOP + (tabHeight + fontAscent) / 2;
-          //g.drawString(sketch.code[i].name, textLeft, baseline);
           g.drawString(tab.text, textLeft, baseline);
-//          g.drawLine(tab.left, baseline-fontAscent, tab.right, baseline-fontAscent);
-//          g.drawLine(tab.left, baseline, tab.right, baseline);
         }
 
         if (code.isModified()) {
           g.setColor(modifiedColor);
-          //g.drawLine(tab.left + NOTCH, top, tab.right - NOTCH, top);
-          //g.drawLine(tab.left + (i == 0 ? CURVE_RADIUS : 0), TAB_TOP, tab.right-1, TAB_TOP);
           g.drawLine(tab.right, TAB_TOP, tab.right, TAB_BOTTOM);
         }
       }
-
-//      if (g != null) {
-//        g.drawImage(pieces[state][RIGHT], x, 0, PIECE_WIDTH, PIECE_HEIGHT, null);
-//      }
-//      x += PIECE_WIDTH - 1;  // overlap by 1 pixel
       x += TAB_BETWEEN;
     }
-
-    // removed 150130
-//    // Draw this last because of half-pixel overlaps on retina displays
-//    if (g != null) {
-//      g.setColor(tabColor[SELECTED]);
-//      g.fillRect(0, bottom, getWidth(), TAB_STRETCH);
-//    }
-
     return x <= right;
   }
 
 
   private void drawTab(Graphics g, int left, int right,
-                       boolean leftNotch, boolean rightNotch) {
-//    final int bottom = getHeight(); // - TAB_STRETCH;
-//    final int top = bottom - TAB_HEIGHT;
-//    g.fillRect(left, top, right - left, bottom - top);
-
+                       boolean leftNotch, boolean rightNotch,
+                       boolean selected) {
     Graphics2D g2 = (Graphics2D) g;
+    final int bottom = TAB_BOTTOM + (selected ? 2 : 0);
     g2.fill(Toolkit.createRoundRect(left, TAB_TOP,
-                                    right, TAB_BOTTOM,
+                                    right, bottom,
                                     leftNotch ? CURVE_RADIUS : 0,
                                     rightNotch ? CURVE_RADIUS : 0,
                                     0, 0));
-
-//    path.moveTo(left, TAB_BOTTOM);
-//    if (left == MARGIN_WIDTH) {  // first tab on the left
-//      path.lineTo(left, TAB_TOP - CURVE_RADIUS);
-//    }
-
   }
 
 
 
@@ -56,8 +56,8 @@ X   update the mode selector colors
 X   remove background color from console text
 X   make sure repaint is happening
 X white corner on the scroll bar
+X single line at top of editor (editor bg color?)
 _ line numbers extending into the horizontal scroll bar
-_ single line at top of editor (editor bg color?)
 _ put themes in folders by name
 _ selector for theme that uses tiny images
 _ add notes about params to the wiki