diff --git a/app/elements/pkm-list/pkm-list.js b/app/elements/pkm-list/pkm-list.js
index 33009eb4..b81dc1ca 100644
--- a/app/elements/pkm-list/pkm-list.js
+++ b/app/elements/pkm-list/pkm-list.js
@@ -49,6 +49,9 @@ var fs = require("fs");
         },
         typeName: function (typeId) {
             return nameData["en"]["types"][typeId];
+        },
+        toJson: function (e) {
+            return new handlebars.SafeString(JSON.stringify(e));
         }
     });
     var PkmList = (function (_super) {
diff --git a/app/elements/pkm-list/pkm-list.ts b/app/elements/pkm-list/pkm-list.ts
index f39970de..354c9297 100644
--- a/app/elements/pkm-list/pkm-list.ts
+++ b/app/elements/pkm-list/pkm-list.ts
@@ -34,6 +34,9 @@ var pkmFormat = handlebars.registerHelper({
     },
     typeName: function(typeId) {
         return nameData["en"]["types"][typeId];
+    },
+    toJson: function(e) {
+        return new handlebars.SafeString(JSON.stringify(e));
     }
     });
 
diff --git a/gulpfile.js b/gulpfile.js
index 88a3a5ad..5db749fd 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -218,14 +218,20 @@ gulp.task('buildElectron', function() {
         release: "./release",
         cache: "./cache",
         version: "v0.30.1",
-        platforms: ["darwin-x64"],
+        platforms: ["darwin-x64", "win32-ia32"],
         platformResources: {
             darwin: {
                 CFBundleDisplayName: "KeySAVe",
                 CFBundleIdentifier: "com.cu3po42.keysave",
                 CFBundleName: "KeySAVe",
                 CFBundleVersion: packageJson.version,
-                icon: "keysave-logo.icns"
+                icon: "resources/keysave-logo.icns"
+            },
+            win: {
+                "version-string": packageJson.version,
+                "file-version": packageJson.version,
+                "product-version": packageJson.version,
+                "icon": "resources/keysave-logo.ico"
             }
         }
     }))
diff --git a/keysave-logo.icns b/keysave-logo.icns
deleted file mode 100644
index 5bf4e9cf..00000000
Binary files a/keysave-logo.icns and /dev/null differ
diff --git a/package.json b/package.json
index 5cbef384..2ba96a00 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
     "connect-history-api-fallback": "^1.1.0",
     "del": "^1.1.1",
     "electron-packager": "^5.0.1",
+    "electron-prebuilt": "^0.30.1",
     "glob": "^5.0.6",
     "gulp": "^3.8.5",
     "gulp-autoprefixer": "^2.1.0",
diff --git a/resources/keysave-logo-1024.png b/resources/keysave-logo-1024.png
new file mode 100644
index 00000000..a91b5cb4
Binary files /dev/null and b/resources/keysave-logo-1024.png differ
diff --git a/resources/keysave-logo-128.png b/resources/keysave-logo-128.png
new file mode 100644
index 00000000..3eaa70c8
Binary files /dev/null and b/resources/keysave-logo-128.png differ
diff --git a/resources/keysave-logo-16.png b/resources/keysave-logo-16.png
new file mode 100644
index 00000000..d7aa4866
Binary files /dev/null and b/resources/keysave-logo-16.png differ
diff --git a/resources/keysave-logo-256.png b/resources/keysave-logo-256.png
new file mode 100644
index 00000000..00c65e12
Binary files /dev/null and b/resources/keysave-logo-256.png differ
diff --git a/resources/keysave-logo-32.png b/resources/keysave-logo-32.png
new file mode 100644
index 00000000..26990d4c
Binary files /dev/null and b/resources/keysave-logo-32.png differ
diff --git a/resources/keysave-logo-48.png b/resources/keysave-logo-48.png
new file mode 100644
index 00000000..4cdc9468
Binary files /dev/null and b/resources/keysave-logo-48.png differ
diff --git a/resources/keysave-logo-512.png b/resources/keysave-logo-512.png
new file mode 100644
index 00000000..24ee5604
Binary files /dev/null and b/resources/keysave-logo-512.png differ
diff --git a/resources/keysave-logo-64.png b/resources/keysave-logo-64.png
new file mode 100644
index 00000000..6d359e29
Binary files /dev/null and b/resources/keysave-logo-64.png differ
diff --git a/resources/keysave-logo.icns b/resources/keysave-logo.icns
new file mode 100644
index 00000000..3f7e6997
Binary files /dev/null and b/resources/keysave-logo.icns differ
diff --git a/resources/keysave-logo.ico b/resources/keysave-logo.ico
new file mode 100644
index 00000000..77493827
Binary files /dev/null and b/resources/keysave-logo.ico differ
diff --git a/resources/keysave-logo.idraw b/resources/keysave-logo.idraw
new file mode 100644
index 00000000..cd6d5676
Binary files /dev/null and b/resources/keysave-logo.idraw differ