diff --git a/.bzrignore b/.bzrignore
index 2620fea42..1d2bb8267 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -20,3 +20,4 @@ _eric4project
 openlp/core/resources.py.old
 *.qm
 resources/windows/warnOpenLP.txt
+openlp.cfg
diff --git a/openlp.pyw b/openlp.pyw
index a39f6cf65..fe96ebd23 100755
--- a/openlp.pyw
+++ b/openlp.pyw
@@ -79,6 +79,8 @@ class OpenLP(QtGui.QApplication):
     class in order to provide the core of the application.
     """
 
+    args = []
+
     def exec_(self):
         """
         Override exec method to allow the shared memory to be released on exit
@@ -92,7 +94,7 @@ class OpenLP(QtGui.QApplication):
         """
         # On Windows, the args passed into the constructor are
         # ignored. Not very handy, so set the ones we want to use.
-        self.args = args
+        self.args.extend(args)
         # provide a listener for widgets to reqest a screen update.
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'openlp_process_events'), self.processEvents)
@@ -180,6 +182,18 @@ class OpenLP(QtGui.QApplication):
         """
         self.restoreOverrideCursor()
 
+    def event(self, event):
+        """
+        Enables direct file opening on OS X
+        """
+        if event.type() == QtCore.QEvent.FileOpen:
+            file_name = event.file()
+            log.debug(u'Got open file event for %s!', file_name)
+            self.args.insert(0, unicode(file_name))
+            return True
+        else:
+            return QtGui.QApplication.event(self, event)
+
 def main():
     """
     The main function which parses command line options and then runs
diff --git a/openlp/core/lib/__init__.py b/openlp/core/lib/__init__.py
index 7fbd5243c..620d5dafd 100644
--- a/openlp/core/lib/__init__.py
+++ b/openlp/core/lib/__init__.py
@@ -205,7 +205,7 @@ def clean_tags(text):
     text = text.replace(u'<br>', u'\n')
     text = text.replace(u'{br}', u'\n')
     text = text.replace(u'&nbsp;', u' ')
-    for tag in DisplayTags.get_html_tags():
+    for tag in FormattingTags.get_html_tags():
         text = text.replace(tag[u'start tag'], u'')
         text = text.replace(tag[u'end tag'], u'')
     return text
@@ -214,7 +214,7 @@ def expand_tags(text):
     """
     Expand tags HTML for display
     """
-    for tag in DisplayTags.get_html_tags():
+    for tag in FormattingTags.get_html_tags():
         text = text.replace(tag[u'start tag'], tag[u'start html'])
         text = text.replace(tag[u'end tag'], tag[u'end html'])
     return text
@@ -234,7 +234,7 @@ def check_directory_exists(dir):
         pass
 
 from listwidgetwithdnd import ListWidgetWithDnD
-from displaytags import DisplayTags
+from formattingtags import FormattingTags
 from eventreceiver import Receiver
 from spelltextedit import SpellTextEdit
 from settingsmanager import SettingsManager
diff --git a/openlp/core/lib/displaytags.py b/openlp/core/lib/formattingtags.py
similarity index 76%
rename from openlp/core/lib/displaytags.py
rename to openlp/core/lib/formattingtags.py
index 95ce13bda..ae9d5c1cf 100644
--- a/openlp/core/lib/displaytags.py
+++ b/openlp/core/lib/formattingtags.py
@@ -25,12 +25,12 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 """
-Provide Html Tag management and Display Tag access class
+Provide HTML Tag management and Formatting Tag access class
 """
 
 from openlp.core.lib import translate
 
-class DisplayTags(object):
+class FormattingTags(object):
     """
     Static Class to HTML Tags to be access around the code the list is managed
     by the Options Tab.
@@ -42,89 +42,93 @@ class DisplayTags(object):
         """
         Provide access to the html_expands list.
         """
-        return DisplayTags.html_expands
+        return FormattingTags.html_expands
 
     @staticmethod
     def reset_html_tags():
         """
         Resets the html_expands list.
         """
-        DisplayTags.html_expands = []
+        FormattingTags.html_expands = []
         base_tags = []
         # Append the base tags.
         # Hex Color tags from http://www.w3schools.com/html/html_colornames.asp
-        base_tags.append({u'desc': translate('OpenLP.DisplayTags', 'Red'),
+        base_tags.append({u'desc': translate('OpenLP.FormattingTags', 'Red'),
             u'start tag': u'{r}',
             u'start html': u'<span style="-webkit-text-fill-color:red">',
             u'end tag': u'{/r}', u'end html': u'</span>', u'protected': True})
-        base_tags.append({u'desc':  translate('OpenLP.DisplayTags', 'Black'),
+        base_tags.append({u'desc':  translate('OpenLP.FormattingTags', 'Black'),
             u'start tag': u'{b}',
             u'start html': u'<span style="-webkit-text-fill-color:black">',
             u'end tag': u'{/b}', u'end html': u'</span>', u'protected': True})
-        base_tags.append({u'desc': translate('OpenLP.DisplayTags', 'Blue'),
+        base_tags.append({u'desc': translate('OpenLP.FormattingTags', 'Blue'),
             u'start tag': u'{bl}',
             u'start html': u'<span style="-webkit-text-fill-color:blue">',
             u'end tag': u'{/bl}', u'end html': u'</span>', u'protected': True})
-        base_tags.append({u'desc': translate('OpenLP.DisplayTags', 'Yellow'),
+        base_tags.append({u'desc': translate('OpenLP.FormattingTags', 'Yellow'),
             u'start tag': u'{y}',
             u'start html': u'<span style="-webkit-text-fill-color:yellow">',
             u'end tag': u'{/y}', u'end html': u'</span>', u'protected': True})
-        base_tags.append({u'desc': translate('OpenLP.DisplayTags', 'Green'),
+        base_tags.append({u'desc': translate('OpenLP.FormattingTags', 'Green'),
             u'start tag': u'{g}',
             u'start html': u'<span style="-webkit-text-fill-color:green">',
             u'end tag': u'{/g}', u'end html': u'</span>', u'protected': True})
-        base_tags.append({u'desc': translate('OpenLP.DisplayTags', 'Pink'),
+        base_tags.append({u'desc': translate('OpenLP.FormattingTags', 'Pink'),
             u'start tag': u'{pk}',
             u'start html': u'<span style="-webkit-text-fill-color:#FFC0CB">',
             u'end tag': u'{/pk}', u'end html': u'</span>', u'protected': True})
-        base_tags.append({u'desc': translate('OpenLP.DisplayTags', 'Orange'),
+        base_tags.append({u'desc': translate('OpenLP.FormattingTags', 'Orange'),
             u'start tag': u'{o}',
             u'start html': u'<span style="-webkit-text-fill-color:#FFA500">',
             u'end tag': u'{/o}', u'end html': u'</span>', u'protected': True})
-        base_tags.append({u'desc': translate('OpenLP.DisplayTags', 'Purple'),
+        base_tags.append({u'desc': translate('OpenLP.FormattingTags', 'Purple'),
             u'start tag': u'{pp}',
             u'start html': u'<span style="-webkit-text-fill-color:#800080">',
             u'end tag': u'{/pp}', u'end html': u'</span>', u'protected': True})
-        base_tags.append({u'desc': translate('OpenLP.DisplayTags', 'White'),
+        base_tags.append({u'desc': translate('OpenLP.FormattingTags', 'White'),
             u'start tag': u'{w}',
             u'start html': u'<span style="-webkit-text-fill-color:white">',
             u'end tag': u'{/w}', u'end html': u'</span>', u'protected': True})
         base_tags.append({
-            u'desc': translate('OpenLP.DisplayTags', 'Superscript'),
+            u'desc': translate('OpenLP.FormattingTags', 'Superscript'),
             u'start tag': u'{su}', u'start html': u'<sup>',
             u'end tag': u'{/su}', u'end html': u'</sup>', u'protected': True})
-        base_tags.append({u'desc': translate('OpenLP.DisplayTags', 'Subscript'),
+        base_tags.append({
+            u'desc': translate('OpenLP.FormattingTags', 'Subscript'),
             u'start tag': u'{sb}', u'start html': u'<sub>',
             u'end tag': u'{/sb}', u'end html': u'</sub>', u'protected': True})
-        base_tags.append({u'desc': translate('OpenLP.DisplayTags', 'Paragraph'),
+        base_tags.append({
+            u'desc': translate('OpenLP.FormattingTags', 'Paragraph'),
             u'start tag': u'{p}', u'start html': u'<p>', u'end tag': u'{/p}',
             u'end html': u'</p>', u'protected': True})
-        base_tags.append({u'desc': translate('OpenLP.DisplayTags', 'Bold'),
+        base_tags.append({u'desc': translate('OpenLP.FormattingTags', 'Bold'),
             u'start tag': u'{st}', u'start html': u'<strong>',
             u'end tag': u'{/st}', u'end html': u'</strong>',
             u'protected': True})
-        base_tags.append({u'desc': translate('OpenLP.DisplayTags', 'Italics'),
+        base_tags.append({
+            u'desc': translate('OpenLP.FormattingTags', 'Italics'),
             u'start tag': u'{it}', u'start html': u'<em>', u'end tag': u'{/it}',
             u'end html': u'</em>', u'protected': True})
-        base_tags.append({u'desc': translate('OpenLP.DisplayTags', 'Underline'),
+        base_tags.append({
+            u'desc': translate('OpenLP.FormattingTags', 'Underline'),
             u'start tag': u'{u}',
             u'start html': u'<span style="text-decoration: underline;">',
             u'end tag': u'{/u}', u'end html': u'</span>', u'protected': True})
-        base_tags.append({u'desc': translate('OpenLP.DisplayTags', 'Break'),
+        base_tags.append({u'desc': translate('OpenLP.FormattingTags', 'Break'),
             u'start tag': u'{br}', u'start html': u'<br>', u'end tag': u'',
             u'end html': u'', u'protected': True})
-        DisplayTags.add_html_tags(base_tags)
+        FormattingTags.add_html_tags(base_tags)
 
     @staticmethod
     def add_html_tags(tags):
         """
         Add a list of tags to the list
         """
-        DisplayTags.html_expands.extend(tags)
+        FormattingTags.html_expands.extend(tags)
 
     @staticmethod
     def remove_html_tag(tag_id):
         """
         Removes an individual html_expands tag.
         """
-        DisplayTags.html_expands.pop(tag_id)
+        FormattingTags.html_expands.pop(tag_id)
diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index 6537d0ad5..ce7f84778 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -418,7 +418,7 @@ class Renderer(object):
             to the list of slides. (unicode string)
 
         ``previous_raw``
-            The raw text (with display tags) which is know to fit on a slide,
+            The raw text (with formatting tags) which is know to fit on a slide,
             but is not yet added to the list of slides. (unicode string)
 
         ``html_list``
@@ -427,7 +427,7 @@ class Renderer(object):
 
         ``raw_list``
             The elements which do not fit on a slide and needs to be processed
-            using the binary chop. The elements can contain display tags.
+            using the binary chop. The elements can contain formatting tags.
 
         ``separator``
             The separator for the elements. For lines this is ``u'<br>'`` and
diff --git a/openlp/core/lib/spelltextedit.py b/openlp/core/lib/spelltextedit.py
index 0d277b9fe..b0bb61e92 100644
--- a/openlp/core/lib/spelltextedit.py
+++ b/openlp/core/lib/spelltextedit.py
@@ -39,7 +39,7 @@ except ImportError:
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import translate, DisplayTags
+from openlp.core.lib import translate, FormattingTags
 from openlp.core.lib.ui import checkable_action
 
 log = logging.getLogger(__name__)
@@ -114,7 +114,7 @@ class SpellTextEdit(QtGui.QPlainTextEdit):
                     popupMenu.insertMenu(popupMenu.actions()[0], spell_menu)
         tagMenu = QtGui.QMenu(translate('OpenLP.SpellTextEdit',
             'Formatting Tags'))
-        for html in DisplayTags.get_html_tags():
+        for html in FormattingTags.get_html_tags():
             action = SpellAction(html[u'desc'], tagMenu)
             action.correct.connect(self.htmlTag)
             tagMenu.addAction(action)
@@ -148,7 +148,7 @@ class SpellTextEdit(QtGui.QPlainTextEdit):
         """
         Replaces the selected text with word.
         """
-        for html in DisplayTags.get_html_tags():
+        for html in FormattingTags.get_html_tags():
             if tag == html[u'desc']:
                 cursor = self.textCursor()
                 if self.textCursor().hasSelection():
diff --git a/openlp/core/ui/__init__.py b/openlp/core/ui/__init__.py
index 7aebcb1df..e754480e0 100644
--- a/openlp/core/ui/__init__.py
+++ b/openlp/core/ui/__init__.py
@@ -69,7 +69,7 @@ from advancedtab import AdvancedTab
 from aboutform import AboutForm
 from pluginform import PluginForm
 from settingsform import SettingsForm
-from displaytagform import DisplayTagForm
+from formattingtagform import FormattingTagForm
 from shortcutlistform import ShortcutListForm
 from mediadockmanager import MediaDockManager
 from servicemanager import ServiceManager
diff --git a/openlp/core/ui/firsttimeform.py b/openlp/core/ui/firsttimeform.py
index 8ffd87bcf..4beebfde6 100644
--- a/openlp/core/ui/firsttimeform.py
+++ b/openlp/core/ui/firsttimeform.py
@@ -129,6 +129,7 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
                     os.path.join(gettempdir(), u'openlp', screenshot)))
                 item.setCheckState(QtCore.Qt.Unchecked)
                 item.setFlags(item.flags() | QtCore.Qt.ItemIsUserCheckable)
+        Receiver.send_message(u'cursor_normal')
 
     def nextId(self):
         """
@@ -156,10 +157,27 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
                 item = self.themesListWidget.item(iter)
                 if item.checkState() == QtCore.Qt.Checked:
                     self.themeComboBox.addItem(item.text())
+            # Check if this is a re-run of the wizard.
+            self.has_run_wizard = QtCore.QSettings().value(
+                u'general/has run wizard', QtCore.QVariant(False)).toBool()
+            if self.has_run_wizard:
+                # Add any existing themes to list.
+                for theme in self.parent().themeManagerContents.getThemes():
+                    index = self.themeComboBox.findText(theme)
+                    if index == -1:
+                        self.themeComboBox.addItem(theme)
+                default_theme = unicode(QtCore.QSettings().value(
+                    u'themes/global theme',
+                    QtCore.QVariant(u'')).toString())
+                # Pre-select the current default theme.
+                index = self.themeComboBox.findText(default_theme)
+                self.themeComboBox.setCurrentIndex(index)
         elif pageId == FirstTimePage.Progress:
+            Receiver.send_message(u'cursor_busy')
             self._preWizard()
             self._performWizard()
             self._postWizard()
+            Receiver.send_message(u'cursor_normal')
 
     def updateScreenListCombo(self):
         """
@@ -248,11 +266,21 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
         """
         if self.max_progress:
             self.progressBar.setValue(self.progressBar.maximum())
-            self.progressLabel.setText(translate('OpenLP.FirstTimeWizard',
-                'Download complete. Click the finish button to start OpenLP.'))
+            if self.has_run_wizard:
+                self.progressLabel.setText(translate('OpenLP.FirstTimeWizard',
+                    'Download complete.'
+                    ' Click the finish button to return to OpenLP.'))
+            else:
+                self.progressLabel.setText(translate('OpenLP.FirstTimeWizard',
+                    'Download complete.'
+                    ' Click the finish button to start OpenLP.'))
         else:
-            self.progressLabel.setText(translate('OpenLP.FirstTimeWizard',
-                'Click the finish button to start OpenLP.'))
+            if self.has_run_wizard:
+                self.progressLabel.setText(translate('OpenLP.FirstTimeWizard',
+                    'Click the finish button to return to OpenLP.'))
+            else:
+                self.progressLabel.setText(translate('OpenLP.FirstTimeWizard',
+                    'Click the finish button to start OpenLP.'))
         self.finishButton.setVisible(True)
         self.finishButton.setEnabled(True)
         self.cancelButton.setVisible(False)
diff --git a/openlp/core/ui/displaytagdialog.py b/openlp/core/ui/formattingtagdialog.py
similarity index 82%
rename from openlp/core/ui/displaytagdialog.py
rename to openlp/core/ui/formattingtagdialog.py
index 328fcd137..186f4739b 100644
--- a/openlp/core/ui/displaytagdialog.py
+++ b/openlp/core/ui/formattingtagdialog.py
@@ -30,15 +30,15 @@ from PyQt4 import QtCore, QtGui
 from openlp.core.lib import translate
 from openlp.core.lib.ui import UiStrings
 
-class Ui_DisplayTagDialog(object):
+class Ui_FormattingTagDialog(object):
 
-    def setupUi(self, displayTagDialog):
-        displayTagDialog.setObjectName(u'displayTagDialog')
-        displayTagDialog.resize(725, 548)
-        self.listdataGridLayout = QtGui.QGridLayout(displayTagDialog)
+    def setupUi(self, formattingTagDialog):
+        formattingTagDialog.setObjectName(u'formattingTagDialog')
+        formattingTagDialog.resize(725, 548)
+        self.listdataGridLayout = QtGui.QGridLayout(formattingTagDialog)
         self.listdataGridLayout.setMargin(8)
         self.listdataGridLayout.setObjectName(u'listdataGridLayout')
-        self.tagTableWidget = QtGui.QTableWidget(displayTagDialog)
+        self.tagTableWidget = QtGui.QTableWidget(formattingTagDialog)
         self.tagTableWidget.setHorizontalScrollBarPolicy(
             QtCore.Qt.ScrollBarAlwaysOff)
         self.tagTableWidget.setEditTriggers(
@@ -67,11 +67,11 @@ class Ui_DisplayTagDialog(object):
         spacerItem = QtGui.QSpacerItem(40, 20,
             QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
         self.horizontalLayout.addItem(spacerItem)
-        self.deletePushButton = QtGui.QPushButton(displayTagDialog)
+        self.deletePushButton = QtGui.QPushButton(formattingTagDialog)
         self.deletePushButton.setObjectName(u'deletePushButton')
         self.horizontalLayout.addWidget(self.deletePushButton)
         self.listdataGridLayout.addLayout(self.horizontalLayout, 1, 0, 1, 1)
-        self.editGroupBox = QtGui.QGroupBox(displayTagDialog)
+        self.editGroupBox = QtGui.QGroupBox(formattingTagDialog)
         self.editGroupBox.setObjectName(u'editGroupBox')
         self.dataGridLayout = QtGui.QGridLayout(self.editGroupBox)
         self.dataGridLayout.setObjectName(u'dataGridLayout')
@@ -112,38 +112,38 @@ class Ui_DisplayTagDialog(object):
         self.savePushButton.setObjectName(u'savePushButton')
         self.dataGridLayout.addWidget(self.savePushButton, 4, 2, 1, 1)
         self.listdataGridLayout.addWidget(self.editGroupBox, 2, 0, 1, 1)
-        self.buttonBox = QtGui.QDialogButtonBox(displayTagDialog)
-        self.buttonBox.setObjectName('displayTagDialogButtonBox')
+        self.buttonBox = QtGui.QDialogButtonBox(formattingTagDialog)
+        self.buttonBox.setObjectName('formattingTagDialogButtonBox')
         self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Close)
         self.listdataGridLayout.addWidget(self.buttonBox, 3, 0, 1, 1)
 
-        self.retranslateUi(displayTagDialog)
-        QtCore.QMetaObject.connectSlotsByName(displayTagDialog)
+        self.retranslateUi(formattingTagDialog)
+        QtCore.QMetaObject.connectSlotsByName(formattingTagDialog)
 
-    def retranslateUi(self, displayTagDialog):
-        displayTagDialog.setWindowTitle(translate('OpenLP.displayTagDialog',
-            'Configure Display Tags'))
+    def retranslateUi(self, formattingTagDialog):
+        formattingTagDialog.setWindowTitle(translate(
+            'OpenLP.FormattingTagDialog', 'Configure Formatting Tags'))
         self.editGroupBox.setTitle(
-            translate('OpenLP.DisplayTagDialog', 'Edit Selection'))
+            translate('OpenLP.FormattingTagDialog', 'Edit Selection'))
         self.savePushButton.setText(
-            translate('OpenLP.DisplayTagDialog', 'Save'))
+            translate('OpenLP.FormattingTagDialog', 'Save'))
         self.descriptionLabel.setText(
-            translate('OpenLP.DisplayTagDialog', 'Description'))
-        self.tagLabel.setText(translate('OpenLP.DisplayTagDialog', 'Tag'))
+            translate('OpenLP.FormattingTagDialog', 'Description'))
+        self.tagLabel.setText(translate('OpenLP.FormattingTagDialog', 'Tag'))
         self.startTagLabel.setText(
-            translate('OpenLP.DisplayTagDialog', 'Start tag'))
+            translate('OpenLP.FormattingTagDialog', 'Start tag'))
         self.endTagLabel.setText(
-            translate('OpenLP.DisplayTagDialog', 'End tag'))
+            translate('OpenLP.FormattingTagDialog', 'End tag'))
         self.deletePushButton.setText(UiStrings().Delete)
         self.newPushButton.setText(UiStrings().New)
         self.tagTableWidget.horizontalHeaderItem(0).setText(
-            translate('OpenLP.DisplayTagDialog', 'Description'))
+            translate('OpenLP.FormattingTagDialog', 'Description'))
         self.tagTableWidget.horizontalHeaderItem(1).setText(
-            translate('OpenLP.DisplayTagDialog', 'Tag Id'))
+            translate('OpenLP.FormattingTagDialog', 'Tag Id'))
         self.tagTableWidget.horizontalHeaderItem(2).setText(
-            translate('OpenLP.DisplayTagDialog', 'Start HTML'))
+            translate('OpenLP.FormattingTagDialog', 'Start HTML'))
         self.tagTableWidget.horizontalHeaderItem(3).setText(
-            translate('OpenLP.DisplayTagDialog', 'End HTML'))
+            translate('OpenLP.FormattingTagDialog', 'End HTML'))
         self.tagTableWidget.setColumnWidth(0, 120)
         self.tagTableWidget.setColumnWidth(1, 80)
         self.tagTableWidget.setColumnWidth(2, 330)
diff --git a/openlp/core/ui/displaytagform.py b/openlp/core/ui/formattingtagform.py
similarity index 82%
rename from openlp/core/ui/displaytagform.py
rename to openlp/core/ui/formattingtagform.py
index 22ac38f06..2a8625b1a 100644
--- a/openlp/core/ui/displaytagform.py
+++ b/openlp/core/ui/formattingtagform.py
@@ -25,22 +25,22 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 """
-The :mod:`DisplayTagTab` provides an Tag Edit facility.  The Base set are
-protected and included each time loaded.  Custom tags can be defined and saved.
-The Custom Tag arrays are saved in a pickle so QSettings works on them.  Base
+The :mod:`formattingtagform` provides an Tag Edit facility. The Base set are
+protected and included each time loaded. Custom tags can be defined and saved.
+The Custom Tag arrays are saved in a pickle so QSettings works on them. Base
 Tags cannot be changed.
 """
 import cPickle
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import translate, DisplayTags
+from openlp.core.lib import translate, FormattingTags
 from openlp.core.lib.ui import critical_error_message_box
-from openlp.core.ui.displaytagdialog import Ui_DisplayTagDialog
+from openlp.core.ui.formattingtagdialog import Ui_FormattingTagDialog
 
-class DisplayTagForm(QtGui.QDialog, Ui_DisplayTagDialog):
+class FormattingTagForm(QtGui.QDialog, Ui_FormattingTagDialog):
     """
-    The :class:`DisplayTagTab` manages the settings tab .
+    The :class:`FormattingTagForm` manages the settings tab .
     """
     def __init__(self, parent):
         """
@@ -48,7 +48,7 @@ class DisplayTagForm(QtGui.QDialog, Ui_DisplayTagDialog):
         """
         QtGui.QDialog.__init__(self, parent)
         self.setupUi(self)
-        self._loadDisplayTags()
+        self._loadFormattingTags()
         QtCore.QObject.connect(self.tagTableWidget,
             QtCore.SIGNAL(u'clicked(QModelIndex)'), self.onRowSelected)
         QtCore.QObject.connect(self.newPushButton,
@@ -65,19 +65,20 @@ class DisplayTagForm(QtGui.QDialog, Ui_DisplayTagDialog):
         Load Display and set field state.
         """
         # Create initial copy from master
-        self._loadDisplayTags()
+        self._loadFormattingTags()
         self._resetTable()
         self.selected = -1
         return QtGui.QDialog.exec_(self)
 
-    def _loadDisplayTags(self):
+    def _loadFormattingTags(self):
         """
         Load the Tags from store so can be used in the system or used to
         update the display. If Cancel was selected this is needed to reset the
         dsiplay to the correct version.
         """
         # Initial Load of the Tags
-        DisplayTags.reset_html_tags()
+        FormattingTags.reset_html_tags()
+        # Formatting Tags were also known as display tags.
         user_expands = QtCore.QSettings().value(u'displayTags/html_tags',
             QtCore.QVariant(u'')).toString()
         # cPickle only accepts str not unicode strings
@@ -85,14 +86,14 @@ class DisplayTagForm(QtGui.QDialog, Ui_DisplayTagDialog):
         if user_expands_string:
             user_tags = cPickle.loads(user_expands_string)
             # If we have some user ones added them as well
-            DisplayTags.add_html_tags(user_tags)
+            FormattingTags.add_html_tags(user_tags)
 
     def onRowSelected(self):
         """
         Table Row selected so display items and set field state.
         """
         row = self.tagTableWidget.currentRow()
-        html = DisplayTags.get_html_tags()[row]
+        html = FormattingTags.get_html_tags()[row]
         self.selected = row
         self.descriptionLineEdit.setText(html[u'desc'])
         self.tagLineEdit.setText(self._strip(html[u'start tag']))
@@ -117,23 +118,23 @@ class DisplayTagForm(QtGui.QDialog, Ui_DisplayTagDialog):
         """
         Add a new tag to list only if it is not a duplicate.
         """
-        for html in DisplayTags.get_html_tags():
+        for html in FormattingTags.get_html_tags():
             if self._strip(html[u'start tag']) == u'n':
                 critical_error_message_box(
-                    translate('OpenLP.DisplayTagTab', 'Update Error'),
-                    translate('OpenLP.DisplayTagTab',
+                    translate('OpenLP.FormattingTagForm', 'Update Error'),
+                    translate('OpenLP.FormattingTagForm',
                     'Tag "n" already defined.'))
                 return
         # Add new tag to list
         tag = {
-            u'desc': translate('OpenLP.DisplayTagTab', 'New Tag'),
+            u'desc': translate('OpenLP.FormattingTagForm', 'New Tag'),
             u'start tag': u'{n}',
-            u'start html': translate('OpenLP.DisplayTagTab', '<HTML here>'),
+            u'start html': translate('OpenLP.FormattingTagForm', '<HTML here>'),
             u'end tag': u'{/n}',
-            u'end html': translate('OpenLP.DisplayTagTab', '</and here>'),
+            u'end html': translate('OpenLP.FormattingTagForm', '</and here>'),
             u'protected': False
         }
-        DisplayTags.add_html_tags([tag])
+        FormattingTags.add_html_tags([tag])
         self._resetTable()
         # Highlight new row
         self.tagTableWidget.selectRow(self.tagTableWidget.rowCount() - 1)
@@ -145,7 +146,7 @@ class DisplayTagForm(QtGui.QDialog, Ui_DisplayTagDialog):
         Delete selected custom tag.
         """
         if self.selected != -1:
-            DisplayTags.remove_html_tag(self.selected)
+            FormattingTags.remove_html_tag(self.selected)
             self.selected = -1
         self._resetTable()
         self._saveTable()
@@ -154,7 +155,7 @@ class DisplayTagForm(QtGui.QDialog, Ui_DisplayTagDialog):
         """
         Update Custom Tag details if not duplicate and save the data.
         """
-        html_expands = DisplayTags.get_html_tags()
+        html_expands = FormattingTags.get_html_tags()
         if self.selected != -1:
             html = html_expands[self.selected]
             tag = unicode(self.tagLineEdit.text())
@@ -162,8 +163,8 @@ class DisplayTagForm(QtGui.QDialog, Ui_DisplayTagDialog):
                 if self._strip(html1[u'start tag']) == tag and \
                     linenumber != self.selected:
                     critical_error_message_box(
-                        translate('OpenLP.DisplayTagTab', 'Update Error'),
-                        unicode(translate('OpenLP.DisplayTagTab',
+                        translate('OpenLP.FormattingTagForm', 'Update Error'),
+                        unicode(translate('OpenLP.FormattingTagForm',
                         'Tag %s already defined.')) % tag)
                     return
             html[u'desc'] = unicode(self.descriptionLineEdit.text())
@@ -177,18 +178,15 @@ class DisplayTagForm(QtGui.QDialog, Ui_DisplayTagDialog):
 
     def _saveTable(self):
         """
-        Saves all display tags except protected ones.
+        Saves all formatting tags except protected ones.
         """
         tags = []
-        for tag in DisplayTags.get_html_tags():
+        for tag in FormattingTags.get_html_tags():
             if not tag[u'protected']:
                 tags.append(tag)
-        if tags:
-            QtCore.QSettings().setValue(u'displayTags/html_tags',
-                QtCore.QVariant(cPickle.dumps(tags)))
-        else:
-            QtCore.QSettings().setValue(u'displayTags/html_tags',
-                QtCore.QVariant(u''))
+        # Formatting Tags were also known as display tags.
+        QtCore.QSettings().setValue(u'displayTags/html_tags',
+            QtCore.QVariant(cPickle.dumps(tags) if tags else u''))
 
     def _resetTable(self):
         """
@@ -199,7 +197,7 @@ class DisplayTagForm(QtGui.QDialog, Ui_DisplayTagDialog):
         self.newPushButton.setEnabled(True)
         self.savePushButton.setEnabled(False)
         self.deletePushButton.setEnabled(False)
-        for linenumber, html in enumerate(DisplayTags.get_html_tags()):
+        for linenumber, html in enumerate(FormattingTags.get_html_tags()):
             self.tagTableWidget.setRowCount(
                 self.tagTableWidget.rowCount() + 1)
             self.tagTableWidget.setItem(linenumber, 0,
diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index c88508672..c7ff6c52a 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -33,15 +33,17 @@ from tempfile import gettempdir
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import Renderer, build_icon, OpenLPDockWidget, \
-    PluginManager, Receiver, translate, ImageManager
+    PluginManager, Receiver, translate, ImageManager,  PluginStatus
 from openlp.core.lib.ui import UiStrings, base_action, checkable_action, \
     icon_action, shortcut_action
 from openlp.core.ui import AboutForm, SettingsForm, ServiceManager, \
     ThemeManager, SlideController, PluginForm, MediaDockManager, \
-    ShortcutListForm, DisplayTagForm
+    ShortcutListForm, FormattingTagForm
 from openlp.core.utils import AppLocation, add_actions, LanguageManager, \
     get_application_version, delete_file
 from openlp.core.utils.actions import ActionList, CategoryOrder
+from openlp.core.ui.firsttimeform import FirstTimeForm
+from openlp.core.ui import ScreenList
 
 log = logging.getLogger(__name__)
 
@@ -244,6 +246,9 @@ class Ui_MainWindow(object):
         self.toolsOpenDataFolder = icon_action(mainWindow,
             u'toolsOpenDataFolder', u':/general/general_open.png',
             category=UiStrings().Tools)
+        self.toolsFirstTimeWizard = icon_action(mainWindow,
+            u'toolsFirstTimeWizard', u':/general/general_revert.png',
+            category=UiStrings().Tools)
         self.updateThemeImages = base_action(mainWindow,
             u'updateThemeImages', category=UiStrings().Tools)
         action_list.add_category(UiStrings().Settings,
@@ -269,7 +274,8 @@ class Ui_MainWindow(object):
             u'settingsShortcutsItem',
             u':/system/system_configure_shortcuts.png',
             category=UiStrings().Settings)
-        self.displayTagItem = icon_action(mainWindow,
+        # Formatting Tags were also known as display tags.
+        self.formattingTagItem = icon_action(mainWindow,
             u'displayTagItem', u':/system/tag_editor.png',
             category=UiStrings().Settings)
         self.settingsConfigureItem = icon_action(mainWindow,
@@ -315,14 +321,15 @@ class Ui_MainWindow(object):
             add_actions(self.settingsMenu, (self.settingsPluginListItem,
                 self.settingsLanguageMenu.menuAction(), None,
                 self.settingsConfigureItem, self.settingsShortcutsItem,
-                self.displayTagItem))
+                self.formattingTagItem))
         else:
             add_actions(self.settingsMenu, (self.settingsPluginListItem,
                 self.settingsLanguageMenu.menuAction(), None,
-                self.displayTagItem, self.settingsShortcutsItem,
+                self.formattingTagItem, self.settingsShortcutsItem,
                 self.settingsConfigureItem))
         add_actions(self.toolsMenu, (self.toolsAddToolItem, None))
         add_actions(self.toolsMenu, (self.toolsOpenDataFolder, None))
+        add_actions(self.toolsMenu, (self.toolsFirstTimeWizard, None))
         add_actions(self.toolsMenu, [self.updateThemeImages])
         if os.name == u'nt':
             add_actions(self.helpMenu, (self.offlineHelpItem,
@@ -403,8 +410,8 @@ class Ui_MainWindow(object):
             translate('OpenLP.MainWindow', '&Language'))
         self.settingsShortcutsItem.setText(
             translate('OpenLP.MainWindow', 'Configure &Shortcuts...'))
-        self.displayTagItem.setText(
-            translate('OpenLP.MainWindow', '&Configure Display Tags'))
+        self.formattingTagItem.setText(
+            translate('OpenLP.MainWindow', '&Configure Formatting Tags...'))
         self.settingsConfigureItem.setText(
             translate('OpenLP.MainWindow', '&Configure OpenLP...'))
         self.viewMediaManagerItem.setText(
@@ -471,6 +478,10 @@ class Ui_MainWindow(object):
             translate('OpenLP.MainWindow', 'Open &Data Folder...'))
         self.toolsOpenDataFolder.setStatusTip(translate('OpenLP.MainWindow',
             'Open the folder where songs, bibles and other data resides.'))
+        self.toolsFirstTimeWizard.setText(
+            translate('OpenLP.MainWindow', 'Re-run First Time Wizard'))
+        self.toolsFirstTimeWizard.setStatusTip(translate('OpenLP.MainWindow',
+            'Re-run the First Time Wizard, importing songs, Bibles and themes.'))
         self.updateThemeImages.setText(
             translate('OpenLP.MainWindow', 'Update Theme Images'))
         self.updateThemeImages.setStatusTip(
@@ -511,7 +522,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         self.serviceNotSaved = False
         self.aboutForm = AboutForm(self)
         self.settingsForm = SettingsForm(self, self)
-        self.displayTagForm = DisplayTagForm(self)
+        self.formattingTagForm = FormattingTagForm(self)
         self.shortcutForm = ShortcutListForm(self)
         self.recentFiles = QtCore.QStringList()
         # Set up the path with plugins
@@ -546,10 +557,12 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
             QtCore.SIGNAL(u'triggered()'), self.onHelpWebSiteClicked)
         QtCore.QObject.connect(self.toolsOpenDataFolder,
             QtCore.SIGNAL(u'triggered()'), self.onToolsOpenDataFolderClicked)
+        QtCore.QObject.connect(self.toolsFirstTimeWizard,
+            QtCore.SIGNAL(u'triggered()'), self.onFirstTimeWizardClicked)
         QtCore.QObject.connect(self.updateThemeImages,
             QtCore.SIGNAL(u'triggered()'), self.onUpdateThemeImages)
-        QtCore.QObject.connect(self.displayTagItem,
-            QtCore.SIGNAL(u'triggered()'), self.onDisplayTagItemClicked)
+        QtCore.QObject.connect(self.formattingTagItem,
+            QtCore.SIGNAL(u'triggered()'), self.onFormattingTagItemClicked)
         QtCore.QObject.connect(self.settingsConfigureItem,
             QtCore.SIGNAL(u'triggered()'), self.onSettingsConfigureItemClicked)
         QtCore.QObject.connect(self.settingsShortcutsItem,
@@ -714,6 +727,45 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
             delete_file(os.path.join(temp_dir, filename))
         os.removedirs(temp_dir)
 
+    def onFirstTimeWizardClicked(self):
+        """
+        Re-run the first time wizard.  Prompts the user for run confirmation
+        If wizard is run, songs, bibles and themes are imported.  The default
+        theme is changed (if necessary).  The plugins in pluginmanager are
+        set active/in-active to match the selection in the wizard.
+        """
+        answer = QtGui.QMessageBox.warning(self,
+            translate('OpenLP.MainWindow', 'Re-run First Time Wizard?'),
+            translate('OpenLP.MainWindow',
+            'Are you sure you want to re-run the First Time Wizard?\n\n'
+            'Re-running this wizard may make changes to your current '
+            'OpenLP configuration and possibly add songs to your '
+            'existing songs list and change your default theme.'),
+            QtGui.QMessageBox.StandardButtons(
+            QtGui.QMessageBox.Yes |
+            QtGui.QMessageBox.No),
+            QtGui.QMessageBox.No)
+        if answer == QtGui.QMessageBox.No:
+            return
+        Receiver.send_message(u'cursor_busy')
+        screens = ScreenList.get_instance()
+        if FirstTimeForm(screens, self).exec_() == QtGui.QDialog.Accepted:
+            self.firstTime()
+            for plugin in self.pluginManager.plugins:
+                self.activePlugin = plugin
+                oldStatus = self.activePlugin.status
+                self.activePlugin.setStatus()
+                if oldStatus != self.activePlugin.status:
+                    if self.activePlugin.status == PluginStatus.Active:
+                        self.activePlugin.toggleStatus(PluginStatus.Active)
+                        self.activePlugin.appStartup()
+                    else:
+                        self.activePlugin.toggleStatus(PluginStatus.Inactive)
+            self.themeManagerContents.configUpdated()
+            self.themeManagerContents.loadThemes(True)
+            Receiver.send_message(u'theme_update_global',
+                self.themeManagerContents.global_theme)
+
     def blankCheck(self):
         """
         Check and display message if screen blank on setup.
@@ -788,11 +840,11 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         """
         self.themeManagerContents.updatePreviewImages()
 
-    def onDisplayTagItemClicked(self):
+    def onFormattingTagItemClicked(self):
         """
         Show the Settings dialog
         """
-        self.displayTagForm.exec_()
+        self.formattingTagForm.exec_()
 
     def onSettingsConfigureItemClicked(self):
         """
diff --git a/openlp/core/ui/shortcutlistdialog.py b/openlp/core/ui/shortcutlistdialog.py
index 6d877358f..a9b9b22cf 100644
--- a/openlp/core/ui/shortcutlistdialog.py
+++ b/openlp/core/ui/shortcutlistdialog.py
@@ -123,7 +123,7 @@ class Ui_ShortcutListDialog(object):
 
     def retranslateUi(self, shortcutListDialog):
         shortcutListDialog.setWindowTitle(
-            translate('OpenLP.ShortcutListDialog', 'Customize Shortcuts'))
+            translate('OpenLP.ShortcutListDialog', 'Configure Shortcuts'))
         self.descriptionLabel.setText(translate('OpenLP.ShortcutListDialog',
             'Select an action and click one of the buttons below to start '
             'capturing a new primary or alternate shortcut, respectively.'))
diff --git a/resources/osx/Info.plist.master b/resources/osx/Info.plist.master
index 45aab92a5..5fc3aa48f 100755
--- a/resources/osx/Info.plist.master
+++ b/resources/osx/Info.plist.master
@@ -2,6 +2,99 @@
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+
+        <key>CFBundleDocumentTypes</key>
+        <array>
+                <dict>
+                        <key>CFBundleTypeExtension</key>
+                        <array>
+                                <string>osz</string>
+                        </array>
+                        <key>CFBundleTypeIconFiles</key>
+                        <array>
+                                <string>openlp-logo-with-text.icns</string>
+                        </array>
+                        <key>CFBundleTypeName</key>
+                        <string>OpenLP Service</string>
+                        <key>CFBundleTypeRole</key>
+                        <string>Viewer</string>
+                        <key>LSHandlerRank</key>
+                        <string>Owner</string>
+                        <key>LSItemContentTypes</key>
+                        <array>
+                                <string>org.openlp.osz</string>
+                        </array>
+                </dict>
+                <dict>
+                        <key>CFBundleTypeExtension</key>
+                        <array>
+                                <string>otz</string>
+                        </array>
+                        <key>CFBundleTypeIconFiles</key>
+                        <array>
+                                <string>openlp-logo-with-text.icns</string>
+                        </array>
+                        <key>CFBundleTypeName</key>
+                        <string>OpenLP Theme</string>
+                        <key>CFBundleTypeRole</key>
+                        <string>Viewer</string>
+                        <key>LSHandlerRank</key>
+                        <string>Owner</string>
+                        <key>LSItemContentTypes</key>
+                        <array>
+                                <string>org.openlp.otz</string>
+                        </array>
+                </dict>
+        </array>
+
+        <key>UTExportedTypeDeclarations</key>
+        <array>
+                <dict>
+                        <key>UTTypeIdentifier</key>
+                        <string>org.openlp.osz</string>
+                        <key>UTTypeDescription</key>
+                        <string>OpenLP Service</string>
+                        <key>UTTypeConformsTo</key>
+                        <array>
+                                <string>public.data</string>
+                                <string>public.content</string>
+                        </array>
+                        <key>UTTypeTagSpecification</key>
+                        <dict>
+                                <key>public.filename-extension</key>
+                                <array>
+                                        <string>osz</string>
+                                </array>
+                                <key>public.mime-type</key>
+                                <array>
+                                        <string>application/x-openlp-service</string>
+                                </array>
+                        </dict>
+                </dict>
+                <dict>
+                        <key>UTTypeIdentifier</key>
+                        <string>org.openlp.otz</string>
+                        <key>UTTypeDescription</key>
+                        <string>OpenLP Theme</string>
+                        <key>UTTypeConformsTo</key>
+                        <array>
+                                <string>public.data</string>
+                                <string>public.content</string>
+                        </array>
+                        <key>UTTypeTagSpecification</key>
+                        <dict>
+                                <key>public.filename-extension</key>
+                                <array>
+                                        <string>otz</string>
+                                </array>
+                                <key>public.mime-type</key>
+                                <array>
+                                        <string>application/x-openlp-theme</string>
+                                </array>
+                        </dict>
+                </dict>
+        </array>
+
 <key>CFBundleIdentifier</key>
 <string>org.openlp</string>
 <key>CFBundleShortVersionString</key>
diff --git a/resources/osx/applescript-adjustview-10-5.master b/resources/osx/applescript-adjustview-10-5.master
index abc0e5a8d..19be239d0 100755
--- a/resources/osx/applescript-adjustview-10-5.master
+++ b/resources/osx/applescript-adjustview-10-5.master
@@ -48,7 +48,7 @@ on run
 			set theViewOptions to the icon view options of container window
 			set arrangement of theViewOptions to not arranged
 			set icon size of theViewOptions to 128
-			set background picture of theViewOptions to file ".installer-background.png"
+			set background picture of theViewOptions to file ".background:installer-background.png"
                         if not exists file "Applications" then
 			    make new alias file at container window to POSIX file "/Applications" with properties {name:"Applications"}
                         end if
diff --git a/resources/osx/applescript-adjustview-10-6.master b/resources/osx/applescript-adjustview-10-6.master
index 2b5a0c000..170842564 100755
--- a/resources/osx/applescript-adjustview-10-6.master
+++ b/resources/osx/applescript-adjustview-10-6.master
@@ -49,15 +49,19 @@ on run
 			set theViewOptions to the icon view options of container window
 			set arrangement of theViewOptions to not arranged
 			set icon size of theViewOptions to 128
-			set background picture of theViewOptions to file ".installer-background.png"
-			make new alias file at container window to POSIX file "/Applications" with properties {name:"Applications"}
-			delay 5
+			set background picture of theViewOptions to file ".background:installer-background.png"
+                        if not exists file "Applications" then
+			    make new alias file at container window to POSIX file "/Applications" with properties {name:"Applications"}
+                        end if
+			delay 1
 			set position of item "%s" of container window to {160, 200}
 			set position of item ".Trashes" of container window to {100, 500}
-			set position of item ".installer-background.png" of container window to {200, 500}
+			set position of item ".background" of container window to {200, 500}
 			set position of item ".DS_Store" of container window to {400, 500}
 			set position of item "Applications" of container window to {550, 200}
-			set position of item ".VolumeIcon.icns" of container window to {500, 500}
+                        if exists file ".VolumeIcon.icns" then
+			    set position of item ".VolumeIcon.icns" of container window to {500, 500}
+                        end if
 			set position of item ".fseventsd" of container window to {300, 500}
 			if exists POSIX file ".SymAVx86QSFile" then
 				set position of item ".SymAVx86QSFile" of container window to {600, 500}
diff --git a/resources/osx/build.py b/resources/osx/build.py
index ff7f6bdfd..38e56e42a 100644
--- a/resources/osx/build.py
+++ b/resources/osx/build.py
@@ -93,8 +93,12 @@ script_name = "build"
 def build_application(settings, app_name_lower, app_dir):
     logging.info('[%s] now building the app with pyinstaller at "%s"...',
         script_name, settings['pyinstaller_basedir'])
-    result = os.system('python %s/pyinstaller.py openlp.spec' \
-              % settings['pyinstaller_basedir'])
+    full_python_dir = os.path.join('/opt/local/Library/Frameworks',
+        'Python.framework/Versions/2.6/Resources/',
+        'Python.app/Contents/MacOS/Python')
+    result = os.system('arch -i386 %s %s/pyinstaller.py openlp.spec' \
+              % ( full_python_dir,
+                settings['pyinstaller_basedir']) )
     if (result != 0):
         logging.error('[%s] The pyinstaller build reported an error, cannot \
             continue!', script_name)
@@ -219,10 +223,10 @@ def create_dmg(settings):
         sys.exit(1)
 
     logging.info('[%s] copying the background image...', script_name)
-    # os.mkdir(volume_basedir + '/.background')
+    os.mkdir(volume_basedir + '/.background')
     result = os.system('CpMac %s %s'
         % (settings['installer_backgroundimage_file'],
-           volume_basedir + '/.installer-background.png'))
+           volume_basedir + '/.background/installer-background.png'))
     if (result != 0):
         logging.error('[%s] could not copy the background image, dmg creation\
             failed!', script_name)
diff --git a/resources/osx/openlp-logo-with-text.icns b/resources/osx/openlp-logo-with-text.icns
old mode 100755
new mode 100644
diff --git a/resources/osx/openlp.cfg b/resources/osx/openlp.cfg.sample
similarity index 81%
rename from resources/osx/openlp.cfg
rename to resources/osx/openlp.cfg.sample
index 3be085dc0..f72a8fca1 100755
--- a/resources/osx/openlp.cfg
+++ b/resources/osx/openlp.cfg.sample
@@ -1,8 +1,8 @@
 [openlp]
 openlp_appname = OpenLP
-openlp_dmgname = OpenLP-1.9.4-bzrXXXX
+openlp_dmgname = OpenLP-1.9.6-bzrXXXX
 openlp_version = XXXX
-openlp_basedir = /Users/openlp/trunk
+openlp_basedir = /Users/openlp/repo/trunk
 openlp_icon_file = openlp-logo-with-text.icns
 openlp_dmg_icon_file = openlp-logo-420x420.png
 installer_backgroundimage_file = installation-background.png
diff --git a/resources/osx/openlp.spec.master b/resources/osx/openlp.spec.master
index 94aec2a60..eb743c40b 100755
--- a/resources/osx/openlp.spec.master
+++ b/resources/osx/openlp.spec.master
@@ -1,5 +1,5 @@
 # -*- mode: python -*-
-a = Analysis([os.path.join(HOMEPATH,'support/_mountzlib.py'), os.path.join(HOMEPATH,'support/useUnicode.py'), '%(openlp_basedir)s/openlp.pyw'],
+a = Analysis([os.path.join(HOMEPATH,'support/_mountzlib.py'), os.path.join(CONFIGDIR,'support/useUnicode.py'), '%(openlp_basedir)s/openlp.pyw'],
              pathex=['%(pyinstaller_basedir)s'], hookspath=['%(openlp_basedir)s/resources/pyinstaller'])
 pyz = PYZ(a.pure)
 exe = EXE(pyz,