diff --git a/src/messenger/webim/libs/expand.php b/src/messenger/webim/libs/expand.php
index 42394a9d..a28d964d 100644
--- a/src/messenger/webim/libs/expand.php
+++ b/src/messenger/webim/libs/expand.php
@@ -98,11 +98,11 @@ function expand($basedir,$style,$filename) {
 	if(!is_dir("$basedir/$style")) {
 		$style = "default";
 	}
-	$expand_include_path = "$basedir/$style/";
+	$expand_include_path = "$basedir/$style/templates/";
 	$current_style = $style;
 	$contents = @file_get_contents($expand_include_path.$filename);
 	if($contents === false) {
-		$expand_include_path = "$basedir/default/";
+		$expand_include_path = "$basedir/default/templates/";
 		$current_style = "default";
 		$contents = @file_get_contents($expand_include_path.$filename) or die("cannot load template");
 	}
diff --git a/src/messenger/webim/styles/default/bg_btn.gif b/src/messenger/webim/styles/default/images/bg_btn.gif
similarity index 100%
rename from src/messenger/webim/styles/default/bg_btn.gif
rename to src/messenger/webim/styles/default/images/bg_btn.gif
diff --git a/src/messenger/webim/styles/default/bg_domain.gif b/src/messenger/webim/styles/default/images/bg_domain.gif
similarity index 100%
rename from src/messenger/webim/styles/default/bg_domain.gif
rename to src/messenger/webim/styles/default/images/bg_domain.gif
diff --git a/src/messenger/webim/styles/default/butbg.gif b/src/messenger/webim/styles/default/images/butbg.gif
similarity index 100%
rename from src/messenger/webim/styles/default/butbg.gif
rename to src/messenger/webim/styles/default/images/butbg.gif
diff --git a/src/messenger/webim/styles/default/quadrat.gif b/src/messenger/webim/styles/default/images/quadrat.gif
similarity index 100%
rename from src/messenger/webim/styles/default/quadrat.gif
rename to src/messenger/webim/styles/default/images/quadrat.gif
diff --git a/src/messenger/webim/styles/.htaccess b/src/messenger/webim/styles/default/templates/.htaccess
similarity index 100%
rename from src/messenger/webim/styles/.htaccess
rename to src/messenger/webim/styles/default/templates/.htaccess
diff --git a/src/messenger/webim/styles/default/agentchat.tpl b/src/messenger/webim/styles/default/templates/agentchat.tpl
similarity index 100%
rename from src/messenger/webim/styles/default/agentchat.tpl
rename to src/messenger/webim/styles/default/templates/agentchat.tpl
diff --git a/src/messenger/webim/styles/default/agentrochat.tpl b/src/messenger/webim/styles/default/templates/agentrochat.tpl
similarity index 100%
rename from src/messenger/webim/styles/default/agentrochat.tpl
rename to src/messenger/webim/styles/default/templates/agentrochat.tpl
diff --git a/src/messenger/webim/styles/default/chat.tpl b/src/messenger/webim/styles/default/templates/chat.tpl
similarity index 98%
rename from src/messenger/webim/styles/default/chat.tpl
rename to src/messenger/webim/styles/default/templates/chat.tpl
index 70391484..916f1dcf 100644
--- a/src/messenger/webim/styles/default/chat.tpl
+++ b/src/messenger/webim/styles/default/templates/chat.tpl
@@ -16,18 +16,18 @@ var threadParams = { servl:"${webimroot}/thread.php",wroot:"${webimroot}",freque
 <style>
 #header{
 	height:50px;
-	background:url(${tplroot}/bg_domain.gif) repeat-x top;
+	background:url(${tplroot}/images/bg_domain.gif) repeat-x top;
 	background-color:#5AD66B;
 	width:99.6%;
 	margin:0px 0px 20px 0px;
 }
 #header .mmimg{
-	background:url(${tplroot}/quadrat.gif) bottom left no-repeat;
+	background:url(${tplroot}/images/quadrat.gif) bottom left no-repeat;
 }
 .but{
 	font-family:Verdana !important;
 	font-size:11px;
-	background:url(${tplroot}/bg_btn.gif) no-repeat top left;
+	background:url(${tplroot}/images/bg_btn.gif) no-repeat top left;
 	display:block;
 	text-align:center;
 	padding-top:2px;
diff --git a/src/messenger/webim/styles/default/chatsimple.tpl b/src/messenger/webim/styles/default/templates/chatsimple.tpl
similarity index 100%
rename from src/messenger/webim/styles/default/chatsimple.tpl
rename to src/messenger/webim/styles/default/templates/chatsimple.tpl
diff --git a/src/messenger/webim/styles/default/error.tpl b/src/messenger/webim/styles/default/templates/error.tpl
similarity index 94%
rename from src/messenger/webim/styles/default/error.tpl
rename to src/messenger/webim/styles/default/templates/error.tpl
index ac0c4204..27d1b0c7 100644
--- a/src/messenger/webim/styles/default/error.tpl
+++ b/src/messenger/webim/styles/default/templates/error.tpl
@@ -8,13 +8,13 @@
 <style>
 #header{
 	height:50px;
-	background:url(${tplroot}/bg_domain.gif) repeat-x top;
+	background:url(${tplroot}/images/bg_domain.gif) repeat-x top;
 	background-color:#5AD66B;
 	width:99.6%;
 	margin:0px 0px 20px 0px;
 }
 #header .mmimg{
-	background:url(${tplroot}/quadrat.gif) bottom left no-repeat;
+	background:url(${tplroot}/images/quadrat.gif) bottom left no-repeat;
 }
 </style>
 <body bgcolor="#FFFFFF" text="#000000" link="#C28400" vlink="#C28400" alink="#C28400" style="margin:0px">
diff --git a/src/messenger/webim/styles/default/leavemessage.tpl b/src/messenger/webim/styles/default/templates/leavemessage.tpl
similarity index 95%
rename from src/messenger/webim/styles/default/leavemessage.tpl
rename to src/messenger/webim/styles/default/templates/leavemessage.tpl
index 96367982..6d93960a 100644
--- a/src/messenger/webim/styles/default/leavemessage.tpl
+++ b/src/messenger/webim/styles/default/templates/leavemessage.tpl
@@ -9,13 +9,13 @@
 <style>
 #header{
 	height:50px;
-	background:url(${tplroot}/bg_domain.gif) repeat-x top;
+	background:url(${tplroot}/images/bg_domain.gif) repeat-x top;
 	background-color:#5AD66B;
 	width:99.6%;
 	margin:0px 0px 20px 0px;
 }
 #header .mmimg{
-	background:url(${tplroot}/quadrat.gif) bottom left no-repeat;
+	background:url(${tplroot}/images/quadrat.gif) bottom left no-repeat;
 }
 .form td{
 	background-color:#f4f4f4;
@@ -24,7 +24,7 @@
 .but{
 	font-family:Verdana !important;
 	font-size:11px;
-	background:url(${tplroot}/butbg.gif) no-repeat top left;
+	background:url(${tplroot}/images/butbg.gif) no-repeat top left;
 	display:block;
 	text-align:center;
 	padding-top:2px;
diff --git a/src/messenger/webim/styles/default/leavemessagesent.tpl b/src/messenger/webim/styles/default/templates/leavemessagesent.tpl
similarity index 94%
rename from src/messenger/webim/styles/default/leavemessagesent.tpl
rename to src/messenger/webim/styles/default/templates/leavemessagesent.tpl
index dbcf8821..d83e1f86 100644
--- a/src/messenger/webim/styles/default/leavemessagesent.tpl
+++ b/src/messenger/webim/styles/default/templates/leavemessagesent.tpl
@@ -8,13 +8,13 @@
 <style>
 #header{
 	height:50px;
-	background:url(${tplroot}/bg_domain.gif) repeat-x top;
+	background:url(${tplroot}/images/bg_domain.gif) repeat-x top;
 	background-color:#5AD66B;
 	width:99.6%;
 	margin:0px 0px 20px 0px;
 }
 #header .mmimg{
-	background:url(${tplroot}/quadrat.gif) bottom left no-repeat;
+	background:url(${tplroot}/images/quadrat.gif) bottom left no-repeat;
 }
 </style>
 <body bgcolor="#FFFFFF" text="#000000" link="#C28400" vlink="#C28400" alink="#C28400" style="margin:0px">
diff --git a/src/messenger/webim/styles/default/mail.tpl b/src/messenger/webim/styles/default/templates/mail.tpl
similarity index 97%
rename from src/messenger/webim/styles/default/mail.tpl
rename to src/messenger/webim/styles/default/templates/mail.tpl
index 61046cc0..435a15db 100644
--- a/src/messenger/webim/styles/default/mail.tpl
+++ b/src/messenger/webim/styles/default/templates/mail.tpl
@@ -8,7 +8,7 @@
 <style>
 #header{
 	height:50px;
-	background:url(${tplroot}/bg_domain.gif) repeat-x top;
+	background:url(${tplroot}/images/bg_domain.gif) repeat-x top;
 	background-color:#5AD66B;
 	width:99.6%;
 	margin:0px 0px 20px 0px;
@@ -16,7 +16,7 @@
 .but{
 	font-family:Verdana !important;
 	font-size:11px;
-	background:url(${tplroot}/butbg.gif) no-repeat top left;
+	background:url(${tplroot}/images/butbg.gif) no-repeat top left;
 	display:block;
 	text-align:center;
 	padding-top:2px;
diff --git a/src/messenger/webim/styles/default/mailsent.tpl b/src/messenger/webim/styles/default/templates/mailsent.tpl
similarity index 94%
rename from src/messenger/webim/styles/default/mailsent.tpl
rename to src/messenger/webim/styles/default/templates/mailsent.tpl
index 2260c582..ddc268dd 100644
--- a/src/messenger/webim/styles/default/mailsent.tpl
+++ b/src/messenger/webim/styles/default/templates/mailsent.tpl
@@ -8,13 +8,13 @@
 <style>
 #header{
 	height:50px;
-	background:url(${tplroot}/bg_domain.gif) repeat-x top;
+	background:url(${tplroot}/images/bg_domain.gif) repeat-x top;
 	background-color:#5AD66B;
 	width:99.6%;
 	margin:0px 0px 20px 0px;
 }
 #header .mmimg{
-	background:url(${tplroot}/quadrat.gif) bottom left no-repeat;
+	background:url(${tplroot}/images/quadrat.gif) bottom left no-repeat;
 }
 </style>
 <body bgcolor="#FFFFFF" text="#000000" link="#C28400" vlink="#C28400" alink="#C28400" style="margin:0px">
diff --git a/src/messenger/webim/styles/default/nochat.tpl b/src/messenger/webim/styles/default/templates/nochat.tpl
similarity index 94%
rename from src/messenger/webim/styles/default/nochat.tpl
rename to src/messenger/webim/styles/default/templates/nochat.tpl
index 2dc491da..b0ee87ee 100644
--- a/src/messenger/webim/styles/default/nochat.tpl
+++ b/src/messenger/webim/styles/default/templates/nochat.tpl
@@ -8,13 +8,13 @@
 <style>
 #header{
 	height:50px;
-	background:url(${tplroot}/bg_domain.gif) repeat-x top;
+	background:url(${tplroot}/images/bg_domain.gif) repeat-x top;
 	background-color:#5AD66B;
 	width:99.6%;
 	margin:0px 0px 20px 0px;
 }
 #header .mmimg{
-	background:url(${tplroot}/quadrat.gif) bottom left no-repeat;
+	background:url(${tplroot}/images/quadrat.gif) bottom left no-repeat;
 }
 </style>
 <body bgcolor="#FFFFFF" text="#000000" link="#C28400" vlink="#C28400" alink="#C28400" style="margin:0px">
diff --git a/src/messenger/webim/styles/default/redirect.tpl b/src/messenger/webim/styles/default/templates/redirect.tpl
similarity index 94%
rename from src/messenger/webim/styles/default/redirect.tpl
rename to src/messenger/webim/styles/default/templates/redirect.tpl
index c1ba4367..13f22f4d 100644
--- a/src/messenger/webim/styles/default/redirect.tpl
+++ b/src/messenger/webim/styles/default/templates/redirect.tpl
@@ -9,13 +9,13 @@
 <style>
 #header{
 	height:50px;
-	background:url(${tplroot}/bg_domain.gif) repeat-x top;
+	background:url(${tplroot}/images/bg_domain.gif) repeat-x top;
 	background-color:#5AD66B;
 	width:99.6%;
 	margin:0px 0px 20px 0px;
 }
 #header .mmimg{
-	background:url(${tplroot}/quadrat.gif) bottom left no-repeat;
+	background:url(${tplroot}/images/quadrat.gif) bottom left no-repeat;
 }
 .form td{
 	background-color:#f4f4f4;
@@ -24,7 +24,7 @@
 .but{
 	font-family:Verdana !important;
 	font-size:11px;
-	background:url(${tplroot}/butbg.gif) no-repeat top left;
+	background:url(${tplroot}/images/butbg.gif) no-repeat top left;
 	display:block;
 	text-align:center;
 	padding-top:2px;
diff --git a/src/messenger/webim/styles/default/redirected.tpl b/src/messenger/webim/styles/default/templates/redirected.tpl
similarity index 94%
rename from src/messenger/webim/styles/default/redirected.tpl
rename to src/messenger/webim/styles/default/templates/redirected.tpl
index fd50f791..1670ed58 100644
--- a/src/messenger/webim/styles/default/redirected.tpl
+++ b/src/messenger/webim/styles/default/templates/redirected.tpl
@@ -8,13 +8,13 @@
 <style>
 #header{
 	height:50px;
-	background:url(${tplroot}/bg_domain.gif) repeat-x top;
+	background:url(${tplroot}/images/bg_domain.gif) repeat-x top;
 	background-color:#5AD66B;
 	width:99.6%;
 	margin:0px 0px 20px 0px;
 }
 #header .mmimg{
-	background:url(${tplroot}/quadrat.gif) bottom left no-repeat;
+	background:url(${tplroot}/images/quadrat.gif) bottom left no-repeat;
 }
 </style>
 <body bgcolor="#FFFFFF" text="#000000" link="#C28400" vlink="#C28400" alink="#C28400" style="margin:0px">
diff --git a/src/messenger/webim/styles/original/.htaccess b/src/messenger/webim/styles/original/.htaccess
deleted file mode 100644
index 14249c50..00000000
--- a/src/messenger/webim/styles/original/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all
\ No newline at end of file
diff --git a/src/messenger/webim/styles/default/.htaccess b/src/messenger/webim/styles/original/templates/.htaccess
similarity index 100%
rename from src/messenger/webim/styles/default/.htaccess
rename to src/messenger/webim/styles/original/templates/.htaccess
diff --git a/src/messenger/webim/styles/original/agentchat.tpl b/src/messenger/webim/styles/original/templates/agentchat.tpl
similarity index 100%
rename from src/messenger/webim/styles/original/agentchat.tpl
rename to src/messenger/webim/styles/original/templates/agentchat.tpl
diff --git a/src/messenger/webim/styles/original/agentrochat.tpl b/src/messenger/webim/styles/original/templates/agentrochat.tpl
similarity index 100%
rename from src/messenger/webim/styles/original/agentrochat.tpl
rename to src/messenger/webim/styles/original/templates/agentrochat.tpl
diff --git a/src/messenger/webim/styles/original/chat.tpl b/src/messenger/webim/styles/original/templates/chat.tpl
similarity index 100%
rename from src/messenger/webim/styles/original/chat.tpl
rename to src/messenger/webim/styles/original/templates/chat.tpl
diff --git a/src/messenger/webim/styles/original/chatsimple.tpl b/src/messenger/webim/styles/original/templates/chatsimple.tpl
similarity index 100%
rename from src/messenger/webim/styles/original/chatsimple.tpl
rename to src/messenger/webim/styles/original/templates/chatsimple.tpl
diff --git a/src/messenger/webim/styles/original/error.tpl b/src/messenger/webim/styles/original/templates/error.tpl
similarity index 100%
rename from src/messenger/webim/styles/original/error.tpl
rename to src/messenger/webim/styles/original/templates/error.tpl
diff --git a/src/messenger/webim/styles/original/leavemessage.tpl b/src/messenger/webim/styles/original/templates/leavemessage.tpl
similarity index 100%
rename from src/messenger/webim/styles/original/leavemessage.tpl
rename to src/messenger/webim/styles/original/templates/leavemessage.tpl
diff --git a/src/messenger/webim/styles/original/leavemessagesent.tpl b/src/messenger/webim/styles/original/templates/leavemessagesent.tpl
similarity index 100%
rename from src/messenger/webim/styles/original/leavemessagesent.tpl
rename to src/messenger/webim/styles/original/templates/leavemessagesent.tpl
diff --git a/src/messenger/webim/styles/original/mail.tpl b/src/messenger/webim/styles/original/templates/mail.tpl
similarity index 100%
rename from src/messenger/webim/styles/original/mail.tpl
rename to src/messenger/webim/styles/original/templates/mail.tpl
diff --git a/src/messenger/webim/styles/original/mailsent.tpl b/src/messenger/webim/styles/original/templates/mailsent.tpl
similarity index 100%
rename from src/messenger/webim/styles/original/mailsent.tpl
rename to src/messenger/webim/styles/original/templates/mailsent.tpl
diff --git a/src/messenger/webim/styles/original/nochat.tpl b/src/messenger/webim/styles/original/templates/nochat.tpl
similarity index 100%
rename from src/messenger/webim/styles/original/nochat.tpl
rename to src/messenger/webim/styles/original/templates/nochat.tpl
diff --git a/src/messenger/webim/styles/original/redirect.tpl b/src/messenger/webim/styles/original/templates/redirect.tpl
similarity index 100%
rename from src/messenger/webim/styles/original/redirect.tpl
rename to src/messenger/webim/styles/original/templates/redirect.tpl
diff --git a/src/messenger/webim/styles/original/redirected.tpl b/src/messenger/webim/styles/original/templates/redirected.tpl
similarity index 100%
rename from src/messenger/webim/styles/original/redirected.tpl
rename to src/messenger/webim/styles/original/templates/redirected.tpl