diff --git a/client/components/admin/admin-theme.vue b/client/components/admin/admin-theme.vue
index 2f3b23f9..39c3a26f 100644
--- a/client/components/admin/admin-theme.vue
+++ b/client/components/admin/admin-theme.vue
@@ -14,7 +14,7 @@
         v-form.pt-3
           v-layout(row wrap)
             v-flex(lg6 xs12)
-              v-card.wiki-form.animated.fadeInUp
+              v-card.animated.fadeInUp
                 v-toolbar(color='primary', dark, dense, flat)
                   v-toolbar-title.subtitle-1 {{$t('admin:theme.title')}}
                 v-card-text
@@ -51,7 +51,23 @@
                     :hint='$t(`admin:theme.darkModeHint`)'
                     )
 
-              v-card.wiki-form.mt-3.animated.fadeInUp.wait-p2s
+              //- v-card.mt-3.animated.fadeInUp.wait-p1s
+              //-   v-toolbar(color='primary', dark, dense, flat)
+              //-     v-toolbar-title.subtitle-1 {{$t(`admin:theme.options`)}}
+              //-     v-spacer
+              //-     v-chip(label, color='white', small).primary--text coming soon
+              //-   v-card-text
+              //-     v-select(
+              //-       :items='iconsets'
+              //-       outlined
+              //-       prepend-icon='mdi-border-vertical'
+              //-       v-model='config.iconset'
+              //-       label='Table of Contents Position'
+              //-       persistent-hint
+              //-       hint='Select whether the table of contents is shown on the left, right or not at all.'
+              //-       )
+
+              v-card.mt-3.animated.fadeInUp.wait-p2s
                 v-toolbar(color='primary', dark, dense, flat)
                   v-toolbar-title.subtitle-1 {{$t(`admin:theme.codeInjection`)}}
                 v-card-text
diff --git a/client/components/admin/admin-users-edit.vue b/client/components/admin/admin-users-edit.vue
index 465c7a84..cafd3e31 100644
--- a/client/components/admin/admin-users-edit.vue
+++ b/client/components/admin/admin-users-edit.vue
@@ -26,7 +26,7 @@
           v-btn.ml-3.animated.fadeInDown(color='primary', large, depressed, @click='updateUser')
             v-icon(left) mdi-check
             span Update User
-      v-flex(xs5)
+      v-flex(xs6)
         v-card.animated.fadeInUp
           v-toolbar(color='primary', dense, dark, flat)
             v-icon.mr-2 mdi-information-variant
@@ -39,8 +39,28 @@
                 v-list-item-title Email
                 v-list-item-subtitle {{ user.email }}
               v-list-item-action(v-if='!user.isSystem')
-                  v-btn(icon, color='grey', flat, x-small)
-                    v-icon mdi-pencil
+                v-menu(
+                  v-model='editPop.email'
+                  :close-on-content-click='false'
+                  min-width='350'
+                  left
+                  )
+                  template(v-slot:activator='{ on }')
+                    v-btn(icon, color='grey', x-small, v-on='on', @click='focusField(`iptEmail`)')
+                      v-icon mdi-pencil
+                  v-card
+                    v-text-field(
+                      ref='iptEmail'
+                      v-model='user.email'
+                      label='Email'
+                      solo
+                      hide-details
+                      append-icon='mdi-check'
+                      @click:append='editPop.email = false'
+                      @keydown.enter='editPop.email = false'
+                      @keydown.esc='editPop.email = false'
+                    )
+
             v-divider
             v-list-item
               v-list-item-avatar(size='32')
@@ -49,8 +69,28 @@
                 v-list-item-title Display Name
                 v-list-item-subtitle {{ user.name }}
               v-list-item-action
-                  v-btn(icon, color='grey', flat, x-small)
-                    v-icon mdi-pencil
+                v-menu(
+                  v-model='editPop.name'
+                  :close-on-content-click='false'
+                  min-width='350'
+                  left
+                  )
+                  template(v-slot:activator='{ on }')
+                    v-btn(icon, color='grey', x-small, v-on='on', @click='focusField(`iptDisplayName`)')
+                      v-icon mdi-pencil
+                  v-card
+                    v-text-field(
+                      ref='iptDisplayName'
+                      v-model='user.name'
+                      label='Display Name'
+                      solo
+                      hide-details
+                      append-icon='mdi-check'
+                      @click:append='editPop.name = false'
+                      @keydown.enter='editPop.name = false'
+                      @keydown.esc='editPop.name = false'
+                    )
+
         v-card.mt-3.animated.fadeInUp.wait-p2s(v-if='!user.isSystem')
           v-toolbar(color='primary', dense, dark, flat)
             v-icon.mr-2 mdi-lock-outline
@@ -75,13 +115,13 @@
                 v-list-item-action
                   v-tooltip(top)
                     template(v-slot:activator='{ on }')
-                      v-btn(icon, color='grey', flat, x-small, v-on='on')
+                      v-btn(icon, color='grey', x-small, v-on='on')
                         v-icon mdi-cached
                     span Change Password
                 v-list-item-action
                   v-tooltip(top)
                     template(v-slot:activator='{ on }')
-                      v-btn(icon, color='grey', flat, x-small, v-on='on')
+                      v-btn(icon, color='grey', x-small, v-on='on')
                         v-icon mdi-email
                     span Send Password Reset Email
               v-divider
@@ -94,7 +134,7 @@
                 v-list-item-action
                   v-tooltip(top)
                     template(v-slot:activator='{ on }')
-                      v-btn(icon, color='grey', flat, x-small, v-on='on')
+                      v-btn(icon, color='grey', x-small, v-on='on', disabled)
                         v-icon mdi-power
                     span Toggle 2FA
               template(v-if='user.providerId')
@@ -127,7 +167,7 @@
             v-btn(color='primary', text)
               v-icon(left) mdi-clipboard-account
               span Assign to group
-      v-flex(xs7)
+      v-flex(xs6)
         v-card.animated.fadeInUp.wait-p2s
           v-toolbar(color='primary', dense, dark, flat)
             v-icon.mr-2 mdi-account-badge-outline
@@ -140,8 +180,27 @@
                 v-list-item-title Location
                 v-list-item-subtitle {{ user.location }}
               v-list-item-action
-                  v-btn(icon, color='grey', flat, x-small)
-                    v-icon mdi-pencil
+                v-menu(
+                  v-model='editPop.location'
+                  :close-on-content-click='false'
+                  min-width='350'
+                  left
+                  )
+                  template(v-slot:activator='{ on }')
+                    v-btn(icon, color='grey', x-small, v-on='on', @click='focusField(`iptLocation`)')
+                      v-icon mdi-pencil
+                  v-card
+                    v-text-field(
+                      ref='iptLocation'
+                      v-model='user.location'
+                      label='Location'
+                      solo
+                      hide-details
+                      append-icon='mdi-check'
+                      @click:append='editPop.location = false'
+                      @keydown.enter='editPop.location = false'
+                      @keydown.esc='editPop.location = false'
+                    )
             v-divider
             v-list-item
               v-list-item-avatar(size='32')
@@ -150,8 +209,27 @@
                 v-list-item-title Job Title
                 v-list-item-subtitle {{ user.jobTitle }}
               v-list-item-action
-                  v-btn(icon, color='grey', flat, x-small)
-                    v-icon mdi-pencil
+                v-menu(
+                  v-model='editPop.jobTitle'
+                  :close-on-content-click='false'
+                  min-width='350'
+                  left
+                  )
+                  template(v-slot:activator='{ on }')
+                    v-btn(icon, color='grey', x-small, v-on='on', @click='focusField(`iptJobTitle`)')
+                      v-icon mdi-pencil
+                  v-card
+                    v-text-field(
+                      ref='iptJobTitle'
+                      v-model='user.jobTitle'
+                      label='Job Title'
+                      solo
+                      hide-details
+                      append-icon='mdi-check'
+                      @click:append='editPop.jobTitle = false'
+                      @keydown.enter='editPop.jobTitle = false'
+                      @keydown.esc='editPop.jobTitle = false'
+                    )
             v-divider
             v-list-item
               v-list-item-avatar(size='32')
@@ -160,8 +238,29 @@
                 v-list-item-title Timezone
                 v-list-item-subtitle {{ user.timezone }}
               v-list-item-action
-                  v-btn(icon, color='grey', flat, x-small)
-                    v-icon mdi-pencil
+                v-menu(
+                  v-model='editPop.timezone'
+                  :close-on-content-click='false'
+                  min-width='350'
+                  left
+                  )
+                  template(v-slot:activator='{ on }')
+                    v-btn(icon, color='grey', x-small, v-on='on', @click='focusField(`iptTimezone`)')
+                      v-icon mdi-pencil
+                  v-card
+                    v-select(
+                      ref='iptTimezone'
+                      :items='timezones'
+                      v-model='user.timezone'
+                      label='Timezone'
+                      solo
+                      dense
+                      hide-details
+                      append-icon='mdi-check'
+                      @click:append='editPop.timezone = false'
+                      @keydown.enter='editPop.timezone = false'
+                      @keydown.esc='editPop.timezone = false'
+                    )
         v-card.mt-3.animated.fadeInUp.wait-p4s
           v-toolbar(color='primary', dense, dark, flat)
             v-icon.mr-2 mdi-file-document-box-multiple-outline
@@ -180,9 +279,270 @@ export default {
   data() {
     return {
       deleteUserDialog: false,
+      editPop: {
+        email: false,
+        name: false,
+        pwd: false,
+        location: false,
+        jobTitle: false,
+        timezone: false
+      },
       user: {
-
-      }
+        name: '',
+        groups: []
+      },
+      timezones: [
+        { text: '(GMT-11:00) Niue', value: 'Pacific/Niue' },
+        { text: '(GMT-11:00) Pago Pago', value: 'Pacific/Pago_Pago' },
+        { text: '(GMT-10:00) Hawaii Time', value: 'Pacific/Honolulu' },
+        { text: '(GMT-10:00) Rarotonga', value: 'Pacific/Rarotonga' },
+        { text: '(GMT-10:00) Tahiti', value: 'Pacific/Tahiti' },
+        { text: '(GMT-09:30) Marquesas', value: 'Pacific/Marquesas' },
+        { text: '(GMT-09:00) Alaska Time', value: 'America/Anchorage' },
+        { text: '(GMT-09:00) Gambier', value: 'Pacific/Gambier' },
+        { text: '(GMT-08:00) Pacific Time', value: 'America/Los_Angeles' },
+        { text: '(GMT-08:00) Pacific Time - Tijuana', value: 'America/Tijuana' },
+        { text: '(GMT-08:00) Pacific Time - Vancouver', value: 'America/Vancouver' },
+        { text: '(GMT-08:00) Pacific Time - Whitehorse', value: 'America/Whitehorse' },
+        { text: '(GMT-08:00) Pitcairn', value: 'Pacific/Pitcairn' },
+        { text: '(GMT-07:00) Mountain Time', value: 'America/Denver' },
+        { text: '(GMT-07:00) Mountain Time - Arizona', value: 'America/Phoenix' },
+        { text: '(GMT-07:00) Mountain Time - Chihuahua, Mazatlan', value: 'America/Mazatlan' },
+        { text: '(GMT-07:00) Mountain Time - Dawson Creek', value: 'America/Dawson_Creek' },
+        { text: '(GMT-07:00) Mountain Time - Edmonton', value: 'America/Edmonton' },
+        { text: '(GMT-07:00) Mountain Time - Hermosillo', value: 'America/Hermosillo' },
+        { text: '(GMT-07:00) Mountain Time - Yellowknife', value: 'America/Yellowknife' },
+        { text: '(GMT-06:00) Belize', value: 'America/Belize' },
+        { text: '(GMT-06:00) Central Time', value: 'America/Chicago' },
+        { text: '(GMT-06:00) Central Time - Mexico City', value: 'America/Mexico_City' },
+        { text: '(GMT-06:00) Central Time - Regina', value: 'America/Regina' },
+        { text: '(GMT-06:00) Central Time - Tegucigalpa', value: 'America/Tegucigalpa' },
+        { text: '(GMT-06:00) Central Time - Winnipeg', value: 'America/Winnipeg' },
+        { text: '(GMT-06:00) Costa Rica', value: 'America/Costa_Rica' },
+        { text: '(GMT-06:00) El Salvador', value: 'America/El_Salvador' },
+        { text: '(GMT-06:00) Galapagos', value: 'Pacific/Galapagos' },
+        { text: '(GMT-06:00) Guatemala', value: 'America/Guatemala' },
+        { text: '(GMT-06:00) Managua', value: 'America/Managua' },
+        { text: '(GMT-05:00) America Cancun', value: 'America/Cancun' },
+        { text: '(GMT-05:00) Bogota', value: 'America/Bogota' },
+        { text: '(GMT-05:00) Easter Island', value: 'Pacific/Easter' },
+        { text: '(GMT-05:00) Eastern Time', value: 'America/New_York' },
+        { text: '(GMT-05:00) Eastern Time - Iqaluit', value: 'America/Iqaluit' },
+        { text: '(GMT-05:00) Eastern Time - Toronto', value: 'America/Toronto' },
+        { text: '(GMT-05:00) Guayaquil', value: 'America/Guayaquil' },
+        { text: '(GMT-05:00) Havana', value: 'America/Havana' },
+        { text: '(GMT-05:00) Jamaica', value: 'America/Jamaica' },
+        { text: '(GMT-05:00) Lima', value: 'America/Lima' },
+        { text: '(GMT-05:00) Nassau', value: 'America/Nassau' },
+        { text: '(GMT-05:00) Panama', value: 'America/Panama' },
+        { text: '(GMT-05:00) Port-au-Prince', value: 'America/Port-au-Prince' },
+        { text: '(GMT-05:00) Rio Branco', value: 'America/Rio_Branco' },
+        { text: '(GMT-04:00) Atlantic Time - Halifax', value: 'America/Halifax' },
+        { text: '(GMT-04:00) Barbados', value: 'America/Barbados' },
+        { text: '(GMT-04:00) Bermuda', value: 'Atlantic/Bermuda' },
+        { text: '(GMT-04:00) Boa Vista', value: 'America/Boa_Vista' },
+        { text: '(GMT-04:00) Caracas', value: 'America/Caracas' },
+        { text: '(GMT-04:00) Curacao', value: 'America/Curacao' },
+        { text: '(GMT-04:00) Grand Turk', value: 'America/Grand_Turk' },
+        { text: '(GMT-04:00) Guyana', value: 'America/Guyana' },
+        { text: '(GMT-04:00) La Paz', value: 'America/La_Paz' },
+        { text: '(GMT-04:00) Manaus', value: 'America/Manaus' },
+        { text: '(GMT-04:00) Martinique', value: 'America/Martinique' },
+        { text: '(GMT-04:00) Port of Spain', value: 'America/Port_of_Spain' },
+        { text: '(GMT-04:00) Porto Velho', value: 'America/Porto_Velho' },
+        { text: '(GMT-04:00) Puerto Rico', value: 'America/Puerto_Rico' },
+        { text: '(GMT-04:00) Santo Domingo', value: 'America/Santo_Domingo' },
+        { text: '(GMT-04:00) Thule', value: 'America/Thule' },
+        { text: '(GMT-03:30) Newfoundland Time - St. Johns', value: 'America/St_Johns' },
+        { text: '(GMT-03:00) Araguaina', value: 'America/Araguaina' },
+        { text: '(GMT-03:00) Asuncion', value: 'America/Asuncion' },
+        { text: '(GMT-03:00) Belem', value: 'America/Belem' },
+        { text: '(GMT-03:00) Buenos Aires', value: 'America/Argentina/Buenos_Aires' },
+        { text: '(GMT-03:00) Campo Grande', value: 'America/Campo_Grande' },
+        { text: '(GMT-03:00) Cayenne', value: 'America/Cayenne' },
+        { text: '(GMT-03:00) Cuiaba', value: 'America/Cuiaba' },
+        { text: '(GMT-03:00) Fortaleza', value: 'America/Fortaleza' },
+        { text: '(GMT-03:00) Godthab', value: 'America/Godthab' },
+        { text: '(GMT-03:00) Maceio', value: 'America/Maceio' },
+        { text: '(GMT-03:00) Miquelon', value: 'America/Miquelon' },
+        { text: '(GMT-03:00) Montevideo', value: 'America/Montevideo' },
+        { text: '(GMT-03:00) Palmer', value: 'Antarctica/Palmer' },
+        { text: '(GMT-03:00) Paramaribo', value: 'America/Paramaribo' },
+        { text: '(GMT-03:00) Punta Arenas', value: 'America/Punta_Arenas' },
+        { text: '(GMT-03:00) Recife', value: 'America/Recife' },
+        { text: '(GMT-03:00) Rothera', value: 'Antarctica/Rothera' },
+        { text: '(GMT-03:00) Salvador', value: 'America/Bahia' },
+        { text: '(GMT-03:00) Santiago', value: 'America/Santiago' },
+        { text: '(GMT-03:00) Stanley', value: 'Atlantic/Stanley' },
+        { text: '(GMT-02:00) Noronha', value: 'America/Noronha' },
+        { text: '(GMT-02:00) Sao Paulo', value: 'America/Sao_Paulo' },
+        { text: '(GMT-02:00) South Georgia', value: 'Atlantic/South_Georgia' },
+        { text: '(GMT-01:00) Azores', value: 'Atlantic/Azores' },
+        { text: '(GMT-01:00) Cape Verde', value: 'Atlantic/Cape_Verde' },
+        { text: '(GMT-01:00) Scoresbysund', value: 'America/Scoresbysund' },
+        { text: '(GMT+00:00) Abidjan', value: 'Africa/Abidjan' },
+        { text: '(GMT+00:00) Accra', value: 'Africa/Accra' },
+        { text: '(GMT+00:00) Bissau', value: 'Africa/Bissau' },
+        { text: '(GMT+00:00) Canary Islands', value: 'Atlantic/Canary' },
+        { text: '(GMT+00:00) Casablanca', value: 'Africa/Casablanca' },
+        { text: '(GMT+00:00) Danmarkshavn', value: 'America/Danmarkshavn' },
+        { text: '(GMT+00:00) Dublin', value: 'Europe/Dublin' },
+        { text: '(GMT+00:00) El Aaiun', value: 'Africa/El_Aaiun' },
+        { text: '(GMT+00:00) Faeroe', value: 'Atlantic/Faroe' },
+        { text: '(GMT+00:00) GMT (no daylight saving)', value: 'Etc/GMT' },
+        { text: '(GMT+00:00) Lisbon', value: 'Europe/Lisbon' },
+        { text: '(GMT+00:00) London', value: 'Europe/London' },
+        { text: '(GMT+00:00) Monrovia', value: 'Africa/Monrovia' },
+        { text: '(GMT+00:00) Reykjavik', value: 'Atlantic/Reykjavik' },
+        { text: '(GMT+01:00) Algiers', value: 'Africa/Algiers' },
+        { text: '(GMT+01:00) Amsterdam', value: 'Europe/Amsterdam' },
+        { text: '(GMT+01:00) Andorra', value: 'Europe/Andorra' },
+        { text: '(GMT+01:00) Berlin', value: 'Europe/Berlin' },
+        { text: '(GMT+01:00) Brussels', value: 'Europe/Brussels' },
+        { text: '(GMT+01:00) Budapest', value: 'Europe/Budapest' },
+        { text: '(GMT+01:00) Central European Time - Belgrade', value: 'Europe/Belgrade' },
+        { text: '(GMT+01:00) Central European Time - Prague', value: 'Europe/Prague' },
+        { text: '(GMT+01:00) Ceuta', value: 'Africa/Ceuta' },
+        { text: '(GMT+01:00) Copenhagen', value: 'Europe/Copenhagen' },
+        { text: '(GMT+01:00) Gibraltar', value: 'Europe/Gibraltar' },
+        { text: '(GMT+01:00) Lagos', value: 'Africa/Lagos' },
+        { text: '(GMT+01:00) Luxembourg', value: 'Europe/Luxembourg' },
+        { text: '(GMT+01:00) Madrid', value: 'Europe/Madrid' },
+        { text: '(GMT+01:00) Malta', value: 'Europe/Malta' },
+        { text: '(GMT+01:00) Monaco', value: 'Europe/Monaco' },
+        { text: '(GMT+01:00) Ndjamena', value: 'Africa/Ndjamena' },
+        { text: '(GMT+01:00) Oslo', value: 'Europe/Oslo' },
+        { text: '(GMT+01:00) Paris', value: 'Europe/Paris' },
+        { text: '(GMT+01:00) Rome', value: 'Europe/Rome' },
+        { text: '(GMT+01:00) Stockholm', value: 'Europe/Stockholm' },
+        { text: '(GMT+01:00) Tirane', value: 'Europe/Tirane' },
+        { text: '(GMT+01:00) Tunis', value: 'Africa/Tunis' },
+        { text: '(GMT+01:00) Vienna', value: 'Europe/Vienna' },
+        { text: '(GMT+01:00) Warsaw', value: 'Europe/Warsaw' },
+        { text: '(GMT+01:00) Zurich', value: 'Europe/Zurich' },
+        { text: '(GMT+02:00) Amman', value: 'Asia/Amman' },
+        { text: '(GMT+02:00) Athens', value: 'Europe/Athens' },
+        { text: '(GMT+02:00) Beirut', value: 'Asia/Beirut' },
+        { text: '(GMT+02:00) Bucharest', value: 'Europe/Bucharest' },
+        { text: '(GMT+02:00) Cairo', value: 'Africa/Cairo' },
+        { text: '(GMT+02:00) Chisinau', value: 'Europe/Chisinau' },
+        { text: '(GMT+02:00) Damascus', value: 'Asia/Damascus' },
+        { text: '(GMT+02:00) Gaza', value: 'Asia/Gaza' },
+        { text: '(GMT+02:00) Helsinki', value: 'Europe/Helsinki' },
+        { text: '(GMT+02:00) Jerusalem', value: 'Asia/Jerusalem' },
+        { text: '(GMT+02:00) Johannesburg', value: 'Africa/Johannesburg' },
+        { text: '(GMT+02:00) Khartoum', value: 'Africa/Khartoum' },
+        { text: '(GMT+02:00) Kiev', value: 'Europe/Kiev' },
+        { text: '(GMT+02:00) Maputo', value: 'Africa/Maputo' },
+        { text: '(GMT+02:00) Moscow-01 - Kaliningrad', value: 'Europe/Kaliningrad' },
+        { text: '(GMT+02:00) Nicosia', value: 'Asia/Nicosia' },
+        { text: '(GMT+02:00) Riga', value: 'Europe/Riga' },
+        { text: '(GMT+02:00) Sofia', value: 'Europe/Sofia' },
+        { text: '(GMT+02:00) Tallinn', value: 'Europe/Tallinn' },
+        { text: '(GMT+02:00) Tripoli', value: 'Africa/Tripoli' },
+        { text: '(GMT+02:00) Vilnius', value: 'Europe/Vilnius' },
+        { text: '(GMT+02:00) Windhoek', value: 'Africa/Windhoek' },
+        { text: '(GMT+03:00) Baghdad', value: 'Asia/Baghdad' },
+        { text: '(GMT+03:00) Istanbul', value: 'Europe/Istanbul' },
+        { text: '(GMT+03:00) Minsk', value: 'Europe/Minsk' },
+        { text: '(GMT+03:00) Moscow+00 - Moscow', value: 'Europe/Moscow' },
+        { text: '(GMT+03:00) Nairobi', value: 'Africa/Nairobi' },
+        { text: '(GMT+03:00) Qatar', value: 'Asia/Qatar' },
+        { text: '(GMT+03:00) Riyadh', value: 'Asia/Riyadh' },
+        { text: '(GMT+03:00) Syowa', value: 'Antarctica/Syowa' },
+        { text: '(GMT+03:30) Tehran', value: 'Asia/Tehran' },
+        { text: '(GMT+04:00) Baku', value: 'Asia/Baku' },
+        { text: '(GMT+04:00) Dubai', value: 'Asia/Dubai' },
+        { text: '(GMT+04:00) Mahe', value: 'Indian/Mahe' },
+        { text: '(GMT+04:00) Mauritius', value: 'Indian/Mauritius' },
+        { text: '(GMT+04:00) Moscow+01 - Samara', value: 'Europe/Samara' },
+        { text: '(GMT+04:00) Reunion', value: 'Indian/Reunion' },
+        { text: '(GMT+04:00) Tbilisi', value: 'Asia/Tbilisi' },
+        { text: '(GMT+04:00) Yerevan', value: 'Asia/Yerevan' },
+        { text: '(GMT+04:30) Kabul', value: 'Asia/Kabul' },
+        { text: '(GMT+05:00) Aqtau', value: 'Asia/Aqtau' },
+        { text: '(GMT+05:00) Aqtobe', value: 'Asia/Aqtobe' },
+        { text: '(GMT+05:00) Ashgabat', value: 'Asia/Ashgabat' },
+        { text: '(GMT+05:00) Dushanbe', value: 'Asia/Dushanbe' },
+        { text: '(GMT+05:00) Karachi', value: 'Asia/Karachi' },
+        { text: '(GMT+05:00) Kerguelen', value: 'Indian/Kerguelen' },
+        { text: '(GMT+05:00) Maldives', value: 'Indian/Maldives' },
+        { text: '(GMT+05:00) Mawson', value: 'Antarctica/Mawson' },
+        { text: '(GMT+05:00) Moscow+02 - Yekaterinburg', value: 'Asia/Yekaterinburg' },
+        { text: '(GMT+05:00) Tashkent', value: 'Asia/Tashkent' },
+        { text: '(GMT+05:30) Colombo', value: 'Asia/Colombo' },
+        { text: '(GMT+05:30) India Standard Time', value: 'Asia/Kolkata' },
+        { text: '(GMT+05:45) Kathmandu', value: 'Asia/Kathmandu' },
+        { text: '(GMT+06:00) Almaty', value: 'Asia/Almaty' },
+        { text: '(GMT+06:00) Bishkek', value: 'Asia/Bishkek' },
+        { text: '(GMT+06:00) Chagos', value: 'Indian/Chagos' },
+        { text: '(GMT+06:00) Dhaka', value: 'Asia/Dhaka' },
+        { text: '(GMT+06:00) Moscow+03 - Omsk', value: 'Asia/Omsk' },
+        { text: '(GMT+06:00) Thimphu', value: 'Asia/Thimphu' },
+        { text: '(GMT+06:00) Vostok', value: 'Antarctica/Vostok' },
+        { text: '(GMT+06:30) Cocos', value: 'Indian/Cocos' },
+        { text: '(GMT+06:30) Rangoon', value: 'Asia/Yangon' },
+        { text: '(GMT+07:00) Bangkok', value: 'Asia/Bangkok' },
+        { text: '(GMT+07:00) Christmas', value: 'Indian/Christmas' },
+        { text: '(GMT+07:00) Davis', value: 'Antarctica/Davis' },
+        { text: '(GMT+07:00) Hanoi', value: 'Asia/Saigon' },
+        { text: '(GMT+07:00) Hovd', value: 'Asia/Hovd' },
+        { text: '(GMT+07:00) Jakarta', value: 'Asia/Jakarta' },
+        { text: '(GMT+07:00) Moscow+04 - Krasnoyarsk', value: 'Asia/Krasnoyarsk' },
+        { text: '(GMT+08:00) Brunei', value: 'Asia/Brunei' },
+        { text: '(GMT+08:00) China Time - Beijing', value: 'Asia/Shanghai' },
+        { text: '(GMT+08:00) Choibalsan', value: 'Asia/Choibalsan' },
+        { text: '(GMT+08:00) Hong Kong', value: 'Asia/Hong_Kong' },
+        { text: '(GMT+08:00) Kuala Lumpur', value: 'Asia/Kuala_Lumpur' },
+        { text: '(GMT+08:00) Macau', value: 'Asia/Macau' },
+        { text: '(GMT+08:00) Makassar', value: 'Asia/Makassar' },
+        { text: '(GMT+08:00) Manila', value: 'Asia/Manila' },
+        { text: '(GMT+08:00) Moscow+05 - Irkutsk', value: 'Asia/Irkutsk' },
+        { text: '(GMT+08:00) Singapore', value: 'Asia/Singapore' },
+        { text: '(GMT+08:00) Taipei', value: 'Asia/Taipei' },
+        { text: '(GMT+08:00) Ulaanbaatar', value: 'Asia/Ulaanbaatar' },
+        { text: '(GMT+08:00) Western Time - Perth', value: 'Australia/Perth' },
+        { text: '(GMT+08:30) Pyongyang', value: 'Asia/Pyongyang' },
+        { text: '(GMT+09:00) Dili', value: 'Asia/Dili' },
+        { text: '(GMT+09:00) Jayapura', value: 'Asia/Jayapura' },
+        { text: '(GMT+09:00) Moscow+06 - Yakutsk', value: 'Asia/Yakutsk' },
+        { text: '(GMT+09:00) Palau', value: 'Pacific/Palau' },
+        { text: '(GMT+09:00) Seoul', value: 'Asia/Seoul' },
+        { text: '(GMT+09:00) Tokyo', value: 'Asia/Tokyo' },
+        { text: '(GMT+09:30) Central Time - Darwin', value: 'Australia/Darwin' },
+        { text: '(GMT+10:00) Dumont D\'Urville', value: 'Antarctica/DumontDUrville' },
+        { text: '(GMT+10:00) Eastern Time - Brisbane', value: 'Australia/Brisbane' },
+        { text: '(GMT+10:00) Guam', value: 'Pacific/Guam' },
+        { text: '(GMT+10:00) Moscow+07 - Vladivostok', value: 'Asia/Vladivostok' },
+        { text: '(GMT+10:00) Port Moresby', value: 'Pacific/Port_Moresby' },
+        { text: '(GMT+10:00) Truk', value: 'Pacific/Chuuk' },
+        { text: '(GMT+10:30) Central Time - Adelaide', value: 'Australia/Adelaide' },
+        { text: '(GMT+11:00) Casey', value: 'Antarctica/Casey' },
+        { text: '(GMT+11:00) Eastern Time - Hobart', value: 'Australia/Hobart' },
+        { text: '(GMT+11:00) Eastern Time - Melbourne, Sydney', value: 'Australia/Sydney' },
+        { text: '(GMT+11:00) Efate', value: 'Pacific/Efate' },
+        { text: '(GMT+11:00) Guadalcanal', value: 'Pacific/Guadalcanal' },
+        { text: '(GMT+11:00) Kosrae', value: 'Pacific/Kosrae' },
+        { text: '(GMT+11:00) Moscow+08 - Magadan', value: 'Asia/Magadan' },
+        { text: '(GMT+11:00) Norfolk', value: 'Pacific/Norfolk' },
+        { text: '(GMT+11:00) Noumea', value: 'Pacific/Noumea' },
+        { text: '(GMT+11:00) Ponape', value: 'Pacific/Pohnpei' },
+        { text: '(GMT+12:00) Funafuti', value: 'Pacific/Funafuti' },
+        { text: '(GMT+12:00) Kwajalein', value: 'Pacific/Kwajalein' },
+        { text: '(GMT+12:00) Majuro', value: 'Pacific/Majuro' },
+        { text: '(GMT+12:00) Moscow+09 - Petropavlovsk-Kamchatskiy', value: 'Asia/Kamchatka' },
+        { text: '(GMT+12:00) Nauru', value: 'Pacific/Nauru' },
+        { text: '(GMT+12:00) Tarawa', value: 'Pacific/Tarawa' },
+        { text: '(GMT+12:00) Wake', value: 'Pacific/Wake' },
+        { text: '(GMT+12:00) Wallis', value: 'Pacific/Wallis' },
+        { text: '(GMT+13:00) Auckland', value: 'Pacific/Auckland' },
+        { text: '(GMT+13:00) Enderbury', value: 'Pacific/Enderbury' },
+        { text: '(GMT+13:00) Fakaofo', value: 'Pacific/Fakaofo' },
+        { text: '(GMT+13:00) Fiji', value: 'Pacific/Fiji' },
+        { text: '(GMT+13:00) Tongatapu', value: 'Pacific/Tongatapu' },
+        { text: '(GMT+14:00) Apia', value: 'Pacific/Apia' },
+        { text: '(GMT+14:00) Kiritimati', value: 'Pacific/Kiritimati' }
+      ]
     }
   },
   computed: {
@@ -190,7 +550,14 @@ export default {
   },
   methods: {
     deleteUser() {},
-    updateUser() {}
+    updateUser() {},
+    focusField (ipt) {
+      this.$nextTick(() => {
+        _.delay(() => {
+          this.$refs[ipt].focus()
+        }, 200)
+      })
+    }
   },
   apollo: {
     user: {
diff --git a/server/themes/default/theme.yml b/server/themes/default/theme.yml
new file mode 100644
index 00000000..42a9e274
--- /dev/null
+++ b/server/themes/default/theme.yml
@@ -0,0 +1,25 @@
+name: Default
+author: requarks.io
+site: https://wiki.requarks.io/
+version: 1.0.0
+requirements:
+  minimum: '>= 2.0.0'
+  maximum: '< 3.0.0'
+props:
+  accentColor:
+    type: String
+    title: Accent Color
+    hint: Color used in the sidebar navigation and other elements.
+    order: 1
+    default: blue darken-2
+    control: color-material
+  tocPosition:
+    type: String
+    title: Table of Contents Position
+    hint: Select whether the table of contents is shown on the left, right or not at all.
+    order: 2
+    default: left
+    enum:
+      - left
+      - right
+      - hidden
diff --git a/server/themes/default/thumbnail.png b/server/themes/default/thumbnail.png
new file mode 100644
index 00000000..489e3f83
Binary files /dev/null and b/server/themes/default/thumbnail.png differ