diff --git a/rpg-docs/.meteor/packages b/rpg-docs/.meteor/packages
index b23d4b1f..c2305b10 100644
--- a/rpg-docs/.meteor/packages
+++ b/rpg-docs/.meteor/packages
@@ -3,7 +3,6 @@
 # 'meteor add' and 'meteor remove' will edit this file for you,
 # but you can also edit it by hand.
 
-thaum:vulcanize
 iron:router
 accounts-password@1.3.3
 accounts-ui@1.1.9
diff --git a/rpg-docs/.meteor/versions b/rpg-docs/.meteor/versions
index 1598e049..7bdf3093 100644
--- a/rpg-docs/.meteor/versions
+++ b/rpg-docs/.meteor/versions
@@ -110,7 +110,6 @@ spacebars@1.0.13
 spacebars-compiler@1.0.13
 splendido:accounts-emails-field@1.2.0
 splendido:accounts-meld@1.3.1
-thaum:vulcanize@2.2.0
 srp@1.0.10
 standard-minifier-js@1.2.1
 templating@1.2.15
diff --git a/rpg-docs/Routes/Routes.js b/rpg-docs/Routes/Routes.js
index f3fe9fdd..14f64014 100644
--- a/rpg-docs/Routes/Routes.js
+++ b/rpg-docs/Routes/Routes.js
@@ -21,6 +21,14 @@ Router.map(function() {
 		},
 	});
 
+	this.route("testContent", {
+		path: "/test",
+		onAfterAction: function() {
+			document.title = appName;
+		},
+		layoutTemplate: "testLayout",
+	});
+
 	this.route("characterList", {
 		path: "/characterList",
 		waitOn: function(){
diff --git a/rpg-docs/bower.json b/rpg-docs/bower.json
index 73e21394..fa6aa300 100644
--- a/rpg-docs/bower.json
+++ b/rpg-docs/bower.json
@@ -15,10 +15,13 @@
     "tests"
   ],
   "dependencies": {
-    "paper-elements": "PolymerElements/paper-elements#~1.0.7",
-    "iron-elements": "PolymerElements/iron-elements#~1.0.10",
-    "marked-element": "PolymerElements/marked-element#~1.2.0",
-    "app-layout": "PolymerElements/app-layout#~0.10.4"
+    "polymer": "Polymer/polymer#^1.0.0",
+    "iron-elements": "PolymerElements/iron-elements#^1.0.0",
+    "platinum-elements": "PolymerElements/platinum-elements#^1.0.1",
+    "neon-elements": "PolymerElements/neon-elements#^1.0.0",
+    "paper-elements": "PolymerElements/paper-elements#^1.0.7",
+    "app-elements": "PolymerElements/app-elements#^0.10.1",
+    "marked-element": "PolymerElements/marked-element#^1.2.0"
   },
   "resolutions": {
     "webcomponentsjs": "0.7.23"
diff --git a/rpg-docs/client/views/layout/layout.html b/rpg-docs/client/views/layout/layout.html
index d966d54a..605b107e 100644
--- a/rpg-docs/client/views/layout/layout.html
+++ b/rpg-docs/client/views/layout/layout.html
@@ -1,33 +1,47 @@
 <template name="layout">
-	<core-drawer-panel class="layout" responsiveWidth="905px" disableSwipe>
-		<core-header-panel drawer navigation flex mode="seamed" class="white">
-			<div id="accountSummary">
-				{{#if currentUser}}
-					<div id="profileLink"
-						 style="text-decoration: underline; cursor: pointer; font-size: 16px;">
-						{{profileLink}}
-					</div>
-				{{else}}
-					<a href="/sign-in" style="color: white;">Sign in</a>
-				{{/if}}
-			</div>
-			<div id="navPanel">
-				<core-item id="homeNav" icon="home" label="Home"></core-item>
-				{{> characterSideList}}
-				<core-item id="guide" icon="social:school" label="Guide"></core-item>
-				<core-item id="feedback" icon="bug-report" label="Send Feedback"></core-item>
-				<core-item id="changeLog" icon="list" label="Change Log"></core-item>
-			</div>
-		</core-header-panel>
-		<core-animated-pages main
+	<app-drawer-layout class="layout" responsiveWidth="905px" fullbleed>
+		<app-drawer>
+			<app-header-layout mode="seamed" class="white">
+				<div id="accountSummary">
+					{{#if currentUser}}
+						<div id="profileLink"
+							 style="text-decoration: underline; cursor: pointer; font-size: 16px;">
+							{{profileLink}}
+						</div>
+					{{else}}
+						<a href="/sign-in" style="color: white;">Sign in</a>
+					{{/if}}
+				</div>
+				<div id="navPanel">
+					<paper-icon-item id="homeNav" icon="home">
+						<iron-icon icon="home" item-icon></iron-icon>
+						Home
+					</paper-icon-item>
+					{{> characterSideList}}
+					<paper-icon-item id="guide">
+						<iron-icon icon="social:school" item-icon></iron-icon>
+						Guide
+					</paper-icon-item>
+					<paper-icon-item id="feedback">
+						<iron-icon icon="bug-report" item-icon></iron-icon>
+						Send Feedback
+					</paper-icon-item>
+					<paper-icon-item id="changeLog">
+						<iron-icon icon="list" item-icon></iron-icon>
+						Change Log
+					</paper-icon-item>
+				</div>
+			</app-header-layout>
+		</app-drawer>
+		<neon-animated-pages class="fit"
 							 navigation
 							 detail-pages
 							 transitions="hero-transition cross-fade"
 							 selected={{globalDetailSelected}}>
 			<section id="mainContentSection" class={{notSelected}}>
-				<core-header-panel fit mode="standard">
+				<app-header-layout fullbleed>
 					{{> yield}}
-				</core-header-panel>
+				</app-header-layout>
 				<div>
 					<div id="fadeDummy" cross-fade></div>
 				</div>
@@ -35,27 +49,26 @@
 			<section id="detailSection">
 				<div id="detailScreenFiller">
 					<div id="screenDim" cross-fade></div>
-					<paper-shadow id="globalDetail" class="card" z="5"
+					<paper-material id="globalDetail" class="card" z="5"
 								  animated hero hero-id="main"
 								  layout vertical>
 						{{#if globalDetailTemplate}}
 							{{> UI.dynamic template=globalDetailTemplate data=globalDetailData}}
 						{{/if}}
-					</paper-shadow>
+					</paper-material>
 				</div>
 			</section>
-		</core-animated-pages>
-	</core-drawer-panel>
+		</neon-animated-pages>
+	</app-drawer-layout>
 
-	<paper-action-dialog global-dialog backdrop
-						 transition="core-transition-center"
+	<paper-dialog global-dialog backdrop
 						 class="scrolling {{#if globalDialogFullOnMobile}}full-on-mobile{{/if}}"
 						 heading={{globalDialogHeader}}
 						 layered>
 		{{#if globalDialogTemplate}}
 			{{> UI.dynamic template=globalDialogTemplate data=globalDialogData}}
 		{{/if}}
-	</paper-action-dialog>
+	</paper-dialog>
 
 	<paper-toast global-toast duration="5000">
 		{{#if globalToastTemplate}}
diff --git a/rpg-docs/client/views/layout/layout.js b/rpg-docs/client/views/layout/layout.js
index bc49e5b5..bad9c551 100644
--- a/rpg-docs/client/views/layout/layout.js
+++ b/rpg-docs/client/views/layout/layout.js
@@ -20,14 +20,22 @@ Template.layout.helpers({
 	},
 });
 
+let drawerLayout;
+const closeDrawer = function(instance){
+	if (!drawerLayout) drawerLayout = instance.find("app-drawer-layout");
+	if (drawerLayout && drawerLayout.narrow){
+		drawerLayout.drawer.close();
+	}
+}
+
 Template.layout.events({
 	"tap #homeNav": function(event, instance){
 		Router.go("/");
-		instance.find("core-drawer-panel").closeDrawer();
+		closeDrawer(instance);
 	},
 	"tap #profileLink": function(event, instance){
 		Router.go("profile");
-		instance.find("core-drawer-panel").closeDrawer();
+		closeDrawer(instance);
 	},
 	"tap #feedback": function(event, instance) {
 		GlobalUI.showDialog({
@@ -35,14 +43,14 @@ Template.layout.events({
 			template: "feedback",
 			fullOnMobile: true,
 		});
-		instance.find("core-drawer-panel").closeDrawer();
+		closeDrawer(instance);
 	},
 	"tap #changeLog": function(event, instance) {
 		Router.go("changeLog");
-		instance.find("core-drawer-panel").closeDrawer();
+		closeDrawer(instance);
 	},
 	"tap #guide": function(event, instance) {
 		Router.go("guide");
-		instance.find("core-drawer-panel").closeDrawer();
+		closeDrawer(instance);
 	},
 });
diff --git a/rpg-docs/client/views/layout/polymer.imports.html b/rpg-docs/client/views/layout/polymer.imports.html
deleted file mode 100644
index c4d3a6cc..00000000
--- a/rpg-docs/client/views/layout/polymer.imports.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--core components-->
-<link rel="import" href="/components/core-animated-pages/core-animated-pages.html">
-<link rel="import" href="/components/core-animated-pages/transitions/cross-fade.html">
-<link rel="import" href="/components/core-animated-pages/transitions/hero-transition.html">
-<link rel="import" href="/components/core-animated-pages/transitions/slide-from-right.html">
-<link rel="import" href="/components/core-icons/av-icons.html">
-<link rel="import" href="/components/core-icons/core-icons.html">
-<link rel="import" href="/components/core-icons/editor-icons.html">
-<link rel="import" href="/components/core-icons/image-icons.html">
-<link rel="import" href="/components/core-icons/social-icons.html">
-<link rel="import" href="/components/core-image/core-image.html">
-<link rel="import" href="/components/core-item/core-item.html">
-<link rel="import" href="/components/core-menu/core-menu.html">
-<link rel="import" href="/components/core-scaffold/core-scaffold.html">
-<link rel="import" href="/components/core-transition/core-transition.html">
-
-<!--paper components-->
-<link rel="import" href="/components/paper-button/paper-button.html">
-<link rel="import" href="/components/paper-checkbox/paper-checkbox.html">
-<link rel="import" href="/components/paper-dialog/paper-action-dialog.html">
-<link rel="import" href="/components/paper-dialog/paper-dialog.html">
-<link rel="import" href="/components/paper-dialog/paper-dialog-transition.html">
-<link rel="import" href="/components/paper-fab/paper-fab.html">
-<link rel="import" href="/components/paper-fab-menu/paper-fab-menu.html">
-<link rel="import" href="/components/paper-icon-button/paper-icon-button.html">
-<link rel="import" href="/components/paper-input/paper-autogrow-textarea.html">
-<link rel="import" href="/components/paper-input/paper-input.html">
-<link rel="import" href="/components/paper-input/paper-input-decorator.html">
-<link rel="import" href="/components/paper-item/paper-item.html">
-<link rel="import" href="/components/paper-menu-button/paper-menu-button.html">
-<link rel="import" href="/components/paper-radio-button/paper-radio-button.html">
-<link rel="import" href="/components/paper-radio-group/paper-radio-group.html">
-<link rel="import" href="/components/paper-shadow/paper-shadow.html">
-<link rel="import" href="/components/paper-spinner/paper-spinner.html">
-<link rel="import" href="/components/paper-slider/paper-slider.html">
-<link rel="import" href="/components/paper-tabs/paper-tabs.html">
-<link rel="import" href="/components/paper-toast/paper-toast.html">
-<link rel="import" href="/components/paper-toggle-button/paper-toggle-button.html">
-
-<!--custom components-->
-<link rel="import" href="/custom_components/paper-dropdown-menu/paper-dropdown-menu.html">
-<link rel="import" href="/custom_components/paper-dropdown/paper-dropdown.html">
-<link rel="import" href="/custom_components/paper-diff-slider/paper-diff-slider.html">
diff --git a/rpg-docs/client/views/layout/polymerImports.html b/rpg-docs/client/views/layout/polymerImports.html
new file mode 100644
index 00000000..c362fa8b
--- /dev/null
+++ b/rpg-docs/client/views/layout/polymerImports.html
@@ -0,0 +1,36 @@
+<head>
+	<script>
+		/* this script must run before Polymer is imported */
+		window.Polymer = {
+		  dom: 'shadow',
+		  lazyRegister: true
+		};
+	</script>
+	<link rel="import" href="/components/app-layout/app-layout.html">
+
+	<link rel="import" href="/components/iron-icon/iron-icon.html">
+<!--<link rel="import" href="/components/iron-icons/av-icons.html">-->
+<!--<link rel="import" href="/components/iron-icons/communication-icons.html">-->
+<!--<link rel="import" href="/components/iron-icons/device-icons.html">-->
+<!--<link rel="import" href="/components/iron-icons/editor-icons.html">-->
+<!--<link rel="import" href="/components/iron-icons/hardware-icons.html">-->
+<!--<link rel="import" href="/components/iron-icons/image-icons.html">-->
+	<link rel="import" href="/components/iron-icons/iron-icons.html">
+<!--<link rel="import" href="/components/iron-icons/maps-icons.html">-->
+<!--<link rel="import" href="/components/iron-icons/notification-icons.html">-->
+<!--<link rel="import" href="/components/iron-icons/places-icons.html">-->
+	<link rel="import" href="/components/iron-icons/social-icons.html">
+
+	<link rel="import" href="/components/neon-animation/neon-animation.html">
+	<link rel="import" href="/components/neon-animation/neon-animations.html">
+
+	<link rel="import" href="/components/paper-dialog/paper-dialog.html">
+	<link rel="import" href="/components/paper-icon-button/paper-icon-button.html">
+	<link rel="import" href="/components/paper-item/all-imports.html">
+	<link rel="import" href="/components/paper-material/paper-material.html">
+	<link rel="import" href="/components/paper-menu-button/paper-menu-button.html">
+	<link rel="import" href="/components/paper-tabs/paper-tabs.html">
+	<link rel="import" href="/components/paper-toast/paper-toast.html">
+
+	<link rel="import" href="/custom_components/app-theme.html">
+</head>
diff --git a/rpg-docs/client/views/layout/testLayout.html b/rpg-docs/client/views/layout/testLayout.html
new file mode 100644
index 00000000..633c870a
--- /dev/null
+++ b/rpg-docs/client/views/layout/testLayout.html
@@ -0,0 +1,11 @@
+<template name="testLayout">
+	<app-drawer-layout class="layout fit" responsiveWidth="905px">
+		<app-drawer>
+			<app-header-layout mode="seamed" class="white">
+			</app-header-layout>
+		</app-drawer>
+		<div>
+			{{> yield}}
+		</div>
+	</app-drawer-layout>
+</template>
diff --git a/rpg-docs/client/views/private/GeneralCSS/globalDetail.css b/rpg-docs/client/views/private/GeneralCSS/globalDetail.css
index 30196b18..01129045 100644
--- a/rpg-docs/client/views/private/GeneralCSS/globalDetail.css
+++ b/rpg-docs/client/views/private/GeneralCSS/globalDetail.css
@@ -42,12 +42,12 @@ html /deep/ .red-button:not([disabled]) {
 	border-radius: 2px;
 }
 
-#globalDetail core-toolbar {
+#globalDetail app-toolbar {
 	border-radius: 2px 2px 0 0;
 }
 
 @media (max-width: 640px) {
-	#globalDetail core-toolbar {
+	#globalDetail app-toolbar {
 		border-radius: 0;
 	}
 }
diff --git a/rpg-docs/client/views/private/character/characterSheet.css b/rpg-docs/client/views/private/character/characterSheet.css
index 9816e965..b44b8881 100644
--- a/rpg-docs/client/views/private/character/characterSheet.css
+++ b/rpg-docs/client/views/private/character/characterSheet.css
@@ -1,8 +1,8 @@
-paper-tabs, core-toolbar {
+paper-tabs, app-toolbar {
 	box-shadow: 0px 3px 2px rgba(0, 0, 0, 0.2);
 }
 
-core-toolbar paper-tabs {
+app-toolbar paper-tabs {
 	box-shadow: none;
 }
 
@@ -23,6 +23,6 @@ paper-tabs.transparent-brown {
 	box-shadow: none;
 }
 
-core-toolbar.medium-tall {
+app-toolbar.medium-tall {
 	height: 108px;
 }
diff --git a/rpg-docs/client/views/private/character/characterSheet.html b/rpg-docs/client/views/private/character/characterSheet.html
index 2a0331e4..1f1bcedc 100644
--- a/rpg-docs/client/views/private/character/characterSheet.html
+++ b/rpg-docs/client/views/private/character/characterSheet.html
@@ -1,54 +1,54 @@
 <template name="characterSheet">
-	<!--<div tool horizontal layout flex end-justified class="bottom">Title-bottom</div>-->
-	<core-toolbar class="medium-tall {{colorClass}}">
-		<core-icon-button icon="menu" core-drawer-toggle></core-icon-button>
-		<div flex>
-			{{name}}
-		</div>
-		{{#if canEditCharacter _id}}
-			<div>
-				{{> colorDropdown}}
+	<app-header>
+		<app-toolbar class="medium-tall {{colorClass}}">
+			<paper-icon-button icon="menu" drawer-toggle top-item></paper-icon-button>
+			<div class="flex" top-item>
+				{{name}}
 			</div>
-			<paper-menu-button>
-				<paper-icon-button icon="more-vert" noink></paper-icon-button>
-				<paper-dropdown class="dropdown" halign="right">
-					<core-menu class="menu" style="color: black; color: rgba(0,0,0,0.87);">
-						<paper-item id="deleteCharacter">
-							<core-icon icon="delete"></core-icon>Delete
-						</paper-item>
-						<paper-item id="shareCharacter">
-							<core-icon icon="social:share"></core-icon>Share
-						</paper-item>
-						<paper-item id="characterSettings">
-							<core-icon icon="settings"></core-icon>Settings
-						</paper-item>
-					</core-menu>
-				</paper-dropdown>
-			</paper-menu-button>
-		{{/if}}
-		<div class="bottom fit" horizontal layout>
-			<paper-tabs flex horizontal center layout id="characterSheetTabs" selected={{selectedTab}} class="{{colorClass}}">
-				<paper-tab name="stats">Stats</paper-tab>
-				<paper-tab name="features">Features</paper-tab>
-				<paper-tab name="inventory">Inventory</paper-tab>
-				{{#unless hideSpellcasting}}
-				<paper-tab name="spells">Spells</paper-tab>
-				{{/unless}}
-				<paper-tab name="persona">Persona</paper-tab>
-				<paper-tab name="journal">Journal</paper-tab>
-			</paper-tabs>
-		</div>
-	</core-toolbar>
-	<div fit>
-		<core-animated-pages id="tabPages" selected={{selectedTab}} transitions="slide-from-right" fit>
-			<section flex name="stats">{{> stats}}</section>
-			<section flex name="features">{{> features}}</section>
-			<section flex name="inventory">{{> inventory}}</section>
+			{{#if canEditCharacter _id}}
+				{{> colorDropdown}}
+				<paper-menu-button top-item>
+					<paper-icon-button icon="more-vert"  class="dropdown-trigger"></paper-icon-button>
+					<paper-menu class="dropdown-content" halign="right">
+						<paper-icon-item id="deleteCharacter">
+							<iron-icon icon="delete" item-icon></iron-icon>
+							Delete
+						</paper-icon-item>
+						<paper-icon-item id="shareCharacter">
+							<iron-icon icon="social:share" item-icon></iron-icon>
+							Share
+						</paper-icon-item>
+						<paper-icon-item id="characterSettings">
+							<iron-icon icon="settings" item-icon></iron-icon>
+							Settings
+						</paper-icon-item>
+					</paper-menu>
+				</paper-menu-button>
+			{{/if}}
+			<div bottom-item>
+				<paper-tabs id="characterSheetTabs" selected={{selectedTab}} class="{{colorClass}}" attr-for-selected="name">
+					<paper-tab name="stats">Stats</paper-tab>
+					<paper-tab name="features">Features</paper-tab>
+					<paper-tab name="inventory">Inventory</paper-tab>
+					{{#unless hideSpellcasting}}
+					<paper-tab name="spells">Spells</paper-tab>
+					{{/unless}}
+					<paper-tab name="persona">Persona</paper-tab>
+					<paper-tab name="journal">Journal</paper-tab>
+				</paper-tabs>
+			</div>
+		</app-toolbar>
+	</app-header>
+	<div>
+		<neon-animated-pages id="tabPages" selected={{selectedTab}} transitions="slide-from-right" attr-for-selected="name">
+			<div name="stats">{{> stats}}</div>
+			<div name="features">{{> features}}</div>
+			<div name="inventory">{{> inventory}}</div>
 			{{#unless hideSpellcasting}}
-			<section flex name="spells">{{> spells}}</section>
+			<div name="spells">{{> spells}}</div>
 			{{/unless}}
-			<section flex name="persona">{{> persona}}</section>
-			<section flex name="journal">{{> journal}}</section>
-		</core-animated-pages>
+			<div name="persona">{{> persona}}</div>
+			<div name="journal">{{> journal}}</div>
+		</neon-animated-pages>
 	</div>
 </template>
diff --git a/rpg-docs/client/views/private/character/characterSheet.js b/rpg-docs/client/views/private/character/characterSheet.js
index 4e7681b9..61cb4a7d 100644
--- a/rpg-docs/client/views/private/character/characterSheet.js
+++ b/rpg-docs/client/views/private/character/characterSheet.js
@@ -1,4 +1,4 @@
-Template.characterSheet.onCreated(function() {
+Template.characterSheet.onRendered(function() {
 	//default to the first tab
 	Session.setDefault(this.data._id + ".selectedTab", "stats");
 	//watch this character and make sure their encumbrance is updated
@@ -24,11 +24,8 @@ Template.characterSheet.helpers({
 });
 
 Template.characterSheet.events({
-	"core-animated-pages-transition-end #tabPages": function(event) {
-		event.stopPropagation();
-	},
-	"tap #characterSheetTabs paper-tab": function(event, instance){
-		setTab(this._id, event.currentTarget.getAttribute("name"));
+	"iron-select #characterSheetTabs": function(event, instance){
+		setTab(this._id, event.target.selected);
 	},
 	"color-change": function(event, instance){
 		Characters.update(this._id, {$set: {color: event.color}});
diff --git a/rpg-docs/client/views/private/character/features/features.css b/rpg-docs/client/views/private/character/features/features.css
index 1b7bcce6..02c189b9 100644
--- a/rpg-docs/client/views/private/character/features/features.css
+++ b/rpg-docs/client/views/private/character/features/features.css
@@ -18,7 +18,7 @@
 	white-space: pre-line;
 }
 
-.resourceCards paper-shadow.healthCard {
+.resourceCards paper-material.healthCard {
 	width: 100%;
 }
 
diff --git a/rpg-docs/client/views/private/character/features/features.html b/rpg-docs/client/views/private/character/features/features.html
index 2eb7b57b..55b4191e 100644
--- a/rpg-docs/client/views/private/character/features/features.html
+++ b/rpg-docs/client/views/private/character/features/features.html
@@ -15,7 +15,7 @@
 
 				<!--Attacks-->
 				<div>
-				<paper-shadow class="card">
+				<paper-material class="card">
 					<div class="top white">
 						Attacks
 					</div>
@@ -48,12 +48,12 @@
 							</div>
 						{{/each}}
 					</div>
-				</paper-shadow>
+				</paper-material>
 				</div>
 
 				<!--Proficiencies-->
 				<div>
-				<paper-shadow class="card">
+				<paper-material class="card">
 					<div class="white top">
 						Proficiencies
 					</div>
@@ -77,13 +77,13 @@
 							{{> proficiencyListItem}}
 						{{/each}}
 					</div>
-				</paper-shadow>
+				</paper-material>
 				</div>
 
 				<!--features-->
 				{{#each features}}
 					<div>
-					<paper-shadow class="card featureCard"
+					<paper-material class="card featureCard"
 								  hero-id="main" {{detailHero}}>
 						<div class="top {{colorClass}} subhead"
 							 layout horizontal
@@ -123,7 +123,7 @@
 								</paper-button>
 							</div>
 						{{/if}}
-					</paper-shadow>
+					</paper-material>
 					</div>
 				{{/each}}
 			</div>
@@ -145,7 +145,7 @@
 <template name="resource">
 	{{#if characterCalculate "attributeBase" char._id name}}
 	<div>
-		<paper-shadow class="card"
+		<paper-material class="card"
 					  hero-id="main" {{detailHero name char._id}}
 					  layout horizontal>
 			<div class="left {{getColor}} display1 white-text"
@@ -168,7 +168,7 @@
 				 flex layout horizontal center>
 				{{title}}
 			</div>
-		</paper-shadow>
+		</paper-material>
 	</div>
 	{{/if}}
 </template>
diff --git a/rpg-docs/client/views/private/character/inventory/inventory.html b/rpg-docs/client/views/private/character/inventory/inventory.html
index 55647237..9ce85570 100644
--- a/rpg-docs/client/views/private/character/inventory/inventory.html
+++ b/rpg-docs/client/views/private/character/inventory/inventory.html
@@ -4,7 +4,7 @@
 			<div class="column-container">
 				<!--Net Worth-->
 				<div>
-				<paper-shadow class="card">
+				<paper-material class="card">
 					<div class="white top" layout horizontal center>
 						<div class="subhead" flex>
 							Net Worth
@@ -13,11 +13,11 @@
 							{{valueString netWorth}}
 						</div>
 					</div>
-				</paper-shadow>
+				</paper-material>
 				</div>
 				<!--Weight Carried-->
 				<div>
-				<paper-shadow class="card"
+				<paper-material class="card"
 							  hero-id="main" {{detailHero "weightCarried" _id}}>
 					<div class="top green white-text weightCarried"
 						 hero-id="toolbar" {{detailHero "weightCarried" _id}}
@@ -40,9 +40,9 @@
 								 hero-id="main" {{detailHero}}
 								 layout horizontal center>
 								<div flex>
-									<core-icon icon="work"
+									<iron-icon icon="work"
 											   style="margin-right: 16px">
-									</core-icon>
+									</iron-icon>
 									{{name}}
 								</div>
 							</div>
@@ -50,11 +50,11 @@
 						{{/each}}
 					</div>
 					{{/if}}
-				</paper-shadow>
+				</paper-material>
 				</div>
 				<!--Equipment-->
 				<div>
-				<paper-shadow class="card equipmentContainer">
+				<paper-material class="card equipmentContainer">
 					<div class="white top" layout horizontal center>
 						<div class="subhead" flex>
 							Equipment
@@ -80,11 +80,11 @@
 							{{>inventoryItem}}
 						{{/each}}
 					</div>
-				</paper-shadow>
+				</paper-material>
 				</div>
 				<!--Carried Items-->
 				<div>
-				<paper-shadow class="card carriedContainer">
+				<paper-material class="card carriedContainer">
 					<div class="white top" layout horizontal center>
 						<div class="subhead" flex>
 							Carried
@@ -101,11 +101,11 @@
 							{{>inventoryItem}}
 						{{/each}}
 					</div>
-				</paper-shadow>
+				</paper-material>
 				</div>
 				{{#each containers}}
 					<div>
-					<paper-shadow class="card itemContainer"
+					<paper-material class="card itemContainer"
 								  hero-id="main" {{detailHero}}>
 						<div class="top {{colorClass}}"
 							 hero-id="toolbar" {{detailHero}}
@@ -132,7 +132,7 @@
 								{{>inventoryItem}}
 							{{/each}}
 						</div>
-					</paper-shadow>
+					</paper-material>
 					</div>
 				{{/each}}
 			</div>
diff --git a/rpg-docs/client/views/private/character/inventory/moveItemDialog/moveItemDialog.html b/rpg-docs/client/views/private/character/inventory/moveItemDialog/moveItemDialog.html
index d11cfa41..80ee29ea 100644
--- a/rpg-docs/client/views/private/character/inventory/moveItemDialog/moveItemDialog.html
+++ b/rpg-docs/client/views/private/character/inventory/moveItemDialog/moveItemDialog.html
@@ -21,10 +21,10 @@
 					{{#each containers}}
 						<paper-item name={{_id}}
 									layout horizontal center>
-							<core-icon icon="image:brightness-1"
+							<iron-icon icon="image:brightness-1"
 									   style="color: {{hexColor color}};
 											  margin-right: 16px;">
-							</core-icon>
+							</iron-icon>
 							<div>{{name}}</div>
 						</paper-item>
 					{{/each}}
diff --git a/rpg-docs/client/views/private/character/journal/journal.html b/rpg-docs/client/views/private/character/journal/journal.html
index 7a1fe7bf..f6c09d38 100644
--- a/rpg-docs/client/views/private/character/journal/journal.html
+++ b/rpg-docs/client/views/private/character/journal/journal.html
@@ -3,7 +3,7 @@
 		<div id="journal" class="scroll-y" fit>
 			<div class="column-container">
 				<!--Experience Table-->
-				<div><paper-shadow class="card experiencesCard"
+				<div><paper-material class="card experiencesCard"
 							  hero-id="main" {{detailHero}}>
 					<div class="top white subhead"
 						 hero-id="toolbar" {{detailHero}}
@@ -37,9 +37,9 @@
 							</paper-button>
 						</div>
 					{{/if}}
-				</paper-shadow></div>
+				</paper-material></div>
 				<!--Class Table-->
-				<div><paper-shadow class="card"
+				<div><paper-material class="card"
 							  hero-id="main" {{detailHero}}>
 					<div class="white top"
 						 hero-id="toolbar" {{detailHero}}
@@ -78,18 +78,18 @@
 							</div>
 						{{/each}}
 					</div>
-				</paper-shadow></div>
+				</paper-material></div>
 				<!--Notes-->
 				{{#each notes}}
 				<div>
-					<paper-shadow class="card"  hero-id="main" {{detailHero}}>
+					<paper-material class="card"  hero-id="main" {{detailHero}}>
 						<div class="top {{colorClass}} noteTop subhead"
 							 hero-id="toolbar" {{detailHero}}
 							 layout horizontal center>
 							{{name}}
 						</div>
 						<div class="bottom">{{#markdown}}{{description}}{{/markdown}}</div>
-					</paper-shadow>
+					</paper-material>
 				</div>
 				{{/each}}
 			</div>
diff --git a/rpg-docs/client/views/private/character/persona/persona.html b/rpg-docs/client/views/private/character/persona/persona.html
index 748e9051..3f74e0b9 100644
--- a/rpg-docs/client/views/private/character/persona/persona.html
+++ b/rpg-docs/client/views/private/character/persona/persona.html
@@ -4,7 +4,7 @@
 			<div class="column-container">
 				{{#with characterDetails}}
 				<div>
-					<paper-shadow class="card"
+					<paper-material class="card"
 								  hero-id="main" {{detailHero "details" _id}}>
 						{{#unless picture}}
 							<div class="top subhead characterField {{colorClass}}"
@@ -32,7 +32,7 @@
 								{{alignment}} {{gender}} {{race}}
 							</div>
 						</div>
-					</paper-shadow>
+					</paper-material>
 				</div>
 				{{/with}}
 				<div>{{> containerCard characterField "description" "Description"}}</div>
@@ -42,7 +42,7 @@
 				<div>{{> containerCard characterField "flaws" "Flaws"}}</div>
 				<div>{{> containerCard characterField "backstory" "Background"}}</div>
 				<div>
-				<paper-shadow class="card">
+				<paper-material class="card">
                     <div class="white top subhead">
                       Languages
 					</div>
@@ -51,7 +51,7 @@
 							{{> proficiencyListItem}}
 						{{/each}}
 					</div>
-				</paper-shadow>
+				</paper-material>
 				</div>
 			</div>
 		</div>
@@ -63,7 +63,7 @@
 </template>
 
 <template name="containerCardHelper">
-	<paper-shadow class="card {{class}}"
+	<paper-material class="card {{class}}"
                   hero-id="main" {{detailHero field ../_id}}>
         <div class="top subhead {{colorClass}} {{topClass}}"
              hero-id="toolbar" {{detailHero field ../_id}}>
@@ -73,5 +73,5 @@
           </div>
 		</div>
 		<div class="bottom">{{#markdown}}{{> UI.contentBlock}}{{/markdown}}</div>
-	</paper-shadow>
+	</paper-material>
 </template>
diff --git a/rpg-docs/client/views/private/character/proficiencies/proficiencyListItem/proficiencyListItem.html b/rpg-docs/client/views/private/character/proficiencies/proficiencyListItem/proficiencyListItem.html
index 944e9eb4..5aa48af0 100644
--- a/rpg-docs/client/views/private/character/proficiencies/proficiencyListItem/proficiencyListItem.html
+++ b/rpg-docs/client/views/private/character/proficiencies/proficiencyListItem/proficiencyListItem.html
@@ -3,8 +3,8 @@
 		<div class="proficiency item small"
 			 hero-id="main" {{detailHero}}
 			 layout horizontal center>
-			<core-icon icon="{{profIcon}}"
-					   style="margin-right: 16px;"></core-icon>
+			<iron-icon icon="{{profIcon}}"
+					   style="margin-right: 16px;"></iron-icon>
 			<div flex>{{getName}}</div>
 		</div>
 	</div>
diff --git a/rpg-docs/client/views/private/character/proficiencies/proficiencyView/proficiencyView.html b/rpg-docs/client/views/private/character/proficiencies/proficiencyView/proficiencyView.html
index 5d79e37f..46020343 100644
--- a/rpg-docs/client/views/private/character/proficiencies/proficiencyView/proficiencyView.html
+++ b/rpg-docs/client/views/private/character/proficiencies/proficiencyView/proficiencyView.html
@@ -2,7 +2,7 @@
 	<div class="proficiencyView item small"
 		 style="padding: 0;"
 		 layout horizontal center>
-		<core-icon icon="{{profIcon}}" style="margin-right: 16px;"></core-icon>
+		<iron-icon icon="{{profIcon}}" style="margin-right: 16px;"></iron-icon>
 		<div>{{getName}}</div>
 	</div>
 </template>
diff --git a/rpg-docs/client/views/private/character/spells/spells.css b/rpg-docs/client/views/private/character/spells/spells.css
index 4b00a80c..4fe22baa 100644
--- a/rpg-docs/client/views/private/character/spells/spells.css
+++ b/rpg-docs/client/views/private/character/spells/spells.css
@@ -6,7 +6,7 @@
 	height: 56px;
 }
 
-#spells .inventoryItem core-icon{
+#spells .inventoryItem iron-icon{
 	width: 32px;
 	height: 32px;
 }
@@ -18,7 +18,7 @@
 	cursor: pointer !important;
 }
 
-#spells .inventoryItem[disabled] core-icon{
+#spells .inventoryItem[disabled] iron-icon{
 	color: #ccc !important;
 	color: rgba(0,0,0,0.26) !important;
 }
diff --git a/rpg-docs/client/views/private/character/spells/spells.html b/rpg-docs/client/views/private/character/spells/spells.html
index 4dc1a671..7ea409f8 100644
--- a/rpg-docs/client/views/private/character/spells/spells.html
+++ b/rpg-docs/client/views/private/character/spells/spells.html
@@ -4,7 +4,7 @@
 			<div style="padding: 4px;"
 				 layout horizontal start wrap>
 				{{#if hasSlots}}
-					<paper-shadow class="card"
+					<paper-material class="card"
 								  style="margin: 4px;"
 								  hero-id="main" {{detailHero}}>
 						<div class="white top subhead"
@@ -32,10 +32,10 @@
 								</div>
 							{{/if}}{{/each}}
 						</div>
-					</paper-shadow>
+					</paper-material>
 				{{/if}}
 				{{#each spellLists}}
-					<paper-shadow class="card spellList" flex
+					<paper-material class="card spellList" flex
 								  hero-id="main" {{detailHero}}
 								  style="margin: 4px;">
 						<div class="top {{colorClass}}"
@@ -92,10 +92,10 @@
 												<div class="tall spell item"
 													 hero-id="main" {{detailHero}}
 													 layout horizontal center>
-													<core-icon icon="social:whatshot"
+													<iron-icon icon="social:whatshot"
 															   style="color: {{hexColor color}};
 																	  margin-right: 16px;"
-															   ></core-icon>
+															   ></iron-icon>
 													<div flex layout vertical>
 														<div>{{name}}</div>
 														<div class="caption">
@@ -122,7 +122,7 @@
 								</div>
 							{{/each}}
 						</div>
-					</paper-shadow>
+					</paper-material>
 				{{/each}}
 			</div>
 			<div class="fab-buffer"></div>
diff --git a/rpg-docs/client/views/private/character/stats/abilityCards/abilityCards.html b/rpg-docs/client/views/private/character/stats/abilityCards/abilityCards.html
index f82ffe0c..3a05ec9e 100644
--- a/rpg-docs/client/views/private/character/stats/abilityCards/abilityCards.html
+++ b/rpg-docs/client/views/private/character/stats/abilityCards/abilityCards.html
@@ -1,6 +1,6 @@
 <template name="abilityMiniCard">
 	<div>
-	<paper-shadow class="card abilityMiniCard clickable"
+	<paper-material class="card abilityMiniCard clickable"
 				  hero-id="main" {{detailHero ability ../_id}}
 				  layout horizontal>
 		<div class="left white-text {{color}}"
@@ -11,6 +11,6 @@
 		<div class="right subhead" layout horizontal center>
 			{{title}}
 		</div>
-	</paper-shadow>
+	</paper-material>
 	</div>
 </template>
diff --git a/rpg-docs/client/views/private/character/stats/healthCard/healthCard.html b/rpg-docs/client/views/private/character/stats/healthCard/healthCard.html
index f9626b51..3a9ee647 100644
--- a/rpg-docs/client/views/private/character/stats/healthCard/healthCard.html
+++ b/rpg-docs/client/views/private/character/stats/healthCard/healthCard.html
@@ -1,5 +1,5 @@
 <template name="healthCard">
-	<paper-shadow class="card container healthCard"
+	<paper-material class="card container healthCard"
 				  hero-id="main" {{detailHero "hitPoints" _id}}
 				  layout horizontal wrap>
 		<div class="green white-text subhead left"
@@ -95,5 +95,5 @@
 				{{/with}}
 			{{/if}}
 		</div>
-	</paper-shadow>
+	</paper-material>
 </template>
diff --git a/rpg-docs/client/views/private/character/stats/hitDice/hitDice.html b/rpg-docs/client/views/private/character/stats/hitDice/hitDice.html
index 7e41d789..8f5489f8 100644
--- a/rpg-docs/client/views/private/character/stats/hitDice/hitDice.html
+++ b/rpg-docs/client/views/private/character/stats/hitDice/hitDice.html
@@ -1,7 +1,7 @@
 <template name="hitDice">
 	{{#if characterCalculate "attributeBase" ../_id name}}
 		<div>
-		<paper-shadow class="card hit-dice" hero-id="main"
+		<paper-material class="card hit-dice" hero-id="main"
 					  {{detailHero name ../_id}}
 					  layout horizontal>
 			<div class="left green display1 white-text"
@@ -29,7 +29,7 @@
 			<div class="right clickable" flex relative horizontal layout center>
 				Hit Dice
 			</div>
-		</paper-shadow>
+		</paper-material>
 		</div>
 	{{/if}}
 </template>
diff --git a/rpg-docs/client/views/private/character/stats/skillDialog/skillDialog.html b/rpg-docs/client/views/private/character/stats/skillDialog/skillDialog.html
index 10953f17..d2ad5908 100644
--- a/rpg-docs/client/views/private/character/stats/skillDialog/skillDialog.html
+++ b/rpg-docs/client/views/private/character/stats/skillDialog/skillDialog.html
@@ -11,7 +11,7 @@
 			{{characterCalculate "skillMod" charId skillName}}
 		</div>
 		<div class="subhead">
-			<core-icon icon="{{profIcon}}" class="black54"></core-icon>
+			<iron-icon icon="{{profIcon}}" class="black54"></iron-icon>
 			{{#if profSource}}
 				{{proficiencyValue}} - {{#with profSource}}{{sourceName}}{{/with}}
 			{{else}}
diff --git a/rpg-docs/client/views/private/character/stats/skillRow/skillRow.html b/rpg-docs/client/views/private/character/stats/skillRow/skillRow.html
index c40d6460..d8f7db0c 100644
--- a/rpg-docs/client/views/private/character/stats/skillRow/skillRow.html
+++ b/rpg-docs/client/views/private/character/stats/skillRow/skillRow.html
@@ -4,7 +4,7 @@
 			 hero-id="main" 
 			 {{detailHero skill ../_id}} 
 			 layout horizontal center>
-			<core-icon icon="{{profIcon}}"></core-icon>
+			<iron-icon icon="{{profIcon}}"></iron-icon>
 			{{#if failSkill}}
 				<div class="fail skill-mod">fail</div>
 			{{else}}
diff --git a/rpg-docs/client/views/private/character/stats/stats.css b/rpg-docs/client/views/private/character/stats/stats.css
index 343afeb5..fe8f696e 100644
--- a/rpg-docs/client/views/private/character/stats/stats.css
+++ b/rpg-docs/client/views/private/character/stats/stats.css
@@ -46,6 +46,6 @@
 	background-color: rgba(0,0,0,0.6);
 }
 
-section:not(.core-selected):not([animate]) paper-shadow[hero] {
+section:not(.core-selected):not([animate]) paper-material[hero] {
 	visibility: hidden;
 }
\ No newline at end of file
diff --git a/rpg-docs/client/views/private/character/stats/stats.html b/rpg-docs/client/views/private/character/stats/stats.html
index 6aeff4c7..3f3df6ab 100644
--- a/rpg-docs/client/views/private/character/stats/stats.html
+++ b/rpg-docs/client/views/private/character/stats/stats.html
@@ -28,7 +28,7 @@
 			{{>hitDice name="d12HitDice" diceNum="12" char=this}}
 			<!--Saving Throws-->
 			<div>
-			<paper-shadow class="card">
+			<paper-material class="card">
 				<div class="top white subhead">
 					Saving Throws
 				</div>
@@ -40,11 +40,11 @@
 					{{> skillRow name="Wisdom" skill="wisdomSave"}}
 					{{> skillRow name="Charisma" skill="charismaSave"}}
 				</div>
-			</paper-shadow>
+			</paper-material>
 			</div>
 			<!--Skills-->
 			<div>
-			<paper-shadow class="card">
+			<paper-material class="card">
 				<div class="top white subhead">
 					Skills
 				</div>
@@ -68,7 +68,7 @@
 					{{> skillRow name="Stealth" skill="stealth"}}
 					{{> skillRow name="Survival" skill="survival"}}
 				</div>
-			</paper-shadow>
+			</paper-material>
 			</div>
 		</div>
 	</div>
@@ -76,7 +76,7 @@
 
 <template name="statCard">
 	<div>
-	<paper-shadow class="card statCard clickable" hero-id="main" {{detailHero stat ../_id}} layout horizontal>
+	<paper-material class="card statCard clickable" hero-id="main" {{detailHero stat ../_id}} layout horizontal>
 		<div class="left display1 white-text {{color}}"
 			 hero-id="toolbar" {{detailHero stat ../_id}}>
 			{{#if isSkill}}
@@ -88,6 +88,6 @@
 		<div class="right subhead" flex horizontal layout center>
 			{{name}}
 		</div>
-	</paper-shadow>
+	</paper-material>
 	</div>
 </template>
diff --git a/rpg-docs/client/views/private/characterList/characterList.html b/rpg-docs/client/views/private/characterList/characterList.html
index 66923574..1ceaa1d7 100644
--- a/rpg-docs/client/views/private/characterList/characterList.html
+++ b/rpg-docs/client/views/private/characterList/characterList.html
@@ -1,10 +1,10 @@
 <template name="characterList">
-	<core-toolbar class="app-grey white-text">
-		<core-icon-button icon="menu" core-drawer-toggle></core-icon-button>
+	<app-toolbar class="app-grey white-text">
+		<paper-icon-button icon="menu" drawer-toggle></paper-icon-button>
 		<div flex>
 			Characters
 		</div>
-	</core-toolbar>
+	</app-toolbar>
 	<div class="scroll-y" fit>
 			{{#if currentUser}}
 				{{#if characters.count}}
diff --git a/rpg-docs/client/views/private/characterList/characterSideList.css b/rpg-docs/client/views/private/characterList/characterSideList.css
index 6e09e834..29272c1a 100644
--- a/rpg-docs/client/views/private/characterList/characterSideList.css
+++ b/rpg-docs/client/views/private/characterList/characterSideList.css
@@ -9,7 +9,7 @@
 	text-decoration: none;
 }
 
-.singleLineItem core-icon {
+.singleLineItem iron-icon {
 	height: 8px;
 	margin-right: 8px;
 	width: 8px;
diff --git a/rpg-docs/client/views/private/characterList/characterSideList.html b/rpg-docs/client/views/private/characterList/characterSideList.html
index 5cde2abe..f07e4771 100644
--- a/rpg-docs/client/views/private/characterList/characterSideList.html
+++ b/rpg-docs/client/views/private/characterList/characterSideList.html
@@ -6,7 +6,7 @@
 				<a href={{pathFor route="characterSheet" data=this}}
 				   class="singleLineItem characterRepresentative"
 					 layout horizontal center>
-					<core-icon icon="image:brightness-1"></core-icon>
+					<iron-icon icon="image:brightness-1"></iron-icon>
 					<div>{{name}}</div>
 				</a>
 			{{/each}}
diff --git a/rpg-docs/client/views/private/guide/guide.html b/rpg-docs/client/views/private/guide/guide.html
index c03e65bb..45f0117c 100644
--- a/rpg-docs/client/views/private/guide/guide.html
+++ b/rpg-docs/client/views/private/guide/guide.html
@@ -1,10 +1,10 @@
 <template name="guide">
-	<core-toolbar class="app-grey white-text">
-		<core-icon-button icon="menu" core-drawer-toggle></core-icon-button>
+	<app-toolbar class="app-grey white-text">
+		<paper-icon-button icon="menu" drawer-toggle></paper-icon-button>
 		<div flex>Guide</div>
-	</core-toolbar>
+	</app-toolbar>
 	<div layout vertical center>
-		<paper-shadow class="wallOfText card" style="padding: 32px; max-width: 800px;">
+		<paper-material class="wallOfText card" style="padding: 32px; max-width: 800px;">
 			<h2>Character Sheet Philosophy</h2>
 			<p>Setting up your character on Dicecloud is going to take you a little longer than just filling it in on a paper character sheet would have. The goal of using an online sheet is to make actually playing the game more streamlined, and ultimately more fun. So putting a little extra effort into setting up your character now will pay off over and over again once you're playing.</p>
 			<p>The idea is to track where each number comes from, and allow you to easily make changes on the fly.</p>
@@ -89,6 +89,6 @@
 				<li>Change your level and check that the <em>Stats</em> tab gets updated accordingly</li>
 			</ul>
 			<p>You can try all sorts of calculations in your effects and in certain other places too. For example if you had some feature that is used a number of times equal to your wisdom modifier or 1, whichever is lower, you could limit its uses to <em>min(1, wisdomMod)</em> and the character sheet will figure it out for you, and update itself if you wisdom modifier happens to change later.</p>
-		</paper-shadow>
+		</paper-material>
 	</div>
 </template>
\ No newline at end of file
diff --git a/rpg-docs/client/views/private/home/home.html b/rpg-docs/client/views/private/home/home.html
index 053a016d..b411ff03 100644
--- a/rpg-docs/client/views/private/home/home.html
+++ b/rpg-docs/client/views/private/home/home.html
@@ -1,9 +1,9 @@
 <template name="home">
-	<core-toolbar class="app-grey white-text">
-		<core-icon-button icon="menu" core-drawer-toggle></core-icon-button>
+	<app-toolbar class="app-grey white-text">
+		<paper-icon-button icon="menu" drawer-toggle></paper-icon-button>
 		<div flex>
 			Home
 		</div>
-	</core-toolbar>
+	</app-toolbar>
 	{{> intro}}
-</template>
\ No newline at end of file
+</template>
diff --git a/rpg-docs/client/views/private/home/intro/intro.html b/rpg-docs/client/views/private/home/intro/intro.html
index 89b762a5..ce00f177 100644
--- a/rpg-docs/client/views/private/home/intro/intro.html
+++ b/rpg-docs/client/views/private/home/intro/intro.html
@@ -36,7 +36,7 @@
 					Check out the example characters
 				</h2>
 				<div layout horizontal around-justified wrap>
-					<paper-shadow class="card characterCard ssArcher clickable"
+					<paper-material class="card characterCard ssArcher clickable"
 								  z="2">
 						<div class="top subhead green white-text">
 							<div class="subhead" flex>
@@ -44,8 +44,8 @@
 							</div>
 						</div>
 						<div class="bottom text">Lawful Good Human</div>
-					</paper-shadow>
-					<paper-shadow class="card characterCard ssWizard clickable"
+					</paper-material>
+					<paper-material class="card characterCard ssWizard clickable"
 								  z="2">
 						<div class="top subhead deep-purple white-text">
 							<div class="subhead" flex>
@@ -53,7 +53,7 @@
 							</div>
 						</div>
 						<div class="bottom text">Chaotic Good High Elf</div>
-					</paper-shadow>
+					</paper-material>
 				</div>
 			</div>
 		</div>
diff --git a/rpg-docs/client/views/private/loading/loading.html b/rpg-docs/client/views/private/loading/loading.html
index cd3f21a2..7c32486a 100644
--- a/rpg-docs/client/views/private/loading/loading.html
+++ b/rpg-docs/client/views/private/loading/loading.html
@@ -1,7 +1,7 @@
 <template name="loading">
-	<core-toolbar class="app-grey white-text">
-		<core-icon-button icon="menu" core-drawer-toggle></core-icon-button>
-	</core-toolbar>
+	<app-toolbar class="app-grey white-text">
+		<paper-icon-button icon="menu" drawer-toggle></paper-icon-button>
+	</app-toolbar>
     <div fit layout vertical center center-justified>
 		<paper-spinner class="bigSpinner" active></paper-spinner>
 		<div class="subhead" 
diff --git a/rpg-docs/client/views/private/meta/changeLog/changeLog.html b/rpg-docs/client/views/private/meta/changeLog/changeLog.html
index 6c4d5270..3c63ebe4 100644
--- a/rpg-docs/client/views/private/meta/changeLog/changeLog.html
+++ b/rpg-docs/client/views/private/meta/changeLog/changeLog.html
@@ -1,15 +1,15 @@
 <template name="changeLog">
-	<core-toolbar class="app-grey white-text">
-		<core-icon-button icon="menu" core-drawer-toggle></core-icon-button>
+	<app-toolbar class="app-grey white-text">
+		<paper-icon-button icon="menu" drawer-toggle></paper-icon-button>
 		<div flex>
 			Change Log
 		</div>
-	</core-toolbar>
+	</app-toolbar>
 	<div class="changeLog scroll-y" fit>
 		<div layout vertical center>
 			<div layout vertical style="max-width: 800px; padding: 4px;">
 				{{#each changeLogs}}
-					<paper-shadow class="card" 
+					<paper-material class="card" 
 								  style="margin: 4px;
 										 padding: 16px;"
 								  layout vertical>
@@ -19,7 +19,7 @@
 							<li>{{this}}</li>
 							{{/each}}
 						</ul>
-					</paper-shadow>
+					</paper-material>
 				{{/each}}
 			</div>
 		</div>
diff --git a/rpg-docs/client/views/private/notFound/notFound.html b/rpg-docs/client/views/private/notFound/notFound.html
index 17bc3d1e..c919c7e1 100644
--- a/rpg-docs/client/views/private/notFound/notFound.html
+++ b/rpg-docs/client/views/private/notFound/notFound.html
@@ -1,7 +1,7 @@
 <template name="notFound">
-	<core-toolbar class="app-grey white-text">
-		<core-icon-button icon="menu" core-drawer-toggle></core-icon-button>
-	</core-toolbar>
+	<app-toolbar class="app-grey white-text">
+		<paper-icon-button icon="menu" drawer-toggle></paper-icon-button>
+	</app-toolbar>
 	<div layout vertical center center-justified fit 
 		 style="padding: 16px; text-align: center;">
 		<h2 style="margin-bottom: 12px;">The data for the page you requested could not be found.</h2>
diff --git a/rpg-docs/client/views/private/paperTemplates/fabMenu/fabMenu.scss b/rpg-docs/client/views/private/paperTemplates/fabMenu/fabMenu.scss
index fec0560a..ddeb5309 100644
--- a/rpg-docs/client/views/private/paperTemplates/fabMenu/fabMenu.scss
+++ b/rpg-docs/client/views/private/paperTemplates/fabMenu/fabMenu.scss
@@ -34,10 +34,10 @@
 }
 
 .expand-menu {
-	&::shadow core-icon {
+	&::shadow iron-icon {
 		transition: transform 0.3s ease-in-out;
 	}
-	&.active::shadow core-icon{
+	&.active::shadow iron-icon{
 		transform: rotate(405deg);
 	}
 }
diff --git a/rpg-docs/client/views/private/testContent.html b/rpg-docs/client/views/private/testContent.html
new file mode 100644
index 00000000..b4b7427a
--- /dev/null
+++ b/rpg-docs/client/views/private/testContent.html
@@ -0,0 +1,3 @@
+<template name="testContent">
+	<div class="layout horizontal center center-justified">Some content</div>
+</template>
diff --git a/rpg-docs/client/views/private/user/profile/profile.html b/rpg-docs/client/views/private/user/profile/profile.html
index 4e87f4c6..19b876dd 100644
--- a/rpg-docs/client/views/private/user/profile/profile.html
+++ b/rpg-docs/client/views/private/user/profile/profile.html
@@ -1,11 +1,11 @@
 <template name="profile">
 	{{#with currentUser}}
-		<core-toolbar class="blue-grey white-text">
-			<core-icon-button icon="menu" core-drawer-toggle></core-icon-button>
+		<app-toolbar class="blue-grey white-text">
+			<paper-icon-button icon="menu" drawer-toggle></paper-icon-button>
 			<div id="username" class="clickable" flex>
 				{{profileName}}
 			</div>
-		</core-toolbar>
+		</app-toolbar>
 		<div id="userProfile" class="padded">
 			<div>
 				<h2>Email</h2>
diff --git a/rpg-docs/client/views/private/user/titledAtForm/titledAtForm.html b/rpg-docs/client/views/private/user/titledAtForm/titledAtForm.html
index ef62b371..fe64e317 100644
--- a/rpg-docs/client/views/private/user/titledAtForm/titledAtForm.html
+++ b/rpg-docs/client/views/private/user/titledAtForm/titledAtForm.html
@@ -1,13 +1,13 @@
 <template name="titledAtForm">
-	<core-toolbar class="app-grey white-text">
-		<core-icon-button icon="menu" core-drawer-toggle></core-icon-button>
+	<app-toolbar class="app-grey white-text">
+		<paper-icon-button icon="menu" drawer-toggle></paper-icon-button>
 		<div flex>
 			
 		</div>
-	</core-toolbar>
+	</app-toolbar>
 	<div class="scroll-y padded" fit layout vertical center center-justified>
-		<paper-shadow class="white" style="max-width: 400px;">
+		<paper-material class="white" style="max-width: 400px;">
 			{{> atForm}}
-		</paper-shadow>
+		</paper-material>
 	</div>
 </template>
diff --git a/rpg-docs/config.vulcanize b/rpg-docs/config.vulcanize
index 08fb0be7..3dcec764 100644
--- a/rpg-docs/config.vulcanize
+++ b/rpg-docs/config.vulcanize
@@ -2,62 +2,6 @@
   "polyfill": "/components/webcomponentsjs/webcomponents.min.js",
   "useShadowDom": true,
   "imports": [
-<<<<<<< HEAD
-    "/components/neon-animated-pages/neon-animated-pages.html",
-    "/components/neon-animated-pages/animations/cross-fade.html",
-    "/components/neon-animated-pages/animations/hero-animation.html",
-    "/components/neon-animated-pages/animations/slide-from-right-animation.html",
-    "/components/iron-icons/av-icons.html",
-    "/components/iron-icons/iron-icons.html",
-    "/components/iron-icons/editor-icons.html",
-    "/components/iron-icons/image-icons.html",
-    "/components/iron-icons/social-icons.html",
-    "/components/iron-image/iron-image.html",
-    "/components/iron-item/iron-item.html",
-    "/components/iron-menu/iron-menu.html",
-    "/components/app-layout/app-layout.html",
-=======
-    "/custom_components/paper-dropdown/paper-dropdown.html",
-    "/custom_components/paper-dropdown-menu/paper-dropdown-menu.html",
-    "/custom_components/paper-diff-slider/paper-diff-slider.html",
-    "/custom_components/swipe-detect/swipe-detect.html",
-    
-    "/components/core-animated-pages/core-animated-pages.html",
-    "/components/core-animated-pages/transitions/cross-fade.html",
-    "/components/core-animated-pages/transitions/hero-transition.html",
-    "/components/core-animated-pages/transitions/slide-from-right.html",
-    "/components/core-icons/av-icons.html",
-    "/components/core-icons/core-icons.html",
-    "/components/core-icons/editor-icons.html",
-    "/components/core-icons/image-icons.html",
-    "/components/core-icons/social-icons.html",
-    "/components/core-image/core-image.html",
-    "/components/core-item/core-item.html",
-    "/components/core-menu/core-menu.html",
-    "/components/core-scaffold/core-scaffold.html",
-    "/components/core-transition/core-transition.html",
->>>>>>> update-meteor-1.4
-
-    "/components/paper-button/paper-button.html",
-    "/components/paper-checkbox/paper-checkbox.html",
-    "/components/paper-dialog/paper-action-dialog.html",
-    "/components/paper-dialog/paper-dialog.html",
-    "/components/paper-dialog/paper-dialog-transition.html",
-    "/components/paper-fab/paper-fab.html",
-    "/components/paper-fab-menu/paper-fab-menu.html",
-    "/components/paper-icon-button/paper-icon-button.html",
-    "/components/paper-input/paper-autogrow-textarea.html",
-    "/components/paper-input/paper-input.html",
-    "/components/paper-input/paper-input-decorator.html",
-    "/components/paper-item/paper-item.html",
-    "/components/paper-menu-button/paper-menu-button.html",
-    "/components/paper-radio-button/paper-radio-button.html",
-    "/components/paper-radio-group/paper-radio-group.html",
-    "/components/paper-shadow/paper-shadow.html",
-    "/components/paper-spinner/paper-spinner.html",
-    "/components/paper-slider/paper-slider.html",
-    "/components/paper-tabs/paper-tabs.html",
-    "/components/paper-toast/paper-toast.html",
-    "/components/paper-toggle-button/paper-toggle-button.html"
+    "/components/app-layout/app-layout.html"
   ]
 }
diff --git a/rpg-docs/package.json b/rpg-docs/package.json
index 46afdeb6..49a2f8ff 100644
--- a/rpg-docs/package.json
+++ b/rpg-docs/package.json
@@ -11,7 +11,9 @@
   },
   "author": "Stefan Zermatten",
   "dependencies": {
+    "@polymer/polymer": "^1.2.5-npm-test.2",
     "babel-runtime": "^6.18.0",
+    "bcrypt": "^1.0.1",
     "bower": "^1.7.9"
   }
 }
diff --git a/rpg-docs/packages/meteor-vulcanize/.npm/plugin/vulcanize-new-1rnrsz4/npm-shrinkwrap.json b/rpg-docs/packages/meteor-vulcanize/.npm/plugin/vulcanize-new-1rnrsz4/npm-shrinkwrap.json
new file mode 100644
index 00000000..907888eb
--- /dev/null
+++ b/rpg-docs/packages/meteor-vulcanize/.npm/plugin/vulcanize-new-1rnrsz4/npm-shrinkwrap.json
@@ -0,0 +1,89 @@
+{
+  "dependencies": {
+    "vulcanize": {
+      "version": "1.14.7",
+      "resolved": "https://registry.npmjs.org/vulcanize/-/vulcanize-1.14.7.tgz",
+      "from": "vulcanize@1.14.7",
+      "dependencies": {
+        "dom5": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/dom5/-/dom5-1.3.1.tgz",
+          "from": "dom5@1.3.1",
+          "dependencies": {
+            "clone": {
+              "version": "1.0.2",
+              "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz",
+              "from": "clone@1.0.2"
+            },
+            "parse5": {
+              "version": "1.5.1",
+              "resolved": "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz",
+              "from": "parse5@1.5.1"
+            }
+          }
+        },
+        "es6-promise": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-2.3.0.tgz",
+          "from": "es6-promise@2.3.0"
+        },
+        "hydrolysis": {
+          "version": "1.22.0",
+          "resolved": "https://registry.npmjs.org/hydrolysis/-/hydrolysis-1.22.0.tgz",
+          "from": "hydrolysis@1.22.0",
+          "dependencies": {
+            "doctrine": {
+              "version": "0.7.2",
+              "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-0.7.2.tgz",
+              "from": "doctrine@0.7.2",
+              "dependencies": {
+                "esutils": {
+                  "version": "1.1.6",
+                  "resolved": "https://registry.npmjs.org/esutils/-/esutils-1.1.6.tgz",
+                  "from": "esutils@1.1.6"
+                },
+                "isarray": {
+                  "version": "0.0.1",
+                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                  "from": "isarray@0.0.1"
+                }
+              }
+            },
+            "espree": {
+              "version": "2.2.5",
+              "resolved": "https://registry.npmjs.org/espree/-/espree-2.2.5.tgz",
+              "from": "espree@2.2.5"
+            },
+            "estraverse": {
+              "version": "3.1.0",
+              "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-3.1.0.tgz",
+              "from": "estraverse@3.1.0"
+            },
+            "path-is-absolute": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz",
+              "from": "path-is-absolute@1.0.0"
+            }
+          }
+        },
+        "nopt": {
+          "version": "3.0.6",
+          "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
+          "from": "nopt@3.0.6",
+          "dependencies": {
+            "abbrev": {
+              "version": "1.0.7",
+              "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz",
+              "from": "abbrev@1.0.7"
+            }
+          }
+        },
+        "path-posix": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/path-posix/-/path-posix-1.0.0.tgz",
+          "from": "path-posix@1.0.0"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/rpg-docs/packages/meteor-vulcanize/.npm/plugin/vulcanize-new-1rnrsz4/package.json b/rpg-docs/packages/meteor-vulcanize/.npm/plugin/vulcanize-new-1rnrsz4/package.json
new file mode 100644
index 00000000..0967ef42
--- /dev/null
+++ b/rpg-docs/packages/meteor-vulcanize/.npm/plugin/vulcanize-new-1rnrsz4/package.json
@@ -0,0 +1 @@
+{}
diff --git a/rpg-docs/packages/meteor-vulcanize/.npm/plugin/vulcanize/npm-shrinkwrap.json b/rpg-docs/packages/meteor-vulcanize/.npm/plugin/vulcanize/npm-shrinkwrap.json
index 867a2f3d..f680d5df 100644
--- a/rpg-docs/packages/meteor-vulcanize/.npm/plugin/vulcanize/npm-shrinkwrap.json
+++ b/rpg-docs/packages/meteor-vulcanize/.npm/plugin/vulcanize/npm-shrinkwrap.json
@@ -1,89 +1,446 @@
 {
   "dependencies": {
+    "ansi-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz",
+      "from": "ansi-regex@>=2.0.0 <3.0.0"
+    },
+    "ansi-styles": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+      "from": "ansi-styles@>=2.2.1 <3.0.0"
+    },
+    "boxen": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/boxen/-/boxen-0.3.1.tgz",
+      "from": "boxen@>=0.3.1 <0.4.0"
+    },
+    "buffer-shims": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
+      "from": "buffer-shims@>=1.0.0 <2.0.0"
+    },
+    "capture-stack-trace": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz",
+      "from": "capture-stack-trace@>=1.0.0 <2.0.0"
+    },
+    "chalk": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+      "from": "chalk@>=1.0.0 <2.0.0"
+    },
+    "code-point-at": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+      "from": "code-point-at@>=1.0.0 <2.0.0"
+    },
+    "configstore": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/configstore/-/configstore-2.1.0.tgz",
+      "from": "configstore@>=2.0.0 <3.0.0"
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "from": "core-util-is@>=1.0.0 <1.1.0"
+    },
+    "create-error-class": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
+      "from": "create-error-class@>=3.0.1 <4.0.0"
+    },
+    "deep-extend": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.1.tgz",
+      "from": "deep-extend@>=0.4.0 <0.5.0"
+    },
+    "dot-prop": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz",
+      "from": "dot-prop@>=3.0.0 <4.0.0"
+    },
+    "duplexer2": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
+      "from": "duplexer2@>=0.1.4 <0.2.0"
+    },
+    "error-ex": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.0.tgz",
+      "from": "error-ex@>=1.2.0 <2.0.0"
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "from": "escape-string-regexp@>=1.0.2 <2.0.0"
+    },
+    "filled-array": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/filled-array/-/filled-array-1.1.0.tgz",
+      "from": "filled-array@>=1.0.0 <2.0.0"
+    },
+    "got": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/got/-/got-5.7.1.tgz",
+      "from": "got@>=5.0.0 <6.0.0"
+    },
+    "graceful-fs": {
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+      "from": "graceful-fs@>=4.1.2 <5.0.0"
+    },
+    "has-ansi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+      "from": "has-ansi@>=2.0.0 <3.0.0"
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "from": "imurmurhash@>=0.1.4 <0.2.0"
+    },
+    "inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "from": "inherits@>=2.0.1 <2.1.0"
+    },
+    "ini": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
+      "from": "ini@>=1.3.0 <1.4.0"
+    },
+    "is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "from": "is-arrayish@>=0.2.1 <0.3.0"
+    },
+    "is-finite": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
+      "from": "is-finite@>=1.0.0 <2.0.0"
+    },
+    "is-fullwidth-code-point": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+      "from": "is-fullwidth-code-point@>=1.0.0 <2.0.0"
+    },
+    "is-npm": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz",
+      "from": "is-npm@>=1.0.0 <2.0.0"
+    },
+    "is-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+      "from": "is-obj@>=1.0.0 <2.0.0"
+    },
+    "is-redirect": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
+      "from": "is-redirect@>=1.0.0 <2.0.0"
+    },
+    "is-retry-allowed": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
+      "from": "is-retry-allowed@>=1.0.0 <2.0.0"
+    },
+    "is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "from": "is-stream@>=1.0.0 <2.0.0"
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "from": "isarray@>=1.0.0 <1.1.0"
+    },
+    "latest-version": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-2.0.0.tgz",
+      "from": "latest-version@>=2.0.0 <3.0.0"
+    },
+    "lowercase-keys": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz",
+      "from": "lowercase-keys@>=1.0.0 <2.0.0"
+    },
+    "minimist": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+      "from": "minimist@0.0.8"
+    },
+    "mkdirp": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "from": "mkdirp@>=0.5.0 <0.6.0"
+    },
+    "node-status-codes": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz",
+      "from": "node-status-codes@>=1.0.0 <2.0.0"
+    },
+    "number-is-nan": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+      "from": "number-is-nan@>=1.0.0 <2.0.0"
+    },
+    "object-assign": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz",
+      "from": "object-assign@>=4.0.1 <5.0.0"
+    },
+    "os-homedir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "from": "os-homedir@>=1.0.0 <2.0.0"
+    },
+    "os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "from": "os-tmpdir@>=1.0.0 <2.0.0"
+    },
+    "osenv": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
+      "from": "osenv@>=0.1.0 <0.2.0"
+    },
+    "package-json": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz",
+      "from": "package-json@>=2.0.0 <3.0.0"
+    },
+    "parse-json": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+      "from": "parse-json@>=2.1.0 <3.0.0"
+    },
+    "pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "from": "pinkie@>=2.0.0 <3.0.0"
+    },
+    "pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "from": "pinkie-promise@>=2.0.0 <3.0.0"
+    },
+    "prepend-http": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
+      "from": "prepend-http@>=1.0.1 <2.0.0"
+    },
+    "process-nextick-args": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+      "from": "process-nextick-args@>=1.0.6 <1.1.0"
+    },
+    "rc": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.1.6.tgz",
+      "from": "rc@>=1.1.6 <2.0.0",
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "from": "minimist@>=1.2.0 <2.0.0"
+        }
+      }
+    },
+    "read-all-stream": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz",
+      "from": "read-all-stream@>=3.0.0 <4.0.0"
+    },
+    "readable-stream": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz",
+      "from": "readable-stream@>=2.0.5 <3.0.0"
+    },
+    "registry-auth-token": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.1.0.tgz",
+      "from": "registry-auth-token@>=3.0.1 <4.0.0"
+    },
+    "registry-url": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz",
+      "from": "registry-url@>=3.0.3 <4.0.0"
+    },
+    "repeating": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
+      "from": "repeating@>=2.0.0 <3.0.0"
+    },
+    "semver": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+      "from": "semver@>=5.1.0 <6.0.0"
+    },
+    "semver-diff": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz",
+      "from": "semver-diff@>=2.0.0 <3.0.0"
+    },
+    "slide": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz",
+      "from": "slide@>=1.1.5 <2.0.0"
+    },
+    "string-width": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+      "from": "string-width@>=1.0.1 <2.0.0"
+    },
+    "string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "from": "string_decoder@>=0.10.0 <0.11.0"
+    },
+    "strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "from": "strip-ansi@>=3.0.0 <4.0.0"
+    },
+    "strip-json-comments": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz",
+      "from": "strip-json-comments@>=1.0.4 <1.1.0"
+    },
+    "supports-color": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+      "from": "supports-color@>=2.0.0 <3.0.0"
+    },
+    "timed-out": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-3.1.0.tgz",
+      "from": "timed-out@>=3.0.0 <4.0.0"
+    },
+    "unzip-response": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz",
+      "from": "unzip-response@>=1.0.2 <2.0.0"
+    },
+    "update-notifier": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-0.6.3.tgz",
+      "from": "update-notifier@>=0.6.0 <0.7.0"
+    },
+    "url-parse-lax": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
+      "from": "url-parse-lax@>=1.0.0 <2.0.0"
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "from": "util-deprecate@>=1.0.1 <1.1.0"
+    },
+    "uuid": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
+      "from": "uuid@>=2.0.1 <3.0.0"
+    },
     "vulcanize": {
       "version": "1.14.7",
       "resolved": "https://registry.npmjs.org/vulcanize/-/vulcanize-1.14.7.tgz",
-      "from": "https://registry.npmjs.org/vulcanize/-/vulcanize-1.14.7.tgz",
+      "from": "vulcanize@1.14.7",
       "dependencies": {
         "dom5": {
           "version": "1.3.1",
           "resolved": "https://registry.npmjs.org/dom5/-/dom5-1.3.1.tgz",
-          "from": "https://registry.npmjs.org/dom5/-/dom5-1.3.1.tgz",
+          "from": "dom5@1.3.1",
           "dependencies": {
             "clone": {
               "version": "1.0.2",
               "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz",
-              "from": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz"
+              "from": "clone@1.0.2"
             },
             "parse5": {
               "version": "1.5.1",
               "resolved": "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz",
-              "from": "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz"
+              "from": "parse5@1.5.1"
             }
           }
         },
         "es6-promise": {
           "version": "2.3.0",
           "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-2.3.0.tgz",
-          "from": "https://registry.npmjs.org/es6-promise/-/es6-promise-2.3.0.tgz"
+          "from": "es6-promise@2.3.0"
         },
         "hydrolysis": {
           "version": "1.22.0",
           "resolved": "https://registry.npmjs.org/hydrolysis/-/hydrolysis-1.22.0.tgz",
-          "from": "https://registry.npmjs.org/hydrolysis/-/hydrolysis-1.22.0.tgz",
+          "from": "hydrolysis@1.22.0",
           "dependencies": {
             "doctrine": {
               "version": "0.7.2",
               "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-0.7.2.tgz",
-              "from": "https://registry.npmjs.org/doctrine/-/doctrine-0.7.2.tgz",
+              "from": "doctrine@0.7.2",
               "dependencies": {
                 "esutils": {
                   "version": "1.1.6",
                   "resolved": "https://registry.npmjs.org/esutils/-/esutils-1.1.6.tgz",
-                  "from": "https://registry.npmjs.org/esutils/-/esutils-1.1.6.tgz"
+                  "from": "esutils@1.1.6"
                 },
                 "isarray": {
                   "version": "0.0.1",
                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                  "from": "isarray@0.0.1"
                 }
               }
             },
             "espree": {
               "version": "2.2.5",
               "resolved": "https://registry.npmjs.org/espree/-/espree-2.2.5.tgz",
-              "from": "https://registry.npmjs.org/espree/-/espree-2.2.5.tgz"
+              "from": "espree@2.2.5"
             },
             "estraverse": {
               "version": "3.1.0",
               "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-3.1.0.tgz",
-              "from": "https://registry.npmjs.org/estraverse/-/estraverse-3.1.0.tgz"
+              "from": "estraverse@3.1.0"
             },
             "path-is-absolute": {
               "version": "1.0.0",
               "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz",
-              "from": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
+              "from": "path-is-absolute@1.0.0"
             }
           }
         },
         "nopt": {
           "version": "3.0.6",
           "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-          "from": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
+          "from": "nopt@3.0.6",
           "dependencies": {
             "abbrev": {
               "version": "1.0.7",
               "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz",
-              "from": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
+              "from": "abbrev@1.0.7"
             }
           }
         },
         "path-posix": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/path-posix/-/path-posix-1.0.0.tgz",
-          "from": "https://registry.npmjs.org/path-posix/-/path-posix-1.0.0.tgz"
+          "from": "path-posix@1.0.0"
         }
       }
+    },
+    "widest-line": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz",
+      "from": "widest-line@>=1.0.0 <2.0.0"
+    },
+    "write-file-atomic": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.2.0.tgz",
+      "from": "write-file-atomic@>=1.1.2 <2.0.0"
+    },
+    "xdg-basedir": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz",
+      "from": "xdg-basedir@>=2.0.0 <3.0.0"
     }
   }
 }
diff --git a/rpg-docs/public/_imports.html b/rpg-docs/public/_imports.html
new file mode 100644
index 00000000..974db0dc
--- /dev/null
+++ b/rpg-docs/public/_imports.html
@@ -0,0 +1 @@
+<link rel="import" href="/components/app-layout/app-layout.html">
\ No newline at end of file
diff --git a/rpg-docs/public/custom_components/app-theme.html b/rpg-docs/public/custom_components/app-theme.html
new file mode 100644
index 00000000..3004f5b0
--- /dev/null
+++ b/rpg-docs/public/custom_components/app-theme.html
@@ -0,0 +1,6 @@
+<link rel="import" href="../components/polymer/polymer.html">
+<link rel="import" href="../components/iron-flex-layout/iron-flex-layout-classes.html">
+
+<style is="custom-style" include="iron-flex iron-flex-alignment iron-positioning">
+
+</style>