diff --git a/bin/installOnWindows.bat b/bin/installOnWindows.bat
index b6f699de..0e3e2099 100644
--- a/bin/installOnWindows.bat
+++ b/bin/installOnWindows.bat
@@ -6,10 +6,6 @@ set JQUERY_VERSION=1.7
 cd bin
 cd ..
 
-echo _
-echo Setting up settings.json...
-copy settings.json.template_windows settings.json
-
 echo _
 echo Updating node...
 curl -lo bin\node.exe http://nodejs.org/dist/v%NODE_VERSION%/node.exe
@@ -23,13 +19,20 @@ echo Updating jquery...
 curl -lo "node_modules\ep_etherpad-lite\static\js\jquery.min.js" "http://code.jquery.com/jquery-%JQUERY_VERSION%.min.js"
 
 echo _
-echo Some other stuff...
-copy node_modules\ep_etherpad-lite\static\custom\js.template node_modules\ep_etherpad-lite\static\custom\index.template
-copy node_modules\ep_etherpad-lite\static\custom\js.template node_modules\ep_etherpad-lite\static\custom\pad.template
-copy node_modules\ep_etherpad-lite\static\custom\js.template node_modules\ep_etherpad-lite\static\custom\timeslider.template
-copy node_modules\ep_etherpad-lite\static\custom\css.template node_modules\ep_etherpad-lite\static\custom\index.template
-copy node_modules\ep_etherpad-lite\static\custom\css.template node_modules\ep_etherpad-lite\static\custom\pad.template
-copy node_modules\ep_etherpad-lite\static\custom\css.template node_modules\ep_etherpad-lite\static\custom\timeslider.template
+echo Copying custom templates...
+set custom_dir=node_modules\ep_etherpad-lite\static\custom
+FOR %%f IN (index pad timeslider) DO (
+  if NOT EXIST %custom_dir%\%%f.js copy %custom_dir%\js.template %custom_dir%\%%f.js
+  if NOT EXIST %custom_dir%\%%f.css copy %custom_dir%\css.template %custom_dir%\%%f.css
+)
+
+echo _
+echo Clearing cache.
+del /S var\minified*
+
+echo _
+echo Setting up settings.json...
+IF NOT EXIST settings.json copy settings.json.template_windows settings.json
 
 echo _
 echo Installed Etherpad-lite!
\ No newline at end of file
diff --git a/src/static/js/pluginfw/plugins.js b/src/static/js/pluginfw/plugins.js
index 455dd203..7efcb49c 100644
--- a/src/static/js/pluginfw/plugins.js
+++ b/src/static/js/pluginfw/plugins.js
@@ -57,8 +57,8 @@ exports.loadFn = function (path, hookName) {
   var functionName
     , parts = path.split(":");
   
-  // on windows
-  if(process.platform == 'win32') {
+  // on windows: C:\foo\bar:xyz
+  if(parts[0].length == 1) {
     if(parts.length == 3)
       functionName = parts.pop();
     path = parts.join(":");