diff --git a/_data/categories.yml b/_data/categories.yml
new file mode 100644
index 000000000..4c296b751
--- /dev/null
+++ b/_data/categories.yml
@@ -0,0 +1,23 @@
+enabled: true
+names:
+  - Ansible
+  - Apps
+  - CLI
+  - CSS
+  - Devops
+  - Elixir
+  - Git
+  - HTML
+  - JavaScript
+  - JavaScript libraries
+  - Jekyll
+  - Ledger
+  - Markup
+  - Node.js
+  - Rails
+  - React
+  - Ruby
+  - Ruby libraries
+  - Vim
+  - Fitness
+  - Others
diff --git a/_data/category.yml b/_data/category.yml
deleted file mode 100644
index e69de29bb..000000000
diff --git a/_layouts/2017/home.html b/_layouts/2017/home.html
index 53c8bce41..d1301e706 100644
--- a/_layouts/2017/home.html
+++ b/_layouts/2017/home.html
@@ -40,7 +40,8 @@
       {% endif %}
     {% endfor %}
 
-    {% for category in site.data.category.names %}
+
+    {% for category in site.data.categories.names %}
       <h2 class='category item' id='{{ category | downcase | replace: " ", "-" }}' data-js-searchable-header>
         <span>{{ category }}</span>
       </h2>
@@ -59,6 +60,7 @@
       <p>
         <a class='push-button' href='{{ site.github.repository_url }}/issues/new?title=Cheatsheet%20request:%20APP_NAME_HERE'>Request cheatsheet</a>
       </p>
+    </div>
   </div>
 </div>
 
diff --git a/_layouts/2017/sheet.html b/_layouts/2017/sheet.html
index 280357216..393a0238a 100644
--- a/_layouts/2017/sheet.html
+++ b/_layouts/2017/sheet.html
@@ -1,7 +1,3 @@
----
-og_type: article
-type: article
----
 {% include 2017/head.html %}
 
 {% include 2017/top-nav.html page=page %}
diff --git a/_layouts/home.html b/_layouts/home.html
index b1785649b..129954589 100644
--- a/_layouts/home.html
+++ b/_layouts/home.html
@@ -5,7 +5,7 @@ type: home
 {% include head.html %}
 {% include site-header.html %}
 
-{% for category in site.data.category.names %}
+{% for category in site.data.categories.names %}
   <div class='pages-header'>
     <h2 id='{{ category | downcase | replace: " ", "-" }}'>{{ category }}</h2>
   </div>