diff --git a/modules/chat/templates/default/chat_full_ws.tpl b/modules/chat/templates/default/chat_full_ws.tpl
index 2ebe9bd..72b29df 100644
--- a/modules/chat/templates/default/chat_full_ws.tpl
+++ b/modules/chat/templates/default/chat_full_ws.tpl
@@ -1,35 +1,37 @@
 {$header}
- <div id="content-wrap-chat">
-   	<div class="chatrow">
-   		<div id="main" class="ten columns" style="height:100%;">
-			<div id="chat" style="height:80vh;">
-					<div class="topbar"><a id="notchan">Ding</a> | <a href="//funch.at/forum/help-8.html" target="_blank" onclick="return popup('//funch.at/forum/help-8.html','width=800, height=800, resizeable,scrollbars=yes');">Hilfe</a> | <a href="//funch.at/forum/misc.php?action=smilies&amp;popup=true" target="_blank" onclick="return popup('//funch.at/forum/misc.php?action=smilies&amp;popup=true','width=600, height=600, resizeable,scrollbars=yes');">Smilies</a> | <a id="notsw">Benachrichtigung: An</a> | <a id="scrolling">Scrolling: An</a> | <a id="whwindow">{$whtext}</a> | <a id="submit">{$submit}</a> | <a id="logout">Logout</a></div>
-					<div id="chatlog" style="z-index:1; position:relative;"></div>
-					<textarea id="text" autocomplete="off" spellcheck="true" style="z-index:2; float: left; position: relative; background: none repeat scroll 0 0 #FFFFFF; border: 1px solid #000000; width: 100%; max-width: 870px; height:20px; color: #{$col};" ></textarea>
-			</div>
-		</div> <!-- end main -->
-		<div id="sidebar" class="two columns">
+<div class="wrapper col4">
+  <div id="container">
+    <div id="content">
+        <div class="topbar"><a id="notchan">Ding</a> | <a href="//funch.at/forum/help-8.html" target="_blank" onclick="return popup('//funch.at/forum/help-8.html','width=800, height=800, resizeable,scrollbars=yes');">Hilfe</a> | <a href="//funch.at/forum/misc.php?action=smilies&amp;popup=true" target="_blank" onclick="return popup('//funch.at/forum/misc.php?action=smilies&amp;popup=true','width=600, height=600, resizeable,scrollbars=yes');">Smilies</a> | <a id="notsw">Benachrichtigung: An</a> | <a id="scrolling">Scrolling: An</a> | <a id="whwindow">{$whtext}</a> | <a id="submit">{$submit}</a> | <a id="logout">Logout</a></div>
+		<div id="chatlog" style="z-index:1; position:relative;"></div>
+    </div>
+    <div id="column">
 		<div class="userlist">
 		</div>
 		<div class="functions">
 		</div>
 		{$rightnav}
-		</div> <!-- end sidebar -->
-	</div> <!-- end row -->
+    </div>
+    <br class="clear">
+  </div>
+</div>
+<br class="clear">
+<div class="wrapper col5">
+<textarea id="text" autocomplete="off" spellcheck="true" style="z-index:2; float: left; position: relative; background: none repeat scroll 0 0 #FFFFFF; border: 1px solid #000000; width: 100%; max-width: 870px; height:20px; color: #{$col};" ></textarea>
 </div>
-	<script type="text/javascript">
-	    $(function(){
-		      $('#chatlog').slimScroll({
-		          color: '#00f',
-		          size: '10px',
-		          width: '95%',
-				  wheelStep: 10,
-		          height: '90%',
-				  start: 'bottom'
-		      });
-		});
-	</script>
 <div id="whispers" style="display:none;">
 </div>
 <div id="repwindow" style="display:none;">
-</div>
+<script type="text/javascript">
+	$(function(){
+			$('#chatlog').slimScroll({
+				color: '#00f',
+				size: '10px',
+				width: '90%',
+				wheelStep: 10,
+				height: '90%',
+				start: 'bottom'
+			});
+	});
+</script>
+
diff --git a/modules/chat/templates/default/chat_header.tpl b/modules/chat/templates/default/chat_header.tpl
index eb0c5d5..f425a81 100644
--- a/modules/chat/templates/default/chat_header.tpl
+++ b/modules/chat/templates/default/chat_header.tpl
@@ -1,91 +1,54 @@
-<!doctype html>
-<html class="no-js" lang="de">
-  <head>
-    <!--- basic page needs
-    ================================================== -->
-    <meta charset="utf-8" />
-    <title>Funch.at - Die &Ouml;sterreichische Chatcommunity</title>
-    <meta
-      content="Funch.at - Die &Ouml;sterreichische Chatcommunity"
-      property="og:title"
-    />
-    <meta
-      name="keywords"
-      content="oe3 &Ouml;3 chat sms.at uboot.com chatcommunity webchat austria oesterreich forum"
-    />
-    <meta name="author" content="Funch.at" />
-    <meta
-      name="description"
-      content="Die kostenlose und werbefreie &Ouml;sterreichische Chatcommunity. Endlich wieder Chatten wie im Uboot, sms.at, Orf Chat, usw. Wir sehen uns!"
-    />
-    {$meta}
-    <link href="https://funch.at/chat" rel="Chat" />
-    <link href="https://funch.at/forum" rel="Forum" />
-    <!-- mobile specific metas
-   ================================================== -->
-    <meta
-      name="viewport"
-      content="width=device-width, initial-scale=1, maximum-scale=1"
-    />
-
-    <!-- CSS
-    ================================================== -->
-    <link rel="stylesheet" href="{$themepath}/css/default.css" />
-    <link rel="stylesheet" href="{$themepath}/css/layout.css" />
-    <link rel="stylesheet" href="{$themepath}/css/media-queries.css" />
-    <link rel="stylesheet" href="/js/odo/odometer-theme-minmal.css" />
-
-    <!-- Script
-   ================================================== -->
-    <script src="{$themepath}/js/modernizr.js"></script>
-    <script defer src="{$themepath}/js/fontawesome/all.min.js"></script>
-
-    <!-- Favicons
-	================================================== -->
-    <link
-      rel="icon"
-      type="image/png"
-      sizes="192x192"
-      href="/android-icon-192x192.png"
-    />
-    <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png" />
-    <link rel="icon" type="image/png" sizes="96x96" href="/favicon-96x96.png" />
-    <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />
-  </head>
-
-  <body>
-    <!-- Header
-   ================================================== -->
-    <header id="chattop">
-      <nav id="nav-wrap">
-        <a class="mobile-btn" href="#nav-wrap" title="Navigation zeigen"
-          >Zeige Men&uuml;</a
-        >
-        <a class="mobile-btn" href="#" title="Navigation verstecken"
-          >Verstecke Men&uuml;</a
-        >
-
-        <div class="row">
-          <ul id="nav" class="nav">
-            <li><a href="/">Home</a></li>
-            <li class="current">
-              <a href="/chat">Chat<span class="odometer">{$users}</span></a>
-            </li>
-            <li class="has-children">
-              <a href="/forum">Forum</a>
-              <ul>
-                {foreach from=$forum item=f}
-                <li><a href="{$f.link}">{$f.name}</a></li>
-                {/foreach}
-              </ul>
-            </li>
-            <li><a href="archives.html">Archives</a></li>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>FunCh.at - Deine Chatcommunity</title>
+<meta content="FunCh.at - Deine Chatcommunity" property="og:title" />
+<meta name="keywords" content="oe3 &Ouml;3 chat sms.at uboot.com chatcommunity webchat austria oesterreich forum" />
+<meta name="author" content="Funch.at" />
+<meta name="description" content="Die kostenlose und werbefreie &Ouml;sterreichische Chatcommunity. Endlich wieder Chatten wie im Uboot, sms.at, Orf Chat, usw. Wir sehen uns!" />
+{$meta}
+<link href="https://funch.at/chat" rel="Chat">
+<link href="https://funch.at/forum" rel="Forum">
+<link rel="icon" type="image/png" sizes="192x192"  href="{$themepath}/images/android-icon-192x192.png" />
+<link rel="icon" type="image/png" sizes="32x32" href="{$themepath}/images/favicon-32x32.png" />
+<link rel="icon" type="image/png" sizes="96x96" href="{$themepath}/images/favicon-96x96.png" />
+<link rel="icon" type="image/png" sizes="16x16" href="{$themepath}/images/favicon-16x16.png" />
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<link rel="stylesheet" href="{$themepath}/layout/styles/layout.css" type="text/css">
+<link rel="stylesheet" href="/js/odo/odometer-theme-minmal.css" />
+</head>
+<body id="top">
+<div class="wrapper col1">
+  <div id="header">
+    <!--<div class="fl_right"><a href="#"><img src="" alt="" /></a></div>-->
+    <br class="clear">
+  </div>
+</div>
+<!-- ####################################################################################################### -->
+<div class="wrapper col2">
+  <div id="topbar">
+    <div id="topnav">
+      <ul>
+        <li class="active"><a href="I">Home</a></li>
+        <li><a href="/chat">Chat<span class="odometer">{$users}</span></a></li>
+        <li><a href="/forum">Forum</a>
+          <ul>
+            {foreach from=$forum item=f}
+            <li><a href="{$f.link}">{$f.name}</a></li>
+            {/foreach}
           </ul>
-          <!-- end #nav -->
-        </div>
-      </nav>
-      <!-- end #nav-wrap -->
-    </header>
-    <!-- Header End -->
-  </body>
-</html>
+        </li>
+      </ul>
+    </div>
+    <!--<div id="search">
+      <form action="#" method="post">
+        <fieldset>
+          <legend>Site Search</legend>
+          <input type="text" value="Search Our Website&hellip;"  onfocus="this.value=(this.value=='Search Our Website&hellip;')? '' : this.value ;" />
+          <input type="submit" name="go" id="go" value="Search" />
+        </fieldset>
+      </form>
+    </div>-->
+    <br class="clear" />
+  </div>
+</div>
diff --git a/modules/chat/templates/default/userlist.tpl b/modules/chat/templates/default/userlist.tpl
index 147a592..85633bd 100644
--- a/modules/chat/templates/default/userlist.tpl
+++ b/modules/chat/templates/default/userlist.tpl
@@ -17,7 +17,6 @@ No users.
               $('#users').slimscroll({
                   color: '#00f',
                   size: '10px',
-                  width: '220px',
                   height: '300px'                  
               });
 {if $js!=""}
