diff --git a/inc/core.class.php b/inc/core.class.php
index fb984c2..980abaa 100644
--- a/inc/core.class.php
+++ b/inc/core.class.php
@@ -251,7 +251,9 @@ class Core{
 		}
 		$tpl->assign('messagetitle', $title);
 		if($redirect && $url!=''){	
-			$url = '//'.$config['domain'].$config['path'].$url;
+			if(substr( $url, 0, 4 ) != "http") {
+				$url = '//'.$config['domain'].$config['path'].$url;
+			}
 			$meta.='<meta http-equiv="refresh" content="'.$time.';URL='.$url.'" />';
 		}
 		$this->make_page($tpl->fetch('message.tpl'),$minimal);
@@ -454,8 +456,7 @@ class Core{
 				$this->log->write('Modul '.$task.' not found!',2);
 				
 			return $error->http_error('404');
-
-             	}
+		}
 		$this->make_page($content);
 	}
 
diff --git a/js/calendar/dhtmlgoodies_calendar.css b/js/calendar/dhtmlgoodies_calendar.css
index d7088c5..7446316 100644
--- a/js/calendar/dhtmlgoodies_calendar.css
+++ b/js/calendar/dhtmlgoodies_calendar.css
@@ -1,141 +1,140 @@
-#calendarDiv{
-	position:absolute;
-	width:205px;
-	line-height: 10px;
-	border:1px solid #317082;
-	padding:1px;
-	background-color: #FFF;
-	font-family:arial;
-	font-size:10px;
-	padding-bottom:20px;
-	visibility:hidden;
+#calendarDiv {
+  position: absolute;
+  width: 205px;
+  line-height: 10px;
+  border: 1px solid #317082;
+  padding: 1px;
+  background-color: #0a2145;
+  font-family: arial;
+  font-size: 10px;
+  padding-bottom: 20px;
+  visibility: hidden;
 }
-#calendarDiv span,#calendarDiv img{
-	float:left;
+#calendarDiv span,
+#calendarDiv img {
+  float: left;
 }
-#calendarDiv table{
-	margin: 0;
+#calendarDiv table {
+  margin: 0;
 }
-#calendarDiv .selectBox,#calendarDiv .selectBoxOver{
-	
-	line-height:12px;
-	padding:1px;
-	cursor:pointer;
-	padding-left:2px;
+#calendarDiv .selectBox,
+#calendarDiv .selectBoxOver {
+  line-height: 12px;
+  padding: 1px;
+  cursor: pointer;
+  background-color: #fdac46;
+  padding-left: 2px;
 }
 
-#calendarDiv .selectBoxTime,#calendarDiv .selectBoxTimeOver{	
-	line-height:12px;
-	padding:1px;
-	cursor:pointer;
-	padding-left:2px;
+#calendarDiv .selectBoxTime,
+#calendarDiv .selectBoxTimeOver {
+  line-height: 12px;
+  padding: 1px;
+  cursor: pointer;
+  padding-left: 2px;
 }
 
-#calendarDiv td{
-	padding:3px;
-	margin:0px;
-	font-size:10px;
+#calendarDiv td {
+  padding: 3px;
+  margin: 0px;
+  font-size: 10px;
 }
 
-
-
-#calendarDiv .selectBox{
-	border:1px solid #E2EBED;		
-	color: #E2EBED;
-	position:relative;
+#calendarDiv .selectBox {
+  border: 1px solid #e2ebed;
+  color: #000;
+  position: relative;
 }
-#calendarDiv .selectBoxOver{
-	border:1px solid #FFF;
-	background-color: #317082;
-	color: #FFF;
-	position:relative;
+#calendarDiv .selectBoxOver {
+  border: 1px solid #fff;
+  background-color: #fdac46;
+  color: #000;
+  position: relative;
 }
-#calendarDiv .selectBoxTime{
-	border:1px solid #317082;		
-	color: #317082;
-	position:relative;
+#calendarDiv .selectBoxTime {
+  border: 1px solid #317082;
+  color: #000;
+  position: relative;
 }
-#calendarDiv .selectBoxTimeOver{
-	border:1px solid #216072;	
-	color: #216072;
-	position:relative;
+#calendarDiv .selectBoxTimeOver {
+  border: 1px solid #216072;
+  color: #000;
+  position: relative;
 }
 
-#calendarDiv .topBar{
-	height:16px;
-	padding:2px;
-	background-color: #317082;
-
-
+#calendarDiv .topBar {
+  height: 16px;
+  padding: 2px;
+  background-color: #fdac46;
 }
-#calendarDiv .activeDay{	/* Active day in the calendar */
-	color:#FF0000;
+#calendarDiv .activeDay {
+  /* Active day in the calendar */
+  color: #ff0000;
 }
-#calendarDiv .todaysDate{
-	height:17px;
-	line-height:17px;
-	padding:2px;
-	background-color: #E2EBED;
-	text-align:center;
-	position:absolute;
-	bottom:0px;
-	width:201px;
+#calendarDiv .todaysDate {
+  height: 17px;
+  line-height: 17px;
+  padding: 2px;
+  color: #000;
+  background-color: #fdac46;
+  text-align: center;
+  position: absolute;
+  bottom: 0px;
+  width: 201px;
 }
-#calendarDiv .todaysDate div{
-	float:left;
-}
-	
-#calendarDiv .timeBar{
-	height:17px;
-	line-height:17px;
-	background-color: #E2EBED;
-	width:72px;
-	color:#FFF;
-	position:absolute;
-	right:0px;
+#calendarDiv .todaysDate div {
+  float: left;
 }
 
-#calendarDiv .timeBar div{
-	float:left;
-	margin-right:1px;
+#calendarDiv .timeBar {
+  height: 17px;
+  line-height: 17px;
+  background-color: #e2ebed;
+  width: 72px;
+  color: #fff;
+  position: absolute;
+  right: 0px;
 }
 
-
-#calendarDiv .monthYearPicker{
-	background-color: #E2EBED;
-	border:1px solid #AAAAAA;
-	position:absolute;
-	color: #317082;
-	left:0px;
-	top:15px;
-	z-index:1000;
-	display:none;
-
-}
-#calendarDiv #monthSelect{
-	width:70px;
-}
-#calendarDiv .monthYearPicker div{
-	float:none;
-	clear:both;	
-	padding:1px;
-	margin:1px;	
-	cursor:pointer;
-}
-#calendarDiv .monthYearActive{
-	background-color:#317082;
-	color: #E2EBED;
+#calendarDiv .timeBar div {
+  float: left;
+  margin-right: 1px;
 }
 
-#calendarDiv td{
-	text-align:right;
-	cursor:pointer;
+#calendarDiv .monthYearPicker {
+  background-color: #e2ebed;
+  border: 1px solid #aaaaaa;
+  position: absolute;
+  color: #317082;
+  left: 0px;
+  top: 15px;
+  z-index: 1000;
+  display: none;
+}
+#calendarDiv #monthSelect {
+  width: 70px;
+}
+#calendarDiv .monthYearPicker div {
+  float: none;
+  clear: both;
+  padding: 1px;
+  margin: 1px;
+  cursor: pointer;
+}
+#calendarDiv .monthYearActive {
+  background-color: #317082;
+  color: #e2ebed;
 }
 
-#calendarDiv .topBar img{
-	cursor:pointer;
+#calendarDiv td {
+  text-align: right;
+  cursor: pointer;
 }
-#calendarDiv .topBar div{
-	float:left;
-	margin-right:1px;
+
+#calendarDiv .topBar img {
+  cursor: pointer;
+}
+#calendarDiv .topBar div {
+  float: left;
+  margin-right: 1px;
 }
diff --git a/login.php b/login.php
index bd98926..447d85f 100644
--- a/login.php
+++ b/login.php
@@ -73,6 +73,6 @@ if($_POST['username']!='' && $_POST['password']!=''){
 }else{
 	$tpl->assign('config',$config);
 	$content=$tpl->fetch('login.tpl');
-	$core->make_page($content, true);
+	$core->make_page($content, FALSE);
 }
 ?>
diff --git a/modules/chat/templates/default/allroomlist.tpl b/modules/chat/templates/default/allroomlist.tpl
index 5fcdabb..5c513dc 100644
--- a/modules/chat/templates/default/allroomlist.tpl
+++ b/modules/chat/templates/default/allroomlist.tpl
@@ -1,4 +1,5 @@
-<h4>Raumliste</h4><a id="userlist" style="font-size:8px;">(schlie&szlig;en)</a><br />
+<h4>Raumliste</h4><a id="userlist" style="font-size:8px;">(schlie&szlig;en)</a>
+<div id="users" class="mousescroll" style="padding:5px; height: 250px;">
 {if $users==""}
 <p>
 No users.
@@ -7,19 +8,20 @@ No users.
 <div style="padding:5px;">
 {foreach from=$users key=key item=user}
 	{if $user.s == false}
-		<strong><a id="{$key}" class="room">{$key}</a></strong> <img src="/themes/austria/images/unlocked.png" style="border:none;" /><br />
+		<strong><a id="{$key}" class="room">{$key}</a></strong> <img src="/themes/funchat/images/unlocked.png" style="border:none;" /><br />
 	{else}
-		<strong><a>{$key}</a></strong> <img src="/themes/austria/images/locked.png" style="border:none;" /><br />
+		<strong><a>{$key}</a></strong> <img src="/themes/funchat/images/locked.png" style="border:none;" /><br />
 	{/if}
 	{foreach from=$user.u item=i}
-		<a id="{$i.n}" class="notice"><img src="/themes/austria/images/{$i.i}" style="border:none;" /></a>{$i.l}<a href="/np/{$i.n}" target="_blank" style="color:#{$i.c}; margin-left: 8px;">{$i.n}</a></span>&nbsp;<img src="/themes/archer/images/{$i.g}.png" style="border:none;" /><br />
+		<a id="{$i.n}" class="notice"><img src="/themes/funchat/images/{$i.i}" style="border:none;" /></a>{$i.l}<a href="/np/{$i.n}" target="_blank" style="color:#{$i.c}; margin-left: 8px;">{$i.n}</a></span>&nbsp;<img src="/themes/funchat/images/{$i.g}.png" style="border:none;" /><br />
 	{/foreach}
 {/foreach}
 {/if}
 </div>
+</div>
 {if $js!=""}
 <script type="text/javascript">
 	{$js}
 	$(".notice").rightClickMenu(menu);	
 </script>
-{/if}
\ No newline at end of file
+{/if}
diff --git a/modules/chat/templates/default/chat_full_ws.tpl b/modules/chat/templates/default/chat_full_ws.tpl
index 72b29df..9c75ee7 100644
--- a/modules/chat/templates/default/chat_full_ws.tpl
+++ b/modules/chat/templates/default/chat_full_ws.tpl
@@ -1,7 +1,7 @@
 {$header}
 <div class="wrapper col4">
   <div id="container">
-    <div id="content">
+    <div id="content" 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>
     </div>
@@ -13,12 +13,11 @@
 		{$rightnav}
     </div>
     <br class="clear">
+    <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>
 <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>
+
 <div id="whispers" style="display:none;">
 </div>
 <div id="repwindow" style="display:none;">
diff --git a/modules/chat/templates/default/userlist.tpl b/modules/chat/templates/default/userlist.tpl
index 85633bd..ac7bd52 100644
--- a/modules/chat/templates/default/userlist.tpl
+++ b/modules/chat/templates/default/userlist.tpl
@@ -7,7 +7,7 @@ No users.
 </p>
 {else}
 {foreach from=$users item=user}
-<a id="{$user.nick}" class="notice"><img src="/themes/austria/images/{$user.notice}" title="Toggle notice for {$user.nick}" style="border:none;" /></a><a href="/np/{$user.nick}" target="_blank" style="color:#{$user.color}; margin-left: 8px;">{$user.nick}</a>{if $user.typing=="true"}<i class="fa fa-comment" style="color:#{$user.color}" aria-hidden="true"></i>{/if}</span>&nbsp;<img src="/themes/austria/images/{$user.gender}.png" style="border:none;" /><br />
+<a id="{$user.nick}" class="notice"><img src="/themes/funchat/images/{$user.notice}" title="Toggle notice for {$user.nick}" style="border:none;" /></a><a href="/np/{$user.nick}" target="_blank" style="color:#{$user.color}; margin-left: 8px;">{$user.nick}</a>{if $user.typing=="true"}<i class="fa fa-comment" style="color:#{$user.color}" aria-hidden="true"></i>{/if}</span>&nbsp;<img src="/themes/funchat/images/{$user.gender}.png" style="border:none;" /><br />
 {/foreach}
 {/if}
 &nbsp;
diff --git a/modules/mybbnews/mybbnews.module.php b/modules/mybbnews/mybbnews.module.php
index b9c98e6..a1f400e 100644
--- a/modules/mybbnews/mybbnews.module.php
+++ b/modules/mybbnews/mybbnews.module.php
@@ -6,7 +6,7 @@ class module_mybbnews extends admin_module{
 		$info["name"]="MYBB News";
 		$info["file"]="mybbnews";
 		$info["author"]="genuineparts";
-		$info["version"]="1.0.0";
+		$info["version"]="1.0.1";
 		$info["url"]="http://www.becast.ar";
 		return $info;
 	}	
diff --git a/modules/mybbnews/mybbnews.plugins.php b/modules/mybbnews/mybbnews.plugins.php
index 24d204f..e82ae36 100644
--- a/modules/mybbnews/mybbnews.plugins.php
+++ b/modules/mybbnews/mybbnews.plugins.php
@@ -37,6 +37,7 @@ class plugins_mybbnews{
 				$row["date"]=date("d.m.Y",$row["dateline"]);
 				$row["text"]=$parser->parse(nl2br($row["message"]));
 				$row["title"]=$parser->parse(nl2br($row["subject"]));
+				$row["fuid"]=$row["uid"];
 				$row["comments"]=$row["count"];
 				$news[]=$row;
 			}
diff --git a/themes/funchat/images/female.png b/themes/funchat/images/female.png
new file mode 100644
index 0000000..f92958e
Binary files /dev/null and b/themes/funchat/images/female.png differ
diff --git a/themes/funchat/images/male.png b/themes/funchat/images/male.png
new file mode 100644
index 0000000..25d6ea9
Binary files /dev/null and b/themes/funchat/images/male.png differ
diff --git a/themes/funchat/images/na.png b/themes/funchat/images/na.png
new file mode 100644
index 0000000..6a2223e
Binary files /dev/null and b/themes/funchat/images/na.png differ
diff --git a/themes/funchat/images/notice_off.png b/themes/funchat/images/notice_off.png
new file mode 100644
index 0000000..4cdace0
Binary files /dev/null and b/themes/funchat/images/notice_off.png differ
diff --git a/themes/funchat/images/notice_on.png b/themes/funchat/images/notice_on.png
new file mode 100644
index 0000000..71c4941
Binary files /dev/null and b/themes/funchat/images/notice_on.png differ
diff --git a/themes/funchat/images/password.png b/themes/funchat/images/password.png
new file mode 100644
index 0000000..f168289
Binary files /dev/null and b/themes/funchat/images/password.png differ
diff --git a/themes/funchat/images/unlocked.png b/themes/funchat/images/unlocked.png
new file mode 100644
index 0000000..646b413
Binary files /dev/null and b/themes/funchat/images/unlocked.png differ
diff --git a/themes/funchat/layout/styles/forms.css b/themes/funchat/layout/styles/forms.css
index 4d68881..11a5d20 100644
--- a/themes/funchat/layout/styles/forms.css
+++ b/themes/funchat/layout/styles/forms.css
@@ -8,25 +8,125 @@ Licence URI: http://www.os-templates.com/template-terms
 File: Forms CSS
 */
 
-form, fieldset, legend{margin:0; padding:0; border:none;}
-legend{display:none;}
-input, textarea, select{font-size:12px; font-family:Georgia, "Times New Roman", Times, serif;}
+form,
+fieldset,
+legend {
+  margin: 0;
+  padding: 0;
+  border: none;
+}
+legend {
+  display: none;
+}
+input,
+textarea,
+select {
+  font-size: 12px;
+  font-family: Inter;
+}
 
 /* ----------------------------------------------Search Form------------------------------------- */
 
-#topbar input{display:block; float:left; width:155px; margin:0 5px 0 0; padding:5px; color:#B6B6B6; background-color:#151515; border:1px solid #666666; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px;}
-#topbar input#go{width:68px; height:26px; margin:0; padding:4px 0; text-transform:uppercase; color:#BFE009; background-color:#2C2C2C; cursor:pointer; font-weight:bold;}
+#topbar input {
+  display: block;
+  float: left;
+  width: 155px;
+  margin: 0 5px 0 0;
+  padding: 5px;
+  color: #b6b6b6;
+  background-color: #151515;
+  border: 1px solid #666666;
+  font-family: Inter;
+  font-size: 12px;
+}
+#topbar input#go {
+  width: 68px;
+  height: 26px;
+  margin: 0;
+  padding: 4px 0;
+  text-transform: uppercase;
+  color: #bfe009;
+  background-color: #2c2c2c;
+  cursor: pointer;
+  font-weight: bold;
+}
+
+.subnav input#go {
+  width: 68px;
+  height: 26px;
+  margin: 0;
+  padding: 4px 0;
+  text-transform: uppercase;
+  color: #bfe009;
+  background-color: #2c2c2c;
+  cursor: pointer;
+  font-weight: bold;
+}
 
 /* ----------------------------------------------Forms in Content Area------------------------------------- */
 
-#container #respond{display:block; width:100%;}
-#container #respond input{width:170px; padding:2px; border:1px solid #CCCCCC; margin:5px 5px 0 0;}
-#container #respond textarea{width:98%; border:1px solid #CCCCCC; padding:2px; overflow:auto;}
-#container #respond p{margin:5px 0;}
-#container #respond #submit, #container #respond #reset{margin:0; padding:5px; color:#666666; background-color:#F7F7F7; border:1px solid #CCCCCC; cursor:pointer;}
+#container #respond {
+  display: block;
+  width: 100%;
+}
+#container #respond input {
+  width: 170px;
+  padding: 2px;
+  border: 1px solid #cccccc;
+  margin: 5px 5px 0 0;
+}
+
+#container #respond label {
+  width: 150px;
+  display: inline-block;
+}
+
+#container #respond textarea {
+  width: 98%;
+  border: 1px solid #cccccc;
+  padding: 2px;
+  overflow: auto;
+}
+#container #respond p {
+  margin: 5px 0;
+}
+#container #respond #submit,
+#container #respond #reset {
+  margin: 0;
+  padding: 5px;
+  color: #666666;
+  background-color: #f7f7f7;
+  border: 1px solid #cccccc;
+  cursor: pointer;
+}
 
 /* ----------------------------------------------Newsletter------------------------------------- */
 
-#socialise form{display:block; width:300px; margin:0; padding:10px 0 0 0; border:none;}
-#socialise input{display:block; width:218px; margin:0 0 10px 0; padding:5px; color:#FFFFFF; background-color:#2684B7; border:1px solid #1C5E82; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px;}
-#socialise input#newsletter_go{width:58px; height:62px; margin:0; padding:0; font-weight:bold; text-transform:uppercase; font-family:Georgia, "Times New Roman", Times, serif; font-size:60px; cursor:pointer;}
\ No newline at end of file
+#socialise form {
+  display: block;
+  width: 300px;
+  margin: 0;
+  padding: 10px 0 0 0;
+  border: none;
+}
+#socialise input {
+  display: block;
+  width: 218px;
+  margin: 0 0 10px 0;
+  padding: 5px;
+  color: #ffffff;
+  background-color: #2684b7;
+  border: 1px solid #1c5e82;
+  font-family: Inter;
+  font-size: 12px;
+}
+#socialise input#newsletter_go {
+  width: 58px;
+  height: 62px;
+  margin: 0;
+  padding: 0;
+  font-weight: bold;
+  text-transform: uppercase;
+  font-family: Inter;
+  cursor: pointer;
+}
diff --git a/themes/funchat/layout/styles/layout.css b/themes/funchat/layout/styles/layout.css
index 583c251..865dcac 100644
--- a/themes/funchat/layout/styles/layout.css
+++ b/themes/funchat/layout/styles/layout.css
@@ -74,7 +74,6 @@ a {
 }
 
 img {
-  display: block;
   margin: 0;
   padding: 0;
   border: none;