diff --git a/.bowerrc b/.bowerrc
deleted file mode 100644
index 93547a5..0000000
--- a/.bowerrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "directory": "../"
-}
\ No newline at end of file
diff --git a/bower.json b/bower.json
index 1162eda..133c2cf 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "disqus-comments",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "keywords": [
     "polymer",
     "web-components",
@@ -12,6 +12,7 @@
     "polymer": "Polymer/polymer#^1.0.0"
   },
   "devDependencies": {
-    "web-component-tester": "Polymer/web-component-tester#^2.0.0"
+    "iron-component-page": "PolymerElements/iron-component-page#^1.0.0",
+    "web-component-tester": "*"
   }
 }
diff --git a/demo.html b/demo.html
deleted file mode 100644
index f82bb2f..0000000
--- a/demo.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!doctype html>
-<html>
-<head>
-  <meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
-  <title>disqus-comments Demo</title>
-
-  <script src="../webcomponentsjs/webcomponents.js"></script>
-
-  <link rel="import" href="disqus-comments.html">
-  <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Open+Sans:400,700">
-
-  <style>
-    body {
-      font-family: 'Open Sans', sans-serif;
-      padding: 40px;
-    }
-    h1 {
-      color: #333;
-    }
-    p {
-      color: #666;
-    }
-    disqus-comments {
-      margin: 20px 0;
-    }
-    #disqus_thread p {
-      color: #333;
-    }
-    #disqus_thread a {
-      color: hotpink;
-    }
-  </style>
-</head>
-<body unresolved>
-  <h1>disqus-comments</h1>
-  <p>Show Disqus comments in your Shadow DOM. Just provide a shortname and you're good to go!</p>
-  <disqus-comments shortname="disqus-comments-polymer"></disqus-comments>
-</body>
-</html>
\ No newline at end of file
diff --git a/demo/index.html b/demo/index.html
new file mode 100644
index 0000000..d9e41bd
--- /dev/null
+++ b/demo/index.html
@@ -0,0 +1,24 @@
+<!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 charset="utf-8">
+    <meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
+    <title>disqus-comments Demo</title>
+    <script src="../../webcomponentsjs/webcomponents-lite.js"></script>
+    <link rel="import" href="../disqus-comments.html">
+  </head>
+<body unresolved>
+    <h1>disqus-comments</h1>
+    <p>Show Disqus comments in your Shadow DOM. Just provide a shortname and you're good to go!</p>
+    <disqus-comments shortname="disqus-comments-polymer"></disqus-comments>
+</body>
+</html>
diff --git a/disqus-comments.html b/disqus-comments.html
index 1747330..2f4363b 100644
--- a/disqus-comments.html
+++ b/disqus-comments.html
@@ -17,6 +17,7 @@
     }
 
 @element disqus-comments
+@demo demo/index.html
 @blurb Add a Disqus comment thread to your Shadow DOM.
 @status alpha
 @homepage http://elements.divshot.io/disqus-comments
diff --git a/index.html b/index.html
index d2c53f7..be747ba 100644
--- a/index.html
+++ b/index.html
@@ -1,15 +1,29 @@
 <!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">
-  <script src="../webcomponentsjs/webcomponents.js"></script>
-  <link rel="import" href="../polymer/polymer.html">
-  <link rel="import" href="../core-component-page/core-component-page.html">
+
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+  <script src="../webcomponentsjs/webcomponents-lite.js"></script>
+  <link rel="import" href="../iron-component-page/iron-component-page.html">
 
 </head>
 <body unresolved>
-
-  <core-component-page></core-component-page>
+  <!-- Note: if the main element for this repository doesn't
+       match the folder name, add a src="&lt;main-component&gt;.html" attribute,
+       where &lt;main-component&gt;.html" is a file that imports all of the
+       components you want documented. -->
+  <iron-component-page></iron-component-page>
 
 </body>
 </html>
diff --git a/test/basic-test.html b/test/basic-test.html
new file mode 100644
index 0000000..e70944f
--- /dev/null
+++ b/test/basic-test.html
@@ -0,0 +1,41 @@
+<!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 charset="utf-8">
+    <meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
+
+    <script src="../../webcomponentsjs/webcomponents-lite.js"></script>
+    <script src="../../web-component-tester/browser.js"></script>
+
+    <!-- Step 1: import the element to test -->
+    <link rel="import" href="../disqus-comments.html">
+  </head>
+  <body>
+
+    <!-- You can use the document as a place to set up your fixtures. -->
+    <disqus-comments shortname="disqus-comments-polymer"></disqus-comments>
+
+    <script>
+      var myEl = document.querySelector('disqus-comments');
+
+      suite('<disqus-comments>', function() {
+
+        test('defines the "shortname" property', function() {
+          assert.equal(myEl.shortname, 'disqus-comments-polymer');
+        });
+
+
+      });
+    </script>
+
+  </body>
+</html>
diff --git a/test/index.html b/test/index.html
new file mode 100755
index 0000000..eb77239
--- /dev/null
+++ b/test/index.html
@@ -0,0 +1,27 @@
+<!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 charset="utf-8">
+    <meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
+
+    <script src="../../webcomponentsjs/webcomponents-lite.js"></script>
+    <script src="../../web-component-tester/browser.js"></script>
+  </head>
+  <body>
+    <script>
+      // Load and run all tests (.html, .js):
+      WCT.loadSuites([
+        'basic-test.html',
+      ]);
+    </script>
+  </body>
+</html>
