diff --git a/openlp/core/theme/theme.py b/openlp/core/theme/theme.py
index 0295912fa..27969c9d9 100644
--- a/openlp/core/theme/theme.py
+++ b/openlp/core/theme/theme.py
@@ -30,7 +30,7 @@ from PyQt4 import QtGui
 
 DelphiColors={"clRed":0xFF0000,
                 "clBlue":0x0000FF,
-                "clYellow":0x0FFFF00,
+                "clYellow":0xFFFF00,
                "clBlack":0x000000,
                "clWhite":0xFFFFFF}
 
@@ -113,6 +113,7 @@ class Theme(object):
         root = ElementTree(element=XML(xml))
         iter = root.getiterator()
         for element in iter:
+            delphiColorChange = False
             if element.tag != u'Theme':
                 t = element.text
                 val = 0
@@ -128,6 +129,7 @@ class Theme(object):
                             pass
                     elif DelphiColors.has_key(t):
                         val = DelphiColors[t]
+                        delphiColorChange = True
                     else:
                         try:
                             val = int(t)
@@ -136,7 +138,10 @@ class Theme(object):
                 if (element.tag.find(u'Color') > 0 or
                     (element.tag.find(u'BackgroundParameter') == 0 and type(val) == type(0))):
                     # convert to a wx.Colour
-                    val = QtGui.QColor(val&0xFF, (val>>8)&0xFF, (val>>16)&0xFF)
+                        if not delphiColorChange:
+                            val = QtGui.QColor(val&0xFF, (val>>8)&0xFF, (val>>16)&0xFF)
+                        else:
+                            val = QtGui.QColor((val>>16)&0xFF, (val>>8)&0xFF, val&0xFF)
                 setattr(self, element.tag, val)
 
     def __str__(self):