diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java
index 7efba35e5..9b25ddd40 100755
--- a/core/src/processing/core/PApplet.java
+++ b/core/src/processing/core/PApplet.java
@@ -776,6 +776,11 @@ public class PApplet extends Applet
   Object pauseObject = new Object();
   Thread thread;
 
+  // Background default needs to be different from the default value in
+  // PGraphics.backgroundColor, otherwise size(100, 100) bg spills over.
+  // https://github.com/processing/processing/issues/2297
+  final Color WINDOW_BGCOLOR = new Color(0xDD, 0xDD, 0xDD);
+
   // messages to send if attached as an external vm
 
   /**
@@ -10616,8 +10621,7 @@ public class PApplet extends Applet
     Frame frame = new JFrame(displayDevice.getDefaultConfiguration());
     // Default Processing gray, which will be replaced below if another
     // color is specified on the command line (i.e. in the prefs).
-    final Color defaultGray = new Color(0xCC, 0xCC, 0xCC);
-    ((JFrame) frame).getContentPane().setBackground(defaultGray);
+    ((JFrame) frame).getContentPane().setBackground(WINDOW_BGCOLOR);
     // Cannot call setResizable(false) until later due to OS X (issue #467)
 
     final PApplet applet;
diff --git a/core/todo.txt b/core/todo.txt
index 69652e51d..e36b0c516 100644
--- a/core/todo.txt
+++ b/core/todo.txt
@@ -9,6 +9,8 @@ o XML.getChildren() throwing NPE when getInt() called on non-existent var
 o   https://github.com/processing/processing/issues/2367
 X PGraphics.colorCalcARGB(int, float) doesn't cap alpha
 X   https://github.com/processing/processing/issues/2439
+X run window border color changed in 2.1
+X   https://github.com/processing/processing/issues/2297
 
 fixed in 2.1
 X draw() called again before finishing on OS X (retina issue)
@@ -41,18 +43,6 @@ A   https://github.com/processing/processing/issues/2416
 A fix pixels[] array for video capture
 A   https://github.com/processing/processing/issues/2424
 
-_ tint() not working in PDF (regression from previous release)
-_   https://github.com/processing/processing/issues/2428
-
-_ default font fixes 
-_   https://github.com/processing/processing/issues/2331
-_   https://github.com/processing/processing/pull/2338
-
-_ saveFrame() with retina render is making black images
-_ add print() method to other data types (not just IntList)
-
-_ run window border color changed in 2.1
-_   https://github.com/processing/processing/issues/2297
 
 _ point() rendering differently in 2.0.3 and 2.1
 _   https://github.com/processing/processing/issues/2278
@@ -60,7 +50,15 @@ _   https://github.com/processing/processing/issues/2278
 _ Sketch runs with default size if size() is followed by large memory allocation
 _   https://github.com/processing/processing/issues/2039
 
+
 high
+_ tint() not working in PDF (regression between 2.0.3 and 2.1)
+_   https://github.com/processing/processing/issues/2428
+_ default font fixes 
+_   https://github.com/processing/processing/issues/2331
+_   https://github.com/processing/processing/pull/2338
+_ saveFrame() with retina render is making black images
+_ add print() method to other data types (not just IntList)
 _ zero alpha values still a problem with retina renderer
 _   https://github.com/processing/processing/issues/2030
 _ Sort out blending differences with P2D/P3D