diff --git a/app/controllers/admin/pages_controller.rb b/app/controllers/admin/pages_controller.rb
index e3fdbb202..5a5bc2c3f 100644
--- a/app/controllers/admin/pages_controller.rb
+++ b/app/controllers/admin/pages_controller.rb
@@ -22,7 +22,7 @@ class Admin::PagesController < ApplicationController
     @item.is_published = true
     @item.parent_id = @parent_item.id rescue nil
     @designs = Design.all.entries
-    @default_design = @designs.detect {|d| d.title.to_s == 'Bob' }
+    @default_design = Design.first
     @default_theme =  @default_design.themes.detect {|t| t.name.to_s == 'default' }
   end
 
diff --git a/app/models/page.rb b/app/models/page.rb
index be51c35c0..4e9f87ff6 100644
--- a/app/models/page.rb
+++ b/app/models/page.rb
@@ -1,7 +1,7 @@
 class Page < Item
   
   field :content
-  field :theme_id
+  field :theme_id, :type => BSON::ObjectId
   
   belongs_to :design
   has_many :page_parts
diff --git a/config/mongoid.yml b/config/mongoid.yml
index 5fbcd8cd6..0270b13ce 100644
--- a/config/mongoid.yml
+++ b/config/mongoid.yml
@@ -16,8 +16,10 @@ test:
 
 # set these environment variables on your prod server
 production:
-  host: <%= ENV['MONGOID_HOST'] %>
-  port: <%= ENV['MONGOID_PORT'] %>
-  username: <%= ENV['MONGOID_USERNAME'] %>
-  password: <%= ENV['MONGOID_PASSWORD'] %>
-  database: <%= ENV['MONGOID_DATABASE'] %>
\ No newline at end of file
+  # host: <%= ENV['MONGOID_HOST'] %>
+  # port: <%= ENV['MONGOID_PORT'] %>
+  # username: <%= ENV['MONGOID_USERNAME'] %>
+  # password: <%= ENV['MONGOID_PASSWORD'] %>
+  # database: <%= ENV['MONGOID_DATABASE'] %>
+  <<: *defaults
+  database: prototype_r4_development
\ No newline at end of file
diff --git a/lib/parser.rb b/lib/parser.rb
index d55b3cdf8..c8fc1940a 100644
--- a/lib/parser.rb
+++ b/lib/parser.rb
@@ -66,10 +66,8 @@ module Parser
       c.define_tag 'stylesheets' do |tag|
         res = ''
         res << "<link href='#{page.design.structure_css.url}' rel='stylesheet' type='text/css' /> "
-        page.design.themes.each do |theme|
-          res << "<link href='#{theme.file.url}' rel='stylesheet' type='text/css' /> "
-        end
-        res
+        theme = page.design.themes.detect{ |d| d.id == page.theme_id  }
+        res << "<link href='#{theme.file.url}' rel='stylesheet' type='text/css' />"
       end
       c.define_tag 'javascripts' do |tag|
         res = ''
@@ -171,10 +169,8 @@ module Parser
       c.define_tag 'stylesheets' do |tag|
         res = ''
         res << "<link href='#{page.design.structure_css.url}' rel='stylesheet' type='text/css' />"
-        page.design.themes.each do |theme|
-          res << "<link href='#{theme.file.url}' rel='stylesheet' type='text/css' />"
-        end
-        res
+        theme = page.design.themes.detect{ |d| d.id == page.theme_id  }
+        res << "<link href='#{theme.file.url}' rel='stylesheet' type='text/css' />"
       end
       c.define_tag 'javascripts' do |tag|
         res = ''