diff --git a/.bzrignore b/.bzrignore
index 7bea0adb9..e7b399b49 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -10,3 +10,5 @@ openlp.org 2.0.e4*
 documentation/build/html
 documentation/build/doctrees
 *.log*
+dist
+OpenLP.egg-info
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 000000000..73ff3c545
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,12 @@
+recursive-include openlp *.py
+recursive-include openlp *.sqlite
+recursive-include openlp *.csv
+recursive-include documentation *
+recursive-include resources/forms *
+recursive-include resources/i18n *
+recursive-include resources/images *
+recursive-include scripts *.py
+include resources/*.desktop
+include copyright.txt
+include LICENSE
+include openlp/.version
diff --git a/openlp.pyw b/openlp.pyw
index d35591a1c..5c18486b6 100755
--- a/openlp.pyw
+++ b/openlp.pyw
@@ -35,7 +35,7 @@ from PyQt4 import QtCore, QtGui
 from openlp.core.lib import Receiver, str_to_bool
 from openlp.core.resources import qInitResources
 from openlp.core.ui import MainWindow, SplashScreen, ScreenList
-from openlp.core.utils import ConfigHelper
+from openlp.core.utils import get_config_directory, ConfigHelper
 
 log = logging.getLogger()
 
@@ -158,7 +158,7 @@ def main():
     parser.add_option("-s", "--style", dest="style",
                       help="Set the Qt4 style (passed directly to Qt4).")
     # Set up logging
-    filename = u'openlp.log'
+    filename = os.path.join(get_config_directory(), u'openlp.log')
     logfile = FileHandler(filename, u'w')
     logfile.setFormatter(logging.Formatter(
         u'%(asctime)s %(name)-15s %(levelname)-8s %(message)s'))
diff --git a/openlp/core/lib/rendermanager.py b/openlp/core/lib/rendermanager.py
index 600a029c0..1e8363228 100644
--- a/openlp/core/lib/rendermanager.py
+++ b/openlp/core/lib/rendermanager.py
@@ -25,10 +25,10 @@
 
 import logging
 
-from PyQt4 import QtGui, QtCore
+from PyQt4 import QtCore
 
 from renderer import Renderer
-from openlp.core.lib import ThemeLevel, resize_image
+from openlp.core.lib import ThemeLevel
 
 class RenderManager(object):
     """
diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py
index 603d7cadb..e62b24d8e 100644
--- a/openlp/core/lib/serviceitem.py
+++ b/openlp/core/lib/serviceitem.py
@@ -72,6 +72,7 @@ class ServiceItem(object):
         self._raw_frames = []
         self._display_frames = []
         self._uuid = unicode(uuid.uuid1())
+        self.autoPreviewAllowed = False
 
     def addIcon(self, icon):
         """
@@ -200,7 +201,8 @@ class ServiceItem(object):
             u'icon':self.icon,
             u'footer':self.raw_footer,
             u'type':self.service_item_type,
-            u'audit':self.audit
+            u'audit':self.audit,
+            u'preview':self.autoPreviewAllowed
         }
         service_data = []
         if self.service_item_type == ServiceItemType.Text:
@@ -234,6 +236,7 @@ class ServiceItem(object):
         self.addIcon(header[u'icon'])
         self.raw_footer = header[u'footer']
         self.audit = header[u'audit']
+        self.autoPreviewAllowed = header[u'preview']
         if self.service_item_type == ServiceItemType.Text:
             for slide in serviceitem[u'serviceitem'][u'data']:
                 self._raw_frames.append(slide)
diff --git a/openlp/core/theme/theme.py b/openlp/core/theme/theme.py
index 92ffbfed2..27969c9d9 100644
--- a/openlp/core/theme/theme.py
+++ b/openlp/core/theme/theme.py
@@ -30,7 +30,7 @@ from PyQt4 import QtGui
 
 DelphiColors={"clRed":0xFF0000,
                 "clBlue":0x0000FF,
-                "clYellow":0x0FFFF00,
+                "clYellow":0xFFFF00,
                "clBlack":0x000000,
                "clWhite":0xFFFFFF}
 
@@ -113,6 +113,7 @@ class Theme(object):
         root = ElementTree(element=XML(xml))
         iter = root.getiterator()
         for element in iter:
+            delphiColorChange = False
             if element.tag != u'Theme':
                 t = element.text
                 val = 0
@@ -128,6 +129,7 @@ class Theme(object):
                             pass
                     elif DelphiColors.has_key(t):
                         val = DelphiColors[t]
+                        delphiColorChange = True
                     else:
                         try:
                             val = int(t)
@@ -136,7 +138,10 @@ class Theme(object):
                 if (element.tag.find(u'Color') > 0 or
                     (element.tag.find(u'BackgroundParameter') == 0 and type(val) == type(0))):
                     # convert to a wx.Colour
-                    val = QtGui.QColor((val>>16) & 0xFF, (val>>8)&0xFF, val&0xFF)
+                        if not delphiColorChange:
+                            val = QtGui.QColor(val&0xFF, (val>>8)&0xFF, (val>>16)&0xFF)
+                        else:
+                            val = QtGui.QColor((val>>16)&0xFF, (val>>8)&0xFF, val&0xFF)
                 setattr(self, element.tag, val)
 
     def __str__(self):
diff --git a/openlp/core/ui/aboutform.py b/openlp/core/ui/aboutform.py
index d6a97e2c9..c3eb7bdcb 100644
--- a/openlp/core/ui/aboutform.py
+++ b/openlp/core/ui/aboutform.py
@@ -25,7 +25,6 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import build_icon
 from aboutdialog import Ui_AboutDialog
 
 class AboutForm(QtGui.QDialog, Ui_AboutDialog):
diff --git a/openlp/core/ui/generaltab.py b/openlp/core/ui/generaltab.py
index d821c0f45..c65ea3dd0 100644
--- a/openlp/core/ui/generaltab.py
+++ b/openlp/core/ui/generaltab.py
@@ -87,6 +87,10 @@ class GeneralTab(SettingsTab):
         self.SaveCheckServiceCheckBox.setObjectName(u'SaveCheckServiceCheckBox')
         self.SettingsLayout.addWidget(self.SaveCheckServiceCheckBox)
         self.GeneralLeftLayout.addWidget(self.SettingsGroupBox)
+        self.AutoPreviewCheckBox = QtGui.QCheckBox(self.SettingsGroupBox)
+        self.AutoPreviewCheckBox.setObjectName(u'AutoPreviewCheckBox')
+        self.SettingsLayout.addWidget(self.AutoPreviewCheckBox)
+        self.GeneralLeftLayout.addWidget(self.SettingsGroupBox)
         self.GeneralLeftSpacer = QtGui.QSpacerItem(20, 40,
             QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
         self.GeneralLeftLayout.addItem(self.GeneralLeftSpacer)
@@ -137,6 +141,8 @@ class GeneralTab(SettingsTab):
             QtCore.SIGNAL(u'stateChanged(int)'), self.onShowSplashCheckBoxChanged)
         QtCore.QObject.connect(self.SaveCheckServiceCheckBox,
             QtCore.SIGNAL(u'stateChanged(int)'), self.onSaveCheckServiceCheckBox)
+        QtCore.QObject.connect(self.AutoPreviewCheckBox,
+            QtCore.SIGNAL(u'stateChanged(int)'), self.onAutoPreviewCheckBox)
         QtCore.QObject.connect(self.NumberEdit,
             QtCore.SIGNAL(u'editingFinished()'), self.onNumberEditLostFocus)
         QtCore.QObject.connect(self.UsernameEdit,
@@ -153,6 +159,7 @@ class GeneralTab(SettingsTab):
         self.ShowSplashCheckBox.setText(self.trUtf8('Show the splash screen'))
         self.SettingsGroupBox.setTitle(self.trUtf8('Application Settings'))
         self.SaveCheckServiceCheckBox.setText(self.trUtf8('Prompt to save Service before starting New'))
+        self.AutoPreviewCheckBox.setText(self.trUtf8('Preview Next Song from Service Manager'))
         self.CCLIGroupBox.setTitle(self.trUtf8('CCLI Details'))
         self.NumberLabel.setText(self.trUtf8('CCLI Number:'))
         self.UsernameLabel.setText(self.trUtf8('SongSelect Username:'))
@@ -173,6 +180,9 @@ class GeneralTab(SettingsTab):
     def onSaveCheckServiceCheckBox(self, value):
         self.PromptSaveService = (value == QtCore.Qt.Checked)
 
+    def onAutoPreviewCheckBox(self, value):
+        self.AutoPreview = (value == QtCore.Qt.Checked)
+
     def onNumberEditLostFocus(self):
         self.CCLINumber = self.NumberEdit.displayText()
 
@@ -194,6 +204,7 @@ class GeneralTab(SettingsTab):
         self.AutoOpen = str_to_bool(self.config.get_config(u'auto open', u'False'))
         self.ShowSplash = str_to_bool(self.config.get_config(u'show splash', u'True'))
         self.PromptSaveService = str_to_bool(self.config.get_config(u'save prompt', u'False'))
+        self.AutoPreview = str_to_bool(self.config.get_config(u'auto preview', u'False'))
         self.CCLINumber = unicode(self.config.get_config(u'ccli number', u''))
         self.Username = unicode(self.config.get_config(u'songselect username', u''))
         self.Password = unicode(self.config.get_config(u'songselect password', u''))
@@ -203,6 +214,7 @@ class GeneralTab(SettingsTab):
         self.WarningCheckBox.setChecked(self.Warning)
         self.AutoOpenCheckBox.setChecked(self.AutoOpen)
         self.ShowSplashCheckBox.setChecked(self.ShowSplash)
+        self.AutoPreviewCheckBox.setChecked(self.AutoPreview)
         self.NumberEdit.setText(self.CCLINumber)
         self.UsernameEdit.setText(self.Username)
         self.PasswordEdit.setText(self.Password)
@@ -213,6 +225,7 @@ class GeneralTab(SettingsTab):
         self.config.set_config(u'auto open', self.AutoOpen)
         self.config.set_config(u'show splash', self.ShowSplash)
         self.config.set_config(u'save prompt', self.PromptSaveService)
+        self.config.set_config(u'auto preview', self.AutoPreview)
         self.config.set_config(u'ccli number', self.CCLINumber)
         self.config.set_config(u'songselect username', self.Username)
         self.config.set_config(u'songselect password', self.Password)
diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py
index 1ba31ea62..bdb396498 100644
--- a/openlp/core/ui/maindisplay.py
+++ b/openlp/core/ui/maindisplay.py
@@ -25,7 +25,6 @@
 
 import logging
 import os
-import time
 
 from PyQt4 import QtCore, QtGui
 from PyQt4.phonon import Phonon
@@ -203,7 +202,7 @@ class MainDisplay(DisplayWidget):
         if not self.primary:
             self.setVisible(True)
             self.showFullScreen()
-        self.generateAlert()
+        Receiver.send_message(u'flush_alert')
 
     def addImageWithText(self, frame):
         frame = resize_image(frame,
diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index df66d5e97..96a089df1 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -52,12 +52,17 @@ media_manager_style = """
   }
 """
 class versionThread(QtCore.QThread):
-    def __init__(self, parent):
+    def __init__(self, parent, app_version, generalConfig):
         QtCore.QThread.__init__(self, parent)
         self.parent = parent
+        self.app_version = app_version
+        self.generalConfig = generalConfig
     def run (self):
         time.sleep(2)
-        Receiver.send_message(u'version_check')
+        version = check_latest_version(self.generalConfig, self.app_version)
+        #new version has arrived
+        if version != self.app_version:
+            Receiver.send_message(u'version_check', u'%s' % version)
 
 
 class Ui_MainWindow(object):
@@ -536,20 +541,18 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         log.info(u'Load data from Settings')
         self.settingsForm.postSetUp()
 
-    def versionCheck(self):
+    def versionCheck(self, version):
         """
         Checks the version of the Application called from openlp.pyw
         """
         app_version = self.applicationVersion[u'full']
-        version = check_latest_version(self.generalConfig, app_version)
-        if app_version != version:
-            version_text = unicode(self.trUtf8('OpenLP version %s has been updated '
-                'to version %s\n\nYou can obtain the latest version from http://openlp.org'))
-            QtGui.QMessageBox.question(self,
-                self.trUtf8('OpenLP Version Updated'),
-                version_text % (app_version, version),
-                QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok),
-                QtGui.QMessageBox.Ok)
+        version_text = unicode(self.trUtf8('OpenLP version %s has been updated '
+            'to version %s\n\nYou can obtain the latest version from http://openlp.org'))
+        QtGui.QMessageBox.question(self,
+            self.trUtf8('OpenLP Version Updated'),
+            version_text % (app_version, version),
+            QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok),
+            QtGui.QMessageBox.Ok)
 
     def getMonitorNumber(self):
         """
@@ -584,7 +587,8 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
                 QtGui.QMessageBox.Ok)
 
     def versionThread(self):
-        vT = versionThread(self)
+        app_version = self.applicationVersion[u'full']
+        vT = versionThread(self, app_version, self.generalConfig)
         vT.start()
 
     def onHelpAboutItemClicked(self):
diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py
index b96e47f97..22fbb7ecc 100644
--- a/openlp/core/ui/servicemanager.py
+++ b/openlp/core/ui/servicemanager.py
@@ -30,8 +30,8 @@ import zipfile
 
 from PyQt4 import QtCore, QtGui
 from openlp.core.lib import PluginConfig, OpenLPToolbar, ServiceItem, \
-    ServiceItemType, contextMenuAction, contextMenuSeparator, contextMenu, \
-    Receiver, contextMenu, str_to_bool
+    contextMenuAction, contextMenuSeparator, contextMenu, Receiver, \
+    contextMenu, str_to_bool
 
 class ServiceManagerList(QtGui.QTreeWidget):
 
@@ -573,13 +573,15 @@ class ServiceManager(QtGui.QWidget):
         self.regenerateServiceItems()
 
     def regenerateServiceItems(self):
+        #force reset of renderer as theme data has changed
+        self.parent.RenderManager.themedata = None
         if len(self.serviceItems) > 0:
             tempServiceItems = self.serviceItems
             self.onNewService()
             for item in tempServiceItems:
-                self.addServiceItem(item[u'service_item'])
+                self.addServiceItem(item[u'service_item'], True)
 
-    def addServiceItem(self, item):
+    def addServiceItem(self, item, rebuild=False):
         """
         Add a Service item to the list
 
@@ -606,6 +608,9 @@ class ServiceManager(QtGui.QWidget):
                     u'order': len(self.serviceItems)+1,
                     u'expanded':True})
                 self.repaintServiceList(sitem + 1, 0)
+            #if rebuilding list make sure live is fixed.
+            if rebuild:
+                self.parent.LiveController.replaceServiceManagerItem(item)
         self.parent.serviceChanged(False, self.serviceName)
 
     def makePreview(self):
@@ -616,6 +621,7 @@ class ServiceManager(QtGui.QWidget):
         self.parent.PreviewController.addServiceManagerItem(
             self.serviceItems[item][u'service_item'], count)
 
+
     def makeLive(self):
         """
         Send the current item to the Live slide controller
@@ -623,6 +629,13 @@ class ServiceManager(QtGui.QWidget):
         item, count = self.findServiceItem()
         self.parent.LiveController.addServiceManagerItem(
             self.serviceItems[item][u'service_item'], count)
+        if str_to_bool(PluginConfig(u'General').
+                        get_config(u'auto preview', u'False')):
+            item += 1
+            if len(self.serviceItems) > 0 and item < len(self.serviceItems) and \
+                self.serviceItems[item][u'service_item'].autoPreviewAllowed:
+                    self.parent.PreviewController.addServiceManagerItem(
+                        self.serviceItems[item][u'service_item'], 0)
 
     def remoteEdit(self):
         """
diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py
index e88699b71..515fb2d3c 100644
--- a/openlp/core/ui/slidecontroller.py
+++ b/openlp/core/ui/slidecontroller.py
@@ -144,6 +144,7 @@ class SlideController(QtGui.QWidget):
         self.PreviewListWidget.setEditTriggers(
             QtGui.QAbstractItemView.NoEditTriggers)
         self.PreviewListWidget.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
+        self.PreviewListWidget.setAlternatingRowColors(True)
         self.ControllerLayout.addWidget(self.PreviewListWidget)
         # Build the full toolbar
         self.Toolbar = OpenLPToolbar(self)
diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py
index 8ece41ac2..577021418 100644
--- a/openlp/core/ui/thememanager.py
+++ b/openlp/core/ui/thememanager.py
@@ -34,8 +34,8 @@ from PyQt4 import QtCore, QtGui
 from openlp.core.ui import AmendThemeForm
 from openlp.core.theme import Theme
 from openlp.core.lib import PluginConfig, OpenLPToolbar, contextMenuAction, \
-    ThemeXML, ThemeLevel, str_to_bool, get_text_file_string, build_icon, \
-    Receiver, contextMenuSeparator
+    ThemeXML, str_to_bool, get_text_file_string, build_icon, Receiver, \
+    contextMenuSeparator
 from openlp.core.utils import ConfigHelper
 
 class ThemeManager(QtGui.QWidget):
@@ -313,17 +313,23 @@ class ThemeManager(QtGui.QWidget):
             filexml = None
             themename = None
             for file in zip.namelist():
-                if file.endswith(os.path.sep):
-                    theme_dir = os.path.join(dir, file)
+                osfile = unicode(QtCore.QDir.toNativeSeparators(file))
+                theme_dir = None
+                if osfile.endswith(os.path.sep):
+                    theme_dir = os.path.join(dir, osfile)
                     if not os.path.exists(theme_dir):
-                        os.mkdir(os.path.join(dir, file))
+                        os.mkdir(os.path.join(dir, osfile))
                 else:
-                    fullpath = os.path.join(dir, file)
-                    names = file.split(os.path.sep)
+                    fullpath = os.path.join(dir, osfile)
+                    names = osfile.split(os.path.sep)
                     if len(names) > 1:
                         # not preview file
                         if themename is None:
                             themename = names[0]
+                        if theme_dir is None:
+                            theme_dir = os.path.join(dir, names[0])
+                            if not os.path.exists(theme_dir):
+                                os.mkdir(os.path.join(dir, names[0]))
                         xml_data = zip.read(file)
                         if os.path.splitext(file)[1].lower() in [u'.xml']:
                             if self.checkVersion1(xml_data):
@@ -335,7 +341,7 @@ class ThemeManager(QtGui.QWidget):
                             outfile = open(fullpath, u'w')
                             outfile.write(filexml)
                         else:
-                            outfile = open(fullpath, u'w')
+                            outfile = open(fullpath, u'wb')
                             outfile.write(zip.read(file))
             self.generateAndSaveImage(dir, themename, filexml)
         except:
@@ -384,7 +390,6 @@ class ThemeManager(QtGui.QWidget):
                 unicode(theme.BackgroundParameter2.name()), direction)
         else:
             newtheme.add_background_image(unicode(theme.BackgroundParameter1))
-
         newtheme.add_font(unicode(theme.FontName),
             unicode(theme.FontColor.name()),
             unicode(theme.FontProportion * 3), u'False')
@@ -397,9 +402,14 @@ class ThemeManager(QtGui.QWidget):
             shadow = True
         if theme.Outline == 1:
             outline = True
+        vAlignCorrection = 0
+        if theme.VerticalAlign == 2:
+            vAlignCorrection = 1
+        elif theme.VerticalAlign == 1:
+            vAlignCorrection = 2
         newtheme.add_display(unicode(shadow), unicode(theme.ShadowColor.name()),
             unicode(outline), unicode(theme.OutlineColor.name()),
-            unicode(theme.HorizontalAlign), unicode(theme.VerticalAlign),
+            unicode(theme.HorizontalAlign), unicode(vAlignCorrection),
             unicode(theme.WrapStyle), unicode(0))
         return newtheme.extract_xml()
 
diff --git a/openlp/core/utils/__init__.py b/openlp/core/utils/__init__.py
index 9504c771e..e85b2d939 100644
--- a/openlp/core/utils/__init__.py
+++ b/openlp/core/utils/__init__.py
@@ -22,17 +22,12 @@
 # with this program; if not, write to the Free Software Foundation, Inc., 59  #
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
+
+import os
 import logging
 import urllib2
 from datetime import datetime
 
-from registry import Registry
-from confighelper import ConfigHelper
-
-log = logging.getLogger(__name__)
-
-__all__ = ['Registry', 'ConfigHelper']
-
 log = logging.getLogger(__name__)
 
 def check_latest_version(config, current_version):
@@ -54,3 +49,40 @@ def check_latest_version(config, current_version):
             if hasattr(e, u'reason'):
                 log.exception(u'Reason for failure: %s', e.reason)
     return version_string
+
+def get_config_directory():
+    path = u''
+    if os.name == u'nt':
+        path = os.path.join(os.getenv(u'APPDATA'), u'openlp')
+    elif os.name == u'mac':
+        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
+
+def get_data_directory():
+    path = u''
+    if os.name == u'nt':
+        # ask OS for path to application data, set on Windows XP and Vista
+        path = os.path.join(os.getenv(u'APPDATA'), u'openlp', u'data')
+    elif os.name == u'mac':
+        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
+
+from registry import Registry
+from confighelper import ConfigHelper
+
+__all__ = [u'Registry', u'ConfigHelper', u'get_config_directory',
+           u'get_data_directory', u'check_latest_version']
diff --git a/openlp/core/utils/confighelper.py b/openlp/core/utils/confighelper.py
index 112712675..d49157f55 100644
--- a/openlp/core/utils/confighelper.py
+++ b/openlp/core/utils/confighelper.py
@@ -24,6 +24,8 @@
 ###############################################################################
 
 import os
+
+from openlp.core.utils import get_data_directory, get_config_directory
 from openlp.core.utils.registry import Registry
 
 class ConfigHelper(object):
@@ -34,20 +36,7 @@ class ConfigHelper(object):
 
     @staticmethod
     def get_data_path():
-        if os.name == u'nt':
-            # ask OS for path to application data, set on Windows XP and Vista
-            path = os.path.join(os.getenv(u'APPDATA'), u'openlp', u'data')
-        elif os.name == u'mac':
-            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')
-        #reg = ConfigHelper.get_registry()
-        #path = ConfigHelper.get_config(u'main', 'data path', path)
+        path = get_data_directory()
         if not os.path.exists(path):
             os.makedirs(path)
         return path
@@ -81,17 +70,7 @@ class ConfigHelper(object):
         current operating system, and returns an instantiation of that class.
         """
         if ConfigHelper.__registry__ is None:
-            config_path = u''
-            if os.name == u'nt':
-                config_path = os.path.join(os.getenv(u'APPDATA'), u'openlp')
-            elif os.name == u'mac':
-                config_path = os.path.join(os.getenv(u'HOME'), u'Library',
-                    u'Application Support', u'openlp')
-            else:
-                try:
-                    from xdg import BaseDirectory
-                    config_path = os.path.join(BaseDirectory.xdg_config_home, u'openlp')
-                except ImportError:
-                    config_path = os.path.join(os.getenv(u'HOME'), u'.openlp')
+            config_path = get_config_directory()
             ConfigHelper.__registry__ = Registry(config_path)
-        return ConfigHelper.__registry__
\ No newline at end of file
+        return ConfigHelper.__registry__
+
diff --git a/openlp/plugins/alerts/alertsplugin.py b/openlp/plugins/alerts/alertsplugin.py
index 60e718bb3..5bf268394 100644
--- a/openlp/plugins/alerts/alertsplugin.py
+++ b/openlp/plugins/alerts/alertsplugin.py
@@ -23,12 +23,11 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
-from datetime import datetime
 import logging
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import Plugin, Receiver, str_to_bool, build_icon, PluginStatus
+from openlp.core.lib import Plugin, build_icon, PluginStatus
 from openlp.plugins.alerts.lib import AlertsManager, DBManager
 from openlp.plugins.alerts.forms import AlertsTab, AlertForm, AlertEditForm
 
diff --git a/openlp/plugins/alerts/forms/alerteditform.py b/openlp/plugins/alerts/forms/alerteditform.py
index fef8a04e5..4abc8a660 100644
--- a/openlp/plugins/alerts/forms/alerteditform.py
+++ b/openlp/plugins/alerts/forms/alerteditform.py
@@ -23,8 +23,6 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
-from datetime import date
-
 from PyQt4 import QtGui, QtCore
 from openlp.plugins.alerts.lib.models import AlertItem
 
diff --git a/openlp/plugins/alerts/forms/alertform.py b/openlp/plugins/alerts/forms/alertform.py
index 26f78e9b2..2d7dd1c21 100644
--- a/openlp/plugins/alerts/forms/alertform.py
+++ b/openlp/plugins/alerts/forms/alertform.py
@@ -23,9 +23,8 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
-from datetime import date
-
 from PyQt4 import QtGui, QtCore
+
 from openlp.plugins.alerts.lib.models import AlertItem
 
 from alertdialog import Ui_AlertDialog
diff --git a/openlp/plugins/alerts/lib/alertsmanager.py b/openlp/plugins/alerts/lib/alertsmanager.py
index 1f4369588..deda11240 100644
--- a/openlp/plugins/alerts/lib/alertsmanager.py
+++ b/openlp/plugins/alerts/lib/alertsmanager.py
@@ -1,10 +1,33 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2010 Raoul Snyman                                        #
+# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
+# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Carsten Tinggaard                                                           #
+# --------------------------------------------------------------------------- #
+# 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
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import str_to_bool, Receiver
-from openlp.core.lib import SettingsTab
+from openlp.core.lib import Receiver
 
 class AlertsManager(QtCore.QObject):
     """
@@ -19,6 +42,8 @@ class AlertsManager(QtCore.QObject):
         self.parent = parent
         self.timer_id = 0
         self.alertList = []
+        QtCore.QObject.connect(Receiver.get_receiver(),
+            QtCore.SIGNAL(u'flush_alert'), self.generateAlert)
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'alert_text'), self.displayAlert)
         QtCore.QObject.connect(Receiver.get_receiver(),
diff --git a/openlp/plugins/bibles/forms/importwizardform.py b/openlp/plugins/bibles/forms/importwizardform.py
index a684c01a3..2f5e84867 100644
--- a/openlp/plugins/bibles/forms/importwizardform.py
+++ b/openlp/plugins/bibles/forms/importwizardform.py
@@ -23,11 +23,10 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
+import csv
 import logging
 import os
 import os.path
-from time import sleep
-import csv
 
 from PyQt4 import QtCore, QtGui
 
@@ -46,8 +45,8 @@ class DownloadLocation(object):
     }
 
     @classmethod
-    def get_name(class_, id):
-        return class_.Names[id]
+    def get_name(cls, id):
+        return cls.Names[id]
 
 
 class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard):
diff --git a/openlp/plugins/bibles/lib/common.py b/openlp/plugins/bibles/lib/common.py
index 5152ca496..4ba985842 100644
--- a/openlp/plugins/bibles/lib/common.py
+++ b/openlp/plugins/bibles/lib/common.py
@@ -27,7 +27,6 @@ import urllib2
 import chardet
 import logging
 import re
-import sqlite3
 
 only_verses = re.compile(r'([\w .]+)[ ]+([0-9]+)[ ]*[:|v|V][ ]*([0-9]+)'
     r'(?:[ ]*-[ ]*([0-9]+|end))?(?:[ ]*,[ ]*([0-9]+)(?:[ ]*-[ ]*([0-9]+|end))?)?',
@@ -167,8 +166,6 @@ class BibleCommon(object):
     """
     A common ancestor for bible download sites.
     """
-    global log
-    log = logging.getLogger(u'BibleCommon')
     log.info(u'BibleCommon')
 
     def _get_web_text(self, urlstring, proxyurl):
diff --git a/openlp/plugins/bibles/lib/db.py b/openlp/plugins/bibles/lib/db.py
index 67c71ca10..be4112a54 100644
--- a/openlp/plugins/bibles/lib/db.py
+++ b/openlp/plugins/bibles/lib/db.py
@@ -59,7 +59,7 @@ class BibleDB(QtCore.QObject):
         ``config``
             The configuration object, passed in from the plugin.
         """
-        log.info(u'BibleDBimpl loaded')
+        log.info(u'BibleDB loaded')
         QtCore.QObject.__init__(self)
         if u'path' not in kwargs:
             raise KeyError(u'Missing keyword argument "path".')
diff --git a/openlp/plugins/bibles/lib/http.py b/openlp/plugins/bibles/lib/http.py
index 1cf92e4d2..d00c1f88a 100644
--- a/openlp/plugins/bibles/lib/http.py
+++ b/openlp/plugins/bibles/lib/http.py
@@ -35,6 +35,8 @@ from common import BibleCommon, SearchResults
 from db import BibleDB
 from openlp.plugins.bibles.lib.models import Book
 
+log = logging.getLogger(__name__)
+
 class HTTPBooks(object):
     cursor = None
 
@@ -119,9 +121,7 @@ class HTTPBooks(object):
 
 
 class BGExtract(BibleCommon):
-    global log
-    log = logging.getLogger(u'BibleHTTPMgr(BG_extract)')
-    log.info(u'BG_extract loaded')
+    log.info(u'%s BGExtract loaded', __name__)
 
     def __init__(self, proxyurl=None):
         log.debug(u'init %s', proxyurl)
@@ -184,7 +184,7 @@ class BGExtract(BibleCommon):
         return SearchResults(bookname, chapter, bible)
 
 class CWExtract(BibleCommon):
-    log.info(u'%s loaded', __name__)
+    log.info(u'%s CWExtract loaded', __name__)
 
     def __init__(self, proxyurl=None):
         log.debug(u'init %s', proxyurl)
@@ -229,7 +229,7 @@ class CWExtract(BibleCommon):
 
 
 class HTTPBible(BibleDB):
-    log.info(u'%s loaded', __name__)
+    log.info(u'%s HTTPBible loaded' , __name__)
 
     def __init__(self, parent, **kwargs):
         """
diff --git a/openlp/plugins/bibles/lib/manager.py b/openlp/plugins/bibles/lib/manager.py
index db70ac6db..965d0433f 100644
--- a/openlp/plugins/bibles/lib/manager.py
+++ b/openlp/plugins/bibles/lib/manager.py
@@ -25,7 +25,6 @@
 
 import logging
 import os
-import csv
 
 from common import parse_reference
 from opensong import OpenSongBible
diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py
index 648694f45..c0a3bde35 100644
--- a/openlp/plugins/bibles/lib/mediaitem.py
+++ b/openlp/plugins/bibles/lib/mediaitem.py
@@ -31,8 +31,6 @@ from PyQt4 import QtCore, QtGui
 from openlp.core.lib import MediaManagerItem, Receiver, str_to_bool, \
     BaseListWithDnD
 from openlp.plugins.bibles.forms import ImportWizardForm
-from openlp.plugins.bibles.lib.manager import BibleMode
-from openlp.plugins.bibles.lib.common import parse_reference
 
 class BibleListView(BaseListWithDnD):
     """
@@ -45,7 +43,6 @@ class BibleListView(BaseListWithDnD):
     def resizeEvent(self, event):
         self.parent.onListViewResize(event.size().width(), event.size().width())
 
-
 class BibleMediaItem(MediaManagerItem):
     """
     This is the custom media manager item for Bibles.
@@ -437,6 +434,7 @@ class BibleMediaItem(MediaManagerItem):
         raw_slides = []
         raw_footer = []
         bible_text = u''
+        service_item.autoPreviewAllowed = True
         #If we want to use a 2nd translation / version
         bible2 = u''
         if self.SearchTabWidget.currentIndex() == 0:
@@ -472,12 +470,12 @@ class BibleMediaItem(MediaManagerItem):
                 verse_text = self.formatVerse(old_chapter, chapter, verse, u'', u'')
             old_chapter = chapter
             footer = u'%s (%s %s)' % (book, version, copyright)
-            #If not found throws and error so add.s
+            #If not found add to footer
             if footer not in raw_footer:
                 raw_footer.append(footer)
             if bible2:
                 footer = u'%s (%s %s)' % (book, version, copyright)
-                #If not found throws and error so add.s
+                #If not found add to footer
                 if footer not in raw_footer:
                     raw_footer.append(footer)
                 bible_text = u'%s %s \n\n %s %s' % \
diff --git a/openlp/plugins/bibles/lib/opensong.py b/openlp/plugins/bibles/lib/opensong.py
index 830267f2a..6fa18cf6d 100644
--- a/openlp/plugins/bibles/lib/opensong.py
+++ b/openlp/plugins/bibles/lib/opensong.py
@@ -23,13 +23,9 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
-import os
-import os.path
 import logging
-import chardet
-import codecs
-from lxml import objectify
 
+from lxml import objectify
 from PyQt4 import QtCore
 
 from openlp.core.lib import Receiver
diff --git a/openlp/plugins/bibles/lib/osis.py b/openlp/plugins/bibles/lib/osis.py
index 396b3b6ba..cfa68b213 100644
--- a/openlp/plugins/bibles/lib/osis.py
+++ b/openlp/plugins/bibles/lib/osis.py
@@ -30,8 +30,6 @@ import chardet
 import codecs
 import re
 
-from PyQt4 import QtCore
-
 from openlp.core.lib import Receiver
 from db import BibleDB
 
diff --git a/openlp/plugins/custom/lib/mediaitem.py b/openlp/plugins/custom/lib/mediaitem.py
index c9ca91112..c4b9ef16a 100644
--- a/openlp/plugins/custom/lib/mediaitem.py
+++ b/openlp/plugins/custom/lib/mediaitem.py
@@ -144,6 +144,7 @@ class CustomMediaItem(MediaManagerItem):
             item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
         else:
             item_id = self.remoteCustom
+        service_item.autoPreviewAllowed = True
         customSlide = self.parent.custommanager.get_custom(item_id)
         title = customSlide.title
         credit = customSlide.credits
@@ -165,4 +166,4 @@ class CustomMediaItem(MediaManagerItem):
         else:
             raw_footer.append(u'')
         service_item.raw_footer = raw_footer
-        return True
\ No newline at end of file
+        return True
diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py
index 145e07f04..e418ee44e 100644
--- a/openlp/plugins/images/lib/mediaitem.py
+++ b/openlp/plugins/images/lib/mediaitem.py
@@ -144,6 +144,7 @@ class ImageMediaItem(MediaManagerItem):
         items = self.ListView.selectedIndexes()
         if items:
             service_item.title = self.trUtf8('Image(s)')
+            service_item.autoPreviewAllowed = True
             for item in items:
                 bitem = self.ListView.item(item.row())
                 filename = unicode((bitem.data(QtCore.Qt.UserRole)).toString())
diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py
index 46b059c01..67f1024a9 100644
--- a/openlp/plugins/media/lib/mediaitem.py
+++ b/openlp/plugins/media/lib/mediaitem.py
@@ -30,6 +30,8 @@ from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import MediaManagerItem, BaseListWithDnD, build_icon
 
+log = logging.getLogger(__name__)
+
 class MediaListView(BaseListWithDnD):
     def __init__(self, parent=None):
         self.PluginName = u'Media'
@@ -39,9 +41,7 @@ class MediaMediaItem(MediaManagerItem):
     """
     This is the custom media manager item for Media Slides.
     """
-    global log
-    log = logging.getLogger(u'MediaMediaItem')
-    log.info(u'Media Media Item loaded')
+    log.info(u'%s MediaMediaItem loaded', __name__)
 
     def __init__(self, parent, icon, title):
         self.PluginNameShort = u'Media'
diff --git a/openlp/plugins/media/mediaplugin.py b/openlp/plugins/media/mediaplugin.py
index 640de1cb3..b403ab0de 100644
--- a/openlp/plugins/media/mediaplugin.py
+++ b/openlp/plugins/media/mediaplugin.py
@@ -27,11 +27,12 @@ import logging
 
 from openlp.core.lib import Plugin, build_icon, PluginStatus
 from openlp.plugins.media.lib import MediaMediaItem
+from PyQt4.phonon import Phonon
+
+log = logging.getLogger(__name__)
 
 class MediaPlugin(Plugin):
-    global log
-    log = logging.getLogger(u'MediaPlugin')
-    log.info(u'Media Plugin loaded')
+    log.info(u'%s MediaPlugin loaded', __name__)
 
     def __init__(self, plugin_helpers):
         Plugin.__init__(self, u'Media', u'1.9.1', plugin_helpers)
@@ -40,6 +41,9 @@ class MediaPlugin(Plugin):
         # passed with drag and drop messages
         self.dnd_id = u'Media'
         self.status = PluginStatus.Active
+#        print Phonon.BackendCapabilities.availableMimeTypes()
+#        for mimetype in Phonon.BackendCapabilities.availableMimeTypes():
+#            print mimetype
 
     def initialise(self):
         log.info(u'Plugin Initialising')
diff --git a/openlp/plugins/presentations/lib/presentationtab.py b/openlp/plugins/presentations/lib/presentationtab.py
index 40ab15e69..0ef7e17d1 100644
--- a/openlp/plugins/presentations/lib/presentationtab.py
+++ b/openlp/plugins/presentations/lib/presentationtab.py
@@ -51,17 +51,10 @@ class PresentationTab(SettingsTab):
         self.PresentationLeftLayout.setMargin(0)
         self.VerseDisplayGroupBox = QtGui.QGroupBox(self)
         self.VerseDisplayGroupBox.setObjectName(u'VerseDisplayGroupBox')
-        self.VerseDisplayLayout = QtGui.QGridLayout(self.VerseDisplayGroupBox)
+        self.VerseDisplayLayout = QtGui.QVBoxLayout(self.VerseDisplayGroupBox)
         self.VerseDisplayLayout.setMargin(8)
         self.VerseDisplayLayout.setObjectName(u'VerseDisplayLayout')
-        self.VerseTypeWidget = QtGui.QWidget(self.VerseDisplayGroupBox)
-        self.VerseTypeWidget.setObjectName(u'VerseTypeWidget')
-        self.VerseTypeLayout = QtGui.QHBoxLayout(self.VerseTypeWidget)
-        self.VerseTypeLayout.setSpacing(8)
-        self.VerseTypeLayout.setMargin(0)
-        self.VerseTypeLayout.setObjectName(u'VerseTypeLayout')
         self.PresenterCheckboxes = {}
-        index = 0
         for key in self.controllers:
             controller = self.controllers[key]
             checkbox = QtGui.QCheckBox(self.VerseDisplayGroupBox)
@@ -69,8 +62,7 @@ class PresentationTab(SettingsTab):
             checkbox.setEnabled(controller.available)
             checkbox.setObjectName(controller.name + u'CheckBox')
             self.PresenterCheckboxes[controller.name] = checkbox
-            index = index + 1
-            self.VerseDisplayLayout.addWidget(checkbox, index, 0, 1, 1)
+            self.VerseDisplayLayout.addWidget(checkbox)
         self.PresentationThemeWidget = QtGui.QWidget(self.VerseDisplayGroupBox)
         self.PresentationThemeWidget.setObjectName(u'PresentationThemeWidget')
         self.PresentationThemeLayout = QtGui.QHBoxLayout(
@@ -96,6 +88,7 @@ class PresentationTab(SettingsTab):
         self.PresentationLayout.addWidget(self.PresentationRightWidget)
 
     def retranslateUi(self):
+        self.VerseDisplayGroupBox.setTitle(self.trUtf8('Available Controllers'))
         for key in self.controllers:
             controller = self.controllers[key]
             checkbox = self.PresenterCheckboxes[controller.name]
@@ -115,4 +108,4 @@ class PresentationTab(SettingsTab):
             controller = self.controllers[key]
             checkbox = self.PresenterCheckboxes[controller.name]
             self.config.set_config(
-                controller.name, unicode(checkbox.checkState()))
\ No newline at end of file
+                controller.name, unicode(checkbox.checkState()))
diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py
index 477910108..dd3af03c3 100644
--- a/openlp/plugins/songs/forms/editsongform.py
+++ b/openlp/plugins/songs/forms/editsongform.py
@@ -33,13 +33,13 @@ from openlp.plugins.songs.forms import EditVerseForm
 from openlp.plugins.songs.lib.models import Song
 from editsongdialog import Ui_EditSongDialog
 
+log = logging.getLogger(__name__)
+
 class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
     """
     Class to manage the editing of a song
     """
-    global log
-    log = logging.getLogger(u'EditSongForm')
-    log.info(u'Song Editor loaded')
+    log.info(u'%s EditSongForm loaded', __name__)
 
     def __init__(self, songmanager, parent=None):
         """
diff --git a/openlp/plugins/songs/forms/editverseform.py b/openlp/plugins/songs/forms/editverseform.py
index 148fd164a..cee84aae5 100644
--- a/openlp/plugins/songs/forms/editverseform.py
+++ b/openlp/plugins/songs/forms/editverseform.py
@@ -77,6 +77,8 @@ class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog):
     def setVerse(self, text, verseCount=0, single=False, tag=u'Verse:1'):
         posVerse = 0
         posSub = 0
+        if len(text) == 0:
+            text = u'---[Verse:1]---\n'
         if single:
             id = tag.split(u':')
             posVerse = self.VerseListComboBox.findText(id[0], QtCore.Qt.MatchExactly)
@@ -112,6 +114,7 @@ class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog):
         self.VerseTextEdit.setPlainText(text)
         self.VerseTextEdit.setFocus(QtCore.Qt.OtherFocusReason)
         self.onVerseComboChanged(0)
+        self.VerseTextEdit.moveCursor(QtGui.QTextCursor.Down)
 
     def getVerse(self):
        return self.VerseTextEdit.toPlainText(), \
@@ -119,11 +122,14 @@ class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog):
             unicode(self.SubVerseListComboBox.currentText())
 
     def getVerseAll(self):
-       return self.VerseTextEdit.toPlainText()
+        text = self.VerseTextEdit.toPlainText()
+        if not text.startsWith(u'---['):
+            text = u'---[Verse:1]---\n%s' % text
+        return text
 
     def onVerseComboChanged(self, id):
         if unicode(self.VerseListComboBox.currentText()) == u'Verse':
             self.SubVerseListComboBox.setEnabled(True)
         else:
             self.SubVerseListComboBox.setEnabled(False)
-            self.SubVerseListComboBox.setCurrentIndex(0)
\ No newline at end of file
+            self.SubVerseListComboBox.setCurrentIndex(0)
diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py
index 7398fe18d..63fd69d48 100644
--- a/openlp/plugins/songs/lib/mediaitem.py
+++ b/openlp/plugins/songs/lib/mediaitem.py
@@ -290,6 +290,7 @@ class SongMediaItem(MediaManagerItem):
             item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
         else:
             item_id = self.remoteSong
+        service_item.autoPreviewAllowed = True
         song = self.parent.songmanager.get_song(item_id)
         service_item.theme = song.theme_name
         service_item.edit_enabled = True
diff --git a/openlp/plugins/songusage/forms/songusagedeleteform.py b/openlp/plugins/songusage/forms/songusagedeleteform.py
index 26fe2b7e2..56eb1954a 100644
--- a/openlp/plugins/songusage/forms/songusagedeleteform.py
+++ b/openlp/plugins/songusage/forms/songusagedeleteform.py
@@ -23,8 +23,6 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
-from datetime import date
-
 from PyQt4 import QtGui
 
 from songusagedeletedialog import Ui_SongUsageDeleteDialog
diff --git a/openlp/plugins/songusage/forms/songusagedetaildialog.py b/openlp/plugins/songusage/forms/songusagedetaildialog.py
index 63866d1fd..d6ba2ecfb 100644
--- a/openlp/plugins/songusage/forms/songusagedetaildialog.py
+++ b/openlp/plugins/songusage/forms/songusagedetaildialog.py
@@ -1,69 +1,91 @@
 # -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
 
-# Form implementation generated from reading ui file 'songusagedetaildialog.ui'
-#
-# Created: Tue Feb  9 07:34:05 2010
-#      by: PyQt4 UI code generator 4.6.2
-#
-# WARNING! All changes made in this file will be lost!
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2010 Raoul Snyman                                        #
+# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
+# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Carsten Tinggaard                                                           #
+# --------------------------------------------------------------------------- #
+# 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                          #
+###############################################################################
 
 from PyQt4 import QtCore, QtGui
 
 class Ui_SongUsageDetailDialog(object):
     def setupUi(self, AuditDetailDialog):
-        AuditDetailDialog.setObjectName("AuditDetailDialog")
+        AuditDetailDialog.setObjectName(u'AuditDetailDialog')
         AuditDetailDialog.resize(609, 413)
         self.verticalLayout = QtGui.QVBoxLayout(AuditDetailDialog)
-        self.verticalLayout.setObjectName("verticalLayout")
+        self.verticalLayout.setObjectName(u'verticalLayout')
         self.DateRangeGroupBox = QtGui.QGroupBox(AuditDetailDialog)
-        self.DateRangeGroupBox.setObjectName("DateRangeGroupBox")
+        self.DateRangeGroupBox.setObjectName(u'DateRangeGroupBox')
         self.verticalLayout_2 = QtGui.QVBoxLayout(self.DateRangeGroupBox)
-        self.verticalLayout_2.setObjectName("verticalLayout_2")
+        self.verticalLayout_2.setObjectName(u'verticalLayout_2')
         self.DateHorizontalLayout = QtGui.QHBoxLayout()
-        self.DateHorizontalLayout.setObjectName("DateHorizontalLayout")
+        self.DateHorizontalLayout.setObjectName(u'DateHorizontalLayout')
         self.FromDate = QtGui.QCalendarWidget(self.DateRangeGroupBox)
-        self.FromDate.setObjectName("FromDate")
+        self.FromDate.setObjectName(u'FromDate')
         self.DateHorizontalLayout.addWidget(self.FromDate)
         self.ToLabel = QtGui.QLabel(self.DateRangeGroupBox)
         self.ToLabel.setScaledContents(False)
         self.ToLabel.setAlignment(QtCore.Qt.AlignCenter)
-        self.ToLabel.setObjectName("ToLabel")
+        self.ToLabel.setObjectName(u'ToLabel')
         self.DateHorizontalLayout.addWidget(self.ToLabel)
         self.ToDate = QtGui.QCalendarWidget(self.DateRangeGroupBox)
-        self.ToDate.setObjectName("ToDate")
+        self.ToDate.setObjectName(u'ToDate')
         self.DateHorizontalLayout.addWidget(self.ToDate)
         self.verticalLayout_2.addLayout(self.DateHorizontalLayout)
         self.FileGroupBox = QtGui.QGroupBox(self.DateRangeGroupBox)
-        self.FileGroupBox.setObjectName("FileGroupBox")
+        self.FileGroupBox.setObjectName(u'FileGroupBox')
         self.verticalLayout_4 = QtGui.QVBoxLayout(self.FileGroupBox)
-        self.verticalLayout_4.setObjectName("verticalLayout_4")
+        self.verticalLayout_4.setObjectName(u'verticalLayout_4')
         self.horizontalLayout = QtGui.QHBoxLayout()
-        self.horizontalLayout.setObjectName("horizontalLayout")
+        self.horizontalLayout.setObjectName(u'horizontalLayout')
         self.FileLineEdit = QtGui.QLineEdit(self.FileGroupBox)
-        self.FileLineEdit.setObjectName("FileLineEdit")
+        self.FileLineEdit.setObjectName(u'FileLineEdit')
         self.horizontalLayout.addWidget(self.FileLineEdit)
         self.SaveFilePushButton = QtGui.QPushButton(self.FileGroupBox)
         icon = QtGui.QIcon()
-        icon.addPixmap(QtGui.QPixmap(":/exports/export_load.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon.addPixmap(QtGui.QPixmap(u':/exports/export_load.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.SaveFilePushButton.setIcon(icon)
-        self.SaveFilePushButton.setObjectName("SaveFilePushButton")
+        self.SaveFilePushButton.setObjectName(u'SaveFilePushButton')
         self.horizontalLayout.addWidget(self.SaveFilePushButton)
         self.verticalLayout_4.addLayout(self.horizontalLayout)
         self.verticalLayout_2.addWidget(self.FileGroupBox)
         self.verticalLayout.addWidget(self.DateRangeGroupBox)
         self.buttonBox = QtGui.QDialogButtonBox(AuditDetailDialog)
         self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Ok)
-        self.buttonBox.setObjectName("buttonBox")
+        self.buttonBox.setObjectName(u'buttonBox')
         self.verticalLayout.addWidget(self.buttonBox)
 
         self.retranslateUi(AuditDetailDialog)
-        QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL("accepted()"), AuditDetailDialog.accept)
-        QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL("rejected()"), AuditDetailDialog.close)
-        QtCore.QObject.connect(self.SaveFilePushButton, QtCore.SIGNAL("pressed()"), AuditDetailDialog.defineOutputLocation)
+        QtCore.QObject.connect(self.buttonBox,
+                                QtCore.SIGNAL(u'accepted()'),
+                                AuditDetailDialog.accept)
+        QtCore.QObject.connect(self.buttonBox,
+                               QtCore.SIGNAL(u'rejected()'),
+                               AuditDetailDialog.close)
+        QtCore.QObject.connect(self.SaveFilePushButton,
+                               QtCore.SIGNAL(u'pressed()'),
+                               AuditDetailDialog.defineOutputLocation)
         QtCore.QMetaObject.connectSlotsByName(AuditDetailDialog)
 
     def retranslateUi(self, AuditDetailDialog):
-        AuditDetailDialog.setWindowTitle(QtGui.QApplication.translate("AuditDetailDialog", "Audit Detail Extraction", None, QtGui.QApplication.UnicodeUTF8))
-        self.DateRangeGroupBox.setTitle(QtGui.QApplication.translate("AuditDetailDialog", "Select Date Range", None, QtGui.QApplication.UnicodeUTF8))
-        self.ToLabel.setText(QtGui.QApplication.translate("AuditDetailDialog", "to", None, QtGui.QApplication.UnicodeUTF8))
-        self.FileGroupBox.setTitle(QtGui.QApplication.translate("AuditDetailDialog", "Report Location", None, QtGui.QApplication.UnicodeUTF8))
+        AuditDetailDialog.setWindowTitle(self.trUtf8('Audit Detail Extraction'))
+        self.DateRangeGroupBox.setTitle(self.trUtf8('ASelect Date Range'))
+        self.ToLabel.setText(self.trUtf8('to'))
+        self.FileGroupBox.setTitle(self.trUtf8('Report Location'))
diff --git a/openlpcnv.pyw b/openlpcnv.pyw
index 877e74744..8c3a8bcf5 100755
--- a/openlpcnv.pyw
+++ b/openlpcnv.pyw
@@ -147,4 +147,4 @@ if __name__ == u'__main__':
     newdb = os.path.join(newpath, u'songs.sqlite')
     mig.convert_sqlite2_to_3(olddb, newdb)
     mig.process()
-    #mig.move_log_file()
\ No newline at end of file
+    #mig.move_log_file()
diff --git a/resources/openlp.desktop b/resources/openlp.desktop
new file mode 100644
index 000000000..8791c2d8f
--- /dev/null
+++ b/resources/openlp.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=OpenLP
+GenericName=Church lyrics projection
+Exec=openlp
+Icon=openlp
+StartupNotify=true
+Terminal=False
+Type=Application
+Categories=AudioVideo
diff --git a/scripts/bible-1to2-converter.py b/scripts/bible-1to2-converter.py
index 226c1ec2e..b1e9b6897 100755
--- a/scripts/bible-1to2-converter.py
+++ b/scripts/bible-1to2-converter.py
@@ -28,7 +28,7 @@ import sys
 import os
 import sqlite
 import sqlite3
-import re
+
 from optparse import OptionParser
 from traceback import format_tb as get_traceback
 
diff --git a/setup.py b/setup.py
old mode 100644
new mode 100755
index 8c34238ff..73cecd97a
--- a/setup.py
+++ b/setup.py
@@ -1,38 +1,57 @@
-# -*- coding: utf-8 -*-
-# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
+#!/usr/bin/env python
 
-###############################################################################
-# OpenLP - Open Source Lyrics Projection                                      #
-# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman                                        #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
-# Carsten Tinggaard                                                           #
-# --------------------------------------------------------------------------- #
-# 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                          #
-###############################################################################
+from setuptools import setup, find_packages
+import sys, os
 
-from setuptools import setup
+VERSION_FILE = 'openlp/.version'
+
+try:
+    from bzrlib.branch import Branch
+    b = Branch.open_containing('.')[0]
+    b.lock_read()
+    try:
+        # Get the branch's latest revision number.
+        revno = b.revno()
+        # Convert said revision number into a bzr revision id.
+        revision_id = b.dotted_revno_to_revision_id((revno,))
+        # Get a dict of tags, with the revision id as the key.
+        tags = b.tags.get_reverse_tag_dict()
+        # Check if the latest
+        if revision_id in tags:
+            version = u'%s' % tags[revision_id][0]
+        else:
+            version = '%s-bzr%s' % (sorted(b.tags.get_tag_dict().keys())[-1], revno)
+        ver_file = open(VERSION_FILE, u'w')
+        ver_file.write(version)
+        ver_file.close()
+    finally:
+        b.unlock()
+except:
+    ver_file = open(VERSION_FILE, u'r')
+    version = ver_file.read().strip()
+    ver_file.close()
 
-APP = ['openlp.pyw']
-OPTIONS = {'argv_emulation': True, 'includes': ['sip', 'PyQt4']}
 
 setup(
-    name='openlp.org',
-    version='1.9.0',
-    url='http://www.openlp.org/',
-    app=APP,
-    options={'py2app': OPTIONS},
-    setup_requires=['py2app'],
-)
\ No newline at end of file
+    name='OpenLP',
+    version=version,
+    description="Open source Church presentation and lyrics projection application.",
+    long_description="""\
+OpenLP (previously openlp.org) is free church presentation software, or lyrics projection software, used to display slides of songs, Bible verses, videos, images, and even presentations (if PowerPoint is installed) for church worship using a computer and a data projector.""",
+    classifiers=[], # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
+    keywords='open source church presentation lyrics projection song bible display project',
+    author='Raoul Snyman',
+    author_email='raoulsnyman@openlp.org',
+    url='http://openlp.org/',
+    license='GNU General Public License',
+    packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
+    scripts=['openlp.pyw', 'scripts/openlp-1to2-converter.py', 'scripts/bible-1to2-converter.py'],
+    include_package_data=True,
+    zip_safe=False,
+    install_requires=[
+        # -*- Extra requirements: -*-
+    ],
+    entry_points="""
+    # -*- Entry points: -*-
+    """
+)
diff --git a/version.txt b/version.txt
index f89837461..90ad4fc3a 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.9.0-705
+1.9.0-716