diff --git a/src/App.vue b/src/App.vue
index 0d00466591..74a18dc787 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
 <template>
   <div id="app" v-bind:style="style" class="base02-background">
-    <nav class='container base01-background base04' @click="scrollToTop()" id="nav">
+    <nav class='container base02-background base05' @click="scrollToTop()" id="nav">
       <div class='inner-nav' :style="logoStyle">
         <div class='item'>
           <router-link :to="{ name: 'root'}">{{sitename}}</router-link>
@@ -14,8 +14,8 @@
     </nav>
     <div class="container" id="content">
       <div class="panel-switcher">
-        <button @click="activatePanel('sidebar')" class="base01-background base04">Sidebar</button>
-        <button @click="activatePanel('timeline')" class="base01-background base04">Timeline</button>
+        <button @click="activatePanel('sidebar')" class="base02-background base05">Sidebar</button>
+        <button @click="activatePanel('timeline')" class="base02-background base05">Timeline</button>
       </div>
       <div class="sidebar-flexer" :class="{ 'mobile-hidden': mobileActivePanel != 'sidebar'}">
         <div class="sidebar-bounds">
diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
index 3dea4985cb..c7adba1310 100644
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="timeline panel panel-default">
-    <div class="panel-heading base01-background base04 base03-border conversation-heading">
+    <div class="panel-heading base02-background base04 base03-border conversation-heading">
       {{ $t('timeline.conversation') }}
       <span v-if="collapsable" style="float:right;">
         <small><a href="#" @click.prevent="$emit('toggleExpanded')">Collapse</a></small>
diff --git a/src/components/login_form/login_form.vue b/src/components/login_form/login_form.vue
index c05488ec35..c293d611f6 100644
--- a/src/components/login_form/login_form.vue
+++ b/src/components/login_form/login_form.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="login panel panel-default base00-background">
     <!-- Default panel contents -->
-    <div class="panel-heading base01-background base04">
+    <div class="panel-heading base02-background base04">
       {{$t('login.login')}}
     </div>
     <div class="panel-body">
@@ -17,7 +17,7 @@
         <div class='form-group'>
           <div class='login-bottom'>
             <div><router-link :to="{name: 'registration'}" v-if='registrationOpen' class='register'>{{$t('login.register')}}</router-link></div>
-            <button :disabled="loggingIn" type='submit' class='btn btn-default base05 base01-background'>{{$t('login.login')}}</button>
+            <button :disabled="loggingIn" type='submit' class='btn btn-default base04 base02-background'>{{$t('login.login')}}</button>
           </div>
         </div>
         <div v-if="authError" class='form-group'>
diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue
index 1e5f697522..646248731e 100644
--- a/src/components/notifications/notifications.vue
+++ b/src/components/notifications/notifications.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="notifications">
     <div class="panel panel-default base00-background">
-      <div class="panel-heading base01-background base04">
+      <div class="panel-heading base02-background base04">
         <span class="unseen-count" v-if="unseenCount">{{unseenCount}}</span>
         {{$t('notifications.notifications')}}
-        <button @click.prevent="markAsSeen" class="base05 base01-background read-button">{{$t('notifications.read')}}</button>
+        <button @click.prevent="markAsSeen" class="base04 base02-background read-button">{{$t('notifications.read')}}</button>
       </div>
       <div class="panel-body base03-border">
         <div v-for="notification in visibleNotifications" :key="notification" class="notification" :class='{"unseen": !notification.seen}'>
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 33614637e4..4b9072a4e2 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -6,7 +6,7 @@
       </div>
       <div style="position:relative;" v-if="candidates">
         <div class="autocomplete-panel base05-background">
-          <div v-for="candidate in candidates" @click="replace(candidate.screen_name + ' ')" class="autocomplete base01">
+          <div v-for="candidate in candidates" @click="replace(candidate.screen_name + ' ')" class="autocomplete base02">
             <img :src="candidate.img"></img>
             <span>
               {{candidate.screen_name}}
@@ -17,8 +17,8 @@
       </div>
       <div class='form-bottom'>
         <media-upload @uploading="disableSubmit" @uploaded="addMediaFile" @upload-failed="enableSubmit" :drop-files="dropFiles"></media-upload>
-        <button v-if="posting" disabled class="btn btn-default base05 base01-background">{{$t('post_status.posting')}}</button>
-        <button v-else :disabled="submitDisabled" type="submit" class="btn btn-default base05 base01-background">{{$t('general.submit')}}</button>
+        <button v-if="posting" disabled class="btn btn-default base05 base02-background">{{$t('post_status.posting')}}</button>
+        <button v-else :disabled="submitDisabled" type="submit" class="btn btn-default base05 base02-background">{{$t('general.submit')}}</button>
       </div>
       <div class='error' v-if="error">
         Error: {{ error }}
diff --git a/src/components/registration/registration.vue b/src/components/registration/registration.vue
index 755489d796..adc751a3d9 100644
--- a/src/components/registration/registration.vue
+++ b/src/components/registration/registration.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="settings panel panel-default base00-background">
-    <div class="panel-heading base01-background base04">
+    <div class="panel-heading base02-background base04">
       {{$t('registration.registration')}}
     </div>
     <div class="panel-body">
@@ -39,7 +39,7 @@
             </div>
             -->
             <div class='form-group'>
-              <button :disabled="registering" type='submit' class='btn btn-default base05 base01-background'>{{$t('general.submit')}}</button>
+              <button :disabled="registering" type='submit' class='btn btn-default base05 base02-background'>{{$t('general.submit')}}</button>
             </div>
           </div>
           <div class='terms-of-service' v-html="termsofservice">
diff --git a/src/components/settings/settings.js b/src/components/settings/settings.js
index a1d3aeda26..235ccfbb27 100644
--- a/src/components/settings/settings.js
+++ b/src/components/settings/settings.js
@@ -13,6 +13,7 @@ const settings = {
       hoverPreviewLocal: this.$store.state.config.hoverPreview,
       bgColorLocal: '',
       fgColorLocal: '',
+      textColorLocal: '',
       linkColorLocal: ''
     }
   },
@@ -24,6 +25,18 @@ const settings = {
       return this.$store.state.users.currentUser
     }
   },
+  mounted() {
+    const rgbstr2hex = (rgb) => {
+      if (rgb[0] === '#')
+        return rgb
+      rgb = rgb.match(/\d+/g)
+      return `#${((Number(rgb[0]) << 16) + (Number(rgb[1]) << 8) + Number(rgb[2])).toString(16)}`
+    }
+    this.bgColorLocal = rgbstr2hex(this.$store.state.config.colors['base00'])
+    this.fgColorLocal = rgbstr2hex(this.$store.state.config.colors['base02'])
+    this.textColorLocal = rgbstr2hex(this.$store.state.config.colors['base05'])
+    this.linkColorLocal = rgbstr2hex(this.$store.state.config.colors['base08'])
+  },
   methods: {
     setCustomTheme () {
       if (!this.bgColorLocal && !this.fgColorLocal && !this.linkColorLocal) {
@@ -39,12 +52,14 @@ const settings = {
       }
       const bgRgb = rgb(this.bgColorLocal)
       const fgRgb = rgb(this.fgColorLocal)
+      const textRgb = rgb(this.textColorLocal)
       const linkRgb = rgb(this.linkColorLocal)
       if (bgRgb && fgRgb && linkRgb) {
         console.log('all colors ok')
         this.$store.dispatch('setOption', { name: 'customTheme', value: {
           fg: fgRgb,
           bg: bgRgb,
+          text: textRgb,
           link: linkRgb
         }})
       }
diff --git a/src/components/settings/settings.vue b/src/components/settings/settings.vue
index 9dcb12637d..8d9c33607e 100644
--- a/src/components/settings/settings.vue
+++ b/src/components/settings/settings.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="settings panel panel-default base00-background">
-    <div class="panel-heading base01-background base04">
+    <div class="panel-heading base02-background base04">
       {{$t('settings.settings')}}
     </div>
     <div class="panel-body">
@@ -11,10 +11,38 @@
       <div class="setting-item">
         <h3>Custom theme</h3>
         <p>Enter hex color codes (#aabbcc) into the text fields.</p>
-        <input type="text" placeholder="Background" v-model="bgColorLocal">
-        <input type="text" placeholder="Foreground" v-model="fgColorLocal">
-        <input type="text" placeholder="Highlight" v-model="linkColorLocal">
-        <button @click="setCustomTheme">Submit</button>
+        <div class="color-container">
+          <div class="color-item">
+            <label for="bgcolor" class="base04">Background</label>
+            <input id="bgcolor" class="theme-color-in" type="text" v-model="bgColorLocal">
+          </div>
+          <div class="color-item">
+            <label for="fgcolor" class="base04">Foreground</label>
+            <input id="fgcolor" class="theme-color-in" type="text" v-model="fgColorLocal">
+          </div>
+          <div class="color-item">
+            <label for="textcolor" class="base04">Text</label>
+            <input id="textcolor" class="theme-color-in" type="text" v-model="textColorLocal">
+          </div>
+          <div class="color-item">
+            <label for="linkcolor" class="base04">Links</label>
+            <input id="linkcolor" class="theme-color-in" type="text" v-model="linkColorLocal">
+          </div>
+        </div>
+        <div>
+          <div class="panel">
+            <div class="panel-heading" :style="{ 'background-color': fgColorLocal, 'color': textColorLocal }">Preview</div>
+            <div class="panel-body theme-preview-content" :style="{ 'background-color': bgColorLocal, 'color': textColorLocal }">
+              <h4>Content</h4>
+              <br>
+              A bunch of more content and
+              <a :style="{ 'color': linkColorLocal }">a nice lil' link</a>
+              <br>
+              <button class="btn" :style="{ 'background-color': fgColorLocal, 'color': textColorLocal }">Button</button>
+            </div>
+          </div>
+        </div>
+        <button class="btn base02-background base04" @click="setCustomTheme">Submit</button>
       </div>
       <div class="setting-item">
         <h2>{{$t('settings.filtering')}}</h2>
@@ -86,4 +114,26 @@
  .setting-list {
    list-style-type: none;
  }
+
+ .color-container {
+   display: flex;
+ }
+
+ .color-item {
+   max-width: 7em;
+   display:flex;
+   flex-wrap:wrap;
+ }
+
+ .theme-color-in {
+   max-width: 6em;
+   border-radius: 2px;
+   border: 0;
+   padding: 5px;
+   margin: 5px 0 5px 0;
+ }
+
+ .theme-preview-content {
+   padding: 20px;
+ }
 </style>
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
index 18e27c71e4..ad741e3b12 100644
--- a/src/components/timeline/timeline.vue
+++ b/src/components/timeline/timeline.vue
@@ -1,16 +1,16 @@
 <template>
   <div class="timeline panel panel-default" v-if="viewing == 'statuses'">
-    <div class="panel-heading timeline-heading base01-background base04">
+    <div class="panel-heading timeline-heading base02-background base04">
       <div class="title">
         {{title}}
       </div>
-      <button @click.prevent="showNewStatuses" class="base05 base01-background loadmore-button" v-if="timeline.newStatusCount > 0 && !timelineError">
+      <button @click.prevent="showNewStatuses" class="base05 base02-background loadmore-button" v-if="timeline.newStatusCount > 0 && !timelineError">
         {{$t('timeline.show_new')}} ({{timeline.newStatusCount}})
       </button>
       <div @click.prevent class="base06 error  loadmore-text" v-if="timelineError">
         {{$t('timeline.error_fetching')}}
       </div>
-      <div @click.prevent class="base04 base01-background loadmore-text" v-if="!timeline.newStatusCount > 0 && !timelineError">
+      <div @click.prevent class="base04 base02-background loadmore-text" v-if="!timeline.newStatusCount > 0 && !timelineError">
         {{$t('timeline.up_to_date')}}
       </div>
     </div>
@@ -18,14 +18,14 @@
       <div class="timeline">
         <status-or-conversation v-for="status in timeline.visibleStatuses" :key="status.id" v-bind:statusoid="status"></status-or-conversation>
         <a href="#" v-on:click.prevent='fetchOlderStatuses()' v-if="!timeline.loading">
-          <div class="base01-background base03-border new-status-notification text-center">{{$t('timeline.load_older')}}</div>
+          <div class="base02-background base03-border new-status-notification text-center">{{$t('timeline.load_older')}}</div>
         </a>
-          <div class="base01-background base03-border new-status-notification text-center" v-else>...</div>
+          <div class="base02-background base03-border new-status-notification text-center" v-else>...</div>
       </div>
     </div>
   </div>
   <div class="timeline panel panel-default" v-else-if="viewing == 'followers'">
-    <div class="panel-heading timeline-heading base01-background base04">
+    <div class="panel-heading timeline-heading base02-background base04">
       <div class="title">
         {{$t('user_card.followers')}}
       </div>
@@ -37,7 +37,7 @@
     </div>
   </div>
   <div class="timeline panel panel-default" v-else-if="viewing == 'friends'">
-    <div class="panel-heading timeline-heading base01-background base04">
+    <div class="panel-heading timeline-heading base02-background base04">
       <div class="title">
         {{$t('user_card.followees')}}
       </div>
diff --git a/src/components/user_settings/user_settings.vue b/src/components/user_settings/user_settings.vue
index 003ee3bd99..74b0ff2a37 100644
--- a/src/components/user_settings/user_settings.vue
+++ b/src/components/user_settings/user_settings.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="settings panel panel-default base00-background">
-    <div class="panel-heading base01-background base04">
+    <div class="panel-heading base02-background base04">
       {{$t('settings.user_settings')}}
     </div>
     <div class="panel-body profile-edit">
@@ -10,7 +10,7 @@
         <input class='name-changer base03-border' id='username' v-model="newname" :value="user.screen_name"></input>
         <p>{{$t('settings.bio')}}</p>
         <textarea class="bio base03-border" v-model="newbio"></textarea>
-        <button :disabled='newname.length <= 0' class="btn btn-default base05 base01-background" @click="updateProfile">{{$t('general.submit')}}</button>
+        <button :disabled='newname.length <= 0' class="btn btn-default base05 base02-background" @click="updateProfile">{{$t('general.submit')}}</button>
       </div>
       <div class="setting-item">
         <h3>{{$t('settings.avatar')}}</h3>
@@ -23,7 +23,7 @@
           <input type="file" @change="uploadFile(0, $event)" ></input>
         </div>
         <i class="fa icon-spin4 animate-spin" v-if="uploading[0]"></i>
-        <button class="btn btn-default base05 base01-background" v-else-if="previews[0]" @click="submitAvatar">{{$t('general.submit')}}</button>
+        <button class="btn btn-default base05 base02-background" v-else-if="previews[0]" @click="submitAvatar">{{$t('general.submit')}}</button>
       </div>
       <div class="setting-item">
         <h3>{{$t('settings.profile_banner')}}</h3>
@@ -36,7 +36,7 @@
           <input type="file" @change="uploadFile(1, $event)" ></input>
         </div>
         <i class="fa icon-spin4 animate-spin uploading" v-if="uploading[1]"></i>
-        <button class="btn btn-default base05 base01-background" v-else-if="previews[1]" @click="submitBanner">{{$t('general.submit')}}</button>
+        <button class="btn btn-default base05 base02-background" v-else-if="previews[1]" @click="submitBanner">{{$t('general.submit')}}</button>
       </div>
       <div class="setting-item">
         <h3>{{$t('settings.profile_background')}}</h3>
@@ -47,7 +47,7 @@
           <input type="file" @change="uploadFile(2, $event)" ></input>
         </div>
         <i class="fa icon-spin4 animate-spin uploading" v-if="uploading[2]"></i>
-        <button class="btn btn-default base05 base01-background" v-else-if="previews[2]" @click="submitBg">{{$t('general.submit')}}</button>
+        <button class="btn btn-default base05 base02-background" v-else-if="previews[2]" @click="submitBg">{{$t('general.submit')}}</button>
       </div>
     </div>
   </div>
diff --git a/src/services/style_setter/style_setter.js b/src/services/style_setter/style_setter.js
index 4047c26e1f..1633c43378 100644
--- a/src/services/style_setter/style_setter.js
+++ b/src/services/style_setter/style_setter.js
@@ -1,4 +1,4 @@
-import { times } from 'lodash'
+import { times, map } from 'lodash'
 
 const setStyle = (href, col, commit) => {
   /***
@@ -50,6 +50,11 @@ const setStyle = (href, col, commit) => {
   }
 
   const rgb2hex = (r, g, b) => {
+    [r, g, b] = map([r, g, b], (val) => {
+      val = val < 0 ? 0 : val
+      val = val > 255 ? 255 : val
+      return val
+    })
     return `#${((1 << 24) + (r << 16) + (g << 8) + b).toString(16).slice(1)}`
   }
 
@@ -58,32 +63,36 @@ const setStyle = (href, col, commit) => {
     head.appendChild(styleEl)
     const styleSheet = styleEl.sheet
 
-    const isDark = (col.fg.r + col.fg.g + col.fg.b) > (col.bg.r + col.bg.g + col.bg.b)
+    const isDark = (col.text.r + col.text.g + col.text.b) > (col.bg.r + col.bg.g + col.bg.b)
     let colors = {}
 
-    times(4, (n) => {
-      const nameLow = `base0${n.toString(16).toUpperCase()}`
-      const nameHigh = `base0${(n + 4).toString(16).toUpperCase()}`
-      if (isDark) {
-        colors[nameLow] = rgb2hex(col.bg.r + 10 * n, col.bg.g + 10 * n, col.bg.b + 10 * n)
-        colors[nameHigh] = rgb2hex(col.fg.r - 10 * n, col.fg.g - 10 * n, col.fg.b - 10 * n)
-      } else {
-        colors[nameLow] = rgb2hex(col.bg.r - 10 * n, col.bg.g - 10 * n, col.bg.b - 10 * n)
-        colors[nameHigh] = rgb2hex(col.fg.r + 10 * n, col.fg.g + 10 * n, col.fg.b + 10 * n)
-      }
-      styleSheet.insertRule(`.${nameLow} { color: ${colors[nameLow]}`, 'index-max')
-      styleSheet.insertRule(`.${nameHigh} { color: ${colors[nameHigh]}`, 'index-max')
-      styleSheet.insertRule(`.${nameLow}-background { background-color: ${colors[nameLow]}`, 'index-max')
-      styleSheet.insertRule(`.${nameHigh}-background { background-color: ${colors[nameHigh]}`, 'index-max')
+    let mod = 10
+    if (isDark) {
+      mod = mod * -1
+    }
+    colors['base00'] = rgb2hex(col.bg.r, col.bg.g, col.bg.b)                         // background
+    colors['base01'] = rgb2hex(col.bg.r - mod, col.bg.g - mod, col.bg.b - mod)       // hilighted bg
+    colors['base02'] = rgb2hex(col.fg.r, col.fg.g, col.fg.b)                         // panels & buttons
+    colors['base03'] = rgb2hex(col.fg.r - mod, col.fg.g - mod, col.fg.b - mod)       // borders
+    colors['base04'] = rgb2hex(col.text.r + mod, col.text.g + mod, col.text.b + mod) // faint text
+    colors['base05'] = rgb2hex(col.text.r, col.text.g, col.text.b)                   // text
+    colors['base06'] = rgb2hex(col.text.r - mod, col.text.g - mod, col.text.b - mod) // strong text
+    colors['base07'] = rgb2hex(col.text.r - mod * 2, col.text.g - mod * 2, col.text.b - mod * 2)
+    colors['base08'] = rgb2hex(col.link.r, col.link.g, col.link.b)                   // links
+
+    times(9, (n) => {
+      const color = colors[`base0${n}`]
+      styleSheet.insertRule(`.base0${n} { color: ${color}`, 'index-max')
+      styleSheet.insertRule(`.base0${n}-background { background-color: ${color}`, 'index-max')
     })
-    colors['base08'] = rgb2hex(col.link.r, col.link.g, col.link.b)
+
     commit('setOption', { name: 'colors', value: colors })
-    console.log(colors)
 
     styleSheet.insertRule(`a { color: ${colors['base08']}`, 'index-max')
     styleSheet.insertRule(`body { color: ${colors['base05']}`, 'index-max')
     styleSheet.insertRule(`.base05-border { border-color: ${colors['base05']}`, 'index-max')
     styleSheet.insertRule(`.base03-border { border-color: ${colors['base03']}`, 'index-max')
+    console.log(styleSheet)
     body.style.display = 'initial'
   }
   if (col) {