diff --git a/app/models/environment.rb b/app/models/environment.rb
index c70a01a..2fa53a5 100644
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -205,7 +205,6 @@ class Environment < ActiveRecord::Base
   settings_items :description, :type => String
   settings_items :category_types, :type => Array, :default => ['Category']
   settings_items :enable_ssl
-  settings_items :theme, :type => String, :default => 'default'
   settings_items :icon_theme, :type => String, :default => 'default'
   settings_items :local_docs, :type => Array, :default => []
   settings_items :news_amount_by_folder, :type => Integer, :default => 4
diff --git a/db/migrate/20100722020357_add_default_value_for_environment_theme.rb b/db/migrate/20100722020357_add_default_value_for_environment_theme.rb
new file mode 100644
index 0000000..83dab82
--- /dev/null
+++ b/db/migrate/20100722020357_add_default_value_for_environment_theme.rb
@@ -0,0 +1,9 @@
+class AddDefaultValueForEnvironmentTheme < ActiveRecord::Migration
+  def self.up
+    change_column :environments, :theme, :string, :default => 'default'
+  end
+
+  def self.down
+    change_column :environments, :theme, :string, :default => nil
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index bf84e76..e287b35 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20100621235235) do
+ActiveRecord::Schema.define(:version => 20100722020357) do
 
   create_table "article_versions", :force => true do |t|
     t.integer  "article_id"
@@ -182,7 +182,7 @@ ActiveRecord::Schema.define(:version => 20100621235235) do
     t.text     "design_data"
     t.text     "custom_header"
     t.text     "custom_footer"
-    t.string   "theme"
+    t.string   "theme",                        :default => "default"
     t.text     "terms_of_use_acceptance_text"
     t.datetime "created_at"
     t.datetime "updated_at"
diff --git a/test/unit/environment_test.rb b/test/unit/environment_test.rb
index 217830c..a19568d 100644
--- a/test/unit/environment_test.rb
+++ b/test/unit/environment_test.rb
@@ -972,4 +972,11 @@ class EnvironmentTest < Test::Unit::TestCase
     assert_equal '.', env.currency_delimiter
   end
 
+  should 'set a new theme' do
+    env = fast_create(Environment)
+    env.theme = 'another'
+    env.save! && env.reload
+    assert_equal 'another', env.theme
+  end
+
 end
--
libgit2 0.21.2