diff --git a/app/src/processing/app/tools/InstallCommander.java b/app/src/processing/app/tools/InstallCommander.java
index 1967c4e30..a59645c49 100644
--- a/app/src/processing/app/tools/InstallCommander.java
+++ b/app/src/processing/app/tools/InstallCommander.java
@@ -22,6 +22,7 @@
 package processing.app.tools;
 
 import java.io.File;
+import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.PrintWriter;
 
@@ -31,6 +32,7 @@ import processing.app.Base;
 import processing.app.Editor;
 import processing.app.Language;
 import processing.core.PApplet;
+import processing.data.StringList;
 
 
 public class InstallCommander implements Tool {
@@ -80,28 +82,16 @@ public class InstallCommander implements Tool {
       PrintWriter writer = PApplet.createWriter(file);
       writer.println("#!/bin/sh");
 
-      String[] jarList = new String[] {
-        "pde.jar",
-        "antlr.jar",
-        "jna.jar",
-        "ant.jar",
-        "ant-launcher.jar",
-
-        // extra libraries for new JDI setup
-        "org-netbeans-swing-outline.jar",
-        "com.ibm.icu_4.4.2.v20110823.jar",
-        "jdi.jar",
-        "jdimodel.jar",
-        "org.eclipse.osgi_3.8.1.v20120830-144521.jar",
-
-        "core/library/core.jar"        
-      };
-      String classPath = PApplet.join(jarList, ":");
-
-      //String javaRoot = System.getProperty("javaroot");
       String javaRoot = Base.getContentFile(".").getCanonicalPath();
+
+      StringList jarList = new StringList();
+      addJarList(jarList, new File(javaRoot));
+      addJarList(jarList, new File(javaRoot, "core/library"));
+      addJarList(jarList, new File(javaRoot, "modes/java/mode"));
+      String classPath = jarList.join(":").replaceAll(javaRoot + "\\/?", "");
+
       writer.println("cd \"" + javaRoot + "\" && " +
-                     Base.getJavaPath() + 
+                     Base.getJavaPath() +
                      " -Djna.nosys=true" +
       		           " -cp \"" + classPath + "\"" +
       		           " processing.mode.java.Commander \"$@\"");
@@ -136,4 +126,16 @@ public class InstallCommander implements Tool {
                        "An error occurred and the tools were not installed.", e);
     }
   }
+
+
+  static private void addJarList(StringList list, File dir) {
+    File[] jars = dir.listFiles(new FilenameFilter() {
+      public boolean accept(File dir, String name) {
+        return name.toLowerCase().endsWith(".jar") && !name.startsWith(".");
+      }
+    });
+    for (File jar : jars) {
+      list.append(jar.getAbsolutePath());
+    }
+  }
 }
\ No newline at end of file
diff --git a/build/linux/processing b/build/linux/processing
index 23bba63db..3a6aabf78 100755
--- a/build/linux/processing
+++ b/build/linux/processing
@@ -91,6 +91,9 @@ done
 for LIB in "$APPDIR"/core/library/*.jar; do
   CLASSPATH="$CLASSPATH"${CLASSPATH:+:}"$LIB"
 done
+for LIB in "$APPDIR"/modes/java/mode/*.jar; do
+  CLASSPATH="$CLASSPATH"${CLASSPATH:+:}"$LIB"
+done
 export CLASSPATH
 log CLASSPATH
 
diff --git a/build/windows/config-cmd.xml b/build/windows/config-cmd.xml
index 607d545c5..e4e3cd290 100644
--- a/build/windows/config-cmd.xml
+++ b/build/windows/config-cmd.xml
@@ -12,31 +12,32 @@
   <customProcName>false</customProcName>
   <stayAlive>false</stayAlive>
   <manifest></manifest>
-  <!-- avoid confusion w/ the real app by not setting the icon -->
+
+  <!-- We don't set the icon for this app to avoid confusion
+       with the PDE itself (and we don't have a separate icon...yet) -->
+
   <classPath>
     <mainClass>processing.mode.java.Commander</mainClass>
-    <cp>lib/pde.jar</cp>
-    <cp>core/library/core.jar</cp>
-    <cp>lib/jna.jar</cp>
-    <cp>lib/antlr.jar</cp>
-    <cp>lib/ant.jar</cp>
-    <cp>lib/ant-launcher.jar</cp>
-    <cp>lib/org-netbeans-swing-outline.jar</cp>
-    <cp>lib/com.ibm.icu_4.4.2.v20110823.jar</cp>
-    <cp>lib/jdi.jar</cp>
-    <cp>lib/jdimodel.jar</cp>
-    <cp>lib/org.eclipse.osgi_3.8.1.v20120830-144521.jar</cp>
+
+    <cp>lib/*.jar</cp>
+    <cp>core/library/*.jar</cp>
+    <cp>modes/java/mode/*.jar</cp>
+
+    <!-- If using a full JDK, link to the tools.jar file -->
     <!-- <cp>%EXEDIR%/java/lib/tools.jar</cp> -->
   </classPath>
+
   <jre>
     <path>java</path>
-    <!-- https://github.com/processing/processing/issues/2239 -->
+    <!-- Prevent a user-installed JNA from conflicting with our version.
+         https://github.com/processing/processing/issues/2239 -->
     <opt>-Djna.nosys=true</opt>
-    <!-- for 2.2, set a minimum version -->
-    <minVersion>1.7.0_40</minVersion>
+    <!-- starting in 3.0, require Java 8 -->
+    <minVersion>1.8.0</minVersion>
     <!-- increase available per PDE X request -->
     <maxHeapSize>256</maxHeapSize>
   </jre>
+
   <messages>
     <startupErr>An error occurred while starting the application.</startupErr>
     <bundledJreErr>This application was configured to use a bundled Java Runtime Environment but the runtime is missing or corrupted.</bundledJreErr>
diff --git a/core/todo.txt b/core/todo.txt
index 3b3614695..652472bb8 100644
--- a/core/todo.txt
+++ b/core/todo.txt
@@ -13,6 +13,7 @@ _   right now, on Windows it moves it on-screen (b/c of previous bug reports)
 _   may be cause of some of the display placement issues w/ multiple displays
 _   seem to recall one of the bugs mentioning stacked displays
 _   need to change to iterate through display rectangles
+_ tweak mode ColorSelector is broken (uses getComponent())
 
 
 rendering/performance/surface
diff --git a/todo.txt b/todo.txt
index 17d068c57..c2d113914 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,6 +1,16 @@
 0235 (3.0a8)
 
+_ Unable to install "processing-java"
+_   https://github.com/processing/processing/issues/3224
+_   also update the Windows and Linux versions
 
+_ "Your sketch has been modified externally..." appears erroneously
+_   https://github.com/processing/processing/issues/3222
+_ Error message changes from "function" to "method"
+_   https://github.com/processing/processing/issues/3225
+
+
+_ fix this error message: Experimental Mode: Yikes! Can't find "processing.opengl" library! Line: 2 in tab: particle_signature_30_01
 _ 'ant clean' not removing old versions created by dist
 _ finish adding 'examples' contribs
 _   https://github.com/processing/processing/issues/2953