diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index d3110ad..b13491a 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -54,6 +54,7 @@ function pages() {
   return gulp.src(['src/pages/**/*.html', '!src/pages/archive/**/*.html'])
     .pipe(panini({
       root: 'src/pages',
+      data: 'src/data',
       layouts: 'src/layouts',
       partials: 'src/partials',
       helpers: 'src/helpers'
@@ -108,7 +109,7 @@ function server(done) {
 // Watch for file changes
 function watch() {
   gulp.watch('src/pages/**/*.html').on('all', gulp.series(pages, inline, browser.reload));
-  gulp.watch(['src/layouts/**/*', 'src/partials/**/*']).on('all', gulp.series(resetPages, pages, inline, browser.reload));
+  gulp.watch(['src/data/**/*', 'src/layouts/**/*', 'src/partials/**/*']).on('all', gulp.series(resetPages, pages, inline, browser.reload));
   gulp.watch(['../scss/**/*.scss', 'src/assets/scss/**/*.scss']).on('all', gulp.series(resetPages, sass, pages, inline, browser.reload));
   gulp.watch('src/assets/img/**/*').on('all', gulp.series(images, browser.reload));
 }
diff --git a/src/data/templates.yml b/src/data/templates.yml
new file mode 100644
index 0000000..94e4c93
--- /dev/null
+++ b/src/data/templates.yml
@@ -0,0 +1,22 @@
+- html: basic.html
+  name: Basic Template
+- html: drip.html
+  name: Drip Template
+- html: hero.html
+  name: Hero Template
+- html: marketing.html
+  name: Marketing Template
+- html: newsletter.html
+  name: Newsletter Template
+- html: newsletter-2.html
+  name: Newsletter 2 Template
+- html: order.html
+  name: Order Template Template
+- html: password.html
+  name: Password Template
+- html: sidebar.html
+  name: Sidebar Template
+- html: sidebar-hero.html
+  name: Sidebar Hero Template
+- html: welcome.html
+  name: Welcome Template
diff --git a/src/pages/index.html b/src/pages/index.html
index 95cbddf..aeb413a 100644
--- a/src/pages/index.html
+++ b/src/pages/index.html
@@ -8,7 +8,7 @@
 <container>
 
   <spacer size="24"></spacer>
-  
+
   <row>
     <columns small="12">
 
@@ -19,17 +19,9 @@
 
     <center>
       <menu class="vertical">
-        <item href="{{root}}basic.html" target="_blank">Basic Template</item>
-        <item href="{{root}}drip.html" target="_blank">Drip Template</item>
-        <item href="{{root}}hero.html" target="_blank">Hero Template</item>
-        <item href="{{root}}marketing.html" target="_blank">Marketing Template</item>
-        <item href="{{root}}newsletter.html" target="_blank">Newsletter Template</item>
-        <item href="{{root}}newsletter-2.html" target="_blank">Newsletter 2 Template</item>
-        <item href="{{root}}order.html" target="_blank">Order Template</item>
-        <item href="{{root}}password.html" target="_blank">Password Template</item>
-        <item href="{{root}}sidebar.html" target="_blank">Sidebar Template</item>
-        <item href="{{root}}sidebar-hero.html" target="_blank">Sidebar Hero Template</item>
-        <item href="{{root}}welcome.html" target="_blank">Welcome Template</item>
+        {{#each templates}}
+          <item href="{{root}}{{this.html}}" target="_blank">{{this.name}}</item>
+        {{/each}}
       </menu>
     </center>
 
@@ -52,4 +44,3 @@
 </center>
 
 <spacer size="16"></spacer>
-