From 2f26d731fc5fedc86a34bcbe34eae4c7f9401f7d Mon Sep 17 00:00:00 2001
From: Nicolas Giard <github@ngpixel.com>
Date: Thu, 9 Aug 2018 00:07:15 -0400
Subject: [PATCH] feat: themes foundation + editors load improvements

---
 client/app.js                                 |   1 +
 client/components/common/nav-footer.vue       |   2 +-
 client/components/common/nav-header.vue       |  46 ++++++--
 client/components/profile/preferences.vue     |  20 +++-
 client/components/profile/profile.vue         |   6 +-
 client/index.js                               |   4 +-
 client/themes/default/components/app.vue      |  88 ++++++++++++++
 client/themes/default/js/app.js               |   1 +
 client/themes/default/scss/app.scss           |  45 ++++++++
 client/themes/default/theme.yml               |   7 ++
 .../themes}/default/thumbnail.png             | Bin
 dev/config/config.yml                         |   4 -
 dev/tasks/localization.js                     |  56 ---------
 dev/webpack/webpack.dev.js                    |   5 +-
 dev/webpack/webpack.prod.js                   |  25 +---
 package.json                                  |  20 ++--
 server/controllers/common.js                  |   9 +-
 server/db/migrations/2.0.0.js                 |   1 +
 server/jobs/render-page.js                    |  15 +++
 server/models/editors.js                      |  51 ++++++---
 server/models/pages.js                        |   9 ++
 server/modules/editor/markdown.js             |  10 --
 server/modules/editor/markdown/definition.yml |   6 +
 server/views/main/editor.pug                  |   7 +-
 server/views/main/page.pug                    |  45 ++++++++
 server/views/main/profile.pug                 |   5 +-
 server/views/main/setup.pug                   |   5 +-
 themes/default/theme.yml                      |  28 -----
 themes/default/views/page.pug                 |  65 -----------
 yarn.lock                                     | 108 +++++++++---------
 30 files changed, 396 insertions(+), 298 deletions(-)
 create mode 100644 client/themes/default/components/app.vue
 create mode 100644 client/themes/default/js/app.js
 create mode 100644 client/themes/default/scss/app.scss
 create mode 100644 client/themes/default/theme.yml
 rename {themes => client/themes}/default/thumbnail.png (100%)
 delete mode 100644 dev/config/config.yml
 delete mode 100644 dev/tasks/localization.js
 create mode 100644 server/jobs/render-page.js
 delete mode 100644 server/modules/editor/markdown.js
 create mode 100644 server/modules/editor/markdown/definition.yml
 create mode 100644 server/views/main/page.pug
 delete mode 100644 themes/default/theme.yml
 delete mode 100644 themes/default/views/page.pug

diff --git a/client/app.js b/client/app.js
index e81002bc..edb36000 100644
--- a/client/app.js
+++ b/client/app.js
@@ -115,6 +115,7 @@ Vue.component('nav-header', () => import(/* webpackMode: "eager" */ './component
 Vue.component('profile', () => import(/* webpackChunkName: "profile" */ './components/profile.vue'))
 Vue.component('setup', () => import(/* webpackChunkName: "setup" */ './components/setup.vue'))
 Vue.component('v-card-chin', () => import(/* webpackMode: "eager" */ './components/common/v-card-chin.vue'))
+Vue.component('page', () => import(/* webpackChunkName: "theme-page" */ './themes/' + process.env.CURRENT_THEME + '/components/app.vue'))
 
 let bootstrap = () => {
   // ====================================
diff --git a/client/components/common/nav-footer.vue b/client/components/common/nav-footer.vue
index 4cd41032..d266aa5f 100644
--- a/client/components/common/nav-footer.vue
+++ b/client/components/common/nav-footer.vue
@@ -1,5 +1,5 @@
 <template lang="pug">
-  v-footer.py-2.justify-center(app, absolute, :color='darkMode ? "" : "grey lighten-3"', inset, height='auto')
+  v-footer.justify-center(:color='darkMode ? "" : "grey lighten-3"', inset)
     .caption.grey--text.text--darken-1
       span(v-if='company && company.length > 0') {{ $t('common:footer.copyright', { company: company, year: currentYear }) }} |&nbsp;
       span {{ $t('common:footer.poweredBy') }} Wiki.js
diff --git a/client/components/common/nav-header.vue b/client/components/common/nav-header.vue
index bb589651..6b2967b0 100644
--- a/client/components/common/nav-header.vue
+++ b/client/components/common/nav-header.vue
@@ -1,30 +1,30 @@
 <template lang='pug'>
-  v-toolbar(color='black', dark, app, clipped-left, fixed, flat, :dense='dense')
-    v-menu(open-on-hover, offset-y, bottom, left, nudge-top='-18', min-width='250')
+  v-toolbar(color='black', dark, app, clipped-left, fixed, flat)
+    v-menu(open-on-hover, offset-y, bottom, left, min-width='250')
       v-toolbar-side-icon(slot='activator')
         v-icon view_module
       v-list(dense).py-0
         v-list-tile(avatar, href='/')
           v-list-tile-avatar: v-icon(color='blue') home
           v-list-tile-content Home
-        v-list-tile(avatar, @click='')
+        v-list-tile(avatar, @click='pageNew')
           v-list-tile-avatar: v-icon(color='green') add_box
           v-list-tile-content New Page
         v-divider.my-0
         v-subheader Current Page
-        v-list-tile(avatar, @click='')
+        v-list-tile(avatar, @click='pageEdit')
           v-list-tile-avatar: v-icon(color='indigo') edit
           v-list-tile-content Edit
-        v-list-tile(avatar, @click='')
+        v-list-tile(avatar, @click='pageHistory')
           v-list-tile-avatar: v-icon(color='indigo') history
           v-list-tile-content History
-        v-list-tile(avatar, @click='')
+        v-list-tile(avatar, @click='pageSource')
           v-list-tile-avatar: v-icon(color='indigo') code
           v-list-tile-content View Source
-        v-list-tile(avatar, @click='')
+        v-list-tile(avatar, @click='pageMove')
           v-list-tile-avatar: v-icon(color='indigo') forward
           v-list-tile-content Move / Rename
-        v-list-tile(avatar, @click='')
+        v-list-tile(avatar, @click='pageDelete')
           v-list-tile-avatar: v-icon(color='red darken-2') delete
           v-list-tile-content Delete
         v-divider.my-0
@@ -61,11 +61,15 @@
     .navHeaderLoading.mr-3
       v-progress-circular(indeterminate, color='blue', :size='22', :width='2' v-show='isLoading')
     slot(name='actions')
-    v-btn(icon, href='/a')
-      v-icon(color='grey') settings
+    v-tooltip(bottom)
+      v-btn(icon, href='/a', slot='activator')
+        v-icon(color='grey') settings
+      span Admin
     v-menu(offset-y, min-width='300')
-      v-btn(icon, slot='activator')
-        v-icon(color='grey') account_circle
+      v-tooltip(bottom, slot='activator')
+        v-btn(icon, slot='activator')
+          v-icon(color='grey') account_circle
+        span Account
       v-list.py-0
         v-list-tile.py-3(avatar)
           v-list-tile-avatar
@@ -116,6 +120,24 @@ export default {
   methods: {
     searchEnter() {
       this.searchIsLoading = true
+    },
+    pageNew () {
+
+    },
+    pageEdit () {
+
+    },
+    pageHistory () {
+
+    },
+    pageSource () {
+
+    },
+    pageMove () {
+
+    },
+    pageDelete () {
+
     }
   }
 }
diff --git a/client/components/profile/preferences.vue b/client/components/profile/preferences.vue
index 8e92a69b..c9ea0c67 100644
--- a/client/components/profile/preferences.vue
+++ b/client/components/profile/preferences.vue
@@ -14,10 +14,18 @@
                       .subheading Display
                   v-card-text
                     v-subheader.pl-0 Locale
-                    v-select.grey.lighten-5(solo, flat)
-                    v-divider
+                    v-select(
+                      outline
+                      background-color='grey lighten-2'
+                      hide-details
+                      )
+                    v-divider.mt-3
                     v-subheader.pl-0 Timezone
-                    v-select.grey.lighten-5(solo, flat)
+                    v-select(
+                      outline
+                      background-color='grey lighten-2'
+                      hide-details
+                      )
                   v-card-chin
                     v-spacer
                     v-btn(color='primary')
@@ -30,7 +38,11 @@
                     .subheading Editing
                 v-card-text
                   v-subheader.pl-0 Default Editor
-                  v-select.grey.lighten-5(solo, flat)
+                  v-select(
+                    outline
+                    background-color='grey lighten-2'
+                    hide-details
+                    )
                 v-card-chin
                   v-spacer
                   v-btn(color='primary')
diff --git a/client/components/profile/profile.vue b/client/components/profile/profile.vue
index daab57fe..9efbbc37 100644
--- a/client/components/profile/profile.vue
+++ b/client/components/profile/profile.vue
@@ -36,12 +36,12 @@
               )
               v-icon(:color='darkMode ? "grey lighten-1" : "purple darken-4"') supervised_user_circle
               .subheading.ml-3 Local
-            v-divider
+            v-divider.mt-3
             v-subheader.pl-0 Two-Factor Authentication (2FA)
             .caption.mb-2 2FA adds an extra layer of security by requiring a unique code generated on your smartphone when signing in.
             v-btn(color='purple darken-4', dark, depressed).ml-0 Enable 2FA
             v-btn(color='purple darken-4', dark, depressed, disabled).ml-0 Disable 2FA
-            v-divider
+            v-divider.mt-3
             v-subheader.pl-0 Change Password
             v-text-field(label='Current Password', prepend-icon='last_page')
             v-text-field(label='New Password', prepend-icon='last_page')
@@ -68,7 +68,7 @@
             .body-1: strong January 1st, 2018 at 12:00 AM
             .body-2.grey--text.mt-3 Last login on
             .body-1: strong January 1st, 2018 at 12:00 AM
-            v-divider
+            v-divider.mt-3
             .body-2.grey--text.mt-3 Pages created
             .body-1: strong 0
             .body-2.grey--text.mt-3 Comments posted
diff --git a/client/index.js b/client/index.js
index c857512e..51f6ec1e 100644
--- a/client/index.js
+++ b/client/index.js
@@ -2,6 +2,8 @@
 
 require('vuetify/src/stylus/main.styl')
 require('./scss/app.scss')
+require('./themes/' + process.env.CURRENT_THEME + '/scss/app.scss')
+
 require('./helpers/compatibility.js')
-require('offline-plugin/runtime').install()
 require('./app.js')
+require('./themes/' + process.env.CURRENT_THEME + '/js/app.js')
diff --git a/client/themes/default/components/app.vue b/client/themes/default/components/app.vue
new file mode 100644
index 00000000..229e2364
--- /dev/null
+++ b/client/themes/default/components/app.vue
@@ -0,0 +1,88 @@
+<template lang="pug">
+  v-app
+    nav-header
+    v-navigation-drawer.primary(dark, app, clipped, permanent)
+      v-list(dense)
+        v-list-tile.pt-2
+          v-list-tile-avatar: v-icon home
+          v-list-tile-title Home
+        v-divider.my-2
+        v-subheader.pl-4 Navigation
+        v-list-tile
+          v-list-tile-avatar: v-icon stars
+          v-list-tile-title The Universe
+        v-list-tile
+          v-list-tile-avatar: v-icon directions_boat
+          v-list-tile-title Ships
+        v-list-tile
+          v-list-tile-avatar: v-icon local_airport
+          v-list-tile-title Airports
+
+    v-content
+      v-toolbar(color='grey lighten-3', flat, dense)
+        v-breadcrumbs.pl-0(divider='/')
+          v-breadcrumbs-item Universe
+          v-breadcrumbs-item Galaxy
+          v-breadcrumbs-item Solar System
+          v-breadcrumbs-item Planet Earth
+
+      v-divider
+      v-layout(row)
+        v-flex(xs10)
+          v-toolbar(color='grey lighten-4', flat, :height='90')
+            div
+              .headline.grey--text.text--darken-3 {{title}}
+              .caption.grey--text.text--darken-1 {{description}}
+          .contents
+            slot(name='contents')
+        v-flex(xs2, fill-height)
+          v-toolbar(color='grey lighten-4', flat, :height='90')
+            div
+              .caption.grey--text.text--lighten-1 Last edited by
+              .body-2.grey--text.text--darken-3 John Doe
+              .caption.grey--text.text--darken-1 Monday at 12:34 PM
+            v-spacer
+            v-icon edit
+          v-list.grey.lighten-3(dense)
+            v-subheader.pl-4 Table of contents
+            v-list-tile
+              v-list-tile-avatar: v-icon chevron_right
+              v-list-tile-title Introduction
+            v-list-tile
+              v-list-tile-avatar: v-icon chevron_right
+              v-list-tile-title Cities
+            v-list-tile(inset)
+              v-list-tile-avatar: v-icon chevron_right
+              v-list-tile-title New York
+            v-divider.my-2
+            v-subheader.pl-4 Metadata
+            v-list-tile
+              v-list-tile-avatar: v-icon chevron_right
+              v-list-tile-title Test
+            v-list-tile
+              v-list-tile-avatar: v-icon chevron_right
+              v-list-tile-title Test
+            v-list-tile
+              v-list-tile-avatar: v-icon chevron_right
+              v-list-tile-title Test
+    nav-footer
+</template>
+
+<script>
+export default {
+  props: {
+    title: {
+      type: String,
+      default: 'Untitled Page'
+    },
+    description: {
+      type: String,
+      default: ''
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+
+</style>
diff --git a/client/themes/default/js/app.js b/client/themes/default/js/app.js
new file mode 100644
index 00000000..34efb224
--- /dev/null
+++ b/client/themes/default/js/app.js
@@ -0,0 +1 @@
+/* THEME SPECIFIC JAVASCRIPT */
diff --git a/client/themes/default/scss/app.scss b/client/themes/default/scss/app.scss
new file mode 100644
index 00000000..4f738893
--- /dev/null
+++ b/client/themes/default/scss/app.scss
@@ -0,0 +1,45 @@
+/* THEME SPECIFIC STYLES */
+
+.contents {
+  h1 {
+    padding-left: 16px;
+    color: mc('blue', '800');
+    margin-top: 16px;
+    position: relative;
+
+    &::after {
+      content: '';
+      position: absolute;
+      bottom: 0;
+      left: 0;
+      width: 100%;
+      height: 2px;
+      background: linear-gradient(to right, mc('blue', '500'), rgba(mc('blue', '500'), 0));
+    }
+
+    & + h2 {
+      margin-top: 8px;
+    }
+  }
+  h2 {
+    margin-left: 16px;
+    padding: 8px 0 0 0;
+    color: mc('grey', '800');
+    position: relative;
+
+    &::after {
+      content: '';
+      position: absolute;
+      bottom: 0;
+      left: 0;
+      width: 100%;
+      height: 1px;
+      background: linear-gradient(to right, mc('grey', '700'), rgba(mc('grey', '700'), 0));
+    }
+  }
+
+  p {
+    padding: 16px 16px 0 16px;
+    margin: 0;
+  }
+}
diff --git a/client/themes/default/theme.yml b/client/themes/default/theme.yml
new file mode 100644
index 00000000..2efcf081
--- /dev/null
+++ b/client/themes/default/theme.yml
@@ -0,0 +1,7 @@
+name: Default
+author: requarks.io
+site: https://wiki.requarks.io/
+version: 1.0.0
+requirements:
+  minimum: '>= 2.0.0'
+  maximum: '< 3.0.0'
diff --git a/themes/default/thumbnail.png b/client/themes/default/thumbnail.png
similarity index 100%
rename from themes/default/thumbnail.png
rename to client/themes/default/thumbnail.png
diff --git a/dev/config/config.yml b/dev/config/config.yml
deleted file mode 100644
index 405734c9..00000000
--- a/dev/config/config.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-lokalise:
-  api: https://api.lokalise.co/api
-  project: 2994254859f751ea605a00.03473540
-  key: 34b38266e48cb23b6e5dbd25eabe77ad8e6ec6f6
\ No newline at end of file
diff --git a/dev/tasks/localization.js b/dev/tasks/localization.js
deleted file mode 100644
index 023ccb38..00000000
--- a/dev/tasks/localization.js
+++ /dev/null
@@ -1,56 +0,0 @@
-const Promise = require('bluebird')
-const colors = require('colors/safe')
-const fs = Promise.promisifyAll(require('fs-extra'))
-const path = require('path')
-const request = require('request-promise')
-const yaml = require('js-yaml')
-const _ = require('lodash')
-
-const config = yaml.safeLoad(fs.readFileSync(path.join(process.cwd(), 'dev/config/config.yml'), 'utf8'))
-
-/**
- * Fetch Localization Resources from Lokalise
- */
-const fetchLocalizationResources = async () => {
-  console.info(colors.green('Fetching latest localization resources...'))
-  let langs = await request({
-    method: 'POST',
-    uri: `${config.lokalise.api}/string/list`,
-    form: {
-      api_token: config.lokalise.key,
-      id: config.lokalise.project
-    },
-    json: true
-  })
-  if (langs && langs.strings && _.isPlainObject(langs.strings)) {
-    _.forIn(langs.strings, (langData, langKey) => {
-      let lang = {}
-      let langTotal = 0
-      langData.forEach(item => {
-        if (item.is_archived === '1' || _.includes(item.key, '::')) { return }
-        let keyParts = item.key.split(':')
-        let keyNamespace = (keyParts.length > 1) ? _.head(keyParts) : 'common'
-        let keyString = _.last(keyParts)
-        _.set(lang, `${keyNamespace}.${keyString}`, item.translation)
-        langTotal++
-      })
-      _.forOwn(lang, (langObject, langNamespace) => {
-        let langYaml = yaml.safeDump(langObject, {
-          indent: 2,
-          sortKeys: true,
-          lineWidth: 2048
-        })
-        fs.outputFileSync(path.join(process.cwd(), `server/locales/${langKey}/${langNamespace}.yml`), langYaml, 'utf8')
-      })
-      console.info(colors.grey(`└─ ${langKey} - ${langTotal} keys written`))
-    })
-  } else {
-    throw new Error('Failed to fetch language list from Lokalise API.')
-  }
-}
-
-try {
-  fetchLocalizationResources()
-} catch (err) {
-  console.error(colors.red(err))
-}
diff --git a/dev/webpack/webpack.dev.js b/dev/webpack/webpack.dev.js
index c7549549..fddbddb2 100644
--- a/dev/webpack/webpack.dev.js
+++ b/dev/webpack/webpack.dev.js
@@ -1,6 +1,8 @@
 const webpack = require('webpack')
 const path = require('path')
 const fs = require('fs-extra')
+const yargs = require('yargs').argv
+const _ = require('lodash')
 
 const { VueLoaderPlugin } = require('vue-loader')
 const CopyWebpackPlugin = require('copy-webpack-plugin')
@@ -181,7 +183,8 @@ module.exports = {
       format: 'compact'
     }),
     new webpack.DefinePlugin({
-      'process.env': { NODE_ENV: '"development"' },
+      'process.env.NODE_ENV': JSON.stringify('development'),
+      'process.env.CURRENT_THEME': JSON.stringify(_.defaultTo(yargs.theme, 'default')),
       '__REACT_DEVTOOLS_GLOBAL_HOOK__': '({ isDisabled: true })'
     }),
     new WriteFilePlugin(),
diff --git a/dev/webpack/webpack.prod.js b/dev/webpack/webpack.prod.js
index 1f482144..3fdc8d52 100644
--- a/dev/webpack/webpack.prod.js
+++ b/dev/webpack/webpack.prod.js
@@ -1,13 +1,14 @@
 const webpack = require('webpack')
 const path = require('path')
 const fs = require('fs-extra')
+const yargs = require('yargs').argv
+const _ = require('lodash')
 
 const CleanWebpackPlugin = require('clean-webpack-plugin')
 const CopyWebpackPlugin = require('copy-webpack-plugin')
 const HtmlWebpackPlugin = require('html-webpack-plugin')
 const HtmlWebpackPugPlugin = require('html-webpack-pug-plugin')
 const MiniCssExtractPlugin = require('mini-css-extract-plugin')
-const OfflinePlugin = require('offline-plugin')
 const OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin')
 const ScriptExtHtmlWebpackPlugin = require('script-ext-html-webpack-plugin')
 const SimpleProgressWebpackPlugin = require('simple-progress-webpack-plugin')
@@ -208,24 +209,10 @@ module.exports = {
       cssProcessorOptions: { discardComments: { removeAll: true } },
       canPrint: true
     }),
-    new OfflinePlugin({
-      ServiceWorker: {
-        minify: false
-      },
-      publicPath: '/',
-      externals: ['/'],
-      caches: {
-        main: [
-          'js/client.js'
-        ],
-        additional: [
-          ':externals:'
-        ],
-        optional: [
-          'js/*.chunk.js'
-        ]
-      },
-      safeToUseOptionalCaches: true
+    new webpack.DefinePlugin({
+      'process.env.NODE_ENV': JSON.stringify('production'),
+      'process.env.CURRENT_THEME': JSON.stringify(_.defaultTo(yargs.theme, 'default')),
+      '__REACT_DEVTOOLS_GLOBAL_HOOK__': '({ isDisabled: true })'
     })
   ],
   optimization: {
diff --git a/package.json b/package.json
index 7be2a12a..10419e03 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
     "graphql-list-fields": "2.0.2",
     "graphql-tools": "3.1.1",
     "i18next": "11.5.0",
-    "i18next-express-middleware": "1.2.0",
+    "i18next-express-middleware": "1.2.1",
     "i18next-localstorage-cache": "1.1.1",
     "i18next-node-fs-backend": "1.2.1",
     "image-size": "0.6.3",
@@ -147,7 +147,7 @@
   },
   "devDependencies": {
     "@panter/vue-i18next": "0.12.0",
-    "@vue/cli": "3.0.0-rc.10",
+    "@vue/cli": "3.0.0-rc.11",
     "apollo-cache-inmemory": "1.2.6",
     "apollo-client": "2.3.7",
     "apollo-fetch": "0.7.0",
@@ -177,7 +177,7 @@
     "cssnano": "4.0.5",
     "duplicate-package-checker-webpack-plugin": "3.0.0",
     "epic-spinners": "1.0.3",
-    "eslint": "5.2.0",
+    "eslint": "5.3.0",
     "eslint-config-requarks": "1.0.7",
     "eslint-config-standard": "11.0.0",
     "eslint-plugin-import": "2.13.0",
@@ -206,7 +206,7 @@
     "postcss-cssnext": "3.1.0",
     "postcss-flexbugs-fixes": "4.1.0",
     "postcss-flexibility": "2.0.0",
-    "postcss-import": "11.1.0",
+    "postcss-import": "12.0.0",
     "postcss-loader": "2.1.6",
     "postcss-preset-env": "5.3.0",
     "postcss-selector-parser": "5.0.0-rc.3",
@@ -220,7 +220,7 @@
     "sass-resources-loader": "1.3.3",
     "script-ext-html-webpack-plugin": "2.0.1",
     "simple-progress-webpack-plugin": "1.1.2",
-    "style-loader": "0.21.0",
+    "style-loader": "0.22.1",
     "stylus": "0.54.5",
     "stylus-loader": "3.0.2",
     "twemoji-awesome": "1.0.6",
@@ -229,11 +229,11 @@
     "velocity-animate": "1.5.2",
     "vue": "2.5.17",
     "vue-apollo": "3.0.0-beta.19",
-    "vue-chartjs": "3.3.2",
+    "vue-chartjs": "3.4.0",
     "vue-clipboards": "1.2.4",
     "vue-codemirror": "4.0.5",
     "vue-hot-reload-api": "2.3.0",
-    "vue-loader": "15.2.6",
+    "vue-loader": "15.3.0",
     "vue-material-design-icons": "1.6.0",
     "vue-moment": "4.0.0",
     "vue-router": "3.0.1",
@@ -241,11 +241,11 @@
     "vue-template-compiler": "2.5.17",
     "vue-tour": "1.0.1",
     "vuedraggable": "2.16.0",
-    "vuetify": "1.1.9",
+    "vuetify": "1.1.10",
     "vuex": "3.0.1",
-    "vuex-pathify": "1.1.2",
+    "vuex-pathify": "1.1.3",
     "vuex-persistedstate": "2.5.4",
-    "webpack": "4.16.4",
+    "webpack": "4.16.5",
     "webpack-bundle-analyzer": "2.13.1",
     "webpack-cli": "3.1.0",
     "webpack-dev-middleware": "3.1.3",
diff --git a/server/controllers/common.js b/server/controllers/common.js
index a207cea6..cf0d83e9 100644
--- a/server/controllers/common.js
+++ b/server/controllers/common.js
@@ -1,13 +1,10 @@
 const express = require('express')
 const router = express.Router()
-const path = require('path')
-
-/* global WIKI */
 
 /**
  * Create/Edit document
  */
-router.get('/e/*', (req, res, next) => {
+router.get(['/e', '/e/*'], (req, res, next) => {
   res.render('main/editor')
 })
 
@@ -36,9 +33,7 @@ router.get('/', (req, res, next) => {
  * View document
  */
 router.get('/*', (req, res, next) => {
-  res.render(path.join(WIKI.ROOTPATH, 'themes/default/views/page'), {
-    basedir: path.join(WIKI.SERVERPATH, 'views')
-  })
+  res.render('main/page')
 })
 
 module.exports = router
diff --git a/server/db/migrations/2.0.0.js b/server/db/migrations/2.0.0.js
index cf76e766..1711973c 100644
--- a/server/db/migrations/2.0.0.js
+++ b/server/db/migrations/2.0.0.js
@@ -91,6 +91,7 @@ exports.up = knex => {
       table.string('publishStartDate')
       table.string('publishEndDate')
       table.text('content')
+      table.text('render')
       table.string('contentType').notNullable()
       table.string('createdAt').notNullable()
       table.string('updatedAt').notNullable()
diff --git a/server/jobs/render-page.js b/server/jobs/render-page.js
new file mode 100644
index 00000000..a780c45e
--- /dev/null
+++ b/server/jobs/render-page.js
@@ -0,0 +1,15 @@
+require('../core/worker')
+
+/* global WIKI */
+
+module.exports = async (job) => {
+  WIKI.logger.info(`Rendering page ${job.data.path}...`)
+
+  try {
+
+    WIKI.logger.info(`Rendering page ${job.data.path}: [ COMPLETED ]`)
+  } catch (err) {
+    WIKI.logger.error(`Rendering page ${job.data.path}: [ FAILED ]`)
+    WIKI.logger.error(err.message)
+  }
+}
diff --git a/server/models/editors.js b/server/models/editors.js
index 03839b1e..57cedf4a 100644
--- a/server/models/editors.js
+++ b/server/models/editors.js
@@ -1,7 +1,9 @@
 const Model = require('objection').Model
-const autoload = require('auto-load')
+const fs = require('fs-extra')
 const path = require('path')
 const _ = require('lodash')
+const yaml = require('js-yaml')
+const commonHelper = require('../helpers/common')
 
 /* global WIKI */
 
@@ -14,42 +16,63 @@ module.exports = class Editor extends Model {
   static get jsonSchema () {
     return {
       type: 'object',
-      required: ['key', 'title', 'isEnabled'],
+      required: ['key', 'isEnabled'],
 
       properties: {
         id: {type: 'integer'},
         key: {type: 'string'},
-        title: {type: 'string'},
         isEnabled: {type: 'boolean'},
         config: {type: 'object'}
       }
     }
   }
 
-  static async getEnabledEditors() {
-    return WIKI.models.editors.query().where({ isEnabled: true })
+  static async getEditors() {
+    return WIKI.models.editors.query()
   }
 
   static async refreshEditorsFromDisk() {
     try {
       const dbEditors = await WIKI.models.editors.query()
-      const diskEditors = autoload(path.join(WIKI.SERVERPATH, 'modules/editor'))
+
+      // -> Fetch definitions from disk
+      const editorDirs = await fs.readdir(path.join(WIKI.SERVERPATH, 'modules/editors'))
+      let diskEditors = []
+      for (let dir of editorDirs) {
+        const def = await fs.readFile(path.join(WIKI.SERVERPATH, 'modules/editors', dir, 'definition.yml'), 'utf8')
+        diskEditors.push(yaml.safeLoad(def))
+      }
+      WIKI.data.editors = diskEditors.map(editor => ({
+        ...editor,
+        props: commonHelper.parseModuleProps(editor.props)
+      }))
+
+      // -> Insert new editors
       let newEditors = []
-      _.forOwn(diskEditors, (strategy, strategyKey) => {
-        if (!_.some(dbEditors, ['key', strategy.key])) {
+      for (let editor of WIKI.data.editors) {
+        if (!_.some(dbEditors, ['key', editor.key])) {
           newEditors.push({
-            key: strategy.key,
-            title: strategy.title,
+            key: editor.key,
             isEnabled: false,
-            config: _.reduce(strategy.props, (result, value, key) => {
-              _.set(result, value, '')
+            config: _.transform(editor.props, (result, value, key) => {
+              _.set(result, key, value.default)
               return result
             }, {})
           })
+        } else {
+          const editorConfig = _.get(_.find(dbEditors, ['key', editor.key]), 'config', {})
+          await WIKI.models.editors.query().patch({
+            config: _.transform(editor.props, (result, value, key) => {
+              if (!_.has(result, key)) {
+                _.set(result, key, value.default)
+              }
+              return result
+            }, editorConfig)
+          }).where('key', editor.key)
         }
-      })
+      }
       if (newEditors.length > 0) {
-        await WIKI.models.editors.query().insert(newEditors)
+        await WIKI.models.storage.query().insert(newEditors)
         WIKI.logger.info(`Loaded ${newEditors.length} new editors: [ OK ]`)
       } else {
         WIKI.logger.info(`No new editors found: [ SKIPPED ]`)
diff --git a/server/models/pages.js b/server/models/pages.js
index d0e43a56..68fa8a81 100644
--- a/server/models/pages.js
+++ b/server/models/pages.js
@@ -88,10 +88,12 @@ module.exports = class Page extends Model {
   }
 
   static async createPage(opts) {
+    await WIKI.models.pages.renderPage(opts)
     const page = await WIKI.models.pages.query().insertAndFetch({
       authorId: opts.authorId,
       content: opts.content,
       creatorId: opts.authorId,
+      contentType: _.get(WIKI.data.editors, `${opts.editor}.contentType`, 'text'),
       description: opts.description,
       editorKey: opts.editor,
       isPrivate: opts.isPrivate,
@@ -130,4 +132,11 @@ module.exports = class Page extends Model {
     })
     return page
   }
+
+  static async renderPage(opts) {
+    WIKI.queue.job.renderPage.add(opts, {
+      removeOnComplete: true,
+      removeOnFail: true
+    })
+  }
 }
diff --git a/server/modules/editor/markdown.js b/server/modules/editor/markdown.js
deleted file mode 100644
index 2ea4376e..00000000
--- a/server/modules/editor/markdown.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// ------------------------------------
-// Markdown Editor (default)
-// ------------------------------------
-
-module.exports = {
-  key: 'markdown',
-  title: 'Markdown (default)',
-  props: [],
-  init (conf) {}
-}
diff --git a/server/modules/editor/markdown/definition.yml b/server/modules/editor/markdown/definition.yml
new file mode 100644
index 00000000..8a72c37a
--- /dev/null
+++ b/server/modules/editor/markdown/definition.yml
@@ -0,0 +1,6 @@
+key: markdown
+title: Markdown
+description: Default Markdown editor
+contentType: markdown
+author: requarks.io
+props: {}
diff --git a/server/views/main/editor.pug b/server/views/main/editor.pug
index 138defe1..2f543777 100644
--- a/server/views/main/editor.pug
+++ b/server/views/main/editor.pug
@@ -1,7 +1,6 @@
 extends ../master.pug
 
 block body
-  body
-    #app
-      v-app
-        editor
+  #app
+    v-app
+      editor
diff --git a/server/views/main/page.pug b/server/views/main/page.pug
new file mode 100644
index 00000000..f368799e
--- /dev/null
+++ b/server/views/main/page.pug
@@ -0,0 +1,45 @@
+extends ../master.pug
+
+block head
+
+block body
+  #app
+    page(title='Planet Earth', description='The 3rd planet of the solar system')
+      template(slot='contents')
+        p Earth is the third planet from the Sun and the only astronomical object known to harbor life. According to radiometric dating and other sources of evidence, Earth formed over 4.5 billion years ago.[24][25][26] Earth's gravity interacts with other objects in space, especially the Sun and the Moon, Earth's only natural satellite. Earth revolves around the Sun in 365.26 days, a period known as an Earth year. During this time, Earth rotates about its axis about 366.26 times.[n 5]
+        p Earth's axis of rotation is tilted with respect to its orbital plane, producing seasons on Earth.[27] The gravitational interaction between Earth and the Moon causes ocean tides, stabilizes Earth's orientation on its axis, and gradually slows its rotation. Earth is the densest planet in the Solar System and the largest of the four terrestrial planets.
+        h1 Introduction
+        p Earth's lithosphere is divided into several rigid tectonic plates that migrate across the surface over periods of many millions of years. About 71% of Earth's surface is covered with water, mostly by oceans.[29] The remaining 29% is land consisting of continents and islands that together have many lakes, rivers and other sources of water that contribute to the hydrosphere. The majority of Earth's polar regions are covered in ice, including the Antarctic ice sheet and the sea ice of the Arctic ice pack. Earth's interior remains active with a solid iron inner core, a liquid outer core that generates the Earth's magnetic field, and a convecting mantle that drives plate tectonics.
+        p Within the first billion years of Earth's history, life appeared in the oceans and began to affect the Earth's atmosphere and surface, leading to the proliferation of aerobic and anaerobic organisms. Some geological evidence indicates that life may have arisen as much as 4.1 billion years ago. Since then, the combination of Earth's distance from the Sun, physical properties, and geological history have allowed life to evolve and thrive.[30][31] In the history of the Earth, biodiversity has gone through long periods of expansion, occasionally punctuated by mass extinction events. Over 99% of all species[32] that ever lived on Earth are extinct.[33][34] Estimates of the number of species on Earth today vary widely;[35][36][37] most species have not been described.[38] Over 7.6 billion humans live on Earth and depend on its biosphere and natural resources for their survival.[39] Humans have developed diverse societies and cultures; politically, the world has about 200 sovereign states.
+        p Earth is the third planet from the Sun and the only astronomical object known to harbor life. According to radiometric dating and other sources of evidence, Earth formed over 4.5 billion years ago.[24][25][26] Earth's gravity interacts with other objects in space, especially the Sun and the Moon, Earth's only natural satellite. Earth revolves around the Sun in 365.26 days, a period known as an Earth year. During this time, Earth rotates about its axis about 366.26 times.[n 5]
+        h1 Cities
+        h2 New York
+        p Earth's axis of rotation is tilted with respect to its orbital plane, producing seasons on Earth.[27] The gravitational interaction between Earth and the Moon causes ocean tides, stabilizes Earth's orientation on its axis, and gradually slows its rotation. Earth is the densest planet in the Solar System and the largest of the four terrestrial planets.
+        h2 Chicago
+        p Earth's lithosphere is divided into several rigid tectonic plates that migrate across the surface over periods of many millions of years. About 71% of Earth's surface is covered with water, mostly by oceans.[29] The remaining 29% is land consisting of continents and islands that together have many lakes, rivers and other sources of water that contribute to the hydrosphere. The majority of Earth's polar regions are covered in ice, including the Antarctic ice sheet and the sea ice of the Arctic ice pack. Earth's interior remains active with a solid iron inner core, a liquid outer core that generates the Earth's magnetic field, and a convecting mantle that drives plate tectonics.
+        p Within the first billion years of Earth's history, life appeared in the oceans and began to affect the Earth's atmosphere and surface, leading to the proliferation of aerobic and anaerobic organisms. Some geological evidence indicates that life may have arisen as much as 4.1 billion years ago. Since then, the combination of Earth's distance from the Sun, physical properties, and geological history have allowed life to evolve and thrive.[30][31] In the history of the Earth, biodiversity has gone through long periods of expansion, occasionally punctuated by mass extinction events. Over 99% of all species[32] that ever lived on Earth are extinct.[33][34] Estimates of the number of species on Earth today vary widely;[35][36][37] most species have not been described.[38] Over 7.6 billion humans live on Earth and depend on its biosphere and natural resources for their survival.[39] Humans have developed diverse societies and cultures; politically, the world has about 200 sovereign states.
+        p Earth is the third planet from the Sun and the only astronomical object known to harbor life. According to radiometric dating and other sources of evidence, Earth formed over 4.5 billion years ago.[24][25][26] Earth's gravity interacts with other objects in space, especially the Sun and the Moon, Earth's only natural satellite. Earth revolves around the Sun in 365.26 days, a period known as an Earth year. During this time, Earth rotates about its axis about 366.26 times.[n 5]
+        p Earth's axis of rotation is tilted with respect to its orbital plane, producing seasons on Earth.[27] The gravitational interaction between Earth and the Moon causes ocean tides, stabilizes Earth's orientation on its axis, and gradually slows its rotation. Earth is the densest planet in the Solar System and the largest of the four terrestrial planets.
+        p Earth's lithosphere is divided into several rigid tectonic plates that migrate across the surface over periods of many millions of years. About 71% of Earth's surface is covered with water, mostly by oceans.[29] The remaining 29% is land consisting of continents and islands that together have many lakes, rivers and other sources of water that contribute to the hydrosphere. The majority of Earth's polar regions are covered in ice, including the Antarctic ice sheet and the sea ice of the Arctic ice pack. Earth's interior remains active with a solid iron inner core, a liquid outer core that generates the Earth's magnetic field, and a convecting mantle that drives plate tectonics.
+        p Within the first billion years of Earth's history, life appeared in the oceans and began to affect the Earth's atmosphere and surface, leading to the proliferation of aerobic and anaerobic organisms. Some geological evidence indicates that life may have arisen as much as 4.1 billion years ago. Since then, the combination of Earth's distance from the Sun, physical properties, and geological history have allowed life to evolve and thrive.[30][31] In the history of the Earth, biodiversity has gone through long periods of expansion, occasionally punctuated by mass extinction events. Over 99% of all species[32] that ever lived on Earth are extinct.[33][34] Estimates of the number of species on Earth today vary widely;[35][36][37] most species have not been described.[38] Over 7.6 billion humans live on Earth and depend on its biosphere and natural resources for their survival.[39] Humans have developed diverse societies and cultures; politically, the world has about 200 sovereign states.
+        p Earth is the third planet from the Sun and the only astronomical object known to harbor life. According to radiometric dating and other sources of evidence, Earth formed over 4.5 billion years ago.[24][25][26] Earth's gravity interacts with other objects in space, especially the Sun and the Moon, Earth's only natural satellite. Earth revolves around the Sun in 365.26 days, a period known as an Earth year. During this time, Earth rotates about its axis about 366.26 times.[n 5]
+        p Earth's axis of rotation is tilted with respect to its orbital plane, producing seasons on Earth.[27] The gravitational interaction between Earth and the Moon causes ocean tides, stabilizes Earth's orientation on its axis, and gradually slows its rotation. Earth is the densest planet in the Solar System and the largest of the four terrestrial planets.
+        p Earth's lithosphere is divided into several rigid tectonic plates that migrate across the surface over periods of many millions of years. About 71% of Earth's surface is covered with water, mostly by oceans.[29] The remaining 29% is land consisting of continents and islands that together have many lakes, rivers and other sources of water that contribute to the hydrosphere. The majority of Earth's polar regions are covered in ice, including the Antarctic ice sheet and the sea ice of the Arctic ice pack. Earth's interior remains active with a solid iron inner core, a liquid outer core that generates the Earth's magnetic field, and a convecting mantle that drives plate tectonics.
+        p Within the first billion years of Earth's history, life appeared in the oceans and began to affect the Earth's atmosphere and surface, leading to the proliferation of aerobic and anaerobic organisms. Some geological evidence indicates that life may have arisen as much as 4.1 billion years ago. Since then, the combination of Earth's distance from the Sun, physical properties, and geological history have allowed life to evolve and thrive.[30][31] In the history of the Earth, biodiversity has gone through long periods of expansion, occasionally punctuated by mass extinction events. Over 99% of all species[32] that ever lived on Earth are extinct.[33][34] Estimates of the number of species on Earth today vary widely;[35][36][37] most species have not been described.[38] Over 7.6 billion humans live on Earth and depend on its biosphere and natural resources for their survival.[39] Humans have developed diverse societies and cultures; politically, the world has about 200 sovereign states.
+        p Earth is the third planet from the Sun and the only astronomical object known to harbor life. According to radiometric dating and other sources of evidence, Earth formed over 4.5 billion years ago.[24][25][26] Earth's gravity interacts with other objects in space, especially the Sun and the Moon, Earth's only natural satellite. Earth revolves around the Sun in 365.26 days, a period known as an Earth year. During this time, Earth rotates about its axis about 366.26 times.[n 5]
+        p Earth's axis of rotation is tilted with respect to its orbital plane, producing seasons on Earth.[27] The gravitational interaction between Earth and the Moon causes ocean tides, stabilizes Earth's orientation on its axis, and gradually slows its rotation. Earth is the densest planet in the Solar System and the largest of the four terrestrial planets.
+        p Earth's lithosphere is divided into several rigid tectonic plates that migrate across the surface over periods of many millions of years. About 71% of Earth's surface is covered with water, mostly by oceans.[29] The remaining 29% is land consisting of continents and islands that together have many lakes, rivers and other sources of water that contribute to the hydrosphere. The majority of Earth's polar regions are covered in ice, including the Antarctic ice sheet and the sea ice of the Arctic ice pack. Earth's interior remains active with a solid iron inner core, a liquid outer core that generates the Earth's magnetic field, and a convecting mantle that drives plate tectonics.
+        p Within the first billion years of Earth's history, life appeared in the oceans and began to affect the Earth's atmosphere and surface, leading to the proliferation of aerobic and anaerobic organisms. Some geological evidence indicates that life may have arisen as much as 4.1 billion years ago. Since then, the combination of Earth's distance from the Sun, physical properties, and geological history have allowed life to evolve and thrive.[30][31] In the history of the Earth, biodiversity has gone through long periods of expansion, occasionally punctuated by mass extinction events. Over 99% of all species[32] that ever lived on Earth are extinct.[33][34] Estimates of the number of species on Earth today vary widely;[35][36][37] most species have not been described.[38] Over 7.6 billion humans live on Earth and depend on its biosphere and natural resources for their survival.[39] Humans have developed diverse societies and cultures; politically, the world has about 200 sovereign states.
+        p Earth is the third planet from the Sun and the only astronomical object known to harbor life. According to radiometric dating and other sources of evidence, Earth formed over 4.5 billion years ago.[24][25][26] Earth's gravity interacts with other objects in space, especially the Sun and the Moon, Earth's only natural satellite. Earth revolves around the Sun in 365.26 days, a period known as an Earth year. During this time, Earth rotates about its axis about 366.26 times.[n 5]
+        p Earth's axis of rotation is tilted with respect to its orbital plane, producing seasons on Earth.[27] The gravitational interaction between Earth and the Moon causes ocean tides, stabilizes Earth's orientation on its axis, and gradually slows its rotation. Earth is the densest planet in the Solar System and the largest of the four terrestrial planets.
+        p Earth's lithosphere is divided into several rigid tectonic plates that migrate across the surface over periods of many millions of years. About 71% of Earth's surface is covered with water, mostly by oceans.[29] The remaining 29% is land consisting of continents and islands that together have many lakes, rivers and other sources of water that contribute to the hydrosphere. The majority of Earth's polar regions are covered in ice, including the Antarctic ice sheet and the sea ice of the Arctic ice pack. Earth's interior remains active with a solid iron inner core, a liquid outer core that generates the Earth's magnetic field, and a convecting mantle that drives plate tectonics.
+        p Within the first billion years of Earth's history, life appeared in the oceans and began to affect the Earth's atmosphere and surface, leading to the proliferation of aerobic and anaerobic organisms. Some geological evidence indicates that life may have arisen as much as 4.1 billion years ago. Since then, the combination of Earth's distance from the Sun, physical properties, and geological history have allowed life to evolve and thrive.[30][31] In the history of the Earth, biodiversity has gone through long periods of expansion, occasionally punctuated by mass extinction events. Over 99% of all species[32] that ever lived on Earth are extinct.[33][34] Estimates of the number of species on Earth today vary widely;[35][36][37] most species have not been described.[38] Over 7.6 billion humans live on Earth and depend on its biosphere and natural resources for their survival.[39] Humans have developed diverse societies and cultures; politically, the world has about 200 sovereign states.
+        p Earth is the third planet from the Sun and the only astronomical object known to harbor life. According to radiometric dating and other sources of evidence, Earth formed over 4.5 billion years ago.[24][25][26] Earth's gravity interacts with other objects in space, especially the Sun and the Moon, Earth's only natural satellite. Earth revolves around the Sun in 365.26 days, a period known as an Earth year. During this time, Earth rotates about its axis about 366.26 times.[n 5]
+        p Earth's axis of rotation is tilted with respect to its orbital plane, producing seasons on Earth.[27] The gravitational interaction between Earth and the Moon causes ocean tides, stabilizes Earth's orientation on its axis, and gradually slows its rotation. Earth is the densest planet in the Solar System and the largest of the four terrestrial planets.
+        p Earth's lithosphere is divided into several rigid tectonic plates that migrate across the surface over periods of many millions of years. About 71% of Earth's surface is covered with water, mostly by oceans.[29] The remaining 29% is land consisting of continents and islands that together have many lakes, rivers and other sources of water that contribute to the hydrosphere. The majority of Earth's polar regions are covered in ice, including the Antarctic ice sheet and the sea ice of the Arctic ice pack. Earth's interior remains active with a solid iron inner core, a liquid outer core that generates the Earth's magnetic field, and a convecting mantle that drives plate tectonics.
+        p Within the first billion years of Earth's history, life appeared in the oceans and began to affect the Earth's atmosphere and surface, leading to the proliferation of aerobic and anaerobic organisms. Some geological evidence indicates that life may have arisen as much as 4.1 billion years ago. Since then, the combination of Earth's distance from the Sun, physical properties, and geological history have allowed life to evolve and thrive.[30][31] In the history of the Earth, biodiversity has gone through long periods of expansion, occasionally punctuated by mass extinction events. Over 99% of all species[32] that ever lived on Earth are extinct.[33][34] Estimates of the number of species on Earth today vary widely;[35][36][37] most species have not been described.[38] Over 7.6 billion humans live on Earth and depend on its biosphere and natural resources for their survival.[39] Humans have developed diverse societies and cultures; politically, the world has about 200 sovereign states.
+        p Earth is the third planet from the Sun and the only astronomical object known to harbor life. According to radiometric dating and other sources of evidence, Earth formed over 4.5 billion years ago.[24][25][26] Earth's gravity interacts with other objects in space, especially the Sun and the Moon, Earth's only natural satellite. Earth revolves around the Sun in 365.26 days, a period known as an Earth year. During this time, Earth rotates about its axis about 366.26 times.[n 5]
+        p Earth's axis of rotation is tilted with respect to its orbital plane, producing seasons on Earth.[27] The gravitational interaction between Earth and the Moon causes ocean tides, stabilizes Earth's orientation on its axis, and gradually slows its rotation. Earth is the densest planet in the Solar System and the largest of the four terrestrial planets.
+        p Earth's lithosphere is divided into several rigid tectonic plates that migrate across the surface over periods of many millions of years. About 71% of Earth's surface is covered with water, mostly by oceans.[29] The remaining 29% is land consisting of continents and islands that together have many lakes, rivers and other sources of water that contribute to the hydrosphere. The majority of Earth's polar regions are covered in ice, including the Antarctic ice sheet and the sea ice of the Arctic ice pack. Earth's interior remains active with a solid iron inner core, a liquid outer core that generates the Earth's magnetic field, and a convecting mantle that drives plate tectonics.
+        p Within the first billion years of Earth's history, life appeared in the oceans and began to affect the Earth's atmosphere and surface, leading to the proliferation of aerobic and anaerobic organisms. Some geological evidence indicates that life may have arisen as much as 4.1 billion years ago. Since then, the combination of Earth's distance from the Sun, physical properties, and geological history have allowed life to evolve and thrive.[30][31] In the history of the Earth, biodiversity has gone through long periods of expansion, occasionally punctuated by mass extinction events. Over 99% of all species[32] that ever lived on Earth are extinct.[33][34] Estimates of the number of species on Earth today vary widely;[35][36][37] most species have not been described.[38] Over 7.6 billion humans live on Earth and depend on its biosphere and natural resources for their survival.[39] Humans have developed diverse societies and cultures; politically, the world has about 200 sovereign states.
+    
diff --git a/server/views/main/profile.pug b/server/views/main/profile.pug
index bf276652..37ec24f6 100644
--- a/server/views/main/profile.pug
+++ b/server/views/main/profile.pug
@@ -1,6 +1,5 @@
 extends ../master.pug
 
 block body
-  body
-    #app
-      profile
+  #app
+    profile
diff --git a/server/views/main/setup.pug b/server/views/main/setup.pug
index 9f27d746..963f5c20 100644
--- a/server/views/main/setup.pug
+++ b/server/views/main/setup.pug
@@ -1,6 +1,5 @@
 extends ../master.pug
 
 block body
-  body
-    #app
-      setup(telemetry-id=telemetryClientID, wiki-version=packageObj.version)
+  #app
+    setup(telemetry-id=telemetryClientID, wiki-version=packageObj.version)
diff --git a/themes/default/theme.yml b/themes/default/theme.yml
deleted file mode 100644
index e5c0a6d8..00000000
--- a/themes/default/theme.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: Default
-author: Nicolas Giard
-site: https://wiki.requarks.io/
-version: 1.0.0
-requirements:
-  minimum: '>= 2.0.0'
-  maximum: '< 3.0.0'
-fields:
-  primary:
-    title: Primary Color
-    description: Used for top navigation bar, headers, links, etc.
-    type: color
-    default: indigo
-  alt:
-    title: Alternate Color
-    description: Used for the sidebar (in a darker tone)
-    type: color
-    default: blue-grey
-  codeDark:
-    title: Code Blocks - Use Dark Theme
-    description: todo
-    type: boolean
-    default: true
-  codeColorize:
-    title: Code Blocks - Colorize syntax
-    description: todo
-    type: boolean
-    default: true
\ No newline at end of file
diff --git a/themes/default/views/page.pug b/themes/default/views/page.pug
deleted file mode 100644
index f58536fd..00000000
--- a/themes/default/views/page.pug
+++ /dev/null
@@ -1,65 +0,0 @@
-extends /master.pug
-
-block head
-
-block body
-  #app
-    v-app
-      nav-header
-      v-navigation-drawer.pb-0.primary(dark, app, fixed, clipped, left, permanent)
-        v-list(dense)
-          v-list-tile.pt-2
-            v-list-tile-avatar: v-icon home
-            v-list-tile-title Home
-          v-divider.my-2
-          v-subheader.pl-4 Navigation
-          v-list-tile
-            v-list-tile-avatar: v-icon stars
-            v-list-tile-title The Universe
-
-      v-content
-        v-toolbar(color='grey lighten-3', flat, dense)
-          v-breadcrumbs.pl-0(divider='/')
-            v-breadcrumbs-item Universe
-            v-breadcrumbs-item Galaxy
-            v-breadcrumbs-item Solar System
-            v-breadcrumbs-item Planet Earth
-        
-        v-divider
-        v-layout(row)
-          v-flex(xs10)
-            v-toolbar(color='grey lighten-4', flat, :height='90')
-              div
-                .headline.grey--text.text--darken-3 Planet Earth
-                .caption.grey--text.text--darken-1 The 3rd planet of the solar system
-              v-spacer
-              v-icon public
-
-            .pa-3 Earth is the third planet from the Sun and the only astronomical object known to harbor life. According to radiometric dating and other sources of evidence, Earth formed over 4.5 billion years ago.[24][25][26] Earth's gravity interacts with other objects in space, especially the Sun and the Moon, Earth's only natural satellite. Earth revolves around the Sun in 365.26 days, a period known as an Earth year. During this time, Earth rotates about its axis about 366.26 times.[n 5]
-            .pa-3 Earth's axis of rotation is tilted with respect to its orbital plane, producing seasons on Earth.[27] The gravitational interaction between Earth and the Moon causes ocean tides, stabilizes Earth's orientation on its axis, and gradually slows its rotation.[28] Earth is the densest planet in the Solar System and the largest of the four terrestrial planets.
-            .pa-3 Earth's lithosphere is divided into several rigid tectonic plates that migrate across the surface over periods of many millions of years. About 71% of Earth's surface is covered with water, mostly by oceans.[29] The remaining 29% is land consisting of continents and islands that together have many lakes, rivers and other sources of water that contribute to the hydrosphere. The majority of Earth's polar regions are covered in ice, including the Antarctic ice sheet and the sea ice of the Arctic ice pack. Earth's interior remains active with a solid iron inner core, a liquid outer core that generates the Earth's magnetic field, and a convecting mantle that drives plate tectonics.
-            .pa-3 Within the first billion years of Earth's history, life appeared in the oceans and began to affect the Earth's atmosphere and surface, leading to the proliferation of aerobic and anaerobic organisms. Some geological evidence indicates that life may have arisen as much as 4.1 billion years ago. Since then, the combination of Earth's distance from the Sun, physical properties, and geological history have allowed life to evolve and thrive.[30][31] In the history of the Earth, biodiversity has gone through long periods of expansion, occasionally punctuated by mass extinction events. Over 99% of all species[32] that ever lived on Earth are extinct.[33][34] Estimates of the number of species on Earth today vary widely;[35][36][37] most species have not been described.[38] Over 7.6 billion humans live on Earth and depend on its biosphere and natural resources for their survival.[39] Humans have developed diverse societies and cultures; politically, the world has about 200 sovereign states.
-          v-flex(xs2, fill-height)
-            v-list.grey.lighten-3(dense)
-              v-subheader.pl-4 Table of contents
-              v-list-tile
-                v-list-tile-avatar: v-icon chevron_right
-                v-list-tile-title Test
-              v-list-tile
-                v-list-tile-avatar: v-icon chevron_right
-                v-list-tile-title Test
-              v-list-tile
-                v-list-tile-avatar: v-icon chevron_right
-                v-list-tile-title Test
-              v-divider.my-2
-              v-subheader.pl-4 Metadata
-              v-list-tile
-                v-list-tile-avatar: v-icon chevron_right
-                v-list-tile-title Test
-              v-list-tile
-                v-list-tile-avatar: v-icon chevron_right
-                v-list-tile-title Test
-              v-list-tile
-                v-list-tile-avatar: v-icon chevron_right
-                v-list-tile-title Test
-      nav-footer
diff --git a/yarn.lock b/yarn.lock
index a5bb8c93..2ee5ce81 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -416,13 +416,14 @@
   version "0.8.0"
   resolved "https://registry.yarnpkg.com/@types/zen-observable/-/zen-observable-0.8.0.tgz#8b63ab7f1aa5321248aad5ac890a485656dcea4d"
 
-"@vue/cli-shared-utils@^3.0.0-rc.10":
-  version "3.0.0-rc.10"
-  resolved "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-3.0.0-rc.10.tgz#9e1cbae4a99f8acd0788b229c86acf0277a5af1c"
+"@vue/cli-shared-utils@^3.0.0-rc.11":
+  version "3.0.0-rc.11"
+  resolved "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-3.0.0-rc.11.tgz#4249b9815bcb0181a4b630966eee16746a9a8bd8"
   dependencies:
     chalk "^2.4.1"
     execa "^0.10.0"
     joi "^13.0.0"
+    launch-editor "^2.2.1"
     node-ipc "^9.1.1"
     opn "^5.3.0"
     ora "^2.1.0"
@@ -431,16 +432,16 @@
     semver "^5.5.0"
     string.prototype.padstart "^3.0.0"
 
-"@vue/cli-ui-addon-webpack@^3.0.0-rc.10":
-  version "3.0.0-rc.10"
-  resolved "https://registry.yarnpkg.com/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-3.0.0-rc.10.tgz#7a6bc083c1f02e5d4d6870bae81b860dea8beefc"
+"@vue/cli-ui-addon-webpack@^3.0.0-rc.11":
+  version "3.0.0-rc.11"
+  resolved "https://registry.yarnpkg.com/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-3.0.0-rc.11.tgz#0bcd095e925b56c0e87aca899d058462d50fa08c"
 
-"@vue/cli-ui@^3.0.0-rc.10":
-  version "3.0.0-rc.10"
-  resolved "https://registry.yarnpkg.com/@vue/cli-ui/-/cli-ui-3.0.0-rc.10.tgz#a1df03c2b51fb05c27816b7934edc0110778d5db"
+"@vue/cli-ui@^3.0.0-rc.11":
+  version "3.0.0-rc.11"
+  resolved "https://registry.yarnpkg.com/@vue/cli-ui/-/cli-ui-3.0.0-rc.11.tgz#b62d068c5000785cc28aa78be4fb5c5ddd129d1f"
   dependencies:
     "@akryum/winattr" "^3.0.0"
-    "@vue/cli-shared-utils" "^3.0.0-rc.10"
+    "@vue/cli-shared-utils" "^3.0.0-rc.11"
     chalk "^2.4.1"
     clone "^2.1.1"
     deepmerge "^2.1.1"
@@ -453,7 +454,6 @@
     graphql-type-json "^0.2.1"
     javascript-stringify "^1.6.0"
     js-yaml "^3.12.0"
-    launch-editor "^2.2.1"
     lodash.merge "^4.6.1"
     lowdb "^1.0.0"
     lru-cache "^4.1.3"
@@ -461,19 +461,20 @@
     node-notifier "^5.2.1"
     parse-git-config "^2.0.2"
     portfinder "^1.0.13"
+    prismjs "^1.15.0"
     semver "^5.5.0"
     shortid "^2.2.11"
     terminate "^2.1.0"
     vue-cli-plugin-apollo "^0.14.6"
     watch "^1.0.2"
 
-"@vue/cli@3.0.0-rc.10":
-  version "3.0.0-rc.10"
-  resolved "https://registry.yarnpkg.com/@vue/cli/-/cli-3.0.0-rc.10.tgz#47d06e1d9e1dc95ba30cec31fb274587bafdc6f7"
+"@vue/cli@3.0.0-rc.11":
+  version "3.0.0-rc.11"
+  resolved "https://registry.yarnpkg.com/@vue/cli/-/cli-3.0.0-rc.11.tgz#c2fee307e9b16e0558916ede47589256bb964554"
   dependencies:
-    "@vue/cli-shared-utils" "^3.0.0-rc.10"
-    "@vue/cli-ui" "^3.0.0-rc.10"
-    "@vue/cli-ui-addon-webpack" "^3.0.0-rc.10"
+    "@vue/cli-shared-utils" "^3.0.0-rc.11"
+    "@vue/cli-ui" "^3.0.0-rc.11"
+    "@vue/cli-ui-addon-webpack" "^3.0.0-rc.11"
     chalk "^2.4.1"
     cmd-shim "^2.0.2"
     commander "^2.16.0"
@@ -490,7 +491,6 @@
     javascript-stringify "^1.6.0"
     js-yaml "^3.12.0"
     klaw-sync "^4.0.0"
-    launch-editor "^2.2.1"
     lodash.clonedeep "^4.5.0"
     minimist "^1.2.0"
     recast "^0.15.2"
@@ -2899,7 +2899,7 @@ clipboard@^1.7.1:
     select "^1.1.2"
     tiny-emitter "^2.0.0"
 
-clipboard@^2.0.1:
+clipboard@^2.0.0, clipboard@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.1.tgz#a12481e1c13d8a50f5f036b0560fe5d16d74e46a"
   dependencies:
@@ -4383,9 +4383,9 @@ eslint-visitor-keys@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
 
-eslint@5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.2.0.tgz#3901ae249195d473e633c4acbc370068b1c964dc"
+eslint@5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.3.0.tgz#53695aca5213968aacdf970ccb231e42a2b285f8"
   dependencies:
     ajv "^6.5.0"
     babel-code-frame "^6.26.0"
@@ -4418,7 +4418,7 @@ eslint@5.2.0:
     path-is-inside "^1.0.2"
     pluralize "^7.0.0"
     progress "^2.0.0"
-    regexpp "^1.1.0"
+    regexpp "^2.0.0"
     require-uncached "^1.0.3"
     semver "^5.5.0"
     string.prototype.matchall "^2.0.0"
@@ -5880,9 +5880,9 @@ https-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
 
-i18next-express-middleware@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/i18next-express-middleware/-/i18next-express-middleware-1.2.0.tgz#1622e79110806ea6132de30476394d56b2812fc7"
+i18next-express-middleware@1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/i18next-express-middleware/-/i18next-express-middleware-1.2.1.tgz#1c49e335406ad6654471dee7aaaa766a708a74e0"
   dependencies:
     cookies "0.7.1"
 
@@ -9542,11 +9542,11 @@ postcss-image-set-polyfill@^0.3.5:
     postcss "^6.0.1"
     postcss-media-query-parser "^0.2.3"
 
-postcss-import@11.1.0:
-  version "11.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-11.1.0.tgz#55c9362c9192994ec68865d224419df1db2981f0"
+postcss-import@12.0.0:
+  version "12.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-12.0.0.tgz#149f96a4ef0b27525c419784be8517ebd17e92c5"
   dependencies:
-    postcss "^6.0.1"
+    postcss "^7.0.1"
     postcss-value-parser "^3.2.3"
     read-cache "^1.0.0"
     resolve "^1.1.7"
@@ -9968,7 +9968,7 @@ postcss@^6.0.23:
     source-map "^0.6.1"
     supports-color "^5.4.0"
 
-postcss@^7.0.0, postcss@^7.0.2:
+postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2:
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.2.tgz#7b5a109de356804e27f95a960bef0e4d5bc9bb18"
   dependencies:
@@ -10035,6 +10035,12 @@ pretty-format@^23.2.0:
     ansi-regex "^3.0.0"
     ansi-styles "^3.2.0"
 
+prismjs@^1.15.0:
+  version "1.15.0"
+  resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.15.0.tgz#8801d332e472091ba8def94976c8877ad60398d9"
+  optionalDependencies:
+    clipboard "^2.0.0"
+
 private@^0.1.6, private@^0.1.8, private@~0.1.5:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
@@ -10702,10 +10708,6 @@ regexp.prototype.flags@^1.2.0:
   dependencies:
     define-properties "^1.1.2"
 
-regexpp@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-1.1.0.tgz#0e3516dd0b7904f413d2d4193dce4618c3a689ab"
-
 regexpp@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.0.tgz#b2a7534a85ca1b033bcf5ce9ff8e56d4e0755365"
@@ -11670,9 +11672,9 @@ strip-outer@^1.0.0:
   dependencies:
     escape-string-regexp "^1.0.2"
 
-style-loader@0.21.0:
-  version "0.21.0"
-  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.21.0.tgz#68c52e5eb2afc9ca92b6274be277ee59aea3a852"
+style-loader@0.22.1:
+  version "0.22.1"
+  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.22.1.tgz#901ea28aac78fcc00c5075585ac07d7ef3f87a52"
   dependencies:
     loader-utils "^1.1.0"
     schema-utils "^0.4.5"
@@ -12437,9 +12439,9 @@ vue-apollo@3.0.0-beta.19:
   dependencies:
     throttle-debounce "^2.0.0"
 
-vue-chartjs@3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/vue-chartjs/-/vue-chartjs-3.3.2.tgz#1bdbf859d0f5df6cac75d8510e51aee5865638ab"
+vue-chartjs@3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/vue-chartjs/-/vue-chartjs-3.4.0.tgz#669e4453be0676605fc9290b3b581867ccd15c88"
 
 vue-cli-plugin-apollo@^0.14.6:
   version "0.14.6"
@@ -12492,9 +12494,9 @@ vue-hot-reload-api@2.3.0, vue-hot-reload-api@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.0.tgz#97976142405d13d8efae154749e88c4e358cf926"
 
-vue-loader@15.2.6:
-  version "15.2.6"
-  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.2.6.tgz#4ad4e56a0ca1fd89ebc4220f9e3bd4723097b397"
+vue-loader@15.3.0:
+  version "15.3.0"
+  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.3.0.tgz#b474d10a4e93d934a78c147fc3e314b370e9fc54"
   dependencies:
     "@vue/component-compiler-utils" "^2.0.0"
     hash-sum "^1.0.2"
@@ -12562,13 +12564,13 @@ vuedraggable@2.16.0:
   dependencies:
     sortablejs "^1.7.0"
 
-vuetify@1.1.9:
-  version "1.1.9"
-  resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-1.1.9.tgz#3eb497cc89d318ee6865bbebd081f5830f83f8ba"
+vuetify@1.1.10:
+  version "1.1.10"
+  resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-1.1.10.tgz#4a5c890f242e1cf84e318ccdf265a58928de76bb"
 
-vuex-pathify@1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/vuex-pathify/-/vuex-pathify-1.1.2.tgz#ae2283b0c1bc977d0f9d9f78d3189e9db00ade33"
+vuex-pathify@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/vuex-pathify/-/vuex-pathify-1.1.3.tgz#233c96356e27d1e3d1c23e1ee444c926e4d74505"
   dependencies:
     lodash.clonedeep "^4.5.0"
 
@@ -12726,9 +12728,9 @@ webpack-sources@^1.0.1, webpack-sources@^1.1.0:
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
-webpack@4.16.4:
-  version "4.16.4"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.16.4.tgz#6b020f76483bc66339164c296d89978aa100d37a"
+webpack@4.16.5:
+  version "4.16.5"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.16.5.tgz#29fb39462823d7eb8aefcab8b45f7f241db0d092"
   dependencies:
     "@webassemblyjs/ast" "1.5.13"
     "@webassemblyjs/helper-module-context" "1.5.13"