diff --git a/client/scss/components/color-picker.scss b/client/scss/components/color-picker.scss
index 2efab795..d8ccb41e 100644
--- a/client/scss/components/color-picker.scss
+++ b/client/scss/components/color-picker.scss
@@ -4,31 +4,43 @@
   height: 60px;
 
   &-choice {
-    width: 50px;
-    height: 50px;
-    border: 1px solid #FFF;
+    width: 40px;
+    height: 40px;
+    border: 0 solid #FFF;
     transition: all .2s ease;
     cursor: pointer;
     display: flex;
     justify-content: center;
     align-items: center;
+    margin-right: 1px;
+
+    &:first-child {
+      border-top-left-radius: 5px;
+      border-bottom-left-radius: 5px;
+    }
+    &:last-child {
+      border-top-right-radius: 5px;
+      border-bottom-right-radius: 5px;
+    }
 
     &.is-active, &:hover {
       border-width: 5px;
-      border-radius: 3px;
-      width: 60px;
-      height: 60px;
+      border-radius: 5px;
+      width: 55px;
+      height: 55px;
     }
 
     &.is-active::before {
-      content: 'X';
+      content: '|';
       font-weight: 700;
       color: rgba(255,255,255,.5);
+      margin-bottom: 3px;
     }
 
     @each $color, $colorvalue in $material-colors {
 		  &.is-#{$color} {
         background-color: mc($color, '500');
+        background-image: linear-gradient(45deg, mc($color, '400'), mc($color, '700'));
         border-color: mc($color,'500');
 
         &.is-active, &:hover {
diff --git a/client/scss/components/hero.scss b/client/scss/components/hero.scss
index 31031937..21d92fb6 100644
--- a/client/scss/components/hero.scss
+++ b/client/scss/components/hero.scss
@@ -40,7 +40,7 @@
 				color: #FFF;
 				display: inline-flex;
 				align-items: center;
-				justify-items: center;
+				justify-content: center;
 				padding: 0 15px;
 				height: 32px;
 				border: 1px solid mc('light-blue', '600');
@@ -74,3 +74,20 @@
 	}
 
 }
+
+/* THEME OVERRIDE - START */
+
+@each $color, $colorvalue in $material-colors {
+  .is-primary-#{$color} .hero {
+    h1 {
+      color: mc($color, '500');
+    }
+  }
+  .is-alternate-#{$color} .hero {
+    .pageicon {
+      color: mc($color, '500');
+    }
+  }
+}
+
+/* THEME OVERRIDE - END */
diff --git a/server/views/pages/admin/theme.pug b/server/views/pages/admin/theme.pug
index c63f39ca..dcd330d5 100644
--- a/server/views/pages/admin/theme.pug
+++ b/server/views/pages/admin/theme.pug
@@ -8,17 +8,20 @@ block adminContent
   .form-sections
     section
       label.label= t('admin:theme.primarycolor')
-      color-picker(current-color='indigo')
+      color-picker(current-color=appconfig.theme.primary)
+      span.desc Used for top navigation bar, headers, links, etc.
     section
       label.label= t('admin:theme.altcolor')
-      color-picker(current-color='blue-grey')
+      color-picker(current-color=appconfig.theme.alt)
+      span.desc Used for the sidebar (in a darker tone)
     section
       label.label= t('admin:theme.footercolor')
-      color-picker(current-color='blue-grey')
+      color-picker(current-color=appconfig.theme.footer)
+      span.desc Used for the foter (in a lighter tone)
     section
       label.label= t('admin:theme.codeblock')
-      toggle(current-value='dark', desc='Use Dark Theme')
-      toggle(current-value='dark', desc='Colorize code syntax')
+      toggle(:current-value=appconfig.theme.code.dark.toString(), desc='Use Dark Theme')
+      toggle(:current-value=appconfig.theme.code.colorize.toString(), desc='Colorize code syntax')
     section
       button.button.is-green(@click='saveUser')
         i.nc-icon-outline.ui-1_check