diff --git a/client/components/admin.vue b/client/components/admin.vue
index 2790496c..cb8ecb00 100644
--- a/client/components/admin.vue
+++ b/client/components/admin.vue
@@ -7,7 +7,7 @@
           v-list-tile-avatar: v-icon dashboard
           v-list-tile-title Dashboard
         v-divider.my-2
-        v-subheader Site
+        v-subheader.pl-4 Site
         v-list-tile(to='/general')
           v-list-tile-avatar: v-icon widgets
           v-list-tile-title General
@@ -21,7 +21,7 @@
           v-list-tile-avatar: v-icon palette
           v-list-tile-title Theme
         v-divider.my-2
-        v-subheader Users
+        v-subheader.pl-4 Users
         v-list-tile(to='/groups')
           v-list-tile-avatar: v-icon people
           v-list-tile-title Groups
@@ -33,19 +33,19 @@
               v-chip(small, disabled, color='grey lighten-4')
                 .caption.grey--text 1
         v-divider.my-2
-        v-subheader Modules
+        v-subheader.pl-4 Modules
         v-list-tile(to='/auth')
           v-list-tile-avatar: v-icon lock_outline
           v-list-tile-title Authentication
-        v-list-tile(to='/rendering')
-          v-list-tile-avatar: v-icon system_update_alt
-          v-list-tile-title Content Rendering
         v-list-tile(to='/editor')
           v-list-tile-avatar: v-icon transform
           v-list-tile-title Editor
         v-list-tile(to='/logging')
           v-list-tile-avatar: v-icon graphic_eq
           v-list-tile-title Logging
+        v-list-tile(to='/rendering')
+          v-list-tile-avatar: v-icon system_update_alt
+          v-list-tile-title Rendering
         v-list-tile(to='/search')
           v-list-tile-avatar: v-icon search
           v-list-tile-title Search Engine
@@ -53,7 +53,7 @@
           v-list-tile-avatar: v-icon storage
           v-list-tile-title Storage
         v-divider.my-2
-        v-subheader System
+        v-subheader.pl-4 System
         v-list-tile(to='/api')
           v-list-tile-avatar: v-icon call_split
           v-list-tile-title API Access
@@ -96,7 +96,7 @@ import { mapState } from 'vuex'
 
 import adminStore from '@/store/admin'
 
-/* global WIKI */
+/* global WIKI, siteConfig */
 
 WIKI.$store.registerModule('admin', adminStore)
 
@@ -143,7 +143,10 @@ export default {
       set(newState) { this.$store.commit('updateNotificationState', newState) }
     }
   },
-  router
+  router,
+  mounted() {
+    this.$store.commit('admin/setThemeDarkMode', siteConfig.darkMode)
+  }
 }
 </script>
 
diff --git a/client/components/admin/admin-rendering.vue b/client/components/admin/admin-rendering.vue
index dc4514af..a44dae69 100644
--- a/client/components/admin/admin-rendering.vue
+++ b/client/components/admin/admin-rendering.vue
@@ -2,7 +2,7 @@
   v-container(fluid, fill-height)
     v-layout(row wrap)
       v-flex(xs12)
-        .headline.primary--text Content Rendering
+        .headline.primary--text Rendering
         .subheading.grey--text Configure how content is rendered
 </template>
 
diff --git a/client/components/admin/admin-theme.vue b/client/components/admin/admin-theme.vue
index 6a0f845d..85066f30 100644
--- a/client/components/admin/admin-theme.vue
+++ b/client/components/admin/admin-theme.vue
@@ -12,7 +12,14 @@
                   v-toolbar-title
                     .subheading Theme
                 v-card-text
-                  v-select(:items='themes', prepend-icon='palette', v-model='selectedTheme', label='Site Theme', persistent-hint, hint='Themes affect how content pages are displayed. Other site sections (such as the editor or admin area) are not affected.')
+                  v-select(
+                    :items='themes'
+                    prepend-icon='palette'
+                    v-model='selectedTheme'
+                    label='Site Theme'
+                    persistent-hint
+                    hint='Themes affect how content pages are displayed. Other site sections (such as the editor or admin area) are not affected.'
+                    )
                     template(slot='item', slot-scope='data')
                       v-list-tile-avatar
                         v-icon.blue--text(dark) filter_frames
@@ -20,7 +27,13 @@
                         v-list-tile-title(v-html='data.item.text')
                         v-list-tile-sub-title(v-html='data.item.author')
                   v-divider
-                  v-switch(v-model='darkMode', label='Dark Mode', color='primary', persistent-hint, hint='Not recommended for accessibility.')
+                  v-switch(
+                    v-model='darkMode'
+                    label='Dark Mode'
+                    color='primary'
+                    persistent-hint
+                    hint='Not recommended for accessibility. May not be supported by all themes.'
+                    )
                 v-card-chin
                   v-spacer
                   v-btn(color='primary', :loading='loading', @click='save')
@@ -35,20 +48,66 @@
 </template>
 
 <script>
+import _ from 'lodash'
+
+import themeSaveMutation from 'gql/admin-theme-mutation-save.gql'
+
 export default {
   data() {
     return {
+      loading: false,
       themes: [
         { text: 'Default', author: 'requarks.io', value: 'default' }
       ],
       selectedTheme: 'default',
-      darkMode: false
+      darkMode: false,
+      darkModeInitial: false
     }
   },
   watch: {
     darkMode(newValue, oldValue) {
       this.$store.commit('admin/setThemeDarkMode', newValue)
-      console.info(this.$vuetify.dark)
+    }
+  },
+  mounted() {
+    this.darkMode = this.$store.state.admin.theme.dark
+    this.darkModeInitial = this.darkMode
+  },
+  beforeDestroy() {
+    this.$store.commit('admin/setThemeDarkMode', this.darkModeInitial)
+  },
+  methods: {
+    async save () {
+      this.loading = true
+      this.$store.commit(`loadingStart`, 'admin-theme-save')
+      try {
+        const respRaw = await this.$apollo.mutate({
+          mutation: themeSaveMutation,
+          variables: {
+            theme: this.selectedTheme,
+            darkMode: this.darkMode
+          }
+        })
+        const resp = _.get(respRaw, 'data.theming.setConfig.responseResult', {})
+        if (resp.succeeded) {
+          this.darkModeInitial = this.darkMode
+          this.$store.commit('showNotification', {
+            message: 'Theme settings updated successfully.',
+            style: 'success',
+            icon: 'check'
+          })
+        } else {
+          throw new Error(resp.message)
+        }
+      } catch (err) {
+        this.$store.commit('showNotification', {
+          message: `Error: ${err.message}`,
+          style: 'error',
+          icon: 'warning'
+        })
+      }
+      this.$store.commit(`loadingStop`, 'admin-theme-save')
+      this.loading = false
     }
   }
 }
diff --git a/client/components/common/user-search.vue b/client/components/common/user-search.vue
index 1a952208..06e66b77 100644
--- a/client/components/common/user-search.vue
+++ b/client/components/common/user-search.vue
@@ -15,12 +15,13 @@
           v-show='searchLoading'
           )
       v-card-text
-        v-text-field.blue.lighten-5(
+        v-text-field(
           solo
           flat
           label='Search Users...'
           v-model='search'
           prepend-icon='search'
+          :class='$vuetify.dark ? "grey darken-4" : "blue lighten-5"'
           color='primary'
           ref='searchIpt'
           )
@@ -35,8 +36,7 @@
               v-list-tile-action
                 v-icon(color='primary') arrow_forward
             v-divider.my-0(v-if='idx < items.length - 1')
-      v-divider.my-0
-      v-card-actions.grey.lighten-4
+      v-card-chin
         v-spacer
         v-btn(
           flat
diff --git a/client/components/nav-header.vue b/client/components/nav-header.vue
index 5d033e62..685abfd4 100644
--- a/client/components/nav-header.vue
+++ b/client/components/nav-header.vue
@@ -33,7 +33,7 @@
           v-list-tile-avatar: v-icon(color='blue-grey') burst_mode
           v-list-tile-content Images &amp; Files
     v-toolbar-title
-      span.subheading Wiki.js
+      span.subheading {{title}}
     v-spacer
     transition(name='navHeaderSearch')
       v-text-field(
@@ -87,6 +87,8 @@
 <script>
 import { mapGetters } from 'vuex'
 
+/* global siteConfig */
+
 export default {
   data() {
     return {
@@ -97,7 +99,8 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(['isLoading'])
+    ...mapGetters(['isLoading']),
+    title() { return siteConfig.title }
   },
   methods: {
     searchToggle() {
diff --git a/client/graph/admin-theme-mutation-save.gql b/client/graph/admin-theme-mutation-save.gql
new file mode 100644
index 00000000..711824b7
--- /dev/null
+++ b/client/graph/admin-theme-mutation-save.gql
@@ -0,0 +1,12 @@
+mutation($theme: String!, $darkMode: Boolean!) {
+  theming {
+    setConfig(theme: $theme, darkMode: $darkMode) {
+      responseResult {
+        succeeded
+        errorCode
+        slug
+        message
+      }
+    }
+  }
+}
diff --git a/dev/templates/master.pug b/dev/templates/master.pug
index 9b4c325f..1e5e540a 100644
--- a/dev/templates/master.pug
+++ b/dev/templates/master.pug
@@ -7,7 +7,7 @@ html
     meta(name='theme-color', content='#333333')
     meta(name='msapplication-TileColor', content='#333333')
     meta(name='msapplication-TileImage', content='/favicons/ms-icon-144x144.png')
-    title= config.site.title
+    title= config.title
 
     //- Favicon
     each favsize in [57, 60, 72, 76, 114, 120, 144, 152, 180]
@@ -19,7 +19,7 @@ html
 
     //- Site Lang
     script.
-      var siteConfig = !{JSON.stringify(config.site)}
+      var siteConfig = !{JSON.stringify({ title: config.title, theme: config.theming.theme, darkMode: config.theming.darkMode, lang: config.lang.code })}
 
     //- CSS
     link(type='text/css', rel='stylesheet', href='https://fonts.googleapis.com/icon?family=Roboto:400,500,700|Source+Code+Pro:400,700|Material+Icons')
diff --git a/server/app/data.yml b/server/app/data.yml
index 1aaf4609..1dbb039a 100644
--- a/server/app/data.yml
+++ b/server/app/data.yml
@@ -24,21 +24,21 @@ defaults:
       db: 0
       password: null
     # DB defaults
-    auth:
-      public: false
-      strategies:
-        local:
-          isEnabled: true
-          allowSelfRegister: false
-    logging:
-      telemetry: false
-      loggers:
-        console:
-          enabled: true
-    site:
-      lang: en
-      rtl: false
-      title: Wiki.js
+    defaultEditor: 'markdown'
+    graphEndpoint: 'https://graph.requarks.io'
+    lang:
+      code: en
+      autoUpdate: true
+      namespaces: []
+      namespacing: false
+    public: false
+    telemetry:
+      clientId: ''
+      isEnabled: false
+    title: Wiki.js
+    theming:
+      theme: 'default'
+      darkMode: false
     # System defaults
     setup: false
     cors:
diff --git a/server/core/auth.js b/server/core/auth.js
index 7ef0deb8..f76da129 100644
--- a/server/core/auth.js
+++ b/server/core/auth.js
@@ -41,10 +41,11 @@ module.exports = {
 
       // Load enable strategies
       const enabledStrategies = await WIKI.db.authentication.getEnabledStrategies()
+      console.info(enabledStrategies)
       for (let idx in enabledStrategies) {
         const stg = enabledStrategies[idx]
         const strategy = require(`../modules/authentication/${stg.key}`)
-        stg.config.callbackURL = `${WIKI.config.site.host}/login/${stg.key}/callback`
+        stg.config.callbackURL = `${WIKI.config.host}/login/${stg.key}/callback` // TODO: config.host
         strategy.init(passport, stg.config)
 
         fs.readFile(path.join(WIKI.ROOTPATH, `assets/svg/auth-icon-${strategy.key}.svg`), 'utf8').then(iconData => {
diff --git a/server/core/logger.js b/server/core/logger.js
index 8423b463..9a3c3fbc 100644
--- a/server/core/logger.js
+++ b/server/core/logger.js
@@ -1,4 +1,4 @@
-const _ = require('lodash')
+// const _ = require('lodash')
 const winston = require('winston')
 
 /* global WIKI */
@@ -16,11 +16,17 @@ module.exports = {
       )
     })
 
-    _.forOwn(_.omitBy(WIKI.config.logging.loggers, s => s.enabled === false), (loggerConfig, loggerKey) => {
-      let loggerModule = require(`../modules/logging/${loggerKey}`)
-      loggerModule.init(logger, loggerConfig)
-      this.loggers[logger.key] = loggerModule
-    })
+    // Init Console (default)
+
+    let loggerConsoleModule = require(`../modules/logging/console`)
+    loggerConsoleModule.init(logger)
+    this.loggers['console'] = loggerConsoleModule
+
+    // _.forOwn(_.omitBy(WIKI.config.logging.loggers, s => s.enabled === false), (loggerConfig, loggerKey) => {
+    //   let loggerModule = require(`../modules/logging/${loggerKey}`)
+    //   loggerModule.init(logger, loggerConfig)
+    //   this.loggers[logger.key] = loggerModule
+    // })
 
     return logger
   }
diff --git a/server/graph/resolvers/theming.js b/server/graph/resolvers/theming.js
new file mode 100644
index 00000000..6a31cf59
--- /dev/null
+++ b/server/graph/resolvers/theming.js
@@ -0,0 +1,42 @@
+const graphHelper = require('../../helpers/graph')
+
+/* global WIKI */
+
+module.exports = {
+  Query: {
+    async theming() { return {} }
+  },
+  Mutation: {
+    async theming() { return {} }
+  },
+  ThemingQuery: {
+    async themes(obj, args, context, info) {
+      return [{ // TODO
+        key: 'default',
+        title: 'Default',
+        author: 'requarks.io'
+      }]
+    },
+    async config(obj, args, context, info) {
+      return {
+        theme: WIKI.config.theming.theme,
+        darkMode: WIKI.config.theming.darkMode
+      }
+    }
+  },
+  ThemingMutation: {
+    async setConfig(obj, args, context, info) {
+      try {
+        WIKI.config.theming.theme = args.theme
+        WIKI.config.theming.darkMode = args.darkMode
+        await WIKI.configSvc.saveToDb(['theming'])
+
+        return {
+          responseResult: graphHelper.generateSuccess('Theme config updated')
+        }
+      } catch (err) {
+        return graphHelper.generateError(err)
+      }
+    }
+  }
+}
diff --git a/server/graph/schemas/theming.graphql b/server/graph/schemas/theming.graphql
new file mode 100644
index 00000000..71c54e41
--- /dev/null
+++ b/server/graph/schemas/theming.graphql
@@ -0,0 +1,46 @@
+# ===============================================
+# THEMES
+# ===============================================
+
+extend type Query {
+  theming: ThemingQuery
+}
+
+extend type Mutation {
+  theming: ThemingMutation
+}
+
+# -----------------------------------------------
+# QUERIES
+# -----------------------------------------------
+
+type ThemingQuery {
+  themes: [ThemingTheme]
+  config: ThemingConfig
+}
+
+# -----------------------------------------------
+# MUTATIONS
+# -----------------------------------------------
+
+type ThemingMutation {
+  setConfig(
+    theme: String!
+    darkMode: Boolean!
+  ): DefaultResponse
+}
+
+# -----------------------------------------------
+# TYPES
+# -----------------------------------------------
+
+type ThemingConfig {
+  theme: String
+  darkMode: Boolean
+}
+
+type ThemingTheme {
+  key: String
+  title: String
+  author: String
+}
diff --git a/server/master.js b/server/master.js
index 02290063..1f11ab1e 100644
--- a/server/master.js
+++ b/server/master.js
@@ -111,7 +111,7 @@ module.exports = async () => {
   app.locals.basedir = WIKI.ROOTPATH
   app.locals._ = require('lodash')
   app.locals.moment = require('moment')
-  app.locals.moment.locale(WIKI.config.site.lang)
+  app.locals.moment.locale(WIKI.config.lang.code)
   app.locals.config = WIKI.config
 
   // ----------------------------------------
diff --git a/server/setup.js b/server/setup.js
index 38c35e9f..d3a45cc7 100644
--- a/server/setup.js
+++ b/server/setup.js
@@ -284,6 +284,8 @@ module.exports = () => {
       _.set(WIKI.config, 'sessionSecret', (await crypto.randomBytesAsync(32)).toString('hex'))
       _.set(WIKI.config, 'telemetry.isEnabled', req.body.telemetry === 'true')
       _.set(WIKI.config, 'telemetry.clientId', WIKI.telemetry.cid)
+      _.set(WIKI.config, 'theming.theme', 'default')
+      _.set(WIKI.config, 'theming.darkMode', false)
       _.set(WIKI.config, 'title', req.body.title)
 
       // Save config to DB
@@ -295,6 +297,7 @@ module.exports = () => {
         'public',
         'sessionSecret',
         'telemetry',
+        'theming',
         'title'
       ])
 
diff --git a/server/views/master.pug b/server/views/master.pug
index 54ae5dda..ef1bbcca 100644
--- a/server/views/master.pug
+++ b/server/views/master.pug
@@ -7,7 +7,7 @@ html
     meta(name='theme-color', content='#333333')
     meta(name='msapplication-TileColor', content='#333333')
     meta(name='msapplication-TileImage', content='/favicons/ms-icon-144x144.png')
-    title= config.site.title
+    title= config.title
 
     //- Favicon
     each favsize in [57, 60, 72, 76, 114, 120, 144, 152, 180]
@@ -19,7 +19,7 @@ html
 
     //- Site Lang
     script.
-      var siteConfig = !{JSON.stringify(config.site)}
+      var siteConfig = !{JSON.stringify({ title: config.title, theme: config.theming.theme, darkMode: config.theming.darkMode, lang: config.lang.code })}
 
     //- CSS
     link(type='text/css', rel='stylesheet', href='https://fonts.googleapis.com/icon?family=Roboto:400,500,700|Source+Code+Pro:400,700|Material+Icons')