diff --git a/rest-theme/src/main.js b/rest-theme/src/main.js
index c0f2aa6..686ecc0 100644
--- a/rest-theme/src/main.js
+++ b/rest-theme/src/main.js
@@ -1,61 +1,73 @@
+/* global wp */
+
+String.prototype.capitalize = function () {
+  return this.charAt(0).toUpperCase() + this.slice(1)
+}
+
 import Vue from 'vue'
 import VueRouter from 'vue-router'
 
-Vue.use(require('vue-resource'));
-Vue.use(VueRouter);
+Vue.use(require('vue-resource'))
+Vue.use(VueRouter)
 
 Vue.config.debug = true
 
 import Posts from './posts.vue'
 import Post from './post.vue'
-Vue.component('Post', Post)
 import Page from './page.vue'
-Vue.component('Page', Page)
 import Header from './theme-header.vue'
-Vue.component('theme-header', Header)
 import Footer from './theme-footer.vue'
+
+Vue.component('Post', Post)
+Vue.component('Page', Page)
+Vue.component('theme-header', Header)
 Vue.component('theme-footer', Footer)
 
-var App = Vue.extend({
-    template: '<theme-header></theme-header>' +
-              '<div class="container"><router-view></router-view></div>' +
-              '<theme-footer></theme-footer>',
+var
+  App = Vue.extend({
+    template: `
+<div>
+  <theme-header></theme-header>
+  <div class="container">
+    <router-view></router-view>
+  </div>
+  <theme-footer></theme-footer>
+<div>`,
 
     ready() {
-        this.updateTitle('');
+      this.updateTitle('')
     },
 
     methods: {
-        updateTitle(pageTitle) {
-            document.title = (pageTitle ? pageTitle + ' - ' : '') + wp.site_name;
-        }
+      updateTitle(pageTitle) {
+        document.title = (pageTitle ? pageTitle + ' - ' : '') + wp.site_name
+      }
     },
 
     events: {
-        'page-title': function(pageTitle) {
-            this.updateTitle(pageTitle);
-        }
+      'page-title': function (pageTitle) {
+        this.updateTitle(pageTitle)
+      }
     }
-});
-var router = new VueRouter({
+  }),
+
+  router = new VueRouter({
     hashbang: false,
     history: true
-});
+  }),
+
+  key, route
 
 router.on(wp.base_path, {
-    component: Posts
-});
-
-for (var key in wp.routes) {
-    var route = wp.routes[key];
-    router.on(wp.base_path + route.slug, {
-        component: Vue.component(capitalize(route.type)),
-        postId: route.id
-    });
-}
+  component: Posts
+})
 
-router.start(App, '#app');
+for (key in wp.routes) {
+  route = wp.routes[key]
+  router.on(wp.base_path + route.slug, {
+    component: Vue.component(route.type.capitalize()),
+    postId: route.id
+  })
+}
 
-function capitalize(string) {
-    return string.charAt(0).toUpperCase() + string.slice(1);
-}
\ No newline at end of file
+router.start(App, '#app')
diff --git a/rest-theme/src/page.vue b/rest-theme/src/page.vue
index 723762c..03a9d1d 100644
--- a/rest-theme/src/page.vue
+++ b/rest-theme/src/page.vue
@@ -1,49 +1,52 @@
-<style>
-
-</style>
-
 <template>
-    <div class="page">
-        <h1 class="entry-title">{{ page.title.rendered }}</h1>
-
-        <div class="entry-content">
-            {{{ page.content.rendered }}}
-        </div>
+  <div class="page">
+    <h1 class="entry-title">{{ page.title.rendered }}</h1>
+    <div class="entry-content">
+      {{{ page.content.rendered }}}
     </div>
+  </div>
 </template>
 
 <script>
-    export default {
-        ready() {
-            this.getPage();
-        },
+export default {
+  ready() {
+    this.getPage()
+  },
 
-        data() {
-            return {
-                page: {
-                    id: 0,
-                    slug: '',
-                    title: { rendered: '' },
-                    content: { rendered: '' }
-                }
-            }
+  data() {
+    return {
+      page: {
+        id: 0,
+        slug: '',
+        title: {
+          rendered: ''
         },
+        content: {
+          rendered: ''
+        }
+      }
+    }
+  },
 
-        methods: {
-            getPage() {
-                this.$http.get(wp.root + 'wp/v2/pages/' + this.$route.postId).then(function(response) {
-                    this.page = response.data;
-                    this.$dispatch('page-title', this.page.title.rendered);
-                }, function(response) {
-                    console.log(response);
-                });
-            }
+  methods: {
+    getPage() {
+      this.$http.get(wp.root + 'wp/v2/pages/' + this.$route.postId).then(
+        function(response) {
+          this.page = response.data
+          this.$dispatch('page-title', this.page.title.rendered)
         },
+        function(response) {
+          console.log(response)
+        })
+    }
+  },
 
-        route: {
-            canReuse() {
-                return false;
-            }
-        }
+  route: {
+    canReuse() {
+      return false
     }
-</script>
\ No newline at end of file
+  }
+}
+
+</script>
+
diff --git a/rest-theme/src/post.vue b/rest-theme/src/post.vue
index a8a3433..d27853f 100644
--- a/rest-theme/src/post.vue
+++ b/rest-theme/src/post.vue
@@ -1,58 +1,63 @@
-<style>
-
-</style>
-
 <template>
-    <div class="post">
-        <h1 class="entry-title" v-if="isSingle">{{ post.title.rendered }}</h1>
-        <h2 class="entry-title" v-else><a v-link="{ path: base_path + post.slug }">{{ post.title.rendered }}</a></h2>
-
-        <div class="entry-content">
-            {{{ post.content.rendered }}}
-        </div>
+  <div class="post">
+    <h1 class="entry-title" v-if="isSingle">{{ post.title.rendered }}</h1>
+    <h2 class="entry-title" v-else>
+      <a v-link="{ path: basePath + post.slug }">{{ post.title.rendered }}</a>
+    </h2>
+    <div class="entry-content">
+      {{{ post.content.rendered }}}
     </div>
+  </div>
 </template>
 
 <script>
-    export default {
-        props: {
-            post: {
-                type: Object,
-                default() {
-                    return {
-                        id: 0,
-                        slug: '',
-                        title: { rendered: '' },
-                        content: { rendered: '' }
-                    }
-                }
-            }
-        },
+export default {
+  props: {
+    post: {
+      type: Object,
+      default () {
+        return {
+          id: 0,
+          slug: '',
+          title: {
+            rendered: ''
+          },
+          content: {
+            rendered: ''
+          }
+        }
+      }
+    }
+  },
 
-        ready() {
-            // If post hasn't been passed by prop
-            if (!this.post.id) {
-                this.getPost();
-                this.isSingle = true;
-            }
-        },
+  ready() {
+    // If post hasn't been passed by prop
+    if (!this.post.id) {
+      this.getPost()
+      this.isSingle = true
+    }
+  },
 
-        data() {
-            return {
-                base_path: wp.base_path,
-                isSingle: false
-            }
-        },
+  data() {
+    return {
+      basePath: wp.base_path,
+      isSingle: false
+    }
+  },
 
-        methods: {
-            getPost() {
-                this.$http.get(wp.root + 'wp/v2/posts/' + this.$route.postId).then(function(response) {
-                    this.post = response.data;
-                    this.$dispatch('page-title', this.post.title.rendered);
-                }, function(response) {
-                    console.log(response);
-                });
-            }
-        }
+  methods: {
+    getPost() {
+      this.$http.get(wp.root + 'wp/v2/posts/' + this.$route.postId)
+      .then(function(response) {
+        this.post = response.data
+        this.$dispatch('page-title', this.post.title.rendered)
+      })
+      .catch(function(error) {
+        console.log(error)
+      })
     }
-</script>
\ No newline at end of file
+  }
+}
+
+</script>
+
diff --git a/rest-theme/src/posts.vue b/rest-theme/src/posts.vue
index 09d3644..cff5f24 100644
--- a/rest-theme/src/posts.vue
+++ b/rest-theme/src/posts.vue
@@ -1,34 +1,32 @@
-<style>
-
-</style>
-
 <template>
-    <div class="posts">
-        <Post v-for="post in posts" :post="post"></Post>
-    </div>
+  <div class="posts">
+    <Post v-for="post in posts" :post="post"></Post>
+  </div>
 </template>
 
 <script>
-    export default {
-        ready() {
-            this.getPosts();
-        },
+export default {
+  ready() {
+    this.getPosts()
+  },
 
-        data() {
-            return {
-                posts: []
-            }
-        },
+  data() {
+    return {
+      posts: []
+    }
+  },
 
-        methods: {
-            getPosts() {
-                this.$http.get(wp.root + 'wp/v2/posts').then(function(response) {
-                    this.posts = response.data;
-                    this.$dispatch('page-title', '');
-                }, function(response) {
-                    console.log(response);
-                });
-            }
-        }
+  methods: {
+    getPosts() {
+      this.$http.get(wp.root + 'wp/v2/posts').then(function(response) {
+        this.posts = response.data
+        this.$dispatch('page-title', '')
+      }, function(response) {
+        console.log(response)
+      })
     }
-</script>
\ No newline at end of file
+  }
+}
+
+</script>
+
diff --git a/rest-theme/src/theme-footer.vue b/rest-theme/src/theme-footer.vue
index 7fb84e5..c6612cc 100644
--- a/rest-theme/src/theme-footer.vue
+++ b/rest-theme/src/theme-footer.vue
@@ -1,26 +1,27 @@
 <style>
-    .footer {
-        font-size: 14px;
-        color: #999;
-        margin-top: 50px;
-    }
+.footer {
+  font-size: 14px;
+  color: #999;
+  margin-top: 50px;
+}
 </style>
 
 <template>
-    <footer class="footer">
-        <div class="container">
-            Copyright &copy; <a v-link="{ path: base_path }">{{ site_name }}</a>
-        </div>
-    </footer>
+  <footer class="footer">
+    <div class="container">
+      Copyright &copy; <a v-link="{ path: basePath }">{{ siteName }}</a>
+    </div>
+  </footer>
 </template>
 
 <script>
-    export default {
-        data() {
-            return {
-                base_path: wp.base_path,
-                site_name: wp.site_name
-            }
-        }
+export default {
+  data() {
+    return {
+      basePath: wp.base_path,
+      siteName: wp.site_name
     }
-</script>
\ No newline at end of file
+  }
+}
+</script>
+
diff --git a/rest-theme/src/theme-header.vue b/rest-theme/src/theme-header.vue
index 32e7d90..c135519 100644
--- a/rest-theme/src/theme-header.vue
+++ b/rest-theme/src/theme-header.vue
@@ -1,61 +1,69 @@
 <style>
-    .header {
-        box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
-        margin-bottom: 50px;
-    }
-    .header .container { display: flex; }
-    .header .site-title { width: 50%; }
-    .header .nav {
-        list-style: none;
-        margin: 0;
-        padding: 0;
-        width: 50%;
-        text-align: right;
-    }
-    .header .nav li {
-        display: inline;
-        margin-left: 15px;
-    }
-    .header .v-link-active { color: #333; }
+.header {
+  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
+  margin-bottom: 50px;
+}
+.header .container {
+  display: flex;
+}
+.header .site-title {
+  width: 50%;
+}
+.header .nav {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+  width: 50%;
+  text-align: right;
+}
+.header .nav li {
+  display: inline;
+  margin-left: 15px;
+}
+.header .v-link-active {
+  color: #333;
+}
 </style>
 
 <template>
-    <header class="header">
-        <div class="container">
-            <div class="site-title">
-                <a v-link="{ path: base_path }">{{ site_name }}</a>
-            </div>
-            <ul class="nav">
-                <li v-for="page in pages">
-                    <a v-link="{ path: base_path + page.slug }">{{ page.title.rendered }}</a>
-                </li>
-            </ul>
-        </div>
-    </header>
+  <header class="header">
+    <div class="container">
+      <div class="site-title">
+        <a v-link="{ path: basePath }">{{ siteName }}</a>
+      </div>
+      <ul class="nav">
+        <li v-for="page in pages">
+          <a v-link="{ path: basePath + page.slug }">{{ page.title.rendered }}</a>
+        </li>
+      </ul>
+    </div>
+  </header>
 </template>
 
 <script>
-    export default {
-        ready() {
-            this.getPages();
-        },
+export default {
+  ready() {
+    this.getPages()
+  },
 
-        data() {
-            return {
-                base_path: wp.base_path,
-                site_name: wp.site_name,
-                pages: []
-            }
-        },
+  data() {
+    return {
+      basePath: wp.base_path,
+      siteName: wp.site_name,
+      pages: []
+    }
+  },
 
-        methods: {
-            getPages() {
-                this.$http.get(wp.root + 'wp/v2/pages').then(function(response) {
-                    this.pages = response.data;
-                }, function(response) {
-                    console.log(response);
-                });
-            }
-        }
+  methods: {
+    getPages() {
+      this.$http.get(wp.root + 'wp/v2/pages').then(function(response) {
+        this.pages = response.data
+      }, function(response) {
+        console.log(response)
+      })
     }
-</script>
\ No newline at end of file
+  }
+}
+
+</script>
+