Merge branch 'master' into sharing

23 files changed, 265 insertions, 292 deletions

diff --git a/admin/appinfo/app.php b/admin/appinfo/app.php
index dfb9aee8159..08a36060fe3 100644
--- a/admin/appinfo/app.php
+++ b/admin/appinfo/app.php
@@ -7,6 +7,6 @@ OC_App::addAdminPage( array( "id" => "core_users", "order" => 2, "href" => OC_He
 OC_App::addAdminPage( array( "id" => "core_apps", "order" => 3, "href" => OC_Helper::linkTo( "admin", "apps.php?installed" ), "name" => "Apps", "icon" => OC_Helper::imagePath( "admin", "apps.png" )));
 
 // Add subentries for App installer
-OC_App::addNavigationSubEntry( "core_apps", array( "id" => "core_apps_get", "order" => 4, "href" => OC_Helper::linkTo( "admin", "apps.php" ), "name" => "Get new apps", "icon" => OC_Helper::imagePath( "admin", "navicon.png" )));
+//OC_App::addNavigationSubEntry( "core_apps", array( "id" => "core_apps_get", "order" => 4, "href" => OC_Helper::linkTo( "admin", "apps.php" ), "name" => "Get new apps", "icon" => OC_Helper::imagePath( "admin", "navicon.png" )));
 
 ?>
diff --git a/admin/css/apps.css b/admin/css/apps.css
index cd427a3c536..c6b4f69ebcb 100644
--- a/admin/css/apps.css
+++ b/admin/css/apps.css
@@ -1,68 +1,9 @@
 /* APPS TABLE */
-
-table td.date
-{
-    width: 5em;
-    padding: 0.5em 1em;
-    text-align: right;
-}
-
-table td.version, table td.enabled, table td.disabled
-{
-    padding: 0.5em 1em;
-    text-align: center;
-}
-
-input[type="button"].enabled
-{
-    color: #006600;
-}
-
-input[type="button"].disabled
-{
-    color: #660000;
-}
-
-.preview 
-{
-    padding: 3px;
-    text-align: left;
-}
-
-table td.date
-{
-    width: 11em;
-    color: #555555;
-}
-
-table td.selection, table th.selection, table td.fileaction
-{
-    width: 2em;
-    text-align: center;
-}
-
-table td.name a
-{
-    padding: 6px;
-    text-decoration: none;
-    color: #555555;
-}
-
-.type 
-{
-    text-decoration: none;
-    color: #888888;
-    font-size: 0.8em;
-}
-
-.description 
-{
-    text-decoration: none;
-    color: #666666;
-    font-size: 0.9em;
-}
-
-
-input[type="button"].appbutton { padding:0.1em 1em; border:1px solid #999; font-weight:bold; font-size:0.9em; cursor:pointer; }
-input[type="button"]:hover.appbutton, form input[type="submit"]:focus { border:1px solid #999; background-color:#999; outline:0; }
-input[type="button"]:active.appbutton { outline:0; }
\ No newline at end of file
+table td.date { width:5em; padding:.5em 1em; text-align:right; }
+table td.version, table td.enabled, table td.disabled { padding:.5em 1em; text-align:center; }
+.preview  { padding:3px; text-align:left; }
+table td.date { width:11em; color:#555555; }
+table td.selection, table th.selection, table td.fileaction { width:2em; text-align:center; }
+table td.name a { padding:6px; text-decoration:none; color:#555555; }
+.type  { text-decoration:none; color:#888888; font-size:.8em; }
+.description  { text-decoration:none; color:#666666; font-size:.9em; }
diff --git a/admin/css/users.css b/admin/css/users.css
deleted file mode 100644
index 7f441499bd1..00000000000
--- a/admin/css/users.css
+++ /dev/null
@@ -1,3 +0,0 @@
-#usertable, #grouptable{
-	margin:0px;
-}
\ No newline at end of file
diff --git a/admin/templates/app_noconn.php b/admin/templates/app_noconn.php
index 70b7d9b3119..f22d3656287 100644
--- a/admin/templates/app_noconn.php
+++ b/admin/templates/app_noconn.php
@@ -1,7 +1 @@
-<?php
-/*
- * Template for Apps when can't connect to app store
- */
-?>
-<h1><?php echo $l->t( 'Apps Repository' ); ?></h1>
 <h2><?php echo $l->t( 'Cannot connect to apps repository' ); ?></h2>
diff --git a/admin/templates/appsinst.php b/admin/templates/appsinst.php
index d1adb5f45a1..d205d95cc34 100644
--- a/admin/templates/appsinst.php
+++ b/admin/templates/appsinst.php
@@ -13,7 +13,7 @@
 				<td class="name" width="200"><?php echo($app['name']); ?></td>
 				<td class="version"><?php echo($app['version']); ?></td>
 				<td><?php echo($app['author']); ?></td>
-				<td><input x-use="appenablebutton" type="button" value="<?php echo $l->t( $app['enabled'] ? 'enabled' : 'disabled' ); ?>" class="appbutton prettybutton <?php echo( $app['enabled'] ? 'enabled' : 'disabled' ); ?>" /></td>
+				<td><input x-use="appenablebutton" type="submit" value="<?php echo $l->t( $app['enabled'] ? 'enabled' : 'disabled' ); ?>" class="appbutton <?php echo( $app['enabled'] ? 'enabled' : 'disabled' ); ?>" /></td>
 			</tr>
 		<?php endforeach; ?>
 	</tbody>
diff --git a/admin/templates/system.php b/admin/templates/system.php
index 92ff9c836a8..bbe4d2757a3 100644
--- a/admin/templates/system.php
+++ b/admin/templates/system.php
@@ -1,8 +1,2 @@
-<?php
-/*
- * Template for admin pages
- */
-?>
-<h1><?php echo $l->t( 'Administration' ); ?></h1>
 <h2><?php echo $l->t( 'System Settings' ); ?></h2>
-#TBD
\ No newline at end of file
+#TBD
diff --git a/admin/templates/users.php b/admin/templates/users.php
index 6fc3e643010..79a4c712049 100644
--- a/admin/templates/users.php
+++ b/admin/templates/users.php
@@ -12,8 +12,8 @@
 			<tr id="createuserform">
 				<form id="createuserdata">
 					<td>
-						<input x-use="createuserfield" type="text" name="username" placeholder='<?php echo $l->t( 'Name' ); ?>' />
-						<input x-use="createuserfield" type="password" name="password" placeholder='<?php echo $l->t( 'Password' ); ?>' />
+						<input x-use="createuserfield" type="text" name="username" placeholder="<?php echo $l->t( 'Name' ); ?>" />
+						<input x-use="createuserfield" type="password" name="password" placeholder="<?php echo $l->t( 'Password' ); ?>" />
 					</td>
 					<td id="createusergroups">
 						<?php foreach($_["groups"] as $i): ?>
@@ -22,7 +22,7 @@
 						<?php endforeach; ?>
 					</td>
 					<td>
-						<button id="createuserbutton"><?php echo $l->t( 'Create' ); ?></button>
+						<input type="submit" id="createuserbutton" value="<?php echo $l->t( 'Add user' ); ?>" />
 					</td>
 				</form>
 			</tr>
@@ -34,7 +34,7 @@
 					<td x-use="usergroups"><div x-use="usergroupsdiv"><?php if( $user["groups"] ){ echo $user["groups"]; }else{echo "&nbsp";} ?></div></td>
 					<td>
 						<?php if($user['name']!=OC_User::getUser()):?>
-							<a  class="removeuserbutton" href=""><?php echo $l->t( 'remove' ); ?></a>
+							<input type="submit" class="removeuserbutton" value="<?php echo $l->t( 'Remove' ); ?>" />
 						<?php endif;?>
 					</td>
 				</tr>
@@ -55,8 +55,8 @@
 		<tfoot>
 			<form id="creategroupdata">
 				<tr>
-					<td><input x-use="creategroupfield" type="text" name="groupname" /></td>
-					<td><button id="creategroupbutton"><?php echo $l->t( 'Create group' ); ?></button></td>
+					<td><input x-use="creategroupfield" type="text" name="groupname" placeholder="New group" /></td>
+					<td><input type="submit" id="creategroupbutton" value="<?php echo $l->t( 'Create group' ); ?>" /></td>
 				</tr>
 			</form>
 		</tfoot>
@@ -66,7 +66,7 @@
 					<td><?php echo $group["name"] ?></td>
 					<td>
 						<?php if( $group["name"] != "admin" ): ?>
-							<a class="removegroupbutton" href=""><?php echo $l->t( 'remove' ); ?></a>
+							<input type="submit" class="removegroupbutton" value="<?php echo $l->t( 'remove' ); ?>" />
 						<?php else: ?>
 							&nbsp;
 						<?php endif; ?>
@@ -94,7 +94,7 @@
 		<input id="changepassworduid" type="hidden" name="username" value="" />
 		<?php echo $l->t( 'Force new password:' ); ?>
 		<input id="changepasswordpwd" type="password" name="password" value="" />
-		<button id="changepasswordbutton"><?php echo $l->t( 'Set' ); ?></button>
+		<input type="submit" id="changepasswordbutton" value="<?php echo $l->t( 'Set' ); ?>" />
 	</form>
 </span>
 
diff --git a/admin/users.php b/admin/users.php
index fd0b6fec01b..b87f1bb5bc8 100644
--- a/admin/users.php
+++ b/admin/users.php
@@ -29,7 +29,6 @@ if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' ))
 
 // We have some javascript foo!
 OC_Util::addScript( "admin", "users" );
-OC_Util::addStyle( "admin", "users" );
 OC_App::setActiveNavigationEntry( "core_users" );
 
 $users = array();
diff --git a/apps/files_publiclink/admin.php b/apps/files_publiclink/admin.php
index c095cf14409..f5163547963 100644
--- a/apps/files_publiclink/admin.php
+++ b/apps/files_publiclink/admin.php
@@ -35,7 +35,6 @@ if( !OC_User::isLoggedIn()){
 
 OC_App::setActiveNavigationEntry( "files_publiclink_administration" );
 
-OC_Util::addStyle( 'files_publiclink', 'admin' );
 OC_Util::addScript( 'files_publiclink', 'admin' );
 
 if(isset($_SERVER['HTTPS'])) {
diff --git a/apps/files_publiclink/css/admin.css b/apps/files_publiclink/css/admin.css
deleted file mode 100644
index f21b289f043..00000000000
--- a/apps/files_publiclink/css/admin.css
+++ /dev/null
@@ -1,2 +0,0 @@
-td.path{min-width:200px}
-td.expire{width:120px}
\ No newline at end of file
diff --git a/apps/files_publiclink/js/admin.js b/apps/files_publiclink/js/admin.js
index 21857718149..7052992e36d 100644
--- a/apps/files_publiclink/js/admin.js
+++ b/apps/files_publiclink/js/admin.js
@@ -1,14 +1,9 @@
 $(document).ready(function() {
-	$( "#expire" ).datepicker({
-		dateFormat:'MM d, yy',
-		altField: "#expire_time",
-		altFormat: "yy-mm-dd"
-	});
 	$( "#path" ).autocomplete({
 		source: "../../files/ajax/autocomplete.php",
 		minLength: 1
 	});
-	$("button.delete").live('click', function( event ) {
+	$(".delete").live('click', function( event ) {
 		event.preventDefault();
 		var token=$(this).attr('data-token');
 		var data="token="+token;
@@ -25,7 +20,7 @@ $(document).ready(function() {
 	$('#newlink').submit(function( event ){
 		event.preventDefault();
 		var path=$('#path').val();
-		var expire=$('#expire_time').val()||0;
+		var expire=0;
 		var data='path='+path+'&expire='+expire;
 		$.ajax({
 			type: 'GET',
@@ -36,17 +31,13 @@ $(document).ready(function() {
 				if(token){
 					var html="<tr class='link' id='"+token+"'>";
 					html+="<td class='path'>"+path+"</td>";
-					var expire=($('#expire').val())?$('#expire').val():'Never'
-					html+="<td class='expire'>"+expire+"</td>"
 					html+="<td class='link'><a href='get.php?token="+token+"'>"+$('#baseUrl').val()+"?token="+token+"</a></td>"
-					html+="<td><button class='delete fancybutton' data-token='"+token+"'>Delete</button></td>"
+					html+="<td><input type='submit' class='delete' data-token='"+token+" value='Delete' /></td>"
 					html+="</tr>"
 					$(html).insertBefore($('#newlink_row'));
-					$('#expire').val('');
-					$('#expire_time').val('');
 					$('#path').val('');
 				}
 			}
 		});
 	});
-});
\ No newline at end of file
+});
diff --git a/apps/files_publiclink/templates/admin.php b/apps/files_publiclink/templates/admin.php
index 04aaf5c4302..9ee5e0d0ea1 100644
--- a/apps/files_publiclink/templates/admin.php
+++ b/apps/files_publiclink/templates/admin.php
@@ -3,7 +3,6 @@
 	<thead>
 		<tr>
 			<td class='path'><?php echo $l->t( 'Path' ); ?></td>
-			<td class='expire'><?php echo $l->t( 'Expires' ); ?></td>
 			<td class='link'><?php echo $l->t( 'Link' ); ?></td>
 		</tr>
 	</thead>
@@ -11,16 +10,14 @@
 		<?php foreach($_['links'] as $link):?>
 			<tr class='link' id='<?php echo $link['token'];?>'>
 				<td class='path'><?php echo $link['path'];?></td>
-				<td class='expire'><?php echo ($link['expire_time']==0)?'Never':$l->l('date', $link['expire_time']);?></td>
 				<td class='link'><a href='get.php?token=<?php echo $link['token'];?>'><?php echo $_['baseUrl'];?>?token=<?php echo $link['token'];?></a></td>
-				<td><button class='delete fancybutton' data-token='<?php echo $link['token'];?>'><?php echo $l->t( 'Delete' ); ?></button></td>
+				<td><input type="submit" class="delete" data-token="<?php echo $link['token'];?>" value="<?php echo $l->t( 'Delete' ); ?>" /></td>
 			</tr>
 		<?php endforeach;?>
 		<tr id='newlink_row'>
 			<form action='#' id='newlink'>
 				<input type='hidden' id='expire_time'/>
 				<td class='path'><input placeholder='Path' id='path'/></td>
-				<td class='expire'><input placeholder='Expires' id='expire'/></td>
 				<td><input type='submit' value='Share'/></td>
 			</form>
 		</tr>
diff --git a/apps/files_publiclink/templates/files.php b/apps/files_publiclink/templates/files.php
index b4ae17656c3..41ff0a1e765 100644
--- a/apps/files_publiclink/templates/files.php
+++ b/apps/files_publiclink/templates/files.php
@@ -4,6 +4,6 @@
 				<td class="filename"><a style="background-image:url(<?php if($file["type"] == "dir") echo mimetype_icon("dir"); else echo mimetype_icon($file["mime"]); ?>)" href="<?php if($file["type"] == "dir") echo link_to("files_publiclink", "get.php?token=".$_['token']."&path=".$file["directory"]."/".$file["name"]); else echo link_to("files_publiclink", "get.php?token=".$_['token']."&path=".$file["directory"]."/".$file["name"]); ?>" title=""><?php echo htmlspecialchars($file["name"]); ?></a></td>
 				<td class="filesize"><?php echo human_file_size($file["size"]); ?></td>
 				<td class="date"><?php if($file["type"] != "dir") echo $file["date"]; ?></td>
-				<td class="fileaction"><a href="" title=""><img src="images/drop-arrow.png" alt="+" /></a></td>
+				<td class="fileaction"><a href="" title="">▾</a></td>
 			</tr>
-		<?php endforeach; ?>
\ No newline at end of file
+		<?php endforeach; ?>
diff --git a/apps/media/templates/player.php b/apps/media/templates/player.php
index b307f984734..31b06e097bc 100644
--- a/apps/media/templates/player.php
+++ b/apps/media/templates/player.php
@@ -19,4 +19,4 @@
 	<div class="jp-current-time"></div>
 	<div class="jp-duration"></div>
 	<div class='player' id='jp-player'></div>
-</div>
\ No newline at end of file
+</div>
diff --git a/core/css/styles.css b/core/css/styles.css
index e83f0634993..114080f1f10 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -11,28 +11,40 @@ input, select { background:#fff; color:#333; outline:0; }
 a, a img, a strong, a span, input, button, select, li { cursor:pointer; }
 input[type="text"], input[type="password"] { cursor:text; }
 
+input, select { font-size:1em; width:10em; margin:.3em; padding:.5em; background:#fff; color:#333; border:1px solid #ddd; -moz-box-shadow:0 1px 1px #fff, 0 2px 0 #bbb inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 0 #bbb inset; box-shadow:0 1px 1px #fff, 0 1px 0 #bbb inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; }
+input[type="text"], input[type="password"] { background:#f8f8f8; color:#555; cursor:text; }
+input[type="text"]:hover, input[type="text"]:focus, input[type="password"]:hover, input[type="password"]:focus { background:#fff; color:#333; }
+
+input[type="submit"] { width:auto; padding:.4em; border:1px solid #ddd; font-weight:bold; cursor:pointer; background:#f8f8f8; color:#555; text-shadow:#fff 0 1px 0; -moz-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; }
+input[type="submit"]:hover, input[type="submit"]:focus { background:#fff; color:#333; }
+input[type="checkbox"] { width:auto; }
+
+#body-login input { font-size:1.5em; }
+#body-login input[type="submit"] { float:right; margin-right:.8em; }
+#remember_login { margin:.8em .2em 0 1em; }
+form.searchbox input[type="search"] { position:fixed; font-size:1.2em; top:.3em; right:7em; padding:.2em .5em .2em 1.5em; background:#f8f8f8 url('../img/actions/search.png') .5em center no-repeat; border:0; -moz-border-radius:1em; -webkit-border-
+radius:1em; border-radius:1em; }
+input[type="submit"].enabled { background:#aea; -moz-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; -webkit-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; }
+input[type="submit"].highlight{ background:#ffc100; border:1px solid #dda600; text-shadow:#ffeedd 0 1px 0; -moz-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #ffeedd inset; -webkit-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #ffeedd inset; box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #ffeedd inset; }
+
 form#user_settings { max-width:600px; }
 form#user_settings p label { display:block; float:left; width:35%; padding:0.4em 0.5em 0 0; text-align:right; }
 form p { padding:0.5em 4em 0.5em 0.5em; text-align:left; }
 form p.form_footer { margin:1em 0 0 0; text-align:right; }
 form label { cursor:pointer; }
-form input { padding:0.2em; border:1px solid #ddd; font-size:1.2em; }
-form input[type="submit"] { padding:0.1em 1em; border:1px solid #999; font-weight:bold; font-size:0.9em; cursor:pointer; }
-form input[type="submit"]:hover, form input[type="submit"]:focus { border:1px solid #999; background-color:#999; }
-form input[type="button"], form input[type="text"] { font-size:0.9em; }
-fieldset { padding:1em; background-color:#f7f7f7; border:1px solid #ddd; max-width:600px; margin:2em 2em 2em 3em; }
-legend { padding:0.5em; font-size:1.2em; }
+fieldset { padding:1em; background-color:#f7f7f7; border:1px solid #ddd; max-width:600px; margin:2em; }
+legend { padding:.5em; font-size:1.2em; }
 .template{display:none;}
 
-div.controls { width:100%; margin:0px; background-color:#f7f7f7; border-bottom:1px solid #eee; position:fixed; z-index:2; }
+div.controls { width:100%; height:3em; margin:0; background-color:#f7f7f7; border-bottom:1px solid #eee; position:fixed; z-index:2; }
 
 /* LOG IN & INSTALLATION ------------------------------------------------------------ */
-#body-login { width:100%; background-image:none; background-color:#ddd; }
-#body-login p.info { width:16em; margin:2em auto; padding:1em; background-color:#eee; border:1px solid #ccc; -moz-border-radius:10px; -webkit-border-radius:10px; border-radius:10px; }
+#body-login { background-color:#ddd; }
+#body-login p.info { width:16em; margin:2em auto; padding:1em; background-color:#eee; -moz-box-shadow:0 1px 0 #bbb inset; -webkit-box-shadow:0 1px 0 #bbb inset; box-shadow:0 1px 0 #bbb inset; -moz-border-radius:1em; -webkit-border-radius:1em; border-radius:1em; }
 #body-login p.info a { font-weight:bold; }
 
-#body-login header { margin-top:-2em; height:10em;
- -moz-box-shadow:0 0 5px #000; -webkit-box-shadow:0 0 20px #000; box-shadow:0 0 20px #000;
+#body-login header { margin:-2em auto 0; text-align:center; height:10em;
+ -moz-box-shadow:0 0 1em #000; -webkit-box-shadow:0 0 1em #000; box-shadow:0 0 1em #000;
 background: #1d2d44; /* Old browsers */
 background: -moz-linear-gradient(top, #35537a 0%, #1d2d42 100%); /* FF3.6+ */
 background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#35537a), color-stop(100%,#1d2d42)); /* Chrome,Safari4+ */
@@ -41,34 +53,16 @@ background: -o-linear-gradient(top, #35537a 0%,#1d2d42 100%); /* Opera11.10+ */
 background: -ms-linear-gradient(top, #35537a 0%,#1d2d42 100%); /* IE10+ */
 background: linear-gradient(top, #35537a 0%,#1d2d42 100%); /* W3C */
 filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endColorstr='#1d2d42',GradientType=0 ); /* IE6-9 */ }
-#login { margin:0 auto 0 auto; padding:2em 0 0 0; border-bottom:1px solid #FFF; text-align:center; background:#eee; }
-#login_form { width:20em; margin:4em auto; padding:0; }
-#login_form fieldset { background-color:transparent; border:0; }
-#login_form fieldset p { margin:0.5em 0 0 0; padding:0; text-align:left; }
-#login_form fieldset p.submit { margin:2em 0 0 0; padding:1em 0 0 0; border-top:1px solid #DDD; text-align:right; }
-#login_form label { font-size:1em; color:#666; }
-#login_form input { width:100%; margin:0 0 0.5em 0; padding:0.5em; border:1px solid #DDD; -moz-border-radius:15px; -webkit-border-radius:15px; border-radius:15px; font-size:1.5em; color:#333; text-align:center; }
-#login_form input[type=submit] { width:auto; margin:1em 0 0 0.5em; text-align:center; border:1px solid #DDD; background-color:#FFF; -moz-border-radius:15px; -webkit-border-radius:15px; border-radius:15px; font-size:1.5em }
-#login_form input[type=submit]:hover { border:1px solid #666; background-color:#666; color:#FFF; }
-#login_form input[type="checkbox"] { width:15px; }
-#setup_form { margin:3em auto; text-align:left; width:720px; }
-#setup_form #use_mysql { font-size:0.9em; margin:0 0 0 1em; }
-#setup_form p.intro { color:#666; font-size:1.3em; margin:4em 0 3em 0; padding:0; text-align:center; }
-#setup_form ul.errors { background-image:url(images/no.png); background-position:1em 1em; background-repeat:no-repeat; background-color:#FED7D7; border:1px solid #F00; font-size:1.2em; list-style-indent:inside; margin:0 0 4em 0; padding:1em 1em 1em 5em; }
-#setup_form fieldset { margin:0 0 3em 0;	 }
-#setup_form p { line-height:1.8em; }
-#setup_form legend { font-weight:normal; }
-#setup_form label { cursor:pointer; display:block; float:left; margin:0 0 0.2em 0; text-align:right; width:40%; }
-#setup_form input[type='text'],
-#setup_form input[type='password'] { font-size:1em; margin:0 0 0 0.5em; padding:0.3em; }
-#setup_form input[type='radio'] { margin:0 0 0 1em; }
-#setup_form input[type='submit'] { background-color:#DDD; border:1px solid #999; color:#666; font-size:1.2em; }
-#setup_form input[type='submit']:hover { border-color:#000; color:#000; }
-#setup_form p.submit { padding:0 0 1em 0; text-align:center; }
 
+#login { min-height:30em; margin:2em auto 0; border-bottom:1px solid #f8f8f8; background:#eee; }
+#login form { width:18em; margin:2em auto 5em; padding:0; }
+#login form fieldset { background-color:transparent; border:0; margin:0; padding:0; }
+#login form p { position:relative; padding:0; }
+#login form label { position:absolute; margin:.8em .8em; font-size:1.5em; color:#666; }
+#login form input[type="checkbox"]+label { position:relative; margin:0; font-size:1em; text-shadow:#fff 0 1px 0; }
 
-.prettybutton { margin:0.1em; padding:0.2em 0.5em; border:1px solid #ddd; -moz-border-radius:15px; -webkit-border-radius:15px; border-radius:15px; font-size:1.5em; text-decoration:none; color:#666; background-color:#fff; }
-.prettybutton:hover, .prettybutton:focus { background-color:#ccc; outline:0; }
+#login form #use_mysql { font-size:.9em; margin:0 0 0 1em; }
+#login form ul.errors { background:#fed7d7 url(images/no.png) no-repeat 1em 1em; border:1px solid #f00; font-size:1.2em; list-style-indent:inside; margin:0 0 4em 0; padding:1em 1em 1em 5em; }
 
 /* META NAVIGATION (Settings, Log out) ---------------------------------------------------------------- */ 
 #metanav { float:right; position:relative; top:.5em; right:1em; list-style:none; margin:0; padding:0; }
@@ -77,10 +71,6 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', end
 #metanav li a:hover, #metanav li a:focus { background:rgba(0,0,0,.5); -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; box-shadow:#555 0 1px 0; -moz-box-shadow:#555 0 1px 0; -webkit-box-shadow:#555 0 1px 0; }
 #metanav li a img { vertical-align:middle; }
 
-/* SEARCH --------------------------------------------------------------------- */
-form.searchbox { display:inline; position:fixed; top:.9em; right:9em; margin:0; padding:0; }
-input[type="search"] { font-size:1em; padding-left:2em; background:#eee url('../img/actions/search.png') .5em center no-repeat; }
-
 /* NAVIGATION ------------------------------------------------------------- */
 #navigation { position:fixed; top:3.5em; float:left; width:12.5em; padding:0; z-index:50; height:100%; background:#eee; border-right: 1px #ccc solid; -moz-box-shadow: -3px 0 7px #000; -webkit-box-shadow: -3px 0 7px #000; box-shadow: -3px 0 7px #000; } }
 #navigation ul { list-style-type:none; border-top:1px solid #ccc; }
@@ -98,16 +88,4 @@ input[type="search"] { font-size:1em; padding-left:2em; background:#eee url('../
 #quota_indicator { margin:0 4em 1em 0; padding:0; border:1px solid #ddd; border-radius:10px; -webkit-border-radius:10px; -moz-border-radius:10px; }
 #quota_indicator div { background-color:#76A9EA; border-radius:10px; -webkit-border-radius:10px; -moz-border-radius:10px; }
 
-/* PAGER ------------------------------------------------------------ */
-.pager tr td { border-bottom:0px; }
-.pager tr td a { text-decoration:none; color:#666666; font-size:0.9em; text-align:center; }
-
-/* LOGS --------------------------------------------------------------------- */
-#logs_options { width:auto; margin:0; }
-#logs_options p { padding:0.5em; text-align:left; }
-#logs_options span { margin:0 2em 0 0.5em; font-weight:bold; }
-#logs_options label { margin:0 1em 0 0; }
-#logs_options input[type="submit"] { float:right; margin:0 2em 0 0; }
-#logs_options input[type="submit"].nofloat { float:none; margin:0 2em 0 0; }
-#logs_options input[type="text"] { margin:0; padding:0; border:1px solid #ccc; text-align:right; }
 li.error { list-style:none; width:640px; margin:4em auto; padding:1em 1em 1em 4em; background-color:#fee; background-image:url('../img/task-attention.png'); background-position:0.8em 0.8em; background-repeat:no-repeat; border:1px solid #ccc; -moz-border-radius:10px; -webkit-border-radius:10px; border-radius:10px; }
diff --git a/core/js/js.js b/core/js/js.js
index 00618cb30cf..9e2ae8d7104 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -238,4 +238,147 @@ $(document).ready(function(){
 			}
 		}
 	});
+
+	// 'show password' checkbox	
+	$('#pass2').showPassword();
+
+	// hide log in button etc. when form fields not filled
+	$('#submit').hide();
+	$('#remember_login').hide();
+	$('#remember_login+label').hide();
+	$('#body-login input').keyup(function() {
+		var empty = false;
+		$('#body-login input').each(function() {
+			if ($(this).val() == '') {
+				empty = true;
+			}
+		});
+
+		if(empty) {
+			$('#submit').fadeOut();
+			$('#remember_login').fadeOut();
+			$('#remember_login+label').fadeOut();
+		} else {
+			$('#submit').fadeIn();
+			$('#remember_login').fadeIn();
+			$('#remember_login+label').fadeIn();
+		}
+	});
 });
+
+
+
+
+/*
+*	@name							Show Password
+*	@descripton						
+*	@version						1.3
+*	@requires						Jquery 1.5
+*
+*	@author							Jan Jarfalk
+*	@author-email					jan.jarfalk@unwrongest.com
+*	@author-website					http://www.unwrongest.com
+*
+*	@special-thanks					Michel Gratton
+*
+*	@licens							MIT License - http://www.opensource.org/licenses/mit-license.php
+*/
+(function($){
+     $.fn.extend({
+         showPassword: function(c) {	
+            
+            // Setup callback object
+			var callback 	= {'fn':null,'args':{}}
+				callback.fn = c;
+			
+			// Clones passwords and turn the clones into text inputs
+			var cloneElement = function( element ) {
+				
+				var $element = $(element);
+					
+				$clone = $("<input />");
+					
+				// Name added for JQuery Validation compatibility
+				// Element name is required to avoid script warning.
+				$clone.attr({
+					'type'		:	'text',
+					'class'		:	$element.attr('class'),
+					'style'		:	$element.attr('style'),
+					'size'		:	$element.attr('size'),
+					'name'		:	$element.attr('name')+'-clone',
+					'tabindex' 	:	$element.attr('tabindex')
+				});
+					
+				return $clone;
+			
+			};
+			
+			// Transfers values between two elements
+			var update = function(a,b){
+				b.val(a.val());
+			};
+			
+			// Shows a or b depending on checkbox
+			var setState = function( checkbox, a, b ){
+			
+				if(checkbox.is(':checked')){
+					update(a,b);
+					b.show();
+					a.hide();
+				} else {
+					update(b,a);
+					b.hide();
+					a.show();
+				}
+				
+			};
+            
+            return this.each(function() {
+            	
+            	var $input					= $(this),
+            		$checkbox 				= $($input.data('typetoggle'));
+            	
+            	// Create clone
+				var $clone = cloneElement($input);
+					$clone.insertAfter($input);
+				
+				// Set callback arguments
+            	if(callback.fn){	
+            		callback.args.input		= $input;
+            		callback.args.checkbox	= $checkbox;
+					callback.args.clone 	= $clone;
+            	}
+				
+
+				
+				$checkbox.bind('click', function() {
+					setState( $checkbox, $input, $clone );
+				});
+				
+				$input.bind('keyup', function() {
+					update( $input, $clone )
+				});
+				
+				$clone.bind('keyup', function(){ 
+					update( $clone, $input );
+					
+					// Added for JQuery Validation compatibility
+					// This will trigger validation if it's ON for keyup event
+					$input.trigger('keyup');
+					
+				});
+				
+				// Added for JQuery Validation compatibility
+				// This will trigger validation if it's ON for blur event
+				$clone.bind('blur', function() { $input.trigger('focusout'); });
+				
+				setState( $checkbox, $input, $clone );
+				
+				if( callback.fn ){
+					callback.fn( callback.args );
+				}
+
+            });
+        }
+    });
+})(jQuery);
diff --git a/core/templates/installation.php b/core/templates/installation.php
index e2392778bed..de14c562419 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -1,12 +1,8 @@
 <div id="login">
 	<header><img src="<?php echo image_path('', 'owncloud-logo-medium-white.png'); ?>" alt="ownCloud" /></header>
-	<form action="index.php" method="post" id="setup_form">
-		<input type="hidden" name="install" value="true" />
-		<p class="intro">
-			<?php echo $l->t( '<strong>ownCloud</strong> is your personal web storage.' ); ?><br />
-			<?php echo $l->t( 'Finish the setup by following the steps below.' ); ?>
-		</p>
-
+	<form action="index.php" method="post">
+	
+	<input type="hidden" name="install" value="true" />
 		<?php if(count($_['errors']) > 0): ?>
 		<ul class="errors">
 			<?php foreach($_['errors'] as $err): ?>
@@ -23,24 +19,24 @@
 		<?php endif; ?>
 
 		<fieldset>
-			<legend><?php echo $l->t( 'Create an <strong>admin account</strong>.' ); ?></legend>
-			<p><label for="adminlogin"><?php echo $l->t( 'Username' ); ?></label><input type="text" name="adminlogin" id="adminlogin" value="<?php print OC_Helper::init_var('adminlogin'); ?>" autofocus /></p>
-			<p><label for="adminpass"><?php echo $l->t( 'Password' ); ?></label><input type="password" name="adminpass" id="adminpass" value="<?php print OC_Helper::init_var('adminpass'); ?>" /></p>
+			<legend><?php echo $l->t( 'Create an <strong>admin account</strong>' ); ?></legend>
+			<input type="text" name="adminlogin" id="adminlogin" value="<?php print OC_Helper::init_var('adminlogin'); ?>" placeholder="<?php echo $l->t( 'Username' ); ?>" autofocus /></p>
+			<input type="password" name="adminpass" id="adminpass" value="<?php print OC_Helper::init_var('adminpass'); ?>" placeholder="<?php echo $l->t( 'Password' ); ?>" /></p>
         </fieldset>
         
-        <a id='showAdvanced'><strong><?php echo $l->t( 'Advanced' ); ?></strong> <img src='<?php echo OC_Helper::imagePath('','drop-arrow.png'); ?>'></img></a>
+        <a id='showAdvanced'><strong><?php echo $l->t( 'Advanced' ); ?> ▾</strong></a>
         
         <fieldset id='datadirField'>
-			<legend><?php echo $l->t( 'Set where to store the data.' ); ?></legend>
-			<p><label for="directory"><?php echo $l->t( 'Data directory:' ); ?></label><input type="text" name="directory" id="directory" value="<?php print OC_Helper::init_var('directory', $_['directory']); ?>" /></p>
+			<legend><?php echo $l->t( 'Set data folder' ); ?></legend>
+			<input type="text" name="directory" id="directory" value="<?php print OC_Helper::init_var('directory', $_['directory']); ?>" placeholder="<?php echo $l->t( 'Data folder' ); ?>" /></p>
 		</fieldset>
 		
 		<fieldset id='databaseField'>
-			<legend><?php echo $l->t( 'Configure the database.' ); ?></legend>
+			<legend><?php echo $l->t( 'Configure the database' ); ?></legend>
 			<?php if($_['hasSQLite']): ?>
 			<input type='hidden' id='hasSQLite' value='true'/>
 			<?php if(!$_['hasMySQL'] and !$_['hasPostgreSQL']): ?>
-			<p><?php echo $l->t( 'SQLite will be used for the database. You have nothing to do.' ); ?></p>
+			<p><?php echo $l->t( 'SQLite will be used.' ); ?></p>
 			<input type="hidden" id="dbtype" name="dbtype" value="sqlite" />
 			<?php else: ?>
 			<p><label class="sqlite" for="sqlite"><?php echo $l->t( 'SQLite' ); ?></label><input type="radio" name="dbtype" value='sqlite' id="sqlite" <?php OC_Helper::init_radio('dbtype', 'sqlite', 'sqlite'); ?>/></p>
@@ -50,17 +46,17 @@
 			<?php if($_['hasMySQL']): ?>
 			<input type='hidden' id='hasMySQL' value='true'/>
 			<?php if(!$_['hasSQLite'] and !$_['hasPostgreSQL']): ?>
-			<p><?php echo $l->t( 'MySQL will be used for the database.' ); ?></p>
+			<p><?php echo $l->t( 'MySQL will be used.' ); ?></p>
 			<input type="hidden" id="dbtype" name="dbtype" value="mysql" />
 			<?php else: ?>
-			<p><label class="mysql" for="mysql">MySQL </label><input type="radio" name="dbtype" value='mysql' id="mysql" <?php OC_Helper::init_radio('dbtype','pgsql', 'mysql', 'sqlite'); ?>/></p>
+			<label class="mysql" for="mysql">MySQL</label><input type="radio" name="dbtype" value='mysql' id="mysql" <?php OC_Helper::init_radio('dbtype','pgsql', 'mysql', 'sqlite'); ?>/>
 			<?php endif; ?>
 			<div id="use_mysql">
-				<p><label for="dbuser"><?php echo $l->t( 'MySQL username:' ); ?></label><input type="text" name="dbuser" id="dbuser" value="<?php print OC_Helper::init_var('dbuser'); ?>" /></p>
-				<p><label for="dbpass"><?php echo $l->t( 'MySQL password:' ); ?></label><input type="password" name="dbpass" id="dbpass" value="<?php print OC_Helper::init_var('dbpass'); ?>" /></p>
-				<p><label for="dbname"><?php echo $l->t( 'Database name:' ); ?></label><input type="text" name="dbname" id="dbname" value="<?php print OC_Helper::init_var('dbname'); ?>" /></p>
-				<p><label for="dbhost"><?php echo $l->t( 'Host:' ); ?></label><input type="text" name="dbhost" id="dbhost" value="<?php print OC_Helper::init_var('dbhost', 'localhost'); ?>" /></p>
-				<p><label for="dbtableprefix"><?php echo $l->t( 'Table prefix:' ); ?></label><input type="text" name="dbtableprefix" id="dbtableprefix" value="<?php print OC_Helper::init_var('dbtableprefix', 'oc_'); ?>" /></p>
+				<input type="text" name="dbuser" id="dbuser" value="<?php print OC_Helper::init_var('dbuser'); ?>" placeholder="<?php echo $l->t( 'Database user' ); ?>" />
+				<input type="password" name="dbpass" id="dbpass" value="<?php print OC_Helper::init_var('dbpass'); ?>" placeholder="<?php echo $l->t( 'Database password' ); ?>" />
+				<input type="text" name="dbname" id="dbname" value="<?php print OC_Helper::init_var('dbname'); ?>" placeholder="<?php echo $l->t( 'Database name' ); ?>" />
+				<input type="text" name="dbhost" id="dbhost" value="<?php print OC_Helper::init_var('dbhost', 'localhost'); ?>" placeholder="<?php echo $l->t( 'Host' ); ?>" />
+				<input type="text" name="dbtableprefix" id="dbtableprefix" value="<?php print OC_Helper::init_var('dbtableprefix', 'oc_'); ?>" placeholder="<?php echo $l->t( 'Table prefix' ); ?>" />
 				
 			</div>
 			<?php endif; ?>
@@ -68,22 +64,22 @@
 			<?php if($_['hasPostgreSQL']): ?>
 			<input type='hidden' id='hasPostgreSQL' value='true'/>
 			<?php if(!$_['hasSQLite'] and !$_['hasSQLite']): ?>
-			<p><?php echo $l->t( 'PostgreSQL will be used for the database.' ); ?></p>
+			<p><?php echo $l->t( 'PostgreSQL will be used.' ); ?></p>
 			<input type="hidden" id="dbtype" name="dbtype" value="pgsql" />
 			<?php else: ?>
-			<p><label class="pgsql" for="pgsql">PostgreSQL </label><input type="radio" name="dbtype" value='pgsql' id="pgsql" <?php OC_Helper::init_radio('dbtype','pgsql', 'mysql', 'sqlite'); ?>/></p>
+			<p><label class="pgsql" for="pgsql">PostgreSQL</label><input type="radio" name="dbtype" value='pgsql' id="pgsql" <?php OC_Helper::init_radio('dbtype','pgsql', 'mysql', 'sqlite'); ?>/></p>
 			<?php endif; ?>
 			<div id="use_postgresql">
-				<p><label for="pg_dbuser"><?php echo $l->t( 'PostgreSQL username:' ); ?></label><input type="text" name="pg_dbuser" id="pg_dbuser" value="<?php print OC_Helper::init_var('dbuser'); ?>" /></p>
-				<p><label for="pg_dbpass"><?php echo $l->t( 'PostgreSQL password:' ); ?></label><input type="password" name="pg_dbpass" id="pg_dbpass" value="<?php print OC_Helper::init_var('dbpass'); ?>" /></p>
-				<p><label for="pg_dbname"><?php echo $l->t( 'Database name:' ); ?></label><input type="text" name="pg_dbname" id="pg_dbname" value="<?php print OC_Helper::init_var('dbname'); ?>" /></p>
-				<p><label for="pg_dbhost"><?php echo $l->t( 'Host:' ); ?></label><input type="text" name="pg_dbhost" id="pg_dbhost" value="<?php print OC_Helper::init_var('dbhost', 'localhost'); ?>" /></p>
-				<p><label for="pg_dbtableprefix"><?php echo $l->t( 'Table prefix:' ); ?></label><input type="text" name="pg_dbtableprefix" id="pg_dbtableprefix" value="<?php print OC_Helper::init_var('dbtableprefix', 'oc_'); ?>" /></p>
+				<input type="text" name="pg_dbuser" id="pg_dbuser" value="<?php print OC_Helper::init_var('dbuser'); ?>" placeholder="<?php echo $l->t( 'Database user' ); ?>" />
+				<input type="password" name="pg_dbpass" id="pg_dbpass" value="<?php print OC_Helper::init_var('dbpass'); ?>" placeholder="<?php echo $l->t( 'PostgreSQL password' ); ?>" />
+				<input type="text" name="pg_dbname" id="pg_dbname" value="<?php print OC_Helper::init_var('dbname'); ?>" placeholder="<?php echo $l->t( 'Database name' ); ?>" />
+				<input type="text" name="pg_dbhost" id="pg_dbhost" value="<?php print OC_Helper::init_var('dbhost', 'localhost'); ?>" placeholder="<?php echo $l->t( 'Host' ); ?>" />
+				<input type="text" name="pg_dbtableprefix" id="pg_dbtableprefix" value="<?php print OC_Helper::init_var('dbtableprefix', 'oc_'); ?>" placeholder="<?php echo $l->t( 'Table prefix' ); ?>" />
 				
 			</div>
 			<?php endif; ?>
 		</fieldset>
 
-		<p class="submit"><input type="submit" value="<?php echo $l->t( 'Finish setup' ); ?>" /></p>
+		<input type="submit" value="<?php echo $l->t( 'Finish setup' ); ?>" />
 	</form>
 </div>
diff --git a/core/templates/login.php b/core/templates/login.php
index c3095047f48..19f25f033d3 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -1,24 +1,22 @@
 <div id="login">
 	<header>
-		<div class='header'>
-			<img src="<?php echo image_path('', 'owncloud-logo-medium-white.png'); ?>" alt="ownCloud" />
-		</div>
+		<img src="<?php echo image_path('', 'owncloud-logo-medium-white.png'); ?>" alt="ownCloud" />
 	</header>
-	<form action="index.php" method="post" id="login_form">
+	<form action="index.php" method="post">
 		<fieldset>
 			<?php if($_['error']): ?>
 				<?php echo $l->t( 'Login failed!' ); ?>
 			<?php endif; ?>
 			<?php if(empty($_["username"])){?>
-			<input type="text" name="user" id="user" value="" autofocus />
-			<input type="password" name="password" id="password" value="" />
-			<input type="checkbox" name="remember_login"/> <?php echo $l->t('Remember login'); ?>
+			<input type="text" name="user" id="user" placeholder="Username" value="" autocomplete="off" required autofocus />
+			<input type="password" name="password" id="password" placeholder="Password" value="" required />
+			<input type="checkbox" name="remember_login" id="remember_login" /><label for="remember_login"><?php echo $l->t('remember'); ?></label>
 			<?php }else{ ?>
-			<input type="text" name="user" id="user" value="<?php echo $_['username']; ?>">
-			<input type="password" name="password" id="password" value="" autofocus />
-			<input type="checkbox" name="remember_login" checked /> <?php echo $l->t('Remember login'); ?>
+			<input type="text" name="user" id="user" placeholder="Username" value="<?php echo $_['username']; ?>" autocomplete="off" required >
+			<input type="password" name="password" id="password" placeholder="Password" value="" required autofocus />
+			<input type="checkbox" name="remember_login" id="remember_login" checked /><label for="remember_login"><?php echo $l->t('remember'); ?></label>
 			<?php } ?>
-			<input type="submit" value="Log in" />
+			<input type="submit" id="submit" value="Log in" />
 		</fieldset>
 	</form>
 </div>
diff --git a/files/css/files.css b/files/css/files.css
index b01d52b43be..b57d1a9bed2 100644
--- a/files/css/files.css
+++ b/files/css/files.css
@@ -1,16 +1,16 @@
 /* FILE MENU */
-.actions { padding:.6em; float:right; margin-right:16em; }
-#file_menu { right:0px; position:absolute; top:0; }
+.actions { padding:.6em; float:right; margin-right:13em; }
+.actions input { margin:0; padding:.3em; }
+#file_menu { right:0; position:absolute; top:0; }
 #file_menu a { display:block; float:left; background-image:none; text-decoration:none; }
 .file_upload_form, #file_newfolder_form { display:inline; }
 #fileSelector, #file_upload_submit, #file_newfolder_submit { display:none; }
-.file_upload_filename, #file_newfolder_name { background-repeat:no-repeat; background-position:0.5em 0; padding-left:2em; }
-.file_upload_filename { background-image:url("../img/file.png"); font-weight:bold; }.file_upload_start { opacity:0;filter:alpha(opacity = 0); }
-input.highlight{ background-color:#ffc100; border:#dda600 1px solid; }
+.file_upload_wrapper, #file_newfolder_name { background-repeat:no-repeat; background-position:.5em .3em; padding-left:2em; }
+.file_upload_wrapper { background:url("../img/file.png"); font-weight:bold; position:relative; top:-1.2em; left:-2em; display:-moz-inline-box; /* fallback for older firefox versions*/ display:inline-block; width:8em; }
+.file_upload_start { opacity:0; filter:alpha(opacity=0); }
 
 #file_newfolder_name { background-image:url("../img/folder.png"); font-weight:bold; width:12em; }
-.file_upload_start, .file_upload_filename { position:absolute; top:0px; left:0px; width:12em; font-size:0.9em; }
-.file_upload_wrapper { position:relative; top:-1.2em; left:-2em; display:-moz-inline-box; /* fallback for older firefox versions*/ display:inline-block; width:12em; }
+.file_upload_start, .file_upload_filename { position:absolute; top:0; left:0; font-size:1em; }
 #file_newfolder_submit, #file_upload_submit { width:3em; }
 .file_upload_target { display:none; }
 
diff --git a/files/templates/index.php b/files/templates/index.php
index 25c2d4cd9c6..155bcf1ad51 100644
--- a/files/templates/index.php
+++ b/files/templates/index.php
@@ -4,17 +4,17 @@
 	</span>
 	<div class="actions">
 		<form data-upload-id='1' class="file_upload_form" action="ajax/upload.php" method="post" enctype="multipart/form-data" target="file_upload_target_1">
-			<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_["uploadMaxFilesize"] ?>" id="max_upload">
-			<input type="hidden" class="max_human_file_size" value="(max <?php echo $_["uploadMaxHumanFilesize"]; ?>)">
-			<input type="hidden" name="dir" value="<?php echo $_["dir"] ?>" id="dir">
-			<div class='file_upload_wrapper'>
-				<input class="prettybutton file_upload_filename" value="Upload (max. <?php echo $_["uploadMaxHumanFilesize"];?>)"/>
-				<input class="prettybutton file_upload_start" type="file" name='files[]'/>
-			</div>&nbsp;
+			<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload">
+			<input type="hidden" class="max_human_file_size" value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
+			<input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir">
+			<div class="file_upload_wrapper">
+				<input type="submit" class="file_upload_filename" value="Upload (max. <?php echo $_['uploadMaxHumanFilesize'];?>)"/>
+				<input class="file_upload_start" type="file" name='files[]'/>
+			</div>
 			<iframe name="file_upload_target_1" class='file_upload_target' src=""></iframe>
 		</form>
 		<form id="file_newfolder_form">
-			<input type="text" class="prettybutton" name="file_newfolder_name" id="file_newfolder_name" value="New Folder" />&nbsp;
+			<input type="text" name="file_newfolder_name" id="file_newfolder_name" value="" placeholder="New Folder" />
 		</form>
 	</div>
 	<div id="file_action_panel">
diff --git a/help/css/help.css b/help/css/help.css
index e46cf112092..e8c42f808d1 100644
--- a/help/css/help.css
+++ b/help/css/help.css
@@ -1,48 +1,8 @@
 /* APPS TABLE */
-
-table td.date
-{
-    width: 5em;
-    padding: 0.5em 1em;
-    text-align: right;
-}
-
-.preview 
-{
-    padding: 3px;
-    text-align: left;
-}
-
-table td.date
-{
-    width: 11em;
-    color: #555555;
-}
-
-table td.selection, table th.selection, table td.fileaction
-{
-    width: 2em;
-    text-align: center;
-}
-
-table td.name a
-{
-    padding: 6px;
-    text-decoration: none;
-    color: #555555;
-}
-
-.type 
-{
-    text-decoration: none;
-    color: #888888;
-    font-size: 0.8em;
-}
-
-.description 
-{
-    text-decoration: none;
-    color: #666666;
-    font-size: 0.9em;
-}
-
+table td.date { width:5em; padding:.5em 1em; text-align:right; }
+.preview  { padding:3px; text-align:left; }
+table td.date { width:11em; color:#555555; }
+table td.selection, table th.selection, table td.fileaction { width:2em; text-align:center; }
+table td.name a { padding:6px; text-decoration:none; color:#555555; }
+.type  { text-decoration:none; color:#888888; font-size:.8em; }
+.description  { text-decoration:none; color:#666666; font-size:.9em; }
diff --git a/help/templates/index.php b/help/templates/index.php
index 82ab224d49e..f859a8ae70c 100644
--- a/help/templates/index.php
+++ b/help/templates/index.php
@@ -6,7 +6,7 @@
 			<?php foreach($_["kbe"] as $kb): ?>
 				<tr>
 					<td width="1"><?php if($kb["preview1"] <> "") { echo('<img class="preview" border="0" src="'.$kb["preview1"].'" />'); } ?> </a></td>
-					<td class="name"><?php echo $kb["name"]; ?><br /><?php  echo('<span class="type">'.$kb['description'].'</span>'); ?><br />
+					<td class="name"><?php echo $kb["name"]; ?><br /><?php  echo('<span class="type">'.$kb['description'].'</span>'); ?>
 					<?php if($kb['answer']<>'') echo('<br /><span class="type"><b>Answer:</b></span><br /><span class="type">'.$kb['answer'].'</span>');?>
 					</td>
 				</tr>
diff --git a/settings/templates/index.php b/settings/templates/index.php
index 819b71c8943..6e68cfa148c 100644
--- a/settings/templates/index.php
+++ b/settings/templates/index.php
@@ -11,21 +11,10 @@
 		<legend><?php echo $l->t( 'Change Password' );?></legend>
 		<div id="passwordchanged"><?php echo $l->t( 'Your password got changed');?></div>
 		<div id="passworderror"></div>
-		<p>
-			<label for="pass1"><?php echo $l->t( 'Old password:' );?></label>
-			<input type="password" id="pass1" name="oldpassword" />
-		</p>
-		<p>
-			<label for="pass2"><?php echo $l->t( 'New password' );?></label>
-			<input type="password" id="pass2" name="password" />
-		</p>
-		<p>
-			<input type="checkbox" id="show" name="show" />
-			<label for="show"><?php echo $l->t( 'Show new password' );?></label>
-		</p>
-		<p class="form_footer">
-			<input id="passwordbutton" class="prettybutton" type="submit" value="Save" />
-		</p>
+		<input type="password" id="pass1" name="oldpassword" placeholder="<?php echo $l->t( 'Old password' );?>" />
+		<input type="password" id="pass2" name="password" placeholder="<?php echo $l->t( 'New password' );?>" data-typetoggle="#show" />
+		<input type="checkbox" id="show" name="show" /><label for="show"><?php echo $l->t( 'show' );?></label>
+		<input id="passwordbutton" type="submit" value="Change password" />
 	</fieldset>
 </form>
 
@@ -33,9 +22,8 @@
 	<form id="openidform">
 		<fieldset>
 			<legend><?php echo $l->t( 'OpenID' );?></legend>
-			<p>OpenID identity for <b><?php echo OC_User::getUser();?></b></p>
-			<p><input name='identity' id='identity' value='<?php echo $_['identity']; ?>'></input></p>
-			<p><input type='submit' value='Save'></input></p>
+			<input type="text" name='identity' id='identity' value="<?php echo $_['identity']; ?>" placeholder="OpenID for <?php echo OC_User::getUser();?>" />
+			<input type="submit" value="Save" /></p>
 		</fieldset>
 	</form>
 <?php endif;?>