Index: binary-improvements2/WebServer/src/UrlHandlers/ApiHandler.cs
===================================================================
--- binary-improvements2/WebServer/src/UrlHandlers/ApiHandler.cs	(revision 394)
+++ binary-improvements2/WebServer/src/UrlHandlers/ApiHandler.cs	(revision 399)
@@ -64,5 +64,5 @@
 			
 			if (!apis.TryGetValue (apiName, out AbsWebAPI api)) {
-				Log.Out ($"Error in {nameof(ApiHandler)}.HandleRequest(): No handler found for API \"{apiName}\"");
+				Log.Warning ($"[Web] In {nameof(ApiHandler)}.HandleRequest(): No handler found for API \"{apiName}\"");
 				_context.Response.StatusCode = (int) HttpStatusCode.NotFound;
 				return;
@@ -85,5 +85,5 @@
 				apiHandlerSampler.End ();
 			} catch (Exception e) {
-				Log.Error ($"Error in {nameof(ApiHandler)}.HandleRequest(): Handler {api.Name} threw an exception:");
+				Log.Error ($"[Web] In {nameof(ApiHandler)}.HandleRequest(): Handler {api.Name} threw an exception:");
 				Log.Exception (e);
 				_context.Response.StatusCode = (int) HttpStatusCode.InternalServerError;
Index: binary-improvements2/WebServer/src/UrlHandlers/ItemIconHandler.cs
===================================================================
--- binary-improvements2/WebServer/src/UrlHandlers/ItemIconHandler.cs	(revision 394)
+++ binary-improvements2/WebServer/src/UrlHandlers/ItemIconHandler.cs	(revision 399)
@@ -28,5 +28,5 @@
 			if (!loaded) {
 				_context.Response.StatusCode = (int) HttpStatusCode.InternalServerError;
-				Log.Out ("Web:IconHandler: Icons not loaded");
+				Log.Out ("[Web] IconHandler: Icons not loaded");
 				return;
 			}
@@ -45,5 +45,5 @@
 				_context.Response.StatusCode = (int) HttpStatusCode.NotFound;
 				if (logMissingFiles) {
-					Log.Out ("Web:IconHandler:FileNotFound: \"" + _context.RequestPath + "\" ");
+					Log.Out ("[Web] IconHandler: FileNotFound: \"" + _context.RequestPath + "\" ");
 				}
 			}
@@ -83,5 +83,5 @@
 					loadIconsFromFolder (GameIO.GetGameDir ("Data/ItemIcons"), tintedIcons);
 				} catch (Exception e) {
-					Log.Error ("Failed loading icons from base game");
+					Log.Error ("[Web] Failed loading icons from base game");
 					Log.Exception (e);
 				}
@@ -93,5 +93,5 @@
 						loadIconsFromFolder (modIconsPath, tintedIcons);
 					} catch (Exception e) {
-						Log.Error ("Failed loading icons from mod " + mod.ModInfo.Name.Value);
+						Log.Error ("[Web] Failed loading icons from mod " + mod.ModInfo.Name.Value);
 						Log.Exception (e);
 					}
@@ -99,5 +99,5 @@
 
 				loaded = true;
-				Log.Out ("Web:IconHandler: Icons loaded - {0} ms", microStopwatch.ElapsedMilliseconds);
+				Log.Out ("[Web] IconHandler: Icons loaded - {0} ms", microStopwatch.ElapsedMilliseconds);
 
 				return true;
Index: binary-improvements2/WebServer/src/UrlHandlers/SessionHandler.cs
===================================================================
--- binary-improvements2/WebServer/src/UrlHandlers/SessionHandler.cs	(revision 394)
+++ binary-improvements2/WebServer/src/UrlHandlers/SessionHandler.cs	(revision 399)
@@ -70,5 +70,5 @@
 					WebConnection con = connectionHandler.LogIn (id, _context.Request.RemoteEndPoint.Address);
 					int level = GameManager.Instance.adminTools.GetUserPermissionLevel (con.UserId);
-					Log.Out ("Steam OpenID login from {0} with ID {1}, permission level {2}",
+					Log.Out ("[Web] Steam OpenID login from {0} with ID {1}, permission level {2}",
 						remoteEndpointString, con.UserId, level);
 
@@ -85,9 +85,9 @@
 				}
 			} catch (Exception e) {
-				Log.Error ("Error validating login:");
+				Log.Error ("[Web] Error validating Steam login:");
 				Log.Exception (e);
 			}
 
-			Log.Out ($"Steam OpenID login failed from {remoteEndpointString}");
+			Log.Out ($"[Web] Steam OpenID login failed from {remoteEndpointString}");
 			_context.Response.Redirect (pageErrorPath + "SteamLoginFailed");
 		}
Index: binary-improvements2/WebServer/src/UrlHandlers/SseHandler.cs
===================================================================
--- binary-improvements2/WebServer/src/UrlHandlers/SseHandler.cs	(revision 394)
+++ binary-improvements2/WebServer/src/UrlHandlers/SseHandler.cs	(revision 399)
@@ -58,5 +58,5 @@
 
 			if (!events.TryGetValue (eventName, out AbsEvent eventInstance)) {
-				Log.Out ($"Error in {nameof (SseHandler)}.HandleRequest(): No handler found for event \"{eventName}\"");
+				Log.Warning ($"[Web] [SSE] In {nameof (SseHandler)}.HandleRequest(): No handler found for event \"{eventName}\"");
 				_context.Response.StatusCode = (int)HttpStatusCode.NotFound;
 				return;
@@ -81,5 +81,5 @@
 				_context.Response.OutputStream.Flush ();
 			} catch (Exception e) {
-				Log.Error ($"Error in {nameof (SseHandler)}.HandleRequest(): Handler {eventInstance.Name} threw an exception:");
+				Log.Error ($"[Web] [SSE] In {nameof (SseHandler)}.HandleRequest(): Handler {eventInstance.Name} threw an exception:");
 				Log.Exception (e);
 				_context.Response.StatusCode = (int)HttpStatusCode.InternalServerError;
@@ -99,5 +99,5 @@
 						eventHandler.ProcessSendQueue ();
 					} catch (Exception e) {
-						Log.Error ($"SSE ({eventName}): Error processing send queue");
+						Log.Error ($"[Web] [SSE] '{eventName}': Error processing send queue");
 						Log.Exception (e);
 					}
Index: binary-improvements2/WebServer/src/UrlHandlers/StaticHandler.cs
===================================================================
--- binary-improvements2/WebServer/src/UrlHandlers/StaticHandler.cs	(revision 394)
+++ binary-improvements2/WebServer/src/UrlHandlers/StaticHandler.cs	(revision 399)
@@ -28,5 +28,5 @@
 				_context.Response.StatusCode = (int) HttpStatusCode.NotFound;
 				if (logMissingFiles) {
-					Log.Out ("Web:Static:FileNotFound: \"" + _context.RequestPath + "\" @ \"" + datapath + fn + "\"");
+					Log.Warning ("[Web] Static: FileNotFound: \"" + _context.RequestPath + "\" @ \"" + datapath + fn + "\"");
 				}
 			}