diff --git a/Gruntfile.js b/Gruntfile.js
index 1ef8ef2cf..05df4524b 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -28,8 +28,11 @@ module.exports = function(grunt) {
       chrome: {
         command: 'make -C chrome-app '
       },
-      wp: {
-        command: 'make -C cordova wp',
+      wpinit: {
+        command: 'make -C cordova wp-init',
+      },
+      wpcopy: {
+        command: 'make -C cordova wp-copy',
       },
       ios: {
         command: 'make -C cordova ios',
@@ -254,7 +257,8 @@ module.exports = function(grunt) {
   grunt.registerTask('osx', ['prod', 'nwjs', 'exec:osx']);
   grunt.registerTask('chrome', ['exec:chrome']);
   grunt.registerTask('wp', ['prod', 'exec:wp']);
-  grunt.registerTask('wp-debug', ['default', 'exec:wp']);
+  grunt.registerTask('wp-copy', ['default', 'exec:wpcopy']);
+  grunt.registerTask('wp-init', ['default', 'exec:wpinit']);
   grunt.registerTask('ios', ['prod', 'exec:ios']);
   grunt.registerTask('ios-debug', ['default', 'exec:ios']);
   grunt.registerTask('ios-run', ['exec:xcode']);
diff --git a/app-template/Makefile b/app-template/Makefile
index 058cbce10..f18321402 100644
--- a/app-template/Makefile
+++ b/app-template/Makefile
@@ -8,7 +8,7 @@ clean:
 	rm -Rf $(WORKDIR)*
 
 
-$(WORKDIR)android $(WORKDIR)ios $(WORKDIR)wp:  config.xml
+$(WORKDIR)android $(WORKDIR)ios:  config.xml
 	cordova create $@ com.bitpay.*NAMENOSPACE* *NAMECASENOSPACE* || echo "Project Path Existed"
 	cp ProjectMakefile $@/Makefile
 	rm -r $@/www && ln -sF ../../public $@/www
@@ -27,16 +27,23 @@ android: project-android
 	cp -R android/res/*  $(WORKDIR)android/platforms/android/res
 	make -C $(WORKDIR)android build-android
 
+wp-init: config.xml
+	cordova create $(WORKDIR)$@ com.bitpay.*NAMENOSPACE* *NAMECASENOSPACE* || echo "Project Path Existed"
+	cp ProjectMakefile $(WORKDIR)$@/Makefile
+	mkdir -p $(WORKDIR)$@/www
+	cp -Rf ../public/* $(WORKDIR)$@/www
+	cp config.xml $(WORKDIR)$@/config.xml
+	make -C $(WORKDIR)$@  $(subst $(WORKDIR),, $(WORKDIR)$@)
 
-wp: build-wp
-	cp -vf wp/Properties/* $</platforms/wp8/Properties/
-	cp -vf wp/MainPage.xaml $</platforms/wp8/
-	cp -vf wp/Package.appxmanifest $</platforms/wp8/
-	cp -vf wp/Assets/* $</platforms/wp8/Assets/
-	cp -vf wp/SplashScreenImage.jpg $</platforms/wp8/
-	cp -vf wp/ApplicationIcon.png $</platforms/wp8/
-	cp -vf wp/Background.png $</platforms/wp8/
-	cp -af ../public/** $</www
+wp-copy: 
+	cp -rvf wp/Properties/* $(WORKDIR)wp/platforms/wp8/Properties/
+	cp -rvf wp/MainPage.xaml $(WORKDIR)wp/platforms/wp8/
+	cp -rvf wp/Package.appxmanifest $(WORKDIR)wp/platforms/wp8/
+	cp -rvf wp/Assets/* $(WORKDIR)wp/platforms/wp8/Assets/
+	cp -rvf wp/SplashScreenImage.jpg $(WORKDIR)wp/platforms/wp8/
+	cp -rvf wp/ApplicationIcon.png $(WORKDIR)wp/platforms/wp8/
+	cp -rvf wp/Background.png $(WORKDIR)wp/platforms/wp8/
+	cp -rvf ../public/* $(WORKDIR)wp/www
 	wp/fix-svg.sh
 
 
diff --git a/app-template/ProjectMakefile b/app-template/ProjectMakefile
index 3331e5c33..a3813ae2d 100644
--- a/app-template/ProjectMakefile
+++ b/app-template/ProjectMakefile
@@ -1,4 +1,4 @@
-.PHONY:plugins ios-platform android-platform wp-platform
+.PHONY:plugins ios-platform android-platform wp8-platform
 
 plugins:
 	cordova plugin add cordova-plugin-globalization
@@ -30,7 +30,7 @@ plugins:
 
 
 
-ios-platform android-platform wp-platform:
+ios-platform android-platform wp8-platform:
 	cordova platforms add $(subst -platform,,$@) || echo "Platform already added"
 
 ios: ios-platform plugins
@@ -41,7 +41,7 @@ android: android-platform plugins
 	cordova plugin add https://github.com/jrontend/phonegap-plugin-barcodescanner
 	cordova plugin add phonegap-plugin-push@1.2.3
 
-wp: wp-platform plugins
+wp: wp8-platform plugins
 	cordova plugin add https://github.com/jrontend/phonegap-plugin-barcodescanner
 
 build-ios build-android build-wp8:
diff --git a/app-template/package.json b/app-template/package.json
index 3e19f4248..875eecb93 100644
--- a/app-template/package.json
+++ b/app-template/package.json
@@ -85,7 +85,7 @@
     "xcode": "^0.8.2"
   },
   "scripts": {
-    "preinstall": "bower install && cd app-template && ./apply.js",
+    "preinstall": "bower install && cd app-template && node apply.js",
     "postinstall": "npm run build",
     "build": "grunt",
     "start": "node app.js",