diff --git a/bower.json b/bower.json
index 40d4f10..0fa7da9 100644
--- a/bower.json
+++ b/bower.json
@@ -25,7 +25,7 @@
     "tests"
   ],
   "dependencies": {
-    "polymer": "^1.0.0",
-    "leaflet": "^0.7.3"
+    "polymer": "Polymer/polymer#2.0.0",
+    "leaflet": "^1.0.0"
   }
 }
diff --git a/leaflet-core.html b/leaflet-core.html
index 630a9b8..e3ecb7e 100644
--- a/leaflet-core.html
+++ b/leaflet-core.html
@@ -41,14 +41,15 @@
 @demo https://leaflet-extras.github.io/leaflet-map/demo.html
 -->
 <dom-module id="leaflet-map">
-	<style>
-		:host { display: block; }
-		:host #map {height:100%; width:100%}
-	</style>
 	<!-- include stylesheet for shady dom and shadow dom -->
 	<link rel="stylesheet" href="../leaflet/dist/leaflet.css" />
 	<link rel="import" type="css" href="../leaflet/dist/leaflet.css" />
 	<template>
+		<style>
+                :host { display: block; }
+                :host #map {height:100%; width:100%}
+        	</style>
+
 		<div id="map"></div>
 		<content id="markers" select="*"></content>
   	</template>
@@ -556,8 +557,10 @@
 			 * @attribute inertia-deceleration
 			 * @type number
 			 */
-			inertiaDeceleration: 3000,
-
+			inertiaDeceleration: {
+			 type: Number,
+			 value: 3000
+			},
 			/**
 			 * The `inertia-max-speed` attribute sets the max speed of the inertial movement, in pixels/second.
 			 *