diff --git a/processing/build/windows/dist/run.bat b/processing/build/windows/dist/run.bat
index 5c0e6c8ab..1b26a32a3 100755
--- a/processing/build/windows/dist/run.bat
+++ b/processing/build/windows/dist/run.bat
@@ -4,7 +4,7 @@ REM --- if you need more ram, change the 64m (which means
 REM --- 64 megabytes) to something higher. 
 
 set SAVEDCP=%CLASSPATH%
-set CLASSPATH=%CLASSPATH%;java\lib\rt.jar;lib;lib\build;lib\pde.jar;lib\kjc.jar;lib\oro.jar;lib\comm.jar;c:\winnt\system32\qtjava.zip;c:\windows\system32\qtjava.zip
+set CLASSPATH=%CLASSPATH%;java\lib\rt.jar;lib;lib\build;lib\pde.jar;lib\kjc.jar;lib\antlr.jar;lib\oro.jar;lib\comm.jar;c:\winnt\system32\qtjava.zip;c:\windows\system32\qtjava.zip
 
 java -ms64m -mx64m PdeBase
 
diff --git a/processing/build/windows/launcher/launcher.cpp b/processing/build/windows/launcher/launcher.cpp
index 6c325f465..9b57a08b4 100644
--- a/processing/build/windows/launcher/launcher.cpp
+++ b/processing/build/windows/launcher/launcher.cpp
@@ -61,6 +61,7 @@ WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmd, int nShow)
           "%s\\lib\\pde.jar;"
           "%s\\lib\\kjc.jar;"
           "%s\\lib\\oro.jar;"
+	  "%s\\lib\\antlr.jar;"
           "%s\\lib\\comm.jar;"
           "C:\\WINNT\\system32\\QTJava.zip;"
           "C:\\WINDOWS\\system32\\QTJava.zip;"
@@ -68,7 +69,7 @@ WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmd, int nShow)
           localJreInstalled ? "java\\lib\\rt.jar;" : "", 
           envClasspath ? envClasspath : "",
           envClasspath ? ";" : "",
-          loaddir, loaddir, loaddir, loaddir, loaddir, loaddir);
+          loaddir, loaddir, loaddir, loaddir, loaddir, loaddir, loaddir);
 
   if (!SetEnvironmentVariable("CLASSPATH", cp)) {
     MessageBox(NULL, "Could not set CLASSPATH environment variable",
diff --git a/processing/build/windows/launcher/processing.exe b/processing/build/windows/launcher/processing.exe
index 72fbfc3f1..b9a2178dc 100755
Binary files a/processing/build/windows/launcher/processing.exe and b/processing/build/windows/launcher/processing.exe differ
diff --git a/processing/build/windows/make.sh b/processing/build/windows/make.sh
index 27cea0d4e..7dbad01b9 100755
--- a/processing/build/windows/make.sh
+++ b/processing/build/windows/make.sh
@@ -130,14 +130,24 @@ echo Building PDE for JDK 1.4
 
 cd app
 
-# new javax.comm location
-CLASSPATH="..\\build\\windows\\work\\classes;..\\build\\windows\\work\\lib\\kjc.jar;..\\build\\windows\\work\\lib\\oro.jar;..\\build\\windows\\work\\java\\lib\\rt.jar;..\\build\\windows\\work\\lib\\comm.jar;${QT_JAVA_PATH}"
+cd preprocessor
 
-perl ../bagel/buzz.pl "jikes +D -classpath \"$CLASSPATH\" -d \"..\\build\\windows\\work/classes\"" -dJDK13 -dJDK14 *.java jeditsyntax/*.java
+# first build the default java goop
+java -cp "..\\..\\build\\windows\\work\\lib\\antlr.jar" antlr.Tool java.g
+java -cp "..\\..\\build\\windows\\work\\lib\\antlr.jar" antlr.Tool java.tree.g 
+
+# now build the pde stuff that extends the java classes
+java -cp "..\\..\\build\\windows\\work\\lib\\antlr.jar" antlr.Tool \
+    -glib java.g pde.g
+java -cp "..\\..\\build\\windows\\work\\lib\\antlr.jar" antlr.Tool \
+    -glib java.tree.g pde.tree.g
+cd ..
+
+CLASSPATH="..\\build\\windows\\work\\classes;..\\build\\windows\\work\\lib\\kjc.jar;..\\build\\windows\\work\\lib\antlr.jar;..\\build\\windows\\work\\lib\\oro.jar;..\\build\\windows\\work\\java\\lib\\rt.jar;..\\build\\windows\\work\\lib\\comm.jar;${QT_JAVA_PATH}"
+
+perl ../bagel/buzz.pl "jikes +D -classpath \"$CLASSPATH\" -d \"..\\build\\windows\\work/classes\"" -dJDK13 -dJDK14 *.java jeditsyntax/*.java preprocessor/*.java
 
 cd ../build/windows/work/classes
 rm -f ../lib/pde.jar
-zip -0q ../lib/pde.jar *.class
+zip -0rq ../lib/pde.jar .
 
-# back to 'build' dir
-cd ../../..
diff --git a/processing/build/windows/run.sh b/processing/build/windows/run.sh
index 2ffa4e3a4..41cc4ad5a 100644
--- a/processing/build/windows/run.sh
+++ b/processing/build/windows/run.sh
@@ -14,12 +14,7 @@ fi
 # rxtx testing
 #CLASSPATH=java\\lib\\rt.jar\;lib\;lib\\build\;lib\\pde.jar\;lib\\kjc.jar\;lib\\oro.jar\;lib\\RXTXcomm.jar\;${QT_JAVA_PATH}
 
-# newer javax.comm version
-#CLASSPATH=java\\lib\\rt.jar\;lib\;lib\\build\;lib\\pde.jar\;lib\\kjc.jar\;lib\\oro.jar\;lib\\comm.jar\;${QT_JAVA_PATH}
-CLASSPATH=java\\lib\\rt.jar\;lib\;lib\\build\;lib\\pde.jar\;lib\\kjc.jar\;lib\\oro.jar\;lib\\comm.jar\;lib\\RXTXcomm.jar\;${QT_JAVA_PATH}
-
-# javax.comm version
-#CLASSPATH=java\\lib\\rt.jar\;lib\;lib\\build\;lib\\pde.jar\;lib\\kjc.jar\;lib\\oro.jar\;java\\lib\\ext\\comm.jar\;${QT_JAVA_PATH}
+CLASSPATH=java\\lib\\rt.jar\;lib\;lib\\build\;lib\\pde.jar\;lib\\kjc.jar\;lib\\antlr.jar\;lib\\oro.jar\;lib\\comm.jar\;lib\\RXTXcomm.jar\;${QT_JAVA_PATH}
 
 # version for javac/1.1 testing
 #CLASSPATH=java\\lib\\rt.jar\;lib\;lib\\build\;lib\\pde.jar\;lib\\kjc.jar\;lib\\oro.jar\;java\\lib\\ext\\comm.jar\;${QT_JAVA_PATH}\;..\\..\\macos9\\JDKClasses.zip\;..\\..\\macos9\\JDKToolsClasses.zip
diff --git a/processing/build/windows/srun.sh b/processing/build/windows/srun.sh
index 17d7cf9fb..8e6aad88d 100755
--- a/processing/build/windows/srun.sh
+++ b/processing/build/windows/srun.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-CLASSPATH=java\\lib\\rt.jar\;lib\;lib\\build\;lib\\pde.jar\;lib\\kjc.jar\;lib\\oro.jar\;java\\lib\\ext\\comm.jar
+CLASSPATH=java\\lib\\rt.jar\;lib\;lib\\build\;lib\\pde.jar\;lib\\kjc.jar\;lib\\antlr.jar\;lib\\oro.jar\;lib\\comm.jar\;lib\\RXTXcomm.jar
 export CLASSPATH
 
 cd work && ./java/bin/java -Djava.compiler=NONE PdeBase