diff --git a/phpgwapi/templates/idots/css/kneschke.css b/phpgwapi/templates/idots/css/kneschke.css
index 54d470e61a..db009ccb22 100755
--- a/phpgwapi/templates/idots/css/kneschke.css
+++ b/phpgwapi/templates/idots/css/kneschke.css
@@ -1,19 +1,19 @@
 /*
-	StyleSheet coding standards:
+StyleSheet coding standards:
 
-	1. use lowercase if possible
+1. use lowercase if possible
 
-	2. format styles like this:
-	
-		body
-		{
-			font-size: 12px;
-			font-family: Verdana, Arial, Helvetica, sans-serif
-		}
+2. format styles like this:
 
-	3. existing html elements on top of the document, then all self defined .classes and at last all self defined #id's.
+body
+{
+	font-size: 12px;
+	font-family: Verdana, Arial, Helvetica, sans-serif
+}
 
-	4. close every property with ; also the last one.
+3. existing html elements on top of the document, then all self defined .classes and at last all self defined #id's.
+
+4. close every property with ; also the last one.
 */
 
 body 
@@ -24,31 +24,42 @@ body
 	padding:14px;
 }
 
-a:link
+img
 {
+	border-width:0px;
+	border-style:none;
+	/*filter:progid:DXImageTransform.Microsoft.AlphaImageLoader;
+*/
+}
+
+a:link,a:visited
+{
+	cursor:pointer;
 	color: #006699; 
 	text-decoration: none;
 }
 
+/*
 a:visited 
 {
 	color: #006699; 
 	text-decoration: none;
 }
-
-a:hover 
+*/
+a:hover,a:active
 {
+	cursor:pointer;
 	color: #ff9933;
 	text-decoration: underline;
 }
-
+/*
 a:active 
 {
 	color: #006699; 
 	text-decoration: underline;
 }
-
-input
+*/
+input,button
 {
 	font-size: 11px; 
 	color: #006699; 
@@ -56,26 +67,21 @@ input
 	border: 1px #bbbbbb solid;
 }
 
-input[type="image"]
-{
-	border: 1px #bbbbbb none;
-}
-
 input[type=submit],input[type=button],button
 {
+	margin:1px;
+	padding:1px;
 	cursor: pointer; 
 	cursor: hand;
 }
 
-select 
+input[type=image]
 {
-	font-size: 11px; 
-	color: #006699; 
-	font-family: Arial, Helvetica, sans-serif;
-	border: 1px #bbbbbb solid;
+	cursor: pointer; 
+	cursor: hand;
+	border: 0px #bbbbbb none;
 }
-
-textarea
+select 
 {
 	font-size: 11px; 
 	color: #006699; 
@@ -86,14 +92,32 @@ textarea
 td
 {
 	font-size: 11px;
-/*	padding-top:1px;
+	/*	padding-top:1px;
 	padding-bottom:1px;*/
 }
 
+.divLoginbox 
+{
+	position:relative;
+	width: 300px; 
+	border-right: #9c9c9c 1px solid; 
+	border-top: #9c9c9c 1px solid; 
+	border-left: #9c9c9c 1px solid; 
+	border-bottom: #9c9c9c 1px solid
+}
+
+.divLoginboxHeader 
+{
+	text-align:center;
+	background-color:#dddddd;
+	padding-top:2px;
+	font-size:10px;
+	color:#666666;
+}
 .divSidebox 
 {
 	position:relative;
-	width: 160px; 
+	width: 147px; 
 	border-right: #9c9c9c 1px solid; 
 	border-top: #9c9c9c 1px solid; 
 	border-left: #9c9c9c 1px solid; 
@@ -104,22 +128,16 @@ td
 {
 	text-align:center;
 	background-color:#dddddd;
-	background-color:#D8DEED;
-	background-color:#D3DCE3;
-	height:12px;
 	padding-top:2px;
-	padding-bottom:2px;
-	font-size:11px;
-	color:#333333;
-	font-weight : bold;
-
+	font-size:10px;
+	color:#666666;
 }
 
 a.divSideboxEntry, .divSideboxEntry
 {
 	text-align:left;
 	height:16px;
-	background-color:#F6F7F4;
+	background-color:#eeeeee;
 }
 
 a.appTitles,.appTitles
@@ -139,10 +157,11 @@ a.textSidebox
 .textSidebox
 {
 	font-size: 10px; 
+	height:18px;
 	padding-top:2px;
 	padding-bottom:2px;
 	border-top: #aaaaaa 1px solid;
-	
+
 }
 
 .sideboxSpace
@@ -159,6 +178,28 @@ a.textSidebox
 	height:1px;
 }
 
+.prefSection
+{
+	font-weight:bold;
+	font-size:16px;
+	line-height:40px;
+}
+
+#extraIcons
+{
+/*	position:absolute;
+	z-index:13;
+	right:10px;
+	top:113px;
+	visibility:hidden;*/
+	background-image:url(../images/alpha-white.png);
+	border-width:1px;
+	border-color:#7e7e7e;
+	border-style:solid;
+}
+
+
+
 #divMain
 {
 	background-color:white;
@@ -177,19 +218,6 @@ a.textSidebox
 	z-index:51;
 }
 
-#extraIcons
-{
-/*	position:absolute;
-	z-index:13;
-	right:10px;
-	top:113px;
-	visibility:hidden;*/
-	background-image:url(../images/alpha-white.png);
-	border-width:1px;
-	border-color:#7e7e7e;
-	border-style:solid;
-}
-
 #divAppIconBar
 {
 	background-color:white;
@@ -211,23 +239,25 @@ a.textSidebox
 	height:15px;
 	padding-left:170px;
 	margin-top: 13px;
-/*	margin-bottom: 2px;*/
+	/*	margin-bottom: 2px;*/
 }
 
-#divSubContainer
+/*#divSubContainer
 {
 }
-
+*/
 #tdSidebox
 {
 	width:170px;
 	background-color:white;
+	overflow:visible;
 }
 
+
 #tdAppbox
 {
 	background-color:white;
-	padding-left:9px;
+	padding-left:5px;
 	width: 100%;
 }
 #divSideboxContainer
@@ -237,7 +267,6 @@ a.textSidebox
 	top:0px;
 	left:0px;
 	background-color:white;
-	border-color:red;
 	border-width:1px;
 	border-style:solid;
 	z-index:40;
@@ -245,17 +274,17 @@ a.textSidebox
 
 #divAppboxHeader
 {
-	width:100%;
+	/*width:100%;*/
 	background-image:url(../images/appbox-header-background.png);
 	background-repeat: repeat-x;
-	height:16px;
-	line-height:18px;
+	height:36px;
+	line-height:28px;
 	text-align:center;
-/*	padding-top:7px;*/
+	/*	padding-top:7px;*/
 	padding-bottom:0px;
-	font-size:12px;
+	font-size:14px;
 	font-weight:bold;
-	color:#555555;
+	color:#666666;
 	border-top-color:#9c9c9c;
 	border-top-width:1px;
 	border-top-style:solid;
@@ -269,7 +298,7 @@ a.textSidebox
 
 #divAppbox
 {
-	width:100%;
+/*	width:100%;*/
 	background-color:#f7f7f7;
 	padding:5px;
 	border-bottom-color:#9c9c9c;
@@ -283,9 +312,56 @@ a.textSidebox
 	border-right-style:solid;
 }
 
+#fmStatusBar
+{
+	margin-left:4px;
+	margin-bottom:3px;
+	font-size: 10px; 
+/*	font-family: Verdana, Arial, Helvetica, sans-serif;*/
+	
+
+}
+
+
+.fmButton
+{
+	background-image:url(../images/buttonbackground.png);
+	width:28px;
+	height:28px;
+	background-repeat: no-repeat;
+}
+
+#fmLocation
+{
+	position:relative;
+	/*background-image:url(../images/buttonbackgroundscaled.png);
+	background-repeat: repeat-x;*/
+	/*margin-left:4px;*/
+	margin-bottom:3px;
+	height:27px;
+
+}
+
+#fmMenu
+{
+	position:relative;
+}
+#fmFileWindow
+{
+	background-color:#ffffff;
+	margin-left:4px;
+	padding:5px;
+	position:relative;
+	border-right: #cccccc 1px solid; 
+	border-top: #9c9c9c 2px solid; 
+	border-left: #9c9c9c 2px solid; 
+	border-bottom: #cccccc 1px solid
+}
+
 #user_info
 {
-	color: #555555;
+
+
 }
 
 #admin_info
@@ -294,6 +370,15 @@ a.textSidebox
 	text-align:right;
 }
 
+#divGenTime
+{
+	bottom:14px;
+	font-size: 9px;
+	color: #ff0000;
+	text-align:center;
+	width:99%;
+}
+
 #divPoweredBy 
 {
 	bottom:14px;
diff --git a/phpgwapi/templates/jerryr/css/kneschke.css b/phpgwapi/templates/jerryr/css/kneschke.css
index 54d470e61a..db009ccb22 100755
--- a/phpgwapi/templates/jerryr/css/kneschke.css
+++ b/phpgwapi/templates/jerryr/css/kneschke.css
@@ -1,19 +1,19 @@
 /*
-	StyleSheet coding standards:
+StyleSheet coding standards:
 
-	1. use lowercase if possible
+1. use lowercase if possible
 
-	2. format styles like this:
-	
-		body
-		{
-			font-size: 12px;
-			font-family: Verdana, Arial, Helvetica, sans-serif
-		}
+2. format styles like this:
 
-	3. existing html elements on top of the document, then all self defined .classes and at last all self defined #id's.
+body
+{
+	font-size: 12px;
+	font-family: Verdana, Arial, Helvetica, sans-serif
+}
 
-	4. close every property with ; also the last one.
+3. existing html elements on top of the document, then all self defined .classes and at last all self defined #id's.
+
+4. close every property with ; also the last one.
 */
 
 body 
@@ -24,31 +24,42 @@ body
 	padding:14px;
 }
 
-a:link
+img
 {
+	border-width:0px;
+	border-style:none;
+	/*filter:progid:DXImageTransform.Microsoft.AlphaImageLoader;
+*/
+}
+
+a:link,a:visited
+{
+	cursor:pointer;
 	color: #006699; 
 	text-decoration: none;
 }
 
+/*
 a:visited 
 {
 	color: #006699; 
 	text-decoration: none;
 }
-
-a:hover 
+*/
+a:hover,a:active
 {
+	cursor:pointer;
 	color: #ff9933;
 	text-decoration: underline;
 }
-
+/*
 a:active 
 {
 	color: #006699; 
 	text-decoration: underline;
 }
-
-input
+*/
+input,button
 {
 	font-size: 11px; 
 	color: #006699; 
@@ -56,26 +67,21 @@ input
 	border: 1px #bbbbbb solid;
 }
 
-input[type="image"]
-{
-	border: 1px #bbbbbb none;
-}
-
 input[type=submit],input[type=button],button
 {
+	margin:1px;
+	padding:1px;
 	cursor: pointer; 
 	cursor: hand;
 }
 
-select 
+input[type=image]
 {
-	font-size: 11px; 
-	color: #006699; 
-	font-family: Arial, Helvetica, sans-serif;
-	border: 1px #bbbbbb solid;
+	cursor: pointer; 
+	cursor: hand;
+	border: 0px #bbbbbb none;
 }
-
-textarea
+select 
 {
 	font-size: 11px; 
 	color: #006699; 
@@ -86,14 +92,32 @@ textarea
 td
 {
 	font-size: 11px;
-/*	padding-top:1px;
+	/*	padding-top:1px;
 	padding-bottom:1px;*/
 }
 
+.divLoginbox 
+{
+	position:relative;
+	width: 300px; 
+	border-right: #9c9c9c 1px solid; 
+	border-top: #9c9c9c 1px solid; 
+	border-left: #9c9c9c 1px solid; 
+	border-bottom: #9c9c9c 1px solid
+}
+
+.divLoginboxHeader 
+{
+	text-align:center;
+	background-color:#dddddd;
+	padding-top:2px;
+	font-size:10px;
+	color:#666666;
+}
 .divSidebox 
 {
 	position:relative;
-	width: 160px; 
+	width: 147px; 
 	border-right: #9c9c9c 1px solid; 
 	border-top: #9c9c9c 1px solid; 
 	border-left: #9c9c9c 1px solid; 
@@ -104,22 +128,16 @@ td
 {
 	text-align:center;
 	background-color:#dddddd;
-	background-color:#D8DEED;
-	background-color:#D3DCE3;
-	height:12px;
 	padding-top:2px;
-	padding-bottom:2px;
-	font-size:11px;
-	color:#333333;
-	font-weight : bold;
-
+	font-size:10px;
+	color:#666666;
 }
 
 a.divSideboxEntry, .divSideboxEntry
 {
 	text-align:left;
 	height:16px;
-	background-color:#F6F7F4;
+	background-color:#eeeeee;
 }
 
 a.appTitles,.appTitles
@@ -139,10 +157,11 @@ a.textSidebox
 .textSidebox
 {
 	font-size: 10px; 
+	height:18px;
 	padding-top:2px;
 	padding-bottom:2px;
 	border-top: #aaaaaa 1px solid;
-	
+
 }
 
 .sideboxSpace
@@ -159,6 +178,28 @@ a.textSidebox
 	height:1px;
 }
 
+.prefSection
+{
+	font-weight:bold;
+	font-size:16px;
+	line-height:40px;
+}
+
+#extraIcons
+{
+/*	position:absolute;
+	z-index:13;
+	right:10px;
+	top:113px;
+	visibility:hidden;*/
+	background-image:url(../images/alpha-white.png);
+	border-width:1px;
+	border-color:#7e7e7e;
+	border-style:solid;
+}
+
+
+
 #divMain
 {
 	background-color:white;
@@ -177,19 +218,6 @@ a.textSidebox
 	z-index:51;
 }
 
-#extraIcons
-{
-/*	position:absolute;
-	z-index:13;
-	right:10px;
-	top:113px;
-	visibility:hidden;*/
-	background-image:url(../images/alpha-white.png);
-	border-width:1px;
-	border-color:#7e7e7e;
-	border-style:solid;
-}
-
 #divAppIconBar
 {
 	background-color:white;
@@ -211,23 +239,25 @@ a.textSidebox
 	height:15px;
 	padding-left:170px;
 	margin-top: 13px;
-/*	margin-bottom: 2px;*/
+	/*	margin-bottom: 2px;*/
 }
 
-#divSubContainer
+/*#divSubContainer
 {
 }
-
+*/
 #tdSidebox
 {
 	width:170px;
 	background-color:white;
+	overflow:visible;
 }
 
+
 #tdAppbox
 {
 	background-color:white;
-	padding-left:9px;
+	padding-left:5px;
 	width: 100%;
 }
 #divSideboxContainer
@@ -237,7 +267,6 @@ a.textSidebox
 	top:0px;
 	left:0px;
 	background-color:white;
-	border-color:red;
 	border-width:1px;
 	border-style:solid;
 	z-index:40;
@@ -245,17 +274,17 @@ a.textSidebox
 
 #divAppboxHeader
 {
-	width:100%;
+	/*width:100%;*/
 	background-image:url(../images/appbox-header-background.png);
 	background-repeat: repeat-x;
-	height:16px;
-	line-height:18px;
+	height:36px;
+	line-height:28px;
 	text-align:center;
-/*	padding-top:7px;*/
+	/*	padding-top:7px;*/
 	padding-bottom:0px;
-	font-size:12px;
+	font-size:14px;
 	font-weight:bold;
-	color:#555555;
+	color:#666666;
 	border-top-color:#9c9c9c;
 	border-top-width:1px;
 	border-top-style:solid;
@@ -269,7 +298,7 @@ a.textSidebox
 
 #divAppbox
 {
-	width:100%;
+/*	width:100%;*/
 	background-color:#f7f7f7;
 	padding:5px;
 	border-bottom-color:#9c9c9c;
@@ -283,9 +312,56 @@ a.textSidebox
 	border-right-style:solid;
 }
 
+#fmStatusBar
+{
+	margin-left:4px;
+	margin-bottom:3px;
+	font-size: 10px; 
+/*	font-family: Verdana, Arial, Helvetica, sans-serif;*/
+	
+
+}
+
+
+.fmButton
+{
+	background-image:url(../images/buttonbackground.png);
+	width:28px;
+	height:28px;
+	background-repeat: no-repeat;
+}
+
+#fmLocation
+{
+	position:relative;
+	/*background-image:url(../images/buttonbackgroundscaled.png);
+	background-repeat: repeat-x;*/
+	/*margin-left:4px;*/
+	margin-bottom:3px;
+	height:27px;
+
+}
+
+#fmMenu
+{
+	position:relative;
+}
+#fmFileWindow
+{
+	background-color:#ffffff;
+	margin-left:4px;
+	padding:5px;
+	position:relative;
+	border-right: #cccccc 1px solid; 
+	border-top: #9c9c9c 2px solid; 
+	border-left: #9c9c9c 2px solid; 
+	border-bottom: #cccccc 1px solid
+}
+
 #user_info
 {
-	color: #555555;
+
+
 }
 
 #admin_info
@@ -294,6 +370,15 @@ a.textSidebox
 	text-align:right;
 }
 
+#divGenTime
+{
+	bottom:14px;
+	font-size: 9px;
+	color: #ff0000;
+	text-align:center;
+	width:99%;
+}
+
 #divPoweredBy 
 {
 	bottom:14px;
diff --git a/phpgwapi/templates/jerryr/head.inc.php b/phpgwapi/templates/jerryr/head.inc.php
index c4eed1bea6..6b8311fe96 100644
--- a/phpgwapi/templates/jerryr/head.inc.php
+++ b/phpgwapi/templates/jerryr/head.inc.php
@@ -32,10 +32,10 @@
 	}
 
 	#_debug_array($GLOBALS['phpgw_info']['user']['preferences']['common']);
-	$theme_css = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/idots/css/'.$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'].'.css';
+	$theme_css = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/jerryr/css/'.$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'].'.css';
 	if(!file_exists($theme_css))
 	{
-		$theme_css = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/idots/css/'.$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'].'.css';
+		$theme_css = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/jerryr/css/'.$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'].'.css';
 	}
 
 	//pngfix defaults to yes