diff --git a/style/Sunrise/personality.php b/style/Sunrise/personality.php
index ba8bf4b2f..cbcd9b07a 100644
--- a/style/Sunrise/personality.php
+++ b/style/Sunrise/personality.php
@@ -147,10 +147,16 @@
 							<input type="radio" name="form[color]" id="red" value="#ff4444"<?php if ($luna_user['color'] == '#ff4444') echo ' checked' ?>>
 						</label>
 						<label class="btn btn-primary color-accent accent-luna<?php if ($luna_user['color'] == '#0d4382') echo ' active' ?>">
-							<input type="radio" name="form[color]" id="red" value="#0d4382"<?php if ($luna_user['color'] == '#0d4382') echo ' checked' ?>>
+							<input type="radio" name="form[color]" id="luna" value="#0d4382"<?php if ($luna_user['color'] == '#0d4382') echo ' checked' ?>>
 						</label>
-						<label class="btn btn-primary color-accent accent-grey<?php if ($luna_user['color'] == '#cccccc') echo ' active' ?>">
-							<input type="radio" name="form[color]" id="red" value="#cccccc"<?php if ($luna_user['color'] == '#cccccc') echo ' checked' ?>>
+						<label class="btn btn-primary color-accent accent-white<?php if ($luna_user['color'] == '#cccccc') echo ' active' ?>">
+							<input type="radio" name="form[color]" id="white" value="#cccccc"<?php if ($luna_user['color'] == '#cccccc') echo ' checked' ?>>
+						</label>
+						<label class="btn btn-primary color-accent accent-grey<?php if ($luna_user['color'] == '#999999') echo ' active' ?>">
+							<input type="radio" name="form[color]" id="grey" value="#999999"<?php if ($luna_user['color'] == '#999999') echo ' checked' ?>>
+						</label>
+						<label class="btn btn-primary color-accent accent-black<?php if ($luna_user['color'] == '#444444') echo ' active' ?>">
+							<input type="radio" name="form[color]" id="black" value="#444444"<?php if ($luna_user['color'] == '#444444') echo ' checked' ?>>
 						</label>
 					</div>
 				</div>
diff --git a/style/Sunrise/style.css b/style/Sunrise/style.css
index 68ae89a33..fa710f90e 100644
--- a/style/Sunrise/style.css
+++ b/style/Sunrise/style.css
@@ -1118,10 +1118,18 @@ blockquote footer {
 	background-color: #0d4382 !important;
 }
 
-.accent-grey {
+.accent-white {
 	background-color: #ccc !important;
 }
 
+.accent-grey {
+	background-color: #999 !important;
+}
+
+.accent-black {
+	background-color: #444 !important;
+}
+
 /* Cookie bar */
 .cookie-bar {
 	background: #393939;
diff --git a/style/Sunrise/style.php b/style/Sunrise/style.php
index b68789510..14b646cfb 100644
--- a/style/Sunrise/style.php
+++ b/style/Sunrise/style.php
@@ -25,9 +25,17 @@
 	$secondary_color = '#0d4382';
 	$tertiary_color = '#0b3c75';
 } elseif ($luna_user['color'] == '#cccccc') {
+	$primary_color = '#eeeeee';
+	$secondary_color = '#dddddd';
+	$tertiary_color = '#cccccc';
+} elseif ($luna_user['color'] == '#999999') {
 	$primary_color = '#afafaf';
 	$secondary_color = '#9e9e9e';
 	$tertiary_color = '#8e8e8e';
+} elseif ($luna_user['color'] == '#444444') {
+	$primary_color = '#555555';
+	$secondary_color = '#444444';
+	$tertiary_color = '#333333';
 }
 
 ?>
@@ -52,4 +60,10 @@
 .list-group-forum a.list-group-item:hover {
 	border-left-color: <?php echo $primary_color ?>;
 }
+
+<?php if ($luna_user['color'] == '#cccccc') { ?>
+.navbar-inverse .navbar-brand:hover, .navbar-inverse .navbar-brand:focus, .first-run-title, .navbar-inverse .navbar-nav > li > a:hover, .navbar-inverse .navbar-nav > li > a:focus, .navbar-inverse .navbar-nav > li > a, .navbar-inverse .navbar-brand, footer, footer a {
+	color: #555;
+}
+<?php } ?>
 </style>
\ No newline at end of file