diff --git a/trunk/images/flash-sucks.png b/trunk/images/flash-sucks.png
deleted file mode 100644
index e20710b..0000000
Binary files a/trunk/images/flash-sucks.png and /dev/null differ
diff --git a/trunk/images/mplayer.png b/trunk/images/mplayer.png
index 61e8e6d..cf5dae5 100644
Binary files a/trunk/images/mplayer.png and b/trunk/images/mplayer.png differ
diff --git a/trunk/images/tango/README b/trunk/images/tango/README
index d0b8aca..243393d 100644
--- a/trunk/images/tango/README
+++ b/trunk/images/tango/README
@@ -1,5 +1,5 @@
-Tango icons taken from
-http://tango.freedesktop.org/Tango_Icon_Gallery
+Tango icons by various Artists
+License: Creative Commons BY-SA 2.5
 
-they are licensed under CC BY-SA 2.5
-http://creativecommons.org/licenses/by-sa/2.5/
+Totem icon by Jakub "jimmac" Steiner
+License: GPL 2.0
diff --git a/trunk/images/totem.png b/trunk/images/totem.png
new file mode 100644
index 0000000..7774f4e
Binary files /dev/null and b/trunk/images/totem.png differ
diff --git a/trunk/locale/en-us.xml b/trunk/locale/en-us.xml
index 3245c52..dbe118d 100755
--- a/trunk/locale/en-us.xml
+++ b/trunk/locale/en-us.xml
@@ -61,6 +61,7 @@
     <string id="error_insert_password">Please insert a password.</string>
     <string id="error_repeat_password">Please repeat your password.</string>
     <string id="error_no_query">You passed no query string.</string>
+    <string id="error_no_ogg_plugin">Your browser does not support Ogg Theora video playback.</string>
     <string id=""></string>
 
     <!-- information -->
diff --git a/trunk/style/default.css b/trunk/style/default.css
index 8272e53..a789a59 100755
--- a/trunk/style/default.css
+++ b/trunk/style/default.css
@@ -5,12 +5,6 @@ Yolanda default stylesheet
 
 /* global default */
 
-*
-{
-    clear:            both;
-}
-
-
 body
 {
     font-family:        sans-serif;
@@ -77,6 +71,12 @@ a
         height:             3em;
     }
 
+    div.footer,
+    div.header
+    {
+        clear:                  both;
+    }
+
     a.footer,
     a.header
     {
@@ -137,15 +137,6 @@ a
         border-width:       1px;
     }
 
-/*
-    div.footer
-    {
-        position:           absolute;
-        bottom:             1.5em;
-        margin-right:       1.5em;
-    }
-*/
-
     img.logo-header
     {
         display:        none;
@@ -158,7 +149,6 @@ a
 
 /* content */
 
-
     div.button-download,
     div.button-edit,
     div.button-junk
@@ -185,6 +175,20 @@ a
             vertical-align: middle;
         }
 
+    div#container
+    {
+            position: relative;
+    }
+
+        div#container form
+        {
+            position:       absolute;
+            top:            50%;
+            padding-left:   auto;
+            padding-right:  auto;
+            width:          100%
+        }
+
     div.commentform,
     div.loginform,
     div.registerform,
diff --git a/trunk/xsl/xhtml.xsl b/trunk/xsl/xhtml.xsl
index 230d0f0..2cac299 100755
--- a/trunk/xsl/xhtml.xsl
+++ b/trunk/xsl/xhtml.xsl
@@ -110,36 +110,4 @@
 
 </xsl:template>
 
-<xsl:template name="tagcloud">
-    <xsl:variable name="max" select="//tagcloud/tag/count[not(//tagcloud/tag/count &gt; .)]" />
-    <xsl:variable name="min" select="//tagcloud/tag/count[not(//tagcloud/tag/count &lt; .)]" />
-    <div class="tagcloud">
-        <xsl:for-each select="//tagcloud/tag">
-            <xsl:sort select="text" order="ascending" data-type="text" />
-            <a class="tag">
-                <xsl:attribute name="style">
-<!--
-                scale *should* be logarihmic, but that's not widely supportet
--->
-                    font-size:<xsl:value-of select="round((32-12)*(number(count)-number($min))div (number($max)-number($min)))+12" />px
-                </xsl:attribute>
-                <xsl:attribute name="href">
-                    <xsl:value-of select="$site_strings[@id='path_results']" />
-                    tag:
-                    <xsl:value-of select="text" />
-                </xsl:attribute>
-                
-                <xsl:value-of select="text" />
-<!--
-                unnecessary, except for debug purposes
-                (<xsl:value-of select="count" />)
--->
-            </a>
-            &#8204;
-        </xsl:for-each>
-    </div>
-
-</xsl:template>
-
-
 </xsl:stylesheet>
diff --git a/trunk/xsl/xhtml/frontpage.xsl b/trunk/xsl/xhtml/frontpage.xsl
index d72f1e6..3fa5b33 100644
--- a/trunk/xsl/xhtml/frontpage.xsl
+++ b/trunk/xsl/xhtml/frontpage.xsl
@@ -64,4 +64,35 @@
 
 </xsl:template>
 
+<xsl:template name="tagcloud">
+    <xsl:variable name="max" select="//tagcloud/tag/count[not(//tagcloud/tag/count &gt; .)]" />
+    <xsl:variable name="min" select="//tagcloud/tag/count[not(//tagcloud/tag/count &lt; .)]" />
+    <div class="tagcloud">
+        <xsl:for-each select="//tagcloud/tag">
+            <xsl:sort select="text" order="ascending" data-type="text" />
+            <a class="tag">
+                <xsl:attribute name="style">
+<!--
+                scale *should* be logarihmic, but that's not widely supportet
+-->
+                    font-size:<xsl:value-of select="round((32-12)*(number(count)-number($min))div (number($max)-number($min)))+12" />px
+                </xsl:attribute>
+                <xsl:attribute name="href">
+                    <xsl:value-of select="$site_strings[@id='path_results']" />
+                    tag:
+                    <xsl:value-of select="text" />
+                </xsl:attribute>
+                
+                <xsl:value-of select="text" />
+<!--
+                unnecessary, except for debug purposes
+                (<xsl:value-of select="count" />)
+-->
+            </a>
+            &#8204;
+        </xsl:for-each>
+    </div>
+
+</xsl:template>
+
 </xsl:stylesheet>
diff --git a/trunk/xsl/xhtml/video.xsl b/trunk/xsl/xhtml/video.xsl
index fa630ca..88a602a 100644
--- a/trunk/xsl/xhtml/video.xsl
+++ b/trunk/xsl/xhtml/video.xsl
@@ -41,15 +41,13 @@
         function hide_movie()
             {
             document.getElementById('video').style.display = 'none';
-            document.getElementById('thumbnail').style.display = 'block';
-            document.getElementById('buttons').style.display = 'block';
+            document.getElementById('container').style.display = 'block';
             }
 
         function show_movie()
             {
-            document.getElementById('video').style.display = 'block';
-            document.getElementById('thumbnail').style.display = 'none';
-            document.getElementById('buttons').style.display = 'none';
+            document.getElementById('video').style.display = 'inline';
+            document.getElementById('container').style.display = 'none';
             }
 
         ]]]]></xsl:text>
@@ -57,6 +55,7 @@
     </script>
 
     <object type="application/ogg" id="video">
+
         <xsl:attribute name="width">
             <xsl:value-of select="//video/@width" />
         </xsl:attribute>
@@ -66,62 +65,75 @@
         <xsl:attribute name="data">
             <xsl:value-of select="concat(//video/rdf:RDF/cc:Work/@rdf:about,'view=true')" />
         </xsl:attribute>
-        <img src="/images/flash-sucks.png"/><br />
-        <img src="/images/vlc.png"/>
-        <img src="/images/mplayer.png"/>                    
+
+        <div class="messagebox" id="error">
+            <img src="/images/tango/dialog-error.png" />
+            <xsl:value-of select="$locale_strings[@id='error_no_ogg_plugin']" />
+        </div>
+
+        <div>
+            <img src="/images/vlc.png"/>
+            <img src="/images/mplayer.png"/>
+            <img src="/images/totem.png"/>
+        </div>
+
     </object>
 
-    <img id="thumbnail" style="display: none;">
-        <xsl:attribute name="src">
-            <xsl:value-of select="//video/@thumbnail" />
-        </xsl:attribute>
-        <xsl:attribute name="alt">
-            <xsl:value-of select="//video/rdf:RDF/cc:Work/dc:title" />
-        </xsl:attribute>
-        <xsl:attribute name="height">
-            <xsl:value-of select="//video/@height" />
-        </xsl:attribute>
-        <xsl:attribute name="widht">
-            <xsl:value-of select="//video/@width" />
-        </xsl:attribute>
-    </img>
+    <div id="container" style="display: none;">
 
-    <form id="buttons" method="get">
-        <xsl:attribute name="action">
-            <xsl:value-of select="//video/rdf:RDF/cc:Work/@rdf:about" />
-        </xsl:attribute>
-        <button
-            name="playback"
-            type="button"
-            value="playback"
-            onclick="show_movie()">
-            <img src="/images/tango/media-playback-start.png" alt="playback" />
-            <br />
-            <xsl:value-of select="$locale_strings[@id='video_playback']" />
-            <br />
-            <xsl:variable name="hours" select="floor(//video/@duration div 3600)" />
-            <xsl:variable name="minutes" select="floor((//video/@duration - $hours*3600) div 60)" />
-            <xsl:variable name="seconds" select="//video/@duration - $minutes*60 - $hours*3600" />
-            <xsl:choose>
-                <xsl:when test="$hours=0">
-                    (<xsl:value-of select="concat(format-number($minutes, '00'), ':', format-number($seconds, '00'))" />)
-                </xsl:when>
-                <xsl:otherwise>
-                    (<xsl:value-of select="concat($hours, ':', format-number($minutes, '00'), ':', format-number($seconds, '00'))" />)
-                </xsl:otherwise>
-            </xsl:choose>
-        </button>
-        <button
-            name="download"
-            type="submit"
-            value="download">
-            <img src="/images/tango/document-save.png" alt="download" />
-            <br />
-            <xsl:value-of select="$locale_strings[@id='video_download']" />
-            <br />
-            (<xsl:value-of select="format-number(number(round(//video/@filesize) div 1048576), '0.0#')" />&#160;<xsl:value-of select="$locale_strings[@id='megabytes']" />)
-        </button>
-    </form>
+        <img>
+            <xsl:attribute name="src">
+                <xsl:value-of select="//video/@thumbnail" />
+            </xsl:attribute>
+            <xsl:attribute name="alt">
+                <xsl:value-of select="//video/rdf:RDF/cc:Work/dc:title" />
+            </xsl:attribute>
+            <xsl:attribute name="height">
+                <xsl:value-of select="//video/@height" />
+            </xsl:attribute>
+            <xsl:attribute name="width">
+                <xsl:value-of select="//video/@width" />
+            </xsl:attribute>
+        </img>
+
+        <form>
+            <xsl:attribute name="action">
+                <xsl:value-of select="//video/rdf:RDF/cc:Work/@rdf:about" />
+            </xsl:attribute>
+            <button
+                name="playback"
+                type="button"
+                value="playback"
+                onclick="show_movie()">
+                <img src="/images/tango/media-playback-start.png" alt="playback" />
+                <br />
+                <xsl:value-of select="$locale_strings[@id='video_playback']" />
+                <br />
+                <xsl:variable name="hours" select="floor(//video/@duration div 3600)" />
+                <xsl:variable name="minutes" select="floor((//video/@duration - $hours*3600) div 60)" />
+                <xsl:variable name="seconds" select="//video/@duration - $minutes*60 - $hours*3600" />
+                <xsl:choose>
+                    <xsl:when test="$hours=0">
+                        (<xsl:value-of select="concat(format-number($minutes, '00'), ':', format-number($seconds, '00'))" />)
+                    </xsl:when>
+                    <xsl:otherwise>
+                        (<xsl:value-of select="concat($hours, ':', format-number($minutes, '00'), ':', format-number($seconds, '00'))" />)
+                    </xsl:otherwise>
+                </xsl:choose>
+            </button>
+            <button
+                name="download"
+                type="submit"
+                value="download">
+                <img src="/images/tango/document-save.png" alt="download" />
+                <br />
+                <xsl:value-of select="$locale_strings[@id='video_download']" />
+                <br />
+                (<xsl:value-of select="format-number(number(round(//video/@filesize) div 1048576), '0.0#')" />&#160;<xsl:value-of select="$locale_strings[@id='megabytes']" />)
+            </button>
+        </form>
+
+    </div>
 
     <xsl:if test="not(//@embed='true')">