Index: TFP-WebServer/CommandExtensions/ModInfo.xml
===================================================================
--- TFP-WebServer/CommandExtensions/ModInfo.xml	(revision 500)
+++ TFP-WebServer/CommandExtensions/ModInfo.xml	(revision 503)
@@ -5,5 +5,5 @@
 	<Description value="Additional commands for server operation" />
 	<Author value="The Fun Pimps LLC" />
-	<Version value="1.1.0.1" />
+	<Version value="2.0.0.0" />
 	<Website value="" />
 </xml>
Index: TFP-WebServer/CommandExtensions/src/ChatHelpers.cs
===================================================================
--- TFP-WebServer/CommandExtensions/src/ChatHelpers.cs	(revision 500)
+++ TFP-WebServer/CommandExtensions/src/ChatHelpers.cs	(revision 503)
@@ -6,11 +6,14 @@
 				PrivateMessageConnections.SetLastPMSender (_sender, _receiver);
 				senderName = _sender.playerName;
+				
+				_receiver.SendPackage (NetPackageManager.GetPackage<NetPackageChat> ().Setup (EChatType.Whisper, _sender.entityId,
+					_message, null, EMessageSender.SenderIdAsPlayer, GeneratedTextManager.BbCodeSupportMode.SupportedAndAddEscapes));
 			} else {
 				senderName = "Server";
+				
+				_receiver.SendPackage (NetPackageManager.GetPackage<NetPackageChat> ().Setup (EChatType.Whisper, -1,
+					_message, null, EMessageSender.Server, GeneratedTextManager.BbCodeSupportMode.Supported));
 			}
 
-			_receiver.SendPackage (NetPackageManager.GetPackage<NetPackageChat> ().Setup (EChatType.Whisper, -1,
-				$"{senderName} (PM): {_message}", null,
-				EMessageSender.None));
 			string receiverName = _receiver.playerName;
 			receiverName = receiverName != null ? $"\"{receiverName}\"" : "unknownName";
Index: TFP-WebServer/MapRendering/ModInfo.xml
===================================================================
--- TFP-WebServer/MapRendering/ModInfo.xml	(revision 500)
+++ TFP-WebServer/MapRendering/ModInfo.xml	(revision 503)
@@ -5,5 +5,5 @@
 	<Description value="Render the game map to image map tiles as it is uncovered" />
 	<Author value="The Fun Pimps LLC" />
-	<Version value="1.1.0.0" />
+	<Version value="2.0.0.0" />
 	<Website value="" />
 </xml>
Index: TFP-WebServer/MapRendering/src/ModApi.cs
===================================================================
--- TFP-WebServer/MapRendering/src/ModApi.cs	(revision 500)
+++ TFP-WebServer/MapRendering/src/ModApi.cs	(revision 503)
@@ -27,19 +27,25 @@
 		}
 
-		private void GameStartDone () {
+		private ModEvents.EModEventResult GameStartDone (ref ModEvents.SGameStartDoneData _data) {
 			if (!MapRenderer.Enabled) {
-				return;
+				return ModEvents.EModEventResult.Continue;
 			}
 
 			ModEvents.GameShutdown.RegisterHandler (GameShutdown);
 			ModEvents.CalcChunkColorsDone.RegisterHandler (CalcChunkColorsDone);
+
+			return ModEvents.EModEventResult.Continue;
 		}
 
-		private void GameShutdown () {
+		private ModEvents.EModEventResult GameShutdown (ref ModEvents.SGameShutdownData _data) {
 			MapRenderer.Shutdown ();
+
+			return ModEvents.EModEventResult.Continue;
 		}
 
-		private void CalcChunkColorsDone (Chunk _chunk) {
-			MapRenderer.RenderSingleChunk (_chunk);
+		private ModEvents.EModEventResult CalcChunkColorsDone (ref ModEvents.SCalcChunkColorsDoneData _data) {
+			MapRenderer.RenderSingleChunk (_data.Chunk);
+
+			return ModEvents.EModEventResult.Continue;
 		}
 	}
Index: TFP-WebServer/WebServer/ModInfo.xml
===================================================================
--- TFP-WebServer/WebServer/ModInfo.xml	(revision 500)
+++ TFP-WebServer/WebServer/ModInfo.xml	(revision 503)
@@ -5,5 +5,5 @@
 	<Description value="Integrated Webserver for the Web Dashboard and server APIs" />
 	<Author value="The Fun Pimps LLC" />
-	<Version value="1.1.0.4" />
+	<Version value="2.0.0.0" />
 	<Website value="" />
 </xml>
Index: TFP-WebServer/WebServer/src/ModApi.cs
===================================================================
--- TFP-WebServer/WebServer/src/ModApi.cs	(revision 500)
+++ TFP-WebServer/WebServer/src/ModApi.cs	(revision 503)
@@ -18,7 +18,7 @@
 		}
 
-		private void GameStartDone () {
+		private ModEvents.EModEventResult GameStartDone (ref ModEvents.SGameStartDoneData _data) {
 			if (!ConnectionManager.Instance.IsServer) {
-				return;
+				return ModEvents.EModEventResult.Continue;
 			}
 			
@@ -29,8 +29,12 @@
 				ItemIconHandler.Instance.LoadIcons ();
 			}
+
+			return ModEvents.EModEventResult.Continue;
 		}
 
-		private void WorldShuttingDown () {
+		private ModEvents.EModEventResult WorldShuttingDown (ref ModEvents.SWorldShuttingDownData _data) {
 			webInstance?.Disconnect ();
+
+			return ModEvents.EModEventResult.Continue;
 		}
 	}
Index: TFP-WebServer/bin/Mods/TFP_CommandExtensions/ModInfo.xml
===================================================================
--- TFP-WebServer/bin/Mods/TFP_CommandExtensions/ModInfo.xml	(revision 500)
+++ TFP-WebServer/bin/Mods/TFP_CommandExtensions/ModInfo.xml	(revision 503)
@@ -5,5 +5,5 @@
 	<Description value="Additional commands for server operation" />
 	<Author value="The Fun Pimps LLC" />
-	<Version value="1.1.0.1" />
+	<Version value="2.0.0.0" />
 	<Website value="" />
 </xml>
Index: TFP-WebServer/bin/Mods/TFP_MapRendering/ModInfo.xml
===================================================================
--- TFP-WebServer/bin/Mods/TFP_MapRendering/ModInfo.xml	(revision 500)
+++ TFP-WebServer/bin/Mods/TFP_MapRendering/ModInfo.xml	(revision 503)
@@ -5,5 +5,5 @@
 	<Description value="Render the game map to image map tiles as it is uncovered" />
 	<Author value="The Fun Pimps LLC" />
-	<Version value="1.1.0.0" />
+	<Version value="2.0.0.0" />
 	<Website value="" />
 </xml>
Index: TFP-WebServer/bin/Mods/TFP_WebServer/ModInfo.xml
===================================================================
--- TFP-WebServer/bin/Mods/TFP_WebServer/ModInfo.xml	(revision 500)
+++ TFP-WebServer/bin/Mods/TFP_WebServer/ModInfo.xml	(revision 503)
@@ -5,5 +5,5 @@
 	<Description value="Integrated Webserver for the Web Dashboard and server APIs" />
 	<Author value="The Fun Pimps LLC" />
-	<Version value="1.1.0.4" />
+	<Version value="2.0.0.0" />
 	<Website value="" />
 </xml>