diff --git a/openlp.pyw b/openlp.pyw
index c4f062b87..dfe973ceb 100755
--- a/openlp.pyw
+++ b/openlp.pyw
@@ -129,11 +129,11 @@ class OpenLP(QtGui.QApplication):
         screens = ScreenList()
         # Decide how many screens we have and their size
         for screen in xrange(0, self.desktop().numScreens()):
+            size = self.desktop().screenGeometry(screen);
             screens.add_screen({u'number': screen,
-                u'size': self.desktop().availableGeometry(screen),
+                u'size': size,
                 u'primary': (self.desktop().primaryScreen() == screen)})
-            log.info(u'Screen %d found with resolution %s',
-                screen, self.desktop().availableGeometry(screen))
+            log.info(u'Screen %d found with resolution %s', screen, size)
         # start the main app window
         self.mainWindow = MainWindow(screens, app_version)
         self.mainWindow.show()
diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py
index a39c3dac5..acf00bdeb 100644
--- a/openlp/core/lib/htmlbuilder.py
+++ b/openlp/core/lib/htmlbuilder.py
@@ -40,6 +40,7 @@ HTMLSRC = u"""
     margin: 0;
     padding: 0;
     border: 0;
+    overflow: hidden;
 }
 body {
     %s;
@@ -144,6 +145,7 @@ body {
         }
         document.getElementById('black').style.display = black;
         document.getElementById('lyricsmain').style.visibility = lyrics;
+        document.getElementById('image').style.visibility = lyrics;
         outline = document.getElementById('lyricsoutline')
         if(outline!=null)
             outline.style.visibility = lyrics;
@@ -326,7 +328,7 @@ def build_background_css(item, width, height):
             else:
                 background = \
                     u'background: -webkit-gradient(radial, %s 50%%, 100, %s ' \
-                    u'50%%, %s, from(%s), to(%s))' % (width, width, width, 
+                    u'50%%, %s, from(%s), to(%s))' % (width, width, width,
                     theme.background_startColor, theme.background_endColor)
     return background
 
@@ -369,10 +371,10 @@ def build_lyrics_css(item, webkitvers):
     lyricsmain = u''
     outline = u''
     shadow = u''
-    if theme:
+    if theme and item.main:
         lyricstable = u'left: %spx; top: %spx;' % \
             (item.main.x(), item.main.y())
-        lyrics = build_lyrics_format_css(theme, item.main.width(), 
+        lyrics = build_lyrics_format_css(theme, item.main.width(),
             item.main.height())
         # For performance reasons we want to show as few DIV's as possible,
         # especially when animating/transitions.
@@ -392,7 +394,7 @@ def build_lyrics_css(item, webkitvers):
         if webkitvers >= 533.3:
             lyricsmain += build_lyrics_outline_css(theme)
         else:
-            outline = build_lyrics_outline_css(theme) 
+            outline = build_lyrics_outline_css(theme)
         if theme.display_shadow:
             if theme.display_outline and webkitvers < 534.3:
                 shadow = u'padding-left: %spx; padding-top: %spx ' % \
@@ -404,7 +406,7 @@ def build_lyrics_css(item, webkitvers):
                     theme.display_shadow_size)
     lyrics_css = style % (lyricstable, lyrics, lyricsmain, outline, shadow)
     return lyrics_css
-    
+
 def build_lyrics_outline_css(theme, is_shadow=False):
     """
     Build the css which controls the theme outline
@@ -412,7 +414,7 @@ def build_lyrics_outline_css(theme, is_shadow=False):
 
     `theme`
         Object containing theme information
-    
+
     `is_shadow`
         If true, use the shadow colors instead
     """
@@ -436,7 +438,7 @@ def build_lyrics_format_css(theme, width, height):
 
     `theme`
         Object containing theme information
-    
+
     `width`
         Width of the lyrics block
 
@@ -460,8 +462,8 @@ def build_lyrics_format_css(theme, width, height):
         'text-align: %s; vertical-align: %s; font-family: %s; ' \
         'font-size: %spt; color: %s; line-height: %d%%; ' \
         'margin:0; padding:0; width: %spx; height: %spx; ' % \
-        (align, valign, theme.font_main_name, theme.font_main_proportion, 
-        theme.font_main_color, 100 + int(theme.font_main_line_adjustment), 
+        (align, valign, theme.font_main_name, theme.font_main_proportion,
+        theme.font_main_color, 100 + int(theme.font_main_line_adjustment),
         width, height)
     if theme.display_outline:
         if webkit_version() < 534.3:
@@ -471,7 +473,7 @@ def build_lyrics_format_css(theme, width, height):
     if theme.font_main_weight == u'Bold':
         lyrics += u' font-weight:bold; '
     return lyrics
-    
+
 def build_lyrics_html(item, webkitvers):
     """
     Build the HTML required to show the lyrics
@@ -519,7 +521,7 @@ def build_footer_css(item):
     text-align: %s;
     """
     theme = item.themedata
-    if not theme:
+    if not theme or not item.footer:
         return u''
     if theme.display_horizontalAlign == 2:
         align = u'center'
diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index 330c434c5..0cb92ad39 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -70,21 +70,11 @@ class Renderer(object):
         self.theme_name = theme.theme_name
         if theme.background_type == u'image':
             if theme.background_filename:
-                self.set_bg_image(theme.background_filename)
-
-    def set_bg_image(self, filename):
-        """
-        Set a background image.
-
-        ``filename``
-            The name of the image file.
-        """
-        log.debug(u'set bg image %s', filename)
-        self._bg_image_filename = unicode(filename)
-        if self.frame:
-            self.bg_image = resize_image(self._bg_image_filename,
-                                         self.frame.width(),
-                                         self.frame.height())
+                self._bg_image_filename = unicode(theme.background_filename)
+                if self.frame:
+                    self.bg_image = resize_image(self._bg_image_filename,
+                        self.frame.width(),
+                        self.frame.height())
 
     def set_text_rectangle(self, rect_main, rect_footer):
         """
@@ -100,7 +90,7 @@ class Renderer(object):
         self._rect = rect_main
         self._rect_footer = rect_footer
 
-    def set_frame_dest(self, frame_width, frame_height, preview=False):
+    def set_frame_dest(self, frame_width, frame_height):
         """
         Set the size of the slide.
 
@@ -110,11 +100,7 @@ class Renderer(object):
         ``frame_height``
             The height of the slide.
 
-        ``preview``
-            Defaults to *False*. Whether or not to generate a preview.
         """
-        if preview:
-            self.bg_frame = None
         log.debug(u'set frame dest (frame) w %d h %d', frame_width,
             frame_height)
         self.frame = QtGui.QImage(frame_width, frame_height,
@@ -122,8 +108,17 @@ class Renderer(object):
         if self._bg_image_filename and not self.bg_image:
             self.bg_image = resize_image(self._bg_image_filename,
                 self.frame.width(), self.frame.height())
-        if self.bg_frame is None:
-            self._generate_background_frame()
+        if self._theme.background_type == u'image':
+            self.bg_frame = QtGui.QImage(self.frame.width(),
+                self.frame.height(), QtGui.QImage.Format_ARGB32_Premultiplied)
+            painter = QtGui.QPainter()
+            painter.begin(self.bg_frame)
+            painter.fillRect(self.frame.rect(), QtCore.Qt.black)
+            if self.bg_image:
+                painter.drawImage(0, 0, self.bg_image)
+            painter.end()
+        else:
+            self.bg_frame = None
 
     def format_slide(self, words, line_break):
         """
@@ -143,14 +138,14 @@ class Renderer(object):
         for verse in verses_text:
             lines = verse.split(u'\n')
             for line in lines:
-                text.append(line)               
+                text.append(line)
         web = QtWebKit.QWebView()
         web.resize(self._rect.width(), self._rect.height())
         web.setVisible(False)
         frame = web.page().mainFrame()
         # Adjust width and height to account for shadow. outline done in css
-        width = self._rect.width() - int(self._theme.display_shadow_size) 
-        height = self._rect.height() - int(self._theme.display_shadow_size) 
+        width = self._rect.width() - int(self._theme.display_shadow_size)
+        height = self._rect.height() - int(self._theme.display_shadow_size)
         shell = u'<html><head><style>#main {%s %s}</style><body>' \
             u'<div id="main">' % \
             (build_lyrics_format_css(self._theme, width, height),
@@ -174,57 +169,3 @@ class Renderer(object):
         formatted.append(html_text)
         log.debug(u'format_slide - End')
         return formatted
-
-    def _generate_background_frame(self):
-        """
-        Generate a background frame to the same size as the frame to be used.
-        Results are cached for performance reasons.
-        """
-        assert(self._theme)
-        self.bg_frame = QtGui.QImage(self.frame.width(),
-            self.frame.height(), QtGui.QImage.Format_ARGB32_Premultiplied)
-        log.debug(u'render background %s start', self._theme.background_type)
-        if self._theme.background_type == u'solid':
-            self.bg_frame = None
-#            painter.fillRect(self.frame.rect(),
-#                QtGui.QColor(self._theme.background_color))
-        elif self._theme.background_type == u'gradient':
-            self.bg_frame = None
-            # gradient
-#            gradient = None
-#            if self._theme.background_direction == u'horizontal':
-#                w = int(self.frame.width()) / 2
-#                # vertical
-#                gradient = QtGui.QLinearGradient(w, 0, w, self.frame.height())
-#            elif self._theme.background_direction == u'vertical':
-#                h = int(self.frame.height()) / 2
-#                # Horizontal
-#                gradient = QtGui.QLinearGradient(0, h, self.frame.width(), h)
-#            else:
-#                w = int(self.frame.width()) / 2
-#                h = int(self.frame.height()) / 2
-#                # Circular
-#                gradient = QtGui.QRadialGradient(w, h, w)
-#            gradient.setColorAt(0,
-#                QtGui.QColor(self._theme.background_startColor))
-#            gradient.setColorAt(1,
-#                QtGui.QColor(self._theme.background_endColor))
-#            painter.setBrush(QtGui.QBrush(gradient))
-#            rect_path = QtGui.QPainterPath()
-#            max_x = self.frame.width()
-#            max_y = self.frame.height()
-#            rect_path.moveTo(0, 0)
-#            rect_path.lineTo(0, max_y)
-#            rect_path.lineTo(max_x, max_y)
-#            rect_path.lineTo(max_x, 0)
-#            rect_path.closeSubpath()
-#            painter.drawPath(rect_path)
-#            painter.end()
-        elif self._theme.background_type == u'image':
-            # image
-            painter = QtGui.QPainter()
-            painter.begin(self.bg_frame)
-            painter.fillRect(self.frame.rect(), QtCore.Qt.black)
-            if self.bg_image:
-                painter.drawImage(0, 0, self.bg_image)
-            painter.end()
diff --git a/openlp/core/lib/rendermanager.py b/openlp/core/lib/rendermanager.py
index 6be26bd82..a6e494b01 100644
--- a/openlp/core/lib/rendermanager.py
+++ b/openlp/core/lib/rendermanager.py
@@ -93,6 +93,8 @@ class RenderManager(object):
         """
         self.global_theme = global_theme
         self.theme_level = theme_level
+        self.global_theme_data = \
+            self.theme_manager.getThemeData(self.global_theme)
         self.themedata = None
 
     def set_service_theme(self, service_theme):
diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py
index 0e8625ce7..b0d453af5 100644
--- a/openlp/core/lib/serviceitem.py
+++ b/openlp/core/lib/serviceitem.py
@@ -170,6 +170,7 @@ class ServiceItem(object):
                         u'verseTag': slide[u'verseTag'] })
                 log.log(15, u'Formatting took %4s' % (time.time() - before))
         elif self.service_item_type == ServiceItemType.Image:
+            self.themedata = self.render_manager.global_theme_data
             for slide in self._raw_frames:
                 slide[u'image'] = resize_image(slide[u'image'],
                     self.render_manager.width, self.render_manager.height)
diff --git a/openlp/core/ui/generaltab.py b/openlp/core/ui/generaltab.py
index bc050b6f9..d8481e801 100644
--- a/openlp/core/ui/generaltab.py
+++ b/openlp/core/ui/generaltab.py
@@ -195,6 +195,19 @@ class GeneralTab(SettingsTab):
         self.currentYValueLabel.setObjectName(u'currentYValueLabel')
         self.currentYLayout.addWidget(self.currentYValueLabel)
         self.currentLayout.addLayout(self.currentYLayout)
+        self.currentWidthLayout = QtGui.QVBoxLayout()
+        self.currentWidthLayout.setSpacing(0)
+        self.currentWidthLayout.setMargin(0)
+        self.currentWidthLayout.setObjectName(u'currentWidthLayout')
+        self.currentWidthLabel = QtGui.QLabel(self.displayGroupBox)
+        self.currentWidthLabel.setAlignment(QtCore.Qt.AlignCenter)
+        self.currentWidthLabel.setObjectName(u'currentWidthLabel')
+        self.currentWidthLayout.addWidget(self.currentWidthLabel)
+        self.currentWidthValueLabel = QtGui.QLabel(self.displayGroupBox)
+        self.currentWidthValueLabel.setAlignment(QtCore.Qt.AlignCenter)
+        self.currentWidthValueLabel.setObjectName(u'currentWidthValueLabel')
+        self.currentWidthLayout.addWidget(self.currentWidthValueLabel)
+        self.currentLayout.addLayout(self.currentWidthLayout)
         self.currentHeightLayout = QtGui.QVBoxLayout()
         self.currentHeightLayout.setSpacing(0)
         self.currentHeightLayout.setMargin(0)
@@ -209,19 +222,6 @@ class GeneralTab(SettingsTab):
         self.currentHeightValueLabel.setObjectName(u'Height')
         self.currentHeightLayout.addWidget(self.currentHeightValueLabel)
         self.currentLayout.addLayout(self.currentHeightLayout)
-        self.currentWidthLayout = QtGui.QVBoxLayout()
-        self.currentWidthLayout.setSpacing(0)
-        self.currentWidthLayout.setMargin(0)
-        self.currentWidthLayout.setObjectName(u'currentWidthLayout')
-        self.currentWidthLabel = QtGui.QLabel(self.displayGroupBox)
-        self.currentWidthLabel.setAlignment(QtCore.Qt.AlignCenter)
-        self.currentWidthLabel.setObjectName(u'currentWidthLabel')
-        self.currentWidthLayout.addWidget(self.currentWidthLabel)
-        self.currentWidthValueLabel = QtGui.QLabel(self.displayGroupBox)
-        self.currentWidthValueLabel.setAlignment(QtCore.Qt.AlignCenter)
-        self.currentWidthValueLabel.setObjectName(u'currentWidthValueLabel')
-        self.currentWidthLayout.addWidget(self.currentWidthValueLabel)
-        self.currentLayout.addLayout(self.currentWidthLayout)
         self.displayLayout.addLayout(self.currentLayout)
         self.overrideCheckBox = QtGui.QCheckBox(self.displayGroupBox)
         self.overrideCheckBox.setObjectName(u'overrideCheckBox')
@@ -256,18 +256,6 @@ class GeneralTab(SettingsTab):
         self.customYValueEdit.setObjectName(u'customYValueEdit')
         self.customYLayout.addWidget(self.customYValueEdit)
         self.customLayout.addLayout(self.customYLayout)
-        self.customHeightLayout = QtGui.QVBoxLayout()
-        self.customHeightLayout.setSpacing(0)
-        self.customHeightLayout.setMargin(0)
-        self.customHeightLayout.setObjectName(u'customHeightLayout')
-        self.customHeightLabel = QtGui.QLabel(self.displayGroupBox)
-        self.customHeightLabel.setAlignment(QtCore.Qt.AlignCenter)
-        self.customHeightLabel.setObjectName(u'customHeightLabel')
-        self.customHeightLayout.addWidget(self.customHeightLabel)
-        self.customHeightValueEdit = QtGui.QLineEdit(self.displayGroupBox)
-        self.customHeightValueEdit.setObjectName(u'customHeightValueEdit')
-        self.customHeightLayout.addWidget(self.customHeightValueEdit)
-        self.customLayout.addLayout(self.customHeightLayout)
         self.customWidthLayout = QtGui.QVBoxLayout()
         self.customWidthLayout.setSpacing(0)
         self.customWidthLayout.setMargin(0)
@@ -281,6 +269,18 @@ class GeneralTab(SettingsTab):
         self.customWidthValueEdit.setObjectName(u'customWidthValueEdit')
         self.customWidthLayout.addWidget(self.customWidthValueEdit)
         self.customLayout.addLayout(self.customWidthLayout)
+        self.customHeightLayout = QtGui.QVBoxLayout()
+        self.customHeightLayout.setSpacing(0)
+        self.customHeightLayout.setMargin(0)
+        self.customHeightLayout.setObjectName(u'customHeightLayout')
+        self.customHeightLabel = QtGui.QLabel(self.displayGroupBox)
+        self.customHeightLabel.setAlignment(QtCore.Qt.AlignCenter)
+        self.customHeightLabel.setObjectName(u'customHeightLabel')
+        self.customHeightLayout.addWidget(self.customHeightLabel)
+        self.customHeightValueEdit = QtGui.QLineEdit(self.displayGroupBox)
+        self.customHeightValueEdit.setObjectName(u'customHeightValueEdit')
+        self.customHeightLayout.addWidget(self.customHeightValueEdit)
+        self.customLayout.addLayout(self.customHeightLayout)
         self.displayLayout.addLayout(self.customLayout)
         # Bottom spacer
         self.generalRightSpacer = QtGui.QSpacerItem(20, 40,
@@ -476,7 +476,6 @@ class GeneralTab(SettingsTab):
         # Order is important so be careful if you change
         if self.overrideChanged or postUpdate:
             Receiver.send_message(u'config_screen_changed')
-        Receiver.send_message(u'config_updated')
         self.overrideChanged = False
 
     def onOverrideCheckBoxToggled(self, checked):
diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py
index 2c9472414..3e0b070b9 100644
--- a/openlp/core/ui/maindisplay.py
+++ b/openlp/core/ui/maindisplay.py
@@ -97,6 +97,7 @@ class MainDisplay(DisplayWidget):
         self.screens = screens
         self.isLive = live
         self.alertTab = None
+        self.hide_mode = None
         self.setWindowTitle(u'OpenLP Display')
         self.setWindowFlags(QtCore.Qt.FramelessWindowHint |
             QtCore.Qt.WindowStaysOnTopHint)
@@ -125,6 +126,8 @@ class MainDisplay(DisplayWidget):
         self.frame = self.page.mainFrame()
         QtCore.QObject.connect(self.webView,
             QtCore.SIGNAL(u'loadFinished(bool)'), self.isLoaded)
+        self.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
+        self.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
         self.frame.setScrollBarPolicy(QtCore.Qt.Vertical,
             QtCore.Qt.ScrollBarAlwaysOff)
         self.frame.setScrollBarPolicy(QtCore.Qt.Horizontal,
@@ -338,6 +341,9 @@ class MainDisplay(DisplayWidget):
         self.webView.setHtml(html)
         if serviceItem.foot_text and serviceItem.foot_text:
             self.footer(serviceItem.foot_text)
+        # if was hidden keep it hidden
+        if self.hide_mode and self.isLive:
+            self.hideDisplay(self.hide_mode)
 
     def footer(self, text):
         """
@@ -363,6 +369,7 @@ class MainDisplay(DisplayWidget):
             self.frame.evaluateJavaScript(u'show_blank("theme");')
         if mode != HideMode.Screen and self.isHidden():
             self.setVisible(True)
+        self.hide_mode = mode
 
     def showDisplay(self):
         """
@@ -376,6 +383,7 @@ class MainDisplay(DisplayWidget):
             self.setVisible(True)
         # Trigger actions when display is active again
         Receiver.send_message(u'maindisplay_active')
+        self.hide_mode = None
 
 class AudioPlayer(QtCore.QObject):
     """
diff --git a/openlp/core/ui/settingsform.py b/openlp/core/ui/settingsform.py
index 97f2aebaf..37fe1f329 100644
--- a/openlp/core/ui/settingsform.py
+++ b/openlp/core/ui/settingsform.py
@@ -30,6 +30,7 @@ import logging
 
 from PyQt4 import QtGui
 
+from openlp.core.lib import Receiver
 from openlp.core.ui import AdvancedTab, GeneralTab, ThemesTab
 from settingsdialog import Ui_SettingsDialog
 
@@ -87,6 +88,8 @@ class SettingsForm(QtGui.QDialog, Ui_SettingsDialog):
         """
         for tabIndex in range(0, self.settingsTabWidget.count()):
             self.settingsTabWidget.widget(tabIndex).save()
+        # Must go after all settings are save
+        Receiver.send_message(u'config_updated')
         return QtGui.QDialog.accept(self)
 
     def postSetUp(self):
diff --git a/openlp/plugins/bibles/lib/biblestab.py b/openlp/plugins/bibles/lib/biblestab.py
index 8399ee1d4..0903c9625 100644
--- a/openlp/plugins/bibles/lib/biblestab.py
+++ b/openlp/plugins/bibles/lib/biblestab.py
@@ -196,10 +196,10 @@ class BiblesTab(SettingsTab):
             self.show_new_chapters = True
 
     def onBibleDualCheckBox(self, check_state):
-        self.duel_bibles = False
+        self.dual_bibles = False
         # we have a set value convert to True/False
         if check_state == QtCore.Qt.Checked:
-            self.duel_bibles = True
+            self.dual_bibles = True
 
     def load(self):
         settings = QtCore.QSettings()
@@ -212,12 +212,12 @@ class BiblesTab(SettingsTab):
             u'verse layout style', QtCore.QVariant(0)).toInt()[0]
         self.bible_theme = unicode(
             settings.value(u'bible theme', QtCore.QVariant(u'')).toString())
-        self.duel_bibles = settings.value(
+        self.dual_bibles = settings.value(
             u'dual bibles', QtCore.QVariant(True)).toBool()
         self.NewChaptersCheckBox.setChecked(self.show_new_chapters)
         self.DisplayStyleComboBox.setCurrentIndex(self.display_style)
         self.LayoutStyleComboBox.setCurrentIndex(self.layout_style)
-        self.BibleDualCheckBox.setChecked(self.duel_bibles)
+        self.BibleDualCheckBox.setChecked(self.dual_bibles)
         settings.endGroup()
 
     def save(self):
@@ -229,7 +229,7 @@ class BiblesTab(SettingsTab):
             QtCore.QVariant(self.display_style))
         settings.setValue(u'verse layout style',
             QtCore.QVariant(self.layout_style))
-        settings.setValue(u'dual bibles', QtCore.QVariant(self.duel_bibles))
+        settings.setValue(u'dual bibles', QtCore.QVariant(self.dual_bibles))
         settings.setValue(u'bible theme', QtCore.QVariant(self.bible_theme))
         settings.endGroup()
 
diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py
index e7850c65c..57e70617a 100644
--- a/openlp/plugins/bibles/lib/mediaitem.py
+++ b/openlp/plugins/bibles/lib/mediaitem.py
@@ -275,8 +275,9 @@ class BibleMediaItem(MediaManagerItem):
         self.SearchProgress.setObjectName(u'SearchProgress')
 
     def configUpdated(self):
+        log.debug(u'configUpdated')
         if QtCore.QSettings().value(self.settingsSection + u'/dual bibles',
-            QtCore.QVariant(False)).toBool():
+            QtCore.QVariant(True)).toBool():
             self.AdvancedSecondBibleLabel.setVisible(True)
             self.AdvancedSecondBibleComboBox.setVisible(True)
             self.QuickSecondVersionLabel.setVisible(True)
diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py
index 85ba1cf06..9f14698ee 100644
--- a/openlp/plugins/songs/lib/mediaitem.py
+++ b/openlp/plugins/songs/lib/mediaitem.py
@@ -359,16 +359,13 @@ class SongMediaItem(MediaManagerItem):
                 author_list = author_list + u', '
             author_list = author_list + unicode(author.display_name)
             author_audit.append(unicode(author.display_name))
-        if song.ccli_number is None or len(song.ccli_number) == 0:
-            ccli = QtCore.QSettings().value(u'general/ccli number',
-                QtCore.QVariant(u'')).toString()
-        else:
-            ccli = unicode(song.ccli_number)
         raw_footer.append(song.title)
         raw_footer.append(author_list)
         raw_footer.append(song.copyright )
         raw_footer.append(unicode(
-            translate('SongsPlugin.MediaItem', 'CCLI Licence: ') + ccli))
+            translate('SongsPlugin.MediaItem', 'CCLI Licence: ') +
+            QtCore.QSettings().value(u'general/ccli number',
+            QtCore.QVariant(u'')).toString()))
         service_item.raw_footer = raw_footer
         service_item.audit = [
             song.title, author_audit, song.copyright, unicode(song.ccli_number)
diff --git a/openlp/plugins/songs/lib/oooimport.py b/openlp/plugins/songs/lib/oooimport.py
index 76b4b6c0d..e8c723c0e 100644
--- a/openlp/plugins/songs/lib/oooimport.py
+++ b/openlp/plugins/songs/lib/oooimport.py
@@ -28,6 +28,7 @@ import os
 
 from PyQt4 import QtCore
 
+from openlp.core.lib import Receiver
 from songimport import SongImport
 
 if os.name == u'nt':
@@ -43,23 +44,32 @@ else:
     except ImportError:
         pass
 
-class OooImport(object):
+class OooImport(SongImport):
     """
     Import songs from Impress/Powerpoint docs using Impress 
     """
-    def __init__(self, songmanager):
+    def __init__(self, master_manager, **kwargs):
         """
         Initialise the class. Requires a songmanager class which is passed
         to SongImport for writing song to disk
         """
+        SongImport.__init__(self, master_manager)
         self.song = None
-        self.manager = songmanager
+        self.master_manager = master_manager
         self.document = None
         self.process_started = False
+        self.filenames = kwargs[u'filenames']
+        QtCore.QObject.connect(Receiver.get_receiver(),
+            QtCore.SIGNAL(u'song_stop_import'), self.stop_import)
 
-    def import_docs(self, filenames):
+    def do_import(self):
+        self.abort = False
+        self.import_wizard.importProgressBar.setMaximum(0)
         self.start_ooo()
-        for filename in filenames:
+        for filename in self.filenames:
+            if self.abort:
+                self.import_wizard.incrementProgressBar(u'Import cancelled', 0)
+                return
             filename = unicode(filename)
             if os.path.isfile(filename):
                 self.open_ooo_file(filename)
@@ -72,6 +82,12 @@ class OooImport(object):
                         self.process_doc()
                     self.close_ooo_file()
         self.close_ooo()
+        self.import_wizard.importProgressBar.setMaximum(1)
+        self.import_wizard.incrementProgressBar(u'', 1)
+        return True
+
+    def stop_import(self):
+        self.abort = True
 
     def start_ooo(self):
         """
@@ -135,6 +151,9 @@ class OooImport(object):
                 "com.sun.star.presentation.PresentationDocument") and not \
                 self.document.supportsService("com.sun.star.text.TextDocument"):
                 self.close_ooo_file()
+            else:
+                self.import_wizard.incrementProgressBar(
+                    u'Processing file ' + filepath, 0)
         except:
             pass
         return   
@@ -161,6 +180,9 @@ class OooImport(object):
         slides = doc.getDrawPages()
         text = u''
         for slide_no in range(slides.getCount()):
+            if self.abort:
+                self.import_wizard.incrementProgressBar(u'Import cancelled', 0)
+                return
             slide = slides.getByIndex(slide_no)   
             slidetext = u''
             for idx in range(slide.getCount()):
diff --git a/openlp/plugins/songs/lib/sofimport.py b/openlp/plugins/songs/lib/sofimport.py
index 54cfd07ac..ab91e1923 100644
--- a/openlp/plugins/songs/lib/sofimport.py
+++ b/openlp/plugins/songs/lib/sofimport.py
@@ -68,19 +68,30 @@ class SofImport(OooImport):
     It attempts to detect italiced verses, and treats these as choruses in
     the verse ordering. Again not perfect, but a start.
     """
-    def __init__(self, songmanager):
+    def __init__(self, master_manager, **kwargs):
         """
         Initialise the class. Requires a songmanager class which is passed
         to SongImport for writing song to disk
         """
-        OooImport.__init__(self, songmanager)
+        OooImport.__init__(self, master_manager, **kwargs)
 
-    def import_sof(self, filename):
+    def do_import(self):
+        self.abort = False
         self.start_ooo()
-        self.open_ooo_file(filename)
-        self.process_sof_file()
-        self.close_ooo_file()
+        for filename in self.filenames:
+            if self.abort:
+                self.import_wizard.incrementProgressBar(u'Import cancelled', 0)
+                return
+            filename = unicode(filename)
+            if os.path.isfile(filename):
+                self.open_ooo_file(filename)
+                if self.document:
+                    self.process_sof_file()
+                    self.close_ooo_file()
         self.close_ooo()
+        self.import_wizard.importProgressBar.setMaximum(1)
+        self.import_wizard.incrementProgressBar(u'', 1)
+        return True
 
     def process_sof_file(self):
         """
@@ -90,6 +101,9 @@ class SofImport(OooImport):
         self.new_song()
         paragraphs = self.document.getText().createEnumeration()
         while paragraphs.hasMoreElements():
+            if self.abort:
+                self.import_wizard.incrementProgressBar(u'Import cancelled', 0)
+                return
             paragraph = paragraphs.nextElement()
             if paragraph.supportsService("com.sun.star.text.Paragraph"):
                 self.process_paragraph(paragraph)
@@ -244,6 +258,7 @@ class SofImport(OooImport):
         if title.endswith(u','):
             title = title[:-1]
         self.song.title = title
+        self.import_wizard.incrementProgressBar(u'Processing song ' + title, 0)
 
     def add_author(self, text):
         """
diff --git a/openlp/plugins/songs/lib/songimport.py b/openlp/plugins/songs/lib/songimport.py
index bf5079c8c..17000a2ba 100644
--- a/openlp/plugins/songs/lib/songimport.py
+++ b/openlp/plugins/songs/lib/songimport.py
@@ -129,13 +129,13 @@ class SongImport(QtCore.QObject):
 
     def process_verse_text(self, text):
         lines = text.split(u'\n')
-        if text.lower().find(COPYRIGHT_STRING) >= 0 \
-            or text.lower().find(COPYRIGHT_SYMBOL) >= 0:
+        if text.lower().find(self.copyright_string) >= 0 \
+            or text.lower().find(self.copyright_symbol) >= 0:
             copyright_found = False
             for line in lines:
                 if (copyright_found or
-                    line.lower().find(COPYRIGHT_STRING) >= 0 or
-                    line.lower().find(COPYRIGHT_SYMBOL) >= 0):
+                    line.lower().find(self.copyright_string) >= 0 or
+                    line.lower().find(self.copyright_symbol) >= 0):
                     copyright_found = True
                     self.add_copyright(line)
                 else:
@@ -300,7 +300,7 @@ class SongImport(QtCore.QObject):
                 topic = Topic.populate(name=topictext)
             song.topics.append(topic)
         self.manager.save_object(song)
-        self.setDefaults()
+        self.set_defaults()
 
     def print_song(self):
         """