diff --git a/trunk/xsl/xhtml.xsl b/trunk/xsl/xhtml.xsl
index 0ea3558..c82690b 100755
--- a/trunk/xsl/xhtml.xsl
+++ b/trunk/xsl/xhtml.xsl
@@ -17,8 +17,11 @@
 	omit-xml-declaration="no"
 />
 
-<xsl:include href="../xsl/xhtml/results.xsl"/>
-<xsl:include href="../xsl/xhtml/video.xsl"/>
+<xsl:include href="./xhtml/frontpage.xsl"/>
+<xsl:include href="./xhtml/loginform.xsl"/>
+<xsl:include href="./xhtml/results.xsl"/>
+<xsl:include href="./xhtml/upload.xsl"/>
+<xsl:include href="./xhtml/video.xsl"/>
 
 <xsl:variable name="locale">
 	<xsl:choose>
@@ -35,6 +38,7 @@
 <xsl:variable name="locale_strings" select="document(concat('../locale/', $locale, '.xml'))//strings/str" />
 
 <!-- this kills 99% of the processed XML... sorry Tim Bray.... -->
+<!-- had to look up Bray in Wikipedia, 2 points off my geek score -->
 <xsl:template match="@*|node()">
 	<xsl:if test="not(/)">
 		<xsl:copy>
@@ -225,60 +229,10 @@
 	</html>
 </xsl:template>
 
-<xsl:template name="frontpage">
-
-	<img class="logo-big" src="/images/logo-big.png" alt="Yolanda logo (320x100)" />
-
-	<div class="search">
-		<form method="get" enctype="text/plain">
-			<xsl:attribute name="action">
-				<xsl:value-of select="$site_strings[@id='page_results']" />
-			</xsl:attribute>
-			<fieldset>
-				<input type="text" name="query" size="40" /><br />
-				<input type="submit">
-					<xsl:attribute name="value">
-						<xsl:value-of select="$locale_strings[@id='button_find']" />
-					</xsl:attribute>
-				</input>&#160;
-				<input type="submit" name="lucky">
-					<xsl:attribute name="value">
-						<xsl:value-of select="$locale_strings[@id='button_lucky']" />
-					</xsl:attribute>
-				</input>
-			</fieldset>
-		</form>
-	</div>
-
-	<div class="toplists">
-		<a>
-			<xsl:attribute name="href">
-				<xsl:value-of select="$site_strings[@id='page_query_latestadditions']" />
-			</xsl:attribute>
-			<xsl:value-of select="$locale_strings[@id='query_latestadditions']" />
-		</a>
-		<xsl:value-of select="$locale_strings[@id='separator']" />
-		<a>
-			<xsl:attribute name="href">
-				<xsl:value-of select="$site_strings[@id='page_query_mostdownloads']" />
-			</xsl:attribute>
-			<xsl:value-of select="$locale_strings[@id='query_mostdownloads']" />
-		</a>
-		<xsl:value-of select="$locale_strings[@id='separator']" />
-		<a>
-			<xsl:attribute name="href">
-				<xsl:value-of select="$site_strings[@id='page_query_mostviews']" />
-			</xsl:attribute>
-			<xsl:value-of select="$locale_strings[@id='query_mostviews']" />
-		</a>
-	</div>
-
-	<xsl:call-template name="tagcloud"/>
-
-</xsl:template>
-
 <xsl:template name="search">
+
 	<xsl:call-template name="results"/>
+
 </xsl:template>
 
 <xsl:template name="logo-small">
@@ -341,6 +295,9 @@
 			<xsl:sort select="text" order="ascending" data-type="text" />
 			<a class="tag">
 				<xsl:attribute name="style">
+<!--
+				this *should* be logarihmic, but thats 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">
@@ -349,7 +306,10 @@
 					<xsl:value-of select="text" />
 				</xsl:attribute>
 				<xsl:value-of select="text" />
+<!--
+				unnecessary, except for debug purposes
 				(<xsl:value-of select="count" />)
+-->
 			</a>
 		</xsl:for-each>
 	</div>
@@ -388,514 +348,6 @@
 
 </xsl:template>
 
-<xsl:template name="loginform">
-	<div class="loginform">
-		<xsl:choose>
-			<xsl:when test="//loginform/@action='openid'">
-				<form method="post">
-					<xsl:attribute name="action">
-						<xsl:value-of select="$site_strings[@id='page_login']" />
-					</xsl:attribute>
-					<fieldset>
-						<input name="action" type="hidden" value="openid" />
-						OpenID:
-						<br />
-						<input name="user" type="text" style="background: url(http://stat.livejournal.com/img/openid-inputicon.gif) no-repeat; background-color: #fff; background-position: 0 50%; padding-left: 18px;" />
-						<br />
-						e.g. http://username.myopenid.com
-						<br />
-						<input type="submit" name="login" >
-							<xsl:attribute name="value">
-								<xsl:value-of select="$locale_strings[@id='button_login']" />
-							</xsl:attribute>
-						</input>
-						<br />
-						<a>
-							<xsl:attribute name="href">
-								<xsl:value-of select="$site_strings[@id='page_login']" />
-							</xsl:attribute>
-							login with normal account
-						</a>
-					</fieldset>
-				</form>
-			</xsl:when>
-			<xsl:otherwise>
-				<form method="post">
-					<xsl:attribute name="action">
-						<xsl:value-of select="$site_strings[@id='page_login']" />
-					</xsl:attribute>
-					<fieldset>
-						<input name="action" type="hidden" value="login" />
-						<xsl:value-of select="$locale_strings[@id='username']" />:
-						<br />				
-						<input name="user" type="text" size="30" maxlength="30" />
-						<br />
-						<xsl:value-of select="$locale_strings[@id='password']" />:
-						<br />
-						<input name="pass" type="password" size="30" maxlength="30" />
-						<br />
-						<input type="submit" name="login" >
-							<xsl:attribute name="value">
-								<xsl:value-of select="$locale_strings[@id='button_login']" />
-							</xsl:attribute>
-						</input>
-						<br />
-						<a>
-							<xsl:attribute name="href">
-								<xsl:value-of select="$site_strings[@id='page_login-openid']" />
-							</xsl:attribute>
-							login with openid
-						</a>
-					</fieldset>
-				</form>
-			</xsl:otherwise>
-		</xsl:choose>
-	</div>
-
-</xsl:template>
-
-<xsl:template name="uploadform">
-	<div class="uploadform">
-		<xsl:choose>
-
-			<xsl:when test="//uploadform/@page=1">
-				<h2>Basic Description</h2>
-				<p>These entries describe the very nature of your upload. All fields are required to be filled appropriately.</p>
-				<form method="post">
-					<xsl:attribute name="action">
-						<xsl:value-of select="$site_strings[@id='page_upload']" />
-					</xsl:attribute>
-					<input name="DC.Creator" type="hidden">
-						<xsl:attribute name="value">
-							<xsl:value-of select="//uploadform/@DC.Creator" />
-						</xsl:attribute>
-					</input>
-					<input name="DC.Source" type="hidden">
-						<xsl:attribute name="value">
-							<xsl:value-of select="//uploadform/@DC.Source" />
-						</xsl:attribute>
-					</input>
-					<input name="DC.Language" type="hidden">
-						<xsl:attribute name="value">
-							<xsl:value-of select="//uploadform/@DC.Language" />
-						</xsl:attribute>
-					</input>
-					<input name="DC.Coverage" type="hidden">
-						<xsl:attribute name="value">
-							<xsl:value-of select="//uploadform/@DC.Coverage" />
-						</xsl:attribute>
-					</input>
-					<fieldset>
-						<input type="hidden" name="page" value="2" />
-						<div class="messagebox">
-							<xsl:value-of select="$locale_strings[@id='instruction_title']" />
-							<br />
-							<input name="DC.Title" type="text" size="30">
-								<xsl:attribute name="value">
-									<xsl:value-of select="//uploadform/@DC.Title" />
-								</xsl:attribute>
-							</input>
-						</div>
-						<div class="messagebox">
-							<xsl:value-of select="$locale_strings[@id='instruction_subject']" />
-							<br />
-							<input name="DC.Subject" type="text" size="30">
-								<xsl:attribute name="value">
-									<xsl:value-of select="//uploadform/@DC.Subject" />
-								</xsl:attribute>
-							</input>
-						</div>
-						<div class="messagebox">
-							<xsl:value-of select="$locale_strings[@id='instruction_description']" />
-							<br />
-							<textarea name="DC.Description" cols="50" rows="5">
-								<xsl:value-of select="//uploadform/@DC.Description" />
-							</textarea>
-						</div>
-						<input type="submit" name="2">
-							<xsl:attribute name="value">
-								<xsl:value-of select="$locale_strings[@id='button_next_page']" />
-							</xsl:attribute>
-						</input>
-						<br />
-						<span class="protip">
-							<xsl:value-of select="$locale_strings[@id='this_is_page_1']" />
-						</span>
-					</fieldset>
-				</form>
-			</xsl:when>
-			
-			<xsl:when test="//uploadform/@page=2">
-				<h2>Uploads that match your description</h2>
-				<p>If the attributes you just entered is imilar to those of already uploaded videos you will see the results below.</p>
-				<p>Please check if your video is not among them and then click next to proceed.</p>
-				<form method="post">
-					<xsl:attribute name="action">
-						<xsl:value-of select="$site_strings[@id='page_upload']" />
-					</xsl:attribute>
-					<input name="DC.Title" type="hidden">
-						<xsl:attribute name="value">
-							<xsl:value-of select="//uploadform/@DC.Title" />
-						</xsl:attribute>
-					</input>
-					<input name="DC.Subject" type="hidden">
-						<xsl:attribute name="value">
-							<xsl:value-of select="//uploadform/@DC.Subject" />
-						</xsl:attribute>
-					</input>
-					<input name="DC.Description" type="hidden">
-						<xsl:attribute name="value">
-							<xsl:value-of select="//uploadform/@DC.Description" />
-						</xsl:attribute>
-					</input>
-					<input name="DC.Creator" type="hidden">
-						<xsl:attribute name="value">
-							<xsl:value-of select="//uploadform/@DC.Creator" />
-						</xsl:attribute>
-					</input>
-					<input name="DC.Source" type="hidden">
-						<xsl:attribute name="value">
-							<xsl:value-of select="//uploadform/@DC.Source" />
-						</xsl:attribute>
-					</input>
-					<input name="DC.Language" type="hidden">
-						<xsl:attribute name="value">
-							<xsl:value-of select="//uploadform/@DC.Language" />
-						</xsl:attribute>
-					</input>
-					<input name="DC.Coverage" type="hidden">
-						<xsl:attribute name="value">
-							<xsl:value-of select="//uploadform/@DC.Coverage" />
-						</xsl:attribute>
-					</input>
-					<fieldset>
-						<input type="submit" name="1">
-							<xsl:attribute name="value">
-								<xsl:value-of select="$locale_strings[@id='button_previous_page']" />
-							</xsl:attribute>
-						</input>
-						<input type="submit" name="3">
-							<xsl:attribute name="value">
-								<xsl:value-of select="$locale_strings[@id='button_next_page']" />
-							</xsl:attribute>
-						</input>
-						<br />
-						<span class="protip">
-							<xsl:value-of select="$locale_strings[@id='this_is_page_2']" />
-						</span>
-					</fieldset>
-				</form>
-				<xsl:call-template name="innerresults"/>
-			</xsl:when>
-
-			<xsl:when test="//uploadform/@page=3">
-				<h2>Additional information</h2>
-				<p>The following fields are optional but recommended.</p>
-				<form method="post">
-					<xsl:attribute name="action">
-						<xsl:value-of select="$site_strings[@id='page_upload']" />
-					</xsl:attribute>
-					<input name="DC.Title" type="hidden">
-						<xsl:attribute name="value">
-							<xsl:value-of select="//uploadform/@DC.Title" />
-						</xsl:attribute>
-					</input>
-					<input name="DC.Subject" type="hidden">
-						<xsl:attribute name="value">
-							<xsl:value-of select="//uploadform/@DC.Subject" />
-						</xsl:attribute>
-					</input>
-					<input name="DC.Description" type="hidden">
-						<xsl:attribute name="value">
-							<xsl:value-of select="//uploadform/@DC.Description" />
-						</xsl:attribute>
-					</input>
-					<fieldset>
-						<div class="messagebox">
-							<xsl:value-of select="$locale_strings[@id='instruction_creator']" />
-							<br />
-							<input type="radio" name="creator" value="user" />myself
-							<br />
-							<input type="radio" name="creator" value="other" />other:
-							<br />
-							<input name="DC.Creator" type="text" size="30" />
-							</div>
-						<div class="messagebox">
-							<xsl:value-of select="$locale_strings[@id='instruction_source']" />
-							<br />
-							<input name="DC.Source" type="text" size="30" />
-						</div>
-						<div class="messagebox">
-							<xsl:value-of select="$locale_strings[@id='instruction_language']" />
-							<br />
-							<select name="DC.Language">
-								<option>English</option>
-								<option>German</option>
-							</select>
-						</div>
-						<div class="messagebox">
-							<xsl:value-of select="$locale_strings[@id='instruction_coverage']" />
-							<br />
-							<input name="DC.Coverage" type="text" size="30" />
-						</div>
-						<input type="submit" name="2">
-							<xsl:attribute name="value">
-								<xsl:value-of select="$locale_strings[@id='button_previous_page']" />
-							</xsl:attribute>
-						</input>
-						<input type="submit" name="4">
-							<xsl:attribute name="value">
-								<xsl:value-of select="$locale_strings[@id='button_next_page']" />
-							</xsl:attribute>
-						</input>
-						<br />
-						<span class="protip">
-							<xsl:value-of select="$locale_strings[@id='this_is_page_3']" />
-						</span>
-					</fieldset>
-				</form>
-			</xsl:when>
-			
-			<xsl:when test="//uploadform/@page=4">
-				<h2>Licensing</h2>
-				<p>If you are the copyright holder feel free to use creative commons to license your work. If not, select the original license of your video.</p>
-				<form method="post">
-					<xsl:attribute name="action">
-						<xsl:value-of select="$site_strings[@id='page_upload']" />
-					</xsl:attribute>
-					<input name="DC.Title" type="hidden">
-						<xsl:attribute name="value">
-							<xsl:value-of select="//uploadform/@DC.Title" />
-						</xsl:attribute>
-					</input>
-					<input name="DC.Subject" type="hidden">
-						<xsl:attribute name="value">
-							<xsl:value-of select="//uploadform/@DC.Subject" />
-						</xsl:attribute>
-					</input>
-					<input name="DC.Description" type="hidden">
-						<xsl:attribute name="value">
-							<xsl:value-of select="//uploadform/@DC.Description" />
-						</xsl:attribute>
-					</input>
-					<input name="DC.Creator" type="hidden">
-						<xsl:attribute name="value">
-							<xsl:value-of select="//uploadform/@DC.Creator" />
-						</xsl:attribute>
-					</input>
-					<input name="DC.Source" type="hidden">
-						<xsl:attribute name="value">
-							<xsl:value-of select="//uploadform/@DC.Source" />
-						</xsl:attribute>
-					</input>
-					<input name="DC.Language" type="hidden">
-						<xsl:attribute name="value">
-							<xsl:value-of select="//uploadform/@DC.Language" />
-						</xsl:attribute>
-					</input>
-					<input name="DC.Coverage" type="hidden">
-						<xsl:attribute name="value">
-							<xsl:value-of select="//uploadform/@DC.Coverage" />
-						</xsl:attribute>
-					</input>
-					<fieldset>
-						<div class="messagebox">
-							<input type="radio" name="license" checked="checked" />none
-							<br />
-							<input type="radio" name="license" />proprietary
-							<br />
-							<input type="radio" name="license" />public domain
-							<br />
-							<input type="radio" name="license" />creative commons
-							<br />
-							<select>
-								<option>cc-by</option>
-								<option>cc-by-sa</option>
-								<option>cc-by-sa-nc</option>
-								<option>cc-by-nc</option>
-								<option>cc-by-nd</option>
-								<option>cc-by-nd-nc</option>
-							</select>
-						</div>
-						<input type="submit" name="3">
-							<xsl:attribute name="value">
-								<xsl:value-of select="$locale_strings[@id='button_previous_page']" />
-							</xsl:attribute>
-						</input>
-						<input type="submit" name="5">
-							<xsl:attribute name="value">
-								<xsl:value-of select="$locale_strings[@id='button_next_page']" />
-							</xsl:attribute>
-						</input>
-						<br />
-						<span class="protip">
-							<xsl:value-of select="$locale_strings[@id='this_is_page_4']" />
-						</span>
-					</fieldset>
-				</form>
-			</xsl:when>
-			
-			<xsl:when test="//uploadform/@page=5">
-				<h2>Summary</h2>
-				<p>Please check everything for correctness and edit if neccessary.</p>
-				<form method="post">
-					<xsl:attribute name="action">
-						<xsl:value-of select="$site_strings[@id='page_upload']" />
-					</xsl:attribute>
-					<input name="DC.Title" type="hidden">
-						<xsl:attribute name="value">
-							<xsl:value-of select="//uploadform/@DC.Title" />
-						</xsl:attribute>
-					</input>
-					<input name="DC.Subject" type="hidden">
-						<xsl:attribute name="value">
-							<xsl:value-of select="//uploadform/@DC.Subject" />
-						</xsl:attribute>
-					</input>
-					<input name="DC.Description" type="hidden">
-						<xsl:attribute name="value">
-							<xsl:value-of select="//uploadform/@DC.Description" />
-						</xsl:attribute>
-					</input>
-					<fieldset>
-					<input name="DC.Title" type="hidden">
-						<xsl:attribute name="value">
-							<xsl:value-of select="//uploadform/@DC.Title" />
-						</xsl:attribute>
-					</input>
-					<input name="DC.Subject" type="hidden">
-						<xsl:attribute name="value">
-							<xsl:value-of select="//uploadform/@DC.Subject" />
-						</xsl:attribute>
-					</input>
-					<input name="DC.Description" type="hidden">
-						<xsl:attribute name="value">
-							<xsl:value-of select="//uploadform/@DC.Description" />
-						</xsl:attribute>
-					</input>
-					<input name="DC.Creator" type="hidden">
-						<xsl:attribute name="value">
-							<xsl:value-of select="//uploadform/@DC.Creator" />
-						</xsl:attribute>
-					</input>
-					<input name="DC.Source" type="hidden">
-						<xsl:attribute name="value">
-							<xsl:value-of select="//uploadform/@DC.Source" />
-						</xsl:attribute>
-					</input>
-					<input name="DC.Language" type="hidden">
-						<xsl:attribute name="value">
-							<xsl:value-of select="//uploadform/@DC.Language" />
-						</xsl:attribute>
-					</input>
-					<input name="DC.Coverage" type="hidden">
-						<xsl:attribute name="value">
-							<xsl:value-of select="//uploadform/@DC.Coverage" />
-						</xsl:attribute>
-					</input>
-						<div class="messagebox">
-							title:
-							<br />
-							subject:
-							<br />
-							description:
-							<br />
-							<input type="submit" name="1">
-								<xsl:attribute name="value">
-									<xsl:value-of select="$locale_strings[@id='button_page_1']" />
-								</xsl:attribute>
-							</input>
-						</div>
-						<div class="messagebox">
-							creator:
-							<br />
-							source:
-							<br />
-							language:
-							<br />
-							coverage:
-							<br />
-							<input type="submit" name="3">
-								<xsl:attribute name="value">
-									<xsl:value-of select="$locale_strings[@id='button_page_3']" />
-								</xsl:attribute>
-							</input>
-						</div>
-						<div class="messagebox">
-							license:
-							<br />
-							<input type="submit" name="4">
-								<xsl:attribute name="value">
-									<xsl:value-of select="$locale_strings[@id='button_page_4']" />
-								</xsl:attribute>
-							</input>
-						</div>
-					</fieldset>
-				</form>
-				<p>If Everything is okay proceed below by uploading your video.</p>
-				<form method="post" enctype="multipart/form-data">
-					<xsl:attribute name="action">
-						<xsl:value-of select="$site_strings[@id='page_uploader']" />
-					</xsl:attribute>
-					<input name="DC.Title" type="hidden">
-						<xsl:attribute name="value">
-							<xsl:value-of select="//uploadform/@DC.Title" />
-						</xsl:attribute>
-					</input>
-					<input name="DC.Subject" type="hidden">
-						<xsl:attribute name="value">
-							<xsl:value-of select="//uploadform/@DC.Subject" />
-						</xsl:attribute>
-					</input>
-					<input name="DC.Description" type="hidden">
-						<xsl:attribute name="value">
-							<xsl:value-of select="//uploadform/@DC.Description" />
-						</xsl:attribute>
-					</input>
-					<input name="DC.Creator" type="hidden">
-						<xsl:attribute name="value">
-							<xsl:value-of select="//uploadform/@DC.Creator" />
-						</xsl:attribute>
-					</input>
-					<input name="DC.Source" type="hidden">
-						<xsl:attribute name="value">
-							<xsl:value-of select="//uploadform/@DC.Source" />
-						</xsl:attribute>
-					</input>
-					<input name="DC.Language" type="hidden">
-						<xsl:attribute name="value">
-							<xsl:value-of select="//uploadform/@DC.Language" />
-						</xsl:attribute>
-					</input>
-					<input name="DC.Coverage" type="hidden">
-						<xsl:attribute name="value">
-							<xsl:value-of select="//uploadform/@DC.Coverage" />
-						</xsl:attribute>
-					</input>
-					<fieldset>
-						<div class="messagebox">
-						<xsl:value-of select="$locale_strings[@id='instruction_file']" />
-						<br />
-						<input name="file" type="file" size="13" />
-						</div>
-						<input type="submit">
-							<xsl:attribute name="value">
-								<xsl:value-of select="$locale_strings[@id='button_upload']" />
-							</xsl:attribute>
-						</input>
-						<br />
-						<span class="protip">
-							<xsl:value-of select="$locale_strings[@id='this_is_page_5']" />
-						</span>
-					</fieldset>
-				</form>
-			</xsl:when>
-
-		</xsl:choose>
-	</div>
-
-</xsl:template>
-
 <xsl:template name="account">
 	<div>
 		<a>
diff --git a/trunk/xsl/xhtml/frontpage.xsl b/trunk/xsl/xhtml/frontpage.xsl
new file mode 100644
index 0000000..18d5061
--- /dev/null
+++ b/trunk/xsl/xhtml/frontpage.xsl
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<xsl:stylesheet version="1.0"
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	xmlns:dc="http://purl.org/dc/elements/1.1/"
+	xmlns:cc="http://web.resource.org/cc/"
+	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+>
+
+<xsl:template name="frontpage">
+
+	<img class="logo-big" src="/images/logo-big.png" alt="Yolanda logo (320x100)" />
+
+	<div class="search">
+		<form method="get" enctype="text/plain">
+			<xsl:attribute name="action">
+				<xsl:value-of select="$site_strings[@id='page_results']" />
+			</xsl:attribute>
+			<fieldset>
+				<input type="text" name="query" size="40" /><br />
+				<input type="submit">
+					<xsl:attribute name="value">
+						<xsl:value-of select="$locale_strings[@id='button_find']" />
+					</xsl:attribute>
+				</input>&#160;
+				<input type="submit" name="lucky">
+					<xsl:attribute name="value">
+						<xsl:value-of select="$locale_strings[@id='button_lucky']" />
+					</xsl:attribute>
+				</input>
+			</fieldset>
+		</form>
+	</div>
+
+	<div class="toplists">
+		<a>
+			<xsl:attribute name="href">
+				<xsl:value-of select="$site_strings[@id='page_query_latestadditions']" />
+			</xsl:attribute>
+			<xsl:value-of select="$locale_strings[@id='query_latestadditions']" />
+		</a>
+		<xsl:value-of select="$locale_strings[@id='separator']" />
+		<a>
+			<xsl:attribute name="href">
+				<xsl:value-of select="$site_strings[@id='page_query_mostdownloads']" />
+			</xsl:attribute>
+			<xsl:value-of select="$locale_strings[@id='query_mostdownloads']" />
+		</a>
+		<xsl:value-of select="$locale_strings[@id='separator']" />
+		<a>
+			<xsl:attribute name="href">
+				<xsl:value-of select="$site_strings[@id='page_query_mostviews']" />
+			</xsl:attribute>
+			<xsl:value-of select="$locale_strings[@id='query_mostviews']" />
+		</a>
+	</div>
+
+	<xsl:call-template name="tagcloud"/>
+
+</xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/trunk/xsl/xhtml/loginform.xsl b/trunk/xsl/xhtml/loginform.xsl
new file mode 100644
index 0000000..fd30130
--- /dev/null
+++ b/trunk/xsl/xhtml/loginform.xsl
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<xsl:stylesheet version="1.0"
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	xmlns:dc="http://purl.org/dc/elements/1.1/"
+	xmlns:cc="http://web.resource.org/cc/"
+	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+>
+
+<xsl:template name="loginform">
+	<div class="loginform">
+		<xsl:choose>
+			<xsl:when test="//loginform/@action='openid'">
+				<form method="post">
+					<xsl:attribute name="action">
+						<xsl:value-of select="$site_strings[@id='page_login']" />
+					</xsl:attribute>
+					<fieldset>
+						<input name="action" type="hidden" value="openid" />
+						OpenID:
+						<br />
+						<input name="user" type="text" style="background: url(http://stat.livejournal.com/img/openid-inputicon.gif) no-repeat; background-color: #fff; background-position: 0 50%; padding-left: 18px;" />
+						<br />
+						e.g. http://username.myopenid.com
+						<br />
+						<input type="submit" name="login" >
+							<xsl:attribute name="value">
+								<xsl:value-of select="$locale_strings[@id='button_login']" />
+							</xsl:attribute>
+						</input>
+						<br />
+						<a>
+							<xsl:attribute name="href">
+								<xsl:value-of select="$site_strings[@id='page_login']" />
+							</xsl:attribute>
+							login with normal account
+						</a>
+					</fieldset>
+				</form>
+			</xsl:when>
+			<xsl:otherwise>
+				<form method="post">
+					<xsl:attribute name="action">
+						<xsl:value-of select="$site_strings[@id='page_login']" />
+					</xsl:attribute>
+					<fieldset>
+						<input name="action" type="hidden" value="login" />
+						<xsl:value-of select="$locale_strings[@id='username']" />:
+						<br />				
+						<input name="user" type="text" size="30" maxlength="30" />
+						<br />
+						<xsl:value-of select="$locale_strings[@id='password']" />:
+						<br />
+						<input name="pass" type="password" size="30" maxlength="30" />
+						<br />
+						<input type="submit" name="login" >
+							<xsl:attribute name="value">
+								<xsl:value-of select="$locale_strings[@id='button_login']" />
+							</xsl:attribute>
+						</input>
+						<br />
+						<a>
+							<xsl:attribute name="href">
+								<xsl:value-of select="$site_strings[@id='page_login-openid']" />
+							</xsl:attribute>
+							login with openid
+						</a>
+					</fieldset>
+				</form>
+			</xsl:otherwise>
+		</xsl:choose>
+	</div>
+
+</xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/trunk/xsl/xhtml/results.xsl b/trunk/xsl/xhtml/results.xsl
index a395247..9e8aba1 100644
--- a/trunk/xsl/xhtml/results.xsl
+++ b/trunk/xsl/xhtml/results.xsl
@@ -379,5 +379,4 @@
 	</div>
 </xsl:template>
 
-
 </xsl:stylesheet>
diff --git a/trunk/xsl/xhtml/upload.xsl b/trunk/xsl/xhtml/upload.xsl
new file mode 100644
index 0000000..da5b2a5
--- /dev/null
+++ b/trunk/xsl/xhtml/upload.xsl
@@ -0,0 +1,451 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<xsl:stylesheet version="1.0"
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	xmlns:dc="http://purl.org/dc/elements/1.1/"
+	xmlns:cc="http://web.resource.org/cc/"
+	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+>
+<xsl:template name="uploadform">
+	<div class="uploadform">
+		<xsl:choose>
+
+			<xsl:when test="//uploadform/@page=1">
+				<h2>Basic Description</h2>
+				<p>These entries describe the very nature of your upload. All fields are required to be filled appropriately.</p>
+				<form method="post">
+					<xsl:attribute name="action">
+						<xsl:value-of select="$site_strings[@id='page_upload']" />
+					</xsl:attribute>
+					<input name="DC.Creator" type="hidden">
+						<xsl:attribute name="value">
+							<xsl:value-of select="//uploadform/@DC.Creator" />
+						</xsl:attribute>
+					</input>
+					<input name="DC.Source" type="hidden">
+						<xsl:attribute name="value">
+							<xsl:value-of select="//uploadform/@DC.Source" />
+						</xsl:attribute>
+					</input>
+					<input name="DC.Language" type="hidden">
+						<xsl:attribute name="value">
+							<xsl:value-of select="//uploadform/@DC.Language" />
+						</xsl:attribute>
+					</input>
+					<input name="DC.Coverage" type="hidden">
+						<xsl:attribute name="value">
+							<xsl:value-of select="//uploadform/@DC.Coverage" />
+						</xsl:attribute>
+					</input>
+					<fieldset>
+						<input type="hidden" name="page" value="2" />
+						<div class="messagebox">
+							<xsl:value-of select="$locale_strings[@id='instruction_title']" />
+							<br />
+							<input name="DC.Title" type="text" size="30">
+								<xsl:attribute name="value">
+									<xsl:value-of select="//uploadform/@DC.Title" />
+								</xsl:attribute>
+							</input>
+						</div>
+						<div class="messagebox">
+							<xsl:value-of select="$locale_strings[@id='instruction_subject']" />
+							<br />
+							<input name="DC.Subject" type="text" size="30">
+								<xsl:attribute name="value">
+									<xsl:value-of select="//uploadform/@DC.Subject" />
+								</xsl:attribute>
+							</input>
+						</div>
+						<div class="messagebox">
+							<xsl:value-of select="$locale_strings[@id='instruction_description']" />
+							<br />
+							<textarea name="DC.Description" cols="50" rows="5">
+								<xsl:value-of select="//uploadform/@DC.Description" />
+							</textarea>
+						</div>
+						<input type="submit" name="2">
+							<xsl:attribute name="value">
+								<xsl:value-of select="$locale_strings[@id='button_next_page']" />
+							</xsl:attribute>
+						</input>
+						<br />
+						<span class="protip">
+							<xsl:value-of select="$locale_strings[@id='this_is_page_1']" />
+						</span>
+					</fieldset>
+				</form>
+			</xsl:when>
+			
+			<xsl:when test="//uploadform/@page=2">
+				<h2>Uploads that match your description</h2>
+				<p>If the attributes you just entered is imilar to those of already uploaded videos you will see the results below.</p>
+				<p>Please check if your video is not among them and then click next to proceed.</p>
+				<form method="post">
+					<xsl:attribute name="action">
+						<xsl:value-of select="$site_strings[@id='page_upload']" />
+					</xsl:attribute>
+					<input name="DC.Title" type="hidden">
+						<xsl:attribute name="value">
+							<xsl:value-of select="//uploadform/@DC.Title" />
+						</xsl:attribute>
+					</input>
+					<input name="DC.Subject" type="hidden">
+						<xsl:attribute name="value">
+							<xsl:value-of select="//uploadform/@DC.Subject" />
+						</xsl:attribute>
+					</input>
+					<input name="DC.Description" type="hidden">
+						<xsl:attribute name="value">
+							<xsl:value-of select="//uploadform/@DC.Description" />
+						</xsl:attribute>
+					</input>
+					<input name="DC.Creator" type="hidden">
+						<xsl:attribute name="value">
+							<xsl:value-of select="//uploadform/@DC.Creator" />
+						</xsl:attribute>
+					</input>
+					<input name="DC.Source" type="hidden">
+						<xsl:attribute name="value">
+							<xsl:value-of select="//uploadform/@DC.Source" />
+						</xsl:attribute>
+					</input>
+					<input name="DC.Language" type="hidden">
+						<xsl:attribute name="value">
+							<xsl:value-of select="//uploadform/@DC.Language" />
+						</xsl:attribute>
+					</input>
+					<input name="DC.Coverage" type="hidden">
+						<xsl:attribute name="value">
+							<xsl:value-of select="//uploadform/@DC.Coverage" />
+						</xsl:attribute>
+					</input>
+					<fieldset>
+						<input type="submit" name="1">
+							<xsl:attribute name="value">
+								<xsl:value-of select="$locale_strings[@id='button_previous_page']" />
+							</xsl:attribute>
+						</input>
+						<input type="submit" name="3">
+							<xsl:attribute name="value">
+								<xsl:value-of select="$locale_strings[@id='button_next_page']" />
+							</xsl:attribute>
+						</input>
+						<br />
+						<span class="protip">
+							<xsl:value-of select="$locale_strings[@id='this_is_page_2']" />
+						</span>
+					</fieldset>
+				</form>
+				<xsl:call-template name="innerresults"/>
+			</xsl:when>
+
+			<xsl:when test="//uploadform/@page=3">
+				<h2>Additional information</h2>
+				<p>The following fields are optional but recommended.</p>
+				<form method="post">
+					<xsl:attribute name="action">
+						<xsl:value-of select="$site_strings[@id='page_upload']" />
+					</xsl:attribute>
+					<input name="DC.Title" type="hidden">
+						<xsl:attribute name="value">
+							<xsl:value-of select="//uploadform/@DC.Title" />
+						</xsl:attribute>
+					</input>
+					<input name="DC.Subject" type="hidden">
+						<xsl:attribute name="value">
+							<xsl:value-of select="//uploadform/@DC.Subject" />
+						</xsl:attribute>
+					</input>
+					<input name="DC.Description" type="hidden">
+						<xsl:attribute name="value">
+							<xsl:value-of select="//uploadform/@DC.Description" />
+						</xsl:attribute>
+					</input>
+					<fieldset>
+						<div class="messagebox">
+							<xsl:value-of select="$locale_strings[@id='instruction_creator']" />
+							<br />
+							<input type="radio" name="creator" value="user" />myself
+							<br />
+							<input type="radio" name="creator" value="other" />other:
+							<br />
+							<input name="DC.Creator" type="text" size="30" />
+							</div>
+						<div class="messagebox">
+							<xsl:value-of select="$locale_strings[@id='instruction_source']" />
+							<br />
+							<input name="DC.Source" type="text" size="30" />
+						</div>
+						<div class="messagebox">
+							<xsl:value-of select="$locale_strings[@id='instruction_language']" />
+							<br />
+							<select name="DC.Language">
+								<option>English</option>
+								<option>German</option>
+							</select>
+						</div>
+						<div class="messagebox">
+							<xsl:value-of select="$locale_strings[@id='instruction_coverage']" />
+							<br />
+							<input name="DC.Coverage" type="text" size="30" />
+						</div>
+						<input type="submit" name="2">
+							<xsl:attribute name="value">
+								<xsl:value-of select="$locale_strings[@id='button_previous_page']" />
+							</xsl:attribute>
+						</input>
+						<input type="submit" name="4">
+							<xsl:attribute name="value">
+								<xsl:value-of select="$locale_strings[@id='button_next_page']" />
+							</xsl:attribute>
+						</input>
+						<br />
+						<span class="protip">
+							<xsl:value-of select="$locale_strings[@id='this_is_page_3']" />
+						</span>
+					</fieldset>
+				</form>
+			</xsl:when>
+			
+			<xsl:when test="//uploadform/@page=4">
+				<h2>Licensing</h2>
+				<p>If you are the copyright holder feel free to use creative commons to license your work. If not, select the original license of your video.</p>
+				<form method="post">
+					<xsl:attribute name="action">
+						<xsl:value-of select="$site_strings[@id='page_upload']" />
+					</xsl:attribute>
+					<input name="DC.Title" type="hidden">
+						<xsl:attribute name="value">
+							<xsl:value-of select="//uploadform/@DC.Title" />
+						</xsl:attribute>
+					</input>
+					<input name="DC.Subject" type="hidden">
+						<xsl:attribute name="value">
+							<xsl:value-of select="//uploadform/@DC.Subject" />
+						</xsl:attribute>
+					</input>
+					<input name="DC.Description" type="hidden">
+						<xsl:attribute name="value">
+							<xsl:value-of select="//uploadform/@DC.Description" />
+						</xsl:attribute>
+					</input>
+					<input name="DC.Creator" type="hidden">
+						<xsl:attribute name="value">
+							<xsl:value-of select="//uploadform/@DC.Creator" />
+						</xsl:attribute>
+					</input>
+					<input name="DC.Source" type="hidden">
+						<xsl:attribute name="value">
+							<xsl:value-of select="//uploadform/@DC.Source" />
+						</xsl:attribute>
+					</input>
+					<input name="DC.Language" type="hidden">
+						<xsl:attribute name="value">
+							<xsl:value-of select="//uploadform/@DC.Language" />
+						</xsl:attribute>
+					</input>
+					<input name="DC.Coverage" type="hidden">
+						<xsl:attribute name="value">
+							<xsl:value-of select="//uploadform/@DC.Coverage" />
+						</xsl:attribute>
+					</input>
+					<fieldset>
+						<div class="messagebox">
+							<input type="radio" name="license" checked="checked" />none
+							<br />
+							<input type="radio" name="license" />proprietary
+							<br />
+							<input type="radio" name="license" />public domain
+							<br />
+							<input type="radio" name="license" />creative commons
+							<br />
+							<select>
+								<option>cc-by</option>
+								<option>cc-by-sa</option>
+								<option>cc-by-sa-nc</option>
+								<option>cc-by-nc</option>
+								<option>cc-by-nd</option>
+								<option>cc-by-nd-nc</option>
+							</select>
+						</div>
+						<input type="submit" name="3">
+							<xsl:attribute name="value">
+								<xsl:value-of select="$locale_strings[@id='button_previous_page']" />
+							</xsl:attribute>
+						</input>
+						<input type="submit" name="5">
+							<xsl:attribute name="value">
+								<xsl:value-of select="$locale_strings[@id='button_next_page']" />
+							</xsl:attribute>
+						</input>
+						<br />
+						<span class="protip">
+							<xsl:value-of select="$locale_strings[@id='this_is_page_4']" />
+						</span>
+					</fieldset>
+				</form>
+			</xsl:when>
+			
+			<xsl:when test="//uploadform/@page=5">
+				<h2>Summary</h2>
+				<p>Please check everything for correctness and edit if neccessary.</p>
+				<form method="post">
+					<xsl:attribute name="action">
+						<xsl:value-of select="$site_strings[@id='page_upload']" />
+					</xsl:attribute>
+					<input name="DC.Title" type="hidden">
+						<xsl:attribute name="value">
+							<xsl:value-of select="//uploadform/@DC.Title" />
+						</xsl:attribute>
+					</input>
+					<input name="DC.Subject" type="hidden">
+						<xsl:attribute name="value">
+							<xsl:value-of select="//uploadform/@DC.Subject" />
+						</xsl:attribute>
+					</input>
+					<input name="DC.Description" type="hidden">
+						<xsl:attribute name="value">
+							<xsl:value-of select="//uploadform/@DC.Description" />
+						</xsl:attribute>
+					</input>
+					<fieldset>
+					<input name="DC.Title" type="hidden">
+						<xsl:attribute name="value">
+							<xsl:value-of select="//uploadform/@DC.Title" />
+						</xsl:attribute>
+					</input>
+					<input name="DC.Subject" type="hidden">
+						<xsl:attribute name="value">
+							<xsl:value-of select="//uploadform/@DC.Subject" />
+						</xsl:attribute>
+					</input>
+					<input name="DC.Description" type="hidden">
+						<xsl:attribute name="value">
+							<xsl:value-of select="//uploadform/@DC.Description" />
+						</xsl:attribute>
+					</input>
+					<input name="DC.Creator" type="hidden">
+						<xsl:attribute name="value">
+							<xsl:value-of select="//uploadform/@DC.Creator" />
+						</xsl:attribute>
+					</input>
+					<input name="DC.Source" type="hidden">
+						<xsl:attribute name="value">
+							<xsl:value-of select="//uploadform/@DC.Source" />
+						</xsl:attribute>
+					</input>
+					<input name="DC.Language" type="hidden">
+						<xsl:attribute name="value">
+							<xsl:value-of select="//uploadform/@DC.Language" />
+						</xsl:attribute>
+					</input>
+					<input name="DC.Coverage" type="hidden">
+						<xsl:attribute name="value">
+							<xsl:value-of select="//uploadform/@DC.Coverage" />
+						</xsl:attribute>
+					</input>
+						<div class="messagebox">
+							title:
+							<br />
+							subject:
+							<br />
+							description:
+							<br />
+							<input type="submit" name="1">
+								<xsl:attribute name="value">
+									<xsl:value-of select="$locale_strings[@id='button_page_1']" />
+								</xsl:attribute>
+							</input>
+						</div>
+						<div class="messagebox">
+							creator:
+							<br />
+							source:
+							<br />
+							language:
+							<br />
+							coverage:
+							<br />
+							<input type="submit" name="3">
+								<xsl:attribute name="value">
+									<xsl:value-of select="$locale_strings[@id='button_page_3']" />
+								</xsl:attribute>
+							</input>
+						</div>
+						<div class="messagebox">
+							license:
+							<br />
+							<input type="submit" name="4">
+								<xsl:attribute name="value">
+									<xsl:value-of select="$locale_strings[@id='button_page_4']" />
+								</xsl:attribute>
+							</input>
+						</div>
+					</fieldset>
+				</form>
+				<p>If Everything is okay proceed below by uploading your video.</p>
+				<form method="post" enctype="multipart/form-data">
+					<xsl:attribute name="action">
+						<xsl:value-of select="$site_strings[@id='page_uploader']" />
+					</xsl:attribute>
+					<input name="DC.Title" type="hidden">
+						<xsl:attribute name="value">
+							<xsl:value-of select="//uploadform/@DC.Title" />
+						</xsl:attribute>
+					</input>
+					<input name="DC.Subject" type="hidden">
+						<xsl:attribute name="value">
+							<xsl:value-of select="//uploadform/@DC.Subject" />
+						</xsl:attribute>
+					</input>
+					<input name="DC.Description" type="hidden">
+						<xsl:attribute name="value">
+							<xsl:value-of select="//uploadform/@DC.Description" />
+						</xsl:attribute>
+					</input>
+					<input name="DC.Creator" type="hidden">
+						<xsl:attribute name="value">
+							<xsl:value-of select="//uploadform/@DC.Creator" />
+						</xsl:attribute>
+					</input>
+					<input name="DC.Source" type="hidden">
+						<xsl:attribute name="value">
+							<xsl:value-of select="//uploadform/@DC.Source" />
+						</xsl:attribute>
+					</input>
+					<input name="DC.Language" type="hidden">
+						<xsl:attribute name="value">
+							<xsl:value-of select="//uploadform/@DC.Language" />
+						</xsl:attribute>
+					</input>
+					<input name="DC.Coverage" type="hidden">
+						<xsl:attribute name="value">
+							<xsl:value-of select="//uploadform/@DC.Coverage" />
+						</xsl:attribute>
+					</input>
+					<fieldset>
+						<div class="messagebox">
+						<xsl:value-of select="$locale_strings[@id='instruction_file']" />
+						<br />
+						<input name="file" type="file" size="13" />
+						</div>
+						<input type="submit">
+							<xsl:attribute name="value">
+								<xsl:value-of select="$locale_strings[@id='button_upload']" />
+							</xsl:attribute>
+						</input>
+						<br />
+						<span class="protip">
+							<xsl:value-of select="$locale_strings[@id='this_is_page_5']" />
+						</span>
+					</fieldset>
+				</form>
+			</xsl:when>
+
+		</xsl:choose>
+	</div>
+
+</xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file