diff --git a/ReferenceGenerator/bin/ProcessingWeblet$1.class b/ReferenceGenerator/bin/ProcessingWeblet$1.class
diff --git a/ReferenceGenerator/bin/ProcessingWeblet$10.class b/ReferenceGenerator/bin/ProcessingWeblet$10.class
diff --git a/ReferenceGenerator/bin/ProcessingWeblet$2.class b/ReferenceGenerator/bin/ProcessingWeblet$2.class
diff --git a/ReferenceGenerator/bin/ProcessingWeblet$3.class b/ReferenceGenerator/bin/ProcessingWeblet$3.class
diff --git a/ReferenceGenerator/bin/ProcessingWeblet$4.class b/ReferenceGenerator/bin/ProcessingWeblet$4.class
diff --git a/ReferenceGenerator/bin/ProcessingWeblet$5.class b/ReferenceGenerator/bin/ProcessingWeblet$5.class
diff --git a/ReferenceGenerator/bin/ProcessingWeblet$6.class b/ReferenceGenerator/bin/ProcessingWeblet$6.class
diff --git a/ReferenceGenerator/bin/ProcessingWeblet$7.class b/ReferenceGenerator/bin/ProcessingWeblet$7.class
diff --git a/ReferenceGenerator/bin/ProcessingWeblet$8.class b/ReferenceGenerator/bin/ProcessingWeblet$8.class
diff --git a/ReferenceGenerator/bin/ProcessingWeblet$9.class b/ReferenceGenerator/bin/ProcessingWeblet$9.class
diff --git a/ReferenceGenerator/bin/ProcessingWeblet$Option.class b/ReferenceGenerator/bin/ProcessingWeblet$Option.class
diff --git a/ReferenceGenerator/bin/ProcessingWeblet.class b/ReferenceGenerator/bin/ProcessingWeblet.class
diff --git a/ReferenceGenerator/bin/writers/BaseWriter.class b/ReferenceGenerator/bin/writers/BaseWriter.class
diff --git a/ReferenceGenerator/bin/writers/ClassWriter.class b/ReferenceGenerator/bin/writers/ClassWriter.class
diff --git a/ReferenceGenerator/bin/writers/FieldWriter.class b/ReferenceGenerator/bin/writers/FieldWriter.class
diff --git a/ReferenceGenerator/bin/writers/FileUtils.class b/ReferenceGenerator/bin/writers/FileUtils.class
diff --git a/ReferenceGenerator/bin/writers/FunctionWriter.class b/ReferenceGenerator/bin/writers/FunctionWriter.class
diff --git a/ReferenceGenerator/bin/writers/LibraryWriter.class b/ReferenceGenerator/bin/writers/LibraryWriter.class
diff --git a/ReferenceGenerator/bin/writers/MethodWriter.class b/ReferenceGenerator/bin/writers/MethodWriter.class
diff --git a/ReferenceGenerator/bin/writers/Shared$TagScanner.class b/ReferenceGenerator/bin/writers/Shared$TagScanner.class
diff --git a/ReferenceGenerator/bin/writers/Shared.class b/ReferenceGenerator/bin/writers/Shared.class
diff --git a/ReferenceGenerator/bin/writers/TemplateWriter.class b/ReferenceGenerator/bin/writers/TemplateWriter.class
diff --git a/ReferenceGenerator/build.xml b/ReferenceGenerator/build.xml
@@ -52,7 +52,7 @@
         description="compile the source " >
     <!-- Compile the java code from ${src} into ${build} -->
     <!-- Note that your environment JAVA_HOME now matters for building -->
-    <javac srcdir="${src}" destdir="${build}" source="11" target="11" includeantruntime="true">
+    <javac srcdir="${src}" destdir="${build}" source="17" target="17" includeantruntime="true">
       <classpath refid="class.path" />
     </javac>
   </target>

diff --git a/ReferenceGenerator/processingrefBuild.sh b/ReferenceGenerator/processingrefBuild.sh
@@ -5,7 +5,14 @@ echo "[REFERENCE GENERATOR] Booting up..."
 # PROCESSING_SRC_PATH=./test
 PROCESSING_SRC_PATH=../../processing4/core/src
 PROCESSING_LIB_PATH=../../processing4/java/libraries
+PROCESSING_VIDEO_PATH=../../processing-video
+PROCESSING_SOUND_PATH=../../processing-sound
+
+DOCLET_PATH=bin/:lib/org.json.jar
+SOURCE_PATH=../../processing4/core/bin
 REFERENCES_OUT_PATH=../../processing-website/content/references/translations/en
+CLASS_PATH="$PROCESSING_SRC_PATH/../library/*:$PROCESSING_LIB_PATH/serial/library/*:$PROCESSING_LIB_PATH/io/library/*:$PROCESSING_LIB_PATH/net/library/*:$PROCESSING_VIDEO_PATH/library/*:$PROCESSING_SOUND_PATH/library/*"
+
 # GENERATE REFERENCE ENTRIES AND INDEX THROUGH JAVADOC - BY DAVID WICKS
 
 echo "[REFERENCE GENERATOR] Source Path :: $PROCESSING_SRC_PATH"
@@ -19,14 +26,15 @@ if [ $# -eq 0 ]
     echo "No arguments supplied, generating everything"
     echo "[REFERENCE GENERATOR] Removing previous version of the ref..."
     FOLDERS="$PROCESSING_SRC_PATH/processing/core/*.java \
+        	$PROCESSING_SRC_PATH/processing/awt/*.java \
     			$PROCESSING_SRC_PATH/processing/data/*.java \
     			$PROCESSING_SRC_PATH/processing/event/*.java \
     			$PROCESSING_SRC_PATH/processing/opengl/*.java \
     			$PROCESSING_LIB_PATH/io/src/processing/io/*.java \
     			$PROCESSING_LIB_PATH/net/src/processing/net/*.java \
     			$PROCESSING_LIB_PATH/serial/src/processing/serial/*.java \
-    			$PROCESSING_LIB_PATH/../../../processing-video/src/processing/video/*.java \
-    			$PROCESSING_LIB_PATH/../../../processing-sound/src/processing/sound/*.java"
+    			$PROCESSING_VIDEO_PATH/src/processing/video/*.java \
+    			$PROCESSING_SOUND_PATH/src/processing/sound/*.java"
   elif [ $1 = "processing" ]
   then
     echo "Generating processing references"
@@ -38,20 +46,30 @@ if [ $# -eq 0 ]
           $PROCESSING_LIB_PATH/io/src/processing/io/*.java \
           $PROCESSING_LIB_PATH/net/src/processing/net/*.java \
           $PROCESSING_LIB_PATH/serial/src/processing/serial/*.java"
-  else
-  	echo "Generating $1 library"
+  elif [ $1 = "video" ]
+  then
+  	echo "Generating video library"
   	echo "[REFERENCE GENERATOR] Removing previous version of the ref..."
-  	FOLDERS="$PROCESSING_LIB_PATH/../../../processing-$1/src/processing/$1/*.java"
+  	FOLDERS="$PROCESSING_VIDEO_PATH/src/processing/video/*.java"
+  elif [ $1 = "sound" ]
+  then
+  	echo "Generating sound library"
+  	echo "[REFERENCE GENERATOR] Removing previous version of the ref..."
+  	FOLDERS="$PROCESSING_SOUND_PATH/src/processing/sound/*.java"
+  else
+    echo "Option '$1' not valid. Should be 'processing', 'sound' or 'video'"
 fi
 
 echo "[REFERENCE GENERATOR] Generating new javadocs..."
 javadoc -doclet ProcessingWeblet \
-        -docletpath "bin/:lib/org.json.jar" \
+        -docletpath $DOCLET_PATH \
+        --source-path $SOURCE_PATH \
+        --class-path $CLASS_PATH \
         -public \
 	-templatedir ../templates \
 	-examplesdir ../../content/api_en \
 	-includedir ../../content/api_en/include \
 	-imagedir images \
 	-encoding UTF-8 \
-	$FOLDERS \
+  $FOLDERS \
 	-noisy