diff --git a/.gitmodules b/.gitmodules
index 73f90e0a..098b04e2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,4 @@
 [submodule "js/wPaint"]
 	path = js/wPaint
-	url = https://github.com/vichan-devel/wPaint.git
+	url = https://github.com/ctrlcctrlv/wPaint.git
+	branch = master
diff --git a/inc/instance-config.php b/inc/instance-config.php
index cfcb62de..bc8d63da 100644
--- a/inc/instance-config.php
+++ b/inc/instance-config.php
@@ -145,12 +145,7 @@
 	$config['additional_javascript'][] = 'js/file-selector.js';
 	// Oekaki (now depends on config.oekaki so can be in all scripts)
 	$config['additional_javascript'][] = 'js/jquery-ui.custom.min.js';
-	$config['additional_javascript'][] = 'js/wPaint/lib/wColorPicker.min.js';
-	$config['additional_javascript'][] = 'js/wPaint/wPaint.min.js';
-	$config['additional_javascript'][] = 'js/wPaint/plugins/main/wPaint.menu.main.min.js';
-	$config['additional_javascript'][] = 'js/wPaint/plugins/text/wPaint.menu.text.min.js';
-	$config['additional_javascript'][] = 'js/wPaint/plugins/shapes/wPaint.menu.main.shapes.min.js';
-	$config['additional_javascript'][] = 'js/wPaint/plugins/file/wPaint.menu.main.file.min.js';
+	$config['additional_javascript'][] = 'js/wPaint/8ch.js';
 	$config['additional_javascript'][] = 'js/wpaint.js';
 	// Code tags (fix because we no longer have different scripts for each board)
 	$config['additional_javascript'][] = 'js/code_tags/run_prettify.js';
diff --git a/js/wPaint b/js/wPaint
index 2c272dff..53b007f2 160000
--- a/js/wPaint
+++ b/js/wPaint
@@ -1 +1 @@
-Subproject commit 2c272dffca0f3d7b7163bd82ba15629f54409278
+Subproject commit 53b007f28cf0b6cec9998e5e79d56dae6feb8c69