diff --git a/build/windows/dist.sh b/build/windows/dist.sh
index d1a1fb276..c3d85c7f2 100755
--- a/build/windows/dist.sh
+++ b/build/windows/dist.sh
@@ -18,6 +18,8 @@ cp -r ../shared processing
 # and same for cvsignore
 rm -rf processing/CVS
 rm -rf processing/lib/CVS
+rm -rf processing/lib/netscape/CVS
+rm -rf processing/lib/netscape/javascript/CVS
 rm -rf processing/fonts/CVS
 rm -rf processing/reference/CVS
 rm -rf processing/reference/images/CVS
diff --git a/build/windows/dist/run.bat b/build/windows/dist/run.bat
index 657a229ca..931411545 100755
--- a/build/windows/dist/run.bat
+++ b/build/windows/dist/run.bat
@@ -6,7 +6,7 @@ REM --- (which means 128 megabytes) to something higher.
 set SAVEDCP=%CLASSPATH%
 set SAVEDPATH=%PATH%
 
-set CLASSPATH=java\lib\rt.jar;java\lib\jaws.jar;lib;lib\build;lib\pde.jar;lib\kjc.jar;lib\antlr.jar;lib\oro.jar;lib\comm.jar;%windir%\system32\qtjava.zip;%windir%\system\qtjava.zip
+set CLASSPATH=java\lib\rt.jar;lib;lib\build;lib\pde.jar;lib\kjc.jar;lib\antlr.jar;lib\oro.jar;lib\comm.jar;%windir%\system32\qtjava.zip;%windir%\system\qtjava.zip
 set PATH=java\bin;%PATH%
 
 start javaw -ms128m -mx128m PdeBase
diff --git a/build/windows/launcher/launcher.cpp b/build/windows/launcher/launcher.cpp
index bca72b35b..729355ae3 100644
--- a/build/windows/launcher/launcher.cpp
+++ b/build/windows/launcher/launcher.cpp
@@ -182,7 +182,8 @@ WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmd, int nShow)
           //,
 
           // the first three %s args
-          local_jre_installed ? "java\\lib\\rt.jar;java\\lib\\jaws.jar;" : "", 
+          //local_jre_installed ? "java\\lib\\rt.jar;java\\lib\\jaws.jar;" : "", 
+          local_jre_installed ? "java\\lib\\rt.jar;" : "", 
           qtjava_path,
           env_classpath, 
 
diff --git a/build/windows/launcher/processing.exe b/build/windows/launcher/processing.exe
index 8a3c8199a..9fc837f5f 100755
Binary files a/build/windows/launcher/processing.exe and b/build/windows/launcher/processing.exe differ
diff --git a/build/windows/make.sh b/build/windows/make.sh
index 0365eaa99..574131524 100755
--- a/build/windows/make.sh
+++ b/build/windows/make.sh
@@ -144,7 +144,7 @@ fi
 
 # new regular version
 CLASSPATH="..\\build\\windows\\work\\java\\lib\\rt.jar;..\\build\\windows\\work\\lib\\comm.jar;${QT_JAVA_PATH}"
-#CLASSPATH="..\\build\\windows\\work\\java\\lib\\rt.jar;..\\build\\windows\\work\\lib\\comm.jar;$QTJAVA"
+export CLASSPATH
 
 # make version with serial for the application
 echo Building bagel with serial, sonic, video and jdk13 support
diff --git a/build/windows/run.sh b/build/windows/run.sh
index aaf20aba5..647b1e101 100644
--- a/build/windows/run.sh
+++ b/build/windows/run.sh
@@ -27,6 +27,10 @@ fi
 # 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
 
-CLASSPATH=\"java\\lib\\rt.jar\;java\\lib\\jaws.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}\"
+# includes jaws.jar
+#CLASSPATH=\"java\\lib\\rt.jar\;java\\lib\\jaws.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}\"
+
+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}\"
+export CLASSPATH
 
 cd work && ./java/bin/java PdeBase
diff --git a/build/windows/srun.sh b/build/windows/srun.sh
index 2ea7b59ee..d81943ba9 100755
--- a/build/windows/srun.sh
+++ b/build/windows/srun.sh
@@ -18,7 +18,7 @@ else
   fi
 fi
 
-CLASSPATH=\"java\\lib\\rt.jar\;java\\lib\\jaws.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}\"
+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}\"
 
 export CLASSPATH