diff --git a/_includes/license-overview.html b/_includes/license-overview.html
index e2e19fc..1622174 100644
--- a/_includes/license-overview.html
+++ b/_includes/license-overview.html
@@ -1,6 +1,6 @@
 <div class="license-family cf">
   <div class="license-family-heading">
-    <h3 class="license-family-name"><a href="{{ page.permalink }}">{% if page.family-title %}{{ page.family-title }}{% else %}{{ page.title }}{% endif %}</a></h3>
+    <h3 class="license-family-name"><a href="{{ page.permalink }}">{% if page.category %}{{ page.category }}{% else %}{{ page.title }}{% endif %}</a></h3>
 
     <p class="license-family-description">{{ page.description }}</p>
   </div>
@@ -9,12 +9,16 @@
     <div class="license-variations js-license-variations">
       <!-- always show this div, even w/o variations, for proper spacing -->
       <ul class="nav-pills js-nav-pills">
-        <li class="active"><a href="#" data-selected-tab="variation-gpl-v2">GPL v2</a></li>
-        <li><a href="#" data-selected-tab="variation-gpl-v3">GPL v3</a></li>
-        <li><a href="#" data-selected-tab="variation-affero-gpl">Affero GPL</a></li>
+        {% for variation in site.pages %}
+          {% if variation.category and variation.category == page.category %}
+        <li{% if page.slug == variation.slug %} class="active"{% endif %}><a href="#{{ variation.slug }}" data-selected-tab="variation-{{ variation.slug }}">{{ variation.title }}</a></li>
+          {% endif %}
+        {% endfor %}
       </ul>
     </div>
-    <div class="variation-tab variation-gpl-v2 js-variation-tab active">
+    {% for variation in site.pages %}
+      {% if variation.category and variation.category == page.category %}
+    <div class="variation-tab variation-{{ variation.slug }} js-variation-tab{% if page.slug == variation.slug %} active{% endif %}">
       <table class='license-rules'>
         <tr>
         {% assign types = "required|permitted|forbidden" | split: "|" %}
@@ -26,7 +30,7 @@
         {% for type in types %}
           <td>
             <ul class="license-{{ type }}">
-              {% for req in page[type] %}
+              {% for req in variation[type] %}
                 <li class="{{ req }}">{{ site.rules[type][req].label }}</li>
               {% endfor %}
             </ul>
@@ -34,16 +38,10 @@
         {% endfor %}
         </tr>
       </table>
-      <p class="small"><a href="{{ page.permalink }}">View full GPL v2 license »</a></p>
-    </div>
-    <div class="variation-tab variation-gpl-v3 js-variation-tab">
-      GPL v3 table
-      <p class="small"><a href="{{ page.permalink }}">View full GPL v3 license »</a></p>
-    </div>
-    <div class="variation-tab variation-affero-gpl js-variation-tab">
-      Affero GPL table
-      <p class="small"><a href="{{ page.permalink }}">View full Affero GPL license »</a></p>
+      <p class="small"><a href="{{ variation.permalink }}">View full {{ variation.title }} license »</a></p>
     </div>
+        {% endif %}
+    {% endfor %}
   </div>
 </div>
 
diff --git a/licenses/agpl.txt b/licenses/agpl.txt
index 4cca975..efa18ef 100644
--- a/licenses/agpl.txt
+++ b/licenses/agpl.txt
@@ -1,6 +1,7 @@
 ---
 title: Affero GPL
-family-title: GPL
+category: GPL
+slug: agpl
 hide-from-license-list: true
 layout: license
 permalink: /licenses/agpl/
diff --git a/licenses/apache.txt b/licenses/apache.txt
index c3468d0..4fdb809 100644
--- a/licenses/apache.txt
+++ b/licenses/apache.txt
@@ -1,6 +1,7 @@
 ---
 title: Apache v2 License
-family-title: Apache
+category: Apache
+slug: apache
 layout: license
 permalink: /licenses/apache/
 
diff --git a/licenses/artistic.txt b/licenses/artistic.txt
index e97657e..9fd6d6a 100644
--- a/licenses/artistic.txt
+++ b/licenses/artistic.txt
@@ -1,7 +1,8 @@
 ---
 layout: license
 title: Artistic License 2.0
-family-title: Artistic
+category: Artistic
+slug: artistic
 permalink: /licenses/artistic/
 source: http://www.perlfoundation.org/attachment/legal/artistic-2_0.txt
 
diff --git a/licenses/bsd-3-clause.txt b/licenses/bsd-3-clause.txt
index 57e9fe7..79a9250 100644
--- a/licenses/bsd-3-clause.txt
+++ b/licenses/bsd-3-clause.txt
@@ -1,7 +1,8 @@
 ---
 layout: license
 title: BSD (3-Clause) License
-family-title: BSD
+category: BSD
+slug: bsd-3
 hide-from-license-list: true
 permalink: /licenses/bsd-3-clause/
 
diff --git a/licenses/bsd.txt b/licenses/bsd.txt
index 600a205..98f8b9b 100644
--- a/licenses/bsd.txt
+++ b/licenses/bsd.txt
@@ -1,7 +1,8 @@
 ---
 layout: license
 title: BSD 2-Clause license
-family-title: BSD
+category: BSD
+slug: bsd
 hide-from-license-list: false
 permalink: /licenses/bsd/
 
diff --git a/licenses/eclipse.txt b/licenses/eclipse.txt
index 88f18ff..30ee0f6 100644
--- a/licenses/eclipse.txt
+++ b/licenses/eclipse.txt
@@ -1,7 +1,8 @@
 ---
 layout: license
 title: Eclipse Public License v1.0
-family-title: Eclipse
+category: Eclipse
+slug: eclipse
 permalink: /licenses/eclipse/
 
 description: This commercially-friendly copyleft license provides the ability to commercially license binaries; a modern royalty-free patent license grant; and the ability for linked works to use other licenses, including commercial ones.
diff --git a/licenses/gpl-v2.txt b/licenses/gpl-v2.txt
index 1a433ae..f0ddfda 100644
--- a/licenses/gpl-v2.txt
+++ b/licenses/gpl-v2.txt
@@ -1,6 +1,7 @@
 ---
 title: GPL v2
-family-title: GPL
+category: GPL
+slug: gpl-v2
 hide-from-license-list: false
 layout: license
 permalink: /licenses/gpl-v2/
diff --git a/licenses/gpl-v3.txt b/licenses/gpl-v3.txt
index f9717ce..9648203 100644
--- a/licenses/gpl-v3.txt
+++ b/licenses/gpl-v3.txt
@@ -1,6 +1,7 @@
 ---
 title: GPL v3
-family-title: GPL
+category: GPL
+slug: gpl-v3
 hide-from-license-list: true
 layout: license
 permalink: /licenses/gpl-v3/
diff --git a/licenses/lgpl-v2.1.txt b/licenses/lgpl-v2.1.txt
index 7d68343..d31a02c 100644
--- a/licenses/lgpl-v2.1.txt
+++ b/licenses/lgpl-v2.1.txt
@@ -1,7 +1,8 @@
 ---
 layout: license
 title: LGPL v2.1
-family-title: LGPL
+category: LGPL
+slug: lgpl-v2.1
 permalink: /licenses/lgpl-v2.1/
 source: http://www.gnu.org/licenses/lgpl-2.1.txt
 
diff --git a/licenses/lgpl-v3.txt b/licenses/lgpl-v3.txt
index 82b4c5e..860ba96 100644
--- a/licenses/lgpl-v3.txt
+++ b/licenses/lgpl-v3.txt
@@ -1,7 +1,8 @@
 ---
 layout: license
 title: LGPL v3
-family-title: LGPL
+category: LGPL
+slug: lgpl-v3
 hide-from-license-list: true
 permalink: /licenses/lgpl-v3/
 source: http://www.gnu.org/licenses/lgpl-3.0.txt
diff --git a/licenses/mit.txt b/licenses/mit.txt
index 217f8cd..3bc3976 100644
--- a/licenses/mit.txt
+++ b/licenses/mit.txt
@@ -1,7 +1,8 @@
 ---
 layout: license
 title: MIT License
-family-title: Apache
+category: mit
+slug: mit
 permalink: /licenses/mit/
 source: http://opensource.org/licenses/MIT
 
diff --git a/licenses/mozilla.txt b/licenses/mozilla.txt
index 1efcfd4..ce91ea0 100644
--- a/licenses/mozilla.txt
+++ b/licenses/mozilla.txt
@@ -1,7 +1,8 @@
 ---
 layout: license
 title: Mozilla Public License Version 2.0
-family-title: Mozilla
+category: Mozilla
+slug: mozilla
 permalink: /licenses/mozilla/
 source: http://www.mozilla.org/MPL/2.0/
 
diff --git a/licenses/no-license.html b/licenses/no-license.html
index 783e374..9ae7baa 100644
--- a/licenses/no-license.html
+++ b/licenses/no-license.html
@@ -1,6 +1,8 @@
 ---
 layout: license
 permalink: /licenses/no-license/
+category: No License
+slug: no-license
 class: license-types
 title: No License
 
diff --git a/licenses/public-domain.txt b/licenses/public-domain.txt
index a870459..b002f6c 100644
--- a/licenses/public-domain.txt
+++ b/licenses/public-domain.txt
@@ -3,6 +3,8 @@ layout: license
 permalink: /licenses/public-domain/
 class: license-types
 title: Public Domain (Unlicense)
+category: Public Domain
+slug: unlicense
 filename: UNLICENSE
 
 source: http://unlicense.org/UNLICENSE