diff --git a/src/sass/partials/messages.sass b/src/sass/partials/messages.sass
index 3cf67abde..75f3f43e9 100644
--- a/src/sass/partials/messages.sass
+++ b/src/sass/partials/messages.sass
@@ -281,10 +281,10 @@ input[type="checkbox"]:checked.poloCheckbox + label
   .message-body
     margin-left: 10px
     padding: 5px 8px
-    background: #ddd
+    background: darken($page_content_right_bg, 10%)
     +borderRadius(5px)
     p
-      color: lighten(#222222, 20%)
+      color: automatic-text-color(darken($page_content_right_bg, 10%))
       font-size: 13px
       //font-weight: 300
       margin: 0
diff --git a/src/views/settings.hbs b/src/views/settings.hbs
index 57cf9a476..9a5f0d9ec 100644
--- a/src/views/settings.hbs
+++ b/src/views/settings.hbs
@@ -259,29 +259,6 @@
                         </div>
                     </div>
 
-                    <div class="setting-item-wrap uk-margin-medium-bottom">
-                        <div class="panel trupanel nopadding no-hover-shadow" style="min-height: 60px;">
-                            <div class="left">
-                                <h6 style="padding: 0 0 0 15px; margin: 15px 0 0 0; font-size: 16px; line-height: 14px;">Built-in Color Scheme</h6>
-                                <h5 style="padding: 0 0 10px 15px; margin: 2px 0 0 0; font-size: 12px;" class="uk-text-muted">
-                                    Select a predefined color scheme
-                                </h5>
-                            </div>
-                            <div class="right uk-width-1-3 uk-clearfix" style="position:relative; margin-right: 15px; margin-top: 5px;">
-                                <div class="uk-width-2-3 uk-float-right">
-                                    <select name="colorSchemeSelect" id="colorSchemeSelect" data-md-selectize>
-                                        <option value="light">Light (Default)</option>
-                                        <option value="dark">Dark</option>
-                                        <option value="moonlight">Moonlight</option>
-                                        <option value="bluejean">Blue Jean</option>
-                                        <option value="sandstone">Sandstone</option>
-                                        <option value="winterfire">Winter's Fire</option>
-                                    </select>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
                     <div class="setting-item-wrap uk-margin-medium-bottom">
                         <div class="panel trupanel nopadding no-hover-shadow uk-overflow-hidden" style="min-height: 60px; height: auto;">
                             <div class="left">
@@ -299,6 +276,23 @@
                             <div class="panel-body2" style="padding: 20px 15px 15px 15px;">
                                 <div class="uk-position-relative">
                                     <div class="zone">
+                                        <div class="z-box uk-clearfix">
+                                            <div class="uk-float-left uk-width-1-2">
+                                                <h5 style="font-weight: normal;">Built-in Color Scheme</h5>
+                                                <p class="uk-text-muted">Select a predefined color scheme</p>
+                                            </div>
+                                            <div class="uk-float-right uk-width-1-3 uk-clearfix" style="position:relative; max-width: 283px; margin-top: 5px;">
+                                                <select name="colorSchemeSelect" id="colorSchemeSelect" data-md-selectize>
+                                                    <option value="light">Light (Default)</option>
+                                                    <option value="dark">Dark</option>
+                                                    <option value="moonlight">Moonlight</option>
+                                                    <option value="bluejean">Blue Jean</option>
+                                                    <option value="sandstone">Sandstone</option>
+                                                    <option value="winterfire">Winter's Fire</option>
+                                                </select>
+                                            </div>
+                                        </div>
+
                                         <div class="z-box uk-clearfix">
                                             <div class="uk-float-left uk-width-1-2">
                                                 <h5 style="font-weight: normal;">Header Background</h5>