diff --git a/app/elements/bv-dumper/bv-dumper.js b/app/elements/bv-dumper/bv-dumper.js
index 9485d575..c3b0e0bc 100644
--- a/app/elements/bv-dumper/bv-dumper.js
+++ b/app/elements/bv-dumper/bv-dumper.js
@@ -91,5 +91,5 @@ var fs = require("fs");
         ], BvDumper);
         return BvDumper;
     })(polymer.Base);
-    createElement(BvDumper);
+    polymer.createElement(BvDumper);
 })();
diff --git a/app/elements/bv-dumper/bv-dumper.ts b/app/elements/bv-dumper/bv-dumper.ts
index 00ccc538..8dd6ad16 100644
--- a/app/elements/bv-dumper/bv-dumper.ts
+++ b/app/elements/bv-dumper/bv-dumper.ts
@@ -64,5 +64,5 @@ class BvDumper extends polymer.Base {
         return !val;
     }
 }
-createElement(BvDumper);
+polymer.createElement(BvDumper);
 })()
diff --git a/app/elements/file-input/file-input.js b/app/elements/file-input/file-input.js
index 300930e1..3229834c 100644
--- a/app/elements/file-input/file-input.js
+++ b/app/elements/file-input/file-input.js
@@ -49,5 +49,5 @@ var IpcClient = require("electron-ipc-tunnel/client");
         ], FileInput);
         return FileInput;
     })(polymer.Base);
-    createElement(FileInput);
+    polymer.createElement(FileInput);
 })();
diff --git a/app/elements/file-input/file-input.ts b/app/elements/file-input/file-input.ts
index 0d1f1c3c..91ef03a0 100644
--- a/app/elements/file-input/file-input.ts
+++ b/app/elements/file-input/file-input.ts
@@ -30,5 +30,5 @@ class FileInput extends polymer.Base {
         setTimeout(() => this.ipcClient.send("file-dialog-open"), 350);
     }
 }
-createElement(FileInput);
+polymer.createElement(FileInput);
 })()
diff --git a/app/elements/keysav-options/keysav-options.html b/app/elements/keysav-options/keysav-options.html
index d4c1fe1c..dcf16929 100644
--- a/app/elements/keysav-options/keysav-options.html
+++ b/app/elements/keysav-options/keysav-options.html
@@ -33,7 +33,7 @@
         }
 
         paper-textarea /deep/ textarea {
-            font-family: "Source Code Pro", monospace !important;
+            font-family: "Fira Mono", monospace !important;
             font-size: smaller !important;
             letter-spacing: -1px;
         }
diff --git a/app/elements/keysav-options/keysav-options.js b/app/elements/keysav-options/keysav-options.js
index c706f4d5..9418dc71 100644
--- a/app/elements/keysav-options/keysav-options.js
+++ b/app/elements/keysav-options/keysav-options.js
@@ -125,5 +125,5 @@ var fs = require("fs");
         ], KeysavOptions);
         return KeysavOptions;
     })(polymer.Base);
-    createElement(KeysavOptions);
+    polymer.createElement(KeysavOptions);
 })();
diff --git a/app/elements/keysav-options/keysav-options.ts b/app/elements/keysav-options/keysav-options.ts
index 4d3442ff..76a2f711 100644
--- a/app/elements/keysav-options/keysav-options.ts
+++ b/app/elements/keysav-options/keysav-options.ts
@@ -97,5 +97,5 @@ class KeysavOptions extends polymer.Base {
         this.updateFileBase("file2", oldValue);
     }
 }
-createElement(KeysavOptions);
+polymer.createElement(KeysavOptions);
 })()
diff --git a/app/elements/pkm-list/pkm-list.html b/app/elements/pkm-list/pkm-list.html
index bedf24db..21916fa2 100644
--- a/app/elements/pkm-list/pkm-list.html
+++ b/app/elements/pkm-list/pkm-list.html
@@ -5,7 +5,7 @@
         }
 
         .container {
-            font-family: "Source Code Pro", monospace;
+            font-family: "Fira Mono", monospace;
             font-size: 0.8em;
             white-space: nowrap;
             overflow-x: auto;
diff --git a/app/elements/pkm-list/pkm-list.js b/app/elements/pkm-list/pkm-list.js
index 98e83877..33009eb4 100644
--- a/app/elements/pkm-list/pkm-list.js
+++ b/app/elements/pkm-list/pkm-list.js
@@ -87,5 +87,5 @@ var fs = require("fs");
         ], PkmList);
         return PkmList;
     })(polymer.Base);
-    createElement(PkmList);
+    polymer.createElement(PkmList);
 })();
diff --git a/app/elements/pkm-list/pkm-list.ts b/app/elements/pkm-list/pkm-list.ts
index 7fcf7be8..f39970de 100644
--- a/app/elements/pkm-list/pkm-list.ts
+++ b/app/elements/pkm-list/pkm-list.ts
@@ -60,5 +60,5 @@ class PkmList extends polymer.Base {
         this.template = handlebars.compile(newValue, {knownHelpers: ["box", "column", "row", "speciesName", "natureName", "abilityName", "typeName"]});
     }
 }
-createElement(PkmList);
+polymer.createElement(PkmList);
 })()
diff --git a/app/elements/save-dumper/save-dumper.js b/app/elements/save-dumper/save-dumper.js
index 8c2ce8ca..4ede251b 100644
--- a/app/elements/save-dumper/save-dumper.js
+++ b/app/elements/save-dumper/save-dumper.js
@@ -98,5 +98,5 @@ var fs = require("fs");
         ], SaveDumper);
         return SaveDumper;
     })(polymer.Base);
-    createElement(SaveDumper);
+    polymer.createElement(SaveDumper);
 })();
diff --git a/app/elements/save-dumper/save-dumper.ts b/app/elements/save-dumper/save-dumper.ts
index bcdda742..943a5bdf 100644
--- a/app/elements/save-dumper/save-dumper.ts
+++ b/app/elements/save-dumper/save-dumper.ts
@@ -69,5 +69,5 @@ class SaveDumper extends polymer.Base {
             });
     }
 }
-createElement(SaveDumper);
+polymer.createElement(SaveDumper);
 })()
diff --git a/app/favicon.ico b/app/favicon.ico
deleted file mode 100644
index 4887394f..00000000
Binary files a/app/favicon.ico and /dev/null differ
diff --git a/app/fonts/fira.css b/app/fonts/fira.css
new file mode 100644
index 00000000..02a19ac8
--- /dev/null
+++ b/app/fonts/fira.css
@@ -0,0 +1,161 @@
+/*@font-face{
+    font-family: 'Fira Sans';
+    src: local('Fira Sans Hair'),
+         url('ttf/FiraSans-Hair.ttf') format('truetype');
+    font-weight: 100;
+    font-style: normal;
+}
+
+@font-face{
+    font-family: 'Fira Sans';
+    src: local('Fira Sans Hair Italic'),
+         url('ttf/FiraSans-HairItalic.ttf') format('truetype');
+    font-weight: 100;
+    font-style: italic;
+}
+
+@font-face{
+    font-family: 'Fira Sans';
+    src: local('Fira Sans UltraLight'),
+         url('ttf/FiraSans-UltraLight.ttf') format('truetype');
+    font-weight: 200;
+    font-style: normal;
+}
+
+@font-face{
+    font-family: 'Fira Sans';
+    src: local('Fira Sans UltraLight Italic'),
+         url('ttf/FiraSans-UltraLightItalic.ttf') format('truetype');
+    font-weight: 200;
+    font-style: italic;
+}
+
+@font-face{
+    font-family: 'Fira Sans';
+    src: local('Fira Sans Light'),
+         url('ttf/FiraSans-Light.ttf') format('truetype');
+    font-weight: 300;
+    font-style: normal;
+}
+
+@font-face{
+    font-family: 'Fira Sans';
+    src: local('Fira Sans Light Italic'),
+         url('ttf/FiraSans-LightItalic.ttf') format('truetype');
+    font-weight: 300;
+    font-style: italic;
+}
+
+@font-face{
+    font-family: 'Fira Sans';
+    src: local('Fira Sans Regular'),
+         url('ttf/FiraSans-Regular.ttf') format('truetype');
+    font-weight: 400;
+    font-style: normal;
+}
+
+@font-face{
+    font-family: 'Fira Sans';
+    src: local('Fira Sans Regular Italic'),
+         url('ttf/FiraSans-Italic.ttf') format('truetype');
+    font-weight: 400;
+    font-style: italic;
+}
+
+@font-face{
+    font-family: 'Fira Sans';
+    src: local('Fira Sans Medium'),
+         url('ttf/FiraSans-Medium.ttf') format('truetype');
+    font-weight: 500;
+    font-style: normal;
+}
+
+@font-face{
+    font-family: 'Fira Sans';
+    src: local('Fira Sans Medium Italic'),
+         url('ttf/FiraSans-MediumItalic.ttf') format('truetype');
+    font-weight: 500;
+    font-style: italic;
+}
+
+@font-face{
+    font-family: 'Fira Sans';
+    src: local('Fira Sans SemiBold'),
+         url('ttf/FiraSans-SemiBold.ttf') format('truetype');
+    font-weight: 600;
+    font-style: normal;
+}
+
+@font-face{
+    font-family: 'Fira Sans';
+    src: local('Fira Sans SemiBold Italic'),
+         url('ttf/FiraSans-SemiBoldItalic.ttf') format('truetype');
+    font-weight: 600;
+    font-style: italic;
+}
+
+@font-face{
+    font-family: 'Fira Sans';
+    src: local('Fira Sans Bold'),
+         url('ttf/FiraSans-Bold.ttf') format('truetype');
+    font-weight: 700;
+    font-style: normal;
+}
+
+@font-face{
+    font-family: 'Fira Sans';
+    src: local('Fira Sans Bold Italic'),
+         url('ttf/FiraSans-BoldItalic.ttf') format('truetype');
+    font-weight: 700;
+    font-style: italic;
+}
+
+@font-face{
+    font-family: 'Fira Sans';
+    src: local('Fira Sans ExtraBold'),
+         url('ttf/FiraSans-ExtraBold.ttf') format('truetype');
+    font-weight: 800;
+    font-style: normal;
+}
+
+@font-face{
+    font-family: 'Fira Sans';
+    src: local('Fira Sans ExtraBold Italic'),
+         url('ttf/FiraSans-ExtraBoldItalic.ttf') format('truetype');
+    font-weight: 800;
+    font-style: italic;
+}
+
+@font-face{
+    font-family: 'Fira Sans';
+    src: local('Fira Sans Heavy'),
+         url('ttf/FiraSans-Heavy.ttf') format('truetype');
+    font-weight: 900;
+    font-style: normal;
+}
+
+@font-face{
+    font-family: 'Fira Sans';
+    src: local('Fira Sans Heavy Italic'),
+         url('ttf/FiraSans-HeavyItalic.ttf') format('truetype');
+    font-weight: 900;
+    font-style: italic;
+}*/
+
+
+@font-face{
+    font-family: 'Fira Mono';
+    src: local('Fira Mono'),
+         url('ttf/FiraMono-Regular.ttf') format('truetype');
+    font-weight: 400;
+    font-style: normal;
+}
+
+@font-face{
+    font-family: 'Fira Mono';
+    src: local('Fira Mono Bold'),
+         url('ttf/FiraMono-Bold.ttf') format('truetype');
+    font-weight: 600;
+    font-style: normal;
+}
+
diff --git a/app/fonts/ttf/FiraMono-Bold.ttf b/app/fonts/ttf/FiraMono-Bold.ttf
new file mode 100644
index 00000000..73cbbd68
Binary files /dev/null and b/app/fonts/ttf/FiraMono-Bold.ttf differ
diff --git a/app/fonts/ttf/FiraMono-Medium.ttf b/app/fonts/ttf/FiraMono-Medium.ttf
new file mode 100644
index 00000000..086b036b
Binary files /dev/null and b/app/fonts/ttf/FiraMono-Medium.ttf differ
diff --git a/app/fonts/ttf/FiraMono-Regular.ttf b/app/fonts/ttf/FiraMono-Regular.ttf
new file mode 100644
index 00000000..f24e522c
Binary files /dev/null and b/app/fonts/ttf/FiraMono-Regular.ttf differ
diff --git a/app/images/touch/apple-touch-icon.png b/app/images/touch/apple-touch-icon.png
deleted file mode 100644
index bacf3188..00000000
Binary files a/app/images/touch/apple-touch-icon.png and /dev/null differ
diff --git a/app/images/touch/chrome-touch-icon-192x192.png b/app/images/touch/chrome-touch-icon-192x192.png
deleted file mode 100644
index 6a5e1011..00000000
Binary files a/app/images/touch/chrome-touch-icon-192x192.png and /dev/null differ
diff --git a/app/images/touch/icon-128x128.png b/app/images/touch/icon-128x128.png
deleted file mode 100644
index 43649032..00000000
Binary files a/app/images/touch/icon-128x128.png and /dev/null differ
diff --git a/app/images/touch/ms-icon-144x144.png b/app/images/touch/ms-icon-144x144.png
deleted file mode 100644
index cb9f44ce..00000000
Binary files a/app/images/touch/ms-icon-144x144.png and /dev/null differ
diff --git a/app/images/touch/ms-touch-icon-144x144-precomposed.png b/app/images/touch/ms-touch-icon-144x144-precomposed.png
deleted file mode 100644
index cb9f44ce..00000000
Binary files a/app/images/touch/ms-touch-icon-144x144-precomposed.png and /dev/null differ
diff --git a/app/index.html b/app/index.html
index d8324a8a..c13db1ec 100644
--- a/app/index.html
+++ b/app/index.html
@@ -17,31 +17,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="generator" content="Polymer Starter Kit" />
     <title>KeySAVᵉ</title>
-    <!-- Place favicon.ico in the `app/` directory -->
-
-    <!-- Chrome for Android theme color -->
-    <meta name="theme-color" content="#303F9F">
-
-    <!-- Web Application Manifest -->
-    <link rel="manifest" href="manifest.json">
-
-    <!-- Tile color for Win8 -->
-    <meta name="msapplication-TileColor" content="#3372DF">
-
-    <!-- Add to homescreen for Chrome on Android -->
-    <meta name="mobile-web-app-capable" content="yes">
-    <meta name="application-name" content="PSK">
-    <link rel="icon" sizes="192x192" href="images/touch/chrome-touch-icon-192x192.png">
-
-    <!-- Add to homescreen for Safari on iOS -->
-    <meta name="apple-mobile-web-app-capable" content="yes">
-    <meta name="apple-mobile-web-app-status-bar-style" content="black">
-    <meta name="apple-mobile-web-app-title" content="Polymer Starter Kit">
-    <link rel="apple-touch-icon" href="images/touch/apple-touch-icon.png">
-
-    <!-- Tile icon for Win8 (144x144) -->
-    <meta name="msapplication-TileImage" content="images/touch/ms-touch-icon-144x144-precomposed.png">
-
+    <link rel="stylesheet" href="fonts/fira.css">
     <!-- build:css styles/main.css -->
     <link rel="stylesheet" href="styles/main.css">
     <!-- endbuild-->
@@ -50,6 +26,7 @@
     <script src="bower_components/webcomponentsjs/webcomponents-lite.js"></script>
     <!-- endbuild -->
 
+    <link rel="import" href="bower_components/polymer/polymer.html">
     <script src="bower_components/polymer-ts/polymer-ts.js"></script>
 
     <!-- will be replaced with elements/elements.vulcanized.html -->
diff --git a/app/manifest.json b/app/manifest.json
deleted file mode 100644
index 69ba10f9..00000000
--- a/app/manifest.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "name": "Polymer Starter Kit",
-  "short_name": "Polymer Starter Kit",
-  "icons": [{
-        "src": "images/touch/icon-128x128.png",
-        "sizes": "128x128",
-        "type": "image/png"
-      }, {
-        "src": "images/touch/apple-touch-icon.png",
-        "sizes": "152x152",
-        "type": "image/png"
-      }, {
-        "src": "images/touch/ms-touch-icon-144x144-precomposed.png",
-        "sizes": "144x144",
-        "type": "image/png"
-      }, {
-        "src": "images/touch/chrome-touch-icon-192x192.png",
-        "sizes": "192x192",
-        "type": "image/png"
-      }],
-  "start_url": "/#!/",
-  "display": "standalone"
-}
diff --git a/app/precache.json b/app/precache.json
deleted file mode 100644
index fe51488c..00000000
--- a/app/precache.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
diff --git a/app/robots.txt b/app/robots.txt
deleted file mode 100644
index 5a2d9d7b..00000000
--- a/app/robots.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-# www.robotstxt.org
-
-User-agent: *
-Disallow:
diff --git a/app/sw-import.js b/app/sw-import.js
deleted file mode 100644
index cb7fb1f9..00000000
--- a/app/sw-import.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
-Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
-*/
-
-importScripts('bower_components/platinum-sw/service-worker.js');
diff --git a/app/test/index.html b/app/test/index.html
deleted file mode 100644
index 69817504..00000000
--- a/app/test/index.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!doctype html>
-<!--
-@license
-Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
--->
-
-<html>
-
-  <head>
-    <meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
-    <title>Elements Test Runner</title>
-    <meta charset="UTF-8">
-
-    <script src="../../bower_components/webcomponentsjs/webcomponents.min.js"></script>
-    <script src="../../bower_components/web-component-tester/browser.js"></script>
-  </head>
-
-  <body>
-
-    <script>
-      WCT.loadSuites(['my-greeting-basic.html', 'my-list-basic.html']);
-    </script>
-
-
-  </body>
-
-</html>
diff --git a/app/test/my-greeting-basic.html b/app/test/my-greeting-basic.html
deleted file mode 100644
index eedfaf8a..00000000
--- a/app/test/my-greeting-basic.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!doctype html>
-<!--
-@license
-Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
--->
-
-<html>
-<head>
-  <meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
-  <title>my-greeting-basic</title>
-
-  <script src="../../bower_components/webcomponentsjs/webcomponents.min.js"></script>
-  <link rel="import" href="../../bower_components/polymer/polymer.html">
-  <script src="../../bower_components/web-component-tester/browser.js"></script>
-  <script src="../../bower_components/test-fixture/test-fixture-mocha.js"></script>
-  <link rel="import" href="../../bower_components/test-fixture/test-fixture.html">
-
-  <!-- Import the element to test -->
-  <link rel="import" href="../elements/my-greeting/my-greeting.html">
-
-</head>
-<body>
-
-  <test-fixture id="basic">
-    <template>
-      <my-greeting></my-greeting>
-    </template>
-  </test-fixture>
-
-  <script>
-
-    suite('my-greeting tests', function() {
-      var greeting, header;
-
-      setup(function() {
-        greeting = fixture('basic');
-      });
-
-      test('Welcome!', function() {
-        header = greeting.querySelector('h1');
-        assert.equal(header.textContent, 'Welcome!');
-      });
-
-    });
-  </script>
-
-</body>
-</html>
diff --git a/app/test/my-list-basic.html b/app/test/my-list-basic.html
deleted file mode 100644
index a59deade..00000000
--- a/app/test/my-list-basic.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<!doctype html>
-<!--
-@license
-Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
--->
-
-<html>
-<head>
-  <meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
-  <title>my-list-basic</title>
-
-  <script src="../../bower_components/webcomponentsjs/webcomponents.min.js"></script>
-  <link rel="import" href="../../bower_components/polymer/polymer.html">
-  <script src="../../bower_components/web-component-tester/browser.js"></script>
-  <script src="../../bower_components/test-fixture/test-fixture-mocha.js"></script>
-  <link rel="import" href="../../bower_components/test-fixture/test-fixture.html">
-
-  <!-- Import the element to test -->
-  <link rel="import" href="../elements/my-list/my-list.html">
-
-</head>
-<body>
-
-  <test-fixture id="basic">
-    <template>
-       <my-list></my-list>
-    </template>
-  </test-fixture>
-
-  <script>
-    suite('my-list tests', function() {
-      var list, listItems;
-
-      setup(function() {
-        list = fixture('basic');
-      });
-
-      test('Item lengths should be equalled', function(done) {
-        // Test a property
-        // TODO: Fix list.items.push('Foo') causing a WeakMap exception
-        // Invalid value used as weak map key
-        list.items = [
-            'Responsive Web App boilerplate',
-            'Iron Elements and Paper Elements',
-            'End-to-end Build Tooling (including Vulcanize)',
-            'Unit testing with Web Component Tester',
-            'Routing with Page.js',
-            'Offline support with the Platinum Service Worker Elements'
-            ];
-
-        // Data bindings will stamp out new DOM asynchronously
-        // so wait to check for updates
-        flush(function() {
-          listItems = list.querySelectorAll('li');
-          assert.equal(list.items.length, listItems.length);
-          done();
-        });
-      })
-    });
-  </script>
-
-</body>
-</html>
diff --git a/bower.json b/bower.json
index b0d0fb7d..e701c886 100644
--- a/bower.json
+++ b/bower.json
@@ -16,7 +16,8 @@
     "iron-elements": "PolymerElements/iron-elements#1.0.0",
     "paper-elements": "PolymerElements/paper-elements#1.0.1",
     "platinum-elements": "PolymerElements/platinum-elements#1.0.1",
-    "neon-elements": "PolymerElements/neon-elements#1.0.0"
+    "neon-elements": "PolymerElements/neon-elements#1.0.0",
+    "polymer-ts": "~0.1.7"
   },
   "devDependencies": {
     "web-component-tester": "*",