Clean code and add 'name' in theme.rb

app/models/design/theme.rb

@@ -1,3 +1,15 @@
 class Theme < Stylesheet
   embedded_in :design
+  field :name
+  
+  has_many :pages
+  
+  before_save :set_name
+  
+  protected
+  
+  def set_name
+    self.name = self.file_filename.split('.')[0]
+  end
+  
 end

app/models/page.rb

@@ -1,11 +1,11 @@
 class Page < Item
   
   field :content
-  field :design_name
   
-  validates_presence_of :design_name, :design_id
+  validates_presence_of :design_id
   
   belongs_to :design
+  belongs_to :theme
   has_many :page_parts
   
   def create_parts
@@ -27,15 +27,4 @@ class Page < Item
     Design.find(design_id)
   end
   
-  protected
-  
-  def setup_default_value
-    super
-    
-    if self.design_id
-      self.design_name = get_design.title
-    end
-    
-  end
-  
 end