diff --git a/openlp/core/lib/rendermanager.py b/openlp/core/lib/rendermanager.py
index d2f0712a8..e0bb19a63 100644
--- a/openlp/core/lib/rendermanager.py
+++ b/openlp/core/lib/rendermanager.py
@@ -56,7 +56,7 @@ class RenderManager(object):
         """
         log.debug(u'Initilisation started')
         self.screens = screens
-        self.display = self.display = MainDisplay(self, screens, False)
+        self.display = MainDisplay(self, screens, False)
         self.display.setup()
         self.theme_manager = theme_manager
         self.renderer = Renderer()
@@ -190,7 +190,11 @@ class RenderManager(object):
         serviceItem = ServiceItem()
         serviceItem.add_from_text(u'', verse, u'')
         serviceItem.render_manager = self
+        # serviceItem gets the theme data so switch it.
+        temp_themedata = self.themedata
+        self.themedata = themedata
         serviceItem.render()
+        self.themedata = temp_themedata
         serviceItem.raw_footer = footer
         self.display.buildHtml(serviceItem)
         frame, raw_html = serviceItem.get_rendered_frame(0)
@@ -235,4 +239,4 @@ class RenderManager(object):
         log.debug(u'calculate default %d, %d, %f',
             self.width, self.height, self.screen_ratio )
         # 90% is start of footer
-        self.footer_start = int(self.height * 0.90)
\ No newline at end of file
+        self.footer_start = int(self.height * 0.90)
diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py
index 4684dfaec..e94a23c90 100644
--- a/openlp/core/ui/thememanager.py
+++ b/openlp/core/ui/thememanager.py
@@ -661,7 +661,7 @@ class ThemeManager(QtGui.QWidget):
         """
         Call the RenderManager to build a Sample Image
         """
-        log.debug(u'generateImage %s ', themedata)
+        log.debug(u'generateImage \n%s ', themedata)
         return self.parent.RenderManager.generate_preview(themedata)
 
     def getPreviewImage(self, theme):
@@ -756,4 +756,4 @@ class ThemeManager(QtGui.QWidget):
         theme.font_main_y = int(theme.font_main_y.strip())
         #theme.theme_mode
         theme.theme_name = theme.theme_name.strip()
-        #theme.theme_version
\ No newline at end of file
+        #theme.theme_version