diff --git a/site/_data/docs.yml b/site/_data/docs.yml
new file mode 100644
index 00000000..4e89bcb2
--- /dev/null
+++ b/site/_data/docs.yml
@@ -0,0 +1,43 @@
+- title: Getting Started
+ docs:
+ - home
+ - quickstart
+ - installation
+ - usage
+ - structure
+ - configuration
+
+- title: Your Content
+ docs:
+ - frontmatter
+ - posts
+ - drafts
+ - pages
+ - variables
+ - datafiles
+ - migrations
+
+- title: Customization
+ docs:
+ - templates
+ - permalinks
+ - pagination
+ - plugins
+ - extras
+
+- title: Deployment
+ docs:
+ - github-pages
+ - deployment-methods
+
+- title: Miscellaneous
+ docs:
+ - troubleshooting
+ - sites
+ - resources
+ - upgrading
+
+- title: Meta
+ docs:
+ - contributing
+ - history
diff --git a/site/_includes/docs_contents.html b/site/_includes/docs_contents.html
index 523b5227..2ac64bb4 100644
--- a/site/_includes/docs_contents.html
+++ b/site/_includes/docs_contents.html
@@ -1,16 +1,8 @@
diff --git a/site/_includes/docs_contents_mobile.html b/site/_includes/docs_contents_mobile.html
index bbc367d4..b3e0110c 100644
--- a/site/_includes/docs_contents_mobile.html
+++ b/site/_includes/docs_contents_mobile.html
@@ -1,23 +1,10 @@
diff --git a/site/_includes/docs_option.html b/site/_includes/docs_option.html
index 8284ed96..a1e29cac 100644
--- a/site/_includes/docs_option.html
+++ b/site/_includes/docs_option.html
@@ -1,4 +1,4 @@
-{% assign items = include.items | split: ' ' %}
+{% assign items = include.items %}
{% for item in items %}
{% assign item_url = item | prepend:'/docs/' | append:'/' %}
diff --git a/site/_includes/docs_ul.html b/site/_includes/docs_ul.html
index 4ba82479..99ac26ef 100644
--- a/site/_includes/docs_ul.html
+++ b/site/_includes/docs_ul.html
@@ -1,4 +1,4 @@
-{% assign items = include.items | split: ' ' %}
+{% assign items = include.items %}
{% for item in items %}
@@ -16,5 +16,5 @@
{% endif %}
{% endfor %}
-{% endfor %}
+{% endfor %}