diff --git a/defaults.php b/defaults.php
index 3ed7275..07ae25a 100755
--- a/defaults.php
+++ b/defaults.php
@@ -18,8 +18,8 @@
 define('DUMB_MODE_ENABLED', false);
 // default file permissions
 // change file to 644 and dir to 755 if your webserver "complains"
-define('FILE_PERMISSIONS', 0777);
-define('DIR_PERMISSIONS', 0777);
+define('FILE_PERMISSIONS', 0775);
+define('DIR_PERMISSIONS', 0775);
 
 // first some webserver setup...
 
@@ -36,10 +36,10 @@ define('ABS_PATH', dirname(__FILE__) . '/');
 define('FP_DEFAULTS', 'fp-defaults/');
 
 // all writable directories go here.
-define('FP_CONTENT', 'fp-content/'); // must be chmodded to 0777
+define('FP_CONTENT', 'fp-content/'); // must be chmodded to 0775
 
 // blog configurations files
-define('CONFIG_DIR', FP_CONTENT . 'config/'); // must be chmodded to 0777
+define('CONFIG_DIR', FP_CONTENT . 'config/'); // must be chmodded to 0775
 define('CONFIG_FILE', CONFIG_DIR . 'settings.conf.php');
 
 /**
diff --git a/fp-defaults/settings-defaults.php b/fp-defaults/settings-defaults.php
index 3f3d5df..046967c 100755
--- a/fp-defaults/settings-defaults.php
+++ b/fp-defaults/settings-defaults.php
@@ -21,7 +21,7 @@ $fp_config = array(
 		'dateformat' => '%A, %B %e, %Y',
 		'dateformatshort' => '%Y-%m-%d',
 		'charset' => 'utf-8',
-		'lang' => LANG_DEFAULT . $browserLang
+		'lang' => LANG_DEFAULT
 	),
 	'plugins' => array(
 		'blockparser' => array(
diff --git a/setup/imgs/loading.gif b/setup/imgs/loading.gif
deleted file mode 100755
index fbe57be..0000000
Binary files a/setup/imgs/loading.gif and /dev/null differ
diff --git a/setup/imgs/shade.png b/setup/imgs/shade.png
deleted file mode 100755
index ddf63c5..0000000
Binary files a/setup/imgs/shade.png and /dev/null differ
diff --git a/setup/imgs/tile.png b/setup/imgs/tile.png
deleted file mode 100755
index 84a137a..0000000
Binary files a/setup/imgs/tile.png and /dev/null differ
diff --git a/setup/main.php b/setup/main.php
index e796cb2..6634563 100644
--- a/setup/main.php
+++ b/setup/main.php
@@ -1,4 +1,7 @@
 <?php
+error_reporting($_SERVER ["SERVER_NAME"] == "localhost" ? E_ALL : 0);
+chmod("./fp-content/", 0775);
+
 $language = @$_POST ['language']? $_POST ['language'] : $browserLang;
 
 $lf = "lang.$language.php";
diff --git a/setup/res/setup.css b/setup/res/setup.css
index f2d4ef7..d72df1d 100755
--- a/setup/res/setup.css
+++ b/setup/res/setup.css
@@ -1,273 +1,118 @@
-/* Default WordPress by Dave Shea || http://mezzoblue.com
-	Modifications by Matthew Mullenweg || http://photomatt.net
-	This is just a basic layout, with only the bare minimum defined.
-	Please tweak this and make it your own. :)
+/*
+===================
+FlatPress Setup CSS
+===================
+
+Name: Leggero v2
+Author: NoWhereMan, Dave Shea, Matthew Mullenweg and Fraenkiman
+Version: 1.0.1
+Module: setup.css
 */
 
-/*base blue: #263962*/
-
-
-a {
-	color: #3b68bf;
-	text-decoration: none;
-}
-
-a img {
-	border: none;
-}
-
-a:visited {
-	color: #3b68bf;
-}
-
-a:hover {
-	color: #3b5d9f;
-	border-bottom: 1px solid #333;
-}
-
-acronym, abbr {
-	border-bottom: 1px dashed #333;
-}
-
-acronym, abbr, span.caps {
-	cursor: help;
-	font-size: 90%;
-	letter-spacing: .07em;
-}
-
-blockquote {
-	border-left: 5px solid #ccc;
-	margin-left: 1.5em;
-	padding-left: 5px;
-}
+@viewport { width: device-width }
 
 body {
-	background: #fff ; /* url('../imgs/tile.png') repeat-x; */
+	background: #fff;
 	color: #535c6f;
 	font-family: 'Lucida Grande', 'Lucida Sans Unicode', Verdana, sans-serif;
 	font-size: 70%;
 	text-align: center;
+	-webkit-text-size-adjust: none;
+	-moz-text-size-adjust: none;
+	text-size-adjust: none
 }
 
-#main {
-	margin: auto;
-	width: 500px;
-	text-align: left;
-}
-
-cite {
-	font-size: 90%;
-	font-style: normal;
-}
-
-h2 {
-	font: 160%, bold, Georgia, Times, 'Times New Roman', serif;
-	margin-top: 1em;
-}
-
-h3 {
-	border-bottom: dotted 1px #eee;
-	font: 200%, bold, Georgia, Times, 'Times New Roman', serif;
-	margin-top: 0;
-}
-
-big {
-	color:red;
-	font-weight: bold;
-}
-
-ol#comments li p {
-	font-size: 100%;
-	
-
-}
-
-ol#commentlist li {
-	padding-left: 8px;
-	padding-right: 8px;
-	margin: 4px;
-	border: thin dotted #e0e5ef;
-	background-color:#eff4ff;
-	
-}
-
-#pagesubtitle {
-	color: #ddd;
-	font-style: italic;
-	font-family: Georgia, Times, 'Times New Roman', serif;
-	text-align:center;
-}
-
-/* classes used by the_meta() */
-ul.post-meta {
-	list-style: none;
-}
-
-ul.post-meta span.post-meta-key {
-	font-weight: bold;
-}
-
-.credit {
-	/*background: #263962;
-	color: #fff;*/
-	font-size: 11px;
-	text-align: center;
-	clear:both;
-	
-	padding-top:20px;
-	
-	width: 85%	
-	
-}
-
-
-.feedback {
-	color: #ccc;
-	text-align: right;
-	margin-top: 2em;
-	font-size: .75em;
-}
-
-.meta {
-	font-size: .75em;
-}
-
-.meta li, ul.post-meta li {
-	display: inline;
-}
-
-.meta ul {
-	display: inline;
-	list-style: none;
-	margin: 0;
-	padding: 0;
-}
-
-.meta, .meta a {
-	color: #808080;
-	font-weight: normal;
-	letter-spacing: 0;
-}
-
-.storytitle {
-	margin: 0;
-}
-
-.storytitle a {
-	text-decoration: none;
-}
-
-
-.storycontent {
-	
-	/* clear floats */
-	
-	overflow: hidden;
-	_height:1%; /*ie hack*/
-}
-
-.post {
-	padding: 0.2em 1em;
-	background: #fff;
-	border: solid thin #ddd;
-}
-
-#navigation {
-	margin-left: 6.2%;
-	margin-top: 2em;
-	margin-bottom: 2em;
-}
-
-
-.alignleft {
-		float:left;
-}
-
- .alignright, #buttonbar {
-		float:right;
-}
-
-#buttonbar {
-	padding: 0;
-	margin-top: 1em;
-}
-
-#commentform #name, #commentform #email, #commentform #url, #commentform textarea {
-	background: #fff;
-	border: 1px solid #333;
-	padding: .2em;
-}
-
-
-fieldset {
-	padding: 0.4em;
-}
-
- textarea {
-	width: 99%;
-	font: normal 1em 'Lucida Grande', 'Lucida Sans Unicode', Verdana, sans-serif;
-	background: #fff;
-	border: 1px solid #333;
-	padding: .2em;
-
-
-}
-
-#commentlist li ul {
-	border-left: 1px solid #ddd;
-	font-size: 110%;
-	list-style-type: none;
-}
-
-
-
 #header {
 	font-family: Georgia, Times, 'Times New Roman', serif;
 	font-weight: normal;
 	font-style: italic;
 	font-size: 300%;
 	text-align: center;
-	border-bottom: 1px solid #bbb;
+	border-bottom: 1px solid #bbb
 }
 
-#header a {
-	color: #fff;
-	text-decoration: none;
+#main {
+	margin: auto;
+	width: 500px;
+	text-align: left
 }
 
-#header a:hover {
-	text-decoration: underline;
+a { color: #aa4142; text-decoration: none }
+
+a img { border: none }
+
+a:hover { color: #aa4142; border-bottom: 1px solid #333 }
+
+a:visited { color: #aa5152 }
+
+h1 :nth-child(1) { /* logo-small.gif */
+	vertical-align: bottom;
+    width: 28px;
+    margin: 5px 0
 }
 
+h1 :nth-child(2) { color: #535c6f }
 
-input, select {
-	font-size: 130%;
-	font-family: Georgia, Garamond, 'Times New Roman', Times, serif;
-	border: 1px solid #bbb;
-	background-color: #eee;
+h1 :nth-child(3) { color: #aa4142 }
+
+pre, code {
+    font-family: "Lucida Console", Monaco, monospace;
+    font-size: 100%;
+    color: #3b68bf
 }
 
-.maxsize {
-	width: 99%;
-}
+.storycontent { overflow: hidden }
 
+.post {
+	padding: 0.2em 1em;
+	background: #eee;
+	border: solid thin #ddd;
+	font-size: 120%;
+	border-radius: 5px
+}
 
 dt {
-	width: 30%; 
+	width: 40%; 
 	margin-top: 1.8em; 
 	text-align: right; 
-	line-height: 1.5em;
+	line-height: 1.5em
 }
 
 dd {
-	margin-top: -1.5em; 
-	margin-right: 10%; 
-	line-height: 2em;
-	float: right;
+    margin-top: -1.5em;
+    margin-right: 10%;
+    float: right;
+    line-height: 1.5em
 }
 
-.info-notice {
-	padding: 1em;
+dl { margin: 1.8em 0 }
+
+.alignleft { float: left }
+
+.alignright, #buttonbar { float: right }
+
+input, select {
+	font-size: 130%;
+	font-family: sans-serif;
 	border: 1px solid #ddd;
-	background: #eee;
+	border-radius: 3px;
 }
+
+input[type=text],
+input[type=password] {
+	width: 16em;
+	font-size: 100%;
+	background-color: #fff;
+	vertical-align: middle
+}
+
+input:hover,
+input:focus,
+textarea:hover, 
+textarea:focus { border: 1px solid #aa4142 }
+
+#buttonbar { padding: 0; margin-top: 1.6em }
+
+input[type=submit] { cursor: pointer; font-size: 100% }
+
+#footer { padding-top: 20px }
diff --git a/setup/tpls/footer.tpl.php b/setup/tpls/footer.tpl.php
index b6b983f..3f09044 100644
--- a/setup/tpls/footer.tpl.php
+++ b/setup/tpls/footer.tpl.php
@@ -1,5 +1,8 @@
 
 </form>
 </div>
+<div id="footer">
+	<p>FlatPress <?php echo SYSTEM_VER; ?></p>
+</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/setup/tpls/header.tpl.php b/setup/tpls/header.tpl.php
index 1a60bef..c4cdc07 100644
--- a/setup/tpls/header.tpl.php
+++ b/setup/tpls/header.tpl.php
@@ -1,15 +1,14 @@
 <!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head><title>Flatpress installer</title>
-		<link href="setup/res/setup.css" type="text/css" rel="stylesheet" /></head>
+<html xmlns="http://www.w3.org/1999/xhtml" lang="<?php echo LANG_DEFAULT; ?>">
+<head><title>FlatPress Installer</title>
+		<link href="setup/res/setup.css" type="text/css" rel="stylesheet"></head>
 <body>
 	<div id="rap">
-		<h1 id="header">FlatPress Installer</h1>
+		<h1 id="header"><img src="<?php echo BLOG_BASEURL; ?>setup/imgs/logo-small.gif" alt="logo-small.gif" title="logo-small.gif"><span> Flat</span><span>Press</span> Installer</h1>
+
 		</div>
 
 		<div id="main">
 		
 	
-<form class="storycontent" method="post" action="<?php
-
-echo BLOG_BASEURL?>setup.php"> 
\ No newline at end of file
+<form class="storycontent" method="post" action="<?php echo BLOG_BASEURL; ?>setup.php">
diff --git a/setup/tpls/locked.tpl.php b/setup/tpls/locked.tpl.php
index 4c54520..5b30022 100644
--- a/setup/tpls/locked.tpl.php
+++ b/setup/tpls/locked.tpl.php
@@ -1,8 +1,8 @@
-<h2><?php echo $l['head']; ?></h2>
+<h2><?php echo $l ['head']; ?></h2>
 <div class="post">
 
 <?php echo wpautop(sprintf(
-			$l['descr'], 
+			$l ['descr'], 
 			LOCKFILE, 
 			BLOG_BASEURL, 
 			BLOG_BASEURL . 'setup.php'
diff --git a/setup/tpls/step1.tpl.php b/setup/tpls/step1.tpl.php
index 8fd563a..65fa312 100644
--- a/setup/tpls/step1.tpl.php
+++ b/setup/tpls/step1.tpl.php
@@ -4,23 +4,23 @@
 	$languages = $o->getList();
 	
 ?>
-<h2><?php echo $l['head']; ?></h2>
+<h2><?php echo $l ['head']; ?></h2>
 
 <div class="post">
 
-<input type="hidden" name="setupid" value="<?php echo $setupid; ?>" />
+<input type="hidden" name="setupid" value="<?php echo $setupid; ?>">
 
 <?php 
-	echo wpautop(sprintf($l['descr'], FP_CONTENT));
+	echo wpautop(sprintf($l ['descr'], FP_CONTENT));
 	
 
 	if ($err)
-		 echo wpautop(sprintf($l['descrw'], FP_CONTENT));
+		 echo wpautop(sprintf($l ['descrw'], FP_CONTENT));
 		 
 ?>
 <div id="buttonbar">
 	<input type="submit" name="start" id="start" 
-	value="<?php echo $lang['buttonbar']['next']; ?>" />
+	value="<?php echo $lang ['buttonbar'] ['next']; ?>">
 </div>
 
 </div>
diff --git a/setup/tpls/step2.tpl.php b/setup/tpls/step2.tpl.php
index 1e1cd35..66c1fa0 100644
--- a/setup/tpls/step2.tpl.php
+++ b/setup/tpls/step2.tpl.php
@@ -1,8 +1,8 @@
-<h2><?php echo $l['head']; ?></h2>
+<h2><?php echo $l ['head']; ?></h2>
 <div class="errors">
 
-<input type="hidden" name="setupid" value="<?php echo $setupid; ?>" />
-<input type="hidden" name="language" value="<?php echo $language; ?>" />
+<input type="hidden" name="setupid" value="<?php echo $setupid; ?>">
+<input type="hidden" name="language" value="<?php echo $language; ?>">
 
 <?php 
 	if ($err) {
@@ -25,51 +25,51 @@
 
 <div class="post">
 
-<?php echo wpautop(sprintf($l['descr'], FP_CONTENT)); ?>
+<?php echo wpautop(sprintf($l ['descr'], FP_CONTENT)); ?>
 
 	<dl>
 		
 		<dt>
-			<label for="username">	<?php echo $l['fpuser']; ?> 	</label>
+			<label for="username"> <?php echo $l ['fpuser']; ?> </label>
 		</dt>
 		<dd>	
-			<input type="text" id="username" name="fpuser" />
+			<input type="text" id="username" name="fpuser">
 		</dd>
 		
 		<dt>
-			<label for="password">	<?php echo $l['fppwd']; ?>	</label>
+			<label for="password"> <?php echo $l ['fppwd']; ?> </label>
 		</dt>
 		<dd>
-			<input type="password" id="password" name="fppwd" />	
+			<input type="password" id="password" name="fppwd">	
 		</dd>
 		
 		<dt>
-			<label for="password2">	<?php echo $l['fppwd2']; ?>	</label>
+			<label for="password2"> <?php echo $l ['fppwd2']; ?> </label>
 		</dt>
 	
 		<dd>
-			<input type="password" id="password2" name="fppwd2" />	
+			<input type="password" id="password2" name="fppwd2">	
 		</dd>
 		
 		<dt>
-			<label for="www">	<?php echo $l['www']; ?>	</label>
+			<label for="www"> <?php echo $l ['www']; ?> </label>
 		</dt>
 		<dd>
-			<input type="text" id="www" name="www" value="<?php echo BLOG_BASEURL ; ?>" />	
+			<input type="text" id="www" name="www" value="<?php echo BLOG_BASEURL; ?>">	
 		</dd>
 		
 		<dt>
-			<label for="email">	<?php echo $l['email']; ?>	</label>
+			<label for="email">	<?php echo $l ['email']; ?> </label>
 		</dt>
 		<dd>
-			<input type="text" id="email" name="email" />	
+			<input type="text" id="email" name="email">	
 		</dd>
 		
 	</dl>
 
 <div id="buttonbar">
 	<input type="submit" name="start" id="start" 
-	value="<?php echo $lang['buttonbar']['next']; ?>" />
+	value="<?php echo $lang ['buttonbar'] ['next']; ?>">
 </div>
 
 </div>
\ No newline at end of file
diff --git a/setup/tpls/step3.tpl.php b/setup/tpls/step3.tpl.php
index 54f5326..2fca9ea 100644
--- a/setup/tpls/step3.tpl.php
+++ b/setup/tpls/step3.tpl.php
@@ -1,6 +1,6 @@
-<h2><?php echo $l['head']; ?></h2>
+<h2><?php echo $l ['head']; ?></h2>
 <div class="post">
 
-<?php echo wpautop(sprintf($l['descr'], BLOG_BASEURL, BLOG_BASEURL . 'login.php')); ?>
+<?php echo wpautop(sprintf($l ['descr'], BLOG_BASEURL, BLOG_BASEURL . 'login.php')); ?>
 
 </div>
\ No newline at end of file