diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py
index 765d0f9fa..511046fe3 100644
--- a/openlp/core/lib/htmlbuilder.py
+++ b/openlp/core/lib/htmlbuilder.py
@@ -55,14 +55,17 @@ body {
     background-color: black;
     display: none;
 }
-#image {
+#bgimage {
     z-index:1;
 }
-#video1 {
+#image {
     z-index:2;
 }
+#video1 {
+    z-index:3;
+}
 #video2 {
-    z-index:2;
+    z-index:3;
 }
 #alert {
     position: absolute;
@@ -73,7 +76,7 @@ body {
 }
 #footer {
     position: absolute;
-    z-index:5;
+    z-index:6;
     %s
 }
 /* lyric css */
@@ -112,7 +115,7 @@ body {
             vid2.volume = volume;
         }
         switch(state){
-            case 'init':            
+            case 'init':
                 vid.src = path;
                 vid2.src = path;
                 if(loop == null) loop = false;
@@ -294,7 +297,8 @@ body {
 </script>
 </head>
 <body>
-<img id="image" class="size" %s />
+<img id="bgimage" class="size" %s />
+<img id="image" class="size" style="display:none" />
 <video id="video1" class="size" style="visibility:hidden" autobuffer preload>
 </video>
 <video id="video2" class="size" style="visibility:hidden" autobuffer preload>
@@ -397,7 +401,7 @@ def build_lyrics_css(item, webkitvers):
     """
     style = """
 .lyricstable {
-    z-index:4;
+    z-index:5;
     position: absolute;
     display: table;
     %s
diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py
index e7ec9c2af..ef0bdb69f 100644
--- a/openlp/core/lib/serviceitem.py
+++ b/openlp/core/lib/serviceitem.py
@@ -149,15 +149,15 @@ class ServiceItem(object):
         line_break = True
         if self.is_capable(ItemCapabilities.NoLineBreaks):
             line_break = False
+        theme = None
+        if self.theme:
+            theme = self.theme
+        self.main, self.footer = \
+            self.render_manager.set_override_theme(theme, useOverride)
+        self.bg_image_bytes = self.render_manager.renderer.bg_image_bytes
+        self.themedata = self.render_manager.renderer._theme
         if self.service_item_type == ServiceItemType.Text:
             log.debug(u'Formatting slides')
-            theme = None
-            if self.theme:
-                theme = self.theme
-            self.main, self.footer = \
-                self.render_manager.set_override_theme(theme, useOverride)
-            self.bg_image_bytes = self.render_manager.renderer.bg_image_bytes
-            self.themedata = self.render_manager.renderer._theme
             for slide in self._raw_frames:
                 before = time.time()
                 formatted = self.render_manager \
@@ -170,7 +170,7 @@ class ServiceItem(object):
                         u'verseTag': slide[u'verseTag'] })
                 log.log(15, u'Formatting took %4s' % (time.time() - before))
         elif self.service_item_type == ServiceItemType.Image:
-            self.themedata = self.render_manager.global_theme_data
+            #self.themedata = self.render_manager.global_theme_data
             for slide in self._raw_frames:
                 slide[u'image'] = resize_image(slide[u'image'],
                     self.render_manager.width, self.render_manager.height)
diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py
index e4882bee9..a06311965 100644
--- a/openlp/core/ui/maindisplay.py
+++ b/openlp/core/ui/maindisplay.py
@@ -115,22 +115,22 @@ class MainDisplay(DisplayWidget):
         log.debug(u'Setup live = %s for %s ' % (self.isLive,
             self.screens.monitor_number))
         self.usePhonon = QtCore.QSettings().value(
-            u'media/use phonon', QtCore.QVariant(False)).toBool()
+            u'media/use phonon', QtCore.QVariant(True)).toBool()
+        self.phononActive = False
         self.screen = self.screens.current
         self.setVisible(False)
         self.setGeometry(self.screen[u'size'])
-        try:
-            self.webView = QtWebKit.QGraphicsWebView()
-            self.scene = QtGui.QGraphicsScene(self)
-            self.setScene(self.scene)
-            self.scene.addItem(self.webView)
-            self.webView.setGeometry(QtCore.QRectF(0, 0,
-                self.screen[u'size'].width(), self.screen[u'size'].height()))
-        except AttributeError:
-            #  QGraphicsWebView a recent addition, so fall back to QWebView
-            self.webView = QtWebKit.QWebView(self)
-            self.webView.setGeometry(0, 0,
-                self.screen[u'size'].width(), self.screen[u'size'].height())
+        self.videoWidget = Phonon.VideoWidget(self)
+        self.videoWidget.setVisible(False)
+        self.videoWidget.setGeometry(QtCore.QRect(0, 0,
+            self.screen[u'size'].width(), self.screen[u'size'].height()))
+        self.mediaObject = Phonon.MediaObject(self)
+        self.audio = Phonon.AudioOutput(Phonon.VideoCategory, self.mediaObject)
+        Phonon.createPath(self.mediaObject, self.videoWidget)
+        Phonon.createPath(self.mediaObject, self.audio)
+        self.webView = QtWebKit.QWebView(self)
+        self.webView.setGeometry(0, 0,
+            self.screen[u'size'].width(), self.screen[u'size'].height())
         self.page = self.webView.page()
         self.frame = self.page.mainFrame()
         QtCore.QObject.connect(self.webView,
@@ -141,14 +141,6 @@ class MainDisplay(DisplayWidget):
             QtCore.Qt.ScrollBarAlwaysOff)
         self.frame.setScrollBarPolicy(QtCore.Qt.Horizontal,
             QtCore.Qt.ScrollBarAlwaysOff)
-        self.videowidget = Phonon.VideoWidget(self)
-        self.videowidget.setVisible(False)
-        self.videowidget.setGeometry(QtCore.QRect(0, 0,
-            self.screen[u'size'].width(), self.screen[u'size'].height()))
-        self.mediaObject = Phonon.MediaObject(self)
-        self.audio = Phonon.AudioOutput(Phonon.VideoCategory, self.mediaObject)
-        Phonon.createPath(self.mediaObject, self.videowidget)
-        Phonon.createPath(self.mediaObject, self.audio)
         if self.isLive:
             # Build the initial frame.
             self.black = QtGui.QImage(
@@ -209,7 +201,7 @@ class MainDisplay(DisplayWidget):
         """
         log.debug(u'alert')
         if self.height() != self.screen[u'size'].height() \
-            or not self.isVisible():
+            or not self.isVisible() or self.videoWidget.isVisible():
             shrink = True
         else:
             shrink = False
@@ -218,12 +210,17 @@ class MainDisplay(DisplayWidget):
             u'top' if shrink else u'')
         height = self.frame.evaluateJavaScript(js)
         if shrink:
-            if text:
-                self.resize(self.width(), int(height.toString()))
-                self.setVisible(True)
+            if self.phononActive:
+                shrinkItem = self.webView
             else:
-                self.setGeometry(self.screen[u'size'])
-                self.setVisible(False)
+                shrinkItem = self
+            if text:
+                shrinkItem.resize(self.width(), int(height.toString()))
+                shrinkItem.setVisible(True)
+            else:
+                shrinkItem.setVisible(False)
+                shrinkItem.resize(self.screen[u'size'].width(), 
+                    self.screen[u'size'].height())
 
     def image(self, image):
         """
@@ -269,18 +266,21 @@ class MainDisplay(DisplayWidget):
         Used after Video plugin has changed the background
         """
         log.debug(u'resetVideo')
-        if isBackground or not self.usePhonon:
-            self.frame.evaluateJavaScript(u'show_video("close");')
-        else:
+        if self.phononActive:
             self.mediaObject.stop()
             self.mediaObject.clearQueue()
+            self.webView.setVisible(True)
+            self.videoWidget.setVisible(False)
+            self.phononActive = False
+        else:
+            self.frame.evaluateJavaScript(u'show_video("close");')
 
     def videoPlay(self):
         """
         Responds to the request to play a loaded video
         """
         log.debug(u'videoPlay')
-        if self.usePhonon:
+        if self.phononActive:
             self.mediaObject.play()
         else:
             self.frame.evaluateJavaScript(u'show_video("play");')
@@ -293,7 +293,7 @@ class MainDisplay(DisplayWidget):
         Responds to the request to pause a loaded video
         """
         log.debug(u'videoPause')
-        if self.usePhonon:
+        if self.phononActive:
             self.mediaObject.pause()
         else:
             self.frame.evaluateJavaScript(u'show_video("pause");')
@@ -303,10 +303,8 @@ class MainDisplay(DisplayWidget):
         Responds to the request to stop a loaded video
         """
         log.debug(u'videoStop')
-        if self.usePhonon:
+        if self.phononActive:
             self.mediaObject.stop()
-            self.webView.setVisible(True)
-            self.videowidget.setVisible(False)
         else:
             self.frame.evaluateJavaScript(u'show_video("stop");')
 
@@ -315,12 +313,12 @@ class MainDisplay(DisplayWidget):
         Changes the volume of a running video
         """
         log.debug(u'videoVolume %d' % volume)
-        if self.usePhonon:
+        if self.phononActive:
             self.audio.setVolume(volume)
         else:
             self.frame.evaluateJavaScript(u'show_video(null, null, %s);' %
                 str(float(volume)/float(10)))
-            
+
     def video(self, videoPath, volume, isBackground=False):
         """
         Loads and starts a video to run with the option of sound
@@ -333,12 +331,13 @@ class MainDisplay(DisplayWidget):
                 str(float(volume)/float(10)))
             self.frame.evaluateJavaScript(js)
         else:
+            self.phononActive = True
             self.mediaObject.stop()
             self.mediaObject.clearQueue()
             self.mediaObject.setCurrentSource(Phonon.MediaSource(videoPath))
             self.mediaObject.play()
             self.webView.setVisible(False)
-            self.videowidget.setVisible(True)
+            self.videoWidget.setVisible(True)
         return self.preview()
 
     def isLoaded(self):
@@ -419,6 +418,8 @@ class MainDisplay(DisplayWidget):
         Store the images so they can be replaced when required
         """
         log.debug(u'hideDisplay mode = %d', mode)
+        if self.phononActive:
+            self.videoPause()
         if mode == HideMode.Screen:
             self.frame.evaluateJavaScript(u'show_blank("desktop");')
             self.setVisible(False)
@@ -426,8 +427,11 @@ class MainDisplay(DisplayWidget):
             self.frame.evaluateJavaScript(u'show_blank("black");')
         else:
             self.frame.evaluateJavaScript(u'show_blank("theme");')
-        if mode != HideMode.Screen and self.isHidden():
-            self.setVisible(True)
+        if mode != HideMode.Screen:
+            if self.isHidden():
+                self.setVisible(True)
+            if self.phononActive:
+                self.webView.setVisible(True)
         self.hide_mode = mode
 
     def showDisplay(self):
@@ -440,6 +444,9 @@ class MainDisplay(DisplayWidget):
         self.frame.evaluateJavaScript('show_blank("show");')
         if self.isHidden():
             self.setVisible(True)
+        if self.phononActive:
+            self.webView.setVisible(False)
+            self.videoPlay()
         # Trigger actions when display is active again
         Receiver.send_message(u'maindisplay_active')
         self.hide_mode = None
@@ -521,3 +528,4 @@ class AudioPlayer(QtCore.QObject):
         """
         log.debug(u'AudioPlayer Reached end of media playlist')
         self.mediaObject.clearQueue()
+
diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py
index 6966c0f8a..308bfbe6d 100644
--- a/openlp/core/ui/slidecontroller.py
+++ b/openlp/core/ui/slidecontroller.py
@@ -538,7 +538,7 @@ class SlideController(QtGui.QWidget):
                 Receiver.send_message(u'%s_stop' %
                     self.serviceItem.name.lower(), [serviceItem, self.isLive])
             if self.serviceItem.is_media():
-                self.onMediaStop()
+                self.onMediaClose()
         if self.isLive:
             blanked = self.BlankScreen.isChecked()
         else:
@@ -980,3 +980,18 @@ class SlideController(QtGui.QWidget):
             self.video.hide()
         self.SlidePreview.clear()
         self.SlidePreview.show()
+        
+    def onMediaClose(self):
+        """
+        Respond to a request to close the Video
+        """
+        log.debug(u'SlideController onMediaStop')
+        if self.isLive:
+            self.display.resetVideo()
+        else:
+            self.mediaObject.stop()
+            self.mediaObject.clearQueue()
+            self.video.hide()
+        self.SlidePreview.clear()
+        self.SlidePreview.show()
+
