diff --git a/openlp/core/ui/alertstab.py b/openlp/core/ui/alertstab.py
index bde977940..706c4aa5f 100644
--- a/openlp/core/ui/alertstab.py
+++ b/openlp/core/ui/alertstab.py
@@ -19,6 +19,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
 """
 
 from PyQt4 import QtCore, QtGui
+from PyQt4.QtGui import QColor
 
 from openlp.core import translate
 from openlp.core.lib import SettingsTab
@@ -30,6 +31,7 @@ class AlertsTab(SettingsTab):
     """
     def __init__(self):
         SettingsTab.__init__(self, u'Alerts')
+        self.load()
 
     def setupUi(self):
         self.setObjectName(u'AlertsTab')
@@ -64,22 +66,35 @@ class AlertsTab(SettingsTab):
         self.FontColorLabel = QtGui.QLabel(self.ColorWidget)
         self.FontColorLabel.setObjectName(u'FontColorLabel')
         self.ColorLayout.addWidget(self.FontColorLabel)
-        self.FontColorPanel = QtGui.QGraphicsView(self.ColorWidget)
-        self.FontColorPanel.setMinimumSize(QtCore.QSize(24, 24))
-        self.FontColorPanel.setMaximumSize(QtCore.QSize(24, 24))
-        self.FontColorPanel.setObjectName(u'FontColorPanel')
-        self.ColorLayout.addWidget(self.FontColorPanel)
+
+        self.FontColourButton = QtGui.QPushButton(self.ColorWidget)
+        self.FontColourButton.setObjectName("FontColourButton")
+        self.ColorLayout.addWidget(self.FontColourButton)
+
+#        self.FontColorPanel = QtGui.QGraphicsView(self.ColorWidget)
+#        self.FontColorPanel.setMinimumSize(QtCore.QSize(24, 24))
+#        self.FontColorPanel.setMaximumSize(QtCore.QSize(24, 24))
+#        self.FontColorPanel.setObjectName(u'FontColorPanel')
+#        self.ColorLayout.addWidget(self.FontColorPanel)
+
         self.ColorSpacerItem = QtGui.QSpacerItem(40, 20,
             QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
         self.ColorLayout.addItem(self.ColorSpacerItem)
         self.BackgroundColorLabel = QtGui.QLabel(self.ColorWidget)
         self.BackgroundColorLabel.setObjectName(u'BackgroundColorLabel')
         self.ColorLayout.addWidget(self.BackgroundColorLabel)
-        self.BackgroundColorPanel = QtGui.QGraphicsView(self.ColorWidget)
-        self.BackgroundColorPanel.setMinimumSize(QtCore.QSize(24, 24))
-        self.BackgroundColorPanel.setMaximumSize(QtCore.QSize(24, 24))
-        self.BackgroundColorPanel.setObjectName(u'BackgroundColorPanel')
-        self.ColorLayout.addWidget(self.BackgroundColorPanel)
+        
+        self.BackgroundColourButton = QtGui.QPushButton(self.ColorWidget)
+        self.BackgroundColourButton.setObjectName("BackgroundColourButton")
+        self.ColorLayout.addWidget(self.BackgroundColourButton)
+        
+#        self.BackgroundColorPanel = QtGui.QGraphicsView(self.ColorWidget)
+#        self.BackgroundColorPanel.setMinimumSize(QtCore.QSize(24, 24))
+#        self.BackgroundColorPanel.setMaximumSize(QtCore.QSize(24, 24))
+#        self.BackgroundColorPanel.setObjectName(u'BackgroundColorPanel')
+#        self.ColorLayout.addWidget(self.BackgroundColorPanel)
+        
+        
         self.FontLayout.addWidget(self.ColorWidget)
         self.LengthWidget = QtGui.QWidget(self.FontGroupBox)
         self.LengthWidget.setObjectName(u'LengthWidget')
@@ -131,7 +146,8 @@ class AlertsTab(SettingsTab):
         self.SlideRightLayout.addItem(self.SlideRightSpacer)
         self.AlertsLayout.addWidget(self.AlertRightColumn)
         
-        QtCore.QObject.connect(self.BackgroundColorPanel, QtCore.SIGNAL("pressed()"), self.onBackgroundColorPanelclicked)    
+        QtCore.QObject.connect(self.BackgroundColourButton, QtCore.SIGNAL("pressed()"), self.onBackgroundColourButtonclicked)
+        QtCore.QObject.connect(self.FontColourButton, QtCore.SIGNAL("pressed()"), self.onFontColourButtonclicked)
 
     def retranslateUi(self):
         self.FontGroupBox.setTitle(translate(u'AlertsTab', u'Font'))
@@ -142,5 +158,18 @@ class AlertsTab(SettingsTab):
         self.LengthSpinBox.setSuffix(translate(u'AlertsTab', u's'))
         self.PreviewGroupBox.setTitle(translate(u'AlertsTab', u'Preview'))
     
-    def onBackgroundColorPanelclicked(self):
+    def onBackgroundColourButtonclicked(self):
         print "pressed background"
+
+    def onFontColourButtonclicked(self):
+        print "pressed font"
+        old_name = 0
+        colour = QtGui.QColorDialog.getColor(QColor(old_name), self).name()
+        print colour
+        self.FontColourButton.setStyleSheet('background-color: %s' % colour)        
+
+    def load(self):
+        pass
+        
+    def save(self):
+        pass
diff --git a/openlp/plugins/bibles/lib/biblestab.py b/openlp/plugins/bibles/lib/biblestab.py
index be58c620e..fd478d1e9 100644
--- a/openlp/plugins/bibles/lib/biblestab.py
+++ b/openlp/plugins/bibles/lib/biblestab.py
@@ -30,6 +30,7 @@ class BiblesTab(SettingsTab):
     """
     def __init__(self):
         SettingsTab.__init__(self, u'Bibles')
+        self.load()
 
     def setupUi(self):
         self.setObjectName(u'BiblesTab')
@@ -128,28 +129,25 @@ class BiblesTab(SettingsTab):
         self.BibleSearchCheckBox.setText(translate("SettingsForm", "Search-as-you-type"))
 
     def load(self):
-        bible_output_style = self.config.get_config("bible_output_style", "Paragraph")
-        if bible_output_style == "Paragraph":
-            self.ParagraphRadioButton.setChecked()
+        bible_output_style = self.config.get_config("output style", "P")
+        if bible_output_style == "P":
+            self.ParagraphRadioButton.setChecked(True)
+            self.paragraph_format = True
         else:
-            self.VerseRadioButton.setChecked()
- #       self.SettingsOutputStyleComboBox.setCurrentIndex(int(self.config.get_config("bible_output_style", 0)))
-     #   self.SettingsVerseStyleComboBox.setCurrentIndex(int(self.config.get_config("bible_verse_style", 0)))
-   #     try:
-       #     self.SettingsNewChapterCheck.setCheckState(int(self.config.get_config("bible_new_chapter", 0)))
-        #except:
-          #  pass
+            self.VerseRadioButton.setChecked(True)
+            self.paragraph_format = False
+        display_new_chapters = self.config.get_config("display new chapters", "0")
+        #self.NewChaptersCheckBox.setState(display_new_chapters)
+        if display_new_chapters == 0:
+            self.display_new_chapters = True
+
 
     def save(self):
-        print "VRB =- ", self.VerseRadioButton.isChecked()
-        print "PRB =- ", self.ParagraphRadioButton.isChecked()
         if self.ParagraphRadioButton.isChecked():
-            self.config.set_config("bible_output_style", "Paragraph")
+            self.config.set_config("output style", "P")
         else:
-            self.config.set_config("bible_output_style", "Verse")
-        print "NCCB =- ", self.NewChaptersCheckBox.checkState()
-        print "DSCB =- ", self.DisplayStyleComboBox.currentIndex()
-        print "BSCB =- ",self.BibleSearchCheckBox.checkState()
-        #self.config.set_config("bible_output_style", str(self.SettingsOutputStyleComboBox.currentIndex()))
-        #self.config.set_config("bible_verse_style", str(self.SettingsVerseStyleComboBox.currentIndex()))
-        #self.config.set_config("bible_new_chapter", str(self.SettingsNewChapterCheck.checkState()))
+            self.config.set_config("output style", "V")
+        self.config.set_config("display new chapter", str(self.NewChaptersCheckBox.checkState()))
+        self.config.set_config("display brackets", str(self.DisplayStyleComboBox.currentIndex()))
+        self.config.set_config("search as type", str(self.BibleSearchCheckBox.checkState()))
+
diff --git a/resources/forms/settings.ui b/resources/forms/settings.ui
index ea4b773b7..025aa46a1 100644
--- a/resources/forms/settings.ui
+++ b/resources/forms/settings.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>SettingsDialog</class>
- <widget class="QDialog" name="SettingsDialog" >
-  <property name="geometry" >
+ <widget class="QDialog" name="SettingsDialog">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,67 +10,67 @@
     <height>502</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Settings</string>
   </property>
-  <property name="windowIcon" >
-   <iconset resource="../images/openlp-2.qrc" >
+  <property name="windowIcon">
+   <iconset resource="../images/openlp-2.qrc">
     <normaloff>:/icon/openlp.org-icon-32.bmp</normaloff>:/icon/openlp.org-icon-32.bmp</iconset>
   </property>
-  <layout class="QVBoxLayout" name="SettingsLayout" >
-   <property name="spacing" >
+  <layout class="QVBoxLayout" name="SettingsLayout">
+   <property name="spacing">
     <number>8</number>
    </property>
-   <property name="margin" >
+   <property name="margin">
     <number>8</number>
    </property>
    <item>
-    <widget class="QTabWidget" name="SettingsTabWidget" >
-     <property name="currentIndex" >
-      <number>0</number>
+    <widget class="QTabWidget" name="SettingsTabWidget">
+     <property name="currentIndex">
+      <number>2</number>
      </property>
-     <widget class="QWidget" name="GeneralTab" >
-      <attribute name="title" >
+     <widget class="QWidget" name="GeneralTab">
+      <attribute name="title">
        <string>General</string>
       </attribute>
-      <layout class="QHBoxLayout" name="GeneralLayout" >
-       <property name="spacing" >
+      <layout class="QHBoxLayout" name="GeneralLayout">
+       <property name="spacing">
         <number>8</number>
        </property>
-       <property name="margin" >
+       <property name="margin">
         <number>8</number>
        </property>
        <item>
-        <widget class="QWidget" native="1" name="GeneralLeftWidget" >
-         <layout class="QVBoxLayout" name="verticalLayout" >
+        <widget class="QWidget" name="GeneralLeftWidget" native="true">
+         <layout class="QVBoxLayout" name="verticalLayout">
           <item>
-           <widget class="QGroupBox" name="MonitorGroupBox" >
-            <property name="title" >
+           <widget class="QGroupBox" name="MonitorGroupBox">
+            <property name="title">
              <string>Monitors</string>
             </property>
-            <layout class="QVBoxLayout" name="MonitorLayout" >
-             <property name="spacing" >
+            <layout class="QVBoxLayout" name="MonitorLayout">
+             <property name="spacing">
               <number>8</number>
              </property>
-             <property name="margin" >
+             <property name="margin">
               <number>8</number>
              </property>
              <item>
-              <widget class="QLabel" name="MonitorLabel" >
-               <property name="text" >
+              <widget class="QLabel" name="MonitorLabel">
+               <property name="text">
                 <string>Select monitor for output display:</string>
                </property>
               </widget>
              </item>
              <item>
-              <widget class="QComboBox" name="MonitorComboBox" >
+              <widget class="QComboBox" name="MonitorComboBox">
                <item>
-                <property name="text" >
+                <property name="text">
                  <string>Monitor 1 on X11 Windowing System</string>
                 </property>
                </item>
                <item>
-                <property name="text" >
+                <property name="text">
                  <string>Monitor 2 on X11 Windowing System</string>
                 </property>
                </item>
@@ -79,20 +80,20 @@
            </widget>
           </item>
           <item>
-           <widget class="QGroupBox" name="BlankScreenGroupBox" >
-            <property name="title" >
+           <widget class="QGroupBox" name="BlankScreenGroupBox">
+            <property name="title">
              <string>Blank Screen</string>
             </property>
-            <layout class="QVBoxLayout" name="BlankScreenLayout" >
-             <property name="spacing" >
+            <layout class="QVBoxLayout" name="BlankScreenLayout">
+             <property name="spacing">
               <number>8</number>
              </property>
-             <property name="margin" >
+             <property name="margin">
               <number>8</number>
              </property>
              <item>
-              <widget class="QCheckBox" name="WarningCheckBox" >
-               <property name="text" >
+              <widget class="QCheckBox" name="WarningCheckBox">
+               <property name="text">
                 <string>Show warning on startup</string>
                </property>
               </widget>
@@ -101,14 +102,14 @@
            </widget>
           </item>
           <item>
-           <widget class="QGroupBox" name="AutoOpenGroupBox" >
-            <property name="title" >
+           <widget class="QGroupBox" name="AutoOpenGroupBox">
+            <property name="title">
              <string>Auto Open Last Service</string>
             </property>
-            <layout class="QVBoxLayout" name="AutoOpenLayout" >
+            <layout class="QVBoxLayout" name="AutoOpenLayout">
              <item>
-              <widget class="QCheckBox" name="AutoOpenCheckBox" >
-               <property name="text" >
+              <widget class="QCheckBox" name="AutoOpenCheckBox">
+               <property name="text">
                 <string>Automatically open the last service at startup</string>
                </property>
               </widget>
@@ -117,11 +118,11 @@
            </widget>
           </item>
           <item>
-           <spacer name="GeneralLeftSpacer" >
-            <property name="orientation" >
+           <spacer name="GeneralLeftSpacer">
+            <property name="orientation">
              <enum>Qt::Vertical</enum>
             </property>
-            <property name="sizeHint" stdset="0" >
+            <property name="sizeHint" stdset="0">
              <size>
               <width>20</width>
               <height>40</height>
@@ -133,56 +134,56 @@
         </widget>
        </item>
        <item>
-        <widget class="QWidget" native="1" name="GeneralRightWidget" >
-         <layout class="QVBoxLayout" name="GeneralRightLayout" >
-          <property name="spacing" >
+        <widget class="QWidget" name="GeneralRightWidget" native="true">
+         <layout class="QVBoxLayout" name="GeneralRightLayout">
+          <property name="spacing">
            <number>8</number>
           </property>
-          <property name="margin" >
+          <property name="margin">
            <number>0</number>
           </property>
           <item>
-           <widget class="QGroupBox" name="CCLIGroupBox" >
-            <property name="title" >
+           <widget class="QGroupBox" name="CCLIGroupBox">
+            <property name="title">
              <string>CCLI Details</string>
             </property>
-            <layout class="QGridLayout" name="CCLILayout" >
-             <property name="margin" >
+            <layout class="QGridLayout" name="CCLILayout">
+             <property name="margin">
               <number>8</number>
              </property>
-             <property name="spacing" >
+             <property name="spacing">
               <number>8</number>
              </property>
-             <item row="0" column="0" >
-              <widget class="QLabel" name="NumberLabel" >
-               <property name="text" >
+             <item row="0" column="0">
+              <widget class="QLabel" name="NumberLabel">
+               <property name="text">
                 <string>CCLI Number:</string>
                </property>
               </widget>
              </item>
-             <item row="0" column="1" >
-              <widget class="QLineEdit" name="NumberEdit" />
+             <item row="0" column="1">
+              <widget class="QLineEdit" name="NumberEdit"/>
              </item>
-             <item row="1" column="0" >
-              <widget class="QLabel" name="UsernameLabel" >
-               <property name="text" >
+             <item row="1" column="0">
+              <widget class="QLabel" name="UsernameLabel">
+               <property name="text">
                 <string>SongSelect Username:</string>
                </property>
               </widget>
              </item>
-             <item row="1" column="1" >
-              <widget class="QLineEdit" name="UsernameEdit" />
+             <item row="1" column="1">
+              <widget class="QLineEdit" name="UsernameEdit"/>
              </item>
-             <item row="2" column="0" >
-              <widget class="QLabel" name="PasswordLabel" >
-               <property name="text" >
+             <item row="2" column="0">
+              <widget class="QLabel" name="PasswordLabel">
+               <property name="text">
                 <string>SongSelect Password:</string>
                </property>
               </widget>
              </item>
-             <item row="2" column="1" >
-              <widget class="QLineEdit" name="PasswordEdit" >
-               <property name="echoMode" >
+             <item row="2" column="1">
+              <widget class="QLineEdit" name="PasswordEdit">
+               <property name="echoMode">
                 <enum>QLineEdit::Password</enum>
                </property>
               </widget>
@@ -191,11 +192,11 @@
            </widget>
           </item>
           <item>
-           <spacer name="GeneralRightSpacer" >
-            <property name="orientation" >
+           <spacer name="GeneralRightSpacer">
+            <property name="orientation">
              <enum>Qt::Vertical</enum>
             </property>
-            <property name="sizeHint" stdset="0" >
+            <property name="sizeHint" stdset="0">
              <size>
               <width>20</width>
               <height>40</height>
@@ -208,125 +209,125 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="ThemesTab" >
-      <attribute name="title" >
+     <widget class="QWidget" name="ThemesTab">
+      <attribute name="title">
        <string>Themes</string>
       </attribute>
-      <layout class="QHBoxLayout" name="ThemesTabLayout" >
-       <property name="spacing" >
+      <layout class="QHBoxLayout" name="ThemesTabLayout">
+       <property name="spacing">
         <number>8</number>
        </property>
-       <property name="margin" >
+       <property name="margin">
         <number>8</number>
        </property>
        <item>
-        <widget class="QGroupBox" name="GlobalGroupBox" >
-         <property name="title" >
+        <widget class="QGroupBox" name="GlobalGroupBox">
+         <property name="title">
           <string>Global theme</string>
          </property>
-         <layout class="QVBoxLayout" name="GlobalGroupBoxLayout" >
-          <property name="spacing" >
+         <layout class="QVBoxLayout" name="GlobalGroupBoxLayout">
+          <property name="spacing">
            <number>8</number>
           </property>
-          <property name="margin" >
+          <property name="margin">
            <number>8</number>
           </property>
           <item>
-           <widget class="QComboBox" name="DefaultComboBox" >
+           <widget class="QComboBox" name="DefaultComboBox">
             <item>
-             <property name="text" >
+             <property name="text">
               <string>African Sunset</string>
              </property>
             </item>
             <item>
-             <property name="text" >
+             <property name="text">
               <string>Snowy Mountains</string>
              </property>
             </item>
             <item>
-             <property name="text" >
+             <property name="text">
               <string>Wilderness</string>
              </property>
             </item>
            </widget>
           </item>
           <item>
-           <widget class="QListView" name="DefaultListView" />
+           <widget class="QListView" name="DefaultListView"/>
           </item>
          </layout>
         </widget>
        </item>
        <item>
-        <widget class="QGroupBox" name="LevelGroupBox" >
-         <property name="title" >
+        <widget class="QGroupBox" name="LevelGroupBox">
+         <property name="title">
           <string>Theme level</string>
          </property>
-         <layout class="QFormLayout" name="formLayout" >
-          <property name="labelAlignment" >
+         <layout class="QFormLayout" name="formLayout">
+          <property name="labelAlignment">
            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
           </property>
-          <property name="formAlignment" >
+          <property name="formAlignment">
            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
           </property>
-          <property name="horizontalSpacing" >
+          <property name="horizontalSpacing">
            <number>8</number>
           </property>
-          <property name="verticalSpacing" >
+          <property name="verticalSpacing">
            <number>8</number>
           </property>
-          <property name="margin" >
+          <property name="margin">
            <number>8</number>
           </property>
-          <item row="0" column="0" >
-           <widget class="QRadioButton" name="SongLevelRadioButton" >
-            <property name="text" >
+          <item row="0" column="0">
+           <widget class="QRadioButton" name="SongLevelRadioButton">
+            <property name="text">
              <string>Song level</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="1" >
-           <widget class="QLabel" name="SongLevelLabel" >
-            <property name="text" >
+          <item row="0" column="1">
+           <widget class="QLabel" name="SongLevelLabel">
+            <property name="text">
              <string>Use the theme from each song in the database. If a song doesn't have a theme associated with it, then use the service's theme. If the service doesn't have a theme, then use the global theme.</string>
             </property>
-            <property name="wordWrap" >
+            <property name="wordWrap">
              <bool>true</bool>
             </property>
            </widget>
           </item>
-          <item row="1" column="0" >
-           <widget class="QRadioButton" name="ServiceLevelRadioButton" >
-            <property name="text" >
+          <item row="1" column="0">
+           <widget class="QRadioButton" name="ServiceLevelRadioButton">
+            <property name="text">
              <string>Service level</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="1" >
-           <widget class="QLabel" name="ServiceLevelLabel" >
-            <property name="text" >
+          <item row="1" column="1">
+           <widget class="QLabel" name="ServiceLevelLabel">
+            <property name="text">
              <string>Use the theme from the service , overriding any of the individual songs' themes. If the service doesn't have a theme, then use the global theme.</string>
             </property>
-            <property name="wordWrap" >
+            <property name="wordWrap">
              <bool>true</bool>
             </property>
            </widget>
           </item>
-          <item row="2" column="0" >
-           <widget class="QRadioButton" name="GlobalLevelRadioButton" >
-            <property name="text" >
+          <item row="2" column="0">
+           <widget class="QRadioButton" name="GlobalLevelRadioButton">
+            <property name="checked">
+             <bool>true</bool>
+            </property>
+            <property name="text">
              <string>Global level</string>
             </property>
-            <property name="checked" >
-             <bool>true</bool>
-            </property>
            </widget>
           </item>
-          <item row="2" column="1" >
-           <widget class="QLabel" name="GlobalLevelLabel" >
-            <property name="text" >
+          <item row="2" column="1">
+           <widget class="QLabel" name="GlobalLevelLabel">
+            <property name="text">
              <string>Use the global theme, overriding any themes associated wither either the service or the songs.</string>
             </property>
-            <property name="wordWrap" >
+            <property name="wordWrap">
              <bool>true</bool>
             </property>
            </widget>
@@ -336,86 +337,71 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="AlertsTab" >
-      <attribute name="title" >
+     <widget class="QWidget" name="AlertsTab">
+      <attribute name="title">
        <string>Alerts</string>
       </attribute>
-      <layout class="QHBoxLayout" name="AlertsLayout" >
-       <property name="spacing" >
+      <layout class="QHBoxLayout" name="AlertsLayout">
+       <property name="spacing">
         <number>8</number>
        </property>
-       <property name="margin" >
+       <property name="margin">
         <number>8</number>
        </property>
        <item>
-        <widget class="QWidget" native="1" name="AlertLeftColumn" >
-         <layout class="QVBoxLayout" name="SlideLeftLayout" >
-          <property name="spacing" >
+        <widget class="QWidget" name="AlertLeftColumn" native="true">
+         <layout class="QVBoxLayout" name="SlideLeftLayout">
+          <property name="spacing">
            <number>8</number>
           </property>
-          <property name="margin" >
+          <property name="margin">
            <number>0</number>
           </property>
           <item>
-           <widget class="QGroupBox" name="FontGroupBox" >
-            <property name="title" >
+           <widget class="QGroupBox" name="FontGroupBox">
+            <property name="title">
              <string>Font</string>
             </property>
-            <layout class="QVBoxLayout" name="FontLayout" >
-             <property name="spacing" >
+            <layout class="QVBoxLayout" name="FontLayout">
+             <property name="spacing">
               <number>8</number>
              </property>
-             <property name="margin" >
+             <property name="margin">
               <number>8</number>
              </property>
              <item>
-              <widget class="QLabel" name="FontLabel" >
-               <property name="text" >
+              <widget class="QLabel" name="FontLabel">
+               <property name="text">
                 <string>Font Name:</string>
                </property>
               </widget>
              </item>
              <item>
-              <widget class="QFontComboBox" name="FontComboBox" />
+              <widget class="QFontComboBox" name="FontComboBox"/>
              </item>
              <item>
-              <widget class="QWidget" native="1" name="ColorWidget" >
-               <layout class="QHBoxLayout" name="ColorLayout" >
-                <property name="spacing" >
-                 <number>8</number>
-                </property>
-                <property name="margin" >
-                 <number>0</number>
-                </property>
+              <widget class="QWidget" name="ColorWidget" native="true">
+               <layout class="QHBoxLayout" name="horizontalLayout">
                 <item>
-                 <widget class="QLabel" name="FontColorLabel" >
-                  <property name="text" >
+                 <widget class="QLabel" name="FontColorLabel">
+                  <property name="text">
                    <string>Font Color:</string>
                   </property>
                  </widget>
                 </item>
                 <item>
-                 <widget class="QGraphicsView" name="FontColorPanel" >
-                  <property name="minimumSize" >
-                   <size>
-                    <width>24</width>
-                    <height>24</height>
-                   </size>
-                  </property>
-                  <property name="maximumSize" >
-                   <size>
-                    <width>24</width>
-                    <height>24</height>
-                   </size>
+                 <widget class="QPushButton" name="FontColourButton">
+                  <property name="text">
+                   <string/>
                   </property>
                  </widget>
                 </item>
                 <item>
-                 <spacer name="ColorSpacer" >
-                  <property name="orientation" >
+                 <spacer name="ColorSpacer">
+                  <property name="orientation">
                    <enum>Qt::Horizontal</enum>
                   </property>
-                  <property name="sizeHint" stdset="0" >
+                  <property name="sizeHint" stdset="0">
                    <size>
                     <width>40</width>
                     <height>20</height>
@@ -424,25 +410,16 @@
                  </spacer>
                 </item>
                 <item>
-                 <widget class="QLabel" name="BackgroundColorLabel" >
-                  <property name="text" >
+                 <widget class="QLabel" name="BackgroundColorLabel">
+                  <property name="text">
                    <string>Background Color:</string>
                   </property>
                  </widget>
                 </item>
                 <item>
-                 <widget class="QGraphicsView" name="BackgroundColorPanel" >
-                  <property name="minimumSize" >
-                   <size>
-                    <width>24</width>
-                    <height>24</height>
-                   </size>
-                  </property>
-                  <property name="maximumSize" >
-                   <size>
-                    <width>24</width>
-                    <height>24</height>
-                   </size>
+                 <widget class="QPushButton" name="BackgroundColourButton">
+                  <property name="text">
+                   <string/>
                   </property>
                  </widget>
                 </item>
@@ -450,40 +427,40 @@
               </widget>
              </item>
              <item>
-              <widget class="QWidget" native="1" name="LengthWidget" >
-               <layout class="QHBoxLayout" name="LengthLayout" >
-                <property name="spacing" >
+              <widget class="QWidget" name="LengthWidget" native="true">
+               <layout class="QHBoxLayout" name="LengthLayout">
+                <property name="spacing">
                  <number>8</number>
                 </property>
-                <property name="margin" >
+                <property name="margin">
                  <number>0</number>
                 </property>
                 <item>
-                 <widget class="QLabel" name="LengthLabel" >
-                  <property name="text" >
+                 <widget class="QLabel" name="LengthLabel">
+                  <property name="text">
                    <string>Display length:</string>
                   </property>
                  </widget>
                 </item>
                 <item>
-                 <widget class="QSpinBox" name="LengthSpinBox" >
-                  <property name="suffix" >
+                 <widget class="QSpinBox" name="LengthSpinBox">
+                  <property name="value">
+                   <number>5</number>
+                  </property>
+                  <property name="suffix">
                    <string>s</string>
                   </property>
-                  <property name="maximum" >
+                  <property name="maximum">
                    <number>180</number>
                   </property>
-                  <property name="value" >
-                   <number>5</number>
-                  </property>
                  </widget>
                 </item>
                 <item>
-                 <spacer name="LengthSpacer" >
-                  <property name="orientation" >
+                 <spacer name="LengthSpacer">
+                  <property name="orientation">
                    <enum>Qt::Horizontal</enum>
                   </property>
-                  <property name="sizeHint" stdset="0" >
+                  <property name="sizeHint" stdset="0">
                    <size>
                     <width>147</width>
                     <height>20</height>
@@ -498,11 +475,11 @@
            </widget>
           </item>
           <item>
-           <spacer name="SlideLeftSpacer" >
-            <property name="orientation" >
+           <spacer name="SlideLeftSpacer">
+            <property name="orientation">
              <enum>Qt::Vertical</enum>
             </property>
-            <property name="sizeHint" stdset="0" >
+            <property name="sizeHint" stdset="0">
              <size>
               <width>20</width>
               <height>94</height>
@@ -514,35 +491,35 @@
         </widget>
        </item>
        <item>
-        <widget class="QWidget" native="1" name="SlideRightColumn" >
-         <layout class="QVBoxLayout" name="SlideRightLayout" >
-          <property name="spacing" >
+        <widget class="QWidget" name="SlideRightColumn" native="true">
+         <layout class="QVBoxLayout" name="SlideRightLayout">
+          <property name="spacing">
            <number>8</number>
           </property>
-          <property name="margin" >
+          <property name="margin">
            <number>0</number>
           </property>
           <item>
-           <widget class="QGroupBox" name="PreviewGroupBox" >
-            <property name="sizePolicy" >
-             <sizepolicy vsizetype="Minimum" hsizetype="Minimum" >
+           <widget class="QGroupBox" name="PreviewGroupBox">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="title" >
+            <property name="title">
              <string>Preview</string>
             </property>
-            <layout class="QVBoxLayout" name="PreviewLayout" >
-             <property name="spacing" >
+            <layout class="QVBoxLayout" name="PreviewLayout">
+             <property name="spacing">
               <number>8</number>
              </property>
-             <property name="margin" >
+             <property name="margin">
               <number>8</number>
              </property>
              <item>
-              <widget class="QGraphicsView" name="FontPreview" >
-               <property name="maximumSize" >
+              <widget class="QGraphicsView" name="FontPreview">
+               <property name="maximumSize">
                 <size>
                  <width>16777215</width>
                  <height>64</height>
@@ -554,11 +531,11 @@
            </widget>
           </item>
           <item>
-           <spacer name="SlideRightSpacer" >
-            <property name="orientation" >
+           <spacer name="SlideRightSpacer">
+            <property name="orientation">
              <enum>Qt::Vertical</enum>
             </property>
-            <property name="sizeHint" stdset="0" >
+            <property name="sizeHint" stdset="0">
              <size>
               <width>20</width>
               <height>40</height>
@@ -574,23 +551,23 @@
     </widget>
    </item>
    <item>
-    <widget class="QDialogButtonBox" name="ButtonsBox" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Minimum" hsizetype="Expanding" >
+    <widget class="QDialogButtonBox" name="ButtonsBox">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="maximumSize" >
+     <property name="maximumSize">
       <size>
        <width>16777215</width>
        <height>16777215</height>
       </size>
      </property>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="standardButtons" >
+     <property name="standardButtons">
       <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
@@ -598,7 +575,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="../images/openlp-2.qrc" />
+  <include location="../images/openlp-2.qrc"/>
  </resources>
  <connections>
   <connection>
@@ -607,11 +584,11 @@
    <receiver>SettingsDialog</receiver>
    <slot>accept()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>248</x>
      <y>254</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>157</x>
      <y>274</y>
     </hint>
@@ -623,11 +600,11 @@
    <receiver>SettingsDialog</receiver>
    <slot>reject()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>316</x>
      <y>260</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>286</x>
      <y>274</y>
     </hint>