diff --git a/_config.yml b/_config.yml
index 6477c79e6..8b972f86e 100644
--- a/_config.yml
+++ b/_config.yml
@@ -21,6 +21,7 @@ kramdown:
 defaults:
   - scope:
       path: ""
+      type: pages
     values:
       layout: "default"
       category: "Others"
diff --git a/_includes/2017/pages-list-item.html b/_includes/2017/pages-list-item.html
new file mode 100644
index 000000000..e530b6644
--- /dev/null
+++ b/_includes/2017/pages-list-item.html
@@ -0,0 +1,6 @@
+<a class='article item' href="{{base}}{{ include.page.url | remove: '.html' }}">
+  <code class='slug'>{{ include.page.url | remove: '.html' | remove: '/' }}</code>
+  {% if include.page.title | downcase != include.page.url | remove: '.html' | remove: '/' %}
+    <span class='title'>{{ include.page.title }}</span>
+  {% endif %}
+</a>
diff --git a/_layouts/2017/home.html b/_layouts/2017/home.html
index dc48eca7f..85e40ec6a 100644
--- a/_layouts/2017/home.html
+++ b/_layouts/2017/home.html
@@ -11,6 +11,16 @@ type: website
   </div>
 
   <div class='pages-list'>
+    <h2 class='category item' id='{{ category | downcase | replace: " ", "-" }}'>
+      <span>Top cheatsheets</span>
+    </h2>
+
+    {{ site.tags }}
+
+    {% for page in site.tags.Featured %}
+      {% include 2017/pages-list-item.html page=page %}
+    {% endfor %}
+
     {% for category in site.category_names %}
       <h2 class='category item' id='{{ category | downcase | replace: " ", "-" }}'>
         <span>{{ category }}</span>
@@ -19,12 +29,7 @@ type: website
       {% for page in site.pages %}
         {% if page.category == category %}
           {% if page.type == article %}
-            <a class='article item' href="{{base}}{{ page.url | remove: '.html' }}">
-              <code class='slug'>{{ page.url | remove: '.html' | remove: '/' }}</code>
-              {% if page.title | downcase != page.url | remove: '.html' | remove: '/' %}
-                <span class='title'>{{ page.title }}</span>
-              {% endif %}
-            </a>
+            {% include 2017/pages-list-item.html page=page %}
           {% endif %}
         {% endif %}
       {% endfor %}