Index: /binary-improvements/7dtd-server-fixes/src/API.cs
===================================================================
--- /binary-improvements/7dtd-server-fixes/src/API.cs	(revision 266)
+++ /binary-improvements/7dtd-server-fixes/src/API.cs	(revision 267)
@@ -28,6 +28,6 @@
 		}
 
-		public override bool ChatMessage (ClientInfo _cInfo, string _message, string _playerName) {
-			return ChatHookExample.Hook (_cInfo, _message, _playerName);
+		public override bool ChatMessage (ClientInfo _cInfo, EnumGameMessages _type, string _msg, string _mainName, bool _localizeMain, string _secondaryName, bool _localizeSecondary) {
+			return ChatHookExample.Hook (_cInfo, _type, _msg, _mainName);
 		}
 	}
Index: /binary-improvements/7dtd-server-fixes/src/ChatHookExample.cs
===================================================================
--- /binary-improvements/7dtd-server-fixes/src/ChatHookExample.cs	(revision 266)
+++ /binary-improvements/7dtd-server-fixes/src/ChatHookExample.cs	(revision 267)
@@ -4,17 +4,12 @@
 {
 	public class ChatHookExample {
-		private const string BBFILTER = "[ffffffff][/url][/b][/i][/u][/s][/sub][/sup][ff]";
 		private const string ANSWER = "     [ff0000]I[-] [ff7f00]W[-][ffff00]A[-][80ff00]S[-] [00ffff]H[-][0080ff]E[-][0000ff]R[-][8b00ff]E[-]";
 
-		public static bool Hook (ClientInfo _cInfo, string _message, string _playerName) {
+		public static bool Hook (ClientInfo _cInfo, EnumGameMessages _type, string _message, string _playerName) {
 			if (!string.IsNullOrEmpty (_message)) {
-				if (_message.EndsWith (BBFILTER + BBFILTER)) {
-					_message = _message.Remove (_message.Length - 2 * BBFILTER.Length);
-				}
-
 				if (_message.ToLower () == "/alloc") {
 					if (_cInfo != null) {
 						Log.Out ("Sent chat hook reply to {0}", _cInfo.playerId);
-						_cInfo.SendPackage (new NetPackageGameMessage (ANSWER, ""));
+						_cInfo.SendPackage (new NetPackageGameMessage (EnumGameMessages.Chat, ANSWER, "", false, "", false));
 					} else {
 						Log.Error ("Argument _cInfo null on message: {0}", _message);
Index: /binary-improvements/AllocsCommands/Chat.cs
===================================================================
--- /binary-improvements/AllocsCommands/Chat.cs	(revision 266)
+++ /binary-improvements/AllocsCommands/Chat.cs	(revision 267)
@@ -13,5 +13,5 @@
 				senderName = "Server";
 			}
-			_receiver.SendPackage (new NetPackageGameMessage (_message, senderName + " (PM)"));
+			_receiver.SendPackage (new NetPackageGameMessage (EnumGameMessages.Chat, _message, senderName + " (PM)", false, "", false));
 			string receiverName = _receiver.playerName;
 			SdtdConsole.Instance.Output ("Message to player " + (receiverName != null ? "\"" + receiverName + "\"" : "unknownName") + " sent with sender \"" + senderName + "\"");
Index: /binary-improvements/MapRendering/API.cs
===================================================================
--- /binary-improvements/MapRendering/API.cs	(revision 266)
+++ /binary-improvements/MapRendering/API.cs	(revision 267)
@@ -10,4 +10,10 @@
 		}
 
+//		public override void GameStartDone () {
+//			if (AllocsFixes.NetConnections.Servers.Web.Handlers.ItemIconHandler.Instance != null) {
+//				AllocsFixes.NetConnections.Servers.Web.Handlers.ItemIconHandler.Instance.LoadIcons ();
+//			}
+//		}
+
 		public override void CalcChunkColorsDone (Chunk _chunk) {
 			AllocsFixes.MapRendering.MapRendering.RenderSingleChunk (_chunk);
Index: /binary-improvements/MapRendering/Web/Handlers/ItemIconHandler.cs
===================================================================
--- /binary-improvements/MapRendering/Web/Handlers/ItemIconHandler.cs	(revision 266)
+++ /binary-improvements/MapRendering/Web/Handlers/ItemIconHandler.cs	(revision 267)
@@ -9,4 +9,9 @@
 {
 	public class ItemIconHandler : PathHandler {
+		private static ItemIconHandler instance = null;
+		public static ItemIconHandler Instance {
+			get { return instance; }
+		}
+
 		private string staticPart;
 		private bool logMissingFiles;
@@ -17,4 +22,5 @@
 			this.staticPart = staticPart;
 			this.logMissingFiles = logMissingFiles;
+			ItemIconHandler.instance = this;
 		}
 
@@ -47,5 +53,5 @@
 		}
 
-		private bool LoadIcons () {
+		public bool LoadIcons () {
 			lock (icons) {
 				if (loaded) {
Index: /binary-improvements/server-fixes.userprefs
===================================================================
--- /binary-improvements/server-fixes.userprefs	(revision 266)
+++ /binary-improvements/server-fixes.userprefs	(revision 267)
@@ -1,10 +1,10 @@
 <Properties>
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Release_Version" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="MapRendering/ModInfo.xml">
+  <MonoDevelop.Ide.Workbench ActiveDocument="MapRendering/API.cs">
     <Files>
       <File FileName="7dtd-server-fixes/ModInfo.xml" Line="1" Column="1" />
       <File FileName="AllocsCommands/ModInfo.xml" Line="1" Column="1" />
-      <File FileName="MapRendering/ModInfo.xml" Line="21" Column="21" />
-      <File FileName="MapRendering/Web/Web.cs" Line="1" Column="1" />
+      <File FileName="MapRendering/ModInfo.xml" Line="1" Column="1" />
+      <File FileName="MapRendering/Web/Web.cs" Line="10" Column="10" />
       <File FileName="MapRendering/Web/API/ExecuteConsoleCommand.cs" Line="1" Column="1" />
       <File FileName="MapRendering/Web/LogBuffer.cs" Line="1" Column="1" />
@@ -13,6 +13,7 @@
       <File FileName="MapRendering/Web/Handlers/ApiHandler.cs" Line="1" Column="1" />
       <File FileName="MapRendering/Commands/WebTokens.cs" Line="1" Column="1" />
-      <File FileName="AllocsCommands/Commands/TeleportPlayer.cs" Line="63" Column="63" />
-      <File FileName="MapRendering/Web/Handlers/ItemIconHandler.cs" Line="42" Column="42" />
+      <File FileName="AllocsCommands/Commands/TeleportPlayer.cs" Line="1" Column="1" />
+      <File FileName="MapRendering/Web/Handlers/ItemIconHandler.cs" Line="20" Column="20" />
+      <File FileName="MapRendering/API.cs" Line="1" Column="1" />
     </Files>
   </MonoDevelop.Ide.Workbench>