diff --git a/openlp/core/ui/themeform.py b/openlp/core/ui/themeform.py
index 2b6075876..92dd76b29 100644
--- a/openlp/core/ui/themeform.py
+++ b/openlp/core/ui/themeform.py
@@ -29,7 +29,7 @@ import os
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import translate, theme, BackgroundType, BackgroundGradientType
+from openlp.core.lib import translate, BackgroundType, BackgroundGradientType
 from openlp.core.utils import get_images_filter
 from themedialog import Ui_ThemeDialog
 
@@ -315,18 +315,18 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeDialog):
             self.imageLineEdit.setText(self.theme.background_filename)
         if self.theme.background_direction == \
             BackgroundGradientType.to_string(BackgroundGradientType.Horizontal):
-           self.setField(u'gradient', QtCore.QVariant(0))
+            self.setField(u'gradient', QtCore.QVariant(0))
         elif self.theme.background_direction == \
             BackgroundGradientType.to_string(BackgroundGradientType.Vertical):
-           self.setField(u'gradient', QtCore.QVariant(1))
+            self.setField(u'gradient', QtCore.QVariant(1))
         elif self.theme.background_direction == \
             BackgroundGradientType.to_string(BackgroundGradientType.Circular):
-           self.setField(u'gradient', QtCore.QVariant(2))
+            self.setField(u'gradient', QtCore.QVariant(2))
         elif self.theme.background_direction == \
             BackgroundGradientType.to_string(BackgroundGradientType.LeftTop):
-           self.setField(u'gradient', QtCore.QVariant(3))
+            self.setField(u'gradient', QtCore.QVariant(3))
         else:
-           self.setField(u'gradient', QtCore.QVariant(4))
+            self.setField(u'gradient', QtCore.QVariant(4))
 
     def setMainAreaTabValues(self):
         """
diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py
index 2162253c9..e5b8d1a0d 100644
--- a/openlp/core/ui/thememanager.py
+++ b/openlp/core/ui/thememanager.py
@@ -608,7 +608,7 @@ class ThemeManager(QtGui.QWidget):
                 BackgroundGradientType. \
                 to_string(BackgroundGradientType.Horizontal)
             if theme.BackgroundParameter3.name() == 1:
-                 newtheme.background_direction = \
+                newtheme.background_direction = \
                     BackgroundGradientType. \
                     to_string(BackgroundGradientType.Horizontal)
             newtheme.background_start_color = \
diff --git a/openlp/plugins/songs/songsplugin.py b/openlp/plugins/songs/songsplugin.py
index 338179037..b2df06401 100644
--- a/openlp/plugins/songs/songsplugin.py
+++ b/openlp/plugins/songs/songsplugin.py
@@ -122,7 +122,8 @@ class SongsPlugin(Plugin):
         self.toolsReindexItem = QtGui.QAction(tools_menu)
         self.toolsReindexItem.setIcon(build_icon(u':/plugins/plugin_songs.png'))
         self.toolsReindexItem.setObjectName(u'toolsReindexItem')
-        self.toolsReindexItem.setText(translate('SongsPlugin', '&Re-index Songs'))
+        self.toolsReindexItem.setText(
+            translate('SongsPlugin', '&Re-index Songs'))
         self.toolsReindexItem.setStatusTip(
             translate('SongsPlugin', 'Re-index the songs database to improve '
             'searching and ordering.'))
@@ -149,8 +150,9 @@ class SongsPlugin(Plugin):
                 song.title = u''
             if song.alternate_title is None:
                 song.alternate_title = u''
-            song.search_title = self.whitespace.sub(u' ', song.title.lower()) +\
-                u' ' + self.whitespace.sub(u' ', song.alternate_title.lower())
+            song.search_title = self.whitespace.sub(u' ', \
+                song.title.lower()) + u' ' + \
+                self.whitespace.sub(u' ', song.alternate_title.lower())
             progressDialog.setValue(counter)
         self.manager.save_objects(songs)
         counter += 1