diff --git a/app/models/user.rb b/app/models/user.rb
index 6a5411b222dcce5514686c630c639b39fe8908f3..8efae30f35e6fd39db423e050a33ea70fc323817 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -205,6 +205,7 @@ class User < ActiveRecord::Base
       u.projects_limit = Gitlab.config.gitlab.default_projects_limit
       u.can_create_group = Gitlab.config.gitlab.default_can_create_group
       u.can_create_team = Gitlab.config.gitlab.default_can_create_team
+      u.theme_id = Gitlab::Theme::MARS
     end
   end
 
diff --git a/lib/gitlab/theme.rb b/lib/gitlab/theme.rb
index 7f833867e393c59c32f59bd376b07f55aa44f5e9..89604162304d14c60357e5ddbac156843d7b1bba 100644
--- a/lib/gitlab/theme.rb
+++ b/lib/gitlab/theme.rb
@@ -1,12 +1,18 @@
 module Gitlab
   class Theme
+    BASIC  = 1
+    MARS   = 2
+    MODERN = 3
+    GRAY   = 4
+    COLOR  = 5
+
     def self.css_class_by_id(id)
       themes = {
-        1 => "ui_basic",
-        2 => "ui_mars",
-        3 => "ui_modern",
-        4 => "ui_gray",
-        5 => "ui_color"
+        BASIC  => "ui_basic",
+        MARS   => "ui_mars",
+        MODERN => "ui_modern",
+        GRAY   => "ui_gray",
+        COLOR  => "ui_color"
       }
 
       id ||= 1