diff --git a/_includes/inf-scroll-page.html b/_includes/inf-scroll-page.html
new file mode 100644
index 0000000..c074fc3
--- /dev/null
+++ b/_includes/inf-scroll-page.html
@@ -0,0 +1,21 @@
+<div id="container" class="variable-sizes">
+  {% assign page_position = page.page_position %}
+  {% for element in site.elements limit:20 offset:page.page_position %}
+    {% include element-partial.html %}
+  {% endfor %}
+</div>
+
+<script src="../{{ site.jquery_js }}"></script>
+<script src="../{{ site.isotope_js }}"></script>
+<script>
+  $(function(){
+    
+    var $container = $('#container');
+    
+    $container.isotope({
+      itemSelector : '.element',
+      layoutMode : 'fitRows'
+    });
+    
+  });
+</script>
\ No newline at end of file
diff --git a/_layouts/demo.html b/_layouts/demo.html
deleted file mode 100644
index 140d2aa..0000000
--- a/_layouts/demo.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% include html-head.html %}
-
-  <p id="demo-nav"><a href="../index.html">{{ site.name }}</a> Demo</p>
-  
-  <h1>{{ page.title }}</h1>
-  
-  {{ content }}
-  
-  {% include footer.html %}
-  
-{% include html-foot.html %}
\ No newline at end of file
diff --git a/_layouts/doc.html b/_layouts/doc.html
deleted file mode 100644
index e8afc11..0000000
--- a/_layouts/doc.html
+++ /dev/null
@@ -1,36 +0,0 @@
-{% include html-head.html %}
-  
-  <nav id="docs-nav">
-    <h1><a href="../index.html">{{ site.name }}</a> Docs</h1>
-    
-    <ul>
-      {% for doc in site.categories.docs reversed %}
-        {% if page.title == doc.title %}
-        <li class="current"><a href="#content">{{ doc.title }}</a>
-          <ul class="toc">
-            {% for item in page.toc %}
-            <li><a href="#{{ item.anchor }}">{{ item.title }}</a></li>
-            {% endfor %}
-          </ul>
-        </li>
-        {% else %}
-          {% if doc.layout != 'index-page' %}
-            <li><a href="..{{ doc.url }}">{{ doc.title }}</a>
-          {% endif %}
-        {% endif %}
-      {% endfor %}
-    </ul>
-    
-  </nav> <!-- #docs-nav -->
-  
-  <section id="content">
-    
-    <h1>{{ page.title }}</h1>
-
-    {{ content }}
-    
-    {% include footer.html %}
-    
-  </section> <!-- #content -->
-  
-{% include html-foot.html %}
\ No newline at end of file
diff --git a/_layouts/elements.html b/_layouts/elements.html
deleted file mode 100644
index 0bc0d85..0000000
--- a/_layouts/elements.html
+++ /dev/null
@@ -1,111 +0,0 @@
-{% include html-head.html %}
-
-  <p id="demo-nav"><a href="../index.html">{{ site.name }}</a> Demo</p>
-
-  <h1>{{ page.title }}</h1>
-  
-  <section id="copy">
-    <p>Isotope&rsquo;s capabilities are designed to be used together cohesively. You can do it all &mdash; filter, sort, change layout modes, add items &mdash; and Isotope will handle it with ease.</p>
-  </section>
-
-  <section id="options" class="clearfix">
-
-    {% include filter-buttons.html %}
-
-    {% include sort-buttons.html %}
-
-    {% include layout-options.html %}
-
-    <h3>Etc</h3>
-
-    <ul id="etc" class="floated clearfix">
-
-      <li id="toggle-sizes"><a href="#toggle-sizes">Toggle variable sizes</a></li>
-      <li id="insert"><a href="#insert">Insert new elements</a></li>
-      <li id="append"><a href='#append'>Append new elements</a></li>
-      <!-- <li id="shuffle"><a href='#shuffle'>Shuffle</a></li> -->
-    </ul>
-  </section> <!-- #options -->
-
-  
-
-  {{ content }}
-  
-  {% include footer.html %}
-
-  <script src="../{{ site.jquery_js }}"></script>
-  <script src="../{{ site.isotope_js }}"></script>
-  <script src="../js/fake-element.js"></script>
-  <script>
-    $(function(){
-      
-      var $container = $('#container');
-      
-      {% include random-sizes.js %}
-      
-      $container.isotope({
-        itemSelector : '.element',
-        masonry : {
-          columnWidth : 120
-        },
-        masonryHorizontal : {
-          rowHeight: 120
-        },
-        cellsByRow : {
-          columnWidth : 240,
-          rowHeight : 240
-        },
-        cellsByColumn : {
-          columnWidth : 240,
-          rowHeight : 240
-        },
-        getSortData : {
-          symbol : function( $elem ) {
-            return $elem.attr('data-symbol');
-          },
-          category : function( $elem ) {
-            return $elem.attr('data-category');
-          },
-          number : function( $elem ) {
-            return parseInt( $elem.find('.number').text(), 10 );
-          },
-          weight : function( $elem ) {
-            return parseFloat( $elem.find('.weight').text().replace( /[\(\)]/g, '') );
-          },
-          name : function ( $elem ) {
-            return $elem.find('.name').text();
-          }
-        }
-      });
-      
-      {% include option-set-buttons.js %}
-
-      // toggle variable sizes of all elements
-      $('#toggle-sizes').find('a').click(function(){
-        $container
-          .toggleClass('variable-sizes')
-          .isotope('reLayout');
-        return false;
-      });
-
-      {% include layout-change.js %}
-
-      {% include add-buttons.js %}
-
-      $('#shuffle a').click(function(){
-        $container.isotope('shuffle');
-        return false;
-      });
-      
-      // change size of clicked element
-      $container.find('.element').live('click', function(){
-        $(this).toggleClass('large');
-        $container.isotope('reLayout');
-      });
-
-
-    });
-  </script>
-
-  
-{% include html-foot.html %}
\ No newline at end of file
diff --git a/_layouts/index-page.html b/_layouts/index-page.html
deleted file mode 100644
index d6e5a32..0000000
--- a/_layouts/index-page.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{% include html-head.html %}
-
-  <p id="demo-nav"><a href="../index.html">{{ site.name }}</a></p>
-  
-  <h1>{{ page.title }}</h1>
-  
-  <ul id="index-list">
-    {% for post in site.categories[page.category] reversed %}
-      {% if post.layout != 'index-page' %}
-        <li><a href="{{ post.url }}">{{ post.title }}</a></li>
-      {% endif %}
-    {% endfor %}
-  </ul>
-  
-  {% include footer.html %}
-  
-{% include html-foot.html %}
\ No newline at end of file
diff --git a/_layouts/inf-scroll-page.html b/_layouts/inf-scroll-page.html
deleted file mode 100644
index 717ed3e..0000000
--- a/_layouts/inf-scroll-page.html
+++ /dev/null
@@ -1,31 +0,0 @@
-{% include html-head.html %}
-
-  <p id="demo-nav"><a href="../index.html">{{ site.name }}</a> Demo</p>
-
-  <h1>{{ page.title }}</h1>
-  
-  <div id="container" class="variable-sizes">
-    {% assign page_position = page.page_position %}
-    {% for element in site.elements limit:20 offset:page_position %}
-      {% include element-partial.html %}
-    {% endfor %}
-  </div>
-  
-  {% include footer.html %}
-  
-  <script src="../{{ site.jquery_js }}"></script>
-  <script src="../{{ site.isotope_js }}"></script>
-  <script>
-    $(function(){
-      
-      var $container = $('#container');
-      
-      $container.isotope({
-        itemSelector : '.element',
-        layoutMode : 'fitRows'
-      });
-      
-    });
-  </script>
-  
-{% include html-foot.html %}
\ No newline at end of file
diff --git a/_posts/pages/2011-01-01-2.yml b/_posts/pages/2011-01-01-2.html
similarity index 62%
rename from _posts/pages/2011-01-01-2.yml
rename to _posts/pages/2011-01-01-2.html
index 533d5cd..a5b226c 100644
--- a/_posts/pages/2011-01-01-2.yml
+++ b/_posts/pages/2011-01-01-2.html
@@ -1,7 +1,9 @@
 ---
 title: Infinite Scroll Page 2
 category: pages
-layout: inf-scroll-page
+layout: default
 page_position: 20
 infinite_scroll: true
----
\ No newline at end of file
+---
+
+{% include inf-scroll-page.html %}
\ No newline at end of file
diff --git a/_posts/pages/2011-01-01-3.yml b/_posts/pages/2011-01-01-3.html
similarity index 62%
rename from _posts/pages/2011-01-01-3.yml
rename to _posts/pages/2011-01-01-3.html
index 05f9908..5aa7e41 100644
--- a/_posts/pages/2011-01-01-3.yml
+++ b/_posts/pages/2011-01-01-3.html
@@ -1,7 +1,9 @@
 ---
 title: Infinite Scroll Page 3
 category: pages
-layout: inf-scroll-page
+layout: default
 page_position: 40
 infinite_scroll: true
----
\ No newline at end of file
+---
+
+{% include inf-scroll-page.html %}
\ No newline at end of file
diff --git a/_posts/pages/2011-01-01-4.yml b/_posts/pages/2011-01-01-4.html
similarity index 62%
rename from _posts/pages/2011-01-01-4.yml
rename to _posts/pages/2011-01-01-4.html
index 3465532..d08868d 100644
--- a/_posts/pages/2011-01-01-4.yml
+++ b/_posts/pages/2011-01-01-4.html
@@ -1,7 +1,9 @@
 ---
 title: Infinite Scroll Page 4
 category: pages
-layout: inf-scroll-page
+layout: default
 page_position: 60
 infinite_scroll: true
----
\ No newline at end of file
+---
+
+{% include inf-scroll-page.html %}
\ No newline at end of file
diff --git a/_posts/pages/2011-01-01-5.yml b/_posts/pages/2011-01-01-5.html
similarity index 62%
rename from _posts/pages/2011-01-01-5.yml
rename to _posts/pages/2011-01-01-5.html
index 60004e2..7da5795 100644
--- a/_posts/pages/2011-01-01-5.yml
+++ b/_posts/pages/2011-01-01-5.html
@@ -1,7 +1,9 @@
 ---
 title: Infinite Scroll Page 5
 category: pages
-layout: inf-scroll-page
+layout: default
 page_position: 80
 infinite_scroll: true
----
\ No newline at end of file
+---
+
+{% include inf-scroll-page.html %}
\ No newline at end of file
diff --git a/_posts/pages/2011-01-01-6.yml b/_posts/pages/2011-01-01-6.html
similarity index 62%
rename from _posts/pages/2011-01-01-6.yml
rename to _posts/pages/2011-01-01-6.html
index b1fa4c7..369c780 100644
--- a/_posts/pages/2011-01-01-6.yml
+++ b/_posts/pages/2011-01-01-6.html
@@ -1,7 +1,9 @@
 ---
 title: Infinite Scroll Page 6
 category: pages
-layout: inf-scroll-page
+layout: default
 page_position: 100
 infinite_scroll: true
----
\ No newline at end of file
+---
+
+{% include inf-scroll-page.html %}
\ No newline at end of file