diff --git a/openlp/core/lib/themexmlhandler.py b/openlp/core/lib/themexmlhandler.py
index cab3f0f45..3ce3dbce8 100644
--- a/openlp/core/lib/themexmlhandler.py
+++ b/openlp/core/lib/themexmlhandler.py
@@ -231,7 +231,10 @@ class ThemeXML():
                         setattr(self, master + element.tag +u'_'+ e[0], e[1])
                     else:
                         field = master + e[0]
-                        setattr(self, field, e[1])
+                        e1 = e[1]
+                        if e[1] == u'True' or e[1] == u'False':
+                            e1 = convertStringToBoolean(e[1])
+                        setattr(self, field, e1)
             else:
                 #print "c", element.tag, element.text
                 if element.tag is not None :
diff --git a/openlp/core/ui/amendthemedialog.py b/openlp/core/ui/amendthemedialog.py
index 0fe2dd27c..c126735a0 100644
--- a/openlp/core/ui/amendthemedialog.py
+++ b/openlp/core/ui/amendthemedialog.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'amendthemedialog.ui'
 #
-# Created: Sun Apr 19 07:51:09 2009
+# Created: Tue Apr 21 06:06:56 2009
 #      by: PyQt4 UI code generator 4.4.4
 #
 # WARNING! All changes made in this file will be lost!
@@ -121,40 +121,40 @@ class Ui_AmendThemeDialog(object):
         self.MainLeftLayout.setSpacing(8)
         self.MainLeftLayout.setMargin(0)
         self.MainLeftLayout.setObjectName("MainLeftLayout")
-        self.MainFontGroupBox = QtGui.QGroupBox(self.MainLeftWidget)
-        self.MainFontGroupBox.setObjectName("MainFontGroupBox")
-        self.MainFontLayout = QtGui.QFormLayout(self.MainFontGroupBox)
+        self.FontMainGroupBox = QtGui.QGroupBox(self.MainLeftWidget)
+        self.FontMainGroupBox.setObjectName("FontMainGroupBox")
+        self.MainFontLayout = QtGui.QFormLayout(self.FontMainGroupBox)
         self.MainFontLayout.setFormAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter)
         self.MainFontLayout.setMargin(8)
         self.MainFontLayout.setSpacing(8)
         self.MainFontLayout.setObjectName("MainFontLayout")
-        self.MainFontlabel = QtGui.QLabel(self.MainFontGroupBox)
-        self.MainFontlabel.setObjectName("MainFontlabel")
-        self.MainFontLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.MainFontlabel)
-        self.MainFontComboBox = QtGui.QFontComboBox(self.MainFontGroupBox)
-        self.MainFontComboBox.setObjectName("MainFontComboBox")
-        self.MainFontLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.MainFontComboBox)
-        self.MainFontColorLabel = QtGui.QLabel(self.MainFontGroupBox)
-        self.MainFontColorLabel.setObjectName("MainFontColorLabel")
-        self.MainFontLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.MainFontColorLabel)
-        self.MainFontColorPushButton = QtGui.QPushButton(self.MainFontGroupBox)
-        self.MainFontColorPushButton.setObjectName("MainFontColorPushButton")
-        self.MainFontLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.MainFontColorPushButton)
-        self.MainFontSize = QtGui.QLabel(self.MainFontGroupBox)
-        self.MainFontSize.setObjectName("MainFontSize")
-        self.MainFontLayout.setWidget(2, QtGui.QFormLayout.LabelRole, self.MainFontSize)
-        self.MainFontSizeSpinBox = QtGui.QSpinBox(self.MainFontGroupBox)
+        self.FontMainlabel = QtGui.QLabel(self.FontMainGroupBox)
+        self.FontMainlabel.setObjectName("FontMainlabel")
+        self.MainFontLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.FontMainlabel)
+        self.FontMainComboBox = QtGui.QFontComboBox(self.FontMainGroupBox)
+        self.FontMainComboBox.setObjectName("FontMainComboBox")
+        self.MainFontLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.FontMainComboBox)
+        self.FontMainColorLabel = QtGui.QLabel(self.FontMainGroupBox)
+        self.FontMainColorLabel.setObjectName("FontMainColorLabel")
+        self.MainFontLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.FontMainColorLabel)
+        self.FontMainColorPushButton = QtGui.QPushButton(self.FontMainGroupBox)
+        self.FontMainColorPushButton.setObjectName("FontMainColorPushButton")
+        self.MainFontLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.FontMainColorPushButton)
+        self.FontMainSize = QtGui.QLabel(self.FontMainGroupBox)
+        self.FontMainSize.setObjectName("FontMainSize")
+        self.MainFontLayout.setWidget(2, QtGui.QFormLayout.LabelRole, self.FontMainSize)
+        self.FontMainSizeSpinBox = QtGui.QSpinBox(self.FontMainGroupBox)
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.MainFontSizeSpinBox.sizePolicy().hasHeightForWidth())
-        self.MainFontSizeSpinBox.setSizePolicy(sizePolicy)
-        self.MainFontSizeSpinBox.setMinimumSize(QtCore.QSize(70, 0))
-        self.MainFontSizeSpinBox.setMaximum(999)
-        self.MainFontSizeSpinBox.setProperty("value", QtCore.QVariant(16))
-        self.MainFontSizeSpinBox.setObjectName("MainFontSizeSpinBox")
-        self.MainFontLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.MainFontSizeSpinBox)
-        self.MainLeftLayout.addWidget(self.MainFontGroupBox)
+        sizePolicy.setHeightForWidth(self.FontMainSizeSpinBox.sizePolicy().hasHeightForWidth())
+        self.FontMainSizeSpinBox.setSizePolicy(sizePolicy)
+        self.FontMainSizeSpinBox.setMinimumSize(QtCore.QSize(70, 0))
+        self.FontMainSizeSpinBox.setProperty("value", QtCore.QVariant(16))
+        self.FontMainSizeSpinBox.setMaximum(999)
+        self.FontMainSizeSpinBox.setObjectName("FontMainSizeSpinBox")
+        self.MainFontLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.FontMainSizeSpinBox)
+        self.MainLeftLayout.addWidget(self.FontMainGroupBox)
         spacerItem1 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
         self.MainLeftLayout.addItem(spacerItem1)
         self.FontMainLayout.addWidget(self.MainLeftWidget)
@@ -173,10 +173,10 @@ class Ui_AmendThemeDialog(object):
         self.DefaultLocationLabel = QtGui.QLabel(self.MainLocationGroupBox)
         self.DefaultLocationLabel.setObjectName("DefaultLocationLabel")
         self.MainLocationLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.DefaultLocationLabel)
-        self.FontMainUseDefault = QtGui.QCheckBox(self.MainLocationGroupBox)
-        self.FontMainUseDefault.setTristate(False)
-        self.FontMainUseDefault.setObjectName("FontMainUseDefault")
-        self.MainLocationLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.FontMainUseDefault)
+        self.FontMainDefaultCheckBox = QtGui.QCheckBox(self.MainLocationGroupBox)
+        self.FontMainDefaultCheckBox.setTristate(False)
+        self.FontMainDefaultCheckBox.setObjectName("FontMainDefaultCheckBox")
+        self.MainLocationLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.FontMainDefaultCheckBox)
         self.FontMainXLabel = QtGui.QLabel(self.MainLocationGroupBox)
         self.FontMainXLabel.setObjectName("FontMainXLabel")
         self.MainLocationLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.FontMainXLabel)
@@ -196,8 +196,8 @@ class Ui_AmendThemeDialog(object):
         sizePolicy.setHeightForWidth(self.FontMainXSpinBox.sizePolicy().hasHeightForWidth())
         self.FontMainXSpinBox.setSizePolicy(sizePolicy)
         self.FontMainXSpinBox.setMinimumSize(QtCore.QSize(78, 0))
-        self.FontMainXSpinBox.setMaximum(9999)
         self.FontMainXSpinBox.setProperty("value", QtCore.QVariant(0))
+        self.FontMainXSpinBox.setMaximum(9999)
         self.FontMainXSpinBox.setObjectName("FontMainXSpinBox")
         self.MainLocationLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.FontMainXSpinBox)
         self.FontMainYSpinBox = QtGui.QSpinBox(self.MainLocationGroupBox)
@@ -277,8 +277,8 @@ class Ui_AmendThemeDialog(object):
         sizePolicy.setHeightForWidth(self.FontFooterSizeSpinBox.sizePolicy().hasHeightForWidth())
         self.FontFooterSizeSpinBox.setSizePolicy(sizePolicy)
         self.FontFooterSizeSpinBox.setMinimumSize(QtCore.QSize(70, 0))
-        self.FontFooterSizeSpinBox.setMaximum(999)
         self.FontFooterSizeSpinBox.setProperty("value", QtCore.QVariant(10))
+        self.FontFooterSizeSpinBox.setMaximum(999)
         self.FontFooterSizeSpinBox.setObjectName("FontFooterSizeSpinBox")
         self.FooterFontLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.FontFooterSizeSpinBox)
         self.FooterLeftLayout.addWidget(self.FooterFontGroupBox)
@@ -325,8 +325,8 @@ class Ui_AmendThemeDialog(object):
         sizePolicy.setHeightForWidth(self.FontFooterXSpinBox.sizePolicy().hasHeightForWidth())
         self.FontFooterXSpinBox.setSizePolicy(sizePolicy)
         self.FontFooterXSpinBox.setMinimumSize(QtCore.QSize(78, 0))
-        self.FontFooterXSpinBox.setMaximum(9999)
         self.FontFooterXSpinBox.setProperty("value", QtCore.QVariant(0))
+        self.FontFooterXSpinBox.setMaximum(9999)
         self.FontFooterXSpinBox.setObjectName("FontFooterXSpinBox")
         self.LocationFooterLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.FontFooterXSpinBox)
         self.FontFooterYSpinBox = QtGui.QSpinBox(self.LocationFooterGroupBox)
@@ -336,15 +336,15 @@ class Ui_AmendThemeDialog(object):
         sizePolicy.setHeightForWidth(self.FontFooterYSpinBox.sizePolicy().hasHeightForWidth())
         self.FontFooterYSpinBox.setSizePolicy(sizePolicy)
         self.FontFooterYSpinBox.setMinimumSize(QtCore.QSize(78, 0))
-        self.FontFooterYSpinBox.setMaximum(9999)
         self.FontFooterYSpinBox.setProperty("value", QtCore.QVariant(0))
+        self.FontFooterYSpinBox.setMaximum(9999)
         self.FontFooterYSpinBox.setObjectName("FontFooterYSpinBox")
         self.LocationFooterLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.FontFooterYSpinBox)
-        self.FontFooterWidthspinBox = QtGui.QSpinBox(self.LocationFooterGroupBox)
-        self.FontFooterWidthspinBox.setMinimumSize(QtCore.QSize(78, 0))
-        self.FontFooterWidthspinBox.setMaximum(9999)
-        self.FontFooterWidthspinBox.setObjectName("FontFooterWidthspinBox")
-        self.LocationFooterLayout.setWidget(3, QtGui.QFormLayout.FieldRole, self.FontFooterWidthspinBox)
+        self.FontFooterWidthSpinBox = QtGui.QSpinBox(self.LocationFooterGroupBox)
+        self.FontFooterWidthSpinBox.setMinimumSize(QtCore.QSize(78, 0))
+        self.FontFooterWidthSpinBox.setMaximum(9999)
+        self.FontFooterWidthSpinBox.setObjectName("FontFooterWidthSpinBox")
+        self.LocationFooterLayout.setWidget(3, QtGui.QFormLayout.FieldRole, self.FontFooterWidthSpinBox)
         self.FontFooterHeightSpinBox = QtGui.QSpinBox(self.LocationFooterGroupBox)
         self.FontFooterHeightSpinBox.setMinimumSize(QtCore.QSize(78, 0))
         self.FontFooterHeightSpinBox.setMaximum(9999)
@@ -493,11 +493,11 @@ class Ui_AmendThemeDialog(object):
         AmendThemeDialog.setTabOrder(self.Color2PushButton, self.ImageLineEdit)
         AmendThemeDialog.setTabOrder(self.ImageLineEdit, self.ImageToolButton)
         AmendThemeDialog.setTabOrder(self.ImageToolButton, self.GradientComboBox)
-        AmendThemeDialog.setTabOrder(self.GradientComboBox, self.MainFontComboBox)
-        AmendThemeDialog.setTabOrder(self.MainFontComboBox, self.MainFontColorPushButton)
-        AmendThemeDialog.setTabOrder(self.MainFontColorPushButton, self.MainFontSizeSpinBox)
-        AmendThemeDialog.setTabOrder(self.MainFontSizeSpinBox, self.FontMainUseDefault)
-        AmendThemeDialog.setTabOrder(self.FontMainUseDefault, self.FontMainXSpinBox)
+        AmendThemeDialog.setTabOrder(self.GradientComboBox, self.FontMainComboBox)
+        AmendThemeDialog.setTabOrder(self.FontMainComboBox, self.FontMainColorPushButton)
+        AmendThemeDialog.setTabOrder(self.FontMainColorPushButton, self.FontMainSizeSpinBox)
+        AmendThemeDialog.setTabOrder(self.FontMainSizeSpinBox, self.FontMainDefaultCheckBox)
+        AmendThemeDialog.setTabOrder(self.FontMainDefaultCheckBox, self.FontMainXSpinBox)
         AmendThemeDialog.setTabOrder(self.FontMainXSpinBox, self.FontMainYSpinBox)
         AmendThemeDialog.setTabOrder(self.FontMainYSpinBox, self.FontMainWidthSpinBox)
         AmendThemeDialog.setTabOrder(self.FontMainWidthSpinBox, self.FontMainHeightSpinBox)
@@ -507,8 +507,8 @@ class Ui_AmendThemeDialog(object):
         AmendThemeDialog.setTabOrder(self.FontFooterSizeSpinBox, self.FontFooterDefaultCheckBox)
         AmendThemeDialog.setTabOrder(self.FontFooterDefaultCheckBox, self.FontFooterXSpinBox)
         AmendThemeDialog.setTabOrder(self.FontFooterXSpinBox, self.FontFooterYSpinBox)
-        AmendThemeDialog.setTabOrder(self.FontFooterYSpinBox, self.FontFooterWidthspinBox)
-        AmendThemeDialog.setTabOrder(self.FontFooterWidthspinBox, self.FontFooterHeightSpinBox)
+        AmendThemeDialog.setTabOrder(self.FontFooterYSpinBox, self.FontFooterWidthSpinBox)
+        AmendThemeDialog.setTabOrder(self.FontFooterWidthSpinBox, self.FontFooterHeightSpinBox)
         AmendThemeDialog.setTabOrder(self.FontFooterHeightSpinBox, self.OutlineCheckBox)
         AmendThemeDialog.setTabOrder(self.OutlineCheckBox, self.OutlineColorPushButton)
         AmendThemeDialog.setTabOrder(self.OutlineColorPushButton, self.ShadowCheckBox)
@@ -534,11 +534,11 @@ class Ui_AmendThemeDialog(object):
         self.GradientComboBox.setItemText(1, QtGui.QApplication.translate("AmendThemeDialog", "Vertical", None, QtGui.QApplication.UnicodeUTF8))
         self.GradientComboBox.setItemText(2, QtGui.QApplication.translate("AmendThemeDialog", "Circular", None, QtGui.QApplication.UnicodeUTF8))
         self.ThemeTabWidget.setTabText(self.ThemeTabWidget.indexOf(self.BackgroundTab), QtGui.QApplication.translate("AmendThemeDialog", "Background", None, QtGui.QApplication.UnicodeUTF8))
-        self.MainFontGroupBox.setTitle(QtGui.QApplication.translate("AmendThemeDialog", "Main Font", None, QtGui.QApplication.UnicodeUTF8))
-        self.MainFontlabel.setText(QtGui.QApplication.translate("AmendThemeDialog", "Font:", None, QtGui.QApplication.UnicodeUTF8))
-        self.MainFontColorLabel.setText(QtGui.QApplication.translate("AmendThemeDialog", "Font Color:", None, QtGui.QApplication.UnicodeUTF8))
-        self.MainFontSize.setText(QtGui.QApplication.translate("AmendThemeDialog", "Size:", None, QtGui.QApplication.UnicodeUTF8))
-        self.MainFontSizeSpinBox.setSuffix(QtGui.QApplication.translate("AmendThemeDialog", "pt", None, QtGui.QApplication.UnicodeUTF8))
+        self.FontMainGroupBox.setTitle(QtGui.QApplication.translate("AmendThemeDialog", "Main Font", None, QtGui.QApplication.UnicodeUTF8))
+        self.FontMainlabel.setText(QtGui.QApplication.translate("AmendThemeDialog", "Font:", None, QtGui.QApplication.UnicodeUTF8))
+        self.FontMainColorLabel.setText(QtGui.QApplication.translate("AmendThemeDialog", "Font Color:", None, QtGui.QApplication.UnicodeUTF8))
+        self.FontMainSize.setText(QtGui.QApplication.translate("AmendThemeDialog", "Size:", None, QtGui.QApplication.UnicodeUTF8))
+        self.FontMainSizeSpinBox.setSuffix(QtGui.QApplication.translate("AmendThemeDialog", "pt", None, QtGui.QApplication.UnicodeUTF8))
         self.MainLocationGroupBox.setTitle(QtGui.QApplication.translate("AmendThemeDialog", "Display Location", None, QtGui.QApplication.UnicodeUTF8))
         self.DefaultLocationLabel.setText(QtGui.QApplication.translate("AmendThemeDialog", "Use Default Location:", None, QtGui.QApplication.UnicodeUTF8))
         self.FontMainXLabel.setText(QtGui.QApplication.translate("AmendThemeDialog", "X Position:", None, QtGui.QApplication.UnicodeUTF8))
@@ -563,7 +563,7 @@ class Ui_AmendThemeDialog(object):
         self.FontFooterHeightLabel.setText(QtGui.QApplication.translate("AmendThemeDialog", "Height:", None, QtGui.QApplication.UnicodeUTF8))
         self.FontFooterXSpinBox.setSuffix(QtGui.QApplication.translate("AmendThemeDialog", "px", None, QtGui.QApplication.UnicodeUTF8))
         self.FontFooterYSpinBox.setSuffix(QtGui.QApplication.translate("AmendThemeDialog", "px", None, QtGui.QApplication.UnicodeUTF8))
-        self.FontFooterWidthspinBox.setSuffix(QtGui.QApplication.translate("AmendThemeDialog", "px", None, QtGui.QApplication.UnicodeUTF8))
+        self.FontFooterWidthSpinBox.setSuffix(QtGui.QApplication.translate("AmendThemeDialog", "px", None, QtGui.QApplication.UnicodeUTF8))
         self.FontFooterHeightSpinBox.setSuffix(QtGui.QApplication.translate("AmendThemeDialog", "px", None, QtGui.QApplication.UnicodeUTF8))
         self.ThemeTabWidget.setTabText(self.ThemeTabWidget.indexOf(self.FontFooterTab), QtGui.QApplication.translate("AmendThemeDialog", "Font Footer", None, QtGui.QApplication.UnicodeUTF8))
         self.ShadowGroupBox.setTitle(QtGui.QApplication.translate("AmendThemeDialog", "Shadow && Outline", None, QtGui.QApplication.UnicodeUTF8))
diff --git a/openlp/core/ui/amendthemeform.py b/openlp/core/ui/amendthemeform.py
index a5d283b8a..587198ce3 100644
--- a/openlp/core/ui/amendthemeform.py
+++ b/openlp/core/ui/amendthemeform.py
@@ -36,6 +36,7 @@ class AmendThemeForm(QtGui.QDialog,  Ui_AmendThemeDialog):
     def __init__(self, thememanager, parent=None):
         QtGui.QDialog.__init__(self, parent)
         self.thememanager = thememanager
+        self.theme = ThemeXML() # Needed here as UI setup generates Events
         self.setupUi(self)
 
         #define signals
@@ -44,8 +45,8 @@ class AmendThemeForm(QtGui.QDialog,  Ui_AmendThemeDialog):
             QtCore.SIGNAL("pressed()"), self.onColor1PushButtonClicked)
         QtCore.QObject.connect(self.Color2PushButton ,
             QtCore.SIGNAL("pressed()"), self.onColor2PushButtonClicked)
-        QtCore.QObject.connect(self.MainFontColorPushButton,
-            QtCore.SIGNAL("pressed()"), self.onMainFontColorPushButtonClicked)
+        QtCore.QObject.connect(self.FontMainColorPushButton,
+            QtCore.SIGNAL("pressed()"), self.onFontMainColorPushButtonClicked)
         QtCore.QObject.connect(self.FontFooterColorPushButton,
             QtCore.SIGNAL("pressed()"), self.onFontFooterColorPushButtonClicked)
         #Combo boxes
@@ -55,14 +56,35 @@ class AmendThemeForm(QtGui.QDialog,  Ui_AmendThemeDialog):
             QtCore.SIGNAL("activated(int)"), self.onBackgroundTypeComboBoxSelected)
         QtCore.QObject.connect(self.GradientComboBox,
             QtCore.SIGNAL("activated(int)"), self.onGradientComboBoxSelected)
-        QtCore.QObject.connect(self.MainFontComboBox,
-            QtCore.SIGNAL("activated(int)"), self.onMainFontComboBoxSelected)
+        QtCore.QObject.connect(self.FontMainComboBox,
+            QtCore.SIGNAL("activated(int)"), self.onFontMainComboBoxSelected)
         QtCore.QObject.connect(self.FontFooterComboBox,
             QtCore.SIGNAL("activated(int)"), self.onFontFooterComboBoxSelected)
-        QtCore.QObject.connect(self.MainFontSizeSpinBox,
-            QtCore.SIGNAL("valueChanged(int)"), self.onMainFontSizeSpinBoxChanged)
+        QtCore.QObject.connect(self.FontMainSizeSpinBox,
+            QtCore.SIGNAL("valueChanged(int)"), self.onFontMainSizeSpinBoxChanged)
         QtCore.QObject.connect(self.FontFooterSizeSpinBox,
             QtCore.SIGNAL("valueChanged(int)"), self.onFontFooterSizeSpinBoxChanged)
+        QtCore.QObject.connect(self.FontMainDefaultCheckBox,
+            QtCore.SIGNAL("stateChanged(int)"), self.onFontMainDefaultCheckBoxChanged)
+        QtCore.QObject.connect(self.FontMainXSpinBox,
+            QtCore.SIGNAL("valueChanged(int)"), self.onFontMainXSpinBoxChanged)
+        QtCore.QObject.connect(self.FontMainYSpinBox,
+            QtCore.SIGNAL("valueChanged(int)"), self.onFontMainYSpinBoxChanged)
+        QtCore.QObject.connect(self.FontMainWidthSpinBox,
+            QtCore.SIGNAL("valueChanged(int)"), self.onFontMainWidthSpinBoxChanged)
+        QtCore.QObject.connect(self.FontMainHeightSpinBox,
+            QtCore.SIGNAL("valueChanged(int)"), self.onFontMainHeightSpinBoxChanged)
+        QtCore.QObject.connect(self.FontFooterDefaultCheckBox,
+            QtCore.SIGNAL("stateChanged(int)"), self.onFontFooterDefaultCheckBoxChanged)
+        QtCore.QObject.connect(self.FontFooterXSpinBox,
+            QtCore.SIGNAL("valueChanged(int)"), self.onFontFooterXSpinBoxChanged)
+        QtCore.QObject.connect(self.FontFooterYSpinBox,
+            QtCore.SIGNAL("valueChanged(int)"), self.onFontFooterYSpinBoxChanged)
+        QtCore.QObject.connect(self.FontFooterWidthSpinBox,
+            QtCore.SIGNAL("valueChanged(int)"), self.onFontFooterWidthSpinBoxChanged)
+        QtCore.QObject.connect(self.FontFooterHeightSpinBox,
+            QtCore.SIGNAL("valueChanged(int)"), self.onFontFooterHeightSpinBoxChanged)
+
 
     def accept(self):
         return QtGui.QDialog.accept(self)
@@ -71,7 +93,6 @@ class AmendThemeForm(QtGui.QDialog,  Ui_AmendThemeDialog):
         self.path = path
 
     def loadTheme(self, theme):
-        self.theme = ThemeXML()
         if theme == None:
             self.theme.parse(self.baseTheme())
         else:
@@ -84,14 +105,39 @@ class AmendThemeForm(QtGui.QDialog,  Ui_AmendThemeDialog):
     #
     #Main Font Tab
     #
-    def onMainFontComboBoxSelected(self):
-        self.theme.font_main_name = self.MainFontComboBox.currentFont().family()
+    def onFontMainComboBoxSelected(self):
+        self.theme.font_main_name = self.FontMainComboBox.currentFont().family()
         self.previewTheme(self.theme)
 
-    def onMainFontSizeSpinBoxChanged(self, value):
+    def onFontMainSizeSpinBoxChanged(self, value):
         self.theme.font_main_proportion = value
         self.previewTheme(self.theme)
 
+    def onFontMainDefaultCheckBoxChanged(self, value):
+        if value == 2:  # checked
+            self.theme.font_main_override = False
+        else:
+            self.theme.font_main_override = True
+        self.stateChanging(self.theme)
+        self.previewTheme(self.theme)
+
+    def onFontMainXSpinBoxChanged(self, value):
+        self.theme.font_main_x = value
+        self.previewTheme(self.theme)
+
+    def onFontMainYSpinBoxChanged(self, value):
+        self.theme.font_main_y = value
+        self.previewTheme(self.theme)
+
+    def onFontMainWidthSpinBoxChanged(self, value):
+        self.theme.font_main_width = value
+        self.previewTheme(self.theme)
+
+    def onFontMainHeightSpinBoxChanged(self, value):
+        self.theme.font_main_height = value
+        self.previewTheme(self.theme)
+
+
     #
     #Footer Font Tab
     #
@@ -103,6 +149,34 @@ class AmendThemeForm(QtGui.QDialog,  Ui_AmendThemeDialog):
         self.theme.font_footer_proportion = value
         self.previewTheme(self.theme)
 
+    def onFontFooterDefaultCheckBoxChanged(self):
+        self.stateChanging(self.theme)
+        self.previewTheme(self.theme)
+
+    def onFontFooterDefaultCheckBoxChanged(self, value):
+        if value == 2:  # checked
+            self.theme.font_footer_override = False
+        else:
+            self.theme.font_footer_override = True
+        self.stateChanging(self.theme)
+        self.previewTheme(self.theme)
+
+    def onFontFooterXSpinBoxChanged(self, value):
+        self.theme.font_footer_x = value
+        self.previewTheme(self.theme)
+
+    def onFontFooterYSpinBoxChanged(self, value):
+        self.theme.font_footer_y = value
+        self.previewTheme(self.theme)
+
+    def onFontFooterWidthSpinBoxChanged(self, value):
+        self.theme.font_footer_width = value
+        self.previewTheme(self.theme)
+
+    def onFontFooterHeightSpinBoxChanged(self, value):
+        self.theme.font_footer_height = value
+        self.previewTheme(self.theme)
+
     #
     #Background Tab
     #
@@ -164,11 +238,11 @@ class AmendThemeForm(QtGui.QDialog,  Ui_AmendThemeDialog):
 
         self.previewTheme(self.theme)
 
-    def onMainFontColorPushButtonClicked(self):
+    def onFontMainColorPushButtonClicked(self):
         self.theme.font_main_color = QtGui.QColorDialog.getColor(
             QColor(self.theme.font_main_color), self).name()
 
-        self.MainFontColorPushButton.setStyleSheet(
+        self.FontMainColorPushButton.setStyleSheet(
             'background-color: %s' % str(self.theme.font_main_color))
         self.previewTheme(self.theme)
 
@@ -188,8 +262,8 @@ class AmendThemeForm(QtGui.QDialog,  Ui_AmendThemeDialog):
         newtheme = ThemeXML()
         newtheme.new_document(u'New Theme')
         newtheme.add_background_solid(str(u'#000000'))
-        newtheme.add_font(str(QFont().family()), str(u'#FFFFFF'), str(30), u'False')
-        newtheme.add_font(str(QFont().family()), str(u'#FFFFFF'), str(12), u'False', u'footer')
+        newtheme.add_font(str(QFont().family()), str(u'#FFFFFF'), str(30), False)
+        newtheme.add_font(str(QFont().family()), str(u'#FFFFFF'), str(12), False, u'footer')
         newtheme.add_display(str(False), str(u'#FFFFFF'), str(False), str(u'#FFFFFF'),
             str(0), str(0), str(0))
 
@@ -215,7 +289,7 @@ class AmendThemeForm(QtGui.QDialog,  Ui_AmendThemeDialog):
         else:
             self.GradientComboBox.setCurrentIndex(2)
 
-        self.MainFontSizeSpinBox.setValue(int(self.theme.font_main_proportion))
+        self.FontMainSizeSpinBox.setValue(int(self.theme.font_main_proportion))
         self.FontMainXSpinBox.setValue(int(self.theme.font_main_x))
         self.FontMainYSpinBox.setValue(int(self.theme.font_main_y))
         self.FontMainWidthSpinBox.setValue(int(self.theme.font_main_width))
@@ -223,24 +297,22 @@ class AmendThemeForm(QtGui.QDialog,  Ui_AmendThemeDialog):
         self.FontFooterSizeSpinBox.setValue(int(self.theme.font_footer_proportion))
         self.FontFooterXSpinBox.setValue(int(self.theme.font_footer_x))
         self.FontFooterYSpinBox.setValue(int(self.theme.font_footer_y))
-        self.FontFooterWidthspinBox.setValue(int(self.theme.font_footer_width))
+        self.FontFooterWidthSpinBox.setValue(int(self.theme.font_footer_width))
         self.FontFooterHeightSpinBox.setValue(int(self.theme.font_footer_height))
-        self.MainFontColorPushButton.setStyleSheet(
+        self.FontMainColorPushButton.setStyleSheet(
             'background-color: %s' % str(theme.font_main_color))
         self.FontFooterColorPushButton.setStyleSheet(
             'background-color: %s' % str(theme.font_footer_color))
 
-        if self.theme.font_main_override == u'True':
-            self.FontMainUseDefault.setChecked(True)
+        if self.theme.font_main_override == False:
+            self.FontMainDefaultCheckBox.setChecked(True)
         else:
-            self.FontMainUseDefault.setChecked(False)
-        if self.theme.font_footer_override == u'True':
+            self.FontMainDefaultCheckBox.setChecked(False)
+        if self.theme.font_footer_override == False:
             self.FontFooterDefaultCheckBox.setChecked(True)
         else:
             self.FontFooterDefaultCheckBox.setChecked(False)
 
-
-
     def stateChanging(self, theme):
         if theme.background_type == u'solid':
             self.Color1PushButton.setStyleSheet(
@@ -282,7 +354,7 @@ class AmendThemeForm(QtGui.QDialog,  Ui_AmendThemeDialog):
             self.GradientLabel.setVisible(False)
             self.GradientComboBox.setVisible(False)
 
-        if theme.font_main_override == u'True':
+        if theme.font_main_override == False:
             self.FontMainXSpinBox.setEnabled(False)
             self.FontMainYSpinBox.setEnabled(False)
             self.FontMainWidthSpinBox.setEnabled(False)
@@ -293,18 +365,17 @@ class AmendThemeForm(QtGui.QDialog,  Ui_AmendThemeDialog):
             self.FontMainWidthSpinBox.setEnabled(True)
             self.FontMainHeightSpinBox.setEnabled(True)
 
-        if theme.font_footer_override == u'True':
+        if theme.font_footer_override == False:
             self.FontFooterXSpinBox.setEnabled(False)
             self.FontFooterYSpinBox.setEnabled(False)
-            self.FontFooterWidthspinBox.setEnabled(False)
+            self.FontFooterWidthSpinBox.setEnabled(False)
             self.FontFooterHeightSpinBox.setEnabled(False)
         else:
             self.FontFooterXSpinBox.setEnabled(True)
             self.FontFooterYSpinBox.setEnabled(True)
-            self.FontFooterWidthspinBox.setEnabled(True)
+            self.FontFooterWidthSpinBox.setEnabled(True)
             self.FontFooterHeightSpinBox.setEnabled(True)
 
-
     def previewTheme(self, theme):
         frame = self.thememanager.generateImage(theme)
         self.ThemePreview.setPixmap(frame)
diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py
index 992d7b927..70b0bb2e5 100644
--- a/openlp/core/ui/thememanager.py
+++ b/openlp/core/ui/thememanager.py
@@ -307,8 +307,8 @@ class ThemeManager(QWidget):
         else:
             newtheme.add_background_image(str(t.BackgroundParameter1))
 
-        newtheme.add_font(str(t.FontName), str(t.FontColor.name()), str(t.FontProportion * 2), u'True')
-        newtheme.add_font(str(t.FontName), str(t.FontColor.name()), str(12), u'True', u'footer')
+        newtheme.add_font(str(t.FontName), str(t.FontColor.name()), str(t.FontProportion * 2), u'False')
+        newtheme.add_font(str(t.FontName), str(t.FontColor.name()), str(12), u'False', u'footer')
         outline = False
         shadow = False
         if t.Shadow == 1:
diff --git a/resources/forms/amendthemedialog.ui b/resources/forms/amendthemedialog.ui
index febdd98bf..84fa8b7bd 100644
--- a/resources/forms/amendthemedialog.ui
+++ b/resources/forms/amendthemedialog.ui
@@ -1,10 +1,11 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>AmendThemeDialog</class>
- <widget class="QDialog" name="AmendThemeDialog" >
-  <property name="windowModality" >
+ <widget class="QDialog" name="AmendThemeDialog">
+  <property name="windowModality">
    <enum>Qt::ApplicationModal</enum>
   </property>
-  <property name="geometry" >
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -12,200 +13,200 @@
     <height>651</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Theme Maintance</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>
-  <property name="modal" >
+  <property name="modal">
    <bool>true</bool>
   </property>
-  <layout class="QVBoxLayout" name="AmendThemeLayout" >
-   <property name="spacing" >
+  <layout class="QVBoxLayout" name="AmendThemeLayout">
+   <property name="spacing">
     <number>8</number>
    </property>
-   <property name="margin" >
+   <property name="margin">
     <number>8</number>
    </property>
    <item>
-    <widget class="QWidget" native="1" name="ThemeNameWidget" >
-     <layout class="QHBoxLayout" name="ThemeNameLayout" >
-      <property name="spacing" >
+    <widget class="QWidget" name="ThemeNameWidget" native="true">
+     <layout class="QHBoxLayout" name="ThemeNameLayout">
+      <property name="spacing">
        <number>8</number>
       </property>
-      <property name="margin" >
+      <property name="margin">
        <number>0</number>
       </property>
       <item>
-       <widget class="QLabel" name="ThemeNameLabel" >
-        <property name="text" >
+       <widget class="QLabel" name="ThemeNameLabel">
+        <property name="text">
          <string>Theme Name:</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QLineEdit" name="ThemeNameEdit" />
+       <widget class="QLineEdit" name="ThemeNameEdit"/>
       </item>
      </layout>
     </widget>
    </item>
    <item>
-    <widget class="QWidget" native="1" name="ContentWidget" >
-     <layout class="QHBoxLayout" name="ContentLayout" >
-      <property name="spacing" >
+    <widget class="QWidget" name="ContentWidget" native="true">
+     <layout class="QHBoxLayout" name="ContentLayout">
+      <property name="spacing">
        <number>8</number>
       </property>
-      <property name="margin" >
+      <property name="margin">
        <number>0</number>
       </property>
       <item>
-       <widget class="QTabWidget" name="ThemeTabWidget" >
-        <property name="currentIndex" >
+       <widget class="QTabWidget" name="ThemeTabWidget">
+        <property name="currentIndex">
          <number>0</number>
         </property>
-        <widget class="QWidget" name="BackgroundTab" >
-         <attribute name="title" >
+        <widget class="QWidget" name="BackgroundTab">
+         <attribute name="title">
           <string>Background</string>
          </attribute>
-         <layout class="QFormLayout" name="BackgroundLayout" >
-          <property name="horizontalSpacing" >
+         <layout class="QFormLayout" name="BackgroundLayout">
+          <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="QLabel" name="BackgroundLabel" >
-            <property name="text" >
+          <item row="0" column="0">
+           <widget class="QLabel" name="BackgroundLabel">
+            <property name="text">
              <string>Background:</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="1" >
-           <widget class="QComboBox" name="BackgroundComboBox" >
+          <item row="0" column="1">
+           <widget class="QComboBox" name="BackgroundComboBox">
             <item>
-             <property name="text" >
+             <property name="text">
               <string>Opaque</string>
              </property>
             </item>
             <item>
-             <property name="text" >
+             <property name="text">
               <string>Transparent</string>
              </property>
             </item>
            </widget>
           </item>
-          <item row="1" column="0" >
-           <widget class="QLabel" name="BackgroundTypeLabel" >
-            <property name="text" >
+          <item row="1" column="0">
+           <widget class="QLabel" name="BackgroundTypeLabel">
+            <property name="text">
              <string>Background Type:</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="1" >
-           <widget class="QComboBox" name="BackgroundTypeComboBox" >
+          <item row="1" column="1">
+           <widget class="QComboBox" name="BackgroundTypeComboBox">
             <item>
-             <property name="text" >
+             <property name="text">
               <string>Solid Color</string>
              </property>
             </item>
             <item>
-             <property name="text" >
+             <property name="text">
               <string>Gradient</string>
              </property>
             </item>
             <item>
-             <property name="text" >
+             <property name="text">
               <string>Image</string>
              </property>
             </item>
            </widget>
           </item>
-          <item row="2" column="0" >
-           <widget class="QLabel" name="Color1Label" >
-            <property name="text" >
-             <string>&lt;Color1></string>
+          <item row="2" column="0">
+           <widget class="QLabel" name="Color1Label">
+            <property name="text">
+             <string>&lt;Color1&gt;</string>
             </property>
            </widget>
           </item>
-          <item row="2" column="1" >
-           <widget class="QPushButton" name="Color1PushButton" >
-            <property name="text" >
+          <item row="2" column="1">
+           <widget class="QPushButton" name="Color1PushButton">
+            <property name="text">
              <string/>
             </property>
            </widget>
           </item>
-          <item row="3" column="0" >
-           <widget class="QLabel" name="Color2Label" >
-            <property name="text" >
-             <string>&lt;Color2></string>
+          <item row="3" column="0">
+           <widget class="QLabel" name="Color2Label">
+            <property name="text">
+             <string>&lt;Color2&gt;</string>
             </property>
            </widget>
           </item>
-          <item row="3" column="1" >
-           <widget class="QPushButton" name="Color2PushButton" >
-            <property name="text" >
+          <item row="3" column="1">
+           <widget class="QPushButton" name="Color2PushButton">
+            <property name="text">
              <string/>
             </property>
            </widget>
           </item>
-          <item row="4" column="0" >
-           <widget class="QLabel" name="ImageLabel" >
-            <property name="text" >
+          <item row="4" column="0">
+           <widget class="QLabel" name="ImageLabel">
+            <property name="text">
              <string>Image:</string>
             </property>
            </widget>
           </item>
-          <item row="6" column="0" >
-           <widget class="QLabel" name="GradientLabel" >
-            <property name="text" >
+          <item row="6" column="0">
+           <widget class="QLabel" name="GradientLabel">
+            <property name="text">
              <string>Gradient :</string>
             </property>
            </widget>
           </item>
-          <item row="6" column="1" >
-           <widget class="QComboBox" name="GradientComboBox" >
+          <item row="6" column="1">
+           <widget class="QComboBox" name="GradientComboBox">
             <item>
-             <property name="text" >
+             <property name="text">
               <string>Horizontal</string>
              </property>
             </item>
             <item>
-             <property name="text" >
+             <property name="text">
               <string>Vertical</string>
              </property>
             </item>
             <item>
-             <property name="text" >
+             <property name="text">
               <string>Circular</string>
              </property>
             </item>
            </widget>
           </item>
-          <item row="4" column="1" >
-           <widget class="QWidget" native="1" name="ImageFilenameWidget" >
-            <layout class="QHBoxLayout" name="horizontalLayout_2" >
-             <property name="spacing" >
+          <item row="4" column="1">
+           <widget class="QWidget" name="ImageFilenameWidget" native="true">
+            <layout class="QHBoxLayout" name="horizontalLayout_2">
+             <property name="spacing">
               <number>0</number>
              </property>
-             <property name="margin" >
+             <property name="margin">
               <number>0</number>
              </property>
              <item>
-              <widget class="QLineEdit" name="ImageLineEdit" />
+              <widget class="QLineEdit" name="ImageLineEdit"/>
              </item>
              <item>
-              <widget class="QToolButton" name="ImageToolButton" >
-               <property name="text" >
+              <widget class="QToolButton" name="ImageToolButton">
+               <property name="text">
                 <string/>
                </property>
-               <property name="icon" >
-                <iconset resource="../images/openlp-2.qrc" >
+               <property name="icon">
+                <iconset resource="../images/openlp-2.qrc">
                  <normaloff>:/images/image_load.png</normaloff>:/images/image_load.png</iconset>
                </property>
               </widget>
@@ -213,12 +214,12 @@
             </layout>
            </widget>
           </item>
-          <item row="7" column="1" >
-           <spacer name="BackgroundSpacer" >
-            <property name="orientation" >
+          <item row="7" column="1">
+           <spacer name="BackgroundSpacer">
+            <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>
@@ -228,109 +229,109 @@
           </item>
          </layout>
         </widget>
-        <widget class="QWidget" name="FontMainTab" >
-         <attribute name="title" >
+        <widget class="QWidget" name="FontMainTab">
+         <attribute name="title">
           <string>Font Main</string>
          </attribute>
-         <layout class="QHBoxLayout" name="FontMainLayout" >
-          <property name="spacing" >
+         <layout class="QHBoxLayout" name="FontMainLayout">
+          <property name="spacing">
            <number>8</number>
           </property>
-          <property name="margin" >
+          <property name="margin">
            <number>8</number>
           </property>
           <item>
-           <widget class="QWidget" native="1" name="MainLeftWidget" >
-            <layout class="QVBoxLayout" name="MainLeftLayout" >
-             <property name="spacing" >
+           <widget class="QWidget" name="MainLeftWidget" native="true">
+            <layout class="QVBoxLayout" name="MainLeftLayout">
+             <property name="spacing">
               <number>8</number>
              </property>
-             <property name="margin" >
+             <property name="margin">
               <number>0</number>
              </property>
              <item>
-              <widget class="QGroupBox" name="MainFontGroupBox" >
-               <property name="title" >
+              <widget class="QGroupBox" name="FontMainGroupBox">
+               <property name="title">
                 <string>Main Font</string>
                </property>
-               <layout class="QFormLayout" name="MainFontLayout" >
-                <property name="formAlignment" >
+               <layout class="QFormLayout" name="MainFontLayout">
+                <property name="formAlignment">
                  <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</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="QLabel" name="MainFontlabel" >
-                  <property name="text" >
+                <item row="0" column="0">
+                 <widget class="QLabel" name="FontMainlabel">
+                  <property name="text">
                    <string>Font:</string>
                   </property>
                  </widget>
                 </item>
-                <item row="0" column="1" >
-                 <widget class="QFontComboBox" name="MainFontComboBox" />
+                <item row="0" column="1">
+                 <widget class="QFontComboBox" name="FontMainComboBox"/>
                 </item>
-                <item row="1" column="0" >
-                 <widget class="QLabel" name="MainFontColorLabel" >
-                  <property name="text" >
+                <item row="1" column="0">
+                 <widget class="QLabel" name="FontMainColorLabel">
+                  <property name="text">
                    <string>Font Color:</string>
                   </property>
                  </widget>
                 </item>
-                <item row="1" column="1" >
-                 <widget class="QPushButton" name="MainFontColorPushButton" >
-                  <property name="text" >
+                <item row="1" column="1">
+                 <widget class="QPushButton" name="FontMainColorPushButton">
+                  <property name="text">
                    <string/>
                   </property>
                  </widget>
                 </item>
-                <item row="2" column="0" >
-                 <widget class="QLabel" name="MainFontSize" >
-                  <property name="text" >
+                <item row="2" column="0">
+                 <widget class="QLabel" name="FontMainSize">
+                  <property name="text">
                    <string>Size:</string>
                   </property>
                  </widget>
                 </item>
-                <item row="2" column="1" >
-                 <widget class="QSpinBox" name="MainFontSizeSpinBox" >
-                  <property name="sizePolicy" >
-                   <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+                <item row="2" column="1">
+                 <widget class="QSpinBox" name="FontMainSizeSpinBox">
+                  <property name="sizePolicy">
+                   <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
                     <horstretch>0</horstretch>
                     <verstretch>0</verstretch>
                    </sizepolicy>
                   </property>
-                  <property name="minimumSize" >
+                  <property name="minimumSize">
                    <size>
                     <width>70</width>
                     <height>0</height>
                    </size>
                   </property>
-                  <property name="suffix" >
-                   <string>pt</string>
-                  </property>
-                  <property name="maximum" >
-                   <number>999</number>
-                  </property>
-                  <property name="value" >
+                  <property name="value">
                    <number>16</number>
                   </property>
+                  <property name="suffix">
+                   <string>pt</string>
+                  </property>
+                  <property name="maximum">
+                   <number>999</number>
+                  </property>
                  </widget>
                 </item>
                </layout>
               </widget>
              </item>
              <item>
-              <spacer name="FontMainSpacer" >
-               <property name="orientation" >
+              <spacer name="FontMainSpacer">
+               <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>
@@ -342,161 +343,161 @@
            </widget>
           </item>
           <item>
-           <widget class="QWidget" native="1" name="MainRightWidget" >
-            <layout class="QVBoxLayout" name="MainRightLayout" >
-             <property name="spacing" >
+           <widget class="QWidget" name="MainRightWidget" native="true">
+            <layout class="QVBoxLayout" name="MainRightLayout">
+             <property name="spacing">
               <number>8</number>
              </property>
-             <property name="margin" >
+             <property name="margin">
               <number>0</number>
              </property>
              <item>
-              <widget class="QGroupBox" name="MainLocationGroupBox" >
-               <property name="title" >
+              <widget class="QGroupBox" name="MainLocationGroupBox">
+               <property name="title">
                 <string>Display Location</string>
                </property>
-               <layout class="QFormLayout" name="MainLocationLayout" >
-                <property name="horizontalSpacing" >
+               <layout class="QFormLayout" name="MainLocationLayout">
+                <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="QLabel" name="DefaultLocationLabel" >
-                  <property name="text" >
+                <item row="0" column="0">
+                 <widget class="QLabel" name="DefaultLocationLabel">
+                  <property name="text">
                    <string>Use Default Location:</string>
                   </property>
                  </widget>
                 </item>
-                <item row="0" column="1" >
-                 <widget class="QCheckBox" name="FontMainUseDefault" >
-                  <property name="text" >
+                <item row="0" column="1">
+                 <widget class="QCheckBox" name="FontMainDefaultCheckBox">
+                  <property name="text">
                    <string/>
                   </property>
-                  <property name="tristate" >
+                  <property name="tristate">
                    <bool>false</bool>
                   </property>
                  </widget>
                 </item>
-                <item row="1" column="0" >
-                 <widget class="QLabel" name="FontMainXLabel" >
-                  <property name="text" >
+                <item row="1" column="0">
+                 <widget class="QLabel" name="FontMainXLabel">
+                  <property name="text">
                    <string>X Position:</string>
                   </property>
                  </widget>
                 </item>
-                <item row="2" column="0" >
-                 <widget class="QLabel" name="FontMainYLabel" >
-                  <property name="text" >
+                <item row="2" column="0">
+                 <widget class="QLabel" name="FontMainYLabel">
+                  <property name="text">
                    <string>Y Position:</string>
                   </property>
                  </widget>
                 </item>
-                <item row="3" column="0" >
-                 <widget class="QLabel" name="FontMainWidthLabel" >
-                  <property name="text" >
+                <item row="3" column="0">
+                 <widget class="QLabel" name="FontMainWidthLabel">
+                  <property name="text">
                    <string>Width:</string>
                   </property>
                  </widget>
                 </item>
-                <item row="4" column="0" >
-                 <widget class="QLabel" name="FontMainHeightLabel" >
-                  <property name="text" >
+                <item row="4" column="0">
+                 <widget class="QLabel" name="FontMainHeightLabel">
+                  <property name="text">
                    <string>Height:</string>
                   </property>
                  </widget>
                 </item>
-                <item row="1" column="1" >
-                 <widget class="QSpinBox" name="FontMainXSpinBox" >
-                  <property name="sizePolicy" >
-                   <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+                <item row="1" column="1">
+                 <widget class="QSpinBox" name="FontMainXSpinBox">
+                  <property name="sizePolicy">
+                   <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
                     <horstretch>0</horstretch>
                     <verstretch>0</verstretch>
                    </sizepolicy>
                   </property>
-                  <property name="minimumSize" >
+                  <property name="minimumSize">
                    <size>
                     <width>78</width>
                     <height>0</height>
                    </size>
                   </property>
-                  <property name="suffix" >
-                   <string>px</string>
-                  </property>
-                  <property name="maximum" >
-                   <number>9999</number>
-                  </property>
-                  <property name="value" >
+                  <property name="value">
                    <number>0</number>
                   </property>
-                 </widget>
-                </item>
-                <item row="2" column="1" >
-                 <widget class="QSpinBox" name="FontMainYSpinBox" >
-                  <property name="sizePolicy" >
-                   <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="minimumSize" >
-                   <size>
-                    <width>78</width>
-                    <height>0</height>
-                   </size>
-                  </property>
-                  <property name="suffix" >
+                  <property name="suffix">
                    <string>px</string>
                   </property>
-                  <property name="maximum" >
+                  <property name="maximum">
                    <number>9999</number>
                   </property>
                  </widget>
                 </item>
-                <item row="3" column="1" >
-                 <widget class="QSpinBox" name="FontMainWidthSpinBox" >
-                  <property name="sizePolicy" >
-                   <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+                <item row="2" column="1">
+                 <widget class="QSpinBox" name="FontMainYSpinBox">
+                  <property name="sizePolicy">
+                   <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
                     <horstretch>0</horstretch>
                     <verstretch>0</verstretch>
                    </sizepolicy>
                   </property>
-                  <property name="minimumSize" >
+                  <property name="minimumSize">
                    <size>
                     <width>78</width>
                     <height>0</height>
                    </size>
                   </property>
-                  <property name="suffix" >
+                  <property name="suffix">
                    <string>px</string>
                   </property>
-                  <property name="maximum" >
+                  <property name="maximum">
                    <number>9999</number>
                   </property>
                  </widget>
                 </item>
-                <item row="4" column="1" >
-                 <widget class="QSpinBox" name="FontMainHeightSpinBox" >
-                  <property name="sizePolicy" >
-                   <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+                <item row="3" column="1">
+                 <widget class="QSpinBox" name="FontMainWidthSpinBox">
+                  <property name="sizePolicy">
+                   <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
                     <horstretch>0</horstretch>
                     <verstretch>0</verstretch>
                    </sizepolicy>
                   </property>
-                  <property name="minimumSize" >
+                  <property name="minimumSize">
                    <size>
                     <width>78</width>
                     <height>0</height>
                    </size>
                   </property>
-                  <property name="suffix" >
+                  <property name="suffix">
                    <string>px</string>
                   </property>
-                  <property name="maximum" >
+                  <property name="maximum">
+                   <number>9999</number>
+                  </property>
+                 </widget>
+                </item>
+                <item row="4" column="1">
+                 <widget class="QSpinBox" name="FontMainHeightSpinBox">
+                  <property name="sizePolicy">
+                   <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                   </sizepolicy>
+                  </property>
+                  <property name="minimumSize">
+                   <size>
+                    <width>78</width>
+                    <height>0</height>
+                   </size>
+                  </property>
+                  <property name="suffix">
+                   <string>px</string>
+                  </property>
+                  <property name="maximum">
                    <number>9999</number>
                   </property>
                  </widget>
@@ -505,11 +506,11 @@
               </widget>
              </item>
              <item>
-              <spacer name="MainLocationSpacer" >
-               <property name="orientation" >
+              <spacer name="MainLocationSpacer">
+               <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>
@@ -522,112 +523,112 @@
           </item>
          </layout>
         </widget>
-        <widget class="QWidget" name="FontFooterTab" >
-         <attribute name="title" >
+        <widget class="QWidget" name="FontFooterTab">
+         <attribute name="title">
           <string>Font Footer</string>
          </attribute>
-         <layout class="QHBoxLayout" name="FontFooterLayout" >
-          <property name="spacing" >
+         <layout class="QHBoxLayout" name="FontFooterLayout">
+          <property name="spacing">
            <number>8</number>
           </property>
-          <property name="margin" >
+          <property name="margin">
            <number>8</number>
           </property>
           <item>
-           <widget class="QWidget" native="1" name="FooterLeftWidget" >
-            <layout class="QVBoxLayout" name="FooterLeftLayout" >
-             <property name="spacing" >
+           <widget class="QWidget" name="FooterLeftWidget" native="true">
+            <layout class="QVBoxLayout" name="FooterLeftLayout">
+             <property name="spacing">
               <number>8</number>
              </property>
-             <property name="margin" >
+             <property name="margin">
               <number>0</number>
              </property>
              <item>
-              <widget class="QGroupBox" name="FooterFontGroupBox" >
-               <property name="title" >
+              <widget class="QGroupBox" name="FooterFontGroupBox">
+               <property name="title">
                 <string>Footer Font</string>
                </property>
-               <layout class="QFormLayout" name="FooterFontLayout" >
-                <property name="fieldGrowthPolicy" >
+               <layout class="QFormLayout" name="FooterFontLayout">
+                <property name="fieldGrowthPolicy">
                  <enum>QFormLayout::ExpandingFieldsGrow</enum>
                 </property>
-                <property name="formAlignment" >
+                <property name="formAlignment">
                  <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</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="QLabel" name="FontFooterLabel" >
-                  <property name="text" >
+                <item row="0" column="0">
+                 <widget class="QLabel" name="FontFooterLabel">
+                  <property name="text">
                    <string>Font:</string>
                   </property>
                  </widget>
                 </item>
-                <item row="0" column="1" >
-                 <widget class="QFontComboBox" name="FontFooterComboBox" />
+                <item row="0" column="1">
+                 <widget class="QFontComboBox" name="FontFooterComboBox"/>
                 </item>
-                <item row="1" column="0" >
-                 <widget class="QLabel" name="FontFooterColorLabel" >
-                  <property name="text" >
+                <item row="1" column="0">
+                 <widget class="QLabel" name="FontFooterColorLabel">
+                  <property name="text">
                    <string>Font Color:</string>
                   </property>
                  </widget>
                 </item>
-                <item row="1" column="1" >
-                 <widget class="QPushButton" name="FontFooterColorPushButton" >
-                  <property name="text" >
+                <item row="1" column="1">
+                 <widget class="QPushButton" name="FontFooterColorPushButton">
+                  <property name="text">
                    <string/>
                   </property>
                  </widget>
                 </item>
-                <item row="2" column="0" >
-                 <widget class="QLabel" name="FontFooterSizeLabel" >
-                  <property name="text" >
+                <item row="2" column="0">
+                 <widget class="QLabel" name="FontFooterSizeLabel">
+                  <property name="text">
                    <string>Size:</string>
                   </property>
                  </widget>
                 </item>
-                <item row="2" column="1" >
-                 <widget class="QSpinBox" name="FontFooterSizeSpinBox" >
-                  <property name="sizePolicy" >
-                   <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+                <item row="2" column="1">
+                 <widget class="QSpinBox" name="FontFooterSizeSpinBox">
+                  <property name="sizePolicy">
+                   <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
                     <horstretch>0</horstretch>
                     <verstretch>0</verstretch>
                    </sizepolicy>
                   </property>
-                  <property name="minimumSize" >
+                  <property name="minimumSize">
                    <size>
                     <width>70</width>
                     <height>0</height>
                    </size>
                   </property>
-                  <property name="suffix" >
+                  <property name="value">
+                   <number>10</number>
+                  </property>
+                  <property name="suffix">
                    <string>pt</string>
                   </property>
-                  <property name="maximum" >
+                  <property name="maximum">
                    <number>999</number>
                   </property>
-                  <property name="value" >
-                   <number>10</number>
-                  </property>
                  </widget>
                 </item>
                </layout>
               </widget>
              </item>
              <item>
-              <spacer name="FontFooterSpacer" >
-               <property name="orientation" >
+              <spacer name="FontFooterSpacer">
+               <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>
@@ -639,158 +640,158 @@
            </widget>
           </item>
           <item>
-           <widget class="QWidget" native="1" name="FooterRightWidget" >
-            <layout class="QVBoxLayout" name="FooterRightLayout" >
-             <property name="spacing" >
+           <widget class="QWidget" name="FooterRightWidget" native="true">
+            <layout class="QVBoxLayout" name="FooterRightLayout">
+             <property name="spacing">
               <number>8</number>
              </property>
-             <property name="margin" >
+             <property name="margin">
               <number>0</number>
              </property>
              <item>
-              <widget class="QGroupBox" name="LocationFooterGroupBox" >
-               <property name="title" >
+              <widget class="QGroupBox" name="LocationFooterGroupBox">
+               <property name="title">
                 <string>Display Location</string>
                </property>
-               <layout class="QFormLayout" name="LocationFooterLayout" >
-                <property name="fieldGrowthPolicy" >
+               <layout class="QFormLayout" name="LocationFooterLayout">
+                <property name="fieldGrowthPolicy">
                  <enum>QFormLayout::ExpandingFieldsGrow</enum>
                 </property>
-                <property name="formAlignment" >
+                <property name="formAlignment">
                  <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</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="QLabel" name="FontFooterDefaultLabel" >
-                  <property name="text" >
+                <item row="0" column="0">
+                 <widget class="QLabel" name="FontFooterDefaultLabel">
+                  <property name="text">
                    <string>Use Default Location:</string>
                   </property>
                  </widget>
                 </item>
-                <item row="0" column="1" >
-                 <widget class="QCheckBox" name="FontFooterDefaultCheckBox" >
-                  <property name="text" >
+                <item row="0" column="1">
+                 <widget class="QCheckBox" name="FontFooterDefaultCheckBox">
+                  <property name="text">
                    <string/>
                   </property>
-                  <property name="tristate" >
+                  <property name="tristate">
                    <bool>false</bool>
                   </property>
                  </widget>
                 </item>
-                <item row="1" column="0" >
-                 <widget class="QLabel" name="FontFooterXLabel" >
-                  <property name="text" >
+                <item row="1" column="0">
+                 <widget class="QLabel" name="FontFooterXLabel">
+                  <property name="text">
                    <string>X Position:</string>
                   </property>
                  </widget>
                 </item>
-                <item row="2" column="0" >
-                 <widget class="QLabel" name="FontFooterYLabel" >
-                  <property name="text" >
+                <item row="2" column="0">
+                 <widget class="QLabel" name="FontFooterYLabel">
+                  <property name="text">
                    <string>Y Position:</string>
                   </property>
                  </widget>
                 </item>
-                <item row="3" column="0" >
-                 <widget class="QLabel" name="FontFooterWidthLabel" >
-                  <property name="text" >
+                <item row="3" column="0">
+                 <widget class="QLabel" name="FontFooterWidthLabel">
+                  <property name="text">
                    <string>Width:</string>
                   </property>
                  </widget>
                 </item>
-                <item row="4" column="0" >
-                 <widget class="QLabel" name="FontFooterHeightLabel" >
-                  <property name="text" >
+                <item row="4" column="0">
+                 <widget class="QLabel" name="FontFooterHeightLabel">
+                  <property name="text">
                    <string>Height:</string>
                   </property>
                  </widget>
                 </item>
-                <item row="1" column="1" >
-                 <widget class="QSpinBox" name="FontFooterXSpinBox" >
-                  <property name="sizePolicy" >
-                   <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+                <item row="1" column="1">
+                 <widget class="QSpinBox" name="FontFooterXSpinBox">
+                  <property name="sizePolicy">
+                   <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
                     <horstretch>0</horstretch>
                     <verstretch>0</verstretch>
                    </sizepolicy>
                   </property>
-                  <property name="minimumSize" >
+                  <property name="minimumSize">
                    <size>
                     <width>78</width>
                     <height>0</height>
                    </size>
                   </property>
-                  <property name="suffix" >
+                  <property name="value">
+                   <number>0</number>
+                  </property>
+                  <property name="suffix">
                    <string>px</string>
                   </property>
-                  <property name="maximum" >
+                  <property name="maximum">
                    <number>9999</number>
                   </property>
-                  <property name="value" >
-                   <number>0</number>
-                  </property>
                  </widget>
                 </item>
-                <item row="2" column="1" >
-                 <widget class="QSpinBox" name="FontFooterYSpinBox" >
-                  <property name="sizePolicy" >
-                   <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+                <item row="2" column="1">
+                 <widget class="QSpinBox" name="FontFooterYSpinBox">
+                  <property name="sizePolicy">
+                   <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
                     <horstretch>0</horstretch>
                     <verstretch>0</verstretch>
                    </sizepolicy>
                   </property>
-                  <property name="minimumSize" >
+                  <property name="minimumSize">
                    <size>
                     <width>78</width>
                     <height>0</height>
                    </size>
                   </property>
-                  <property name="suffix" >
-                   <string>px</string>
-                  </property>
-                  <property name="maximum" >
-                   <number>9999</number>
-                  </property>
-                  <property name="value" >
+                  <property name="value">
                    <number>0</number>
                   </property>
-                 </widget>
-                </item>
-                <item row="3" column="1" >
-                 <widget class="QSpinBox" name="FontFooterWidthspinBox" >
-                  <property name="minimumSize" >
-                   <size>
-                    <width>78</width>
-                    <height>0</height>
-                   </size>
-                  </property>
-                  <property name="suffix" >
+                  <property name="suffix">
                    <string>px</string>
                   </property>
-                  <property name="maximum" >
+                  <property name="maximum">
                    <number>9999</number>
                   </property>
                  </widget>
                 </item>
-                <item row="4" column="1" >
-                 <widget class="QSpinBox" name="FontFooterHeightSpinBox" >
-                  <property name="minimumSize" >
+                <item row="3" column="1">
+                 <widget class="QSpinBox" name="FontFooterWidthSpinBox">
+                  <property name="minimumSize">
                    <size>
                     <width>78</width>
                     <height>0</height>
                    </size>
                   </property>
-                  <property name="suffix" >
+                  <property name="suffix">
                    <string>px</string>
                   </property>
-                  <property name="maximum" >
+                  <property name="maximum">
+                   <number>9999</number>
+                  </property>
+                 </widget>
+                </item>
+                <item row="4" column="1">
+                 <widget class="QSpinBox" name="FontFooterHeightSpinBox">
+                  <property name="minimumSize">
+                   <size>
+                    <width>78</width>
+                    <height>0</height>
+                   </size>
+                  </property>
+                  <property name="suffix">
+                   <string>px</string>
+                  </property>
+                  <property name="maximum">
                    <number>9999</number>
                   </property>
                  </widget>
@@ -799,11 +800,11 @@
               </widget>
              </item>
              <item>
-              <spacer name="FontFooterLocationSpacer" >
-               <property name="orientation" >
+              <spacer name="FontFooterLocationSpacer">
+               <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>
@@ -816,74 +817,74 @@
           </item>
          </layout>
         </widget>
-        <widget class="QWidget" name="OtherOptionsTab" >
-         <attribute name="title" >
+        <widget class="QWidget" name="OtherOptionsTab">
+         <attribute name="title">
           <string>Other Options</string>
          </attribute>
-         <layout class="QHBoxLayout" name="OtherOptionsLayout" >
-          <property name="spacing" >
+         <layout class="QHBoxLayout" name="OtherOptionsLayout">
+          <property name="spacing">
            <number>8</number>
           </property>
-          <property name="margin" >
+          <property name="margin">
            <number>8</number>
           </property>
           <item>
-           <widget class="QWidget" native="1" name="OptionsLeftWidget" >
-            <layout class="QVBoxLayout" name="OptionsLeftLayout" >
-             <property name="spacing" >
+           <widget class="QWidget" name="OptionsLeftWidget" native="true">
+            <layout class="QVBoxLayout" name="OptionsLeftLayout">
+             <property name="spacing">
               <number>8</number>
              </property>
-             <property name="margin" >
+             <property name="margin">
               <number>0</number>
              </property>
              <item>
-              <widget class="QGroupBox" name="ShadowGroupBox" >
-               <property name="title" >
+              <widget class="QGroupBox" name="ShadowGroupBox">
+               <property name="title">
                 <string>Shadow &amp;&amp; Outline</string>
                </property>
-               <layout class="QVBoxLayout" name="verticalLayout" >
-                <property name="spacing" >
+               <layout class="QVBoxLayout" name="verticalLayout">
+                <property name="spacing">
                  <number>8</number>
                 </property>
-                <property name="margin" >
+                <property name="margin">
                  <number>8</number>
                 </property>
                 <item>
-                 <widget class="QWidget" native="1" name="OutlineWidget" >
-                  <layout class="QFormLayout" name="OutlineLayout" >
-                   <property name="horizontalSpacing" >
+                 <widget class="QWidget" name="OutlineWidget" native="true">
+                  <layout class="QFormLayout" name="OutlineLayout">
+                   <property name="horizontalSpacing">
                     <number>8</number>
                    </property>
-                   <property name="verticalSpacing" >
+                   <property name="verticalSpacing">
                     <number>8</number>
                    </property>
-                   <property name="margin" >
+                   <property name="margin">
                     <number>0</number>
                    </property>
-                   <item row="0" column="1" >
-                    <widget class="QCheckBox" name="OutlineCheckBox" >
-                     <property name="text" >
+                   <item row="0" column="1">
+                    <widget class="QCheckBox" name="OutlineCheckBox">
+                     <property name="text">
                       <string/>
                      </property>
                     </widget>
                    </item>
-                   <item row="1" column="0" >
-                    <widget class="QLabel" name="OutlineColorLabel" >
-                     <property name="text" >
+                   <item row="1" column="0">
+                    <widget class="QLabel" name="OutlineColorLabel">
+                     <property name="text">
                       <string>Outline Color:</string>
                      </property>
                     </widget>
                    </item>
-                   <item row="1" column="1" >
-                    <widget class="QPushButton" name="OutlineColorPushButton" >
-                     <property name="text" >
+                   <item row="1" column="1">
+                    <widget class="QPushButton" name="OutlineColorPushButton">
+                     <property name="text">
                       <string/>
                      </property>
                     </widget>
                    </item>
-                   <item row="0" column="0" >
-                    <widget class="QLabel" name="OutlineEnabledLabel" >
-                     <property name="text" >
+                   <item row="0" column="0">
+                    <widget class="QLabel" name="OutlineEnabledLabel">
+                     <property name="text">
                       <string>Show Outline:</string>
                      </property>
                     </widget>
@@ -892,41 +893,41 @@
                  </widget>
                 </item>
                 <item>
-                 <widget class="QWidget" native="1" name="ShadowWidget" >
-                  <layout class="QFormLayout" name="ShadowLayout" >
-                   <property name="horizontalSpacing" >
+                 <widget class="QWidget" name="ShadowWidget" native="true">
+                  <layout class="QFormLayout" name="ShadowLayout">
+                   <property name="horizontalSpacing">
                     <number>8</number>
                    </property>
-                   <property name="verticalSpacing" >
+                   <property name="verticalSpacing">
                     <number>8</number>
                    </property>
-                   <property name="margin" >
+                   <property name="margin">
                     <number>0</number>
                    </property>
-                   <item row="0" column="1" >
-                    <widget class="QCheckBox" name="ShadowCheckBox" >
-                     <property name="text" >
+                   <item row="0" column="1">
+                    <widget class="QCheckBox" name="ShadowCheckBox">
+                     <property name="text">
                       <string/>
                      </property>
                     </widget>
                    </item>
-                   <item row="1" column="0" >
-                    <widget class="QLabel" name="ShadowColorLabel" >
-                     <property name="text" >
+                   <item row="1" column="0">
+                    <widget class="QLabel" name="ShadowColorLabel">
+                     <property name="text">
                       <string>Shadow Color:</string>
                      </property>
                     </widget>
                    </item>
-                   <item row="1" column="1" >
-                    <widget class="QPushButton" name="ShadowColorPushButton" >
-                     <property name="text" >
+                   <item row="1" column="1">
+                    <widget class="QPushButton" name="ShadowColorPushButton">
+                     <property name="text">
                       <string/>
                      </property>
                     </widget>
                    </item>
-                   <item row="0" column="0" >
-                    <widget class="QLabel" name="ShadowEnabledLabel" >
-                     <property name="text" >
+                   <item row="0" column="0">
+                    <widget class="QLabel" name="ShadowEnabledLabel">
+                     <property name="text">
                       <string>Show Shadow:</string>
                      </property>
                     </widget>
@@ -938,11 +939,11 @@
               </widget>
              </item>
              <item>
-              <spacer name="ShadowSpacer" >
-               <property name="orientation" >
+              <spacer name="ShadowSpacer">
+               <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>
@@ -954,67 +955,67 @@
            </widget>
           </item>
           <item>
-           <widget class="QWidget" native="1" name="OptionsRightWidget" >
-            <layout class="QVBoxLayout" name="OptionsRightLayout" >
-             <property name="spacing" >
+           <widget class="QWidget" name="OptionsRightWidget" native="true">
+            <layout class="QVBoxLayout" name="OptionsRightLayout">
+             <property name="spacing">
               <number>8</number>
              </property>
-             <property name="margin" >
+             <property name="margin">
               <number>0</number>
              </property>
              <item>
-              <widget class="QGroupBox" name="AlignmentGroupBox" >
-               <property name="title" >
+              <widget class="QGroupBox" name="AlignmentGroupBox">
+               <property name="title">
                 <string>Alignment</string>
                </property>
-               <layout class="QGridLayout" name="gridLayout_4" >
-                <item row="0" column="0" >
-                 <widget class="QLabel" name="HorizontalLabel" >
-                  <property name="text" >
+               <layout class="QGridLayout" name="gridLayout_4">
+                <item row="0" column="0">
+                 <widget class="QLabel" name="HorizontalLabel">
+                  <property name="text">
                    <string>Horizontal Align:</string>
                   </property>
                  </widget>
                 </item>
-                <item row="0" column="1" >
-                 <widget class="QComboBox" name="HorizontalComboBox" >
+                <item row="0" column="1">
+                 <widget class="QComboBox" name="HorizontalComboBox">
                   <item>
-                   <property name="text" >
+                   <property name="text">
                     <string>Left</string>
                    </property>
                   </item>
                   <item>
-                   <property name="text" >
+                   <property name="text">
                     <string>Right</string>
                    </property>
                   </item>
                   <item>
-                   <property name="text" >
+                   <property name="text">
                     <string>Center</string>
                    </property>
                   </item>
                  </widget>
                 </item>
-                <item row="1" column="0" >
-                 <widget class="QLabel" name="VerticalLabel" >
-                  <property name="text" >
+                <item row="1" column="0">
+                 <widget class="QLabel" name="VerticalLabel">
+                  <property name="text">
                    <string>Vertical Align:</string>
                   </property>
                  </widget>
                 </item>
-                <item row="1" column="1" >
-                 <widget class="QComboBox" name="VerticalComboBox" >
+                <item row="1" column="1">
+                 <widget class="QComboBox" name="VerticalComboBox">
                   <item>
-                   <property name="text" >
+                   <property name="text">
                     <string>Top</string>
                    </property>
                   </item>
                   <item>
-                   <property name="text" >
+                   <property name="text">
                     <string>Middle</string>
                    </property>
                   </item>
                   <item>
-                   <property name="text" >
+                   <property name="text">
                     <string>Bottom</string>
                    </property>
                   </item>
@@ -1024,11 +1025,11 @@
               </widget>
              </item>
              <item>
-              <spacer name="AlignmentSpacer" >
-               <property name="orientation" >
+              <spacer name="AlignmentSpacer">
+               <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>
@@ -1047,23 +1048,23 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="PreviewGroupBox" >
-     <property name="title" >
+    <widget class="QGroupBox" name="PreviewGroupBox">
+     <property name="title">
       <string>Preview</string>
      </property>
-     <layout class="QHBoxLayout" name="ThemePreviewLayout" >
-      <property name="spacing" >
+     <layout class="QHBoxLayout" name="ThemePreviewLayout">
+      <property name="spacing">
        <number>8</number>
       </property>
-      <property name="margin" >
+      <property name="margin">
        <number>8</number>
       </property>
       <item>
-       <spacer name="PreviewLeftSpacer" >
-        <property name="orientation" >
+       <spacer name="PreviewLeftSpacer">
+        <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>
@@ -1072,42 +1073,42 @@
        </spacer>
       </item>
       <item>
-       <widget class="QLabel" name="ThemePreview" >
-        <property name="sizePolicy" >
-         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+       <widget class="QLabel" name="ThemePreview">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
-        <property name="minimumSize" >
+        <property name="minimumSize">
          <size>
           <width>300</width>
           <height>225</height>
          </size>
         </property>
-        <property name="frameShape" >
+        <property name="frameShape">
          <enum>QFrame::WinPanel</enum>
         </property>
-        <property name="frameShadow" >
+        <property name="frameShadow">
          <enum>QFrame::Sunken</enum>
         </property>
-        <property name="lineWidth" >
+        <property name="lineWidth">
          <number>1</number>
         </property>
-        <property name="text" >
+        <property name="text">
          <string/>
         </property>
-        <property name="scaledContents" >
+        <property name="scaledContents">
          <bool>true</bool>
         </property>
        </widget>
       </item>
       <item>
-       <spacer name="PreviewRightSpacer" >
-        <property name="orientation" >
+       <spacer name="PreviewRightSpacer">
+        <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>
@@ -1119,8 +1120,8 @@
     </widget>
    </item>
    <item>
-    <widget class="QDialogButtonBox" name="ThemeButtonBox" >
-     <property name="standardButtons" >
+    <widget class="QDialogButtonBox" name="ThemeButtonBox">
+     <property name="standardButtons">
       <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
@@ -1138,10 +1139,10 @@
   <tabstop>ImageLineEdit</tabstop>
   <tabstop>ImageToolButton</tabstop>
   <tabstop>GradientComboBox</tabstop>
-  <tabstop>MainFontComboBox</tabstop>
-  <tabstop>MainFontColorPushButton</tabstop>
-  <tabstop>MainFontSizeSpinBox</tabstop>
-  <tabstop>FontMainUseDefault</tabstop>
+  <tabstop>FontMainComboBox</tabstop>
+  <tabstop>FontMainColorPushButton</tabstop>
+  <tabstop>FontMainSizeSpinBox</tabstop>
+  <tabstop>FontMainDefaultCheckBox</tabstop>
   <tabstop>FontMainXSpinBox</tabstop>
   <tabstop>FontMainYSpinBox</tabstop>
   <tabstop>FontMainWidthSpinBox</tabstop>
@@ -1152,7 +1153,7 @@
   <tabstop>FontFooterDefaultCheckBox</tabstop>
   <tabstop>FontFooterXSpinBox</tabstop>
   <tabstop>FontFooterYSpinBox</tabstop>
-  <tabstop>FontFooterWidthspinBox</tabstop>
+  <tabstop>FontFooterWidthSpinBox</tabstop>
   <tabstop>FontFooterHeightSpinBox</tabstop>
   <tabstop>OutlineCheckBox</tabstop>
   <tabstop>OutlineColorPushButton</tabstop>
@@ -1162,7 +1163,7 @@
   <tabstop>VerticalComboBox</tabstop>
  </tabstops>
  <resources>
-  <include location="../images/openlp-2.qrc" />
+  <include location="../images/openlp-2.qrc"/>
  </resources>
  <connections>
   <connection>
@@ -1171,11 +1172,11 @@
    <receiver>AmendThemeDialog</receiver>
    <slot>accept()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>375</x>
      <y>466</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>375</x>
      <y>241</y>
     </hint>
@@ -1187,11 +1188,11 @@
    <receiver>AmendThemeDialog</receiver>
    <slot>reject()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>375</x>
      <y>466</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>375</x>
      <y>241</y>
     </hint>