diff --git a/Makefile b/Makefile
index bafb7e9ff..ab2105455 100644
--- a/Makefile
+++ b/Makefile
@@ -1,38 +1,26 @@
+VERSION=`cut -d '"' -f2 $BUILDDIR/../version.js`
+
 sign:
 	gpg -u 1112CFA1 --output browser-extensions/chrome/copay-chrome-extension.zip.sig --detach-sig browser-extensions/chrome/copay-chrome-extension.zip
 verify: 
 	gpg --verify browser-extensions/chrome/copay-chrome-extension.zip.sig browser-extensions/chrome/copay-chrome-extension.zip
 
-ios:
-	cordova/build.sh
-	cd cordova/project && cordova build ios
-	open cordova/project/platforms/ios/Copay.xcodeproj
-
-ios-debug:
-	cordova/build.sh --dbgjs
-	cd cordova/project && cordova build ios
-	open cordova/project/platforms/ios/Copay.xcodeproj
-
-android:
-	cordova/build.sh --android --dbgjs
-	cd cordova/project && cordova run android
-
-android-prod:
-	cordova/build.sh --release
-	cd cordova/project && cordova build android --release
-
-
-
 chrome:
 	grunt prod
 	browser-extensions/chrome/build.sh
 
 
-wp8:
-	cordova/build.sh
+cordova-base:
+	grunt dist-mobile
 
-fix-wp8-svg:
-	cordova/wp/fix-svg.sh
+ios:  cordova-base
+	make -C cordova ios
+	open cordova/project/platforms/ios/Copay
+
+android: cordova-base
+	make -C cordova run-android
+
+release-android: cordova-base
+	make -C cordova release-android
 
-wp8: fix-wp8-svg
 
diff --git a/cordova/Makefile b/cordova/Makefile
new file mode 100644
index 000000000..e6d4f3ee6
--- /dev/null
+++ b/cordova/Makefile
@@ -0,0 +1,50 @@
+.PHONY: plugins android wp8 ios clean
+
+all:
+
+#  grunt dist-mobile-dbg
+
+plugins:
+	make -C project plugins
+
+project: 
+	cordova create project com.bitpay.copay Copay
+	cp config.xml project/config.xml
+	cp ProjectMakefile project/Makefile
+	cp -af ../dist/web/** project/www
+	sed "s/<\!-- PLACEHOLDER: CORDOVA SRIPT -->/<script type='text\/javascript' charset='utf-8' src='cordova.js'><\/script>/g" ../index.html > project/www/index.html
+
+ 
+android: project plugins
+	mkdir -p project/platforms/android/res/xml/
+	cp android/AndroidManifest.xml project/platforms/android/AndroidManifest.xml
+	cp android/project.properties project/platforms/android/project.properties
+	cp -R android/res/* project/platforms/android/res
+	make -C project android
+
+wp8: project plugins
+	make -C project wp8
+	cp -R project/www/* project/platforms/wp8/www
+	cp -R wp/res/* project/platforms/wp/res
+
+ios: project plugins
+	make -C project ios
+	cp ios/Copay-Info.plist project/platforms/ios/Copay-Info.plist
+	mkdir -p project/platforms/ios/Copay/Resources/icons
+	mkdir -p project/platforms/ios/Copay/Resources/splash
+	cp -R ios/icons/* project/platforms/ios/Copay/Resources/icons
+	cp -R ios/splash/* project/platforms/ios/Copay/Resources/splash
+
+open-ios: ios
+	open project/platforms/ios/Copay.xcodeproj
+
+run-android: android
+	make -C project run-android
+
+release-android: android 
+	make -C project release-android
+
+clean:
+	rm -rf project
+
+
diff --git a/cordova/ProjectMakefile b/cordova/ProjectMakefile
new file mode 100644
index 000000000..fdaa1be4b
--- /dev/null
+++ b/cordova/ProjectMakefile
@@ -0,0 +1,31 @@
+
+.PHONY: android plugins wp8 ios
+
+plugins:
+	@echo "Intalling cordova plugins"
+	cordova plugin add https://github.com/Initsogar/cordova-webintent.git
+	cordova plugin add https://github.com/wildabeast/BarcodeScanner.git
+	cordova plugin add org.apache.cordova.splashscreen
+	cordova plugin add org.apache.cordova.statusbar
+	cordova plugin add https://github.com/EddyVerbruggen/LaunchMyApp-PhoneGap-Plugin.git --variable URL_SCHEME=bitcoin
+	cordova plugin add org.apache.cordova.inappbrowser
+
+android:
+	cordova platforms add android
+
+wp8:
+	cordova platforms add wp8 
+
+ios:
+	cordova platforms add ios
+
+build-ios: 
+	cordova build ios
+
+run-android: 
+	cordova run android
+
+release-android: 
+	cordova build android --release
+
+
diff --git a/cordova/build.sh b/cordova/build.sh
index f8d00fccb..10d6c9bfb 100755
--- a/cordova/build.sh
+++ b/cordova/build.sh
@@ -176,3 +176,4 @@ if [ $CURRENT_OS == "WP8" ]; then
 
 fi
 
+
diff --git a/cordova/readme.md b/cordova/readme.md
index e6f19b580..b80002e41 100644
--- a/cordova/readme.md
+++ b/cordova/readme.md
@@ -9,11 +9,10 @@
 
 ## Build the project
 
-    $ sh cordova/build.sh [--android]
-    $ cd cordova/project
-    $ cordova run android
-    $ cordova emulate ios
+    $ make [clean] open-ios
+    OR $ make [clean] android-run
+    OR $ make [clean] wp8
+
+    See Makefile for more targets
 
-## Build for release
 
-    $ cordova build android --release
diff --git a/cordova/wp/res/ApplicationIcon.png b/cordova/wp/res/ApplicationIcon.png
new file mode 100644
index 000000000..6db598fa9
Binary files /dev/null and b/cordova/wp/res/ApplicationIcon.png differ
diff --git a/cordova/wp/res/Background.png b/cordova/wp/res/Background.png
new file mode 100644
index 000000000..31f4d63d3
Binary files /dev/null and b/cordova/wp/res/Background.png differ