diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py
index 729f2ade3..8aa903772 100644
--- a/openlp/core/ui/slidecontroller.py
+++ b/openlp/core/ui/slidecontroller.py
@@ -1404,7 +1404,6 @@ class SlideController(QtWidgets.QWidget, LogMixin, RegistryProperties):
             self.media_controller.video(self.controller_type, item, self.hide_mode())
         if not self.is_live:
             self.preview_display.show()
-            #self.slide_preview.hide()
 
     def on_media_close(self):
         """
@@ -1412,7 +1411,6 @@ class SlideController(QtWidgets.QWidget, LogMixin, RegistryProperties):
         """
         self.media_controller.media_reset(self)
         self.preview_display.hide()
-        #self.slide_preview.show()
 
     def _reset_blank(self, no_theme):
         """
diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py
index 9849729fd..3962cfb82 100644
--- a/openlp/core/ui/thememanager.py
+++ b/openlp/core/ui/thememanager.py
@@ -295,7 +295,7 @@ class ThemeManager(QtWidgets.QWidget, RegistryBase, Ui_ThemeManager, LogMixin, R
                     for plugin in self.plugin_manager.plugins:
                         if plugin.uses_theme(old_theme_name):
                             plugin.rename_theme(old_theme_name, new_theme_name)
-                    #self.renderer.update_theme(new_theme_name, old_theme_name)
+                    self.renderer.set_theme(self.get_theme_data(new_theme_data))
                     self.load_themes()
 
     def on_copy_theme(self, field=None):
@@ -347,7 +347,7 @@ class ThemeManager(QtWidgets.QWidget, RegistryBase, Ui_ThemeManager, LogMixin, R
             self.theme_form.theme = theme
             self.theme_form.exec(True)
             self.old_background_image_path = None
-            #self.renderer.update_theme(theme.theme_name)
+            self.renderer.set_theme(theme)
             self.load_themes()
 
     def on_delete_theme(self, field=None):
@@ -363,7 +363,7 @@ class ThemeManager(QtWidgets.QWidget, RegistryBase, Ui_ThemeManager, LogMixin, R
             row = self.theme_list_widget.row(item)
             self.theme_list_widget.takeItem(row)
             self.delete_theme(theme)
-            #self.renderer.update_theme(theme, only_delete=True)
+            self.renderer.set_theme(item.data(QtCore.Qt.UserRole))
             # As we do not reload the themes, push out the change. Reload the
             # list as the internal lists and events need to be triggered.
             self._push_themes()
@@ -669,7 +669,7 @@ class ThemeManager(QtWidgets.QWidget, RegistryBase, Ui_ThemeManager, LogMixin, R
         create_paths(theme_dir)
         theme_path = theme_dir / '{file_name}.json'.format(file_name=name)
         try:
-                theme_path.write_text(theme_pretty)
+            theme_path.write_text(theme_pretty)
         except OSError:
             self.log_exception('Saving theme to file failed')
         if image_source_path and image_destination_path:
diff --git a/openlp/plugins/alerts/lib/alertsmanager.py b/openlp/plugins/alerts/lib/alertsmanager.py
index 40d2269c5..abdf8eb60 100644
--- a/openlp/plugins/alerts/lib/alertsmanager.py
+++ b/openlp/plugins/alerts/lib/alertsmanager.py
@@ -85,9 +85,6 @@ class AlertsManager(QtCore.QObject, RegistryBase, LogMixin, RegistryProperties):
         text = self.alert_list.pop(0)
         alert_tab = self.parent().settings_tab
         self.live_controller.displays[0].alert(text, alert_tab.location)
-        # Check to see if we have a timer running.
-        #if self.timer_id == 0:
-        #    self.timer_id = self.startTimer(int(alert_tab.timeout) * 1000)
 
     def timerEvent(self, event):
         """