diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index 8bba8e912..572d96ade 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -561,8 +561,6 @@ class Renderer(object):
         ``image2``
             Defaults to *None*. Another image to save to disk.
         """
-        im = image.toImage()
-        im.save(u'renderer.png', u'png')
+        image.save(u'renderer.png', u'png')
         if image2 is not None:
-            im = image2.toImage()
-            im.save(u'renderer2.png', u'png')
+            image2.save(u'renderer2.png', u'png')
diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index cac0b8e0a..6a5401e3a 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -438,7 +438,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         self.mainDisplay = MainDisplay(self, screens)
         self.alertForm = AlertForm(self)
         self.aboutForm = AboutForm(self)
-        self.settingsForm = SettingsForm(self.screenList, self)
+        self.settingsForm = SettingsForm(self.screenList, self, self)
         # Set up the path with plugins
         pluginpath = os.path.split(os.path.abspath(__file__))[0]
         pluginpath = os.path.abspath(
diff --git a/openlp/core/ui/settingsform.py b/openlp/core/ui/settingsform.py
index b00e622cf..6d17009af 100644
--- a/openlp/core/ui/settingsform.py
+++ b/openlp/core/ui/settingsform.py
@@ -35,7 +35,7 @@ log = logging.getLogger(u'SettingsForm')
 class SettingsForm(QtGui.QDialog, Ui_SettingsDialog):
 
     def __init__(self, screen_list, mainWindow, parent=None):
-        QtGui.QDialog.__init__(self, None)
+        QtGui.QDialog.__init__(self, parent)
         self.setupUi(self)
         # General tab
         self.GeneralTab = GeneralTab(screen_list)
diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py
index 9ac09c839..b5a2b225f 100644
--- a/openlp/core/ui/thememanager.py
+++ b/openlp/core/ui/thememanager.py
@@ -290,8 +290,8 @@ class ThemeManager(QtGui.QWidget):
             xml = newtheme.extract_xml()
         theme = ThemeXML()
         theme.parse(xml)
-        theme.extend_image_filename(self.path)
         self.cleanTheme(theme)
+        theme.extend_image_filename(self.path)
         return theme
 
     def checkThemesExists(self, dir):
diff --git a/openlp/plugins/audit/forms/auditdetailform.py b/openlp/plugins/audit/forms/auditdetailform.py
index 74e28f394..d93c07527 100644
--- a/openlp/plugins/audit/forms/auditdetailform.py
+++ b/openlp/plugins/audit/forms/auditdetailform.py
@@ -25,8 +25,6 @@
 from PyQt4 import QtCore, QtGui
 
 from auditdetaildialog import Ui_AuditDetailDialog
-from openlp.core.lib import translate
-#from openlp.plugins.audit.lib.models import CustomSlide
 
 class AuditDetailForm(QtGui.QDialog, Ui_AuditDetailDialog):
     """