diff --git a/app/assets/images/dark-scheme-preview.png b/app/assets/images/dark-scheme-preview.png
new file mode 100644
index 0000000..055a906
Binary files /dev/null and b/app/assets/images/dark-scheme-preview.png differ
diff --git a/app/assets/images/dark.png b/app/assets/images/dark.png
deleted file mode 100644
index 055a906..0000000
Binary files a/app/assets/images/dark.png and /dev/null differ
diff --git a/app/assets/images/monokai-scheme-preview.png b/app/assets/images/monokai-scheme-preview.png
new file mode 100644
index 0000000..9477941
Binary files /dev/null and b/app/assets/images/monokai-scheme-preview.png differ
diff --git a/app/assets/images/monokai.png b/app/assets/images/monokai.png
deleted file mode 100644
index 9477941..0000000
Binary files a/app/assets/images/monokai.png and /dev/null differ
diff --git a/app/assets/images/solarized-dark-scheme-preview.png b/app/assets/images/solarized-dark-scheme-preview.png
new file mode 100644
index 0000000..728964b
Binary files /dev/null and b/app/assets/images/solarized-dark-scheme-preview.png differ
diff --git a/app/assets/images/solarized_dark.png b/app/assets/images/solarized_dark.png
deleted file mode 100644
index 728964b..0000000
Binary files a/app/assets/images/solarized_dark.png and /dev/null differ
diff --git a/app/assets/images/white-scheme-preview.png b/app/assets/images/white-scheme-preview.png
new file mode 100644
index 0000000..67eb876
Binary files /dev/null and b/app/assets/images/white-scheme-preview.png differ
diff --git a/app/assets/images/white.png b/app/assets/images/white.png
deleted file mode 100644
index 67eb876..0000000
Binary files a/app/assets/images/white.png and /dev/null differ
diff --git a/app/assets/stylesheets/highlight/dark.scss b/app/assets/stylesheets/highlight/dark.scss
index a56c98c..129d33d 100644
--- a/app/assets/stylesheets/highlight/dark.scss
+++ b/app/assets/stylesheets/highlight/dark.scss
@@ -1,4 +1,4 @@
-.black .highlight {
+.dark .highlight {
 
   background-color: #333;
 
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 488a55b..5287bb0 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -4,12 +4,23 @@ require 'uri'
 module ApplicationHelper
   COLOR_SCHEMES = {
     1 => 'white',
-    2 => 'black',
+    2 => 'dark',
     3 => 'solarized-dark',
     4 => 'monokai',
   }
   COLOR_SCHEMES.default = 'white'
 
+  # Helper method to access the COLOR_SCHEMES
+  #
+  # The keys are the `color_scheme_ids`
+  # The values are the `name` of the scheme.
+  #
+  # The preview images are `name-scheme-preview.png`
+  # The stylesheets should use the css class `.name`
+  def color_schemes
+    COLOR_SCHEMES.freeze
+  end
+
   # Check if a particular controller is the current one
   #
   # args - One or more controller names to check
diff --git a/app/views/profiles/design.html.haml b/app/views/profiles/design.html.haml
index 878297f..9ada69c 100644
--- a/app/views/profiles/design.html.haml
+++ b/app/views/profiles/design.html.haml
@@ -40,23 +40,9 @@
         %i.icon-ok
         Saved
     .code_highlight_opts
-      = label_tag do
-        .prev
-          = image_tag "white.png"
-        = f.radio_button :color_scheme_id, 1
-        White
-      = label_tag do
-        .prev
-          = image_tag "dark.png"
-        = f.radio_button :color_scheme_id, 2
-        Dark
-      = label_tag do
-        .prev
-          = image_tag "solarized_dark.png"
-        = f.radio_button :color_scheme_id, 3
-        Solarized Dark
-      = label_tag do
-        .prev
-          = image_tag "monokai.png"
-        = f.radio_button :color_scheme_id, 4
-        Monokai
+      - color_schemes.each do |color_scheme_id, color_scheme|
+        = label_tag do
+          .prev
+            = image_tag "#{color_scheme}-scheme-preview.png"
+          = f.radio_button :color_scheme_id, color_scheme_id
+          = color_scheme.gsub(/[-_]+/, ' ').humanize
diff --git a/features/steps/profile/profile.rb b/features/steps/profile/profile.rb
index 8981705..c1fe00c 100644
--- a/features/steps/profile/profile.rb
+++ b/features/steps/profile/profile.rb
@@ -74,7 +74,7 @@ class Profile < Spinach::FeatureSteps
 
   When "I change my code preview theme" do
     within '.code-preview-theme' do
-      choose "Solarized Dark"
+      choose "Solarized dark"
     end
   end
 
--
libgit2 0.21.2