diff --git a/lib/ProMotion/table/cell/table_view_cell_module.rb b/lib/ProMotion/table/cell/table_view_cell_module.rb
index 7bbb732..4a8ce2b 100644
--- a/lib/ProMotion/table/cell/table_view_cell_module.rb
+++ b/lib/ProMotion/table/cell/table_view_cell_module.rb
@@ -25,25 +25,28 @@ module ProMotion
 
     def set_cell_attributes
       data_cell_attributes = data_cell.dup
-      [:image, :accessory_action].each { |k| data_cell_attributes.delete(k) }
+      [:image, :accessory_action, :editing_style].each { |k| data_cell_attributes.delete(k) }
       set_attributes self, data_cell_attributes
       self
     end
 
     def set_background_color
-      self.backgroundView = UIView.new.tap{|v| v.backgroundColor = data_cell[:background_color]} if data_cell[:background_color]
+      self.backgroundView ||= UIView.new
+      self.backgroundView.backgroundColor = data_cell[:background_color] if data_cell[:background_color]
     end
 
     def set_accessory_view
-      if data_cell[:accessory][:view] == :switch
-        switch_view = UISwitch.alloc.initWithFrame(CGRectZero)
-        switch_view.setAccessibilityLabel(data_cell[:accessory][:accessibility_label] || data_cell[:title])
-        switch_view.addTarget(self.table_screen, action: "accessory_toggled_switch:", forControlEvents:UIControlEventValueChanged)
-        switch_view.on = !!data_cell[:accessory][:value]
-        self.accessoryView = switch_view
-      elsif data_cell[:accessory][:view]
-        self.accessoryView = data_cell[:accessory][:view]
-        self.accessoryView.autoresizingMask = UIViewAutoresizingFlexibleWidth
+      if data_cell[:accessory]
+        if data_cell[:accessory][:view] == :switch
+          switch_view = UISwitch.alloc.initWithFrame(CGRectZero)
+          switch_view.setAccessibilityLabel(data_cell[:accessory][:accessibility_label] || data_cell[:title])
+          switch_view.addTarget(self.table_screen, action: "accessory_toggled_switch:", forControlEvents:UIControlEventValueChanged)
+          switch_view.on = !!data_cell[:accessory][:value]
+          self.accessoryView = switch_view
+        elsif data_cell[:accessory][:view]
+          self.accessoryView = data_cell[:accessory][:view]
+          self.accessoryView.autoresizingMask = UIViewAutoresizingFlexibleWidth
+        end
       else
         self.accessoryView = nil
       end
diff --git a/lib/ProMotion/table/data/table_data.rb b/lib/ProMotion/table/data/table_data.rb
index 1b6e776..6bf4136 100644
--- a/lib/ProMotion/table/data/table_data.rb
+++ b/lib/ProMotion/table/data/table_data.rb
@@ -79,20 +79,15 @@ module ProMotion
         value: data_cell[:accessory_value],
         action: data_cell[:accessory_action],
         arguments: data_cell[:accessory_arguments]
-      } unless data_cell[:accessory].is_a? Hash
+      } unless data_cell[:accessory].nil? || data_cell[:accessory].is_a?(Hash)
 
       data_cell
     end
 
     def build_cell_identifier(data_cell)
-      ident = "Cell"
-      unless data_cell[:accessory].nil?
-        if data_cell[:accessory][:view] == :switch
-          ident << "-switch"
-        elsif !data_cell[:accessory][:view].nil?
-          ident << "-accessory"
-        end
-      end
+      ident = "#{data_cell[:cell_class]}"
+      ident << "-#{data_cell[:stylename].to_s}" if data_cell[:stylename] # For Teacup
+      ident << "-#{data_cell[:accessory][:view].to_s}" if data_cell[:accessory]
       ident << "-subtitle" if data_cell[:subtitle]
       ident << "-remoteimage" if data_cell[:remote_image]
       ident << "-image" if data_cell[:image]
diff --git a/lib/ProMotion/table/table.rb b/lib/ProMotion/table/table.rb
index 7f1ef9e..f281fe5 100644
--- a/lib/ProMotion/table/table.rb
+++ b/lib/ProMotion/table/table.rb
@@ -109,7 +109,7 @@ module ProMotion
       table_cell = table_view.dequeueReusableCellWithIdentifier(data_cell[:cell_identifier])
       
       unless table_cell
-        data_cell[:cell_style] = UITableViewCellStyleSubtitle
+        data_cell[:cell_style] ||= UITableViewCellStyleSubtitle
         table_cell = data_cell[:cell_class].alloc.initWithStyle(data_cell[:cell_style], reuseIdentifier:data_cell[:cell_identifier])
         table_cell.extend PM::TableViewCellModule unless table_cell.is_a?(PM::TableViewCellModule)
         table_cell.autoresizingMask = UIViewAutoresizingFlexibleWidth|UIViewAutoresizingFlexibleLeftMargin|UIViewAutoresizingFlexibleRightMargin
@@ -148,21 +148,44 @@ module ProMotion
       table_view_cell(index_path: index_path)
     end
 
+    def tableView(table_view, willDisplayCell: table_cell, forRowAtIndexPath: index_path)
+      data_cell = @promotion_table_data.cell(index_path: index_path)
+      table_cell.backgroundColor = data_cell[:background_color] if data_cell[:background_color]
+      table_cell.send(:restyle!) if table_cell.respond_to?(:restyle!)
+    end
+
     def tableView(table_view, heightForRowAtIndexPath:index_path)
       (@promotion_table_data.cell(index_path: index_path)[:height] || table_view.rowHeight).to_f
     end
 
     def tableView(table_view, didSelectRowAtIndexPath:index_path)
-      cell = @promotion_table_data.cell(index_path: index_path)
+      data_cell = @promotion_table_data.cell(index_path: index_path)
       table_view.deselectRowAtIndexPath(index_path, animated: true)
 
-      cell[:arguments] ||= {}
-      cell[:arguments][:cell] = cell if cell[:arguments].is_a?(Hash) # TODO: Should we really do this?
+      data_cell[:arguments] ||= {}
+      data_cell[:arguments][:cell] = data_cell if data_cell[:arguments].is_a?(Hash) # TODO: Should we really do this?
 
-      trigger_action(cell[:action], cell[:arguments]) if cell[:action]
+      trigger_action(data_cell[:action], data_cell[:arguments]) if data_cell[:action]
     end
 
-    def tableView(tableView, commitEditingStyle:editing_style, forRowAtIndexPath:index_path)
+    def tableView(table_view, editingStyleForRowAtIndexPath: index_path)
+      data_cell = @promotion_table_data.cell(index_path: index_path)
+
+      case data_cell[:editing_style]
+      when nil
+        UITableViewCellEditingStyleNone
+      when :none
+        UITableViewCellEditingStyleNone
+      when :delete
+        UITableViewCellEditingStyleDelete
+      when :insert
+        UITableViewCellEditingStyleInsert
+      else
+        data_cell[:editing_style]
+      end
+    end
+
+    def tableView(table_view, commitEditingStyle: editing_style, forRowAtIndexPath: index_path)
       if editing_style == UITableViewCellEditingStyleDelete
         delete_cell(index_path)
       end
@@ -175,13 +198,13 @@ module ProMotion
         tableView.setContentOffset(CGPointZero, animated:false)
         NSNotFound
       else
-        index-1
+        index - 1
       end
     end
 
-    def deleteRowsAtIndexPaths(indexPaths, withRowAnimation:animation)
-      PM.logger.warn "ProMotion expects you to use 'delete_cell(index_paths, animation)'' instead of 'deleteRowsAtIndexPaths(indexPaths, withRowAnimation:animation)'."
-      delete_cell(indexPaths, animation)
+    def deleteRowsAtIndexPaths(index_paths, withRowAnimation:animation)
+      PM.logger.warn "ProMotion expects you to use 'delete_cell(index_paths, animation)'' instead of 'deleteRowsAtIndexPaths(index_paths, withRowAnimation:animation)'."
+      delete_cell(index_paths, animation)
     end
 
   end