diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py
index 6fb834e05..5799a3f41 100644
--- a/openlp/core/lib/mediamanageritem.py
+++ b/openlp/core/lib/mediamanageritem.py
@@ -169,8 +169,9 @@ class MediaManagerItem(QtGui.QWidget):
         ``slot``
             The method to call when the button is clicked.
 
-        ``objectname``
-            The name of the button.
+        ``checkable``
+            If *True* the button has two, *off* and *on*, states. Default is
+            *False*, which means the buttons has only one state.
         """
         # NB different order (when I broke this out, I didn't want to
         # break compatability), but it makes sense for the icon to
@@ -193,13 +194,13 @@ class MediaManagerItem(QtGui.QWidget):
         """
         # Add a toolbar
         self.addToolbar()
-        #Allow the plugin to define buttons at start of bar
+        # Allow the plugin to define buttons at start of bar
         self.addStartHeaderBar()
-        #Add the middle of the tool bar (pre defined)
+        # Add the middle of the tool bar (pre defined)
         self.addMiddleHeaderBar()
-        #Allow the plugin to define buttons at end of bar
+        # Allow the plugin to define buttons at end of bar
         self.addEndHeaderBar()
-        #Add the list view
+        # Add the list view
         self.addListViewToToolBar()
 
     def addMiddleHeaderBar(self):
diff --git a/openlp/core/lib/spelltextedit.py b/openlp/core/lib/spelltextedit.py
index 30811e08b..82391a0b3 100644
--- a/openlp/core/lib/spelltextedit.py
+++ b/openlp/core/lib/spelltextedit.py
@@ -28,9 +28,9 @@ import re
 try:
     import enchant
     from enchant import DictNotFoundError
-    enchant_available = True
+    ENCHANT_AVAILABLE = True
 except ImportError:
-    enchant_available = False
+    ENCHANT_AVAILABLE = False
 
 # based on code from
 # http://john.nachtimwald.com/2009/08/22/qplaintextedit-with-in-line-spell-check
@@ -45,7 +45,7 @@ class SpellTextEdit(QtGui.QPlainTextEdit):
     def __init__(self, *args):
         QtGui.QPlainTextEdit.__init__(self, *args)
         # Default dictionary based on the current locale.
-        if enchant_available:
+        if ENCHANT_AVAILABLE:
             try:
                 self.dict = enchant.Dict()
             except DictNotFoundError:
@@ -72,7 +72,7 @@ class SpellTextEdit(QtGui.QPlainTextEdit):
         self.setTextCursor(cursor)
         # Check if the selected word is misspelled and offer spelling
         # suggestions if it is.
-        if enchant_available and self.textCursor().hasSelection():
+        if ENCHANT_AVAILABLE and self.textCursor().hasSelection():
             text = unicode(self.textCursor().selectedText())
             if not self.dict.check(text):
                 spell_menu = QtGui.QMenu(translate('OpenLP.SpellTextEdit',
diff --git a/openlp/core/lib/toolbar.py b/openlp/core/lib/toolbar.py
index 93aed62e5..763e6bf67 100644
--- a/openlp/core/lib/toolbar.py
+++ b/openlp/core/lib/toolbar.py
@@ -69,8 +69,9 @@ class OpenLPToolbar(QtGui.QToolBar):
         ``slot``
             The method to run when this button is clicked.
 
-        ``objectname``
-            The name of the object, as used in `<button>.setObjectName()`.
+        ``checkable``
+            If *True* the button has two, *off* and *on*, states. Default is
+            *False*, which means the buttons has only one state.
         """
         newAction = None
         if icon:
diff --git a/openlp/core/ui/__init__.py b/openlp/core/ui/__init__.py
index 698216365..80124c2be 100644
--- a/openlp/core/ui/__init__.py
+++ b/openlp/core/ui/__init__.py
@@ -26,6 +26,9 @@
 """
 The :mod:`ui` module provides the core user interface for OpenLP
 """
+from PyQt4 import QtGui
+
+from openlp.core.lib import translate, Receiver
 
 class HideMode(object):
     """
@@ -48,6 +51,34 @@ class HideMode(object):
     Theme = 2
     Screen = 3
 
+
+def criticalErrorMessageBox(title=None, message=None, parent=None,
+    question=False):
+    """
+    Provides a standard critical message box for errors that OpenLP displays
+    to users.
+
+    ``title``
+        The title for the message box.
+
+    ``message``
+        The message to display to the user.
+
+    ``parent``
+        The parent UI element to attach the dialog to.
+
+    ``question``
+        Should this message box question the user.
+    """
+    error = translate('OpenLP.Ui', 'Error')
+    if question:
+        return QtGui.QMessageBox.critical(parent, error, message,
+            QtGui.QMessageBox.StandardButtons(
+            QtGui.QMessageBox.Yes | QtGui.QMessageBox.No))
+    data = {u'message': message}
+    data[u'title'] = title if title else error
+    return Receiver.send_message(u'openlp_error_message', data)
+
 from themeform import ThemeForm
 from filerenameform import FileRenameForm
 from maindisplay import MainDisplay
@@ -68,6 +99,6 @@ from mediadockmanager import MediaDockManager
 from servicemanager import ServiceManager
 from thememanager import ThemeManager
 
-__all__ = ['SplashScreen', 'AboutForm', 'SettingsForm',
-    'MainDisplay', 'SlideController', 'ServiceManager', 'ThemeManager',
-    'MediaDockManager', 'ServiceItemEditForm']
+__all__ = ['criticalErrorMessageBox', 'SplashScreen', 'AboutForm',
+    'SettingsForm', 'MainDisplay', 'SlideController', 'ServiceManager',
+    'ThemeManager', 'MediaDockManager', 'ServiceItemEditForm']
diff --git a/openlp/core/ui/advancedtab.py b/openlp/core/ui/advancedtab.py
index 7cebe9930..58b637bc2 100644
--- a/openlp/core/ui/advancedtab.py
+++ b/openlp/core/ui/advancedtab.py
@@ -72,6 +72,14 @@ class AdvancedTab(SettingsTab):
             u'enableAutoCloseCheckBox')
         self.uiLayout.addRow(self.enableAutoCloseCheckBox)
         self.leftLayout.addWidget(self.uiGroupBox)
+        self.hideMouseGroupBox = QtGui.QGroupBox(self.leftColumn)
+        self.hideMouseGroupBox.setObjectName(u'hideMouseGroupBox')
+        self.hideMouseLayout = QtGui.QVBoxLayout(self.hideMouseGroupBox)
+        self.hideMouseLayout.setObjectName(u'hideMouseLayout')
+        self.hideMouseCheckBox = QtGui.QCheckBox(self.hideMouseGroupBox)
+        self.hideMouseCheckBox.setObjectName(u'hideMouseCheckBox')
+        self.hideMouseLayout.addWidget(self.hideMouseCheckBox)
+        self.leftLayout.addWidget(self.hideMouseGroupBox)
 #        self.sharedDirGroupBox = QtGui.QGroupBox(self.leftColumn)
 #        self.sharedDirGroupBox.setObjectName(u'sharedDirGroupBox')
 #        self.sharedDirLayout = QtGui.QFormLayout(self.sharedDirGroupBox)
@@ -117,6 +125,10 @@ class AdvancedTab(SettingsTab):
             'Expand new service items on creation'))
         self.enableAutoCloseCheckBox.setText(translate('OpenLP.AdvancedTab',
             'Enable application exit confirmation'))
+        self.hideMouseGroupBox.setTitle(translate('OpenLP.AdvancedTab',
+            'Mouse Cursor'))
+        self.hideMouseCheckBox.setText(translate('OpenLP.AdvancedTab',
+            'Hide the mouse cursor when moved over the display window'))
 #        self.sharedDirGroupBox.setTitle(
 #            translate('AdvancedTab', 'Central Data Store'))
 #        self.sharedCheckBox.setText(
@@ -150,6 +162,8 @@ class AdvancedTab(SettingsTab):
         self.enableAutoCloseCheckBox.setChecked(
             settings.value(u'enable exit confirmation',
             QtCore.QVariant(True)).toBool())
+        self.hideMouseCheckBox.setChecked(
+            settings.value(u'hide mouse', QtCore.QVariant(False)).toBool())
         settings.endGroup()
 
     def save(self):
@@ -168,6 +182,8 @@ class AdvancedTab(SettingsTab):
             QtCore.QVariant(self.expandServiceItemCheckBox.isChecked()))
         settings.setValue(u'enable exit confirmation',
             QtCore.QVariant(self.enableAutoCloseCheckBox.isChecked()))
+        settings.setValue(u'hide mouse',
+            QtCore.QVariant(self.hideMouseCheckBox.isChecked()))
         settings.endGroup()
 
 #    def onSharedCheckBoxChanged(self, checked):
diff --git a/openlp/core/ui/displaytagtab.py b/openlp/core/ui/displaytagtab.py
index 154d397b9..1c77084b9 100644
--- a/openlp/core/ui/displaytagtab.py
+++ b/openlp/core/ui/displaytagtab.py
@@ -34,6 +34,7 @@ import cPickle
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import SettingsTab, translate, DisplayTags
+from openlp.core.ui import criticalErrorMessageBox
 
 class DisplayTagTab(SettingsTab):
     '''
@@ -275,12 +276,10 @@ class DisplayTagTab(SettingsTab):
         """
         for html in DisplayTags.get_html_tags():
             if self._strip(html[u'start tag']) == u'n':
-                QtGui.QMessageBox.critical(self,
+                criticalErrorMessageBox(
                     translate('OpenLP.DisplayTagTab', 'Update Error'),
                     translate('OpenLP.DisplayTagTab',
-                    'Tag "n" already defined.'),
-                    QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok),
-                    QtGui.QMessageBox.Ok)
+                    'Tag "n" already defined.'))
                 return
         # Add new tag to list
         tag = {u'desc': u'New Item', u'start tag': u'{n}',
@@ -318,12 +317,10 @@ class DisplayTagTab(SettingsTab):
             for linenumber, html1 in enumerate(html_expands):
                 if self._strip(html1[u'start tag']) == tag and \
                     linenumber != self.selected:
-                    QtGui.QMessageBox.critical(self,
+                    criticalErrorMessageBox(
                         translate('OpenLP.DisplayTagTab', 'Update Error'),
                         unicode(translate('OpenLP.DisplayTagTab',
-                        'Tag %s already defined.')) % tag,
-                        QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok),
-                        QtGui.QMessageBox.Ok)
+                        'Tag %s already defined.')) % tag)
                     return
             html[u'desc'] = unicode(self.descriptionLineEdit.text())
             html[u'start html'] = unicode(self.startTagLineEdit.text())
diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py
index 273a3c4f0..ec5ab7b3f 100644
--- a/openlp/core/ui/maindisplay.py
+++ b/openlp/core/ui/maindisplay.py
@@ -94,6 +94,7 @@ class DisplayWidget(QtGui.QGraphicsView):
         else:
             event.ignore()
 
+
 class MainDisplay(DisplayWidget):
     """
     This is the display screen.
@@ -270,6 +271,8 @@ class MainDisplay(DisplayWidget):
         else:
             js = u'show_image("");'
         self.frame.evaluateJavaScript(js)
+        # Update the preview frame.
+        Receiver.send_message(u'maindisplay_active')
 
     def resetImage(self):
         """
@@ -278,6 +281,8 @@ class MainDisplay(DisplayWidget):
         """
         log.debug(u'resetImage')
         self.displayImage(self.serviceItem.bg_image_bytes)
+        # Update the preview frame.
+        Receiver.send_message(u'maindisplay_active')
 
     def resetVideo(self):
         """
@@ -292,6 +297,8 @@ class MainDisplay(DisplayWidget):
             self.phononActive = False
         else:
             self.frame.evaluateJavaScript(u'show_video("close");')
+        # Update the preview frame.
+        Receiver.send_message(u'maindisplay_active')
 
     def videoPlay(self):
         """
@@ -359,6 +366,8 @@ class MainDisplay(DisplayWidget):
             self.webView.setVisible(False)
             self.videoWidget.setVisible(True)
             self.audio.setVolume(vol)
+        # Update the preview frame.
+        Receiver.send_message(u'maindisplay_active')
         return self.preview()
 
     def isLoaded(self):
@@ -426,6 +435,15 @@ class MainDisplay(DisplayWidget):
         # if was hidden keep it hidden
         if self.hideMode and self.isLive:
             self.hideDisplay(self.hideMode)
+        # Hide mouse cursor when moved over display if enabled in settings
+        settings = QtCore.QSettings()
+        if settings.value(u'advanced/hide mouse',
+            QtCore.QVariant(False)).toBool():
+            self.setCursor(QtCore.Qt.BlankCursor)
+            self.frame.evaluateJavaScript('document.body.style.cursor = "none"')
+        else:
+            self.setCursor(QtCore.Qt.ArrowCursor)
+            self.frame.evaluateJavaScript('document.body.style.cursor = "auto"')
 
     def footer(self, text):
         """
@@ -475,6 +493,7 @@ class MainDisplay(DisplayWidget):
         # Trigger actions when display is active again
         Receiver.send_message(u'maindisplay_active')
 
+
 class AudioPlayer(QtCore.QObject):
     """
     This Class will play audio only allowing components to work with a
diff --git a/openlp/core/ui/pluginform.py b/openlp/core/ui/pluginform.py
index 8e82f0003..d6ffc69f0 100644
--- a/openlp/core/ui/pluginform.py
+++ b/openlp/core/ui/pluginform.py
@@ -85,7 +85,7 @@ class PluginForm(QtGui.QDialog, Ui_PluginViewDialog):
                 item.setIcon(plugin.icon)
             self.pluginListWidget.addItem(item)
             pluginListWidth = max(pluginListWidth, self.fontMetrics().width(
-                unicode(translate('OpenLP.PluginForm', '%s (Inactive)')) % 
+                unicode(translate('OpenLP.PluginForm', '%s (Inactive)')) %
                 name_string[u'singular']))
         self.pluginListWidget.setFixedWidth(pluginListWidth +
             self.pluginListWidget.iconSize().width() + 48)
diff --git a/openlp/core/ui/serviceitemeditform.py b/openlp/core/ui/serviceitemeditform.py
index 6516fa40f..edd4ee29f 100644
--- a/openlp/core/ui/serviceitemeditform.py
+++ b/openlp/core/ui/serviceitemeditform.py
@@ -25,6 +25,7 @@
 ###############################################################################
 
 from PyQt4 import QtCore, QtGui
+
 from serviceitemeditdialog import Ui_ServiceItemEditDialog
 
 class ServiceItemEditForm(QtGui.QDialog, Ui_ServiceItemEditDialog):
@@ -39,16 +40,18 @@ class ServiceItemEditForm(QtGui.QDialog, Ui_ServiceItemEditDialog):
         self.setupUi(self)
         self.itemList = []
         # enable drop
-        QtCore.QObject.connect(self.upButton, QtCore.SIGNAL(u'clicked()'),
-            self.onItemUp)
-        QtCore.QObject.connect(self.downButton, QtCore.SIGNAL(u'clicked()'),
-            self.onItemDown)
-        QtCore.QObject.connect(self.deleteButton, QtCore.SIGNAL(u'clicked()'),
-            self.onItemDelete)
-        QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(u'accepted()'),
-            self.accept)
-        QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(u'rejected()'),
-            self.reject)
+        QtCore.QObject.connect(self.upButton,
+            QtCore.SIGNAL(u'clicked()'), self.onItemUp)
+        QtCore.QObject.connect(self.downButton,
+            QtCore.SIGNAL(u'clicked()'), self.onItemDown)
+        QtCore.QObject.connect(self.deleteButton,
+            QtCore.SIGNAL(u'clicked()'), self.onItemDelete)
+        QtCore.QObject.connect(self.buttonBox,
+            QtCore.SIGNAL(u'accepted()'), self.accept)
+        QtCore.QObject.connect(self.buttonBox,
+            QtCore.SIGNAL(u'rejected()'), self.reject)
+        QtCore.QObject.connect(self.listWidget,
+            QtCore.SIGNAL(u'currentRowChanged(int)'), self.onCurrentRowChanged)
 
     def setServiceItem(self, item):
         self.item = item
@@ -58,6 +61,7 @@ class ServiceItemEditForm(QtGui.QDialog, Ui_ServiceItemEditDialog):
             for frame in self.item._raw_frames:
                 self.itemList.append(frame)
         self.loadData()
+        self.listWidget.setCurrentItem(self.listWidget.currentItem())
 
     def getServiceItem(self):
         if self.data:
@@ -69,57 +73,79 @@ class ServiceItemEditForm(QtGui.QDialog, Ui_ServiceItemEditDialog):
         return self.item
 
     def loadData(self):
+        """
+        Loads the image list.
+        """
         self.listWidget.clear()
         for frame in self.itemList:
             item_name = QtGui.QListWidgetItem(frame[u'title'])
             self.listWidget.addItem(item_name)
-        if self.listWidget.count() == 1:
+
+    def onItemDelete(self):
+        """
+        Delete the current row.
+        """
+        item = self.listWidget.currentItem()
+        if not item:
+            return
+        row = self.listWidget.row(item)
+        self.itemList.remove(self.itemList[row])
+        self.loadData()
+        if row == self.listWidget.count():
+            self.listWidget.setCurrentRow(row - 1)
+        else:
+            self.listWidget.setCurrentRow(row)
+
+    def onItemUp(self):
+        """
+        Move the current row up in the list.
+        """
+        item = self.listWidget.currentItem()
+        if not item:
+            return
+        row = self.listWidget.row(item)
+        temp = self.itemList[row]
+        self.itemList.remove(self.itemList[row])
+        self.itemList.insert(row - 1, temp)
+        self.loadData()
+        self.listWidget.setCurrentRow(row - 1)
+
+    def onItemDown(self):
+        """
+        Move the current row down in the list
+        """
+        item = self.listWidget.currentItem()
+        if not item:
+            return
+        row = self.listWidget.row(item)
+        temp = self.itemList[row]
+        self.itemList.remove(self.itemList[row])
+        self.itemList.insert(row + 1, temp)
+        self.loadData()
+        self.listWidget.setCurrentRow(row + 1)
+
+    def onCurrentRowChanged(self, row):
+        """
+        Called when the currentRow has changed.
+
+        ``row``
+            The row number (int).
+        """
+        # Disable all buttons, as no row is selected or only one image is left.
+        if row == -1 or self.listWidget.count() == 1:
             self.downButton.setEnabled(False)
             self.upButton.setEnabled(False)
             self.deleteButton.setEnabled(False)
         else:
-            self.downButton.setEnabled(True)
-            self.upButton.setEnabled(True)
+            # Check if we are at the end of the list.
+            if self.listWidget.count() == row + 1:
+                self.downButton.setEnabled(False)
+            else:
+                self.downButton.setEnabled(True)
+            # Check if we are at the beginning of the list.
+            if row == 0:
+                self.upButton.setEnabled(False)
+            else:
+                self.upButton.setEnabled(True)
             self.deleteButton.setEnabled(True)
 
-    def onItemDelete(self):
-        """
-        Delete the selected row
-        """
-        items = self.listWidget.selectedItems()
-        for item in items:
-            row = self.listWidget.row(item)
-            self.itemList.remove(self.itemList[row])
-            self.loadData()
-            if row == self.listWidget.count():
-                self.listWidget.setCurrentRow(row - 1)
-            else:
-                self.listWidget.setCurrentRow(row)
-
-    def onItemUp(self):
-        """
-        Move the selected row up in the list
-        """
-        items = self.listWidget.selectedItems()
-        for item in items:
-            row = self.listWidget.row(item)
-            if row > 0:
-                temp = self.itemList[row]
-                self.itemList.remove(self.itemList[row])
-                self.itemList.insert(row - 1, temp)
-                self.loadData()
-                self.listWidget.setCurrentRow(row - 1)
-
-    def onItemDown(self):
-        """
-        Move the selected row down in the list
-        """
-        items = self.listWidget.selectedItems()
-        for item in items:
-            row = self.listWidget.row(item)
-            if row < len(self.itemList) and row is not -1:
-                temp = self.itemList[row]
-                self.itemList.remove(self.itemList[row])
-                self.itemList.insert(row + 1, temp)
-                self.loadData()
-                self.listWidget.setCurrentRow(row + 1)
\ No newline at end of file
diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py
index 0b5b25e06..81f514959 100644
--- a/openlp/core/ui/servicemanager.py
+++ b/openlp/core/ui/servicemanager.py
@@ -36,7 +36,8 @@ from PyQt4 import QtCore, QtGui
 from openlp.core.lib import OpenLPToolbar, ServiceItem, context_menu_action, \
     Receiver, build_icon, ItemCapabilities, SettingsManager, translate, \
     ThemeLevel
-from openlp.core.ui import ServiceNoteForm, ServiceItemEditForm
+from openlp.core.ui import criticalErrorMessageBox, ServiceNoteForm, \
+    ServiceItemEditForm
 from openlp.core.utils import AppLocation, delete_file, file_is_unicode, \
     split_filename
 
@@ -483,11 +484,10 @@ class ServiceManager(QtGui.QWidget):
             for file in zip.namelist():
                 ucsfile = file_is_unicode(file)
                 if not ucsfile:
-                    QtGui.QMessageBox.critical(
-                        self, translate('OpenLP.ServiceManager', 'Error'),
-                        translate('OpenLP.ServiceManager',
-                            'File is not a valid service.\n'
-                            'The content encoding is not UTF-8.'))
+                    criticalErrorMessageBox(
+                        message=translate('OpenLP.ServiceManager',
+                        'File is not a valid service.\n'
+                        'The content encoding is not UTF-8.'))
                     continue
                 osfile = unicode(QtCore.QDir.toNativeSeparators(ucsfile))
                 filePath = os.path.join(self.servicePath,
@@ -514,10 +514,9 @@ class ServiceManager(QtGui.QWidget):
                             serviceItem.name.lower(), serviceItem)
                 delete_file(p_file)
             else:
-                QtGui.QMessageBox.critical(
-                    self, translate('OpenLP.ServiceManager', 'Error'),
-                    translate('OpenLP.ServiceManager',
-                        'File is not a valid service.'))
+                criticalErrorMessageBox(
+                    message=translate('OpenLP.ServiceManager',
+                    'File is not a valid service.'))
                 log.exception(u'File contains no service data')
         except (IOError, NameError):
             log.exception(u'Problem loading a service file')
@@ -993,7 +992,7 @@ class ServiceManager(QtGui.QWidget):
             self.mainwindow.previewController.addServiceManagerItem(
                 self.serviceItems[item][u'service_item'], count)
         else:
-            QtGui.QMessageBox.critical(self,
+            criticalErrorMessageBox(
                 translate('OpenLP.ServiceManager', 'Missing Display Handler'),
                 translate('OpenLP.ServiceManager', 'Your item cannot be '
                     'displayed as there is no handler to display it'))
@@ -1027,11 +1026,11 @@ class ServiceManager(QtGui.QWidget):
                         self.serviceItems[item][u'service_item'], 0)
                     self.mainwindow.liveController.PreviewListWidget.setFocus()
         else:
-            QtGui.QMessageBox.critical(self,
+            criticalErrorMessageBox(
                 translate('OpenLP.ServiceManager', 'Missing Display Handler'),
                 translate('OpenLP.ServiceManager', 'Your item cannot be '
-                    'displayed as the plugin required to display it is missing '
-                    'or inactive'))
+                'displayed as the plugin required to display it is missing '
+                'or inactive'))
 
     def remoteEdit(self):
         """
diff --git a/openlp/core/ui/themeform.py b/openlp/core/ui/themeform.py
index f8236a1eb..2db76063c 100644
--- a/openlp/core/ui/themeform.py
+++ b/openlp/core/ui/themeform.py
@@ -31,6 +31,7 @@ from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import translate, BackgroundType, BackgroundGradientType, \
     Receiver
+from openlp.core.ui import criticalErrorMessageBox
 from openlp.core.utils import get_images_filter
 from themewizard import Ui_ThemeWizard
 
@@ -567,20 +568,16 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
         self.theme.theme_name = \
             unicode(self.field(u'name').toString())
         if not self.theme.theme_name:
-            QtGui.QMessageBox.critical(self,
+            criticalErrorMessageBox(
                 translate('OpenLP.ThemeForm', 'Theme Name Missing'),
                 translate('OpenLP.ThemeForm',
-                    'There is no name for this theme. Please enter one.'),
-                (QtGui.QMessageBox.Ok),
-                QtGui.QMessageBox.Ok)
+                'There is no name for this theme. Please enter one.'))
             return
         if self.theme.theme_name == u'-1' or self.theme.theme_name == u'None':
-            QtGui.QMessageBox.critical(self,
+            criticalErrorMessageBox(
                 translate('OpenLP.ThemeForm', 'Theme Name Invalid'),
                 translate('OpenLP.ThemeForm',
-                    'Invalid theme name. Please enter one.'),
-                (QtGui.QMessageBox.Ok),
-                QtGui.QMessageBox.Ok)
+                'Invalid theme name. Please enter one.'))
             return
         saveFrom = None
         saveTo = None
diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py
index ed08a4bd3..df1f1f775 100644
--- a/openlp/core/ui/thememanager.py
+++ b/openlp/core/ui/thememanager.py
@@ -32,7 +32,7 @@ import logging
 from xml.etree.ElementTree import ElementTree, XML
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.ui import FileRenameForm, ThemeForm
+from openlp.core.ui import criticalErrorMessageBox, FileRenameForm, ThemeForm
 from openlp.core.theme import Theme
 from openlp.core.lib import OpenLPToolbar, ThemeXML, get_text_file_string, \
     build_icon, Receiver, SettingsManager, translate, check_item_selected, \
@@ -359,9 +359,7 @@ class ThemeManager(QtGui.QWidget):
         """
         item = self.themeListWidget.currentItem()
         if item is None:
-            QtGui.QMessageBox.critical(self,
-                translate('OpenLP.ThemeManager', 'Error'),
-                translate('OpenLP.ThemeManager',
+            criticalErrorMessageBox(message=translate('OpenLP.ThemeManager',
                 'You have not selected a theme.'))
             return
         theme = unicode(item.data(QtCore.Qt.UserRole).toString())
@@ -388,10 +386,10 @@ class ThemeManager(QtGui.QWidget):
                         'Your theme has been successfully exported.'))
             except (IOError, OSError):
                 log.exception(u'Export Theme Failed')
-                QtGui.QMessageBox.critical(self,
+                criticalErrorMessageBox(
                     translate('OpenLP.ThemeManager', 'Theme Export Failed'),
                     translate('OpenLP.ThemeManager',
-                        'Your theme could not be exported due to an error.'))
+                    'Your theme could not be exported due to an error.'))
             finally:
                 if zip:
                     zip.close()
@@ -498,11 +496,10 @@ class ThemeManager(QtGui.QWidget):
             for file in zip.namelist():
                 ucsfile = file_is_unicode(file)
                 if not ucsfile:
-                    QtGui.QMessageBox.critical(
-                        self, translate('OpenLP.ThemeManager', 'Error'),
-                        translate('OpenLP.ThemeManager',
-                            'File is not a valid theme.\n'
-                            'The content encoding is not UTF-8.'))
+                    criticalErrorMessageBox(
+                        message=translate('OpenLP.ThemeManager',
+                        'File is not a valid theme.\n'
+                        'The content encoding is not UTF-8.'))
                     continue
                 osfile = unicode(QtCore.QDir.toNativeSeparators(ucsfile))
                 theme_dir = None
@@ -534,19 +531,17 @@ class ThemeManager(QtGui.QWidget):
                 theme = self._createThemeFromXml(filexml, self.path)
                 self.generateAndSaveImage(dir, themename, theme)
             else:
-                Receiver.send_message(u'openlp_error_message', {
-                    u'title': translate('OpenLP.ThemeManager',
-                    'Validation Error'),
-                    u'message':translate('OpenLP.ThemeManager',
-                    'File is not a valid theme.')})
+                criticalErrorMessageBox(
+                    translate('OpenLP.ThemeManager', 'Validation Error'),
+                    translate('OpenLP.ThemeManager',
+                    'File is not a valid theme.'))
                 log.exception(u'Theme file does not contain XML data %s' %
                     filename)
         except (IOError, NameError):
-            Receiver.send_message(u'openlp_error_message', {
-                u'title': translate('OpenLP.ThemeManager',
-                'Validation Error'),
-                u'message':translate('OpenLP.ThemeManager',
-                'File is not a valid theme.')})
+            criticalErrorMessageBox(
+                translate('OpenLP.ThemeManager', 'Validation Error'),
+                translate('OpenLP.ThemeManager',
+                'File is not a valid theme.'))
             log.exception(u'Importing theme from zip failed %s' % filename)
         finally:
             if zip:
@@ -563,11 +558,10 @@ class ThemeManager(QtGui.QWidget):
         """
         theme_dir = os.path.join(self.path, themeName)
         if os.path.exists(theme_dir):
-            Receiver.send_message(u'openlp_error_message', {
-                u'title': translate('OpenLP.ThemeManager',
-                'Validation Error'),
-                u'message':translate('OpenLP.ThemeManager',
-                'A theme with this name already exists.')})
+            criticalErrorMessageBox(
+                translate('OpenLP.ThemeManager', 'Validation Error'),
+                translate('OpenLP.ThemeManager',
+                'A theme with this name already exists.'))
             return False
         return True
 
@@ -694,21 +688,19 @@ class ThemeManager(QtGui.QWidget):
                 return False
             # should be the same unless default
             if theme != unicode(item.data(QtCore.Qt.UserRole).toString()):
-                QtGui.QMessageBox.critical(self,
-                    translate('OpenLP.ThemeManager', 'Error'),
-                    translate('OpenLP.ThemeManager',
-                        'You are unable to delete the default theme.'))
+                criticalErrorMessageBox(
+                    message=translate('OpenLP.ThemeManager',
+                    'You are unable to delete the default theme.'))
                 return False
             # check for use in the system else where.
             if testPlugin:
                 for plugin in self.mainwindow.pluginManager.plugins:
                     if plugin.usesTheme(theme):
-                        Receiver.send_message(u'openlp_error_message', {
-                            u'title': translate('OpenLP.ThemeManager',
+                        criticalErrorMessageBox(translate('OpenLP.ThemeManager',
                             'Validation Error'),
-                            u'message': unicode(translate('OpenLP.ThemeManager',
+                            unicode(translate('OpenLP.ThemeManager',
                             'Theme %s is used in the %s plugin.')) % \
-                            (theme, plugin.name)})
+                            (theme, plugin.name))
                         return False
         return True
 
diff --git a/openlp/core/ui/wizard.py b/openlp/core/ui/wizard.py
index 3b221455b..d3a0255b4 100644
--- a/openlp/core/ui/wizard.py
+++ b/openlp/core/ui/wizard.py
@@ -95,7 +95,7 @@ class OpenLPWizard(QtGui.QWizard):
 
     def addProgressPage(self):
         """
-        Add the progress page for the wizard.  This page informs the user how
+        Add the progress page for the wizard. This page informs the user how
         the wizard is progressing with its task.
         """
         self.progressPage = QtGui.QWizardPage()
@@ -125,7 +125,7 @@ class OpenLPWizard(QtGui.QWizard):
         log.debug(u'Wizard cancelled by user.')
         if self.currentPage() == self.progressPage:
             Receiver.send_message(u'openlp_stop_wizard')
-        self.done(QtGui.QDialog.Rejected) 
+        self.done(QtGui.QDialog.Rejected)
 
     def onCurrentIdChanged(self, pageId):
         """
diff --git a/openlp/core/utils/__init__.py b/openlp/core/utils/__init__.py
index b7d95a46d..9117a8e19 100644
--- a/openlp/core/utils/__init__.py
+++ b/openlp/core/utils/__init__.py
@@ -26,7 +26,6 @@
 """
 The :mod:`utils` module provides the utility libraries for OpenLP
 """
-
 import logging
 import os
 import re
@@ -36,12 +35,18 @@ import urllib2
 from datetime import datetime
 
 from PyQt4 import QtGui, QtCore
+if sys.platform != u'win32' and sys.platform != u'darwin':
+    try:
+        from xdg import BaseDirectory
+        XDG_BASE_AVAILABLE = True
+    except ImportError:
+        XDG_BASE_AVAILABLE = False
 
 import openlp
 from openlp.core.lib import Receiver, translate
 
 log = logging.getLogger(__name__)
-images_filter = None
+IMAGES_FILTER = None
 
 class VersionThread(QtCore.QThread):
     """
@@ -113,77 +118,46 @@ class AppLocation(object):
             The directory type you want, for instance the data directory.
         """
         if dir_type == AppLocation.AppDir:
-            if hasattr(sys, u'frozen') and sys.frozen == 1:
-                app_path = os.path.abspath(os.path.split(sys.argv[0])[0])
-            else:
-                app_path = os.path.split(openlp.__file__)[0]
-            return app_path
+            return _get_frozen_path(
+                os.path.abspath(os.path.split(sys.argv[0])[0]),
+                os.path.split(openlp.__file__)[0])
         elif dir_type == AppLocation.ConfigDir:
-            if sys.platform == u'win32':
-                path = os.path.join(os.getenv(u'APPDATA'), u'openlp')
-            elif sys.platform == u'darwin':
-                path = os.path.join(os.getenv(u'HOME'), u'Library',
-                    u'Application Support', u'openlp')
-            else:
-                try:
-                    from xdg import BaseDirectory
-                    path = os.path.join(
-                        BaseDirectory.xdg_config_home, u'openlp')
-                except ImportError:
-                    path = os.path.join(os.getenv(u'HOME'), u'.openlp')
-            return path
+            return _get_os_dir_path(u'openlp',
+                os.path.join(os.getenv(u'HOME'), u'Library',
+                    u'Application Support', u'openlp'),
+                os.path.join(BaseDirectory.xdg_config_home, u'openlp'),
+                os.path.join(os.getenv(u'HOME'), u'.openlp'))
         elif dir_type == AppLocation.DataDir:
-            if sys.platform == u'win32':
-                path = os.path.join(os.getenv(u'APPDATA'), u'openlp', u'data')
-            elif sys.platform == u'darwin':
-                path = os.path.join(os.getenv(u'HOME'), u'Library',
-                    u'Application Support', u'openlp', u'Data')
-            else:
-                try:
-                    from xdg import BaseDirectory
-                    path = os.path.join(BaseDirectory.xdg_data_home, u'openlp')
-                except ImportError:
-                    path = os.path.join(os.getenv(u'HOME'), u'.openlp', u'data')
-            return path
+            return _get_os_dir_path(os.path.join(u'openlp', u'data'),
+                os.path.join(os.getenv(u'HOME'), u'Library',
+                    u'Application Support', u'openlp', u'Data'),
+                os.path.join(BaseDirectory.xdg_data_home, u'openlp'),
+                os.path.join(os.getenv(u'HOME'), u'.openlp', u'data'))
         elif dir_type == AppLocation.PluginsDir:
-            plugin_path = None
             app_path = os.path.abspath(os.path.split(sys.argv[0])[0])
-            if hasattr(sys, u'frozen') and sys.frozen == 1:
-                plugin_path = os.path.join(app_path, u'plugins')
-            else:
-                plugin_path = os.path.join(
-                    os.path.split(openlp.__file__)[0], u'plugins')
-            return plugin_path
+            return _get_frozen_path(os.path.join(app_path, u'plugins'),
+                os.path.join(os.path.split(openlp.__file__)[0], u'plugins'))
         elif dir_type == AppLocation.VersionDir:
-            if hasattr(sys, u'frozen') and sys.frozen == 1:
-                version_path = os.path.abspath(os.path.split(sys.argv[0])[0])
-            else:
-                version_path = os.path.split(openlp.__file__)[0]
-            return version_path
+            return _get_frozen_path(
+                os.path.abspath(os.path.split(sys.argv[0])[0]),
+                os.path.split(openlp.__file__)[0])
         elif dir_type == AppLocation.CacheDir:
-            if sys.platform == u'win32':
-                path = os.path.join(os.getenv(u'APPDATA'), u'openlp')
-            elif sys.platform == u'darwin':
-                path = os.path.join(os.getenv(u'HOME'), u'Library',
-                    u'Application Support', u'openlp')
-            else:
-                try:
-                    from xdg import BaseDirectory
-                    path = os.path.join(
-                        BaseDirectory.xdg_cache_home, u'openlp')
-                except ImportError:
-                    path = os.path.join(os.getenv(u'HOME'), u'.openlp')
-            return path
+            return _get_os_dir_path(u'openlp',
+                os.path.join(os.getenv(u'HOME'), u'Library',
+                    u'Application Support', u'openlp'),
+                os.path.join(BaseDirectory.xdg_cache_home, u'openlp'),
+                os.path.join(os.getenv(u'HOME'), u'.openlp'))
         if dir_type == AppLocation.LanguageDir:
-            if hasattr(sys, u'frozen') and sys.frozen == 1:
-                app_path = os.path.abspath(os.path.split(sys.argv[0])[0])
-            else:
-                app_path = os.path.split(openlp.__file__)[0]
+            app_path = _get_frozen_path(
+                os.path.abspath(os.path.split(sys.argv[0])[0]),
+                os.path.split(openlp.__file__)[0])
             return os.path.join(app_path, u'i18n')
 
-
     @staticmethod
     def get_data_path():
+        """
+        Return the path OpenLP stores all its data under.
+        """
         path = AppLocation.get_directory(AppLocation.DataDir)
         if not os.path.exists(path):
             os.makedirs(path)
@@ -191,12 +165,38 @@ class AppLocation(object):
 
     @staticmethod
     def get_section_data_path(section):
+        """
+        Return the path a particular module stores its data under.
+        """
         data_path = AppLocation.get_data_path()
         path = os.path.join(data_path, section)
         if not os.path.exists(path):
             os.makedirs(path)
         return path
 
+def _get_os_dir_path(win_option, darwin_option, base_dir_option,
+    non_base_dir_option):
+    """
+    Return a path based on which OS and environment we are running in.
+    """
+    if sys.platform == u'win32':
+        return os.path.join(os.getenv(u'APPDATA'), win_option)
+    elif sys.platform == u'darwin':
+        return darwin_option
+    else:
+        if XDG_BASE_AVAILABLE:
+            return base_dir_option
+        else:
+            return non_base_dir_option
+
+def _get_frozen_path(frozen_option, non_frozen_option):
+    """
+    Return a path based on the system status.
+    """
+    if hasattr(sys, u'frozen') and sys.frozen == 1:
+        return frozen_option
+    else:
+        return non_frozen_option
 
 def check_latest_version(current_version):
     """
@@ -225,9 +225,8 @@ def check_latest_version(current_version):
         remote_version = None
         try:
             remote_version = unicode(urllib2.urlopen(req, None).read()).strip()
-        except IOError, e:
-            if hasattr(e, u'reason'):
-                log.exception(u'Reason for failure: %s', e.reason)
+        except IOError:
+            log.exception(u'Failed to download the latest OpenLP version file')
         if remote_version:
             version_string = remote_version
     return version_string
@@ -264,18 +263,21 @@ def get_images_filter():
     Returns a filter string for a file dialog containing all the supported
     image formats.
     """
-    global images_filter
-    if not images_filter:
+    global IMAGES_FILTER
+    if not IMAGES_FILTER:
         log.debug(u'Generating images filter.')
         formats = [unicode(fmt)
             for fmt in QtGui.QImageReader.supportedImageFormats()]
         visible_formats = u'(*.%s)' % u'; *.'.join(formats)
         actual_formats = u'(*.%s)' % u' *.'.join(formats)
-        images_filter = u'%s %s %s' % (translate('OpenLP', 'Image Files'),
+        IMAGES_FILTER = u'%s %s %s' % (translate('OpenLP', 'Image Files'),
             visible_formats, actual_formats)
-    return images_filter
+    return IMAGES_FILTER
 
 def split_filename(path):
+    """
+    Return a list of the parts in a given path.
+    """
     path = os.path.abspath(path)
     if not os.path.isfile(path):
         return path, u''
diff --git a/openlp/plugins/bibles/forms/bibleimportform.py b/openlp/plugins/bibles/forms/bibleimportform.py
index d79051126..d3f41804b 100644
--- a/openlp/plugins/bibles/forms/bibleimportform.py
+++ b/openlp/plugins/bibles/forms/bibleimportform.py
@@ -35,6 +35,7 @@ from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import Receiver, SettingsManager, translate
 from openlp.core.lib.db import delete_database
+from openlp.core.ui import criticalErrorMessageBox
 from openlp.core.ui.wizard import OpenLPWizard
 from openlp.core.utils import AppLocation, string_is_unicode
 from openlp.plugins.bibles.lib.manager import BibleFormat
@@ -468,7 +469,7 @@ class BibleImportForm(OpenLPWizard):
         elif self.currentPage() == self.selectPage:
             if self.field(u'source_format').toInt()[0] == BibleFormat.OSIS:
                 if not self.field(u'osis_location').toString():
-                    QtGui.QMessageBox.critical(self,
+                    criticalErrorMessageBox(
                         translate('BiblesPlugin.ImportWizardForm',
                         'Invalid Bible Location'),
                         translate('BiblesPlugin.ImportWizardForm',
@@ -478,7 +479,7 @@ class BibleImportForm(OpenLPWizard):
                     return False
             elif self.field(u'source_format').toInt()[0] == BibleFormat.CSV:
                 if not self.field(u'csv_booksfile').toString():
-                    QtGui.QMessageBox.critical(self,
+                    criticalErrorMessageBox(
                         translate('BiblesPlugin.ImportWizardForm',
                         'Invalid Books File'),
                         translate('BiblesPlugin.ImportWizardForm',
@@ -487,7 +488,7 @@ class BibleImportForm(OpenLPWizard):
                     self.csvBooksEdit.setFocus()
                     return False
                 elif not self.field(u'csv_versefile').toString():
-                    QtGui.QMessageBox.critical(self,
+                    criticalErrorMessageBox(
                         translate('BiblesPlugin.ImportWizardForm',
                         'Invalid Verse File'),
                         translate('BiblesPlugin.ImportWizardForm',
@@ -498,7 +499,7 @@ class BibleImportForm(OpenLPWizard):
             elif self.field(u'source_format').toInt()[0] == \
                 BibleFormat.OpenSong:
                 if not self.field(u'opensong_file').toString():
-                    QtGui.QMessageBox.critical(self,
+                    criticalErrorMessageBox(
                         translate('BiblesPlugin.ImportWizardForm',
                         'Invalid OpenSong Bible'),
                         translate('BiblesPlugin.ImportWizardForm',
@@ -508,7 +509,7 @@ class BibleImportForm(OpenLPWizard):
                     return False
             elif self.field(u'source_format').toInt()[0] == BibleFormat.OpenLP1:
                 if not self.field(u'openlp1_location').toString():
-                    QtGui.QMessageBox.critical(self,
+                    criticalErrorMessageBox(
                         translate('BiblesPlugin.ImportWizardForm',
                         'Invalid Bible Location'),
                         translate('BiblesPlugin.ImportWizardForm',
@@ -522,7 +523,7 @@ class BibleImportForm(OpenLPWizard):
             license_copyright = \
                 unicode(self.field(u'license_copyright').toString())
             if not license_version:
-                QtGui.QMessageBox.critical(self,
+                criticalErrorMessageBox(
                     translate('BiblesPlugin.ImportWizardForm',
                     'Empty Version Name'),
                     translate('BiblesPlugin.ImportWizardForm',
@@ -530,7 +531,7 @@ class BibleImportForm(OpenLPWizard):
                 self.versionNameEdit.setFocus()
                 return False
             elif not license_copyright:
-                QtGui.QMessageBox.critical(self,
+                criticalErrorMessageBox(
                     translate('BiblesPlugin.ImportWizardForm',
                     'Empty Copyright'),
                     translate('BiblesPlugin.ImportWizardForm',
@@ -539,7 +540,7 @@ class BibleImportForm(OpenLPWizard):
                 self.copyrightEdit.setFocus()
                 return False
             elif self.manager.exists(license_version):
-                QtGui.QMessageBox.critical(self,
+                criticalErrorMessageBox(
                     translate('BiblesPlugin.ImportWizardForm', 'Bible Exists'),
                     translate('BiblesPlugin.ImportWizardForm',
                     'This Bible already exists. Please import '
diff --git a/openlp/plugins/bibles/lib/db.py b/openlp/plugins/bibles/lib/db.py
index 9f4376da1..f442a9cd6 100644
--- a/openlp/plugins/bibles/lib/db.py
+++ b/openlp/plugins/bibles/lib/db.py
@@ -33,8 +33,9 @@ from sqlalchemy import Column, ForeignKey, or_, Table, types
 from sqlalchemy.orm import class_mapper, mapper, relation
 from sqlalchemy.orm.exc import UnmappedClassError
 
-from openlp.core.lib import Receiver, translate
+from openlp.core.lib import translate
 from openlp.core.lib.db import BaseModel, init_db, Manager
+from openlp.core.ui import criticalErrorMessageBox
 
 log = logging.getLogger(__name__)
 
@@ -339,11 +340,11 @@ class BibleDB(QtCore.QObject, Manager):
         verse_list = []
         for book, chapter, start_verse, end_verse in reference_list:
             db_book = self.get_book(book)
-            if end_verse == -1:
-                end_verse = self.get_verse_count(book, chapter)
             if db_book:
                 book = db_book.name
                 log.debug(u'Book name corrected to "%s"', book)
+                if end_verse == -1:
+                    end_verse = self.get_verse_count(book, chapter)
                 verses = self.session.query(Verse)\
                     .filter_by(book_id=db_book.id)\
                     .filter_by(chapter=chapter)\
@@ -354,12 +355,11 @@ class BibleDB(QtCore.QObject, Manager):
                 verse_list.extend(verses)
             else:
                 log.debug(u'OpenLP failed to find book %s', book)
-                Receiver.send_message(u'openlp_error_message', {
-                    u'title': translate('BiblesPlugin', 'No Book Found'),
-                    u'message': translate('BiblesPlugin', 'No matching book '
+                criticalErrorMessageBox(
+                    translate('BiblesPlugin', 'No Book Found'),
+                    translate('BiblesPlugin', 'No matching book '
                     'could be found in this Bible. Check that you have '
-                    'spelled the name of the book correctly.')
-                })
+                    'spelled the name of the book correctly.'))
         return verse_list
 
     def verse_search(self, text):
diff --git a/openlp/plugins/bibles/lib/http.py b/openlp/plugins/bibles/lib/http.py
index 6f6b861e9..b844bbe61 100644
--- a/openlp/plugins/bibles/lib/http.py
+++ b/openlp/plugins/bibles/lib/http.py
@@ -38,6 +38,7 @@ from HTMLParser import HTMLParseError
 from BeautifulSoup import BeautifulSoup, NavigableString
 
 from openlp.core.lib import Receiver, translate
+from openlp.core.ui import criticalErrorMessageBox
 from openlp.core.utils import AppLocation, get_web_page
 from openlp.plugins.bibles.lib import SearchResults
 from openlp.plugins.bibles.lib.db import BibleDB, Book
@@ -429,12 +430,11 @@ class HTTPBible(BibleDB):
             if not db_book:
                 book_details = HTTPBooks.get_book(book)
                 if not book_details:
-                    Receiver.send_message(u'openlp_error_message', {
-                        u'title': translate('BiblesPlugin', 'No Book Found'),
-                        u'message': translate('BiblesPlugin', 'No matching '
+                    criticalErrorMessageBox(
+                        translate('BiblesPlugin', 'No Book Found'),
+                        translate('BiblesPlugin', 'No matching '
                         'book could be found in this Bible. Check that you '
-                        'have spelled the name of the book correctly.')
-                    })
+                        'have spelled the name of the book correctly.'))
                     return []
                 db_book = self.create_book(book_details[u'name'],
                     book_details[u'abbreviation'],
@@ -540,17 +540,15 @@ def send_error_message(error_type):
         The type of error that occured for the issue.
     """
     if error_type == u'download':
-        Receiver.send_message(u'openlp_error_message', {
-            u'title': translate('BiblePlugin.HTTPBible', 'Download Error'),
-            u'message': translate('BiblePlugin.HTTPBible', 'There was a '
+        criticalErrorMessageBox(
+            translate('BiblePlugin.HTTPBible', 'Download Error'),
+            translate('BiblePlugin.HTTPBible', 'There was a '
             'problem downloading your verse selection. Please check your '
             'Internet connection, and if this error continues to occur '
-            'please consider reporting a bug.')
-            })
+            'please consider reporting a bug.'))
     elif error_type == u'parse':
-        Receiver.send_message(u'openlp_error_message', {
-            u'title': translate('BiblePlugin.HTTPBible', 'Parse Error'),
-            u'message': translate('BiblePlugin.HTTPBible', 'There was a '
+        criticalErrorMessageBox(
+            translate('BiblePlugin.HTTPBible', 'Parse Error'),
+            translate('BiblePlugin.HTTPBible', 'There was a '
             'problem extracting your verse selection. If this error continues '
-            'to occur please consider reporting a bug.')
-            })
+            'to occur please consider reporting a bug.'))
diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py
index 7ee450c8a..4ecd4b49e 100644
--- a/openlp/plugins/bibles/lib/mediaitem.py
+++ b/openlp/plugins/bibles/lib/mediaitem.py
@@ -30,6 +30,7 @@ from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import MediaManagerItem, Receiver, BaseListWithDnD, \
     ItemCapabilities, translate
+from openlp.core.ui import criticalErrorMessageBox
 from openlp.plugins.bibles.forms import BibleImportForm
 from openlp.plugins.bibles.lib import get_reference_match
 
@@ -389,11 +390,8 @@ class BibleMediaItem(MediaManagerItem):
         verse_count = self.parent.manager.get_verse_count(bible, book, 1)
         if verse_count == 0:
             self.advancedSearchButton.setEnabled(False)
-            Receiver.send_message(u'openlp_error_message', {
-                u'title': translate('BiblePlugin.MediaItem', 'Error'),
-                u'message': translate('BiblePlugin.MediaItem',
-                'Bible not fully loaded')
-            })
+            criticalErrorMessageBox(message=translate('BiblePlugin.MediaItem',
+                'Bible not fully loaded'))
         else:
             self.advancedSearchButton.setEnabled(True)
             self.adjustComboBox(1, self.chapter_count, self.advancedFromChapter)
@@ -534,13 +532,11 @@ class BibleMediaItem(MediaManagerItem):
             if item_second_bible and second_bible or not item_second_bible and \
                 not second_bible:
                 self.displayResults(bible, second_bible)
-            elif QtGui.QMessageBox.critical(self,
-                translate('BiblePlugin.MediaItem', 'Error'),
-                translate('BiblePlugin.MediaItem', 'You cannot combine single '
-                'and second bible verses. Do you want to delete your search '
-                'results and start a new search?'),
-                QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.No |
-                QtGui.QMessageBox.Yes)) == QtGui.QMessageBox.Yes:
+            elif criticalErrorMessageBox(
+                message=translate('BiblePlugin.MediaItem',
+                'You cannot combine single and second bible verses. Do you '
+                'want to delete your search results and start a new search?'),
+                parent=self, question=True) == QtGui.QMessageBox.Yes:
                 self.listView.clear()
                 self.displayResults(bible, second_bible)
         else:
@@ -584,13 +580,11 @@ class BibleMediaItem(MediaManagerItem):
             if item_second_bible and second_bible or not item_second_bible and \
                 not second_bible:
                 self.displayResults(bible, second_bible)
-            elif QtGui.QMessageBox.critical(self,
-                translate('BiblePlugin.MediaItem', 'Error'),
-                translate('BiblePlugin.MediaItem', 'You cannot combine single '
-                'and second bible verses. Do you want to delete your search '
-                'results and start a new search?'),
-                QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.No |
-                QtGui.QMessageBox.Yes)) == QtGui.QMessageBox.Yes:
+            elif criticalErrorMessageBox(
+                message=translate('BiblePlugin.MediaItem',
+                'You cannot combine single and second bible verses. Do you '
+                'want to delete your search results and start a new search?'),
+                parent=self, question=True) == QtGui.QMessageBox.Yes:
                 self.listView.clear()
                 self.displayResults(bible, second_bible)
         elif self.search_results:
diff --git a/openlp/plugins/bibles/lib/opensong.py b/openlp/plugins/bibles/lib/opensong.py
index 2b3b6dfb7..12a6562bc 100644
--- a/openlp/plugins/bibles/lib/opensong.py
+++ b/openlp/plugins/bibles/lib/opensong.py
@@ -79,7 +79,7 @@ class OpenSongBible(BibleDB):
                             break
                         self.create_verse(
                             db_book.id,
-                            int(chapter.attrib[u'n']),
+                            int(chapter.attrib[u'n'].split()[-1]),
                             int(verse.attrib[u'n']),
                             unicode(verse.text)
                         )
@@ -87,7 +87,7 @@ class OpenSongBible(BibleDB):
                     self.wizard.incrementProgressBar(unicode(translate(
                         'BiblesPlugin.Opensong', 'Importing %s %s...',
                         'Importing <book name> <chapter>...')) %
-                        (db_book.name, int(chapter.attrib[u'n'])))
+                        (db_book.name, int(chapter.attrib[u'n'].split()[-1])))
                     self.session.commit()
         except (IOError, AttributeError):
             log.exception(u'Loading bible from OpenSong file failed')
diff --git a/openlp/plugins/custom/forms/editcustomform.py b/openlp/plugins/custom/forms/editcustomform.py
index 2f005828a..ebc917e99 100644
--- a/openlp/plugins/custom/forms/editcustomform.py
+++ b/openlp/plugins/custom/forms/editcustomform.py
@@ -29,6 +29,7 @@ import logging
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import Receiver, translate
+from openlp.core.ui import criticalErrorMessageBox
 from openlp.plugins.custom.lib import CustomXMLBuilder, CustomXMLParser
 from openlp.plugins.custom.lib.db import CustomSlide
 from editcustomdialog import Ui_CustomEditDialog
@@ -151,8 +152,7 @@ class EditCustomForm(QtGui.QDialog, Ui_CustomEditDialog):
         """
         valid, message = self._validate()
         if not valid:
-            QtGui.QMessageBox.critical(self,
-                translate('CustomPlugin.EditCustomForm', 'Error'), message)
+            criticalErrorMessageBox(message=message)
             return False
         sxml = CustomXMLBuilder()
         sxml.new_document()
@@ -265,4 +265,4 @@ class EditCustomForm(QtGui.QDialog, Ui_CustomEditDialog):
         if self.slideListView.count() == 0:
             return False, translate('CustomPlugin.EditCustomForm',
                 'You need to add at least one slide')
-        return True, u''
\ No newline at end of file
+        return True, u''
diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py
index e9f41abcd..bd84219fb 100644
--- a/openlp/plugins/images/lib/mediaitem.py
+++ b/openlp/plugins/images/lib/mediaitem.py
@@ -31,7 +31,8 @@ from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import MediaManagerItem, BaseListWithDnD, build_icon, \
     ItemCapabilities, SettingsManager, translate, check_item_selected, \
-    Receiver, check_directory_exists
+    check_directory_exists
+from openlp.core.ui import criticalErrorMessageBox
 from openlp.core.utils import AppLocation, delete_file, get_images_filter
 
 log = logging.getLogger(__name__)
@@ -160,7 +161,7 @@ class ImageMediaItem(MediaManagerItem):
                 items.remove(item)
             # We cannot continue, as all images do not exist.
             if not items:
-                QtGui.QMessageBox.critical(self,
+                criticalErrorMessageBox(
                     translate('ImagePlugin.MediaItem', 'Missing Image(s)'),
                     unicode(translate('ImagePlugin.MediaItem',
                     'The following image(s) no longer exist: %s')) %
@@ -186,12 +187,15 @@ class ImageMediaItem(MediaManagerItem):
             return False
 
     def onResetClick(self):
+        """
+        Called to reset the Live backgound with the image selected,
+        """
         self.resetAction.setVisible(False)
         self.parent.liveController.display.resetImage()
 
     def onReplaceClick(self):
         """
-        Called to replace Live backgound with the video selected
+        Called to replace Live backgound with the image selected.
         """
         if check_item_selected(self.listView,
             translate('ImagePlugin.MediaItem',
@@ -204,12 +208,11 @@ class ImageMediaItem(MediaManagerItem):
                 self.parent.liveController.display.directImage(name, filename)
                 self.resetAction.setVisible(True)
             else:
-                Receiver.send_message(u'openlp_error_message', {
-                    u'title':  translate('ImagePlugin.MediaItem',
-                    'Live Background Error'),
-                    u'message': unicode(translate('ImagePlugin.MediaItem',
+                criticalErrorMessageBox(
+                    translate('ImagePlugin.MediaItem', 'Live Background Error'),
+                    unicode(translate('ImagePlugin.MediaItem',
                     'There was a problem replacing your background, '
-                    'the image file "%s" no longer exists.')) % filename})
+                    'the image file "%s" no longer exists.')) % filename)
 
     def onPreviewClick(self):
         MediaManagerItem.onPreviewClick(self)
diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py
index cc75dfc2b..121fa80a0 100644
--- a/openlp/plugins/media/lib/mediaitem.py
+++ b/openlp/plugins/media/lib/mediaitem.py
@@ -30,8 +30,8 @@ import os
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import MediaManagerItem, BaseListWithDnD, build_icon, \
-    ItemCapabilities, SettingsManager, translate, check_item_selected, \
-    Receiver
+    ItemCapabilities, SettingsManager, translate, check_item_selected
+from openlp.core.ui import criticalErrorMessageBox
 
 log = logging.getLogger(__name__)
 
@@ -40,6 +40,7 @@ class MediaListView(BaseListWithDnD):
         self.PluginName = u'Media'
         BaseListWithDnD.__init__(self, parent)
 
+
 class MediaMediaItem(MediaManagerItem):
     """
     This is the custom media manager item for Media Slides.
@@ -92,10 +93,16 @@ class MediaMediaItem(MediaManagerItem):
         self.resetAction.setVisible(False)
 
     def onResetClick(self):
+        """
+        Called to reset the Live backgound with the media selected,
+        """
         self.resetAction.setVisible(False)
         self.parent.liveController.display.resetVideo()
 
     def onReplaceClick(self):
+        """
+        Called to replace Live backgound with the media selected.
+        """
         if check_item_selected(self.listView,
             translate('MediaPlugin.MediaItem',
             'You must select a media file to replace the background with.')):
@@ -106,12 +113,11 @@ class MediaMediaItem(MediaManagerItem):
                 self.parent.liveController.display.video(filename, 0, True)
                 self.resetAction.setVisible(True)
             else:
-                Receiver.send_message(u'openlp_error_message', {
-                    u'title':  translate('MediaPlugin.MediaItem',
+                criticalErrorMessageBox(translate('MediaPlugin.MediaItem',
                     'Live Background Error'),
-                    u'message': unicode(translate('MediaPlugin.MediaItem',
+                    unicode(translate('MediaPlugin.MediaItem',
                     'There was a problem replacing your background, '
-                    'the media file "%s" no longer exists.')) % filename})
+                    'the media file "%s" no longer exists.')) % filename)
 
     def generateSlideData(self, service_item, item=None, xmlVersion=False):
         if item is None:
@@ -131,9 +137,8 @@ class MediaMediaItem(MediaManagerItem):
             return True
         else:
             # File is no longer present
-            QtGui.QMessageBox.critical(
-                self, translate('MediaPlugin.MediaItem',
-                'Missing Media File'),
+            criticalErrorMessageBox(
+                translate('MediaPlugin.MediaItem', 'Missing Media File'),
                 unicode(translate('MediaPlugin.MediaItem',
                 'The file %s no longer exists.')) % filename)
             return False
diff --git a/openlp/plugins/presentations/lib/mediaitem.py b/openlp/plugins/presentations/lib/mediaitem.py
index 1e65a3358..2c9381a70 100644
--- a/openlp/plugins/presentations/lib/mediaitem.py
+++ b/openlp/plugins/presentations/lib/mediaitem.py
@@ -31,6 +31,7 @@ from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import MediaManagerItem, BaseListWithDnD, build_icon, \
     SettingsManager, translate, check_item_selected, Receiver, ItemCapabilities
+from openlp.core.ui import criticalErrorMessageBox
 from openlp.plugins.presentations.lib import MessageListener
 
 log = logging.getLogger(__name__)
@@ -180,7 +181,7 @@ class PresentationMediaItem(MediaManagerItem):
             filename = os.path.split(unicode(file))[1]
             if titles.count(filename) > 0:
                 if not initialLoad:
-                    QtGui.QMessageBox.critical(self,
+                    criticalErrorMessageBox(
                         translate('PresentationPlugin.MediaItem',
                         'File Exists'),
                         translate('PresentationPlugin.MediaItem',
@@ -204,7 +205,7 @@ class PresentationMediaItem(MediaManagerItem):
                 if initialLoad:
                     icon = build_icon(u':/general/general_delete.png')
                 else:
-                    QtGui.QMessageBox.critical(
+                    criticalErrorMessageBox(
                         self, translate('PresentationPlugin.MediaItem',
                         'Unsupported File'),
                         translate('PresentationPlugin.MediaItem',
@@ -275,8 +276,8 @@ class PresentationMediaItem(MediaManagerItem):
                     return True
                 else:
                     # File is no longer present
-                    QtGui.QMessageBox.critical(
-                        self, translate('PresentationPlugin.MediaItem',
+                    criticalErrorMessageBox(
+                        translate('PresentationPlugin.MediaItem',
                         'Missing Presentation'),
                         unicode(translate('PresentationPlugin.MediaItem',
                         'The Presentation %s no longer exists.')) % filename)
diff --git a/openlp/plugins/songs/forms/authorsform.py b/openlp/plugins/songs/forms/authorsform.py
index 320d3c1d3..091618bde 100644
--- a/openlp/plugins/songs/forms/authorsform.py
+++ b/openlp/plugins/songs/forms/authorsform.py
@@ -27,6 +27,7 @@
 from PyQt4 import QtGui, QtCore
 
 from openlp.core.lib import translate
+from openlp.core.ui import criticalErrorMessageBox
 from openlp.plugins.songs.forms.authorsdialog import Ui_AuthorsDialog
 
 class AuthorsForm(QtGui.QDialog, Ui_AuthorsDialog):
@@ -79,28 +80,21 @@ class AuthorsForm(QtGui.QDialog, Ui_AuthorsDialog):
 
     def accept(self):
         if not self.firstNameEdit.text():
-            QtGui.QMessageBox.critical(
-                self, translate('SongsPlugin.AuthorsForm', 'Error'),
-                translate('SongsPlugin.AuthorsForm',
-                    'You need to type in the first name of the author.'))
+            criticalErrorMessageBox(message=translate('SongsPlugin.AuthorsForm',
+                'You need to type in the first name of the author.'))
             self.firstNameEdit.setFocus()
             return False
         elif not self.lastNameEdit.text():
-            QtGui.QMessageBox.critical(
-                self, translate('SongsPlugin.AuthorsForm', 'Error'),
-                translate('SongsPlugin.AuthorsForm',
-                    'You need to type in the last name of the author.'))
+            criticalErrorMessageBox(message=translate('SongsPlugin.AuthorsForm',
+                'You need to type in the last name of the author.'))
             self.lastNameEdit.setFocus()
             return False
         elif not self.displayEdit.text():
-            if QtGui.QMessageBox.critical(
-                    self, translate('SongsPlugin.AuthorsForm', 'Error'),
-                    translate('SongsPlugin.AuthorsForm',
-                        'You have not set a display name for the '
-                        'author, combine the first and last names?'),
-                    QtGui.QMessageBox.StandardButtons(
-                        QtGui.QMessageBox.Yes | QtGui.QMessageBox.No)
-                    ) == QtGui.QMessageBox.Yes:
+            if criticalErrorMessageBox(
+                message=translate('SongsPlugin.AuthorsForm',
+                'You have not set a display name for the '
+                'author, combine the first and last names?'),
+                parent=self, question=True) == QtGui.QMessageBox.Yes:
                 self.displayEdit.setText(self.firstNameEdit.text() + \
                     u' ' + self.lastNameEdit.text())
                 return QtGui.QDialog.accept(self)
diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py
index 0ddcdbcea..b36ea55e1 100644
--- a/openlp/plugins/songs/forms/editsongform.py
+++ b/openlp/plugins/songs/forms/editsongform.py
@@ -30,6 +30,7 @@ import re
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import Receiver, translate
+from openlp.core.ui import criticalErrorMessageBox
 from openlp.plugins.songs.forms import EditVerseForm
 from openlp.plugins.songs.lib import SongXML, VerseType
 from openlp.plugins.songs.lib.db import Book, Song, Author, Topic
@@ -331,7 +332,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
                 else:
                     author = Author.populate(first_name=text.rsplit(u' ', 1)[0],
                         last_name=text.rsplit(u' ', 1)[1], display_name=text)
-                self.manager.save_object(author, False)
+                self.manager.save_object(author)
                 author_item = QtGui.QListWidgetItem(
                     unicode(author.display_name))
                 author_item.setData(QtCore.Qt.UserRole,
@@ -346,10 +347,9 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
             author = self.manager.get_object(Author, item_id)
             if self.authorsListView.findItems(unicode(author.display_name),
                 QtCore.Qt.MatchExactly):
-                QtGui.QMessageBox.warning(self,
-                    translate('SongsPlugin.EditSongForm', 'Error'),
-                    translate('SongsPlugin.EditSongForm', 'This author is '
-                    'already in the list.'))
+                criticalErrorMessageBox(
+                    message=translate('SongsPlugin.EditSongForm',
+                    'This author is already in the list.'))
             else:
                 author_item = QtGui.QListWidgetItem(unicode(
                     author.display_name))
@@ -386,7 +386,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
                 QtGui.QMessageBox.Yes | QtGui.QMessageBox.No,
                 QtGui.QMessageBox.Yes) == QtGui.QMessageBox.Yes:
                 topic = Topic.populate(name=text)
-                self.manager.save_object(topic, False)
+                self.manager.save_object(topic)
                 topic_item = QtGui.QListWidgetItem(unicode(topic.name))
                 topic_item.setData(QtCore.Qt.UserRole,
                     QtCore.QVariant(topic.id))
@@ -400,10 +400,9 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
             topic = self.manager.get_object(Topic, item_id)
             if self.topicsListView.findItems(unicode(topic.name),
                 QtCore.Qt.MatchExactly):
-                QtGui.QMessageBox.warning(self,
-                    translate('SongsPlugin.EditSongForm', 'Error'),
-                    translate('SongsPlugin.EditSongForm', 'This topic is '
-                    'already in the list.'))
+                criticalErrorMessageBox(
+                    message=translate('SongsPlugin.EditSongForm',
+                    'This topic is already in the list.'))
             else:
                 topic_item = QtGui.QListWidgetItem(unicode(topic.name))
                 topic_item.setData(QtCore.Qt.UserRole,
@@ -525,38 +524,36 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
 
     def _validate_song(self):
         """
-        Check the validity of the form. Only display the 'save' if the data
-        can be saved.
+        Check the validity of the song.
         """
+        # This checks data in the form *not* self.song.  self.song is still
+        # None at this point.
         log.debug(u'Validate Song')
         # Lets be nice and assume the data is correct.
-        if len(self.titleEdit.displayText()) == 0:
+        if not self.titleEdit.text():
             self.songTabWidget.setCurrentIndex(0)
             self.titleEdit.setFocus()
-            QtGui.QMessageBox.critical(self,
-                translate('SongsPlugin.EditSongForm', 'Error'),
-                translate('SongsPlugin.EditSongForm',
+            criticalErrorMessageBox(
+                message=translate('SongsPlugin.EditSongForm',
                 'You need to type in a song title.'))
             return False
         if self.verseListWidget.rowCount() == 0:
             self.songTabWidget.setCurrentIndex(0)
             self.verseListWidget.setFocus()
-            QtGui.QMessageBox.critical(self,
-                translate('SongsPlugin.EditSongForm', 'Error'),
-                translate('SongsPlugin.EditSongForm',
+            criticalErrorMessageBox(
+                message=translate('SongsPlugin.EditSongForm',
                 'You need to type in at least one verse.'))
             return False
         if self.authorsListView.count() == 0:
             self.songTabWidget.setCurrentIndex(1)
             self.authorsListView.setFocus()
-            QtGui.QMessageBox.critical(self,
-                translate('SongsPlugin.EditSongForm', 'Warning'),
-                translate('SongsPlugin.EditSongForm',
+            criticalErrorMessageBox(
+                message=translate('SongsPlugin.EditSongForm',
                 'You need to have an author for this song.'))
             return False
-        if self.song.verse_order:
+        if self.verseOrderEdit.text():
             order = []
-            order_names = self.song.verse_order.split()
+            order_names = unicode(self.verseOrderEdit.text()).split()
             for item in order_names:
                 if len(item) == 1:
                     order.append(item.lower() + u'1')
@@ -578,9 +575,8 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
                     valid = verses.pop(0)
                     for verse in verses:
                         valid = valid + u', ' + verse
-                    QtGui.QMessageBox.critical(self,
-                        translate('SongsPlugin.EditSongForm', 'Error'),
-                        unicode(translate('SongsPlugin.EditSongForm',
+                    criticalErrorMessageBox(
+                        message=unicode(translate('SongsPlugin.EditSongForm',
                         'The verse order is invalid. There is no verse '
                         'corresponding to %s. Valid entries are %s.')) % \
                         (order_names[count], valid))
@@ -598,6 +594,19 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
                         QtGui.QMessageBox.Yes | QtGui.QMessageBox.No)
                     if answer == QtGui.QMessageBox.No:
                         return False
+        item = int(self.songBookComboBox.currentIndex())
+        text = unicode(self.songBookComboBox.currentText())
+        if self.songBookComboBox.findText(text, QtCore.Qt.MatchExactly) < 0:
+            if QtGui.QMessageBox.question(self,
+                translate('SongsPlugin.EditSongForm', 'Add Book'),
+                translate('SongsPlugin.EditSongForm', 'This song book does '
+                'not exist, do you want to add it?'),
+                QtGui.QMessageBox.Yes | QtGui.QMessageBox.No,
+                QtGui.QMessageBox.Yes) == QtGui.QMessageBox.Yes:
+                book = Book.populate(name=text, publisher=u'')
+                self.manager.save_object(book)
+            else:
+                return False
         return True
 
     def onCopyrightInsertButtonTriggered(self):
@@ -658,33 +667,25 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
         """
         log.debug(u'accept')
         self.clearCaches()
-        if not self.song:
-            self.song = Song()
-        item = int(self.songBookComboBox.currentIndex())
-        text = unicode(self.songBookComboBox.currentText())
-        if self.songBookComboBox.findText(text, QtCore.Qt.MatchExactly) < 0:
-            if QtGui.QMessageBox.question(self,
-                translate('SongsPlugin.EditSongForm', 'Add Book'),
-                translate('SongsPlugin.EditSongForm', 'This song book does '
-                'not exist, do you want to add it?'),
-                QtGui.QMessageBox.Yes | QtGui.QMessageBox.No,
-                QtGui.QMessageBox.Yes) == QtGui.QMessageBox.Yes:
-                book = Book.populate(name=text, publisher=u'')
-                self.manager.save_object(book, False)
-            else:
-                return
-        if self.saveSong():
+        if self._validate_song():
+            self.saveSong()
             Receiver.send_message(u'songs_load_list')
             self.close()
 
     def saveSong(self, preview=False):
         """
         Get all the data from the widgets on the form, and then save it to the
-        database.
+        database.  The form has been validated and all reference items
+        (Authors, Books and Topics) have been saved before this function is
+        called.
 
         ``preview``
             Should be ``True`` if the song is also previewed (boolean).
         """
+        # The Song() assignment.  No database calls should be made while a
+        # Song() is in a partially complete state.
+        if not self.song:
+            self.song = Song()
         self.song.title = unicode(self.titleEdit.text())
         self.song.alternate_title = unicode(self.alternativeEdit.text())
         self.song.copyright = unicode(self.copyrightEdit.text())
@@ -708,27 +709,27 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
             self.song.theme_name = theme_name
         else:
             self.song.theme_name = None
-        if self._validate_song():
-            self.processLyrics()
-            self.processTitle()
-            self.song.authors = []
-            for row in range(self.authorsListView.count()):
-                item = self.authorsListView.item(row)
-                authorId = (item.data(QtCore.Qt.UserRole)).toInt()[0]
-                self.song.authors.append(self.manager.get_object(Author,
-                    authorId))
-            self.song.topics = []
-            for row in range(self.topicsListView.count()):
-                item = self.topicsListView.item(row)
-                topicId = (item.data(QtCore.Qt.UserRole)).toInt()[0]
-                self.song.topics.append(self.manager.get_object(Topic, topicId))
-            self.manager.save_object(self.song)
-            if not preview:
-                self.song = None
-            return True
-        return False
+        self.processLyrics()
+        self.processTitle()
+        self.song.authors = []
+        for row in range(self.authorsListView.count()):
+            item = self.authorsListView.item(row)
+            authorId = (item.data(QtCore.Qt.UserRole)).toInt()[0]
+            self.song.authors.append(self.manager.get_object(Author, authorId))
+        self.song.topics = []
+        for row in range(self.topicsListView.count()):
+            item = self.topicsListView.item(row)
+            topicId = (item.data(QtCore.Qt.UserRole)).toInt()[0]
+            self.song.topics.append(self.manager.get_object(Topic, topicId))
+        self.manager.save_object(self.song)
+        if not preview:
+            self.song = None
 
     def processLyrics(self):
+        """
+        Process the lyric data entered by the user into the OpenLP XML format.
+        """
+        # This method must only be run after the self.song = Song() assignment.
         log.debug(u'processLyrics')
         try:
             sxml = SongXML()
@@ -754,6 +755,11 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
                 sxml.dump_xml())
 
     def processTitle(self):
+        """
+        Process the song title entered by the user to remove stray punctuation
+        characters.
+        """
+        # This method must only be run after the self.song = Song() assignment.
         log.debug(u'processTitle')
         self.song.search_title = re.sub(r'[\'"`,;:(){}?]+', u'',
             unicode(self.song.search_title)).lower()
diff --git a/openlp/plugins/songs/forms/editverseform.py b/openlp/plugins/songs/forms/editverseform.py
index c01ad9726..c10e48cb7 100644
--- a/openlp/plugins/songs/forms/editverseform.py
+++ b/openlp/plugins/songs/forms/editverseform.py
@@ -29,6 +29,7 @@ import logging
 
 from PyQt4 import QtCore, QtGui
 
+from openlp.core.ui import criticalErrorMessageBox
 from openlp.plugins.songs.lib import VerseType, translate
 
 from editversedialog import Ui_EditVerseDialog
@@ -167,9 +168,8 @@ class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog):
         else:
             value = self.getVerse()[0].split(u'\n')[1]
         if len(value) == 0:
-            QtGui.QMessageBox.critical(self,
-                translate('SongsPlugin.EditSongForm', 'Error'),
-                translate('SongsPlugin.EditSongForm',
+            criticalErrorMessageBox(
+                message=translate('SongsPlugin.EditSongForm',
                 'You need to type some text in to the verse.'))
             return False
         QtGui.QDialog.accept(self)
diff --git a/openlp/plugins/songs/forms/songbookform.py b/openlp/plugins/songs/forms/songbookform.py
index 4a4a08ff6..8341a7c4c 100644
--- a/openlp/plugins/songs/forms/songbookform.py
+++ b/openlp/plugins/songs/forms/songbookform.py
@@ -27,6 +27,7 @@
 from PyQt4 import QtGui
 
 from openlp.core.lib import translate
+from openlp.core.ui import criticalErrorMessageBox
 from openlp.plugins.songs.forms.songbookdialog import Ui_SongBookDialog
 
 class SongBookForm(QtGui.QDialog, Ui_SongBookDialog):
@@ -49,10 +50,9 @@ class SongBookForm(QtGui.QDialog, Ui_SongBookDialog):
 
     def accept(self):
         if not self.nameEdit.text():
-            QtGui.QMessageBox.critical(
-                self, translate('SongsPlugin.SongBookForm', 'Error'),
-                translate('SongsPlugin.SongBookForm',
-                    'You need to type in a name for the book.'))
+            criticalErrorMessageBox(
+                message=translate('SongsPlugin.SongBookForm',
+                'You need to type in a name for the book.'))
             self.nameEdit.setFocus()
             return False
         else:
diff --git a/openlp/plugins/songs/forms/songimportform.py b/openlp/plugins/songs/forms/songimportform.py
index 22a7ab61f..d14ab9c36 100644
--- a/openlp/plugins/songs/forms/songimportform.py
+++ b/openlp/plugins/songs/forms/songimportform.py
@@ -32,6 +32,7 @@ import os
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import Receiver, SettingsManager, translate
+from openlp.core.ui import criticalErrorMessageBox
 from openlp.core.ui.wizard import OpenLPWizard
 from openlp.plugins.songs.lib.importer import SongFormat
 
@@ -127,6 +128,9 @@ class SongImportForm(OpenLPWizard):
         QtCore.QObject.connect(self.genericRemoveButton,
             QtCore.SIGNAL(u'clicked()'),
             self.onGenericRemoveButtonClicked)
+        QtCore.QObject.connect(self.easiSlidesBrowseButton,
+            QtCore.SIGNAL(u'clicked()'),
+            self.onEasiSlidesBrowseButtonClicked)
         QtCore.QObject.connect(self.ewBrowseButton,
             QtCore.SIGNAL(u'clicked()'),
             self.onEWBrowseButtonClicked)
@@ -176,6 +180,8 @@ class SongImportForm(OpenLPWizard):
         self.addMultiFileSelectItem(u'songsOfFellowship', None, True)
         # Generic Document/Presentation import
         self.addMultiFileSelectItem(u'generic', None, True)
+        # EasySlides
+        self.addSingleFileSelectItem(u'easiSlides')
         # EasyWorship
         self.addSingleFileSelectItem(u'ew')
         # Words of Worship
@@ -225,10 +231,12 @@ class SongImportForm(OpenLPWizard):
             translate('SongsPlugin.ImportWizardForm',
             'Generic Document/Presentation'))
         self.formatComboBox.setItemText(8,
-            translate('SongsPlugin.ImportWizardForm', 'EasyWorship'))
+            translate('SongsPlugin.ImportWizardForm', 'EasiSlides'))
         self.formatComboBox.setItemText(9,
+            translate('SongsPlugin.ImportWizardForm', 'EasyWorship'))
+        self.formatComboBox.setItemText(10,
             translate('SongsPlugin.ImportWizardForm', 'SongBeamer'))
-#        self.formatComboBox.setItemText(9,
+#        self.formatComboBox.setItemText(11,
 #            translate('SongsPlugin.ImportWizardForm', 'CSV'))
         self.openLP2FilenameLabel.setText(
             translate('SongsPlugin.ImportWizardForm', 'Filename:'))
@@ -280,6 +288,10 @@ class SongImportForm(OpenLPWizard):
             translate('SongsPlugin.ImportWizardForm', 'The generic document/'
             'presentation importer has been disabled because OpenLP cannot '
             'find OpenOffice.org on your computer.'))
+        self.easiSlidesFilenameLabel.setText(
+            translate('SongsPlugin.ImportWizardForm', 'Filename:'))
+        self.easiSlidesBrowseButton.setText(
+            translate('SongsPlugin.ImportWizardForm', 'Browse...'))
         self.ewFilenameLabel.setText(
             translate('SongsPlugin.ImportWizardForm', 'Filename:'))
         self.ewBrowseButton.setText(
@@ -310,6 +322,8 @@ class SongImportForm(OpenLPWizard):
             QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
         self.openLP1FormLabelSpacer.changeSize(width, 0,
             QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
+        self.easiSlidesFormLabelSpacer.changeSize(width, 0,
+            QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
         self.ewFormLabelSpacer.changeSize(width, 0, QtGui.QSizePolicy.Fixed,
             QtGui.QSizePolicy.Fixed)
 #        self.csvFormLabelSpacer.changeSize(width, 0, QtGui.QSizePolicy.Fixed,
@@ -325,7 +339,7 @@ class SongImportForm(OpenLPWizard):
             source_format = self.formatComboBox.currentIndex()
             if source_format == SongFormat.OpenLP2:
                 if self.openLP2FilenameEdit.text().isEmpty():
-                    QtGui.QMessageBox.critical(self,
+                    criticalErrorMessageBox(
                         translate('SongsPlugin.ImportWizardForm',
                         'No OpenLP 2.0 Song Database Selected'),
                         translate('SongsPlugin.ImportWizardForm',
@@ -335,7 +349,7 @@ class SongImportForm(OpenLPWizard):
                     return False
             elif source_format == SongFormat.OpenLP1:
                 if self.openLP1FilenameEdit.text().isEmpty():
-                    QtGui.QMessageBox.critical(self,
+                    criticalErrorMessageBox(
                         translate('SongsPlugin.ImportWizardForm',
                         'No openlp.org 1.x Song Database Selected'),
                         translate('SongsPlugin.ImportWizardForm',
@@ -345,7 +359,7 @@ class SongImportForm(OpenLPWizard):
                     return False
             elif source_format == SongFormat.OpenLyrics:
                 if self.openLyricsFileListWidget.count() == 0:
-                    QtGui.QMessageBox.critical(self,
+                    criticalErrorMessageBox(
                         translate('SongsPlugin.ImportWizardForm',
                         'No OpenLyrics Files Selected'),
                         translate('SongsPlugin.ImportWizardForm',
@@ -355,7 +369,7 @@ class SongImportForm(OpenLPWizard):
                     return False
             elif source_format == SongFormat.OpenSong:
                 if self.openSongFileListWidget.count() == 0:
-                    QtGui.QMessageBox.critical(self,
+                    criticalErrorMessageBox(
                         translate('SongsPlugin.ImportWizardForm',
                         'No OpenSong Files Selected'),
                         translate('SongsPlugin.ImportWizardForm',
@@ -365,7 +379,7 @@ class SongImportForm(OpenLPWizard):
                     return False
             elif source_format == SongFormat.WordsOfWorship:
                 if self.wordsOfWorshipFileListWidget.count() == 0:
-                    QtGui.QMessageBox.critical(self,
+                    criticalErrorMessageBox(
                         translate('SongsPlugin.ImportWizardForm',
                         'No Words of Worship Files Selected'),
                         translate('SongsPlugin.ImportWizardForm',
@@ -375,7 +389,7 @@ class SongImportForm(OpenLPWizard):
                     return False
             elif source_format == SongFormat.CCLI:
                 if self.ccliFileListWidget.count() == 0:
-                    QtGui.QMessageBox.critical(self,
+                    criticalErrorMessageBox(
                         translate('SongsPlugin.ImportWizardForm',
                         'No CCLI Files Selected'),
                         translate('SongsPlugin.ImportWizardForm',
@@ -385,7 +399,7 @@ class SongImportForm(OpenLPWizard):
                     return False
             elif source_format == SongFormat.SongsOfFellowship:
                 if self.songsOfFellowshipFileListWidget.count() == 0:
-                    QtGui.QMessageBox.critical(self,
+                    criticalErrorMessageBox(
                         translate('SongsPlugin.ImportWizardForm',
                         'No Songs of Fellowship File Selected'),
                         translate('SongsPlugin.ImportWizardForm',
@@ -395,7 +409,7 @@ class SongImportForm(OpenLPWizard):
                     return False
             elif source_format == SongFormat.Generic:
                 if self.genericFileListWidget.count() == 0:
-                    QtGui.QMessageBox.critical(self,
+                    criticalErrorMessageBox(
                         translate('SongsPlugin.ImportWizardForm',
                         'No Document/Presentation Selected'),
                         translate('SongsPlugin.ImportWizardForm',
@@ -403,9 +417,19 @@ class SongImportForm(OpenLPWizard):
                         'presentation file to import from.'))
                     self.genericAddButton.setFocus()
                     return False
+            elif source_format == SongFormat.EasiSlides:
+                if self.easiSlidesFilenameEdit.text().isEmpty():
+                    criticalErrorMessageBox(
+                        translate('SongsPlugin.ImportWizardForm',
+                        'No Easislides Songs file selected'),
+                        translate('SongsPlugin.ImportWizardForm',
+                        'You need to select an xml song file exported from '
+                        'EasiSlides, to import from.'))
+                    self.easiSlidesBrowseButton.setFocus()
+                    return False
             elif source_format == SongFormat.EasyWorship:
                 if self.ewFilenameEdit.text().isEmpty():
-                    QtGui.QMessageBox.critical(self,
+                    criticalErrorMessageBox(
                         translate('SongsPlugin.ImportWizardForm',
                         'No EasyWorship Song Database Selected'),
                         translate('SongsPlugin.ImportWizardForm',
@@ -415,7 +439,7 @@ class SongImportForm(OpenLPWizard):
                     return False
             elif source_format == SongFormat.SongBeamer:
                 if self.songBeamerFileListWidget.count() == 0:
-                    QtGui.QMessageBox.critical(self,
+                    criticalErrorMessageBox(
                         translate('SongsPlugin.ImportWizardForm',
                         'No SongBeamer File Selected'),
                         translate('SongsPlugin.ImportWizardForm',
@@ -624,6 +648,13 @@ class SongImportForm(OpenLPWizard):
         """
         self.removeSelectedItems(self.genericFileListWidget)
 
+    def onEasiSlidesBrowseButtonClicked(self):
+        self.getFileName(
+            translate('SongsPlugin.ImportWizardForm',
+            'Select EasiSlides songfile'),
+            self.easiSlidesFilenameEdit
+        )
+  
     def onEWBrowseButtonClicked(self):
         """
         Get EasyWorship song database files
@@ -673,6 +704,7 @@ class SongImportForm(OpenLPWizard):
         self.ccliFileListWidget.clear()
         self.songsOfFellowshipFileListWidget.clear()
         self.genericFileListWidget.clear()
+        self.easiSlidesFilenameEdit.setText(u'')
         self.ewFilenameEdit.setText(u'')
         self.songBeamerFileListWidget.clear()
         #self.csvFilenameEdit.setText(u'')
@@ -736,8 +768,13 @@ class SongImportForm(OpenLPWizard):
             importer = self.plugin.importSongs(SongFormat.Generic,
                 filenames=self.getListOfFiles(self.genericFileListWidget)
             )
+        elif source_format == SongFormat.EasiSlides:
+            # Import an EasiSlides export file
+            importer = self.plugin.importSongs(SongFormat.EasiSlides,
+                filename=unicode(self.easiSlidesFilenameEdit.text())
+            )
         elif source_format == SongFormat.EasyWorship:
-            # Import an OpenLP 2.0 database
+            # Import an EasyWorship database
             importer = self.plugin.importSongs(SongFormat.EasyWorship,
                 filename=unicode(self.ewFilenameEdit.text())
             )
diff --git a/openlp/plugins/songs/forms/songmaintenanceform.py b/openlp/plugins/songs/forms/songmaintenanceform.py
index c964c5192..cd10dca9b 100644
--- a/openlp/plugins/songs/forms/songmaintenanceform.py
+++ b/openlp/plugins/songs/forms/songmaintenanceform.py
@@ -23,15 +23,19 @@
 # with this program; if not, write to the Free Software Foundation, Inc., 59  #
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
+import logging
 
 from PyQt4 import QtGui, QtCore
 from sqlalchemy.sql import and_
 
 from openlp.core.lib import Receiver, translate
+from openlp.core.ui import criticalErrorMessageBox
 from openlp.plugins.songs.forms import AuthorsForm, TopicsForm, SongBookForm
 from openlp.plugins.songs.lib.db import Author, Book, Topic, Song
 from songmaintenancedialog import Ui_SongMaintenanceDialog
 
+log = logging.getLogger(__name__)
+
 class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
     """
     Class documentation goes here.
@@ -87,15 +91,14 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
         if item_id != -1:
             item = self.manager.get_object(item_class, item_id)
             if item and len(item.songs) == 0:
-                if QtGui.QMessageBox.warning(self, dlg_title, del_text,
-                    QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.No |
-                    QtGui.QMessageBox.Yes)) == QtGui.QMessageBox.Yes:
+                if criticalErrorMessageBox(title=dlg_title, message=del_text,
+                    parent=self, question=True) == QtGui.QMessageBox.Yes:
                     self.manager.delete_object(item_class, item.id)
                     reset_func()
             else:
-                QtGui.QMessageBox.critical(self, dlg_title, err_text)
+                criticalErrorMessageBox(dlg_title, err_text)
         else:
-            QtGui.QMessageBox.critical(self, dlg_title, sel_text)
+            criticalErrorMessageBox(dlg_title, sel_text)
 
     def resetAuthors(self):
         """
@@ -229,14 +232,12 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
                 if self.manager.save_object(author):
                     self.resetAuthors()
                 else:
-                    QtGui.QMessageBox.critical(self,
-                        translate('SongsPlugin.SongMaintenanceForm', 'Error'),
-                        translate('SongsPlugin.SongMaintenanceForm',
+                    criticalErrorMessageBox(
+                        message=translate('SongsPlugin.SongMaintenanceForm',
                         'Could not add your author.'))
             else:
-                QtGui.QMessageBox.critical(self,
-                    translate('SongsPlugin.SongMaintenanceForm', 'Error'),
-                    translate('SongsPlugin.SongMaintenanceForm',
+                criticalErrorMessageBox(
+                    message=translate('SongsPlugin.SongMaintenanceForm',
                     'This author already exists.'))
 
     def onTopicAddButtonClick(self):
@@ -246,14 +247,12 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
                 if self.manager.save_object(topic):
                     self.resetTopics()
                 else:
-                    QtGui.QMessageBox.critical(self,
-                        translate('SongsPlugin.SongMaintenanceForm', 'Error'),
-                        translate('SongsPlugin.SongMaintenanceForm',
+                    criticalErrorMessageBox(
+                        message=translate('SongsPlugin.SongMaintenanceForm',
                         'Could not add your topic.'))
             else:
-                QtGui.QMessageBox.critical(self,
-                    translate('SongsPlugin.SongMaintenanceForm', 'Error'),
-                    translate('SongsPlugin.SongMaintenanceForm',
+                criticalErrorMessageBox(
+                    message=translate('SongsPlugin.SongMaintenanceForm',
                     'This topic already exists.'))
 
     def onBookAddButtonClick(self):
@@ -264,14 +263,12 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
                 if self.manager.save_object(book):
                     self.resetBooks()
                 else:
-                    QtGui.QMessageBox.critical(self,
-                        translate('SongsPlugin.SongMaintenanceForm', 'Error'),
-                        translate('SongsPlugin.SongMaintenanceForm',
+                    criticalErrorMessageBox(
+                        message=translate('SongsPlugin.SongMaintenanceForm',
                         'Could not add your book.'))
             else:
-                QtGui.QMessageBox.critical(self,
-                    translate('SongsPlugin.SongMaintenanceForm', 'Error'),
-                    translate('SongsPlugin.SongMaintenanceForm',
+                criticalErrorMessageBox(
+                    message=translate('SongsPlugin.SongMaintenanceForm',
                     'This book already exists.'))
 
     def onAuthorEditButtonClick(self):
@@ -298,20 +295,15 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
                         self.resetAuthors()
                         Receiver.send_message(u'songs_load_list')
                     else:
-                        QtGui.QMessageBox.critical(self,
-                            translate('SongsPlugin.SongMaintenanceForm',
-                            'Error'),
-                            translate('SongsPlugin.SongMaintenanceForm',
+                        criticalErrorMessageBox(
+                            message=translate('SongsPlugin.SongMaintenanceForm',
                             'Could not save your changes.'))
-                elif QtGui.QMessageBox.critical(self,
-                    translate('SongsPlugin.SongMaintenanceForm', 'Error'),
-                    unicode(translate('SongsPlugin.SongMaintenanceForm',
-                    'The author %s already exists. Would you like to make songs'
-                    ' with author %s use the existing author %s?')) %
-                    (author.display_name, temp_display_name,
-                    author.display_name), QtGui.QMessageBox.StandardButtons(
-                    QtGui.QMessageBox.No | QtGui.QMessageBox.Yes)) == \
-                    QtGui.QMessageBox.Yes:
+                elif criticalErrorMessageBox(message=unicode(translate(
+                    'SongsPlugin.SongMaintenanceForm', 'The author %s already '
+                    'exists. Would you like to make songs with author %s use '
+                    'the existing author %s?')) % (author.display_name,
+                    temp_display_name, author.display_name),
+                    parent=self, question=True) == QtGui.QMessageBox.Yes:
                     self.mergeAuthors(author)
                     self.resetAuthors()
                     Receiver.send_message(u'songs_load_list')
@@ -321,9 +313,8 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
                     author.first_name = temp_first_name
                     author.last_name = temp_last_name
                     author.display_name = temp_display_name
-                    QtGui.QMessageBox.critical(self,
-                        translate('SongsPlugin.SongMaintenanceForm', 'Error'),
-                        translate('SongsPlugin.SongMaintenanceForm',
+                    criticalErrorMessageBox(
+                        message=translate('SongsPlugin.SongMaintenanceForm',
                         'Could not save your modified author, because the '
                         'author already exists.'))
 
@@ -340,27 +331,22 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
                     if self.manager.save_object(topic):
                         self.resetTopics()
                     else:
-                        QtGui.QMessageBox.critical(self,
-                            translate('SongsPlugin.SongMaintenanceForm',
-                            'Error'),
-                            translate('SongsPlugin.SongMaintenanceForm',
+                        criticalErrorMessageBox(
+                            message=translate('SongsPlugin.SongMaintenanceForm',
                             'Could not save your changes.'))
-                elif QtGui.QMessageBox.critical(self,
-                    translate('SongsPlugin.SongMaintenanceForm', 'Error'),
-                    unicode(translate('SongsPlugin.SongMaintenanceForm',
+                elif criticalErrorMessageBox(
+                    message=unicode(translate('SongsPlugin.SongMaintenanceForm',
                     'The topic %s already exists. Would you like to make songs '
                     'with topic %s use the existing topic %s?')) % (topic.name,
-                    temp_name, topic.name), QtGui.QMessageBox.StandardButtons(
-                    QtGui.QMessageBox.No | QtGui.QMessageBox.Yes)) == \
-                    QtGui.QMessageBox.Yes:
+                    temp_name, topic.name),
+                    parent=self, question=True) == QtGui.QMessageBox.Yes:
                     self.mergeTopics(topic)
                     self.resetTopics()
                 else:
                     # We restore the topics's old name.
                     topic.name = temp_name
-                    QtGui.QMessageBox.critical(self,
-                        translate('SongsPlugin.SongMaintenanceForm', 'Error'),
-                        translate('SongsPlugin.SongMaintenanceForm',
+                    criticalErrorMessageBox(
+                        message=translate('SongsPlugin.SongMaintenanceForm',
                         'Could not save your modified topic, because it '
                         'already exists.'))
 
@@ -383,19 +369,15 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
                     if self.manager.save_object(book):
                         self.resetBooks()
                     else:
-                        QtGui.QMessageBox.critical(self,
-                            translate('SongsPlugin.SongMaintenanceForm',
-                            'Error'),
-                            translate('SongsPlugin.SongMaintenanceForm',
+                        criticalErrorMessageBox(
+                            message=translate('SongsPlugin.SongMaintenanceForm',
                             'Could not save your changes.'))
-                elif QtGui.QMessageBox.critical(self,
-                    translate('SongsPlugin.SongMaintenanceForm', 'Error'),
-                    unicode(translate('SongsPlugin.SongMaintenanceForm',
+                elif criticalErrorMessageBox(
+                    message=unicode(translate('SongsPlugin.SongMaintenanceForm',
                     'The book %s already exists. Would you like to make songs '
                     'with book %s use the existing book %s?')) % (book.name,
-                    temp_name, book.name), QtGui.QMessageBox.StandardButtons(
-                    QtGui.QMessageBox.No | QtGui.QMessageBox.Yes)) == \
-                    QtGui.QMessageBox.Yes:
+                    temp_name, book.name),
+                    parent=self, question=True) == QtGui.QMessageBox.Yes:
                     self.mergeBooks(book)
                     self.resetBooks()
                 else:
diff --git a/openlp/plugins/songs/forms/topicsform.py b/openlp/plugins/songs/forms/topicsform.py
index 1ff827423..4ab2b63fa 100644
--- a/openlp/plugins/songs/forms/topicsform.py
+++ b/openlp/plugins/songs/forms/topicsform.py
@@ -27,6 +27,7 @@
 from PyQt4 import QtGui
 
 from openlp.core.lib import translate
+from openlp.core.ui import criticalErrorMessageBox
 from openlp.plugins.songs.forms.topicsdialog import Ui_TopicsDialog
 
 class TopicsForm(QtGui.QDialog, Ui_TopicsDialog):
@@ -48,10 +49,8 @@ class TopicsForm(QtGui.QDialog, Ui_TopicsDialog):
 
     def accept(self):
         if not self.nameEdit.text():
-            QtGui.QMessageBox.critical(
-                self, translate('SongsPlugin.TopicsForm', 'Error'),
-                translate('SongsPlugin.TopicsForm',
-                    'You need to type in a topic name.'))
+            criticalErrorMessageBox(message=translate('SongsPlugin.TopicsForm',
+                'You need to type in a topic name.'))
             self.nameEdit.setFocus()
             return False
         else:
diff --git a/openlp/plugins/songs/lib/__init__.py b/openlp/plugins/songs/lib/__init__.py
index 462dac89a..af8b71795 100644
--- a/openlp/plugins/songs/lib/__init__.py
+++ b/openlp/plugins/songs/lib/__init__.py
@@ -48,49 +48,27 @@ class VerseType(object):
         ``verse_type``
             The type to return a string for
         """
-        if verse_type == VerseType.Verse:
-            return translate('SongsPlugin.VerseType', 'Verse')
-        elif verse_type == VerseType.Chorus:
-            return translate('SongsPlugin.VerseType', 'Chorus')
-        elif verse_type == VerseType.Bridge:
-            return translate('SongsPlugin.VerseType', 'Bridge')
-        elif verse_type == VerseType.PreChorus:
-            return translate('SongsPlugin.VerseType', 'Pre-Chorus')
-        elif verse_type == VerseType.Intro:
-            return translate('SongsPlugin.VerseType', 'Intro')
-        elif verse_type == VerseType.Ending:
-            return translate('SongsPlugin.VerseType', 'Ending')
-        elif verse_type == VerseType.Other:
-            return translate('SongsPlugin.VerseType', 'Other')
-
-    @staticmethod
-    def expand_string(verse_type):
-        """
-        Return the VerseType for a given string
-
-        ``verse_type``
-            The string to return a VerseType for
-        """
-        verse_type = verse_type.lower()
-        if verse_type == \
+        if not isinstance(verse_type, int):
+            verse_type = verse_type.lower()
+        if verse_type == VerseType.Verse or verse_type == \
             unicode(VerseType.to_string(VerseType.Verse)).lower()[0]:
             return translate('SongsPlugin.VerseType', 'Verse')
-        elif verse_type == \
+        elif verse_type == VerseType.Chorus or verse_type == \
             unicode(VerseType.to_string(VerseType.Chorus)).lower()[0]:
             return translate('SongsPlugin.VerseType', 'Chorus')
-        elif verse_type == \
+        elif verse_type == VerseType.Bridge or verse_type == \
             unicode(VerseType.to_string(VerseType.Bridge)).lower()[0]:
             return translate('SongsPlugin.VerseType', 'Bridge')
-        elif verse_type == \
+        elif verse_type == VerseType.PreChorus or verse_type == \
             unicode(VerseType.to_string(VerseType.PreChorus)).lower()[0]:
-            return translate('SongsPlugin.VerseType', 'PreChorus')
-        elif verse_type == \
+            return translate('SongsPlugin.VerseType', 'Pre-Chorus')
+        elif verse_type == VerseType.Intro or verse_type == \
             unicode(VerseType.to_string(VerseType.Intro)).lower()[0]:
             return translate('SongsPlugin.VerseType', 'Intro')
-        elif verse_type == \
+        elif verse_type == VerseType.Ending or verse_type == \
             unicode(VerseType.to_string(VerseType.Ending)).lower()[0]:
             return translate('SongsPlugin.VerseType', 'Ending')
-        elif verse_type == \
+        elif verse_type == VerseType.Other or verse_type == \
             unicode(VerseType.to_string(VerseType.Other)).lower()[0]:
             return translate('SongsPlugin.VerseType', 'Other')
 
@@ -163,7 +141,7 @@ def retrieve_windows_encoding(recommendation=None):
             translate('SongsPlugin', 'Character Encoding'),
             translate('SongsPlugin', 'The codepage setting is responsible\n'
                 'for the correct character representation.\n'
-                'Usually you are fine with the preselected choise.'),
+                'Usually you are fine with the preselected choice.'),
             [pair[1] for pair in encodings], recommended_index, False)
     else:
         choice = QtGui.QInputDialog.getItem(None,
diff --git a/openlp/plugins/songs/lib/db.py b/openlp/plugins/songs/lib/db.py
index faa0a88da..838172893 100644
--- a/openlp/plugins/songs/lib/db.py
+++ b/openlp/plugins/songs/lib/db.py
@@ -72,7 +72,7 @@ def init_schema(url):
     ``url``
         The database to setup
     """
-    session, metadata = init_db(url, False)
+    session, metadata = init_db(url)
 
     # Definition of the "authors" table
     authors_table = Table(u'authors', metadata,
diff --git a/openlp/plugins/songs/lib/easislidesimport.py b/openlp/plugins/songs/lib/easislidesimport.py
new file mode 100644
index 000000000..8685b6934
--- /dev/null
+++ b/openlp/plugins/songs/lib/easislidesimport.py
@@ -0,0 +1,341 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2011 Raoul Snyman                                        #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Carsten Tinggaard, Frode Woldsund                                           #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+
+import logging
+import os
+from lxml import etree, objectify
+from lxml.etree import Error, LxmlError
+import re
+
+from openlp.core.lib import translate
+from openlp.plugins.songs.lib.songimport import SongImport
+
+log = logging.getLogger(__name__)
+
+class EasiSlidesImport(SongImport):
+    """
+    Import songs exported from EasiSlides
+
+    The format example is here:
+    http://wiki.openlp.org/Development:EasiSlides_-_Song_Data_Format
+    """
+    def __init__(self, manager, **kwargs):
+        """
+        Initialise the class.
+        """
+        SongImport.__init__(self, manager)
+        self.filename = kwargs[u'filename']
+        self.song = None
+        self.commit = True
+
+    def do_import(self):
+        """
+        Import either each of the files in self.filenames - each element of
+        which can be either a single opensong file, or a zipfile containing
+        multiple opensong files. If `self.commit` is set False, the
+        import will not be committed to the database (useful for test scripts).
+        """
+        self.import_wizard.progressBar.setMaximum(1)
+        log.info(u'Importing EasiSlides XML file %s', self.filename)
+        parser = etree.XMLParser(remove_blank_text=True)
+        file = etree.parse(self.filename, parser)
+        xml = unicode(etree.tostring(file))
+        song_xml = objectify.fromstring(xml)
+        self.import_wizard.incrementProgressBar(
+            unicode(translate('SongsPlugin.ImportWizardForm',
+                u'Importing %s...')) % os.path.split(self.filename)[-1])
+        self.import_wizard.progressBar.setMaximum(len(song_xml.Item))
+        for song in song_xml.Item:
+            self.import_wizard.incrementProgressBar(
+                unicode(translate('SongsPlugin.ImportWizardForm',
+                    u'Importing %s, song %s...')) %
+                    (os.path.split(self.filename)[-1], song.Title1))
+            success = self._parse_song(song)
+            if not success or self.stop_import_flag:
+                return False
+            elif self.commit:
+                self.finish()
+        return True
+
+    def _parse_song(self, song):
+        self._success = True
+        self._add_title(song)
+        self._add_alttitle(song)
+        self._add_number(song)
+        self._add_authors(song)
+        self._add_copyright(song)
+        self._add_book(song)
+        self._parse_and_add_lyrics(song)
+        return self._success
+
+    def _add_title(self, song):
+        try:
+            self.title = unicode(song.Title1).strip()
+        except UnicodeDecodeError:
+            log.exception(u'Unicode decode error while decoding Title1')
+            self._success = False
+        except AttributeError:
+            log.exception(u'no Title1')
+            self._success = False
+
+    def _add_alttitle(self, song):
+        try:
+            self.alternate_title = unicode(song.Title2).strip()
+        except UnicodeDecodeError:
+            log.exception(u'Unicode decode error while decoding Title2')
+            self._success = False
+        except AttributeError:
+            pass
+
+    def _add_number(self, song):
+        try:
+            number = unicode(song.SongNumber)
+            if number != u'0':
+                self.song_number = number
+        except UnicodeDecodeError:
+            log.exception(u'Unicode decode error while decoding SongNumber')
+            self._success = False
+        except AttributeError:
+            pass
+
+    def _add_authors(self, song):
+        try:
+            authors = unicode(song.Writer).split(u',')
+            for author in authors:
+                author = author.strip()
+                if len(author) > 0:
+                    self.authors.append(author)
+        except UnicodeDecodeError:
+            log.exception(u'Unicode decode error while decoding Writer')
+            self._success = False
+        except AttributeError:
+            pass
+
+    def _add_copyright(self, song):
+        copyright = []
+        try:
+            copyright.append(unicode(song.Copyright).strip())
+        except UnicodeDecodeError:
+            log.exception(u'Unicode decode error while decoding Copyright')
+            self._success = False
+        except AttributeError:
+            pass
+        try:
+            copyright.append(unicode(song.LicenceAdmin1).strip())
+        except UnicodeDecodeError:
+            log.exception(u'Unicode decode error while decoding LicenceAdmin1')
+            self._success = False
+        except AttributeError:
+            pass
+        try:
+            copyright.append(unicode(song.LicenceAdmin2).strip())
+        except UnicodeDecodeError:
+            log.exception(u'Unicode decode error while decoding LicenceAdmin2')
+            self._success = False
+        except AttributeError:
+            pass
+        self.add_copyright(u' '.join(copyright))
+
+    def _add_book(self, song):
+        try:
+            self.song_book_name = unicode(song.BookReference).strip()
+        except UnicodeDecodeError:
+            log.exception(u'Unicode decode error while decoding BookReference')
+            self._success = False
+        except AttributeError:
+            pass
+
+    def _parse_and_add_lyrics(self, song):
+        try:
+            lyrics = unicode(song.Contents).strip()
+        except UnicodeDecodeError:
+            log.exception(u'Unicode decode error while decoding Contents')
+            self._success = False
+        except AttributeError:
+            log.exception(u'no Contents')
+            self._success = False
+        lines = lyrics.split(u'\n')
+        # we go over all lines first, to determine information,
+        # which tells us how to parse verses later
+        regionlines = {}
+        separatorlines = 0
+        for line in lines:
+            line = line.strip()
+            if len(line) == 0:
+                continue
+            elif line[1:7] == u'region':
+                # this is region separator, probably [region 2]
+                region = self._extractRegion(line)
+                if regionlines.has_key(region):
+                    regionlines[region] = regionlines[region] + 1
+                else:
+                    regionlines[region] = 1
+            elif line[0] == u'[':
+                separatorlines = separatorlines + 1
+        # if the song has separators
+        separators = (separatorlines > 0)
+        # the number of different regions in song - 1
+        if len(regionlines) > 1:
+            log.info(u'EasiSlidesImport: the file contained a song named "%s"'
+                u'with more than two regions, but only two regions are',
+                u'tested, encountered regions were: %s',
+                self.title, u','.join(regionlines.keys()))
+        # if the song has regions
+        regions = (len(regionlines) > 0)
+        # if the regions are inside verses
+        regionsInVerses = (regions and regionlines[regionlines.keys()[0]] > 1)
+        MarkTypes = {
+            u'CHORUS': u'C',
+            u'VERSE': u'V',
+            u'INTRO': u'I',
+            u'ENDING': u'E',
+            u'BRIDGE': u'B',
+            u'PRECHORUS': u'P'}
+        verses = {}
+        # list as [region, versetype, versenum, instance]
+        our_verse_order = []
+        defaultregion = u'1'
+        reg = defaultregion
+        verses[reg] = {}
+        # instance differentiates occurrences of same verse tag
+        vt = u'V'
+        vn = u'1'
+        inst = 1
+
+        for line in lines:
+            line = line.strip()
+            if len(line) == 0:
+                if separators:
+                    # separators are used, so empty line means slide break
+                    # inside verse
+                    if self._listHas(verses, [reg, vt, vn, inst]):
+                        inst = inst + 1
+                else:
+                    # separators are not used, so empty line starts a new verse
+                    vt = u'V'
+                    if verses[reg].has_key(vt):
+                        vn = len(verses[reg][vt].keys())+1
+                    else:
+                        vn = u'1'
+                    inst = 1
+            elif line[0:7] == u'[region':
+                reg = self._extractRegion(line)
+                if not verses.has_key(reg):
+                    verses[reg] = {}
+                if not regionsInVerses:
+                    vt = u'V'
+                    vn = u'1'
+                    inst = 1
+            elif line[0] == u'[':
+                # this is a normal section marker
+                marker = line[1:line.find(u']')].upper()
+                vn = u'1'
+                # have we got any digits?
+                # If so, versenumber is everything from the digits to the end
+                match = re.match(u'(.*)(\d+.*)', marker)
+                if match:
+                    marker = match.group(1).strip()
+                    vn = match.group(2)
+                if len(marker) == 0:
+                    vt = u'V'
+                elif MarkTypes.has_key(marker):
+                    vt = MarkTypes[marker]
+                else:
+                    vt = u'O'
+                if regionsInVerses:
+                    region = defaultregion
+                inst = 1
+                if self._listHas(verses, [reg, vt, vn, inst]):
+                    inst = len(verses[reg][vt][vn])+1
+            else:
+                if not [reg, vt, vn, inst] in our_verse_order:
+                    our_verse_order.append([reg, vt, vn, inst])
+                if not verses[reg].has_key(vt):
+                    verses[reg][vt] = {}
+                if not verses[reg][vt].has_key(vn):
+                    verses[reg][vt][vn] = {}
+                if not verses[reg][vt][vn].has_key(inst):
+                    verses[reg][vt][vn][inst] = []
+                words = self.tidy_text(line)
+                verses[reg][vt][vn][inst].append(words)
+        # done parsing
+
+        versetags = []
+        # we use our_verse_order to ensure, we insert lyrics in the same order
+        # as these appeared originally in the file
+        for [reg, vt, vn, inst] in our_verse_order:
+            if self._listHas(verses, [reg, vt, vn, inst]):
+                versetag = u'%s%s' % (vt, vn)
+                versetags.append(versetag)
+                lines = u'\n'.join(verses[reg][vt][vn][inst])
+                self.verses.append([versetag, lines])
+
+        SeqTypes = {
+            u'p': u'P1',
+            u'q': u'P2',
+            u'c': u'C1',
+            u't': u'C2',
+            u'b': u'B1',
+            u'w': u'B2',
+            u'e': u'E1'}
+        # Make use of Sequence data, determining the order of verses
+        try:
+            order = unicode(song.Sequence).strip().split(u',')
+            for tag in order:
+                if len(tag) == 0:
+                    continue
+                elif tag[0].isdigit():
+                    tag = u'V' + tag
+                elif SeqTypes.has_key(tag.lower()):
+                    tag = SeqTypes[tag.lower()]
+                else:
+                    continue
+ 
+                if tag in versetags:
+                    self.verse_order_list.append(tag)
+                else:
+                    log.info(u'Got order item %s, which is not in versetags,'
+                        u'dropping item from presentation order', tag)
+        except UnicodeDecodeError:
+            log.exception(u'Unicode decode error while decoding Sequence')
+            self._success = False
+        except AttributeError:
+            pass
+
+    def _listHas(self, lst, subitems):
+        for i in subitems:
+            if type(lst) == type({}) and lst.has_key(i):
+                lst = lst[i]
+            elif type(lst) == type([]) and i in lst:
+                lst = lst[i]
+            else:
+                return False
+        return True
+
+    def _extractRegion(self, line):
+        # this was true already: line[0:7] == u'[region':
+        right_bracket = line.find(u']')
+        return line[7:right_bracket].strip()
diff --git a/openlp/plugins/songs/lib/importer.py b/openlp/plugins/songs/lib/importer.py
index 128d80138..91d3d7e6f 100644
--- a/openlp/plugins/songs/lib/importer.py
+++ b/openlp/plugins/songs/lib/importer.py
@@ -23,8 +23,11 @@
 # with this program; if not, write to the Free Software Foundation, Inc., 59  #
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
-
+"""
+The :mod:`importer` modules provides the general song import functionality.
+"""
 from opensongimport import OpenSongImport
+from easislidesimport import EasiSlidesImport
 from olpimport import OpenLPSongImport
 from openlyricsimport import OpenLyricsImport
 from wowimport import WowImport
@@ -34,19 +37,19 @@ from songbeamerimport import SongBeamerImport
 # Imports that might fail
 try:
     from olp1import import OpenLP1SongImport
-    has_openlp1 = True
+    HAS_OPENLP1 = True
 except ImportError:
-    has_openlp1 = False
+    HAS_OPENLP1 = False
 try:
     from sofimport import SofImport
-    has_sof = True
+    HAS_SOF = True
 except ImportError:
-    has_sof = False
+    HAS_SOF = False
 try:
     from oooimport import OooImport
-    has_ooo = True
+    HAS_OOO = True
 except ImportError:
-    has_ooo = False
+    HAS_OOO = False
 
 class SongFormat(object):
     """
@@ -65,8 +68,9 @@ class SongFormat(object):
     SongsOfFellowship = 6
     Generic = 7
     #CSV = 8
-    EasyWorship = 8
-    SongBeamer = 9
+    EasiSlides = 8
+    EasyWorship = 9
+    SongBeamer = 10
 
     @staticmethod
     def get_class(format):
@@ -92,6 +96,8 @@ class SongFormat(object):
             return OooImport
         elif format == SongFormat.CCLI:
             return CCLIFileImport
+        elif format == SongFormat.EasiSlides:
+            return EasiSlidesImport
         elif format == SongFormat.EasyWorship:
             return EasyWorshipSongImport
         elif format == SongFormat.SongBeamer:
@@ -112,20 +118,28 @@ class SongFormat(object):
             SongFormat.CCLI,
             SongFormat.SongsOfFellowship,
             SongFormat.Generic,
+            SongFormat.EasiSlides,
             SongFormat.EasyWorship,
             SongFormat.SongBeamer
         ]
 
     @staticmethod
     def set_availability(format, available):
+        """
+        Set the availability for a given song format.
+        """
         SongFormat._format_availability[format] = available
 
     @staticmethod
     def get_availability(format):
+        """
+        Return the availability of a given song format.
+        """
         return SongFormat._format_availability.get(format, True)
 
-SongFormat.set_availability(SongFormat.OpenLP1, has_openlp1)
-SongFormat.set_availability(SongFormat.SongsOfFellowship, has_sof)
-SongFormat.set_availability(SongFormat.Generic, has_ooo)
+SongFormat.set_availability(SongFormat.OpenLP1, HAS_OPENLP1)
+SongFormat.set_availability(SongFormat.SongsOfFellowship, HAS_SOF)
+SongFormat.set_availability(SongFormat.Generic, HAS_OOO)
+
+__all__ = [u'SongFormat']
 
-__all__ = [u'SongFormat']
\ No newline at end of file
diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py
index 93e40f58a..67021616b 100644
--- a/openlp/plugins/songs/lib/mediaitem.py
+++ b/openlp/plugins/songs/lib/mediaitem.py
@@ -194,8 +194,7 @@ class SongMediaItem(MediaManagerItem):
         elif search_type == 5:
             log.debug(u'Theme Search')
             search_results = self.parent.manager.get_all_objects(Song,
-                Song.theme_name == search_keywords,
-                Song.search_lyrics.asc())
+                Song.theme_name == search_keywords, Song.search_lyrics.asc())
             self.displayResultsSong(search_results)
 
     def onSongListLoad(self):
diff --git a/openlp/plugins/songs/lib/songbeamerimport.py b/openlp/plugins/songs/lib/songbeamerimport.py
index c783793db..47290bfbd 100644
--- a/openlp/plugins/songs/lib/songbeamerimport.py
+++ b/openlp/plugins/songs/lib/songbeamerimport.py
@@ -83,7 +83,7 @@ class SongBeamerImport(SongImport):
 
     def do_import(self):
         """
-        Recieve a single file, or a list of files to import.
+        Receive a single file or a list of files to import.
         """
         if isinstance(self.import_source, list):
             self.import_wizard.progressBar.setMaximum(
@@ -94,21 +94,21 @@ class SongBeamerImport(SongImport):
                 self.current_verse = u''
                 self.current_verse_type = u'V'
                 read_verses = False
-                self.file_name = os.path.split(file)[1]
+                file_name = os.path.split(file)[1]
                 self.import_wizard.incrementProgressBar(
-                    u'Importing %s' % (self.file_name), 0)
+                    u'Importing %s' % (file_name), 0)
                 if os.path.isfile(file):
                     detect_file = open(file, u'r')
                     details = chardet.detect(detect_file.read(2048))
                     detect_file.close()
                     infile = codecs.open(file, u'r', details['encoding'])
-                    self.songData = infile.readlines()
+                    songData = infile.readlines()
                     infile.close()
                 else:
                     return False
-                self.title = self.file_name.split('.sng')[0]
+                self.title = file_name.split('.sng')[0]
                 read_verses = False
-                for line in self.songData:
+                for line in songData:
                     # Just make sure that the line is of the type 'Unicode'.
                     line = unicode(line).strip()
                     if line.startswith(u'#') and not read_verses:
@@ -136,7 +136,7 @@ class SongBeamerImport(SongImport):
                     self.finish()
                 self.import_wizard.incrementProgressBar(unicode(translate(
                     'SongsPlugin.SongBeamerImport', 'Importing %s...')) %
-                    self.file_name)
+                    file_name)
             return True
 
     def replace_html_tags(self):
diff --git a/openlp/plugins/songs/lib/songimport.py b/openlp/plugins/songs/lib/songimport.py
index c1105a578..3ce271466 100644
--- a/openlp/plugins/songs/lib/songimport.py
+++ b/openlp/plugins/songs/lib/songimport.py
@@ -62,7 +62,6 @@ class SongImport(QtCore.QObject):
         Create defaults for properties - call this before each song
         if importing many songs at once to ensure a clean beginning
         """
-        self.authors = []
         self.title = u''
         self.song_number = u''
         self.alternate_title = u''
@@ -251,20 +250,15 @@ class SongImport(QtCore.QObject):
 
     def finish(self):
         """
-        All fields have been set to this song. Write it away
+        All fields have been set to this song. Write the song to disk.
         """
         if not self.authors:
             self.authors.append(unicode(translate('SongsPlugin.SongImport',
                 'Author unknown')))
-        self.commit_song()
-
-    def commit_song(self):
-        """
-        Write the song and its fields to disk
-        """
         log.info(u'commiting song %s to database', self.title)
         song = Song()
         song.title = self.title
+        song.alternate_title = self.alternate_title
         song.search_title = self.remove_punctuation(self.title).lower() \
             + '@' + self.remove_punctuation(self.alternate_title).lower()
         song.song_number = self.song_number
diff --git a/openlp/plugins/songs/lib/wowimport.py b/openlp/plugins/songs/lib/wowimport.py
index d0c308413..b90a47de6 100644
--- a/openlp/plugins/songs/lib/wowimport.py
+++ b/openlp/plugins/songs/lib/wowimport.py
@@ -107,63 +107,60 @@ class WowImport(SongImport):
 
     def do_import(self):
         """
-        Recieve a single file, or a list of files to import.
+        Receive a single file or a list of files to import.
         """
-
         if isinstance(self.import_source, list):
             self.import_wizard.progressBar.setMaximum(len(self.import_source))
             for file in self.import_source:
-                self.author = u''
-                self.copyright = u''
-                self.file_name = os.path.split(file)[1]
+                author = u''
+                copyright = u''
+                file_name = os.path.split(file)[1]
                 self.import_wizard.incrementProgressBar(
-                    u'Importing %s' % (self.file_name), 0)
+                    u'Importing %s' % (file_name), 0)
                 # Get the song title
-                self.title = self.file_name.rpartition(u'.')[0]
-                self.songData = open(file, 'rb')
-                if self.songData.read(19) != u'WoW File\nSong Words':
+                self.title = file_name.rpartition(u'.')[0]
+                songData = open(file, 'rb')
+                if songData.read(19) != u'WoW File\nSong Words':
                     continue
                 # Seek to byte which stores number of blocks in the song
-                self.songData.seek(56)
-                self.no_of_blocks = ord(self.songData.read(1))
+                songData.seek(56)
+                no_of_blocks = ord(songData.read(1))
                 # Seek to the beging of the first block
-                self.songData.seek(82)
-                for block in range(self.no_of_blocks):
-                    self.lines_to_read = ord(self.songData.read(1))
+                songData.seek(82)
+                for block in range(no_of_blocks):
+                    self.lines_to_read = ord(songData.read(1))
                     # Skip 3 nulls to the beginnig of the 1st line
-                    self.songData.seek(3, os.SEEK_CUR)
-                    self.block_text = u''
+                    songData.seek(3, os.SEEK_CUR)
+                    block_text = u''
                     while self.lines_to_read:
-                        self.length_of_line = ord(self.songData.read(1))
                         self.line_text = unicode(
-                            self.songData.read(self.length_of_line), u'cp1252')
-                        self.songData.seek(1, os.SEEK_CUR)
-                        if self.block_text != u'':
-                            self.block_text += u'\n'
-                        self.block_text += self.line_text
+                            songData.read(ord(songData.read(1))), u'cp1252')
+                        songData.seek(1, os.SEEK_CUR)
+                        if block_text != u'':
+                            block_text += u'\n'
+                        block_text += self.line_text
                         self.lines_to_read -= 1
-                    self.block_type = BLOCK_TYPES[ord(self.songData.read(1))]
+                    block_type = BLOCK_TYPES[ord(songData.read(1))]
                     # Skip 3 nulls at the end of the block
-                    self.songData.seek(3, os.SEEK_CUR)
+                    songData.seek(3, os.SEEK_CUR)
                     # Blocks are seperated by 2 bytes, skip them, but not if
                     # this is the last block!
-                    if (block + 1) < self.no_of_blocks:
-                        self.songData.seek(2, os.SEEK_CUR)
-                    self.add_verse(self.block_text, self.block_type)
-                # Now to extact the author
-                self.author_length = ord(self.songData.read(1))
-                if self.author_length != 0:
-                    self.author = unicode(
-                        self.songData.read(self.author_length), u'cp1252')
+                    if (block + 1) < no_of_blocks:
+                        songData.seek(2, os.SEEK_CUR)
+                    self.add_verse(block_text, block_type)
+                # Now to extract the author
+                author_length = ord(songData.read(1))
+                if author_length != 0:
+                    author = unicode(songData.read(author_length), u'cp1252')
                 # Finally the copyright
-                self.copyright_length = ord(self.songData.read(1))
-                if self.copyright_length != 0:
-                    self.copyright = unicode(
-                        self.songData.read(self.copyright_length), u'cp1252')
-                self.parse_author(self.author)
-                self.add_copyright(self.copyright)
-                self.songData.close()
+                copyright_length = ord(songData.read(1))
+                if copyright_length != 0:
+                    copyright = unicode(
+                        songData.read(copyright_length), u'cp1252')
+                self.parse_author(author)
+                self.add_copyright(copyright)
+                songData.close()
                 self.finish()
                 self.import_wizard.incrementProgressBar(
-                    u'Importing %s' % (self.file_name))
+                    u'Importing %s' % (file_name))
             return True
diff --git a/openlp/plugins/songs/lib/xml.py b/openlp/plugins/songs/lib/xml.py
index cbe313212..88459b797 100644
--- a/openlp/plugins/songs/lib/xml.py
+++ b/openlp/plugins/songs/lib/xml.py
@@ -435,7 +435,7 @@ class OpenLyrics(object):
                     text += u'\n'
                 text += u'\n'.join([unicode(line) for line in lines.line])
             verse_name = self._get(verse, u'name')
-            verse_type = unicode(VerseType.expand_string(verse_name[0]))[0]
+            verse_type = unicode(VerseType.to_string(verse_name[0]))[0]
             verse_number = re.compile(u'[a-zA-Z]*').sub(u'', verse_name)
             verse_part = re.compile(u'[0-9]*').sub(u'', verse_name[1:])
             # OpenLyrics allows e. g. "c", but we need "c1".