diff --git a/template_2.txt b/template_2.txt
index e34210e..34a4c4f 100644
--- a/template_2.txt
+++ b/template_2.txt
@@ -2,10 +2,10 @@
 txtWelcome|SourceUser = 
 
 # Simple messages
-txtMessage|SourceRoom = <%friendlysender%>:<%Message%>
-txtMe|SourceRoom = <%friendlysender%>:<%Message%>
-txtMes|SourceRoom = <%friendlysender%>:<%Message%>
-txtNarr|SourceRoom = <%friendlysender%>:<%Message%>
+txtMessage|SourceRoom = <%friendlysender%>: <%Message%>
+txtMe|SourceRoom = <%friendlysender%>: <%Message%>
+txtMes|SourceRoom = <%friendlysender%>: <%Message%>
+txtNarr|SourceRoom = <%friendlysender%>: <%Message%>
 txtHelp|SourceUser = <span class="info">Die Hilfe sollte sich in einem neuen Fenster ge&ouml;ffnet haben, wenn nicht, bitte <a href="//austriachat.net/forum/help-8.html" target="_blank">hier klicken</a>.</span><br/><script type="text/javascript">window.open('//austriachat.net/forum/help-8.html',' ','width=600, height=400, resizeable,scrollbars=yes')</script>
 txtMaybeOOC|SourceUser = <span class="info">Hm, thats a lot of OOC, maybe you should join the 'Chitchat' room? Simply enter /j chitchat</span><br/>
 txtOldversion|SourceUser = <span class="info">Achtung! Dein Browser ist veraltet und versteht womoglich nicht die aktuellen Websocket Protokolle, dies k&ouml;nnte zu zahlreichen Problemen f&uuml;hren. Bitte upgrade oder wechsle deinen Browser.</span><br/>
@@ -25,16 +25,16 @@ txtNotFriend|SourceUser = <span class="info"><span style="color: #<%DestColor%>;
 txtInvalidRoomname|SourceUser = <span class="info">Der Raumname darf keine /, ; oder | enthalten.</span><br/>
 
 # Enter and leave message
-txtEnterChatUser|SourceUser = <%SourceNick%>:ENTERSELF
-txtEnterChat|SourceRoom = <%friendlysender%>:ENTERCHAT
+txtEnterChatUser|SourceUser = <%SourceNick%>: ENTERSELF
+txtEnterChat|SourceRoom = <%friendlysender%>: ENTERCHAT
 txtEnterChatAdmin|SourceUser = <span class="info">Achtung, du bist als Admin eingeloggt!</span><br/>
-txtLeaveChat|SourceUser = <%friendlysender%>:LEAVESELF
-txtLeaveChat|SourceRoom = <%friendlysender%>:LEAVECHAT
-txtLeaveChatWords|SourceRoom = <%friendlysender%>:LEAVECHAT
-txtLeaveChatWords|SourceUser = <%friendlysender%>:LEAVESELF
+txtLeaveChat|SourceUser = <%friendlysender%>: LEAVESELF
+txtLeaveChat|SourceRoom = <%friendlysender%>: LEAVECHAT
+txtLeaveChatWords|SourceRoom = <%friendlysender%>: LEAVECHAT
+txtLeaveChatWords|SourceUser = <%friendlysender%>: LEAVESELF
 
 # Server engine message
-txtServerStop|AllUsers = NONE:SERVERSTOP
+txtServerStop|AllUsers = NONE: SERVERSTOP
 
 # Whispers
 txtWhisper|SourceUser = <span class="info">Du fl&uuml;sterst zu <span class="user_whisper" title="<%friendlyreciever%>" style="color: #<%DestColor%>;"><%friendlyreciever%></span>: <%Message%></span><br/>
@@ -109,8 +109,8 @@ txtInvitedReason|SourceUser = <span class="info">Du hast <span style="color:#<%D
 txtInvitedReason|DestUser = <span class="info">Du wurdest von <span style="color:#<%SourceColor%>;"><%SourceNick%></span> mit den Worten '<%Message%>' in den Raum '<%SourceRoom%>' eingeladen.</span><br/><span class="info">Um die Einladung anzunehmen musst Du /a eintippen.</span><br/>
 
 # Away
-txtAway|SourceRoom = <%friendlysender%>:AWAY
-txtAwayBack|SourceRoom = <%friendlysender%>:BACK
+txtAway|SourceRoom = <%friendlysender%>: AWAY
+txtAwayBack|SourceRoom = <%friendlysender%>: BACK
 
 # Kick
 txtKick|SourceUser = <span class="info"><span style="color:#<%SourceColor%>;"><%SourceNick%></span> wirft <span style="color:#<%DestColor%>;"><%DestNick%></span> in den Raum '<%DestRoom%>'.</span><br/>
@@ -155,7 +155,7 @@ txtMuted|DestRoom = <span class="info"><span style="color:#<%SourceColor%>;"><%S
 txtNiceTry|SourceUser = <span class="info">Netter Versuch. User mit gleichen oder h&ouml;heren Rechten k&ouml;nnen nicht bestraft werden.</span><br/>
 
 # Gag
-txtNoSelfGag|SourceUser = <span class="info">Masochist!? ;-)</span><br/>
+txtNoSelfGag|SourceUser = <span class="info">Masochist!? ;)</span><br/>
 txtGaged|SourceUser = <span class="info">Mit einem Knebel im Mund spricht es sich nicht gut!</span><br/>
 txtGag|SourceUser = <span class="info"><span style="color:#<%SourceColor%>;"><%SourceNick%></span> knebel  <span style="color:#<%DestColor%>;"><%DestNick%></span>.</span><br/>
 txtGag|DestRoom = <span class="info"><span style="color:#<%SourceColor%>;"><%SourceNick%></span> knebelt <span style="color:#<%DestColor%>;"><%DestNick%></span>.</span><br/>