diff --git a/app/src/processing/mode/java/JavaBuild.java b/app/src/processing/mode/java/JavaBuild.java
index d4e756f12..73edb71bc 100644
--- a/app/src/processing/mode/java/JavaBuild.java
+++ b/app/src/processing/mode/java/JavaBuild.java
@@ -240,25 +240,25 @@ public class JavaBuild {
       }
     }
 
-    // initSketchSize() sets the internal sketchWidth/Height/Renderer vars
-    // in the preprocessor. Those are used in preproc.write() so that they
-    // can be turned into sketchXxxx() methods.
-    // This also returns the size info as an array so that we can figure out
-    // if this fella is OpenGL, and if so, to add the import. It's messy and
-    // gross and someday we'll just always include OpenGL.
-    String[] sizeInfo =
-      preprocessor.initSketchSize(sketch.getMainProgram(), sizeWarning);
-      //PdePreprocessor.parseSketchSize(sketch.getMainProgram(), false);
-    if (sizeInfo != null) {
-      String sketchRenderer = sizeInfo[3];
-      if (sketchRenderer != null) {
-        if (sketchRenderer.equals("P2D") ||
-            sketchRenderer.equals("P3D") ||
-            sketchRenderer.equals("OPENGL")) {
-          bigCode.insert(0, "import processing.opengl.*; ");
-        }
-      }
-    }
+//    // initSketchSize() sets the internal sketchWidth/Height/Renderer vars
+//    // in the preprocessor. Those are used in preproc.write() so that they
+//    // can be turned into sketchXxxx() methods.
+//    // This also returns the size info as an array so that we can figure out
+//    // if this fella is OpenGL, and if so, to add the import. It's messy and
+//    // gross and someday we'll just always include OpenGL.
+//    String[] sizeInfo =
+//      preprocessor.initSketchSize(sketch.getMainProgram(), sizeWarning);
+//      //PdePreprocessor.parseSketchSize(sketch.getMainProgram(), false);
+//    if (sizeInfo != null) {
+//      String sketchRenderer = sizeInfo[3];
+//      if (sketchRenderer != null) {
+//        if (sketchRenderer.equals("P2D") ||
+//            sketchRenderer.equals("P3D") ||
+//            sketchRenderer.equals("OPENGL")) {
+//          bigCode.insert(0, "import processing.opengl.*; ");
+//        }
+//      }
+//    }
 
     PreprocessorResult result;
     try {
diff --git a/app/src/processing/mode/java/JavaEditor.java b/app/src/processing/mode/java/JavaEditor.java
index 644c59108..fa20ab48b 100644
--- a/app/src/processing/mode/java/JavaEditor.java
+++ b/app/src/processing/mode/java/JavaEditor.java
@@ -54,15 +54,16 @@ public class JavaEditor extends Editor {
         handleExportApplication();
       }
     });
-    String appletTitle = JavaToolbar.getTitle(JavaToolbar.EXPORT, true);
-    JMenuItem exportApplet = Base.newJMenuItemShift(appletTitle, 'E');
-    exportApplet.addActionListener(new ActionListener() {
-      public void actionPerformed(ActionEvent e) {
-        handleExportApplet();
-      }
-    });
+//    String appletTitle = JavaToolbar.getTitle(JavaToolbar.EXPORT, true);
+//    JMenuItem exportApplet = Base.newJMenuItemShift(appletTitle, 'E');
+//    exportApplet.addActionListener(new ActionListener() {
+//      public void actionPerformed(ActionEvent e) {
+//        handleExportApplet();
+//      }
+//    });
 
-    return buildFileMenu(new JMenuItem[] { exportApplication, exportApplet });
+//    return buildFileMenu(new JMenuItem[] { exportApplication, exportApplet });
+    return buildFileMenu(new JMenuItem[] { exportApplication });
   }
 
 
diff --git a/app/src/processing/mode/java/JavaMode.java b/app/src/processing/mode/java/JavaMode.java
index 404cb3243..ea0f20569 100644
--- a/app/src/processing/mode/java/JavaMode.java
+++ b/app/src/processing/mode/java/JavaMode.java
@@ -139,11 +139,11 @@ public class JavaMode extends Mode {
 
 
   public File[] getExampleCategoryFolders() {
-    // Basics, Topics, 3D, Books
+    // Basics, Topics, OpenGL, Books
     return new File[] { 
       new File(examplesFolder, "Basics"),
       new File(examplesFolder, "Topics"),
-      new File(examplesFolder, "3D"),
+      new File(examplesFolder, "OpenGL"),
       new File(examplesFolder, "Books")
     };
   }
diff --git a/app/src/processing/mode/java/JavaToolbar.java b/app/src/processing/mode/java/JavaToolbar.java
index 62cf03dd2..cf8e168e0 100644
--- a/app/src/processing/mode/java/JavaToolbar.java
+++ b/app/src/processing/mode/java/JavaToolbar.java
@@ -72,7 +72,8 @@ public class JavaToolbar extends EditorToolbar {
     case NEW:    return !shift ? "New" : "New Editor Window";
     case OPEN:   return !shift ? "Open" : "Open in Another Window";
     case SAVE:   return "Save";
-    case EXPORT: return !shift ? "Export Application" : "Export Applet";
+//    case EXPORT: return !shift ? "Export Application" : "Export Applet";
+    case EXPORT: return "Export Application";
     }
     return null;
   }
@@ -115,11 +116,11 @@ public class JavaToolbar extends EditorToolbar {
       break;
 
     case EXPORT:
-      if (shift) {
-        jeditor.handleExportApplet();
-      } else {
-        jeditor.handleExportApplication();
-      }
+//      if (shift) {
+//        jeditor.handleExportApplet();
+//      } else {
+      jeditor.handleExportApplication();
+//      }
       break;
     }
   }
diff --git a/app/src/processing/mode/java/preproc/PdePreprocessor.java b/app/src/processing/mode/java/preproc/PdePreprocessor.java
index 3b81d3a0b..1d7d29879 100644
--- a/app/src/processing/mode/java/preproc/PdePreprocessor.java
+++ b/app/src/processing/mode/java/preproc/PdePreprocessor.java
@@ -890,7 +890,8 @@ public class PdePreprocessor {
   public String[] getCoreImports() {
     return new String[] {
       "processing.core.*",
-      "processing.data.*"
+      "processing.data.*",
+      "processing.opengl.*"
     };
   }
 
diff --git a/build/build.xml b/build/build.xml
index d45f28796..e574656f3 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -78,7 +78,6 @@
     <subant buildpath="../app" target="clean"/>
     <subant buildpath="../java/libraries/dxf" target="clean"/>
     <subant buildpath="../java/libraries/net" target="clean"/>
-    <subant buildpath="../java/libraries/opengl" target="clean"/>
     <subant buildpath="../java/libraries/pdf" target="clean"/>
     <subant buildpath="../java/libraries/serial" target="clean"/>
     <subant buildpath="../java/libraries/video" target="clean"/>
@@ -91,7 +90,6 @@
     <subant buildpath="../app" target="build"/>
     <subant buildpath="../java/libraries/dxf" target="build"/>
     <subant buildpath="../java/libraries/net" target="build"/>
-    <subant buildpath="../java/libraries/opengl" target="build"/>
     <subant buildpath="../java/libraries/pdf" target="build"/>
     <subant buildpath="../java/libraries/serial" target="build"/>
     <subant buildpath="../java/libraries/video" target="build"/>
@@ -210,9 +208,6 @@
     <copy todir="${target.path}/modes/java/libraries/net">
       <fileset dir="../net" includes="library/**,src/**" />
     </copy>
-    <copy todir="${target.path}/modes/java/libraries/opengl">
-      <fileset dir="../opengl" includes="library/**,src/**" />
-    </copy>
     <copy todir="${target.path}/modes/java/libraries/pdf">
       <fileset dir="../pdf" includes="library/**,src/**" />
     </copy>