diff --git a/app/src/processing/app/Preferences.java b/app/src/processing/app/Preferences.java
index 332fe1fc1..77eb15c42 100644
--- a/app/src/processing/app/Preferences.java
+++ b/app/src/processing/app/Preferences.java
@@ -661,7 +661,7 @@ public class Preferences {
    * then send a message to the editor saying that it's time to do the same.
    */
   protected void applyFrame() {
-    setBoolean("editor.antialias", //$NON-NLS-1$
+    setBoolean("editor.smooth", //$NON-NLS-1$
                editorAntialiasBox.isSelected());
 
     setBoolean("export.delete_target_folder", //$NON-NLS-1$
@@ -796,7 +796,7 @@ public class Preferences {
 
 
   protected void showFrame() {
-    editorAntialiasBox.setSelected(getBoolean("editor.antialias")); //$NON-NLS-1$
+    editorAntialiasBox.setSelected(getBoolean("editor.smooth")); //$NON-NLS-1$
     inputMethodBox.setSelected(getBoolean("editor.input_method_support")); //$NON-NLS-1$
 
     // set all settings entry boxes to their actual status
diff --git a/app/src/processing/app/syntax/TextAreaPainter.java b/app/src/processing/app/syntax/TextAreaPainter.java
index 853e345e0..d1679ddaa 100644
--- a/app/src/processing/app/syntax/TextAreaPainter.java
+++ b/app/src/processing/app/syntax/TextAreaPainter.java
@@ -30,8 +30,6 @@ import processing.app.syntax.im.CompositionTextPainter;
 public class TextAreaPainter extends JComponent implements TabExpander {
   /** True if inside printing, will handle disabling the highlight */
   boolean printing;
-  /** Current setting for editor.antialias preference */
-//  boolean antialias;
 
   /** A specific painter composed by the InputMethod.*/
   protected CompositionTextPainter compositionTextPainter;
@@ -129,7 +127,7 @@ public class TextAreaPainter extends JComponent implements TabExpander {
       plainFont = new Font(fontFamily, Font.PLAIN, fontSize);
     }
     boldFont = new Font(fontFamily, Font.BOLD, fontSize);
-    antialias = Preferences.getBoolean("editor.antialias");
+    antialias = Preferences.getBoolean("editor.smooth");
 //    System.out.println(plainFont.getFamily());
 //    System.out.println(plainFont);
 
diff --git a/build/shared/lib/preferences.txt b/build/shared/lib/preferences.txt
index a2310249d..8ac212d59 100644
--- a/build/shared/lib/preferences.txt
+++ b/build/shared/lib/preferences.txt
@@ -110,12 +110,10 @@ editor.window.height.min.windows = 530
 editor.font.family = Source Code Pro
 editor.font.size = 12
 
-# anti-aliased text, turned off by default
-#editor.antialias=false
-# linux fonts are hideous without anti-aliasing [0191]
-#editor.antialias.linux=true
-# turning anti-aliasing on by default for 2.0
-editor.antialias=true
+# To reset everyone's default, replaced editor.antialias with editor.smooth 
+# for 2.1. Fonts are unusably gross on OS X (and Linux) w/o smoothing and 
+# the Oracle JVM, and many longtime users have anti-aliasing turned off.
+editor.smooth = true
 
 # blink the caret by default
 editor.caret.blink = true
diff --git a/todo.txt b/todo.txt
index 6d589afbc..d51447484 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,4 +1,15 @@
 0223 pde
+_ reset font smoothing for everyone to its default by changing the pref
+# To reset everyone's default, replaced editor.antialias with editor.smooth 
+# for 2.1. Fonts are unusably gross on OS X (and Linux) w/o smoothing and 
+# the Oracle JVM, and many longtime users have anti-aliasing turned off.
+X   https://github.com/processing/processing/issues/2164
+X   https://github.com/processing/processing/issues/2160
+
+_ emacs style errors in commander aren't quite right
+_   https://github.com/processing/processing/issues/2158
+_ return code needs to be 1 instead of 0
+_   https://github.com/processing/processing/issues/1798#issuecomment-26711847
 
 
 medium