diff --git a/CMakeLists.txt b/CMakeLists.txt
index ec0d5b1fb..02c3618de 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,42 +1,24 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 3.10)
-IF(POLICY CMP0074)
-	cmake_policy(SET CMP0074 NEW)
-ENDIF()
 
-#FindMySQL is located here so lets make it so CMake can find it
 SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/" ${CMAKE_MODULE_PATH})
 
-#Our project name is EQEmu
 PROJECT(EQEmu)
 
-#Default build type is set to RelWithDebInfo for generators that honor that like makefiles
 IF(NOT CMAKE_BUILD_TYPE)
 	SET(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Choose the type of build." FORCE)
 ENDIF(NOT CMAKE_BUILD_TYPE)
 
-SET(CMAKE_PREFIX_PATH "${CMAKE_CURRENT_SOURCE_DIR}/dependencies" "${CMAKE_PREFIX_PATH}")
-
 SET(CMAKE_CXX_STANDARD 14)
 SET(CMAKE_CXX_STANDARD_REQUIRED ON)
 SET(CMAKE_CXX_EXTENSIONS OFF)
 
 IF(MSVC)
 	ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
-
-	#crash logging currently only works on windows x86/x64
-	OPTION(EQEMU_ENABLE_CRASH_LOGGING "Enable crash logging" ON)
-	IF(EQEMU_ENABLE_CRASH_LOGGING)
-		ADD_DEFINITIONS(-DCRASH_LOGGING)
-	ENDIF(EQEMU_ENABLE_CRASH_LOGGING)
-
-	OPTION(EQEMU_BUILD_MSVC_MP "Enable build with multiple processes." ON)
-	IF(EQEMU_BUILD_MSVC_MP)
-		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
-	ENDIF(EQEMU_BUILD_MSVC_MP)
-
 	ADD_DEFINITIONS(-DNOMINMAX)
+	ADD_DEFINITIONS(-DCRASH_LOGGING)
+	
+	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
 ELSE(MSVC)
-	#Normally set by perl but we don't use the perl flags anymore so we set it.
 	ADD_DEFINITIONS(-DHAS_UNION_SEMUN)
 ENDIF(MSVC)
 
@@ -53,35 +35,13 @@ IF(UNIX)
 	ENDIF(CMAKE_SYSTEM_NAME MATCHES "Darwin")
 ENDIF(UNIX)
 
-#NPC Types Cache Behavior
-OPTION(EQEMU_DEPOP_INVALIDATES_CACHE "#repop invalidates the npc_types cache (will cause a larger database hit on #repop but is more convienent)." ON)
-
-#Bots are a compile time option so on/off
-OPTION(EQEMU_ENABLE_BOTS "Enable Bots" OFF)
-
-#Enable GM Command log system
-OPTION(EQEMU_COMMANDS_LOGGING "Enable GM Command logs" ON)
-
-IF(EQEMU_COMMANDS_LOGGING)
-	ADD_DEFINITIONS(-DCOMMANDS_LOGGING)
-ENDIF(EQEMU_COMMANDS_LOGGING)
-
-IF(EQEMU_ENABLE_BOTS)
-	ADD_DEFINITIONS(-DBOTS)
-ENDIF(EQEMU_ENABLE_BOTS)
-
-#What to build
-OPTION(EQEMU_BUILD_SERVER "Build the game server." ON)
-OPTION(EQEMU_BUILD_HC "Build the headless client." OFF)
-OPTION(EQEMU_BUILD_TESTS "Build utility tests." OFF)
-OPTION(EQEMU_BUILD_CLIENT_FILES "Build Client Import/Export Data Programs." ON)
-
 ADD_DEFINITIONS(-DGLM_FORCE_RADIANS)
 ADD_DEFINITIONS(-DGLM_FORCE_CTOR_INIT)
 ADD_DEFINITIONS(-DGLM_ENABLE_EXPERIMENTAL)
 
 #Find everything we need
-FIND_PACKAGE(MySQL REQUIRED)
+FIND_PACKAGE(MySQL)
+FIND_PACKAGE(MariaDB)
 FIND_PACKAGE(Boost REQUIRED)
 FIND_PACKAGE(ZLIB)
 FIND_PACKAGE(OpenSSL)
@@ -94,18 +54,24 @@ MESSAGE(STATUS "**************************************************")
 MESSAGE(STATUS "* Library Detection                              *")
 MESSAGE(STATUS "**************************************************")
 
+IF(MYSQL_FOUND)
+	MESSAGE(STATUS "* MySQL:                                   FOUND *")
+ELSE()
+	MESSAGE(STATUS "* MySQL:                                 MISSING *")
+ENDIF()
+
+IF(MARIADB_FOUND)
+	MESSAGE(STATUS "* MariaDB:                                 FOUND *")
+ELSE()
+	MESSAGE(STATUS "* MariaDB:                               MISSING *")
+ENDIF()
+
 IF(ZLIB_FOUND)
 	MESSAGE(STATUS "* ZLIB:                                    FOUND *")
 ELSE()
 	MESSAGE(STATUS "* ZLIB:                                  MISSING *")
 ENDIF()
 
-IF(OpenSSL_FOUND)
-	MESSAGE(STATUS "* OpenSSL:                                 FOUND *")
-ELSE()
-	MESSAGE(STATUS "* OpenSSL:                               MISSING *")
-ENDIF()
-
 IF(Lua51_FOUND)
 	MESSAGE(STATUS "* Lua:                                     FOUND *")
 ELSE()
@@ -124,6 +90,12 @@ ELSE()
 	MESSAGE(STATUS "* libsodium:                             MISSING *")
 ENDIF()
 
+IF(OpenSSL_FOUND)
+	MESSAGE(STATUS "* OpenSSL:                                 FOUND *")
+ELSE()
+	MESSAGE(STATUS "* OpenSSL:                               MISSING *")
+ENDIF()
+
 IF(MBEDTLS_FOUND)
 	MESSAGE(STATUS "* mbedTLS:                                 FOUND *")
 ELSE()
@@ -132,7 +104,171 @@ ENDIF()
 
 MESSAGE(STATUS "**************************************************")
 
-SET(SERVER_LIBS common debug ${MySQL_LIBRARY_DEBUG} optimized ${MySQL_LIBRARY_RELEASE} ${Boost_LIBRARIES} uv_a fmt RecastNavigation::Detour)
+#options
+OPTION(EQEMU_DEPOP_INVALIDATES_CACHE "#repop invalidates the npc_types cache (will cause a larger database hit on #repop but is more convienent)." ON)
+OPTION(EQEMU_ENABLE_BOTS "Enable Bots" OFF)
+OPTION(EQEMU_COMMANDS_LOGGING "Enable GM Command logs" ON)
+OPTION(EQEMU_BUILD_SERVER "Build the game server." ON)
+OPTION(EQEMU_BUILD_HC "Build the headless client." OFF)
+OPTION(EQEMU_BUILD_TESTS "Build utility tests." OFF)
+OPTION(EQEMU_BUILD_CLIENT_FILES "Build Client Import/Export Data Programs." ON)
+
+IF(EQEMU_COMMANDS_LOGGING)
+	ADD_DEFINITIONS(-DCOMMANDS_LOGGING)
+ENDIF(EQEMU_COMMANDS_LOGGING)
+
+IF(EQEMU_ENABLE_BOTS)
+	ADD_DEFINITIONS(-DBOTS)
+ENDIF(EQEMU_ENABLE_BOTS)
+
+#database
+#prefer mariadb to mysql (arbitrary)
+IF(MySQL_FOUND AND MariaDB_FOUND)
+	SET(DATABASE_LIBRARY_TYPE "MariaDB")
+	SET(DATABASE_LIBRARY_LIBS ${MariaDB_LIBRARIES})
+	SET(DATABASE_LIBRARY_INCLUDE ${MariaDB_INCLUDE_DIR})
+ELSEIF(MariaDB_FOUND)
+	SET(DATABASE_LIBRARY_TYPE "MariaDB")
+	SET(DATABASE_LIBRARY_LIBS ${MariaDB_LIBRARIES})
+	SET(DATABASE_LIBRARY_INCLUDE ${MariaDB_INCLUDE_DIR})
+ELSEIF(MySQL_FOUND)
+	SET(DATABASE_LIBRARY_TYPE "  MySQL")
+	SET(DATABASE_LIBRARY_LIBS ${MySQL_LIBRARIES})
+	SET(DATABASE_LIBRARY_INCLUDE ${MySQL_INCLUDE_DIR})
+ELSE()
+	MESSAGE(FATAL_ERROR "One of MySQL or MariaDB is a required dependency.")
+ENDIF()
+
+#security
+#prefer openssl to mbedtls (arbitrary)
+IF(OpenSSL_FOUND AND MBEDTLS_FOUND)
+	SET(SSL_LIBRARY_TYPE " OpenSSL")
+	SET(SSL_LIBRARY_ENABLED ON)
+	SET(SSL_LIBRARY_LIBS ${OPENSSL_LIBRARIES})
+	SET(SSL_LIBRARY_INCLUDE ${OPENSSL_INCLUDE_DIR})
+ELSEIF(OpenSSL_FOUND)
+	SET(SSL_LIBRARY_TYPE " OpenSSL")
+	SET(SSL_LIBRARY_ENABLED ON)
+	SET(SSL_LIBRARY_LIBS ${OPENSSL_LIBRARIES})
+	SET(SSL_LIBRARY_INCLUDE ${OPENSSL_INCLUDE_DIR})
+ELSEIF(MBEDTLS_FOUND)
+	SET(SSL_LIBRARY_TYPE " mbedTLS")
+	SET(SSL_LIBRARY_ENABLED ON)
+	SET(SSL_LIBRARY_LIBS ${MBEDTLS_LIBRARY} ${MBEDX509_LIBRARY} ${MBEDCRYPTO_LIBRARY})
+	SET(SSL_LIBRARY_INCLUDE ${MBEDTLS_INCLUDE_DIR})
+ELSE()
+	SET(SSL_LIBRARY_TYPE "Disabled")
+	SET(SSL_LIBRARY_ENABLED OFF)
+ENDIF()
+
+IF(SODIUM_FOUND)
+	SET(SODIUM_LIBRARY_TYPE "Libsodium")
+	SET(SODIUM_LIBRARY_ENABLED ON)
+	SET(SODIUM_LIBRARY_LIBS ${SODIUM_LIBRARIES})
+	SET(SODIUM_LIBRARY_INCLUDE ${SODIUM_INCLUDE_DIRS})
+	ADD_DEFINITIONS(-DENABLE_SECURITY)
+ELSE()
+	SET(SODIUM_LIBRARY_TYPE " Disabled")
+	SET(SODIUM_LIBRARY_ENABLED OFF)
+ENDIF()
+
+IF(Lua51_FOUND)
+	SET(LUA_LIBRARY_TYPE " Lua 5.1")
+	SET(LUA_LIBRARY_LIBS ${LUA_LIBRARY} luabind)
+	SET(LUA_LIBRARY_INCLUDE ${LUA_INCLUDE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/libs/luabind")
+	
+	OPTION(EQEMU_BUILD_LUA "Build Lua parser." ON)
+	IF(EQEMU_BUILD_LUA)
+		ADD_DEFINITIONS(-DLUA_EQEMU)
+		OPTION(EQEMU_SANITIZE_LUA_LIBS "Sanitize Lua Libraries (Remove OS and IO standard libraries from being able to run)." ON)
+		IF(EQEMU_SANITIZE_LUA_LIBS)
+			ADD_DEFINITIONS(-DSANITIZE_LUA_LIBS)
+		ENDIF()
+	ENDIF()
+ELSE()
+	SET(LUA_LIBRARY_TYPE "Disabled")
+ENDIF()
+
+IF(PerlLibs_FOUND)
+	SET(PERL_LIBRARY_TYPE "    Perl")
+	SET(PERL_LIBRARY_LIBS ${PERL_LIBRARY})
+	SET(PERL_LIBRARY_INCLUDE ${PERL_INCLUDE_PATH})
+	
+	OPTION(EQEMU_BUILD_PERL "Build Perl parser." ON)
+	IF(EQEMU_BUILD_PERL)
+		ADD_DEFINITIONS(-DEMBPERL)
+		ADD_DEFINITIONS(-DEMBPERL_PLUGIN)
+	ENDIF()
+ELSE()
+	SET(PERL_LIBRARY_TYPE "Disabled")
+ENDIF()
+
+#use zlib if exists
+IF(ZLIB_FOUND)
+	OPTION(EQEMU_BUILD_ZLIB "Build internal version of zlib." OFF)
+	IF(EQEMU_BUILD_ZLIB)
+		SET(ZLIB_LIBRARY_TYPE "zlib-ng")
+		SET(ZLIB_LIBRARY_LIBS "zlibstatic")
+		SET(ZLIB_LIBRARY_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/submodules/zlibng")
+	ELSE()
+		SET(ZLIB_LIBRARY_TYPE "  zlib")
+		SET(ZLIB_LIBRARY_LIBS ${ZLIB_LIBRARY})
+		SET(ZLIB_LIBRARY_INCLUDE ${ZLIB_INCLUDE_DIRS})
+	ENDIF()
+ELSE()
+	SET(ZLIB_LIBRARY_TYPE "zlib-ng")
+	SET(ZLIB_LIBRARY_LIBS "zlibstatic")
+	SET(ZLIB_LIBRARY_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/submodules/zlibng")
+ENDIF()
+
+MESSAGE(STATUS "")
+MESSAGE(STATUS "**************************************************")
+MESSAGE(STATUS "* Library Usage                                  *")
+MESSAGE(STATUS "**************************************************")
+MESSAGE(STATUS "* Database:                              ${DATABASE_LIBRARY_TYPE} *")
+MESSAGE(STATUS "* TLS:                                  ${SSL_LIBRARY_TYPE} *")
+MESSAGE(STATUS "* Sodium:                              ${SODIUM_LIBRARY_TYPE} *")
+MESSAGE(STATUS "* Lua:                                  ${LUA_LIBRARY_TYPE} *")
+MESSAGE(STATUS "* Perl:                                 ${PERL_LIBRARY_TYPE} *")
+MESSAGE(STATUS "* zlib:                                   ${ZLIB_LIBRARY_TYPE} *")
+MESSAGE(STATUS "**************************************************")
+
+#setup server libs and headers
+SET(SERVER_LIBS common ${DATABASE_LIBRARY_LIBS} ${ZLIB_LIBRARY_LIBS} ${Boost_LIBRARIES} uv_a fmt RecastNavigation::Detour)
+
+INCLUDE_DIRECTORIES(SYSTEM "${DATABASE_LIBRARY_INCLUDE}")
+INCLUDE_DIRECTORIES(SYSTEM "${ZLIB_LIBRARY_INCLUDE}")
+INCLUDE_DIRECTORIES(SYSTEM "${Boost_INCLUDE_DIRS}")
+INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/glm")
+INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/cereal/include")
+INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/fmt/include")
+INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/libuv/include" )
+INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/recastnavigation/DebugUtils/Include")
+INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/recastnavigation/Detour/Include")
+INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/recastnavigation/DetourCrowd/Include")
+INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/recastnavigation/DetourTileCache/Include")
+INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/recastnavigation/Recast/Include")
+INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/websocketpp")
+
+IF(SSL_LIBRARY_ENABLED)
+	SET(SERVER_LIBS ${SERVER_LIBS} ${SSL_LIBRARY_LIBS})
+	INCLUDE_DIRECTORIES(SYSTEM "${SSL_LIBRARY_INCLUDE}")
+ENDIF()
+
+IF(SODIUM_LIBRARY_ENABLED)
+	SET(SERVER_LIBS ${SERVER_LIBS} ${SODIUM_LIBRARY_LIBS})
+	INCLUDE_DIRECTORIES(SYSTEM "${SODIUM_LIBRARY_INCLUDE}")
+ENDIF()
+
+IF(EQEMU_BUILD_LUA)
+	SET(SERVER_LIBS ${SERVER_LIBS} ${LUA_LIBRARY_LIBS})
+	INCLUDE_DIRECTORIES(SYSTEM "${LUA_LIBRARY_INCLUDE}")
+ENDIF()
+
+IF(EQEMU_BUILD_PERL)
+	SET(SERVER_LIBS ${SERVER_LIBS} ${PERL_LIBRARY_LIBS})
+	INCLUDE_DIRECTORIES(SYSTEM "${PERL_LIBRARY_INCLUDE}")
+ENDIF()
 
 IF(WIN32)
 	SET(SERVER_LIBS ${SERVER_LIBS} "ws2_32" "psapi" "iphlpapi" "userenv")
@@ -146,101 +282,10 @@ IF(UNIX)
 	SET(SERVER_LIBS ${SERVER_LIBS} "uuid")
 ENDIF()
 
-IF(ZLIB_FOUND)
-	OPTION(EQEMU_BUILD_ZLIB "Build internal version of zlib." OFF)
-	
-	IF(EQEMU_BUILD_ZLIB)
-		INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/zlibng")
-		SET(SERVER_LIBS ${SERVER_LIBS} "zlibstatic")
-	ELSE()
-		INCLUDE_DIRECTORIES(SYSTEM "${ZLIB_INCLUDE_DIRS}")
-		SET(SERVER_LIBS ${SERVER_LIBS} ${ZLIB_LIBRARY})
-	ENDIF()
-ELSE()
-	INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/zlibng")
-	SET(SERVER_LIBS ${SERVER_LIBS} "zlibstatic")
+IF(EQEMU_BUILD_LOGIN AND NOT SSL_LIBRARY_ENABLED)
+	MESSAGE(FATAL_ERROR "Login server requires a SSL Library to build.")
 ENDIF()
 
-IF(PerlLibs_FOUND)
-	OPTION(EQEMU_BUILD_PERL "Build Perl parser." ON)
-	IF(EQEMU_BUILD_PERL)
-		INCLUDE_DIRECTORIES(SYSTEM "${PERL_INCLUDE_PATH}")
-		SET(SERVER_LIBS ${SERVER_LIBS} "${PERL_LIBRARY}")
-		ADD_DEFINITIONS(-DEMBPERL)
-		ADD_DEFINITIONS(-DEMBPERL_PLUGIN)
-	ENDIF(EQEMU_BUILD_PERL)
-ENDIF()
-
-IF(Lua51_FOUND)
-	OPTION(EQEMU_BUILD_LUA "Build Lua parser." ON)
-	
-	IF(EQEMU_BUILD_LUA)
-		INCLUDE_DIRECTORIES(SYSTEM "${LUA_INCLUDE_DIR}")
-		INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/libs/luabind")
-		SET(SERVER_LIBS ${SERVER_LIBS} "${LUA_LIBRARY}" luabind)
-		ADD_DEFINITIONS(-DLUA_EQEMU)
-		
-		OPTION(EQEMU_SANITIZE_LUA_LIBS "Sanitize Lua Libraries (Remove OS and IO standard libraries from being able to run)." ON)
-		IF(EQEMU_SANITIZE_LUA_LIBS)
-			ADD_DEFINITIONS(-DSANITIZE_LUA_LIBS)
-		ENDIF(EQEMU_SANITIZE_LUA_LIBS)
-	ENDIF(EQEMU_BUILD_LUA)
-ENDIF()
-
-IF(OpenSSL_FOUND OR MBEDTLS_FOUND)
-	OPTION(EQEMU_BUILD_LOGIN "Build the login server." ON)
-	
-	IF(OpenSSL_FOUND AND MBEDTLS_FOUND)
-		SET(EQEMU_CRYPTO_LIB mbedTLS CACHE STRING "Crypto library to use:
-			OpenSSL
-			mbedTLS"
-		)
-		
-		IF(EQEMU_CRYPTO_LIB STREQUAL "OpenSSL")
-			INCLUDE_DIRECTORIES(SYSTEM "${OPENSSL_INCLUDE_DIR}")
-			SET(SERVER_LIBS ${SERVER_LIBS} ${OPENSSL_LIBRARIES})
-			ADD_DEFINITIONS(-DEQEMU_USE_OPENSSL)
-		ELSEIF(EQEMU_CRYPTO_LIB STREQUAL "mbedTLS")
-			INCLUDE_DIRECTORIES(SYSTEM "${MBEDTLS_INCLUDE_DIR}")
-			SET(SERVER_LIBS ${SERVER_LIBS} ${MBEDTLS_LIBRARY} ${MBEDX509_LIBRARY} ${MBEDCRYPTO_LIBRARY})
-			ADD_DEFINITIONS(-DEQEMU_USE_MBEDTLS)
-		ELSE()
-			MESSAGE(FATAL_ERROR "Unknown crypto library set, must be one of these: mbedTLS, OpenSSL")
-		ENDIF()
-		
-	ELSEIF(OpenSSL_FOUND)
-		INCLUDE_DIRECTORIES(SYSTEM "${OPENSSL_INCLUDE_DIR}")
-		SET(SERVER_LIBS ${SERVER_LIBS} ${OPENSSL_LIBRARIES})
-		ADD_DEFINITIONS(-DEQEMU_USE_OPENSSL)
-	ELSEIF(MBEDTLS_FOUND)
-		INCLUDE_DIRECTORIES(SYSTEM "${MBEDTLS_INCLUDE_DIR}")
-		SET(SERVER_LIBS ${SERVER_LIBS} ${MBEDTLS_LIBRARY} ${MBEDX509_LIBRARY} ${MBEDCRYPTO_LIBRARY})
-		ADD_DEFINITIONS(-DEQEMU_USE_MBEDTLS)
-	ENDIF()
-ENDIF()
-
-IF(SODIUM_FOUND AND EQEMU_BUILD_LOGIN)
-	OPTION(EQEMU_ENABLE_SECURITY "Use libsodium for stronger password hashing" ON)
-	IF(EQEMU_ENABLE_SECURITY)
-		INCLUDE_DIRECTORIES(SYSTEM "${SODIUM_INCLUDE_DIRS}")
-		SET(SERVER_LIBS ${SERVER_LIBS} ${SODIUM_LIBRARIES})
-		ADD_DEFINITIONS(-DENABLE_SECURITY)
-	ENDIF()
-ENDIF()
-
-INCLUDE_DIRECTORIES(SYSTEM "${MySQL_INCLUDE_DIR}")
-INCLUDE_DIRECTORIES(SYSTEM "${Boost_INCLUDE_DIRS}")
-INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/glm")
-INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/cereal/include")
-INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/fmt/include")
-INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/libuv/include" )
-INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/recastnavigation/DebugUtils/Include")
-INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/recastnavigation/Detour/Include")
-INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/recastnavigation/DetourCrowd/Include")
-INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/recastnavigation/DetourTileCache/Include")
-INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/recastnavigation/Recast/Include")
-INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/websocketpp")
-
 IF(EQEMU_BUILD_SERVER OR EQEMU_BUILD_LOGIN OR EQEMU_BUILD_TESTS OR EQEMU_BUILD_HC)
 	ADD_SUBDIRECTORY(common)
 	ADD_SUBDIRECTORY(libs)
@@ -258,6 +303,9 @@ IF(EQEMU_BUILD_SERVER OR EQEMU_BUILD_LOGIN OR EQEMU_BUILD_TESTS OR EQEMU_BUILD_H
 	SET(RECASTNAVIGATION_EXAMPLES OFF CACHE BOOL "Build examples")
 	ADD_SUBDIRECTORY(submodules/recastnavigation)
 ENDIF(EQEMU_BUILD_SERVER OR EQEMU_BUILD_LOGIN OR EQEMU_BUILD_TESTS OR EQEMU_BUILD_HC)
+
+MESSAGE(STATUS "Libs: ${SERVER_LIBS}")
+
 IF(EQEMU_BUILD_SERVER)
 	ADD_SUBDIRECTORY(shared_memory)
 	ADD_SUBDIRECTORY(world)
@@ -266,6 +314,7 @@ IF(EQEMU_BUILD_SERVER)
 	ADD_SUBDIRECTORY(queryserv)
 	ADD_SUBDIRECTORY(eqlaunch)
 ENDIF(EQEMU_BUILD_SERVER)
+
 IF(EQEMU_BUILD_LOGIN)
 	ADD_SUBDIRECTORY(loginserver)
 ENDIF(EQEMU_BUILD_LOGIN)
diff --git a/README.md b/README.md
index e1126241c..5e4f919fe 100644
--- a/README.md
+++ b/README.md
@@ -70,3 +70,9 @@ forum, although pull requests will be much quicker and easier on all parties.
   * GPL Perl - GPL / ActiveState (under the assumption that this is a free project)
   * CPPUnit - GLP StringUtilities - Apache
   * LUA - MIT
+
+## Contributors
+
+<a href="https://github.com/EQEmu/server/graphs/contributors">
+  <img src="https://contributors-img.firebaseapp.com/image?repo=EQEmu/server" />
+</a>
diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 000000000..0a653b06f
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,3 @@
+# Security Policy - Reporting Vulnerabilities
+
+When reporting active hacks, exploits and other vulnerabilities, please describe how to reproduce said report and if you can provide context into a possible solution
diff --git a/changelog.txt b/changelog.txt
index dc9d0f16c..84d38df4a 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,26 @@
 EQEMu Changelog (Started on Sept 24, 2003 15:50)
 -------------------------------------------------------
+== 8/16/2019 ==
+Akkadius: Simplified the use of roamboxes and improved the AI for roambox pathing https://i.imgur.com/z33u7y9.gif
+Akkadius: Implemented command #roambox set <box_size> [move_delay]
+Akkadius: Implemented command #roambox remove
+Akkadius: Implemented LUA NPC:SetSimpleRoamBox(box_size, [move_distance], [move_delay]);
+Akkadius: Implemented Perl $npc->SetSimpleRoamBox(box_size, [move_distance], [move_delay]);
+Akkadius: Spawngroup data now hot reloads on #repop
+Akkadius: Command #npceditmass now lists column options when one isn't properly specified
+Akkadius: Implemented command #spawneditmass <search> <option> <value> with options [respawn_time] currently implemented
+
+== 8/11/2019 ==
+Akkadius: Added bulk edit command #npceditmass <column-to-search> <column-search-value> <change-column> <change-value>
+Akkadius: Modified #findzone to include clickable saylinks to both regular zone (if able) and private gmzone instances
+Akkadius: Added #findzone expansion <expansion-number> to show zones via expansion
+
+== 8/6/2019 ==
+Akkadius: Optimizations to movement updates to eliminate ghosting possibilities in larger zones
+
+== 7/22/2019 ==
+Uleat: Added script 'vcxproj_dependencies.py' - a script to help determine conflicting project dependencies (alpha-stage)
+
 == 7/10/2019 ==
 
 Akkadius: Add #npcedit flymode [0 = ground, 1 = flying, 2 = levitate, 3 = water, 4 = floating]
diff --git a/cmake/FindMariaDB.cmake b/cmake/FindMariaDB.cmake
new file mode 100644
index 000000000..14f54734d
--- /dev/null
+++ b/cmake/FindMariaDB.cmake
@@ -0,0 +1,87 @@
+# - Find mariadbclient
+#
+# -*- cmake -*-
+#
+# Find the native MariaDB includes and library
+#
+#	MariaDB_INCLUDE_DIR	- where to find mysql.h, etc.
+#	MariaDB_LIBRARIES		- List of libraries when using MariaDB.
+#	MariaDB_FOUND			- True if MariaDB found.
+#	The following can be used as a hint as to where to search:
+#	MARIADB_ROOT
+
+IF (MariaDB_INCLUDE_DIR AND MariaDB_LIBRARIES)
+	# Already in cache, be silent
+	SET(MariaDB_FIND_QUIETLY TRUE)
+ENDIF (MariaDB_INCLUDE_DIR AND MariaDB_LIBRARIES)
+
+# Include dir
+IF(MARIADB_ROOT)
+	FIND_PATH(MariaDB_INCLUDE_DIR
+		NAMES mariadb_version.h
+		PATHS ${MARIADB_ROOT}/include
+		PATH_SUFFIXES mysql mariadb
+		NO_DEFAULT_PATH
+		NO_SYSTEM_ENVIRONMENT_PATH
+	)
+	FIND_PATH(MariaDB_INCLUDE_DIR
+		NAMES mariadb_version.h
+		PATH_SUFFIXES mysql mariadb
+	)
+ELSE(MARIADB_ROOT)
+	FIND_PATH(MariaDB_INCLUDE_DIR
+		NAMES mariadb_version.h
+		PATH_SUFFIXES mysql mariadb
+	)
+ENDIF(MARIADB_ROOT)
+
+# Library
+SET(MariaDB_NAMES libmariadb)
+IF(MARIADB_ROOT)
+	FIND_LIBRARY(MariaDB_LIBRARY
+		NAMES ${MariaDB_NAMES}
+		PATHS ${MARIADB_ROOT}/lib
+		PATH_SUFFIXES mysql mariadb
+		NO_DEFAULT_PATH
+		NO_SYSTEM_ENVIRONMENT_PATH
+	)
+	
+	FIND_LIBRARY(MariaDB_LIBRARY
+		NAMES ${MariaDB_NAMES}
+		PATH_SUFFIXES mysql mariadb
+	)
+ELSE(MARIADB_ROOT)
+	FIND_LIBRARY(MariaDB_LIBRARY
+		NAMES ${MariaDB_NAMES} mariadbclient_r mariadbclient
+		PATHS /usr/lib /usr/local/lib /usr/lib64 /usr/local/lib64
+		PATH_SUFFIXES mysql mariadb
+	)
+ENDIF(MARIADB_ROOT)
+
+IF (MariaDB_INCLUDE_DIR AND MariaDB_LIBRARY)
+	SET(MariaDB_FOUND TRUE)
+	SET(MariaDB_LIBRARIES ${MariaDB_LIBRARY})
+ELSE (MariaDB_INCLUDE_DIR AND MariaDB_LIBRARY)
+	SET(MariaDB_FOUND FALSE)
+	SET(MariaDB_LIBRARIES)
+ENDIF (MariaDB_INCLUDE_DIR AND MariaDB_LIBRARY)
+
+
+# handle the QUIETLY and REQUIRED arguments and set MariaDB_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(MariaDB DEFAULT_MSG MariaDB_LIBRARY MariaDB_INCLUDE_DIR)
+
+IF(MariaDB_FOUND)
+	SET( MariaDB_LIBRARY_RELEASE ${MariaDB_LIBRARY} )
+	SET( MariaDB_LIBRARY_DEBUG ${MariaDB_LIBRARY} )
+	SET( MariaDB_LIBRARIES ${MariaDB_LIBRARY_RELEASE} ${MariaDB_LIBRARY_DEBUG} )
+ELSE(MariaDB_FOUND)
+	SET( MariaDB_LIBRARIES )
+ENDIF(MariaDB_FOUND)
+
+MARK_AS_ADVANCED(
+	MariaDB_LIBRARY_DEBUG
+	MariaDB_LIBRARY_RELEASE
+	MariaDB_INCLUDE_DIR
+	)
diff --git a/common/base_packet.h b/common/base_packet.h
index e3baf7916..321d65d83 100644
--- a/common/base_packet.h
+++ b/common/base_packet.h
@@ -75,6 +75,7 @@ public:
 	uint32 ReadUInt32() { uint32 value = *(uint32 *)(pBuffer + _rpos); _rpos += sizeof(uint32); return value; }
 	uint32 ReadUInt32(uint32 Offset) const { uint32 value = *(uint32 *)(pBuffer + Offset); return value; }
 	void ReadString(char *str) { uint32 len = static_cast<uint32>(strlen((char *)(pBuffer + _rpos))) + 1; memcpy(str, pBuffer + _rpos, len); _rpos += len; }
+	void ReadString(std::string &str) { str = reinterpret_cast<char *>(pBuffer + _rpos); _rpos += str.length() + 1; }
 	void ReadString(char *str, uint32 Offset, uint32 MaxLength) const;
 
 	uint32 GetWritePosition() { return _wpos; }
diff --git a/common/database.h b/common/database.h
index 1507fcee3..a06a82f3a 100644
--- a/common/database.h
+++ b/common/database.h
@@ -84,6 +84,8 @@ struct VarCache_Struct {
 class PTimerList;
 #	define _ISNAN_(a) std::isnan(a)
 
+#define SQL(...) #__VA_ARGS__
+
 class Database : public DBcore {
 public:
 	Database();
diff --git a/common/database_conversions.cpp b/common/database_conversions.cpp
index 9eac894b4..bcd7d5b38 100644
--- a/common/database_conversions.cpp
+++ b/common/database_conversions.cpp
@@ -476,7 +476,7 @@ bool Database::CheckDatabaseConversions() {
 	CheckDatabaseConvertCorpseDeblob();
 
 	/* Run EQEmu Server script (Checks for database updates) */
-	system("perl eqemu_server.pl ran_from_world");
+	if(system("perl eqemu_server.pl ran_from_world"));
 
 	return true;
 }
diff --git a/common/emu_constants.h b/common/emu_constants.h
index 384aa3768..c6491b3b3 100644
--- a/common/emu_constants.h
+++ b/common/emu_constants.h
@@ -77,6 +77,10 @@ namespace EQEmu
 
 	} // namespace invtype
 
+	namespace DevTools {
+		const int32 GM_ACCOUNT_STATUS_LEVEL = 150;
+	}
+
 	namespace popupresponse {
 		const int32 SERVER_INTERNAL_USE_BASE = 2000000000;
 		const int32 MOB_INFO_DISMISS         = 2000000001;
diff --git a/common/eq_constants.h b/common/eq_constants.h
index d20bfdf4a..6c3e28da0 100644
--- a/common/eq_constants.h
+++ b/common/eq_constants.h
@@ -71,7 +71,7 @@
 //#define AT_Trader 300		// Bazaar Trader Mode (not present in SoF or RoF2)
 
 // animations for AT_Anim
-#define ANIM_FREEZE	102
+#define ANIM_FREEZE	    102
 #define	ANIM_STAND		0x64
 #define	ANIM_SIT		0x6e
 #define	ANIM_CROUCH		0x6f
@@ -87,199 +87,114 @@ typedef enum {
 	_eaMaxAppearance
 } EmuAppearance;
 
-// msg_type's for custom usercolors
-#define MT_Say					256
-#define MT_Tell					257
-#define MT_Group				258
-#define MT_Guild				259
-#define MT_OOC					260
-#define MT_Auction				261
-#define MT_Shout				262
-#define MT_Emote				263
-#define MT_Spells				264
-#define MT_YouHitOther			265
-#define MT_OtherHitsYou			266
-#define MT_YouMissOther			267
-#define MT_OtherMissesYou		268
-#define MT_Broadcasts			269
-#define MT_Skills				270
-#define MT_Disciplines			271
-#define	MT_Unused1				272
-#define MT_DefaultText			273
-#define MT_Unused2				274
-#define MT_MerchantOffer		275
-#define MT_MerchantBuySell		276
-#define	MT_YourDeath			277
-#define MT_OtherDeath			278
-#define MT_OtherHits			279
-#define MT_OtherMisses			280
-#define	MT_Who					281
-#define MT_YellForHelp			282
-#define MT_NonMelee				283
-#define MT_WornOff				284
-#define MT_MoneySplit			285
-#define MT_LootMessages			286
-#define MT_DiceRoll				287
-#define MT_OtherSpells			288
-#define MT_SpellFailure			289
-#define MT_Chat					290
-#define MT_Channel1				291
-#define MT_Channel2				292
-#define MT_Channel3				293
-#define MT_Channel4				294
-#define MT_Channel5				295
-#define MT_Channel6				296
-#define MT_Channel7				297
-#define MT_Channel8				298
-#define MT_Channel9				299
-#define MT_Channel10			300
-#define MT_CritMelee			301
-#define MT_SpellCrits			302
-#define MT_TooFarAway			303
-#define MT_NPCRampage			304
-#define MT_NPCFlurry			305
-#define MT_NPCEnrage			306
-#define MT_SayEcho				307
-#define MT_TellEcho				308
-#define MT_GroupEcho			309
-#define MT_GuildEcho			310
-#define MT_OOCEcho				311
-#define MT_AuctionEcho			312
-#define MT_ShoutECho			313
-#define MT_EmoteEcho			314
-#define MT_Chat1Echo			315
-#define MT_Chat2Echo			316
-#define MT_Chat3Echo			317
-#define MT_Chat4Echo			318
-#define MT_Chat5Echo			319
-#define MT_Chat6Echo			320
-#define MT_Chat7Echo			321
-#define MT_Chat8Echo			322
-#define MT_Chat9Echo			323
-#define MT_Chat10Echo			324
-#define MT_DoTDamage			325
-#define MT_ItemLink				326
-#define MT_RaidSay				327
-#define MT_MyPet				328
-#define MT_DS					329
-#define MT_Leadership			330
-#define MT_PetFlurry			331
-#define MT_PetCrit				332
-#define MT_FocusEffect			333
-#define MT_Experience			334
-#define MT_System				335
-#define MT_PetSpell				336
-#define MT_PetResponse			337
-#define MT_ItemSpeech			338
-#define MT_StrikeThrough		339
-#define MT_Stun					340
+namespace Chat {
+	const uint16 White       = 0;
+	const uint16 DimGray     = 1;
+	const uint16 Default     = 1;
+	const uint16 Green       = 2;
+	const uint16 BrightBlue  = 3;
+	const uint16 LightBlue   = 4;
+	const uint16 Magenta     = 5;
+	const uint16 Gray        = 6;
+	const uint16 LightGray   = 7;
+	const uint16 NPCQuestSay = 10;
+	const uint16 DarkGray    = 12;
+	const uint16 Red         = 13;
+	const uint16 Lime        = 14;
+	const uint16 Yellow      = 15;
+	const uint16 Blue        = 16;
+	const uint16 LightNavy   = 17;
+	const uint16 Cyan        = 18;
+	const uint16 Black       = 20;
 
-// TODO: Really should combine above and below into one
-
-//from showeq
-enum ChatColor
-{
-	/*
-	CC_Default					= 0,
-	CC_DarkGrey					= 1,
-	CC_DarkGreen				= 2,
-	CC_DarkBlue					= 3,
-	CC_Purple					= 5,
-	CC_LightGrey				= 6,
-	*/
-
-	CC_WhiteSmoke				= 0,	// FF|F0F0F0
-	CC_Green					= 2,	// FF|008000
-	CC_BrightBlue				= 3,	// FF|0040FF
-	CC_Magenta					= 5,	// FF|F000F0
-	CC_Gray						= 6,	// FF|808080
-	CC_LightGray				= 7,	// FF|E0E0E0
-	//CC_WhiteSmoke2				= 10,	// FF|F0F0F0
-	CC_DarkGray					= 12,	// FF|A0A0A0
-	CC_Red						= 13,	// FF|F00000
-	CC_Lime						= 14,	// FF|00F000
-	CC_Yellow					= 15,	// FF|F0F000
-	CC_Blue						= 16,	// FF|0000F0
-	CC_LightNavy				= 17,	// FF|0000AF
-	CC_Cyan						= 18,	// FF|00F0F0
-	CC_Black					= 20,	// FF|000000
-	
-	// any index <= 255 that is not defined above
-	CC_DimGray					= 1,	// FF|606060
-	CC_Default					= 1,
-
-	CC_User_Say					= 256,
-	CC_User_Tell				= 257,
-	CC_User_Group				= 258,
-	CC_User_Guild				= 259,
-	CC_User_OOC					= 260,
-	CC_User_Auction				= 261,
-	CC_User_Shout				= 262,
-	CC_User_Emote				= 263,
-	CC_User_Spells				= 264,
-	CC_User_YouHitOther			= 265,
-	CC_User_OtherHitYou			= 266,
-	CC_User_YouMissOther		= 267,
-	CC_User_OtherMissYou		= 268,
-	CC_User_Duels				= 269,
-	CC_User_Skills				= 270,
-	CC_User_Disciplines			= 271,
-	CC_User_Default				= 273,
-	CC_User_MerchantOffer		= 275,
-	CC_User_MerchantExchange	= 276,
-	CC_User_YourDeath			= 277,
-	CC_User_OtherDeath			= 278,
-	CC_User_OtherHitOther		= 279,
-	CC_User_OtherMissOther		= 280,
-	CC_User_Who					= 281,
-	CC_User_Yell				= 282,
-	CC_User_NonMelee			= 283,
-	CC_User_SpellWornOff		= 284,
-	CC_User_MoneySplit			= 285,
-	CC_User_Loot				= 286,
-	CC_User_Random				= 287,
-	CC_User_OtherSpells			= 288,
-	CC_User_SpellFailure		= 289,
-	CC_User_ChatChannel			= 290,
-	CC_User_Chat1				= 291,
-	CC_User_Chat2				= 292,
-	CC_User_Chat3				= 293,
-	CC_User_Chat4				= 294,
-	CC_User_Chat5				= 295,
-	CC_User_Chat6				= 296,
-	CC_User_Chat7				= 297,
-	CC_User_Chat8				= 298,
-	CC_User_Chat9				= 299,
-	CC_User_Chat10				= 300,
-	CC_User_MeleeCrit			= 301,
-	CC_User_SpellCrit			= 302,
-	CC_User_TooFarAway			= 303,
-	CC_User_NPCRampage			= 304,
-	CC_User_NPCFurry			= 305,
-	CC_User_NPCEnrage			= 306,
-	CC_User_EchoSay				= 307,
-	CC_User_EchoTell			= 308,
-	CC_User_EchoGroup			= 309,
-	CC_User_EchoGuild			= 310,
-	CC_User_EchoOOC				= 311,
-	CC_User_EchoAuction			= 312,
-	CC_User_EchoShout			= 313,
-	CC_User_EchoEmote			= 314,
-	CC_User_EchoChat1			= 315,
-	CC_User_EchoChat2			= 316,
-	CC_User_EchoChat3			= 317,
-	CC_User_EchoChat4			= 318,
-	CC_User_EchoChat5			= 319,
-	CC_User_EchoChat6			= 320,
-	CC_User_EchoChat7			= 321,
-	CC_User_EchoChat8			= 322,
-	CC_User_EchoChat9			= 323,
-	CC_User_EchoChat10			= 324,
-	CC_User_UnusedAtThisTime	= 325,
-	CC_User_ItemTags			= 326,
-	CC_User_RaidSay				= 327,
-	CC_User_MyPet				= 328,
-	CC_User_DamageShield		= 329,
+	/**
+	 * User colors
+	 */
+	const uint16 Say              = 256;
+	const uint16 Tell             = 257;
+	const uint16 Group            = 258;
+	const uint16 Guild            = 259;
+	const uint16 OOC              = 260;
+	const uint16 Auction          = 261;
+	const uint16 Shout            = 262;
+	const uint16 Emote            = 263;
+	const uint16 Spells           = 264;
+	const uint16 YouHitOther      = 265;
+	const uint16 OtherHitYou      = 266;
+	const uint16 YouMissOther     = 267;
+	const uint16 OtherMissYou     = 268;
+	const uint16 Broadcasts       = 269;
+	const uint16 Skills           = 270;
+	const uint16 Disciplines      = 271;
+	const uint16 Unused1          = 272;
+	const uint16 DefaultText      = 273;
+	const uint16 Unused2          = 274;
+	const uint16 MerchantOffer    = 275;
+	const uint16 MerchantExchange = 276;
+	const uint16 YourDeath        = 277;
+	const uint16 OtherDeath       = 278;
+	const uint16 OtherHitOther    = 279;
+	const uint16 OtherMissOther   = 280;
+	const uint16 Who              = 281;
+	const uint16 YellForHelp      = 282;
+	const uint16 NonMelee         = 283;
+	const uint16 SpellWornOff     = 284;
+	const uint16 MoneySplit       = 285;
+	const uint16 Loot             = 286;
+	const uint16 DiceRoll         = 287;
+	const uint16 OtherSpells      = 288;
+	const uint16 SpellFailure     = 289;
+	const uint16 ChatChannel      = 290;
+	const uint16 Chat1            = 291;
+	const uint16 Chat2            = 292;
+	const uint16 Chat3            = 293;
+	const uint16 Chat4            = 294;
+	const uint16 Chat5            = 295;
+	const uint16 Chat6            = 296;
+	const uint16 Chat7            = 297;
+	const uint16 Chat8            = 298;
+	const uint16 Chat9            = 299;
+	const uint16 Chat10           = 300;
+	const uint16 MeleeCrit        = 301;
+	const uint16 SpellCrit        = 302;
+	const uint16 TooFarAway       = 303;
+	const uint16 NPCRampage       = 304;
+	const uint16 NPCFlurry        = 305;
+	const uint16 NPCEnrage        = 306;
+	const uint16 EchoSay          = 307;
+	const uint16 EchoTell         = 308;
+	const uint16 EchoGroup        = 309;
+	const uint16 EchoGuild        = 310;
+	const uint16 EchoOOC          = 311;
+	const uint16 EchoAuction      = 312;
+	const uint16 EchoShout        = 313;
+	const uint16 EchoEmote        = 314;
+	const uint16 EchoChat1        = 315;
+	const uint16 EchoChat2        = 316;
+	const uint16 EchoChat3        = 317;
+	const uint16 EchoChat4        = 318;
+	const uint16 EchoChat5        = 319;
+	const uint16 EchoChat6        = 320;
+	const uint16 EchoChat7        = 321;
+	const uint16 EchoChat8        = 322;
+	const uint16 EchoChat9        = 323;
+	const uint16 EchoChat10       = 324;
+	const uint16 DotDamage        = 325;
+	const uint16 ItemLink         = 326;
+	const uint16 RaidSay          = 327;
+	const uint16 MyPet            = 328;
+	const uint16 DamageShield     = 329;
+	const uint16 LeaderShip       = 330;
+	const uint16 PetFlurry        = 331;
+	const uint16 PetCritical      = 332;
+	const uint16 FocusEffect      = 333;
+	const uint16 Experience       = 334;
+	const uint16 System           = 335;
+	const uint16 PetSpell         = 336;
+	const uint16 PetResponse      = 337;
+	const uint16 ItemSpeech       = 338;
+	const uint16 StrikeThrough    = 339;
+	const uint16 Stun             = 340;
 };
 
 //ZoneChange_Struct->success values
@@ -523,4 +438,25 @@ static const uint8 SkillDamageTypes[EQEmu::skills::HIGHEST_SKILL + 1] = // chang
 
 static const uint32 MAX_SPELL_DB_ID_VAL = 65535;
 
+enum ChatChannelNames : uint16
+{
+	ChatChannel_Guild = 0,
+	ChatChannel_Group = 2,
+	ChatChannel_Shout = 3,
+	ChatChannel_Auction = 4,
+	ChatChannel_OOC = 5,
+	ChatChannel_Broadcast = 6,
+	ChatChannel_Tell = 7,
+	ChatChannel_Say = 8,
+	ChatChannel_Petition = 10,
+	ChatChannel_GMSAY = 11,
+	ChatChannel_TellEcho = 14,
+	ChatChannel_Raid = 15,
+
+	ChatChannel_UNKNOWN_Guild = 17,
+	ChatChannel_UNKNOWN_GMSAY = 18,
+	ChatChannel_UCSRelay = 20,
+	ChatChannel_Emotes = 22
+};
+
 #endif /*COMMON_EQ_CONSTANTS_H*/
diff --git a/common/eq_packet_structs.h b/common/eq_packet_structs.h
index c80fdcc02..fb9260857 100644
--- a/common/eq_packet_structs.h
+++ b/common/eq_packet_structs.h
@@ -1188,6 +1188,20 @@ struct SpecialMesg_Struct
 /*24*/	char	message[1];				// What is being said?
 };
 
+struct SpecialMesgHeader_Struct
+{
+/*00*/	char	SpeakMode;				// 2 shouts, 4 %1 %2, 3 %2, 5 tells group, 0 copy, default says
+/*01*/	char	JournalMode;			// 1 and 2 go to journal
+/*02*/	char	language;
+/*03*/	uint32	msg_type;				// Color of text (see MT_*** below)
+/*07*/	uint32	target_spawn_id;		// Who is it being said to?
+/*11*/ // speaker's name
+/*xx*/ // unknown, location, client doesn't care
+/*xx*/ // unknown
+/*xx*/ // unknown
+/*xx*/ // message
+};
+
 /*
 ** When somebody changes what they're wearing or give a pet a weapon (model changes)
 ** Length: 19 Bytes
diff --git a/common/eqemu_logsys.cpp b/common/eqemu_logsys.cpp
index 7181dc7ca..943100350 100644
--- a/common/eqemu_logsys.cpp
+++ b/common/eqemu_logsys.cpp
@@ -81,14 +81,6 @@ namespace Console {
 	};
 }
 
-enum GameChatColor {
-	yellow       = 15,
-	red          = 13,
-	light_green  = 14,
-	light_cyan   = 258,
-	light_purple = 5
-};
-
 /**
  * EQEmuLogSys Constructor
  */
@@ -306,22 +298,22 @@ uint16 EQEmuLogSys::GetGMSayColorFromCategory(uint16 log_category)
 	switch (log_category) {
 		case Logs::Status:
 		case Logs::Normal:
-			return GameChatColor::yellow;
+			return Chat::Yellow;
 		case Logs::MySQLError:
 		case Logs::Error:
-			return GameChatColor::red;
+			return Chat::Red;
 		case Logs::MySQLQuery:
 		case Logs::Debug:
-			return GameChatColor::light_green;
+			return Chat::Lime;
 		case Logs::Quests:
-			return GameChatColor::light_cyan;
+			return Chat::Group;
 		case Logs::Commands:
 		case Logs::Mercenaries:
-			return GameChatColor::light_purple;
+			return Chat::Magenta;
 		case Logs::Crash:
-			return GameChatColor::red;
+			return Chat::Red;
 		default:
-			return GameChatColor::yellow;
+			return Chat::Yellow;
 	}
 }
 
diff --git a/common/net/daybreak_connection.h b/common/net/daybreak_connection.h
index 4d2f62e27..883ecefac 100644
--- a/common/net/daybreak_connection.h
+++ b/common/net/daybreak_connection.h
@@ -257,7 +257,7 @@ namespace EQ
 				resend_delay_min = 150;
 				resend_delay_max = 5000;
 				connect_delay_ms = 500;
-				stale_connection_ms = 90000;
+				stale_connection_ms = 60000;
 				connect_stale_ms = 5000;
 				crc_length = 2;
 				max_packet_size = 512;
@@ -269,7 +269,7 @@ namespace EQ
 				simulated_in_packet_loss = 0;
 				simulated_out_packet_loss = 0;
 				tic_rate_hertz = 60.0;
-				resend_timeout = 90000;
+				resend_timeout = 30000;
 				connection_close_time = 2000;
 				outgoing_data_rate = 0.0;
 			}
diff --git a/common/patches/rof.cpp b/common/patches/rof.cpp
index d7fa21c41..322e187e4 100644
--- a/common/patches/rof.cpp
+++ b/common/patches/rof.cpp
@@ -3199,43 +3199,35 @@ namespace RoF
 		EQApplicationPacket *in = *p;
 		*p = nullptr;
 
-		SpecialMesg_Struct *emu = (SpecialMesg_Struct *)in->pBuffer;
+		SerializeBuffer buf(in->size);
+		buf.WriteInt8(in->ReadUInt8()); // speak mode
+		buf.WriteInt8(in->ReadUInt8()); // journal mode
+		buf.WriteInt8(in->ReadUInt8()); // language
+		buf.WriteInt32(in->ReadUInt32()); // message type
+		buf.WriteInt32(in->ReadUInt32()); // target spawn id
 
-		unsigned char *__emu_buffer = in->pBuffer;
-		// break strlen optimizations!
-		char *message = emu->sayer;
-		auto sayer_length = std::char_traits<char>::length(message);
-		message += sayer_length + 1 + 12; // skip over sayer name, null term, and 3 floats
+		std::string name;
+		in->ReadString(name); // NPC names max out at 63 chars
 
-		std::string old_message = message;
+		buf.WriteString(name);
+
+		buf.WriteInt32(in->ReadUInt32()); // loc
+		buf.WriteInt32(in->ReadUInt32());
+		buf.WriteInt32(in->ReadUInt32());
+
+		std::string old_message;
 		std::string new_message;
 
+		in->ReadString(old_message);
+
 		ServerToRoFSayLink(new_message, old_message);
 
-		//in->size = 3 + 4 + 4 + strlen(emu->sayer) + 1 + 12 + new_message.length() + 1;
-		in->size = sayer_length + new_message.length() + 25;
-		in->pBuffer = new unsigned char[in->size];
+		buf.WriteString(new_message);
 
-		char *OutBuffer = (char *)in->pBuffer;
+		auto outapp = new EQApplicationPacket(OP_SpecialMesg, buf);
 
-		VARSTRUCT_ENCODE_TYPE(uint8, OutBuffer, emu->header[0]);
-		VARSTRUCT_ENCODE_TYPE(uint8, OutBuffer, emu->header[1]);
-		VARSTRUCT_ENCODE_TYPE(uint8, OutBuffer, emu->header[2]);
-
-		VARSTRUCT_ENCODE_TYPE(uint32, OutBuffer, emu->msg_type);
-		VARSTRUCT_ENCODE_TYPE(uint32, OutBuffer, emu->target_spawn_id);
-
-		VARSTRUCT_ENCODE_STRING(OutBuffer, emu->sayer);
-
-		// TODO: figure this shit out
-		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, 0.0f);
-		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, 0.0f);
-		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, 0.0f);
-
-		VARSTRUCT_ENCODE_STRING(OutBuffer, new_message.c_str());
-
-		delete[] __emu_buffer;
-		dest->FastQueuePacket(&in, ack_req);
+		dest->FastQueuePacket(&outapp, ack_req);
+		delete in;
 	}
 
 	ENCODE(OP_Stun)
diff --git a/common/patches/rof2.cpp b/common/patches/rof2.cpp
index 66e699e2a..a6cf7a134 100644
--- a/common/patches/rof2.cpp
+++ b/common/patches/rof2.cpp
@@ -3266,43 +3266,35 @@ namespace RoF2
 		EQApplicationPacket *in = *p;
 		*p = nullptr;
 
-		SpecialMesg_Struct *emu = (SpecialMesg_Struct *)in->pBuffer;
+		SerializeBuffer buf(in->size);
+		buf.WriteInt8(in->ReadUInt8()); // speak mode
+		buf.WriteInt8(in->ReadUInt8()); // journal mode
+		buf.WriteInt8(in->ReadUInt8()); // language
+		buf.WriteInt32(in->ReadUInt32()); // message type
+		buf.WriteInt32(in->ReadUInt32()); // target spawn id
 
-		unsigned char *__emu_buffer = in->pBuffer;
-		// break strlen optimizations!
-		char *message = emu->sayer;
-		auto sayer_length = std::char_traits<char>::length(message);
-		message += sayer_length + 1 + 12; // skip over sayer name, null term, and 3 floats
+		std::string name;
+		in->ReadString(name); // NPC names max out at 63 chars
 
-		std::string old_message = message;
+		buf.WriteString(name);
+
+		buf.WriteInt32(in->ReadUInt32()); // loc
+		buf.WriteInt32(in->ReadUInt32());
+		buf.WriteInt32(in->ReadUInt32());
+
+		std::string old_message;
 		std::string new_message;
 
+		in->ReadString(old_message);
+
 		ServerToRoF2SayLink(new_message, old_message);
 
-		//in->size = 3 + 4 + 4 + strlen(emu->sayer) + 1 + 12 + new_message.length() + 1;
-		in->size = sayer_length + new_message.length() + 25;
-		in->pBuffer = new unsigned char[in->size];
+		buf.WriteString(new_message);
 
-		char *OutBuffer = (char *)in->pBuffer;
+		auto outapp = new EQApplicationPacket(OP_SpecialMesg, buf);
 
-		VARSTRUCT_ENCODE_TYPE(uint8, OutBuffer, emu->header[0]);
-		VARSTRUCT_ENCODE_TYPE(uint8, OutBuffer, emu->header[1]);
-		VARSTRUCT_ENCODE_TYPE(uint8, OutBuffer, emu->header[2]);
-
-		VARSTRUCT_ENCODE_TYPE(uint32, OutBuffer, emu->msg_type);
-		VARSTRUCT_ENCODE_TYPE(uint32, OutBuffer, emu->target_spawn_id);
-
-		VARSTRUCT_ENCODE_STRING(OutBuffer, emu->sayer);
-
-		// TODO: figure this shit out
-		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, 0.0f);
-		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, 0.0f);
-		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, 0.0f);
-
-		VARSTRUCT_ENCODE_STRING(OutBuffer, new_message.c_str());
-
-		delete[] __emu_buffer;
-		dest->FastQueuePacket(&in, ack_req);
+		dest->FastQueuePacket(&outapp, ack_req);
+		delete in;
 	}
 
 	ENCODE(OP_Stun)
diff --git a/common/patches/sod.cpp b/common/patches/sod.cpp
index 2c9d70edf..11aae5cc9 100644
--- a/common/patches/sod.cpp
+++ b/common/patches/sod.cpp
@@ -2069,43 +2069,35 @@ namespace SoD
 		EQApplicationPacket *in = *p;
 		*p = nullptr;
 
-		SpecialMesg_Struct *emu = (SpecialMesg_Struct *)in->pBuffer;
+		SerializeBuffer buf(in->size);
+		buf.WriteInt8(in->ReadUInt8()); // speak mode
+		buf.WriteInt8(in->ReadUInt8()); // journal mode
+		buf.WriteInt8(in->ReadUInt8()); // language
+		buf.WriteInt32(in->ReadUInt32()); // message type
+		buf.WriteInt32(in->ReadUInt32()); // target spawn id
 
-		unsigned char *__emu_buffer = in->pBuffer;
-		// break strlen optimizations!
-		char *message = emu->sayer;
-		auto sayer_length = std::char_traits<char>::length(message);
-		message += sayer_length + 1 + 12; // skip over sayer name, null term, and 3 floats
+		std::string name;
+		in->ReadString(name); // NPC names max out at 63 chars
 
-		std::string old_message = message;
+		buf.WriteString(name);
+
+		buf.WriteInt32(in->ReadUInt32()); // loc
+		buf.WriteInt32(in->ReadUInt32());
+		buf.WriteInt32(in->ReadUInt32());
+
+		std::string old_message;
 		std::string new_message;
 
+		in->ReadString(old_message);
+
 		ServerToSoDSayLink(new_message, old_message);
 
-		//in->size = 3 + 4 + 4 + strlen(emu->sayer) + 1 + 12 + new_message.length() + 1;
-		in->size = sayer_length + new_message.length() + 25;
-		in->pBuffer = new unsigned char[in->size];
+		buf.WriteString(new_message);
 
-		char *OutBuffer = (char *)in->pBuffer;
+		auto outapp = new EQApplicationPacket(OP_SpecialMesg, buf);
 
-		VARSTRUCT_ENCODE_TYPE(uint8, OutBuffer, emu->header[0]);
-		VARSTRUCT_ENCODE_TYPE(uint8, OutBuffer, emu->header[1]);
-		VARSTRUCT_ENCODE_TYPE(uint8, OutBuffer, emu->header[2]);
-
-		VARSTRUCT_ENCODE_TYPE(uint32, OutBuffer, emu->msg_type);
-		VARSTRUCT_ENCODE_TYPE(uint32, OutBuffer, emu->target_spawn_id);
-
-		VARSTRUCT_ENCODE_STRING(OutBuffer, emu->sayer);
-
-		// TODO: figure this shit out
-		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, 0.0f);
-		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, 0.0f);
-		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, 0.0f);
-
-		VARSTRUCT_ENCODE_STRING(OutBuffer, new_message.c_str());
-
-		delete[] __emu_buffer;
-		dest->FastQueuePacket(&in, ack_req);
+		dest->FastQueuePacket(&outapp, ack_req);
+		delete in;
 	}
 
 	ENCODE(OP_Stun)
diff --git a/common/patches/sof.cpp b/common/patches/sof.cpp
index 0b3043c70..bb310a76c 100644
--- a/common/patches/sof.cpp
+++ b/common/patches/sof.cpp
@@ -1116,7 +1116,10 @@ namespace SoF
 		}
 		OUT(deity);
 		OUT(intoxication);
+
 		OUT_array(spellSlotRefresh, spells::SPELL_GEM_COUNT);
+		eq->spellSlotRefresh[9] = 0; // 10th slot is not valid in this release
+
 		OUT(abilitySlotRefresh);
 		OUT(points); // Relocation Test
 		//	OUT(unknown0166[4]);
@@ -1177,7 +1180,10 @@ namespace SoF
 		}
 
 		//	OUT(unknown4184[128]);
+
 		OUT_array(mem_spells, spells::SPELL_GEM_COUNT);
+		eq->mem_spells[9] = 0xFFFFFFFFU; // 10th slot is not valid in this release
+
 		//	OUT(unknown04396[32]);
 		OUT(platinum);
 		OUT(gold);
@@ -1720,43 +1726,35 @@ namespace SoF
 		EQApplicationPacket *in = *p;
 		*p = nullptr;
 
-		SpecialMesg_Struct *emu = (SpecialMesg_Struct *)in->pBuffer;
+		SerializeBuffer buf(in->size);
+		buf.WriteInt8(in->ReadUInt8()); // speak mode
+		buf.WriteInt8(in->ReadUInt8()); // journal mode
+		buf.WriteInt8(in->ReadUInt8()); // language
+		buf.WriteInt32(in->ReadUInt32()); // message type
+		buf.WriteInt32(in->ReadUInt32()); // target spawn id
 
-		unsigned char *__emu_buffer = in->pBuffer;
-		// break strlen optimizations!
-		char *message = emu->sayer;
-		auto sayer_length = std::char_traits<char>::length(message);
-		message += sayer_length + 1 + 12; // skip over sayer name, null term, and 3 floats
+		std::string name;
+		in->ReadString(name);
 
-		std::string old_message = message;
+		buf.WriteString(name);
+
+		buf.WriteInt32(in->ReadUInt32()); // loc
+		buf.WriteInt32(in->ReadUInt32());
+		buf.WriteInt32(in->ReadUInt32());
+
+		std::string old_message;
 		std::string new_message;
 
+		in->ReadString(old_message);
+
 		ServerToSoFSayLink(new_message, old_message);
 
-		//in->size = 3 + 4 + 4 + strlen(emu->sayer) + 1 + 12 + new_message.length() + 1;
-		in->size = sayer_length + new_message.length() + 25;
-		in->pBuffer = new unsigned char[in->size];
+		buf.WriteString(new_message);
 
-		char *OutBuffer = (char *)in->pBuffer;
+		auto outapp = new EQApplicationPacket(OP_SpecialMesg, buf);
 
-		VARSTRUCT_ENCODE_TYPE(uint8, OutBuffer, emu->header[0]);
-		VARSTRUCT_ENCODE_TYPE(uint8, OutBuffer, emu->header[1]);
-		VARSTRUCT_ENCODE_TYPE(uint8, OutBuffer, emu->header[2]);
-
-		VARSTRUCT_ENCODE_TYPE(uint32, OutBuffer, emu->msg_type);
-		VARSTRUCT_ENCODE_TYPE(uint32, OutBuffer, emu->target_spawn_id);
-
-		VARSTRUCT_ENCODE_STRING(OutBuffer, emu->sayer);
-
-		// TODO: figure this shit out
-		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, 0.0f);
-		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, 0.0f);
-		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, 0.0f);
-
-		VARSTRUCT_ENCODE_STRING(OutBuffer, new_message.c_str());
-
-		delete[] __emu_buffer;
-		dest->FastQueuePacket(&in, ack_req);
+		dest->FastQueuePacket(&outapp, ack_req);
+		delete in;
 	}
 
 	ENCODE(OP_Stun)
diff --git a/common/patches/sof_limits.h b/common/patches/sof_limits.h
index 399ff8c1a..a03676f2d 100644
--- a/common/patches/sof_limits.h
+++ b/common/patches/sof_limits.h
@@ -328,7 +328,11 @@ namespace SoF
 
 		const int SPELL_ID_MAX = 15999;
 		const int SPELLBOOK_SIZE = 480;
+		// Be careful not to confuse these two..SoF disc release has a special requirement...
+		// - The number of available spell gems HAS NOT increased from 9 at this point
+		// - The profile allocation HAS increased to 10 at this point
 		const int SPELL_GEM_COUNT = static_cast<uint32>(CastingSlot::MaxGems);
+		const int SPELL_GEM_PROFILE_SIZE = 10; // special case declaration
 		
 		const int LONG_BUFFS = 25;
 		const int SHORT_BUFFS = 15;
diff --git a/common/patches/sof_structs.h b/common/patches/sof_structs.h
index 93b185e23..4d4a591e1 100644
--- a/common/patches/sof_structs.h
+++ b/common/patches/sof_structs.h
@@ -885,7 +885,7 @@ struct PlayerProfile_Struct //23576 Octets
 /*00060*/ BindStruct binds[5];			// Bind points (primary is first)
 /*00160*/ uint32  deity;				// deity
 /*00164*/ uint32  intoxication;			// Alcohol level (in ticks till sober?)
-/*00168*/ uint32  spellSlotRefresh[spells::SPELL_GEM_COUNT]; // Refresh time (millis) - 4 Octets Each
+/*00168*/ uint32  spellSlotRefresh[spells::SPELL_GEM_PROFILE_SIZE]; // Refresh time (millis) - 4 Octets Each
 /*00208*/ uint32  abilitySlotRefresh;
 /*00212*/ uint8   haircolor;			// Player hair color
 /*00213*/ uint8   beardcolor;			// Player beard color
@@ -912,7 +912,7 @@ struct PlayerProfile_Struct //23576 Octets
 /*04173*/ uint8 unknown02264[147];		// was [139]
 /*04312*/ uint32   spell_book[spells::SPELLBOOK_SIZE];	// List of the Spells in spellbook 480 = 60 pages
 /*06232*/ uint8   unknown4184[128];		// was [136]
-/*06396*/ uint32   mem_spells[spells::SPELL_GEM_COUNT]; // List of spells memorized
+/*06396*/ uint32   mem_spells[spells::SPELL_GEM_PROFILE_SIZE]; // List of spells memorized
 /*06436*/ uint8 unknown04396[28];		//#### uint8 unknown04396[32]; in Titanium ####[28]
 /*06464*/ uint32  platinum;				// Platinum Pieces on player
 /*06468*/ uint32  gold;					// Gold Pieces on player
@@ -3768,7 +3768,7 @@ struct AnnoyingZoneUnknown_Struct {
 };
 
 struct LoadSpellSet_Struct {
-	uint32 spell[spells::SPELL_GEM_COUNT];
+	uint32 spell[spells::SPELL_GEM_PROFILE_SIZE];
 	uint32 unknown;
 };
 
diff --git a/common/patches/titanium.cpp b/common/patches/titanium.cpp
index c4bef5bea..d8a115a98 100644
--- a/common/patches/titanium.cpp
+++ b/common/patches/titanium.cpp
@@ -1420,43 +1420,35 @@ namespace Titanium
 		EQApplicationPacket *in = *p;
 		*p = nullptr;
 
-		SpecialMesg_Struct *emu = (SpecialMesg_Struct *)in->pBuffer;
+		SerializeBuffer buf(in->size);
+		buf.WriteInt8(in->ReadUInt8()); // speak mode
+		buf.WriteInt8(in->ReadUInt8()); // journal mode
+		buf.WriteInt8(in->ReadUInt8()); // language
+		buf.WriteInt32(in->ReadUInt32()); // message type
+		buf.WriteInt32(in->ReadUInt32()); // target spawn id
 
-		unsigned char *__emu_buffer = in->pBuffer;
-		// break strlen optimizations!
-		char *message = emu->sayer;
-		auto sayer_length = std::char_traits<char>::length(message);
-		message += sayer_length + 1 + 12; // skip over sayer name, null term, and 3 floats
+		std::string name;
+		in->ReadString(name); // NPC names max out at 63 chars
 
-		std::string old_message = message;
+		buf.WriteString(name);
+
+		buf.WriteInt32(in->ReadUInt32()); // loc
+		buf.WriteInt32(in->ReadUInt32());
+		buf.WriteInt32(in->ReadUInt32());
+
+		std::string old_message;
 		std::string new_message;
 
+		in->ReadString(old_message);
+
 		ServerToTitaniumSayLink(new_message, old_message);
 
-		//in->size = 3 + 4 + 4 + strlen(emu->sayer) + 1 + 12 + new_message.length() + 1;
-		in->size = sayer_length + new_message.length() + 25;
-		in->pBuffer = new unsigned char[in->size];
+		buf.WriteString(new_message);
 
-		char *OutBuffer = (char *)in->pBuffer;
+		auto outapp = new EQApplicationPacket(OP_SpecialMesg, buf);
 
-		VARSTRUCT_ENCODE_TYPE(uint8, OutBuffer, emu->header[0]);
-		VARSTRUCT_ENCODE_TYPE(uint8, OutBuffer, emu->header[1]);
-		VARSTRUCT_ENCODE_TYPE(uint8, OutBuffer, emu->header[2]);
-
-		VARSTRUCT_ENCODE_TYPE(uint32, OutBuffer, emu->msg_type);
-		VARSTRUCT_ENCODE_TYPE(uint32, OutBuffer, emu->target_spawn_id);
-
-		VARSTRUCT_ENCODE_STRING(OutBuffer, emu->sayer);
-
-		// TODO: figure this shit out
-		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, 0.0f);
-		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, 0.0f);
-		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, 0.0f);
-
-		VARSTRUCT_ENCODE_STRING(OutBuffer, new_message.c_str());
-
-		delete[] __emu_buffer;
-		dest->FastQueuePacket(&in, ack_req);
+		dest->FastQueuePacket(&outapp, ack_req);
+		delete in;
 	}
 
 	ENCODE(OP_TaskDescription)
diff --git a/common/patches/uf.cpp b/common/patches/uf.cpp
index 7db0cfb92..b644c9554 100644
--- a/common/patches/uf.cpp
+++ b/common/patches/uf.cpp
@@ -2369,43 +2369,35 @@ namespace UF
 		EQApplicationPacket *in = *p;
 		*p = nullptr;
 
-		SpecialMesg_Struct *emu = (SpecialMesg_Struct *)in->pBuffer;
+		SerializeBuffer buf(in->size);
+		buf.WriteInt8(in->ReadUInt8()); // speak mode
+		buf.WriteInt8(in->ReadUInt8()); // journal mode
+		buf.WriteInt8(in->ReadUInt8()); // language
+		buf.WriteInt32(in->ReadUInt32()); // message type
+		buf.WriteInt32(in->ReadUInt32()); // target spawn id
 
-		unsigned char *__emu_buffer = in->pBuffer;
-		// break strlen optimizations!
-		char *message = emu->sayer;
-		auto sayer_length = std::char_traits<char>::length(message);
-		message += sayer_length + 1 + 12; // skip over sayer name, null term, and 3 floats
+		std::string name;
+		in->ReadString(name); // NPC names max out at 63 chars
 
-		std::string old_message = message;
+		buf.WriteString(name);
+
+		buf.WriteInt32(in->ReadUInt32()); // loc
+		buf.WriteInt32(in->ReadUInt32());
+		buf.WriteInt32(in->ReadUInt32());
+
+		std::string old_message;
 		std::string new_message;
 
+		in->ReadString(old_message);
+
 		ServerToUFSayLink(new_message, old_message);
 
-		//in->size = 3 + 4 + 4 + strlen(emu->sayer) + 1 + 12 + new_message.length() + 1;
-		in->size = sayer_length + new_message.length() + 25;
-		in->pBuffer = new unsigned char[in->size];
+		buf.WriteString(new_message);
 
-		char *OutBuffer = (char *)in->pBuffer;
+		auto outapp = new EQApplicationPacket(OP_SpecialMesg, buf);
 
-		VARSTRUCT_ENCODE_TYPE(uint8, OutBuffer, emu->header[0]);
-		VARSTRUCT_ENCODE_TYPE(uint8, OutBuffer, emu->header[1]);
-		VARSTRUCT_ENCODE_TYPE(uint8, OutBuffer, emu->header[2]);
-
-		VARSTRUCT_ENCODE_TYPE(uint32, OutBuffer, emu->msg_type);
-		VARSTRUCT_ENCODE_TYPE(uint32, OutBuffer, emu->target_spawn_id);
-
-		VARSTRUCT_ENCODE_STRING(OutBuffer, emu->sayer);
-
-		// TODO: figure this shit out
-		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, 0.0f);
-		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, 0.0f);
-		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, 0.0f);
-
-		VARSTRUCT_ENCODE_STRING(OutBuffer, new_message.c_str());
-
-		delete[] __emu_buffer;
-		dest->FastQueuePacket(&in, ack_req);
+		dest->FastQueuePacket(&outapp, ack_req);
+		delete in;
 	}
 
 	ENCODE(OP_Stun)
diff --git a/common/ruletypes.h b/common/ruletypes.h
index 3c9e5d677..cad8f455f 100644
--- a/common/ruletypes.h
+++ b/common/ruletypes.h
@@ -205,6 +205,7 @@ RULE_CATEGORY_END()
 RULE_CATEGORY(GM)
 RULE_INT(GM, MinStatusToSummonItem, 250)
 RULE_INT(GM, MinStatusToZoneAnywhere, 250)
+RULE_INT(GM, MinStatusToLevelTarget, 100)
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(World)
@@ -225,8 +226,6 @@ RULE_BOOL(World, MaxClientsSetByStatus, false) // If True, IP Limiting will be s
 RULE_BOOL(World, EnableIPExemptions, false) // If True, ip_exemptions table is used, if there is no entry for the IP it will default to RuleI(World, MaxClientsPerIP)
 RULE_BOOL(World, ClearTempMerchantlist, true) // Clears temp merchant items when world boots.
 RULE_BOOL(World, DeleteStaleCorpeBackups, true) // Deletes stale corpse backups older than 2 weeks.
-RULE_INT(World, AccountSessionLimit, -1) //Max number of characters allowed on at once from a single account (-1 is disabled)
-RULE_INT(World, ExemptAccountLimitStatus, -1) //Min status required to be exempt from multi-session per account limiting (-1 is disabled)
 RULE_BOOL(World, GMAccountIPList, false) // Check ip list against GM Accounts, AntiHack GM Accounts.
 RULE_INT(World, MinGMAntiHackStatus, 1) //Minimum GM status to check against AntiHack list
 RULE_INT(World, SoFStartZoneID, -1) //Sets the Starting Zone for SoF Clients separate from Titanium Clients (-1 is disabled)
@@ -241,10 +240,11 @@ RULE_BOOL (World, IPLimitDisconnectAll, false)
 RULE_BOOL(World, MaxClientsSimplifiedLogic, false) // New logic that only uses ExemptMaxClientsStatus and MaxClientsPerIP. Done on the loginserver. This mimics the P99-style special IP rules.
 RULE_INT (World, TellQueueSize, 20)
 RULE_BOOL(World, StartZoneSameAsBindOnCreation, true) //Should the start zone ALWAYS be the same location as your bind?
+RULE_BOOL(World, EnforceCharacterLimitAtLogin, false)
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(Zone)
-RULE_INT(Zone, ClientLinkdeadMS, 180000) //the time a client remains link dead on the server after a sudden disconnection
+RULE_INT(Zone, ClientLinkdeadMS, 90000) //the time a client remains link dead on the server after a sudden disconnection
 RULE_INT(Zone, GraveyardTimeMS, 1200000) //ms time until a player corpse is moved to a zone's graveyard, if one is specified for the zone
 RULE_BOOL(Zone, EnableShadowrest, 1) // enables or disables the shadowrest zone feature for player corpses. Default is turned on.
 RULE_BOOL(Zone, UsePlayerCorpseBackups, true) // Keeps backups of player corpses.
diff --git a/common/servertalk.h b/common/servertalk.h
index b942eb547..3ad7c0cc2 100644
--- a/common/servertalk.h
+++ b/common/servertalk.h
@@ -80,6 +80,7 @@
 #define ServerOP_GroupJoin			0x003e //for joining ooz folks
 #define ServerOP_UpdateSpawn		0x003f
 #define ServerOP_SpawnStatusChange	0x0040
+#define ServerOP_DropClient         0x0041	// DropClient
 #define ServerOP_ReloadTasks		0x0060
 #define ServerOP_DepopAllPlayersCorpses	0x0061
 #define ServerOP_ReloadTitles		0x0062
@@ -213,6 +214,15 @@ enum {	QSG_LFGuild_PlayerMatches = 0, QSG_LFGuild_UpdatePlayerInfo, QSG_LFGuild_
 
 #define ServerOP_Speech			0x4513
 
+enum {
+	UserToWorldStatusWorldUnavail = 0,
+	UserToWorldStatusSuccess = 1,
+	UserToWorldStatusSuspended = -1,
+	UserToWorldStatusBanned = -2,
+	UserToWorldStatusWorldAtCapacity = -3,
+	UserToWorldStatusAlreadyOnline = -4
+};
+
 /************ PACKET RELATED STRUCT ************/
 class ServerPacket
 {
@@ -308,11 +318,17 @@ struct ServerZoneIncomingClient_Struct {
 	uint32	accid;
 	int16	admin;
 	uint32	charid;
+	uint32  lsid;
 	bool	tellsoff;
 	char	charname[64];
 	char	lskey[30];
 };
 
+struct ServerZoneDropClient_Struct
+{
+	uint32 lsid;
+};
+
 struct ServerChangeWID_Struct {
 	uint32	charid;
 	uint32	newwid;
@@ -343,7 +359,8 @@ struct ServerChannelMessage_Struct {
 	bool noreply;
 	uint16 chan_num;
 	uint32 guilddbid;
-	uint16 language;
+	uint8 language;
+	uint8 lang_skill;
 	uint8 queued; // 0 = not queued, 1 = queued, 2 = queue full, 3 = offline
 	char message[0];
 };
@@ -856,6 +873,8 @@ struct ServerRaidGroupAction_Struct { //add / remove depends on opcode.
 struct ServerRaidMessage_Struct {
 	uint32 rid;
 	uint32 gid;
+	uint8 language;
+	uint8 lang_skill;
 	char from[64];
 	char message[0];
 };
diff --git a/common/string_util.cpp b/common/string_util.cpp
index c4066ada3..0f39bd41d 100644
--- a/common/string_util.cpp
+++ b/common/string_util.cpp
@@ -27,6 +27,8 @@
 #else
 	#include <stdlib.h>
 	#include <stdio.h>
+#include <iostream>
+
 #endif
 
 #ifndef va_copy
@@ -119,10 +121,29 @@ std::vector<std::string> SplitString(const std::string &str, char delim) {
     while(std::getline(ss, item, delim)) {
         ret.push_back(item);
     }
-	
+
 	return ret;
 }
 
+std::string implode(std::string glue, std::vector<std::string> src)
+{
+	if (src.empty()) {
+		return {};
+	}
+
+	std::ostringstream                 output;
+	std::vector<std::string>::iterator src_iter;
+
+	for (src_iter = src.begin(); src_iter != src.end(); src_iter++) {
+		output << *src_iter << glue;
+	}
+
+	std::string final_output = output.str();
+	final_output.resize (output.str().size () - glue.size());
+
+	return final_output;
+}
+
 std::string EscapeString(const std::string &s) {
 	std::string ret;
 
diff --git a/common/string_util.h b/common/string_util.h
index 03848813c..23a8af05b 100644
--- a/common/string_util.h
+++ b/common/string_util.h
@@ -30,6 +30,7 @@ const std::string ucfirst(std::string s);
 std::vector<std::string> split(std::string str_to_split, char delimiter);
 const std::string StringFormat(const char* format, ...);
 const std::string vStringFormat(const char* format, va_list args);
+std::string implode(std::string glue, std::vector<std::string> src);
 std::vector<std::string> SplitString(const std::string &s, char delim);
 std::string EscapeString(const char *src, size_t sz);
 std::string EscapeString(const std::string &s);
diff --git a/dependencies/.gitignore b/dependencies/.gitignore
deleted file mode 100644
index a0653e77d..000000000
--- a/dependencies/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.*
-*
\ No newline at end of file
diff --git a/libs/zlibng/CMakeLists.txt b/libs/zlibng/CMakeLists.txt
new file mode 100644
index 000000000..9767a00c8
--- /dev/null
+++ b/libs/zlibng/CMakeLists.txt
@@ -0,0 +1,865 @@
+cmake_minimum_required(VERSION 3.5.1)
+if(CMAKE_VERSION VERSION_LESS 3.12)
+  cmake_policy(VERSION ${CMAKE_VERSION})
+else()
+  cmake_policy(VERSION 3.5.1...3.13.2)
+endif()
+
+set(CMAKE_MACOSX_RPATH 1)
+
+# If not specified on the command line, enable C99 as the default
+# Configuration items that affect the global compiler envirionment standards
+# should be issued before the "project" command.
+if(NOT CMAKE_C_STANDARD)
+  set (CMAKE_C_STANDARD 99)          # The C standard whose features are requested to build this target
+endif()
+if(NOT CMAKE_C_STANDARD_REQUIRED)
+  set (CMAKE_C_STANDARD_REQUIRED ON) # Boolean describing whether the value of C_STANDARD is a requirement
+endif()
+if(NOT CMAKE_C_EXTENSIONS)
+  set (CMAKE_C_EXTENSIONS OFF)       # Boolean specifying whether compiler specific extensions are requested
+endif()
+set(VALID_C_STANDARDS "99" "11")
+if(NOT CMAKE_C_STANDARD IN_LIST VALID_C_STANDARDS )
+   MESSAGE(FATAL_ERROR "CMAKE_C_STANDARD:STRING=${CMAKE_C_STANDARD} not in know standards list\n ${VALID_C_STANDARDS}")
+endif()
+
+# Parse the full version number from zlib.h and include in ZLIB_FULL_VERSION
+file(READ ${CMAKE_CURRENT_SOURCE_DIR}/zlib${SUFFIX}.h _zlib_h_contents)
+string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([0-9]+.[0-9]+.[0-9]+).*\".*"
+        "\\1" ZLIB_HEADER_VERSION ${_zlib_h_contents})
+string(REGEX REPLACE ".*#define[ \t]+ZLIBNG_VERSION[ \t]+\"([-0-9A-Za-z.]+)\".*"
+        "\\1" ZLIBNG_HEADER_VERSION ${_zlib_h_contents})
+message(STATUS "ZLIB_HEADER_VERSION: ${ZLIB_HEADER_VERSION}")
+message(STATUS "ZLIBNG_HEADER_VERSION: ${ZLIBNG_HEADER_VERSION}")
+
+project(zlib 
+  VERSION ${ZLIB_HEADER_VERSION}
+  LANGUAGES C)
+
+set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
+set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
+set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers")
+set(INSTALL_MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "Installation directory for manual pages")
+set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/share/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files")
+
+include(CheckTypeSize)
+include(CheckSymbolExists)
+include(CheckFunctionExists)
+include(CheckIncludeFile)
+include(CheckCSourceCompiles)
+include(CheckCSourceRuns)
+include(CMakeDependentOption)
+include(FeatureSummary)
+
+# Make sure we use an appropriate BUILD_TYPE by default, "Release" to be exact
+# this should select the maximum generic optimisation on the current platform (i.e. -O3 for gcc/clang)
+if(NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE "Release" CACHE STRING
+        "Choose the type of build, standard options are: Debug Release RelWithDebInfo MinSizeRel."
+        FORCE)
+    add_feature_info(CMAKE_BUILD_TYPE 1 "Build type: ${CMAKE_BUILD_TYPE} (default)")
+else()
+    add_feature_info(CMAKE_BUILD_TYPE 1 "Build type: ${CMAKE_BUILD_TYPE} (selected)")
+endif()
+
+check_include_file(sys/types.h HAVE_SYS_TYPES_H)
+check_include_file(stdint.h    HAVE_STDINT_H)
+check_include_file(stddef.h    HAVE_STDDEF_H)
+check_include_file(sys/sdt.h   HAVE_SYS_SDT_H)
+
+if(CMAKE_OSX_ARCHITECTURES)
+    # If multiple architectures are requested (universal build), pick only the first
+    list(GET CMAKE_OSX_ARCHITECTURES 0 ARCH)
+else()
+    set(ARCH ${CMAKE_SYSTEM_PROCESSOR})
+endif()
+message(STATUS "Architecture: ${ARCH}")
+if(CMAKE_TOOLCHAIN_FILE)
+    message(STATUS "Using cmake toolchain: ${CMAKE_TOOLCHAIN_FILE}")
+endif()
+
+#
+# Options parsing
+#
+option(WITH_GZFILEOP "Compile with support for gzFile related functions" OFF)
+option(ZLIB_COMPAT "Compile with zlib compatible API" OFF)
+option(ZLIB_ENABLE_TESTS "Build test binaries" ON)
+option(WITH_SANITIZERS "Build with address sanitizer and all supported sanitizers other than memory sanitizer" OFF)
+option(WITH_MSAN "Build with memory sanitizer" OFF)
+option(WITH_FUZZERS "Build test/fuzz" OFF)
+option(WITH_OPTIM "Build with optimisation" ON)
+option(WITH_NEW_STRATEGIES "Use new strategies" ON)
+option(WITH_NATIVE_INSTRUCTIONS
+    "Instruct the compiler to use the full instruction set on this host (gcc/clang -march=native)" OFF)
+if("${ARCH}" MATCHES "arm" OR "${ARCH}" MATCHES "aarch64")
+    option(WITH_ACLE "Build with ACLE CRC" ON)
+    option(WITH_NEON "Build with NEON intrinsics" ON)
+elseif("${ARCH}" MATCHES "s390x")
+    option(WITH_DFLTCC_DEFLATE "Use DEFLATE CONVERSION CALL instruction for compression on IBM Z" OFF)
+    option(WITH_DFLTCC_INFLATE "Use DEFLATE CONVERSION CALL instruction for decompression on IBM Z" OFF)
+endif()
+
+add_feature_info(ZLIB_COMPAT ZLIB_COMPAT "Provide a zlib-compatible API")
+add_feature_info(WITH_GZFILEOP WITH_GZFILEOP "Compile with support for gzFile-related functions")
+add_feature_info(WITH_OPTIM WITH_OPTIM "Build with optimisation")
+add_feature_info(WITH_SANITIZERS WITH_SANITIZERS "Build with address sanitizer and all supported sanitizers other than memory sanitizer")
+add_feature_info(WITH_MSAN WITH_MSAN "Build with memory sanitizer")
+add_feature_info(WITH_FUZZERS WITH_FUZZERS "Build test/fuzz")
+add_feature_info(WITH_NEW_STRATEGIES WITH_NEW_STRATEGIES "Use new strategies")
+if("${ARCH}" MATCHES "arm" OR "${ARCH}" MATCHES "aarch64")
+    add_feature_info(WITH_ACLE WITH_ACLE "Build with ACLE CRC")
+    add_feature_info(WITH_NEON WITH_NEON "Build with NEON intrinsics")
+endif()
+
+if (ZLIB_COMPAT)
+    add_definitions(-DZLIB_COMPAT)
+    set(WITH_GZFILEOP ON)
+    set(LIBNAME1 libz)
+    set(LIBNAME2 zlib)
+    set(SUFFIX "")
+else()
+    set(LIBNAME1 libz-ng)
+    set(LIBNAME2 zlib-ng)
+    set(SUFFIX "-ng")
+endif()
+
+if(WITH_GZFILEOP)
+    add_definitions(-DWITH_GZFILEOP)
+endif()
+
+if(${CMAKE_C_COMPILER} MATCHES "icc" OR ${CMAKE_C_COMPILER} MATCHES "icpc" OR ${CMAKE_C_COMPILER} MATCHES "icl")
+    if(WITH_NATIVE_INSTRUCTIONS)
+        message(STATUS "Ignoring WITH_NATIVE_INSTRUCTIONS; not supported on this configuration")
+    endif()
+    if(CMAKE_HOST_UNIX)
+        if(NOT SSE2FLAG)
+            set(SSE2FLAG "-msse2")
+        endif()
+        if(NOT SSE4FLAG)
+            set(SSE4FLAG "-msse4.2")
+        endif()
+    else()
+        if(NOT SSE2FLAG)
+            set(SSE2FLAG "/arch:SSE2")
+        endif()
+        if(NOT SSE4FLAG)
+            set(SSE4FLAG "/arch:SSE4.2")
+        endif()
+    endif()
+elseif(MSVC)
+    # TODO. ICC can be used through MSVC. I'm not sure if we'd ever see that combination
+    # (who'd use cmake from an IDE...) but checking for ICC before checking for MSVC should
+    # avoid mistakes.
+    # /Oi ?
+    if(NOT ${ARCH} MATCHES "AMD64")
+        set(SSE2FLAG "/arch:SSE2")
+    endif()
+    if("${ARCH}" MATCHES "arm")
+        add_definitions("-D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1")
+        set(NEONFLAG "/arch:VFPv4")
+    endif()
+    if(WITH_NATIVE_INSTRUCTIONS)
+        message(STATUS "Ignoring WITH_NATIVE_INSTRUCTIONS; not supported on this configuration")
+    endif()
+else()
+    # catch all GNU C compilers as well as Clang and AppleClang
+    if(CMAKE_C_COMPILER_ID MATCHES "GNU" OR CMAKE_C_COMPILER_ID MATCHES "Clang")
+        set(__GNUC__ ON)
+    endif()
+    if(WITH_NATIVE_INSTRUCTIONS)
+        if(__GNUC__)
+            set(NATIVEFLAG "-march=native")
+        else()
+            message(STATUS "Ignoring WITH_NATIVE_INSTRUCTIONS; not implemented yet on this configuration")
+        endif()
+    endif()
+    if(__GNUC__ AND "${ARCH}" MATCHES "arm")
+        execute_process(COMMAND ${CMAKE_C_COMPILER} "-dumpmachine"
+                        OUTPUT_VARIABLE GCC_MACHINE)
+        if ("${GCC_MACHINE}" MATCHES "eabihf")
+            set(FLOATABI "-mfloat-abi=hard")
+        else()
+            set(FLOATABI "-mfloat-abi=softfp")
+        endif()
+    endif()
+    if(NOT NATIVEFLAG)
+        if(NOT SSE2FLAG)
+            if(__GNUC__)
+                set(SSE2FLAG "-msse2")
+            endif()
+        endif()
+        if(NOT SSE4FLAG)
+            if(__GNUC__)
+                set(SSE4FLAG "-msse4")
+            endif()
+        endif()
+        if(NOT PCLMULFLAG)
+            if(__GNUC__)
+                set(PCLMULFLAG "-mpclmul")
+            endif()
+        endif()
+        if("${ARCH}" MATCHES "arm")
+            set(ACLEFLAG "-march=armv8-a+crc")
+            set(NEONFLAG "${FLOATABI} -mfpu=neon")
+        elseif("${ARCH}" MATCHES "aarch64")
+            set(ACLEFLAG "-march=armv8-a+crc")
+            set(NEONFLAG "-march=armv8-a+crc+simd")
+        endif()
+    else()
+        set(SSE2FLAG ${NATIVEFLAG})
+        set(SSE4FLAG ${NATIVEFLAG})
+        set(PCLMULFLAG ${NATIVEFLAG})
+        if("${ARCH}" MATCHES "arm")
+            set(ACLEFLAG "${NATIVEFLAG}")
+            set(NEONFLAG "${FLOATABI} -mfpu=neon")
+        elseif("${ARCH}" MATCHES "aarch64")
+            set(ACLEFLAG "${NATIVEFLAG}")
+            set(NEONFLAG "${NATIVEFLAG}")
+        endif()
+    endif()
+endif()
+
+#
+# Check to see if we have large file support
+#
+set(CMAKE_REQUIRED_DEFINITIONS -D_LARGEFILE64_SOURCE=1 -D__USE_LARGEFILE64)
+# We add these other definitions here because CheckTypeSize.cmake
+# in CMake 2.4.x does not automatically do so and we want
+# compatibility with CMake 2.4.x.
+if(HAVE_SYS_TYPES_H)
+    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_SYS_TYPES_H)
+endif()
+if(HAVE_STDINT_H)
+    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDINT_H)
+endif()
+if(HAVE_STDDEF_H)
+    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDDEF_H)
+endif()
+check_type_size(off64_t OFF64_T)
+if(HAVE_OFF64_T)
+   add_definitions(-D_LARGEFILE64_SOURCE=1 -D__USE_LARGEFILE64)
+else()
+   check_type_size(_off64_t _OFF64_T)
+   if(HAVE__OFF64_T)
+      add_definitions(-D_LARGEFILE64_SOURCE=1 -D__USE_LARGEFILE64)
+   else()
+      check_type_size(__off64_t __OFF64_T)
+   endif()
+endif()
+set(CMAKE_REQUIRED_DEFINITIONS) # clear variable
+
+#
+# Check for fseeko and other optional functions
+#
+check_function_exists(fseeko HAVE_FSEEKO)
+if(NOT HAVE_FSEEKO)
+    add_definitions(-DNO_FSEEKO)
+endif()
+check_function_exists(strerror HAVE_STRERROR)
+if(NOT HAVE_STRERROR)
+    add_definitions(-DNO_STRERROR)
+endif()
+
+#
+# Check for unistd.h and stdarg.h
+#
+check_include_file(unistd.h Z_HAVE_UNISTD_H)
+
+if(WITH_SANITIZERS AND WITH_MSAN)
+    message(FATAL_ERROR "Memory sanitizer is incompatible with address sanitizer")
+endif()
+
+if(WITH_MSAN)
+    set(CMAKE_REQUIRED_FLAGS "-fsanitize=memory")
+    check_c_source_compiles("int main() { return 0; }" HAS_MSAN FAIL_REGEX "not supported")
+    if(${HAS_MSAN})
+        set(SANITIZERS_FLAGS "-fsanitize=memory")
+        message(STATUS "Adding memory sanitizer flag: ${SANITIZERS_FLAGS}")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SANITIZERS_FLAGS}")
+    endif()
+endif()
+
+if(WITH_SANITIZERS)
+    set(_sanitize_flags
+        bool
+        address
+        array-bounds
+        float-divide-by-zero
+        function
+        integer-divide-by-zero
+        return
+        shift
+        signed-integer-overflow
+        undefined
+        unsigned-integer-overflow
+        vla-bound
+        vptr
+       )
+    set(SANITIZERS_FLAGS "")
+    foreach(_flag ${_sanitize_flags})
+        set(CMAKE_REQUIRED_FLAGS "-fsanitize=${_flag}")
+        check_c_source_compiles("int main() { return 0; }"
+          HAS_SANITIZER_${_flag} FAIL_REGEX "not supported")
+        if(${HAS_SANITIZER_${_flag}})
+            if("${SANITIZERS_FLAGS}" STREQUAL "")
+                set(SANITIZERS_FLAGS "-fsanitize=${_flag}")
+            else()
+                set(SANITIZERS_FLAGS "${SANITIZERS_FLAGS},${_flag}")
+            endif()
+        endif()
+        set(CMAKE_REQUIRED_FLAGS)
+    endforeach()
+    message(STATUS "Adding sanitizers flags: ${SANITIZERS_FLAGS}")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SANITIZERS_FLAGS}")
+endif()
+
+#
+# Check if we can hide zlib internal symbols that are linked between separate source files using hidden
+#
+check_c_source_compiles(
+    "#define ZLIB_INTERNAL __attribute__((visibility (\"hidden\")))
+    int ZLIB_INTERNAL foo;
+    int main()
+    {
+      return 0;
+    }"
+    HAVE_ATTRIBUTE_VISIBILITY_HIDDEN FAIL_REGEX "not supported")
+if(HAVE_ATTRIBUTE_VISIBILITY_HIDDEN)
+    add_definitions(-DHAVE_HIDDEN)
+endif()
+
+#
+# Check if we can hide zlib internal symbols that are linked between separate source files using internal
+#
+check_c_source_compiles(
+    "#define ZLIB_INTERNAL __attribute__((visibility (\"internal\")))
+    int ZLIB_INTERNAL foo;
+    int main()
+    {
+      return 0;
+    }"
+    HAVE_ATTRIBUTE_VISIBILITY_INTERNAL FAIL_REGEX "not supported")
+if(HAVE_ATTRIBUTE_VISIBILITY_INTERNAL)
+    add_definitions(-DHAVE_INTERNAL)
+endif()
+
+#
+# check for __builtin_ctzl() support in the compiler
+#
+check_c_source_compiles(
+    "int main(void)
+    {
+        unsigned int zero = 0;
+        long test = __builtin_ctzl(zero);
+        (void)test;
+        return 0;
+    }"
+    HAVE_BUILTIN_CTZL
+)
+if(HAVE_BUILTIN_CTZL)
+    add_definitions(-DHAVE_BUILTIN_CTZL)
+endif()
+
+#
+# check for ptrdiff_t support
+#
+check_c_source_compiles(
+    "#include <stddef.h>
+     int main() { ptrdiff_t *a; return 0; }"
+    HAVE_PTRDIFF_T
+)
+if(NOT HAVE_PTRDIFF_T)
+  set(NEED_PTRDIFF_T 1)
+
+  check_type_size("void *" SIZEOF_DATA_PTR)
+  message(STATUS "sizeof(void *) is ${SIZEOF_DATA_PTR} bytes")
+
+  if(${SIZEOF_DATA_PTR} MATCHES "4")
+    set(PTRDIFF_TYPE "uint32_t")
+  elseif(${SIZEOF_DATA_PTR} MATCHES "8")
+    set(PTRDIFF_TYPE "uint64_t")
+  else()
+    message(FATAL_ERROR "sizeof(void *) is neither 32 nor 64 bit")
+  endif()
+endif()
+
+# Macro to check if source compiles when cross-compiling
+# or runs when compiling natively
+macro(check_c_source_compile_or_run source flag)
+    if(CMAKE_CROSSCOMPILING)
+        check_c_source_compiles("${source}" ${flag})
+    else()
+        check_c_source_runs("${source}" ${flag})
+    endif()
+endmacro()
+
+set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DZLIB_DEBUG")
+
+if(MSVC)
+    set(CMAKE_DEBUG_POSTFIX "d")
+    add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
+    add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
+else()
+    #
+    # Not MSVC, so we need to check if we have the MS-style SSE etc. intrinsics
+    #
+    if(WITH_NATIVE_INSTRUCTIONS)
+        set(CMAKE_REQUIRED_FLAGS "${NATIVEFLAG}")
+    else()
+        set(CMAKE_REQUIRED_FLAGS "${SSE2FLAG}")
+    endif()
+    check_c_source_compile_or_run(
+        "#include <immintrin.h>
+        int main(void)
+        {
+            __m128i zero = _mm_setzero_si128();
+            (void)zero;
+            return 0;
+        }"
+        HAVE_SSE2_INTRIN
+    )
+    set(CMAKE_REQUIRED_FLAGS)
+
+    if(WITH_NATIVE_INSTRUCTIONS)
+        set(CMAKE_REQUIRED_FLAGS "${NATIVEFLAG}")
+    else()
+        # Use the generic SSE4 enabler option to check for the SSE4.2 instruction we require:
+        set(CMAKE_REQUIRED_FLAGS "${SSE4FLAG}")
+    endif()
+    check_c_source_compile_or_run(
+        "int main(void)
+        {
+            unsigned val = 0, h = 0;
+            __asm__ __volatile__ ( \"crc32 %1,%0\" : \"+r\" (h) : \"r\" (val) );
+            return (int) h;
+        }"
+        HAVE_SSE42_INTRIN
+    )
+    check_c_source_compile_or_run(
+        "int main(void)
+        {
+            unsigned crc = 0;
+            char c = 'c';
+            crc = __builtin_ia32_crc32qi(crc, c);
+            (void)crc;
+            return 0;
+        }"
+        HAVE_SSE42CRC_INTRIN
+    )
+    set(CMAKE_REQUIRED_FLAGS)
+
+    if(WITH_NATIVE_INSTRUCTIONS)
+        set(CMAKE_REQUIRED_FLAGS "${NATIVEFLAG}")
+    else()
+        set(CMAKE_REQUIRED_FLAGS "${PCLMULFLAG}")
+    endif()
+    if(NOT (APPLE AND ${ARCH} MATCHES "i386"))
+        # The pclmul code currently crashes on Mac in 32bit mode. Avoid for now.
+        check_c_source_compile_or_run(
+            "#include <immintrin.h>
+            #include <wmmintrin.h>
+            int main(void)
+            {
+                __m128i a = _mm_setzero_si128();
+                __m128i b = _mm_setzero_si128();
+                __m128i c = _mm_clmulepi64_si128(a, b, 0x10);
+                (void)c;
+                return 0;
+            }"
+            HAVE_PCLMULQDQ_INTRIN
+        )
+    else()
+        set(HAVE_PCLMULQDQ_INTRIN NO)
+    endif()
+    set(CMAKE_REQUIRED_FLAGS)
+endif()
+
+# Check whether -mfpu=neon is available
+set(CMAKE_REQUIRED_FLAGS "-mfpu=neon")
+check_c_source_compiles(
+    "int main()
+    {
+      return 0;
+    }"
+    MFPU_NEON_AVAILABLE FAIL_REGEX "not supported")
+set(CMAKE_REQUIRED_FLAGS)
+
+# FORCE_SSE2 option will only be shown if HAVE_SSE2_INTRIN is true
+if("${ARCH}" MATCHES "i[3-6]86")
+    cmake_dependent_option(FORCE_SSE2 "Always assume CPU is SSE2 capable" OFF "HAVE_SSE2_INTRIN" OFF)
+endif()
+
+#
+# Enable deflate_medium at level 4-6
+#
+if(NOT WITH_NEW_STRATEGIES)
+    add_definitions(-DNO_MEDIUM_STRATEGY)
+endif()
+
+#
+# Macro to add either the given intrinsics option to the global compiler options,
+# or ${NATIVEFLAG} (-march=native) if that is appropriate and possible.
+# An alternative version of this macro would take a file argument, and set ${flag}
+# only for that file as opposed to ${NATIVEFLAG} globally, to limit side-effect of
+# using ${flag} globally.
+#
+macro(add_intrinsics_option flag)
+    if(WITH_NATIVE_INSTRUCTIONS AND NATIVEFLAG)
+        if (NOT "${CMAKE_C_FLAGS} " MATCHES ".*${NATIVEFLAG} .*")
+            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${NATIVEFLAG}")
+        endif()
+    else()
+        if (NOT "${CMAKE_C_FLAGS} " MATCHES ".*${flag} .*")
+            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${flag}")
+        endif()
+    endif()
+endmacro()
+
+set(ZLIB_ARCH_SRCS)
+set(ARCHDIR "arch/generic")
+if("${ARCH}" MATCHES "x86_64" OR "${ARCH}" MATCHES "AMD64" OR "${ARCH}" MATCHES "i[3-6]86")
+    set(ARCHDIR "arch/x86")
+    add_definitions(-DUNALIGNED_OK)
+    add_feature_info(SSE2 1 "Support the SSE2 instruction set, using \"${SSE2FLAG}\"")
+elseif("${ARCH}" MATCHES "arm" OR "${ARCH}" MATCHES "aarch64")
+    set(ARCHDIR "arch/arm")
+    add_definitions(-DUNALIGNED_OK)
+elseif("${ARCH}" MATCHES "s390x")
+    set(ARCHDIR "arch/s390")
+else()
+    message(STATUS "No optimized architecture: using ${ARCHDIR}")
+endif()
+if("${ARCH}" MATCHES "arm" OR "${ARCH}" MATCHES "aarch64")
+    set(ZLIB_ARCH_SRCS ${ZLIB_ARCH_SRCS} ${ARCHDIR}/armfeature.c ${ARCHDIR}/fill_window_arm.c)
+endif()
+if(WITH_OPTIM)
+    if("${ARCH}" MATCHES "arm")
+        if(WITH_ACLE)
+            set(ZLIB_ARCH_SRCS ${ZLIB_ARCH_SRCS} ${ARCHDIR}/crc32_acle.c ${ARCHDIR}/insert_string_acle.c)
+            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ACLEFLAG}")
+            add_definitions("-DARM_ACLE_CRC_HASH")
+            add_feature_info(ACLE_CRC 1 "Support CRC hash generation using the ACLE instruction set, using \"${ACLEFLAG}\"")
+        endif()
+        if(WITH_NEON)
+            if(MFPU_NEON_AVAILABLE)
+                set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${NEONFLAG}")
+            endif()
+            add_definitions("-DARM_NEON_ADLER32")
+            if(MSVC)
+                add_definitions("-D__ARM_NEON__=1")
+            endif(MSVC)
+            set(ZLIB_ARCH_SRCS ${ZLIB_ARCH_SRCS} ${ARCHDIR}/adler32_neon.c)
+            add_feature_info(NEON_FILLWINDOW 1 "Support NEON instructions in fill_window_arm, using \"${NEONFLAG}\"")
+        endif()
+    elseif("${ARCH}" MATCHES "aarch64")
+        if(WITH_ACLE)
+            set(ZLIB_ARCH_SRCS ${ZLIB_ARCH_SRCS} ${ARCHDIR}/crc32_acle.c ${ARCHDIR}/insert_string_acle.c)
+            add_definitions("-DARM_ACLE_CRC_HASH")
+            add_feature_info(ACLE_CRC 1 "Support CRC hash generation using the ACLE instruction set, using \"${ACLEFLAG}\"")
+        endif()
+        # We need to check WITH_NEON first
+        if(WITH_NEON)
+            add_definitions("-DARM_NEON_ADLER32")
+            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${NEONFLAG}")
+            set(ZLIB_ARCH_SRCS ${ZLIB_ARCH_SRCS} ${ARCHDIR}/adler32_neon.c)
+            add_feature_info(NEON_FILLWINDOW 1 "Support NEON instructions in fill_window_arm, using \"${NEONFLAG}\"")
+        elseif(WITH_ACLE)
+            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ACLEFLAG}")
+        endif()
+    elseif("${ARCHDIR}" MATCHES "arch/x86")
+        add_definitions("-DX86_CPUID")
+        set(ZLIB_ARCH_SRCS ${ZLIB_ARCH_SRCS} ${ARCHDIR}/x86.c)
+        if(HAVE_SSE42_INTRIN)
+            add_definitions(-DX86_SSE4_2_CRC_HASH)
+            set(ZLIB_ARCH_SRCS ${ZLIB_ARCH_SRCS} ${ARCHDIR}/insert_string_sse.c)
+            add_feature_info(SSE4_CRC 1 "Support CRC hash generation using the SSE4.2 instruction set, using \"${SSE4FLAG}\"")
+            add_intrinsics_option("${SSE4FLAG}")
+            if(HAVE_SSE42CRC_INTRIN)
+                add_definitions(-DX86_SSE4_2_CRC_INTRIN)
+            endif()
+            if(WITH_NEW_STRATEGIES)
+                add_definitions(-DX86_QUICK_STRATEGY)
+                set(ZLIB_ARCH_SRCS ${ZLIB_ARCH_SRCS} ${ARCHDIR}/deflate_quick.c)
+                add_feature_info(SSE4DEFLATE 1 "Support SSE4.2-accelerated quick compression")
+            endif()
+        endif()
+        if(HAVE_SSE2_INTRIN)
+            add_definitions(-DX86_SSE2)
+            set(ZLIB_ARCH_SRCS ${ZLIB_ARCH_SRCS} ${ARCHDIR}/fill_window_sse.c)
+            if(NOT ${ARCH} MATCHES "x86_64")
+                add_intrinsics_option("${SSE2FLAG}")
+                add_feature_info(FORCE_SSE2 FORCE_SSE2 "Assume CPU is SSE2 capable")
+                if(FORCE_SSE2)
+                    add_definitions(-DX86_NOCHECK_SSE2)
+                endif()
+            endif()
+        endif()
+        if(HAVE_PCLMULQDQ_INTRIN)
+            add_definitions(-DX86_PCLMULQDQ_CRC)
+            set(ZLIB_ARCH_SRCS ${ZLIB_ARCH_SRCS} ${ARCHDIR}/crc_folding.c)
+            add_intrinsics_option("${PCLMULFLAG}")
+            if(HAVE_SSE42_INTRIN)
+                add_feature_info(PCLMUL_CRC 1 "Support CRC hash generation using PCLMULQDQ, using \"${PCLMULFLAG}\"")
+            else()
+                add_feature_info(PCLMUL_CRC 1 "Support CRC hash generation using PCLMULQDQ, using \"${PCLMULFLAG} ${SSE4FLAG}\"")
+            endif()
+        endif()
+    elseif("${ARCH}" MATCHES "s390x")
+        if(WITH_DFLTCC_DEFLATE OR WITH_DFLTCC_INFLATE)
+            set(ZLIB_ARCH_SRCS ${ZLIB_ARCH_SRCS} ${ARCHDIR}/dfltcc_common.c)
+        endif()
+        if(WITH_DFLTCC_DEFLATE)
+            add_definitions(-DS390_DFLTCC_DEFLATE)
+            set(ZLIB_ARCH_SRCS ${ZLIB_ARCH_SRCS} ${ARCHDIR}/dfltcc_deflate.c)
+        endif()
+        if(WITH_DFLTCC_INFLATE)
+            add_definitions(-DS390_DFLTCC_INFLATE)
+            set(ZLIB_ARCH_SRCS ${ZLIB_ARCH_SRCS} ${ARCHDIR}/dfltcc_inflate.c)
+        endif()
+    endif()
+endif()
+message(STATUS "Architecture-specific source files: ${ZLIB_ARCH_SRCS}")
+
+#============================================================================
+# zconf.h
+#============================================================================
+
+macro(generate_cmakein input output)
+    file(REMOVE ${output})
+    file(STRINGS ${input} _lines)
+    foreach(_line IN LISTS _lines)
+        file(APPEND ${output} "${_line}\n")
+
+        if (_line STREQUAL "#define ZCONF_H" OR _line STREQUAL "#define ZCONFNG_H")
+            file(APPEND ${output} "#cmakedefine Z_HAVE_UNISTD_H\n")
+            if(NOT HAVE_PTRDIFF_T)
+              file(APPEND ${output} "#cmakedefine NEED_PTRDIFF_T\n")
+              file(APPEND ${output} "#cmakedefine PTRDIFF_TYPE ${PTRDIFF_TYPE}\n")
+            endif()
+        endif()
+    endforeach()
+endmacro(generate_cmakein)
+
+generate_cmakein( ${CMAKE_CURRENT_SOURCE_DIR}/zconf${SUFFIX}.h.in ${CMAKE_CURRENT_BINARY_DIR}/zconf${SUFFIX}.h.cmakein )
+
+if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
+    # If we're doing an out of source build and the user has a zconf.h
+    # in their source tree...
+    if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/zconf${SUFFIX}.h)
+        message(STATUS "Renaming")
+        message(STATUS "    ${CMAKE_CURRENT_SOURCE_DIR}/zconf${SUFFIX}.h")
+        message(STATUS "to 'zconf${SUFFIX}.h.included' because this file is included with zlib")
+        message(STATUS "but CMake generates it automatically in the build directory.")
+        file(RENAME ${CMAKE_CURRENT_SOURCE_DIR}/zconf${SUFFIX}.h ${CMAKE_CURRENT_SOURCE_DIR}/zconf${SUFFIX}.h.included)
+    endif()
+
+    # If we're doing an out of source build and the user has a zconf.h.cmakein
+    # in their source tree...
+    if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/zconf${SUFFIX}.h.cmakein)
+        message(STATUS "Renaming")
+        message(STATUS "    ${CMAKE_CURRENT_SOURCE_DIR}/zconf${SUFFIX}.h.cmakein")
+        message(STATUS "to 'zconf${SUFFIX}.h.cmakeincluded' because this file is included with zlib")
+        message(STATUS "but CMake generates it automatically in the build directory.")
+        file(RENAME ${CMAKE_CURRENT_SOURCE_DIR}/zconf${SUFFIX}.h.cmakein ${CMAKE_CURRENT_SOURCE_DIR}/zconf${SUFFIX}.h.cmakeincluded)
+    endif()
+endif()
+
+set(ZLIB_PC ${CMAKE_CURRENT_BINARY_DIR}/${LIBNAME2}.pc)
+configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/zlib.pc.cmakein
+    ${ZLIB_PC} @ONLY)
+configure_file(${CMAKE_CURRENT_BINARY_DIR}/zconf${SUFFIX}.h.cmakein
+    ${CMAKE_CURRENT_BINARY_DIR}/zconf${SUFFIX}.h @ONLY)
+
+
+#============================================================================
+# zlib
+#============================================================================
+
+set(ZLIB_PUBLIC_HDRS
+    ${CMAKE_CURRENT_BINARY_DIR}/zconf${SUFFIX}.h
+    zlib${SUFFIX}.h
+)
+set(ZLIB_PRIVATE_HDRS
+    crc32.h
+    deflate.h
+    functable.h
+    gzguts.h
+    inffast.h
+    inffixed.h
+    inflate.h
+    inftrees.h
+    trees.h
+    zutil.h
+)
+set(ZLIB_SRCS
+    adler32.c
+    compress.c
+    crc32.c
+    deflate.c
+    deflate_fast.c
+    deflate_medium.c
+    deflate_slow.c
+    functable.c
+    inflate.c
+    infback.c
+    inftrees.c
+    inffast.c
+    trees.c
+    uncompr.c
+    zutil.c
+)
+
+set(ZLIB_GZFILE_SRCS
+    gzclose.c
+    gzlib.c
+    gzread.c
+    gzwrite.c
+)
+
+if(NOT MINGW AND NOT MSYS)
+    set(ZLIB_DLL_SRCS
+        win32/zlib${SUFFIX}1.rc # If present will override custom build rule below.
+    )
+endif()
+
+if(MINGW OR MSYS)
+    # This gets us DLL resource information when compiling on MinGW.
+    if(NOT CMAKE_RC_COMPILER)
+        set(CMAKE_RC_COMPILER windres.exe)
+    endif()
+
+    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj
+        COMMAND ${CMAKE_RC_COMPILER}
+            -D GCC_WINDRES
+            -I ${CMAKE_CURRENT_SOURCE_DIR}
+            -I ${CMAKE_CURRENT_BINARY_DIR}
+            -o ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj
+            -i ${CMAKE_CURRENT_SOURCE_DIR}/win32/zlib${SUFFIX}1.rc)
+    set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
+endif()
+
+add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_ARCH_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+target_include_directories(zlib PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
+add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_ARCH_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+target_include_directories(zlibstatic PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
+
+if(WITH_GZFILEOP)
+    target_sources(zlib PRIVATE ${ZLIB_GZFILE_SRCS})
+    target_sources(zlibstatic PRIVATE ${ZLIB_GZFILE_SRCS})
+endif()
+
+set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
+set_target_properties(zlib PROPERTIES SOVERSION 1)
+
+if (ZLIB_COMPAT)
+    set(ZLIB_FULL_VERSION ${ZLIB_HEADER_VERSION})
+else()
+    set(ZLIB_FULL_VERSION ${ZLIBNG_HEADER_VERSION})
+endif()
+if(NOT CYGWIN)
+    # This property causes shared libraries on Linux to have the full version
+    # encoded into their final filename.  We disable this on Cygwin because
+    # it causes cygz-${ZLIB_FULL_VERSION}.dll to be created when cygz.dll
+    # seems to be the default.
+    #
+    # This has no effect with MSVC, on that platform the version info for
+    # the DLL comes from the resource file win32/zlib1.rc
+    set_target_properties(zlib PROPERTIES VERSION ${ZLIB_FULL_VERSION})
+endif()
+
+
+if(UNIX)
+    # On unix-like platforms the library is almost always called libz
+    set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z${SUFFIX})
+    if(NOT APPLE)
+        set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/${LIBNAME2}.map\"")
+    endif()
+elseif(MSYS)
+    # Suppress version number from shared library name
+    set(CMAKE_SHARED_LIBRARY_NAME_WITH_VERSION 0)
+elseif(BUILD_SHARED_LIBS AND WIN32)
+    # Creates zlib1.dll when building shared library version
+    set_target_properties(zlib PROPERTIES SUFFIX "1.dll")
+endif()
+
+if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
+    install(TARGETS zlib zlibstatic
+        RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
+        ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
+        LIBRARY DESTINATION "${INSTALL_LIB_DIR}" )
+endif()
+if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL )
+    install(FILES zlib${SUFFIX}.h DESTINATION "${INSTALL_INC_DIR}" RENAME zlib${SUFFIX}.h)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/zconf${SUFFIX}.h DESTINATION "${INSTALL_INC_DIR}" RENAME zconf${SUFFIX}.h)
+endif()
+if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
+    install(FILES zlib.3 DESTINATION "${INSTALL_MAN_DIR}/man3" RENAME zlib${SUFFIX}.3)
+endif()
+if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
+    install(FILES ${ZLIB_PC} DESTINATION "${INSTALL_PKGCONFIG_DIR}")
+endif()
+
+#============================================================================
+# Example binaries
+#============================================================================
+
+option(ZLIB_ENABLE_TESTS "Build test binaries" ON)
+if (ZLIB_ENABLE_TESTS)
+    enable_testing()
+    macro(configure_test_executable target)
+        target_link_libraries(${target} zlib)
+        if(NOT WITH_GZFILEOP)
+            target_compile_definitions(${target} PUBLIC -DWITH_GZFILEOP)
+            target_sources(${target} PRIVATE ${ZLIB_GZFILE_SRCS})
+        endif()
+    endmacro()
+
+    add_executable(example test/example.c)
+    configure_test_executable(example)
+    add_test(NAME example COMMAND example${CMAKE_EXECUTABLE_SUFFIX})
+
+    add_executable(minigzip test/minigzip.c)
+    configure_test_executable(minigzip)
+
+    if(HAVE_OFF64_T)
+        add_executable(example64 test/example.c)
+        configure_test_executable(example64)
+        set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
+        add_test(NAME example64 COMMAND example64${CMAKE_EXECUTABLE_SUFFIX})
+
+        add_executable(minigzip64 test/minigzip.c)
+        configure_test_executable(minigzip64)
+        set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
+    endif()
+
+    if(WITH_FUZZERS)
+        set(FUZZERS checksum compress example_small example_large example_flush example_dict minigzip)
+        file(GLOB ALL_SRC_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*")
+        foreach(FUZZER ${FUZZERS})
+            add_executable(${FUZZER}_fuzzer test/fuzz/${FUZZER}_fuzzer.c test/fuzz/standalone_fuzz_target_runner.c)
+            configure_test_executable(${FUZZER}_fuzzer)
+            add_test(${FUZZER}_fuzzer ${FUZZER}_fuzzer${CMAKE_EXECUTABLE_SUFFIX} ${ALL_SRC_FILES})
+        endforeach()
+    endif()
+
+    set(CVES CVE-2002-0059 CVE-2004-0797 CVE-2005-1849 CVE-2005-2096)
+    foreach(CVE ${CVES})
+        set(CVE_COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:minigzip> -d)
+        add_test(NAME ${CVE}
+            COMMAND ${CMAKE_COMMAND}
+            "-DCOMMAND=${CVE_COMMAND}"
+            -DINPUT=${CMAKE_CURRENT_SOURCE_DIR}/test/${CVE}/test.gz
+            "-DSUCCESS_EXIT=0;1"
+            -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/run-and-redirect.cmake)
+    endforeach()
+
+    if(NOT WIN32 AND ZLIB_COMPAT)
+        add_executable(CVE-2003-0107 test/CVE-2003-0107.c)
+        target_link_libraries(CVE-2003-0107 zlib)
+        add_test(NAME CVE-2003-0107 COMMAND CVE-2003-0107)
+    endif()
+endif()
+
+# FEATURE_SUMMARY(WHAT ALL INCLUDE_QUIET_PACKAGES)
+
diff --git a/loginserver/world_server.cpp b/loginserver/world_server.cpp
index 55fc03b7b..d953ccc3a 100644
--- a/loginserver/world_server.cpp
+++ b/loginserver/world_server.cpp
@@ -165,21 +165,26 @@ void WorldServer::ProcessUsertoWorldResp(uint16_t opcode, const EQ::Net::Packet
 
 		switch (utwr->response)
 		{
-		case 1:
+		case UserToWorldStatusSuccess:
 			per->Message = 101;
 			break;
-		case 0:
+		case UserToWorldStatusWorldUnavail:
 			per->Message = 326;
 			break;
-		case -1:
+		case UserToWorldStatusSuspended:
 			per->Message = 337;
 			break;
-		case -2:
+		case UserToWorldStatusBanned:
 			per->Message = 338;
 			break;
-		case -3:
-			per->Message = 303;
+		case UserToWorldStatusWorldAtCapacity:
+			per->Message = 339;
 			break;
+		case UserToWorldStatusAlreadyOnline:
+			per->Message = 111;
+			break;
+		default:
+			per->Message = 102;
 		}
 
 		if (server.options.IsTraceOn())
diff --git a/queryserv/database.cpp b/queryserv/database.cpp
index 11c4fe1e9..7ccb265ca 100644
--- a/queryserv/database.cpp
+++ b/queryserv/database.cpp
@@ -379,6 +379,7 @@ void Database::LogMerchantTransaction(QSMerchantLogTransaction_Struct* QS, uint3
 
 }
 
+// this function does not delete the ServerPacket, so it must be handled at call site
 void Database::GeneralQueryReceive(ServerPacket *pack) {
 	/*
 		These are general queries passed from anywhere in zone instead of packing structures and breaking them down again and again
@@ -393,7 +394,6 @@ void Database::GeneralQueryReceive(ServerPacket *pack) {
 		Log(Logs::Detail, Logs::QS_Server, "%s", query.c_str());
 	}
 
-	safe_delete(pack);
 	safe_delete_array(queryBuffer);
 }
 
diff --git a/ucs/clientlist.cpp b/ucs/clientlist.cpp
index a433705e6..26ef62b82 100644
--- a/ucs/clientlist.cpp
+++ b/ucs/clientlist.cpp
@@ -471,7 +471,7 @@ static void ProcessCommandIgnore(Client *c, std::string Ignoree) {
 Clientlist::Clientlist(int ChatPort) {
 	EQStreamManagerInterfaceOptions chat_opts(ChatPort, false, false);
 	chat_opts.opcode_size = 1;
-	chat_opts.daybreak_options.stale_connection_ms = 300000;
+	chat_opts.daybreak_options.stale_connection_ms = 600000;
 	chat_opts.daybreak_options.resend_delay_ms = RuleI(Network, ResendDelayBaseMS);
 	chat_opts.daybreak_options.resend_delay_factor = RuleR(Network, ResendDelayFactor);
 	chat_opts.daybreak_options.resend_delay_min = RuleI(Network, ResendDelayMinMS);
diff --git a/utils/deprecated/perlxs/mob.h b/utils/deprecated/perlxs/mob.h
index 0485e299d..7dc85b2a3 100644
--- a/utils/deprecated/perlxs/mob.h
+++ b/utils/deprecated/perlxs/mob.h
@@ -130,7 +130,7 @@
 	int32	GetFollowID();
 
 	virtual void	Message(int32 type, const char* message, ...);
-	virtual void	Message_StringID(int32 type, int32 string_id, int32 distance = 0);
+	virtual void	MessageString(int32 type, int32 string_id, int32 distance = 0);
 	void Say(const char *format, ...);
 	void Shout(const char *format, ...);
 	void Emote(const char *format, ...);
diff --git a/utils/scripts/.gitignore b/utils/scripts/.gitignore
index eba9f59cb..76f70485c 100644
--- a/utils/scripts/.gitignore
+++ b/utils/scripts/.gitignore
@@ -1 +1,2 @@
-opcode_handlers_output
\ No newline at end of file
+opcode_handlers_output
+vcxproj_dependencies_output
diff --git a/utils/scripts/eqemu_server.pl b/utils/scripts/eqemu_server.pl
index f05c2c266..ef8b0babd 100644
--- a/utils/scripts/eqemu_server.pl
+++ b/utils/scripts/eqemu_server.pl
@@ -454,6 +454,7 @@ sub do_installer_routines {
         fetch_latest_windows_appveyor();
         get_remote_file($install_repository_request_url . "lua51.dll", "lua51.dll", 1);
         get_remote_file($install_repository_request_url . "zlib1.dll", "zlib1.dll", 1);
+		get_remote_file($install_repository_request_url . "zlib1.pdb", "zlib1.pdb", 1);
         get_remote_file($install_repository_request_url . "libmysql.dll", "libmysql.dll", 1);
     }
 
@@ -1587,22 +1588,24 @@ sub add_login_server_firewall_rules {
         print "If firewall rules don't add you must run this script (eqemu_server.pl) as administrator\n";
         print "\n";
         print "[Install] Instructions \n";
-        print "[Install] In order to connect your server to the loginserver you must point your eqemu_config.xml to your local server similar to the following:\n";
+        print "[Install] In order to connect your server to the loginserver you must point your eqemu_config.json to your local server similar to the following:\n";
         print "
-	<loginserver1>
-		<host>login.eqemulator.net</host>
-		<port>5998</port>
-		<account></account>
-		<password></password>
-	</loginserver1>
-	<loginserver2>
-		<host>127.0.0.1</host>
-		<port>5998</port>
-		<account></account>
-		<password></password>
-	</loginserver2>
+	\"loginserver1\" : {
+		\"account\" : \"\",
+		\"host\" : \"login.eqemulator.net\",
+		\"password\" : \"\",
+		\"port\" : \"5998\",
+		\"legacy\": \"1\"
+	},
+	\"loginserver2\" : {
+		\"account\" : \"\",
+		\"host\" : \"192.168.197.129\",
+		\"password\" : \"\",
+		\"port\" : \"5998\"
+	},
+	\"localaddress\" : \"192.168.197.129\",
 		";
-        print "[Install] When done, make sure your EverQuest client points to your loginserver's IP (In this case it would be 127.0.0.1) in the eqhosts.txt file\n";
+        print "[Install] When done, make sure your EverQuest client points to your loginserver's IP (In this case it would be 192.168.197.129) in the eqhosts.txt file\n";
     }
 }
 
@@ -1640,9 +1643,10 @@ sub check_windows_firewall_rules {
 }
 
 sub fetch_server_dlls {
-    print "[Download] Fetching lua51.dll, zlib1.dll, libmysql.dll...\n";
+    print "[Download] Fetching lua51.dll, zlib1.dll, zlib1.pdb, libmysql.dll...\n";
     get_remote_file($install_repository_request_url . "lua51.dll", "lua51.dll", 1);
     get_remote_file($install_repository_request_url . "zlib1.dll", "zlib1.dll", 1);
+	get_remote_file($install_repository_request_url . "zlib1.pdb", "zlib1.pdb", 1);
     get_remote_file($install_repository_request_url . "libmysql.dll", "libmysql.dll", 1);
 }
 
diff --git a/utils/scripts/vcxproj_dependencies.py b/utils/scripts/vcxproj_dependencies.py
new file mode 100644
index 000000000..f50c9aec4
--- /dev/null
+++ b/utils/scripts/vcxproj_dependencies.py
@@ -0,0 +1,793 @@
+#! /usr/bin/env python
+#
+
+"""
+'VCXProj-Dependencies' for EQEmulator
+
+This script locates external dependency paths and generates lists for each
+project. In addition, it will cross-check these lists to determine if any
+discrepancies exist for any dependencies globally and across all projects.
+
+"""
+
+
+import sys
+import os
+import fnmatch
+
+try:
+    import xml.etree.cElementTree as ElementTree
+except ImportError:
+    import xml.etree.ElementTree as ElementTree
+
+from time import time, ctime
+
+
+QUIET_REPORT = True
+
+include_projects = []
+exclude_projects = ['VCTargetsPath', 'CompilerIdC', 'CompilerIdCXX']  # these three should be left in by default
+
+base_path = os.getcwd()[:-14]  # '/utils/scripts'
+base_path = base_path.replace('\\', '/')
+
+file_extensions = ['vcxproj']
+project_paths = []
+master_dependencies = []
+# {[project]:{[build]:{[resource]:{[reference]:[paths]}}}}
+project_dependencies = {}
+
+out_files = {}
+
+col1 = '{0}'.format(' ' * 0)
+col2 = '{0}'.format(' ' * 2)
+col3 = '{0}'.format(' ' * 4)
+col4 = '{0}'.format(' ' * 6)
+col5 = '{0}'.format(' ' * 8)
+
+
+def main():
+    """ main """
+    
+    if not create_output_directory():
+        exit()
+    
+    if not open_output_files():
+        exit()
+    
+    print 'Locating project paths...'
+    locate_project_paths()
+    print '..project count: {0}'.format(len(project_paths))
+    print 'Parsing project files...'
+    parse_project_files()
+    print 'Building master dependencies...'
+    build_master_dependencies()
+    print '..dependency count: {0}'.format(len(master_dependencies))
+    print 'Checking for version discrepancies...'
+    check_for_version_discrepancies()
+    close_output_files()
+    print '\n__fin__'
+    
+    return
+
+
+def create_output_directory():
+    """ Check for output directory - create if does not exist """
+    
+    try:
+        output_path = '{0}/utils/scripts/vcxproj_dependencies_output'.format(base_path)
+        if not os.path.exists(output_path):
+            os.mkdir(output_path)
+        
+        return True
+    
+    except IOError:
+        print('(Exception Error: {0}) create_output_directory()'.format(sys.exc_info()[0]))
+        
+        return False
+
+
+def open_output_files():
+    """ Open all output files """
+    
+    try:
+        file_name = '{0}/utils/scripts/vcxproj_dependencies_output/ProjectPaths.txt'.format(base_path)
+        out_files['ProjectPaths'] = open(file_name, 'w')
+        file_name = '{0}/utils/scripts/vcxproj_dependencies_output/MasterDependencies.txt'.format(base_path)
+        out_files['MasterDependencies'] = open(file_name, 'w')
+        file_name = '{0}/utils/scripts/vcxproj_dependencies_output/ProjectDependencies.txt'.format(base_path)
+        out_files['ProjectDependencies'] = open(file_name, 'w')
+        file_name = '{0}/utils/scripts/vcxproj_dependencies_output/ContextTree.txt'.format(base_path)
+        out_files['ContextTree'] = open(file_name, 'w')
+        file_name = '{0}/utils/scripts/vcxproj_dependencies_output/DiscrepancyReport.txt'.format(base_path)
+        out_files['DiscrepancyReport'] = open(file_name, 'w')
+        for file in out_files:
+            out_files[file].write('>> \'VCXProj-Dependencies\' {0} file\n'.format(file))
+            out_files[file].write('>> file generated @ {0}\n\n'.format(ctime(time())))
+        
+        return True
+    
+    except IOError:
+        print('(Exception Error: {0}) open_output_files()'.format(sys.exc_info()[0]))
+        close_output_files()
+        
+        return False
+
+
+def locate_project_paths():
+    """ Locate vcxproj files in the build folder """
+    
+    for root, dirs, files in os.walk('{0}/build'.format(base_path)):
+        for name in files:
+            project = name.split('.')[0]
+            if not len(include_projects) == 0 and project not in include_projects:
+                continue
+            if not len(exclude_projects) == 0 and project in exclude_projects:
+                continue
+            for extension in file_extensions:
+                if fnmatch.fnmatch(name, '*.{0}'.format(extension)):
+                    project_paths.append(os.path.join(root, name).replace('\\', '/').lower())
+    for path in project_paths:
+        out_files['ProjectPaths'].write('{0};\n'.format(path))
+    
+    return
+
+
+def fixup_path(project_path, dependency_path):
+    """ Fix-up malformed dependency paths """
+    
+    trailing = dependency_path.replace('\\', '/')
+    if '../' in trailing:
+        if trailing[:3] == '../':  # windows
+            leading = project_path[:project_path.rfind('/')]
+            while trailing[:3] == '../':
+                leading = leading[:leading.rfind('/')]
+                trailing = trailing[3:]
+            trailing = trailing.lower()
+            trailing = '{0}/{1}'.format(leading, trailing)
+        else:  # unix
+            print '..processing unix-style path fix-up'
+            while '../' in trailing:
+                backout = trailing.find('../')
+                backdir = trailing.rfind('/', 0, backout - 1)
+                trailing = trailing.replace(trailing[backdir:backout + 2], '', 1)
+            trailing = trailing.lower()
+    else:
+        trailing = trailing.lower()
+    
+    return trailing
+
+
+def parse_project_files():
+    """ Parse each vcxproj file's xml data """
+    
+    for key1 in project_paths:
+        with open(key1, 'r') as vcxproj_file:
+            project_dependencies[key1] = {}
+            xml_tree = ElementTree.ElementTree(file=vcxproj_file)
+            for element1 in xml_tree.getroot():
+                if not element1.tag[-19:] == 'ItemDefinitionGroup':
+                    continue
+                # add '.split('|')[0]' to remove the '|Win##' attribute
+                key2 = element1.attrib['Condition'].split('==')[1][1:-1]
+                project_dependencies[key1][key2] = {}
+                for element2 in element1.getiterator():
+                    if element2.tag[-9:] == 'ClCompile':
+                        key3 = element2.tag[-9:]
+                        project_dependencies[key1][key2][key3] = {}
+                        for element3 in element2.getiterator():
+                            if element3.tag[-28:] == 'AdditionalIncludeDirectories':
+                                key4 = element3.tag[-28:]
+                                project_dependencies[key1][key2][key3][key4] = []
+                                paths = element3.text.split(';')
+                                for path in paths:
+                                    project_dependencies[key1][key2][key3][key4].append(fixup_path(key1, path))
+                    elif element2.tag[-15:] == 'ResourceCompile':
+                        key3 = element2.tag[-15:]
+                        project_dependencies[key1][key2][key3] = {}
+                        for element3 in element2.getiterator():
+                            if element3.tag[-28:] == 'AdditionalIncludeDirectories':
+                                key4 = element3.tag[-28:]
+                                project_dependencies[key1][key2][key3][key4] = []
+                                paths = element3.text.split(';')
+                                for path in paths:
+                                    project_dependencies[key1][key2][key3][key4].append(fixup_path(key1, path))
+                    elif element2.tag[-4:] == 'Midl':
+                        key3 = element2.tag[-4:]
+                        project_dependencies[key1][key2][key3] = {}
+                        for element3 in element2.getiterator():
+                            if element3.tag[-28:] == 'AdditionalIncludeDirectories':
+                                key4 = element3.tag[-28:]
+                                project_dependencies[key1][key2][key3][key4] = []
+                                paths = element3.text.split(';')
+                                for path in paths:
+                                    project_dependencies[key1][key2][key3][key4].append(fixup_path(key1, path))
+                    elif element2.tag[-4:] == 'Link':
+                        key3 = element2.tag[-4:]
+                        project_dependencies[key1][key2][key3] = {}
+                        for element3 in element2.getiterator():
+                            if element3.tag[-22:] == 'AdditionalDependencies':
+                                key4 = element3.tag[-22:]
+                                project_dependencies[key1][key2][key3][key4] = []
+                                paths = element3.text.split(';')
+                                for path in paths:
+                                    project_dependencies[key1][key2][key3][key4].append(fixup_path(key1, path))
+                            if element3.tag[-28:] == 'AdditionalLibraryDirectories':
+                                key4 = element3.tag[-28:]
+                                project_dependencies[key1][key2][key3][key4] = []
+                                paths = element3.text.split(';')
+                                for path in paths:
+                                    project_dependencies[key1][key2][key3][key4].append(fixup_path(key1, path))
+        vcxproj_file.close()
+    
+    return
+
+
+def build_master_dependencies():
+    """ Build master dependencies list """
+    
+    def write(message):
+        """ internal 'ProjectDependencies' write method - performed here so processing takes place after fix-up """
+        
+        out_files['ProjectDependencies'].write('{0}\n'.format(message))
+        
+        return
+    
+    for key1 in project_dependencies:
+        write('{0}<Project Path="{1}">'.format(col1, key1))
+        for key2 in project_dependencies[key1]:
+            write('{0}<Build Type="{1}">'.format(col2, key2))
+            for key3 in project_dependencies[key1][key2]:
+                write('{0}<Resource Type="{1}">'.format(col3, key3))
+                for key4 in project_dependencies[key1][key2][key3]:
+                    write('{0}<Reference Type="{1}">'.format(col4, key4))
+                    for path in project_dependencies[key1][key2][key3][key4]:
+                        write('{0}{1}'.format(col4, path))
+                        if path not in master_dependencies:
+                            master_dependencies.append(path)
+                    write('{0}</Reference>'.format(col4))
+                write('{0}</Resource>'.format(col3))
+            write('{0}</Build>'.format(col2))
+        write('{0}</Project>'.format(col1))
+    master_dependencies.sort()
+    for path in master_dependencies:
+        out_files['MasterDependencies'].write('{0}\n'.format(path))
+    
+    return
+
+
+def check_for_version_discrepancies():
+    """ Check for dependency version discrepancies """
+    
+    def twrite(message):
+        """ internal 'ContextTree' write method """
+        
+        out_files['ContextTree'].write('{0}\n'.format(message))
+        
+        return
+    
+    def rwrite(message):
+        """ internal 'DiscrepancyReport' write method """
+        
+        out_files['DiscrepancyReport'].write('{0}\n'.format(message))
+        
+        return
+    
+    libraries = [
+        'mysql',
+        'zlib',
+        'perl',
+        'lua',
+        'boost',
+        'sodium',
+        'openssl'
+    ]
+    references = [
+        'include',
+        'source',
+        'library'
+    ]
+    priorities = {
+        0: 'NOT FOUND',
+        1: 'install',
+        2: 'dependencies',
+        3: 'libs',
+        4: 'vcpkg',
+        5: 'static',
+        6: 'submodule'
+    }
+    # use all lowercase for path description
+    # use forward slash ('/') for directory name separators
+    # use '|' token for multiple hints ('my_file_path_1|my_file_path_2')
+    # use '!!' token for explicit argument ('/perl/core!!' will find '../perl/core' but not '../perl/core/perl512.lib')
+    # use '##' token for joined hints ('my_file_##_1')
+    # use '&&', '^' and '@' tokens for multiple argument hints ('my_file_&&path_1^path_2^path_3@')
+    # (i.e., 'my_file_path_1|my_file_##_2|my_##_##&&_3^_4!!@')
+    # {[library]:{[reference]:[[priority]:hint]}}
+    hints = {
+        # Notes:
+        'mysql': {
+            'include': [
+                '',  # 'NOT FOUND'
+                '',  # 'install'
+                '/dependencies/mysql_##/include',  # 'dependencies'
+                '',  # 'libs'
+                '',  # 'vcpkg'
+                '',  # 'static'
+                ''  # 'submodule'
+            ],
+            'source': [
+                '',  # 'NOT FOUND'
+                '',  # 'install'
+                '',  # 'dependencies'
+                '',  # 'libs'
+                '',  # 'vcpkg'
+                '',  # 'static'
+                ''  # 'submodule'
+            ],
+            'library': [
+                '',  # 'NOT FOUND'
+                '',  # 'install'
+                'dependencies/mysql_##/lib',  # 'dependencies'
+                '',  # 'libs'
+                '',  # 'vcpkg'
+                '',  # 'static'
+                ''  # 'submodule'
+            ]
+        },
+        'zlib': {
+            'include': [
+                '',  # 'NOT FOUND'
+                '',  # 'install'
+                '/server/dependencies/zlib_x##/include',  # 'dependencies'
+                # not sure if this should be '/libs/zlibng' or '/build/libs/zlibng' based on cmake behavior
+                '/server/build/libs/zlibng!!',  # 'libs'
+                '/server/vcpkg/vcpkg-export-##/installed/x##-windows/include',  # 'vcpkg'
+                '/server/build/libs/zlibng!!',  # 'static'
+                ''  # 'submodule'
+            ],
+            'source': [
+                '',  # 'NOT FOUND'
+                '',  # 'install'
+                '',  # 'dependencies'
+                '/server/libs/zlibng!!',  # 'libs'
+                '',  # 'vcpkg'
+                '',  # 'static'
+                ''  # 'submodule'
+            ],
+            'library': [
+                '',  # 'NOT FOUND'
+                '',  # 'install'
+                '/server/dependencies/zlib_x##/lib/zdll.lib',  # 'dependencies'
+                '',  # 'libs'
+                '/server/vcpkg/vcpkg-export-##/installed/x##-windows/&&lib/zlib.lib!!'
+                '^debug/lib/zlibd.lib!!@',  # 'vcpkg'
+                '/server/build/libs/zlibng/&&debug/zlibstaticd.lib!!^minsizerel/zlibstatic.lib!!'
+                '^release/zlibstatic.lib!!^relwithdebinfo/zlibstatic.lib!!@',  # 'static'
+                ''  # 'submodule'
+            ]
+        },
+        'perl': {
+            'include': [
+                '',  # 'NOT FOUND'
+                '/perl/lib/core!!',  # 'install'
+                '',  # 'dependencies'
+                '',  # 'libs'
+                '',  # 'vcpkg'
+                '',  # 'static'
+                ''  # 'submodule'
+            ],
+            'source': [
+                '',  # 'NOT FOUND'
+                '',  # 'install'
+                '',  # 'dependencies'
+                '',  # 'libs'
+                '',  # 'vcpkg'
+                '',  # 'static'
+                ''  # 'submodule'
+            ],
+            'library': [
+                '',  # 'NOT FOUND'
+                '/perl/lib/core/perl51##.lib',  # 'install'
+                '',  # 'dependencies'
+                '',  # 'libs'
+                '',  # 'vcpkg'
+                '',  # 'static'
+                ''  # 'submodule'
+            ]
+        },
+        'lua': {
+            'include': [
+                '',  # 'NOT FOUND'
+                '',  # 'install'
+                '/server/dependencies/luaj_x##/src',  # 'dependencies'
+                '',  # 'libs'
+                '/server/vcpkg/vcpkg-export-##/installed/x##-windows/include',  # 'vcpkg'
+                '',  # 'static'
+                ''  # 'submodule'
+            ],
+            'source': [
+                '',  # 'NOT FOUND'
+                '',  # 'install'
+                '/server/dependencies/luaj_x##/src',  # 'dependencies'
+                '',  # 'libs'
+                '',  # 'vcpkg'
+                '',  # 'static'
+                ''  # 'submodule'
+            ],
+            'library': [
+                '',  # 'NOT FOUND'
+                '',  # 'install'
+                '/server/dependencies/luaj_x##/bin/lua51.lib',  # 'dependencies'
+                '',  # 'libs'
+                # debug lua package likely incorrect..should be 'lua51d.lib' - or whatever debug version is
+                '/server/vcpkg/vcpkg-export-##/installed/x##-windows/&&lib/lua51.lib!!'
+                '^debug/lib/lua51.lib!!@',  # 'vcpkg'
+                '',  # 'static'
+                ''  # 'submodule'
+            ]
+        },
+        'boost': {
+            'include': [
+                '',  # 'NOT FOUND'
+                '',  # 'install'
+                '/server/dependencies/boost',  # 'dependencies'
+                '',  # 'libs'
+                '/server/vcpkg/vcpkg-export-##/installed/x##-windows/include',  # 'vcpkg'
+                '',  # 'static'
+                ''  # 'submodule'
+            ],
+            'source': [
+                '',  # 'NOT FOUND'
+                '',  # 'install'
+                '',  # 'dependencies'
+                '',  # 'libs'
+                '/server/vcpkg/vcpkg-export-##/installed/x##-windows/include',  # 'vcpkg'
+                '',  # 'static'
+                ''  # 'submodule'
+            ],
+            'library': [
+                '',  # 'NOT FOUND'
+                '',  # 'install'
+                '/server/dependencies/boost',  # 'dependencies'
+                '',  # 'libs'
+                '/server/vcpkg/vcpkg-export-##/installed/x##-windows/lib!!',  # 'vcpkg'
+                '',  # 'static'
+                ''  # 'submodule'
+            ]
+        },
+        'sodium': {
+            'include': [
+                '',  # 'NOT FOUND'
+                '',  # 'install'
+                '/server/dependencies/libsodium/include',  # 'dependencies'
+                '',  # 'libs'
+                '/server/vcpkg/vcpkg-export-##/installed/x##-windows/include',  # 'vcpkg'
+                '',  # 'static'
+                ''  # 'submodule'
+            ],
+            'source': [
+                '',  # 'NOT FOUND'
+                '',  # 'install'
+                '',  # 'dependencies'
+                '',  # 'libs'
+                '',  # 'vcpkg'
+                '',  # 'static'
+                ''  # 'submodule'
+            ],
+            'library': [
+                '',  # 'NOT FOUND'
+                '',  # 'install'
+                '/server/dependencies/libsodium/##/dynamic/libsodium.lib',  # 'dependencies'
+                '',  # 'libs'
+                # debug libsodium package likely incorrect..should be 'libsodiumd.lib' - or whatever debug version is
+                '/server/vcpkg/vcpkg-export-##/installed/x##-windows/&&lib/libsodium.lib!!^'
+                'debug/lib/libsodium.lib!!@',  # 'vcpkg'
+                '',  # 'static'
+                ''  # 'submodule'
+            ]
+        },
+        'openssl': {
+            'include': [
+                '',  # 'NOT FOUND'
+                '',  # 'install'
+                '/server/dependencies/openssl_x##/include',  # 'dependencies'
+                '',  # 'libs'
+                '/server/vcpkg/vcpkg-export-##/installed/x##-windows/include',  # 'vcpkg'
+                '',  # 'static'
+                ''  # 'submodule'
+            ],
+            'source': [
+                '',  # 'NOT FOUND'
+                '',  # 'install'
+                '',  # 'dependencies'
+                '',  # 'libs'
+                '',  # 'vcpkg'
+                '',  # 'static'
+                ''  # 'submodule'
+            ],
+            'library': [
+                '',  # 'NOT FOUND'
+                '',  # 'install'
+                '/server/dependencies/openssl_x##/lib/VC/&&libeay32MD.lib!!^libeay32MDd.lib!!^'
+                     'ssleay32MD.lib!!^ssleay32MDd.lib!!@',  # 'dependencies'
+                '',  # 'libs'
+                # debug openssl package likely incorrect..should be
+                # 'libeay32d.lib' and 'ssleay32d.lib' - or whatever debug versions are
+                '/server/vcpkg/vcpkg-export-##/installed/x##-windows/&&lib/libeay32.lib!!^'
+                     'lib/ssleay32.lib!!^debug/lib/libeay32.lib!!^debug/lib/ssleay32.lib!!@',  # 'vcpkg'
+                '',  # 'static'
+                ''  # 'submodule'
+            ]
+        }
+    }
+    # {[project]:{[build]:{[resource]:{[library]:{[reference]:priority}}}}}
+    context_tree = {}
+    # {[library]:priority}
+    global_priorities = {}
+    # {[build]:{[library]:priority}}
+    build_priorities = {}
+    # loop for discovering first occurence dependency sources (assumes same search precedence as compiler includes)
+    for project in project_dependencies:
+        if project not in context_tree.keys():
+            context_tree[project] = {}
+        for build in project_dependencies[project]:
+            if build not in context_tree[project].keys():
+                context_tree[project][build] = {}
+            if build not in build_priorities.keys():
+                build_priorities[build] = {}
+            for resource in project_dependencies[project][build]:
+                if resource not in context_tree[project][build].keys():
+                    context_tree[project][build][resource] = {}
+                for reference_project in project_dependencies[project][build][resource]:
+                    for path in project_dependencies[project][build][resource][reference_project]:
+                        for library in libraries:
+                            if library not in context_tree[project][build][resource].keys():
+                                context_tree[project][build][resource][library] = {}
+                            if library not in build_priorities[build].keys():
+                                build_priorities[build][library] = 0
+                            if library not in global_priorities.keys():
+                                global_priorities[library] = 0
+                            for reference in references:
+                                if reference not in context_tree[project][build][resource][library].keys():
+                                    context_tree[project][build][resource][library][reference] = 0
+                                elif not context_tree[project][build][resource][library][reference] == 0:
+                                    continue
+                                for priority in priorities:
+                                    if hints[library][reference][priority] == '':
+                                        continue
+                                    hint_found = False
+                                    for hint in hints[library][reference][priority].split('|'):
+                                        if not find_hint_in_path(hint, path) == -1:
+                                            context_tree[project][build][resource][library][reference] = priority
+                                            if context_tree[project][build][resource][library][reference] >\
+                                                    build_priorities[build][library]:
+                                                build_priorities[build][library] =\
+                                                    context_tree[project][build][resource][library][reference]
+                                            if context_tree[project][build][resource][library][reference] >\
+                                                    global_priorities[library]:
+                                                global_priorities[library] =\
+                                                    context_tree[project][build][resource][library][reference]
+                                            hint_found = True
+                                            break
+                                    if hint_found is True:
+                                        break
+    # loop for hack to fix odd behavior caused by 'FindZLIB.cmake' - ref: '../server/build/libs/zlibng/zconf.h'
+    # this does not change anything in the build files..only silences a false discrepancy due to mixing priority types
+    if global_priorities['zlib'] == 5:
+        for project in context_tree:
+            for build in context_tree[project]:
+                for resource in context_tree[project][build]:
+                    if context_tree[project][build][resource]['zlib']['source'] == 3:
+                        context_tree[project][build][resource]['zlib']['source'] = 5
+                    if context_tree[project][build][resource]['zlib']['include'] == 3:
+                        context_tree[project][build][resource]['zlib']['include'] = 5
+    # loop for dumping 'global_priorities'
+    twrite('{0}<Global>'.format(col1))
+    for library in libraries:
+        twrite('{0}<Library Name="{1}">{2}</Library>'.format(col2, library, global_priorities[library]))
+    twrite('{0}</Global>'.format(col1))
+    twrite('')
+    # loop for dumping 'build_priorities'
+    for build in build_priorities:
+        twrite('{0}<Build Type="{1}">'.format(col1, build))
+        for library in libraries:
+            twrite('{0}<Library Name="{1}">{2}</Library>'.format(col2, library, build_priorities[build][library]))
+        twrite('{0}</Build>'.format(col1))
+    twrite('')
+    # loop for dumping 'context_tree'
+    for project in context_tree:
+        twrite('{0}<Project Path="{1}">'.format(col1, project))
+        for build in context_tree[project]:
+            twrite('{0}<Built Type="{1}">'.format(col2, build))
+            for resource in context_tree[project][build]:
+                twrite('{0}<Resource Name="{1}">'.format(col3, resource))
+                for library in context_tree[project][build][resource]:
+                    twrite('{0}<Library Name="{1}">'.format(col4, library))
+                    for reference in context_tree[project][build][resource][library]:
+                        twrite(
+                            '{0}<Reference Name="{1}">{2}</Reference>'.format(
+                                col5,
+                                reference,
+                                context_tree[project][build][resource][library][reference]
+                            )
+                        )
+                    twrite('{0}</Library>'.format(col4))
+                twrite('{0}</Resource>'.format(col3))
+            twrite('{0}</Build>'.format(col2))
+        twrite('{0}</Project>'.format(col1))
+    if QUIET_REPORT is False:
+        for library in libraries:
+            rwrite(
+                '> Global Library \'{0}\' status: \'{1}\' ({2})'.format(
+                    library,
+                    priorities[global_priorities[library]],
+                    global_priorities[library]
+                )
+            )
+    # loop for identifying dependency discrepancies
+    for project in context_tree:
+        for build in context_tree[project]:
+            for resource in context_tree[project][build]:
+                for library in context_tree[project][build][resource]:
+                    if global_priorities[library] == 0:
+                        if QUIET_REPORT is False:
+                            rwrite(
+                                '> No Global Library \'{0}\' .. skipping Project:Build:Resource'
+                                ' "{1}":"{2}":"{3}"'.format(
+                                    library,
+                                    project,
+                                    build,
+                                    resource
+                                )
+                            )
+                        continue
+                    if build_priorities[build][library] == 0:
+                        if QUIET_REPORT is False:
+                            rwrite(
+                                '> No Build Library \'{0}\' .. skipping Project:Build:Resource'
+                                ' "{1}":"{2}":"{3}"'.format(
+                                    library,
+                                    project,
+                                    build,
+                                    resource
+                                )
+                            )
+                        continue
+                    for reference in context_tree[project][build][resource][library]:
+                        if context_tree[project][build][resource][library][reference] == 0:
+                            continue
+                        if not global_priorities[library] == context_tree[project][build][resource][library][reference]:
+                            rwrite(
+                                '> Global-Project Library \'{0}\' mis-match \'{1}!={2}\''
+                                ' ({3}!={4}) Project:Build:Resource "{5}":"{6}":"{7}"'.format(
+                                    library,
+                                    priorities[global_priorities[library]],
+                                    priorities[context_tree[project][build][resource][library][reference]],
+                                    global_priorities[library],
+                                    context_tree[project][build][resource][library][reference],
+                                    project,
+                                    build,
+                                    resource
+                                )
+                            )
+                        # 'builds' are allowed to have different dependencies..so, we'll start crossing at 'resource'
+                        for cross_resource in context_tree[project][build]:
+                            for cross_reference in context_tree[project][build][cross_resource][library]:
+                                if cross_resource == resource and cross_reference == reference:
+                                    continue
+                                if context_tree[project][build][cross_resource][library][cross_reference] == 0:
+                                    continue
+                                if QUIET_REPORT is False and\
+                                        not context_tree[project][build][cross_resource][library][cross_reference] ==\
+                                        context_tree[project][build][resource][library][reference]:
+                                    rwrite(
+                                        '> Project Library \'{0}\' mis-match \'{1}:{2}:{3}!={4}:{5}:{6}\''
+                                        ' ({7}!={8}) Project:Build "{9}":"{10}"'.format(
+                                            library,
+                                            resource,
+                                            reference,
+                                            priorities[context_tree[project][build][resource][library][reference]],
+                                            cross_resource,
+                                            cross_reference,
+                                            priorities[context_tree[project][build][cross_resource][library]
+                                                       [cross_reference]],
+                                            context_tree[project][build][resource][library][reference],
+                                            context_tree[project][build][cross_resource][library][cross_reference],
+                                            project,
+                                            build
+                                        )
+                                    )
+    
+    return
+
+
+def find_hint_in_path(hint, path):
+    """
+    Helper function for parsing and checking for hints in paths
+    
+    Hints strings should be split ('|') and passed as a singular hint into this function
+    
+    """
+    
+    if hint == '' or path == '':
+        return -1
+    
+    joined_index = hint.find('##')
+    pretext_index = hint.find('&&')
+    if joined_index == -1 and pretext_index == -1:
+        if '^' in hint or '@' in hint:
+            print '..malformed or improper handling of hint: \'{0}\' path: \'{1}\''.format(hint, path)
+            
+            return -1
+        
+        explicit_index = hint.find('!!')
+        if explicit_index == -1:
+            return path.find(hint)
+        
+        else:
+            explicit_hint = hint[:explicit_index]
+            found_index = path.find(explicit_hint)
+            if (len(explicit_hint) + found_index) == len(path):
+                return found_index
+        
+            else:
+                return -1
+    
+    elif (not joined_index == -1 and pretext_index == -1) or\
+            (not joined_index == -1 and not pretext_index == -1 and joined_index < pretext_index):
+        start_index = 0
+        for partial_hint in hint.split('##', 1):
+            if partial_hint == '':
+                continue
+            found_index = find_hint_in_path(partial_hint, path[start_index:])
+            if found_index == -1:
+                return found_index
+            
+            start_index = found_index + len(partial_hint)
+        
+        return start_index
+    
+    elif (joined_index == -1 and not pretext_index == -1) or\
+            (not joined_index == -1 and not pretext_index == -1 and joined_index > pretext_index):
+        pretext_hints = hint.split('&&', 1)
+        found_index = 0
+        if not pretext_hints[0] == '':
+            found_index = find_hint_in_path(pretext_hints[0], path)
+            if found_index == -1:
+                return found_index
+        
+        start_index = found_index + len(pretext_hints[0])
+        partial_hints = pretext_hints[1].split('@', 1)
+        for partial_hint in partial_hints:
+            if partial_hint == '':
+                continue
+            for alt_hint in partial_hint.split('^'):
+                if alt_hint == '':
+                    continue
+                found_index = find_hint_in_path(alt_hint, path[start_index:])
+                if found_index == 0:
+                    if not partial_hints[1] == '':
+                        print '..unhandled hint method: \'{0}\''.format(partial_hints[1])
+                    else:
+                        return found_index
+        
+        return -1
+        
+    else:
+        return -1
+
+
+def close_output_files():
+    """ Close all output files """
+    
+    while not len(out_files) == 0:
+        key = out_files.keys()[0]
+        out_files[key].close()
+        del out_files[key]
+    
+    return
+
+
+if __name__ == '__main__':
+    main()
diff --git a/utils/sql/db_update_manifest.txt b/utils/sql/db_update_manifest.txt
index 92bcfd260..4addfe6ce 100644
--- a/utils/sql/db_update_manifest.txt
+++ b/utils/sql/db_update_manifest.txt
@@ -393,7 +393,7 @@
 9137|2018_12_12_client_faction_tables.sql|SHOW TABLES LIKE 'faction_base_data'|empty|
 9138|2018_12_12_convert_to_client_functions.sql|SELECT `id` FROM `faction_list` WHERE `id` > 4999|empty|
 9139|2019_03_25_optional_npc_model.sql|SHOW COLUMNS FROM `npc_types` LIKE 'model'|empty|
-9140|2019_07_03_update_range.sql|SHOW COLUMNS FROM `npc_types` LIKE 'max_movement_update_range'|empty|
+9140|2019_07_03_update_range.sql|SHOW COLUMNS FROM `zone` LIKE 'max_movement_update_range'|empty|
 9141|2019_07_10_npc_flymode.sql|SHOW COLUMNS FROM `npc_types` LIKE 'flymode'|empty|
 
 # Upgrade conditions:
diff --git a/utils/sql/git/optional/2019_06_21_new_rule_gm_level_target.sql b/utils/sql/git/optional/2019_06_21_new_rule_gm_level_target.sql
new file mode 100644
index 000000000..c7c236df6
--- /dev/null
+++ b/utils/sql/git/optional/2019_06_21_new_rule_gm_level_target.sql
@@ -0,0 +1,2 @@
+INSERT INTO `rule_values` (`ruleset_id`, `rule_name`, `rule_value`, `notes`)
+VALUES (1, 'GM:MinStatusToLevelTarget', '100', 'GM status needed to use #level on your target');
diff --git a/utils/sql/git/optional/2019_07_13_linkdead_changes.sql b/utils/sql/git/optional/2019_07_13_linkdead_changes.sql
new file mode 100644
index 000000000..6bc6bde50
--- /dev/null
+++ b/utils/sql/git/optional/2019_07_13_linkdead_changes.sql
@@ -0,0 +1,2 @@
+UPDATE `rule_values` SET `rule_value`='90000' WHERE `rule_name`='Zone:ClientLinkdeadMS';
+INSERT INTO `rule_values` (`ruleset_id`, `rule_name`, `rule_value`, `notes`) VALUES (1, 'DisallowDuplicateAccountLogins', 'true', 'Requires account logins to be unique.');
diff --git a/world/adventure.cpp b/world/adventure.cpp
index c984fa831..3b784cd6e 100644
--- a/world/adventure.cpp
+++ b/world/adventure.cpp
@@ -122,7 +122,7 @@ bool Adventure::Process()
 		else if(status == AS_WaitingForPrimaryEndTime)
 		{
 			//Do partial failure: send a message to the clients that they can only get a certain amount of points.
-			SendAdventureMessage(13, "You failed to complete your adventure in time. Complete your adventure goal within 30 minutes to "
+			SendAdventureMessage(Chat::Red, "You failed to complete your adventure in time. Complete your adventure goal within 30 minutes to "
 				"receive a lesser reward. This adventure will end in 30 minutes and your party will be ejected from the dungeon.");
 			SetStatus(AS_WaitingForSecondaryEndTime);
 		}
@@ -287,7 +287,7 @@ void Adventure::Finished(AdventureWinStatus ws)
 		ClientListEntry *current = client_list.FindCharacter((*iter).c_str());
 		if(current)
 		{
-			if(current->Online() == CLE_Status_InZone)
+			if(current->Online() == CLE_Status::InZone)
 			{
 				//We can send our packets only.
 				auto pack =
diff --git a/world/client.cpp b/world/client.cpp
index 92c119bfc..437d979f6 100644
--- a/world/client.cpp
+++ b/world/client.cpp
@@ -88,7 +88,6 @@ extern volatile bool UCSServerAvailable_;
 
 Client::Client(EQStreamInterface* ieqs)
 :	autobootup_timeout(RuleI(World, ZoneAutobootTimeoutMS)),
-	CLE_keepalive_timer(RuleI(World, ClientKeepaliveTimeoutMS)),
 	connect(1000),
 	eqs(ieqs)
 {
@@ -105,6 +104,7 @@ Client::Client(EQStreamInterface* ieqs)
 	char_name[0] = 0;
 	charid = 0;
 	zone_waiting_for_bootup = 0;
+	enter_world_triggered = false;
 	StartInTutorial = false;
 
 	m_ClientVersion = eqs->ClientVersion();
@@ -115,7 +115,7 @@ Client::Client(EQStreamInterface* ieqs)
 
 Client::~Client() {
 	if (RunLoops && cle && zone_id == 0)
-		cle->SetOnline(CLE_Status_Offline);
+		cle->SetOnline(CLE_Status::Offline);
 
 	numclients--;
 
@@ -185,7 +185,7 @@ void Client::SendExpansionInfo() {
 
 void Client::SendCharInfo() {
 	if (cle) {
-		cle->SetOnline(CLE_Status_CharSelect);
+		cle->SetOnline(CLE_Status::CharSelect);
 	}
 
 	if (m_ClientVersionBit & EQEmu::versions::maskRoFAndLater) {
@@ -461,7 +461,7 @@ bool Client::HandleSendLoginInfoPacket(const EQApplicationPacket *app) {
 			// Track who is in and who is out of the game
 			char *inout= (char *) "";
 			
-			if (cle->GetOnline() == CLE_Status_Never){
+			if (cle->GetOnline() == CLE_Status::Never){
 				// Desktop -> Char Select
 				inout = (char *) "In";
 			}
@@ -474,7 +474,7 @@ bool Client::HandleSendLoginInfoPacket(const EQApplicationPacket *app) {
 			// Either from a fresh client launch or coming back from the game.
 			// Exiting the game entirely does not come through here.
 			// Could use a Logging Out Completely message somewhere.
-			cle->SetOnline(CLE_Status_CharSelect);
+			cle->SetOnline(CLE_Status::CharSelect);
 			
 			Log(Logs::General, Logs::World_Server, 
 				"Account (%s) Logging(%s) to character select :: LSID: %d ", 
@@ -1076,7 +1076,7 @@ bool Client::HandlePacket(const EQApplicationPacket *app) {
 		{
 			// I don't see this getting executed on logout
 			eqs->Close();
-			cle->SetOnline(CLE_Status_Offline); //allows this player to log in again without an ip restriction.
+			cle->SetOnline(CLE_Status::Offline); //allows this player to log in again without an ip restriction.
 			return false;
 		}
 		case OP_ZoneChange:
@@ -1119,15 +1119,15 @@ bool Client::Process() {
 		Log(Logs::General, Logs::World_Server, "Zone bootup timer expired, bootup failed or too slow.");
 		TellClientZoneUnavailable();
 	}
+
 	if(connect.Check()){
 		SendGuildList();// Send OPCode: OP_GuildsList
 		SendApproveWorld();
 		connect.Disable();
 	}
-	if (CLE_keepalive_timer.Check()) {
-		if (cle)
-			cle->KeepAlive();
-	}
+
+	if (cle)
+		cle->KeepAlive();
 
 	/************ Get all packets from packet manager out queue and process them ************/
 	EQApplicationPacket *app = 0;
@@ -1191,11 +1191,18 @@ void Client::EnterWorld(bool TryBootup) {
 	else
 		zone_server = zoneserver_list.FindByZoneID(zone_id);
 
-
 	const char *zone_name = database.GetZoneName(zone_id, true);
 	if (zone_server) {
-		// warn the world we're comming, so it knows not to shutdown
-		zone_server->IncomingClient(this);
+		if (false == enter_world_triggered) {
+			//Drop any clients we own in other zones.
+			zoneserver_list.DropClient(GetLSID(), zone_server);
+
+			// warn the zone we're coming
+			zone_server->IncomingClient(this);
+
+			//tell the server not to trigger this multiple times before we get a zone unavailable
+			enter_world_triggered = true;
+		}
 	}
 	else {
 		if (TryBootup) {
@@ -1214,9 +1221,17 @@ void Client::EnterWorld(bool TryBootup) {
 			return;
 		}
 	}
+
 	zone_waiting_for_bootup = 0;
 
-	if(!cle) {
+	if (GetAdmin() < 80 && zoneserver_list.IsZoneLocked(zone_id)) {
+		Log(Logs::General, Logs::World_Server, "Enter world failed. Zone is locked.");
+		TellClientZoneUnavailable();
+		return;
+	}
+
+	if (!cle) {
+		TellClientZoneUnavailable();
 		return;
 	}
 
@@ -1233,12 +1248,6 @@ void Client::EnterWorld(bool TryBootup) {
 	);
 
 	if (seen_character_select) {
-		if (GetAdmin() < 80 && zoneserver_list.IsZoneLocked(zone_id)) {
-			Log(Logs::General, Logs::World_Server, "Enter world failed. Zone is locked.");
-			TellClientZoneUnavailable();
-			return;
-		}
-
 		auto pack = new ServerPacket;
 		pack->opcode = ServerOP_AcceptWorldEntrance;
 		pack->size = sizeof(WorldToZone_Struct);
@@ -1344,7 +1353,7 @@ void Client::Clearance(int8 response)
 	safe_delete(outapp);
 
 	if (cle)
-		cle->SetOnline(CLE_Status_Zoning);
+		cle->SetOnline(CLE_Status::Zoning);
 }
 
 void Client::TellClientZoneUnavailable() {
@@ -1358,6 +1367,7 @@ void Client::TellClientZoneUnavailable() {
 
 	zone_id = 0;
 	zone_waiting_for_bootup = 0;
+	enter_world_triggered = false;
 	autobootup_timeout.Disable();
 }
 
diff --git a/world/client.h b/world/client.h
index d36dc692d..4dbad85c5 100644
--- a/world/client.h
+++ b/world/client.h
@@ -82,6 +82,7 @@ private:
 	bool	is_player_zoning;
 	Timer	autobootup_timeout;
 	uint32	zone_waiting_for_bootup;
+	bool	enter_world_triggered;
 
 	bool StartInTutorial;
 	EQEmu::versions::ClientVersion m_ClientVersion;
@@ -94,7 +95,6 @@ private:
 	void SetClassLanguages(PlayerProfile_Struct *pp);
 
 	ClientListEntry* cle;
-	Timer	CLE_keepalive_timer;
 	Timer	connect;
 	bool firstlogin;
 	bool seen_character_select;
diff --git a/world/cliententry.cpp b/world/cliententry.cpp
index be8916676..d9ae26730 100644
--- a/world/cliententry.cpp
+++ b/world/cliententry.cpp
@@ -73,7 +73,7 @@ ClientListEntry::ClientListEntry(uint32 in_id, uint32 iAccID, const char* iAccNa
 	memset(pLFGComments, 0, 64);
 }
 
-ClientListEntry::ClientListEntry(uint32 in_id, ZoneServer* iZS, ServerClientList_Struct* scl, int8 iOnline)
+ClientListEntry::ClientListEntry(uint32 in_id, ZoneServer* iZS, ServerClientList_Struct* scl, CLE_Status iOnline)
 : id(in_id)
 {
 	ClearVars(true);
@@ -94,7 +94,7 @@ ClientListEntry::ClientListEntry(uint32 in_id, ZoneServer* iZS, ServerClientList
 	pLFGMatchFilter = false;
 	memset(pLFGComments, 0, 64);
 
-	if (iOnline >= CLE_Status_Zoning)
+	if (iOnline >= CLE_Status::Zoning)
 		Update(iZS, scl, iOnline);
 	else
 		SetOnline(iOnline);
@@ -115,22 +115,24 @@ void ClientListEntry::SetChar(uint32 iCharID, const char* iCharName) {
 	strn0cpy(pname, iCharName, sizeof(pname));
 }
 
-void ClientListEntry::SetOnline(ZoneServer* iZS, int8 iOnline) {
+void ClientListEntry::SetOnline(ZoneServer* iZS, CLE_Status iOnline) {
 	if (iZS == this->Server())
 		SetOnline(iOnline);
 }
 
-void ClientListEntry::SetOnline(int8 iOnline) {
-	if (iOnline >= CLE_Status_Online && pOnline < CLE_Status_Online)
+void ClientListEntry::SetOnline(CLE_Status iOnline) {
+	Log(Logs::General, Logs::World_Server, "ClientListEntry::SetOnline for %s(%i) = %i", AccountName(), AccountID(), iOnline);
+
+	if (iOnline >= CLE_Status::Online && pOnline < CLE_Status::Online)
 		numplayers++;
-	else if (iOnline < CLE_Status_Online && pOnline >= CLE_Status_Online) {
+	else if (iOnline < CLE_Status::Online && pOnline >= CLE_Status::Online) {
 		numplayers--;
 	}
-	if (iOnline != CLE_Status_Online || pOnline < CLE_Status_Online)
+	if (iOnline != CLE_Status::Online || pOnline < CLE_Status::Online)
 		pOnline = iOnline;
-	if (iOnline < CLE_Status_Zoning)
+	if (iOnline < CLE_Status::Zoning)
 		Camp();
-	if (pOnline >= CLE_Status_Online)
+	if (pOnline >= CLE_Status::Online)
 		stale = 0;
 }
 void ClientListEntry::LSUpdate(ZoneServer* iZS){
@@ -161,7 +163,7 @@ void ClientListEntry::LSZoneChange(ZoneToZone_Struct* ztz){
 		safe_delete(pack);
 	}
 }
-void ClientListEntry::Update(ZoneServer* iZS, ServerClientList_Struct* scl, int8 iOnline) {
+void ClientListEntry::Update(ZoneServer* iZS, ServerClientList_Struct* scl, CLE_Status iOnline) {
 	if (pzoneserver != iZS) {
 		if (pzoneserver){
 			pzoneserver->RemovePlayer();
@@ -208,7 +210,7 @@ void ClientListEntry::Update(ZoneServer* iZS, ServerClientList_Struct* scl, int8
 	SetOnline(iOnline);
 }
 
-void ClientListEntry::LeavingZone(ZoneServer* iZS, int8 iOnline) {
+void ClientListEntry::LeavingZone(ZoneServer* iZS, CLE_Status iOnline) {
 	if (iZS != 0 && iZS != pzoneserver)
 		return;
 	SetOnline(iOnline);
@@ -223,7 +225,7 @@ void ClientListEntry::LeavingZone(ZoneServer* iZS, int8 iOnline) {
 
 void ClientListEntry::ClearVars(bool iAll) {
 	if (iAll) {
-		pOnline = CLE_Status_Never;
+		pOnline = CLE_Status::Never;
 		stale = 0;
 
 		pLSID = 0;
@@ -269,10 +271,10 @@ void ClientListEntry::Camp(ZoneServer* iZS) {
 bool ClientListEntry::CheckStale() {
 	stale++;
 	if (stale > 20) {
-		if (pOnline > CLE_Status_Offline)
-			SetOnline(CLE_Status_Offline);
-		else
-			return true;
+		if (pOnline > CLE_Status::Offline)
+			SetOnline(CLE_Status::Offline);
+
+		return true;
 	}
 	return false;
 }
diff --git a/world/cliententry.h b/world/cliententry.h
index 24a837ae9..725b7df0d 100644
--- a/world/cliententry.h
+++ b/world/cliententry.h
@@ -8,13 +8,15 @@
 #include "../common/rulesys.h"
 #include <vector>
 
-
-#define CLE_Status_Never		-1
-#define CLE_Status_Offline		0
-#define CLE_Status_Online		1	// Will not overwrite more specific online status
-#define CLE_Status_CharSelect	2
-#define CLE_Status_Zoning		3
-#define CLE_Status_InZone		4
+typedef enum
+{
+	Never,
+	Offline,
+	Online,
+	CharSelect,
+	Zoning,
+	InZone
+} CLE_Status;
 
 class ZoneServer;
 struct ServerClientList_Struct;
@@ -23,25 +25,25 @@ class ClientListEntry {
 public:
 	ClientListEntry(uint32 id, uint32 iLSID, const char* iLoginName, const char* iLoginKey, int16 iWorldAdmin = 0, uint32 ip = 0, uint8 local=0);
 	ClientListEntry(uint32 id, uint32 iAccID, const char* iAccName, MD5& iMD5Pass, int16 iAdmin = 0);
-	ClientListEntry(uint32 id, ZoneServer* iZS, ServerClientList_Struct* scl, int8 iOnline);
+	ClientListEntry(uint32 id, ZoneServer* iZS, ServerClientList_Struct* scl, CLE_Status iOnline);
 	~ClientListEntry();
 	bool	CheckStale();
-	void	Update(ZoneServer* zoneserver, ServerClientList_Struct* scl, int8 iOnline = CLE_Status_InZone);
+	void	Update(ZoneServer* zoneserver, ServerClientList_Struct* scl, CLE_Status iOnline = CLE_Status::InZone);
 	void	LSUpdate(ZoneServer* zoneserver);
 	void	LSZoneChange(ZoneToZone_Struct* ztz);
 	bool	CheckAuth(uint32 iLSID, const char* key);
 	bool	CheckAuth(const char* iName, MD5& iMD5Password);
 	bool	CheckAuth(uint32 id, const char* key, uint32 ip);
-	void	SetOnline(ZoneServer* iZS, int8 iOnline);
-	void	SetOnline(int8 iOnline = CLE_Status_Online);
+	void	SetOnline(ZoneServer* iZS, CLE_Status iOnline);
+	void	SetOnline(CLE_Status iOnline = CLE_Status::Online);
 	void	SetChar(uint32 iCharID, const char* iCharName);
-	inline int8		Online()		{ return pOnline; }
+	inline CLE_Status Online()		{ return pOnline; }
 	inline const uint32	GetID() const	{ return id; }
 	inline const uint32	GetIP() const	{ return pIP; }
 	inline void			SetIP(const uint32& iIP) { pIP = iIP; }
 	inline void			KeepAlive()		{ stale = 0; }
 	inline uint8			GetStaleCounter() const { return stale; }
-	void	LeavingZone(ZoneServer* iZS = 0, int8 iOnline = CLE_Status_Offline);
+	void	LeavingZone(ZoneServer* iZS = 0, CLE_Status iOnline = CLE_Status::Offline);
 	void	Camp(ZoneServer* iZS = 0);
 
 	// Login Server stuff
@@ -50,7 +52,7 @@ public:
 	inline const char*	LSName() const		{ return plsname; }
 	inline int16		WorldAdmin() const	{ return pworldadmin; }
 	inline const char*	GetLSKey() const	{ return plskey; }
-	inline const int8	GetOnline() const	{ return pOnline; }
+	inline const CLE_Status	GetOnline() const	{ return pOnline; }
 
 	// Account stuff
 	inline uint32		AccountID() const		{ return paccountid; }
@@ -93,7 +95,7 @@ private:
 
 	const uint32	id;
 	uint32	pIP;
-	int8	pOnline;
+	CLE_Status pOnline;
 	uint8	stale;
 
 	// Login Server stuff
diff --git a/world/clientlist.cpp b/world/clientlist.cpp
index 96dd45076..cb05e707d 100644
--- a/world/clientlist.cpp
+++ b/world/clientlist.cpp
@@ -41,7 +41,7 @@ extern ZSList			zoneserver_list;
 uint32 numplayers = 0;	//this really wants to be a member variable of ClientList...
 
 ClientList::ClientList()
-: CLStale_timer(45000)
+: CLStale_timer(10000)
 {
 	NextCLEID = 1;
 
@@ -64,8 +64,6 @@ void ClientList::Process() {
 			struct in_addr in;
 			in.s_addr = iterator.GetData()->GetIP();
 			Log(Logs::Detail, Logs::World_Server,"Removing client from %s:%d", inet_ntoa(in), iterator.GetData()->GetPort());
-//the client destructor should take care of this.
-//			iterator.GetData()->Free();
 			iterator.RemoveCurrent();
 		}
 		else
@@ -99,52 +97,6 @@ ClientListEntry* ClientList::GetCLE(uint32 iID) {
 	return 0;
 }
 
-//Account Limiting Code to limit the number of characters allowed on from a single account at once.
-void ClientList::EnforceSessionLimit(uint32 iLSAccountID) {
-
-	ClientListEntry* ClientEntry = 0;
-
-	LinkedListIterator<ClientListEntry*> iterator(clientlist, BACKWARD);
-
-	int CharacterCount = 0;
-
-	iterator.Reset();
-
-	while(iterator.MoreElements()) {
-
-		ClientEntry = iterator.GetData();
-
-		if ((ClientEntry->LSAccountID() == iLSAccountID) &&
-			((ClientEntry->Admin() <= (RuleI(World, ExemptAccountLimitStatus))) || (RuleI(World, ExemptAccountLimitStatus) < 0))) {
-
-			CharacterCount++;
-
-			if (CharacterCount >= (RuleI(World, AccountSessionLimit))){
-				// If we have a char name, they are in a zone, so send a kick to the zone server
-				if(strlen(ClientEntry->name())) {
-
-					auto pack =
-					    new ServerPacket(ServerOP_KickPlayer, sizeof(ServerKickPlayer_Struct));
-					ServerKickPlayer_Struct* skp = (ServerKickPlayer_Struct*) pack->pBuffer;
-					strcpy(skp->adminname, "SessionLimit");
-					strcpy(skp->name, ClientEntry->name());
-					skp->adminrank = 255;
-					zoneserver_list.SendPacket(pack);
-					safe_delete(pack);
-				}
-
-				ClientEntry->SetOnline(CLE_Status_Offline);
-
-				iterator.RemoveCurrent();
-
-				continue;
-			}
-		}
-		iterator.Advance();
-	}
-}
-
-
 //Check current CLE Entry IPs against incoming connection
 
 void ClientList::GetCLEIP(uint32 iIP) {
@@ -168,7 +120,7 @@ void ClientList::GetCLEIP(uint32 iIP) {
 						return;
 					} else {
 						Log(Logs::General, Logs::Client_Login, "Disconnect: Account %s on IP %s.", countCLEIPs->LSName(), long2ip(countCLEIPs->GetIP()).c_str());
-						countCLEIPs->SetOnline(CLE_Status_Offline);
+						countCLEIPs->SetOnline(CLE_Status::Offline);
 						iterator.RemoveCurrent();
 						continue;
 					}
@@ -184,7 +136,7 @@ void ClientList::GetCLEIP(uint32 iIP) {
 								return;
 							} else {
 								Log(Logs::General, Logs::Client_Login, "Disconnect: Account %s on IP %s.", countCLEIPs->LSName(), long2ip(countCLEIPs->GetIP()).c_str());
-								countCLEIPs->SetOnline(CLE_Status_Offline); // Remove the connection
+								countCLEIPs->SetOnline(CLE_Status::Offline); // Remove the connection
 								iterator.RemoveCurrent();
 								continue;
 							}
@@ -196,7 +148,7 @@ void ClientList::GetCLEIP(uint32 iIP) {
 							return;
 						} else {
 							Log(Logs::General, Logs::Client_Login, "Disconnect: Account %s on IP %s.", countCLEIPs->LSName(), long2ip(countCLEIPs->GetIP()).c_str());
-							countCLEIPs->SetOnline(CLE_Status_Offline); // Remove the connection
+							countCLEIPs->SetOnline(CLE_Status::Offline); // Remove the connection
 							iterator.RemoveCurrent();
 							continue;
 						}
@@ -207,7 +159,7 @@ void ClientList::GetCLEIP(uint32 iIP) {
 							return;
 						} else {
 							Log(Logs::General, Logs::Client_Login, "Disconnect: Account %s on IP %s.", countCLEIPs->LSName(), long2ip(countCLEIPs->GetIP()).c_str());
-							countCLEIPs->SetOnline(CLE_Status_Offline); // Remove the connection
+							countCLEIPs->SetOnline(CLE_Status::Offline); // Remove the connection
 							iterator.RemoveCurrent();
 							continue;
 						}
@@ -228,7 +180,7 @@ uint32 ClientList::GetCLEIPCount(uint32 iIP) {
 
 	while (iterator.MoreElements()) {
 		countCLEIPs = iterator.GetData();
-		if ((countCLEIPs->GetIP() == iIP) && ((countCLEIPs->Admin() < (RuleI(World, ExemptMaxClientsStatus))) || (RuleI(World, ExemptMaxClientsStatus) < 0)) && countCLEIPs->Online() >= CLE_Status_Online) { // If the IP matches, and the connection admin status is below the exempt status, or exempt status is less than 0 (no-one is exempt)
+		if ((countCLEIPs->GetIP() == iIP) && ((countCLEIPs->Admin() < (RuleI(World, ExemptMaxClientsStatus))) || (RuleI(World, ExemptMaxClientsStatus) < 0)) && countCLEIPs->Online() >= CLE_Status::Online) { // If the IP matches, and the connection admin status is below the exempt status, or exempt status is less than 0 (no-one is exempt)
 			IPInstances++; // Increment the occurences of this IP address
 		}
 		iterator.Advance();
@@ -254,7 +206,7 @@ void ClientList::DisconnectByIP(uint32 iIP) {
 				zoneserver_list.SendPacket(pack);
 				safe_delete(pack);
 			}
-			countCLEIPs->SetOnline(CLE_Status_Offline);
+			countCLEIPs->SetOnline(CLE_Status::Offline);
 			iterator.RemoveCurrent();
 		}
 		iterator.Advance();
@@ -272,7 +224,7 @@ ClientListEntry* ClientList::FindCharacter(const char* name) {
 		}
 		iterator.Advance();
 	}
-	return 0;
+	return nullptr;
 }
 
 ClientListEntry* ClientList::FindCLEByAccountID(uint32 iAccID) {
@@ -285,7 +237,7 @@ ClientListEntry* ClientList::FindCLEByAccountID(uint32 iAccID) {
 		}
 		iterator.Advance();
 	}
-	return 0;
+	return nullptr;
 }
 
 ClientListEntry* ClientList::FindCLEByCharacterID(uint32 iCharID) {
@@ -298,7 +250,7 @@ ClientListEntry* ClientList::FindCLEByCharacterID(uint32 iCharID) {
 		}
 		iterator.Advance();
 	}
-	return 0;
+	return nullptr;
 }
 
 void ClientList::SendCLEList(const int16& admin, const char* to, WorldTCPConnection* connection, const char* iName) {
@@ -376,10 +328,10 @@ void ClientList::ClientUpdate(ZoneServer* zoneserver, ServerClientList_Struct* s
 		if (iterator.GetData()->GetID() == scl->wid) {
 			cle = iterator.GetData();
 			if (scl->remove == 2){
-				cle->LeavingZone(zoneserver, CLE_Status_Offline);
+				cle->LeavingZone(zoneserver, CLE_Status::Offline);
 			}
 			else if (scl->remove == 1)
-				cle->LeavingZone(zoneserver, CLE_Status_Zoning);
+				cle->LeavingZone(zoneserver, CLE_Status::Zoning);
 			else
 				cle->Update(zoneserver, scl);
 			return;
@@ -387,11 +339,11 @@ void ClientList::ClientUpdate(ZoneServer* zoneserver, ServerClientList_Struct* s
 		iterator.Advance();
 	}
 	if (scl->remove == 2)
-		cle = new ClientListEntry(GetNextCLEID(), zoneserver, scl, CLE_Status_Online);
+		cle = new ClientListEntry(GetNextCLEID(), zoneserver, scl, CLE_Status::Online);
 	else if (scl->remove == 1)
-		cle = new ClientListEntry(GetNextCLEID(), zoneserver, scl, CLE_Status_Zoning);
+		cle = new ClientListEntry(GetNextCLEID(), zoneserver, scl, CLE_Status::Zoning);
 	else
-		cle = new ClientListEntry(GetNextCLEID(), zoneserver, scl, CLE_Status_InZone);
+		cle = new ClientListEntry(GetNextCLEID(), zoneserver, scl, CLE_Status::InZone);
 	clientlist.Insert(cle);
 	zoneserver->ChangeWID(scl->charid, cle->GetID());
 }
@@ -571,7 +523,7 @@ void ClientList::SendWhoAll(uint32 fromid,const char* to, int16 admin, Who_All_S
 		countcle = countclients.GetData();
 		const char* tmpZone = database.GetZoneName(countcle->zone());
 		if (
-	(countcle->Online() >= CLE_Status_Zoning) &&
+	(countcle->Online() >= CLE_Status::Zoning) &&
 	(!countcle->GetGM() || countcle->Anon() != 1 || admin >= countcle->Admin()) &&
 	(whom == 0 || (
 		((countcle->Admin() >= 80 && countcle->GetGM()) || whom->gmlookup == 0xFFFF) &&
@@ -651,7 +603,7 @@ void ClientList::SendWhoAll(uint32 fromid,const char* to, int16 admin, Who_All_S
 
 		const char* tmpZone = database.GetZoneName(cle->zone());
 		if (
-	(cle->Online() >= CLE_Status_Zoning) &&
+	(cle->Online() >= CLE_Status::Zoning) &&
 	(!cle->GetGM() || cle->Anon() != 1 || admin >= cle->Admin()) &&
 	(whom == 0 || (
 		((cle->Admin() >= 80 && cle->GetGM()) || whom->gmlookup == 0xFFFF) &&
@@ -824,7 +776,7 @@ void ClientList::SendFriendsWho(ServerFriendsWho_Struct *FriendsWho, WorldTCPCon
 		Friend_[Seperator - FriendsPointer] = 0;
 
 		ClientListEntry* CLE = FindCharacter(Friend_);
-		if(CLE && CLE->name() && (CLE->Online() >= CLE_Status_Zoning) && !(CLE->GetGM() && CLE->Anon())) {
+		if(CLE && CLE->name() && (CLE->Online() >= CLE_Status::Zoning) && !(CLE->GetGM() && CLE->Anon())) {
 			FriendsCLEs.push_back(CLE);
 			TotalLength += strlen(CLE->name());
 			int GuildNameLength = strlen(guild_mgr.GetGuildName(CLE->GuildID()));
@@ -1036,7 +988,7 @@ void ClientList::ConsoleSendWhoAll(const char* to, int16 admin, Who_All_Struct*
 		cle = iterator.GetData();
 		const char* tmpZone = database.GetZoneName(cle->zone());
 		if (
-			(cle->Online() >= CLE_Status_Zoning)
+			(cle->Online() >= CLE_Status::Zoning)
 			&& (whom == 0 || (
 				((cle->Admin() >= 80 && cle->GetGM()) || whom->gmlookup == 0xFFFF) &&
 				(whom->lvllow == 0xFFFF || (cle->level() >= whom->lvllow && cle->level() <= whom->lvlhigh)) &&
@@ -1310,7 +1262,32 @@ void ClientList::UpdateClientGuild(uint32 char_id, uint32 guild_id) {
 	}
 }
 
+void ClientList::RemoveCLEByLSID(uint32 iLSID)
+{
+	LinkedListIterator<ClientListEntry*> iterator(clientlist);
 
+	iterator.Reset();
+	while (iterator.MoreElements()) {
+		if (iterator.GetData()->LSAccountID() == iLSID) {
+			iterator.RemoveCurrent();
+		}
+		else
+			iterator.Advance();
+	}
+}
+
+bool ClientList::IsAccountInGame(uint32 iLSID) {
+	LinkedListIterator<ClientListEntry*> iterator(clientlist);
+
+	while (iterator.MoreElements()) {
+		if (iterator.GetData()->LSID() == iLSID && iterator.GetData()->Online() == CLE_Status::InZone) {
+			return true;
+		}
+		iterator.Advance();
+	}
+
+	return false;
+}
 
 int ClientList::GetClientCount() {
 	return(numplayers);
diff --git a/world/clientlist.h b/world/clientlist.h
index 3ca6291c2..2ed9c3971 100644
--- a/world/clientlist.h
+++ b/world/clientlist.h
@@ -61,11 +61,12 @@ public:
 	void	GetCLEIP(uint32 iIP);
 	uint32	GetCLEIPCount(uint32 iLSAccountID);
 	void	DisconnectByIP(uint32 iIP);
-	void	EnforceSessionLimit(uint32 iLSAccountID);
 	void	CLCheckStale();
 	void	CLEKeepAlive(uint32 numupdates, uint32* wid);
 	void	CLEAdd(uint32 iLSID, const char* iLoginName, const char* iLoginKey, int16 iWorldAdmin = 0, uint32 ip = 0, uint8 local=0);
 	void	UpdateClientGuild(uint32 char_id, uint32 guild_id);
+	void	RemoveCLEByLSID(uint32 iLSID);
+	bool    IsAccountInGame(uint32 iLSID);
 
 	int GetClientCount();
 	void GetClients(const char *zone_name, std::vector<ClientListEntry *> &into);
diff --git a/world/login_server.cpp b/world/login_server.cpp
index b642e77ad..02e9fdbab 100644
--- a/world/login_server.cpp
+++ b/world/login_server.cpp
@@ -35,6 +35,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #include "worlddb.h"
 #include "zonelist.h"
 #include "clientlist.h"
+#include "cliententry.h"
 #include "world_config.h"
 
 extern ZSList zoneserver_list;
@@ -65,38 +66,54 @@ void LoginServer::ProcessUsertoWorldReq(uint16_t opcode, EQ::Net::Packet &p) {
 	uint32 id = database.GetAccountIDFromLSID(utwr->lsaccountid);
 	int16 status = database.CheckStatus(id);
 
-	auto outpack = new ServerPacket;
-	outpack->opcode = ServerOP_UsertoWorldResp;
-	outpack->size = sizeof(UsertoWorldResponse_Struct);
-	outpack->pBuffer = new uchar[outpack->size];
-	memset(outpack->pBuffer, 0, outpack->size);
-	UsertoWorldResponse_Struct* utwrs = (UsertoWorldResponse_Struct*)outpack->pBuffer;
+	ServerPacket outpack;
+	outpack.opcode = ServerOP_UsertoWorldResp;
+	outpack.size = sizeof(UsertoWorldResponse_Struct);
+	outpack.pBuffer = new uchar[outpack.size];
+	memset(outpack.pBuffer, 0, outpack.size);
+	UsertoWorldResponse_Struct* utwrs = (UsertoWorldResponse_Struct*)outpack.pBuffer;
 	utwrs->lsaccountid = utwr->lsaccountid;
 	utwrs->ToID = utwr->FromID;
+	utwrs->worldid = utwr->worldid;
+	utwrs->response = UserToWorldStatusSuccess;
 
 	if (Config->Locked == true)
 	{
-		if ((status == 0 || status < 100) && (status != -2 || status != -1))
-			utwrs->response = 0;
-		if (status >= 100)
-			utwrs->response = 1;
-	}
-	else {
-		utwrs->response = 1;
+		if (status < 100) {
+			utwrs->response = UserToWorldStatusWorldUnavail;
+			SendPacket(&outpack);
+			return;
+		}
 	}
 
 	int32 x = Config->MaxClients;
-	if ((int32)numplayers >= x && x != -1 && x != 255 && status < 80)
-		utwrs->response = -3;
+	if ((int32)numplayers >= x && x != -1 && x != 255 && status < 80) {
+		utwrs->response = UserToWorldStatusWorldAtCapacity;
+		SendPacket(&outpack);
+		return;
+	}
 
-	if (status == -1)
-		utwrs->response = -1;
-	if (status == -2)
-		utwrs->response = -2;
+	if (status == -1) {
+		utwrs->response = UserToWorldStatusSuspended;
+		SendPacket(&outpack);
+		return;
+	}
 
-	utwrs->worldid = utwr->worldid;
-	SendPacket(outpack);
-	delete outpack;
+	if (status == -2) {
+		utwrs->response = UserToWorldStatusBanned;
+		SendPacket(&outpack);
+		return;
+	}
+
+	if (RuleB(World, EnforceCharacterLimitAtLogin)) {
+		if (client_list.IsAccountInGame(utwr->lsaccountid)) {
+			utwrs->response = UserToWorldStatusAlreadyOnline;
+			SendPacket(&outpack);
+			return;
+		}
+	}
+
+	SendPacket(&outpack);
 }
 
 void LoginServer::ProcessLSClientAuth(uint16_t opcode, EQ::Net::Packet &p) {
@@ -105,13 +122,6 @@ void LoginServer::ProcessLSClientAuth(uint16_t opcode, EQ::Net::Packet &p) {
 
 	try {
 		auto slsca = p.GetSerialize<ClientAuth_Struct>(0);
-
-		if (RuleI(World, AccountSessionLimit) >= 0) {
-			// Enforce the limit on the number of characters on the same account that can be
-			// online at the same time.
-			client_list.EnforceSessionLimit(slsca.lsaccount_id);
-		}
-
 		client_list.CLEAdd(slsca.lsaccount_id, slsca.name, slsca.key, slsca.worldadmin, slsca.ip, slsca.local);
 	}
 	catch (std::exception &ex) {
diff --git a/world/net.cpp b/world/net.cpp
index b57a0cefe..0c24067d4 100644
--- a/world/net.cpp
+++ b/world/net.cpp
@@ -123,7 +123,7 @@ int main(int argc, char** argv) {
 	if (!std::ifstream("eqemu_config.json")) {
 		CheckForServerScript(true);
 		/* Run EQEmu Server script (Checks for database updates) */
-		system("perl eqemu_server.pl convert_xml");
+		if(system("perl eqemu_server.pl convert_xml"));
 	}
 	else {
 		/* Download EQEmu Server Maintenance Script if doesn't exist */
@@ -627,9 +627,9 @@ void CheckForServerScript(bool force_download) {
 
 		std::cout << "Pulling down EQEmu Server Maintenance Script (eqemu_server.pl)..." << std::endl;
 #ifdef _WIN32
-		system("perl -MLWP::UserAgent -e \"require LWP::UserAgent;  my $ua = LWP::UserAgent->new; $ua->timeout(10); $ua->env_proxy; my $response = $ua->get('https://raw.githubusercontent.com/EQEmu/Server/master/utils/scripts/eqemu_server.pl'); if ($response->is_success){ open(FILE, '> eqemu_server.pl'); print FILE $response->decoded_content; close(FILE); }\"");
+		if(system("perl -MLWP::UserAgent -e \"require LWP::UserAgent;  my $ua = LWP::UserAgent->new; $ua->timeout(10); $ua->env_proxy; my $response = $ua->get('https://raw.githubusercontent.com/EQEmu/Server/master/utils/scripts/eqemu_server.pl'); if ($response->is_success){ open(FILE, '> eqemu_server.pl'); print FILE $response->decoded_content; close(FILE); }\""));
 #else
-		system("wget -N --no-check-certificate --quiet -O eqemu_server.pl https://raw.githubusercontent.com/EQEmu/Server/master/utils/scripts/eqemu_server.pl");
+		if(system("wget -N --no-check-certificate --quiet -O eqemu_server.pl https://raw.githubusercontent.com/EQEmu/Server/master/utils/scripts/eqemu_server.pl"));
 #endif
 	}
 }
diff --git a/world/zonelist.cpp b/world/zonelist.cpp
index 84cd87842..77782ee9b 100644
--- a/world/zonelist.cpp
+++ b/world/zonelist.cpp
@@ -708,6 +708,18 @@ void ZSList::WorldShutDown(uint32 time, uint32 interval)
 	}
 }
 
+void ZSList::DropClient(uint32 lsid, ZoneServer *ignore_zoneserver) {
+	ServerPacket packet(ServerOP_DropClient, sizeof(ServerZoneDropClient_Struct));
+	auto drop = (ServerZoneDropClient_Struct*)packet.pBuffer;
+	drop->lsid = lsid;
+
+	for (auto &zs : zone_server_list) {
+		if (zs.get() != ignore_zoneserver) {
+			zs->SendPacket(&packet);
+		}
+	}
+}
+
 void ZSList::OnTick(EQ::Timer *t)
 {
 	if (!EventSubscriptionWatcher::Get()->IsSubscribed("EQW::ZoneUpdate")) {
diff --git a/world/zonelist.h b/world/zonelist.h
index 947f75a2b..8b8525f57 100644
--- a/world/zonelist.h
+++ b/world/zonelist.h
@@ -57,6 +57,7 @@ public:
 	void SOPZoneBootup(const char *adminname, uint32 ZoneServerID, const char *zonename, bool iMakeStatic = false);
 	void UpdateUCSServerAvailable(bool ucss_available = true);
 	void WorldShutDown(uint32 time, uint32 interval);
+	void DropClient(uint32 lsid, ZoneServer *ignore_zoneserver);
 
 	ZoneServer*	FindByPort(uint16 port);
 	ZoneServer* FindByID(uint32 ZoneID);
diff --git a/world/zoneserver.cpp b/world/zoneserver.cpp
index f3c6aebfc..21c5d8e65 100644
--- a/world/zoneserver.cpp
+++ b/world/zoneserver.cpp
@@ -409,12 +409,12 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
 		if (pack->size < sizeof(ServerChannelMessage_Struct))
 			break;
 		ServerChannelMessage_Struct* scm = (ServerChannelMessage_Struct*)pack->pBuffer;
-		if (scm->chan_num == 20)
+		if (scm->chan_num == ChatChannel_UCSRelay)
 		{
 			UCSLink.SendMessage(scm->from, scm->message);
 			break;
 		}
-		if (scm->chan_num == 7 || scm->chan_num == 14) {
+		if (scm->chan_num == ChatChannel_Tell || scm->chan_num == ChatChannel_TellEcho) {
 			if (scm->deliverto[0] == '*') {
 
 				if (console) {
@@ -437,7 +437,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
 			}
 
 			ClientListEntry* cle = client_list.FindCharacter(scm->deliverto);
-			if (cle == 0 || cle->Online() < CLE_Status_Zoning ||
+			if (cle == 0 || cle->Online() < CLE_Status::Zoning ||
 				(cle->TellsOff() && ((cle->Anon() == 1 && scm->fromadmin < cle->Admin()) || scm->fromadmin < 80))) {
 				if (!scm->noreply) {
 					ClientListEntry* sender = client_list.FindCharacter(scm->from);
@@ -450,7 +450,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
 					sender->Server()->SendPacket(pack);
 				}
 			}
-			else if (cle->Online() == CLE_Status_Zoning) {
+			else if (cle->Online() == CLE_Status::Zoning) {
 				if (!scm->noreply) {
 					ClientListEntry* sender = client_list.FindCharacter(scm->from);
 					if (cle->TellQueueFull()) {
@@ -486,7 +486,8 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
 				cle->Server()->SendPacket(pack);
 		}
 		else {
-			if (scm->chan_num == 5 || scm->chan_num == 6 || scm->chan_num == 11) {
+			if (scm->chan_num == ChatChannel_OOC || scm->chan_num == ChatChannel_Broadcast
+				|| scm->chan_num == ChatChannel_GMSAY) {
 				if (console) {
 					console->SendChannelMessage(scm, [&scm]() {
 						auto pack = new ServerPacket(ServerOP_ChannelMessage,
@@ -517,7 +518,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
 
 			ClientListEntry* cle = client_list.FindCharacter(svm->To);
 
-			if (!cle || (cle->Online() < CLE_Status_Zoning) || !cle->Server()) {
+			if (!cle || (cle->Online() < CLE_Status::Zoning) || !cle->Server()) {
 
 				zoneserver_list.SendEmoteMessage(svm->From, 0, 0, 0, "'%s is not online at this time'", svm->To);
 
@@ -1456,6 +1457,7 @@ void ZoneServer::IncomingClient(Client* client) {
 	s->accid = client->GetAccountID();
 	s->admin = client->GetAdmin();
 	s->charid = client->GetCharID();
+	s->lsid = client->GetLSID();
 	if (client->GetCLE())
 		s->tellsoff = client->GetCLE()->TellsOff();
 	strn0cpy(s->charname, client->GetCharName(), sizeof(s->charname));
diff --git a/zone/aa.cpp b/zone/aa.cpp
index 48ee715f7..1712dd7a0 100644
--- a/zone/aa.cpp
+++ b/zone/aa.cpp
@@ -58,7 +58,7 @@ void Mob::TemporaryPets(uint16 spell_id, Mob *targ, const char *name_override, u
 	if (!database.GetPoweredPetEntry(spells[spell_id].teleport_zone, act_power, &record))
 	{
 		Log(Logs::General, Logs::Error, "Unknown swarm pet spell id: %d, check pets table", spell_id);
-		Message(13, "Unable to find data for pet %s", spells[spell_id].teleport_zone);
+		Message(Chat::Red, "Unable to find data for pet %s", spells[spell_id].teleport_zone);
 		return;
 	}
 
@@ -489,7 +489,7 @@ void Client::ResetAA() {
 	database.DeleteCharacterLeadershipAAs(CharacterID());
 	// undefined for these clients
 	if (ClientVersionBit() & EQEmu::versions::maskTitaniumAndEarlier)
-		Kick();
+		Kick("AA Reset on client that doesn't support it");
 }
 
 void Client::SendClearAA()
@@ -1091,7 +1091,7 @@ void Client::FinishAlternateAdvancementPurchase(AA::Rank *rank, bool ignore_cost
 	SendAlternateAdvancementStats();
 
 	if(rank->prev) {
-		Message_StringID(15, AA_IMPROVE,
+		MessageString(Chat::Yellow, AA_IMPROVE,
 						 std::to_string(rank->title_sid).c_str(),
 						 std::to_string(rank->prev->current_value).c_str(),
 						 std::to_string(cost).c_str(),
@@ -1104,7 +1104,7 @@ void Client::FinishAlternateAdvancementPurchase(AA::Rank *rank, bool ignore_cost
 		}
 	}
 	else {
-		Message_StringID(15, AA_GAIN_ABILITY,
+		MessageString(Chat::Yellow, AA_GAIN_ABILITY,
 						 std::to_string(rank->title_sid).c_str(),
 						 std::to_string(cost).c_str(),
 						 cost == 1 ? std::to_string(AA_POINT).c_str() : std::to_string(AA_POINTS).c_str());
@@ -1179,11 +1179,11 @@ void Client::ActivateAlternateAdvancementAbility(int rank_id, int target_id) {
 		uint32 aaremain_sec = aaremain % 60;
 
 		if(aaremain_hr >= 1) {
-			Message(13, "You can use this ability again in %u hour(s) %u minute(s) %u seconds",
+			Message(Chat::Red, "You can use this ability again in %u hour(s) %u minute(s) %u seconds",
 			aaremain_hr, aaremain_min, aaremain_sec);
 		}
 		else {
-			Message(13, "You can use this ability again in %u minute(s) %u seconds",
+			Message(Chat::Red, "You can use this ability again in %u minute(s) %u seconds",
 			aaremain_min, aaremain_sec);
 		}
 
@@ -1200,7 +1200,7 @@ void Client::ActivateAlternateAdvancementAbility(int rank_id, int target_id) {
 		CommonBreakInvisible();
 
 	if (spells[rank->spell].sneak && (!hidden || (hidden && (Timer::GetCurrentTime() - tmHidden) < 4000))) {
-		Message_StringID(MT_SpellFailure, SNEAK_RESTRICT);
+		MessageString(Chat::SpellFailure, SNEAK_RESTRICT);
 		return;
 	}
 	//
@@ -1214,7 +1214,7 @@ void Client::ActivateAlternateAdvancementAbility(int rank_id, int target_id) {
 			SetAppearance(eaStanding, false);
 
 		if (GetAppearance() != eaStanding) {
-			Message_StringID(MT_SpellFailure, STAND_TO_CAST);
+			MessageString(Chat::SpellFailure, STAND_TO_CAST);
 			return;
 		}
 	}
diff --git a/zone/aggro.cpp b/zone/aggro.cpp
index 8a3da1092..490bf7bbf 100644
--- a/zone/aggro.cpp
+++ b/zone/aggro.cpp
@@ -52,12 +52,12 @@ void EntityList::CheckClientAggro(Client *around)
 void EntityList::DescribeAggro(Client *towho, NPC *from_who, float d, bool verbose) {
 	float d2 = d*d;
 
-	towho->Message(0, "Describing aggro for %s", from_who->GetName());
+	towho->Message(Chat::White, "Describing aggro for %s", from_who->GetName());
 
 	bool engaged = from_who->IsEngaged();
 	if(engaged) {
 		Mob *top = from_who->GetHateTop();
-		towho->Message(0, ".. I am currently fighting with %s", top == nullptr?"(nullptr)":top->GetName());
+		towho->Message(Chat::White, ".. I am currently fighting with %s", top == nullptr?"(nullptr)":top->GetName());
 	}
 	bool check_npcs = from_who->WillAggroNPCs();
 
@@ -77,7 +77,7 @@ void EntityList::DescribeAggro(Client *towho, NPC *from_who, float d, bool verbo
 			if(!database.GetFactionName(my_primary, namebuf, sizeof(namebuf)))
 				strcpy(namebuf, "(Unknown)");
 		}
-		towho->Message(0, ".. I am on faction %s (%d)\n", namebuf, my_primary);
+		towho->Message(Chat::White, ".. I am on faction %s (%d)\n", namebuf, my_primary);
 	}
 
 	for (auto it = mob_list.begin(); it != mob_list.end(); ++it) {
@@ -91,11 +91,11 @@ void EntityList::DescribeAggro(Client *towho, NPC *from_who, float d, bool verbo
 		if (engaged) {
 			uint32 amm = from_who->GetHateAmount(mob);
 			if (amm == 0)
-				towho->Message(0, "... %s is not on my hate list.", mob->GetName());
+				towho->Message(Chat::White, "... %s is not on my hate list.", mob->GetName());
 			else
-				towho->Message(0, "... %s is on my hate list with value %lu", mob->GetName(), (unsigned long)amm);
+				towho->Message(Chat::White, "... %s is on my hate list with value %lu", mob->GetName(), (unsigned long)amm);
 		} else if (!check_npcs && mob->IsNPC()) {
-				towho->Message(0, "... %s is an NPC and my npc_aggro is disabled.", mob->GetName());
+				towho->Message(Chat::White, "... %s is an NPC and my npc_aggro is disabled.", mob->GetName());
 		} else {
 			from_who->DescribeAggro(towho, mob, verbose);
 		}
@@ -114,13 +114,13 @@ void NPC::DescribeAggro(Client *towho, Mob *mob, bool verbose) {
 	if(( t1 > iAggroRange)
 		|| ( t2 > iAggroRange)
 		|| ( t3 > iAggroRange) ) {
-		towho->Message(0, "...%s is out of range (fast). distances (%.3f,%.3f,%.3f), range %.3f", mob->GetName(),
+		towho->Message(Chat::White, "...%s is out of range (fast). distances (%.3f,%.3f,%.3f), range %.3f", mob->GetName(),
 		t1, t2, t3, iAggroRange);
 		return;
 	}
 
 	if(mob->IsInvisible(this)) {
-		towho->Message(0, "...%s is invisible to me. ", mob->GetName());
+		towho->Message(Chat::White, "...%s is invisible to me. ", mob->GetName());
 		return;
 	}
 	if((mob->IsClient() &&
@@ -131,13 +131,13 @@ void NPC::DescribeAggro(Client *towho, Mob *mob, bool verbose) {
 		)
 		))
 	{
-		towho->Message(0, "...%s is my owner. ", mob->GetName());
+		towho->Message(Chat::White, "...%s is my owner. ", mob->GetName());
 		return;
 	}
 
 
 	if(mob == GetOwner()) {
-		towho->Message(0, "...%s a GM or is not connected. ", mob->GetName());
+		towho->Message(Chat::White, "...%s a GM or is not connected. ", mob->GetName());
 		return;
 	}
 
@@ -145,7 +145,7 @@ void NPC::DescribeAggro(Client *towho, Mob *mob, bool verbose) {
 
 	float iAggroRange2 = iAggroRange*iAggroRange;
 	if( dist2 > iAggroRange2 ) {
-		towho->Message(0, "...%s is out of range. %.3f > %.3f ", mob->GetName(),
+		towho->Message(Chat::White, "...%s is out of range. %.3f > %.3f ", mob->GetName(),
 		dist2, iAggroRange2);
 		return;
 	}
@@ -154,14 +154,14 @@ void NPC::DescribeAggro(Client *towho, Mob *mob, bool verbose) {
 	{
 		if (GetLevel() < RuleI(Aggro, MinAggroLevel) && mob->GetLevelCon(GetLevel()) == CON_GRAY && GetBodyType() != 3)
 		{
-			towho->Message(0, "...%s is red to me (basically)", mob->GetName(),	dist2, iAggroRange2);
+			towho->Message(Chat::White, "...%s is red to me (basically)", mob->GetName(),	dist2, iAggroRange2);
 			return;
 		}
 	}
 	else
 	{
 		if(GetINT() > RuleI(Aggro, IntAggroThreshold) && mob->GetLevelCon(GetLevel()) == CON_GRAY ) {
-			towho->Message(0, "...%s is red to me (basically)", mob->GetName(),
+			towho->Message(Chat::White, "...%s is red to me (basically)", mob->GetName(),
 			dist2, iAggroRange2);
 			return;
 		}
@@ -178,9 +178,9 @@ void NPC::DescribeAggro(Client *towho, Mob *mob, bool verbose) {
 			mob_primary = own->GetPrimaryFaction();
 
 		if(mob_primary == 0) {
-			towho->Message(0, "...%s has no primary faction", mob->GetName());
+			towho->Message(Chat::White, "...%s has no primary faction", mob->GetName());
 		} else if(mob_primary < 0) {
-			towho->Message(0, "...%s is on special faction %d", mob->GetName(), mob_primary);
+			towho->Message(Chat::White, "...%s is on special faction %d", mob->GetName(), mob_primary);
 		} else {
 			char namebuf[256];
 			if(!database.GetFactionName(mob_primary, namebuf, sizeof(namebuf)))
@@ -193,22 +193,22 @@ void NPC::DescribeAggro(Client *towho, Mob *mob, bool verbose) {
 				struct NPCFaction* fac = *cur;
 				if ((int32)fac->factionID == mob_primary) {
 					if (fac->npc_value > 0) {
-						towho->Message(0, "...%s is on ALLY faction %s (%d) with %d", mob->GetName(), namebuf, mob_primary, fac->npc_value);
+						towho->Message(Chat::White, "...%s is on ALLY faction %s (%d) with %d", mob->GetName(), namebuf, mob_primary, fac->npc_value);
 						res = true;
 						break;
 					} else if (fac->npc_value < 0) {
-						towho->Message(0, "...%s is on ENEMY faction %s (%d) with %d", mob->GetName(), namebuf, mob_primary, fac->npc_value);
+						towho->Message(Chat::White, "...%s is on ENEMY faction %s (%d) with %d", mob->GetName(), namebuf, mob_primary, fac->npc_value);
 						res = true;
 						break;
 					} else {
-						towho->Message(0, "...%s is on NEUTRAL faction %s (%d) with 0", mob->GetName(), namebuf, mob_primary);
+						towho->Message(Chat::White, "...%s is on NEUTRAL faction %s (%d) with 0", mob->GetName(), namebuf, mob_primary);
 						res = true;
 						break;
 					}
 				}
 			}
 			if(!res) {
-				towho->Message(0, "...%s is on faction %s (%d), which I have no entry for.", mob->GetName(), namebuf, mob_primary);
+				towho->Message(Chat::White, "...%s is on faction %s (%d), which I have no entry for.", mob->GetName(), namebuf, mob_primary);
 			}
 		}
 	}
@@ -222,18 +222,18 @@ void NPC::DescribeAggro(Client *towho, Mob *mob, bool verbose) {
 			||
 			fv == FACTION_THREATENLY
 		)) {
-		towho->Message(0, "...%s faction not low enough. value='%s'", mob->GetName(), FactionValueToString(fv));
+		towho->Message(Chat::White, "...%s faction not low enough. value='%s'", mob->GetName(), FactionValueToString(fv));
 		return;
 	}
 	if(fv == FACTION_THREATENLY) {
-		towho->Message(0, "...%s threatening to me, so they only have a %d chance per check of attacking.", mob->GetName());
+		towho->Message(Chat::White, "...%s threatening to me, so they only have a %d chance per check of attacking.", mob->GetName());
 	}
 
 	if(!CheckLosFN(mob)) {
-		towho->Message(0, "...%s is out of sight.", mob->GetName());
+		towho->Message(Chat::White, "...%s is out of sight.", mob->GetName());
 	}
 
-	towho->Message(0, "...%s meets all conditions, I should be attacking them.", mob->GetName());
+	towho->Message(Chat::White, "...%s meets all conditions, I should be attacking them.", mob->GetName());
 }
 
 /*
@@ -973,11 +973,13 @@ bool Mob::CombatRange(Mob* other)
 }
 
 //Father Nitwit's LOS code
-bool Mob::CheckLosFN(Mob* other) {
+bool Mob::CheckLosFN(Mob *other)
+{
 	bool Result = false;
 
-	if(other)
+	if (other) {
 		Result = CheckLosFN(other->GetX(), other->GetY(), other->GetZ(), other->GetSize());
+	}
 
 	SetLastLosState(Result);
 
diff --git a/zone/api_service.cpp b/zone/api_service.cpp
index 957d2b012..b8ae1149e 100644
--- a/zone/api_service.cpp
+++ b/zone/api_service.cpp
@@ -225,7 +225,7 @@ Json::Value ApiGetNpcListDetail(EQ::Net::WebsocketServerConnection *connection,
 		row["sec_skill"]       = npc->GetSecSkill();
 		row["silver"]          = npc->GetSilver();
 		row["slow_mitigation"] = npc->GetSlowMitigation();
-		row["sp2"]             = npc->GetSp2();
+		row["spawn_group_id"]  = npc->GetSpawnGroupId();
 		row["swarm_owner"]     = npc->GetSwarmOwner();
 		row["swarm_target"]    = npc->GetSwarmTarget();
 		row["waypoint_max"]    = npc->GetWaypointMax();
diff --git a/zone/attack.cpp b/zone/attack.cpp
index a41d2f620..c135843a3 100644
--- a/zone/attack.cpp
+++ b/zone/attack.cpp
@@ -34,6 +34,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #include "lua_parser.h"
 #include "fastmath.h"
 #include "mob.h"
+#include "npc.h"
 
 
 #include <assert.h>
@@ -1319,7 +1320,7 @@ void Mob::DoAttack(Mob *other, DamageHitInfo &hit, ExtraAttackOptions *opts)
 	if (other->AvoidDamage(this, hit)) {
 		int strike_through = itembonuses.StrikeThrough + spellbonuses.StrikeThrough + aabonuses.StrikeThrough;
 		if (strike_through && zone->random.Roll(strike_through)) {
-			Message_StringID(MT_StrikeThrough,
+			MessageString(Chat::StrikeThrough,
 				STRIKETHROUGH_STRING); // You strike through your opponents defenses!
 			hit.damage_done = 1;			// set to one, we will check this to continue
 		}
@@ -1340,9 +1341,9 @@ void Mob::DoAttack(Mob *other, DamageHitInfo &hit, ExtraAttackOptions *opts)
 					int stun_resist2 = other->spellbonuses.FrontalStunResist + other->itembonuses.FrontalStunResist + other->aabonuses.FrontalStunResist;
 					int stun_resist = other->spellbonuses.StunResist + other->itembonuses.StunResist + other->aabonuses.StunResist;
 					if (zone->random.Roll(stun_resist2)) {
-						other->Message_StringID(MT_Stun, AVOID_STUNNING_BLOW);
+						other->MessageString(Chat::Stun, AVOID_STUNNING_BLOW);
 					} else if (zone->random.Roll(stun_resist)) {
-						other->Message_StringID(MT_Stun, SHAKE_OFF_STUN);
+						other->MessageString(Chat::Stun, SHAKE_OFF_STUN);
 					} else {
 						other->Stun(3000); // yuck -- 3 seconds
 					}
@@ -1392,7 +1393,7 @@ bool Client::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, b
 
 	if (DivineAura() && !GetGM()) {//cant attack while invulnerable unless your a gm
 		Log(Logs::Detail, Logs::Combat, "Attack canceled, Divine Aura is in effect.");
-		Message_StringID(MT_DefaultText, DIVINE_AURA_NO_ATK);	//You can't attack while invulnerable!
+		MessageString(Chat::DefaultText, DIVINE_AURA_NO_ATK);	//You can't attack while invulnerable!
 		return false;
 	}
 
@@ -1615,16 +1616,16 @@ bool Client::Death(Mob* killerMob, int32 damage, uint16 spell, EQEmu::skills::Sk
 	if (killerMob && killerMob->IsClient() && (spell != SPELL_UNKNOWN) && damage > 0) {
 		char val1[20] = { 0 };
 
-		entity_list.MessageClose_StringID(
+		entity_list.MessageCloseString(
 			this, /* Sender */
 			false, /* Skip Sender */
 			RuleI(Range, DamageMessages),
-			MT_NonMelee, /* 283 */
+			Chat::NonMelee, /* 283 */
 			HIT_NON_MELEE, /* %1 hit %2 for %3 points of non-melee damage. */
 			killerMob->GetCleanName(), /* Message1 */
 			GetCleanName(), /* Message2 */
 			ConvertArray(damage, val1)/* Message3 */
-			);
+		);
 	}
 
 	int exploss = 0;
@@ -1914,7 +1915,7 @@ bool NPC::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, bool
 	//Check that we can attack before we calc heading and face our target
 	if (!IsAttackAllowed(other)) {
 		if (this->GetOwnerID())
-			this->Say_StringID(NOT_LEGAL_TARGET);
+			this->SayString(NOT_LEGAL_TARGET);
 		if (other) {
 			if (other->IsClient())
 				other->CastToClient()->RemoveXTarget(this, false);
@@ -2129,7 +2130,7 @@ void NPC::Damage(Mob* other, int32 damage, uint16 spell_id, EQEmu::skills::Skill
 		{
 			if (IsLDoNTrapped())
 			{
-				Message_StringID(13, LDON_ACCIDENT_SETOFF2);
+				MessageString(Chat::Red, LDON_ACCIDENT_SETOFF2);
 				SpellFinished(GetLDoNTrapSpellID(), other, EQEmu::spells::CastingSlot::Item, 0, -1, spells[GetLDoNTrapSpellID()].ResistDiff, false);
 				SetLDoNTrapSpellID(0);
 				SetLDoNTrapped(false);
@@ -2169,16 +2170,16 @@ bool NPC::Death(Mob* killer_mob, int32 damage, uint16 spell, EQEmu::skills::Skil
 		if (killer_mob->IsClient() && (spell != SPELL_UNKNOWN) && damage > 0) {
 			char val1[20] = { 0 };
 
-			entity_list.MessageClose_StringID(
+			entity_list.MessageCloseString(
 				this, /* Sender */
 				false, /* Skip Sender */
 				RuleI(Range, DamageMessages),
-				MT_NonMelee, /* 283 */
+				Chat::NonMelee, /* 283 */
 				HIT_NON_MELEE, /* %1 hit %2 for %3 points of non-melee damage. */
 				killer_mob->GetCleanName(), /* Message1 */
 				GetCleanName(), /* Message2 */
 				ConvertArray(damage, val1) /* Message3 */
-				);
+			);
 		}
 	}
 	else {
@@ -3425,7 +3426,7 @@ void Mob::CommonDamage(Mob* attacker, int &damage, const uint16 spell_id, const
 
 				//we used to do a message to the client, but its gone now.
 				// emote goes with every one ... even npcs
-				entity_list.MessageClose(this, true, RuleI(Range, SpellMessages), MT_Emote, "%s beams a smile at %s", attacker->GetCleanName(), this->GetCleanName());
+				entity_list.MessageClose(this, true, RuleI(Range, SpellMessages), Chat::Emote, "%s beams a smile at %s", attacker->GetCleanName(), this->GetCleanName());
 			}
 		}	//end `if there is some damage being done and theres anattacker person involved`
 
@@ -3439,7 +3440,7 @@ void Mob::CommonDamage(Mob* attacker, int &damage, const uint16 spell_id, const
 				Log(Logs::Detail, Logs::Aggro, "Sending pet %s into battle due to attack.", pet->GetName());
 				pet->AddToHateList(attacker, 1, 0, true, false, false, spell_id);
 				pet->SetTarget(attacker);
-				Message_StringID(10, PET_ATTACKING, pet->GetCleanName(), attacker->GetCleanName());
+				MessageString(Chat::NPCQuestSay, PET_ATTACKING, pet->GetCleanName(), attacker->GetCleanName());
 			}
 		}
 
@@ -3459,7 +3460,7 @@ void Mob::CommonDamage(Mob* attacker, int &damage, const uint16 spell_id, const
 			damage = AffectMagicalDamage(damage, spell_id, iBuffTic, attacker);
 			if (origdmg != damage && attacker && attacker->IsClient()) {
 				if (attacker->CastToClient()->GetFilter(FilterDamageShields) != FilterHide)
-					attacker->Message(15, "The Spellshield absorbed %d of %d points of damage", origdmg - damage, origdmg);
+					attacker->Message(Chat::Yellow, "The Spellshield absorbed %d of %d points of damage", origdmg - damage, origdmg);
 			}
 			if (damage == 0 && attacker && origdmg != damage && IsClient()) {
 				//Kayen: Probably need to add a filter for this - Not sure if this msg is correct but there should be a message for spell negate/runes.
@@ -3507,15 +3508,15 @@ void Mob::CommonDamage(Mob* attacker, int &damage, const uint16 spell_id, const
 		//fade mez if we are mezzed
 		if (IsMezzed() && attacker) {
 			Log(Logs::Detail, Logs::Combat, "Breaking mez due to attack.");
-			entity_list.MessageClose_StringID(
+			entity_list.MessageCloseString(
 				this, /* Sender */
 				true,  /* Skip Sender */
 				RuleI(Range, SpellMessages),
-				MT_WornOff, /* 284 */
+				Chat::SpellWornOff, /* 284 */
 				HAS_BEEN_AWAKENED, // %1 has been awakened by %2.
 				GetCleanName(), /* Message1 */
 				attacker->GetCleanName() /* Message2 */
-				);
+			);
 			BuffFadeByEffect(SE_Mez);
 		}
 
@@ -3564,13 +3565,13 @@ void Mob::CommonDamage(Mob* attacker, int &damage, const uint16 spell_id, const
 					else {
 						// stun resist passed!
 						if (IsClient())
-							Message_StringID(MT_Stun, SHAKE_OFF_STUN);
+							MessageString(Chat::Stun, SHAKE_OFF_STUN);
 					}
 				}
 				else {
 					// stun resist 2 passed!
 					if (IsClient())
-						Message_StringID(MT_Stun, AVOID_STUNNING_BLOW);
+						MessageString(Chat::Stun, AVOID_STUNNING_BLOW);
 				}
 			}
 			else {
@@ -3650,7 +3651,7 @@ void Mob::CommonDamage(Mob* attacker, int &damage, const uint16 spell_id, const
 				if (((spell_id != SPELL_UNKNOWN) || (FromDamageShield)) && damage>0) {
 					//special crap for spell damage, looks hackish to me
 					char val1[20] = { 0 };
-					owner->Message_StringID(MT_NonMelee, OTHER_HIT_NONMELEE, GetCleanName(), ConvertArray(damage, val1));
+					owner->MessageString(Chat::NonMelee, OTHER_HIT_NONMELEE, GetCleanName(), ConvertArray(damage, val1));
 				}
 				else {
 					if (damage > 0) {
@@ -3680,19 +3681,19 @@ void Mob::CommonDamage(Mob* attacker, int &damage, const uint16 spell_id, const
 					char val1[20] = { 0 };
 					if (FromDamageShield) {
 						if (attacker->CastToClient()->GetFilter(FilterDamageShields) != FilterHide)
-							attacker->Message_StringID(MT_DS, OTHER_HIT_NONMELEE, GetCleanName(), ConvertArray(damage, val1));
+							attacker->MessageString(Chat::DamageShield, OTHER_HIT_NONMELEE, GetCleanName(), ConvertArray(damage, val1));
 					}
 					else {
-						entity_list.MessageClose_StringID(
+						entity_list.MessageCloseString(
 							this, /* Sender */
 							true, /* Skip Sender */
 							RuleI(Range, SpellMessages),
-							MT_NonMelee, /* 283 */
+							Chat::NonMelee, /* 283 */
 							HIT_NON_MELEE, /* %1 hit %2 for %3 points of non-melee damage. */
 							attacker->GetCleanName(), /* Message1 */
 							GetCleanName(), /* Message2 */
 							ConvertArray(damage, val1) /* Message3 */
-							);
+						);
 					}
 				}
 				else {
@@ -3754,22 +3755,22 @@ void Mob::CommonDamage(Mob* attacker, int &damage, const uint16 spell_id, const
 		// So we can see our dot dmg like live shows it.
 		if (spell_id != SPELL_UNKNOWN && damage > 0 && attacker && attacker != this && attacker->IsClient()) {
 			//might filter on (attack_skill>200 && attack_skill<250), but I dont think we need it
-			attacker->FilteredMessage_StringID(attacker, MT_DoTDamage, FilterDOT,
+			attacker->FilteredMessageString(attacker, Chat::DotDamage, FilterDOT,
 				YOUR_HIT_DOT, GetCleanName(), itoa(damage), spells[spell_id].name);
 
 			/* older clients don't have the below String ID, but it will be filtered */
-			entity_list.FilteredMessageClose_StringID(
+			entity_list.FilteredMessageCloseString(
 				attacker, /* Sender */
 				true, /* Skip Sender */
 				RuleI(Range, SpellMessages),
-				MT_DoTDamage, /* Type: 325 */
+				Chat::DotDamage, /* Type: 325 */
 				FilterDOT, /* FilterType: 19 */
 				OTHER_HIT_DOT,  /* MessageFormat: %1 has taken %2 damage from %3 by %4. */
 				GetCleanName(), /* Message1 */
 				itoa(damage), /* Message2 */
 				attacker->GetCleanName(), /* Message3 */
 				spells[spell_id].name /* Message4 */
-				);
+			);
 		}
 	} //end packet sending
 
@@ -3792,42 +3793,42 @@ void Mob::HealDamage(uint32 amount, Mob *caster, uint16 spell_id)
 										 // message to caster
 				if (caster->IsClient() && caster == this) {
 					if (caster->CastToClient()->ClientVersionBit() & EQEmu::versions::maskSoFAndLater)
-						FilteredMessage_StringID(caster, MT_NonMelee, FilterHealOverTime,
+						FilteredMessageString(caster, Chat::NonMelee, FilterHealOverTime,
 							HOT_HEAL_SELF, itoa(acthealed), spells[spell_id].name);
 					else
-						FilteredMessage_StringID(caster, MT_NonMelee, FilterHealOverTime,
+						FilteredMessageString(caster, Chat::NonMelee, FilterHealOverTime,
 							YOU_HEALED, GetCleanName(), itoa(acthealed));
 				}
 				else if (caster->IsClient() && caster != this) {
 					if (caster->CastToClient()->ClientVersionBit() & EQEmu::versions::maskSoFAndLater)
-						caster->FilteredMessage_StringID(caster, MT_NonMelee, FilterHealOverTime,
+						caster->FilteredMessageString(caster, Chat::NonMelee, FilterHealOverTime,
 							HOT_HEAL_OTHER, GetCleanName(), itoa(acthealed),
 							spells[spell_id].name);
 					else
-						caster->FilteredMessage_StringID(caster, MT_NonMelee, FilterHealOverTime,
+						caster->FilteredMessageString(caster, Chat::NonMelee, FilterHealOverTime,
 							YOU_HEAL, GetCleanName(), itoa(acthealed));
 				}
 				// message to target
 				if (IsClient() && caster != this) {
 					if (CastToClient()->ClientVersionBit() & EQEmu::versions::maskSoFAndLater)
-						FilteredMessage_StringID(this, MT_NonMelee, FilterHealOverTime,
+						FilteredMessageString(this, Chat::NonMelee, FilterHealOverTime,
 							HOT_HEALED_OTHER, caster->GetCleanName(),
 							itoa(acthealed), spells[spell_id].name);
 					else
-						FilteredMessage_StringID(this, MT_NonMelee, FilterHealOverTime,
+						FilteredMessageString(this, Chat::NonMelee, FilterHealOverTime,
 							YOU_HEALED, caster->GetCleanName(), itoa(acthealed));
 				}
 			}
 			else { // normal heals
-				FilteredMessage_StringID(caster, MT_NonMelee, FilterSpellDamage,
+				FilteredMessageString(caster, Chat::NonMelee, FilterSpellDamage,
 					YOU_HEALED, caster->GetCleanName(), itoa(acthealed));
 				if (caster != this)
-					caster->FilteredMessage_StringID(caster, MT_NonMelee, FilterSpellDamage,
+					caster->FilteredMessageString(caster, Chat::NonMelee, FilterSpellDamage,
 						YOU_HEAL, GetCleanName(), itoa(acthealed));
 			}
 		}
 		else {
-			Message(MT_NonMelee, "You have been healed for %d points of damage.", acthealed);
+			Message(Chat::NonMelee, "You have been healed for %d points of damage.", acthealed);
 		}
 	}
 
@@ -3993,10 +3994,10 @@ void Mob::TryWeaponProc(const EQEmu::ItemInstance *inst, const EQEmu::ItemData *
 				if (IsPet()) {
 					Mob *own = GetOwner();
 					if (own)
-						own->Message_StringID(13, PROC_PETTOOLOW);
+						own->MessageString(Chat::Red, PROC_PETTOOLOW);
 				}
 				else {
-					Message_StringID(13, PROC_TOOLOW);
+					MessageString(Chat::Red, PROC_TOOLOW);
 				}
 			}
 			else {
@@ -4030,10 +4031,10 @@ void Mob::TryWeaponProc(const EQEmu::ItemInstance *inst, const EQEmu::ItemData *
 						if (IsPet()) {
 							Mob *own = GetOwner();
 							if (own)
-								own->Message_StringID(13, PROC_PETTOOLOW);
+								own->MessageString(Chat::Red, PROC_PETTOOLOW);
 						}
 						else {
-							Message_StringID(13, PROC_TOOLOW);
+							MessageString(Chat::Red, PROC_TOOLOW);
 						}
 					}
 					else {
@@ -4183,16 +4184,16 @@ void Mob::TryPetCriticalHit(Mob *defender, DamageHitInfo &hit)
 			hit.damage_done += 5;
 			hit.damage_done = (hit.damage_done * critMod) / 100;
 
-			entity_list.FilteredMessageClose_StringID(
+			entity_list.FilteredMessageCloseString(
 				this, /* Sender */
 				false,  /* Skip Sender */
 				RuleI(Range, CriticalDamage),
-				MT_CritMelee, /* Type: 301 */
+				Chat::MeleeCrit, /* Type: 301 */
 				FilterMeleeCrits, /* FilterType: 12 */
 				CRITICAL_HIT, /* MessageFormat: %1 scores a critical hit! (%2) */
 				GetCleanName(), /* Message1 */
 				itoa(hit.damage_done + hit.min_damage) /* Message2 */
-				);
+			);
 
 		}
 	}
@@ -4243,29 +4244,29 @@ void Mob::TryCriticalHit(Mob *defender, DamageHitInfo &hit, ExtraAttackOptions *
 
 				/* Female */
 				if (GetGender() == 1) {
-					entity_list.FilteredMessageClose_StringID(
+					entity_list.FilteredMessageCloseString(
 						this, /* Sender */
 						false, /* Skip Sender */
 						RuleI(Range, CriticalDamage),
-						MT_CritMelee, /* Type: 301 */
+						Chat::MeleeCrit, /* Type: 301 */
 						FilterMeleeCrits, /* FilterType: 12 */
 						FEMALE_SLAYUNDEAD, /* MessageFormat: %1's holy blade cleanses her target!(%2) */
 						GetCleanName(), /* Message1 */
 						itoa(hit.damage_done + hit.min_damage) /* Message2 */
-						);
+					);
 				}
 				/* Males and Neuter */
 				else {
-					entity_list.FilteredMessageClose_StringID(
+					entity_list.FilteredMessageCloseString(
 						this, /* Sender */
 						false, /* Skip Sender */
 						RuleI(Range, CriticalDamage),
-						MT_CritMelee, /* Type: 301 */
+						Chat::MeleeCrit, /* Type: 301 */
 						FilterMeleeCrits, /* FilterType: 12 */
 						MALE_SLAYUNDEAD, /* MessageFormat: %1's holy blade cleanses his target!(%2)  */
 						GetCleanName(), /* Message1 */
 						itoa(hit.damage_done + hit.min_damage) /* Message2 */
-						);
+					);
 				}
 				return;
 			}
@@ -4340,16 +4341,16 @@ void Mob::TryCriticalHit(Mob *defender, DamageHitInfo &hit, ExtraAttackOptions *
 						}
 						hit.damage_done = hit.damage_done * 200 / 100;
 
-						entity_list.FilteredMessageClose_StringID(
+						entity_list.FilteredMessageCloseString(
 							this, /* Sender */
 							false, /* Skip Sender */
 							RuleI(Range, CriticalDamage),
-							MT_CritMelee, /* Type: 301 */
+							Chat::MeleeCrit, /* Type: 301 */
 							FilterMeleeCrits, /* FilterType: 12 */
 							DEADLY_STRIKE, /* MessageFormat: %1 scores a Deadly Strike!(%2) */
 							GetCleanName(), /* Message1 */
 							itoa(hit.damage_done + hit.min_damage) /* Message2 */
-							);
+						);
 						return;
 					}
 				}
@@ -4368,16 +4369,16 @@ void Mob::TryCriticalHit(Mob *defender, DamageHitInfo &hit, ExtraAttackOptions *
 				hit.damage_done += og_damage * 119 / 100;
 				Log(Logs::Detail, Logs::Combat, "Crip damage %d", hit.damage_done);
 
-				entity_list.FilteredMessageClose_StringID(
+				entity_list.FilteredMessageCloseString(
 					this, /* Sender */
 					false, /* Skip Sender */
 					RuleI(Range, CriticalDamage),
-					MT_CritMelee, /* Type: 301 */
+					Chat::MeleeCrit, /* Type: 301 */
 					FilterMeleeCrits, /* FilterType: 12 */
 					CRIPPLING_BLOW, /* MessageFormat: %1 lands a Crippling Blow!(%2) */
 					GetCleanName(), /* Message1 */
 					itoa(hit.damage_done + hit.min_damage) /* Message2 */
-					);
+				);
 
 				// Crippling blows also have a chance to stun
 				// Kayen: Crippling Blow would cause a chance to interrupt for npcs < 55, with a
@@ -4390,16 +4391,16 @@ void Mob::TryCriticalHit(Mob *defender, DamageHitInfo &hit, ExtraAttackOptions *
 			}
 
 			/* Normal Critical hit message */
-			entity_list.FilteredMessageClose_StringID(
+			entity_list.FilteredMessageCloseString(
 				this, /* Sender */
 				false, /* Skip Sender */
 				RuleI(Range, CriticalDamage),
-				MT_CritMelee, /* Type: 301 */
+				Chat::MeleeCrit, /* Type: 301 */
 				FilterMeleeCrits, /* FilterType: 12 */
 				CRITICAL_HIT, /* MessageFormat: %1 scores a critical hit! (%2) */
 				GetCleanName(), /* Message1 */
 				itoa(hit.damage_done + hit.min_damage) /* Message2 */
-				);
+			);
 		}
 	}
 }
@@ -4427,15 +4428,15 @@ bool Mob::TryFinishingBlow(Mob *defender, int &damage)
 			(ProcChance >= zone->random.Int(1, 1000))) {
 
 			/* Finishing Blow Critical Message */
-			entity_list.FilteredMessageClose_StringID(
+			entity_list.FilteredMessageCloseString(
 				this, /* Sender */
 				false, /* Skip Sender */
 				RuleI(Range, CriticalDamage),
-				MT_CritMelee, /* Type: 301 */
+				Chat::MeleeCrit, /* Type: 301 */
 				FilterMeleeCrits, /* FilterType: 12 */
 				FINISHING_BLOW, /* MessageFormat: %1 scores a Finishing Blow!!) */
 				GetCleanName() /* Message1 */
-				);
+			);
 
 			damage = FB_Dmg;
 			return true;
@@ -4453,7 +4454,7 @@ void Mob::DoRiposte(Mob *defender)
 
 	// so ahhh the angle you can riposte is larger than the angle you can hit :P
 	if (!defender->IsFacingMob(this)) {
-		defender->Message_StringID(MT_TooFarAway, CANT_SEE_TARGET);
+		defender->MessageString(Chat::TooFarAway, CANT_SEE_TARGET);
 		return;
 	}
 
@@ -5042,7 +5043,7 @@ void Mob::CommonOutgoingHitSuccess(Mob* defender, DamageHitInfo &hit, ExtraAttac
 		else if (GetClass() == RANGER && GetLevel() > 50) { // no double dmg on headshot
 			if ((defender->IsNPC() && !defender->IsMoving() && !defender->IsRooted()) || !RuleB(Combat, ArcheryBonusRequiresStationary)) {
 				hit.damage_done *= 2;
-				Message_StringID(MT_CritMelee, BOW_DOUBLE_DAMAGE);
+				MessageString(Chat::MeleeCrit, BOW_DOUBLE_DAMAGE);
 			}
 		}
 	}
@@ -5347,7 +5348,7 @@ void Client::DoAttackRounds(Mob *target, int hand, bool IsFromSpell)
 						Attack(target, hand, false, false, IsFromSpell);
 						if (zone->random.Roll(flurrychance))
 							Attack(target, hand, false, false, IsFromSpell);
-						Message_StringID(MT_NPCFlurry, YOU_FLURRY);
+						MessageString(Chat::NPCFlurry, YOU_FLURRY);
 					}
 				}
 			}
diff --git a/zone/aura.cpp b/zone/aura.cpp
index d4aee01cb..adedb3f56 100644
--- a/zone/aura.cpp
+++ b/zone/aura.cpp
@@ -710,13 +710,13 @@ void Mob::MakeAura(uint16 spell_id)
 
 	AuraRecord record;
 	if (!database.GetAuraEntry(spell_id, record)) {
-		Message(13, "Unable to find data for aura %s", spells[spell_id].name);
+		Message(Chat::Red, "Unable to find data for aura %s", spells[spell_id].name);
 		Log(Logs::General, Logs::Error, "Unable to find data for aura %d, check auras table.", spell_id);
 		return;
 	}
 
 	if (!IsValidSpell(record.spell_id)) {
-		Message(13, "Casted spell (%d) is not valid for aura %s", record.spell_id, spells[spell_id].name);
+		Message(Chat::Red, "Casted spell (%d) is not valid for aura %s", record.spell_id, spells[spell_id].name);
 		Log(Logs::General, Logs::Error, "Casted spell (%d) is not valid for aura %d, check auras table.",
 		    record.spell_id, spell_id);
 		return;
@@ -744,7 +744,7 @@ void Mob::MakeAura(uint16 spell_id)
 
 	const auto base = database.LoadNPCTypesData(record.npc_type);
 	if (base == nullptr) {
-		Message(13, "Unable to load NPC data for aura %s", spells[spell_id].teleport_zone);
+		Message(Chat::Red, "Unable to load NPC data for aura %s", spells[spell_id].teleport_zone);
 		Log(Logs::General, Logs::Error,
 		    "Unable to load NPC data for aura %s (NPC ID %d), check auras and npc_types tables.",
 		    spells[spell_id].teleport_zone, record.npc_type);
@@ -841,10 +841,10 @@ void Mob::AddTrap(Aura *aura, AuraRecord &record)
 bool Mob::CanSpawnAura(bool trap)
 {
 	if (trap && !HasFreeTrapSlots()) {
-		Message_StringID(MT_SpellFailure, NO_MORE_TRAPS);
+		MessageString(Chat::SpellFailure, NO_MORE_TRAPS);
 		return false;
 	} else if (!trap && !HasFreeAuraSlots()) {
-		Message_StringID(MT_SpellFailure, NO_MORE_AURAS);
+		MessageString(Chat::SpellFailure, NO_MORE_AURAS);
 		return false;
 	}
 
@@ -878,8 +878,6 @@ void Mob::RemoveAllAuras()
 	}
 
 	trap_mgr.count = 0;
-
-	return;
 }
 
 void Mob::RemoveAura(int spawn_id, bool skip_strip, bool expired)
@@ -891,7 +889,7 @@ void Mob::RemoveAura(int spawn_id, bool skip_strip, bool expired)
 				aura.aura->Depop(skip_strip);
 			if (expired && IsClient()) {
 				CastToClient()->SendColoredText(
-				    CC_Yellow, StringFormat("%s has expired.", aura.name)); // TODO: verify color
+					Chat::Yellow, StringFormat("%s has expired.", aura.name)); // TODO: verify color
 				// need to update client UI too
 				auto app = new EQApplicationPacket(OP_UpdateAura, sizeof(AuraDestory_Struct));
 				auto ads = (AuraDestory_Struct *)app->pBuffer;
@@ -920,7 +918,7 @@ void Mob::RemoveAura(int spawn_id, bool skip_strip, bool expired)
 				aura.aura->Depop(skip_strip);
 			if (expired && IsClient())
 				CastToClient()->SendColoredText(
-				    CC_Yellow, StringFormat("%s has expired.", aura.name)); // TODO: verify color
+					Chat::Yellow, StringFormat("%s has expired.", aura.name)); // TODO: verify color
 			while (trap_mgr.count - 1 > i) {
 				i++;
 				aura.spawn_id = trap_mgr.auras[i].spawn_id;
diff --git a/zone/bot.cpp b/zone/bot.cpp
index b47694103..9cce41c2f 100644
--- a/zone/bot.cpp
+++ b/zone/bot.cpp
@@ -159,9 +159,9 @@ Bot::Bot(uint32 botID, uint32 botOwnerCharacterID, uint32 botSpellsID, double to
 
 	bool stance_flag = false;
 	if (!database.botdb.LoadStance(this, stance_flag) && bot_owner)
-		bot_owner->Message(13, "%s for '%s'", BotDatabase::fail::LoadStance(), GetCleanName());
+		bot_owner->Message(Chat::Red, "%s for '%s'", BotDatabase::fail::LoadStance(), GetCleanName());
 	if (!stance_flag && bot_owner)
-		bot_owner->Message(13, "Could not locate stance for '%s'", GetCleanName());
+		bot_owner->Message(Chat::Red, "Could not locate stance for '%s'", GetCleanName());
 
 	SetTaunting((GetClass() == WARRIOR || GetClass() == PALADIN || GetClass() == SHADOWKNIGHT) && (GetBotStance() == EQEmu::constants::stanceAggressive));
 	SetPauseAI(false);
@@ -178,17 +178,17 @@ Bot::Bot(uint32 botID, uint32 botOwnerCharacterID, uint32 botSpellsID, double to
 
 	memset(&_botInspectMessage, 0, sizeof(InspectMessage_Struct));
 	if (!database.botdb.LoadInspectMessage(GetBotID(), _botInspectMessage) && bot_owner)
-		bot_owner->Message(13, "%s for '%s'", BotDatabase::fail::LoadInspectMessage(), GetCleanName());
+		bot_owner->Message(Chat::Red, "%s for '%s'", BotDatabase::fail::LoadInspectMessage(), GetCleanName());
 
 	if (!database.botdb.LoadGuildMembership(GetBotID(), _guildId, _guildRank, _guildName) && bot_owner)
-		bot_owner->Message(13, "%s for '%s'", BotDatabase::fail::LoadGuildMembership(), GetCleanName());
+		bot_owner->Message(Chat::Red, "%s for '%s'", BotDatabase::fail::LoadGuildMembership(), GetCleanName());
 	
 	std::string error_message;
 
 	EquipBot(&error_message);
 	if(!error_message.empty()) {
 		if(bot_owner)
-			bot_owner->Message(13, error_message.c_str());
+			bot_owner->Message(Chat::Red, error_message.c_str());
 		error_message.clear();
 	}
 
@@ -206,12 +206,12 @@ Bot::Bot(uint32 botID, uint32 botOwnerCharacterID, uint32 botSpellsID, double to
 	GenerateBaseStats();
 
 	if (!database.botdb.LoadTimers(this) && bot_owner)
-		bot_owner->Message(13, "%s for '%s'", BotDatabase::fail::LoadTimers(), GetCleanName());
+		bot_owner->Message(Chat::Red, "%s for '%s'", BotDatabase::fail::LoadTimers(), GetCleanName());
 
 	LoadAAs();
 
 	if (!database.botdb.LoadBuffs(this) && bot_owner)
-		bot_owner->Message(13, "&s for '%s'", BotDatabase::fail::LoadBuffs(), GetCleanName());
+		bot_owner->Message(Chat::Red, "&s for '%s'", BotDatabase::fail::LoadBuffs(), GetCleanName());
 
 	CalcBotStats(false);
 	hp_regen = CalcHPRegen();
@@ -1701,28 +1701,28 @@ bool Bot::Save()
 	if(!GetBotID()) { // New bot record
 		uint32 bot_id = 0;
 		if (!database.botdb.SaveNewBot(this, bot_id) || !bot_id) {
-			bot_owner->Message(13, "%s '%s'", BotDatabase::fail::SaveNewBot(), GetCleanName());
+			bot_owner->Message(Chat::Red, "%s '%s'", BotDatabase::fail::SaveNewBot(), GetCleanName());
 			return false;
 		}
 		SetBotID(bot_id);
 	}
 	else { // Update existing bot record
 		if (!database.botdb.SaveBot(this)) {
-			bot_owner->Message(13, "%s '%s'", BotDatabase::fail::SaveBot(), GetCleanName());
+			bot_owner->Message(Chat::Red, "%s '%s'", BotDatabase::fail::SaveBot(), GetCleanName());
 			return false;
 		}
 	}
 	
 	// All of these continue to process if any fail
 	if (!database.botdb.SaveBuffs(this))
-		bot_owner->Message(13, "%s for '%s'", BotDatabase::fail::SaveBuffs(), GetCleanName());
+		bot_owner->Message(Chat::Red, "%s for '%s'", BotDatabase::fail::SaveBuffs(), GetCleanName());
 	if (!database.botdb.SaveTimers(this))
-		bot_owner->Message(13, "%s for '%s'", BotDatabase::fail::SaveTimers(), GetCleanName());
+		bot_owner->Message(Chat::Red, "%s for '%s'", BotDatabase::fail::SaveTimers(), GetCleanName());
 	if (!database.botdb.SaveStance(this))
-		bot_owner->Message(13, "%s for '%s'", BotDatabase::fail::SaveStance(), GetCleanName());
+		bot_owner->Message(Chat::Red, "%s for '%s'", BotDatabase::fail::SaveStance(), GetCleanName());
 	
 	if (!SavePet())
-		bot_owner->Message(13, "Failed to save pet for '%s'", GetCleanName());
+		bot_owner->Message(Chat::Red, "Failed to save pet for '%s'", GetCleanName());
 	
 	return true;
 }
@@ -1734,26 +1734,26 @@ bool Bot::DeleteBot()
 		return false;
 
 	if (!database.botdb.DeleteHealRotation(GetBotID())) {
-		bot_owner->Message(13, "%s", BotDatabase::fail::DeleteHealRotation());
+		bot_owner->Message(Chat::Red, "%s", BotDatabase::fail::DeleteHealRotation());
 		return false;
 	}
 
 	std::string query = StringFormat("DELETE FROM `bot_heal_rotation_members` WHERE `bot_id` = '%u'", GetBotID());
 	auto results = database.QueryDatabase(query);
 	if (!results.Success()) {
-		bot_owner->Message(13, "Failed to delete heal rotation member '%s'", GetCleanName());
+		bot_owner->Message(Chat::Red, "Failed to delete heal rotation member '%s'", GetCleanName());
 		return false;
 	}
 
 	query = StringFormat("DELETE FROM `bot_heal_rotation_targets` WHERE `target_name` LIKE '%s'", GetCleanName());
 	results = database.QueryDatabase(query);
 	if (!results.Success()) {
-		bot_owner->Message(13, "Failed to delete heal rotation target '%s'", GetCleanName());
+		bot_owner->Message(Chat::Red, "Failed to delete heal rotation target '%s'", GetCleanName());
 		return false;
 	}
 
 	if (!DeletePet()) {
-		bot_owner->Message(13, "Failed to delete pet for '%s'", GetCleanName());
+		bot_owner->Message(Chat::Red, "Failed to delete pet for '%s'", GetCleanName());
 		return false;
 	}
 
@@ -1763,32 +1763,32 @@ bool Bot::DeleteBot()
 	std::string error_message;
 
 	if (!database.botdb.RemoveMemberFromBotGroup(GetBotID())) {
-		bot_owner->Message(13, "%s - '%s'", BotDatabase::fail::RemoveMemberFromBotGroup(), GetCleanName());
+		bot_owner->Message(Chat::Red, "%s - '%s'", BotDatabase::fail::RemoveMemberFromBotGroup(), GetCleanName());
 		return false;
 	}
 
 	if (!database.botdb.DeleteItems(GetBotID())) {
-		bot_owner->Message(13, "%s for '%s'", BotDatabase::fail::DeleteItems(), GetCleanName());
+		bot_owner->Message(Chat::Red, "%s for '%s'", BotDatabase::fail::DeleteItems(), GetCleanName());
 		return false;
 	}
 
 	if (!database.botdb.DeleteTimers(GetBotID())) {
-		bot_owner->Message(13, "%s for '%s'", BotDatabase::fail::DeleteTimers(), GetCleanName());
+		bot_owner->Message(Chat::Red, "%s for '%s'", BotDatabase::fail::DeleteTimers(), GetCleanName());
 		return false;
 	}
 
 	if (!database.botdb.DeleteBuffs(GetBotID())) {
-		bot_owner->Message(13, "%s for '%s'", BotDatabase::fail::DeleteBuffs(), GetCleanName());
+		bot_owner->Message(Chat::Red, "%s for '%s'", BotDatabase::fail::DeleteBuffs(), GetCleanName());
 		return false;
 	}
 
 	if (!database.botdb.DeleteStance(GetBotID())) {
-		bot_owner->Message(13, "%s for '%s'", BotDatabase::fail::DeleteStance(), GetCleanName());
+		bot_owner->Message(Chat::Red, "%s for '%s'", BotDatabase::fail::DeleteStance(), GetCleanName());
 		return false;
 	}
 
 	if (!database.botdb.DeleteBot(GetBotID())) {
-		bot_owner->Message(13, "%s '%s'", BotDatabase::fail::DeleteBot(), GetCleanName());
+		bot_owner->Message(Chat::Red, "%s '%s'", BotDatabase::fail::DeleteBot(), GetCleanName());
 		return false;
 	}
 
@@ -1832,7 +1832,7 @@ bool Bot::LoadPet()
 
 	uint32 pet_index = 0;
 	if (!database.botdb.LoadPetIndex(GetBotID(), pet_index)) {
-		bot_owner->Message(13, "%s for %s's pet", BotDatabase::fail::LoadPetIndex(), GetCleanName());		
+		bot_owner->Message(Chat::Red, "%s for %s's pet", BotDatabase::fail::LoadPetIndex(), GetCleanName());
 		return false;
 	}
 	if (!pet_index)
@@ -1840,10 +1840,10 @@ bool Bot::LoadPet()
 
 	uint32 saved_pet_spell_id = 0;
 	if (!database.botdb.LoadPetSpellID(GetBotID(), saved_pet_spell_id)) {
-		bot_owner->Message(13, "%s for %s's pet", BotDatabase::fail::LoadPetSpellID(), GetCleanName());
+		bot_owner->Message(Chat::Red, "%s for %s's pet", BotDatabase::fail::LoadPetSpellID(), GetCleanName());
 	}
 	if (!IsValidSpell(saved_pet_spell_id)) {
-		bot_owner->Message(13, "Invalid spell id for %s's pet", GetCleanName());
+		bot_owner->Message(Chat::Red, "Invalid spell id for %s's pet", GetCleanName());
 		DeletePet();
 		return false;
 	}
@@ -1854,7 +1854,7 @@ bool Bot::LoadPet()
 	uint32 pet_spell_id = 0;
 
 	if (!database.botdb.LoadPetStats(GetBotID(), pet_name, pet_mana, pet_hp, pet_spell_id)) {
-		bot_owner->Message(13, "%s for %s's pet", BotDatabase::fail::LoadPetStats(), GetCleanName());
+		bot_owner->Message(Chat::Red, "%s for %s's pet", BotDatabase::fail::LoadPetStats(), GetCleanName());
 		return false;
 	}
 
@@ -1869,12 +1869,12 @@ bool Bot::LoadPet()
 	SpellBuff_Struct pet_buffs[PET_BUFF_COUNT];
 	memset(pet_buffs, 0, (sizeof(SpellBuff_Struct) * PET_BUFF_COUNT));
 	if (!database.botdb.LoadPetBuffs(GetBotID(), pet_buffs))
-		bot_owner->Message(13, "%s for %s's pet", BotDatabase::fail::LoadPetBuffs(), GetCleanName());
+		bot_owner->Message(Chat::Red, "%s for %s's pet", BotDatabase::fail::LoadPetBuffs(), GetCleanName());
 
 	uint32 pet_items[EQEmu::invslot::EQUIPMENT_COUNT];
 	memset(pet_items, 0, (sizeof(uint32) * EQEmu::invslot::EQUIPMENT_COUNT));
 	if (!database.botdb.LoadPetItems(GetBotID(), pet_items))
-		bot_owner->Message(13, "%s for %s's pet", BotDatabase::fail::LoadPetItems(), GetCleanName());
+		bot_owner->Message(Chat::Red, "%s for %s's pet", BotDatabase::fail::LoadPetItems(), GetCleanName());
 
 	pet_inst->SetPetState(pet_buffs, pet_items);
 	pet_inst->CalcBonuses();
@@ -1913,14 +1913,14 @@ bool Bot::SavePet()
 	std::string error_message;
 
 	if (!database.botdb.SavePetStats(GetBotID(), pet_name_str, pet_inst->GetMana(), pet_inst->GetHP(), pet_inst->GetPetSpellID())) {
-		bot_owner->Message(13, "%s for %s's pet", BotDatabase::fail::SavePetStats(), GetCleanName());
+		bot_owner->Message(Chat::Red, "%s for %s's pet", BotDatabase::fail::SavePetStats(), GetCleanName());
 		return false;
 	}
 	
 	if (!database.botdb.SavePetBuffs(GetBotID(), pet_buffs))
-		bot_owner->Message(13, "%s for %s's pet", BotDatabase::fail::SavePetBuffs(), GetCleanName());
+		bot_owner->Message(Chat::Red, "%s for %s's pet", BotDatabase::fail::SavePetBuffs(), GetCleanName());
 	if (!database.botdb.SavePetItems(GetBotID(), pet_items))
-		bot_owner->Message(13, "%s for %s's pet", BotDatabase::fail::SavePetItems(), GetCleanName());
+		bot_owner->Message(Chat::Red, "%s for %s's pet", BotDatabase::fail::SavePetItems(), GetCleanName());
 
 	return true;
 }
@@ -1934,15 +1934,15 @@ bool Bot::DeletePet()
 	std::string error_message;
 
 	if (!database.botdb.DeletePetItems(GetBotID())) {
-		bot_owner->Message(13, "%s for %s's pet", BotDatabase::fail::DeletePetItems(), GetCleanName());
+		bot_owner->Message(Chat::Red, "%s for %s's pet", BotDatabase::fail::DeletePetItems(), GetCleanName());
 		return false;
 	}
 	if (!database.botdb.DeletePetBuffs(GetBotID())) {
-		bot_owner->Message(13, "%s for %s's pet", BotDatabase::fail::DeletePetBuffs(), GetCleanName());
+		bot_owner->Message(Chat::Red, "%s for %s's pet", BotDatabase::fail::DeletePetBuffs(), GetCleanName());
 		return false;
 	}
 	if (!database.botdb.DeletePetStats(GetBotID())) {
-		bot_owner->Message(13, "%s for %s's pet", BotDatabase::fail::DeletePetStats(), GetCleanName());
+		bot_owner->Message(Chat::Red, "%s for %s's pet", BotDatabase::fail::DeletePetStats(), GetCleanName());
 		return false;
 	}
 
@@ -2276,12 +2276,12 @@ void Bot::AI_Process() {
 	// Berserk updates should occur if primary AI criteria are met
 	if (GetClass() == WARRIOR || GetClass() == BERSERKER) {
 		if (!berserk && GetHP() > 0 && GetHPRatio() < 30.0f) {
-			entity_list.MessageClose_StringID(this, false, 200, 0, BERSERK_START, GetName());
+			entity_list.MessageCloseString(this, false, 200, 0, BERSERK_START, GetName());
 			berserk = true;
 		}
 
 		if (berserk && GetHPRatio() >= 30.0f) {
-			entity_list.MessageClose_StringID(this, false, 200, 0, BERSERK_END, GetName());
+			entity_list.MessageCloseString(this, false, 200, 0, BERSERK_END, GetName());
 			berserk = false;
 		}
 	}
@@ -2808,7 +2808,7 @@ void Bot::AI_Process() {
 					int32 flurrychance = (aabonuses.FlurryChance + spellbonuses.FlurryChance + itembonuses.FlurryChance);
 					if (flurrychance) {
 						if (zone->random.Int(0, 100) < flurrychance) {
-							Message_StringID(MT_NPCFlurry, YOU_FLURRY);
+							MessageString(Chat::NPCFlurry, YOU_FLURRY);
 							Attack(tar, EQEmu::invslot::slotPrimary, false);
 							
 							TEST_TARGET();
@@ -3256,9 +3256,9 @@ bool Bot::Spawn(Client* botCharacterOwner) {
 		this->texture = 0; //0xFF;
 
 		if(this->Save())
-			this->GetBotOwner()->CastToClient()->Message(0, "%s saved.", this->GetCleanName());
+			this->GetBotOwner()->CastToClient()->Message(Chat::White, "%s saved.", this->GetCleanName());
 		else
-			this->GetBotOwner()->CastToClient()->Message(13, "%s save failed!", this->GetCleanName());
+			this->GetBotOwner()->CastToClient()->Message(Chat::Red, "%s save failed!", this->GetCleanName());
 
 		// Spawn the bot at the bow owner's loc
 		this->m_Position.x = botCharacterOwner->GetX();
@@ -3331,7 +3331,7 @@ uint32 Bot::GetBotItemBySlot(uint32 slotID)
 
 	if (!database.botdb.LoadItemBySlot(GetBotID(), slotID, item_id)) {
 		if (GetBotOwner() && GetBotOwner()->IsClient())
-			GetBotOwner()->CastToClient()->Message(13, "%s", BotDatabase::fail::LoadItemBySlot());
+			GetBotOwner()->CastToClient()->Message(Chat::Red, "%s", BotDatabase::fail::LoadItemBySlot());
 	}
 
 	return item_id;
@@ -3434,7 +3434,7 @@ void Bot::LoadAndSpawnAllZonedBots(Client* botOwner) {
 				std::list<uint32> ActiveBots;
 				// Modified LoadGroupedBotsByGroupID to require a CharacterID
 				if (!database.botdb.LoadGroupedBotsByGroupID(botOwner->CharacterID(), TempGroupId, ActiveBots)) {
-					botOwner->Message(13, "%s", BotDatabase::fail::LoadGroupedBotsByGroupID());
+					botOwner->Message(Chat::Red, "%s", BotDatabase::fail::LoadGroupedBotsByGroupID());
 					return;
 				}
 				
@@ -3838,32 +3838,32 @@ void Bot::PerformTradeWithClient(int16 beginSlotID, int16 endSlotID, Client* cli
 	}
 
 	if (client != GetOwner()) {
-		client->Message(CC_Red, "You are not the owner of this bot - Trade Canceled.");
+		client->Message(Chat::Red, "You are not the owner of this bot - Trade Canceled.");
 		client->ResetTrade();
 		return;
 	}
 	if ((beginSlotID != invslot::TRADE_BEGIN) && (beginSlotID != invslot::slotCursor)) {
-		client->Message(CC_Red, "Trade request processing from illegal 'begin' slot - Trade Canceled.");
+		client->Message(Chat::Red, "Trade request processing from illegal 'begin' slot - Trade Canceled.");
 		client->ResetTrade();
 		return;
 	}
 	if ((endSlotID != invslot::TRADE_END) && (endSlotID != invslot::slotCursor)) {
-		client->Message(CC_Red, "Trade request processing from illegal 'end' slot - Trade Canceled.");
+		client->Message(Chat::Red, "Trade request processing from illegal 'end' slot - Trade Canceled.");
 		client->ResetTrade();
 		return;
 	}
 	if (((beginSlotID == invslot::slotCursor) && (endSlotID != invslot::slotCursor)) || ((beginSlotID != invslot::slotCursor) && (endSlotID == invslot::slotCursor))) {
-		client->Message(CC_Red, "Trade request processing illegal slot range - Trade Canceled.");
+		client->Message(Chat::Red, "Trade request processing illegal slot range - Trade Canceled.");
 		client->ResetTrade();
 		return;
 	}
 	if (endSlotID < beginSlotID) {
-		client->Message(CC_Red, "Trade request processing in reverse slot order - Trade Canceled.");
+		client->Message(Chat::Red, "Trade request processing in reverse slot order - Trade Canceled.");
 		client->ResetTrade();
 		return;
 	}
 	if (client->IsEngaged() || IsEngaged()) {
-		client->Message(CC_Yellow, "You may not perform a trade while engaged - Trade Canceled!");
+		client->Message(Chat::Yellow, "You may not perform a trade while engaged - Trade Canceled!");
 		client->ResetTrade();
 		return;
 	}
@@ -3879,23 +3879,23 @@ void Bot::PerformTradeWithClient(int16 beginSlotID, int16 endSlotID, Client* cli
 
 		if (!trade_instance->GetItem()) {
 			// TODO: add logging
-			client->Message(CC_Red, "A server error was encountered while processing client slot %i - Trade Canceled.", trade_index);
+			client->Message(Chat::Red, "A server error was encountered while processing client slot %i - Trade Canceled.", trade_index);
 			client->ResetTrade();
 			return;
 		}
 		if ((trade_index != invslot::slotCursor) && !trade_instance->IsDroppable()) {
 			// TODO: add logging
-			client->Message(CC_Red, "Trade hack detected - Trade Canceled.");
+			client->Message(Chat::Red, "Trade hack detected - Trade Canceled.");
 			client->ResetTrade();
 			return;
 		}
 		if (trade_instance->IsStackable() && (trade_instance->GetCharges() < trade_instance->GetItem()->StackSize)) { // temp until partial stacks are implemented
-			client->Message(CC_Yellow, "'%s' is only a partially stacked item - Trade Canceled!", trade_instance->GetItem()->Name);
+			client->Message(Chat::Yellow, "'%s' is only a partially stacked item - Trade Canceled!", trade_instance->GetItem()->Name);
 			client->ResetTrade();
 			return;
 		}
 		if (CheckLoreConflict(trade_instance->GetItem())) {
-			client->Message(CC_Yellow, "This bot already has lore equipment matching the item '%s' - Trade Canceled!", trade_instance->GetItem()->Name);
+			client->Message(Chat::Yellow, "This bot already has lore equipment matching the item '%s' - Trade Canceled!", trade_instance->GetItem()->Name);
 			client->ResetTrade();
 			return;
 		}
@@ -3925,13 +3925,13 @@ void Bot::PerformTradeWithClient(int16 beginSlotID, int16 endSlotID, Client* cli
 			
 			if ((trade_iterator.tradeItemInstance->GetItem()->LoreGroup == -1) && (check_iterator.tradeItemInstance->GetItem()->ID == trade_iterator.tradeItemInstance->GetItem()->ID)) {
 				// TODO: add logging
-				client->Message(CC_Red, "Trade hack detected - Trade Canceled.");
+				client->Message(Chat::Red, "Trade hack detected - Trade Canceled.");
 				client->ResetTrade();
 				return;
 			}
 			if ((trade_iterator.tradeItemInstance->GetItem()->LoreGroup > 0) && (check_iterator.tradeItemInstance->GetItem()->LoreGroup == trade_iterator.tradeItemInstance->GetItem()->LoreGroup)) {
 				// TODO: add logging
-				client->Message(CC_Red, "Trade hack detected - Trade Canceled.");
+				client->Message(Chat::Red, "Trade hack detected - Trade Canceled.");
 				client->ResetTrade();
 				return;
 			}
@@ -4040,14 +4040,14 @@ void Bot::PerformTradeWithClient(int16 beginSlotID, int16 endSlotID, Client* cli
 
 		if (!return_instance->GetItem()) {
 			// TODO: add logging
-			client->Message(CC_Red, "A server error was encountered while processing bot slot %i - Trade Canceled.", return_iterator.fromBotSlot);
+			client->Message(Chat::Red, "A server error was encountered while processing bot slot %i - Trade Canceled.", return_iterator.fromBotSlot);
 			client->ResetTrade();
 			return;
 		}
 		// non-failing checks above are causing this to trigger (i.e., !ItemClassCommon and !IsEquipable{race, class, min_level})
 		// this process is hindered by not having bots use the inventory trade method (TODO: implement bot inventory use)
 		if (client->CheckLoreConflict(return_instance->GetItem())) {
-			client->Message(CC_Yellow, "You already have lore equipment matching the item '%s' - Trade Canceled!", return_instance->GetItem()->Name);
+			client->Message(Chat::Yellow, "You already have lore equipment matching the item '%s' - Trade Canceled!", return_instance->GetItem()->Name);
 			client->ResetTrade();
 			return;
 		}
@@ -4104,7 +4104,7 @@ void Bot::PerformTradeWithClient(int16 beginSlotID, int16 endSlotID, Client* cli
 		}
 
 		if (return_iterator.toClientSlot == invslot::SLOT_INVALID) {
-			client->Message(CC_Yellow, "You do not have room to complete this trade - Trade Canceled!");
+			client->Message(Chat::Yellow, "You do not have room to complete this trade - Trade Canceled!");
 			client->ResetTrade();
 			return;
 		}
@@ -4130,7 +4130,7 @@ void Bot::PerformTradeWithClient(int16 beginSlotID, int16 endSlotID, Client* cli
 			//}
 
 			if (!database.botdb.DeleteItemBySlot(GetBotID(), return_iterator.fromBotSlot))
-				client->Message(CC_Red, "%s (slot: %i, name: '%s')", BotDatabase::fail::DeleteItemBySlot(), return_iterator.fromBotSlot, (return_instance ? return_instance->GetItem()->Name : "nullptr"));
+				client->Message(Chat::Red, "%s (slot: %i, name: '%s')", BotDatabase::fail::DeleteItemBySlot(), return_iterator.fromBotSlot, (return_instance ? return_instance->GetItem()->Name : "nullptr"));
 
 			BotRemoveEquipItem(return_iterator.fromBotSlot);
 			if (return_instance)
@@ -4145,7 +4145,7 @@ void Bot::PerformTradeWithClient(int16 beginSlotID, int16 endSlotID, Client* cli
 		// TODO: code for stackables
 
 		if (!database.botdb.SaveItemBySlot(this, trade_iterator.toBotSlot, trade_iterator.tradeItemInstance))
-			client->Message(CC_Red, "%s (slot: %i, name: '%s')", BotDatabase::fail::SaveItemBySlot(), trade_iterator.toBotSlot, (trade_iterator.tradeItemInstance ? trade_iterator.tradeItemInstance->GetItem()->Name : "nullptr"));
+			client->Message(Chat::Red, "%s (slot: %i, name: '%s')", BotDatabase::fail::SaveItemBySlot(), trade_iterator.toBotSlot, (trade_iterator.tradeItemInstance ? trade_iterator.tradeItemInstance->GetItem()->Name : "nullptr"));
 
 		m_inv.PutItem(trade_iterator.toBotSlot, *trade_iterator.tradeItemInstance);
 		this->BotAddEquipItem(trade_iterator.toBotSlot, (trade_iterator.tradeItemInstance ? trade_iterator.tradeItemInstance->GetID() : 0));
@@ -4165,17 +4165,17 @@ void Bot::PerformTradeWithClient(int16 beginSlotID, int16 endSlotID, Client* cli
 	// trade messages
 	for (const auto& return_iterator : client_return) {
 		if (return_iterator.failedItemName.size())
-			client->Message(MT_Tell, "%s tells you, \"%s, I can't use this '%s.'\"", GetCleanName(), client->GetName(), return_iterator.failedItemName.c_str());
+			client->Message(Chat::Tell, "%s tells you, \"%s, I can't use this '%s.'\"", GetCleanName(), client->GetName(), return_iterator.failedItemName.c_str());
 	}
 	for (const auto& trade_iterator : client_trade) {
 		if (trade_iterator.acceptedItemName.size())
-			client->Message(MT_Tell, "%s tells you, \"Thank you for the '%s,' %s!\"", GetCleanName(), trade_iterator.acceptedItemName.c_str(), client->GetName());
+			client->Message(Chat::Tell, "%s tells you, \"Thank you for the '%s,' %s!\"", GetCleanName(), trade_iterator.acceptedItemName.c_str(), client->GetName());
 	}
 
 	size_t accepted_count = client_trade.size();
 	size_t returned_count = client_return.size();
 
-	client->Message(CC_Lime, "Trade with '%s' resulted in %i accepted item%s, %i returned item%s.", GetCleanName(), accepted_count, ((accepted_count == 1) ? "" : "s"), returned_count, ((returned_count == 1) ? "" : "s"));
+	client->Message(Chat::Lime, "Trade with '%s' resulted in %i accepted item%s, %i returned item%s.", GetCleanName(), accepted_count, ((accepted_count == 1) ? "" : "s"), returned_count, ((returned_count == 1) ? "" : "s"));
 
 	if (accepted_count)
 		CalcBotStats(client->GetBotOptionStatsUpdate());
@@ -4190,9 +4190,9 @@ bool Bot::Death(Mob *killerMob, int32 damage, uint16 spell_id, EQEmu::skills::Sk
 	Mob *my_owner = GetBotOwner();
 	if (my_owner && my_owner->IsClient() && my_owner->CastToClient()->GetBotOptionDeathMarquee()) {
 		if (killerMob)
-			my_owner->CastToClient()->SendMarqueeMessage(CC_Yellow, 510, 0, 1000, 3000, StringFormat("%s has been slain by %s", GetCleanName(), killerMob->GetCleanName()));
+			my_owner->CastToClient()->SendMarqueeMessage(Chat::Yellow, 510, 0, 1000, 3000, StringFormat("%s has been slain by %s", GetCleanName(), killerMob->GetCleanName()));
 		else
-			my_owner->CastToClient()->SendMarqueeMessage(CC_Yellow, 510, 0, 1000, 3000, StringFormat("%s has been slain", GetCleanName()));
+			my_owner->CastToClient()->SendMarqueeMessage(Chat::Yellow, 510, 0, 1000, 3000, StringFormat("%s has been slain", GetCleanName()));
 	}
 
 	Mob *give_exp = hate_list.GetDamageTopOnHateList(this);
@@ -4281,7 +4281,7 @@ void Bot::Damage(Mob *from, int32 damage, uint16 spell_id, EQEmu::skills::SkillT
 		int healed = GetActSpellHealing(spell_id, damage);
 		Log(Logs::Detail, Logs::Combat, "Applying lifetap heal of %d to %s", healed, GetCleanName());
 		HealDamage(healed);
-		entity_list.MessageClose(this, true, 300, MT_Spells, "%s beams a smile at %s", GetCleanName(), from->GetCleanName() );
+		entity_list.MessageClose(this, true, 300, Chat::Spells, "%s beams a smile at %s", GetCleanName(), from->GetCleanName() );
 	}
 
 	CommonDamage(from, damage, spell_id, attack_skill, avoidable, buffslot, iBuffTic, special);
@@ -5364,7 +5364,7 @@ bool Bot::TryFinishingBlow(Mob *defender, int &damage)
 		if (defender->GetLevel() <= levelreq && (chance >= zone->random.Int(1, 1000))) {
 			Log(Logs::Detail, Logs::Combat, "Landed a finishing blow: levelreq at %d, other level %d",
 				levelreq, defender->GetLevel());
-			entity_list.MessageClose_StringID(this, false, 200, MT_CritMelee, FINISHING_BLOW, GetName());
+			entity_list.MessageCloseString(this, false, 200, Chat::MeleeCrit, FINISHING_BLOW, GetName());
 			damage = fb_damage;
 			return true;
 		} else {
@@ -5572,7 +5572,7 @@ void Bot::TryBackstab(Mob *other, int ReuseTime) {
 	if (bIsBehind || bCanFrontalBS) {
 		int chance = (10 + (GetDEX() / 10) + (itembonuses.HeroicDEX / 10));
 		if(level >= 60 && other->GetLevel() <= 45 && !other->CastToNPC()->IsEngaged() && other->GetHP()<= 32000 && other->IsNPC() && zone->random.Real(0, 99) < chance) {
-			entity_list.MessageClose_StringID(this, false, 200, MT_CritMelee, ASSASSINATES, GetName());
+			entity_list.MessageCloseString(this, false, 200, Chat::MeleeCrit, ASSASSINATES, GetName());
 			RogueAssassinate(other);
 		} else {
 			RogueBackstab(other);
@@ -5940,12 +5940,12 @@ void Bot::ProcessGuildInvite(Client* guildOfficer, Bot* botToGuild) {
 	if(guildOfficer && botToGuild) {
 		if(!botToGuild->IsInAGuild()) {
 			if (!guild_mgr.CheckPermission(guildOfficer->GuildID(), guildOfficer->GuildRank(), GUILD_INVITE)) {
-				guildOfficer->Message(13, "You dont have permission to invite.");
+				guildOfficer->Message(Chat::Red, "You dont have permission to invite.");
 				return;
 			}
 
 			if (!database.botdb.SaveGuildMembership(botToGuild->GetBotID(), guildOfficer->GuildID(), GUILD_MEMBER)) {
-				guildOfficer->Message(13, "%s for '%s'", BotDatabase::fail::SaveGuildMembership(), botToGuild->GetCleanName());
+				guildOfficer->Message(Chat::Red, "%s for '%s'", BotDatabase::fail::SaveGuildMembership(), botToGuild->GetCleanName());
 				return;
 			}
 			
@@ -5958,7 +5958,7 @@ void Bot::ProcessGuildInvite(Client* guildOfficer, Bot* botToGuild) {
 
 			safe_delete(pack);
 		} else {
-			guildOfficer->Message(13, "Bot is in a guild.");
+			guildOfficer->Message(Chat::Red, "Bot is in a guild.");
 			return;
 		}
 	}
@@ -5974,10 +5974,10 @@ bool Bot::ProcessGuildRemoval(Client* guildOfficer, std::string botName) {
 		} else {
 			uint32 ownerId = 0;
 			if (!database.botdb.LoadOwnerID(botName, ownerId))
-				guildOfficer->Message(13, "%s for '%s'", BotDatabase::fail::LoadOwnerID(), botName.c_str());
+				guildOfficer->Message(Chat::Red, "%s for '%s'", BotDatabase::fail::LoadOwnerID(), botName.c_str());
 			uint32 botId = 0;
 			if (!database.botdb.LoadBotID(ownerId, botName, botId))
-				guildOfficer->Message(13, "%s for '%s'", BotDatabase::fail::LoadBotID(), botName.c_str());
+				guildOfficer->Message(Chat::Red, "%s for '%s'", BotDatabase::fail::LoadBotID(), botName.c_str());
 			if (botId && database.botdb.SaveGuildMembership(botId, 0, 0))
 				Result = true;
 		}
@@ -5987,7 +5987,7 @@ bool Bot::ProcessGuildRemoval(Client* guildOfficer, std::string botName) {
 			GuildManageRemove_Struct* gm = (GuildManageRemove_Struct*) outapp->pBuffer;
 			gm->guildeqid = guildOfficer->GuildID();
 			strcpy(gm->member, botName.c_str());
-			guildOfficer->Message(0, "%s successfully removed from your guild.", botName.c_str());
+			guildOfficer->Message(Chat::White, "%s successfully removed from your guild.", botName.c_str());
 			entity_list.QueueClientsGuild(guildOfficer, outapp, false, gm->guildeqid);
 			safe_delete(outapp);
 		}
@@ -6125,7 +6125,7 @@ int32 Bot::GetActSpellDamage(uint16 spell_id, int32 value, Mob* target) {
 			if(itembonuses.SpellDmg && spells[spell_id].classes[(GetClass() % 17) - 1] >= GetLevel() - 5)
 				value += (GetExtraSpellAmt(spell_id, itembonuses.SpellDmg, value) * ratio / 100);
 
-			entity_list.MessageClose(this, false, 100, MT_SpellCrits, "%s delivers a critical blast! (%d)", GetName(), -value);
+			entity_list.MessageClose(this, false, 100, Chat::SpellCrit, "%s delivers a critical blast! (%d)", GetName(), -value);
 
 			return value;
 		}
@@ -6179,7 +6179,7 @@ int32 Bot::GetActSpellHealing(uint16 spell_id, int32 value, Mob* target) {
 
 		value += (value * target->GetHealRate(spell_id, this) / 100);
 		if (Critical)
-			entity_list.MessageClose(this, false, 100, MT_SpellCrits, "%s performs an exceptional heal! (%d)", GetName(), value);
+			entity_list.MessageClose(this, false, 100, Chat::SpellCrit, "%s performs an exceptional heal! (%d)", GetName(), value);
 
 		return value;
 	} else {
@@ -6444,11 +6444,11 @@ bool Bot::CastSpell(uint16 spell_id, uint16 target_id, EQEmu::spells::CastingSlo
 			if(!IsValidSpell(spell_id) || casting_spell_id || delaytimer || spellend_timer.Enabled() || IsStunned() || IsFeared() || IsMezzed() || (IsSilenced() && !IsDiscipline(spell_id)) || (IsAmnesiad() && IsDiscipline(spell_id))) {
 				Log(Logs::Detail, Logs::Spells, "Spell casting canceled: not able to cast now. Valid? %d, casting %d, waiting? %d, spellend? %d, stunned? %d, feared? %d, mezed? %d, silenced? %d", IsValidSpell(spell_id), casting_spell_id, delaytimer, spellend_timer.Enabled(), IsStunned(), IsFeared(), IsMezzed(), IsSilenced() );
 				if(IsSilenced() && !IsDiscipline(spell_id))
-					Message_StringID(13, SILENCED_STRING);
+					MessageString(Chat::Red, SILENCED_STRING);
 
 				if(IsAmnesiad() && IsDiscipline(spell_id))
 
-					Message_StringID(13, MELEE_SILENCE);
+					MessageString(Chat::Red, MELEE_SILENCE);
 
 				if(casting_spell_id)
 					AI_Event_SpellCastFinished(false, static_cast<uint16>(casting_spell_slot));
@@ -6458,7 +6458,7 @@ bool Bot::CastSpell(uint16 spell_id, uint16 target_id, EQEmu::spells::CastingSlo
 		}
 
 		if(IsDetrimentalSpell(spell_id) && !zone->CanDoCombat()){
-			Message_StringID(13, SPELL_WOULDNT_HOLD);
+			MessageString(Chat::Red, SPELL_WOULDNT_HOLD);
 			if(casting_spell_id)
 				AI_Event_SpellCastFinished(false, static_cast<uint16>(casting_spell_slot));
 
@@ -8155,13 +8155,13 @@ void Bot::CalcBotStats(bool showtext) {
 		return;
 
 	if(showtext) {
-		GetBotOwner()->Message(15, "Updating %s...", GetCleanName());
+		GetBotOwner()->Message(Chat::Yellow, "Updating %s...", GetCleanName());
 	}
 
 	if(!IsValidRaceClassCombo()) {
-		GetBotOwner()->Message(15, "A %s - %s bot was detected. Is this Race/Class combination allowed?.", GetRaceIDName(GetRace()), GetClassIDName(GetClass(), GetLevel()));
-		GetBotOwner()->Message(15, "Previous Bots Code releases did not check Race/Class combinations during create.");
-		GetBotOwner()->Message(15, "Unless you are experiencing heavy lag, you should delete and remake this bot.");
+		GetBotOwner()->Message(Chat::Yellow, "A %s - %s bot was detected. Is this Race/Class combination allowed?.", GetRaceIDName(GetRace()), GetClassIDName(GetClass(), GetLevel()));
+		GetBotOwner()->Message(Chat::Yellow, "Previous Bots Code releases did not check Race/Class combinations during create.");
+		GetBotOwner()->Message(Chat::Yellow, "Unless you are experiencing heavy lag, you should delete and remake this bot.");
 	}
 
 	if(GetBotOwner()->GetLevel() != GetLevel())
@@ -8170,37 +8170,37 @@ void Bot::CalcBotStats(bool showtext) {
 	GenerateSpecialAttacks();
 
 	if(showtext) {
-		GetBotOwner()->Message(15, "Base stats:");
-		GetBotOwner()->Message(15, "Level: %i HP: %i AC: %i Mana: %i STR: %i STA: %i DEX: %i AGI: %i INT: %i WIS: %i CHA: %i", GetLevel(), base_hp, AC, max_mana, STR, STA, DEX, AGI, INT, WIS, CHA);
-		GetBotOwner()->Message(15, "Resists-- Magic: %i, Poison: %i, Fire: %i, Cold: %i, Disease: %i, Corruption: %i.",MR,PR,FR,CR,DR,Corrup);
+		GetBotOwner()->Message(Chat::Yellow, "Base stats:");
+		GetBotOwner()->Message(Chat::Yellow, "Level: %i HP: %i AC: %i Mana: %i STR: %i STA: %i DEX: %i AGI: %i INT: %i WIS: %i CHA: %i", GetLevel(), base_hp, AC, max_mana, STR, STA, DEX, AGI, INT, WIS, CHA);
+		GetBotOwner()->Message(Chat::Yellow, "Resists-- Magic: %i, Poison: %i, Fire: %i, Cold: %i, Disease: %i, Corruption: %i.",MR,PR,FR,CR,DR,Corrup);
 		// Test Code
 		if(GetClass() == BARD)
-			GetBotOwner()->Message(15, "Bard Skills-- Brass: %i, Percussion: %i, Singing: %i, Stringed: %i, Wind: %i",
+			GetBotOwner()->Message(Chat::Yellow, "Bard Skills-- Brass: %i, Percussion: %i, Singing: %i, Stringed: %i, Wind: %i",
 			GetSkill(EQEmu::skills::SkillBrassInstruments), GetSkill(EQEmu::skills::SkillPercussionInstruments), GetSkill(EQEmu::skills::SkillSinging), GetSkill(EQEmu::skills::SkillStringedInstruments), GetSkill(EQEmu::skills::SkillWindInstruments));
 	}
 
 	//if(this->Save())
-	//	this->GetBotOwner()->CastToClient()->Message(0, "%s saved.", this->GetCleanName());
+	//	this->GetBotOwner()->CastToClient()->Message(Chat::White, "%s saved.", this->GetCleanName());
 	//else
-	//	this->GetBotOwner()->CastToClient()->Message(13, "%s save failed!", this->GetCleanName());
+	//	this->GetBotOwner()->CastToClient()->Message(Chat::Red, "%s save failed!", this->GetCleanName());
 
 	CalcBonuses();
 
 	AI_AddNPCSpells(this->GetBotSpellID());
 
 	if(showtext) {
-		GetBotOwner()->Message(15, "%s has been updated.", GetCleanName());
-		GetBotOwner()->Message(15, "Level: %i HP: %i AC: %i Mana: %i STR: %i STA: %i DEX: %i AGI: %i INT: %i WIS: %i CHA: %i", GetLevel(), max_hp, GetAC(), max_mana, GetSTR(), GetSTA(), GetDEX(), GetAGI(), GetINT(), GetWIS(), GetCHA());
-		GetBotOwner()->Message(15, "Resists-- Magic: %i, Poison: %i, Fire: %i, Cold: %i, Disease: %i, Corruption: %i.",GetMR(),GetPR(),GetFR(),GetCR(),GetDR(),GetCorrup());
+		GetBotOwner()->Message(Chat::Yellow, "%s has been updated.", GetCleanName());
+		GetBotOwner()->Message(Chat::Yellow, "Level: %i HP: %i AC: %i Mana: %i STR: %i STA: %i DEX: %i AGI: %i INT: %i WIS: %i CHA: %i", GetLevel(), max_hp, GetAC(), max_mana, GetSTR(), GetSTA(), GetDEX(), GetAGI(), GetINT(), GetWIS(), GetCHA());
+		GetBotOwner()->Message(Chat::Yellow, "Resists-- Magic: %i, Poison: %i, Fire: %i, Cold: %i, Disease: %i, Corruption: %i.",GetMR(),GetPR(),GetFR(),GetCR(),GetDR(),GetCorrup());
 		// Test Code
 		if(GetClass() == BARD) {
-			GetBotOwner()->Message(15, "Bard Skills-- Brass: %i, Percussion: %i, Singing: %i, Stringed: %i, Wind: %i",
+			GetBotOwner()->Message(Chat::Yellow, "Bard Skills-- Brass: %i, Percussion: %i, Singing: %i, Stringed: %i, Wind: %i",
 				GetSkill(EQEmu::skills::SkillBrassInstruments) + GetBrassMod(),
 				GetSkill(EQEmu::skills::SkillPercussionInstruments) + GetPercMod(),
 				GetSkill(EQEmu::skills::SkillSinging) + GetSingMod(),
 				GetSkill(EQEmu::skills::SkillStringedInstruments) + GetStringMod(),
 				GetSkill(EQEmu::skills::SkillWindInstruments) + GetWindMod());
-			GetBotOwner()->Message(15, "Bard Skill Mods-- Brass: %i, Percussion: %i, Singing: %i, Stringed: %i, Wind: %i", GetBrassMod(), GetPercMod(), GetSingMod(), GetStringMod(), GetWindMod());
+			GetBotOwner()->Message(Chat::Yellow, "Bard Skill Mods-- Brass: %i, Percussion: %i, Singing: %i, Stringed: %i, Wind: %i", GetBrassMod(), GetPercMod(), GetSingMod(), GetStringMod(), GetWindMod());
 		}
 	}
 }
@@ -8868,7 +8868,7 @@ bool Bot::UseDiscipline(uint32 spell_id, uint32 target) {
 				SetDisciplineRecastTimer(spells[spell_id].EndurTimerIndex, spell.recast_time);
 		} else {
 			uint32 remain = (GetDisciplineRemainingTime(this, spells[spell_id].EndurTimerIndex) / 1000);
-			GetOwner()->Message(0, "%s can use this discipline in %d minutes %d seconds.", GetCleanName(), (remain / 60), (remain % 60));
+			GetOwner()->Message(Chat::White, "%s can use this discipline in %d minutes %d seconds.", GetCleanName(), (remain / 60), (remain % 60));
 			return false;
 		}
 	}
@@ -9070,7 +9070,7 @@ bool Bot::DyeArmor(int16 slot_id, uint32 rgb, bool all_flag, bool save_flag)
 
 		if (!database.botdb.SaveEquipmentColor(GetBotID(), save_slot, rgb)) {
 			if (GetBotOwner() && GetBotOwner()->IsClient())
-				GetBotOwner()->CastToClient()->Message(13, "%s", BotDatabase::fail::SaveEquipmentColor());
+				GetBotOwner()->CastToClient()->Message(Chat::Red, "%s", BotDatabase::fail::SaveEquipmentColor());
 			return false;
 		}
 	}
diff --git a/zone/bot_command.cpp b/zone/bot_command.cpp
index 3dccaffec..06e6ee2fe 100644
--- a/zone/bot_command.cpp
+++ b/zone/bot_command.cpp
@@ -84,12 +84,12 @@ namespace
 {
 //#define BCSTSPELLDUMP // only needed if you're adding/tailoring bot command spells and need a file dump
 
-#define m_message CC_WhiteSmoke
-#define m_action CC_Yellow
-#define m_note CC_Gray
-#define m_usage CC_Cyan
-#define m_fail CC_Red
-#define m_unknown CC_Magenta
+#define m_message Chat::White
+#define m_action Chat::Yellow
+#define m_note Chat::Gray
+#define m_usage Chat::Cyan
+#define m_fail Chat::Red
+#define m_unknown Chat::Magenta
 
 #define HP_RATIO_DELTA 5.0f
 
@@ -4833,7 +4833,7 @@ void bot_subcommand_bot_inspect_message(Client *c, const Seperator *sep)
 		set_flag = true;
 	}
 	else if (strcasecmp(sep->arg[1], "clear")) {
-		c->Message(15, "This command requires a [set | clear] argument");
+		c->Message(Chat::Yellow, "This command requires a [set | clear] argument");
 		return;
 	}
 
@@ -7284,7 +7284,7 @@ void bot_subcommand_inventory_remove(Client *c, const Seperator *sep)
 	int ab_mask = (ActionableBots::ABM_Target | ActionableBots::ABM_ByName);
 
 	if (c->GetTradeskillObject() || (c->trade->state == Trading)) {
-		c->Message_StringID(MT_Tell, MERCHANT_BUSY);
+		c->MessageString(Chat::Tell, MERCHANT_BUSY);
 		return;
 	}
 
@@ -7310,7 +7310,7 @@ void bot_subcommand_inventory_remove(Client *c, const Seperator *sep)
 		itm = itminst->GetItem();
 
 	if (itminst && itm && c->CheckLoreConflict(itm)) {
-		c->Message_StringID(0, PICK_LORE);
+		c->MessageString(Chat::White, PICK_LORE);
 		return;
 	}
 
@@ -7324,7 +7324,7 @@ void bot_subcommand_inventory_remove(Client *c, const Seperator *sep)
 		if (!c->CheckLoreConflict(itma->GetItem()))
 			continue;
 
-		c->Message_StringID(0, PICK_LORE);
+		c->MessageString(Chat::White, PICK_LORE);
 		return;
 	}
 	
@@ -7454,7 +7454,7 @@ void bot_subcommand_pet_get_lost(Client *c, const Seperator *sep)
 		if (!bot_iter->GetPet() || bot_iter->GetPet()->IsCharmed())
 			continue;
 
-		bot_iter->GetPet()->Say_StringID(PET_GETLOST_STRING);
+		bot_iter->GetPet()->SayString(PET_GETLOST_STRING);
 		bot_iter->GetPet()->Depop(false);
 		bot_iter->SetPetID(0);
 		database.botdb.DeletePetItems(bot_iter->GetBotID());
@@ -7500,7 +7500,7 @@ void bot_subcommand_pet_remove(Client *c, const Seperator *sep)
 		}
 
 		if (bot_iter->GetPet()) {
-			bot_iter->GetPet()->Say_StringID(PET_GETLOST_STRING);
+			bot_iter->GetPet()->SayString(PET_GETLOST_STRING);
 			bot_iter->GetPet()->Depop(false);
 			bot_iter->SetPetID(0);
 		}
diff --git a/zone/client.cpp b/zone/client.cpp
index 0b98be7a3..65713a0b4 100644
--- a/zone/client.cpp
+++ b/zone/client.cpp
@@ -136,6 +136,7 @@ Client::Client(EQStreamInterface* ieqs)
 	forget_timer(0),
 	autosave_timer(RuleI(Character, AutosaveIntervalS) * 1000),
 	client_scan_npc_aggro_timer(RuleI(Aggro, ClientAggroCheckInterval) * 1000),
+	client_zone_wide_full_position_update_timer(5 * 60 * 1000),
 	tribute_timer(Tribute_duration),
 	proximity_timer(ClientProximity_interval),
 	TaskPeriodic_Timer(RuleI(TaskSystem, PeriodicCheckTimer) * 1000),
@@ -446,7 +447,7 @@ Client::~Client() {
 	numclients--;
 	UpdateWindowTitle();
 	if(zone)
-	zone->RemoveAuth(GetName());
+		zone->RemoveAuth(GetName(), lskey);
 
 	//let the stream factory know were done with this stream
 	eqs->Close();
@@ -823,7 +824,7 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s
 	{
 		if(strcmp(targetname, "discard") != 0)
 		{
-			if(chan_num == 3 || chan_num == 4 || chan_num == 5 || chan_num == 7)
+			if(chan_num == ChatChannel_Shout || chan_num == ChatChannel_Auction || chan_num == ChatChannel_OOC || chan_num == ChatChannel_Tell)
 			{
 				if(GlobalChatLimiterTimer)
 				{
@@ -845,7 +846,7 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s
 				{
 					if(AttemptedMessages > RuleI(Chat, MaxMessagesBeforeKick))
 					{
-						Kick();
+						Kick("Sent too many chat messages at once.");
 						return;
 					}
 					if(GlobalChatLimiterTimer)
@@ -869,7 +870,7 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s
 		auto pack = new ServerPacket(ServerOP_Speech, sizeof(Server_Speech_Struct) + strlen(message) + 1);
 		Server_Speech_Struct* sem = (Server_Speech_Struct*) pack->pBuffer;
 
-		if(chan_num == 0)
+		if(chan_num == ChatChannel_Guild)
 			sem->guilddbid = GuildID();
 		else
 			sem->guilddbid = 0;
@@ -892,30 +893,38 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s
 	if(!mod_client_message(message, chan_num)) { return; }
 
 	// Garble the message based on drunkness
-	if (m_pp.intoxication > 0) {
+	if (m_pp.intoxication > 0 && !(RuleB(Chat, ServerWideOOC) && chan_num == ChatChannel_OOC) && !GetGM()) {
 		GarbleMessage(message, (int)(m_pp.intoxication / 3));
 		language = 0; // No need for language when drunk
+		lang_skill = 100;
+	}
+
+	// some channels don't use languages
+	if (chan_num == ChatChannel_OOC || chan_num == ChatChannel_GMSAY || chan_num == ChatChannel_Broadcast || chan_num == ChatChannel_Petition)
+	{
+		language = 0;
+		lang_skill = 100;
 	}
 
 	// Censor the message
-	if (EQEmu::ProfanityManager::IsCensorshipActive() && (chan_num != 8))
+	if (EQEmu::ProfanityManager::IsCensorshipActive() && (chan_num != ChatChannel_Say))
 		EQEmu::ProfanityManager::RedactMessage(message);
 
 	switch(chan_num)
 	{
-	case 0: { /* Guild Chat */
+	case ChatChannel_Guild: { /* Guild Chat */
 		if (!IsInAGuild())
-			Message_StringID(MT_DefaultText, GUILD_NOT_MEMBER2);	//You are not a member of any guild.
+			MessageString(Chat::DefaultText, GUILD_NOT_MEMBER2);	//You are not a member of any guild.
 		else if (!guild_mgr.CheckPermission(GuildID(), GuildRank(), GUILD_SPEAK))
 			Message(0, "Error: You dont have permission to speak to the guild.");
-		else if (!worldserver.SendChannelMessage(this, targetname, chan_num, GuildID(), language, message))
+		else if (!worldserver.SendChannelMessage(this, targetname, chan_num, GuildID(), language, lang_skill, message))
 			Message(0, "Error: World server disconnected");
 		break;
 	}
-	case 2: { /* Group Chat */
+	case ChatChannel_Group: { /* Group Chat */
 		Raid* raid = entity_list.GetRaidByClient(this);
 		if(raid) {
-			raid->RaidGroupSay((const char*) message, this);
+			raid->RaidGroupSay((const char*) message, this, language, lang_skill);
 			break;
 		}
 
@@ -925,14 +934,14 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s
 		}
 		break;
 	}
-	case 15: { /* Raid Say */
+	case ChatChannel_Raid: { /* Raid Say */
 		Raid* raid = entity_list.GetRaidByClient(this);
 		if(raid){
-			raid->RaidSay((const char*) message, this);
+			raid->RaidSay((const char*) message, this, language, lang_skill);
 		}
 		break;
 	}
-	case 3: { /* Shout */
+	case ChatChannel_Shout: { /* Shout */
 		Mob *sender = this;
 		if (GetPet() && GetTarget() == GetPet() && GetPet()->FindType(SE_VoiceGraft))
 			sender = GetPet();
@@ -940,13 +949,13 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s
 		entity_list.ChannelMessage(sender, chan_num, language, lang_skill, message);
 		break;
 	}
-	case 4: { /* Auction */
+	case ChatChannel_Auction: { /* Auction */
 		if(RuleB(Chat, ServerWideAuction))
 		{
 			if(!global_channel_timer.Check())
 			{
 				if(strlen(targetname) == 0)
-					ChannelMessageReceived(5, language, lang_skill, message, "discard"); //Fast typer or spammer??
+					ChannelMessageReceived(chan_num, language, lang_skill, message, "discard"); //Fast typer or spammer??
 				else
 					return;
 			}
@@ -966,7 +975,7 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s
 				}
 			}
 
-			if (!worldserver.SendChannelMessage(this, 0, 4, 0, language, message))
+			if (!worldserver.SendChannelMessage(this, 0, chan_num, 0, language, lang_skill, message))
 			Message(0, "Error: World server disconnected");
 		}
 		else if(!RuleB(Chat, ServerWideAuction)) {
@@ -975,17 +984,17 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s
 			if (GetPet() && GetTarget() == GetPet() && GetPet()->FindType(SE_VoiceGraft))
 			sender = GetPet();
 
-		entity_list.ChannelMessage(sender, chan_num, language, message);
+			entity_list.ChannelMessage(sender, chan_num, language, lang_skill, message);
 		}
 		break;
 	}
-	case 5: { /* OOC */
+	case ChatChannel_OOC: { /* OOC */
 		if(RuleB(Chat, ServerWideOOC))
 		{
 			if(!global_channel_timer.Check())
 			{
 				if(strlen(targetname) == 0)
-					ChannelMessageReceived(5, language, lang_skill, message, "discard"); //Fast typer or spammer??
+					ChannelMessageReceived(chan_num, language, lang_skill, message, "discard"); //Fast typer or spammer??
 				else
 					return;
 			}
@@ -1010,7 +1019,7 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s
 				}
 			}
 
-			if (!worldserver.SendChannelMessage(this, 0, 5, 0, language, message))
+			if (!worldserver.SendChannelMessage(this, 0, chan_num, 0, language, lang_skill, message))
 			{
 				Message(0, "Error: World server disconnected");
 			}
@@ -1022,19 +1031,19 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s
 			if (GetPet() && GetTarget() == GetPet() && GetPet()->FindType(SE_VoiceGraft))
 				sender = GetPet();
 
-			entity_list.ChannelMessage(sender, chan_num, language, message);
+			entity_list.ChannelMessage(sender, chan_num, language, lang_skill, message);
 		}
 		break;
 	}
-	case 6: /* Broadcast */
-	case 11: { /* GM Say */
+	case ChatChannel_Broadcast: /* Broadcast */
+	case ChatChannel_GMSAY: { /* GM Say */
 		if (!(admin >= 80))
 			Message(0, "Error: Only GMs can use this channel");
-		else if (!worldserver.SendChannelMessage(this, targetname, chan_num, 0, language, message))
+		else if (!worldserver.SendChannelMessage(this, targetname, chan_num, 0, language, lang_skill, message))
 			Message(0, "Error: World server disconnected");
 		break;
 	}
-	case 7: { /* Tell */
+	case ChatChannel_Tell: { /* Tell */
 			if(!global_channel_timer.Check())
 			{
 				if(strlen(targetname) == 0)
@@ -1078,21 +1087,21 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s
 				target_name[x] = '\0';
 			}
 
-			if(!worldserver.SendChannelMessage(this, target_name, chan_num, 0, language, message))
+			if(!worldserver.SendChannelMessage(this, target_name, chan_num, 0, language, lang_skill, message))
 				Message(0, "Error: World server disconnected");
 		break;
 	}
-	case 8: { /* Say */
+	case ChatChannel_Say: { /* Say */
 		if(message[0] == COMMAND_CHAR) {
 			if(command_dispatch(this, message) == -2) {
 				if(parse->PlayerHasQuestSub(EVENT_COMMAND)) {
 					int i = parse->EventPlayer(EVENT_COMMAND, this, message, 0);
 					if(i == 0 && !RuleB(Chat, SuppressCommandErrors)) {
-						Message(13, "Command '%s' not recognized.", message);
+						Message(Chat::Red, "Command '%s' not recognized.", message);
 					}
 				} else {
 					if(!RuleB(Chat, SuppressCommandErrors))
-						Message(13, "Command '%s' not recognized.", message);
+						Message(Chat::Red, "Command '%s' not recognized.", message);
 				}
 			}
 			break;
@@ -1107,12 +1116,12 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s
 				if (parse->PlayerHasQuestSub(EVENT_COMMAND)) {
 					int i = parse->EventPlayer(EVENT_COMMAND, this, message, 0);
 					if (i == 0 && !RuleB(Chat, SuppressCommandErrors)) {
-						Message(13, "Bot command '%s' not recognized.", message);
+						Message(Chat::Red, "Bot command '%s' not recognized.", message);
 					}
 				}
 				else {
 					if (!RuleB(Chat, SuppressCommandErrors))
-						Message(13, "Bot command '%s' not recognized.", message);
+						Message(Chat::Red, "Bot command '%s' not recognized.", message);
 				}
 			}
 			break;
@@ -1158,14 +1167,14 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s
 		}
 		break;
 	}
-	case 20:
+	case ChatChannel_UCSRelay:
 	{
 		// UCS Relay for Underfoot and later.
-		if(!worldserver.SendChannelMessage(this, 0, chan_num, 0, language, message))
+		if(!worldserver.SendChannelMessage(this, 0, chan_num, 0, language, lang_skill, message))
 			Message(0, "Error: World server disconnected");
 		break;
 	}
-	case 22:
+	case ChatChannel_Emotes:
 	{
 		// Emotes for Underfoot and later.
 		// crash protection -- cheater
@@ -1189,11 +1198,6 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s
 	}
 }
 
-// if no language skill is specified, call the function with a skill of 100.
-void Client::ChannelMessageSend(const char* from, const char* to, uint8 chan_num, uint8 language, const char* message, ...) {
-	ChannelMessageSend(from, to, chan_num, language, 100, message);
-}
-
 void Client::ChannelMessageSend(const char* from, const char* to, uint8 chan_num, uint8 language, uint8 lang_skill, const char* message, ...) {
 	if ((chan_num==11 && !(this->GetGM())) || (chan_num==10 && this->Admin()<80)) // dont need to send /pr & /petition to everybody
 		return;
@@ -1218,7 +1222,7 @@ void Client::ChannelMessageSend(const char* from, const char* to, uint8 chan_num
 	}
 	if (to != 0)
 		strcpy((char *) cm->targetname, to);
-	else if (chan_num == 7)
+	else if (chan_num == ChatChannel_Tell)
 		strcpy(cm->targetname, m_pp.name);
 	else
 		cm->targetname[0] = 0;
@@ -1227,7 +1231,7 @@ void Client::ChannelMessageSend(const char* from, const char* to, uint8 chan_num
 
 	if (language < MAX_PP_LANGUAGE) {
 		ListenerSkill = m_pp.languages[language];
-		if (ListenerSkill == 0) {
+		if (ListenerSkill < 24) {
 			cm->language = (MAX_PP_LANGUAGE - 1); // in an unknown tongue
 		}
 		else {
@@ -1253,7 +1257,7 @@ void Client::ChannelMessageSend(const char* from, const char* to, uint8 chan_num
 	bool weAreNotSender = strcmp(this->GetCleanName(), cm->sender);
 
 	if (senderCanTrainSelf || weAreNotSender) {
-		if ((chan_num == 2) && (ListenerSkill < 100)) {	// group message in unmastered language, check for skill up
+		if ((chan_num == ChatChannel_Group) && (ListenerSkill < 100)) {	// group message in unmastered language, check for skill up
 			if (m_pp.languages[language] <= lang_skill)
 				CheckLanguageSkillIncrease(language, lang_skill);
 		}
@@ -1261,11 +1265,11 @@ void Client::ChannelMessageSend(const char* from, const char* to, uint8 chan_num
 }
 
 void Client::Message(uint32 type, const char* message, ...) {
-	if (GetFilter(FilterSpellDamage) == FilterHide && type == MT_NonMelee)
+	if (GetFilter(FilterSpellDamage) == FilterHide && type == Chat::NonMelee)
 		return;
-	if (GetFilter(FilterMeleeCrits) == FilterHide && type == MT_CritMelee) //98 is self...
+	if (GetFilter(FilterMeleeCrits) == FilterHide && type == Chat::MeleeCrit) //98 is self...
 		return;
-	if (GetFilter(FilterSpellCrits) == FilterHide && type == MT_SpellCrits)
+	if (GetFilter(FilterSpellCrits) == FilterHide && type == Chat::SpellCrit)
 		return;
 
 	va_list argptr;
@@ -1274,21 +1278,19 @@ void Client::Message(uint32 type, const char* message, ...) {
 	vsnprintf(buffer, 4096, message, argptr);
 	va_end(argptr);
 
-	size_t len = strlen(buffer);
+	SerializeBuffer buf(sizeof(SpecialMesgHeader_Struct) + 12 + 64 + 64);
+	buf.WriteInt8(static_cast<int8>(Journal::SpeakMode::Raw));
+	buf.WriteInt8(static_cast<int8>(Journal::Mode::None));
+	buf.WriteInt8(0); // language
+	buf.WriteUInt32(type);
+	buf.WriteUInt32(0); // target spawn ID used for journal filtering, ignored here
+	buf.WriteString(""); // send name, not applicable here
+	buf.WriteInt32(0); // location, client seems to ignore
+	buf.WriteInt32(0);
+	buf.WriteInt32(0);
+	buf.WriteString(buffer);
 
-	//client dosent like our packet all the time unless
-	//we make it really big, then it seems to not care that
-	//our header is malformed.
-	//len = 4096 - sizeof(SpecialMesg_Struct);
-
-	uint32 len_packet = sizeof(SpecialMesg_Struct)+len;
-	auto app = new EQApplicationPacket(OP_SpecialMesg, len_packet);
-	SpecialMesg_Struct* sm=(SpecialMesg_Struct*)app->pBuffer;
-	sm->header[0] = 0x00; // Header used for #emote style messages..
-	sm->header[1] = 0x00; // Play around with these to see other types
-	sm->header[2] = 0x00;
-	sm->msg_type = type;
-	memcpy(sm->message, buffer, len+1);
+	auto app = new EQApplicationPacket(OP_SpecialMesg, buf);
 
 	FastQueuePacket(&app);
 
@@ -1305,67 +1307,25 @@ void Client::FilteredMessage(Mob *sender, uint32 type, eqFilterType filter, cons
 	vsnprintf(buffer, 4096, message, argptr);
 	va_end(argptr);
 
-	size_t len = strlen(buffer);
+	SerializeBuffer buf(sizeof(SpecialMesgHeader_Struct) + 12 + 64 + 64);
+	buf.WriteInt8(static_cast<int8>(Journal::SpeakMode::Raw));
+	buf.WriteInt8(static_cast<int8>(Journal::Mode::None));
+	buf.WriteInt8(0); // language
+	buf.WriteUInt32(type);
+	buf.WriteUInt32(0); // target spawn ID used for journal filtering, ignored here
+	buf.WriteString(""); // send name, not applicable here
+	buf.WriteInt32(0); // location, client seems to ignore
+	buf.WriteInt32(0);
+	buf.WriteInt32(0);
+	buf.WriteString(buffer);
 
-	//client dosent like our packet all the time unless
-	//we make it really big, then it seems to not care that
-	//our header is malformed.
-	//len = 4096 - sizeof(SpecialMesg_Struct);
-
-	uint32 len_packet = sizeof(SpecialMesg_Struct) + len;
-	auto app = new EQApplicationPacket(OP_SpecialMesg, len_packet);
-	SpecialMesg_Struct* sm = (SpecialMesg_Struct*)app->pBuffer;
-	sm->header[0] = 0x00; // Header used for #emote style messages..
-	sm->header[1] = 0x00; // Play around with these to see other types
-	sm->header[2] = 0x00;
-	sm->msg_type = type;
-	memcpy(sm->message, buffer, len + 1);
+	auto app = new EQApplicationPacket(OP_SpecialMesg, buf);
 
 	FastQueuePacket(&app);
 
 	safe_delete_array(buffer);
 }
 
-void Client::QuestJournalledMessage(const char *npcname, const char* message) {
-
-	// npcnames longer than 60 characters crash the client when they log back in
-	const int MaxNPCNameLength = 60;
-	// I assume there is an upper safe limit on the message length. Don't know what it is, but 4000 doesn't crash
-	// the client.
-	const int MaxMessageLength = 4000;
-
-	char OutNPCName[MaxNPCNameLength+1];
-	char OutMessage[MaxMessageLength+1];
-
-	// Apparently Visual C++ snprintf is not C99 compliant and doesn't put the null terminator
-	// in if the formatted string >= the maximum length, so we put it in.
-	//
-	snprintf(OutNPCName, MaxNPCNameLength, "%s", npcname); OutNPCName[MaxNPCNameLength]='\0';
-	snprintf(OutMessage, MaxMessageLength, "%s", message); OutMessage[MaxMessageLength]='\0';
-
-	uint32 len_packet = sizeof(SpecialMesg_Struct) + strlen(OutNPCName) + strlen(OutMessage);
-	auto app = new EQApplicationPacket(OP_SpecialMesg, len_packet);
-	SpecialMesg_Struct* sm=(SpecialMesg_Struct*)app->pBuffer;
-
-	sm->header[0] = 0;
-	sm->header[1] = 2;
-	sm->header[2] = 0;
-	sm->msg_type = 0x0a;
-	sm->target_spawn_id = GetID();
-
-	char *dest = &sm->sayer[0];
-
-	memcpy(dest, OutNPCName, strlen(OutNPCName) + 1);
-
-	dest = dest + strlen(OutNPCName) + 13;
-
-	memcpy(dest, OutMessage, strlen(OutMessage) + 1);
-
-	QueuePacket(app);
-
-	safe_delete(app);
-}
-
 void Client::SetMaxHP() {
 	if(dead)
 		return;
@@ -1549,7 +1509,7 @@ void Client::IncreaseLanguageSkill(int skill_id, int value) {
 	QueuePacket(outapp);
 	safe_delete(outapp);
 
-	Message_StringID( MT_Skills, LANG_SKILL_IMPROVED ); //Notify client
+	MessageString( Chat::Skills, LANG_SKILL_IMPROVED ); //Notify client
 }
 
 void Client::AddSkill(EQEmu::skills::SkillType skillid, uint16 value) {
@@ -2087,7 +2047,7 @@ bool Client::ChangeFirstName(const char* in_firstname, const char* gmname)
 void Client::SetGM(bool toggle) {
 	m_pp.gm = toggle ? 1 : 0;
 	m_inv.SetGMInventory((bool)m_pp.gm);
-	Message(13, "You are %s a GM.", m_pp.gm ? "now" : "no longer");
+	Message(Chat::Red, "You are %s a GM.", m_pp.gm ? "now" : "no longer");
 	SendAppearancePacket(AT_GM, m_pp.gm);
 	Save();
 	UpdateWho();
@@ -2590,7 +2550,7 @@ uint16 Client::GetMaxSkillAfterSpecializationRules(EQEmu::skills::SkillType skil
 			}
 			else
 			{
-				Message(13, "Your spell casting specializations skills have been reset. "
+				Message(Chat::Red, "Your spell casting specializations skills have been reset. "
 						"Only %i primary specialization skill is allowed.", MaxSpecializations);
 
 				for (int i = EQEmu::skills::SkillSpecializeAbjure; i <= EQEmu::skills::SkillSpecializeEvocation; ++i)
@@ -2618,22 +2578,28 @@ void Client::SetPVP(bool toggle, bool message) {
 
 	if (message) {
 		if(GetPVP())
-			this->Message_StringID(MT_Shout,PVP_ON);
+			this->MessageString(Chat::Shout,PVP_ON);
 		else
-			Message(13, "You no longer follow the ways of discord.");
+			Message(Chat::Red, "You no longer follow the ways of discord.");
 	}
 
 	SendAppearancePacket(AT_PVP, GetPVP());
 	Save();
 }
 
+void Client::Kick(const std::string &reason) {
+	client_state = CLIENT_KICKED;
+
+	Log(Logs::General, Logs::Client_Login, "Client [%s] kicked, reason [%s]", GetCleanName(), reason.c_str());
+}
+
 void Client::WorldKick() {
 	auto outapp = new EQApplicationPacket(OP_GMKick, sizeof(GMKick_Struct));
 	GMKick_Struct* gmk = (GMKick_Struct *)outapp->pBuffer;
 	strcpy(gmk->name,GetName());
 	QueuePacket(outapp);
 	safe_delete(outapp);
-	Kick();
+	Kick("World kick issued");
 }
 
 void Client::GMKill() {
@@ -2748,22 +2714,22 @@ void Client::Disarm(Client* disarmer, int chance) {
 					if (matslot != EQEmu::textures::materialInvalid)
 						SendWearChange(matslot);
 				}
-				Message_StringID(MT_Skills, DISARMED);
+				MessageString(Chat::Skills, DISARMED);
 				if (disarmer != this)
-					disarmer->Message_StringID(MT_Skills, DISARM_SUCCESS, this->GetCleanName());
+					disarmer->MessageString(Chat::Skills, DISARM_SUCCESS, this->GetCleanName());
 				if (chance != 1000)
 					disarmer->CheckIncreaseSkill(EQEmu::skills::SkillDisarm, nullptr, 4);
 				CalcBonuses();
 				// CalcEnduranceWeightFactor();
 				return;
 			}
-			disarmer->Message_StringID(MT_Skills, DISARM_FAILED);
+			disarmer->MessageString(Chat::Skills, DISARM_FAILED);
 			if (chance != 1000)
 				disarmer->CheckIncreaseSkill(EQEmu::skills::SkillDisarm, nullptr, 2);
 			return;
 		}
 	}
-	disarmer->Message_StringID(MT_Skills, DISARM_FAILED);
+	disarmer->MessageString(Chat::Skills, DISARM_FAILED);
 }
 
 bool Client::BindWound(Mob *bindmob, bool start, bool fail)
@@ -2805,7 +2771,7 @@ bool Client::BindWound(Mob *bindmob, bool start, bool fail)
 			} else {
 				// send bindmob "stand still"
 				if (!bindmob->IsAIControlled() && bindmob != this) {
-					bindmob->CastToClient()->Message_StringID(clientMessageYellow,
+					bindmob->CastToClient()->MessageString(Chat::Yellow,
 										  YOU_ARE_BEING_BANDAGED);
 				} else if (bindmob->IsAIControlled() && bindmob != this) {
 					; // Tell IPC to stand still?
@@ -2889,7 +2855,7 @@ bool Client::BindWound(Mob *bindmob, bool start, bool fail)
 						}
 						else {
 							// I dont have the real, live
-							Message(15, "You cannot bind wounds above %d%% hitpoints.",
+							Message(Chat::Yellow, "You cannot bind wounds above %d%% hitpoints.",
 								max_percent);
 							if (bindmob != this && bindmob->IsClient())
 								bindmob->CastToClient()->Message(
@@ -2950,9 +2916,9 @@ bool Client::BindWound(Mob *bindmob, bool start, bool fail)
 							bindmob->SendHPUpdate();
 						}
 						else {
-							Message(15, "You cannot bind wounds above %d%% hitpoints", max_percent);
+							Message(Chat::Yellow, "You cannot bind wounds above %d%% hitpoints", max_percent);
 							if (bindmob != this && bindmob->IsClient())
-								bindmob->CastToClient()->Message(15, "You cannot have your wounds bound above %d%% hitpoints", max_percent);
+								bindmob->CastToClient()->Message(Chat::Yellow, "You cannot have your wounds bound above %d%% hitpoints", max_percent);
 						}
 					}
 				}
@@ -3109,13 +3075,13 @@ void Client::ServerFilter(SetServerFilter_Struct* filter){
 }
 
 // this version is for messages with no parameters
-void Client::Message_StringID(uint32 type, uint32 string_id, uint32 distance)
+void Client::MessageString(uint32 type, uint32 string_id, uint32 distance)
 {
-	if (GetFilter(FilterSpellDamage) == FilterHide && type == MT_NonMelee)
+	if (GetFilter(FilterSpellDamage) == FilterHide && type == Chat::NonMelee)
 		return;
-	if (GetFilter(FilterMeleeCrits) == FilterHide && type == MT_CritMelee) //98 is self...
+	if (GetFilter(FilterMeleeCrits) == FilterHide && type == Chat::MeleeCrit) //98 is self...
 		return;
-	if (GetFilter(FilterSpellCrits) == FilterHide && type == MT_SpellCrits)
+	if (GetFilter(FilterSpellCrits) == FilterHide && type == Chat::SpellCrit)
 		return;
 	auto outapp = new EQApplicationPacket(OP_SimpleMessage, 12);
 	SimpleMessage_Struct* sms = (SimpleMessage_Struct*)outapp->pBuffer;
@@ -3137,30 +3103,30 @@ void Client::Message_StringID(uint32 type, uint32 string_id, uint32 distance)
 // to load the eqstr file and count them in the string.
 // This hack sucks but it's gonna work for now.
 //
-void Client::Message_StringID(uint32 type, uint32 string_id, const char* message1,
+void Client::MessageString(uint32 type, uint32 string_id, const char* message1,
 	const char* message2,const char* message3,const char* message4,
 	const char* message5,const char* message6,const char* message7,
 	const char* message8,const char* message9, uint32 distance)
 {
-	if (GetFilter(FilterSpellDamage) == FilterHide && type == MT_NonMelee)
+	if (GetFilter(FilterSpellDamage) == FilterHide && type == Chat::NonMelee)
 		return;
-	if (GetFilter(FilterMeleeCrits) == FilterHide && type == MT_CritMelee) //98 is self...
+	if (GetFilter(FilterMeleeCrits) == FilterHide && type == Chat::MeleeCrit) //98 is self...
 		return;
-	if (GetFilter(FilterSpellCrits) == FilterHide && type == MT_SpellCrits)
+	if (GetFilter(FilterSpellCrits) == FilterHide && type == Chat::SpellCrit)
 		return;
-	if (GetFilter(FilterDamageShields) == FilterHide && type == MT_DS)
+	if (GetFilter(FilterDamageShields) == FilterHide && type == Chat::DamageShield)
 		return;
 
 	int i = 0, argcount = 0, length = 0;
 	char *bufptr = nullptr;
 	const char *message_arg[9] = {0};
 
-	if(type==MT_Emote)
+	if(type==Chat::Emote)
 		type=4;
 
 	if(!message1)
 	{
-		Message_StringID(type, string_id);	// use the simple message instead
+		MessageString(type, string_id);	// use the simple message instead
 		return;
 	}
 
@@ -3239,7 +3205,7 @@ bool Client::FilteredMessageCheck(Mob *sender, eqFilterType filter)
 	return true;
 }
 
-void Client::FilteredMessage_StringID(Mob *sender, uint32 type,
+void Client::FilteredMessageString(Mob *sender, uint32 type,
 		eqFilterType filter, uint32 string_id)
 {
 	if (!FilteredMessageCheck(sender, filter))
@@ -3258,7 +3224,7 @@ void Client::FilteredMessage_StringID(Mob *sender, uint32 type,
 	return;
 }
 
-void Client::FilteredMessage_StringID(Mob *sender, uint32 type, eqFilterType filter, uint32 string_id,
+void Client::FilteredMessageString(Mob *sender, uint32 type, eqFilterType filter, uint32 string_id,
 		const char *message1, const char *message2, const char *message3,
 		const char *message4, const char *message5, const char *message6,
 		const char *message7, const char *message8, const char *message9)
@@ -3270,11 +3236,11 @@ void Client::FilteredMessage_StringID(Mob *sender, uint32 type, eqFilterType fil
 	char *bufptr = nullptr;
 	const char *message_arg[9] = {0};
 
-	if (type == MT_Emote)
+	if (type == Chat::Emote)
 		type = 4;
 
 	if (!message1) {
-		FilteredMessage_StringID(sender, type, filter, string_id);	// use the simple message instead
+		FilteredMessageString(sender, type, filter, string_id);	// use the simple message instead
 		return;
 	}
 
@@ -3315,7 +3281,7 @@ void Client::Tell_StringID(uint32 string_id, const char *who, const char *messag
 	char string_id_str[10];
 	snprintf(string_id_str, 10, "%d", string_id);
 
-	Message_StringID(MT_TellEcho, TELL_QUEUED_MESSAGE, who, string_id_str, message);
+	MessageString(Chat::EchoTell, TELL_QUEUED_MESSAGE, who, string_id_str, message);
 }
 
 void Client::SetTint(int16 in_slot, uint32 color) {
@@ -3378,7 +3344,7 @@ void Client::SetLanguageSkill(int langid, int value)
 	QueuePacket(outapp);
 	safe_delete(outapp);
 
-	Message_StringID( MT_Skills, LANG_SKILL_IMPROVED ); //Notify the client
+	MessageString( Chat::Skills, LANG_SKILL_IMPROVED ); //Notify the client
 }
 
 void Client::LinkDead()
@@ -3466,7 +3432,7 @@ void Client::Escape()
 	entity_list.RemoveFromTargets(this, true);
 	SetInvisible(1);
 
-	Message_StringID(MT_Skills, ESCAPE);
+	MessageString(Chat::Skills, ESCAPE);
 }
 
 float Client::CalcPriceMod(Mob* other, bool reverse)
@@ -3862,9 +3828,9 @@ void Client::EnteringMessages(Client* client)
 		uint8 flag = database.GetAgreementFlag(client->AccountID());
 		if(!flag)
 		{
-			client->Message(13,"You must agree to the Rules, before you can move. (type #serverrules to view the rules)");
-			client->Message(13,"You must agree to the Rules, before you can move. (type #serverrules to view the rules)");
-			client->Message(13,"You must agree to the Rules, before you can move. (type #serverrules to view the rules)");
+			client->Message(Chat::Red,"You must agree to the Rules, before you can move. (type #serverrules to view the rules)");
+			client->Message(Chat::Red,"You must agree to the Rules, before you can move. (type #serverrules to view the rules)");
+			client->Message(Chat::Red,"You must agree to the Rules, before you can move. (type #serverrules to view the rules)");
 			client->SendAppearancePacket(AT_Anim, ANIM_FREEZE);
 		}
 	}
@@ -3879,7 +3845,7 @@ void Client::SendRules(Client* client)
 
 	auto lines = SplitString(rules, '\n');
 	for (auto&& e : lines)
-		client->Message(0, "%s", e.c_str());
+		client->Message(Chat::White, "%s", e.c_str());
 }
 
 void Client::SetEndurance(int32 newEnd)
@@ -3906,13 +3872,13 @@ void Client::SacrificeConfirm(Client *caster)
 	}
 
 	if (GetLevel() < RuleI(Spells, SacrificeMinLevel)) {
-		caster->Message_StringID(13, SAC_TOO_LOW); // This being is not a worthy sacrifice.
+		caster->MessageString(Chat::Red, SAC_TOO_LOW); // This being is not a worthy sacrifice.
 		safe_delete(outapp);
 		return;
 	}
 
 	if (GetLevel() > RuleI(Spells, SacrificeMaxLevel)) {
-		caster->Message_StringID(13, SAC_TOO_HIGH);
+		caster->MessageString(Chat::Red, SAC_TOO_HIGH);
 		safe_delete(outapp);
 		return;
 	}
@@ -3981,7 +3947,7 @@ void Client::Sacrifice(Client *caster)
 				caster->SummonItem(RuleI(Spells, SacrificeItemID));
 		}
 	} else {
-		caster->Message_StringID(13, SAC_TOO_LOW); // This being is not a worthy sacrifice.
+		caster->MessageString(Chat::Red, SAC_TOO_LOW); // This being is not a worthy sacrifice.
 	}
 }
 
@@ -4256,7 +4222,7 @@ void Client::KeyRingAdd(uint32 item_id)
 		return;
 	}
 
-	Message(4,"Added to keyring.");
+	Message(Chat::LightBlue,"Added to keyring.");
 
 	keyring.push_back(item_id);
 }
@@ -4272,11 +4238,11 @@ bool Client::KeyRingCheck(uint32 item_id)
 
 void Client::KeyRingList()
 {
-	Message(4,"Keys on Keyring:");
+	Message(Chat::LightBlue,"Keys on Keyring:");
 	const EQEmu::ItemData *item = nullptr;
 	for (auto iter = keyring.begin(); iter != keyring.end(); ++iter) {
 		if ((item = database.GetItem(*iter))!=nullptr) {
-			Message(4,item->Name);
+			Message(Chat::LightBlue,item->Name);
 		}
 	}
 }
@@ -4448,8 +4414,8 @@ bool Client::GroupFollow(Client* inviter) {
 
 			if (group->GetID() == 0)
 			{
-				Message(13, "Unable to get new group id. Cannot create group.");
-				inviter->Message(13, "Unable to get new group id. Cannot create group.");
+				Message(Chat::Red, "Unable to get new group id. Cannot create group.");
+				inviter->Message(Chat::Red, "Unable to get new group id. Cannot create group.");
 				return false;
 			}
 
@@ -4958,7 +4924,7 @@ void Client::HandleLDoNOpen(NPC *target)
 		{
 			Log(Logs::General, Logs::None, "%s tried to open %s but %s was out of range",
 				GetName(), target->GetName(), target->GetName());
-			Message(13, "Treasure chest out of range.");
+			Message(Chat::Red, "Treasure chest out of range.");
 			return;
 		}
 
@@ -4966,7 +4932,7 @@ void Client::HandleLDoNOpen(NPC *target)
 		{
 			if(target->GetLDoNTrapSpellID() != 0)
 			{
-				Message_StringID(13, LDON_ACCIDENT_SETOFF2);
+				MessageString(Chat::Red, LDON_ACCIDENT_SETOFF2);
 				target->SpellFinished(target->GetLDoNTrapSpellID(), this, EQEmu::spells::CastingSlot::Item, 0, -1, spells[target->GetLDoNTrapSpellID()].ResistDiff);
 				target->SetLDoNTrapSpellID(0);
 				target->SetLDoNTrapped(false);
@@ -4982,7 +4948,7 @@ void Client::HandleLDoNOpen(NPC *target)
 
 		if(target->IsLDoNLocked())
 		{
-			Message_StringID(MT_Skills, LDON_STILL_LOCKED, target->GetCleanName());
+			MessageString(Chat::Skills, LDON_STILL_LOCKED, target->GetCleanName());
 			return;
 		}
 		else
@@ -5016,13 +4982,13 @@ void Client::HandleLDoNSenseTraps(NPC *target, uint16 skill, uint8 type)
 		{
 			if((target->GetLDoNTrapType() == LDoNTypeCursed || target->GetLDoNTrapType() == LDoNTypeMagical) && type != target->GetLDoNTrapType())
 			{
-				Message_StringID(MT_Skills, LDON_CANT_DETERMINE_TRAP, target->GetCleanName());
+				MessageString(Chat::Skills, LDON_CANT_DETERMINE_TRAP, target->GetCleanName());
 				return;
 			}
 
 			if(target->IsLDoNTrapDetected())
 			{
-				Message_StringID(MT_Skills, LDON_CERTAIN_TRAP, target->GetCleanName());
+				MessageString(Chat::Skills, LDON_CERTAIN_TRAP, target->GetCleanName());
 			}
 			else
 			{
@@ -5031,10 +4997,10 @@ void Client::HandleLDoNSenseTraps(NPC *target, uint16 skill, uint8 type)
 				{
 				case -1:
 				case 0:
-					Message_StringID(MT_Skills, LDON_DONT_KNOW_TRAPPED, target->GetCleanName());
+					MessageString(Chat::Skills, LDON_DONT_KNOW_TRAPPED, target->GetCleanName());
 					break;
 				case 1:
-					Message_StringID(MT_Skills, LDON_CERTAIN_TRAP, target->GetCleanName());
+					MessageString(Chat::Skills, LDON_CERTAIN_TRAP, target->GetCleanName());
 					target->SetLDoNTrapDetected(true);
 					break;
 				default:
@@ -5044,7 +5010,7 @@ void Client::HandleLDoNSenseTraps(NPC *target, uint16 skill, uint8 type)
 		}
 		else
 		{
-			Message_StringID(MT_Skills, LDON_CERTAIN_NOT_TRAP, target->GetCleanName());
+			MessageString(Chat::Skills, LDON_CERTAIN_NOT_TRAP, target->GetCleanName());
 		}
 	}
 }
@@ -5057,13 +5023,13 @@ void Client::HandleLDoNDisarm(NPC *target, uint16 skill, uint8 type)
 		{
 			if(!target->IsLDoNTrapped())
 			{
-				Message_StringID(MT_Skills, LDON_WAS_NOT_TRAPPED, target->GetCleanName());
+				MessageString(Chat::Skills, LDON_WAS_NOT_TRAPPED, target->GetCleanName());
 				return;
 			}
 
 			if((target->GetLDoNTrapType() == LDoNTypeCursed || target->GetLDoNTrapType() == LDoNTypeMagical) && type != target->GetLDoNTrapType())
 			{
-				Message_StringID(MT_Skills, LDON_HAVE_NOT_DISARMED, target->GetCleanName());
+				MessageString(Chat::Skills, LDON_HAVE_NOT_DISARMED, target->GetCleanName());
 				return;
 			}
 
@@ -5082,13 +5048,13 @@ void Client::HandleLDoNDisarm(NPC *target, uint16 skill, uint8 type)
 				target->SetLDoNTrapDetected(false);
 				target->SetLDoNTrapped(false);
 				target->SetLDoNTrapSpellID(0);
-				Message_StringID(MT_Skills, LDON_HAVE_DISARMED, target->GetCleanName());
+				MessageString(Chat::Skills, LDON_HAVE_DISARMED, target->GetCleanName());
 				break;
 			case 0:
-				Message_StringID(MT_Skills, LDON_HAVE_NOT_DISARMED, target->GetCleanName());
+				MessageString(Chat::Skills, LDON_HAVE_NOT_DISARMED, target->GetCleanName());
 				break;
 			case -1:
-				Message_StringID(13, LDON_ACCIDENT_SETOFF2);
+				MessageString(Chat::Red, LDON_ACCIDENT_SETOFF2);
 				target->SpellFinished(target->GetLDoNTrapSpellID(), this, EQEmu::spells::CastingSlot::Item, 0, -1, spells[target->GetLDoNTrapSpellID()].ResistDiff);
 				target->SetLDoNTrapSpellID(0);
 				target->SetLDoNTrapped(false);
@@ -5107,7 +5073,7 @@ void Client::HandleLDoNPickLock(NPC *target, uint16 skill, uint8 type)
 		{
 			if(target->IsLDoNTrapped())
 			{
-				Message_StringID(13, LDON_ACCIDENT_SETOFF2);
+				MessageString(Chat::Red, LDON_ACCIDENT_SETOFF2);
 				target->SpellFinished(target->GetLDoNTrapSpellID(), this, EQEmu::spells::CastingSlot::Item, 0, -1, spells[target->GetLDoNTrapSpellID()].ResistDiff);
 				target->SetLDoNTrapSpellID(0);
 				target->SetLDoNTrapped(false);
@@ -5116,13 +5082,13 @@ void Client::HandleLDoNPickLock(NPC *target, uint16 skill, uint8 type)
 
 			if(!target->IsLDoNLocked())
 			{
-				Message_StringID(MT_Skills, LDON_WAS_NOT_LOCKED, target->GetCleanName());
+				MessageString(Chat::Skills, LDON_WAS_NOT_LOCKED, target->GetCleanName());
 				return;
 			}
 
 			if((target->GetLDoNTrapType() == LDoNTypeCursed || target->GetLDoNTrapType() == LDoNTypeMagical) && type != target->GetLDoNTrapType())
 			{
-				Message(MT_Skills, "You cannot unlock %s with this skill.", target->GetCleanName());
+				Message(Chat::Skills, "You cannot unlock %s with this skill.", target->GetCleanName());
 				return;
 			}
 
@@ -5132,11 +5098,11 @@ void Client::HandleLDoNPickLock(NPC *target, uint16 skill, uint8 type)
 			{
 			case 0:
 			case -1:
-				Message_StringID(MT_Skills, LDON_PICKLOCK_FAILURE, target->GetCleanName());
+				MessageString(Chat::Skills, LDON_PICKLOCK_FAILURE, target->GetCleanName());
 				break;
 			case 1:
 				target->SetLDoNLocked(false);
-				Message_StringID(MT_Skills, LDON_PICKLOCK_SUCCESS, target->GetCleanName());
+				MessageString(Chat::Skills, LDON_PICKLOCK_SUCCESS, target->GetCleanName());
 				break;
 			}
 		}
@@ -5195,7 +5161,7 @@ void Client::SummonAndRezzAllCorpses()
 	int CorpseCount = database.SummonAllCharacterCorpses(CharacterID(), zone->GetZoneID(), zone->GetInstanceID(), GetPosition());
 	if(CorpseCount <= 0)
 	{
-		Message(clientMessageYellow, "You have no corpses to summnon.");
+		Message(Chat::Yellow, "You have no corpses to summnon.");
 		return;
 	}
 
@@ -5204,7 +5170,7 @@ void Client::SummonAndRezzAllCorpses()
 	if(RezzExp > 0)
 		SetEXP(GetEXP() + RezzExp, GetAAXP(), true);
 
-	Message(clientMessageYellow, "All your corpses have been summoned to your feet and have received a 100% resurrection.");
+	Message(Chat::Yellow, "All your corpses have been summoned to your feet and have received a 100% resurrection.");
 }
 
 void Client::SummonAllCorpses(const glm::vec4& position)
@@ -5284,7 +5250,7 @@ void Client::SetStartZone(uint32 zoneid, float x, float y, float z)
 	// setting city to zero allows the player to use /setstartcity to set the city themselves
 	if(zoneid == 0) {
 		m_pp.binds[4].zoneId = 0;
-		this->Message(15,"Your starting city has been reset. Use /setstartcity to choose a new one");
+		this->Message(Chat::Yellow,"Your starting city has been reset. Use /setstartcity to choose a new one");
 		return;
 	}
 
@@ -5613,7 +5579,7 @@ void Client::SuspendMinion()
 		if(m_suspendedminion.SpellID > 0)
 		{
 			if (m_suspendedminion.SpellID >= SPDAT_RECORDS) {
-				Message(13, "Invalid suspended minion spell id (%u).", m_suspendedminion.SpellID);
+				Message(Chat::Red, "Invalid suspended minion spell id (%u).", m_suspendedminion.SpellID);
 				memset(&m_suspendedminion, 0, sizeof(PetInfo));
 				return;
 			}
@@ -5625,7 +5591,7 @@ void Client::SuspendMinion()
 
 			if(!CurrentPet)
 			{
-				Message(13, "Failed to recall suspended minion.");
+				Message(Chat::Red, "Failed to recall suspended minion.");
 				return;
 			}
 
@@ -5641,7 +5607,7 @@ void Client::SuspendMinion()
 
 			CurrentPet->SetMana(m_suspendedminion.Mana);
 
-			Message_StringID(clientMessageTell, SUSPEND_MINION_UNSUSPEND, CurrentPet->GetCleanName());
+			MessageString(Chat::Magenta, SUSPEND_MINION_UNSUSPEND, CurrentPet->GetCleanName());
 
 			memset(&m_suspendedminion, 0, sizeof(struct PetInfo));
 			// TODO: These pet command states need to be synced ...
@@ -5671,19 +5637,19 @@ void Client::SuspendMinion()
 		{
 			if(m_suspendedminion.SpellID > 0)
 			{
-				Message_StringID(clientMessageError,ONLY_ONE_PET);
+				MessageString(Chat::Red,ONLY_ONE_PET);
 
 				return;
 			}
 			else if(CurrentPet->IsEngaged())
 			{
-				Message_StringID(clientMessageError,SUSPEND_MINION_FIGHTING);
+				MessageString(Chat::Red,SUSPEND_MINION_FIGHTING);
 
 				return;
 			}
 			else if(entity_list.Fighting(CurrentPet))
 			{
-				Message_StringID(clientMessageBlue,SUSPEND_MINION_HAS_AGGRO);
+				MessageString(Chat::Blue,SUSPEND_MINION_HAS_AGGRO);
 			}
 			else
 			{
@@ -5700,7 +5666,7 @@ void Client::SuspendMinion()
 				else
 					strn0cpy(m_suspendedminion.Name, CurrentPet->GetName(), 64); // Name stays even at rank 1
 
-				Message_StringID(clientMessageTell, SUSPEND_MINION_SUSPEND, CurrentPet->GetCleanName());
+				MessageString(Chat::Magenta, SUSPEND_MINION_SUSPEND, CurrentPet->GetCleanName());
 
 				CurrentPet->Depop(false);
 
@@ -5709,7 +5675,7 @@ void Client::SuspendMinion()
 		}
 		else
 		{
-			Message_StringID(clientMessageError, ONLY_SUMMONED_PETS);
+			MessageString(Chat::Red, ONLY_SUMMONED_PETS);
 
 			return;
 		}
@@ -5782,7 +5748,7 @@ void Client::ProcessInspectRequest(Client* requestee, Client* requester) {
 		strcpy(insr->text, requestee->GetInspectMessage().text);
 
 		// There could be an OP for this..or not... (Ti clients are not processed here..this message is generated client-side)
-		if(requestee->IsClient() && (requestee != requester)) { requestee->Message(0, "%s is looking at your equipment...", requester->GetName()); }
+		if(requestee->IsClient() && (requestee != requester)) { requestee->Message(Chat::White, "%s is looking at your equipment...", requester->GetName()); }
 
 		requester->QueuePacket(outapp); // Send answer to requester
 		safe_delete(outapp);
@@ -6183,16 +6149,16 @@ void Client::LocateCorpse()
 
 	if(ClosestCorpse)
 	{
-		Message_StringID(MT_Spells, SENSE_CORPSE_DIRECTION);
+		MessageString(Chat::Spells, SENSE_CORPSE_DIRECTION);
 		SetHeading(CalculateHeadingToTarget(ClosestCorpse->GetX(), ClosestCorpse->GetY()));
 		SetTarget(ClosestCorpse);
 		SendTargetCommand(ClosestCorpse->GetID());
 		SentPositionPacket(0.0f, 0.0f, 0.0f, 0.0f, 0, true);
 	}
 	else if(!GetTarget())
-		Message_StringID(clientMessageError, SENSE_CORPSE_NONE);
+		MessageString(Chat::Red, SENSE_CORPSE_NONE);
 	else
-		Message_StringID(clientMessageError, SENSE_CORPSE_NOT_NAME);
+		MessageString(Chat::Red, SENSE_CORPSE_NOT_NAME);
 }
 
 void Client::NPCSpawn(NPC *target_npc, const char *identifier, uint32 extra)
@@ -6252,7 +6218,7 @@ void Client::DragCorpses()
 		if (!corpse || !corpse->IsPlayerCorpse() ||
 				corpse->CastToCorpse()->IsBeingLooted() ||
 				!corpse->CastToCorpse()->Summon(this, false, false)) {
-			Message_StringID(MT_DefaultText, CORPSEDRAG_STOP);
+			MessageString(Chat::DefaultText, CORPSEDRAG_STOP);
 			It = DraggedCorpses.erase(It);
 			if (It == DraggedCorpses.end())
 				break;
@@ -6269,7 +6235,7 @@ void Client::Doppelganger(uint16 spell_id, Mob *target, const char *name_overrid
 	if(!database.GetPetEntry(spells[spell_id].teleport_zone, &record))
 	{
 		Log(Logs::General, Logs::Error, "Unknown doppelganger spell id: %d, check pets table", spell_id);
-		Message(13, "Unable to find data for pet %s", spells[spell_id].teleport_zone);
+		Message(Chat::Red, "Unable to find data for pet %s", spells[spell_id].teleport_zone);
 		return;
 	}
 
@@ -6884,35 +6850,35 @@ void Client::SendStatsWindow(Client* client, bool use_window)
 			goto Extra_Info;
 		}
 		else {
-			client->Message(15, "The window has exceeded its character limit, displaying stats to chat window:");
+			client->Message(Chat::Yellow, "The window has exceeded its character limit, displaying stats to chat window:");
 		}
 	}
 
-	client->Message(15, "~~~~~ %s %s ~~~~~", GetCleanName(), GetLastName());
-	client->Message(0, " Level: %i Class: %i Race: %i DS: %i/%i Size: %1.1f  Weight: %.1f/%d  ", GetLevel(), GetClass(), GetRace(), GetDS(), RuleI(Character, ItemDamageShieldCap), GetSize(), (float)CalcCurrentWeight() / 10.0f, GetSTR());
-	client->Message(0, " HP: %i/%i  HP Regen: %i/%i",GetHP(), GetMaxHP(), CalcHPRegen(), CalcHPRegenCap());
-	client->Message(0, " compute_tohit: %i TotalToHit: %i", compute_tohit(skill), GetTotalToHit(skill, 0));
-	client->Message(0, " compute_defense: %i TotalDefense: %i", compute_defense(), GetTotalDefense());
-	client->Message(0, " offense: %i mitigation ac: %i", offense(skill), GetMitigationAC());
+	client->Message(Chat::Yellow, "~~~~~ %s %s ~~~~~", GetCleanName(), GetLastName());
+	client->Message(Chat::White, " Level: %i Class: %i Race: %i DS: %i/%i Size: %1.1f  Weight: %.1f/%d  ", GetLevel(), GetClass(), GetRace(), GetDS(), RuleI(Character, ItemDamageShieldCap), GetSize(), (float)CalcCurrentWeight() / 10.0f, GetSTR());
+	client->Message(Chat::White, " HP: %i/%i  HP Regen: %i/%i",GetHP(), GetMaxHP(), CalcHPRegen(), CalcHPRegenCap());
+	client->Message(Chat::White, " compute_tohit: %i TotalToHit: %i", compute_tohit(skill), GetTotalToHit(skill, 0));
+	client->Message(Chat::White, " compute_defense: %i TotalDefense: %i", compute_defense(), GetTotalDefense());
+	client->Message(Chat::White, " offense: %i mitigation ac: %i", offense(skill), GetMitigationAC());
 	if(CalcMaxMana() > 0)
-		client->Message(0, " Mana: %i/%i  Mana Regen: %i/%i", GetMana(), GetMaxMana(), CalcManaRegen(), CalcManaRegenCap());
-	client->Message(0, " End.: %i/%i  End. Regen: %i/%i",GetEndurance(), GetMaxEndurance(), CalcEnduranceRegen(), CalcEnduranceRegenCap());
-	client->Message(0, " ATK: %i  Worn/Spell ATK %i/%i  Server Side ATK: %i", GetTotalATK(), RuleI(Character, ItemATKCap), GetATKBonus(), GetATK());
-	client->Message(0, " Haste: %i / %i (Item: %i + Spell: %i + Over: %i)", GetHaste(), RuleI(Character, HasteCap), itembonuses.haste, spellbonuses.haste + spellbonuses.hastetype2, spellbonuses.hastetype3 + ExtraHaste);
-	client->Message(0, " STR: %i  STA: %i  DEX: %i  AGI: %i  INT: %i  WIS: %i  CHA: %i", GetSTR(), GetSTA(), GetDEX(), GetAGI(), GetINT(), GetWIS(), GetCHA());
-	client->Message(0, " hSTR: %i  hSTA: %i  hDEX: %i  hAGI: %i  hINT: %i  hWIS: %i  hCHA: %i", GetHeroicSTR(), GetHeroicSTA(), GetHeroicDEX(), GetHeroicAGI(), GetHeroicINT(), GetHeroicWIS(), GetHeroicCHA());
-	client->Message(0, " MR: %i  PR: %i  FR: %i  CR: %i  DR: %i Corruption: %i PhR: %i", GetMR(), GetPR(), GetFR(), GetCR(), GetDR(), GetCorrup(), GetPhR());
-	client->Message(0, " hMR: %i  hPR: %i  hFR: %i  hCR: %i  hDR: %i hCorruption: %i", GetHeroicMR(), GetHeroicPR(), GetHeroicFR(), GetHeroicCR(), GetHeroicDR(), GetHeroicCorrup());
-	client->Message(0, " Shielding: %i  Spell Shield: %i  DoT Shielding: %i Stun Resist: %i  Strikethrough: %i  Avoidance: %i  Accuracy: %i  Combat Effects: %i", GetShielding(), GetSpellShield(), GetDoTShield(), GetStunResist(), GetStrikeThrough(), GetAvoidance(), GetAccuracy(), GetCombatEffects());
-	client->Message(0, " Heal Amt.: %i  Spell Dmg.: %i  Clairvoyance: %i DS Mitigation: %i", GetHealAmt(), GetSpellDmg(), GetClair(), GetDSMit());
+		client->Message(Chat::White, " Mana: %i/%i  Mana Regen: %i/%i", GetMana(), GetMaxMana(), CalcManaRegen(), CalcManaRegenCap());
+	client->Message(Chat::White, " End.: %i/%i  End. Regen: %i/%i",GetEndurance(), GetMaxEndurance(), CalcEnduranceRegen(), CalcEnduranceRegenCap());
+	client->Message(Chat::White, " ATK: %i  Worn/Spell ATK %i/%i  Server Side ATK: %i", GetTotalATK(), RuleI(Character, ItemATKCap), GetATKBonus(), GetATK());
+	client->Message(Chat::White, " Haste: %i / %i (Item: %i + Spell: %i + Over: %i)", GetHaste(), RuleI(Character, HasteCap), itembonuses.haste, spellbonuses.haste + spellbonuses.hastetype2, spellbonuses.hastetype3 + ExtraHaste);
+	client->Message(Chat::White, " STR: %i  STA: %i  DEX: %i  AGI: %i  INT: %i  WIS: %i  CHA: %i", GetSTR(), GetSTA(), GetDEX(), GetAGI(), GetINT(), GetWIS(), GetCHA());
+	client->Message(Chat::White, " hSTR: %i  hSTA: %i  hDEX: %i  hAGI: %i  hINT: %i  hWIS: %i  hCHA: %i", GetHeroicSTR(), GetHeroicSTA(), GetHeroicDEX(), GetHeroicAGI(), GetHeroicINT(), GetHeroicWIS(), GetHeroicCHA());
+	client->Message(Chat::White, " MR: %i  PR: %i  FR: %i  CR: %i  DR: %i Corruption: %i PhR: %i", GetMR(), GetPR(), GetFR(), GetCR(), GetDR(), GetCorrup(), GetPhR());
+	client->Message(Chat::White, " hMR: %i  hPR: %i  hFR: %i  hCR: %i  hDR: %i hCorruption: %i", GetHeroicMR(), GetHeroicPR(), GetHeroicFR(), GetHeroicCR(), GetHeroicDR(), GetHeroicCorrup());
+	client->Message(Chat::White, " Shielding: %i  Spell Shield: %i  DoT Shielding: %i Stun Resist: %i  Strikethrough: %i  Avoidance: %i  Accuracy: %i  Combat Effects: %i", GetShielding(), GetSpellShield(), GetDoTShield(), GetStunResist(), GetStrikeThrough(), GetAvoidance(), GetAccuracy(), GetCombatEffects());
+	client->Message(Chat::White, " Heal Amt.: %i  Spell Dmg.: %i  Clairvoyance: %i DS Mitigation: %i", GetHealAmt(), GetSpellDmg(), GetClair(), GetDSMit());
 	if(GetClass() == BARD)
-		client->Message(0, " Singing: %i  Brass: %i  String: %i Percussion: %i Wind: %i", GetSingMod(), GetBrassMod(), GetStringMod(), GetPercMod(), GetWindMod());
+		client->Message(Chat::White, " Singing: %i  Brass: %i  String: %i Percussion: %i Wind: %i", GetSingMod(), GetBrassMod(), GetStringMod(), GetPercMod(), GetWindMod());
 
 	Extra_Info:
 
-	client->Message(0, " BaseRace: %i  Gender: %i  BaseGender: %i Texture: %i  HelmTexture: %i", GetBaseRace(), GetGender(), GetBaseGender(), GetTexture(), GetHelmTexture());
+	client->Message(Chat::White, " BaseRace: %i  Gender: %i  BaseGender: %i Texture: %i  HelmTexture: %i", GetBaseRace(), GetGender(), GetBaseGender(), GetTexture(), GetHelmTexture());
 	if (client->Admin() >= 100) {
-		client->Message(0, "  CharID: %i  EntityID: %i  PetID: %i  OwnerID: %i  AIControlled: %i  Targetted: %i", CharacterID(), GetID(), GetPetID(), GetOwnerID(), IsAIControlled(), targeted);
+		client->Message(Chat::White, "  CharID: %i  EntityID: %i  PetID: %i  OwnerID: %i  AIControlled: %i  Targetted: %i", CharacterID(), GetID(), GetPetID(), GetOwnerID(), IsAIControlled(), targeted);
 	}
 }
 
@@ -7282,17 +7248,17 @@ void Client::ShowXTargets(Client *c)
 		return;
 
 	for(int i = 0; i < GetMaxXTargets(); ++i)
-		c->Message(0, "Xtarget Slot: %i, Type: %2i, ID: %4i, Name: %s", i, XTargets[i].Type, XTargets[i].ID, XTargets[i].Name);
+		c->Message(Chat::White, "Xtarget Slot: %i, Type: %2i, ID: %4i, Name: %s", i, XTargets[i].Type, XTargets[i].ID, XTargets[i].Name);
 	auto &list = GetXTargetAutoMgr()->get_list();
 	 // yeah, I kept having to do something for debugging to tell if managers were the same object or not :P
 	 // so lets use the address as an "ID"
-	c->Message(0, "XTargetAutoMgr ID %p size %d", GetXTargetAutoMgr(), list.size());
+	c->Message(Chat::White, "XTargetAutoMgr ID %p size %d", GetXTargetAutoMgr(), list.size());
 	int count = 0;
 	for (auto &e : list) {
-		c->Message(0, "spawn id %d count %d", e.spawn_id, e.count);
+		c->Message(Chat::White, "spawn id %d count %d", e.spawn_id, e.count);
 		count++;
 		if (count == 20) { // lets not spam too many ...
-			c->Message(0, " ... ");
+			c->Message(Chat::White, " ... ");
 			break;
 		}
 	}
@@ -7657,7 +7623,7 @@ void Client::DuplicateLoreMessage(uint32 ItemID)
 {
 	if (!(m_ClientVersionBit & EQEmu::versions::maskRoFAndLater))
 	{
-		Message_StringID(0, PICK_LORE);
+		MessageString(Chat::White, PICK_LORE);
 		return;
 	}
 
@@ -7666,7 +7632,7 @@ void Client::DuplicateLoreMessage(uint32 ItemID)
 	if(!item)
 		return;
 
-	Message_StringID(0, PICK_LORE, item->Name);
+	MessageString(Chat::White, PICK_LORE, item->Name);
 }
 
 void Client::GarbleMessage(char *message, uint8 variance)
@@ -7830,7 +7796,7 @@ void Client::SetFactionLevel(uint32 char_id, uint32 npc_id, uint8 char_class, ui
 
 		UpdatePersonalFaction(char_id, npc_value[i], faction_id[i], &current_value, temp[i], this_faction_min, this_faction_max);
 
-		//Message(14, "Min(%d) Max(%d) Before(%d), After(%d)\n", this_faction_min, this_faction_max, faction_before_hit, current_value);
+		//Message(Chat::Lime, "Min(%d) Max(%d) Before(%d), After(%d)\n", this_faction_min, this_faction_max, faction_before_hit, current_value);
 
 		SendFactionMessage(npc_value[i], faction_id[i], faction_before_hit, current_value, temp[i], this_faction_min, this_faction_max);
 	}
@@ -7873,7 +7839,7 @@ void Client::SetFactionLevel2(uint32 char_id, int32 faction_id, uint8 char_class
 
 		UpdatePersonalFaction(char_id, value, faction_id, &current_value, temp, this_faction_min, this_faction_max);
 
-		//Message(14, "Min(%d) Max(%d) Before(%d), After(%d)\n", this_faction_min, this_faction_max, faction_before_hit, current_value);
+		//Message(Chat::Lime, "Min(%d) Max(%d) Before(%d), After(%d)\n", this_faction_min, this_faction_max, faction_before_hit, current_value);
 
 		SendFactionMessage(value, faction_id, faction_before_hit, current_value, temp, this_faction_min, this_faction_max);
 	}
@@ -7982,7 +7948,7 @@ void Client::MerchantRejectMessage(Mob *merchant, int primaryfaction)
 	}
 	// If no primary faction or biggest influence is your faction hit
 	if (primaryfaction <= 0 || lowestvalue == tmpFactionValue) {
-		merchant->Say_StringID(zone->random.Int(WONT_SELL_DEEDS1, WONT_SELL_DEEDS6));
+		merchant->SayString(zone->random.Int(WONT_SELL_DEEDS1, WONT_SELL_DEEDS6));
 	} else if (lowestvalue == fmod.race_mod) { // race biggest
 		// Non-standard race (ex. illusioned to wolf)
 		if (GetRace() > PLAYER_RACE_COUNT) {
@@ -8001,7 +7967,7 @@ void Client::MerchantRejectMessage(Mob *merchant, int primaryfaction)
 				messageid = WONT_SELL_NONSTDRACE1;
 				break;
 			}
-			merchant->Say_StringID(messageid);
+			merchant->SayString(messageid);
 		} else { // normal player races
 			messageid = zone->random.Int(1, 4);
 			switch (messageid) {
@@ -8021,15 +7987,15 @@ void Client::MerchantRejectMessage(Mob *merchant, int primaryfaction)
 				messageid = WONT_SELL_RACE1;
 				break;
 			}
-			merchant->Say_StringID(messageid, itoa(GetRace()));
+			merchant->SayString(messageid, itoa(GetRace()));
 		}
 	} else if (lowestvalue == fmod.class_mod) {
-		merchant->Say_StringID(zone->random.Int(WONT_SELL_CLASS1, WONT_SELL_CLASS5), itoa(GetClass()));
+		merchant->SayString(zone->random.Int(WONT_SELL_CLASS1, WONT_SELL_CLASS5), itoa(GetClass()));
 	} else {
 		// Must be deity - these two sound the best for that.
 		// Can't use a message with a field, GUI wants class/race names.
 		// for those message IDs.  These are straight text.
-		merchant->Say_StringID(zone->random.Int(WONT_SELL_DEEDS1, WONT_SELL_DEEDS2));
+		merchant->SayString(zone->random.Int(WONT_SELL_DEEDS1, WONT_SELL_DEEDS2));
 	}
 	return;
 }
@@ -8065,15 +8031,15 @@ void Client::SendFactionMessage(int32 tmpvalue, int32 faction_id, int32 faction_
 	if (tmpvalue == 0 || temp == 1 || temp == 2)
 		return;
 	else if (faction_value >= this_faction_max)
-		Message_StringID(15, FACTION_BEST, name);
+		MessageString(Chat::Yellow, FACTION_BEST, name);
 	else if (faction_value <= this_faction_min)
-		Message_StringID(15, FACTION_WORST, name);
+		MessageString(Chat::Yellow, FACTION_WORST, name);
 	else if (tmpvalue > 0 && faction_value < this_faction_max && !RuleB(Client, UseLiveFactionMessage))
-		Message_StringID(15, FACTION_BETTER, name);
+		MessageString(Chat::Yellow, FACTION_BETTER, name);
 	else if (tmpvalue < 0 && faction_value > this_faction_min && !RuleB(Client, UseLiveFactionMessage))
-		Message_StringID(15, FACTION_WORSE, name);
+		MessageString(Chat::Yellow, FACTION_WORSE, name);
 	else if (RuleB(Client, UseLiveFactionMessage))
-		Message(15, "Your faction standing with %s has been adjusted by %i.", name, tmpvalue); //New Live faction message (14261)
+		Message(Chat::Yellow, "Your faction standing with %s has been adjusted by %i.", name, tmpvalue); //New Live faction message (14261)
 
 	return;
 }
@@ -8399,7 +8365,7 @@ void Client::Consume(const EQEmu::ItemData *item, uint8 type, int16 slot, bool a
 		DeleteItemInInventory(slot, 1, false);
 
 		if (!auto_consume) // no message if the client consumed for us
-			entity_list.MessageClose_StringID(this, true, 50, 0, EATING_MESSAGE, GetName(), item->Name);
+			entity_list.MessageCloseString(this, true, 50, 0, EATING_MESSAGE, GetName(), item->Name);
 
 		Log(Logs::General, Logs::Food, "Eating from slot: %i", (int)slot);
 
@@ -8417,7 +8383,7 @@ void Client::Consume(const EQEmu::ItemData *item, uint8 type, int16 slot, bool a
 		    increase, m_pp.thirst_level);
 
 		if (!auto_consume) // no message if the client consumed for us
-			entity_list.MessageClose_StringID(this, true, 50, 0, DRINKING_MESSAGE, GetName(), item->Name);
+			entity_list.MessageCloseString(this, true, 50, 0, DRINKING_MESSAGE, GetName(), item->Name);
 
 		Log(Logs::General, Logs::Food, "Drinking from slot: %i", (int)slot);
 	}
@@ -8462,7 +8428,7 @@ void Client::ExpeditionSay(const char *str, int ExpID) {
 		return;
 
 	if(results.RowCount() == 0) {
-		this->Message(14, "You say to the expedition, '%s'", str);
+		this->Message(Chat::Lime, "You say to the expedition, '%s'", str);
 		return;
 	}
 
@@ -8565,7 +8531,7 @@ void Client::SendHPUpdateMarquee(){
 		return;
 
 	std::string health_update_notification = StringFormat("Health: %u%%", health_percentage);
-	this->SendMarqueeMessage(15, 510, 0, 3000, 3000, health_update_notification);
+	this->SendMarqueeMessage(Chat::Yellow, 510, 0, 3000, 3000, health_update_notification);
 }
 
 uint32 Client::GetMoney(uint8 type, uint8 subtype) {
@@ -9078,7 +9044,7 @@ void Client::SetPrimaryWeaponOrnamentation(uint32 model_id)
 		SendItemPacket(EQEmu::invslot::slotPrimary, primary_item, ItemPacketTrade);
 		WearChange(EQEmu::textures::weaponPrimary, static_cast<uint16>(model_id), 0);
 
-		Message(15, "Your primary weapon appearance has been modified");
+		Message(Chat::Yellow, "Your primary weapon appearance has been modified");
 	}
 }
 
@@ -9101,7 +9067,7 @@ void Client::SetSecondaryWeaponOrnamentation(uint32 model_id)
 		SendItemPacket(EQEmu::invslot::slotSecondary, secondary_item, ItemPacketTrade);
 		WearChange(EQEmu::textures::weaponSecondary, static_cast<uint16>(model_id), 0);
 		
-		Message(15, "Your secondary weapon appearance has been modified");
+		Message(Chat::Yellow, "Your secondary weapon appearance has been modified");
 	}
 }
 
@@ -9141,7 +9107,7 @@ bool Client::GotoPlayer(std::string player_name)
 		auto heading     = static_cast<float>(atof(row[5]));
 
 		if (instance_id > 0 && !database.CheckInstanceExists(instance_id)) {
-			this->Message(15, "Instance no longer exists...");
+			this->Message(Chat::Yellow, "Instance no longer exists...");
 			return false;
 		}
 
@@ -9156,3 +9122,16 @@ bool Client::GotoPlayer(std::string player_name)
 
 	return false;
 }
+
+glm::vec4 &Client::GetLastPositionBeforeBulkUpdate()
+{
+	return last_position_before_bulk_update;
+}
+
+/**
+ * @param in_last_position_before_bulk_update
+ */
+void Client::SetLastPositionBeforeBulkUpdate(glm::vec4 in_last_position_before_bulk_update)
+{
+	Client::last_position_before_bulk_update = in_last_position_before_bulk_update;
+}
\ No newline at end of file
diff --git a/zone/client.h b/zone/client.h
index 15f332d9b..6cb1a98eb 100644
--- a/zone/client.h
+++ b/zone/client.h
@@ -90,23 +90,6 @@ public:
 	bool ack_req;
 };
 
-enum { //Type arguments to the Message* routines.
-	//all not explicitly listed are the same grey color
-	clientMessageWhite0 = 0,
-	clientMessageLoot = 2, //dark green
-	clientMessageTradeskill = 4, //light blue
-	clientMessageTell = 5, //magenta
-	clientMessageWhite = 7,
-	clientMessageWhite2 = 10,
-	clientMessageLightGrey = 12,
-	clientMessageError = 13, //red
-	clientMessageGreen = 14,
-	clientMessageYellow = 15,
-	clientMessageBlue = 16,
-	clientMessageGroup = 18, //cyan
-	clientMessageWhite3 = 20,
-};
-
 #define SPELLBAR_UNLOCK 0x2bc
 enum { //scribing argument to MemorizeSpell
 	memSpellUnknown = -1, // this modifies some state data
@@ -295,11 +278,11 @@ public:
 	void SendBazaarWelcome();
 	void DyeArmor(EQEmu::TintProfile* dye);
 	uint8 SlotConvert(uint8 slot,bool bracer=false);
-	void Message_StringID(uint32 type, uint32 string_id, uint32 distance = 0);
-	void Message_StringID(uint32 type, uint32 string_id, const char* message,const char* message2=0,const char* message3=0,const char* message4=0,const char* message5=0,const char* message6=0,const char* message7=0,const char* message8=0,const char* message9=0, uint32 distance = 0);
+	void MessageString(uint32 type, uint32 string_id, uint32 distance = 0);
+	void MessageString(uint32 type, uint32 string_id, const char* message,const char* message2=0,const char* message3=0,const char* message4=0,const char* message5=0,const char* message6=0,const char* message7=0,const char* message8=0,const char* message9=0, uint32 distance = 0);
 	bool FilteredMessageCheck(Mob *sender, eqFilterType filter);
-	void FilteredMessage_StringID(Mob *sender, uint32 type, eqFilterType filter, uint32 string_id);
-	void FilteredMessage_StringID(Mob *sender, uint32 type, eqFilterType filter,
+	void FilteredMessageString(Mob *sender, uint32 type, eqFilterType filter, uint32 string_id);
+	void FilteredMessageString(Mob *sender, uint32 type, eqFilterType filter,
 					uint32 string_id, const char *message1, const char *message2 = nullptr,
 					const char *message3 = nullptr, const char *message4 = nullptr,
 					const char *message5 = nullptr, const char *message6 = nullptr,
@@ -338,11 +321,9 @@ public:
 	void QueuePacket(const EQApplicationPacket* app, bool ack_req = true, CLIENT_CONN_STATUS = CLIENT_CONNECTINGALL, eqFilterType filter=FilterNone);
 	void FastQueuePacket(EQApplicationPacket** app, bool ack_req = true, CLIENT_CONN_STATUS = CLIENT_CONNECTINGALL);
 	void ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_skill, const char* orig_message, const char* targetname=nullptr);
-	void ChannelMessageSend(const char* from, const char* to, uint8 chan_num, uint8 language, const char* message, ...);
 	void ChannelMessageSend(const char* from, const char* to, uint8 chan_num, uint8 language, uint8 lang_skill, const char* message, ...);
 	void Message(uint32 type, const char* message, ...);
 	void FilteredMessage(Mob *sender, uint32 type, eqFilterType filter, const char* message, ...);
-	void QuestJournalledMessage(const char *npcname, const char* message);
 	void VoiceMacroReceived(uint32 Type, char *Target, uint32 MacroNumber);
 	void SendSound();
 	void LearnRecipe(uint32 recipeID);
@@ -373,9 +354,9 @@ public:
 	inline bool ClientDataLoaded() const { return client_data_loaded; }
 	inline bool Connected() const { return (client_state == CLIENT_CONNECTED); }
 	inline bool InZone() const { return (client_state == CLIENT_CONNECTED || client_state == CLIENT_LINKDEAD); }
-	inline void Kick() { client_state = CLIENT_KICKED; }
 	inline void Disconnect() { eqs->Close(); client_state = DISCONNECTED; }
 	inline bool IsLD() const { return (bool) (client_state == CLIENT_LINKDEAD); }
+	void Kick(const std::string &reason);
 	void WorldKick();
 	inline uint8 GetAnon() const { return m_pp.anon; }
 	inline PlayerProfile_Struct& GetPP() { return m_pp; }
@@ -1311,6 +1292,9 @@ public:
 
 	uint32 trapid; //ID of trap player has triggered. This is cleared when the player leaves the trap's radius, or it despawns.
 
+	void SetLastPositionBeforeBulkUpdate(glm::vec4 in_last_position_before_bulk_update);
+	glm::vec4 &GetLastPositionBeforeBulkUpdate();
+
 protected:
 	friend class Mob;
 	void CalcItemBonuses(StatBonuses* newbon);
@@ -1519,6 +1503,7 @@ private:
 	Timer forget_timer; // our 2 min everybody forgets you timer
 	Timer autosave_timer;
 	Timer client_scan_npc_aggro_timer;
+	Timer client_zone_wide_full_position_update_timer;
 	Timer tribute_timer;
 
 	Timer proximity_timer;
@@ -1541,6 +1526,7 @@ private:
 	Timer position_update_timer; /* Timer used when client hasn't updated within a 10 second window */
 
 	glm::vec3 m_Proximity;
+	glm::vec4 last_position_before_bulk_update;
 
 	void BulkSendInventoryItems();
 
diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp
index bb1de37c4..fed761bb7 100644
--- a/zone/client_packet.cpp
+++ b/zone/client_packet.cpp
@@ -60,6 +60,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #include "water_map.h"
 #include "worldserver.h"
 #include "zone.h"
+#include "mob_movement_manager.h"
 
 #ifdef BOTS
 #include "bot.h"
@@ -540,7 +541,7 @@ void Client::CompleteConnect()
 
 	//SendAATable();
 
-	if (GetHideMe()) Message(13, "[GM] You are currently hidden to all clients");
+	if (GetHideMe()) Message(Chat::Red, "[GM] You are currently hidden to all clients");
 
 	uint32 raidid = database.GetRaidID(GetName());
 	Raid *raid = nullptr;
@@ -710,7 +711,7 @@ void Client::CompleteConnect()
 					{
 						SendAppearancePacket(AT_Levitate, 0);
 						BuffFadeByEffect(SE_Levitate);
-						Message(13, "You can't levitate in this zone.");
+						Message(Chat::Red, "You can't levitate in this zone.");
 					}
 				}
 				else {
@@ -805,6 +806,8 @@ void Client::CompleteConnect()
 
 	parse->EventPlayer(EVENT_ENTER_ZONE, this, "", 0);
 
+	SetLastPositionBeforeBulkUpdate(GetPosition());
+
 	/* This sub event is for if a player logs in for the first time since entering world. */
 	if (firstlogon == 1) {
 		parse->EventPlayer(EVENT_CONNECT, this, "", 0);
@@ -833,19 +836,19 @@ void Client::CompleteConnect()
 			uint32 minute = (ttime / 60000) % 60;
 			uint32 second = (ttime / 1000) % 60;
 			if (day) {
-				Message(15, "%s(%u) will expire in %u days, %u hours, %u minutes, and %u seconds.",
+				Message(Chat::Yellow, "%s(%u) will expire in %u days, %u hours, %u minutes, and %u seconds.",
 					zone->GetLongName(), zone->GetInstanceID(), day, hour, minute, second);
 			}
 			else if (hour) {
-				Message(15, "%s(%u) will expire in %u hours, %u minutes, and %u seconds.",
+				Message(Chat::Yellow, "%s(%u) will expire in %u hours, %u minutes, and %u seconds.",
 					zone->GetLongName(), zone->GetInstanceID(), hour, minute, second);
 			}
 			else if (minute) {
-				Message(15, "%s(%u) will expire in %u minutes, and %u seconds.",
+				Message(Chat::Yellow, "%s(%u) will expire in %u minutes, and %u seconds.",
 					zone->GetLongName(), zone->GetInstanceID(), minute, second);
 			}
 			else {
-				Message(15, "%s(%u) will expire in in %u seconds.",
+				Message(Chat::Yellow, "%s(%u) will expire in in %u seconds.",
 					zone->GetLongName(), zone->GetInstanceID(), second);
 			}
 		}
@@ -945,7 +948,7 @@ void Client::Handle_Connect_OP_ClientError(const EQApplicationPacket *app)
 	ClientError_Struct* error = (ClientError_Struct*)app->pBuffer;
 	Log(Logs::General, Logs::Error, "Client error: %s", error->character_name);
 	Log(Logs::General, Logs::Error, "Error message: %s", error->message);
-	Message(13, error->message);
+	Message(Chat::Red, error->message);
 #if (EQDEBUG>=5)
 	DumpPacket(app);
 #endif
@@ -1166,13 +1169,11 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app)
 	*/
 	Client* client = entity_list.GetClientByName(cze->char_name);
 	if (!zone->GetAuth(ip, cze->char_name, &WID, &account_id, &character_id, &admin, lskey, &tellsoff)) {
-		Log(Logs::General, Logs::Error, "GetAuth() returned false kicking client");
-		if (client != 0) {
+		Log(Logs::General, Logs::Client_Login, "%s failed zone auth check.", cze->char_name);
+		if (nullptr != client) {
 			client->Save();
-			client->Kick();
+			client->Kick("Failed auth check");
 		}
-		//ret = false; // TODO: Can we tell the client to get lost in a good way
-		client_state = CLIENT_KICKED;
 		return;
 	}
 
@@ -1681,7 +1682,7 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app)
 	/**
 	 * DevTools Load Settings
 	 */
-	if (Admin() >= 200) {
+	if (Admin() >= EQEmu::DevTools::GM_ACCOUNT_STATUS_LEVEL) {
 		std::string dev_tools_window_key = StringFormat("%i-dev-tools-window-disabled", AccountID());
 		if (DataBucket::GetData(dev_tools_window_key) == "true") {
 			dev_tools_window_enabled = false;
@@ -1751,14 +1752,14 @@ void Client::Handle_OP_AAAction(const EQApplicationPacket *app)
 	}
 	else if (action->action == aaActionDisableEXP) { //Turn Off AA Exp
 		if (m_epp.perAA > 0)
-			Message_StringID(0, AA_OFF);
+			MessageString(Chat::White, AA_OFF);
 
 		m_epp.perAA = 0;
 		SendAlternateAdvancementStats();
 	}
 	else if (action->action == aaActionSetEXP) {
 		if (m_epp.perAA == 0)
-			Message_StringID(0, AA_ON);
+			MessageString(Chat::White, AA_ON);
 		m_epp.perAA = action->exp_value;
 		if (m_epp.perAA < 0 || m_epp.perAA > 100)
 			m_epp.perAA = 0;	// stop exploit with sanity check
@@ -1896,14 +1897,14 @@ void Client::Handle_OP_AdventureMerchantPurchase(const EQApplicationPacket *app)
 		}
 	}
 	if (!item || !found) {
-		Message(13, "Error: The item you purchased does not exist!");
+		Message(Chat::Red, "Error: The item you purchased does not exist!");
 		return;
 	}
 
 	if (aps->Type == LDoNMerchant)
 	{
 		if (m_pp.ldon_points_available < int32(item->LDoNPrice)) {
-			Message(13, "You cannot afford that item.");
+			Message(Chat::Red, "You cannot afford that item.");
 			return;
 		}
 
@@ -1913,7 +1914,7 @@ void Client::Handle_OP_AdventureMerchantPurchase(const EQApplicationPacket *app)
 			{
 				if (m_pp.ldon_points_tak < int32(item->LDoNPrice))
 				{
-					Message(13, "You need at least %u points in tak to purchase this item.", int32(item->LDoNPrice));
+					Message(Chat::Red, "You need at least %u points in tak to purchase this item.", int32(item->LDoNPrice));
 					return;
 				}
 			}
@@ -1921,7 +1922,7 @@ void Client::Handle_OP_AdventureMerchantPurchase(const EQApplicationPacket *app)
 			{
 				if (m_pp.ldon_points_ruj < int32(item->LDoNPrice))
 				{
-					Message(13, "You need at least %u points in ruj to purchase this item.", int32(item->LDoNPrice));
+					Message(Chat::Red, "You need at least %u points in ruj to purchase this item.", int32(item->LDoNPrice));
 					return;
 				}
 			}
@@ -1929,7 +1930,7 @@ void Client::Handle_OP_AdventureMerchantPurchase(const EQApplicationPacket *app)
 			{
 				if (m_pp.ldon_points_mmc < int32(item->LDoNPrice))
 				{
-					Message(13, "You need at least %u points in mmc to purchase this item.", int32(item->LDoNPrice));
+					Message(Chat::Red, "You need at least %u points in mmc to purchase this item.", int32(item->LDoNPrice));
 					return;
 				}
 			}
@@ -1937,7 +1938,7 @@ void Client::Handle_OP_AdventureMerchantPurchase(const EQApplicationPacket *app)
 			{
 				if (m_pp.ldon_points_mir < int32(item->LDoNPrice))
 				{
-					Message(13, "You need at least %u points in mir to purchase this item.", int32(item->LDoNPrice));
+					Message(Chat::Red, "You need at least %u points in mir to purchase this item.", int32(item->LDoNPrice));
 					return;
 				}
 			}
@@ -1945,7 +1946,7 @@ void Client::Handle_OP_AdventureMerchantPurchase(const EQApplicationPacket *app)
 			{
 				if (m_pp.ldon_points_guk < int32(item->LDoNPrice))
 				{
-					Message(13, "You need at least %u points in guk to purchase this item.", int32(item->LDoNPrice));
+					Message(Chat::Red, "You need at least %u points in guk to purchase this item.", int32(item->LDoNPrice));
 					return;
 				}
 			}
@@ -1955,7 +1956,7 @@ void Client::Handle_OP_AdventureMerchantPurchase(const EQApplicationPacket *app)
 	{
 		if (GetPVPPoints() < item->LDoNPrice)
 		{
-			Message(13, "You need at least %u PVP points to purchase this item.", int32(item->LDoNPrice));
+			Message(Chat::Red, "You need at least %u PVP points to purchase this item.", int32(item->LDoNPrice));
 			return;
 		}
 	}
@@ -1963,7 +1964,7 @@ void Client::Handle_OP_AdventureMerchantPurchase(const EQApplicationPacket *app)
 	{
 		if (GetRadiantCrystals() < item->LDoNPrice)
 		{
-			Message(13, "You need at least %u Radiant Crystals to purchase this item.", int32(item->LDoNPrice));
+			Message(Chat::Red, "You need at least %u Radiant Crystals to purchase this item.", int32(item->LDoNPrice));
 			return;
 		}
 	}
@@ -1971,20 +1972,20 @@ void Client::Handle_OP_AdventureMerchantPurchase(const EQApplicationPacket *app)
 	{
 		if (GetEbonCrystals() < item->LDoNPrice)
 		{
-			Message(13, "You need at least %u Ebon Crystals to purchase this item.", int32(item->LDoNPrice));
+			Message(Chat::Red, "You need at least %u Ebon Crystals to purchase this item.", int32(item->LDoNPrice));
 			return;
 		}
 	}
 	else
 	{
-		Message(13, "Unknown Adventure Merchant type.");
+		Message(Chat::Red, "Unknown Adventure Merchant type.");
 		return;
 	}
 
 
 	if (CheckLoreConflict(item))
 	{
-		Message(15, "You can only have one of a lore item.");
+		Message(Chat::Yellow, "You can only have one of a lore item.");
 		return;
 	}
 
@@ -2127,13 +2128,13 @@ void Client::Handle_OP_AdventureMerchantSell(const EQApplicationPacket *app)
 	if (vendor == 0 || !vendor->IsNPC() || ((vendor->GetClass() != ADVENTUREMERCHANT) &&
 		(vendor->GetClass() != NORRATHS_KEEPERS_MERCHANT) && (vendor->GetClass() != DARK_REIGN_MERCHANT)))
 	{
-		Message(13, "Vendor was not found.");
+		Message(Chat::Red, "Vendor was not found.");
 		return;
 	}
 
 	if (DistanceSquared(m_Position, vendor->GetPosition())  > USE_NPC_RANGE2)
 	{
-		Message(13, "Vendor is out of range.");
+		Message(Chat::Red, "Vendor is out of range.");
 		return;
 	}
 
@@ -2141,14 +2142,14 @@ void Client::Handle_OP_AdventureMerchantSell(const EQApplicationPacket *app)
 
 	if (itemid == 0)
 	{
-		Message(13, "Found no item at that slot.");
+		Message(Chat::Red, "Found no item at that slot.");
 		return;
 	}
 
 	const EQEmu::ItemData* item = database.GetItem(itemid);
 	EQEmu::ItemInstance* inst = GetInv().GetItem(ams_in->slot);
 	if (!item || !inst) {
-		Message(13, "You seemed to have misplaced that item...");
+		Message(Chat::Red, "You seemed to have misplaced that item...");
 		return;
 	}
 
@@ -2167,13 +2168,13 @@ void Client::Handle_OP_AdventureMerchantSell(const EQApplicationPacket *app)
 	// that case here.
 	if (item->LDoNSold == 0)
 	{
-		Message(13, "The merchant does not want that item.");
+		Message(Chat::Red, "The merchant does not want that item.");
 		return;
 	}
 
 	if (item->LDoNPrice == 0)
 	{
-		Message(13, "The merchant does not want that item.");
+		Message(Chat::Red, "The merchant does not want that item.");
 		return;
 	}
 
@@ -2182,7 +2183,7 @@ void Client::Handle_OP_AdventureMerchantSell(const EQApplicationPacket *app)
 
 	if (price == 0)
 	{
-		Message(13, "The merchant does not want that item.");
+		Message(Chat::Red, "The merchant does not want that item.");
 		return;
 	}
 
@@ -2202,7 +2203,7 @@ void Client::Handle_OP_AdventureMerchantSell(const EQApplicationPacket *app)
 
 		if (ams_in->charges == 0)
 		{
-			Message(13, "Charge mismatch error.");
+			Message(Chat::Red, "Charge mismatch error.");
 			return;
 		}
 
@@ -2522,18 +2523,18 @@ void Client::Handle_OP_AltCurrencyPurchase(const EQApplicationPacket *app)
 		}
 
 		if (!item || !found) {
-			Message(13, "Error: The item you purchased does not exist!");
+			Message(Chat::Red, "Error: The item you purchased does not exist!");
 			return;
 		}
 
 		if (cost > current_currency) {
-			Message(13, "You cannot afford that item right now.");
+			Message(Chat::Red, "You cannot afford that item right now.");
 			return;
 		}
 
 		if (CheckLoreConflict(item))
 		{
-			Message(15, "You can only have one of a lore item.");
+			Message(Chat::Yellow, "You can only have one of a lore item.");
 			return;
 		}
 
@@ -2688,7 +2689,7 @@ void Client::Handle_OP_AltCurrencySell(const EQApplicationPacket *app)
 
 			if (sell->charges == 0)
 			{
-				Message(13, "Charge mismatch error.");
+				Message(Chat::Red, "Charge mismatch error.");
 				return;
 			}
 
@@ -2833,7 +2834,7 @@ void Client::Handle_OP_ApplyPoison(const EQApplicationPacket *app)
 
 		if (poison->Proc.Level2 > GetLevel()) {
 			// Poison is too high to apply.
-			Message_StringID(clientMessageTradeskill, POISON_TOO_HIGH);
+			MessageString(Chat::LightBlue, POISON_TOO_HIGH);
 		}
 		else if ((primary && 
 				primary->ItemType == EQEmu::item::ItemType1HPiercing) ||
@@ -2950,7 +2951,7 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app)
 		if ((in_augment->container_slot < EQEmu::invslot::EQUIPMENT_BEGIN || in_augment->container_slot > EQEmu::invslot::GENERAL_END) &&
 			(in_augment->container_slot < EQEmu::invbag::GENERAL_BAGS_BEGIN || in_augment->container_slot > EQEmu::invbag::GENERAL_BAGS_END))
 		{
-			Message(13, "The server does not allow augmentation actions from this slot.");
+			Message(Chat::Red, "The server does not allow augmentation actions from this slot.");
 			auto cursor_item = m_inv[EQEmu::invslot::slotCursor];
 			auto augmented_item = m_inv[in_augment->container_slot];
 			SendItemPacket(EQEmu::invslot::slotCursor, cursor_item, ItemPacketCharInventory);
@@ -2973,7 +2974,7 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app)
 
 		if (item_slot == INVALID_INDEX || solvent_slot == INVALID_INDEX)
 		{
-			Message(13, "Error: Invalid Aug Index.");
+			Message(Chat::Red, "Error: Invalid Aug Index.");
 			return;
 		}
 
@@ -2982,7 +2983,7 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app)
 
 		if (!tobe_auged)
 		{
-			Message(13, "Error: Invalid item passed for augmenting.");
+			Message(Chat::Red, "Error: Invalid item passed for augmenting.");
 			return;
 		}
 
@@ -2995,7 +2996,7 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app)
 				old_aug = tobe_auged->GetAugment(in_augment->augment_index);
 				if (!old_aug || old_aug->GetItem()->AugDistiller != 0) {
 					Log(Logs::General, Logs::Error, "Player tried to safely remove an augment without a distiller.");
-					Message(13, "Error: Missing an augmentation distiller for safely removing this augment.");
+					Message(Chat::Red, "Error: Missing an augmentation distiller for safely removing this augment.");
 					return;
 				}
 			}
@@ -3006,20 +3007,20 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app)
 				if (!old_aug)
 				{
 					Log(Logs::General, Logs::Error, "Player tried to safely remove a nonexistent augment.");
-					Message(13, "Error: No augment found in slot %i for safely removing.", in_augment->augment_index);
+					Message(Chat::Red, "Error: No augment found in slot %i for safely removing.", in_augment->augment_index);
 					return;
 				}
 				else if (solvent->GetItem()->ID != old_aug->GetItem()->AugDistiller)
 				{
 					Log(Logs::General, Logs::Error, "Player tried to safely remove an augment with the wrong distiller (item %u vs expected %u).", solvent->GetItem()->ID, old_aug->GetItem()->AugDistiller);
-					Message(13, "Error: Wrong augmentation distiller for safely removing this augment.");
+					Message(Chat::Red, "Error: Wrong augmentation distiller for safely removing this augment.");
 					return;
 				}
 			}
 			else if (solvent->GetItem()->ItemType != EQEmu::item::ItemTypePerfectedAugmentationDistiller)
 			{
 				Log(Logs::General, Logs::Error, "Player tried to safely remove an augment with a non-distiller item.");
-				Message(13, "Error: Invalid augmentation distiller for safely removing this augment.");
+				Message(Chat::Red, "Error: Invalid augmentation distiller for safely removing this augment.");
 				return;
 			}
 		}
@@ -3033,7 +3034,7 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app)
 			if (!new_aug) // Shouldn't get the OP code without the augment on the user's cursor, but maybe it's h4x.
 			{
 				Log(Logs::General, Logs::Error, "AugmentItem OpCode with 'Insert' or 'Swap' action received, but no augment on client's cursor.");
-				Message(13, "Error: No augment found on cursor for inserting.");
+				Message(Chat::Red, "Error: No augment found on cursor for inserting.");
 				return;
 			}
 			else
@@ -3072,7 +3073,7 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app)
 					}
 					else
 					{
-						Message(13, "Error: Could not properly insert augmentation into augment slot %i. Aborting.", in_augment->augment_index);
+						Message(Chat::Red, "Error: Could not properly insert augmentation into augment slot %i. Aborting.", in_augment->augment_index);
 						return;
 					}
 
@@ -3100,7 +3101,7 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app)
 							if (!PutItemInInventory(EQEmu::invslot::slotCursor, *itemTwoToPush, true))
 							{
 								Log(Logs::General, Logs::Error, "Problem returning old augment to player's cursor after augmentation swap.");
-								Message(15, "Error: Failed to retrieve old augment after augmentation swap!");
+								Message(Chat::Yellow, "Error: Failed to retrieve old augment after augmentation swap!");
 							}
 						}
 
@@ -3117,17 +3118,17 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app)
 						}
 						else
 						{
-							Message(13, "Error: No available slot for end result. Please free up the augment slot.");
+							Message(Chat::Red, "Error: No available slot for end result. Please free up the augment slot.");
 						}
 					}
 					else
 					{
-						Message(13, "Error in cloning item for augment. Aborted.");
+						Message(Chat::Red, "Error in cloning item for augment. Aborted.");
 					}
 				}
 				else
 				{
-					Message(13, "Error: No available slot for augment in that item.");
+					Message(Chat::Red, "Error: No available slot for augment in that item.");
 				}
 			}
 			break;
@@ -3147,7 +3148,7 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app)
 			}
 			else
 			{
-				Message(13, "Error: Could not find augmentation to remove at index %i. Aborting.", in_augment->augment_index);
+				Message(Chat::Red, "Error: Could not find augmentation to remove at index %i. Aborting.", in_augment->augment_index);
 				return;
 			}
 
@@ -3171,7 +3172,7 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app)
 				if (!PutItemInInventory(item_slot, *itemOneToPush, true))
 				{
 					Log(Logs::General, Logs::Error, "Problem returning equipment item to player's inventory after safe augment removal.");
-					Message(15, "Error: Failed to return item after de-augmentation!");
+					Message(Chat::Yellow, "Error: Failed to return item after de-augmentation!");
 				}
 
 				CalcBonuses();
@@ -3185,7 +3186,7 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app)
 				if (!PutItemInInventory(EQEmu::invslot::slotCursor, *itemTwoToPush, true))
 				{
 					Log(Logs::General, Logs::Error, "Problem returning augment to player's cursor after safe removal.");
-					Message(15, "Error: Failed to return augment after removal from item!");
+					Message(Chat::Yellow, "Error: Failed to return augment after removal from item!");
 					return;
 				}
 			}
@@ -3210,7 +3211,7 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app)
 			}
 			else
 			{
-				Message(13, "Error: Could not find augmentation to remove at index %i. Aborting.");
+				Message(Chat::Red, "Error: Could not find augmentation to remove at index %i. Aborting.");
 				return;
 			}
 
@@ -3225,7 +3226,7 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app)
 				if (!PutItemInInventory(item_slot, *itemOneToPush, true))
 				{
 					Log(Logs::General, Logs::Error, "Problem returning equipment item to player's inventory after augment deletion.");
-					Message(15, "Error: Failed to return item after destroying augment!");
+					Message(Chat::Yellow, "Error: Failed to return item after destroying augment!");
 				}
 			}
 
@@ -3469,7 +3470,7 @@ void Client::Handle_OP_Barter(const EQApplicationPacket *app)
 		else {
 			Buf = (char *)app->pBuffer;
 			VARSTRUCT_ENCODE_TYPE(uint32, Buf, Barter_BuyerModeOff);
-			Message(13, "You cannot be a Trader and Buyer at the same time.");
+			Message(Chat::Red, "You cannot be a Trader and Buyer at the same time.");
 		}
 		QueuePacket(app);
 		break;
@@ -3525,7 +3526,7 @@ void Client::Handle_OP_Barter(const EQApplicationPacket *app)
 		const EQEmu::ItemData* item = database.GetItem(bislr->ItemID);
 
 		if (!item)
-			Message(13, "Error: This item does not exist!");
+			Message(Chat::Red, "Error: This item does not exist!");
 		else
 		{
 			EQEmu::ItemInstance* inst = database.CreateItem(item);
@@ -3558,7 +3559,7 @@ void Client::Handle_OP_Barter(const EQApplicationPacket *app)
 		const EQEmu::ItemData* item = database.GetItem(bislr->ItemID);
 
 		if (!item)
-			Message(13, "Error: This item does not exist!");
+			Message(Chat::Red, "Error: This item does not exist!");
 		else
 		{
 			EQEmu::ItemInstance* inst = database.CreateItem(item);
@@ -3578,7 +3579,7 @@ void Client::Handle_OP_Barter(const EQApplicationPacket *app)
 	}
 
 	default:
-		Message(13, "Unrecognised Barter action.");
+		Message(Chat::Red, "Unrecognised Barter action.");
 		Log(Logs::Detail, Logs::Trading, "Unrecognised Barter Action %i", Action);
 
 	}
@@ -3597,7 +3598,7 @@ void Client::Handle_OP_BazaarInspect(const EQApplicationPacket *app)
 	const EQEmu::ItemData* item = database.GetItem(bis->ItemID);
 
 	if (!item) {
-		Message(13, "Error: This item does not exist!");
+		Message(Chat::Red, "Error: This item does not exist!");
 		return;
 	}
 
@@ -3652,7 +3653,7 @@ void Client::Handle_OP_Begging(const EQApplicationPacket *app)
 {
 	if (!p_timers.Expired(&database, pTimerBeggingPickPocket, false))
 	{
-		Message(13, "Ability recovery time not yet met.");
+		Message(Chat::Red, "Ability recovery time not yet met.");
 
 		auto outapp = new EQApplicationPacket(OP_Begging, sizeof(BeggingResponse_Struct));
 		BeggingResponse_Struct *brs = (BeggingResponse_Struct*)outapp->pBuffer;
@@ -4022,8 +4023,8 @@ void Client::Handle_OP_CastSpell(const EQApplicationPacket *app)
 		return;
 	}
 	if (IsAIControlled()) {
-		this->Message_StringID(13, NOT_IN_CONTROL);
-		//Message(13, "You cant cast right now, you arent in control of yourself!");
+		this->MessageString(Chat::Red, NOT_IN_CONTROL);
+		//Message(Chat::Red, "You cant cast right now, you arent in control of yourself!");
 		return;
 	}
 
@@ -4138,7 +4139,7 @@ void Client::Handle_OP_CastSpell(const EQApplicationPacket *app)
 
 		if (castspell->spell_id == SPELL_LAY_ON_HANDS && GetClass() == PALADIN) {
 			if (!p_timers.Expired(&database, pTimerLayHands)) {
-				Message(13, "Ability recovery time not yet met.");
+				Message(Chat::Red, "Ability recovery time not yet met.");
 				InterruptSpell(castspell->spell_id);
 				return;
 			}
@@ -4148,7 +4149,7 @@ void Client::Handle_OP_CastSpell(const EQApplicationPacket *app)
 		else if ((castspell->spell_id == SPELL_HARM_TOUCH
 			|| castspell->spell_id == SPELL_HARM_TOUCH2) && GetClass() == SHADOWKNIGHT) {
 			if (!p_timers.Expired(&database, pTimerHarmTouch)) {
-				Message(13, "Ability recovery time not yet met.");
+				Message(Chat::Red, "Ability recovery time not yet met.");
 				InterruptSpell(castspell->spell_id);
 				return;
 			}
@@ -4177,11 +4178,16 @@ void Client::Handle_OP_ChannelMessage(const EQApplicationPacket *app)
 		return;
 	}
 	if (IsAIControlled()) {
-		Message(13, "You try to speak but cant move your mouth!");
+		Message(Chat::Red, "You try to speak but cant move your mouth!");
 		return;
 	}
 
-	ChannelMessageReceived(cm->chan_num, cm->language, cm->skill_in_language, cm->message, cm->targetname);
+	uint8 skill_in_language = 100;
+	if (cm->language < MAX_PP_LANGUAGE)
+	{
+		skill_in_language = m_pp.languages[cm->language];
+	}
+	ChannelMessageReceived(cm->chan_num, cm->language, skill_in_language, cm->message, cm->targetname);
 	return;
 }
 
@@ -4461,16 +4467,16 @@ void Client::Handle_OP_ClientUpdate(const EQApplicationPacket *app) {
 	
 	/* Handle client aggro scanning timers NPCs */
 	is_client_moving = (ppu->y_pos == m_Position.y && ppu->x_pos == m_Position.x) ? false : true;
-	
+
 	if (is_client_moving) {
 		Log(Logs::Detail, Logs::Normal, "ClientUpdate: Client is moving - scan timer is: %u",
 			client_scan_npc_aggro_timer.GetDuration());
 		if (client_scan_npc_aggro_timer.GetDuration() > 1000) {
 			client_scan_npc_aggro_timer.Disable();
 			client_scan_npc_aggro_timer.Start(500);
-	
 		}
-	} else {
+	}
+	else {
 		Log(Logs::Detail, Logs::Normal, "ClientUpdate: Client is NOT moving - scan timer is: %u",
 			client_scan_npc_aggro_timer.GetDuration());
 		if (client_scan_npc_aggro_timer.GetDuration() < 1000) {
@@ -4478,7 +4484,51 @@ void Client::Handle_OP_ClientUpdate(const EQApplicationPacket *app) {
 			client_scan_npc_aggro_timer.Start(3000);
 		}
 	}
-	
+
+	/**
+	 * On a normal basis we limit mob movement updates based on distance
+	 * This ensures we send a periodic full zone update to a client that has started moving after 5 or so minutes
+	 *
+	 * For very large zones we will also force a full update based on distance
+	 *
+	 * We ignore a small distance around us so that we don't interrupt already pathing deltas as those npcs will appear
+	 * to full stop when they are actually still pathing
+	 */
+
+	float distance_moved                      = DistanceNoZ(GetLastPositionBeforeBulkUpdate(), GetPosition());
+	bool  moved_far_enough_before_bulk_update = distance_moved >= zone->GetNpcPositionUpdateDistance();
+	bool  is_ready_to_update                  = (
+		client_zone_wide_full_position_update_timer.Check() || moved_far_enough_before_bulk_update
+	);
+
+	if (is_client_moving && is_ready_to_update) {
+		Log(Logs::Detail, Logs::Normal, "[%s] Client Zone Wide Position Update NPCs", GetCleanName());
+
+		auto &mob_movement_manager = MobMovementManager::Get();
+		auto &mob_list             = entity_list.GetMobList();
+
+		for (auto &it : mob_list) {
+			Mob *entity = it.second;
+			if (!entity->IsNPC()) {
+				continue;
+			}
+
+			int animation_speed = 0;
+			if (entity->IsMoving()) {
+				if (entity->IsRunning()) {
+					animation_speed = (entity->IsFeared() ? entity->GetFearSpeed() : entity->GetRunspeed());
+				}
+				else {
+					animation_speed = entity->GetWalkspeed();
+				}
+			}
+
+			mob_movement_manager.SendCommandToClients(entity, 0.0, 0.0, 0.0, 0.0, animation_speed, ClientRangeAny, this);
+		}
+
+		SetLastPositionBeforeBulkUpdate(GetPosition());
+	}
+
 	float new_heading = EQ12toFloat(ppu->heading);
 	int32 new_animation = ppu->animation;
 	
@@ -4575,7 +4625,7 @@ void Client::Handle_OP_Consent(const EQApplicationPacket *app)
 			safe_delete(pack);
 		}
 		else {
-			Message_StringID(0, CONSENT_YOURSELF);
+			MessageString(Chat::White, CONSENT_YOURSELF);
 		}
 	}
 	return;
@@ -4614,7 +4664,7 @@ void Client::Handle_OP_Consider(const EQApplicationPacket *app)
 
 	if (tmob->GetClass() == LDON_TREASURE)
 	{
-		Message(15, "%s", tmob->GetCleanName());
+		Message(Chat::Yellow, "%s", tmob->GetCleanName());
 		return;
 	}
 
@@ -4715,10 +4765,10 @@ void Client::Handle_OP_Consider(const EQApplicationPacket *app)
 	// this could be done better, but this is only called when you con so w/e
 	// Shroud of Stealth has a special message
 	if (improved_hidden && (!tmob->see_improved_hide && (tmob->see_invis || tmob->see_hide)))
-		Message_StringID(10, SOS_KEEPS_HIDDEN);
+		MessageString(Chat::NPCQuestSay, SOS_KEEPS_HIDDEN);
 	// we are trying to hide but they can see us
 	else if ((invisible || invisible_undead || hidden || invisible_animals) && !IsInvisible(tmob))
-		Message_StringID(10, SUSPECT_SEES_YOU);
+		MessageString(Chat::NPCQuestSay, SUSPECT_SEES_YOU);
 
 	safe_delete(outapp);
 
@@ -4741,10 +4791,10 @@ void Client::Handle_OP_ConsiderCorpse(const EQApplicationPacket *app)
 			min = (ttime / 60000) % 60; // Total seconds / 60 drop .00
 			char val1[20] = { 0 };
 			char val2[20] = { 0 };
-			Message_StringID(10, CORPSE_DECAY1, ConvertArray(min, val1), ConvertArray(sec, val2));
+			MessageString(Chat::NPCQuestSay, CORPSE_DECAY1, ConvertArray(min, val1), ConvertArray(sec, val2));
 		}
 		else {
-			Message_StringID(10, CORPSE_DECAY_NOW);
+			MessageString(Chat::NPCQuestSay, CORPSE_DECAY_NOW);
 		}
 	}
 	else if (tcorpse && tcorpse->IsPlayerCorpse()) {
@@ -4775,12 +4825,12 @@ void Client::Handle_OP_ConsiderCorpse(const EQApplicationPacket *app)
 			Message(0, "This corpse can be resurrected for %i minutes and %i seconds.", min, sec);
 			}
 			else {
-			Message_StringID(0, CORPSE_TOO_OLD);
+			MessageString(Chat::White, CORPSE_TOO_OLD);
 			}
 			*/
 		}
 		else {
-			Message_StringID(10, CORPSE_DECAY_NOW);
+			MessageString(Chat::NPCQuestSay, CORPSE_DECAY_NOW);
 		}
 	}
 }
@@ -4882,7 +4932,7 @@ void Client::Handle_OP_ControlBoat(const EQApplicationPacket *app)
 			boat->SetTarget(this);
 		}
 		else {
-			this->Message_StringID(13, IN_USE);
+			this->MessageString(Chat::Red, IN_USE);
 			return;
 		}
 	}
@@ -4900,7 +4950,7 @@ void Client::Handle_OP_CorpseDrag(const EQApplicationPacket *app)
 {
 	if (DraggedCorpses.size() >= (unsigned int)RuleI(Character, MaxDraggedCorpses))
 	{
-		Message_StringID(13, CORPSEDRAG_LIMIT);
+		MessageString(Chat::Red, CORPSEDRAG_LIMIT);
 		return;
 	}
 
@@ -4918,9 +4968,9 @@ void Client::Handle_OP_CorpseDrag(const EQApplicationPacket *app)
 	if (c)
 	{
 		if (c == this)
-			Message_StringID(MT_DefaultText, CORPSEDRAG_ALREADY, corpse->GetCleanName());
+			MessageString(Chat::DefaultText, CORPSEDRAG_ALREADY, corpse->GetCleanName());
 		else
-			Message_StringID(MT_DefaultText, CORPSEDRAG_SOMEONE_ELSE, corpse->GetCleanName());
+			MessageString(Chat::DefaultText, CORPSEDRAG_SOMEONE_ELSE, corpse->GetCleanName());
 
 		return;
 	}
@@ -4930,14 +4980,14 @@ void Client::Handle_OP_CorpseDrag(const EQApplicationPacket *app)
 
 	DraggedCorpses.push_back(std::pair<std::string, uint16>(cds->CorpseName, corpse->GetID()));
 
-	Message_StringID(MT_DefaultText, CORPSEDRAG_BEGIN, cds->CorpseName);
+	MessageString(Chat::DefaultText, CORPSEDRAG_BEGIN, cds->CorpseName);
 }
 
 void Client::Handle_OP_CorpseDrop(const EQApplicationPacket *app)
 {
 	if (app->size == 1)
 	{
-		Message_StringID(MT_DefaultText, CORPSEDRAG_STOPALL);
+		MessageString(Chat::DefaultText, CORPSEDRAG_STOPALL);
 		ClearDraggedCorpses();
 		return;
 	}
@@ -4946,7 +4996,7 @@ void Client::Handle_OP_CorpseDrop(const EQApplicationPacket *app)
 	{
 		if (!strcasecmp(Iterator->first.c_str(), (const char *)app->pBuffer))
 		{
-			Message_StringID(MT_DefaultText, CORPSEDRAG_STOP);
+			MessageString(Chat::DefaultText, CORPSEDRAG_STOP);
 			Iterator = DraggedCorpses.erase(Iterator);
 			return;
 		}
@@ -5118,7 +5168,7 @@ void Client::Handle_OP_DeleteItem(const EQApplicationPacket *app)
 	DeleteItem_Struct* alc = (DeleteItem_Struct*)app->pBuffer;
 	const EQEmu::ItemInstance *inst = GetInv().GetItem(alc->from_slot);
 	if (inst && inst->GetItem()->ItemType == EQEmu::item::ItemTypeAlcohol) {
-		entity_list.MessageClose_StringID(this, true, 50, 0, DRINKING_MESSAGE, GetName(), inst->GetItem()->Name);
+		entity_list.MessageCloseString(this, true, 50, 0, DRINKING_MESSAGE, GetName(), inst->GetItem()->Name);
 		CheckIncreaseSkill(EQEmu::skills::SkillAlcoholTolerance, nullptr, 25);
 
 		int16 AlcoholTolerance = GetSkill(EQEmu::skills::SkillAlcoholTolerance);
@@ -5177,7 +5227,7 @@ void Client::Handle_OP_Disarm(const EQApplicationPacket *app) {
 	Disarm_Struct *disarm = (Disarm_Struct *)app->pBuffer;
 
 	if (!p_timers.Expired(&database, pTimerCombatAbility2, false)) {
-		Message(13, "Ability recovery time not yet met.");
+		Message(Chat::Red, "Ability recovery time not yet met.");
 		return;
 	}
 
@@ -5250,7 +5300,7 @@ void Client::Handle_OP_Disarm(const EQApplicationPacket *app) {
 		return;
 	}
 	// Trying to disarm something we can't disarm
-	Message_StringID(MT_Skills, DISARM_NO_TARGET);
+	MessageString(Chat::Skills, DISARM_NO_TARGET);
 
 	return;
 }
@@ -5284,7 +5334,7 @@ void Client::Handle_OP_DisarmTraps(const EQApplicationPacket *app)
 		return;
 
 	if (!p_timers.Expired(&database, pTimerDisarmTraps, false)) {
-		Message(13, "Ability recovery time not yet met.");
+		Message(Chat::Red, "Ability recovery time not yet met.");
 		return;
 	}
 
@@ -5308,14 +5358,14 @@ void Client::Handle_OP_DisarmTraps(const EQApplicationPacket *app)
 			if ((zone->random.Int(0, 49) + uskill) >= (zone->random.Int(0, 49) + trap->skill))
 			{
 				success = SKILLUP_SUCCESS;
-				Message_StringID(MT_Skills, DISARMED_TRAP);
+				MessageString(Chat::Skills, DISARMED_TRAP);
 				trap->disarmed = true;
 				Log(Logs::General, Logs::Traps, "Trap %d is disarmed.", trap->trap_id);
 				trap->UpdateTrap();
 			}
 			else
 			{
-				Message_StringID(MT_Skills, FAIL_DISARM_DETECTED_TRAP);
+				MessageString(Chat::Skills, FAIL_DISARM_DETECTED_TRAP);
 				if (zone->random.Int(0, 99) < 25) {
 					trap->Trigger(this);
 				}
@@ -5325,12 +5375,12 @@ void Client::Handle_OP_DisarmTraps(const EQApplicationPacket *app)
 		}
 		else
 		{
-			Message_StringID(MT_Skills, TRAP_TOO_FAR);
+			MessageString(Chat::Skills, TRAP_TOO_FAR);
 		}
 	}
 	else
 	{
-		Message_StringID(MT_Skills, LDON_SENSE_TRAP2);
+		MessageString(Chat::Skills, LDON_SENSE_TRAP2);
 	}
 
 	return;
@@ -5414,9 +5464,9 @@ void Client::Handle_OP_DuelResponse(const EQApplicationPacket *app)
 	initiator->CastToClient()->SetDuelTarget(0);
 	initiator->CastToClient()->SetDueling(false);
 	if (GetID() == initiator->GetID())
-		entity->CastToClient()->Message_StringID(10, DUEL_DECLINE, initiator->GetName());
+		entity->CastToClient()->MessageString(Chat::NPCQuestSay, DUEL_DECLINE, initiator->GetName());
 	else
-		initiator->CastToClient()->Message_StringID(10, DUEL_DECLINE, entity->GetName());
+		initiator->CastToClient()->MessageString(Chat::NPCQuestSay, DUEL_DECLINE, entity->GetName());
 	return;
 }
 
@@ -5539,7 +5589,7 @@ void Client::Handle_OP_EndLootRequest(const EQApplicationPacket *app)
 
 	Entity* entity = entity_list.GetID(*((uint16*)app->pBuffer));
 	if (entity == 0) {
-		Message(13, "Error: OP_EndLootRequest: Corpse not found (ent = 0)");
+		Message(Chat::Red, "Error: OP_EndLootRequest: Corpse not found (ent = 0)");
 		if (ClientVersion() >= EQEmu::versions::ClientVersion::SoD)
 			Corpse::SendEndLootErrorPacket(this);
 		else
@@ -5547,7 +5597,7 @@ void Client::Handle_OP_EndLootRequest(const EQApplicationPacket *app)
 		return;
 	}
 	else if (!entity->IsCorpse()) {
-		Message(13, "Error: OP_EndLootRequest: Corpse not found (!entity->IsCorpse())");
+		Message(Chat::Red, "Error: OP_EndLootRequest: Corpse not found (!entity->IsCorpse())");
 		Corpse::SendLootReqErrorPacket(this);
 		return;
 	}
@@ -5586,12 +5636,12 @@ void Client::Handle_OP_EnvDamage(const EQApplicationPacket *app)
 		damage = 31337;
 
 	if (admin >= minStatusToAvoidFalling && GetGM()) {
-		Message(13, "Your GM status protects you from %i points of type %i environmental damage.", ed->damage, ed->dmgtype);
+		Message(Chat::Red, "Your GM status protects you from %i points of type %i environmental damage.", ed->damage, ed->dmgtype);
 		SetHP(GetHP() - 1);//needed or else the client wont acknowledge
 		return;
 	}
 	else if (GetInvul()) {
-		Message(13, "Your invuln status protects you from %i points of type %i environmental damage.", ed->damage, ed->dmgtype);
+		Message(Chat::Red, "Your invuln status protects you from %i points of type %i environmental damage.", ed->damage, ed->dmgtype);
 		SetHP(GetHP() - 1);//needed or else the client wont acknowledge
 		return;
 	}
@@ -5640,8 +5690,8 @@ void Client::Handle_OP_FaceChange(const EQApplicationPacket *app)
 	m_pp.drakkin_tattoo = fc->drakkin_tattoo;
 	m_pp.drakkin_details = fc->drakkin_details;
 	Save();
-	Message_StringID(13, FACE_ACCEPTED);
-	//Message(13, "Facial features updated.");
+	MessageString(Chat::Red, FACE_ACCEPTED);
+	//Message(Chat::Red, "Facial features updated.");
 	return;
 }
 
@@ -5650,7 +5700,7 @@ void Client::Handle_OP_FeignDeath(const EQApplicationPacket *app)
 	if (GetClass() != MONK)
 		return;
 	if (!p_timers.Expired(&database, pTimerFeignDeath, false)) {
-		Message(13, "Ability recovery time not yet met.");
+		Message(Chat::Red, "Ability recovery time not yet met.");
 		return;
 	}
 
@@ -5677,7 +5727,7 @@ void Client::Handle_OP_FeignDeath(const EQApplicationPacket *app)
 	uint16 totalfeign = primfeign + secfeign;
 	if (zone->random.Real(0, 160) > totalfeign) {
 		SetFeigned(false);
-		entity_list.MessageClose_StringID(this, false, 200, 10, STRING_FEIGNFAILED, GetName());
+		entity_list.MessageCloseString(this, false, 200, 10, STRING_FEIGNFAILED, GetName());
 	}
 	else {
 		SetFeigned(true);
@@ -5706,7 +5756,7 @@ void Client::Handle_OP_FindPersonRequest(const EQApplicationPacket *app)
 	
 		if (!RuleB(Pathing, Find) && RuleB(Bazaar, EnableWarpToTrader) && target->IsClient() && (target->CastToClient()->Trader ||
 			target->CastToClient()->Buyer)) {
-			Message(15, "Moving you to Trader %s", target->GetName());
+			Message(Chat::Yellow, "Moving you to Trader %s", target->GetName());
 			MovePC(zone->GetZoneID(), zone->GetInstanceID(), target->GetX(), target->GetY(), target->GetZ(), 0.0f);
 		}
 	
@@ -5799,7 +5849,7 @@ void Client::Handle_OP_FindPersonRequest(const EQApplicationPacket *app)
 void Client::Handle_OP_Fishing(const EQApplicationPacket *app)
 {
 	if (!p_timers.Expired(&database, pTimerFishing, false)) {
-		Message(13, "Ability recovery time not yet met.");
+		Message(Chat::Red, "Ability recovery time not yet met.");
 		return;
 	}
 
@@ -5819,7 +5869,7 @@ void Client::Handle_OP_Forage(const EQApplicationPacket *app)
 {
 
 	if (!p_timers.Expired(&database, pTimerForaging, false)) {
-		Message(13, "Ability recovery time not yet met.");
+		Message(Chat::Red, "Ability recovery time not yet met.");
 		return;
 	}
 	p_timers.Start(pTimerForaging, ForagingReuseTime - 1);
@@ -5859,7 +5909,7 @@ void Client::Handle_OP_GetGuildsList(const EQApplicationPacket *app)
 void Client::Handle_OP_GMBecomeNPC(const EQApplicationPacket *app)
 {
 	if (this->Admin() < minStatusToUseGMCommands) {
-		Message(13, "Your account has been reported for hacking.");
+		Message(Chat::Red, "Your account has been reported for hacking.");
 		database.SetHackerFlag(this->account_name, this->name, "/becomenpc");
 		return;
 	}
@@ -5879,7 +5929,7 @@ void Client::Handle_OP_GMBecomeNPC(const EQApplicationPacket *app)
 	cli->SendAppearancePacket(AT_NPCName, 1, true);
 	cli->CastToClient()->SetBecomeNPC(true);
 	cli->CastToClient()->SetBecomeNPCLevel(bnpc->maxlevel);
-	cli->Message_StringID(0, TOGGLE_OFF);
+	cli->MessageString(Chat::White, TOGGLE_OFF);
 	cli->CastToClient()->tellsoff = true;
 	//TODO: Make this toggle a BecomeNPC flag so that it gets updated when people zone in as well; Make combat work with this.
 	return;
@@ -5890,7 +5940,7 @@ void Client::Handle_OP_GMDelCorpse(const EQApplicationPacket *app)
 	if (app->size != sizeof(GMDelCorpse_Struct))
 		return;
 	if (this->Admin() < commandEditPlayerCorpses) {
-		Message(13, "Your account has been reported for hacking.");
+		Message(Chat::Red, "Your account has been reported for hacking.");
 		database.SetHackerFlag(this->account_name, this->name, "/delcorpse");
 		return;
 	}
@@ -5904,14 +5954,14 @@ void Client::Handle_OP_GMDelCorpse(const EQApplicationPacket *app)
 	}
 	corpse->CastToCorpse()->Delete();
 	std::cout << name << " deleted corpse " << dc->corpsename << std::endl;
-	Message(13, "Corpse %s deleted.", dc->corpsename);
+	Message(Chat::Red, "Corpse %s deleted.", dc->corpsename);
 	return;
 }
 
 void Client::Handle_OP_GMEmoteZone(const EQApplicationPacket *app)
 {
 	if (this->Admin() < minStatusToUseGMCommands) {
-		Message(13, "Your account has been reported for hacking.");
+		Message(Chat::Red, "Your account has been reported for hacking.");
 		database.SetHackerFlag(this->account_name, this->name, "/emote");
 		return;
 	}
@@ -5944,7 +5994,7 @@ void Client::Handle_OP_GMEndTraining(const EQApplicationPacket *app)
 void Client::Handle_OP_GMFind(const EQApplicationPacket *app)
 {
 	if (this->Admin() < minStatusToUseGMCommands) {
-		Message(13, "Your account has been reported for hacking.");
+		Message(Chat::Red, "Your account has been reported for hacking.");
 		database.SetHackerFlag(this->account_name, this->name, "/find");
 		return;
 	}
@@ -5982,7 +6032,7 @@ void Client::Handle_OP_GMGoto(const EQApplicationPacket *app)
 		return;
 	}
 	if (this->Admin() < minStatusToUseGMCommands) {
-		Message(13, "Your account has been reported for hacking.");
+		Message(Chat::Red, "Your account has been reported for hacking.");
 		database.SetHackerFlag(this->account_name, this->name, "/goto");
 		return;
 	}
@@ -6009,7 +6059,7 @@ void Client::Handle_OP_GMGoto(const EQApplicationPacket *app)
 void Client::Handle_OP_GMHideMe(const EQApplicationPacket *app)
 {
 	if (this->Admin() < minStatusToUseGMCommands) {
-		Message(13, "Your account has been reported for hacking.");
+		Message(Chat::Red, "Your account has been reported for hacking.");
 		database.SetHackerFlag(this->account_name, this->name, "/hideme");
 		return;
 	}
@@ -6018,7 +6068,7 @@ void Client::Handle_OP_GMHideMe(const EQApplicationPacket *app)
 		return;
 	}
 	SpawnAppearance_Struct* sa = (SpawnAppearance_Struct*)app->pBuffer;
-	Message(13, "#: %i, %i", sa->type, sa->parameter);
+	Message(Chat::Red, "#: %i, %i", sa->type, sa->parameter);
 	SetHideMe(!sa->parameter);
 	return;
 
@@ -6029,7 +6079,7 @@ void Client::Handle_OP_GMKick(const EQApplicationPacket *app)
 	if (app->size != sizeof(GMKick_Struct))
 		return;
 	if (this->Admin() < minStatusToKick) {
-		Message(13, "Your account has been reported for hacking.");
+		Message(Chat::Red, "Your account has been reported for hacking.");
 		database.SetHackerFlag(this->account_name, this->name, "/kick");
 		return;
 	}
@@ -6059,7 +6109,7 @@ void Client::Handle_OP_GMKick(const EQApplicationPacket *app)
 void Client::Handle_OP_GMKill(const EQApplicationPacket *app)
 {
 	if (this->Admin() < minStatusToUseGMCommands) {
-		Message(13, "Your account has been reported for hacking.");
+		Message(Chat::Red, "Your account has been reported for hacking.");
 		database.SetHackerFlag(this->account_name, this->name, "/kill");
 		return;
 	}
@@ -6102,16 +6152,16 @@ void Client::Handle_OP_GMLastName(const EQApplicationPacket *app)
 	}
 	GMLastName_Struct* gmln = (GMLastName_Struct*)app->pBuffer;
 	if (strlen(gmln->lastname) >= 64) {
-		Message(13, "/LastName: New last name too long. (max=63)");
+		Message(Chat::Red, "/LastName: New last name too long. (max=63)");
 	}
 	else {
 		Client* client = entity_list.GetClientByName(gmln->name);
 		if (client == 0) {
-			Message(13, "/LastName: %s not found", gmln->name);
+			Message(Chat::Red, "/LastName: %s not found", gmln->name);
 		}
 		else {
 			if (this->Admin() < minStatusToUseGMCommands) {
-				Message(13, "Your account has been reported for hacking.");
+				Message(Chat::Red, "Your account has been reported for hacking.");
 				database.SetHackerFlag(client->account_name, client->name, "/lastname");
 				return;
 			}
@@ -6136,7 +6186,7 @@ void Client::Handle_OP_GMNameChange(const EQApplicationPacket *app)
 	}
 	const GMName_Struct* gmn = (const GMName_Struct *)app->pBuffer;
 	if (this->Admin() < minStatusToUseGMCommands) {
-		Message(13, "Your account has been reported for hacking.");
+		Message(Chat::Red, "Your account has been reported for hacking.");
 		database.SetHackerFlag(this->account_name, this->name, "/name");
 		return;
 	}
@@ -6144,15 +6194,15 @@ void Client::Handle_OP_GMNameChange(const EQApplicationPacket *app)
 	Log(Logs::General, Logs::Status, "GM(%s) changeing players name. Old:%s New:%s", GetName(), gmn->oldname, gmn->newname);
 	bool usedname = database.CheckUsedName((const char*)gmn->newname);
 	if (client == 0) {
-		Message(13, "%s not found for name change. Operation failed!", gmn->oldname);
+		Message(Chat::Red, "%s not found for name change. Operation failed!", gmn->oldname);
 		return;
 	}
 	if ((strlen(gmn->newname) > 63) || (strlen(gmn->newname) == 0)) {
-		Message(13, "Invalid number of characters in new name (%s).", gmn->newname);
+		Message(Chat::Red, "Invalid number of characters in new name (%s).", gmn->newname);
 		return;
 	}
 	if (!usedname) {
-		Message(13, "%s is already in use. Operation failed!", gmn->newname);
+		Message(Chat::Red, "%s is already in use. Operation failed!", gmn->newname);
 		return;
 
 	}
@@ -6208,9 +6258,9 @@ void Client::Handle_OP_GMSearchCorpse(const EQApplicationPacket *app)
 		return;
 
 	if (results.RowCount() == maxResults)
-		Message(clientMessageError, "Your search found too many results; some are not displayed.");
+		Message(Chat::Red, "Your search found too many results; some are not displayed.");
 	else
-		Message(clientMessageYellow, "There are %i corpse(s) that match the search string '%s'.", results.RowCount(), gmscs->Name);
+		Message(Chat::Yellow, "There are %i corpse(s) that match the search string '%s'.", results.RowCount(), gmscs->Name);
 
 	char charName[64], time_of_death[20];
 
@@ -6237,7 +6287,7 @@ void Client::Handle_OP_GMSearchCorpse(const EQApplicationPacket *app)
 			corpseRezzed ? "Yes" : "No", corpseBuried ? "Yes" : "No");
 
 		if (popupText.size() > 4000) {
-			Message(clientMessageError, "Unable to display all the results.");
+			Message(Chat::Red, "Unable to display all the results.");
 			break;
 		}
 
@@ -6280,19 +6330,19 @@ void Client::Handle_OP_GMToggle(const EQApplicationPacket *app)
 		return;
 	}
 	if (this->Admin() < minStatusToUseGMCommands) {
-		Message(13, "Your account has been reported for hacking.");
+		Message(Chat::Red, "Your account has been reported for hacking.");
 		database.SetHackerFlag(this->account_name, this->name, "/toggle");
 		return;
 	}
 	GMToggle_Struct *ts = (GMToggle_Struct *)app->pBuffer;
 	if (ts->toggle == 0) {
-		this->Message_StringID(0, TOGGLE_OFF);
+		this->MessageString(Chat::White, TOGGLE_OFF);
 		//Message(0, "Turning tells OFF");
 		tellsoff = true;
 	}
 	else if (ts->toggle == 1) {
 		//Message(0, "Turning tells ON");
-		this->Message_StringID(0, TOGGLE_ON);
+		this->MessageString(Chat::White, TOGGLE_ON);
 		tellsoff = false;
 	}
 	else {
@@ -6331,7 +6381,7 @@ void Client::Handle_OP_GMZoneRequest(const EQApplicationPacket *app)
 		return;
 	}
 	if (this->Admin() < minStatusToBeGM) {
-		Message(13, "Your account has been reported for hacking.");
+		Message(Chat::Red, "Your account has been reported for hacking.");
 		database.SetHackerFlag(this->account_name, this->name, "/zone");
 		return;
 	}
@@ -6379,7 +6429,7 @@ void Client::Handle_OP_GMZoneRequest(const EQApplicationPacket *app)
 void Client::Handle_OP_GMZoneRequest2(const EQApplicationPacket *app)
 {
 	if (this->Admin() < minStatusToBeGM) {
-		Message(13, "Your account has been reported for hacking.");
+		Message(Chat::Red, "Your account has been reported for hacking.");
 		database.SetHackerFlag(this->account_name, this->name, "/zone");
 		return;
 	}
@@ -6686,7 +6736,7 @@ void Client::Handle_OP_GroupInvite2(const EQApplicationPacket *app)
 
 	if (Invitee == this)
 	{
-		Message_StringID(clientMessageWhite, GROUP_INVITEE_SELF);
+		MessageString(Chat::LightGray, GROUP_INVITEE_SELF);
 		return;
 	}
 
@@ -6878,7 +6928,7 @@ void Client::Handle_OP_GuildBank(const EQApplicationPacket *app)
 
 	if ((int)zone->GetZoneID() != RuleI(World, GuildBankZoneID))
 	{
-		Message(13, "The Guild Bank is not available in this zone.");
+		Message(Chat::Red, "The Guild Bank is not available in this zone.");
 
 		return;
 	}
@@ -6896,7 +6946,7 @@ void Client::Handle_OP_GuildBank(const EQApplicationPacket *app)
 
 	if (!IsInAGuild())
 	{
-		Message(13, "You must be in a Guild to use the Guild Bank.");
+		Message(Chat::Red, "You must be in a Guild to use the Guild Bank.");
 
 		if (Action == GuildBankDeposit)
 			GuildBankDepositAck(true, sentAction);
@@ -6924,7 +6974,7 @@ void Client::Handle_OP_GuildBank(const EQApplicationPacket *app)
 	{
 		if (GuildBanks->IsAreaFull(GuildID(), GuildBankMainArea))
 		{
-			Message_StringID(13, GUILD_BANK_FULL);
+			MessageString(Chat::Red, GUILD_BANK_FULL);
 
 			GuildBankDepositAck(true, sentAction);
 
@@ -6941,12 +6991,12 @@ void Client::Handle_OP_GuildBank(const EQApplicationPacket *app)
 
 			if (inst)
 			{
-				Message_StringID(clientMessageWhite, GUILD_BANK_TRANSFERRED, inst->GetItem()->Name);
+				MessageString(Chat::LightGray, GUILD_BANK_TRANSFERRED, inst->GetItem()->Name);
 				safe_delete(inst);
 			}
 		}
 		else
-			Message(13, "Unexpected error while moving item into Guild Bank.");
+			Message(Chat::Red, "Unexpected error while moving item into Guild Bank.");
 
 		GuildBankAck();
 
@@ -6973,7 +7023,7 @@ void Client::Handle_OP_GuildBank(const EQApplicationPacket *app)
 	{
 		if (GuildBanks->IsAreaFull(GuildID(), GuildBankDepositArea))
 		{
-			Message_StringID(13, GUILD_BANK_FULL);
+			MessageString(Chat::Red, GUILD_BANK_FULL);
 
 			GuildBankDepositAck(true, sentAction);
 
@@ -6986,7 +7036,7 @@ void Client::Handle_OP_GuildBank(const EQApplicationPacket *app)
 
 		if (!CursorItemInst)
 		{
-			Message(13, "No Item on the cursor.");
+			Message(Chat::Red, "No Item on the cursor.");
 
 			GuildBankDepositAck(true, sentAction);
 
@@ -7018,7 +7068,7 @@ void Client::Handle_OP_GuildBank(const EQApplicationPacket *app)
 
 		if (!Allowed)
 		{
-			Message_StringID(13, GUILD_BANK_CANNOT_DEPOSIT);
+			MessageString(Chat::Red, GUILD_BANK_CANNOT_DEPOSIT);
 			GuildBankDepositAck(true, sentAction);
 
 			return;
@@ -7051,7 +7101,7 @@ void Client::Handle_OP_GuildBank(const EQApplicationPacket *app)
 	{
 		if (GetInv()[EQEmu::invslot::slotCursor])
 		{
-			Message_StringID(13, GUILD_BANK_EMPTY_HANDS);
+			MessageString(Chat::Red, GUILD_BANK_EMPTY_HANDS);
 
 			GuildBankAck();
 
@@ -7082,7 +7132,7 @@ void Client::Handle_OP_GuildBank(const EQApplicationPacket *app)
 
 		if (CheckLoreConflict(inst->GetItem()))
 		{
-			Message_StringID(13, DUP_LORE);
+			MessageString(Chat::Red, DUP_LORE);
 
 			GuildBankAck();
 
@@ -7114,7 +7164,7 @@ void Client::Handle_OP_GuildBank(const EQApplicationPacket *app)
 	case GuildBankSplitStacks:
 	{
 		if (GuildBanks->IsAreaFull(GuildID(), GuildBankMainArea))
-			Message_StringID(13, GUILD_BANK_FULL);
+			MessageString(Chat::Red, GUILD_BANK_FULL);
 		else
 		{
 			GuildBankWithdrawItem_Struct *gbwis = (GuildBankWithdrawItem_Struct*)app->pBuffer;
@@ -7140,7 +7190,7 @@ void Client::Handle_OP_GuildBank(const EQApplicationPacket *app)
 
 	default:
 	{
-		Message(13, "Unexpected GuildBank action.");
+		Message(Chat::Red, "Unexpected GuildBank action.");
 
 		Log(Logs::General, Logs::Error, "Received unexpected guild bank action code %i from %s", Action, GetName());
 	}
@@ -7151,13 +7201,13 @@ void Client::Handle_OP_GuildCreate(const EQApplicationPacket *app)
 {
 	if (IsInAGuild())
 	{
-		Message(clientMessageError, "You are already in a guild!");
+		Message(Chat::Red, "You are already in a guild!");
 		return;
 	}
 
 	if (!RuleB(Guild, PlayerCreationAllowed))
 	{
-		Message(clientMessageError, "This feature is disabled on this server. Contact a GM or post on your server message boards to create a guild.");
+		Message(Chat::Red, "This feature is disabled on this server. Contact a GM or post on your server message boards to create a guild.");
 		return;
 	}
 
@@ -7165,7 +7215,7 @@ void Client::Handle_OP_GuildCreate(const EQApplicationPacket *app)
 		(GetLevel() < RuleI(Guild, PlayerCreationRequiredLevel)) ||
 		(database.GetTotalTimeEntitledOnAccount(AccountID()) < (unsigned int)RuleI(Guild, PlayerCreationRequiredTime)))
 	{
-		Message(clientMessageError, "Your status, level or time playing on this account are insufficient to use this feature.");
+		Message(Chat::Red, "Your status, level or time playing on this account are insufficient to use this feature.");
 		return;
 	}
 
@@ -7184,7 +7234,7 @@ void Client::Handle_OP_GuildCreate(const EQApplicationPacket *app)
 	if (strnlen(GuildName, 64) > 60)
 #endif // DARWIN
 	{
-		Message(clientMessageError, "Guild name too long.");
+		Message(Chat::Red, "Guild name too long.");
 		return;
 	}
 
@@ -7192,7 +7242,7 @@ void Client::Handle_OP_GuildCreate(const EQApplicationPacket *app)
 	{
 		if (!isalpha(GuildName[i]) && (GuildName[i] != ' '))
 		{
-			Message(clientMessageError, "Invalid character in Guild name.");
+			Message(Chat::Red, "Invalid character in Guild name.");
 			return;
 		}
 	}
@@ -7201,13 +7251,13 @@ void Client::Handle_OP_GuildCreate(const EQApplicationPacket *app)
 
 	if (GuildCount >= RuleI(Guild, PlayerCreationLimit))
 	{
-		Message(clientMessageError, "You cannot create this guild because this account may only be leader of %i guilds.", RuleI(Guild, PlayerCreationLimit));
+		Message(Chat::Red, "You cannot create this guild because this account may only be leader of %i guilds.", RuleI(Guild, PlayerCreationLimit));
 		return;
 	}
 
 	if (guild_mgr.GetGuildIDByName(GuildName) != GUILD_NONE)
 	{
-		Message_StringID(clientMessageError, GUILD_NAME_IN_USE);
+		MessageString(Chat::Red, GUILD_NAME_IN_USE);
 		return;
 	}
 
@@ -7217,14 +7267,14 @@ void Client::Handle_OP_GuildCreate(const EQApplicationPacket *app)
 		GuildName, CharacterID(), (unsigned long)NewGuildID);
 
 	if (NewGuildID == GUILD_NONE)
-		Message(clientMessageError, "Guild creation failed.");
+		Message(Chat::Red, "Guild creation failed.");
 	else
 	{
 		if (!guild_mgr.SetGuild(CharacterID(), NewGuildID, GUILD_LEADER))
-			Message(clientMessageError, "Unable to set guild leader's guild in the database. Contact a GM.");
+			Message(Chat::Red, "Unable to set guild leader's guild in the database. Contact a GM.");
 		else
 		{
-			Message(clientMessageYellow, "You are now the leader of %s", GuildName);
+			Message(Chat::Yellow, "You are now the leader of %s", GuildName);
 
 			if (zone->GetZoneID() == RuleI(World, GuildBankZoneID) && GuildBanks)
 				GuildBanks->SendGuildBank(this);
@@ -7291,7 +7341,7 @@ void Client::Handle_OP_GuildDemote(const EQApplicationPacket *app)
 			guild_mgr.GetGuildName(GuildID()), GuildID());
 
 		if (!guild_mgr.SetGuildRank(gci.char_id, rank)) {
-			Message(13, "Error while setting rank %d on '%s'.", rank, demote->target);
+			Message(Chat::Red, "Error while setting rank %d on '%s'.", rank, demote->target);
 			return;
 		}
 		Message(0, "Successfully demoted %s to rank %d", demote->target, rank);
@@ -7314,7 +7364,7 @@ void Client::Handle_OP_GuildInvite(const EQApplicationPacket *app)
 	if (!IsInAGuild())
 		Message(0, "Error: You are not in a guild!");
 	else if (gc->officer > GUILD_MAX_RANK)
-		Message(13, "Invalid rank.");
+		Message(Chat::Red, "Invalid rank.");
 	else if (!worldserver.Connected())
 		Message(0, "Error: World server disconnected");
 	else {
@@ -7323,7 +7373,7 @@ void Client::Handle_OP_GuildInvite(const EQApplicationPacket *app)
 		Mob* invitee = entity_list.GetMob(gc->othername);
 
 		if (!invitee) {
-			Message(13, "Prospective guild member %s must be in zone to preform guild operations on them.", gc->othername);
+			Message(Chat::Red, "Prospective guild member %s must be in zone to preform guild operations on them.", gc->othername);
 			return;
 		}
 
@@ -7336,7 +7386,7 @@ void Client::Handle_OP_GuildInvite(const EQApplicationPacket *app)
 				if (gc->officer < client->GuildRank()) {
 					//demotion
 					if (!guild_mgr.CheckPermission(GuildID(), GuildRank(), GUILD_DEMOTE)) {
-						Message(13, "You dont have permission to demote.");
+						Message(Chat::Red, "You dont have permission to demote.");
 						return;
 					}
 
@@ -7350,7 +7400,7 @@ void Client::Handle_OP_GuildInvite(const EQApplicationPacket *app)
 						guild_mgr.GetGuildName(GuildID()), GuildID());
 
 					if (!guild_mgr.SetGuildRank(client->CharacterID(), gc->officer)) {
-						Message(13, "There was an error during the demotion, DB may now be inconsistent.");
+						Message(Chat::Red, "There was an error during the demotion, DB may now be inconsistent.");
 						return;
 					}
 
@@ -7358,7 +7408,7 @@ void Client::Handle_OP_GuildInvite(const EQApplicationPacket *app)
 				else if (gc->officer > client->GuildRank()) {
 					//promotion
 					if (!guild_mgr.CheckPermission(GuildID(), GuildRank(), GUILD_PROMOTE)) {
-						Message(13, "You dont have permission to demote.");
+						Message(Chat::Red, "You dont have permission to demote.");
 						return;
 					}
 
@@ -7379,7 +7429,7 @@ void Client::Handle_OP_GuildInvite(const EQApplicationPacket *app)
 
 				}
 				else {
-					Message(13, "That member is already that rank.");
+					Message(Chat::Red, "That member is already that rank.");
 					return;
 				}
 			}
@@ -7388,12 +7438,12 @@ void Client::Handle_OP_GuildInvite(const EQApplicationPacket *app)
 				//
 				if (client->GetPendingGuildInvitation())
 				{
-					Message(13, "That person is already considering a guild invitation.");
+					Message(Chat::Red, "That person is already considering a guild invitation.");
 					return;
 				}
 
 				if (!guild_mgr.CheckPermission(GuildID(), GuildRank(), GUILD_INVITE)) {
-					Message(13, "You dont have permission to invite.");
+					Message(Chat::Red, "You dont have permission to invite.");
 					return;
 				}
 
@@ -7424,7 +7474,7 @@ void Client::Handle_OP_GuildInvite(const EQApplicationPacket *app)
 			}
 			else {
 				//they are in some other guild
-				Message(13, "Player is in a guild.");
+				Message(Chat::Red, "Player is in a guild.");
 				return;
 			}
 		}
@@ -7501,7 +7551,7 @@ void Client::Handle_OP_GuildInviteAccept(const EQApplicationPacket *app)
 		//it has been authorized with the guild manager
 		if (!guild_mgr.VerifyAndClearInvite(CharacterID(), gj->guildeqid, guildrank)) {
 			worldserver.SendEmoteMessage(gj->inviter, 0, 0, "%s has sent an invalid response to your invite!", GetName());
-			Message(13, "Invalid invite response packet!");
+			Message(Chat::Red, "Invalid invite response packet!");
 			return;
 		}
 
@@ -7514,7 +7564,7 @@ void Client::Handle_OP_GuildInviteAccept(const EQApplicationPacket *app)
 				guild_mgr.GetGuildName(GuildID()), GuildID());
 
 			if (!guild_mgr.SetGuildRank(CharacterID(), gj->response)) {
-				Message(13, "There was an error during the rank change, DB may now be inconsistent.");
+				Message(Chat::Red, "There was an error during the rank change, DB may now be inconsistent.");
 				return;
 			}
 		}
@@ -7538,7 +7588,7 @@ void Client::Handle_OP_GuildInviteAccept(const EQApplicationPacket *app)
 			}
 
 			if (!guild_mgr.SetGuild(CharacterID(), gj->guildeqid, guildrank)) {
-				Message(13, "There was an error during the invite, DB may now be inconsistent.");
+				Message(Chat::Red, "There was an error during the invite, DB may now be inconsistent.");
 				return;
 			}
 			if (zone->GetZoneID() == RuleI(World, GuildBankZoneID) && GuildBanks)
@@ -7577,7 +7627,7 @@ void Client::Handle_OP_GuildLeader(const EQApplicationPacket *app)
 
 			if (guild_mgr.SetGuildLeader(GuildID(), newleader->CharacterID())) {
 				Message(0, "Successfully Transfered Leadership to %s.", gml->target);
-				newleader->Message(15, "%s has transfered the guild leadership into your hands.", GetName());
+				newleader->Message(Chat::Yellow, "%s has transfered the guild leadership into your hands.", GetName());
 			}
 			else
 				Message(0, "Could not change leadership at this time.");
@@ -7600,7 +7650,7 @@ void Client::Handle_OP_GuildManageBanker(const EQApplicationPacket *app)
 	GuildManageBanker_Struct* gmb = (GuildManageBanker_Struct*)app->pBuffer;
 
 	if (!IsInAGuild()) {
-		Message(13, "Your not in a guild!");
+		Message(Chat::Red, "Your not in a guild!");
 		return;
 	}
 
@@ -7621,7 +7671,7 @@ void Client::Handle_OP_GuildManageBanker(const EQApplicationPacket *app)
 
 	if ((IsCurrentlyABanker != NewBankerStatus) && !guild_mgr.IsGuildLeader(GuildID(), CharacterID()))
 	{
-		Message(13, "Only the guild leader can assign guild bankers!");
+		Message(Chat::Red, "Only the guild leader can assign guild bankers!");
 		return;
 	}
 
@@ -7631,7 +7681,7 @@ void Client::Handle_OP_GuildManageBanker(const EQApplicationPacket *app)
 
 		if (!IsAllowed)
 		{
-			Message(13, "You are not allowed to change the alt status of %s", gmb->member);
+			Message(Chat::Red, "You are not allowed to change the alt status of %s", gmb->member);
 			return;
 		}
 	}
@@ -7644,7 +7694,7 @@ void Client::Handle_OP_GuildManageBanker(const EQApplicationPacket *app)
 	if (IsCurrentlyABanker != NewBankerStatus)
 	{
 		if (!guild_mgr.SetBankerFlag(gci.char_id, NewBankerStatus)) {
-			Message(13, "Error setting guild banker flag.");
+			Message(Chat::Red, "Error setting guild banker flag.");
 			return;
 		}
 
@@ -7656,7 +7706,7 @@ void Client::Handle_OP_GuildManageBanker(const EQApplicationPacket *app)
 	if (IsCurrentlyAnAlt != NewAltStatus)
 	{
 		if (!guild_mgr.SetAltFlag(gci.char_id, NewAltStatus)) {
-			Message(13, "Error setting guild alt flag.");
+			Message(Chat::Red, "Error setting guild alt flag.");
 			return;
 		}
 
@@ -7717,7 +7767,7 @@ void Client::Handle_OP_GuildPromote(const EQApplicationPacket *app)
 			guild_mgr.GetGuildName(GuildID()), GuildID());
 
 		if (!guild_mgr.SetGuildRank(gci.char_id, rank)) {
-			Message(13, "Error while setting rank %d on '%s'.", rank, promote->target);
+			Message(Chat::Red, "Error while setting rank %d on '%s'.", rank, promote->target);
 			return;
 		}
 		Message(0, "Successfully promoted %s to rank %d", promote->target, rank);
@@ -7752,7 +7802,7 @@ void Client::Handle_OP_GuildPublicNote(const EQApplicationPacket *app)
 		gpn->note);
 
 	if (!guild_mgr.SetPublicNote(gci.char_id, gpn->note)) {
-		Message(13, "Failed to set public note on %s", gpn->target);
+		Message(Chat::Red, "Failed to set public note on %s", gpn->target);
 	}
 	else {
 		Message(0, "Successfully changed public note on %s", gpn->target);
@@ -7847,7 +7897,7 @@ void Client::Handle_OP_GuildStatus(const EQApplicationPacket *app)
 
 	if (!c)
 	{
-		Message_StringID(clientMessageWhite, TARGET_PLAYER_FOR_GUILD_STATUS);
+		MessageString(Chat::LightGray, TARGET_PLAYER_FOR_GUILD_STATUS);
 		return;
 	}
 
@@ -7855,7 +7905,7 @@ void Client::Handle_OP_GuildStatus(const EQApplicationPacket *app)
 
 	if (TargetGuildID == GUILD_NONE)
 	{
-		Message_StringID(clientMessageWhite, NOT_IN_A_GUILD, c->GetName());
+		MessageString(Chat::LightGray, NOT_IN_A_GUILD, c->GetName());
 		return;
 	}
 
@@ -7870,21 +7920,21 @@ void Client::Handle_OP_GuildStatus(const EQApplicationPacket *app)
 	if ((TargetGuildID == GuildID()) && (c != this))
 	{
 		if (IsLeader)
-			Message_StringID(clientMessageWhite, LEADER_OF_YOUR_GUILD, c->GetName());
+			MessageString(Chat::LightGray, LEADER_OF_YOUR_GUILD, c->GetName());
 		else if (IsOfficer)
-			Message_StringID(clientMessageWhite, OFFICER_OF_YOUR_GUILD, c->GetName());
+			MessageString(Chat::LightGray, OFFICER_OF_YOUR_GUILD, c->GetName());
 		else
-			Message_StringID(clientMessageWhite, MEMBER_OF_YOUR_GUILD, c->GetName());
+			MessageString(Chat::LightGray, MEMBER_OF_YOUR_GUILD, c->GetName());
 
 		return;
 	}
 
 	if (IsLeader)
-		Message_StringID(clientMessageWhite, LEADER_OF_X_GUILD, c->GetName(), GuildName);
+		MessageString(Chat::LightGray, LEADER_OF_X_GUILD, c->GetName(), GuildName);
 	else if (IsOfficer)
-		Message_StringID(clientMessageWhite, OFFICER_OF_X_GUILD, c->GetName(), GuildName);
+		MessageString(Chat::LightGray, OFFICER_OF_X_GUILD, c->GetName(), GuildName);
 	else
-		Message_StringID(clientMessageWhite, MEMBER_OF_X_GUILD, c->GetName(), GuildName);
+		MessageString(Chat::LightGray, MEMBER_OF_X_GUILD, c->GetName(), GuildName);
 }
 
 void Client::Handle_OP_GuildUpdateURLAndChannel(const EQApplicationPacket *app)
@@ -7906,7 +7956,7 @@ void Client::Handle_OP_GuildUpdateURLAndChannel(const EQApplicationPacket *app)
 
 	if (!guild_mgr.IsGuildLeader(GuildID(), CharacterID()))
 	{
-		Message(13, "Only the guild leader can change the Channel or URL.!");
+		Message(Chat::Red, "Only the guild leader can change the Channel or URL.!");
 		return;
 	}
 
@@ -7945,7 +7995,7 @@ void Client::Handle_OP_Hide(const EQApplicationPacket *app)
 	}
 
 	if (!p_timers.Expired(&database, pTimerHide, false)) {
-		Message(13, "Ability recovery time not yet met.");
+		Message(Chat::Red, "Ability recovery time not yet met.");
 		return;
 	}
 	int reuse = HideReuseTime - GetSkillReuseTime(EQEmu::skills::SkillHide);
@@ -8151,7 +8201,7 @@ void Client::Handle_OP_InstillDoubt(const EQApplicationPacket *app)
 	//packet is empty as of 12/14/04
 
 	if (!p_timers.Expired(&database, pTimerInstillDoubt, false)) {
-		Message(13, "Ability recovery time not yet met.");
+		Message(Chat::Red, "Ability recovery time not yet met.");
 		return;
 	}
 	p_timers.Start(pTimerInstillDoubt, InstillDoubtReuseTime - 1);
@@ -8177,7 +8227,7 @@ void Client::Handle_OP_ItemLinkClick(const EQApplicationPacket *app)
 	const EQEmu::ItemData *item = database.GetItem(ivrs->item_id);
 	if (!item) {
 		if (ivrs->item_id != SAYLINK_ITEM_ID) {
-			Message(13, "Error: The item for the link you have clicked on does not exist!");
+			Message(Chat::Red, "Error: The item for the link you have clicked on does not exist!");
 			return;
 		}
 		// This new scheme will shuttle the ID in the first augment for non-silent links
@@ -8190,12 +8240,12 @@ void Client::Handle_OP_ItemLinkClick(const EQApplicationPacket *app)
 			std::string query = StringFormat("SELECT `phrase` FROM saylink WHERE `id` = '%i'", sayid);
 			auto results = database.QueryDatabase(query);
 			if (!results.Success()) {
-				Message(13, "Error: The saylink (%s) was not found in the database.", response.c_str());
+				Message(Chat::Red, "Error: The saylink (%s) was not found in the database.", response.c_str());
 				return;
 			}
 
 			if (results.RowCount() != 1) {
-				Message(13, "Error: The saylink (%s) was not found in the database.", response.c_str());
+				Message(Chat::Red, "Error: The saylink (%s) was not found in the database.", response.c_str());
 				return;
 			}
 
@@ -8214,7 +8264,7 @@ void Client::Handle_OP_ItemLinkClick(const EQApplicationPacket *app)
 					parse->EventPlayer(EVENT_SAY, this, response.c_str(), 0);
 				}
 				else {
-					Message(7, "You say, '%s'", response.c_str());
+					Message(Chat::LightGray, "You say, '%s'", response.c_str());
 					ChannelMessageReceived(8, 0, 100, response.c_str());
 				}
 				return;
@@ -8224,14 +8274,14 @@ void Client::Handle_OP_ItemLinkClick(const EQApplicationPacket *app)
 					parse->EventPlayer(EVENT_SAY, this, response.c_str(), 0);
 				}
 				else {
-					Message(7, "You say, '%s'", response.c_str());
+					Message(Chat::LightGray, "You say, '%s'", response.c_str());
 					ChannelMessageReceived(8, 0, 100, response.c_str());
 				}
 				return;
 			}
 		}
 		else {
-			Message(13, "Error: Say Link not found or is too long.");
+			Message(Chat::Red, "Error: Say Link not found or is too long.");
 			return;
 		}
 	}
@@ -8487,7 +8537,7 @@ void Client::Handle_OP_ItemVerifyRequest(const EQApplicationPacket *app)
 
 
 	if (IsAIControlled()) {
-		this->Message_StringID(13, NOT_IN_CONTROL);
+		this->MessageString(Chat::Red, NOT_IN_CONTROL);
 		return;
 	}
 
@@ -8596,7 +8646,7 @@ void Client::Handle_OP_ItemVerifyRequest(const EQApplicationPacket *app)
 				if (inst->GetCharges() == 0)
 				{
 					//Message(0, "This item is out of charges.");
-					Message_StringID(13, ITEM_OUT_OF_CHARGES);
+					MessageString(Chat::Red, ITEM_OUT_OF_CHARGES);
 					return;
 				}
 				if (GetLevel() >= item->Click.Level2)
@@ -8616,7 +8666,7 @@ void Client::Handle_OP_ItemVerifyRequest(const EQApplicationPacket *app)
 				}
 				else
 				{
-					Message_StringID(13, ITEMS_INSUFFICIENT_LEVEL);
+					MessageString(Chat::Red, ITEMS_INSUFFICIENT_LEVEL);
 					return;
 				}
 			}
@@ -8625,7 +8675,7 @@ void Client::Handle_OP_ItemVerifyRequest(const EQApplicationPacket *app)
 				if (clickaug->GetCharges() == 0)
 				{
 					//Message(0, "This item is out of charges.");
-					Message_StringID(13, ITEM_OUT_OF_CHARGES);
+					MessageString(Chat::Red, ITEM_OUT_OF_CHARGES);
 					return;
 				}
 				if (GetLevel() >= augitem->Click.Level2)
@@ -8645,7 +8695,7 @@ void Client::Handle_OP_ItemVerifyRequest(const EQApplicationPacket *app)
 				}
 				else
 				{
-					Message_StringID(13, ITEMS_INSUFFICIENT_LEVEL);
+					MessageString(Chat::Red, ITEMS_INSUFFICIENT_LEVEL);
 					return;
 				}
 			}
@@ -8677,7 +8727,7 @@ void Client::Handle_OP_ItemVerifyRequest(const EQApplicationPacket *app)
 #endif
 							// This Seems to be handled in OP_DeleteItem handling
 							//DeleteItemInInventory(slot_id, 1, false);
-							//entity_list.MessageClose_StringID(this, true, 50, 0, DRINKING_MESSAGE, GetName(), item->Name);
+							//entity_list.MessageCloseString(this, true, 50, 0, DRINKING_MESSAGE, GetName(), item->Name);
 							//Should add intoxication level to the PP at some point
 							//CheckIncreaseSkill(ALCOHOL_TOLERANCE, nullptr, 25);
 						}
@@ -8779,13 +8829,13 @@ void Client::Handle_OP_LDoNDisarmTraps(const EQApplicationPacket *app)
 		{
 			if (DistanceSquaredNoZ(m_Position, target->GetPosition()) > RuleI(Adventure, LDoNTrapDistanceUse))
 			{
-				Message(13, "%s is too far away.", target->GetCleanName());
+				Message(Chat::Red, "%s is too far away.", target->GetCleanName());
 				return;
 			}
 			HandleLDoNDisarm(target->CastToNPC(), GetSkill(EQEmu::skills::SkillDisarmTraps), LDoNTypeMechanical);
 		}
 		else
-			Message(13, "You do not have the disarm trap skill.");
+			Message(Chat::Red, "You do not have the disarm trap skill.");
 	}
 }
 
@@ -8793,7 +8843,7 @@ void Client::Handle_OP_LDoNInspect(const EQApplicationPacket *app)
 {
 	Mob * target = GetTarget();
 	if (target && target->GetClass() == LDON_TREASURE)
-		Message(15, "%s", target->GetCleanName());
+		Message(Chat::Yellow, "%s", target->GetCleanName());
 }
 
 void Client::Handle_OP_LDoNOpen(const EQApplicationPacket *app)
@@ -8812,13 +8862,13 @@ void Client::Handle_OP_LDoNPickLock(const EQApplicationPacket *app)
 		{
 			if (DistanceSquaredNoZ(m_Position, target->GetPosition()) > RuleI(Adventure, LDoNTrapDistanceUse))
 			{
-				Message(13, "%s is too far away.", target->GetCleanName());
+				Message(Chat::Red, "%s is too far away.", target->GetCleanName());
 				return;
 			}
 			HandleLDoNPickLock(target->CastToNPC(), GetSkill(EQEmu::skills::SkillPickLock), LDoNTypeMechanical);
 		}
 		else
-			Message(13, "You do not have the pick locks skill.");
+			Message(Chat::Red, "You do not have the pick locks skill.");
 	}
 }
 
@@ -8831,13 +8881,13 @@ void Client::Handle_OP_LDoNSenseTraps(const EQApplicationPacket *app)
 		{
 			if (DistanceSquaredNoZ(m_Position, target->GetPosition()) > RuleI(Adventure, LDoNTrapDistanceUse))
 			{
-				Message(13, "%s is too far away.", target->GetCleanName());
+				Message(Chat::Red, "%s is too far away.", target->GetCleanName());
 				return;
 			}
 			HandleLDoNSenseTraps(target->CastToNPC(), GetSkill(EQEmu::skills::SkillSenseTraps), LDoNTypeMechanical);
 		}
 		else
-			Message(13, "You do not have the sense traps skill.");
+			Message(Chat::Red, "You do not have the sense traps skill.");
 	}
 }
 
@@ -8852,12 +8902,12 @@ void Client::Handle_OP_LeadershipExpToggle(const EQApplicationPacket *app)
 	if (*mode) {
 		m_pp.leadAAActive = 1;
 		Save();
-		Message_StringID(clientMessageYellow, LEADERSHIP_EXP_ON);
+		MessageString(Chat::Yellow, LEADERSHIP_EXP_ON);
 	}
 	else {
 		m_pp.leadAAActive = 0;
 		Save();
-		Message_StringID(clientMessageYellow, LEADERSHIP_EXP_OFF);
+		MessageString(Chat::Yellow, LEADERSHIP_EXP_OFF);
 	}
 }
 
@@ -9216,7 +9266,7 @@ void Client::Handle_OP_LootItem(const EQApplicationPacket *app)
 	EQApplicationPacket* outapp = nullptr;
 	Entity* entity = entity_list.GetID(*((uint16*)app->pBuffer));
 	if (entity == 0) {
-		Message(13, "Error: OP_LootItem: Corpse not found (ent = 0)");
+		Message(Chat::Red, "Error: OP_LootItem: Corpse not found (ent = 0)");
 		outapp = new EQApplicationPacket(OP_LootComplete, 0);
 		QueuePacket(outapp);
 		safe_delete(outapp);
@@ -9228,7 +9278,7 @@ void Client::Handle_OP_LootItem(const EQApplicationPacket *app)
 		return;
 	}
 	else {
-		Message(13, "Error: Corpse not found! (!ent->IsCorpse())");
+		Message(Chat::Red, "Error: Corpse not found! (!ent->IsCorpse())");
 		Corpse::SendEndLootErrorPacket(this);
 	}
 
@@ -9244,7 +9294,7 @@ void Client::Handle_OP_LootRequest(const EQApplicationPacket *app)
 
 	Entity* ent = entity_list.GetID(*((uint32*)app->pBuffer));
 	if (ent == 0) {
-		Message(13, "Error: OP_LootRequest: Corpse not found (ent = 0)");
+		Message(Chat::Red, "Error: OP_LootRequest: Corpse not found (ent = 0)");
 		Corpse::SendLootReqErrorPacket(this);
 		return;
 	}
@@ -9257,7 +9307,7 @@ void Client::Handle_OP_LootRequest(const EQApplicationPacket *app)
 	}
 	else {
 		std::cout << "npc == 0 LOOTING FOOKED3" << std::endl;
-		Message(13, "Error: OP_LootRequest: Corpse not a corpse?");
+		Message(Chat::Red, "Error: OP_LootRequest: Corpse not a corpse?");
 		Corpse::SendLootReqErrorPacket(this);
 	}
 	return;
@@ -9309,7 +9359,7 @@ void Client::Handle_OP_Mend(const EQApplicationPacket *app)
 		return;
 
 	if (!p_timers.Expired(&database, pTimerMend, false)) {
-		Message(13, "Ability recovery time not yet met.");
+		Message(Chat::Red, "Ability recovery time not yet met.");
 		return;
 	}
 	p_timers.Start(pTimerMend, MendReuseTime - 1);
@@ -9322,11 +9372,11 @@ void Client::Handle_OP_Mend(const EQApplicationPacket *app)
 
 		if (zone->random.Int(0, 99) < criticalchance) {
 			mendhp *= 2;
-			Message_StringID(4, MEND_CRITICAL);
+			MessageString(Chat::LightBlue, MEND_CRITICAL);
 		}
 		SetHP(GetHP() + mendhp);
 		SendHPUpdate();
-		Message_StringID(4, MEND_SUCCESS);
+		MessageString(Chat::LightBlue, MEND_SUCCESS);
 	}
 	else {
 		/* the purpose of the following is to make the chance to worsen wounds much less common,
@@ -9339,10 +9389,10 @@ void Client::Handle_OP_Mend(const EQApplicationPacket *app)
 		{
 			SetHP(currenthp > mendhp ? (GetHP() - mendhp) : 1);
 			SendHPUpdate();
-			Message_StringID(4, MEND_WORSEN);
+			MessageString(Chat::LightBlue, MEND_WORSEN);
 		}
 		else
-			Message_StringID(4, MEND_FAIL);
+			MessageString(Chat::LightBlue, MEND_FAIL);
 	}
 
 	CheckIncreaseSkill(EQEmu::skills::SkillMend, nullptr, 10);
@@ -9353,7 +9403,7 @@ void Client::Handle_OP_MercenaryCommand(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(MercenaryCommand_Struct))
 	{
-		Message(13, "Size mismatch in OP_MercenaryCommand expected %i got %i", sizeof(MercenaryCommand_Struct), app->size);
+		Message(Chat::Red, "Size mismatch in OP_MercenaryCommand expected %i got %i", sizeof(MercenaryCommand_Struct), app->size);
 		Log(Logs::General, Logs::None, "Size mismatch in OP_MercenaryCommand expected %i got %i", sizeof(MercenaryCommand_Struct), app->size);
 		DumpPacket(app);
 		return;
@@ -9540,7 +9590,7 @@ void Client::Handle_OP_MercenaryDataUpdateRequest(const EQApplicationPacket *app
 	// The payload is 0 bytes.
 	if (app->size != 0)
 	{
-		Message(13, "Size mismatch in OP_MercenaryDataUpdateRequest expected 0 got %i", app->size);
+		Message(Chat::Red, "Size mismatch in OP_MercenaryDataUpdateRequest expected 0 got %i", app->size);
 		Log(Logs::General, Logs::None, "Size mismatch in OP_MercenaryDataUpdateRequest expected 0 got %i", app->size);
 		DumpPacket(app);
 		return;
@@ -9559,7 +9609,7 @@ void Client::Handle_OP_MercenaryDismiss(const EQApplicationPacket *app)
 	// The payload is 0 or 1 bytes.
 	if (app->size > 1)
 	{
-		Message(13, "Size mismatch in OP_MercenaryDismiss expected 0 got %i", app->size);
+		Message(Chat::Red, "Size mismatch in OP_MercenaryDismiss expected 0 got %i", app->size);
 		Log(Logs::General, Logs::None, "Size mismatch in OP_MercenaryDismiss expected 0 got %i", app->size);
 		DumpPacket(app);
 		return;
@@ -9654,7 +9704,7 @@ void Client::Handle_OP_MercenarySuspendRequest(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(SuspendMercenary_Struct))
 	{
-		Message(13, "Size mismatch in OP_MercenarySuspendRequest expected %i got %i", sizeof(SuspendMercenary_Struct), app->size);
+		Message(Chat::Red, "Size mismatch in OP_MercenarySuspendRequest expected %i got %i", sizeof(SuspendMercenary_Struct), app->size);
 		Log(Logs::General, Logs::None, "Size mismatch in OP_MercenarySuspendRequest expected %i got %i", sizeof(SuspendMercenary_Struct), app->size);
 		DumpPacket(app);
 		return;
@@ -9677,7 +9727,7 @@ void Client::Handle_OP_MercenaryTimerRequest(const EQApplicationPacket *app)
 	// The payload is 0 bytes.
 	if (app->size > 1)
 	{
-		Message(13, "Size mismatch in OP_MercenaryTimerRequest expected 0 got %i", app->size);
+		Message(Chat::Red, "Size mismatch in OP_MercenaryTimerRequest expected 0 got %i", app->size);
 		Log(Logs::General, Logs::None, "Size mismatch in OP_MercenaryTimerRequest expected 0 got %i", app->size);
 		DumpPacket(app);
 		return;
@@ -9751,7 +9801,7 @@ void Client::Handle_OP_MoveItem(const EQApplicationPacket *app)
 				casting_spell_id);
 			database.SetMQDetectionFlag(AccountName(), GetName(), detect, zone->GetShortName());
 			safe_delete_array(detect);
-			Kick(); // Kick client to prevent client and server from getting out-of-sync inventory slots
+			Kick("Inventory desync"); // Kick client to prevent client and server from getting out-of-sync inventory slots
 			return;
 		}
 	}
@@ -9779,7 +9829,7 @@ void Client::Handle_OP_MoveItem(const EQApplicationPacket *app)
 		}
 	}
 
-	if (mi_hack) { Message(15, "Caution: Illegal use of inaccessible bag slots!"); }
+	if (mi_hack) { Message(Chat::Yellow, "Caution: Illegal use of inaccessible bag slots!"); }
 
 	if (!SwapItem(mi) && IsValidSlot(mi->from_slot) && IsValidSlot(mi->to_slot)) {
 		SwapItemResync(mi);
@@ -9795,7 +9845,7 @@ void Client::Handle_OP_MoveItem(const EQApplicationPacket *app)
 
 void Client::Handle_OP_MoveMultipleItems(const EQApplicationPacket *app)
 {
-	Kick(); // TODO: lets not desync though
+	Kick("Unimplemented move multiple items"); // TODO: lets not desync though
 }
 
 void Client::Handle_OP_OpenContainer(const EQApplicationPacket *app)
@@ -9880,9 +9930,9 @@ void Client::Handle_OP_PDeletePetition(const EQApplicationPacket *app)
 		return;
 	}
 	if (petition_list.DeletePetitionByCharName((char*)app->pBuffer))
-		Message_StringID(0, PETITION_DELETED);
+		MessageString(Chat::White, PETITION_DELETED);
 	else
-		Message_StringID(0, PETITION_NO_DELETE);
+		MessageString(Chat::White, PETITION_NO_DELETE);
 	return;
 }
 
@@ -9903,11 +9953,11 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 			if (target) {
 				auto owner = target->GetOwner();
 				if (owner)
-					target->Say_StringID(PET_LEADERIS, owner->GetCleanName());
+					target->SayString(PET_LEADERIS, owner->GetCleanName());
 				else
-					target->Say_StringID(I_FOLLOW_NOONE);
+					target->SayString(I_FOLLOW_NOONE);
 			} else if (mypet) {
-				mypet->Say_StringID(PET_LEADERIS, GetName());
+				mypet->SayString(PET_LEADERIS, GetName());
 			}
 		}
 
@@ -9939,14 +9989,14 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 		if (!target)
 			break;
 		if (target->IsMezzed()) {
-			Message_StringID(10, CANNOT_WAKE, mypet->GetCleanName(), target->GetCleanName());
+			MessageString(Chat::NPCQuestSay, CANNOT_WAKE, mypet->GetCleanName(), target->GetCleanName());
 			break;
 		}
 		if (mypet->IsFeared())
 			break; //prevent pet from attacking stuff while feared
 
 		if (!mypet->IsAttackAllowed(target)) {
-			mypet->SayTo_StringID(this, NOT_LEGAL_TARGET);
+			mypet->SayString(this, NOT_LEGAL_TARGET);
 			break;
 		}
 
@@ -9977,7 +10027,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 						hate += mypet->GetHateAmount(top) - mypet->GetHateAmount(target) + 100; // should be enough to cause target change
 				}
 				mypet->AddToHateList(target, hate, 0, true, false, false, SPELL_UNKNOWN, true);
-				Message_StringID(MT_PetResponse, PET_ATTACKING, mypet->GetCleanName(), target->GetCleanName());
+				MessageString(Chat::PetResponse, PET_ATTACKING, mypet->GetCleanName(), target->GetCleanName());
 				SetTarget(target);
 			}
 		}
@@ -9990,12 +10040,12 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 		if (!GetTarget())
 			break;
 		if (GetTarget()->IsMezzed()) {
-			Message_StringID(10, CANNOT_WAKE, mypet->GetCleanName(), GetTarget()->GetCleanName());
+			MessageString(Chat::NPCQuestSay, CANNOT_WAKE, mypet->GetCleanName(), GetTarget()->GetCleanName());
 			break;
 		}
 
 		if (!mypet->IsAttackAllowed(GetTarget())) {
-			mypet->SayTo_StringID(this, NOT_LEGAL_TARGET);
+			mypet->SayString(this, NOT_LEGAL_TARGET);
 			break;
 		}
 
@@ -10011,7 +10061,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 				}
 				zone->AddAggroMob();
 				mypet->AddToHateList(GetTarget(), 1, 0, true, false, false, SPELL_UNKNOWN, true);
-				Message_StringID(MT_PetResponse, PET_ATTACKING, mypet->GetCleanName(), GetTarget()->GetCleanName());
+				MessageString(Chat::PetResponse, PET_ATTACKING, mypet->GetCleanName(), GetTarget()->GetCleanName());
 			}
 		}
 		break;
@@ -10020,7 +10070,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 		if (mypet->IsFeared()) break; //keeps pet running while feared
 
 		if ((mypet->GetPetType() == petAnimation && aabonuses.PetCommands[PetCommand]) || mypet->GetPetType() != petAnimation) {
-			mypet->SayTo_StringID(this, MT_PetResponse, PET_CALMING);
+			mypet->SayString(this, Chat::PetResponse, PET_CALMING);
 			mypet->WipeHateList();
 			mypet->SetTarget(nullptr);
 			if (mypet->IsPetStop()) {
@@ -10032,7 +10082,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 	}
 	case PET_HEALTHREPORT: {
 		if ((mypet->GetPetType() == petAnimation && aabonuses.PetCommands[PetCommand]) || mypet->GetPetType() != petAnimation) {
-			Message_StringID(MT_PetResponse, PET_REPORT_HP, ConvertArrayF(mypet->GetHPRatio(), val1));
+			MessageString(Chat::PetResponse, PET_REPORT_HP, ConvertArrayF(mypet->GetHPRatio(), val1));
 			mypet->ShowBuffList(this);
 		}
 		break;
@@ -10051,13 +10101,13 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 			SetPet(nullptr);
 		}
 
-		mypet->SayTo_StringID(this, MT_PetResponse, PET_GETLOST_STRING);
+		mypet->SayString(this, Chat::PetResponse, PET_GETLOST_STRING);
 		mypet->CastToNPC()->Depop();
 
 		//Oddly, the client (Titanium) will still allow "/pet get lost" command despite me adding the code below. If someone can figure that out, you can uncomment this code and use it.
 		/*
 		if((mypet->GetPetType() == petAnimation && GetAA(aaAnimationEmpathy) >= 2) || mypet->GetPetType() != petAnimation) {
-		mypet->Say_StringID(PET_GETLOST_STRING);
+		mypet->SayString(PET_GETLOST_STRING);
 		mypet->CastToNPC()->Depop();
 		}
 		*/
@@ -10069,7 +10119,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 
 		if ((mypet->GetPetType() == petAnimation && aabonuses.PetCommands[PetCommand]) || mypet->GetPetType() != petAnimation) {
 			if (mypet->IsNPC()) {
-				mypet->SayTo_StringID(this, MT_PetResponse, PET_GUARDINGLIFE);
+				mypet->SayString(this, Chat::PetResponse, PET_GUARDINGLIFE);
 				mypet->SetPetOrder(SPO_Guard);
 				mypet->CastToNPC()->SaveGuardSpot(mypet->GetPosition());
 				if (!mypet->GetTarget()) // want them to not twitch if they're chasing something down
@@ -10086,7 +10136,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 		if (mypet->IsFeared()) break; //could be exploited like PET_BACKOFF
 
 		if ((mypet->GetPetType() == petAnimation && aabonuses.PetCommands[PetCommand]) || mypet->GetPetType() != petAnimation) {
-			mypet->SayTo_StringID(this, MT_PetResponse, PET_FOLLOWING);
+			mypet->SayString(this, Chat::PetResponse, PET_FOLLOWING);
 			mypet->SetPetOrder(SPO_Follow);
 			mypet->SendAppearancePacket(AT_Anim, ANIM_STAND);
 			if (mypet->IsPetStop()) {
@@ -10100,12 +10150,12 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 		if ((mypet->GetPetType() == petAnimation && aabonuses.PetCommands[PetCommand]) || mypet->GetPetType() != petAnimation) {
 			if (mypet->CastToNPC()->IsTaunting())
 			{
-				Message_StringID(MT_PetResponse, PET_NO_TAUNT);
+				MessageString(Chat::PetResponse, PET_NO_TAUNT);
 				mypet->CastToNPC()->SetTaunting(false);
 			}
 			else
 			{
-				Message_StringID(MT_PetResponse, PET_DO_TAUNT);
+				MessageString(Chat::PetResponse, PET_DO_TAUNT);
 				mypet->CastToNPC()->SetTaunting(true);
 			}
 		}
@@ -10113,14 +10163,14 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 	}
 	case PET_TAUNT_ON: {
 		if ((mypet->GetPetType() == petAnimation && aabonuses.PetCommands[PetCommand]) || mypet->GetPetType() != petAnimation) {
-			Message_StringID(MT_PetResponse, PET_DO_TAUNT);
+			MessageString(Chat::PetResponse, PET_DO_TAUNT);
 			mypet->CastToNPC()->SetTaunting(true);
 		}
 		break;
 	}
 	case PET_TAUNT_OFF: {
 		if ((mypet->GetPetType() == petAnimation && aabonuses.PetCommands[PetCommand]) || mypet->GetPetType() != petAnimation) {
-			Message_StringID(MT_PetResponse, PET_NO_TAUNT);
+			MessageString(Chat::PetResponse, PET_NO_TAUNT);
 			mypet->CastToNPC()->SetTaunting(false);
 		}
 		break;
@@ -10129,7 +10179,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 		if (mypet->IsFeared()) break; //could be exploited like PET_BACKOFF
 
 		if ((mypet->GetPetType() == petAnimation && aabonuses.PetCommands[PetCommand]) || mypet->GetPetType() != petAnimation) {
-			mypet->SayTo_StringID(this, MT_PetResponse, PET_GUARDME_STRING);
+			mypet->SayString(this, Chat::PetResponse, PET_GUARDME_STRING);
 			mypet->SetPetOrder(SPO_Follow);
 			mypet->SendAppearancePacket(AT_Anim, ANIM_STAND);
 			if (mypet->IsPetStop()) {
@@ -10145,13 +10195,13 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 		if ((mypet->GetPetType() == petAnimation && aabonuses.PetCommands[PetCommand]) || mypet->GetPetType() != petAnimation) {
 			if (mypet->GetPetOrder() == SPO_Sit)
 			{
-				mypet->SayTo_StringID(this, MT_PetResponse, PET_SIT_STRING);
+				mypet->SayString(this, Chat::PetResponse, PET_SIT_STRING);
 				mypet->SetPetOrder(SPO_Follow);
 				mypet->SendAppearancePacket(AT_Anim, ANIM_STAND);
 			}
 			else
 			{
-				mypet->SayTo_StringID(this, MT_PetResponse, PET_SIT_STRING);
+				mypet->SayString(this, Chat::PetResponse, PET_SIT_STRING);
 				mypet->SetPetOrder(SPO_Sit);
 				mypet->SetRunAnimSpeed(0);
 				if (!mypet->UseBardSpellLogic())	//maybe we can have a bard pet
@@ -10165,7 +10215,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 		if (mypet->IsFeared()) break; //could be exploited like PET_BACKOFF
 
 		if ((mypet->GetPetType() == petAnimation && aabonuses.PetCommands[PetCommand]) || mypet->GetPetType() != petAnimation) {
-			mypet->SayTo_StringID(this, MT_PetResponse, PET_SIT_STRING);
+			mypet->SayString(this, Chat::PetResponse, PET_SIT_STRING);
 			mypet->SetPetOrder(SPO_Follow);
 			mypet->SendAppearancePacket(AT_Anim, ANIM_STAND);
 		}
@@ -10175,7 +10225,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 		if (mypet->IsFeared()) break; //could be exploited like PET_BACKOFF
 
 		if ((mypet->GetPetType() == petAnimation && aabonuses.PetCommands[PetCommand]) || mypet->GetPetType() != petAnimation) {
-			mypet->SayTo_StringID(this, MT_PetResponse, PET_SIT_STRING);
+			mypet->SayString(this, Chat::PetResponse, PET_SIT_STRING);
 			mypet->SetPetOrder(SPO_Sit);
 			mypet->SetRunAnimSpeed(0);
 			if (!mypet->UseBardSpellLogic())	//maybe we can have a bard pet
@@ -10189,18 +10239,18 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 			if (mypet->IsHeld())
 			{
 				if (m_ClientVersionBit & EQEmu::versions::maskSoDAndLater)
-					Message_StringID(MT_PetResponse, PET_HOLD_SET_OFF);
+					MessageString(Chat::PetResponse, PET_HOLD_SET_OFF);
 				mypet->SetHeld(false);
 			}
 			else
 			{
 				if (m_ClientVersionBit & EQEmu::versions::maskSoDAndLater)
-					Message_StringID(MT_PetResponse, PET_HOLD_SET_ON);
+					MessageString(Chat::PetResponse, PET_HOLD_SET_ON);
 
 				if (m_ClientVersionBit & EQEmu::versions::maskUFAndLater)
-					mypet->SayTo_StringID(this, MT_PetResponse, PET_NOW_HOLDING);
+					mypet->SayString(this, Chat::PetResponse, PET_NOW_HOLDING);
 				else
-					mypet->SayTo_StringID(this, MT_PetResponse, PET_ON_HOLD);
+					mypet->SayString(this, Chat::PetResponse, PET_ON_HOLD);
 
 				mypet->SetHeld(true);
 			}
@@ -10212,12 +10262,12 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 	case PET_HOLD_ON: {
 		if (aabonuses.PetCommands[PetCommand] && mypet->IsNPC() && !mypet->IsHeld()) {
 			if (m_ClientVersionBit & EQEmu::versions::maskSoDAndLater)
-				Message_StringID(MT_PetResponse, PET_HOLD_SET_ON);
+				MessageString(Chat::PetResponse, PET_HOLD_SET_ON);
 
 			if (m_ClientVersionBit & EQEmu::versions::maskUFAndLater)
-				mypet->SayTo_StringID(this, MT_PetResponse, PET_NOW_HOLDING);
+				mypet->SayString(this, Chat::PetResponse, PET_NOW_HOLDING);
 			else
-				mypet->SayTo_StringID(this, MT_PetResponse, PET_ON_HOLD);
+				mypet->SayString(this, Chat::PetResponse, PET_ON_HOLD);
 			mypet->SetHeld(true);
 			mypet->SetGHeld(false);
 			SetPetCommandState(PET_BUTTON_GHOLD, 0);
@@ -10227,7 +10277,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 	case PET_HOLD_OFF: {
 		if (aabonuses.PetCommands[PetCommand] && mypet->IsNPC() && mypet->IsHeld()) {
 			if (m_ClientVersionBit & EQEmu::versions::maskSoDAndLater)
-				Message_StringID(MT_PetResponse, PET_HOLD_SET_OFF);
+				MessageString(Chat::PetResponse, PET_HOLD_SET_OFF);
 			mypet->SetHeld(false);
 		}
 		break;
@@ -10237,16 +10287,16 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 			if (mypet->IsGHeld())
 			{
 				if (m_ClientVersionBit & EQEmu::versions::maskUFAndLater)
-					Message_StringID(MT_PetResponse, PET_OFF_GHOLD);
+					MessageString(Chat::PetResponse, PET_OFF_GHOLD);
 				mypet->SetGHeld(false);
 			}
 			else
 			{
 				if (m_ClientVersionBit & EQEmu::versions::maskUFAndLater) {
-					Message_StringID(MT_PetResponse, PET_ON_GHOLD);
-					mypet->SayTo_StringID(this, MT_PetResponse, PET_GHOLD_ON_MSG);
+					MessageString(Chat::PetResponse, PET_ON_GHOLD);
+					mypet->SayString(this, Chat::PetResponse, PET_GHOLD_ON_MSG);
 				} else {
-					mypet->SayTo_StringID(this, MT_PetResponse, PET_ON_HOLD);
+					mypet->SayString(this, Chat::PetResponse, PET_ON_HOLD);
 				}
 				mypet->SetGHeld(true);
 			}
@@ -10258,10 +10308,10 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 	case PET_GHOLD_ON: {
 		if (aabonuses.PetCommands[PetCommand] && mypet->IsNPC()) {
 			if (m_ClientVersionBit & EQEmu::versions::maskUFAndLater) {
-				Message_StringID(MT_PetResponse, PET_ON_GHOLD);
-				mypet->SayTo_StringID(this, MT_PetResponse, PET_GHOLD_ON_MSG);
+				MessageString(Chat::PetResponse, PET_ON_GHOLD);
+				mypet->SayString(this, Chat::PetResponse, PET_GHOLD_ON_MSG);
 			} else {
-				mypet->SayTo_StringID(this, MT_PetResponse, PET_ON_HOLD);
+				mypet->SayString(this, Chat::PetResponse, PET_ON_HOLD);
 			}
 			mypet->SetGHeld(true);
 			mypet->SetHeld(false);
@@ -10272,7 +10322,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 	case PET_GHOLD_OFF: {
 		if (aabonuses.PetCommands[PetCommand] && mypet->IsNPC() && mypet->IsGHeld()) {
 			if (m_ClientVersionBit & EQEmu::versions::maskUFAndLater)
-				Message_StringID(MT_PetResponse, PET_OFF_GHOLD);
+				MessageString(Chat::PetResponse, PET_OFF_GHOLD);
 			mypet->SetGHeld(false);
 		}
 		break;
@@ -10282,15 +10332,15 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 			if (mypet->IsFeared())
 				break;
 			if (mypet->IsNoCast()) {
-				Message_StringID(MT_PetResponse, PET_CASTING);
+				MessageString(Chat::PetResponse, PET_CASTING);
 				if (m_ClientVersionBit & EQEmu::versions::maskSoDAndLater)
-					Message_StringID(MT_PetResponse, PET_SPELLHOLD_SET_OFF);
+					MessageString(Chat::PetResponse, PET_SPELLHOLD_SET_OFF);
 				mypet->SetNoCast(false);
 			}
 			else {
-				Message_StringID(MT_PetResponse, PET_NOT_CASTING);
+				MessageString(Chat::PetResponse, PET_NOT_CASTING);
 				if (m_ClientVersionBit & EQEmu::versions::maskSoDAndLater)
-					Message_StringID(MT_PetResponse, PET_SPELLHOLD_SET_ON);
+					MessageString(Chat::PetResponse, PET_SPELLHOLD_SET_ON);
 				mypet->SetNoCast(true);
 			}
 		}
@@ -10301,9 +10351,9 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 			if (mypet->IsFeared())
 				break;
 			if (!mypet->IsNoCast()) {
-				Message_StringID(MT_PetResponse, PET_NOT_CASTING);
+				MessageString(Chat::PetResponse, PET_NOT_CASTING);
 				if (m_ClientVersionBit & EQEmu::versions::maskSoDAndLater)
-					Message_StringID(MT_PetResponse, PET_SPELLHOLD_SET_ON);
+					MessageString(Chat::PetResponse, PET_SPELLHOLD_SET_ON);
 				mypet->SetNoCast(true);
 			}
 		}
@@ -10314,9 +10364,9 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 			if (mypet->IsFeared())
 				break;
 			if (mypet->IsNoCast()) {
-				Message_StringID(MT_PetResponse, PET_CASTING);
+				MessageString(Chat::PetResponse, PET_CASTING);
 				if (m_ClientVersionBit & EQEmu::versions::maskSoDAndLater)
-					Message_StringID(MT_PetResponse, PET_SPELLHOLD_SET_OFF);
+					MessageString(Chat::PetResponse, PET_SPELLHOLD_SET_OFF);
 				mypet->SetNoCast(false);
 			}
 		}
@@ -10327,15 +10377,15 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 			if (mypet->IsFeared())
 				break;
 			if (mypet->IsFocused()) {
-				Message_StringID(MT_PetResponse, PET_NOT_FOCUSING);
+				MessageString(Chat::PetResponse, PET_NOT_FOCUSING);
 				if (m_ClientVersionBit & EQEmu::versions::maskSoDAndLater)
-					Message_StringID(MT_PetResponse, PET_FOCUS_SET_OFF);
+					MessageString(Chat::PetResponse, PET_FOCUS_SET_OFF);
 				mypet->SetFocused(false);
 			}
 			else {
-				Message_StringID(MT_PetResponse, PET_NOW_FOCUSING);
+				MessageString(Chat::PetResponse, PET_NOW_FOCUSING);
 				if (m_ClientVersionBit & EQEmu::versions::maskSoDAndLater)
-					Message_StringID(MT_PetResponse, PET_FOCUS_SET_ON);
+					MessageString(Chat::PetResponse, PET_FOCUS_SET_ON);
 				mypet->SetFocused(true);
 			}
 		}
@@ -10346,9 +10396,9 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 			if (mypet->IsFeared())
 				break;
 			if (!mypet->IsFocused()) {
-				Message_StringID(MT_PetResponse, PET_NOW_FOCUSING);
+				MessageString(Chat::PetResponse, PET_NOW_FOCUSING);
 				if (m_ClientVersionBit & EQEmu::versions::maskSoDAndLater)
-					Message_StringID(MT_PetResponse, PET_FOCUS_SET_ON);
+					MessageString(Chat::PetResponse, PET_FOCUS_SET_ON);
 				mypet->SetFocused(true);
 			}
 		}
@@ -10359,9 +10409,9 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 			if (mypet->IsFeared())
 				break;
 			if (mypet->IsFocused()) {
-				Message_StringID(MT_PetResponse, PET_NOT_FOCUSING);
+				MessageString(Chat::PetResponse, PET_NOT_FOCUSING);
 				if (m_ClientVersionBit & EQEmu::versions::maskSoDAndLater)
-					Message_StringID(MT_PetResponse, PET_FOCUS_SET_OFF);
+					MessageString(Chat::PetResponse, PET_FOCUS_SET_OFF);
 				mypet->SetFocused(false);
 			}
 		}
@@ -10382,7 +10432,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 					SetPetCommandState(PET_BUTTON_REGROUP, 0);
 				}
 			}
-			mypet->SayTo_StringID(this, MT_PetResponse, PET_GETLOST_STRING);
+			mypet->SayString(this, Chat::PetResponse, PET_GETLOST_STRING);
 		}
 		break;
 	}
@@ -10393,7 +10443,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 			mypet->SetPetStop(true);
 			mypet->StopNavigation();
 			mypet->SetTarget(nullptr);
-			mypet->SayTo_StringID(this, MT_PetResponse, PET_GETLOST_STRING);
+			mypet->SayString(this, Chat::PetResponse, PET_GETLOST_STRING);
 			if (mypet->IsPetRegroup()) {
 				mypet->SetPetRegroup(false);
 				SetPetCommandState(PET_BUTTON_REGROUP, 0);
@@ -10406,7 +10456,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 
 		if ((mypet->GetPetType() == petAnimation && aabonuses.PetCommands[PetCommand]) || mypet->GetPetType() != petAnimation) {
 			mypet->SetPetStop(false);
-			mypet->SayTo_StringID(this, MT_PetResponse, PET_GETLOST_STRING);
+			mypet->SayString(this, Chat::PetResponse, PET_GETLOST_STRING);
 		}
 		break;
 	}
@@ -10416,11 +10466,11 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 		if (aabonuses.PetCommands[PetCommand]) {
 			if (mypet->IsPetRegroup()) {
 				mypet->SetPetRegroup(false);
-				mypet->SayTo_StringID(this, MT_PetResponse, PET_OFF_REGROUPING);
+				mypet->SayString(this, Chat::PetResponse, PET_OFF_REGROUPING);
 			} else {
 				mypet->SetPetRegroup(true);
 				mypet->SetTarget(nullptr);
-				mypet->SayTo_StringID(this, MT_PetResponse, PET_ON_REGROUPING);
+				mypet->SayString(this, Chat::PetResponse, PET_ON_REGROUPING);
 				if (mypet->IsPetStop()) {
 					mypet->SetPetStop(false);
 					SetPetCommandState(PET_BUTTON_STOP, 0);
@@ -10435,7 +10485,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 		if (aabonuses.PetCommands[PetCommand]) {
 			mypet->SetPetRegroup(true);
 			mypet->SetTarget(nullptr);
-			mypet->SayTo_StringID(this, MT_PetResponse, PET_ON_REGROUPING);
+			mypet->SayString(this, Chat::PetResponse, PET_ON_REGROUPING);
 			if (mypet->IsPetStop()) {
 				mypet->SetPetStop(false);
 				SetPetCommandState(PET_BUTTON_STOP, 0);
@@ -10448,7 +10498,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 
 		if (aabonuses.PetCommands[PetCommand]) {
 			mypet->SetPetRegroup(false);
-			mypet->SayTo_StringID(this, MT_PetResponse, PET_OFF_REGROUPING);
+			mypet->SayString(this, Chat::PetResponse, PET_OFF_REGROUPING);
 		}
 		break;
 	}
@@ -10656,7 +10706,7 @@ void Client::Handle_OP_PickPocket(const EQApplicationPacket *app)
 
 	if (!p_timers.Expired(&database, pTimerBeggingPickPocket, false))
 	{
-		Message(13, "Ability recovery time not yet met.");
+		Message(Chat::Red, "Ability recovery time not yet met.");
 		database.SetMQDetectionFlag(this->AccountName(), this->GetName(), "OP_PickPocket was sent again too quickly.", zone->GetShortName());
 		return;
 	}
@@ -10743,7 +10793,7 @@ void Client::Handle_OP_PopupResponse(const EQApplicationPacket *app)
 
 		case EQEmu::popupresponse::MOB_INFO_DISMISS:
 			this->SetDisplayMobInfoWindow(false);
-			this->Message(15, "[DevTools] Window snoozed in this zone...");
+			this->Message(Chat::Yellow, "[DevTools] Window snoozed in this zone...");
 			break;
 		default:
 			break;
@@ -10805,13 +10855,13 @@ void Client::Handle_OP_PurchaseLeadershipAA(const EQApplicationPacket *app)
 
 	uint32 current_rank = m_pp.leader_abilities.ranks[aaid];
 	if (current_rank >= MAX_LEADERSHIP_TIERS) {
-		Message(13, "This ability can be trained no further.");
+		Message(Chat::Red, "This ability can be trained no further.");
 		return;
 	}
 
 	uint8 cost = LeadershipAACosts[aaid][current_rank];
 	if (cost == 0) {
-		Message(13, "This ability can be trained no further.");
+		Message(Chat::Red, "This ability can be trained no further.");
 		return;
 	}
 
@@ -10820,7 +10870,7 @@ void Client::Handle_OP_PurchaseLeadershipAA(const EQApplicationPacket *app)
 	if (aaid >= raidAAMarkNPC) {
 		//it is a raid ability.
 		if (cost > m_pp.raid_leadership_points) {
-			Message(13, "You do not have enough points to purchase this ability.");
+			Message(Chat::Red, "You do not have enough points to purchase this ability.");
 			return;
 		}
 
@@ -10833,7 +10883,7 @@ void Client::Handle_OP_PurchaseLeadershipAA(const EQApplicationPacket *app)
 	else {
 		//it is a group ability.
 		if (cost > m_pp.group_leadership_points) {
-			Message(13, "You do not have enough points to purchase this ability.");
+			Message(Chat::Red, "You do not have enough points to purchase this ability.");
 			return;
 		}
 
@@ -11032,12 +11082,12 @@ void Client::Handle_OP_RaidCommand(const EQApplicationPacket *app)
 			Group *player_to_invite_group = player_to_invite->GetGroup();
 			
 			if (player_to_invite->HasRaid()) {
-				Message(13, "%s is already in a raid.", player_to_invite->GetName());
+				Message(Chat::Red, "%s is already in a raid.", player_to_invite->GetName());
 				break;
 			}
 
 			if (player_to_invite_group && !player_to_invite_group->IsLeader(player_to_invite)) {
-				Message(13, "You can only invite an ungrouped player or group leader to join your raid.");
+				Message(Chat::Red, "You can only invite an ungrouped player or group leader to join your raid.");
 				break;
 			}
 			
@@ -11061,7 +11111,7 @@ void Client::Handle_OP_RaidCommand(const EQApplicationPacket *app)
 			Client *player_accepting_invite = entity_list.GetClientByName(raid_command_packet->player_name);
 			if (player_accepting_invite) {
 				if (IsRaidGrouped()) {
-					player_accepting_invite->Message_StringID(0, ALREADY_IN_RAID, GetName()); //group failed, must invite members not in raid...
+					player_accepting_invite->MessageString(Chat::White, ALREADY_IN_RAID, GetName()); //group failed, must invite members not in raid...
 					return;
 				}
 				Raid *raid = entity_list.GetRaidByClient(player_accepting_invite);
@@ -11070,13 +11120,13 @@ void Client::Handle_OP_RaidCommand(const EQApplicationPacket *app)
 					Group *group = GetGroup();
 					if (group) {
 						if (group->GroupCount() + raid->RaidCount() > MAX_RAID_MEMBERS) {
-							player_accepting_invite->Message(13, "Invite failed, group invite would create a raid larger than the maximum number of members allowed.");
+							player_accepting_invite->Message(Chat::Red, "Invite failed, group invite would create a raid larger than the maximum number of members allowed.");
 							return;
 						}
 					}
 					else {
 						if (1 + raid->RaidCount() > MAX_RAID_MEMBERS) {
-							player_accepting_invite->Message(13, "Invite failed, member invite would create a raid larger than the maximum number of members allowed.");
+							player_accepting_invite->Message(Chat::Red, "Invite failed, member invite would create a raid larger than the maximum number of members allowed.");
 							return;
 						}
 					}
@@ -11568,7 +11618,7 @@ void Client::Handle_OP_RaidCommand(const EQApplicationPacket *app)
 		{
 			Raid *raid = entity_list.GetRaidByClient(this);
 			if (raid) {
-				Message(15, "Loot type changed to: %d.", raid_command_packet->parameter);
+				Message(Chat::Yellow, "Loot type changed to: %d.", raid_command_packet->parameter);
 				raid->ChangeLootType(raid_command_packet->parameter);
 			}
 			break;
@@ -11579,7 +11629,7 @@ void Client::Handle_OP_RaidCommand(const EQApplicationPacket *app)
 		{
 			Raid *raid = entity_list.GetRaidByClient(this);
 			if (raid) {
-				Message(15, "Adding %s as a raid looter.", raid_command_packet->leader_name);
+				Message(Chat::Yellow, "Adding %s as a raid looter.", raid_command_packet->leader_name);
 				raid->AddRaidLooter(raid_command_packet->leader_name);
 			}
 			break;
@@ -11590,7 +11640,7 @@ void Client::Handle_OP_RaidCommand(const EQApplicationPacket *app)
 		{
 			Raid *raid = entity_list.GetRaidByClient(this);
 			if (raid) {
-				Message(15, "Removing %s as a raid looter.", raid_command_packet->leader_name);
+				Message(Chat::Yellow, "Removing %s as a raid looter.", raid_command_packet->leader_name);
 				raid->RemoveRaidLooter(raid_command_packet->leader_name);
 			}
 			break;
@@ -11623,7 +11673,7 @@ void Client::Handle_OP_RaidCommand(const EQApplicationPacket *app)
 		}
 
 		default: {
-			Message(13, "Raid command (%d) NYI", raid_command_packet->action);
+			Message(Chat::Red, "Raid command (%d) NYI", raid_command_packet->action);
 			break;
 		}
 	}
@@ -11933,14 +11983,14 @@ void Client::Handle_OP_RemoveTrap(const EQApplicationPacket *app)
 	if (good)
 		RemoveAura(id);
 	else
-		Message_StringID(MT_SpellFailure, NOT_YOUR_TRAP); // pretty sure this was red
+		MessageString(Chat::SpellFailure, NOT_YOUR_TRAP); // pretty sure this was red
 }
 
 void Client::Handle_OP_Report(const EQApplicationPacket *app)
 {
 	if (!CanUseReport)
 	{
-		Message_StringID(MT_System, REPORT_ONCE);
+		MessageString(Chat::System, REPORT_ONCE);
 		return;
 	}
 
@@ -12007,11 +12057,11 @@ void Client::Handle_OP_RequestDuel(const EQApplicationPacket *app)
 	ds->duel_target = duel;
 	Entity* entity = entity_list.GetID(ds->duel_target);
 	if (GetID() != ds->duel_target && entity->IsClient() && (entity->CastToClient()->IsDueling() && entity->CastToClient()->GetDuelTarget() != 0)) {
-		Message_StringID(10, DUEL_CONSIDERING, entity->GetName());
+		MessageString(Chat::NPCQuestSay, DUEL_CONSIDERING, entity->GetName());
 		return;
 	}
 	if (IsDueling()) {
-		Message_StringID(10, DUEL_INPROGRESS);
+		MessageString(Chat::NPCQuestSay, DUEL_INPROGRESS);
 		return;
 	}
 
@@ -12058,7 +12108,7 @@ void Client::Handle_OP_RespawnWindow(const EQApplicationPacket *app)
 void Client::Handle_OP_Rewind(const EQApplicationPacket *app)
 {
 	if ((rewind_timer.GetRemainingTime() > 1 && rewind_timer.Enabled())) {
-		Message_StringID(MT_System, REWIND_WAIT);
+		MessageString(Chat::System, REWIND_WAIT);
 	}
 	else {
 		CastToClient()->MovePC(zone->GetZoneID(), zone->GetInstanceID(), m_RewindLocation.x, m_RewindLocation.y, m_RewindLocation.z, 0, 2, Rewind);
@@ -12170,7 +12220,7 @@ void Client::Handle_OP_SenseTraps(const EQApplicationPacket *app)
 		return;
 
 	if (!p_timers.Expired(&database, pTimerSenseTraps, false)) {
-		Message(13, "Ability recovery time not yet met.");
+		Message(Chat::Red, "Ability recovery time not yet met.");
 		return;
 	}
 
@@ -12193,23 +12243,23 @@ void Client::Handle_OP_SenseTraps(const EQApplicationPacket *app)
 			auto diff = trap->m_Position - glm::vec3(GetPosition());
 
 			if (diff.x == 0 && diff.y == 0)
-				Message(MT_Skills, "You sense a trap right under your feet!");
+				Message(Chat::Skills, "You sense a trap right under your feet!");
 			else if (diff.x > 10 && diff.y > 10)
-				Message(MT_Skills, "You sense a trap to the NorthWest.");
+				Message(Chat::Skills, "You sense a trap to the NorthWest.");
 			else if (diff.x < -10 && diff.y > 10)
-				Message(MT_Skills, "You sense a trap to the NorthEast.");
+				Message(Chat::Skills, "You sense a trap to the NorthEast.");
 			else if (diff.y > 10)
-				Message(MT_Skills, "You sense a trap to the North.");
+				Message(Chat::Skills, "You sense a trap to the North.");
 			else if (diff.x > 10 && diff.y < -10)
-				Message(MT_Skills, "You sense a trap to the SouthWest.");
+				Message(Chat::Skills, "You sense a trap to the SouthWest.");
 			else if (diff.x < -10 && diff.y < -10)
-				Message(MT_Skills, "You sense a trap to the SouthEast.");
+				Message(Chat::Skills, "You sense a trap to the SouthEast.");
 			else if (diff.y < -10)
-				Message(MT_Skills, "You sense a trap to the South.");
+				Message(Chat::Skills, "You sense a trap to the South.");
 			else if (diff.x > 10)
-				Message(MT_Skills, "You sense a trap to the West.");
+				Message(Chat::Skills, "You sense a trap to the West.");
 			else
-				Message(MT_Skills, "You sense a trap to the East.");
+				Message(Chat::Skills, "You sense a trap to the East.");
 			trap->detected = true;
 
 			float angle = CalculateHeadingToTarget(trap->m_Position.x, trap->m_Position.y);
@@ -12222,7 +12272,7 @@ void Client::Handle_OP_SenseTraps(const EQApplicationPacket *app)
 			return;
 		}
 	}
-	Message(MT_Skills, "You did not find any traps nearby.");
+	Message(Chat::Skills, "You did not find any traps nearby.");
 	return;
 }
 
@@ -12236,11 +12286,11 @@ void Client::Handle_OP_SetGuildMOTD(const EQApplicationPacket *app)
 		return;
 	}
 	if (!IsInAGuild()) {
-		Message(13, "You are not in a guild!");
+		Message(Chat::Red, "You are not in a guild!");
 		return;
 	}
 	if (!guild_mgr.CheckPermission(GuildID(), GuildRank(), GUILD_MOTD)) {
-		Message(13, "You do not have permissions to edit your guild's MOTD.");
+		Message(Chat::Red, "You do not have permissions to edit your guild's MOTD.");
 		return;
 	}
 
@@ -12291,7 +12341,7 @@ void Client::Handle_OP_SetStartCity(const EQApplicationPacket *app)
 {
 	// if the character has a start city, don't let them use the command
 	if (m_pp.binds[4].zoneId != 0 && m_pp.binds[4].zoneId != 189) {
-		Message(15, "Your home city has already been set.", m_pp.binds[4].zoneId, database.GetZoneName(m_pp.binds[4].zoneId));
+		Message(Chat::Yellow, "Your home city has already been set.", m_pp.binds[4].zoneId, database.GetZoneName(m_pp.binds[4].zoneId));
 		return;
 	}
 
@@ -12331,7 +12381,7 @@ void Client::Handle_OP_SetStartCity(const EQApplicationPacket *app)
 	}
 
 	if (validCity) {
-		Message(15, "Your home city has been set");
+		Message(Chat::Yellow, "Your home city has been set");
 		SetStartZone(startCity, x, y, z);
 		return;
 	}
@@ -12343,7 +12393,7 @@ void Client::Handle_OP_SetStartCity(const EQApplicationPacket *app)
 	if (!results.Success())
 		return;
 
-	Message(15, "Use \"/setstartcity #\" to choose a home city from the following list:");
+	Message(Chat::Yellow, "Use \"/setstartcity #\" to choose a home city from the following list:");
 
 	for (auto row = results.begin(); row != results.end(); ++row) {
 		if (atoi(row[1]) != 0)
@@ -12353,7 +12403,7 @@ void Client::Handle_OP_SetStartCity(const EQApplicationPacket *app)
 
 		char* name = nullptr;
 		database.GetZoneLongName(database.GetZoneName(zoneid), &name);
-		Message(15, "%d - %s", zoneid, name);
+		Message(Chat::Yellow, "%d - %s", zoneid, name);
 	}
 
 }
@@ -12395,7 +12445,8 @@ void Client::Handle_OP_Shielding(const EQApplicationPacket *app)
 
 	if (shield_target)
 	{
-		entity_list.MessageClose_StringID(this, false, 100, 0,
+		entity_list.MessageCloseString(
+			this, false, 100, 0,
 			END_SHIELDING, GetName(), shield_target->GetName());
 		for (int y = 0; y < 2; y++)
 		{
@@ -12421,7 +12472,8 @@ void Client::Handle_OP_Shielding(const EQApplicationPacket *app)
 			{
 				if (shield_target->shielder[x].shielder_id == 0)
 				{
-					entity_list.MessageClose_StringID(this, false, 100, 0,
+					entity_list.MessageCloseString(
+						this, false, 100, 0,
 						START_SHIELDING, GetName(), shield_target->GetName());
 					shield_target->shielder[x].shielder_id = GetID();
 					int shieldbonus = shield->AC * 2;
@@ -12459,7 +12511,7 @@ void Client::Handle_OP_Shielding(const EQApplicationPacket *app)
 	}
 	if (!ack)
 	{
-		Message_StringID(0, ALREADY_SHIELDED);
+		MessageString(Chat::White, ALREADY_SHIELDED);
 		shield_target = 0;
 		return;
 	}
@@ -12536,7 +12588,7 @@ void Client::Handle_OP_ShopPlayerBuy(const EQApplicationPacket *app)
 	item = database.GetItem(item_id);
 	if (!item) {
 		//error finding item, client didnt get the update packet for whatever reason, roleplay a tad
-		Message(15, "%s tells you 'Sorry, that item is for display purposes only.' as they take the item off the shelf.", tmp->GetCleanName());
+		Message(Chat::Yellow, "%s tells you 'Sorry, that item is for display purposes only.' as they take the item off the shelf.", tmp->GetCleanName());
 		auto delitempacket = new EQApplicationPacket(OP_ShopDelItem, sizeof(Merchant_DelItem_Struct));
 		Merchant_DelItem_Struct* delitem = (Merchant_DelItem_Struct*)delitempacket->pBuffer;
 		delitem->itemslot = mp->itemslot;
@@ -12549,7 +12601,7 @@ void Client::Handle_OP_ShopPlayerBuy(const EQApplicationPacket *app)
 	}
 	if (CheckLoreConflict(item))
 	{
-		Message(15, "You can only have one of a lore item.");
+		Message(Chat::Yellow, "You can only have one of a lore item.");
 		return;
 	}
 	if (tmpmer_used && (mp->quantity > prevcharges || item->MaxCharges > 1))
@@ -12623,7 +12675,7 @@ void Client::Handle_OP_ShopPlayerBuy(const EQApplicationPacket *app)
 	//make sure we are not completely full...
 	if (freeslotid == EQEmu::invslot::slotCursor) {
 		if (m_inv.GetItem(EQEmu::invslot::slotCursor) != nullptr) {
-			Message(13, "You do not have room for any more items.");
+			Message(Chat::Red, "You do not have room for any more items.");
 			safe_delete(outapp);
 			safe_delete(inst);
 			return;
@@ -12632,7 +12684,7 @@ void Client::Handle_OP_ShopPlayerBuy(const EQApplicationPacket *app)
 
 	if (!stacked && freeslotid == INVALID_INDEX)
 	{
-		Message(13, "You do not have room for any more items.");
+		Message(Chat::Red, "You do not have room for any more items.");
 		safe_delete(outapp);
 		safe_delete(inst);
 		return;
@@ -12767,7 +12819,7 @@ void Client::Handle_OP_ShopPlayerSell(const EQApplicationPacket *app)
 	const EQEmu::ItemData* item = database.GetItem(itemid);
 	EQEmu::ItemInstance* inst = GetInv().GetItem(mp->itemslot);
 	if (!item || !inst) {
-		Message(13, "You seemed to have misplaced that item..");
+		Message(Chat::Red, "You seemed to have misplaced that item..");
 		return;
 	}
 	if (mp->quantity > 1)
@@ -12777,7 +12829,7 @@ void Client::Handle_OP_ShopPlayerSell(const EQApplicationPacket *app)
 	}
 
 	if (!item->NoDrop) {
-		//Message(13,"%s tells you, 'LOL NOPE'", vendor->GetName());
+		//Message(Chat::Red,"%s tells you, 'LOL NOPE'", vendor->GetName());
 		return;
 	}
 
@@ -12971,7 +13023,7 @@ void Client::Handle_OP_ShopRequest(const EQApplicationPacket *app)
 		return;
 	}
 	if (tmp->IsEngaged()) {
-		this->Message_StringID(0, MERCHANT_BUSY);
+		this->MessageString(Chat::White, MERCHANT_BUSY);
 		action = 0;
 	}
 	if (GetFeigned() || IsInvisible())
@@ -12991,7 +13043,7 @@ void Client::Handle_OP_ShopRequest(const EQApplicationPacket *app)
 
 	// 1199 I don't have time for that now. etc
 	if (!tmp->CastToNPC()->IsMerchantOpen()) {
-		tmp->Say_StringID(zone->random.Int(1199, 1202));
+		tmp->SayString(zone->random.Int(1199, 1202));
 		action = 0;
 	}
 
@@ -13024,7 +13076,7 @@ void Client::Handle_OP_Sneak(const EQApplicationPacket *app)
 	}
 
 	if (!p_timers.Expired(&database, pTimerSneak, false)) {
-		Message(13, "Ability recovery time not yet met.");
+		Message(Chat::Red, "Ability recovery time not yet met.");
 		return;
 	}
 	p_timers.Start(pTimerSneak, SneakReuseTime - 1);
@@ -13245,13 +13297,13 @@ void Client::Handle_OP_Split(const EQApplicationPacket *app)
 	//Per the note above, Im not exactly sure what to do on error
 	//to notify the client of the error...
 	if (!isgrouped) {
-		Message(13, "You can not split money if you're not in a group.");
+		Message(Chat::Red, "You can not split money if you're not in a group.");
 		return;
 	}
 	Group *cgroup = GetGroup();
 	if (cgroup == nullptr) {
 		//invalid group, not sure if we should say more...
-		Message(13, "You can not split money if you're not in a group.");
+		Message(Chat::Red, "You can not split money if you're not in a group.");
 		return;
 	}
 
@@ -13259,7 +13311,7 @@ void Client::Handle_OP_Split(const EQApplicationPacket *app)
 		10 * static_cast<uint64>(split->silver) +
 		100 * static_cast<uint64>(split->gold) +
 		1000 * static_cast<uint64>(split->platinum))) {
-		Message(13, "You do not have enough money to do that split.");
+		Message(Chat::Red, "You do not have enough money to do that split.");
 		return;
 	}
 	cgroup->SplitMoney(split->copper, split->silver, split->gold, split->platinum);
@@ -13278,13 +13330,13 @@ void Client::Handle_OP_Surname(const EQApplicationPacket *app)
 
 	if (!p_timers.Expired(&database, pTimerSurnameChange, false) && !GetGM())
 	{
-		Message(15, "You may only change surnames once every 7 days, your /surname is currently on cooldown.");
+		Message(Chat::Yellow, "You may only change surnames once every 7 days, your /surname is currently on cooldown.");
 		return;
 	}
 
 	if (GetLevel() < 20)
 	{
-		Message_StringID(15, SURNAME_LEVEL);
+		MessageString(Chat::Yellow, SURNAME_LEVEL);
 		return;
 	}
 
@@ -13306,13 +13358,13 @@ void Client::Handle_OP_Surname(const EQApplicationPacket *app)
 	}
 
 	if (strlen(surname->lastname) >= 20) {
-		Message_StringID(15, SURNAME_TOO_LONG);
+		MessageString(Chat::Yellow, SURNAME_TOO_LONG);
 		return;
 	}
 
 	if (!database.CheckNameFilter(surname->lastname, true))
 	{
-		Message_StringID(15, SURNAME_REJECTED);
+		MessageString(Chat::Yellow, SURNAME_REJECTED);
 		return;
 	}
 
@@ -13607,7 +13659,7 @@ void Client::Handle_OP_Taunt(const EQApplicationPacket *app)
 	}
 
 	if (!p_timers.Expired(&database, pTimerTaunt, false)) {
-		Message(13, "Ability recovery time not yet met.");
+		Message(Chat::Red, "Ability recovery time not yet met.");
 		return;
 	}
 	p_timers.Start(pTimerTaunt, TauntReuseTime - 1);
@@ -13616,7 +13668,7 @@ void Client::Handle_OP_Taunt(const EQApplicationPacket *app)
 		return;
 
 	if (!zone->CanDoCombat()) {
-		Message(13, "You cannot taunt in a no combat zone.");
+		Message(Chat::Red, "You cannot taunt in a no combat zone.");
 		return;
 	}
 
@@ -13692,31 +13744,31 @@ void Client::Handle_OP_TradeAcceptClick(const EQApplicationPacket *app)
 			trade->state = TradeCompleting;
 
 			if (CheckTradeLoreConflict(other) || other->CheckTradeLoreConflict(this)) {
-				Message_StringID(13, TRADE_CANCEL_LORE);
-				other->Message_StringID(13, TRADE_CANCEL_LORE);
+				MessageString(Chat::Red, TRADE_CANCEL_LORE);
+				other->MessageString(Chat::Red, TRADE_CANCEL_LORE);
 				this->FinishTrade(this);
 				other->FinishTrade(other);
 				other->trade->Reset();
 				trade->Reset();
 			}
 			else if (CheckTradeNonDroppable()) {
-				Message_StringID(13, TRADE_HAS_BEEN_CANCELLED);
-				other->Message_StringID(13, TRADE_HAS_BEEN_CANCELLED);
+				MessageString(Chat::Red, TRADE_HAS_BEEN_CANCELLED);
+				other->MessageString(Chat::Red, TRADE_HAS_BEEN_CANCELLED);
 				this->FinishTrade(this);
 				other->FinishTrade(other);
 				other->trade->Reset();
 				trade->Reset();
-				Message(15, "Hacking activity detected in trade transaction.");
+				Message(Chat::Yellow, "Hacking activity detected in trade transaction.");
 				// TODO: query (this) as a hacker
 			}
 			else if (other->CheckTradeNonDroppable()) {
-				Message_StringID(13, TRADE_HAS_BEEN_CANCELLED);
-				other->Message_StringID(13, TRADE_HAS_BEEN_CANCELLED);
+				MessageString(Chat::Red, TRADE_HAS_BEEN_CANCELLED);
+				other->MessageString(Chat::Red, TRADE_HAS_BEEN_CANCELLED);
 				this->FinishTrade(this);
 				other->FinishTrade(other);
 				other->trade->Reset();
 				trade->Reset();
-				other->Message(15, "Hacking activity detected in trade transaction.");
+				other->Message(Chat::Yellow, "Hacking activity detected in trade transaction.");
 				// TODO: query (other) as a hacker
 			}
 			else {
@@ -13905,7 +13957,7 @@ void Client::Handle_OP_Trader(const EQApplicationPacket *app)
 	{
 		if (Buyer) {
 			Trader_EndTrader();
-			Message(13, "You cannot be a Trader and Buyer at the same time.");
+			Message(Chat::Red, "You cannot be a Trader and Buyer at the same time.");
 			return;
 		}
 
@@ -13924,20 +13976,20 @@ void Client::Handle_OP_Trader(const EQApplicationPacket *app)
 				if (gis->Items[i] == 0) break;
 
 				if (ints->ItemCost[i] == 0) {
-					Message(13, "Item in Trader Satchel with no price. Unable to start trader mode");
+					Message(Chat::Red, "Item in Trader Satchel with no price. Unable to start trader mode");
 					TradeItemsValid = false;
 					break;
 				}
 				const EQEmu::ItemData *Item = database.GetItem(gis->Items[i]);
 
 				if (!Item) {
-					Message(13, "Unexpected error. Unable to start trader mode");
+					Message(Chat::Red, "Unexpected error. Unable to start trader mode");
 					TradeItemsValid = false;
 					break;
 				}
 
 				if (Item->NoDrop == 0) {
-					Message(13, "NODROP Item in Trader Satchel. Unable to start trader mode");
+					Message(Chat::Red, "NODROP Item in Trader Satchel. Unable to start trader mode");
 					TradeItemsValid = false;
 					break;
 				}
@@ -14159,7 +14211,7 @@ void Client::Handle_OP_TraderShop(const EQApplicationPacket *app)
 			}
 			else
 			{
-				Message_StringID(clientMessageYellow, TRADER_BUSY);
+				MessageString(Chat::Yellow, TRADER_BUSY);
 				Log(Logs::Detail, Logs::Trading, "Client::Handle_OP_TraderShop: Trader Busy");
 			}
 
@@ -14237,7 +14289,7 @@ void Client::Handle_OP_TradeSkillCombine(const EQApplicationPacket *app)
 		return;
 	}
 	/*if (m_tradeskill_object == nullptr) {
-	Message(13, "Error: Server is not aware of the tradeskill container you are attempting to use");
+	Message(Chat::Red, "Error: Server is not aware of the tradeskill container you are attempting to use");
 	return;
 	}*/
 
@@ -14263,7 +14315,7 @@ void Client::Handle_OP_Translocate(const EQApplicationPacket *app)
 		return;
 
 	if ((RuleI(Spells, TranslocateTimeLimit) > 0) && (time(nullptr) > (TranslocateTime + RuleI(Spells, TranslocateTimeLimit)))) {
-		Message(13, "You did not accept the Translocate within the required time limit.");
+		Message(Chat::Red, "You did not accept the Translocate within the required time limit.");
 		PendingTranslocate = false;
 		return;
 	}
diff --git a/zone/client_process.cpp b/zone/client_process.cpp
index 2ea0b5cfb..551a76cfe 100644
--- a/zone/client_process.cpp
+++ b/zone/client_process.cpp
@@ -378,10 +378,10 @@ bool Client::Process() {
 			}
 
 			if (!CombatRange(auto_attack_target)) {
-				Message_StringID(MT_TooFarAway, TARGET_TOO_FAR);
+				MessageString(Chat::TooFarAway, TARGET_TOO_FAR);
 			}
 			else if (auto_attack_target == this) {
-				Message_StringID(MT_TooFarAway, TRY_ATTACKING_SOMEONE);
+				MessageString(Chat::TooFarAway, TRY_ATTACKING_SOMEONE);
 			}
 			else if (!los_status || !los_status_facing) {
 				//you can't see your target
@@ -401,11 +401,11 @@ bool Client::Process() {
 
 		if (GetClass() == WARRIOR || GetClass() == BERSERKER) {
 			if (!dead && !IsBerserk() && GetHPRatio() < RuleI(Combat, BerserkerFrenzyStart)) {
-				entity_list.MessageClose_StringID(this, false, 200, 0, BERSERK_START, GetName());
+				entity_list.MessageCloseString(this, false, 200, 0, BERSERK_START, GetName());
 				berserk = true;
 			}
 			if (IsBerserk() && GetHPRatio() > RuleI(Combat, BerserkerFrenzyEnd)) {
-				entity_list.MessageClose_StringID(this, false, 200, 0, BERSERK_END, GetName());
+				entity_list.MessageCloseString(this, false, 200, 0, BERSERK_END, GetName());
 				berserk = false;
 			}
 		}
@@ -416,11 +416,11 @@ bool Client::Process() {
 			// Range check
 			if (!CombatRange(auto_attack_target)) {
 				// this is a duplicate message don't use it.
-				//Message_StringID(MT_TooFarAway,TARGET_TOO_FAR);
+				//MessageString(Chat::TooFarAway,TARGET_TOO_FAR);
 			}
 			// Don't attack yourself
 			else if (auto_attack_target == this) {
-				//Message_StringID(MT_TooFarAway,TRY_ATTACKING_SOMEONE);
+				//MessageString(Chat::TooFarAway,TRY_ATTACKING_SOMEONE);
 			}
 			else if (!los_status || !los_status_facing)
 			{
@@ -465,7 +465,8 @@ bool Client::Process() {
 			{
 				if (!CombatRange(shield_target))
 				{
-					entity_list.MessageClose_StringID(this, false, 100, 0,
+					entity_list.MessageCloseString(
+						this, false, 100, 0,
 						END_SHIELDING, GetCleanName(), shield_target->GetCleanName());
 					for (int y = 0; y < 2; y++)
 					{
@@ -592,8 +593,8 @@ bool Client::Process() {
 	// only if client is not feigned
 	if (zone->CanDoCombat() && ret && !GetFeigned() && client_scan_npc_aggro_timer.Check()) {
 		int npc_scan_count = 0;
-		for (auto it = close_mobs.begin(); it != close_mobs.end(); ++it) {
-			Mob *mob = it->first;
+		for (auto & close_mob : close_mobs) {
+			Mob *mob = close_mob.first;
 
 			if (!mob)
 				continue;
@@ -604,6 +605,7 @@ bool Client::Process() {
 			if (mob->CheckWillAggro(this) && !mob->CheckAggro(this)) {
 				mob->AddToHateList(this, 25);
 			}
+
 			npc_scan_count++;
 		}
 		Log(Logs::General, Logs::Aggro, "Checking Reverse Aggro (client->npc) scanned_npcs (%i)", npc_scan_count);
@@ -950,9 +952,9 @@ void Client::BulkSendMerchantInventory(int merchant_id, int npcid) {
 		sprintf(handy_id, "%i", greet_id);
 
 		if (greet_id != MERCHANT_GREETING)
-			Message_StringID(10, GENERIC_STRINGID_SAY, merch->GetCleanName(), handy_id, this->GetName(), handyitem->Name);
+			MessageString(Chat::NPCQuestSay, GENERIC_STRINGID_SAY, merch->GetCleanName(), handy_id, this->GetName(), handyitem->Name);
 		else
-			Message_StringID(10, GENERIC_STRINGID_SAY, merch->GetCleanName(), handy_id, this->GetName());
+			MessageString(Chat::NPCQuestSay, GENERIC_STRINGID_SAY, merch->GetCleanName(), handy_id, this->GetName());
 	}
 
 //		safe_delete_array(cpi);
@@ -988,7 +990,7 @@ void Client::OPRezzAnswer(uint32 Action, uint32 SpellID, uint16 ZoneID, uint16 I
 	if(PendingRezzXP < 0) {
 		// pendingrezexp is set to -1 if we are not expecting an OP_RezzAnswer
 		Log(Logs::Detail, Logs::Spells, "Unexpected OP_RezzAnswer. Ignoring it.");
-		Message(13, "You have already been resurrected.\n");
+		Message(Chat::Red, "You have already been resurrected.\n");
 		return;
 	}
 
@@ -1042,7 +1044,7 @@ void Client::OPTGB(const EQApplicationPacket *app)
 
 	uint32 tgb_flag = *(uint32 *)app->pBuffer;
 	if(tgb_flag == 2)
-		Message_StringID(0, TGB() ? TGB_ON : TGB_OFF);
+		MessageString(Chat::White, TGB() ? TGB_ON : TGB_OFF);
 	else
 		tgb = tgb_flag;
 }
@@ -1060,7 +1062,7 @@ void Client::OPMemorizeSpell(const EQApplicationPacket* app)
 
 	if(!IsValidSpell(memspell->spell_id))
 	{
-		Message(13, "Unexpected error: spell id out of range");
+		Message(Chat::Red, "Unexpected error: spell id out of range");
 		return;
 	}
 
@@ -1071,8 +1073,8 @@ void Client::OPMemorizeSpell(const EQApplicationPacket* app)
 	)
 	{
 		char val1[20]={0};
-		Message_StringID(13,SPELL_LEVEL_TO_LOW,ConvertArray(spells[memspell->spell_id].classes[GetClass()-1],val1),spells[memspell->spell_id].name);
-		//Message(13, "Unexpected error: Class cant use this spell at your level!");
+		MessageString(Chat::Red,SPELL_LEVEL_TO_LOW,ConvertArray(spells[memspell->spell_id].classes[GetClass()-1],val1),spells[memspell->spell_id].name);
+		//Message(Chat::Red, "Unexpected error: Class cant use this spell at your level!");
 		return;
 	}
 
@@ -1086,7 +1088,7 @@ void Client::OPMemorizeSpell(const EQApplicationPacket* app)
 				const EQEmu::ItemData* item = inst->GetItem();
 
 				if (RuleB(Character, RestrictSpellScribing) && !item->IsEquipable(GetRace(), GetClass())) {
-					Message_StringID(13, CANNOT_USE_ITEM);
+					MessageString(Chat::Red, CANNOT_USE_ITEM);
 					break;
 				}
 
@@ -1438,7 +1440,7 @@ void Client::OPMoveCoin(const EQApplicationPacket* app)
 		}
 		else{
 			if (to_bucket == &m_pp.platinum_shared || from_bucket == &m_pp.platinum_shared){
-				this->Message(13, "::: WARNING! ::: SHARED BANK IS DISABLED AND YOUR PLATINUM WILL BE DESTROYED IF YOU PUT IT HERE");
+				this->Message(Chat::Red, "::: WARNING! ::: SHARED BANK IS DISABLED AND YOUR PLATINUM WILL BE DESTROYED IF YOU PUT IT HERE");
 			}
 		}
 	}
@@ -1454,8 +1456,8 @@ void Client::OPMoveCoin(const EQApplicationPacket* app)
 			with->trade->state = Trading;
 
 		Client* recipient = trader->CastToClient();
-		recipient->Message(15, "%s adds some coins to the trade.", GetName());
-		recipient->Message(15, "The total trade is: %i PP, %i GP, %i SP, %i CP",
+		recipient->Message(Chat::Yellow, "%s adds some coins to the trade.", GetName());
+		recipient->Message(Chat::Yellow, "The total trade is: %i PP, %i GP, %i SP, %i CP",
 			trade->pp, trade->gp,
 			trade->sp, trade->cp
 		);
@@ -1525,7 +1527,7 @@ void Client::OPGMTraining(const EQApplicationPacket *app)
 	// welcome message
 	if (pTrainer && pTrainer->IsNPC())
 	{
-		pTrainer->Say_StringID(zone->random.Int(1204, 1207), GetCleanName());
+		pTrainer->SayString(zone->random.Int(1204, 1207), GetCleanName());
 	}
 }
 
@@ -1554,7 +1556,7 @@ void Client::OPGMEndTraining(const EQApplicationPacket *app)
 	// goodbye message
 	if (pTrainer->IsNPC())
 	{
-		pTrainer->Say_StringID(zone->random.Int(1208, 1211), GetCleanName());
+		pTrainer->SayString(zone->random.Int(1208, 1211), GetCleanName());
 	}
 }
 
@@ -1644,7 +1646,7 @@ void Client::OPGMTrainSkill(const EQApplicationPacket *app)
 			case EQEmu::skills::SkillJewelryMaking:
 			case EQEmu::skills::SkillPottery:
 				if(skilllevel >= RuleI(Skills, MaxTrainTradeskills)) {
-					Message_StringID(13, MORE_SKILLED_THAN_I, pTrainer->GetCleanName());
+					MessageString(Chat::Red, MORE_SKILLED_THAN_I, pTrainer->GetCleanName());
 					return;
 				}
 				break;
@@ -1654,7 +1656,7 @@ void Client::OPGMTrainSkill(const EQApplicationPacket *app)
 			case EQEmu::skills::SkillSpecializeDivination:
 			case EQEmu::skills::SkillSpecializeEvocation:
 				if(skilllevel >= RuleI(Skills, MaxTrainSpecializations)) {
-					Message_StringID(13, MORE_SKILLED_THAN_I, pTrainer->GetCleanName());
+					MessageString(Chat::Red, MORE_SKILLED_THAN_I, pTrainer->GetCleanName());
 					return;
 				}
 			default:
@@ -1665,7 +1667,7 @@ void Client::OPGMTrainSkill(const EQApplicationPacket *app)
 			if (skilllevel >= MaxSkillValue)
 			{
 				// Don't allow training over max skill level
-				Message_StringID(13, MORE_SKILLED_THAN_I, pTrainer->GetCleanName());
+				MessageString(Chat::Red, MORE_SKILLED_THAN_I, pTrainer->GetCleanName());
 				return;
 			}
 
@@ -1675,7 +1677,7 @@ void Client::OPGMTrainSkill(const EQApplicationPacket *app)
 				if (skilllevel >= MaxSpecSkill)
 				{
 					// Restrict specialization training to follow the rules
-					Message_StringID(13, MORE_SKILLED_THAN_I, pTrainer->GetCleanName());
+					MessageString(Chat::Red, MORE_SKILLED_THAN_I, pTrainer->GetCleanName());
 					return;
 				}
 			}
@@ -1918,7 +1920,7 @@ void Client::DoTracking()
 	Mob *m = entity_list.GetMob(TrackingID);
 
 	if (!m || m->IsCorpse()) {
-		Message_StringID(MT_Skills, TRACK_LOST_TARGET);
+		MessageString(Chat::Skills, TRACK_LOST_TARGET);
 		TrackingID = 0;
 		return;
 	}
@@ -1929,23 +1931,23 @@ void Client::DoTracking()
 		RelativeHeading += 512;
 
 	if (RelativeHeading > 480)
-		Message_StringID(MT_Skills, TRACK_STRAIGHT_AHEAD, m->GetCleanName());
+		MessageString(Chat::Skills, TRACK_STRAIGHT_AHEAD, m->GetCleanName());
 	else if (RelativeHeading > 416)
-		Message_StringID(MT_Skills, TRACK_AHEAD_AND_TO, m->GetCleanName(), "left");
+		MessageString(Chat::Skills, TRACK_AHEAD_AND_TO, m->GetCleanName(), "left");
 	else if (RelativeHeading > 352)
-		Message_StringID(MT_Skills, TRACK_TO_THE, m->GetCleanName(), "left");
+		MessageString(Chat::Skills, TRACK_TO_THE, m->GetCleanName(), "left");
 	else if (RelativeHeading > 288)
-		Message_StringID(MT_Skills, TRACK_BEHIND_AND_TO, m->GetCleanName(), "left");
+		MessageString(Chat::Skills, TRACK_BEHIND_AND_TO, m->GetCleanName(), "left");
 	else if (RelativeHeading > 224)
-		Message_StringID(MT_Skills, TRACK_BEHIND_YOU, m->GetCleanName());
+		MessageString(Chat::Skills, TRACK_BEHIND_YOU, m->GetCleanName());
 	else if (RelativeHeading > 160)
-		Message_StringID(MT_Skills, TRACK_BEHIND_AND_TO, m->GetCleanName(), "right");
+		MessageString(Chat::Skills, TRACK_BEHIND_AND_TO, m->GetCleanName(), "right");
 	else if (RelativeHeading > 96)
-		Message_StringID(MT_Skills, TRACK_TO_THE, m->GetCleanName(), "right");
+		MessageString(Chat::Skills, TRACK_TO_THE, m->GetCleanName(), "right");
 	else if (RelativeHeading > 32)
-		Message_StringID(MT_Skills, TRACK_AHEAD_AND_TO, m->GetCleanName(), "right");
+		MessageString(Chat::Skills, TRACK_AHEAD_AND_TO, m->GetCleanName(), "right");
 	else if (RelativeHeading >= 0)
-		Message_StringID(MT_Skills, TRACK_STRAIGHT_AHEAD, m->GetCleanName());
+		MessageString(Chat::Skills, TRACK_STRAIGHT_AHEAD, m->GetCleanName());
 }
 
 void Client::HandleRespawnFromHover(uint32 Option)
diff --git a/zone/command.cpp b/zone/command.cpp
index 60ad82696..cb4bb5fec 100755
--- a/zone/command.cpp
+++ b/zone/command.cpp
@@ -38,6 +38,7 @@
 #include <algorithm>
 #include <ctime>
 #include <thread>
+#include <fmt/format.h>
 
 #ifdef _WIN32
 #define strcasecmp _stricmp
@@ -105,7 +106,7 @@ LinkedList<CommandRecord *> cleanup_commandlist;
  */
 int command_notavail(Client *c, const char *message)
 {
-	c->Message(13, "Commands not available.");
+	c->Message(Chat::Red, "Commands not available.");
 	return -1;
 }
 
@@ -151,7 +152,7 @@ Access Levels:
 int command_init(void)
 {
 	commandaliases.clear();
-	
+
 	if (
 		command_add("acceptrules", "[acceptrules] - Accept the EQEmu Agreement", 0, command_acceptrules) ||
 		command_add("advnpcspawn", "[maketype|makegroup|addgroupentry|addgroupspawn][removegroupspawn|movespawn|editgroupbox|cleargroupbox]", 150, command_advnpcspawn) ||
@@ -222,7 +223,7 @@ int command_init(void)
 		command_add("gm", "- Turn player target's or your GM flag on or off", 80, command_gm) ||
 		command_add("gmspeed", "[on/off] - Turn GM speed hack on/off for you or your player target", 100, command_gmspeed) ||
 		command_add("gmzone", "[zone_short_name] [zone_version=0] [identifier=gmzone] - Zones to a private GM instance", 100, command_gmzone) ||
-		command_add("goto", "[x] [y] [z] - Teleport to the provided coordinates or to your target", 10, command_goto) ||
+		command_add("goto", "[playername] or [x y z] [h] - Teleport to the provided coordinates or to your target", 10, command_goto) ||
 		command_add("grid", "[add/delete] [grid_num] [wandertype] [pausetype] - Create/delete a wandering grid", 170, command_grid) ||
 		command_add("guild", "- Guild manipulation commands. Use argument help for more info.", 10, command_guild) ||
 		command_add("guildapprove", "[guildapproveid] - Approve a guild with specified ID (guild creator receives the id)", 0, command_guildapprove) ||
@@ -282,6 +283,7 @@ int command_init(void)
 		command_add("network", "- Admin commands for the udp network interface.", 250, command_network) ||
 		command_add("npccast", "[targetname/entityid] [spellid] - Causes NPC target to cast spellid on targetname/entityid", 80, command_npccast) ||
 		command_add("npcedit", "[column] [value] - Mega NPC editing command", 100, command_npcedit) ||
+		command_add("npceditmass", "[name-search] [column] [value] - Mass (Zone wide) NPC data editing command", 100, command_npceditmass) ||
 		command_add("npcemote", "[message] - Make your NPC target emote a message.", 150, command_npcemote) ||
 		command_add("npcloot", "[show/money/add/remove] [itemid/all/money: pp gp sp cp] - Manipulate the loot an NPC is carrying", 80, command_npcloot) ||
 		command_add("npcsay", "[message] - Make your NPC target say a message.", 150, command_npcsay) ||
@@ -344,6 +346,7 @@ int command_init(void)
 		command_add("resetaa", "- Resets a Player's AA in their profile and refunds spent AA's to unspent, may disconnect player.", 200, command_resetaa) ||
 		command_add("resetaa_timer", "Command to reset AA cooldown timers.", 200, command_resetaa_timer) ||
 		command_add("revoke", "[charname] [1/0] - Makes charname unable to talk on OOC", 200, command_revoke) ||
+		command_add("roambox", "Manages roambox settings for an NPC", 200, command_roambox) ||
 		command_add("rules", "(subcommand) - Manage server rules", 250, command_rules) ||
 		command_add("save", "- Force your player or player corpse target to be saved to the database", 50, command_save) ||
 		command_add("scale", "- Handles npc scaling", 150, command_scale) ||
@@ -380,6 +383,7 @@ int command_init(void)
 		command_add("shutdown", "- Shut this zone process down", 150, command_shutdown) ||
 		command_add("size", "[size] - Change size of you or your target", 50, command_size) ||
 		command_add("spawn", "[name] [race] [level] [material] [hp] [gender] [class] [priweapon] [secweapon] [merchantid] - Spawn an NPC", 10, command_spawn) ||
+		command_add("spawneditmass", "Mass editing spawn command", 150, command_spawneditmass) ||
 		command_add("spawnfix", "- Find targeted NPC in database based on its X/Y/heading and update the database to make it spawn at your current location/heading.", 170, command_spawnfix) ||
 		command_add("spawnstatus", "- Show respawn timer status", 100, command_spawnstatus) ||
 		command_add("spellinfo", "[spellid] - Get detailed info about a spell", 10, command_spellinfo) ||
@@ -445,7 +449,7 @@ int command_init(void)
 		command_deinit();
 		return -1;
 	}
-	
+
 	std::map<std::string, std::pair<uint8, std::vector<std::string>>> command_settings;
 	database.GetCommandSettings(command_settings);
 
@@ -572,7 +576,7 @@ int command_realdispatch(Client *c, const char *message)
 
 	CommandRecord *cur = commandlist[cstr];
 	if(c->Admin() < cur->access){
-		c->Message(13,"Your access level is not high enough to use this command.");
+		c->Message(Chat::Red,"Your access level is not high enough to use this command.");
 		return(-1);
 	}
 
@@ -670,9 +674,9 @@ void command_setstat(Client* c, const Seperator* sep){
 		c->GetTarget()->CastToClient()->SetStats(atoi(sep->arg[1]),atoi(sep->arg[2]));
 	}
 	else{
-		c->Message(0,"This command is used to permanently increase or decrease a players stats.");
-		c->Message(0,"Usage: #setstat {type} {value the stat should be}");
-		c->Message(0,"Types: Str: 0, Sta: 1, Agi: 2, Dex: 3, Int: 4, Wis: 5, Cha: 6");
+		c->Message(Chat::White,"This command is used to permanently increase or decrease a players stats.");
+		c->Message(Chat::White,"Usage: #setstat {type} {value the stat should be}");
+		c->Message(Chat::White,"Types: Str: 0, Sta: 1, Agi: 2, Dex: 3, Int: 4, Wis: 5, Cha: 6");
 	}
 }
 
@@ -681,27 +685,27 @@ void command_incstat(Client* c, const Seperator* sep){
 		c->GetTarget()->CastToClient()->IncStats(atoi(sep->arg[1]),atoi(sep->arg[2]));
 	}
 	else{
-		c->Message(0,"This command is used to permanently increase or decrease a players stats.");
-		c->Message(0,"Usage: #setstat {type} {value by which to increase or decrease}");
-		c->Message(0,"Note: The value is in increments of 2, so a value of 3 will actually increase the stat by 6");
-		c->Message(0,"Types: Str: 0, Sta: 1, Agi: 2, Dex: 3, Int: 4, Wis: 5, Cha: 6");
+		c->Message(Chat::White,"This command is used to permanently increase or decrease a players stats.");
+		c->Message(Chat::White,"Usage: #setstat {type} {value by which to increase or decrease}");
+		c->Message(Chat::White,"Note: The value is in increments of 2, so a value of 3 will actually increase the stat by 6");
+		c->Message(Chat::White,"Types: Str: 0, Sta: 1, Agi: 2, Dex: 3, Int: 4, Wis: 5, Cha: 6");
 	}
 }
 
 void command_resetaa(Client* c,const Seperator *sep) {
 	if(c->GetTarget() && c->GetTarget()->IsClient()){
 		c->GetTarget()->CastToClient()->ResetAA();
-		c->Message(13,"Successfully reset %s's AAs", c->GetTarget()->GetName());
+		c->Message(Chat::Red,"Successfully reset %s's AAs", c->GetTarget()->GetName());
 	}
 	else
-		c->Message(0,"Usage: Target a client and use #resetaa to reset the AA data in their Profile.");
+		c->Message(Chat::White,"Usage: Target a client and use #resetaa to reset the AA data in their Profile.");
 }
 
 void command_help(Client *c, const Seperator *sep)
 {
 	int commands_shown=0;
 
-	c->Message(0, "Available EQEMu commands:");
+	c->Message(Chat::White, "Available EQEMu commands:");
 
 	std::map<std::string, CommandRecord *>::iterator cur,end;
 	cur = commandlist.begin();
@@ -717,29 +721,29 @@ void command_help(Client *c, const Seperator *sep)
 		if(c->Admin() < cur->second->access)
 			continue;
 		commands_shown++;
-		c->Message(0, "	%c%s %s",  COMMAND_CHAR, cur->first.c_str(), cur->second->desc == nullptr?"":cur->second->desc);
+		c->Message(Chat::White, "	%c%s %s",  COMMAND_CHAR, cur->first.c_str(), cur->second->desc == nullptr?"":cur->second->desc);
 	}
-	c->Message(0, "%d command%s listed.",  commands_shown, commands_shown!=1?"s":"");
+	c->Message(Chat::White, "%d command%s listed.",  commands_shown, commands_shown!=1?"s":"");
 
 }
 
 void command_version(Client *c, const Seperator *sep)
 {
-	c->Message(0, "Current version information.");
-	c->Message(0, "	%s",  CURRENT_VERSION);
-	c->Message(0, "	Compiled on: %s at %s",  COMPILE_DATE, COMPILE_TIME);
-	c->Message(0, "	Last modified on: %s",  LAST_MODIFIED);
+	c->Message(Chat::White, "Current version information.");
+	c->Message(Chat::White, "	%s",  CURRENT_VERSION);
+	c->Message(Chat::White, "	Compiled on: %s at %s",  COMPILE_DATE, COMPILE_TIME);
+	c->Message(Chat::White, "	Last modified on: %s",  LAST_MODIFIED);
 }
 
 void command_setfaction(Client *c, const Seperator *sep)
 {
 	if((sep->arg[1][0] == 0 || strcasecmp(sep->arg[1],"*")==0) || ((c->GetTarget()==0) || (c->GetTarget()->IsClient()))) {
-		c->Message(0, "Usage: #setfaction [faction number]");
+		c->Message(Chat::White, "Usage: #setfaction [faction number]");
 		return;
     }
 
     auto npcTypeID = c->GetTarget()->CastToNPC()->GetNPCTypeID();
-    c->Message(15,"Setting NPC %u to faction %i",  npcTypeID, atoi(sep->argplus[1]));
+    c->Message(Chat::Yellow,"Setting NPC %u to faction %i",  npcTypeID, atoi(sep->argplus[1]));
 
     std::string query = StringFormat("UPDATE npc_types SET npc_faction_id = %i WHERE id = %i",
                                     atoi(sep->argplus[1]), npcTypeID);
@@ -749,9 +753,9 @@ void command_setfaction(Client *c, const Seperator *sep)
 void command_serversidename(Client *c, const Seperator *sep)
 {
 	if(c->GetTarget())
-		c->Message(0, c->GetTarget()->GetName());
+		c->Message(Chat::White, c->GetTarget()->GetName());
 	else
-		c->Message(0, "Error: no target");
+		c->Message(Chat::White, "Error: no target");
 }
 
 void command_wc(Client *c, const Seperator *sep)
@@ -763,7 +767,7 @@ void command_wc(Client *c, const Seperator *sep)
 		);
 	}
 	else if (c->GetTarget() == nullptr) {
-		c->Message(13, "You must have a target to do a wear change.");
+		c->Message(Chat::Red, "You must have a target to do a wear change.");
 	}
 	else {
 		uint32 hero_forge_model = 0;
@@ -799,10 +803,10 @@ void command_wc(Client *c, const Seperator *sep)
 void command_heromodel(Client *c, const Seperator *sep)
 {
 	if (sep->argnum < 1) {
-		c->Message(0, "Usage: #heromodel [hero forge model] [ [slot] ] (example: #heromodel 63)");
+		c->Message(Chat::White, "Usage: #heromodel [hero forge model] [ [slot] ] (example: #heromodel 63)");
 	}
 	else if (c->GetTarget() == nullptr) {
-		c->Message(13, "You must have a target to do a wear change for Hero's Forge Models.");
+		c->Message(Chat::Red, "You must have a target to do a wear change for Hero's Forge Models.");
 	}
 	else {
 		uint32 hero_forge_model = atoi(sep->arg[1]);
@@ -823,7 +827,7 @@ void command_heromodel(Client *c, const Seperator *sep)
 				}
 			}
 			else {
-				c->Message(13, "Hero's Forge Model must be greater than 0.");
+				c->Message(Chat::Red, "Hero's Forge Model must be greater than 0.");
 			}
 		}
 	}
@@ -834,12 +838,12 @@ void command_setanim(Client *c, const Seperator *sep)
 	if (c->GetTarget() && sep->IsNumber(1)) {
 		int num = atoi(sep->arg[1]);
 		if (num < 0 || num >= _eaMaxAppearance) {
-			c->Message(0, "Invalid animation number, between 0 and %d", _eaMaxAppearance - 1);
+			c->Message(Chat::White, "Invalid animation number, between 0 and %d", _eaMaxAppearance - 1);
 		}
 		c->GetTarget()->SetAppearance(EmuAppearance(num));
 	}
 	else {
-		c->Message(0, "Usage: #setanim [animnum]");
+		c->Message(Chat::White, "Usage: #setanim [animnum]");
 	}
 }
 
@@ -851,50 +855,50 @@ void command_serverinfo(Client *c, const Seperator *sep)
 	auto rss = EQ::GetRSS();
 	auto uptime = EQ::GetUptime();
 
-	c->Message(0, "Operating System Information");
-	c->Message(0, "==================================================");
-	c->Message(0, "System: %s", os.sysname.c_str());
-	c->Message(0, "Release: %s", os.release.c_str());
-	c->Message(0, "Version: %s", os.version.c_str());
-	c->Message(0, "Machine: %s", os.machine.c_str());
-	c->Message(0, "Uptime: %.2f seconds", uptime);
-	c->Message(0, "==================================================");
-	c->Message(0, "CPU Information");
-	c->Message(0, "==================================================");
+	c->Message(Chat::White, "Operating System Information");
+	c->Message(Chat::White, "==================================================");
+	c->Message(Chat::White, "System: %s", os.sysname.c_str());
+	c->Message(Chat::White, "Release: %s", os.release.c_str());
+	c->Message(Chat::White, "Version: %s", os.version.c_str());
+	c->Message(Chat::White, "Machine: %s", os.machine.c_str());
+	c->Message(Chat::White, "Uptime: %.2f seconds", uptime);
+	c->Message(Chat::White, "==================================================");
+	c->Message(Chat::White, "CPU Information");
+	c->Message(Chat::White, "==================================================");
 	for (size_t i = 0; i < cpus.size(); ++i) {
 		auto &cp = cpus[i];
-		c->Message(0, "CPU #%i: %s, Speed: %.2fGhz", i, cp.model.c_str(), cp.speed);
+		c->Message(Chat::White, "CPU #%i: %s, Speed: %.2fGhz", i, cp.model.c_str(), cp.speed);
 	}
-	c->Message(0, "==================================================");
-	c->Message(0, "Process Information");
-	c->Message(0, "==================================================");
-	c->Message(0, "PID: %u", pid);
-	c->Message(0, "RSS: %.2f MB", rss / 1048576.0);
-	c->Message(0, "==================================================");
+	c->Message(Chat::White, "==================================================");
+	c->Message(Chat::White, "Process Information");
+	c->Message(Chat::White, "==================================================");
+	c->Message(Chat::White, "PID: %u", pid);
+	c->Message(Chat::White, "RSS: %.2f MB", rss / 1048576.0);
+	c->Message(Chat::White, "==================================================");
 }
 
 void command_getvariable(Client *c, const Seperator *sep)
 {
 	std::string tmp;
 	if (database.GetVariable(sep->argplus[1], tmp))
-		c->Message(0, "%s = %s",  sep->argplus[1], tmp.c_str());
+		c->Message(Chat::White, "%s = %s",  sep->argplus[1], tmp.c_str());
 	else
-		c->Message(0, "GetVariable(%s) returned false",  sep->argplus[1]);
+		c->Message(Chat::White, "GetVariable(%s) returned false",  sep->argplus[1]);
 }
 
 void command_chat(Client *c, const Seperator *sep)
 {
 	if (sep->arg[2][0] == 0)
-		c->Message(0, "Usage: #chat [channum] [message]");
+		c->Message(Chat::White, "Usage: #chat [channum] [message]");
 	else
-		if (!worldserver.SendChannelMessage(0, 0, (uint8) atoi(sep->arg[1]), 0, 0, sep->argplus[2]))
-			c->Message(0, "Error: World server disconnected");
+		if (!worldserver.SendChannelMessage(0, 0, (uint8) atoi(sep->arg[1]), 0, 0, 100, sep->argplus[2]))
+			c->Message(Chat::White, "Error: World server disconnected");
 }
 
 void command_npcloot(Client *c, const Seperator *sep)
 {
 	if (c->GetTarget() == 0)
-		c->Message(0, "Error: No target");
+		c->Message(Chat::White, "Error: No target");
 	// #npcloot show
 	else if (strcasecmp(sep->arg[1], "show") == 0)
 	{
@@ -903,11 +907,11 @@ void command_npcloot(Client *c, const Seperator *sep)
 		else if (c->GetTarget()->IsCorpse())
 			c->GetTarget()->CastToCorpse()->QueryLoot(c);
 		else
-			c->Message(0, "Error: Target's type doesnt have loot");
+			c->Message(Chat::White, "Error: Target's type doesnt have loot");
 	}
 	// These 2 types are *BAD* for the next few commands
 	else if (c->GetTarget()->IsClient() || c->GetTarget()->IsCorpse())
-		c->Message(0, "Error: Invalid target type, try a NPC =).");
+		c->Message(Chat::White, "Error: Invalid target type, try a NPC =).");
 	// #npcloot add
 	else if (strcasecmp(sep->arg[1], "add") == 0)
 	{
@@ -921,22 +925,22 @@ void command_npcloot(Client *c, const Seperator *sep)
 					c->GetTarget()->CastToNPC()->AddItem(item, atoi(sep->arg[3]), 0);
 				else
 					c->GetTarget()->CastToNPC()->AddItem(item, 1, 0);
-				c->Message(0, "Added item(%i) to the %s's loot.",  item, c->GetTarget()->GetName());
+				c->Message(Chat::White, "Added item(%i) to the %s's loot.",  item, c->GetTarget()->GetName());
 			}
 			else
-				c->Message(0, "Error: #npcloot add: Item(%i) does not exist!",  item);
+				c->Message(Chat::White, "Error: #npcloot add: Item(%i) does not exist!",  item);
 		}
 		else if (!sep->IsNumber(2))
-			c->Message(0, "Error: #npcloot add: Itemid must be a number.");
+			c->Message(Chat::White, "Error: #npcloot add: Itemid must be a number.");
 		else
-			c->Message(0, "Error: #npcloot add: This is not a valid target.");
+			c->Message(Chat::White, "Error: #npcloot add: This is not a valid target.");
 	}
 	// #npcloot remove
 	else if (strcasecmp(sep->arg[1], "remove") == 0)
 	{
 		//#npcloot remove all
 		if (strcasecmp(sep->arg[2], "all") == 0)
-			c->Message(0, "Error: #npcloot remove all: Not yet implemented.");
+			c->Message(Chat::White, "Error: #npcloot remove all: Not yet implemented.");
 		//#npcloot remove itemid
 		else
 		{
@@ -944,12 +948,12 @@ void command_npcloot(Client *c, const Seperator *sep)
 			{
 				uint32 item = atoi(sep->arg[2]);
 				c->GetTarget()->CastToNPC()->RemoveItem(item);
-				c->Message(0, "Removed item(%i) from the %s's loot.",  item, c->GetTarget()->GetName());
+				c->Message(Chat::White, "Removed item(%i) from the %s's loot.",  item, c->GetTarget()->GetName());
 			}
 			else if (!sep->IsNumber(2))
-				c->Message(0, "Error: #npcloot remove: Item must be a number.");
+				c->Message(Chat::White, "Error: #npcloot remove: Item must be a number.");
 			else
-				c->Message(0, "Error: #npcloot remove: This is not a valid target.");
+				c->Message(Chat::White, "Error: #npcloot remove: This is not a valid target.");
 		}
 	}
 	// #npcloot money
@@ -960,16 +964,16 @@ void command_npcloot(Client *c, const Seperator *sep)
 			if ((atoi(sep->arg[2]) < 34465 && atoi(sep->arg[2]) >= 0) && (atoi(sep->arg[3]) < 34465 && atoi(sep->arg[3]) >= 0) && (atoi(sep->arg[4]) < 34465 && atoi(sep->arg[4]) >= 0) && (atoi(sep->arg[5]) < 34465 && atoi(sep->arg[5]) >= 0))
 			{
 				c->GetTarget()->CastToNPC()->AddCash(atoi(sep->arg[5]), atoi(sep->arg[4]), atoi(sep->arg[3]), atoi(sep->arg[2]));
-				c->Message(0, "Set %i Platinum, %i Gold, %i Silver, and %i Copper as %s's money.",  atoi(sep->arg[2]), atoi(sep->arg[3]), atoi(sep->arg[4]), atoi(sep->arg[5]), c->GetTarget()->GetName());
+				c->Message(Chat::White, "Set %i Platinum, %i Gold, %i Silver, and %i Copper as %s's money.",  atoi(sep->arg[2]), atoi(sep->arg[3]), atoi(sep->arg[4]), atoi(sep->arg[5]), c->GetTarget()->GetName());
 			}
 			else
-				c->Message(0, "Error: #npcloot money: Values must be between 0-34465.");
+				c->Message(Chat::White, "Error: #npcloot money: Values must be between 0-34465.");
 		}
 		else
-			c->Message(0, "Usage: #npcloot money platinum gold silver copper");
+			c->Message(Chat::White, "Usage: #npcloot money platinum gold silver copper");
 	}
 	else
-		c->Message(0, "Usage: #npcloot [show/money/add/remove] [itemid/all/money: pp gp sp cp]");
+		c->Message(Chat::White, "Usage: #npcloot [show/money/add/remove] [itemid/all/money: pp gp sp cp]");
 }
 
 void command_gm(Client *c, const Seperator *sep)
@@ -982,10 +986,10 @@ void command_gm(Client *c, const Seperator *sep)
 
 	if(sep->arg[1][0] != 0) {
 		t->SetGM(state);
-		c->Message(0, "%s is %s a GM.",  t->GetName(), state?"now":"no longer");
+		c->Message(Chat::White, "%s is %s a GM.",  t->GetName(), state?"now":"no longer");
 	}
 	else
-		c->Message(0, "Usage: #gm [on/off]");
+		c->Message(Chat::White, "Usage: #gm [on/off]");
 }
 
 // there's no need for this, as /summon already takes care of it
@@ -1007,11 +1011,11 @@ void command_summon(Client *c, const Seperator *sep)
 		else
 		{
 			if (!worldserver.Connected())
-				c->Message(0, "Error: World server disconnected.");
+				c->Message(Chat::White, "Error: World server disconnected.");
 			else
 			{ // player is in another zone
 				//Taking this command out until we test the factor of 8 in ServerOP_ZonePlayer
-				//c->Message(0, "Summoning player from another zone not yet implemented.");
+				//c->Message(Chat::White, "Summoning player from another zone not yet implemented.");
 				//return;
 
 				auto pack = new ServerPacket(ServerOP_ZonePlayer, sizeof(ServerZonePlayer_Struct));
@@ -1036,9 +1040,9 @@ void command_summon(Client *c, const Seperator *sep)
 	else
 	{
 		/*if(c->Admin() < 150)
-			c->Message(0, "You need a NPC/corpse target for this command");
+			c->Message(Chat::White, "You need a NPC/corpse target for this command");
 		else*/
-			c->Message(0, "Usage: #summon [charname] Either target or charname is required");
+			c->Message(Chat::White, "Usage: #summon [charname] Either target or charname is required");
 		return;
 	}
 
@@ -1047,23 +1051,23 @@ void command_summon(Client *c, const Seperator *sep)
 
 	if (t->IsNPC())
 	{ // npc target
-		c->Message(0, "Summoning NPC %s to %1.1f, %1.1f, %1.1f",  t->GetName(), c->GetX(), c->GetY(), c->GetZ());
+		c->Message(Chat::White, "Summoning NPC %s to %1.1f, %1.1f, %1.1f",  t->GetName(), c->GetX(), c->GetY(), c->GetZ());
 		t->CastToNPC()->GMMove(c->GetX(), c->GetY(), c->GetZ(), c->GetHeading());
 		t->CastToNPC()->SaveGuardSpot(glm::vec4(0.0f));
 	}
 	else if (t->IsCorpse())
 	{ // corpse target
-		c->Message(0, "Summoning corpse %s to %1.1f, %1.1f, %1.1f",  t->GetName(), c->GetX(), c->GetY(), c->GetZ());
+		c->Message(Chat::White, "Summoning corpse %s to %1.1f, %1.1f, %1.1f",  t->GetName(), c->GetX(), c->GetY(), c->GetZ());
 		t->CastToCorpse()->GMMove(c->GetX(), c->GetY(), c->GetZ(), c->GetHeading());
 	}
 	else if (t->IsClient())
 	{
 		/*if(c->Admin() < 150)
 		{
-			c->Message(0, "You may not summon a player.");
+			c->Message(Chat::White, "You may not summon a player.");
 			return;
 		}*/
-		c->Message(0, "Summoning player %s to %1.1f, %1.1f, %1.1f",  t->GetName(), c->GetX(), c->GetY(), c->GetZ());
+		c->Message(Chat::White, "Summoning player %s to %1.1f, %1.1f, %1.1f",  t->GetName(), c->GetX(), c->GetY(), c->GetZ());
 		t->CastToClient()->MovePC(zone->GetZoneID(), zone->GetInstanceID(), c->GetX(), c->GetY(), c->GetZ(), c->GetHeading(), 2, GMSummon);
 	}
 }
@@ -1072,7 +1076,7 @@ void command_zone(Client *c, const Seperator *sep)
 {
 	if(c->Admin() < commandZoneToCoords &&
 		(sep->IsNumber(2) || sep->IsNumber(3) || sep->IsNumber(4))) {
-		c->Message(0, "Your status is not high enough to zone to specific coordinates.");
+		c->Message(Chat::White, "Your status is not high enough to zone to specific coordinates.");
 		return;
 	}
 
@@ -1081,29 +1085,29 @@ void command_zone(Client *c, const Seperator *sep)
 	if (sep->IsNumber(1))
 	{
 		if(atoi(sep->arg[1])==26 && (c->Admin() < commandZoneToSpecials)){ //cshome
-				c->Message(0, "Only Guides and above can goto that zone.");
+				c->Message(Chat::White, "Only Guides and above can goto that zone.");
 				return;
 		}
 		zoneid = atoi(sep->arg[1]);
 	}
 	else if (sep->arg[1][0] == 0)
 	{
-		c->Message(0, "Usage: #zone [zonename]");
-		c->Message(0, "Optional Usage: #zone [zonename] y x z");
+		c->Message(Chat::White, "Usage: #zone [zonename]");
+		c->Message(Chat::White, "Optional Usage: #zone [zonename] y x z");
 		return;
 	}
 	else if (zone->GetZoneID() == 184 && c->Admin() < commandZoneToSpecials) {	// Zone: 'Load'
-		c->Message(0, "The Gods brought you here, only they can send you away.");
+		c->Message(Chat::White, "The Gods brought you here, only they can send you away.");
 		return;
 	} else {
 		if((strcasecmp(sep->arg[1], "cshome")==0) && (c->Admin() < commandZoneToSpecials)){
-			c->Message(0, "Only Guides and above can goto that zone.");
+			c->Message(Chat::White, "Only Guides and above can goto that zone.");
 			return;
 		}
 
 		zoneid = database.GetZoneID(sep->arg[1]);
 		if(zoneid == 0) {
-			c->Message(0, "Unable to locate zone '%s'",  sep->arg[1]);
+			c->Message(Chat::White, "Unable to locate zone '%s'",  sep->arg[1]);
 			return;
 		}
 	}
@@ -1128,14 +1132,14 @@ void command_zone_instance(Client *c, const Seperator *sep)
 {
 	if(c->Admin() < commandZoneToCoords &&
 		(sep->IsNumber(2) || sep->IsNumber(3) || sep->IsNumber(4))) {
-		c->Message(0, "Your status is not high enough to zone to specific coordinates.");
+		c->Message(Chat::White, "Your status is not high enough to zone to specific coordinates.");
 		return;
 	}
 
 	if (sep->arg[1][0] == 0)
 	{
-		c->Message(0, "Usage: #zoneinstance [instance id]");
-		c->Message(0, "Optional Usage: #zoneinstance [instance id] y x z");
+		c->Message(Chat::White, "Usage: #zoneinstance [instance id]");
+		c->Message(Chat::White, "Optional Usage: #zoneinstance [instance id] y x z");
 		return;
 	}
 
@@ -1147,26 +1151,26 @@ void command_zone_instance(Client *c, const Seperator *sep)
 		instanceid = atoi(sep->arg[1]);
 		if(!instanceid)
 		{
-			c->Message(0, "Must enter a valid instance id.");
+			c->Message(Chat::White, "Must enter a valid instance id.");
 			return;
 		}
 
 		zoneid = database.ZoneIDFromInstanceID(instanceid);
 		if(!zoneid)
 		{
-			c->Message(0, "Instance not found or zone is set to null.");
+			c->Message(Chat::White, "Instance not found or zone is set to null.");
 			return;
 		}
 	}
 	else
 	{
-		c->Message(0, "Must enter a valid instance id.");
+		c->Message(Chat::White, "Must enter a valid instance id.");
 		return;
 	}
 
 	if(!database.VerifyInstanceAlive(instanceid, c->CharacterID()))
 	{
-		c->Message(0, "Instance ID expiried or you are not apart of this instance.");
+		c->Message(Chat::White, "Instance ID expiried or you are not apart of this instance.");
 		return;
 	}
 
@@ -1192,12 +1196,12 @@ void command_peqzone(Client *c, const Seperator *sep)
 	uint32 timeleft = c->GetPTimers().GetRemainingTime(pTimerPeqzoneReuse)/60;
 
 	if(!c->GetPTimers().Expired(&database, pTimerPeqzoneReuse, false)) {
-		c->Message(13,"You must wait %i minute(s) before using this ability again.",  timeleft);
+		c->Message(Chat::Red,"You must wait %i minute(s) before using this ability again.",  timeleft);
 		return;
 	}
 
 	if(c->GetHPRatio() < 75) {
-		c->Message(0, "You cannot use this command with less than 75 percent health.");
+		c->Message(Chat::White, "You cannot use this command with less than 75 percent health.");
 		return;
 	}
 
@@ -1210,7 +1214,7 @@ void command_peqzone(Client *c, const Seperator *sep)
 		|| c->AutoAttackEnabled()
 		|| c->GetInvul()
 	) {
-		c->Message(0, "You cannot use this command in your current state. Settle down and wait.");
+		c->Message(Chat::White, "You cannot use this command in your current state. Settle down and wait.");
 		return;
 	}
 
@@ -1221,33 +1225,33 @@ void command_peqzone(Client *c, const Seperator *sep)
 		zoneid = atoi(sep->arg[1]);
 		destzone = database.GetPEQZone(zoneid, 0);
 		if(destzone == 0){
-			c->Message(13, "You cannot use this command to enter that zone!");
+			c->Message(Chat::Red, "You cannot use this command to enter that zone!");
 			return;
 		}
 		if(zoneid == zone->GetZoneID()) {
-			c->Message(13, "You cannot use this command on the zone you are in!");
+			c->Message(Chat::Red, "You cannot use this command on the zone you are in!");
 			return;
 		}
 	}
 	else if (sep->arg[1][0] == 0 || sep->IsNumber(2) || sep->IsNumber(3) || sep->IsNumber(4) || sep->IsNumber(5))
 	{
-		c->Message(0, "Usage: #peqzone [zonename]");
-		c->Message(0, "Optional Usage: #peqzone [zoneid]");
+		c->Message(Chat::White, "Usage: #peqzone [zonename]");
+		c->Message(Chat::White, "Optional Usage: #peqzone [zoneid]");
 		return;
 	}
 	else {
 		zoneid = database.GetZoneID(sep->arg[1]);
 		destzone = database.GetPEQZone(zoneid, 0);
 		if(zoneid == 0) {
-			c->Message(0, "Unable to locate zone '%s'",  sep->arg[1]);
+			c->Message(Chat::White, "Unable to locate zone '%s'",  sep->arg[1]);
 			return;
 		}
 		if(destzone == 0){
-			c->Message(13, "You cannot use this command to enter that zone!");
+			c->Message(Chat::Red, "You cannot use this command to enter that zone!");
 			return;
 		}
 		if(zoneid == zone->GetZoneID()) {
-			c->Message(13, "You cannot use this command on the zone you are in!");
+			c->Message(Chat::Red, "You cannot use this command on the zone you are in!");
 			return;
 		}
 	}
@@ -1265,9 +1269,9 @@ void command_peqzone(Client *c, const Seperator *sep)
 void command_movechar(Client *c, const Seperator *sep)
 {
 	if(sep->arg[1][0]==0 || sep->arg[2][0] == 0)
-		c->Message(0, "Usage: #movechar [charactername] [zonename]");
+		c->Message(Chat::White, "Usage: #movechar [charactername] [zonename]");
 	else if (c->Admin() < commandMovecharToSpecials && strcasecmp(sep->arg[2], "cshome") == 0 || strcasecmp(sep->arg[2], "load") == 0 || strcasecmp(sep->arg[2], "load2") == 0)
-		c->Message(0, "Invalid zone name");
+		c->Message(Chat::White, "Invalid zone name");
 	else
 	{
 		uint32 tmp = database.GetAccountIDByChar(sep->arg[1]);
@@ -1275,14 +1279,14 @@ void command_movechar(Client *c, const Seperator *sep)
 		{
 			if (c->Admin() >= commandMovecharSelfOnly || tmp == c->AccountID())
 				if (!database.MoveCharacterToZone((char*) sep->arg[1], (char*) sep->arg[2]))
-					c->Message(0, "Character Move Failed!");
+					c->Message(Chat::White, "Character Move Failed!");
 				else
-					c->Message(0, "Character has been moved.");
+					c->Message(Chat::White, "Character has been moved.");
 			else
-				c->Message(13,"You cannot move characters that are not on your account.");
+				c->Message(Chat::Red,"You cannot move characters that are not on your account.");
 		}
 		else
-			c->Message(0, "Character Does Not Exist");
+			c->Message(Chat::White, "Character Does Not Exist");
 	}
 }
 
@@ -1291,7 +1295,7 @@ void command_movement(Client *c, const Seperator *sep)
 	auto &mgr = MobMovementManager::Get();
 
 	if (sep->arg[1][0] == 0) {
-		c->Message(0, "Usage: #movement stats/clearstats/walkto/runto/rotateto/stop/packet");
+		c->Message(Chat::White, "Usage: #movement stats/clearstats/walkto/runto/rotateto/stop/packet");
 		return;
 	}
 
@@ -1307,7 +1311,7 @@ void command_movement(Client *c, const Seperator *sep)
 	{
 		auto target = c->GetTarget();
 		if (target == nullptr) {
-			c->Message(0, "No target found.");
+			c->Message(Chat::White, "No target found.");
 			return;
 		}
 
@@ -1317,7 +1321,7 @@ void command_movement(Client *c, const Seperator *sep)
 	{
 		auto target = c->GetTarget();
 		if (target == nullptr) {
-			c->Message(0, "No target found.");
+			c->Message(Chat::White, "No target found.");
 			return;
 		}
 
@@ -1327,7 +1331,7 @@ void command_movement(Client *c, const Seperator *sep)
 	{
 		auto target = c->GetTarget();
 		if (target == nullptr) {
-			c->Message(0, "No target found.");
+			c->Message(Chat::White, "No target found.");
 			return;
 		}
 
@@ -1337,7 +1341,7 @@ void command_movement(Client *c, const Seperator *sep)
 	{
 		auto target = c->GetTarget();
 		if (target == nullptr) {
-			c->Message(0, "No target found.");
+			c->Message(Chat::White, "No target found.");
 			return;
 		}
 
@@ -1347,25 +1351,25 @@ void command_movement(Client *c, const Seperator *sep)
 	{
 		auto target = c->GetTarget();
 		if (target == nullptr) {
-			c->Message(0, "No target found.");
+			c->Message(Chat::White, "No target found.");
 			return;
 		}
 
 		mgr.SendCommandToClients(target, atof(sep->arg[2]), atof(sep->arg[3]), atof(sep->arg[4]), atof(sep->arg[5]), atoi(sep->arg[6]), ClientRangeAny);
 	}
 	else {
-		c->Message(0, "Usage: #movement stats/clearstats/walkto/runto/rotateto/stop/packet");
+		c->Message(Chat::White, "Usage: #movement stats/clearstats/walkto/runto/rotateto/stop/packet");
 	}
 }
 
 void command_viewpetition(Client *c, const Seperator *sep)
 {
 	if (sep->arg[1][0] == 0) {
-		c->Message(0, "Usage: #viewpetition (petition number) Type #listpetition for a list");
+		c->Message(Chat::White, "Usage: #viewpetition (petition number) Type #listpetition for a list");
 		return;
     }
 
-    c->Message(13,"	ID : Character Name , Petition Text");
+    c->Message(Chat::Red,"	ID : Character Name , Petition Text");
 
     std::string query = "SELECT petid, charname, petitiontext FROM petitions ORDER BY petid";
     auto results = database.QueryDatabase(query);
@@ -1375,20 +1379,20 @@ void command_viewpetition(Client *c, const Seperator *sep)
     Log(Logs::General, Logs::Normal, "View petition request from %s, petition number: %i",  c->GetName(), atoi(sep->argplus[1]) );
 
     if (results.RowCount() == 0) {
-        c->Message(13,"There was an error in your request: ID not found! Please check the Id and try again.");
+        c->Message(Chat::Red,"There was an error in your request: ID not found! Please check the Id and try again.");
         return;
     }
 
     for (auto row = results.begin(); row != results.end(); ++row)
         if (strcasecmp(row[0], sep->argplus[1]) == 0)
-			c->Message(15, " %s:	%s , %s ",  row[0], row[1], row[2]);
+			c->Message(Chat::Yellow, " %s:	%s , %s ",  row[0], row[1], row[2]);
 
 }
 
 void command_petitioninfo(Client *c, const Seperator *sep)
 {
 	if (sep->arg[1][0] == 0) {
-		c->Message(0, "Usage: #petitioninfo (petition number) Type #listpetition for a list");
+		c->Message(Chat::White, "Usage: #petitioninfo (petition number) Type #listpetition for a list");
 		return;
     }
 
@@ -1400,24 +1404,24 @@ void command_petitioninfo(Client *c, const Seperator *sep)
     Log(Logs::General, Logs::Normal, "Petition information request from %s, petition number:",  c->GetName(), atoi(sep->argplus[1]) );
 
     if (results.RowCount() == 0) {
-		c->Message(13,"There was an error in your request: ID not found! Please check the Id and try again.");
+		c->Message(Chat::Red,"There was an error in your request: ID not found! Please check the Id and try again.");
         return;
     }
 
 	for (auto row = results.begin(); row != results.end(); ++row)
 		if (strcasecmp(row[0],sep->argplus[1])== 0)
-			c->Message(13,"	ID : %s Character Name: %s Account Name: %s Zone: %s Character Class: %s Character Race: %s Character Level: %s", row[0],row[1],row[2],row[3],row[4],row[5],row[6]);
+			c->Message(Chat::Red,"	ID : %s Character Name: %s Account Name: %s Zone: %s Character Class: %s Character Race: %s Character Level: %s", row[0],row[1],row[2],row[3],row[4],row[5],row[6]);
 
 }
 
 void command_delpetition(Client *c, const Seperator *sep)
 {
 	if (sep->arg[1][0] == 0 || strcasecmp(sep->arg[1],"*") == 0) {
-		c->Message(0, "Usage: #delpetition (petition number) Type #listpetition for a list");
+		c->Message(Chat::White, "Usage: #delpetition (petition number) Type #listpetition for a list");
 		return;
     }
 
-	c->Message(13,"Attempting to delete petition number: %i", atoi(sep->argplus[1]));
+	c->Message(Chat::Red,"Attempting to delete petition number: %i", atoi(sep->argplus[1]));
 	std::string query = StringFormat("DELETE FROM petitions WHERE petid = %i",  atoi(sep->argplus[1]));
 	auto results = database.QueryDatabase(query);
 	if (!results.Success())
@@ -1429,7 +1433,7 @@ void command_delpetition(Client *c, const Seperator *sep)
 
 void command_listnpcs(Client *c, const Seperator *sep)
 {
-	c->Message(0, "Deprecated, use the #list command (#list npcs <search>)");
+	c->Message(Chat::White, "Deprecated, use the #list command (#list npcs <search>)");
 }
 
 void command_list(Client *c, const Seperator *sep)
@@ -1686,9 +1690,9 @@ void command_list(Client *c, const Seperator *sep)
 		}
 	}
 	else {
-		c->Message(0, "Usage of #list");
-		c->Message(0, "- #list [npcs|players|corpses|doors|objects] [search]");
-		c->Message(0, "- Example: #list npc (Blank for all)");
+		c->Message(Chat::White, "Usage of #list");
+		c->Message(Chat::White, "- #list [npcs|players|corpses|doors|objects] [search]");
+		c->Message(Chat::White, "- Example: #list npc (Blank for all)");
 	}
 }
 
@@ -1696,7 +1700,7 @@ void command_date(Client *c, const Seperator *sep)
 {
 	//yyyy mm dd hh mm local
 	if(sep->arg[3][0]==0 || !sep->IsNumber(1) || !sep->IsNumber(2) || !sep->IsNumber(3)) {
-		c->Message(13, "Usage: #date yyyy mm dd [HH MM]");
+		c->Message(Chat::Red, "Usage: #date yyyy mm dd [HH MM]");
 	}
 	else {
 		int h=0, m=0;
@@ -1710,7 +1714,7 @@ void command_date(Client *c, const Seperator *sep)
 			m=eqTime.minute;
 		else
 			m=atoi(sep->arg[5]);
-		c->Message(13, "Setting world time to %s-%s-%s %i:%i...",  sep->arg[1], sep->arg[2], sep->arg[3], h, m);
+		c->Message(Chat::Red, "Setting world time to %s-%s-%s %i:%i...",  sep->arg[1], sep->arg[2], sep->arg[3], h, m);
 		zone->SetDate(atoi(sep->arg[1]), atoi(sep->arg[2]), atoi(sep->arg[3]), h, m);
 	}
 }
@@ -1718,15 +1722,15 @@ void command_date(Client *c, const Seperator *sep)
 void command_timezone(Client *c, const Seperator *sep)
 {
 	if(sep->arg[1][0]==0 && !sep->IsNumber(1)) {
-		c->Message(13, "Usage: #timezone HH [MM]");
-		c->Message(13, "Current timezone is: %ih %im",  zone->zone_time.getEQTimeZoneHr(), zone->zone_time.getEQTimeZoneMin());
+		c->Message(Chat::Red, "Usage: #timezone HH [MM]");
+		c->Message(Chat::Red, "Current timezone is: %ih %im",  zone->zone_time.getEQTimeZoneHr(), zone->zone_time.getEQTimeZoneMin());
 	}
 	else {
 		uint8 hours = atoi(sep->arg[1]);
 		uint8 minutes = atoi(sep->arg[2]);
 		if(!sep->IsNumber(2))
 			minutes = 0;
-		c->Message(13, "Setting timezone to %i h %i m",  hours, minutes);
+		c->Message(Chat::Red, "Setting timezone to %i h %i m",  hours, minutes);
 		uint32 ntz=(hours*60)+minutes;
 		zone->zone_time.setEQTimeZone(ntz);
 		database.SetZoneTZ(zone->GetZoneID(), zone->GetInstanceVersion(), ntz);
@@ -1750,10 +1754,10 @@ void command_invul(Client *c, const Seperator *sep)
 
 	if(sep->arg[1][0] != 0) {
 		t->SetInvul(state);
-		c->Message(0, "%s is %s invulnerable from attack.",  t->GetName(), state?"now":"no longer");
+		c->Message(Chat::White, "%s is %s invulnerable from attack.",  t->GetName(), state?"now":"no longer");
 	}
 	else
-		c->Message(0, "Usage: #invulnerable [on/off]");
+		c->Message(Chat::White, "Usage: #invulnerable [on/off]");
 }
 
 void command_hideme(Client *c, const Seperator *sep)
@@ -1761,18 +1765,18 @@ void command_hideme(Client *c, const Seperator *sep)
 	bool state=atobool(sep->arg[1]);
 
 	if(sep->arg[1][0]==0)
-		c->Message(0, "Usage: #hideme [on/off]");
+		c->Message(Chat::White, "Usage: #hideme [on/off]");
 	else
 	{
 		c->SetHideMe(state);
-		c->Message_StringID(MT_Broadcasts, c->GetHideMe() ? NOW_INVISIBLE : NOW_VISIBLE, c->GetName());
+		c->MessageString(Chat::Broadcasts, c->GetHideMe() ? NOW_INVISIBLE : NOW_VISIBLE, c->GetName());
 	}
 }
 
 void command_emote(Client *c, const Seperator *sep)
 {
 	if (sep->arg[3][0] == 0)
-		c->Message(0, "Usage: #emote [name | world | zone] type# message");
+		c->Message(Chat::White, "Usage: #emote [name | world | zone] type# message");
 	else {
 		if (strcasecmp(sep->arg[1], "zone") == 0){
 			char* newmessage=0;
@@ -1784,7 +1788,7 @@ void command_emote(Client *c, const Seperator *sep)
 			}
 		}
 		else if (!worldserver.Connected())
-			c->Message(0, "Error: World server disconnected");
+			c->Message(Chat::White, "Error: World server disconnected");
 		else if (strcasecmp(sep->arg[1], "world") == 0)
 			worldserver.SendEmoteMessage(0, 0, atoi(sep->arg[2]), sep->argplus[3]);
 		else
@@ -1796,42 +1800,42 @@ void command_fov(Client *c, const Seperator *sep)
 {
 	if(c->GetTarget())
 		if(c->BehindMob(c->GetTarget(), c->GetX(), c->GetY()))
-			c->Message(0, "You are behind mob %s, it is looking to %d",  c->GetTarget()->GetName(), c->GetTarget()->GetHeading());
+			c->Message(Chat::White, "You are behind mob %s, it is looking to %d",  c->GetTarget()->GetName(), c->GetTarget()->GetHeading());
 		else
-			c->Message(0, "You are NOT behind mob %s, it is looking to %d",  c->GetTarget()->GetName(), c->GetTarget()->GetHeading());
+			c->Message(Chat::White, "You are NOT behind mob %s, it is looking to %d",  c->GetTarget()->GetName(), c->GetTarget()->GetHeading());
 	else
-		c->Message(0, "I Need a target!");
+		c->Message(Chat::White, "I Need a target!");
 }
 
 void command_npcstats(Client *c, const Seperator *sep)
 {
 	if (c->GetTarget() == 0)
-		c->Message(0, "ERROR: No target!");
+		c->Message(Chat::White, "ERROR: No target!");
 	else if (!c->GetTarget()->IsNPC())
-		c->Message(0, "ERROR: Target is not a NPC!");
+		c->Message(Chat::White, "ERROR: Target is not a NPC!");
 	else {
 		auto target_npc = c->GetTarget()->CastToNPC();
-		c->Message(0, "# NPC Stats");
-		c->Message(0, "- Name: %s   NpcID: %u", target_npc->GetName(), target_npc->GetNPCTypeID());
-		c->Message(0, "- Race: %i  Level: %i  Class: %i  Material: %i", target_npc->GetRace(), target_npc->GetLevel(), target_npc->GetClass(), target_npc->GetTexture());
-		c->Message(0, "- Current HP: %i  Max HP: %i", target_npc->GetHP(), target_npc->GetMaxHP());
-		//c->Message(0, "Weapon Item Number: %s", target_npc->GetWeapNo());
-		c->Message(0, "- Gender: %i  Size: %f  Bodytype: %d", target_npc->GetGender(), target_npc->GetSize(), target_npc->GetBodyType());
-		c->Message(0, "- Runspeed: %.3f  Walkspeed: %.3f", static_cast<float>(0.025f * target_npc->GetRunspeed()), static_cast<float>(0.025f * target_npc->GetWalkspeed()));
-		c->Message(0, "- Spawn Group: %i  Grid: %i", target_npc->GetSp2(), target_npc->GetGrid());
+		c->Message(Chat::White, "# NPC Stats");
+		c->Message(Chat::White, "- Name: %s   NpcID: %u", target_npc->GetName(), target_npc->GetNPCTypeID());
+		c->Message(Chat::White, "- Race: %i  Level: %i  Class: %i  Material: %i", target_npc->GetRace(), target_npc->GetLevel(), target_npc->GetClass(), target_npc->GetTexture());
+		c->Message(Chat::White, "- Current HP: %i  Max HP: %i", target_npc->GetHP(), target_npc->GetMaxHP());
+		//c->Message(Chat::White, "Weapon Item Number: %s", target_npc->GetWeapNo());
+		c->Message(Chat::White, "- Gender: %i  Size: %f  Bodytype: %d", target_npc->GetGender(), target_npc->GetSize(), target_npc->GetBodyType());
+		c->Message(Chat::White, "- Runspeed: %.3f  Walkspeed: %.3f", static_cast<float>(0.025f * target_npc->GetRunspeed()), static_cast<float>(0.025f * target_npc->GetWalkspeed()));
+		c->Message(Chat::White, "- Spawn Group: %i  Grid: %i", target_npc->GetSpawnGroupId(), target_npc->GetGrid());
 		if (target_npc->proximity) {
-			c->Message(0, "- Proximity: Enabled");
-			c->Message(0, "-- Cur_X: %1.3f, Cur_Y: %1.3f, Cur_Z: %1.3f", target_npc->GetX(), target_npc->GetY(), target_npc->GetZ());
-			c->Message(0, "-- Min_X: %1.3f(%1.3f), Max_X: %1.3f(%1.3f), X_Range: %1.3f", target_npc->proximity->min_x, (target_npc->proximity->min_x - target_npc->GetX()), target_npc->proximity->max_x, (target_npc->proximity->max_x - target_npc->GetX()), (target_npc->proximity->max_x - target_npc->proximity->min_x));
-			c->Message(0, "-- Min_Y: %1.3f(%1.3f), Max_Y: %1.3f(%1.3f), Y_Range: %1.3f", target_npc->proximity->min_y, (target_npc->proximity->min_y - target_npc->GetY()), target_npc->proximity->max_y, (target_npc->proximity->max_y - target_npc->GetY()), (target_npc->proximity->max_y - target_npc->proximity->min_y));
-			c->Message(0, "-- Min_Z: %1.3f(%1.3f), Max_Z: %1.3f(%1.3f), Z_Range: %1.3f", target_npc->proximity->min_z, (target_npc->proximity->min_z - target_npc->GetZ()), target_npc->proximity->max_z, (target_npc->proximity->max_z - target_npc->GetZ()), (target_npc->proximity->max_z - target_npc->proximity->min_z));
-			c->Message(0, "-- Say: %s", (target_npc->proximity->say ? "Enabled" : "Disabled"));
+			c->Message(Chat::White, "- Proximity: Enabled");
+			c->Message(Chat::White, "-- Cur_X: %1.3f, Cur_Y: %1.3f, Cur_Z: %1.3f", target_npc->GetX(), target_npc->GetY(), target_npc->GetZ());
+			c->Message(Chat::White, "-- Min_X: %1.3f(%1.3f), Max_X: %1.3f(%1.3f), X_Range: %1.3f", target_npc->proximity->min_x, (target_npc->proximity->min_x - target_npc->GetX()), target_npc->proximity->max_x, (target_npc->proximity->max_x - target_npc->GetX()), (target_npc->proximity->max_x - target_npc->proximity->min_x));
+			c->Message(Chat::White, "-- Min_Y: %1.3f(%1.3f), Max_Y: %1.3f(%1.3f), Y_Range: %1.3f", target_npc->proximity->min_y, (target_npc->proximity->min_y - target_npc->GetY()), target_npc->proximity->max_y, (target_npc->proximity->max_y - target_npc->GetY()), (target_npc->proximity->max_y - target_npc->proximity->min_y));
+			c->Message(Chat::White, "-- Min_Z: %1.3f(%1.3f), Max_Z: %1.3f(%1.3f), Z_Range: %1.3f", target_npc->proximity->min_z, (target_npc->proximity->min_z - target_npc->GetZ()), target_npc->proximity->max_z, (target_npc->proximity->max_z - target_npc->GetZ()), (target_npc->proximity->max_z - target_npc->proximity->min_z));
+			c->Message(Chat::White, "-- Say: %s", (target_npc->proximity->say ? "Enabled" : "Disabled"));
 		}
 		else {
-			c->Message(0, "-Proximity: Disabled");
+			c->Message(Chat::White, "-Proximity: Disabled");
 		}
-		c->Message(0, "");
-		c->Message(0, "EmoteID: %i", target_npc->GetEmoteID());
+		c->Message(Chat::White, "");
+		c->Message(Chat::White, "EmoteID: %i", target_npc->GetEmoteID());
 		target_npc->QueryLoot(c);
 	}
 }
@@ -1840,13 +1844,13 @@ void command_zclip(Client *c, const Seperator *sep)
 {
 	// modifys and resends zhdr packet
 	if(sep->arg[2][0]==0)
-		c->Message(0, "Usage: #zclip <min clip> <max clip>");
+		c->Message(Chat::White, "Usage: #zclip <min clip> <max clip>");
 	else if(atoi(sep->arg[1])<=0)
-		c->Message(0, "ERROR: Min clip can not be zero or less!");
+		c->Message(Chat::White, "ERROR: Min clip can not be zero or less!");
 	else if(atoi(sep->arg[2])<=0)
-		c->Message(0, "ERROR: Max clip can not be zero or less!");
+		c->Message(Chat::White, "ERROR: Max clip can not be zero or less!");
 	else if(atoi(sep->arg[1])>atoi(sep->arg[2]))
-		c->Message(0, "ERROR: Min clip is greater than max clip!");
+		c->Message(Chat::White, "ERROR: Min clip is greater than max clip!");
 	else {
 		zone->newzone_data.minclip = atof(sep->arg[1]);
 		zone->newzone_data.maxclip = atof(sep->arg[2]);
@@ -1872,27 +1876,27 @@ void command_npccast(Client *c, const Seperator *sep)
 		if (spelltar)
 			c->GetTarget()->CastSpell(atoi(sep->arg[2]), spelltar->GetID());
 		else
-			c->Message(0, "Error: %s not found",  sep->arg[1]);
+			c->Message(Chat::White, "Error: %s not found",  sep->arg[1]);
 	}
 	else if (c->GetTarget() && c->GetTarget()->IsNPC() && sep->IsNumber(1) && sep->IsNumber(2) ) {
 		Mob* spelltar = entity_list.GetMob(atoi(sep->arg[1]));
 		if (spelltar)
 			c->GetTarget()->CastSpell(atoi(sep->arg[2]), spelltar->GetID());
 		else
-			c->Message(0, "Error: target ID %i not found",  atoi(sep->arg[1]));
+			c->Message(Chat::White, "Error: target ID %i not found",  atoi(sep->arg[1]));
 	}
 	else
-		c->Message(0, "Usage: (needs NPC targeted) #npccast targetname/entityid spellid");
+		c->Message(Chat::White, "Usage: (needs NPC targeted) #npccast targetname/entityid spellid");
 }
 
 void command_zstats(Client *c, const Seperator *sep)
 {
-	c->Message(0, "Zone Header Data:");
-	c->Message(0, "Sky Type: %i",  zone->newzone_data.sky);
-	c->Message(0, "Fog Colour: Red: %i; Blue: %i; Green %i",  zone->newzone_data.fog_red[0], zone->newzone_data.fog_green[0], zone->newzone_data.fog_blue[0]);
-	c->Message(0, "Safe Coords: %f, %f, %f",  zone->newzone_data.safe_x, zone->newzone_data.safe_y, zone->newzone_data.safe_z);
-	c->Message(0, "Underworld Coords: %f",  zone->newzone_data.underworld);
-	c->Message(0, "Clip Plane: %f - %f",  zone->newzone_data.minclip, zone->newzone_data.maxclip);
+	c->Message(Chat::White, "Zone Header Data:");
+	c->Message(Chat::White, "Sky Type: %i",  zone->newzone_data.sky);
+	c->Message(Chat::White, "Fog Colour: Red: %i; Blue: %i; Green %i",  zone->newzone_data.fog_red[0], zone->newzone_data.fog_green[0], zone->newzone_data.fog_blue[0]);
+	c->Message(Chat::White, "Safe Coords: %f, %f, %f",  zone->newzone_data.safe_x, zone->newzone_data.safe_y, zone->newzone_data.safe_z);
+	c->Message(Chat::White, "Underworld Coords: %f",  zone->newzone_data.underworld);
+	c->Message(Chat::White, "Clip Plane: %f - %f",  zone->newzone_data.minclip, zone->newzone_data.maxclip);
 }
 
 void command_permaclass(Client *c, const Seperator *sep)
@@ -1903,16 +1907,16 @@ void command_permaclass(Client *c, const Seperator *sep)
 		t=c->GetTarget()->CastToClient();
 
 	if(sep->arg[1][0]==0) {
-		c->Message(0,"Usage: #permaclass <classnum>");
+		c->Message(Chat::White,"Usage: #permaclass <classnum>");
 	}
 	else if(!t->IsClient())
-		c->Message(0,"Target is not a client.");
+		c->Message(Chat::White,"Target is not a client.");
 	else {
-		c->Message(0, "Setting %s's class...Sending to char select.",  t->GetName());
+		c->Message(Chat::White, "Setting %s's class...Sending to char select.",  t->GetName());
 		Log(Logs::General, Logs::Normal, "Class change request from %s for %s, requested class:%i",  c->GetName(), t->GetName(), atoi(sep->arg[1]) );
 		t->SetBaseClass(atoi(sep->arg[1]));
 		t->Save();
-		t->Kick();
+		t->Kick("Class was changed.");
 	}
 }
 
@@ -1924,13 +1928,13 @@ void command_permarace(Client *c, const Seperator *sep)
 		t=c->GetTarget()->CastToClient();
 
 	if(sep->arg[1][0]==0) {
-		c->Message(0,"Usage: #permarace <racenum>");
-		c->Message(0,"NOTE: Not all models are global. If a model is not global, it will appear as a human on character select and in zones without the model.");
+		c->Message(Chat::White,"Usage: #permarace <racenum>");
+		c->Message(Chat::White,"NOTE: Not all models are global. If a model is not global, it will appear as a human on character select and in zones without the model.");
 	}
 	else if(!t->IsClient())
-		c->Message(0,"Target is not a client.");
+		c->Message(Chat::White,"Target is not a client.");
 	else {
-		c->Message(0, "Setting %s's race - zone to take effect", t->GetName());
+		c->Message(Chat::White, "Setting %s's race - zone to take effect", t->GetName());
 		Log(Logs::General, Logs::Normal, "Permanant race change request from %s for %s, requested race:%i",  c->GetName(), t->GetName(), atoi(sep->arg[1]) );
 		uint32 tmp = Mob::GetDefaultGender(atoi(sep->arg[1]), t->GetBaseGender());
 		t->SetBaseRace(atoi(sep->arg[1]));
@@ -1948,13 +1952,13 @@ void command_permagender(Client *c, const Seperator *sep)
 		t=c->GetTarget()->CastToClient();
 
 	if(sep->arg[1][0]==0) {
-		c->Message(0,"Usage: #permagender <gendernum>");
-		c->Message(0,"Gender Numbers: 0=Male, 1=Female, 2=Neuter");
+		c->Message(Chat::White,"Usage: #permagender <gendernum>");
+		c->Message(Chat::White,"Gender Numbers: 0=Male, 1=Female, 2=Neuter");
 	}
 	else if(!t->IsClient())
-		c->Message(0,"Target is not a client.");
+		c->Message(Chat::White,"Target is not a client.");
 	else {
-		c->Message(0, "Setting %s's gender - zone to take effect", t->GetName());
+		c->Message(Chat::White, "Setting %s's gender - zone to take effect", t->GetName());
 		Log(Logs::General, Logs::Normal, "Permanant gender change request from %s for %s, requested gender:%i",  c->GetName(), t->GetName(), atoi(sep->arg[1]) );
 		t->SetBaseGender(atoi(sep->arg[1]));
 		t->Save();
@@ -1965,12 +1969,12 @@ void command_permagender(Client *c, const Seperator *sep)
 void command_weather(Client *c, const Seperator *sep)
 {
 	if (!(sep->arg[1][0] == '0' || sep->arg[1][0] == '1' || sep->arg[1][0] == '2' || sep->arg[1][0] == '3')) {
-		c->Message(0, "Usage: #weather <0/1/2/3> - Off/Rain/Snow/Manual.");
+		c->Message(Chat::White, "Usage: #weather <0/1/2/3> - Off/Rain/Snow/Manual.");
 	}
 	else if(zone->zone_weather == 0) {
 		if(sep->arg[1][0] == '3')	{ // Put in modifications here because it had a very good chance at screwing up the client's weather system if rain was sent during snow -T7
 			if(sep->arg[2][0] != 0 && sep->arg[3][0] != 0) {
-				c->Message(0, "Sending weather packet... TYPE=%s, INTENSITY=%s",  sep->arg[2], sep->arg[3]);
+				c->Message(Chat::White, "Sending weather packet... TYPE=%s, INTENSITY=%s",  sep->arg[2], sep->arg[3]);
 				zone->zone_weather = atoi(sep->arg[2]);
 				auto outapp = new EQApplicationPacket(OP_Weather, 8);
 				outapp->pBuffer[0] = atoi(sep->arg[2]);
@@ -1979,7 +1983,7 @@ void command_weather(Client *c, const Seperator *sep)
 				safe_delete(outapp);
 			}
 			else {
-				c->Message(0, "Manual Usage: #weather 3 <type> <intensity>");
+				c->Message(Chat::White, "Manual Usage: #weather 3 <type> <intensity>");
 			}
 		}
 		else if(sep->arg[1][0] == '2')	{
@@ -2033,16 +2037,16 @@ void command_zheader(Client *c, const Seperator *sep)
 {
 	// sends zhdr packet
 	if(sep->arg[1][0]==0) {
-		c->Message(0, "Usage: #zheader <zone name>");
+		c->Message(Chat::White, "Usage: #zheader <zone name>");
 	}
 	else if(database.GetZoneID(sep->argplus[1])==0)
-		c->Message(0, "Invalid Zone Name: %s",  sep->argplus[1]);
+		c->Message(Chat::White, "Invalid Zone Name: %s",  sep->argplus[1]);
 	else {
 
 		if (zone->LoadZoneCFG(sep->argplus[1], 0))
-			c->Message(0, "Successfully loaded zone header for %s from database.",  sep->argplus[1]);
+			c->Message(Chat::White, "Successfully loaded zone header for %s from database.",  sep->argplus[1]);
 		else
-			c->Message(0, "Failed to load zone header %s from database",  sep->argplus[1]);
+			c->Message(Chat::White, "Failed to load zone header %s from database",  sep->argplus[1]);
 		auto outapp = new EQApplicationPacket(OP_NewZone, sizeof(NewZone_Struct));
 		memcpy(outapp->pBuffer, &zone->newzone_data, outapp->size);
 		entity_list.QueueClients(c, outapp);
@@ -2054,9 +2058,9 @@ void command_zsky(Client *c, const Seperator *sep)
 {
 	// modifys and resends zhdr packet
 	if(sep->arg[1][0]==0)
-		c->Message(0, "Usage: #zsky <sky type>");
+		c->Message(Chat::White, "Usage: #zsky <sky type>");
 	else if(atoi(sep->arg[1])<0||atoi(sep->arg[1])>255)
-		c->Message(0, "ERROR: Sky type can not be less than 0 or greater than 255!");
+		c->Message(Chat::White, "ERROR: Sky type can not be less than 0 or greater than 255!");
 	else {
 		zone->newzone_data.sky = atoi(sep->arg[1]);
 		auto outapp = new EQApplicationPacket(OP_NewZone, sizeof(NewZone_Struct));
@@ -2070,13 +2074,13 @@ void command_zcolor(Client *c, const Seperator *sep)
 {
 	// modifys and resends zhdr packet
 	if (sep->arg[3][0]==0)
-		c->Message(0, "Usage: #zcolor <red> <green> <blue>");
+		c->Message(Chat::White, "Usage: #zcolor <red> <green> <blue>");
 	else if (atoi(sep->arg[1])<0||atoi(sep->arg[1])>255)
-		c->Message(0, "ERROR: Red can not be less than 0 or greater than 255!");
+		c->Message(Chat::White, "ERROR: Red can not be less than 0 or greater than 255!");
 	else if (atoi(sep->arg[2])<0||atoi(sep->arg[2])>255)
-		c->Message(0, "ERROR: Green can not be less than 0 or greater than 255!");
+		c->Message(Chat::White, "ERROR: Green can not be less than 0 or greater than 255!");
 	else if (atoi(sep->arg[3])<0||atoi(sep->arg[3])>255)
-		c->Message(0, "ERROR: Blue can not be less than 0 or greater than 255!");
+		c->Message(Chat::White, "ERROR: Blue can not be less than 0 or greater than 255!");
 	else {
 		for (int z=0; z<4; z++) {
 			zone->newzone_data.fog_red[z] = atoi(sep->arg[1]);
@@ -2109,7 +2113,7 @@ void command_itemtest(Client *c, const Seperator *sep)
 	//Using this to determine new item layout
 	FILE* f = nullptr;
 	if (!(f = fopen("c:\\EQEMUcvs\\ItemDump.txt",  "rb"))) {
-		c->Message(13, "Error: Could not open c:\\EQEMUcvs\\ItemDump.txt");
+		c->Message(Chat::Red, "Error: Could not open c:\\EQEMUcvs\\ItemDump.txt");
 		return;
 	}
 
@@ -2129,7 +2133,7 @@ void command_gassign(Client *c, const Seperator *sep)
 		database.AssignGrid(c, atoi(sep->arg[1]), spawn2id);
 	}
 	else
-		c->Message(0, "Usage: #gassign [num] - must have an npc target!");
+		c->Message(Chat::White, "Usage: #gassign [num] - must have an npc target!");
 }
 
 void command_ai(Client *c, const Seperator *sep)
@@ -2141,37 +2145,37 @@ void command_ai(Client *c, const Seperator *sep)
 			if (target->IsNPC())
 				target->CastToNPC()->SetNPCFactionID(atoi(sep->arg[2]));
 			else
-				c->Message(0, "%s is not an NPC.",  target->GetName());
+				c->Message(Chat::White, "%s is not an NPC.",  target->GetName());
 		}
 		else
-			c->Message(0, "Usage: (targeted) #ai factionid [factionid]");
+			c->Message(Chat::White, "Usage: (targeted) #ai factionid [factionid]");
 	}
 	else if (strcasecmp(sep->arg[1], "spellslist") == 0) {
 		if (target && sep->IsNumber(2) && atoi(sep->arg[2]) >= 0) {
 			if (target->IsNPC())
 				target->CastToNPC()->AI_AddNPCSpells(atoi(sep->arg[2]));
 			else
-				c->Message(0, "%s is not an NPC.",  target->GetName());
+				c->Message(Chat::White, "%s is not an NPC.",  target->GetName());
 		}
 		else
-			c->Message(0, "Usage: (targeted) #ai spellslist [npc_spells_id]");
+			c->Message(Chat::White, "Usage: (targeted) #ai spellslist [npc_spells_id]");
 	}
 	else if (strcasecmp(sep->arg[1], "con") == 0) {
 		if (target && sep->arg[2][0] != 0) {
 			Mob* tar2 = entity_list.GetMob(sep->arg[2]);
 			if (tar2)
-				c->Message(0, "%s considering %s: %i",  target->GetName(), tar2->GetName(), tar2->GetReverseFactionCon(target));
+				c->Message(Chat::White, "%s considering %s: %i",  target->GetName(), tar2->GetName(), tar2->GetReverseFactionCon(target));
 			else
-				c->Message(0, "Error: %s not found.",  sep->arg[2]);
+				c->Message(Chat::White, "Error: %s not found.",  sep->arg[2]);
 		}
 		else
-			c->Message(0, "Usage: (targeted) #ai con [mob name]");
+			c->Message(Chat::White, "Usage: (targeted) #ai con [mob name]");
 	}
 	else if (strcasecmp(sep->arg[1], "guard") == 0) {
 		if (target && target->IsNPC())
 			target->CastToNPC()->SaveGuardSpot(target->GetPosition());
 		else
-			c->Message(0, "Usage: (targeted) #ai guard - sets npc to guard the current location (use #summon to move)");
+			c->Message(Chat::White, "Usage: (targeted) #ai guard - sets npc to guard the current location (use #summon to move)");
 	}
 	else if (strcasecmp(sep->arg[1], "roambox") == 0) {
 		if (target && target->IsAIControlled() && target->IsNPC()) {
@@ -2194,39 +2198,39 @@ void command_ai(Client *c, const Seperator *sep)
 				target->CastToNPC()->AI_SetRoambox(atof(sep->arg[2]), atof(sep->arg[3]), tmp, tmp2);
 			}
 			else {
-				c->Message(0, "Usage: #ai roambox dist max_x min_x max_y min_y [delay] [mindelay]");
-				c->Message(0, "Usage: #ai roambox dist roamdist [delay] [mindelay]");
+				c->Message(Chat::White, "Usage: #ai roambox dist max_x min_x max_y min_y [delay] [mindelay]");
+				c->Message(Chat::White, "Usage: #ai roambox dist roamdist [delay] [mindelay]");
 			}
 		}
 		else
-			c->Message(0, "You need a AI NPC targeted");
+			c->Message(Chat::White, "You need a AI NPC targeted");
 	}
 	else if (strcasecmp(sep->arg[1], "stop") == 0 && c->Admin() >= commandToggleAI) {
 		if (target) {
 			if (target->IsAIControlled())
 				target->AI_Stop();
 			else
-				c->Message(0, "Error: Target is not AI controlled");
+				c->Message(Chat::White, "Error: Target is not AI controlled");
 		}
 		else
-			c->Message(0, "Usage: Target a Mob with AI enabled and use this to turn off their AI.");
+			c->Message(Chat::White, "Usage: Target a Mob with AI enabled and use this to turn off their AI.");
 	}
 	else if (strcasecmp(sep->arg[1], "start") == 0 && c->Admin() >= commandToggleAI) {
 		if (target) {
 			if (!target->IsAIControlled())
 				target->AI_Start();
 			else
-				c->Message(0, "Error: Target is already AI controlled");
+				c->Message(Chat::White, "Error: Target is already AI controlled");
 		}
 		else
-			c->Message(0, "Usage: Target a Mob with AI disabled and use this to turn on their AI.");
+			c->Message(Chat::White, "Usage: Target a Mob with AI disabled and use this to turn on their AI.");
 	}
 	else {
-		c->Message(0, "#AI Sub-commands");
-		c->Message(0, "  factionid");
-		c->Message(0, "  spellslist");
-		c->Message(0, "  con");
-		c->Message(0, "  guard");
+		c->Message(Chat::White, "#AI Sub-commands");
+		c->Message(Chat::White, "  factionid");
+		c->Message(Chat::White, "  spellslist");
+		c->Message(Chat::White, "  con");
+		c->Message(Chat::White, "  guard");
 	}
 }
 
@@ -2238,7 +2242,7 @@ void command_worldshutdown(Client *c, const Seperator *sep)
 	if (worldserver.Connected()) {
 		if(sep->IsNumber(1) && sep->IsNumber(2) && ((time=atoi(sep->arg[1]))>0) && ((interval=atoi(sep->arg[2]))>0)) {
 			worldserver.SendEmoteMessage(0,0,15,"<SYSTEMWIDE MESSAGE>:SYSTEM MSG:World coming down in %i minutes, everyone log out before this time.",  (time / 60 ));
-			c->Message(0, "Sending shutdown packet now, World will shutdown in: %i minutes with an interval of: %i seconds",  (time / 60), interval);
+			c->Message(Chat::White, "Sending shutdown packet now, World will shutdown in: %i minutes with an interval of: %i seconds",  (time / 60), interval);
 			auto pack = new ServerPacket(ServerOP_ShutdownAll, sizeof(WorldShutDown_Struct));
 			WorldShutDown_Struct* wsd = (WorldShutDown_Struct*)pack->pBuffer;
 			wsd->time=time*1000;
@@ -2248,7 +2252,7 @@ void command_worldshutdown(Client *c, const Seperator *sep)
 		}
 		else if(strcasecmp(sep->arg[1], "now") == 0){
 			worldserver.SendEmoteMessage(0,0,15,"<SYSTEMWIDE MESSAGE>:SYSTEM MSG:World coming down, everyone log out now.");
-			c->Message(0, "Sending shutdown packet");
+			c->Message(Chat::White, "Sending shutdown packet");
 			auto pack = new ServerPacket;
 			pack->opcode = ServerOP_ShutdownAll;
 			pack->size=0;
@@ -2256,7 +2260,7 @@ void command_worldshutdown(Client *c, const Seperator *sep)
 			safe_delete(pack);
 		}
 		else if(strcasecmp(sep->arg[1], "disable") == 0){
-			c->Message(0, "Shutdown prevented, next time I may not be so forgiving...");
+			c->Message(Chat::White, "Shutdown prevented, next time I may not be so forgiving...");
 			auto pack = new ServerPacket(ServerOP_ShutdownAll, sizeof(WorldShutDown_Struct));
 			WorldShutDown_Struct* wsd = (WorldShutDown_Struct*)pack->pBuffer;
 			wsd->time=0;
@@ -2265,14 +2269,14 @@ void command_worldshutdown(Client *c, const Seperator *sep)
 			safe_delete(pack);
 		}
 		else{
-			c->Message(0,"#worldshutdown - Shuts down the server and all zones.");
-			c->Message(0,"Usage: #worldshutdown now - Shuts down the server and all zones immediately.");
-			c->Message(0,"Usage: #worldshutdown disable - Stops the server from a previously scheduled shut down.");
-			c->Message(0,"Usage: #worldshutdown [timer] [interval] - Shuts down the server and all zones after [timer] seconds and sends warning every [interval] seconds.");
+			c->Message(Chat::White,"#worldshutdown - Shuts down the server and all zones.");
+			c->Message(Chat::White,"Usage: #worldshutdown now - Shuts down the server and all zones immediately.");
+			c->Message(Chat::White,"Usage: #worldshutdown disable - Stops the server from a previously scheduled shut down.");
+			c->Message(Chat::White,"Usage: #worldshutdown [timer] [interval] - Shuts down the server and all zones after [timer] seconds and sends warning every [interval] seconds.");
 		}
 	}
 	else
-		c->Message(0, "Error: World server disconnected");
+		c->Message(Chat::White, "Error: World server disconnected");
 }
 
 void command_sendzonespawns(Client *c, const Seperator *sep)
@@ -2283,10 +2287,10 @@ void command_sendzonespawns(Client *c, const Seperator *sep)
 void command_zsave(Client *c, const Seperator *sep)
 {
 	if (zone->SaveZoneCFG()) {
-		c->Message(13, "Zone header saved successfully.");
+		c->Message(Chat::Red, "Zone header saved successfully.");
 	}
 	else {
-		c->Message(13, "ERROR: Zone header data was NOT saved.");
+		c->Message(Chat::Red, "ERROR: Zone header data was NOT saved.");
 	}
 }
 
@@ -2305,7 +2309,7 @@ void command_dbspawn2(Client *c, const Seperator *sep)
 		database.CreateSpawn2(c, atoi(sep->arg[1]), zone->GetShortName(), c->GetPosition(), atoi(sep->arg[2]), atoi(sep->arg[3]), cond, cond_min);
 	}
 	else {
-		c->Message(0, "Usage: #dbspawn2 spawngroup respawn variance [condition_id] [condition_min]");
+		c->Message(Chat::White, "Usage: #dbspawn2 spawngroup respawn variance [condition_id] [condition_min]");
 	}
 }
 
@@ -2317,36 +2321,36 @@ void command_shutdown(Client *c, const Seperator *sep)
 void command_delacct(Client *c, const Seperator *sep)
 {
 	if(sep->arg[1][0] == 0)
-		c->Message(0, "Format: #delacct accountname");
+		c->Message(Chat::White, "Format: #delacct accountname");
 	else
 		if (database.DeleteAccount(sep->arg[1]))
-			c->Message(0, "The account was deleted.");
+			c->Message(Chat::White, "The account was deleted.");
 		else
-			c->Message(0, "Unable to delete account.");
+			c->Message(Chat::White, "Unable to delete account.");
 }
 
 void command_setpass(Client *c, const Seperator *sep)
 {
 	if(sep->argnum != 2)
-		c->Message(0, "Format: #setpass accountname password");
+		c->Message(Chat::White, "Format: #setpass accountname password");
 	else {
 		int16 tmpstatus = 0;
 		uint32 tmpid = database.GetAccountIDByName(sep->arg[1], &tmpstatus);
 		if (!tmpid)
-			c->Message(0, "Error: Account not found");
+			c->Message(Chat::White, "Error: Account not found");
 		else if (tmpstatus > c->Admin())
-			c->Message(0, "Cannot change password: Account's status is higher than yours");
+			c->Message(Chat::White, "Cannot change password: Account's status is higher than yours");
 		else if (database.SetLocalPassword(tmpid, sep->arg[2]))
-			c->Message(0, "Password changed.");
+			c->Message(Chat::White, "Password changed.");
 		else
-			c->Message(0, "Error changing password.");
+			c->Message(Chat::White, "Error changing password.");
 	}
 }
 
 void command_setlsinfo(Client *c, const Seperator *sep)
 {
 	if(sep->argnum != 2)
-		c->Message(0, "Format: #setlsinfo email password");
+		c->Message(Chat::White, "Format: #setlsinfo email password");
 	else {
 		auto pack = new ServerPacket(ServerOP_LSAccountUpdate, sizeof(ServerLSAccountUpdate_Struct));
 		ServerLSAccountUpdate_Struct* s = (ServerLSAccountUpdate_Struct *) pack->pBuffer;
@@ -2355,14 +2359,14 @@ void command_setlsinfo(Client *c, const Seperator *sep)
 		strn0cpy(s->useremail, sep->arg[1], 100);
 		strn0cpy(s->userpassword, sep->arg[2], 50);
 		worldserver.SendPacket(pack);
-		c->Message(0, "Login Server update packet sent.");
+		c->Message(Chat::White, "Login Server update packet sent.");
 	}
 }
 
 void command_grid(Client *c, const Seperator *sep)
 {
 	if (strcasecmp("max", sep->arg[1]) == 0) {
-		c->Message(0, "Highest grid ID in this zone: %d", database.GetHighestGrid(zone->GetZoneID()));
+		c->Message(Chat::White, "Highest grid ID in this zone: %d", database.GetHighestGrid(zone->GetZoneID()));
 	}
 	else if (strcasecmp("add", sep->arg[1]) == 0) {
 		database.ModifyGrid(c, false, atoi(sep->arg[2]), atoi(sep->arg[3]), atoi(sep->arg[4]), zone->GetZoneID());
@@ -2372,7 +2376,7 @@ void command_grid(Client *c, const Seperator *sep)
 		Mob *target = c->GetTarget();
 
 		if (!target || !target->IsNPC()) {
-			c->Message(0, "You need a NPC target!");
+			c->Message(Chat::White, "You need a NPC target!");
 			return;
 		}
 
@@ -2387,12 +2391,12 @@ void command_grid(Client *c, const Seperator *sep)
 
 		auto results = database.QueryDatabase(query);
 		if (!results.Success()) {
-			c->Message(0, "Error querying database.");
-			c->Message(0, query.c_str());
+			c->Message(Chat::White, "Error querying database.");
+			c->Message(Chat::White, query.c_str());
 		}
 
 		if (results.RowCount() == 0) {
-			c->Message(0, "No grid found");
+			c->Message(Chat::White, "No grid found");
 			return;
 		}
 
@@ -2428,8 +2432,8 @@ void command_grid(Client *c, const Seperator *sep)
 		database.ModifyGrid(c, true, atoi(sep->arg[2]), 0, 0, zone->GetZoneID());
 	}
 	else {
-		c->Message(0, "Usage: #grid add/delete grid_num wandertype pausetype");
-		c->Message(0, "Usage: #grid max - displays the highest grid ID used in this zone (for add)");
+		c->Message(Chat::White, "Usage: #grid add/delete grid_num wandertype pausetype");
+		c->Message(Chat::White, "Usage: #grid max - displays the highest grid ID used in this zone (for add)");
 	}
 }
 
@@ -2452,7 +2456,7 @@ void command_wp(Client *c, const Seperator *sep)
 	else if (strcasecmp("delete", sep->arg[1]) == 0)
 		database.DeleteWaypoint(c, atoi(sep->arg[2]),wp,zone->GetZoneID());
 	else
-		c->Message(0,"Usage: #wp add/delete grid_num pause wp_num [-h]");
+		c->Message(Chat::White,"Usage: #wp add/delete grid_num pause wp_num [-h]");
 }
 
 void command_iplookup(Client *c, const Seperator *sep)
@@ -2472,15 +2476,15 @@ void command_size(Client *c, const Seperator *sep)
 {
 	Mob *target=c->GetTarget();
 	if (!sep->IsNumber(1))
-		c->Message(0, "Usage: #size [0 - 255] (Decimal increments are allowed)");
+		c->Message(Chat::White, "Usage: #size [0 - 255] (Decimal increments are allowed)");
 	else {
 		float newsize = atof(sep->arg[1]);
 		if (newsize > 255)
-			c->Message(0, "Error: #size: Size can not be greater than 255.");
+			c->Message(Chat::White, "Error: #size: Size can not be greater than 255.");
 		else if (newsize < 0)
-			c->Message(0, "Error: #size: Size can not be less than 0.");
+			c->Message(Chat::White, "Error: #size: Size can not be less than 0.");
 		else if (!target)
-			c->Message(0,"Error: this command requires a target");
+			c->Message(Chat::White,"Error: this command requires a target");
 		else {
 			uint16 Race = target->GetRace();
 			uint8 Gender = target->GetGender();
@@ -2501,7 +2505,7 @@ void command_size(Client *c, const Seperator *sep)
 										EyeColor1, EyeColor2, HairStyle, LuclinFace, Beard, 0xFF,
 										DrakkinHeritage, DrakkinTattoo, DrakkinDetails, newsize);
 
-			c->Message(0,"Size = %f",  atof(sep->arg[1]));
+			c->Message(Chat::White,"Size = %f",  atof(sep->arg[1]));
 		}
 	}
 }
@@ -2523,7 +2527,7 @@ void command_flymode(Client *c, const Seperator *sep)
 	Mob *t = c;
 
 	if (strlen(sep->arg[1]) == 1 && !(sep->arg[1][0] == '0' || sep->arg[1][0] == '1' || sep->arg[1][0] == '2' || sep->arg[1][0] == '3' || sep->arg[1][0] == '4' || sep->arg[1][0] == '5'))
-		c->Message(0, "#flymode [0/1/2/3/4/5]");
+		c->Message(Chat::White, "#flymode [0/1/2/3/4/5]");
 	else {
 		if (c->GetTarget()) {
 			t = c->GetTarget();
@@ -2534,22 +2538,22 @@ void command_flymode(Client *c, const Seperator *sep)
 		t->SetFlyMode(static_cast<GravityBehavior>(fm));
 		t->SendAppearancePacket(AT_Levitate, fm);
 		if (sep->arg[1][0] == '0') {
-			c->Message(0, "Setting %s to Grounded", t->GetName());
+			c->Message(Chat::White, "Setting %s to Grounded", t->GetName());
 		}
 		else if (sep->arg[1][0] == '1') {
-			c->Message(0, "Setting %s to Flying", t->GetName());
+			c->Message(Chat::White, "Setting %s to Flying", t->GetName());
 		}
 		else if (sep->arg[1][0] == '2') {
-			c->Message(0, "Setting %s to Levitating", t->GetName());
+			c->Message(Chat::White, "Setting %s to Levitating", t->GetName());
 		}
 		else if (sep->arg[1][0] == '3') {
-			c->Message(0, "Setting %s to In Water", t->GetName());
+			c->Message(Chat::White, "Setting %s to In Water", t->GetName());
 		}
 		else if (sep->arg[1][0] == '4') {
-			c->Message(0, "Setting %s to Floating(Boat)", t->GetName());
+			c->Message(Chat::White, "Setting %s to Floating(Boat)", t->GetName());
 		}
 		else if (sep->arg[1][0] == '5') {
-			c->Message(0, "Setting %s to Levitating While Running", t->GetName());
+			c->Message(Chat::White, "Setting %s to Levitating While Running", t->GetName());
 		}
 	}
 }
@@ -2561,24 +2565,24 @@ void command_showskills(Client *c, const Seperator *sep)
 	if(c->GetTarget() && c->GetTarget()->IsClient())
 		t=c->GetTarget()->CastToClient();
 
-	c->Message(0, "Skills for %s",  t->GetName());
+	c->Message(Chat::White, "Skills for %s",  t->GetName());
 	for (EQEmu::skills::SkillType i = EQEmu::skills::Skill1HBlunt; i <= EQEmu::skills::HIGHEST_SKILL; i = (EQEmu::skills::SkillType)(i + 1))
-		c->Message(0, "Skill [%d] is at [%d] - %u",  i, t->GetSkill(i), t->GetRawSkill(i));
+		c->Message(Chat::White, "Skill [%d] is at [%d] - %u",  i, t->GetSkill(i), t->GetRawSkill(i));
 }
 
 void command_findspell(Client *c, const Seperator *sep)
 {
 	if (sep->arg[1][0] == 0)
-		c->Message(0, "Usage: #FindSpell [spellname]");
+		c->Message(Chat::White, "Usage: #FindSpell [spellname]");
 	else if (SPDAT_RECORDS <= 0)
-		c->Message(0, "Spells not loaded");
+		c->Message(Chat::White, "Spells not loaded");
 	else if (Seperator::IsNumber(sep->argplus[1])) {
 		int spellid = atoi(sep->argplus[1]);
 		if (spellid <= 0 || spellid >= SPDAT_RECORDS) {
-			c->Message(0, "Error: Number out of range");
+			c->Message(Chat::White, "Error: Number out of range");
 		}
 		else {
-			c->Message(0, "  %i: %s",  spellid, spells[spellid].name);
+			c->Message(Chat::White, "  %i: %s",  spellid, spells[spellid].name);
 		}
 	}
 	else {
@@ -2595,7 +2599,7 @@ void command_findspell(Client *c, const Seperator *sep)
 				strupr(sName);
 				char* pdest = strstr(sName, sCriteria);
 				if ((pdest != nullptr) && (count <=20)) {
-					c->Message(0, "  %i: %s",  i, spells[i].name);
+					c->Message(Chat::White, "  %i: %s",  i, spells[i].name);
 					count++;
 				}
 				else if (count > 20)
@@ -2603,16 +2607,16 @@ void command_findspell(Client *c, const Seperator *sep)
 			}
 		}
 		if (count > 20)
-			c->Message(0, "20 spells found... max reached.");
+			c->Message(Chat::White, "20 spells found... max reached.");
 		else
-			c->Message(0, "%i spells found.",  count);
+			c->Message(Chat::White, "%i spells found.",  count);
 	}
 }
 
 void command_castspell(Client *c, const Seperator *sep)
 {
 	if (!sep->IsNumber(1))
-		c->Message(0, "Usage: #CastSpell spellid");
+		c->Message(Chat::White, "Usage: #CastSpell spellid");
 	else {
 		uint16 spellid = atoi(sep->arg[1]);
 		/*
@@ -2625,9 +2629,9 @@ void command_castspell(Client *c, const Seperator *sep)
 			((spellid >= 1342) && (spellid <= 1348)) || (spellid == 1923) || (spellid == 1924) ||
 			(spellid == 3355)) &&
 			c->Admin() < commandCastSpecials)
-			c->Message(13, "Unable to cast spell.");
+			c->Message(Chat::Red, "Unable to cast spell.");
 		else if (spellid >= SPDAT_RECORDS)
-			c->Message(0, "Error: #CastSpell: Argument out of range");
+			c->Message(Chat::White, "Error: #CastSpell: Argument out of range");
 		else
 			if (c->GetTarget() == 0)
 				if(c->Admin() >= commandInstacast)
@@ -2646,51 +2650,51 @@ void command_setlanguage(Client *c, const Seperator *sep)
 {
 	if (strcasecmp(sep->arg[1], "list" ) == 0 )
 	{
-		c->Message(0, "Languages:");
-		c->Message(0, "(0) Common Tongue");
-		c->Message(0, "(1) Barbarian");
-		c->Message(0, "(2) Erudian");
-		c->Message(0, "(3) Elvish");
-		c->Message(0, "(4) Dark Elvish");
-		c->Message(0, "(5) Dwarvish");
-		c->Message(0, "(6) Troll");
-		c->Message(0, "(7) Ogre");
-		c->Message(0, "(8) Gnomish");
-		c->Message(0, "(9) Halfling");
-		c->Message(0, "(10) Thieves Cant");
-		c->Message(0, "(11) Old Erudian");
-		c->Message(0, "(12) Elder Elvish");
-		c->Message(0, "(13) Froglok");
-		c->Message(0, "(14) Goblin");
-		c->Message(0, "(15) Gnoll");
-		c->Message(0, "(16) Combine Tongue");
-		c->Message(0, "(17) Elder Teir`Dal");
-		c->Message(0, "(18) Lizardman");
-		c->Message(0, "(19) Orcish");
-		c->Message(0, "(20) Faerie");
-		c->Message(0, "(21) Dragon");
-		c->Message(0, "(22) Elder Dragon");
-		c->Message(0, "(23) Dark Speech");
-		c->Message(0, "(24) Vah Shir");
-		c->Message(0, "(25) Alaran");
-		c->Message(0, "(26) Hadal");
-		c->Message(0, "(27) Unknown1");
+		c->Message(Chat::White, "Languages:");
+		c->Message(Chat::White, "(0) Common Tongue");
+		c->Message(Chat::White, "(1) Barbarian");
+		c->Message(Chat::White, "(2) Erudian");
+		c->Message(Chat::White, "(3) Elvish");
+		c->Message(Chat::White, "(4) Dark Elvish");
+		c->Message(Chat::White, "(5) Dwarvish");
+		c->Message(Chat::White, "(6) Troll");
+		c->Message(Chat::White, "(7) Ogre");
+		c->Message(Chat::White, "(8) Gnomish");
+		c->Message(Chat::White, "(9) Halfling");
+		c->Message(Chat::White, "(10) Thieves Cant");
+		c->Message(Chat::White, "(11) Old Erudian");
+		c->Message(Chat::White, "(12) Elder Elvish");
+		c->Message(Chat::White, "(13) Froglok");
+		c->Message(Chat::White, "(14) Goblin");
+		c->Message(Chat::White, "(15) Gnoll");
+		c->Message(Chat::White, "(16) Combine Tongue");
+		c->Message(Chat::White, "(17) Elder Teir`Dal");
+		c->Message(Chat::White, "(18) Lizardman");
+		c->Message(Chat::White, "(19) Orcish");
+		c->Message(Chat::White, "(20) Faerie");
+		c->Message(Chat::White, "(21) Dragon");
+		c->Message(Chat::White, "(22) Elder Dragon");
+		c->Message(Chat::White, "(23) Dark Speech");
+		c->Message(Chat::White, "(24) Vah Shir");
+		c->Message(Chat::White, "(25) Alaran");
+		c->Message(Chat::White, "(26) Hadal");
+		c->Message(Chat::White, "(27) Unknown1");
 	}
 	else if( c->GetTarget() == 0 )
 	{
-		c->Message(0, "Error: #setlanguage: No target.");
+		c->Message(Chat::White, "Error: #setlanguage: No target.");
 	}
 	else if( !c->GetTarget()->IsClient() )
 	{
-		c->Message(0, "Error: Target must be a player.");
+		c->Message(Chat::White, "Error: Target must be a player.");
 	}
 	else if (
 				!sep->IsNumber(1) || atoi(sep->arg[1]) < 0 || atoi(sep->arg[1]) > 27 ||
 				!sep->IsNumber(2) || atoi(sep->arg[2]) < 0 || atoi(sep->arg[2]) > 100
 			)
 	{
-		c->Message(0, "Usage: #setlanguage [language ID] [value] (0-27, 0-100)");
-		c->Message(0, "Try #setlanguage list for a list of language IDs");
+		c->Message(Chat::White, "Usage: #setlanguage [language ID] [value] (0-27, 0-100)");
+		c->Message(Chat::White, "Try #setlanguage list for a list of language IDs");
 	}
 	else
 	{
@@ -2704,19 +2708,19 @@ void command_setlanguage(Client *c, const Seperator *sep)
 void command_setskill(Client *c, const Seperator *sep)
 {
 	if (c->GetTarget() == nullptr) {
-		c->Message(0, "Error: #setskill: No target.");
+		c->Message(Chat::White, "Error: #setskill: No target.");
 	}
 	else if (!c->GetTarget()->IsClient()) {
-		c->Message(0, "Error: #setskill: Target must be a client.");
+		c->Message(Chat::White, "Error: #setskill: Target must be a client.");
 	}
 	else if (
 		!sep->IsNumber(1) || atoi(sep->arg[1]) < 0 || atoi(sep->arg[1]) > EQEmu::skills::HIGHEST_SKILL ||
 						!sep->IsNumber(2) || atoi(sep->arg[2]) < 0 || atoi(sep->arg[2]) > HIGHEST_CAN_SET_SKILL
 					)
 	{
-		c->Message(0, "Usage: #setskill skill x ");
-		c->Message(0, "       skill = 0 to %d", EQEmu::skills::HIGHEST_SKILL);
-		c->Message(0, "       x = 0 to %d",  HIGHEST_CAN_SET_SKILL);
+		c->Message(Chat::White, "Usage: #setskill skill x ");
+		c->Message(Chat::White, "       skill = 0 to %d", EQEmu::skills::HIGHEST_SKILL);
+		c->Message(Chat::White, "       x = 0 to %d",  HIGHEST_CAN_SET_SKILL);
 	}
 	else {
 		Log(Logs::General, Logs::Normal, "Set skill request from %s, target:%s skill_id:%i value:%i",  c->GetName(), c->GetTarget()->GetName(), atoi(sep->arg[1]), atoi(sep->arg[2]) );
@@ -2730,12 +2734,12 @@ void command_setskill(Client *c, const Seperator *sep)
 void command_setskillall(Client *c, const Seperator *sep)
 {
 	if (c->GetTarget() == 0)
-		c->Message(0, "Error: #setallskill: No target.");
+		c->Message(Chat::White, "Error: #setallskill: No target.");
 	else if (!c->GetTarget()->IsClient())
-		c->Message(0, "Error: #setskill: Target must be a client.");
+		c->Message(Chat::White, "Error: #setskill: Target must be a client.");
 	else if (!sep->IsNumber(1) || atoi(sep->arg[1]) < 0 || atoi(sep->arg[1]) > HIGHEST_CAN_SET_SKILL) {
-		c->Message(0, "Usage: #setskillall value ");
-		c->Message(0, "       value = 0 to %d",  HIGHEST_CAN_SET_SKILL);
+		c->Message(Chat::White, "Usage: #setskillall value ");
+		c->Message(Chat::White, "       value = 0 to %d",  HIGHEST_CAN_SET_SKILL);
 	}
 	else {
 		if (c->Admin() >= commandSetSkillsOther || c->GetTarget()==c || c->GetTarget()==0) {
@@ -2746,7 +2750,7 @@ void command_setskillall(Client *c, const Seperator *sep)
 			}
 		}
 		else
-			c->Message(0, "Error: Your status is not high enough to set anothers skills");
+			c->Message(Chat::White, "Error: Your status is not high enough to set anothers skills");
 	}
 }
 
@@ -2763,11 +2767,11 @@ void command_race(Client *c, const Seperator *sep)
 			target->SendIllusionPacket(race);
 		}
 		else {
-			c->Message(0, "Usage: #race [0-732, 2253-2259] (0 for back to normal)");
+			c->Message(Chat::White, "Usage: #race [0-732, 2253-2259] (0 for back to normal)");
 		}
 	}
 	else {
-		c->Message(0, "Usage: #race [0-732, 2253-2259] (0 for back to normal)");
+		c->Message(Chat::White, "Usage: #race [0-732, 2253-2259] (0 for back to normal)");
 	}
 }
 
@@ -2781,13 +2785,13 @@ void command_gender(Client *c, const Seperator *sep)
 		t->SendIllusionPacket(t->GetRace(), atoi(sep->arg[1]));
 	}
 	else
-		c->Message(0, "Usage: #gender [0/1/2]");
+		c->Message(Chat::White, "Usage: #gender [0/1/2]");
 }
 
 void command_makepet(Client *c, const Seperator *sep)
 {
 	if (sep->arg[1][0] == '\0')
-		c->Message(0, "Usage: #makepet pet_type_name (will not survive across zones)");
+		c->Message(Chat::White, "Usage: #makepet pet_type_name (will not survive across zones)");
 	else
 		c->MakePet(0, sep->arg[1]);
 }
@@ -2797,9 +2801,9 @@ void command_level(Client *c, const Seperator *sep)
 	uint16 level = atoi(sep->arg[1]);
 
 	if ((level <= 0) || ((level > RuleI(Character, MaxLevel)) && (c->Admin() < commandLevelAboveCap))) {
-		c->Message(0, "Error: #Level: Invalid Level");
+		c->Message(Chat::White, "Error: #Level: Invalid Level");
 	}
-	else if (c->Admin() < 100) {
+	else if (c->Admin() < RuleI(GM, MinStatusToLevelTarget)) {
 		c->SetLevel(level, true);
 #ifdef BOTS
 		if(RuleB(Bots, BotLevelsWithOwner))
@@ -2807,11 +2811,11 @@ void command_level(Client *c, const Seperator *sep)
 #endif
 	}
 	else if (!c->GetTarget()) {
-		c->Message(0, "Error: #Level: No target");
+		c->Message(Chat::White, "Error: #Level: No target");
 	}
 	else {
 		if (!c->GetTarget()->IsNPC() && ((c->Admin() < commandLevelNPCAboveCap) && (level > RuleI(Character, MaxLevel)))) {
-			c->Message(0, "Error: #Level: Invalid Level");
+			c->Message(Chat::White, "Error: #Level: Invalid Level");
 		}
 		else {
 			c->GetTarget()->SetLevel(level, true);
@@ -2826,27 +2830,157 @@ void command_level(Client *c, const Seperator *sep)
 	}
 }
 
+void command_spawneditmass(Client *c, const Seperator *sep)
+{
+	std::string query = fmt::format(
+		SQL(
+			SELECT
+			npc_types.id,
+			npc_types.name,
+			spawn2.respawntime,
+			spawn2.id
+				FROM
+					npc_types
+				JOIN spawnentry ON spawnentry.npcID = npc_types.id
+				JOIN spawn2 ON spawn2.spawngroupID = spawnentry.spawngroupID
+				WHERE
+				spawn2.zone = '{0}' and spawn2.version = {1}
+				GROUP BY npc_types.id
+		),
+		zone->GetShortName(),
+		zone->GetInstanceVersion()
+	);
+
+	std::string status = "(Searching)";
+
+	if (strcasecmp(sep->arg[4], "apply") == 0) {
+		status = "(Applying)";
+	}
+
+	std::string search_value;
+	std::string edit_option;
+	std::string edit_value;
+	std::string apply_set;
+
+	if (sep->arg[1]) {
+		search_value = sep->arg[1];
+	}
+
+	if (sep->arg[2]) {
+		edit_option = sep->arg[2];
+	}
+
+	if (sep->arg[3]) {
+		edit_value = sep->arg[3];
+	}
+
+	if (sep->arg[4]) {
+		apply_set = sep->arg[4];
+	}
+
+	if (!edit_option.empty() && edit_value.empty()) {
+		c->Message(Chat::Yellow, "Please specify an edit option value | #npceditmass <search> <option> <value>");
+		return;
+	}
+
+	std::vector<std::string> npc_ids;
+	std::vector<std::string> spawn2_ids;
+
+	int  found_count = 0;
+	auto results     = database.QueryDatabase(query);
+
+	for (auto row = results.begin(); row != results.end(); ++row) {
+
+		std::string npc_id       = row[0];
+		std::string npc_name     = row[1];
+		std::string respawn_time = row[2];
+		std::string spawn2_id    = row[3];
+
+		if (npc_name.find(search_value) == std::string::npos) {
+			continue;
+		}
+
+		c->Message(
+			Chat::Yellow,
+			fmt::format(
+				"NPC ({0}) [{1}] respawn_time [{2}] {3}",
+				npc_id,
+				npc_name,
+				respawn_time,
+				status
+			).c_str()
+		);
+
+		npc_ids.push_back(npc_id);
+		spawn2_ids.push_back(spawn2_id);
+
+		found_count++;
+	}
+
+	c->Message(Chat::Yellow, "Found [%i] NPC Spawn2 entries that match this criteria in this zone", found_count);
+	if (edit_option.empty()) {
+		c->Message(Chat::Yellow, "Please specify an edit option | #npceditmass <search> <option>");
+		c->Message(Chat::Yellow, "Options [respawn_time]");
+		return;
+	}
+
+	std::string saylink = fmt::format(
+		"#spawneditmass {} {} {} apply",
+		search_value,
+		edit_option,
+		edit_value
+	);
+
+	if (found_count > 0) {
+		c->Message(
+			Chat::Yellow, "To apply these changes, click <%s> or type [%s]",
+			EQEmu::SayLinkEngine::GenerateQuestSaylink(saylink, false, "Apply").c_str(),
+			saylink.c_str()
+		);
+	}
+
+	if (edit_option == "respawn_time" && apply_set == "apply") {
+		std::string spawn2_ids_string = implode(",", spawn2_ids);
+		if (spawn2_ids_string.empty()) {
+			c->Message(Chat::Red, "Error: Ran into an unknown error compiling Spawn2 IDs");
+			return;
+		}
+
+		database.QueryDatabase(
+			fmt::format(
+				SQL(
+					UPDATE spawn2 SET respawntime = {} WHERE id IN({})
+				),
+				std::stoi(edit_value),
+				spawn2_ids_string
+			)
+		);
+
+		c->Message(Chat::Yellow, "Updated [%i] spawns", found_count);
+	}
+}
+
 void command_spawn(Client *c, const Seperator *sep)
 {
 	if (sep->arg[1][0] != 0){
 		Client* client = entity_list.GetClientByName(sep->arg[1]);
 		if(client){
-				c->Message(0,"You cannot spawn a mob with the same name as a character!");
+				c->Message(Chat::White,"You cannot spawn a mob with the same name as a character!");
 				return;
 		}
 	}
 
 	NPC* npc = NPC::SpawnNPC(sep->argplus[1], c->GetPosition(), c);
 	if (!npc) {
-		c->Message(0, "Format: #spawn name race level material hp gender class priweapon secweapon merchantid bodytype - spawns a npc those parameters.");
-		c->Message(0, "Name Format: NPCFirstname_NPCLastname - All numbers in a name are stripped and \"_\" characters become a space.");
-		c->Message(0, "Note: Using \"-\" for gender will autoselect the gender for the race. Using \"-\" for HP will use the calculated maximum HP.");
+		c->Message(Chat::White, "Format: #spawn name race level material hp gender class priweapon secweapon merchantid bodytype - spawns a npc those parameters.");
+		c->Message(Chat::White, "Name Format: NPCFirstname_NPCLastname - All numbers in a name are stripped and \"_\" characters become a space.");
+		c->Message(Chat::White, "Note: Using \"-\" for gender will autoselect the gender for the race. Using \"-\" for HP will use the calculated maximum HP.");
 	}
 }
 
 void command_test(Client *c, const Seperator *sep)
 {
-	c->Message(15, "Triggering test command");
+	c->Message(Chat::Yellow, "Triggering test command");
 
 	if (sep->arg[1]) {
 		c->SetPrimaryWeaponOrnamentation(atoi(sep->arg[1]));
@@ -2898,7 +3032,7 @@ void command_texture(Client *c, const Seperator *sep)
 		}
 	}
 	else
-		c->Message(0, "Usage: #texture [texture] [helmtexture] (0-255, 255 for show equipment)");
+		c->Message(Chat::White, "Usage: #texture [texture] [helmtexture] (0-255, 255 for show equipment)");
 }
 
 void command_npctypespawn(Client *c, const Seperator *sep)
@@ -2917,17 +3051,17 @@ void command_npctypespawn(Client *c, const Seperator *sep)
 			entity_list.AddNPC(npc);
 		}
 		else
-			c->Message(0, "NPC Type %i not found",  atoi(sep->arg[1]));
+			c->Message(Chat::White, "NPC Type %i not found",  atoi(sep->arg[1]));
 	}
 	else
-		c->Message(0, "Usage: #npctypespawn npctypeid factionid");
+		c->Message(Chat::White, "Usage: #npctypespawn npctypeid factionid");
 
 }
 
 void command_heal(Client *c, const Seperator *sep)
 {
 	if (c->GetTarget()==0)
-		c->Message(0, "Error: #Heal: No Target.");
+		c->Message(Chat::White, "Error: #Heal: No Target.");
 	else
 		c->GetTarget()->Heal();
 }
@@ -2939,12 +3073,12 @@ void command_appearance(Client *c, const Seperator *sep)
 	// sends any appearance packet
 	// Dev debug command, for appearance types
 	if (sep->arg[2][0] == 0)
-		c->Message(0, "Usage: #appearance type value");
+		c->Message(Chat::White, "Usage: #appearance type value");
 	else {
 		if ((c->GetTarget()))
 			t=c->GetTarget();
 		t->SendAppearancePacket(atoi(sep->arg[1]), atoi(sep->arg[2]));
-		c->Message(0, "Sending appearance packet: target=%s, type=%s, value=%s",  t->GetName(), sep->arg[1], sep->arg[2]);
+		c->Message(Chat::White, "Sending appearance packet: target=%s, type=%s, value=%s",  t->GetName(), sep->arg[1], sep->arg[2]);
 	}
 }
 
@@ -2955,10 +3089,10 @@ void command_nukeitem(Client *c, const Seperator *sep)
 	if (c->GetTarget() && c->GetTarget()->IsClient() && (sep->IsNumber(1) || sep->IsHexNumber(1))) {
 		itemid=sep->IsNumber(1)?atoi(sep->arg[1]):hextoi(sep->arg[1]);
 		numitems = c->GetTarget()->CastToClient()->NukeItem(itemid);
-		c->Message(0, " %u items deleted",  numitems);
+		c->Message(Chat::White, " %u items deleted",  numitems);
 	}
 	else
-		c->Message(0, "Usage: (targted) #nukeitem itemnum - removes the item from the player's inventory");
+		c->Message(Chat::White, "Usage: (targted) #nukeitem itemnum - removes the item from the player's inventory");
 }
 
 void command_peekinv(Client *c, const Seperator *sep)
@@ -2998,7 +3132,7 @@ void command_peekinv(Client *c, const Seperator *sep)
 		return;
 
 	if (c->GetTarget() && !c->GetTarget()->IsClient()) {
-		c->Message(0, "You must target a PC for this command.");
+		c->Message(Chat::White, "You must target a PC for this command.");
 		return;
 	}
 
@@ -3019,9 +3153,9 @@ void command_peekinv(Client *c, const Seperator *sep)
 	else if (strcasecmp(sep->arg[1], "world") == 0) { scopeMask |= peekWorld; }
 
 	if (!scopeMask) {
-		c->Message(0, "Usage: #peekinv [equip|gen|cursor|poss|limbo|curlim|trib|bank|shbank|allbank|trade|world|all]");
-		c->Message(0, "- Displays a portion of the targeted user's inventory");
-		c->Message(0, "- Caution: 'all' is a lot of information!");
+		c->Message(Chat::White, "Usage: #peekinv [equip|gen|cursor|poss|limbo|curlim|trib|bank|shbank|allbank|trade|world|all]");
+		c->Message(Chat::White, "- Displays a portion of the targeted user's inventory");
+		c->Message(Chat::White, "- Caution: 'all' is a lot of information!");
 		return;
 	}
 
@@ -3037,7 +3171,7 @@ void command_peekinv(Client *c, const Seperator *sep)
 	EQEmu::SayLinkEngine linker;
 	linker.SetLinkType(EQEmu::saylink::SayLinkItemInst);
 
-	c->Message(0, "Displaying inventory for %s...", targetClient->GetName());
+	c->Message(Chat::White, "Displaying inventory for %s...", targetClient->GetName());
 
 	Object* objectTradeskill = targetClient->GetTradeskillObject();
 
@@ -3049,11 +3183,11 @@ void command_peekinv(Client *c, const Seperator *sep)
 
 		if (scopeBit & peekWorld) {
 			if (objectTradeskill == nullptr) {
-				c->Message(1, "No world tradeskill object selected...");
+				c->Message(Chat::Default, "No world tradeskill object selected...");
 				continue;
 			}
 			else {
-				c->Message(0, "[WorldObject DBID: %i (entityid: %i)]", objectTradeskill->GetDBID(), objectTradeskill->GetID());
+				c->Message(Chat::White, "[WorldObject DBID: %i (entityid: %i)]", objectTradeskill->GetDBID(), objectTradeskill->GetID());
 			}
 		}
 
@@ -3257,7 +3391,7 @@ void command_peekinv(Client *c, const Seperator *sep)
 	}
 
 	if (!itemsFound)
-		c->Message(0, "No items found.");
+		c->Message(Chat::White, "No items found.");
 }
 
 void command_interrogateinv(Client *c, const Seperator *sep)
@@ -3276,14 +3410,14 @@ void command_interrogateinv(Client *c, const Seperator *sep)
 
 	if (strcasecmp(sep->arg[1], "help") == 0) {
 		if (c->Admin() < commandInterrogateInv) {
-			c->Message(0, "Usage: #interrogateinv");
-			c->Message(0, "  Displays your inventory's current in-memory nested storage references");
+			c->Message(Chat::White, "Usage: #interrogateinv");
+			c->Message(Chat::White, "  Displays your inventory's current in-memory nested storage references");
 		}
 		else {
-			c->Message(0, "Usage: #interrogateinv [log] [silent]");
-			c->Message(0, "  Displays your or your Player target inventory's current in-memory nested storage references");
-			c->Message(0, "  [log] - Logs interrogation to file");
-			c->Message(0, "  [silent] - Omits the in-game message portion of the interrogation");
+			c->Message(Chat::White, "Usage: #interrogateinv [log] [silent]");
+			c->Message(Chat::White, "  Displays your or your Player target inventory's current in-memory nested storage references");
+			c->Message(Chat::White, "  [log] - Logs interrogation to file");
+			c->Message(Chat::White, "  [silent] - Omits the in-game message portion of the interrogation");
 		}
 		return;
 	}
@@ -3297,8 +3431,8 @@ void command_interrogateinv(Client *c, const Seperator *sep)
 
 	if (c->Admin() < commandInterrogateInv) {
 		if (c->GetInterrogateInvState()) {
-			c->Message(13, "The last use of #interrogateinv on this inventory instance discovered an error...");
-			c->Message(13, "Logging out, zoning or re-arranging items at this point will result in item loss!");
+			c->Message(Chat::Red, "The last use of #interrogateinv on this inventory instance discovered an error...");
+			c->Message(Chat::Red, "Logging out, zoning or re-arranging items at this point will result in item loss!");
 			return;
 		}
 		target = c;
@@ -3312,7 +3446,7 @@ void command_interrogateinv(Client *c, const Seperator *sep)
 			target = c->GetTarget()->CastToClient();
 		}
 		else {
-			c->Message(1, "Use of this command is limited to Client entities");
+			c->Message(Chat::Default, "Use of this command is limited to Client entities");
 			return;
 		}
 
@@ -3325,7 +3459,7 @@ void command_interrogateinv(Client *c, const Seperator *sep)
 	bool success = target->InterrogateInventory(c, log, silent, allowtrip, error);
 
 	if (!success)
-		c->Message(13, "An unknown error occurred while processing Client::InterrogateInventory()");
+		c->Message(Chat::Red, "An unknown error occurred while processing Client::InterrogateInventory()");
 }
 
 void command_invsnapshot(Client *c, const Seperator *sep)
@@ -3353,7 +3487,7 @@ void command_invsnapshot(Client *c, const Seperator *sep)
 					"<td></td>"
 					"<td><c \"#AAAAAA\">takes snapshot of character inventory</td>"
 				"</tr>";
-		
+
 		if (c->Admin() >= commandInvSnapshot)
 			window_text.append(
 				"<tr>"
@@ -3411,7 +3545,7 @@ void command_invsnapshot(Client *c, const Seperator *sep)
 
 		if (strcmp(sep->arg[1], "gcount") == 0) {
 			auto is_count = database.CountInvSnapshots();
-			c->Message(0, "There %s %i inventory snapshot%s.", (is_count == 1 ? "is" : "are"), is_count, (is_count == 1 ? "" : "s"));
+			c->Message(Chat::White, "There %s %i inventory snapshot%s.", (is_count == 1 ? "is" : "are"), is_count, (is_count == 1 ? "" : "s"));
 
 			return;
 		}
@@ -3419,11 +3553,11 @@ void command_invsnapshot(Client *c, const Seperator *sep)
 		if (strcmp(sep->arg[1], "gclear") == 0) {
 			if (strcmp(sep->arg[2], "now") == 0) {
 				database.ClearInvSnapshots(true);
-				c->Message(0, "Inventory snapshots cleared using current time.");
+				c->Message(Chat::White, "Inventory snapshots cleared using current time.");
 			}
 			else {
 				database.ClearInvSnapshots();
-				c->Message(0, "Inventory snapshots cleared using RuleI(Character, InvSnapshotHistoryD) (%i day%s).",
+				c->Message(Chat::White, "Inventory snapshots cleared using RuleI(Character, InvSnapshotHistoryD) (%i day%s).",
 					RuleI(Character, InvSnapshotHistoryD), (RuleI(Character, InvSnapshotHistoryD) == 1 ? "" : "s"));
 			}
 
@@ -3432,7 +3566,7 @@ void command_invsnapshot(Client *c, const Seperator *sep)
 	}
 
 	if (!c->GetTarget() || !c->GetTarget()->IsClient()) {
-		c->Message(0, "Target must be a client.");
+		c->Message(Chat::White, "Target must be a client.");
 		return;
 	}
 
@@ -3441,12 +3575,12 @@ void command_invsnapshot(Client *c, const Seperator *sep)
 	if (strcmp(sep->arg[1], "capture") == 0) {
 		if (database.SaveCharacterInvSnapshot(tc->CharacterID())) {
 			tc->SetNextInvSnapshot(RuleI(Character, InvSnapshotMinIntervalM));
-			c->Message(0, "Successful inventory snapshot taken of %s - setting next interval for %i minute%s.",
+			c->Message(Chat::White, "Successful inventory snapshot taken of %s - setting next interval for %i minute%s.",
 				tc->GetName(), RuleI(Character, InvSnapshotMinIntervalM), (RuleI(Character, InvSnapshotMinIntervalM) == 1 ? "" : "s"));
 		}
 		else {
 			tc->SetNextInvSnapshot(RuleI(Character, InvSnapshotMinRetryM));
-			c->Message(0, "Failed to take inventory snapshot of %s - retrying in %i minute%s.",
+			c->Message(Chat::White, "Failed to take inventory snapshot of %s - retrying in %i minute%s.",
 				tc->GetName(), RuleI(Character, InvSnapshotMinRetryM), (RuleI(Character, InvSnapshotMinRetryM) == 1 ? "" : "s"));
 		}
 
@@ -3456,7 +3590,7 @@ void command_invsnapshot(Client *c, const Seperator *sep)
 	if (c->Admin() >= commandInvSnapshot) {
 		if (strcmp(sep->arg[1], "count") == 0) {
 			auto is_count = database.CountCharacterInvSnapshots(tc->CharacterID());
-			c->Message(0, "%s (id: %u) has %i inventory snapshot%s.", tc->GetName(), tc->CharacterID(), is_count, (is_count == 1 ? "" : "s"));
+			c->Message(Chat::White, "%s (id: %u) has %i inventory snapshot%s.", tc->GetName(), tc->CharacterID(), is_count, (is_count == 1 ? "" : "s"));
 
 			return;
 		}
@@ -3464,11 +3598,11 @@ void command_invsnapshot(Client *c, const Seperator *sep)
 		if (strcmp(sep->arg[1], "clear") == 0) {
 			if (strcmp(sep->arg[2], "now") == 0) {
 				database.ClearCharacterInvSnapshots(tc->CharacterID(), true);
-				c->Message(0, "%s\'s (id: %u) inventory snapshots cleared using current time.", tc->GetName(), tc->CharacterID());
+				c->Message(Chat::White, "%s\'s (id: %u) inventory snapshots cleared using current time.", tc->GetName(), tc->CharacterID());
 			}
 			else {
 				database.ClearCharacterInvSnapshots(tc->CharacterID());
-				c->Message(0, "%s\'s (id: %u) inventory snapshots cleared using RuleI(Character, InvSnapshotHistoryD) (%i day%s).",
+				c->Message(Chat::White, "%s\'s (id: %u) inventory snapshots cleared using RuleI(Character, InvSnapshotHistoryD) (%i day%s).",
 					tc->GetName(), tc->CharacterID(), RuleI(Character, InvSnapshotHistoryD), (RuleI(Character, InvSnapshotHistoryD) == 1 ? "" : "s"));
 			}
 
@@ -3480,7 +3614,7 @@ void command_invsnapshot(Client *c, const Seperator *sep)
 			database.ListCharacterInvSnapshots(tc->CharacterID(), is_list);
 
 			if (is_list.empty()) {
-				c->Message(0, "No inventory snapshots for %s (id: %u)", tc->GetName(), tc->CharacterID());
+				c->Message(Chat::White, "No inventory snapshots for %s (id: %u)", tc->GetName(), tc->CharacterID());
 				return;
 			}
 
@@ -3526,14 +3660,14 @@ void command_invsnapshot(Client *c, const Seperator *sep)
 
 		if (strcmp(sep->arg[1], "parse") == 0) {
 			if (!sep->IsNumber(2)) {
-				c->Message(0, "A timestamp is required to use this option.");
+				c->Message(Chat::White, "A timestamp is required to use this option.");
 				return;
 			}
 
 			uint32 timestamp = atoul(sep->arg[2]);
 
 			if (!database.ValidateCharacterInvSnapshotTimestamp(tc->CharacterID(), timestamp)) {
-				c->Message(0, "No inventory snapshots for %s (id: %u) exist at %u.", tc->GetName(), tc->CharacterID(), timestamp);
+				c->Message(Chat::White, "No inventory snapshots for %s (id: %u) exist at %u.", tc->GetName(), tc->CharacterID(), timestamp);
 				return;
 			}
 
@@ -3543,7 +3677,7 @@ void command_invsnapshot(Client *c, const Seperator *sep)
 			std::string window_title = StringFormat("Snapshot Parse for %s @ %u", tc->GetName(), timestamp);
 
 			std::string window_text = "Slot: ItemID - Description<br>";
-			
+
 			for (auto iter : parse_list) {
 				auto item_data = database.GetItem(iter.second);
 				std::string window_line = StringFormat("%i: %u - %s<br>", iter.first, iter.second, (item_data ? item_data->Name : "[error]"));
@@ -3552,7 +3686,7 @@ void command_invsnapshot(Client *c, const Seperator *sep)
 					window_text.append(window_line);
 				}
 				else {
-					c->Message(0, "Too many snapshot entries to list...");
+					c->Message(Chat::White, "Too many snapshot entries to list...");
 					break;
 				}
 			}
@@ -3564,14 +3698,14 @@ void command_invsnapshot(Client *c, const Seperator *sep)
 
 		if (strcmp(sep->arg[1], "compare") == 0) {
 			if (!sep->IsNumber(2)) {
-				c->Message(0, "A timestamp is required to use this option.");
+				c->Message(Chat::White, "A timestamp is required to use this option.");
 				return;
 			}
 
 			uint32 timestamp = atoul(sep->arg[2]);
-			
+
 			if (!database.ValidateCharacterInvSnapshotTimestamp(tc->CharacterID(), timestamp)) {
-				c->Message(0, "No inventory snapshots for %s (id: %u) exist at %u.", tc->GetName(), tc->CharacterID(), timestamp);
+				c->Message(Chat::White, "No inventory snapshots for %s (id: %u) exist at %u.", tc->GetName(), tc->CharacterID(), timestamp);
 				return;
 			}
 
@@ -3584,7 +3718,7 @@ void command_invsnapshot(Client *c, const Seperator *sep)
 			std::string window_title = StringFormat("Snapshot Comparison for %s @ %u", tc->GetName(), timestamp);
 
 			std::string window_text = "Slot: (action) Snapshot -&gt; Inventory<br>";
-			
+
 			auto inv_iter = inv_compare_list.begin();
 			auto iss_iter = iss_compare_list.begin();
 
@@ -3622,7 +3756,7 @@ void command_invsnapshot(Client *c, const Seperator *sep)
 					window_text.append(window_line);
 				}
 				else {
-					c->Message(0, "Too many comparison entries to list...");
+					c->Message(Chat::White, "Too many comparison entries to list...");
 					break;
 				}
 			}
@@ -3634,14 +3768,14 @@ void command_invsnapshot(Client *c, const Seperator *sep)
 
 		if (strcmp(sep->arg[1], "restore") == 0) {
 			if (!sep->IsNumber(2)) {
-				c->Message(0, "A timestamp is required to use this option.");
+				c->Message(Chat::White, "A timestamp is required to use this option.");
 				return;
 			}
 
 			uint32 timestamp = atoul(sep->arg[2]);
 
 			if (!database.ValidateCharacterInvSnapshotTimestamp(tc->CharacterID(), timestamp)) {
-				c->Message(0, "No inventory snapshots for %s (id: %u) exist at %u.", tc->GetName(), tc->CharacterID(), timestamp);
+				c->Message(Chat::White, "No inventory snapshots for %s (id: %u) exist at %u.", tc->GetName(), tc->CharacterID(), timestamp);
 				return;
 			}
 
@@ -3649,7 +3783,7 @@ void command_invsnapshot(Client *c, const Seperator *sep)
 				tc->SetNextInvSnapshot(RuleI(Character, InvSnapshotMinIntervalM));
 			}
 			else {
-				c->Message(13, "Failed to take pre-restore inventory snapshot of %s (id: %u).",
+				c->Message(Chat::Red, "Failed to take pre-restore inventory snapshot of %s (id: %u).",
 					tc->GetName(), tc->CharacterID());
 				return;
 			}
@@ -3658,14 +3792,14 @@ void command_invsnapshot(Client *c, const Seperator *sep)
 				// cannot delete all valid item slots from client..so, we worldkick
 				tc->WorldKick(); // self restores update before the 'kick' is processed
 
-				c->Message(0, "Successfully applied snapshot %u to %s's (id: %u) inventory.",
+				c->Message(Chat::White, "Successfully applied snapshot %u to %s's (id: %u) inventory.",
 					timestamp, tc->GetName(), tc->CharacterID());
 			}
 			else {
-				c->Message(13, "Failed to apply snapshot %u to %s's (id: %u) inventory.",
+				c->Message(Chat::Red, "Failed to apply snapshot %u to %s's (id: %u) inventory.",
 					timestamp, tc->GetName(), tc->CharacterID());
 			}
-			
+
 			return;
 		}
 	}
@@ -3674,7 +3808,7 @@ void command_invsnapshot(Client *c, const Seperator *sep)
 void command_findnpctype(Client *c, const Seperator *sep)
 {
 	if(sep->arg[1][0] == 0) {
-		c->Message(0, "Usage: #findnpctype [search criteria]");
+		c->Message(Chat::White, "Usage: #findnpctype [search criteria]");
 		return;
     }
 
@@ -3718,75 +3852,119 @@ void command_findnpctype(Client *c, const Seperator *sep)
 
 void command_findzone(Client *c, const Seperator *sep)
 {
-	if(sep->arg[1][0] == 0) {
-		c->Message(0, "Usage: #findzone [search criteria]");
-        return;
-    }
+	if (sep->arg[1][0] == 0) {
+		c->Message(Chat::White, "Usage: #findzone [search criteria]");
+		c->Message(Chat::White, "Usage: #findzone expansion [expansion number]");
+		return;
+	}
 
-    std::string query;
-    int id = atoi((const char *)sep->arg[1]);
-    if (id == 0) { // If id evaluates to 0, then search as if user entered a string.
-	    auto escName = new char[strlen(sep->arg[1]) * 2 + 1];
-	    database.DoEscapeString(escName, sep->arg[1], strlen(sep->arg[1]));
+	std::string query;
+	int         id = atoi((const char *) sep->arg[1]);
 
-	    query = StringFormat("SELECT zoneidnumber, short_name, long_name FROM zone "
-				 "WHERE long_name RLIKE '%s' AND version = 0",
-				 escName);
-	    safe_delete_array(escName);
-    }
-    else // Otherwise, look for just that zoneidnumber.
-		query = StringFormat("SELECT zoneidnumber, short_name, long_name FROM zone "
-                            "WHERE zoneidnumber = %i AND version = 0",  id);
+	std::string arg1 = sep->arg[1];
 
-    auto results = database.QueryDatabase(query);
-    if (!results.Success()) {
-        c->Message (0, "Error querying database.");
-        c->Message (0, query.c_str());
-        return;
-    }
+	if (arg1 == "expansion") {
+		query = fmt::format(
+			"SELECT zoneidnumber, short_name, long_name, version FROM zone WHERE expansion = {}",
+			sep->arg[2]
+		);
+	}
+	else {
 
-    int count = 0;
-    const int maxrows = 20;
+		/**
+		 * If id evaluates to 0, then search as if user entered a string
+		 */
+		if (id == 0) {
+			query = fmt::format(
+				"SELECT zoneidnumber, short_name, long_name, version FROM zone WHERE long_name LIKE '%{}%'",
+				EscapeString(sep->arg[1])
+			);
+		}
+		else {
+			query = fmt::format(
+				"SELECT zoneidnumber, short_name, long_name, version FROM zone WHERE zoneidnumber = {}",
+				id
+			);
+		}
+	}
 
-    for(auto row = results.begin(); row != results.end(); ++row) {
-        if (++count > maxrows) {
-            c->Message (0, "%i zones shown. Too many results.",  maxrows);
-            break;
-        }
+	auto results = database.QueryDatabase(query);
+	if (!results.Success()) {
+		c->Message(Chat::White, "Error querying database.");
+		c->Message(Chat::White, query.c_str());
+		return;
+	}
 
-        c->Message (0, "  %s: %s, %s",  row[0], row[1], row[2]);
-    }
+	int       count   = 0;
+	const int maxrows = 100;
 
-    if (count <= maxrows)
-        c->Message (0, "Query complete. %i rows shown.",  count);
-    else if (count == 0)
-        c->Message (0, "No matches found for %s.",  sep->arg[1]);
+	for (auto row = results.begin(); row != results.end(); ++row) {
+		std::string zone_id    = row[0];
+		std::string short_name = row[1];
+		std::string long_name  = row[2];
+		int         version    = atoi(row[3]);
+
+		if (++count > maxrows) {
+			c->Message(Chat::White, "%i zones shown. Too many results.", maxrows);
+			break;
+		}
+
+		std::string command_zone   = EQEmu::SayLinkEngine::GenerateQuestSaylink("#zone " + short_name, false, "zone");
+		std::string command_gmzone = EQEmu::SayLinkEngine::GenerateQuestSaylink(
+			fmt::format("#gmzone {} {}", short_name, version),
+			false,
+			"gmzone"
+		);
+
+		c->Message(
+			Chat::White,
+			fmt::format(
+				"[{}] [{}] [{}] Version ({}) [{}]",
+				(version == 0 ? command_zone : "zone"),
+				command_gmzone,
+				short_name,
+				version,
+				long_name
+			).c_str()
+		);
+	}
+
+	if (count <= maxrows) {
+		c->Message(
+			Chat::White,
+			"Query complete. %i rows shown. %s",
+			count,
+			(arg1 == "expansion" ? "(expansion search)" : ""));
+	}
+	else if (count == 0) {
+		c->Message(Chat::White, "No matches found for %s.", sep->arg[1]);
+	}
 }
 
 void command_viewnpctype(Client *c, const Seperator *sep)
 {
 	if (!sep->IsNumber(1))
-		c->Message(0, "Usage: #viewnpctype [npctype id]");
+		c->Message(Chat::White, "Usage: #viewnpctype [npctype id]");
 	else
 	{
 		uint32 npctypeid=atoi(sep->arg[1]);
 		const NPCType* npct = database.LoadNPCTypesData(npctypeid);
 		if (npct) {
-			c->Message(0, " NPCType Info, ");
-			c->Message(0, "  NPCTypeID: %u",  npct->npc_id);
-			c->Message(0, "  Name: %s",  npct->name);
-			c->Message(0, "  Level: %i",  npct->level);
-			c->Message(0, "  Race: %i",  npct->race);
-			c->Message(0, "  Class: %i",  npct->class_);
-			c->Message(0, "  MinDmg: %i",  npct->min_dmg);
-			c->Message(0, "  MaxDmg: %i",  npct->max_dmg);
-			c->Message(0, "  Special Abilities: %s",  npct->special_abilities);
-			c->Message(0, "  Spells: %i",  npct->npc_spells_id);
-			c->Message(0, "  Loot Table: %i",  npct->loottable_id);
-			c->Message(0, "  NPCFactionID: %i",  npct->npc_faction_id);
+			c->Message(Chat::White, " NPCType Info, ");
+			c->Message(Chat::White, "  NPCTypeID: %u",  npct->npc_id);
+			c->Message(Chat::White, "  Name: %s",  npct->name);
+			c->Message(Chat::White, "  Level: %i",  npct->level);
+			c->Message(Chat::White, "  Race: %i",  npct->race);
+			c->Message(Chat::White, "  Class: %i",  npct->class_);
+			c->Message(Chat::White, "  MinDmg: %i",  npct->min_dmg);
+			c->Message(Chat::White, "  MaxDmg: %i",  npct->max_dmg);
+			c->Message(Chat::White, "  Special Abilities: %s",  npct->special_abilities);
+			c->Message(Chat::White, "  Spells: %i",  npct->npc_spells_id);
+			c->Message(Chat::White, "  Loot Table: %i",  npct->loottable_id);
+			c->Message(Chat::White, "  NPCFactionID: %i",  npct->npc_faction_id);
 		}
 		else
-			c->Message(0, "NPC #%d not found",  npctypeid);
+			c->Message(Chat::White, "NPC #%d not found",  npctypeid);
 	}
 }
 
@@ -3794,13 +3972,13 @@ void command_reloadqst(Client *c, const Seperator *sep)
 {
 	if (sep->arg[1][0] == 0)
 	{
-		c->Message(0, "Clearing quest memory cache.");
+		c->Message(Chat::White, "Clearing quest memory cache.");
 		entity_list.ClearAreas();
 		parse->ReloadQuests();
 	}
 	else
 	{
-		c->Message(0, "Clearing quest memory cache and stopping timers.");
+		c->Message(Chat::White, "Clearing quest memory cache and stopping timers.");
 		entity_list.ClearAreas();
 		parse->ReloadQuests(true);
 	}
@@ -3814,7 +3992,7 @@ void command_corpsefix(Client *c, const Seperator *sep)
 
 void command_reloadworld(Client *c, const Seperator *sep)
 {
-	c->Message(0, "Reloading quest cache and repopping zones worldwide.");
+	c->Message(Chat::White, "Reloading quest cache and repopping zones worldwide.");
 	auto pack = new ServerPacket(ServerOP_ReloadWorld, sizeof(ReloadWorld_Struct));
 	ReloadWorld_Struct* RW = (ReloadWorld_Struct*) pack->pBuffer;
 	RW->Option = ((atoi(sep->arg[1]) == 1) ? 1 : 0);
@@ -3824,7 +4002,7 @@ void command_reloadworld(Client *c, const Seperator *sep)
 
 void command_reloadmerchants(Client *c, const Seperator *sep) {
 	entity_list.ReloadMerchants();
-	c->Message(15, "Reloading merchants.");
+	c->Message(Chat::Yellow, "Reloading merchants.");
 }
 
 void command_reloadlevelmods(Client *c, const Seperator *sep)
@@ -3833,9 +4011,9 @@ void command_reloadlevelmods(Client *c, const Seperator *sep)
 	{
 		if(RuleB(Zone, LevelBasedEXPMods)){
 			zone->LoadLevelEXPMods();
-			c->Message(15, "Level based EXP Mods have been reloaded zonewide");
+			c->Message(Chat::Yellow, "Level based EXP Mods have been reloaded zonewide");
 		}else{
-			c->Message(15, "Level based EXP Mods are disabled in rules!");
+			c->Message(Chat::Yellow, "Level based EXP Mods are disabled in rules!");
 		}
 	}
 }
@@ -3843,15 +4021,15 @@ void command_reloadlevelmods(Client *c, const Seperator *sep)
 void command_reloadzps(Client *c, const Seperator *sep)
 {
 	database.LoadStaticZonePoints(&zone->zone_point_list, zone->GetShortName(), zone->GetInstanceVersion());
-	c->Message(0, "Reloading server zone_points.");
+	c->Message(Chat::White, "Reloading server zone_points.");
 }
 
 void command_zoneshutdown(Client *c, const Seperator *sep)
 {
 	if (!worldserver.Connected())
-		c->Message(0, "Error: World server disconnected");
+		c->Message(Chat::White, "Error: World server disconnected");
 	else if (sep->arg[1][0] == 0)
-		c->Message(0, "Usage: #zoneshutdown zoneshortname");
+		c->Message(Chat::White, "Usage: #zoneshutdown zoneshortname");
 	else {
 		auto pack = new ServerPacket(ServerOP_ZoneShutdown, sizeof(ServerZoneStateChange_struct));
 		ServerZoneStateChange_struct* s = (ServerZoneStateChange_struct *) pack->pBuffer;
@@ -3868,9 +4046,9 @@ void command_zoneshutdown(Client *c, const Seperator *sep)
 void command_zonebootup(Client *c, const Seperator *sep)
 {
 	if (!worldserver.Connected())
-		c->Message(0, "Error: World server disconnected");
+		c->Message(Chat::White, "Error: World server disconnected");
 	else if (sep->arg[2][0] == 0) {
-		c->Message(0, "Usage: #zonebootup ZoneServerID# zoneshortname");
+		c->Message(Chat::White, "Usage: #zonebootup ZoneServerID# zoneshortname");
 	}
 	else {
 		auto pack = new ServerPacket(ServerOP_ZoneBootup, sizeof(ServerZoneStateChange_struct));
@@ -3887,20 +4065,20 @@ void command_zonebootup(Client *c, const Seperator *sep)
 void command_kick(Client *c, const Seperator *sep)
 {
 	if (sep->arg[1][0] == 0)
-		c->Message(0, "Usage: #kick [charname]");
+		c->Message(Chat::White, "Usage: #kick [charname]");
 	else {
 		Client* client = entity_list.GetClientByName(sep->arg[1]);
 		if (client != 0) {
 			if (client->Admin() <= c->Admin()) {
-				client->Message(0, "You have been kicked by %s", c->GetName());
+				client->Message(Chat::White, "You have been kicked by %s", c->GetName());
 				auto outapp = new EQApplicationPacket(OP_GMKick, 0);
 				client->QueuePacket(outapp);
-				client->Kick();
-				c->Message(0, "Kick: local: kicking %s",  sep->arg[1]);
+				client->Kick("Ordered kicked by command");
+				c->Message(Chat::White, "Kick: local: kicking %s",  sep->arg[1]);
 			}
 		}
 		else if (!worldserver.Connected())
-			c->Message(0, "Error: World server disconnected");
+			c->Message(Chat::White, "Error: World server disconnected");
 		else {
 			auto pack = new ServerPacket(ServerOP_KickPlayer, sizeof(ServerKickPlayer_Struct));
 			ServerKickPlayer_Struct* skp = (ServerKickPlayer_Struct*) pack->pBuffer;
@@ -3920,10 +4098,10 @@ void command_attack(Client *c, const Seperator *sep)
 		if (sictar)
 			c->GetTarget()->CastToNPC()->AddToHateList(sictar, 1, 0);
 		else
-			c->Message(0, "Error: %s not found",  sep->arg[1]);
+			c->Message(Chat::White, "Error: %s not found",  sep->arg[1]);
 	}
 	else
-		c->Message(0, "Usage: (needs NPC targeted) #attack targetname");
+		c->Message(Chat::White, "Usage: (needs NPC targeted) #attack targetname");
 }
 
 void command_lock(Client *c, const Seperator *sep)
@@ -3968,10 +4146,10 @@ void command_listpetition(Client *c, const Seperator *sep)
     if (results.RowCount() == 0)
         return;
 
-    c->Message(13,"	ID : Character Name , Account Name");
+    c->Message(Chat::Red,"	ID : Character Name , Account Name");
 
     for (auto row = results.begin(); row != results.end(); ++row)
-        c->Message(15, " %s:	%s , %s ", row[0],row[1],row[2]);
+        c->Message(Chat::Yellow, " %s:	%s , %s ", row[0],row[1],row[2]);
 }
 
 void command_equipitem(Client *c, const Seperator *sep)
@@ -4007,7 +4185,7 @@ void command_equipitem(Client *c, const Seperator *sep)
 
 			if (partialmove) { // remove this con check if someone can figure out removing charges from cursor stack issue below
 				// mi->number_in_stack is always from_inst->GetCharges() when partialmove is false
-				c->Message(13, "Error: Partial stack added to existing stack exceeds allowable stacksize");
+				c->Message(Chat::Red, "Error: Partial stack added to existing stack exceeds allowable stacksize");
 				safe_delete(outapp);
 				return;
 			}
@@ -4025,7 +4203,7 @@ void command_equipitem(Client *c, const Seperator *sep)
 				//	di->to_slot				= 0xFFFFFFFF;
 				//	di->number_in_stack		= 0xFFFFFFFF;
 
-				//	c->Message(0, "Deleting %i charges from stack",  movecount); // debug line..delete
+				//	c->Message(Chat::White, "Deleting %i charges from stack",  movecount); // debug line..delete
 
 				//	for (int16 deletecount=0; deletecount < movecount; deletecount++)
 						// have to use 'movecount' because mi->number_in_stack is 'ENCODED' at this point (i.e., 99 charges returns 22...)
@@ -4035,19 +4213,19 @@ void command_equipitem(Client *c, const Seperator *sep)
 				//}
 			}
 			else {
-				c->Message(13, "Error: Unable to equip current item");
+				c->Message(Chat::Red, "Error: Unable to equip current item");
 			}
 			safe_delete(outapp);
 
 			// also send out a wear change packet?
 		}
 		else if (from_inst == nullptr)
-			c->Message(13, "Error: There is no item on your cursor");
+			c->Message(Chat::Red, "Error: There is no item on your cursor");
 		else
-			c->Message(13, "Error: Item on your cursor cannot be equipped");
+			c->Message(Chat::Red, "Error: Item on your cursor cannot be equipped");
 	}
 	else
-		c->Message(0, "Usage: #equipitem slotid[0-21] - equips the item on your cursor to the position");
+		c->Message(Chat::White, "Usage: #equipitem slotid[0-21] - equips the item on your cursor to the position");
 }
 
 void command_zonelock(Client *c, const Seperator *sep)
@@ -4067,7 +4245,7 @@ void command_zonelock(Client *c, const Seperator *sep)
 			worldserver.SendPacket(pack);
 		}
 		else
-			c->Message(0, "Usage: #zonelock lock [zonename]");
+			c->Message(Chat::White, "Usage: #zonelock lock [zonename]");
 	}
 	else if (strcasecmp(sep->arg[1], "unlock") == 0 && c->Admin() >= commandLockZones) {
 		uint16 tmp = database.GetZoneID(sep->arg[2]);
@@ -4077,15 +4255,15 @@ void command_zonelock(Client *c, const Seperator *sep)
 			worldserver.SendPacket(pack);
 		}
 		else
-			c->Message(0, "Usage: #zonelock unlock [zonename]");
+			c->Message(Chat::White, "Usage: #zonelock unlock [zonename]");
 	}
 	else {
-		c->Message(0, "#zonelock sub-commands");
-		c->Message(0, "  list");
+		c->Message(Chat::White, "#zonelock sub-commands");
+		c->Message(Chat::White, "  list");
 		if(c->Admin() >= commandLockZones)
 		{
-			c->Message(0, "  lock [zonename]");
-			c->Message(0, "  unlock [zonename]");
+			c->Message(Chat::White, "  lock [zonename]");
+			c->Message(Chat::White, "  unlock [zonename]");
 		}
 	}
 	safe_delete(pack);
@@ -4098,24 +4276,24 @@ void command_corpse(Client *c, const Seperator *sep)
 	if (strcasecmp(sep->arg[1], "DeletePlayerCorpses") == 0 && c->Admin() >= commandEditPlayerCorpses) {
 		int32 tmp = entity_list.DeletePlayerCorpses();
 		if (tmp >= 0)
-			c->Message(0, "%i corpses deleted.",  tmp);
+			c->Message(Chat::White, "%i corpses deleted.",  tmp);
 		else
-			c->Message(0, "DeletePlayerCorpses Error #%i",  tmp);
+			c->Message(Chat::White, "DeletePlayerCorpses Error #%i",  tmp);
 	}
 	else if (strcasecmp(sep->arg[1], "delete") == 0) {
 		if (target == 0 || !target->IsCorpse())
-			c->Message(0, "Error: Target the corpse you wish to delete");
+			c->Message(Chat::White, "Error: Target the corpse you wish to delete");
 		else if (target->IsNPCCorpse()) {
 
-			c->Message(0, "Depoping %s.",  target->GetName());
+			c->Message(Chat::White, "Depoping %s.",  target->GetName());
 			target->CastToCorpse()->Delete();
 		}
 		else if (c->Admin() >= commandEditPlayerCorpses) {
-			c->Message(0, "Deleting %s.",  target->GetName());
+			c->Message(Chat::White, "Deleting %s.",  target->GetName());
 			target->CastToCorpse()->Delete();
 		}
 		else
-			c->Message(0, "Insufficient status to delete player corpse.");
+			c->Message(Chat::White, "Insufficient status to delete player corpse.");
 	}
 	else if (strcasecmp(sep->arg[1], "ListNPC") == 0) {
 		entity_list.ListNPCCorpses(c);
@@ -4126,101 +4304,101 @@ void command_corpse(Client *c, const Seperator *sep)
 	else if (strcasecmp(sep->arg[1], "DeleteNPCCorpses") == 0) {
 		int32 tmp = entity_list.DeleteNPCCorpses();
 		if (tmp >= 0)
-			c->Message(0, "%d corpses deleted.",  tmp);
+			c->Message(Chat::White, "%d corpses deleted.",  tmp);
 		else
-			c->Message(0, "DeletePlayerCorpses Error #%d",  tmp);
+			c->Message(Chat::White, "DeletePlayerCorpses Error #%d",  tmp);
 	}
 	else if (strcasecmp(sep->arg[1], "charid") == 0 && c->Admin() >= commandEditPlayerCorpses) {
 		if (target == 0 || !target->IsPlayerCorpse())
-			c->Message(0, "Error: Target must be a player corpse.");
+			c->Message(Chat::White, "Error: Target must be a player corpse.");
 		else if (!sep->IsNumber(2))
-			c->Message(0, "Error: charid must be a number.");
+			c->Message(Chat::White, "Error: charid must be a number.");
 		else
-			c->Message(0, "Setting CharID=%u on PlayerCorpse '%s'",  target->CastToCorpse()->SetCharID(atoi(sep->arg[2])), target->GetName());
+			c->Message(Chat::White, "Setting CharID=%u on PlayerCorpse '%s'",  target->CastToCorpse()->SetCharID(atoi(sep->arg[2])), target->GetName());
 	}
 	else if (strcasecmp(sep->arg[1], "ResetLooter") == 0) {
 		if (target == 0 || !target->IsCorpse())
-			c->Message(0, "Error: Target the corpse you wish to reset");
+			c->Message(Chat::White, "Error: Target the corpse you wish to reset");
 		else
 			target->CastToCorpse()->ResetLooter();
 	}
 	else if (strcasecmp(sep->arg[1], "RemoveCash") == 0) {
 		if (target == 0 || !target->IsCorpse())
-			c->Message(0, "Error: Target the corpse you wish to remove the cash from");
+			c->Message(Chat::White, "Error: Target the corpse you wish to remove the cash from");
 		else if (!target->IsPlayerCorpse() || c->Admin() >= commandEditPlayerCorpses) {
-			c->Message(0, "Removing Cash from %s.",  target->GetName());
+			c->Message(Chat::White, "Removing Cash from %s.",  target->GetName());
 			target->CastToCorpse()->RemoveCash();
 		}
 		else
-			c->Message(0, "Insufficient status to modify player corpse.");
+			c->Message(Chat::White, "Insufficient status to modify player corpse.");
 	}
 	else if (strcasecmp(sep->arg[1], "InspectLoot") == 0) {
 		if (target == 0 || !target->IsCorpse())
-			c->Message(0, "Error: Target must be a corpse.");
+			c->Message(Chat::White, "Error: Target must be a corpse.");
 		else
 			target->CastToCorpse()->QueryLoot(c);
 	}
 	else if (strcasecmp(sep->arg[1], "lock") == 0) {
 		if (target == 0 || !target->IsCorpse())
-			c->Message(0, "Error: Target must be a corpse.");
+			c->Message(Chat::White, "Error: Target must be a corpse.");
 		else {
 			target->CastToCorpse()->Lock();
-			c->Message(0, "Locking %s...",  target->GetName());
+			c->Message(Chat::White, "Locking %s...",  target->GetName());
 		}
 	}
 	else if (strcasecmp(sep->arg[1], "unlock") == 0) {
 		if (target == 0 || !target->IsCorpse())
-			c->Message(0, "Error: Target must be a corpse.");
+			c->Message(Chat::White, "Error: Target must be a corpse.");
 		else {
 			target->CastToCorpse()->UnLock();
-			c->Message(0, "Unlocking %s...",  target->GetName());
+			c->Message(Chat::White, "Unlocking %s...",  target->GetName());
 		}
 	}
 	else if (strcasecmp(sep->arg[1], "depop") == 0) {
 		if (target == 0 || !target->IsPlayerCorpse())
-			c->Message(0, "Error: Target must be a player corpse.");
+			c->Message(Chat::White, "Error: Target must be a player corpse.");
 		else if (c->Admin() >= commandEditPlayerCorpses && target->IsPlayerCorpse()) {
-			c->Message(0, "Depoping %s.",  target->GetName());
+			c->Message(Chat::White, "Depoping %s.",  target->GetName());
 			target->CastToCorpse()->DepopPlayerCorpse();
 			if(!sep->arg[2][0] || atoi(sep->arg[2]) != 0)
 				target->CastToCorpse()->Bury();
 		}
 		else
-			c->Message(0, "Insufficient status to depop player corpse.");
+			c->Message(Chat::White, "Insufficient status to depop player corpse.");
 	}
 	else if (strcasecmp(sep->arg[1], "depopall") == 0) {
 		if (target == 0 || !target->IsClient())
-			c->Message(0, "Error: Target must be a player.");
+			c->Message(Chat::White, "Error: Target must be a player.");
 		else if (c->Admin() >= commandEditPlayerCorpses && target->IsClient()) {
-			c->Message(0, "Depoping %s\'s corpses.",  target->GetName());
+			c->Message(Chat::White, "Depoping %s\'s corpses.",  target->GetName());
 			target->CastToClient()->DepopAllCorpses();
 			if(!sep->arg[2][0] || atoi(sep->arg[2]) != 0)
 				target->CastToClient()->BuryPlayerCorpses();
 		}
 		else
-			c->Message(0, "Insufficient status to depop player corpse.");
+			c->Message(Chat::White, "Insufficient status to depop player corpse.");
 
 	}
 	else if (sep->arg[1][0] == 0 || strcasecmp(sep->arg[1], "help") == 0) {
-		c->Message(0, "#Corpse Sub-Commands:");
-		c->Message(0, "  DeleteNPCCorpses");
-		c->Message(0, "  Delete - Delete targetted corpse");
-		c->Message(0, "  ListNPC");
-		c->Message(0, "  ListPlayer");
-		c->Message(0, "  Lock - GM locks the corpse - cannot be looted by non-GM");
-		c->Message(0, "  UnLock");
-		c->Message(0, "  RemoveCash");
-		c->Message(0, "  InspectLoot");
-		c->Message(0, "  [to remove items from corpses, loot them]");
-		c->Message(0, "Lead-GM status required to delete/modify player corpses");
-		c->Message(0, "  DeletePlayerCorpses");
-		c->Message(0, "  CharID [charid] - change player corpse's owner");
-		c->Message(0, "  Depop [bury] - Depops single target corpse.");
-		c->Message(0, "  Depopall [bury] - Depops all target player's corpses.");
-		c->Message(0, "Set bury to 0 to skip burying the corpses.");
+		c->Message(Chat::White, "#Corpse Sub-Commands:");
+		c->Message(Chat::White, "  DeleteNPCCorpses");
+		c->Message(Chat::White, "  Delete - Delete targetted corpse");
+		c->Message(Chat::White, "  ListNPC");
+		c->Message(Chat::White, "  ListPlayer");
+		c->Message(Chat::White, "  Lock - GM locks the corpse - cannot be looted by non-GM");
+		c->Message(Chat::White, "  UnLock");
+		c->Message(Chat::White, "  RemoveCash");
+		c->Message(Chat::White, "  InspectLoot");
+		c->Message(Chat::White, "  [to remove items from corpses, loot them]");
+		c->Message(Chat::White, "Lead-GM status required to delete/modify player corpses");
+		c->Message(Chat::White, "  DeletePlayerCorpses");
+		c->Message(Chat::White, "  CharID [charid] - change player corpse's owner");
+		c->Message(Chat::White, "  Depop [bury] - Depops single target corpse.");
+		c->Message(Chat::White, "  Depopall [bury] - Depops all target player's corpses.");
+		c->Message(Chat::White, "Set bury to 0 to skip burying the corpses.");
 	}
 	else
-		c->Message(0, "Error, #corpse sub-command not found");
+		c->Message(Chat::White, "Error, #corpse sub-command not found");
 }
 
 void command_fixmob(Client *c, const Seperator *sep)
@@ -4229,9 +4407,9 @@ void command_fixmob(Client *c, const Seperator *sep)
 	const char* Usage = "Usage: #fixmob [race|gender|texture|helm|face|hair|haircolor|beard|beardcolor|heritage|tattoo|detail] [next|prev]";
 
 	if (!sep->arg[1])
-		c->Message(0,Usage);
+		c->Message(Chat::White,Usage);
 	else if (!target)
-		c->Message(0,"Error: this command requires a target");
+		c->Message(Chat::White,"Error: this command requires a target");
 	else
 	{
 
@@ -4433,7 +4611,7 @@ void command_fixmob(Client *c, const Seperator *sep)
 
 		if (ChangeType == nullptr)
 		{
-			c->Message(0,Usage);
+			c->Message(Chat::White,Usage);
 		}
 		else
 		{
@@ -4441,7 +4619,7 @@ void command_fixmob(Client *c, const Seperator *sep)
 										EyeColor1, EyeColor2, HairStyle, LuclinFace, Beard, 0xFF,
 										DrakkinHeritage, DrakkinTattoo, DrakkinDetails);
 
-			c->Message(0, "%s=%i",  ChangeType, ChangeSetting);
+			c->Message(Chat::White, "%s=%i",  ChangeType, ChangeSetting);
 		}
 	}
 }
@@ -4457,19 +4635,19 @@ void command_gmspeed(Client *c, const Seperator *sep)
 
 	if (sep->arg[1][0] != 0) {
 		database.SetGMSpeed(t->AccountID(), state ? 1 : 0);
-		c->Message(0, "Turning GMSpeed %s for %s (zone to take effect)", state ? "On" : "Off", t->GetName());
+		c->Message(Chat::White, "Turning GMSpeed %s for %s (zone to take effect)", state ? "On" : "Off", t->GetName());
 	}
 	else {
-		c->Message(0, "Usage: #gmspeed [on/off]");
+		c->Message(Chat::White, "Usage: #gmspeed [on/off]");
 	}
 }
 
 void command_gmzone(Client *c, const Seperator *sep)
 {
 	if (!sep->arg[1]) {
-		c->Message(0, "Usage");
-		c->Message(0, "-------");
-		c->Message(0, "#gmzone [zone_short_name] [zone_version=0]");
+		c->Message(Chat::White, "Usage");
+		c->Message(Chat::White, "-------");
+		c->Message(Chat::White, "#gmzone [zone_short_name] [zone_version=0]");
 		return;
 	}
 
@@ -4482,7 +4660,7 @@ void command_gmzone(Client *c, const Seperator *sep)
 	uint16      instance_id            = 0;
 
 	if (zone_id == 0) {
-		c->Message(13, "Invalid zone specified");
+		c->Message(Chat::Red, "Invalid zone specified");
 		return;
 	}
 
@@ -4490,27 +4668,27 @@ void command_gmzone(Client *c, const Seperator *sep)
 		identifier = sep->arg[3];
 	}
 
-	std::string bucket_key             = StringFormat("%s-%s-instance", zone_short_name, identifier.c_str());
+	std::string bucket_key             = StringFormat("%s-%s-%u-instance", zone_short_name, identifier.c_str(), zone_version);
 	std::string existing_zone_instance = DataBucket::GetData(bucket_key);
 
 	if (existing_zone_instance.length() > 0) {
 		instance_id = std::stoi(existing_zone_instance);
 
-		c->Message(15, "Found already created instance (%s) (%u)", zone_short_name, instance_id);
+		c->Message(Chat::Yellow, "Found already created instance (%s) (%u)", zone_short_name, instance_id);
 	}
 
 	if (instance_id == 0) {
 		if (!database.GetUnusedInstanceID(instance_id)) {
-			c->Message(13, "Server was unable to find a free instance id.");
+			c->Message(Chat::Red, "Server was unable to find a free instance id.");
 			return;
 		}
 
 		if (!database.CreateInstance(instance_id, zone_id, zone_version, duration)) {
-			c->Message(13, "Server was unable to create a new instance.");
+			c->Message(Chat::Red, "Server was unable to create a new instance.");
 			return;
 		}
 
-		c->Message(15, "New private GM instance %s was created with id %lu.", zone_short_name, (unsigned long) instance_id);
+		c->Message(Chat::Yellow, "New private GM instance %s was created with id %lu.", zone_short_name, (unsigned long) instance_id);
 		DataBucket::SetData(bucket_key, std::to_string(instance_id));
 	}
 
@@ -4528,10 +4706,10 @@ void command_gmzone(Client *c, const Seperator *sep)
 			&min_status,
 			&min_level
 		)) {
-			c->Message(13, "Failed to find safe coordinates for specified zone");
+			c->Message(Chat::Red, "Failed to find safe coordinates for specified zone");
 		}
 
-		c->Message(15, "Zoning to private GM instance (%s) (%u)", zone_short_name, instance_id);
+		c->Message(Chat::Yellow, "Zoning to private GM instance (%s) (%u)", zone_short_name, instance_id);
 
 		c->AssignToInstance(instance_id);
 		c->MovePC(zone_id, instance_id, target_x, target_y, target_z, 0, 1);
@@ -4541,7 +4719,7 @@ void command_gmzone(Client *c, const Seperator *sep)
 void command_title(Client *c, const Seperator *sep)
 {
 	if (sep->arg[1][0]==0)
-		c->Message(0, "Usage: #title [remove|text] [1 = Create row in title table] - remove or set title to 'text'");
+		c->Message(Chat::White, "Usage: #title [remove|text] [1 = Create row in title table] - remove or set title to 'text'");
 	else {
 		bool Save = (atoi(sep->arg[2]) == 1);
 
@@ -4549,13 +4727,13 @@ void command_title(Client *c, const Seperator *sep)
 		if(!target_mob)
 			target_mob = c;
 		if(!target_mob->IsClient()) {
-			c->Message(13, "#title only works on players.");
+			c->Message(Chat::Red, "#title only works on players.");
 			return;
 		}
 		Client *t = target_mob->CastToClient();
 
 		if(strlen(sep->arg[1]) > 31) {
-			c->Message(13, "Title must be 31 characters or less.");
+			c->Message(Chat::Red, "Title must be 31 characters or less.");
 			return;
 		}
 
@@ -4576,13 +4754,13 @@ void command_title(Client *c, const Seperator *sep)
 		t->Save();
 
 		if(removed) {
-			c->Message(13, "%s's title has been removed.",  t->GetName(), sep->arg[1]);
+			c->Message(Chat::Red, "%s's title has been removed.",  t->GetName(), sep->arg[1]);
 			if(t != c)
-				t->Message(13, "Your title has been removed.",  sep->arg[1]);
+				t->Message(Chat::Red, "Your title has been removed.",  sep->arg[1]);
 		} else {
-			c->Message(13, "%s's title has been changed to '%s'.",  t->GetName(), sep->arg[1]);
+			c->Message(Chat::Red, "%s's title has been changed to '%s'.",  t->GetName(), sep->arg[1]);
 			if(t != c)
-				t->Message(13, "Your title has been changed to '%s'.",  sep->arg[1]);
+				t->Message(Chat::Red, "Your title has been changed to '%s'.",  sep->arg[1]);
 		}
 	}
 }
@@ -4591,7 +4769,7 @@ void command_title(Client *c, const Seperator *sep)
 void command_titlesuffix(Client *c, const Seperator *sep)
 {
 	if (sep->arg[1][0]==0)
-		c->Message(0, "Usage: #titlesuffix [remove|text] [1 = create row in title table] - remove or set title suffix to 'text'");
+		c->Message(Chat::White, "Usage: #titlesuffix [remove|text] [1 = create row in title table] - remove or set title suffix to 'text'");
 	else {
 		bool Save = (atoi(sep->arg[2]) == 1);
 
@@ -4599,13 +4777,13 @@ void command_titlesuffix(Client *c, const Seperator *sep)
 		if(!target_mob)
 			target_mob = c;
 		if(!target_mob->IsClient()) {
-			c->Message(13, "#titlesuffix only works on players.");
+			c->Message(Chat::Red, "#titlesuffix only works on players.");
 			return;
 		}
 		Client *t = target_mob->CastToClient();
 
 		if(strlen(sep->arg[1]) > 31) {
-			c->Message(13, "Title suffix must be 31 characters or less.");
+			c->Message(Chat::Red, "Title suffix must be 31 characters or less.");
 			return;
 		}
 
@@ -4627,13 +4805,13 @@ void command_titlesuffix(Client *c, const Seperator *sep)
 		t->Save();
 
 		if(removed) {
-			c->Message(13, "%s's title suffix has been removed.",  t->GetName(), sep->arg[1]);
+			c->Message(Chat::Red, "%s's title suffix has been removed.",  t->GetName(), sep->arg[1]);
 			if(t != c)
-				t->Message(13, "Your title suffix has been removed.",  sep->arg[1]);
+				t->Message(Chat::Red, "Your title suffix has been removed.",  sep->arg[1]);
 		} else {
-			c->Message(13, "%s's title suffix has been changed to '%s'.",  t->GetName(), sep->arg[1]);
+			c->Message(Chat::Red, "%s's title suffix has been changed to '%s'.",  t->GetName(), sep->arg[1]);
 			if(t != c)
-				t->Message(13, "Your title suffix has been changed to '%s'.",  sep->arg[1]);
+				t->Message(Chat::Red, "Your title suffix has been changed to '%s'.",  sep->arg[1]);
 		}
 	}
 }
@@ -4641,53 +4819,53 @@ void command_titlesuffix(Client *c, const Seperator *sep)
 void command_spellinfo(Client *c, const Seperator *sep)
 {
 	if(sep->arg[1][0]==0)
-		c->Message(0, "Usage: #spellinfo [spell_id]");
+		c->Message(Chat::White, "Usage: #spellinfo [spell_id]");
 	else {
 		short int spell_id=atoi(sep->arg[1]);
 		const struct SPDat_Spell_Struct *s=&spells[spell_id];
-		c->Message(0, "Spell info for spell #%d:",  spell_id);
-		c->Message(0, "  name: %s",  s->name);
-		c->Message(0, "  player_1: %s",  s->player_1);
-		c->Message(0, "  teleport_zone: %s",  s->teleport_zone);
-		c->Message(0, "  you_cast: %s",  s->you_cast);
-		c->Message(0, "  other_casts: %s",  s->other_casts);
-		c->Message(0, "  cast_on_you: %s",  s->cast_on_you);
-		c->Message(0, "  spell_fades: %s",  s->spell_fades);
-		c->Message(0, "  range: %f",  s->range);
-		c->Message(0, "  aoerange: %f",  s->aoerange);
-		c->Message(0, "  pushback: %f",  s->pushback);
-		c->Message(0, "  pushup: %f",  s->pushup);
-		c->Message(0, "  cast_time: %d",  s->cast_time);
-		c->Message(0, "  recovery_time: %d",  s->recovery_time);
-		c->Message(0, "  recast_time: %d",  s->recast_time);
-		c->Message(0, "  buffdurationformula: %d",  s->buffdurationformula);
-		c->Message(0, "  buffduration: %d",  s->buffduration);
-		c->Message(0, "  AEDuration: %d",  s->AEDuration);
-		c->Message(0, "  mana: %d",  s->mana);
-		c->Message(0, "  base[12]: %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d",  s->base[0], s->base[1], s->base[2], s->base[3], s->base[4], s->base[5], s->base[6], s->base[7], s->base[8], s->base[9], s->base[10], s->base[11]);
-		c->Message(0, "  base22[12]: %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d",  s->base2[0], s->base2[1], s->base2[2], s->base2[3], s->base2[4], s->base2[5], s->base2[6], s->base2[7], s->base2[8], s->base2[9], s->base2[10], s->base2[11]);
-		c->Message(0, "  max[12]: %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d",  s->max[0], s->max[1], s->max[2], s->max[3], s->max[4], s->max[5], s->max[6], s->max[7], s->max[8], s->max[9], s->max[10], s->max[11]);
-		c->Message(0, "  components[4]: %d, %d, %d, %d",  s->components[0], s->components[1], s->components[2], s->components[3]);
-		c->Message(0, "  component_counts[4]: %d, %d, %d, %d",  s->component_counts[0], s->component_counts[1], s->component_counts[2], s->component_counts[3]);
-		c->Message(0, "  NoexpendReagent[4]: %d, %d, %d, %d",  s->NoexpendReagent[0], s->NoexpendReagent[1], s->NoexpendReagent[2], s->NoexpendReagent[3]);
-		c->Message(0, "  formula[12]: 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x",  s->formula[0], s->formula[1], s->formula[2], s->formula[3], s->formula[4], s->formula[5], s->formula[6], s->formula[7], s->formula[8], s->formula[9], s->formula[10], s->formula[11]);
-		c->Message(0, "  goodEffect: %d",  s->goodEffect);
-		c->Message(0, "  Activated: %d",  s->Activated);
-		c->Message(0, "  resisttype: %d",  s->resisttype);
-		c->Message(0, "  effectid[12]: 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x",  s->effectid[0], s->effectid[1], s->effectid[2], s->effectid[3], s->effectid[4], s->effectid[5], s->effectid[6], s->effectid[7], s->effectid[8], s->effectid[9], s->effectid[10], s->effectid[11]);
-		c->Message(0, "  targettype: %d",  s->targettype);
-		c->Message(0, "  basediff: %d",  s->basediff);
-		c->Message(0, "  skill: %d",  s->skill);
-		c->Message(0, "  zonetype: %d",  s->zonetype);
-		c->Message(0, "  EnvironmentType: %d",  s->EnvironmentType);
-		c->Message(0, "  TimeOfDay: %d",  s->TimeOfDay);
-		c->Message(0, "  classes[15]: %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d",
+		c->Message(Chat::White, "Spell info for spell #%d:",  spell_id);
+		c->Message(Chat::White, "  name: %s",  s->name);
+		c->Message(Chat::White, "  player_1: %s",  s->player_1);
+		c->Message(Chat::White, "  teleport_zone: %s",  s->teleport_zone);
+		c->Message(Chat::White, "  you_cast: %s",  s->you_cast);
+		c->Message(Chat::White, "  other_casts: %s",  s->other_casts);
+		c->Message(Chat::White, "  cast_on_you: %s",  s->cast_on_you);
+		c->Message(Chat::White, "  spell_fades: %s",  s->spell_fades);
+		c->Message(Chat::White, "  range: %f",  s->range);
+		c->Message(Chat::White, "  aoerange: %f",  s->aoerange);
+		c->Message(Chat::White, "  pushback: %f",  s->pushback);
+		c->Message(Chat::White, "  pushup: %f",  s->pushup);
+		c->Message(Chat::White, "  cast_time: %d",  s->cast_time);
+		c->Message(Chat::White, "  recovery_time: %d",  s->recovery_time);
+		c->Message(Chat::White, "  recast_time: %d",  s->recast_time);
+		c->Message(Chat::White, "  buffdurationformula: %d",  s->buffdurationformula);
+		c->Message(Chat::White, "  buffduration: %d",  s->buffduration);
+		c->Message(Chat::White, "  AEDuration: %d",  s->AEDuration);
+		c->Message(Chat::White, "  mana: %d",  s->mana);
+		c->Message(Chat::White, "  base[12]: %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d",  s->base[0], s->base[1], s->base[2], s->base[3], s->base[4], s->base[5], s->base[6], s->base[7], s->base[8], s->base[9], s->base[10], s->base[11]);
+		c->Message(Chat::White, "  base22[12]: %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d",  s->base2[0], s->base2[1], s->base2[2], s->base2[3], s->base2[4], s->base2[5], s->base2[6], s->base2[7], s->base2[8], s->base2[9], s->base2[10], s->base2[11]);
+		c->Message(Chat::White, "  max[12]: %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d",  s->max[0], s->max[1], s->max[2], s->max[3], s->max[4], s->max[5], s->max[6], s->max[7], s->max[8], s->max[9], s->max[10], s->max[11]);
+		c->Message(Chat::White, "  components[4]: %d, %d, %d, %d",  s->components[0], s->components[1], s->components[2], s->components[3]);
+		c->Message(Chat::White, "  component_counts[4]: %d, %d, %d, %d",  s->component_counts[0], s->component_counts[1], s->component_counts[2], s->component_counts[3]);
+		c->Message(Chat::White, "  NoexpendReagent[4]: %d, %d, %d, %d",  s->NoexpendReagent[0], s->NoexpendReagent[1], s->NoexpendReagent[2], s->NoexpendReagent[3]);
+		c->Message(Chat::White, "  formula[12]: 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x",  s->formula[0], s->formula[1], s->formula[2], s->formula[3], s->formula[4], s->formula[5], s->formula[6], s->formula[7], s->formula[8], s->formula[9], s->formula[10], s->formula[11]);
+		c->Message(Chat::White, "  goodEffect: %d",  s->goodEffect);
+		c->Message(Chat::White, "  Activated: %d",  s->Activated);
+		c->Message(Chat::White, "  resisttype: %d",  s->resisttype);
+		c->Message(Chat::White, "  effectid[12]: 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x",  s->effectid[0], s->effectid[1], s->effectid[2], s->effectid[3], s->effectid[4], s->effectid[5], s->effectid[6], s->effectid[7], s->effectid[8], s->effectid[9], s->effectid[10], s->effectid[11]);
+		c->Message(Chat::White, "  targettype: %d",  s->targettype);
+		c->Message(Chat::White, "  basediff: %d",  s->basediff);
+		c->Message(Chat::White, "  skill: %d",  s->skill);
+		c->Message(Chat::White, "  zonetype: %d",  s->zonetype);
+		c->Message(Chat::White, "  EnvironmentType: %d",  s->EnvironmentType);
+		c->Message(Chat::White, "  TimeOfDay: %d",  s->TimeOfDay);
+		c->Message(Chat::White, "  classes[15]: %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d",
 			s->classes[0], s->classes[1], s->classes[2], s->classes[3], s->classes[4],
 			s->classes[5], s->classes[6], s->classes[7], s->classes[8], s->classes[9],
 			s->classes[10], s->classes[11], s->classes[12], s->classes[13], s->classes[14]);
-		c->Message(0, "  CastingAnim: %d",  s->CastingAnim);
-		c->Message(0, "  SpellAffectIndex: %d",  s->SpellAffectIndex);
-		c->Message(0, " RecourseLink: %d",  s->RecourseLink);
+		c->Message(Chat::White, "  CastingAnim: %d",  s->CastingAnim);
+		c->Message(Chat::White, "  SpellAffectIndex: %d",  s->SpellAffectIndex);
+		c->Message(Chat::White, " RecourseLink: %d",  s->RecourseLink);
 	}
 }
 
@@ -4702,7 +4880,7 @@ void command_lastname(Client *c, const Seperator *sep)
 	if(strlen(sep->arg[1]) <= 70)
 		t->ChangeLastName(sep->arg[1]);
 	else
-		c->Message(0, "Usage: #lastname <lastname> where <lastname> is less than 70 chars long");
+		c->Message(Chat::White, "Usage: #lastname <lastname> where <lastname> is less than 70 chars long");
 }
 
 void command_memspell(Client *c, const Seperator *sep)
@@ -4712,7 +4890,7 @@ void command_memspell(Client *c, const Seperator *sep)
 
 	if (!(sep->IsNumber(1) && sep->IsNumber(2)))
 	{
-		c->Message(0, "Usage: #MemSpell slotid spellid");
+		c->Message(Chat::White, "Usage: #MemSpell slotid spellid");
 	}
 	else
 	{
@@ -4720,12 +4898,12 @@ void command_memspell(Client *c, const Seperator *sep)
 		spell_id = atoi(sep->arg[2]);
 		if (slot > EQEmu::spells::SPELL_GEM_COUNT || spell_id >= SPDAT_RECORDS)
 		{
-			c->Message(0, "Error: #MemSpell: Arguement out of range");
+			c->Message(Chat::White, "Error: #MemSpell: Arguement out of range");
 		}
 		else
 		{
 			c->MemSpell(spell_id, slot);
-			c->Message(0, "Spell slot changed, have fun!");
+			c->Message(Chat::White, "Spell slot changed, have fun!");
 		}
 	}
 }
@@ -4733,21 +4911,21 @@ void command_memspell(Client *c, const Seperator *sep)
 void command_save(Client *c, const Seperator *sep)
 {
 	if (c->GetTarget() == 0)
-		c->Message(0, "Error: no target");
+		c->Message(Chat::White, "Error: no target");
 	else if (c->GetTarget()->IsClient()) {
 		if (c->GetTarget()->CastToClient()->Save(2))
-			c->Message(0, "%s successfully saved.",  c->GetTarget()->GetName());
+			c->Message(Chat::White, "%s successfully saved.",  c->GetTarget()->GetName());
 		else
-			c->Message(0, "Manual save for %s failed.",  c->GetTarget()->GetName());
+			c->Message(Chat::White, "Manual save for %s failed.",  c->GetTarget()->GetName());
 	}
 	else if (c->GetTarget()->IsPlayerCorpse()) {
 		if (c->GetTarget()->CastToMob()->Save())
-			c->Message(0, "%s successfully saved. (dbid=%u)",  c->GetTarget()->GetName(), c->GetTarget()->CastToCorpse()->GetCorpseDBID());
+			c->Message(Chat::White, "%s successfully saved. (dbid=%u)",  c->GetTarget()->GetName(), c->GetTarget()->CastToCorpse()->GetCorpseDBID());
 		else
-			c->Message(0, "Manual save for %s failed.",  c->GetTarget()->GetName());
+			c->Message(Chat::White, "Manual save for %s failed.",  c->GetTarget()->GetName());
 	}
 	else
-		c->Message(0, "Error: target not a Client/PlayerCorpse");
+		c->Message(Chat::White, "Error: target not a Client/PlayerCorpse");
 }
 
 void command_showstats(Client *c, const Seperator *sep)
@@ -4760,7 +4938,7 @@ void command_showstats(Client *c, const Seperator *sep)
 
 void command_showzonegloballoot(Client *c, const Seperator *sep)
 {
-	c->Message(0, "GlobalLoot for %s (%d:%d)", zone->GetShortName(), zone->GetZoneID(), zone->GetInstanceVersion());
+	c->Message(Chat::White, "GlobalLoot for %s (%d:%d)", zone->GetShortName(), zone->GetZoneID(), zone->GetInstanceVersion());
 	zone->ShowZoneGlobalLoot(c);
 }
 
@@ -4787,7 +4965,7 @@ void command_bind(Client *c, const Seperator *sep)
 		if (c->GetTarget()->IsClient())
 			c->GetTarget()->CastToClient()->SetBindPoint();
 		else
-			c->Message(0, "Error: target not a Player");
+			c->Message(Chat::White, "Error: target not a Player");
 	} else
 		c->SetBindPoint();
 }
@@ -4795,9 +4973,9 @@ void command_bind(Client *c, const Seperator *sep)
 void command_depop(Client *c, const Seperator *sep)
 {
 	if (c->GetTarget() == 0 || !(c->GetTarget()->IsNPC() || c->GetTarget()->IsNPCCorpse()))
-		c->Message(0, "You must have a NPC target for this command. (maybe you meant #depopzone?)");
+		c->Message(Chat::White, "You must have a NPC target for this command. (maybe you meant #depopzone?)");
 	else {
-		c->Message(0, "Depoping '%s'.",  c->GetTarget()->GetName());
+		c->Message(Chat::White, "Depoping '%s'.",  c->GetTarget()->GetName());
 		c->GetTarget()->Depop();
 	}
 }
@@ -4805,7 +4983,7 @@ void command_depop(Client *c, const Seperator *sep)
 void command_depopzone(Client *c, const Seperator *sep)
 {
 	zone->Depop();
-	c->Message(0, "Zone depoped.");
+	c->Message(Chat::White, "Zone depoped.");
 }
 
 void command_devtools(Client *c, const Seperator *sep)
@@ -4847,8 +5025,8 @@ void command_devtools(Client *c, const Seperator *sep)
 	/**
 	 * Print menu
 	 */
-	c->Message(0, "| [Devtools] Window %s", window_toggle_command.c_str());
-	c->Message(0, "| [Devtools] Search %s", menu_commands_search.c_str());
+	c->Message(Chat::White, "| [Devtools] Window %s", window_toggle_command.c_str());
+	c->Message(Chat::White, "| [Devtools] Search %s", menu_commands_search.c_str());
 }
 
 void command_repop(Client *c, const Seperator *sep)
@@ -4870,11 +5048,11 @@ void command_repop(Client *c, const Seperator *sep)
 			auto results = database.QueryDatabase(query);
 			iterator.Advance();
 		}
-		c->Message(0, "Zone depop: Force resetting spawn timers.");
+		c->Message(Chat::White, "Zone depop: Force resetting spawn timers.");
 	}
 
 	if (!sep->IsNumber(timearg)) {
-        c->Message(0, "Zone depopped - repopping now.");
+        c->Message(Chat::White, "Zone depopped - repopping now.");
 
 		zone->Repop();
 
@@ -4883,7 +5061,7 @@ void command_repop(Client *c, const Seperator *sep)
 		return;
 	}
 
-    c->Message(0, "Zone depoped. Repop in %i seconds",  atoi(sep->arg[timearg]));
+    c->Message(Chat::White, "Zone depoped. Repop in %i seconds",  atoi(sep->arg[timearg]));
 	zone->Repop(atoi(sep->arg[timearg]) * 1000);
 
 	zone->spawn2_timer.Trigger();
@@ -4906,13 +5084,13 @@ void command_repopclose(Client *c, const Seperator *sep)
 			auto results = database.QueryDatabase(query);
 			iterator.Advance();
 		}
-		c->Message(0, "Zone depop: Force resetting spawn timers.");
+		c->Message(Chat::White, "Zone depop: Force resetting spawn timers.");
 	}
 	if (sep->IsNumber(1)) {
 		repop_distance = atoi(sep->arg[1]);
 	}
 
-	c->Message(0, "Zone depoped. Repopping NPC's within %i distance units", repop_distance);
+	c->Message(Chat::White, "Zone depoped. Repopping NPC's within %i distance units", repop_distance);
 	zone->RepopClose(c->GetPosition(), repop_distance);
 }
 
@@ -4940,7 +5118,7 @@ void command_spawnstatus(Client *c, const Seperator *sep)
 	}
 	else if(strcmp(sep->arg[1], "help") == 0)
 	{
-		c->Message(0, "Usage: #spawnstatus <[a]ll | [d]isabled | [e]nabled | {Spawn2 ID}>");
+		c->Message(Chat::White, "Usage: #spawnstatus <[a]ll | [d]isabled | [e]nabled | {Spawn2 ID}>");
 	}
 	else {
 		zone->SpawnStatus(c);
@@ -4959,7 +5137,7 @@ void command_zuwcoords(Client *c, const Seperator *sep)
 {
 	// modifys and resends zhdr packet
 	if(sep->arg[1][0]==0)
-		c->Message(0, "Usage: #zuwcoords <under world coords>");
+		c->Message(Chat::White, "Usage: #zuwcoords <under world coords>");
 	else {
 		zone->newzone_data.underworld = atof(sep->arg[1]);
 		//float newdata = atof(sep->arg[1]);
@@ -4974,7 +5152,7 @@ void command_zuwcoords(Client *c, const Seperator *sep)
 void command_zunderworld(Client *c, const Seperator *sep)
 {
 	if(sep->arg[1][0]==0)
-		c->Message(0, "Usage: #zunderworld <zcoord>");
+		c->Message(Chat::White, "Usage: #zunderworld <zcoord>");
 	else {
 		zone->newzone_data.underworld = atof(sep->arg[1]);
 	}
@@ -4984,7 +5162,7 @@ void command_zsafecoords(Client *c, const Seperator *sep)
 {
 	// modifys and resends zhdr packet
 	if(sep->arg[3][0]==0)
-		c->Message(0, "Usage: #zsafecoords <safe x> <safe y> <safe z>");
+		c->Message(Chat::White, "Usage: #zsafecoords <safe x> <safe y> <safe z>");
 	else {
 		zone->newzone_data.safe_x = atof(sep->arg[1]);
 		zone->newzone_data.safe_y = atof(sep->arg[2]);
@@ -5008,7 +5186,7 @@ void command_freeze(Client *c, const Seperator *sep)
 	if (c->GetTarget() != 0)
 		c->GetTarget()->SendAppearancePacket(AT_Anim, ANIM_FREEZE);
 	else
-		c->Message(0, "ERROR: Freeze requires a target.");
+		c->Message(Chat::White, "ERROR: Freeze requires a target.");
 }
 
 void command_unfreeze(Client *c, const Seperator *sep)
@@ -5016,7 +5194,7 @@ void command_unfreeze(Client *c, const Seperator *sep)
 	if (c->GetTarget() != 0)
 		c->GetTarget()->SendAppearancePacket(AT_Anim, ANIM_STAND);
 	else
-		c->Message(0, "ERROR: Unfreeze requires a target.");
+		c->Message(Chat::White, "ERROR: Unfreeze requires a target.");
 }
 
 void command_push(Client *c, const Seperator *sep)
@@ -5026,7 +5204,7 @@ void command_push(Client *c, const Seperator *sep)
 		t = c->GetTarget();
 
 	if (!sep->arg[1] || !sep->IsNumber(1)) {
-		c->Message(0, "ERROR: Must provide at least a push back.");
+		c->Message(Chat::White, "ERROR: Must provide at least a push back.");
 		return;
 	}
 
@@ -5049,7 +5227,7 @@ void command_push(Client *c, const Seperator *sep)
 void command_proximity(Client *c, const Seperator *sep)
 {
 	if (!c->GetTarget() && !c->GetTarget()->IsNPC()) {
-		c->Message(0, "You must target an NPC");
+		c->Message(Chat::White, "You must target an NPC");
 		return;
 	}
 
@@ -5128,10 +5306,10 @@ void command_pvp(Client *c, const Seperator *sep)
 
 	if(sep->arg[1][0] != 0) {
 		t->SetPVP(state);
-		c->Message(0, "%s now follows the ways of %s.",  t->GetName(), state?"discord":"order");
+		c->Message(Chat::White, "%s now follows the ways of %s.",  t->GetName(), state?"discord":"order");
 	}
 	else
-		c->Message(0, "Usage: #pvp [on/off]");
+		c->Message(Chat::White, "Usage: #pvp [on/off]");
 }
 
 void command_setxp(Client *c, const Seperator *sep)
@@ -5143,12 +5321,12 @@ void command_setxp(Client *c, const Seperator *sep)
 
 	if (sep->IsNumber(1)) {
 		if (atoi(sep->arg[1]) > 9999999)
-			c->Message(0, "Error: Value too high.");
+			c->Message(Chat::White, "Error: Value too high.");
 		else
 			t->AddEXP(atoi(sep->arg[1]));
 	}
 	else
-		c->Message(0, "Usage: #setxp number");
+		c->Message(Chat::White, "Usage: #setxp number");
 }
 
 void command_setpvppoints(Client *c, const Seperator *sep)
@@ -5160,7 +5338,7 @@ void command_setpvppoints(Client *c, const Seperator *sep)
 
 	if (sep->IsNumber(1)) {
 		if (atoi(sep->arg[1]) > 9999999)
-			c->Message(0, "Error: Value too high.");
+			c->Message(Chat::White, "Error: Value too high.");
 		else
 		{
 			t->SetPVPPoints(atoi(sep->arg[1]));
@@ -5169,7 +5347,7 @@ void command_setpvppoints(Client *c, const Seperator *sep)
 		}
 	}
 	else
-		c->Message(0, "Usage: #setpvppoints number");
+		c->Message(Chat::White, "Usage: #setpvppoints number");
 }
 
 void command_name(Client *c, const Seperator *sep)
@@ -5177,20 +5355,20 @@ void command_name(Client *c, const Seperator *sep)
 	Client *target;
 
 	if( (strlen(sep->arg[1]) == 0) || (!(c->GetTarget() && c->GetTarget()->IsClient())) )
-		c->Message(0, "Usage: #name newname (requires player target)");
+		c->Message(Chat::White, "Usage: #name newname (requires player target)");
 	else
 	{
 		target = c->GetTarget()->CastToClient();
 		char *oldname = strdup(target->GetName());
 		if(target->ChangeFirstName(sep->arg[1], c->GetName()))
 		{
-			c->Message(0, "Successfully renamed %s to %s",  oldname, sep->arg[1]);
+			c->Message(Chat::White, "Successfully renamed %s to %s",  oldname, sep->arg[1]);
 			// until we get the name packet working right this will work
-			c->Message(0, "Sending player to char select.");
-			target->Kick();
+			c->Message(Chat::White, "Sending player to char select.");
+			target->Kick("Name was changed");
 		}
 		else
-			c->Message(13, "ERROR: Unable to rename %s. Check that the new name '%s' isn't already taken.",  oldname, sep->arg[2]);
+			c->Message(Chat::Red, "ERROR: Unable to rename %s. Check that the new name '%s' isn't already taken.",  oldname, sep->arg[2]);
 		free(oldname);
 	}
 }
@@ -5201,17 +5379,17 @@ void command_tempname(Client *c, const Seperator *sep)
 	target = c->GetTarget();
 
 	if(!target)
-		c->Message(0, "Usage: #tempname newname (requires a target)");
+		c->Message(Chat::White, "Usage: #tempname newname (requires a target)");
 	else if(strlen(sep->arg[1]) > 0)
 	{
 		char *oldname = strdup(target->GetName());
 		target->TempName(sep->arg[1]);
-		c->Message(0, "Renamed %s to %s",  oldname, sep->arg[1]);
+		c->Message(Chat::White, "Renamed %s to %s",  oldname, sep->arg[1]);
 		free(oldname);
 	}
 	else {
 		target->TempName();
-		c->Message(0, "Restored the original name");
+		c->Message(Chat::White, "Restored the original name");
 	}
 }
 
@@ -5221,34 +5399,34 @@ void command_petname(Client *c, const Seperator *sep)
 	target = c->GetTarget();
 
 	if(!target)
-		c->Message(0, "Usage: #petname newname (requires a target)");
+		c->Message(Chat::White, "Usage: #petname newname (requires a target)");
 	else if(target->IsPet() && (target->GetOwnerID() == c->GetID()) && strlen(sep->arg[1]) > 0)
 	{
 		char *oldname = strdup(target->GetName());
 		target->TempName(sep->arg[1]);
-		c->Message(0, "Renamed %s to %s",  oldname, sep->arg[1]);
+		c->Message(Chat::White, "Renamed %s to %s",  oldname, sep->arg[1]);
 		free(oldname);
 	}
 	else {
 		target->TempName();
-		c->Message(0, "Restored the original name");
+		c->Message(Chat::White, "Restored the original name");
 	}
 }
 
 void command_npcspecialattk(Client *c, const Seperator *sep)
 {
 	if (c->GetTarget()==0 || c->GetTarget()->IsClient() || strlen(sep->arg[1]) <= 0 || strlen(sep->arg[2]) <= 0)
-		c->Message(0, "Usage: #npcspecialattk *flagchar* *permtag* (Flags are E(nrage) F(lurry) R(ampage) S(ummon), permtag is 1 = True, 0 = False).");
+		c->Message(Chat::White, "Usage: #npcspecialattk *flagchar* *permtag* (Flags are E(nrage) F(lurry) R(ampage) S(ummon), permtag is 1 = True, 0 = False).");
 	else {
 		c->GetTarget()->CastToNPC()->NPCSpecialAttacks(sep->arg[1],atoi(sep->arg[2]));
-		c->Message(0, "NPC Special Attack set.");
+		c->Message(Chat::White, "NPC Special Attack set.");
 	}
 }
 
 void command_kill(Client *c, const Seperator *sep)
 {
 	if (!c->GetTarget()) {
-		c->Message(0, "Error: #Kill: No target.");
+		c->Message(Chat::White, "Error: #Kill: No target.");
 	}
 	else
 		if (!c->GetTarget()->IsClient() || c->GetTarget()->CastToClient()->Admin() <= c->Admin())
@@ -5295,7 +5473,7 @@ void command_killallnpcs(Client *c, const Seperator *sep)
 		count++;
 	}
 
-	c->Message(15, "Killed (%i) npc(s)", count);
+	c->Message(Chat::Yellow, "Killed (%i) npc(s)", count);
 }
 
 void command_haste(Client *c, const Seperator *sep)
@@ -5308,23 +5486,23 @@ void command_haste(Client *c, const Seperator *sep)
 		c->SetExtraHaste(Haste);
 		// SetAttackTimer must be called to make this take effect, so player needs to change
 		// the primary weapon.
-		c->Message(0, "Haste set to %d%% - Need to re-equip primary weapon before it takes effect",  Haste);
+		c->Message(Chat::White, "Haste set to %d%% - Need to re-equip primary weapon before it takes effect",  Haste);
 	}
 	else
-		c->Message(0, "Usage: #haste [percentage]");
+		c->Message(Chat::White, "Usage: #haste [percentage]");
 }
 
 void command_damage(Client *c, const Seperator *sep)
 {
 	if (c->GetTarget()==0)
-		c->Message(0, "Error: #Damage: No Target.");
+		c->Message(Chat::White, "Error: #Damage: No Target.");
 	else if (!sep->IsNumber(1)) {
-		c->Message(0, "Usage: #damage x");
+		c->Message(Chat::White, "Usage: #damage x");
 	}
 	else {
 		int32 nkdmg = atoi(sep->arg[1]);
 		if (nkdmg > 2100000000)
-			c->Message(0, "Enter a value less then 2,100,000,000.");
+			c->Message(Chat::White, "Enter a value less then 2,100,000,000.");
 		else
 			c->GetTarget()->Damage(c, nkdmg, SPELL_UNKNOWN, EQEmu::skills::SkillHandtoHand, false);
 	}
@@ -5332,7 +5510,7 @@ void command_damage(Client *c, const Seperator *sep)
 
 void command_zonespawn(Client *c, const Seperator *sep)
 {
-	c->Message(0, "This command is not yet implemented.");
+	c->Message(Chat::White, "This command is not yet implemented.");
 	return;
 
 /* this was kept from client.cpp verbatim (it was commented out) */
@@ -5381,7 +5559,7 @@ void command_npcspawn(Client *c, const Seperator *sep)
 				extra = 1;
 			}
 			database.NPCSpawnDB(0, zone->GetShortName(), zone->GetInstanceVersion(), c, target->CastToNPC(), extra);
-			c->Message(0, "%s created successfully!",  target->GetName());
+			c->Message(Chat::White, "%s created successfully!",  target->GetName());
 		}
 		else if (strcasecmp(sep->arg[1], "add") == 0) {
 			if (atoi(sep->arg[2]))
@@ -5394,42 +5572,42 @@ void command_npcspawn(Client *c, const Seperator *sep)
 				extra = 1200;
 			}
 			database.NPCSpawnDB(1, zone->GetShortName(), zone->GetInstanceVersion(), c, target->CastToNPC(), extra);
-			c->Message(0, "%s added successfully!",  target->GetName());
+			c->Message(Chat::White, "%s added successfully!",  target->GetName());
 		}
 		else if (strcasecmp(sep->arg[1], "update") == 0) {
 			database.NPCSpawnDB(2, zone->GetShortName(), zone->GetInstanceVersion(), c, target->CastToNPC());
-			c->Message(0, "%s updated!",  target->GetName());
+			c->Message(Chat::White, "%s updated!",  target->GetName());
 		}
 		else if (strcasecmp(sep->arg[1], "remove") == 0) {
 			database.NPCSpawnDB(3, zone->GetShortName(), zone->GetInstanceVersion(), c, target->CastToNPC());
-			c->Message(0, "%s removed successfully from database!",  target->GetName());
+			c->Message(Chat::White, "%s removed successfully from database!",  target->GetName());
 			target->Depop(false);
 		}
 		else if (strcasecmp(sep->arg[1], "delete") == 0) {
 			database.NPCSpawnDB(4, zone->GetShortName(), zone->GetInstanceVersion(), c, target->CastToNPC());
-			c->Message(0, "%s deleted from database!",  target->GetName());
+			c->Message(Chat::White, "%s deleted from database!",  target->GetName());
 			target->Depop(false);
 		}
 		else {
-			c->Message(0, "Error: #npcspawn: Invalid command.");
-			c->Message(0, "Usage: #npcspawn [create|add|update|remove|delete]");
+			c->Message(Chat::White, "Error: #npcspawn: Invalid command.");
+			c->Message(Chat::White, "Usage: #npcspawn [create|add|update|remove|delete]");
 		}
 	}
 	else
-		c->Message(0, "Error: #npcspawn: You must have a NPC targeted!");
+		c->Message(Chat::White, "Error: #npcspawn: You must have a NPC targeted!");
 }
 
 void command_spawnfix(Client *c, const Seperator *sep) {
 	Mob *targetMob = c->GetTarget();
 	if (!targetMob || !targetMob->IsNPC()) {
-		c->Message(0, "Error: #spawnfix: Need an NPC target.");
+		c->Message(Chat::White, "Error: #spawnfix: Need an NPC target.");
 		return;
     }
 
     Spawn2* s2 = targetMob->CastToNPC()->respawn2;
 
     if(!s2) {
-        c->Message(0, "#spawnfix FAILED -- cannot determine which spawn entry in the database this mob came from.");
+        c->Message(Chat::White, "#spawnfix FAILED -- cannot determine which spawn entry in the database this mob came from.");
         return;
     }
 
@@ -5437,12 +5615,12 @@ void command_spawnfix(Client *c, const Seperator *sep) {
                                     c->GetX(), c->GetY(), c->GetZ(), c->GetHeading(),s2->GetID());
     auto results = database.QueryDatabase(query);
     if (!results.Success()) {
-        c->Message(13, "Update failed! MySQL gave the following error:");
-        c->Message(13, results.ErrorMessage().c_str());
+        c->Message(Chat::Red, "Update failed! MySQL gave the following error:");
+        c->Message(Chat::Red, results.ErrorMessage().c_str());
         return;
     }
 
-    c->Message(0, "Updating coordinates successful.");
+    c->Message(Chat::White, "Updating coordinates successful.");
     targetMob->Depop(false);
 }
 
@@ -5450,28 +5628,28 @@ void command_loc(Client *c, const Seperator *sep)
 {
 	Mob *t=c->GetTarget()?c->GetTarget():c->CastToMob();
 
-	c->Message(0, "%s's Location (XYZ): %1.2f, %1.2f, %1.2f; heading=%1.1f",  t->GetName(), t->GetX(), t->GetY(), t->GetZ(), t->GetHeading());
+	c->Message(Chat::White, "%s's Location (XYZ): %1.2f, %1.2f, %1.2f; heading=%1.1f",  t->GetName(), t->GetX(), t->GetY(), t->GetZ(), t->GetHeading());
 }
 
 void command_goto(Client *c, const Seperator *sep)
 {
-	/**
-	 * Goto via target and no args
-	 */
-	if (sep->arg[1][0] == '\0' && c->GetTarget()) {
+	std::string arg1 = sep->arg[1];
+
+	bool goto_via_target_no_args = sep->arg[1][0] == '\0' && c->GetTarget();
+	bool goto_via_player_name    = !sep->IsNumber(1) && !arg1.empty();
+	bool goto_via_x_y_z          = sep->IsNumber(1) && sep->IsNumber(2) && sep->IsNumber(3);
+
+	if (goto_via_target_no_args) {
 		c->MovePC(
 			zone->GetZoneID(),
 			zone->GetInstanceID(),
 			c->GetTarget()->GetX(),
 			c->GetTarget()->GetY(),
 			c->GetTarget()->GetZ(),
-			c->GetTarget()->GetHeading());
+			c->GetTarget()->GetHeading()
+		);
 	}
-
-	/**
-	 * Goto via player name
-	 */
-	else if (!sep->IsNumber(1) && sep->arg[1]) {
+	else if (goto_via_player_name) {
 
 		/**
 		 * Find them in zone first
@@ -5486,33 +5664,31 @@ void command_goto(Client *c, const Seperator *sep)
 				client->GetX(),
 				client->GetY(),
 				client->GetZ(),
-				client->GetHeading());
+				client->GetHeading()
+			);
 
-			c->Message(15, "Goto player '%s' same zone", player_name_string.c_str());
+			c->Message(Chat::Yellow, "Goto player '%s' same zone", player_name_string.c_str());
 		}
 		else if (c->GotoPlayer(player_name_string)) {
-			c->Message(15, "Goto player '%s' different zone", player_name_string.c_str());
+			c->Message(Chat::Yellow, "Goto player '%s' different zone", player_name_string.c_str());
 		}
 		else {
-			c->Message(15, "Player '%s' not found", player_name_string.c_str());
+			c->Message(Chat::Yellow, "Player '%s' not found", player_name_string.c_str());
 		}
 	}
-
-	/**
-	 * Goto via x y z
-	 */
-	else if (sep->IsNumber(1) && sep->IsNumber(2) && sep->IsNumber(3)) {
+	else if (goto_via_x_y_z) {
 		c->MovePC(
 			zone->GetZoneID(),
 			zone->GetInstanceID(),
 			atof(sep->arg[1]),
 			atof(sep->arg[2]),
 			atof(sep->arg[3]),
-			c->GetHeading());
+			(sep->arg[4] ? atof(sep->arg[4]) : c->GetHeading())
+		);
 	}
 	else {
-		c->Message(0, "Usage: #goto [x y z]");
-		c->Message(0, "Usage: #goto [player_name]");
+		c->Message(Chat::White, "Usage: #goto [x y z] [h]");
+		c->Message(Chat::White, "Usage: #goto [player_name]");
 	}
 }
 
@@ -5520,13 +5696,13 @@ void command_iteminfo(Client *c, const Seperator *sep)
 {
 	auto inst = c->GetInv()[EQEmu::invslot::slotCursor];
 	if (!inst) {
-		c->Message(13, "Error: You need an item on your cursor for this command");
+		c->Message(Chat::Red, "Error: You need an item on your cursor for this command");
 		return;
 	}
 	auto item = inst->GetItem();
 	if (!item) {
 		Log(Logs::General, Logs::Inventory, "(%s) Command #iteminfo processed an item with no data pointer");
-		c->Message(13, "Error: This item has no data reference");
+		c->Message(Chat::Red, "Error: This item has no data reference");
 		return;
 	}
 
@@ -5534,41 +5710,41 @@ void command_iteminfo(Client *c, const Seperator *sep)
 	linker.SetLinkType(EQEmu::saylink::SayLinkItemInst);
 	linker.SetItemInst(inst);
 
-	c->Message(0, "*** Item Info for [%s] ***", linker.GenerateLink().c_str());
-	c->Message(0, ">> ID: %u, ItemUseType: %u, ItemClassType: %u", item->ID, item->ItemType, item->ItemClass);
-	c->Message(0, ">> IDFile: '%s', IconID: %u", item->IDFile, item->Icon);
-	c->Message(0, ">> Size: %u, Weight: %u, Price: %u, LDoNPrice: %u", item->Size, item->Weight, item->Price, item->LDoNPrice);
-	c->Message(0, ">> Material: 0x%02X, Color: 0x%08X, Tint: 0x%08X, Light: 0x%02X", item->Material, item->Color, inst->GetColor(), item->Light);
-	c->Message(0, ">> IsLore: %s, LoreGroup: %u, Lore: '%s'", (item->LoreFlag ? "TRUE" : "FALSE"), item->LoreGroup, item->Lore);
-	c->Message(0, ">> NoDrop: %u, NoRent: %u, NoPet: %u, NoTransfer: %u, FVNoDrop: %u",
+	c->Message(Chat::White, "*** Item Info for [%s] ***", linker.GenerateLink().c_str());
+	c->Message(Chat::White, ">> ID: %u, ItemUseType: %u, ItemClassType: %u", item->ID, item->ItemType, item->ItemClass);
+	c->Message(Chat::White, ">> IDFile: '%s', IconID: %u", item->IDFile, item->Icon);
+	c->Message(Chat::White, ">> Size: %u, Weight: %u, Price: %u, LDoNPrice: %u", item->Size, item->Weight, item->Price, item->LDoNPrice);
+	c->Message(Chat::White, ">> Material: 0x%02X, Color: 0x%08X, Tint: 0x%08X, Light: 0x%02X", item->Material, item->Color, inst->GetColor(), item->Light);
+	c->Message(Chat::White, ">> IsLore: %s, LoreGroup: %u, Lore: '%s'", (item->LoreFlag ? "TRUE" : "FALSE"), item->LoreGroup, item->Lore);
+	c->Message(Chat::White, ">> NoDrop: %u, NoRent: %u, NoPet: %u, NoTransfer: %u, FVNoDrop: %u",
 		item->NoDrop, item->NoRent, (uint8)item->NoPet, (uint8)item->NoTransfer, item->FVNoDrop);
 
 	if (item->IsClassBook()) {
-		c->Message(0, "*** This item is a Book (filename:'%s') ***", item->Filename);
+		c->Message(Chat::White, "*** This item is a Book (filename:'%s') ***", item->Filename);
 	}
 	else if (item->IsClassBag()) {
-		c->Message(0, "*** This item is a Container (%u slots) ***", item->BagSlots);
+		c->Message(Chat::White, "*** This item is a Container (%u slots) ***", item->BagSlots);
 	}
 	else {
-		c->Message(0, "*** This item is Common ***");
-		c->Message(0, ">> Classes: %u, Races: %u, Slots: %u", item->Classes, item->Races, item->Slots);
-		c->Message(0, ">> ReqSkill: %u, ReqLevel: %u, RecLevel: %u", item->RecSkill, item->ReqLevel, item->RecLevel);
-		c->Message(0, ">> SkillModType: %u, SkillModValue: %i", item->SkillModType, item->SkillModValue);
-		c->Message(0, ">> BaneRaceType: %u, BaneRaceDamage: %u, BaneBodyType: %u, BaneBodyDamage: %i",
+		c->Message(Chat::White, "*** This item is Common ***");
+		c->Message(Chat::White, ">> Classes: %u, Races: %u, Slots: %u", item->Classes, item->Races, item->Slots);
+		c->Message(Chat::White, ">> ReqSkill: %u, ReqLevel: %u, RecLevel: %u", item->RecSkill, item->ReqLevel, item->RecLevel);
+		c->Message(Chat::White, ">> SkillModType: %u, SkillModValue: %i", item->SkillModType, item->SkillModValue);
+		c->Message(Chat::White, ">> BaneRaceType: %u, BaneRaceDamage: %u, BaneBodyType: %u, BaneBodyDamage: %i",
 			item->BaneDmgRace, item->BaneDmgRaceAmt, item->BaneDmgBody, item->BaneDmgAmt);
-		c->Message(0, ">> Magic: %s, SpellID: %i, ProcLevel: %u, Charges: %u, MaxCharges: %u",
+		c->Message(Chat::White, ">> Magic: %s, SpellID: %i, ProcLevel: %u, Charges: %u, MaxCharges: %u",
 			(item->Magic ? "TRUE" : "FALSE"), item->Click.Effect, item->Click.Level, inst->GetCharges(), item->MaxCharges);
-		c->Message(0, ">> EffectType: 0x%02X, CastTime: %.2f", (uint8)item->Click.Type, ((double)item->CastTime / 1000));
+		c->Message(Chat::White, ">> EffectType: 0x%02X, CastTime: %.2f", (uint8)item->Click.Type, ((double)item->CastTime / 1000));
 	}
 
 	if (c->Admin() >= 200)
-		c->Message(0, ">> MinStatus: %u", item->MinStatus);
+		c->Message(Chat::White, ">> MinStatus: %u", item->MinStatus);
 }
 
 void command_uptime(Client *c, const Seperator *sep)
 {
 	if (!worldserver.Connected())
-		c->Message(0, "Error: World server disconnected");
+		c->Message(Chat::White, "Error: World server disconnected");
 	else
 	{
 		auto pack = new ServerPacket(ServerOP_Uptime, sizeof(ServerUptime_Struct));
@@ -5586,31 +5762,31 @@ void command_flag(Client *c, const Seperator *sep)
 	if(sep->arg[2][0] == 0) {
 		if (!c->GetTarget() || (c->GetTarget() && c->GetTarget() == c)) {
 			c->UpdateAdmin();
-			c->Message(0, "Refreshed your admin flag from DB.");
+			c->Message(Chat::White, "Refreshed your admin flag from DB.");
 		} else if (c->GetTarget() && c->GetTarget() != c && c->GetTarget()->IsClient()) {
 			c->GetTarget()->CastToClient()->UpdateAdmin();
-			c->Message(0, "%s's admin flag has been refreshed.", c->GetTarget()->GetName());
-			c->GetTarget()->Message(0, "%s refreshed your admin flag.", c->GetName());
+			c->Message(Chat::White, "%s's admin flag has been refreshed.", c->GetTarget()->GetName());
+			c->GetTarget()->Message(Chat::White, "%s refreshed your admin flag.", c->GetName());
 		}
 	}
 	else if (!sep->IsNumber(1) || atoi(sep->arg[1]) < -2 || atoi(sep->arg[1]) > 255 || strlen(sep->arg[2]) == 0)
-		c->Message(0, "Usage: #flag [status] [acctname]");
+		c->Message(Chat::White, "Usage: #flag [status] [acctname]");
 
 	else if (c->Admin() < commandChangeFlags) {
 //this check makes banning players by less than this level
 //impossible, but i'll leave it in anyways
-		c->Message(0, "You may only refresh your own flag, doing so now.");
+		c->Message(Chat::White, "You may only refresh your own flag, doing so now.");
 		c->UpdateAdmin();
 	}
 	else {
 		if (atoi(sep->arg[1]) > c->Admin())
-			c->Message(0, "You cannot set people's status to higher than your own");
+			c->Message(Chat::White, "You cannot set people's status to higher than your own");
 		else if (atoi(sep->arg[1]) < 0 && c->Admin() < commandBanPlayers)
-			c->Message(0, "You have too low of status to suspend/ban");
+			c->Message(Chat::White, "You have too low of status to suspend/ban");
 		else if (!database.SetAccountStatus(sep->argplus[2], atoi(sep->arg[1])))
-			c->Message(0, "Unable to set GM Flag.");
+			c->Message(Chat::White, "Unable to set GM Flag.");
 		else {
-			c->Message(0, "Set GM Flag on account.");
+			c->Message(Chat::White, "Set GM Flag on account.");
 			auto pack = new ServerPacket(ServerOP_FlagUpdate, 6);
 			*((uint32*) pack->pBuffer) = database.GetAccountIDByName(sep->argplus[2]);
 			*((int16*) &pack->pBuffer[4]) = atoi(sep->arg[1]);
@@ -5628,12 +5804,12 @@ void command_time(Client *c, const Seperator *sep)
 		if(sep->IsNumber(2)) {
 			minutes=atoi(sep->arg[2]);
 		}
-		c->Message(13, "Setting world time to %s:%i (Timezone: 0)...",  sep->arg[1], minutes);
+		c->Message(Chat::Red, "Setting world time to %s:%i (Timezone: 0)...",  sep->arg[1], minutes);
 		zone->SetTime(atoi(sep->arg[1])+1, minutes);
 		Log(Logs::General, Logs::Zone_Server, "%s :: Setting world time to %s:%i (Timezone: 0)...", c->GetCleanName(), sep->arg[1], minutes);
 	}
 	else {
-		c->Message(13, "To set the Time: #time HH [MM]");
+		c->Message(Chat::Red, "To set the Time: #time HH [MM]");
 		TimeOfDay_Struct eqTime;
 		zone->zone_time.GetCurrentEQTimeOfDay( time(0), &eqTime);
 		sprintf(timeMessage,"%02d:%s%d %s (Timezone: %ih %im)",
@@ -5644,7 +5820,7 @@ void command_time(Client *c, const Seperator *sep)
 			zone->zone_time.getEQTimeZoneHr(),
 			zone->zone_time.getEQTimeZoneMin()
 			);
-		c->Message(13, "It is now %s.", timeMessage);
+		c->Message(Chat::Red, "It is now %s.", timeMessage);
 		Log(Logs::General, Logs::Zone_Server, "Current Time is: %s", timeMessage);
 	}
 }
@@ -5655,14 +5831,14 @@ void command_guild(Client *c, const Seperator *sep)
 	Mob *target=c->GetTarget();
 
 	if (strcasecmp(sep->arg[1], "help") == 0) {
-		c->Message(0, "GM Guild commands:");
-		c->Message(0, "  #guild list - lists all guilds on the server");
-		c->Message(0, "  #guild create {guildleader charname or CharID} guildname");
-		c->Message(0, "  #guild delete guildID");
-		c->Message(0, "  #guild rename guildID newname");
-		c->Message(0, "  #guild set charname guildID    (0=no guild)");
-		c->Message(0, "  #guild setrank charname rank");
-		c->Message(0, "  #guild setleader guildID {guildleader charname or CharID}");
+		c->Message(Chat::White, "GM Guild commands:");
+		c->Message(Chat::White, "  #guild list - lists all guilds on the server");
+		c->Message(Chat::White, "  #guild create {guildleader charname or CharID} guildname");
+		c->Message(Chat::White, "  #guild delete guildID");
+		c->Message(Chat::White, "  #guild rename guildID newname");
+		c->Message(Chat::White, "  #guild set charname guildID    (0=no guild)");
+		c->Message(Chat::White, "  #guild setrank charname rank");
+		c->Message(Chat::White, "  #guild setleader guildID {guildleader charname or CharID}");
 	}
 	else if (strcasecmp(sep->arg[1], "status") == 0 || strcasecmp(sep->arg[1], "stat") == 0) {
 		Client* client = 0;
@@ -5671,24 +5847,24 @@ void command_guild(Client *c, const Seperator *sep)
 		else if (target != 0 && target->IsClient())
 			client = target->CastToClient();
 		if (client == 0)
-			c->Message(0, "You must target someone or specify a character name");
+			c->Message(Chat::White, "You must target someone or specify a character name");
 		else if ((client->Admin() >= minStatusToEditOtherGuilds && admin < minStatusToEditOtherGuilds) && client->GuildID() != c->GuildID()) // no peeping for GMs, make sure tell message stays the same
-			c->Message(0, "You must target someone or specify a character name.");
+			c->Message(Chat::White, "You must target someone or specify a character name.");
 		else {
 			if (client->IsInAGuild())
-				c->Message(0, "%s is not in a guild.",  client->GetName());
+				c->Message(Chat::White, "%s is not in a guild.",  client->GetName());
 			else if (guild_mgr.IsGuildLeader(client->GuildID(), client->CharacterID()))
-				c->Message(0, "%s is the leader of <%s> rank: %s",  client->GetName(), guild_mgr.GetGuildName(client->GuildID()), guild_mgr.GetRankName(client->GuildID(), client->GuildRank()));
+				c->Message(Chat::White, "%s is the leader of <%s> rank: %s",  client->GetName(), guild_mgr.GetGuildName(client->GuildID()), guild_mgr.GetRankName(client->GuildID(), client->GuildRank()));
 			else
-				c->Message(0, "%s is a member of <%s> rank: %s",  client->GetName(), guild_mgr.GetGuildName(client->GuildID()), guild_mgr.GetRankName(client->GuildID(), client->GuildRank()));
+				c->Message(Chat::White, "%s is a member of <%s> rank: %s",  client->GetName(), guild_mgr.GetGuildName(client->GuildID()), guild_mgr.GetRankName(client->GuildID(), client->GuildRank()));
 		}
 	}
 	else if (strcasecmp(sep->arg[1], "info") == 0) {
 		if (sep->arg[2][0] == 0 && c->IsInAGuild()) {
 			if (admin >= minStatusToEditOtherGuilds)
-				c->Message(0, "Usage: #guildinfo guild_id");
+				c->Message(Chat::White, "Usage: #guildinfo guild_id");
 			else
-				c->Message(0, "You're not in a guild");
+				c->Message(Chat::White, "You're not in a guild");
 		}
 		else {
 			uint32 tmp = GUILD_NONE;
@@ -5704,19 +5880,19 @@ void command_guild(Client *c, const Seperator *sep)
 	/*
 	else if (strcasecmp(sep->arg[1], "edit") == 0) {
 		if (c->GuildDBID() == 0)
-			c->Message(0, "You arent in a guild!");
+			c->Message(Chat::White, "You arent in a guild!");
 		else if (!sep->IsNumber(2))
-			c->Message(0, "Error: invalid rank #.");
+			c->Message(Chat::White, "Error: invalid rank #.");
 		else if (atoi(sep->arg[2]) < 0 || atoi(sep->arg[2]) > GUILD_MAX_RANK)
-			c->Message(0, "Error: invalid rank #.");
+			c->Message(Chat::White, "Error: invalid rank #.");
 		else if (!c->GuildRank() == 0)
-			c->Message(0, "You must be rank %s to use edit.",  guilds[c->GuildEQID()].rank[0].rankname);
+			c->Message(Chat::White, "You must be rank %s to use edit.",  guilds[c->GuildEQID()].rank[0].rankname);
 		else if (!worldserver.Connected())
-			c->Message(0, "Error: World server dirconnected");
+			c->Message(Chat::White, "Error: World server dirconnected");
 		else {
 			if (!helper_guild_edit(c, c->GuildDBID(), c->GuildEQID(), atoi(sep->arg[2]), sep->arg[3], sep->argplus[4])) {
-				c->Message(0, "  #guild edit rank title newtitle");
-				c->Message(0, "  #guild edit rank permission 0/1");
+				c->Message(Chat::White, "  #guild edit rank title newtitle");
+				c->Message(Chat::White, "  #guild edit rank permission 0/1");
 			}
 			else {
 				ServerPacket* pack = new ServerPacket(ServerOP_RefreshGuild, 5);
@@ -5729,20 +5905,20 @@ void command_guild(Client *c, const Seperator *sep)
 	}
 	else if (strcasecmp(sep->arg[1], "gmedit") == 0 && admin >= 100) {
 		if (!sep->IsNumber(2))
-			c->Message(0, "Error: invalid guilddbid.");
+			c->Message(Chat::White, "Error: invalid guilddbid.");
 		else if (!sep->IsNumber(3))
-			c->Message(0, "Error: invalid rank #.");
+			c->Message(Chat::White, "Error: invalid rank #.");
 		else if (atoi(sep->arg[3]) < 0 || atoi(sep->arg[3]) > GUILD_MAX_RANK)
-			c->Message(0, "Error: invalid rank #.");
+			c->Message(Chat::White, "Error: invalid rank #.");
 		else if (!worldserver.Connected())
-			c->Message(0, "Error: World server dirconnected");
+			c->Message(Chat::White, "Error: World server dirconnected");
 		else {
 			uint32 eqid = database.GetGuildEQID(atoi(sep->arg[2]));
 			if (eqid == GUILD_NONE)
-				c->Message(0, "Error: Guild not found");
+				c->Message(Chat::White, "Error: Guild not found");
 			else if (!helper_guild_edit(c, atoi(sep->arg[2]), eqid, atoi(sep->arg[3]), sep->arg[4], sep->argplus[5])) {
-				c->Message(0, "  #guild gmedit guilddbid rank title newtitle");
-				c->Message(0, "  #guild gmedit guilddbid rank permission 0/1");
+				c->Message(Chat::White, "  #guild gmedit guilddbid rank title newtitle");
+				c->Message(Chat::White, "  #guild gmedit guilddbid rank permission 0/1");
 			}
 			else {
 				ServerPacket* pack = new ServerPacket(ServerOP_RefreshGuild, 5);
@@ -5755,26 +5931,26 @@ void command_guild(Client *c, const Seperator *sep)
 	*/
 	else if (strcasecmp(sep->arg[1], "set") == 0) {
 		if (!sep->IsNumber(3))
-			c->Message(0, "Usage: #guild set charname guildgbid (0 = clear guildtag)");
+			c->Message(Chat::White, "Usage: #guild set charname guildgbid (0 = clear guildtag)");
 		else {
 			uint32 guild_id = atoi(sep->arg[3]);
 
 			if(guild_id == 0)
 				guild_id = GUILD_NONE;
 			else if(!guild_mgr.GuildExists(guild_id)) {
-				c->Message(13, "Guild %d does not exist.",  guild_id);
+				c->Message(Chat::Red, "Guild %d does not exist.",  guild_id);
 				return;
 			}
 
 			uint32 charid = database.GetCharacterID(sep->arg[2]);
 			if(charid == 0) {
-				c->Message(13, "Unable to find character '%s'",  charid);
+				c->Message(Chat::Red, "Unable to find character '%s'",  charid);
 				return;
 			}
 
 			//we could do the checking we need for guild_mgr.CheckGMStatus, but im lazy right now
 			if(admin < minStatusToEditOtherGuilds) {
-				c->Message(13, "Access denied.");
+				c->Message(Chat::Red, "Access denied.");
 				return;
 			}
 
@@ -5788,26 +5964,26 @@ void command_guild(Client *c, const Seperator *sep)
 			}
 
 			if(!guild_mgr.SetGuild(charid, guild_id, GUILD_MEMBER)) {
-				c->Message(13, "Error putting '%s' into guild %d",  sep->arg[2], guild_id);
+				c->Message(Chat::Red, "Error putting '%s' into guild %d",  sep->arg[2], guild_id);
 			} else {
-				c->Message(0, "%s has been put into guild %d",  sep->arg[2], guild_id);
+				c->Message(Chat::White, "%s has been put into guild %d",  sep->arg[2], guild_id);
 			}
 		}
 	}
 	/*else if (strcasecmp(sep->arg[1], "setdoor") == 0 && admin >= minStatusToEditOtherGuilds) {
 
 		if (!sep->IsNumber(2))
-			c->Message(0, "Usage: #guild setdoor guildEQid (0 = delete guilddoor)");
+			c->Message(Chat::White, "Usage: #guild setdoor guildEQid (0 = delete guilddoor)");
 		else {
 // guild doors
 			if((!guilds[atoi(sep->arg[2])].databaseID) && (atoi(sep->arg[2])!=0) )
 			{
 
-				c->Message(0, "These is no guild with this guildEQid");
+				c->Message(Chat::White, "These is no guild with this guildEQid");
 			}
 			else {
 				c->SetIsSettingGuildDoor(true);
-				c->Message(0, "Click on a door you want to become a guilddoor");
+				c->Message(Chat::White, "Click on a door you want to become a guilddoor");
 				c->SetSetGuildDoorID(atoi(sep->arg[2]));
 			}
 		}
@@ -5815,19 +5991,19 @@ void command_guild(Client *c, const Seperator *sep)
 	else if (strcasecmp(sep->arg[1], "setrank") == 0) {
 		int rank = atoi(sep->arg[3]);
 		if (!sep->IsNumber(3))
-			c->Message(0, "Usage: #guild setrank charname rank");
+			c->Message(Chat::White, "Usage: #guild setrank charname rank");
 		else if (rank < 0 || rank > GUILD_MAX_RANK)
-			c->Message(0, "Error: invalid rank #.");
+			c->Message(Chat::White, "Error: invalid rank #.");
 		else {
 			uint32 charid = database.GetCharacterID(sep->arg[2]);
 			if(charid == 0) {
-				c->Message(13, "Unable to find character '%s'",  charid);
+				c->Message(Chat::Red, "Unable to find character '%s'",  charid);
 				return;
 			}
 
 			//we could do the checking we need for guild_mgr.CheckGMStatus, but im lazy right now
 			if(admin < minStatusToEditOtherGuilds) {
-				c->Message(13, "Access denied.");
+				c->Message(Chat::Red, "Access denied.");
 				return;
 			}
 
@@ -5835,16 +6011,16 @@ void command_guild(Client *c, const Seperator *sep)
 				sep->arg[2], charid, rank);
 
 			if(!guild_mgr.SetGuildRank(charid, rank))
-				c->Message(13, "Error while setting rank %d on '%s'.",  rank, sep->arg[2]);
+				c->Message(Chat::Red, "Error while setting rank %d on '%s'.",  rank, sep->arg[2]);
 			else
-				c->Message(0, "%s has been set to rank %d",  sep->arg[2], rank);
+				c->Message(Chat::White, "%s has been set to rank %d",  sep->arg[2], rank);
 		}
 	}
 	else if (strcasecmp(sep->arg[1], "create") == 0) {
 		if (sep->arg[3][0] == 0)
-			c->Message(0, "Usage: #guild create {guildleader charname or CharID} guild name");
+			c->Message(Chat::White, "Usage: #guild create {guildleader charname or CharID} guild name");
 		else if (!worldserver.Connected())
-			c->Message(0, "Error: World server dirconnected");
+			c->Message(Chat::White, "Error: World server dirconnected");
 		else {
 			uint32 leader = 0;
 			if (sep->IsNumber(2)) {
@@ -5852,22 +6028,22 @@ void command_guild(Client *c, const Seperator *sep)
 			} else if((leader=database.GetCharacterID(sep->arg[2])) != 0) {
 				//got it from the db..
 			} else {
-				c->Message(13, "Unable to find char '%s'",  sep->arg[2]);
+				c->Message(Chat::Red, "Unable to find char '%s'",  sep->arg[2]);
 				return;
 			}
 			if (leader == 0) {
-				c->Message(0, "Guild leader not found.");
+				c->Message(Chat::White, "Guild leader not found.");
 				return;
 			}
 
 			uint32 tmp = guild_mgr.FindGuildByLeader(leader);
 			if (tmp != GUILD_NONE) {
-				c->Message(0, "Error: %s already is the leader of DB# %i '%s'.",  sep->arg[2], tmp, guild_mgr.GetGuildName(tmp));
+				c->Message(Chat::White, "Error: %s already is the leader of DB# %i '%s'.",  sep->arg[2], tmp, guild_mgr.GetGuildName(tmp));
 			}
 			else {
 
 				if(admin < minStatusToEditOtherGuilds) {
-					c->Message(13, "Access denied.");
+					c->Message(Chat::Red, "Access denied.");
 					return;
 				}
 
@@ -5877,12 +6053,12 @@ void command_guild(Client *c, const Seperator *sep)
 					sep->argplus[3], leader, (unsigned long)id);
 
 				if (id == GUILD_NONE)
-					c->Message(0, "Guild creation failed.");
+					c->Message(Chat::White, "Guild creation failed.");
 				else {
-					c->Message(0, "Guild created: Leader: %i, number %i: %s",  leader, id, sep->argplus[3]);
+					c->Message(Chat::White, "Guild created: Leader: %i, number %i: %s",  leader, id, sep->argplus[3]);
 
 					if(!guild_mgr.SetGuild(leader, id, GUILD_LEADER))
-						c->Message(0, "Unable to set guild leader's guild in the database. Your going to have to run #guild set");
+						c->Message(Chat::White, "Unable to set guild leader's guild in the database. Your going to have to run #guild set");
 				}
 
 			}
@@ -5890,24 +6066,24 @@ void command_guild(Client *c, const Seperator *sep)
 	}
 	else if (strcasecmp(sep->arg[1], "delete") == 0) {
 		if (!sep->IsNumber(2))
-			c->Message(0, "Usage: #guild delete guildID");
+			c->Message(Chat::White, "Usage: #guild delete guildID");
 		else if (!worldserver.Connected())
-			c->Message(0, "Error: World server dirconnected");
+			c->Message(Chat::White, "Error: World server dirconnected");
 		else {
 			uint32 id = atoi(sep->arg[2]);
 
 			if(!guild_mgr.GuildExists(id)) {
-				c->Message(0, "Guild %d does not exist!",  id);
+				c->Message(Chat::White, "Guild %d does not exist!",  id);
 				return;
 			}
 
 			if(admin < minStatusToEditOtherGuilds) {
 				//this person is not allowed to just edit any guild, check this guild's min status.
 				if(c->GuildID() != id) {
-					c->Message(13, "Access denied to edit other people's guilds");
+					c->Message(Chat::Red, "Access denied to edit other people's guilds");
 					return;
 				} else if(!guild_mgr.CheckGMStatus(id, admin)) {
-					c->Message(13, "Access denied to edit your guild with GM commands.");
+					c->Message(Chat::Red, "Access denied to edit your guild with GM commands.");
 					return;
 				}
 			}
@@ -5916,32 +6092,32 @@ void command_guild(Client *c, const Seperator *sep)
 				guild_mgr.GetGuildName(id), id);
 
 			if (!guild_mgr.DeleteGuild(id))
-				c->Message(0, "Guild delete failed.");
+				c->Message(Chat::White, "Guild delete failed.");
 			else {
-				c->Message(0, "Guild %d deleted.",  id);
+				c->Message(Chat::White, "Guild %d deleted.",  id);
 			}
 		}
 	}
 	else if (strcasecmp(sep->arg[1], "rename") == 0) {
 		if ((!sep->IsNumber(2)) || sep->arg[3][0] == 0)
-			c->Message(0, "Usage: #guild rename guildID newname");
+			c->Message(Chat::White, "Usage: #guild rename guildID newname");
 		else if (!worldserver.Connected())
-			c->Message(0, "Error: World server dirconnected");
+			c->Message(Chat::White, "Error: World server dirconnected");
 		else {
 			uint32 id = atoi(sep->arg[2]);
 
 			if(!guild_mgr.GuildExists(id)) {
-				c->Message(0, "Guild %d does not exist!",  id);
+				c->Message(Chat::White, "Guild %d does not exist!",  id);
 				return;
 			}
 
 			if(admin < minStatusToEditOtherGuilds) {
 				//this person is not allowed to just edit any guild, check this guild's min status.
 				if(c->GuildID() != id) {
-					c->Message(13, "Access denied to edit other people's guilds");
+					c->Message(Chat::Red, "Access denied to edit other people's guilds");
 					return;
 				} else if(!guild_mgr.CheckGMStatus(id, admin)) {
-					c->Message(13, "Access denied to edit your guild with GM commands.");
+					c->Message(Chat::Red, "Access denied to edit your guild with GM commands.");
 					return;
 				}
 			}
@@ -5950,17 +6126,17 @@ void command_guild(Client *c, const Seperator *sep)
 				guild_mgr.GetGuildName(id), id, sep->argplus[3]);
 
 			if (!guild_mgr.RenameGuild(id, sep->argplus[3]))
-				c->Message(0, "Guild rename failed.");
+				c->Message(Chat::White, "Guild rename failed.");
 			else {
-				c->Message(0, "Guild %d renamed to %s",  id, sep->argplus[3]);
+				c->Message(Chat::White, "Guild %d renamed to %s",  id, sep->argplus[3]);
 			}
 		}
 	}
 	else if (strcasecmp(sep->arg[1], "setleader") == 0) {
 		if (sep->arg[3][0] == 0 || !sep->IsNumber(2))
-			c->Message(0, "Usage: #guild setleader guild_id {guildleader charname or CharID}");
+			c->Message(Chat::White, "Usage: #guild setleader guild_id {guildleader charname or CharID}");
 		else if (!worldserver.Connected())
-			c->Message(0, "Error: World server dirconnected");
+			c->Message(Chat::White, "Error: World server dirconnected");
 		else {
 			uint32 leader = 0;
 			if (sep->IsNumber(2)) {
@@ -5968,31 +6144,31 @@ void command_guild(Client *c, const Seperator *sep)
 			} else if((leader=database.GetCharacterID(sep->arg[2])) != 0) {
 				//got it from the db..
 			} else {
-				c->Message(13, "Unable to find char '%s'",  sep->arg[2]);
+				c->Message(Chat::Red, "Unable to find char '%s'",  sep->arg[2]);
 				return;
 			}
 
 			uint32 tmpdb = guild_mgr.FindGuildByLeader(leader);
 			if (leader == 0)
-				c->Message(0, "New leader not found.");
+				c->Message(Chat::White, "New leader not found.");
 			else if (tmpdb != 0) {
-				c->Message(0, "Error: %s already is the leader of guild # %i",  sep->arg[2], tmpdb);
+				c->Message(Chat::White, "Error: %s already is the leader of guild # %i",  sep->arg[2], tmpdb);
 			}
 			else {
 				uint32 id = atoi(sep->arg[2]);
 
 				if(!guild_mgr.GuildExists(id)) {
-					c->Message(0, "Guild %d does not exist!",  id);
+					c->Message(Chat::White, "Guild %d does not exist!",  id);
 					return;
 				}
 
 				if(admin < minStatusToEditOtherGuilds) {
 					//this person is not allowed to just edit any guild, check this guild's min status.
 					if(c->GuildID() != id) {
-						c->Message(13, "Access denied to edit other people's guilds");
+						c->Message(Chat::Red, "Access denied to edit other people's guilds");
 						return;
 					} else if(!guild_mgr.CheckGMStatus(id, admin)) {
-						c->Message(13, "Access denied to edit your guild with GM commands.");
+						c->Message(Chat::Red, "Access denied to edit your guild with GM commands.");
 						return;
 					}
 				}
@@ -6001,22 +6177,22 @@ void command_guild(Client *c, const Seperator *sep)
 					guild_mgr.GetGuildName(id), id, leader);
 
 				if(!guild_mgr.SetGuildLeader(id, leader))
-					c->Message(0, "Guild leader change failed.");
+					c->Message(Chat::White, "Guild leader change failed.");
 				else {
-					c->Message(0, "Guild leader changed: guild # %d, Leader: %s",  id, sep->argplus[3]);
+					c->Message(Chat::White, "Guild leader changed: guild # %d, Leader: %s",  id, sep->argplus[3]);
 				}
 			}
 		}
 	}
 	else if (strcasecmp(sep->arg[1], "list") == 0) {
 		if(admin < minStatusToEditOtherGuilds) {
-			c->Message(13, "Access denied.");
+			c->Message(Chat::Red, "Access denied.");
 			return;
 		}
 		guild_mgr.ListGuilds(c);
 	}
 	else {
-		c->Message(0, "Unknown guild command, try #guild help");
+		c->Message(Chat::White, "Unknown guild command, try #guild help");
 	}
 }
 /*
@@ -6034,12 +6210,12 @@ bool helper_guild_edit(Client *c, uint32 dbid, uint32 eqid, uint8 rank, const ch
 
 	if (strcasecmp(what, "title") == 0) {
 		if (strlen(value) > 100)
-			c->Message(0, "Error: Title has a maxium length of 100 characters.");
+			c->Message(Chat::White, "Error: Title has a maxium length of 100 characters.");
 		else
 			strcpy(grl.rankname, value);
 	}
 	else if (rank == 0)
-		c->Message(0, "Error: Rank 0's permissions can not be changed.");
+		c->Message(Chat::White, "Error: Rank 0's permissions can not be changed.");
 	else {
 		if (!(strlen(value) == 1 && (value[0] == '0' || value[0] == '1')))
 
@@ -6062,17 +6238,17 @@ bool helper_guild_edit(Client *c, uint32 dbid, uint32 eqid, uint8 rank, const ch
 		else if (strcasecmp(what, "warpeace") == 0)
 			grl.warpeace = (value[0] == '1');
 		else
-			c->Message(0, "Error: Permission name not recognized.");
+			c->Message(Chat::White, "Error: Permission name not recognized.");
 	}
 	if (!database.EditGuild(dbid, rank, &grl))
-		c->Message(0, "Error: database.EditGuild() failed");
+		c->Message(Chat::White, "Error: database.EditGuild() failed");
 	return true;
 }*/
 
 void command_zonestatus(Client *c, const Seperator *sep)
 {
 	if (!worldserver.Connected())
-		c->Message(0, "Error: World server disconnected");
+		c->Message(Chat::White, "Error: World server disconnected");
 	else {
 		auto pack = new ServerPacket(ServerOP_ZoneStatus, strlen(c->GetName()) + 2);
 		memset(pack->pBuffer, (uint8) c->Admin(), 1);
@@ -6085,11 +6261,11 @@ void command_zonestatus(Client *c, const Seperator *sep)
 void command_doanim(Client *c, const Seperator *sep)
 {
 	if (!sep->IsNumber(1))
-		c->Message(0, "Usage: #DoAnim [number]");
+		c->Message(Chat::White, "Usage: #DoAnim [number]");
 	else
 		if (c->Admin() >= commandDoAnimOthers)
 			if (c->GetTarget() == 0)
-				c->Message(0, "Error: You need a target.");
+				c->Message(Chat::White, "Error: You need a target.");
 			else
 				c->GetTarget()->DoAnim(atoi(sep->arg[1]),atoi(sep->arg[2]));
 		else
@@ -6100,13 +6276,13 @@ void command_randomfeatures(Client *c, const Seperator *sep)
 {
 	Mob *target=c->GetTarget();
 	if (!target)
-		c->Message(0,"Error: This command requires a target");
+		c->Message(Chat::White,"Error: This command requires a target");
 	else
 	{
 		if (target->RandomizeFeatures())
-			c->Message(0,"Features Randomized");
+			c->Message(Chat::White,"Features Randomized");
 		else
-			c->Message(0,"This command requires a Playable Race as the target");
+			c->Message(Chat::White,"This command requires a Playable Race as the target");
 	}
 }
 
@@ -6114,9 +6290,9 @@ void command_face(Client *c, const Seperator *sep)
 {
 	Mob *target=c->GetTarget();
 	if (!sep->IsNumber(1))
-		c->Message(0,"Usage: #face [number of face]");
+		c->Message(Chat::White,"Usage: #face [number of face]");
 	else if (!target)
-		c->Message(0,"Error: this command requires a target");
+		c->Message(Chat::White,"Error: this command requires a target");
 	else {
 		uint16 Race = target->GetRace();
 		uint8 Gender = target->GetGender();
@@ -6137,49 +6313,49 @@ void command_face(Client *c, const Seperator *sep)
 									EyeColor1, EyeColor2, HairStyle, LuclinFace, Beard, 0xFF,
 									DrakkinHeritage, DrakkinTattoo, DrakkinDetails);
 
-		c->Message(0,"Face = %i",  atoi(sep->arg[1]));
+		c->Message(Chat::White,"Face = %i",  atoi(sep->arg[1]));
 	}
 }
 
 void command_findaliases(Client *c, const Seperator *sep)
 {
 	if (!sep->arg[1][0]) {
-		c->Message(0, "Usage: #findaliases [alias | command]");
+		c->Message(Chat::White, "Usage: #findaliases [alias | command]");
 		return;
 	}
 
 	auto find_iter = commandaliases.find(sep->arg[1]);
 	if (find_iter == commandaliases.end()) {
-		c->Message(15, "No commands or aliases match '%s'", sep->arg[1]);
+		c->Message(Chat::Yellow, "No commands or aliases match '%s'", sep->arg[1]);
 		return;
 	}
 
 	auto command_iter = commandlist.find(find_iter->second);
 	if (find_iter->second.empty() || command_iter == commandlist.end()) {
-		c->Message(0, "An unknown condition occurred...");
+		c->Message(Chat::White, "An unknown condition occurred...");
 		return;
 	}
 
-	c->Message(0, "Available command aliases for '%s':", command_iter->first.c_str());
+	c->Message(Chat::White, "Available command aliases for '%s':", command_iter->first.c_str());
 
 	int commandaliasesshown = 0;
 	for (auto alias_iter = commandaliases.begin(); alias_iter != commandaliases.end(); ++alias_iter) {
 		if (strcasecmp(find_iter->second.c_str(), alias_iter->second.c_str()) || c->Admin() < command_iter->second->access)
 			continue;
 
-		c->Message(0, "%c%s", COMMAND_CHAR, alias_iter->first.c_str());
+		c->Message(Chat::White, "%c%s", COMMAND_CHAR, alias_iter->first.c_str());
 		++commandaliasesshown;
 	}
-	c->Message(0, "%d command alias%s listed.", commandaliasesshown, commandaliasesshown != 1 ? "es" : "");
+	c->Message(Chat::White, "%d command alias%s listed.", commandaliasesshown, commandaliasesshown != 1 ? "es" : "");
 }
 
 void command_details(Client *c, const Seperator *sep)
 {
 	Mob *target=c->GetTarget();
 	if (!sep->IsNumber(1))
-		c->Message(0,"Usage: #details [number of drakkin detail]");
+		c->Message(Chat::White,"Usage: #details [number of drakkin detail]");
 	else if (!target)
-		c->Message(0,"Error: this command requires a target");
+		c->Message(Chat::White,"Error: this command requires a target");
 	else {
 		uint16 Race = target->GetRace();
 		uint8 Gender = target->GetGender();
@@ -6200,7 +6376,7 @@ void command_details(Client *c, const Seperator *sep)
 									EyeColor1, EyeColor2, HairStyle, LuclinFace, Beard, 0xFF,
 									DrakkinHeritage, DrakkinTattoo, DrakkinDetails);
 
-		c->Message(0,"Details = %i",  atoi(sep->arg[1]));
+		c->Message(Chat::White,"Details = %i",  atoi(sep->arg[1]));
 	}
 }
 
@@ -6208,9 +6384,9 @@ void command_heritage(Client *c, const Seperator *sep)
 {
 	Mob *target=c->GetTarget();
 	if (!sep->IsNumber(1))
-		c->Message(0,"Usage: #heritage [number of Drakkin heritage]");
+		c->Message(Chat::White,"Usage: #heritage [number of Drakkin heritage]");
 	else if (!target)
-		c->Message(0,"Error: this command requires a target");
+		c->Message(Chat::White,"Error: this command requires a target");
 	else {
 		uint16 Race = target->GetRace();
 		uint8 Gender = target->GetGender();
@@ -6231,7 +6407,7 @@ void command_heritage(Client *c, const Seperator *sep)
 									EyeColor1, EyeColor2, HairStyle, LuclinFace, Beard, 0xFF,
 									DrakkinHeritage, DrakkinTattoo, DrakkinDetails);
 
-		c->Message(0,"Heritage = %i",  atoi(sep->arg[1]));
+		c->Message(Chat::White,"Heritage = %i",  atoi(sep->arg[1]));
 	}
 }
 
@@ -6239,9 +6415,9 @@ void command_tattoo(Client *c, const Seperator *sep)
 {
 	Mob *target=c->GetTarget();
 	if (!sep->IsNumber(1))
-		c->Message(0,"Usage: #tattoo [number of Drakkin tattoo]");
+		c->Message(Chat::White,"Usage: #tattoo [number of Drakkin tattoo]");
 	else if (!target)
-		c->Message(0,"Error: this command requires a target");
+		c->Message(Chat::White,"Error: this command requires a target");
 	else {
 		uint16 Race = target->GetRace();
 		uint8 Gender = target->GetGender();
@@ -6262,7 +6438,7 @@ void command_tattoo(Client *c, const Seperator *sep)
 									EyeColor1, EyeColor2, HairStyle, LuclinFace, Beard, 0xFF,
 									DrakkinHeritage, DrakkinTattoo, DrakkinDetails);
 
-		c->Message(0,"Tattoo = %i",  atoi(sep->arg[1]));
+		c->Message(Chat::White,"Tattoo = %i",  atoi(sep->arg[1]));
 	}
 }
 
@@ -6270,9 +6446,9 @@ void command_helm(Client *c, const Seperator *sep)
 {
 	Mob *target=c->GetTarget();
 	if (!sep->IsNumber(1))
-		c->Message(0,"Usage: #helm [number of helm texture]");
+		c->Message(Chat::White,"Usage: #helm [number of helm texture]");
 	else if (!target)
-		c->Message(0,"Error: this command requires a target");
+		c->Message(Chat::White,"Error: this command requires a target");
 	else {
 		uint16 Race = target->GetRace();
 		uint8 Gender = target->GetGender();
@@ -6293,7 +6469,7 @@ void command_helm(Client *c, const Seperator *sep)
 									EyeColor1, EyeColor2, HairStyle, LuclinFace, Beard, 0xFF,
 									DrakkinHeritage, DrakkinTattoo, DrakkinDetails);
 
-		c->Message(0,"Helm = %i",  atoi(sep->arg[1]));
+		c->Message(Chat::White,"Helm = %i",  atoi(sep->arg[1]));
 	}
 }
 
@@ -6301,9 +6477,9 @@ void command_hair(Client *c, const Seperator *sep)
 {
 	Mob *target=c->GetTarget();
 	if (!sep->IsNumber(1))
-		c->Message(0,"Usage: #hair [number of hair style]");
+		c->Message(Chat::White,"Usage: #hair [number of hair style]");
 	else if (!target)
-		c->Message(0,"Error: this command requires a target");
+		c->Message(Chat::White,"Error: this command requires a target");
 	else {
 		uint16 Race = target->GetRace();
 		uint8 Gender = target->GetGender();
@@ -6324,7 +6500,7 @@ void command_hair(Client *c, const Seperator *sep)
 									EyeColor1, EyeColor2, HairStyle, LuclinFace, Beard, 0xFF,
 									DrakkinHeritage, DrakkinTattoo, DrakkinDetails);
 
-		c->Message(0,"Hair = %i",  atoi(sep->arg[1]));
+		c->Message(Chat::White,"Hair = %i",  atoi(sep->arg[1]));
 	}
 }
 
@@ -6332,9 +6508,9 @@ void command_haircolor(Client *c, const Seperator *sep)
 {
 	Mob *target=c->GetTarget();
 	if (!sep->IsNumber(1))
-		c->Message(0,"Usage: #haircolor [number of hair color]");
+		c->Message(Chat::White,"Usage: #haircolor [number of hair color]");
 	else if (!target)
-		c->Message(0,"Error: this command requires a target");
+		c->Message(Chat::White,"Error: this command requires a target");
 	else {
 		uint16 Race = target->GetRace();
 		uint8 Gender = target->GetGender();
@@ -6355,7 +6531,7 @@ void command_haircolor(Client *c, const Seperator *sep)
 									EyeColor1, EyeColor2, HairStyle, LuclinFace, Beard, 0xFF,
 									DrakkinHeritage, DrakkinTattoo, DrakkinDetails);
 
-		c->Message(0,"Hair Color = %i",  atoi(sep->arg[1]));
+		c->Message(Chat::White,"Hair Color = %i",  atoi(sep->arg[1]));
 	}
 }
 
@@ -6363,9 +6539,9 @@ void command_beard(Client *c, const Seperator *sep)
 {
 	Mob *target=c->GetTarget();
 	if (!sep->IsNumber(1))
-		c->Message(0,"Usage: #beard [number of beard style]");
+		c->Message(Chat::White,"Usage: #beard [number of beard style]");
 	else if (!target)
-		c->Message(0,"Error: this command requires a target");
+		c->Message(Chat::White,"Error: this command requires a target");
 	else {
 		uint16 Race = target->GetRace();
 		uint8 Gender = target->GetGender();
@@ -6386,7 +6562,7 @@ void command_beard(Client *c, const Seperator *sep)
 									EyeColor1, EyeColor2, HairStyle, LuclinFace, Beard, 0xFF,
 									DrakkinHeritage, DrakkinTattoo, DrakkinDetails);
 
-		c->Message(0,"Beard = %i",  atoi(sep->arg[1]));
+		c->Message(Chat::White,"Beard = %i",  atoi(sep->arg[1]));
 	}
 }
 
@@ -6394,9 +6570,9 @@ void command_beardcolor(Client *c, const Seperator *sep)
 {
 	Mob *target=c->GetTarget();
 	if (!sep->IsNumber(1))
-		c->Message(0,"Usage: #beardcolor [number of beard color]");
+		c->Message(Chat::White,"Usage: #beardcolor [number of beard color]");
 	else if (!target)
-		c->Message(0,"Error: this command requires a target");
+		c->Message(Chat::White,"Error: this command requires a target");
 	else {
 		uint16 Race = target->GetRace();
 		uint8 Gender = target->GetGender();
@@ -6417,7 +6593,7 @@ void command_beardcolor(Client *c, const Seperator *sep)
 									EyeColor1, EyeColor2, HairStyle, LuclinFace, Beard, 0xFF,
 									DrakkinHeritage, DrakkinTattoo, DrakkinDetails);
 
-		c->Message(0,"Beard Color = %i",  atoi(sep->arg[1]));
+		c->Message(Chat::White,"Beard Color = %i",  atoi(sep->arg[1]));
 	}
 }
 
@@ -6428,7 +6604,7 @@ void command_scribespells(Client *c, const Seperator *sep)
 		t = c->GetTarget()->CastToClient();
 
 	if(sep->argnum < 1 || !sep->IsNumber(1)) {
-		c->Message(0, "FORMAT: #scribespells <max level> <min level>");
+		c->Message(Chat::White, "FORMAT: #scribespells <max level> <min level>");
 		return;
 	}
 
@@ -6441,17 +6617,17 @@ void command_scribespells(Client *c, const Seperator *sep)
 		min_level = (uint8)RuleI(Character, MaxLevel); // default to Character:MaxLevel if we're not a GM & it's higher than the max level
 
 	if(max_level < 1 || min_level < 1) {
-		c->Message(0, "ERROR: Level must be greater than 1.");
+		c->Message(Chat::White, "ERROR: Level must be greater than 1.");
 		return;
 	}
 	if (min_level > max_level) {
-		c->Message(0, "ERROR: Min Level must be less than or equal to Max Level.");
+		c->Message(Chat::White, "ERROR: Min Level must be less than or equal to Max Level.");
 		return;
 	}
 
-	t->Message(0, "Scribing spells to spellbook.");
+	t->Message(Chat::White, "Scribing spells to spellbook.");
 	if(t != c)
-		c->Message(0, "Scribing spells for %s.",  t->GetName());
+		c->Message(Chat::White, "Scribing spells for %s.",  t->GetName());
 	Log(Logs::General, Logs::Normal, "Scribe spells request for %s from %s, levels: %u -> %u",  t->GetName(), c->GetName(), min_level, max_level);
 
 	int book_slot = t->GetNextAvailableSpellBookSlot();
@@ -6478,14 +6654,14 @@ void command_scribespells(Client *c, const Seperator *sep)
 			break;
 		}
 		if (spell_id < 0 || spell_id >= SPDAT_RECORDS) {
-			c->Message(13, "FATAL ERROR: Spell id out-of-range (id: %i, min: 0, max: %i)", spell_id, SPDAT_RECORDS);
+			c->Message(Chat::Red, "FATAL ERROR: Spell id out-of-range (id: %i, min: 0, max: %i)", spell_id, SPDAT_RECORDS);
 			return;
 		}
 		if (book_slot < 0 || book_slot >= EQEmu::spells::SPELLBOOK_SIZE) {
-			c->Message(13, "FATAL ERROR: Book slot out-of-range (slot: %i, min: 0, max: %i)", book_slot, EQEmu::spells::SPELLBOOK_SIZE);
+			c->Message(Chat::Red, "FATAL ERROR: Book slot out-of-range (slot: %i, min: 0, max: %i)", book_slot, EQEmu::spells::SPELLBOOK_SIZE);
 			return;
 		}
-		
+
 		while (true) {
 			if (spells[spell_id].classes[WARRIOR] == 0) // check if spell exists
 				break;
@@ -6498,7 +6674,7 @@ void command_scribespells(Client *c, const Seperator *sep)
 
 			uint16 spell_id_ = (uint16)spell_id;
 			if ((spell_id_ != spell_id) || (spell_id != spell_id_)) {
-				c->Message(13, "FATAL ERROR: Type conversion data loss with spell_id (%i != %u)", spell_id, spell_id_);
+				c->Message(Chat::Red, "FATAL ERROR: Type conversion data loss with spell_id (%i != %u)", spell_id, spell_id_);
 				return;
 			}
 
@@ -6514,14 +6690,14 @@ void command_scribespells(Client *c, const Seperator *sep)
 	}
 
 	if (count > 0) {
-		t->Message(0, "Successfully scribed %i spells.",  count);
+		t->Message(Chat::White, "Successfully scribed %i spells.",  count);
 		if (t != c)
-			c->Message(0, "Successfully scribed %i spells for %s.",  count, t->GetName());
+			c->Message(Chat::White, "Successfully scribed %i spells for %s.",  count, t->GetName());
 	}
 	else {
-		t->Message(0, "No spells scribed.");
+		t->Message(Chat::White, "No spells scribed.");
 		if (t != c)
-			c->Message(0, "No spells scribed for %s.",  t->GetName());
+			c->Message(Chat::White, "No spells scribed for %s.",  t->GetName());
 	}
 }
 
@@ -6534,17 +6710,17 @@ void command_scribespell(Client *c, const Seperator *sep) {
 		t=c->GetTarget()->CastToClient();
 
 	if(!sep->arg[1][0]) {
-		c->Message(0, "FORMAT: #scribespell <spellid>");
+		c->Message(Chat::White, "FORMAT: #scribespell <spellid>");
 		return;
 	}
 
 	spell_id = atoi(sep->arg[1]);
 
 	if(IsValidSpell(spell_id)) {
-		t->Message(0, "Scribing spell: %s (%i) to spellbook.",  spells[spell_id].name, spell_id);
+		t->Message(Chat::White, "Scribing spell: %s (%i) to spellbook.",  spells[spell_id].name, spell_id);
 
 		if(t != c)
-			c->Message(0, "Scribing spell: %s (%i) for %s.",  spells[spell_id].name, spell_id, t->GetName());
+			c->Message(Chat::White, "Scribing spell: %s (%i) for %s.",  spells[spell_id].name, spell_id, t->GetName());
 
 		Log(Logs::General, Logs::Normal, "Scribe spell: %s (%i) request for %s from %s.",  spells[spell_id].name, spell_id, t->GetName(), c->GetName());
 
@@ -6554,17 +6730,17 @@ void command_scribespell(Client *c, const Seperator *sep) {
 			if(book_slot >= 0 && t->FindSpellBookSlotBySpellID(spell_id) < 0)
 				t->ScribeSpell(spell_id, book_slot);
 			else {
-				t->Message(13, "Unable to scribe spell: %s (%i) to your spellbook.",  spells[spell_id].name, spell_id);
+				t->Message(Chat::Red, "Unable to scribe spell: %s (%i) to your spellbook.",  spells[spell_id].name, spell_id);
 
 				if(t != c)
-					c->Message(13, "Unable to scribe spell: %s (%i) for %s.",  spells[spell_id].name, spell_id, t->GetName());
+					c->Message(Chat::Red, "Unable to scribe spell: %s (%i) for %s.",  spells[spell_id].name, spell_id, t->GetName());
 			}
 		}
 		else
-			c->Message(13, "Your target can not scribe this spell.");
+			c->Message(Chat::Red, "Your target can not scribe this spell.");
 	}
 	else
-		c->Message(13, "Spell ID: %i is an unknown spell and cannot be scribed.",  spell_id);
+		c->Message(Chat::Red, "Spell ID: %i is an unknown spell and cannot be scribed.",  spell_id);
 }
 
 void command_unscribespell(Client *c, const Seperator *sep) {
@@ -6576,7 +6752,7 @@ void command_unscribespell(Client *c, const Seperator *sep) {
 		t=c->GetTarget()->CastToClient();
 
 	if(!sep->arg[1][0]) {
-		c->Message(0, "FORMAT: #unscribespell <spellid>");
+		c->Message(Chat::White, "FORMAT: #unscribespell <spellid>");
 		return;
 	}
 
@@ -6588,18 +6764,18 @@ void command_unscribespell(Client *c, const Seperator *sep) {
 		if(book_slot >= 0) {
 			t->UnscribeSpell(book_slot);
 
-			t->Message(0, "Unscribing spell: %s (%i) from spellbook.",  spells[spell_id].name, spell_id);
+			t->Message(Chat::White, "Unscribing spell: %s (%i) from spellbook.",  spells[spell_id].name, spell_id);
 
 			if(t != c)
-				c->Message(0, "Unscribing spell: %s (%i) for %s.",  spells[spell_id].name, spell_id, t->GetName());
+				c->Message(Chat::White, "Unscribing spell: %s (%i) for %s.",  spells[spell_id].name, spell_id, t->GetName());
 
 			Log(Logs::General, Logs::Normal, "Unscribe spell: %s (%i) request for %s from %s.",  spells[spell_id].name, spell_id, t->GetName(), c->GetName());
 		}
 		else {
-			t->Message(13, "Unable to unscribe spell: %s (%i) from your spellbook. This spell is not scribed.",  spells[spell_id].name, spell_id);
+			t->Message(Chat::Red, "Unable to unscribe spell: %s (%i) from your spellbook. This spell is not scribed.",  spells[spell_id].name, spell_id);
 
 			if(t != c)
-				c->Message(13, "Unable to unscribe spell: %s (%i) for %s due to spell not scribed.",  spells[spell_id].name, spell_id, t->GetName());
+				c->Message(Chat::Red, "Unable to unscribe spell: %s (%i) for %s due to spell not scribed.",  spells[spell_id].name, spell_id, t->GetName());
 		}
 	}
 }
@@ -6618,7 +6794,7 @@ void command_untraindisc(Client *c, const Seperator *sep) {
 	Client *t = c;
 	if (c->GetTarget() && c->GetTarget()->IsClient() && c->GetGM())
 		t = c->GetTarget()->CastToClient();
-	
+
 	for (int i = 0; i < MAX_PP_DISCIPLINES; i++) {
 		if (t->GetPP().disciplines.values[i] == atoi(sep->arg[1])) {
 			t->UntrainDisc(i, 1);
@@ -6631,7 +6807,7 @@ void command_untraindiscs(Client *c, const Seperator *sep) {
 	Client *t = c;
 	if (c->GetTarget() && c->GetTarget()->IsClient() && c->GetGM())
 		t = c->GetTarget()->CastToClient();
-	
+
 	t->UntrainDiscAll();
 }
 
@@ -6640,7 +6816,7 @@ void command_wpinfo(Client *c, const Seperator *sep)
 	Mob *t=c->GetTarget();
 
 	if (t == nullptr || !t->IsNPC()) {
-		c->Message(0,"You must target an NPC to use this.");
+		c->Message(Chat::White,"You must target an NPC to use this.");
 		return;
 	}
 
@@ -6650,47 +6826,54 @@ void command_wpinfo(Client *c, const Seperator *sep)
 
 void command_wpadd(Client *c, const Seperator *sep)
 {
-	int	type1=0,
-		type2=0,
-		pause=0;	// Defaults for a new grid
+	int type1 = 0,
+		type2 = 0,
+		pause = 0;    // Defaults for a new grid
 
-	Mob *t=c->GetTarget();
-	if (t && t->IsNPC())
-	{
-		Spawn2* s2info = t->CastToNPC()->respawn2;
+	Mob *target = c->GetTarget();
+	if (target && target->IsNPC()) {
+		Spawn2 *s2info = target->CastToNPC()->respawn2;
 
-		if(s2info == nullptr)	// Can't figure out where this mob's spawn came from... maybe a dynamic mob created by #spawn
+		if (s2info ==
+			nullptr)    // Can't figure out where this mob's spawn came from... maybe a dynamic mob created by #spawn
 		{
-			c->Message(0,"#wpadd FAILED -- Can't determine which spawn record in the database this mob came from!");
+			c->Message(
+				Chat::White,
+				"#wpadd FAILED -- Can't determine which spawn record in the database this mob came from!"
+			);
 			return;
 		}
 
-		if (sep->arg[1][0])
-		{
-			if (atoi(sep->arg[1]) >= 0)
-				pause=atoi(sep->arg[1]);
-			else
-			{
-				c->Message(0,"Usage: #wpadd [pause] [-h]");
+		if (sep->arg[1][0]) {
+			if (atoi(sep->arg[1]) >= 0) {
+				pause = atoi(sep->arg[1]);
+			}
+			else {
+				c->Message(Chat::White, "Usage: #wpadd [pause] [-h]");
 				return;
 			}
 		}
 		auto position = c->GetPosition();
-		if (strcmp("-h",sep->arg[2]) != 0)
+		if (strcmp("-h", sep->arg[2]) != 0) {
 			position.w = -1;
+		}
 
 		uint32 tmp_grid = database.AddWPForSpawn(c, s2info->GetID(), position, pause, type1, type2, zone->GetZoneID());
-		if (tmp_grid)
-			t->CastToNPC()->SetGrid(tmp_grid);
+		if (tmp_grid) {
+			target->CastToNPC()->SetGrid(tmp_grid);
+		}
 
-		t->CastToNPC()->AssignWaypoints(t->CastToNPC()->GetGrid());
-		c->Message(0,"Waypoint added. Use #wpinfo to see waypoints for this NPC (may need to #repop first).");
+		target->CastToNPC()->AssignWaypoints(target->CastToNPC()->GetGrid());
+		c->Message(
+			Chat::White,
+			"Waypoint added. Use #wpinfo to see waypoints for this NPC (may need to #repop first)."
+		);
+	}
+	else {
+		c->Message(Chat::White, "You must target an NPC to use this.");
 	}
-	else
-		c->Message(0,"You must target an NPC to use this.");
 }
 
-
 void command_interrupt(Client *c, const Seperator *sep)
 {
 	uint16 ci_message=0x01b7, ci_color=0x0121;
@@ -6716,14 +6899,14 @@ void command_summonitem(Client *c, const Seperator *sep)
 		itemid = link_body.item_id;
 	}
 	else if (!sep->IsNumber(1)) {
-		c->Message(0, "Usage: #summonitem [item id | link] [charges], charges are optional");
+		c->Message(Chat::White, "Usage: #summonitem [item id | link] [charges], charges are optional");
 		return;
 	}
 	else {
 		itemid = atoi(sep->arg[1]);
 	}
 	if (!itemid) {
-		c->Message(0, "A valid item id number is required (derived: 0)");
+		c->Message(Chat::White, "A valid item id number is required (derived: 0)");
 		return;
 	}
 
@@ -6734,7 +6917,7 @@ void command_summonitem(Client *c, const Seperator *sep)
 	}
 
 	if (item_status > c->Admin())
-		c->Message(13, "Error: Insufficient status to summon this item.");
+		c->Message(Chat::Red, "Error: Insufficient status to summon this item.");
 	else if (sep->argnum == 2 && sep->IsNumber(2))
 		c->SummonItem(itemid, atoi(sep->arg[2]));
 	else if (sep->argnum == 3)
@@ -6752,17 +6935,17 @@ void command_summonitem(Client *c, const Seperator *sep)
 	else {
 		c->SummonItem(itemid);
 	}
-	
+
 }
 
 void command_giveitem(Client *c, const Seperator *sep)
 {
 	if (!sep->IsNumber(1)) {
-		c->Message(13, "Usage: #summonitem [item id] [charges], charges are optional");
+		c->Message(Chat::Red, "Usage: #summonitem [item id] [charges], charges are optional");
 	} else if(c->GetTarget() == nullptr) {
-		c->Message(13, "You must target a client to give the item to.");
+		c->Message(Chat::Red, "You must target a client to give the item to.");
 	} else if(!c->GetTarget()->IsClient()) {
-		c->Message(13, "You can only give items to players with this command.");
+		c->Message(Chat::Red, "You can only give items to players with this command.");
 	} else {
 		Client *t = c->GetTarget()->CastToClient();
 		uint32 itemid = atoi(sep->arg[1]);
@@ -6773,7 +6956,7 @@ void command_giveitem(Client *c, const Seperator *sep)
 		}
 
 		if (item_status > c->Admin())
-			c->Message(13, "Error: Insufficient status to summon this item.");
+			c->Message(Chat::Red, "Error: Insufficient status to summon this item.");
 		else if (sep->argnum==2 && sep->IsNumber(2))
 			t->SummonItem(itemid, atoi(sep->arg[2]));
 		else if (sep->argnum==3)
@@ -6797,25 +6980,25 @@ void command_giveitem(Client *c, const Seperator *sep)
 void command_givemoney(Client *c, const Seperator *sep)
 {
 	if (!sep->IsNumber(1)) {	//as long as the first one is a number, we'll just let atoi convert the rest to 0 or a number
-		c->Message(13, "Usage: #Usage: #givemoney [pp] [gp] [sp] [cp]");
+		c->Message(Chat::Red, "Usage: #Usage: #givemoney [pp] [gp] [sp] [cp]");
 	}
 	else if(c->GetTarget() == nullptr) {
-		c->Message(13, "You must target a player to give money to.");
+		c->Message(Chat::Red, "You must target a player to give money to.");
 	}
 	else if(!c->GetTarget()->IsClient()) {
-		c->Message(13, "You can only give money to players with this command.");
+		c->Message(Chat::Red, "You can only give money to players with this command.");
 	}
 	else {
 		//TODO: update this to the client, otherwise the client doesn't show any weight change until you zone, move an item, etc
 		c->GetTarget()->CastToClient()->AddMoneyToPP(atoi(sep->arg[4]), atoi(sep->arg[3]), atoi(sep->arg[2]), atoi(sep->arg[1]), true);
-		c->Message(0, "Added %i Platinum, %i Gold, %i Silver, and %i Copper to %s's inventory.",  atoi(sep->arg[1]), atoi(sep->arg[2]), atoi(sep->arg[3]), atoi(sep->arg[4]), c->GetTarget()->GetName());
+		c->Message(Chat::White, "Added %i Platinum, %i Gold, %i Silver, and %i Copper to %s's inventory.",  atoi(sep->arg[1]), atoi(sep->arg[2]), atoi(sep->arg[3]), atoi(sep->arg[4]), c->GetTarget()->GetName());
 	}
 }
 
 void command_itemsearch(Client *c, const Seperator *sep)
 {
 	if (sep->arg[1][0] == 0)
-		c->Message(0, "Usage: #itemsearch [search string]");
+		c->Message(Chat::White, "Usage: #itemsearch [search string]");
 	else
 	{
 		const char *search_criteria=sep->argplus[1];
@@ -6829,10 +7012,10 @@ void command_itemsearch(Client *c, const Seperator *sep)
 			if (item) {
 				linker.SetItemData(item);
 
-				c->Message(0, "%u: %s",  item->ID, linker.GenerateLink().c_str());
+				c->Message(Chat::White, "%u: %s",  item->ID, linker.GenerateLink().c_str());
 			}
 			else {
-				c->Message(0, "Item #%s not found",  search_criteria);
+				c->Message(Chat::White, "Item #%s not found",  search_criteria);
 			}
 
 			return;
@@ -6852,7 +7035,7 @@ void command_itemsearch(Client *c, const Seperator *sep)
 			if (pdest != nullptr) {
 				linker.SetItemData(item);
 
-				c->Message(0, "%u: %s",  item->ID, linker.GenerateLink().c_str());
+				c->Message(Chat::White, "%u: %s",  item->ID, linker.GenerateLink().c_str());
 
 				++count;
 			}
@@ -6862,9 +7045,9 @@ void command_itemsearch(Client *c, const Seperator *sep)
 		}
 
 		if (count == 50)
-			c->Message(0, "50 items shown...too many results.");
+			c->Message(Chat::White, "50 items shown...too many results.");
 		else
-			c->Message(0, "%i items found",  count);
+			c->Message(Chat::White, "%i items found",  count);
 
 	}
 }
@@ -6882,7 +7065,7 @@ void command_setaaxp(Client *c, const Seperator *sep)
 			t->SetLeadershipEXP(atoi(sep->arg[2]), atoi(sep->arg[3]));
 		}
 	} else
-		c->Message(0, "Usage: #setaaxp <new AA XP value> (<new Group AA XP value> <new Raid XP value>)");
+		c->Message(Chat::White, "Usage: #setaaxp <new AA XP value> (<new Group AA XP value> <new Raid XP value>)");
 }
 
 void command_setaapts(Client *c, const Seperator *sep)
@@ -6893,23 +7076,23 @@ void command_setaapts(Client *c, const Seperator *sep)
 		t=c->GetTarget()->CastToClient();
 
 	if(sep->arg[1][0] == '\0' || sep->arg[2][0] == '\0')
-		c->Message(0, "Usage: #setaapts <AA|group|raid> <new AA points value>");
+		c->Message(Chat::White, "Usage: #setaapts <AA|group|raid> <new AA points value>");
 	else if(atoi(sep->arg[2]) <= 0 || atoi(sep->arg[2]) > 5000)
-		c->Message(0, "You must have a number greater than 0 for points and no more than 5000.");
+		c->Message(Chat::White, "You must have a number greater than 0 for points and no more than 5000.");
 	else if(!strcasecmp(sep->arg[1], "group")) {
 		t->GetPP().group_leadership_points = atoi(sep->arg[2]);
 		t->GetPP().group_leadership_exp = 0;
-		t->Message(MT_Experience, "Setting Group AA points to %u", t->GetPP().group_leadership_points);
+		t->Message(Chat::Experience, "Setting Group AA points to %u", t->GetPP().group_leadership_points);
 		t->SendLeadershipEXPUpdate();
 	} else if(!strcasecmp(sep->arg[1], "raid")) {
 		t->GetPP().raid_leadership_points = atoi(sep->arg[2]);
 		t->GetPP().raid_leadership_exp = 0;
-		t->Message(MT_Experience, "Setting Raid AA points to %u", t->GetPP().raid_leadership_points);
+		t->Message(Chat::Experience, "Setting Raid AA points to %u", t->GetPP().raid_leadership_points);
 		t->SendLeadershipEXPUpdate();
 	} else {
 		t->GetPP().aapoints = atoi(sep->arg[2]);
 		t->GetPP().expAA = 0;
-		t->Message(MT_Experience, "Setting personal AA points to %u", t->GetPP().aapoints);
+		t->Message(Chat::Experience, "Setting personal AA points to %u", t->GetPP().aapoints);
 		t->SendAlternateAdvancementStats();
 	}
 }
@@ -6922,9 +7105,9 @@ void command_setcrystals(Client *c, const Seperator *sep)
 		t=c->GetTarget()->CastToClient();
 
 	if(sep->arg[1][0] == '\0' || sep->arg[2][0] == '\0')
-		c->Message(0, "Usage: #setcrystals <radiant|ebon> <new crystal count value>");
+		c->Message(Chat::White, "Usage: #setcrystals <radiant|ebon> <new crystal count value>");
 	else if(atoi(sep->arg[2]) <= 0 || atoi(sep->arg[2]) > 100000)
-		c->Message(0, "You must have a number greater than 0 for crystals and no more than 100000.");
+		c->Message(Chat::White, "You must have a number greater than 0 for crystals and no more than 100000.");
 	else if(!strcasecmp(sep->arg[1], "radiant"))
 	{
 		t->SetRadiantCrystals(atoi(sep->arg[2]));
@@ -6939,7 +7122,7 @@ void command_setcrystals(Client *c, const Seperator *sep)
 	}
 	else
 	{
-		c->Message(0, "Usage: #setcrystals <radiant|ebon> <new crystal count value>");
+		c->Message(Chat::White, "Usage: #setcrystals <radiant|ebon> <new crystal count value>");
 	}
 }
 
@@ -6959,14 +7142,14 @@ void command_stun(Client *c, const Seperator *sep)
 			t->CastToNPC()->Stun(duration);
 	}
 	else
-		c->Message(0, "Usage: #stun [duration]");
+		c->Message(Chat::White, "Usage: #stun [duration]");
 }
 
 
 void command_ban(Client *c, const Seperator *sep)
 {
 if(sep->arg[1][0] == 0 || sep->arg[2][0] == 0) {
-		c->Message(0, "Usage: #ban <charname> <message>");
+		c->Message(Chat::White, "Usage: #ban <charname> <message>");
 		return;
 	}
 
@@ -6988,12 +7171,12 @@ if(sep->arg[1][0] == 0 || sep->arg[2][0] == 0) {
     }
 
     if(message.length() == 0) {
-        c->Message(0, "Usage: #ban <charname> <message>");
+        c->Message(Chat::White, "Usage: #ban <charname> <message>");
         return;
     }
 
     if(account_id == 0) {
-        c->Message(13, "Character does not exist.");
+        c->Message(Chat::Red, "Character does not exist.");
         return;
     }
 
@@ -7001,7 +7184,7 @@ if(sep->arg[1][0] == 0 || sep->arg[2][0] == 0) {
                                     "WHERE id = %i",  EscapeString(message).c_str(), account_id);
     auto results = database.QueryDatabase(query);
 
-    c->Message(13, "Account number %i with the character %s has been banned with message: \"%s\"",  account_id, sep->arg[1], message.c_str());
+    c->Message(Chat::Red, "Account number %i with the character %s has been banned with message: \"%s\"",  account_id, sep->arg[1], message.c_str());
 
     ServerPacket flagUpdatePack(ServerOP_FlagUpdate, 6);
     *((uint32*)&flagUpdatePack.pBuffer[0]) = account_id;
@@ -7026,7 +7209,7 @@ if(sep->arg[1][0] == 0 || sep->arg[2][0] == 0) {
 void command_suspend(Client *c, const Seperator *sep)
 {
 	if((sep->arg[1][0] == 0) || (sep->arg[2][0] == 0)) {
-		c->Message(0, "Usage: #suspend <charname> <days> (Specify 0 days to lift the suspension immediately) <message>");
+		c->Message(Chat::White, "Usage: #suspend <charname> <days> (Specify 0 days to lift the suspension immediately) <message>");
 		return;
     }
 
@@ -7053,7 +7236,7 @@ void command_suspend(Client *c, const Seperator *sep)
         }
 
         if(message.length() == 0) {
-            c->Message(0, "Usage: #suspend <charname> <days>(Specify 0 days to lift the suspension immediately) <message>");
+            c->Message(Chat::White, "Usage: #suspend <charname> <days>(Specify 0 days to lift the suspension immediately) <message>");
             return;
         }
     }
@@ -7064,7 +7247,7 @@ void command_suspend(Client *c, const Seperator *sep)
     safe_delete_array(escName);
 
     if (accountID <= 0) {
-        c->Message(13,"Character does not exist.");
+        c->Message(Chat::Red,"Character does not exist.");
         return;
     }
 
@@ -7074,9 +7257,9 @@ void command_suspend(Client *c, const Seperator *sep)
     auto results = database.QueryDatabase(query);
 
     if(duration)
-        c->Message(13,"Account number %i with the character %s has been temporarily suspended for %i day(s).",  accountID, sep->arg[1], duration);
+        c->Message(Chat::Red,"Account number %i with the character %s has been temporarily suspended for %i day(s).",  accountID, sep->arg[1], duration);
     else
-        c->Message(13,"Account number %i with the character %s is no longer suspended.",  accountID, sep->arg[1]);
+        c->Message(Chat::Red,"Account number %i with the character %s is no longer suspended.",  accountID, sep->arg[1]);
 
     Client *bannedClient = entity_list.GetClientByName(sep->arg[1]);
 
@@ -7101,12 +7284,12 @@ void command_ipban(Client *c, const Seperator *sep)
 {
 	if(sep->arg[1] == 0)
 	{
-		c->Message(0, "Usage: #ipban [xxx.xxx.xxx.xxx]");
+		c->Message(Chat::White, "Usage: #ipban [xxx.xxx.xxx.xxx]");
 	} else {
 		if(database.AddBannedIP(sep->arg[1], c->GetName())) {
-			c->Message(0, "%s has been successfully added to the Banned_IPs table by %s", sep->arg[1], c->GetName());
+			c->Message(Chat::White, "%s has been successfully added to the Banned_IPs table by %s", sep->arg[1], c->GetName());
 		} else {
-			c->Message(0, "IPBan Failed (IP address is possibly already in the table?)");
+			c->Message(Chat::White, "IPBan Failed (IP address is possibly already in the table?)");
 		}
 	}
 }
@@ -7114,13 +7297,13 @@ void command_ipban(Client *c, const Seperator *sep)
 void command_revoke(Client *c, const Seperator *sep)
 {
 	if(sep->arg[1][0] == 0 || sep->arg[2][0] == 0) {
-		c->Message(0, "Usage: #revoke [charname] [1/0]");
+		c->Message(Chat::White, "Usage: #revoke [charname] [1/0]");
 		return;
 	}
 
     uint32 characterID = database.GetAccountIDByChar(sep->arg[1]);
     if(characterID == 0) {
-        c->Message(13,"Character does not exist.");
+        c->Message(Chat::Red,"Character does not exist.");
         return;
     }
 
@@ -7128,16 +7311,16 @@ void command_revoke(Client *c, const Seperator *sep)
     std::string query = StringFormat("UPDATE account SET revoked = %d WHERE id = %i",  flag, characterID);
     auto results = database.QueryDatabase(query);
 
-    c->Message(13,"%s account number %i with the character %s.",  flag? "Revoking": "Unrevoking",  characterID, sep->arg[1]);
+    c->Message(Chat::Red,"%s account number %i with the character %s.",  flag? "Revoking": "Unrevoking",  characterID, sep->arg[1]);
 
     Client* revokee = entity_list.GetClientByAccID(characterID);
     if(revokee) {
-        c->Message(0, "Found %s in this zone.",  revokee->GetName());
+        c->Message(Chat::White, "Found %s in this zone.",  revokee->GetName());
         revokee->SetRevoked(flag);
         return;
     }
 
-	c->Message(13, "#revoke: Couldn't find %s in this zone, passing request to worldserver.", sep->arg[1]);
+	c->Message(Chat::Red, "#revoke: Couldn't find %s in this zone, passing request to worldserver.", sep->arg[1]);
 
 	auto outapp = new ServerPacket(ServerOP_Revoke, sizeof(RevokeStruct));
 	RevokeStruct *revoke = (RevokeStruct *)outapp->pBuffer;
@@ -7148,10 +7331,100 @@ void command_revoke(Client *c, const Seperator *sep)
 	safe_delete(outapp);
 }
 
+void command_roambox(Client *c, const Seperator *sep)
+{
+	std::string arg1  = sep->arg[1];
+
+	Mob *target = c->GetTarget();
+	if (!target || !target->IsNPC()) {
+		c->Message(Chat::Red, "You need a valid NPC target for this command");
+		return;
+	}
+
+	NPC *npc           = dynamic_cast<NPC *>(target);
+	int spawn_group_id = npc->GetSpawnGroupId();
+	if (spawn_group_id <= 0) {
+		c->Message(Chat::Red, "NPC needs a valid SpawnGroup!");
+		return;
+	}
+
+	if (arg1 == "set") {
+		int box_size = (sep->arg[2] ? atoi(sep->arg[2]) : 0);
+		int delay = (sep->arg[3] ? atoi(sep->arg[3]) : 15000);
+		if (box_size > 0) {
+			std::string query = fmt::format(
+				SQL(
+					UPDATE spawngroup SET
+					dist = {},
+					min_x = {},
+					max_x = {},
+					min_y = {},
+					max_y = {},
+					delay = {}
+					WHERE id = {}
+				),
+				box_size,
+				npc->GetX() - 100,
+				npc->GetX() + 100,
+				npc->GetY() - 100,
+				npc->GetY() + 100,
+				delay,
+				spawn_group_id
+			);
+
+			database.QueryDatabase(query);
+
+			c->Message(
+				Chat::Yellow,
+				"NPC (%s) Roam Box set to box size of [%i] SpawnGroupId [%i] delay [%i]",
+				npc->GetCleanName(),
+				box_size,
+				spawn_group_id,
+				delay
+			);
+
+			return;
+		}
+
+		c->Message(Chat::Red, "Box size must be set!");
+	}
+
+	if (arg1 == "remove") {
+		std::string query = fmt::format(
+			SQL(
+				UPDATE spawngroup SET
+				dist = 0,
+				min_x = 0,
+				max_x = 0,
+				min_y = 0,
+				max_y = 0,
+				delay = 0
+					WHERE id = {}
+			),
+			spawn_group_id
+		);
+
+		database.QueryDatabase(query);
+
+		c->Message(
+			Chat::Yellow,
+			"NPC (%s) Roam Box has been removed from SpawnGroupID [%i]",
+			npc->GetCleanName(),
+			spawn_group_id
+		);
+
+		return;
+	}
+
+	c->Message(Chat::Yellow, "> Command Usage");
+	c->Message(Chat::Yellow, "#roambox set box_size [delay = 0]");
+	c->Message(Chat::Yellow, "#roambox remove");
+}
+
 void command_oocmute(Client *c, const Seperator *sep)
 {
 	if(sep->arg[1][0] == 0 || !(sep->arg[1][0] == '1' || sep->arg[1][0] == '0'))
-		c->Message(0, "Usage: #oocmute [1/0]");
+		c->Message(Chat::White, "Usage: #oocmute [1/0]");
 	else {
 		auto outapp = new ServerPacket(ServerOP_OOCMute, 1);
 		*(outapp->pBuffer) = atoi(sep->arg[1]);
@@ -7162,17 +7435,16 @@ void command_oocmute(Client *c, const Seperator *sep)
 
 void command_checklos(Client *c, const Seperator *sep)
 {
-	if(c->GetTarget())
-	{
-//		if(c->CheckLos(c->GetTarget()))
-		if(c->CheckLosFN(c->GetTarget()))
-			c->Message(0, "You have LOS to %s",  c->GetTarget()->GetName());
-		else
-			c->Message(0, "You do not have LOS to %s",  c->GetTarget()->GetName());
+	if (c->GetTarget()) {
+		if (c->CheckLosFN(c->GetTarget())) {
+			c->Message(Chat::White, "You have LOS to %s", c->GetTarget()->GetName());
+		}
+		else {
+			c->Message(Chat::White, "You do not have LOS to %s", c->GetTarget()->GetName());
+		}
 	}
-	else
-	{
-		c->Message(0, "ERROR: Target required");
+	else {
+		c->Message(Chat::White, "ERROR: Target required");
 	}
 }
 
@@ -7185,17 +7457,17 @@ void command_set_adventure_points(Client *c, const Seperator *sep)
 
 	if(!sep->arg[1][0])
 	{
-		c->Message(0, "Usage: #setadventurepoints [points] [theme]");
+		c->Message(Chat::White, "Usage: #setadventurepoints [points] [theme]");
 		return;
 	}
 
 	if(!sep->IsNumber(1) || !sep->IsNumber(2))
 	{
-		c->Message(0, "Usage: #setadventurepoints [points] [theme]");
+		c->Message(Chat::White, "Usage: #setadventurepoints [points] [theme]");
 		return;
 	}
 
-	c->Message(0, "Updating adventure points for %s",  t->GetName());
+	c->Message(Chat::White, "Updating adventure points for %s",  t->GetName());
 	t->UpdateLDoNPoints(atoi(sep->arg[1]), atoi(sep->arg[2]));
 }
 
@@ -7207,7 +7479,7 @@ void command_npcsay(Client *c, const Seperator *sep)
 	}
 	else
 	{
-		c->Message(0, "Usage: #npcsay message (requires NPC target");
+		c->Message(Chat::White, "Usage: #npcsay message (requires NPC target");
 	}
 }
 
@@ -7219,13 +7491,13 @@ void command_npcshout(Client *c, const Seperator *sep)
 	}
 	else
 	{
-		c->Message(0, "Usage: #npcshout message (requires NPC target");
+		c->Message(Chat::White, "Usage: #npcshout message (requires NPC target");
 	}
 }
 
 void command_timers(Client *c, const Seperator *sep) {
 	if(!c->GetTarget() || !c->GetTarget()->IsClient()) {
-		c->Message(0,"Need a player target for timers.");
+		c->Message(Chat::White,"Need a player target for timers.");
 		return;
 	}
 	Client *them = c->GetTarget()->CastToClient();
@@ -7233,12 +7505,12 @@ void command_timers(Client *c, const Seperator *sep) {
 	std::vector< std::pair<pTimerType, PersistentTimer *> > res;
 	them->GetPTimers().ToVector(res);
 
-	c->Message(0,"Timers for target:");
+	c->Message(Chat::White,"Timers for target:");
 
 	int r;
 	int l = res.size();
 	for(r = 0; r < l; r++) {
-		c->Message(0,"Timer %d: %d seconds remain.",  res[r].first, res[r].second->GetRemainingTime());
+		c->Message(Chat::White,"Timer %d: %d seconds remain.",  res[r].first, res[r].second->GetRemainingTime());
 	}
 }
 
@@ -7250,595 +7522,765 @@ void command_npcemote(Client *c, const Seperator *sep)
 	}
 	else
 	{
-		c->Message(0, "Usage: #npcemote message (requires NPC target");
+		c->Message(Chat::White, "Usage: #npcemote message (requires NPC target");
+	}
+}
+
+void command_npceditmass(Client *c, const Seperator *sep)
+{
+	std::string query = SQL(
+		SELECT
+				COLUMN_NAME
+		FROM
+		INFORMATION_SCHEMA.COLUMNS
+		WHERE
+			table_name = 'npc_types'
+		AND
+		COLUMN_NAME != 'id'
+	);
+
+	std::string search_column, search_value, change_column, change_value;
+	if (sep->arg[1]) {
+		search_column = sep->arg[1];
+	}
+	if (sep->arg[2]) {
+		search_value = sep->arg[2];
+	}
+	if (sep->arg[3]) {
+		change_column = sep->arg[3];
+	}
+	if (sep->arg[4]) {
+		change_value = sep->arg[4];
+	}
+
+	bool valid_change_column = false;
+	bool valid_search_column = false;
+	auto results             = database.QueryDatabase(query);
+
+	std::vector <std::string> possible_column_options;
+
+	for (auto row = results.begin(); row != results.end(); ++row) {
+		if (row[0] == change_column) {
+			valid_change_column = true;
+		}
+		if (row[0] == search_column) {
+			valid_search_column = true;
+		}
+
+		possible_column_options.push_back(row[0]);
+	}
+
+	std::string options_glue = ", ";
+
+	if (!valid_search_column) {
+		c->Message(Chat::Red, "You must specify a valid search column. [%s] is not valid", search_column.c_str());
+		c->Message(Chat::Yellow, "Possible columns [%s]", implode(options_glue, possible_column_options).c_str());
+		return;
+	}
+
+	if (!valid_change_column) {
+		c->Message(Chat::Red, "You must specify a valid change column. [%s] is not valid", change_column.c_str());
+		c->Message(Chat::Yellow, "Possible columns [%s]", implode(options_glue, possible_column_options).c_str());
+		return;
+	}
+
+	if (!valid_search_column || !valid_change_column) {
+		c->Message(Chat::Red, "One requested column is invalid");
+		return;
+	}
+
+	query = fmt::format(
+		SQL(
+			select
+			id,
+			name,
+			{0},
+			{1}
+				from
+				npc_types
+				where
+				id IN(
+					select
+				spawnentry.npcID
+				from
+					spawnentry
+				join spawn2 on spawn2.spawngroupID = spawnentry.spawngroupID
+				where
+				spawn2.zone = '{2}' and spawn2.version = {3}
+			)
+		),
+		search_column,
+		change_column,
+		zone->GetShortName(),
+		zone->GetInstanceVersion()
+	);
+
+	std::string status = "(Searching)";
+
+	if (strcasecmp(sep->arg[5], "apply") == 0) {
+		status = "(Applying)";
+	}
+
+	std::vector <std::string> npc_ids;
+
+	int found_count = 0;
+	results = database.QueryDatabase(query);
+	for (auto row = results.begin(); row != results.end(); ++row) {
+
+		std::string npc_id                      = row[0];
+		std::string npc_name                    = row[1];
+		std::string search_column_value         = str_tolower(row[2]);
+		std::string change_column_current_value = row[3];
+
+		if (search_column_value.find(search_value) == std::string::npos) {
+			continue;
+		}
+
+		c->Message(
+			Chat::Yellow,
+			fmt::format(
+				"NPC ({0}) [{1}] ({2}) [{3}] Current ({4}) [{5}] New [{6}] {7}",
+				npc_id,
+				npc_name,
+				search_column,
+				search_column_value,
+				change_column,
+				change_column_current_value,
+				change_value,
+				status
+			).c_str()
+		);
+
+		npc_ids.push_back(npc_id);
+
+		found_count++;
+	}
+
+	std::string saylink = fmt::format(
+		"#npceditmass {} {} {} {} apply",
+		search_column,
+		search_value,
+		change_column,
+		change_value
+	);
+
+	if (strcasecmp(sep->arg[5], "apply") == 0) {
+		std::string npc_ids_string = implode(",", npc_ids);
+		if (npc_ids_string.empty()) {
+			c->Message(Chat::Red, "Error: Ran into an unknown error compiling NPC IDs");
+			return;
+		}
+
+		database.QueryDatabase(
+			fmt::format(
+				"UPDATE `npc_types` SET {} = {} WHERE id IN ({})",
+				change_column,
+				change_value,
+				npc_ids_string
+			)
+		);
+
+		c->Message(Chat::Yellow, "Changes applied to (%i) NPC's", found_count);
+		zone->Repop();
+	}
+	else {
+		c->Message(Chat::Yellow, "Found (%i) NPC's that match this search...", found_count);
+
+		if (found_count > 0) {
+			c->Message(
+				Chat::Yellow, "To apply these changes, click <%s> or type [%s]",
+				EQEmu::SayLinkEngine::GenerateQuestSaylink(saylink, false, "Apply").c_str(),
+				saylink.c_str()
+			);
+		}
 	}
 }
 
 void command_npcedit(Client *c, const Seperator *sep)
 {	if (!c->GetTarget() || !c->GetTarget()->IsNPC()) {
-		c->Message(0, "Error: Must have NPC targeted");
+		c->Message(Chat::White, "Error: Must have NPC targeted");
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "help") == 0) {
 
-		c->Message(0, "Help File for #npcedit. Syntax for commands are:");
-		c->Message(0, "#npcedit Name - Sets an NPC's name");
-		c->Message(0, "#npcedit Lastname - Sets an NPC's lastname");
-		c->Message(0, "#npcedit Level - Sets an NPC's level");
-		c->Message(0, "#npcedit Maxlevel - Sets an NPC's maximum level");
-		c->Message(0, "#npcedit Race - Sets an NPC's race");
-		c->Message(0, "#npcedit Class - Sets an NPC's class");
-		c->Message(0, "#npcedit Bodytype - Sets an NPC's bodytype");
-		c->Message(0, "#npcedit HP - Sets an NPC's hitpoints");
-		c->Message(0, "#npcedit Gender - Sets an NPC's gender");
-		c->Message(0, "#npcedit Texture - Sets an NPC's texture");
-		c->Message(0, "#npcedit Helmtexture - Sets an NPC's helmet texture");
-		c->Message(0, "#npcedit Armtexture - Sets an NPC's arm texture");
-		c->Message(0, "#npcedit Bracertexture - Sets an NPC's bracer texture");
-		c->Message(0, "#npcedit Handtexture - Sets an NPC's hand texture");
-		c->Message(0, "#npcedit Legtexture - Sets an NPC's leg texture");
-		c->Message(0, "#npcedit Feettexture - Sets an NPC's feettexture");
-		c->Message(0, "#npcedit Herosforgemodel - Sets an NPC's Hero's Forge Model");
-		c->Message(0, "#npcedit Size - Sets an NPC's size");
-		c->Message(0, "#npcedit Hpregen - Sets an NPC's hitpoint regen rate per tick");
-		c->Message(0, "#npcedit Manaregen - Sets an NPC's mana regen rate per tick");
-		c->Message(0, "#npcedit Loottable - Sets the loottable ID for an NPC ");
-		c->Message(0, "#npcedit Merchantid - Sets the merchant ID for an NPC");
-		c->Message(0, "#npcedit alt_currency_id - Sets the Alternate Currency ID for an alterative currency Merchant");
-		c->Message(0, "#npcedit npc_spells_effects_id - Sets the NPC Spell Effects ID");
-		c->Message(0, "#npcedit adventure_template_id - Sets the NPC's Adventure Template ID");
-		c->Message(0, "#npcedit trap_template - Sets the NPC's Trap Template ID");
-		c->Message(0, "#npcedit special_abilities - Sets the NPC's Special Abilities");
-		c->Message(0, "#npcedit Spell - Sets the npc spells list ID for an NPC");
-		c->Message(0, "#npcedit Faction - Sets the NPC's faction id");
-		c->Message(0, "#npcedit Damage - Sets an NPC's damage");
-		c->Message(0, "#npcedit Meleetype - Sets an NPC's melee types");
-		c->Message(0, "#npcedit Rangedtype - Sets an NPC's ranged type");
-		c->Message(0, "#npcedit Ammoidfile - Sets an NPC's ammo id file");
-		c->Message(0, "#npcedit Aggroradius - Sets an NPC's aggro radius");
-		c->Message(0, "#npcedit Assistradius - Sets an NPC's assist radius");
-		c->Message(0, "#npcedit Social - Set to 1 if an NPC should assist others on its faction");
-		c->Message(0, "#npcedit Runspeed - Sets an NPC's run speed");
-		c->Message(0, "#npcedit Walkspeed - Sets an NPC's walk speed");
-		c->Message(0, "#npcedit AGI - Sets an NPC's Agility");
-		c->Message(0, "#npcedit CHA - Sets an NPC's Charisma");
-		c->Message(0, "#npcedit DEX - Sets an NPC's Dexterity");
-		c->Message(0, "#npcedit INT - Sets an NPC's Intelligence");
-		c->Message(0, "#npcedit STA - Sets an NPC's Stamina");
-		c->Message(0, "#npcedit STR - Sets an NPC's Strength");
-		c->Message(0, "#npcedit WIS - Sets an NPC's Wisdom");
-		c->Message(0, "#npcedit MR - Sets an NPC's Magic Resistance");
-		c->Message(0, "#npcedit PR - Sets an NPC's Poison Resistance");
-		c->Message(0, "#npcedit DR - Sets an NPC's Disease Resistance");
-		c->Message(0, "#npcedit FR - Sets an NPC's Fire Resistance");
-		c->Message(0, "#npcedit CR - Sets an NPC's Cold Resistance");
-		c->Message(0, "#npcedit Corrup - Sets an NPC's Corruption Resistance");
-		c->Message(0, "#npcedit PhR - Sets and NPC's Physical Resistance");
-		c->Message(0, "#npcedit Seeinvis - Sets an NPC's ability to see invis");
-		c->Message(0, "#npcedit Seeinvisundead - Sets an NPC's ability to see through invis vs. undead");
-		c->Message(0, "#npcedit Seehide - Sets an NPC's ability to see through hide");
-		c->Message(0, "#npcedit Seeimprovedhide - Sets an NPC's ability to see through improved hide");
-		c->Message(0, "#npcedit AC - Sets an NPC's Armor Class");
-		c->Message(0, "#npcedit ATK - Sets an NPC's Attack");
-		c->Message(0, "#npcedit Accuracy - Sets an NPC's Accuracy");
-		c->Message(0, "#npcedit Avoidance - Sets an NPC's Avoidance");
-		c->Message(0, "#npcedit npcaggro - Sets an NPC's npc_aggro flag");
-		c->Message(0, "#npcedit qglobal - Sets an NPC's quest global flag");
-		c->Message(0, "#npcedit spawn_limit - Sets an NPC's spawn limit counter");
-		c->Message(0, "#npcedit Attackspeed - Sets an NPC's attack speed modifier");
-		c->Message(0, "#npcedit Attackdelay - Sets an NPC's attack delay");
-		c->Message(0, "#npcedit Attackcount - Sets an NPC's attack count");
-		c->Message(0, "#npcedit findable - Sets an NPC's findable flag");
-		c->Message(0, "#npcedit trackable - Sets an NPC's trackable flag");
-		c->Message(0, "#npcedit weapon - Sets an NPC's primary and secondary weapon model");
-		c->Message(0, "#npcedit featuresave - Saves all current facial features to the database");
-		c->Message(0, "#npcedit color - Sets an NPC's red, green, and blue armor tint");
-		c->Message(0, "#npcedit armortint_id - Set an NPC's Armor tint ID");
-		c->Message(0, "#npcedit setanimation - Set an NPC's animation on spawn (Stored in spawn2 table)");
-		c->Message(0, "#npcedit scalerate - Set an NPC's scaling rate");
-		c->Message(0, "#npcedit healscale - Set an NPC's heal scaling rate");
-		c->Message(0, "#npcedit spellscale - Set an NPC's spell scaling rate");
-		c->Message(0, "#npcedit no_target - Set an NPC's ability to be targeted with the target hotkey");
-		c->Message(0, "#npcedit version - Set an NPC's version");
-		c->Message(0, "#npcedit slow_mitigation - Set an NPC's slow mitigation");
-		c->Message(0, "#npcedit flymode - Set an NPC's flymode [0 = ground, 1 = flying, 2 = levitate, 3 = water, 4 = floating]");
+		c->Message(Chat::White, "Help File for #npcedit. Syntax for commands are:");
+		c->Message(Chat::White, "#npcedit Name - Sets an NPC's name");
+		c->Message(Chat::White, "#npcedit Lastname - Sets an NPC's lastname");
+		c->Message(Chat::White, "#npcedit Level - Sets an NPC's level");
+		c->Message(Chat::White, "#npcedit Maxlevel - Sets an NPC's maximum level");
+		c->Message(Chat::White, "#npcedit Race - Sets an NPC's race");
+		c->Message(Chat::White, "#npcedit Class - Sets an NPC's class");
+		c->Message(Chat::White, "#npcedit Bodytype - Sets an NPC's bodytype");
+		c->Message(Chat::White, "#npcedit HP - Sets an NPC's hitpoints");
+		c->Message(Chat::White, "#npcedit Gender - Sets an NPC's gender");
+		c->Message(Chat::White, "#npcedit Texture - Sets an NPC's texture");
+		c->Message(Chat::White, "#npcedit Helmtexture - Sets an NPC's helmet texture");
+		c->Message(Chat::White, "#npcedit Armtexture - Sets an NPC's arm texture");
+		c->Message(Chat::White, "#npcedit Bracertexture - Sets an NPC's bracer texture");
+		c->Message(Chat::White, "#npcedit Handtexture - Sets an NPC's hand texture");
+		c->Message(Chat::White, "#npcedit Legtexture - Sets an NPC's leg texture");
+		c->Message(Chat::White, "#npcedit Feettexture - Sets an NPC's feettexture");
+		c->Message(Chat::White, "#npcedit Herosforgemodel - Sets an NPC's Hero's Forge Model");
+		c->Message(Chat::White, "#npcedit Size - Sets an NPC's size");
+		c->Message(Chat::White, "#npcedit Hpregen - Sets an NPC's hitpoint regen rate per tick");
+		c->Message(Chat::White, "#npcedit Manaregen - Sets an NPC's mana regen rate per tick");
+		c->Message(Chat::White, "#npcedit Loottable - Sets the loottable ID for an NPC ");
+		c->Message(Chat::White, "#npcedit Merchantid - Sets the merchant ID for an NPC");
+		c->Message(Chat::White, "#npcedit alt_currency_id - Sets the Alternate Currency ID for an alterative currency Merchant");
+		c->Message(Chat::White, "#npcedit npc_spells_effects_id - Sets the NPC Spell Effects ID");
+		c->Message(Chat::White, "#npcedit adventure_template_id - Sets the NPC's Adventure Template ID");
+		c->Message(Chat::White, "#npcedit trap_template - Sets the NPC's Trap Template ID");
+		c->Message(Chat::White, "#npcedit special_abilities - Sets the NPC's Special Abilities");
+		c->Message(Chat::White, "#npcedit Spell - Sets the npc spells list ID for an NPC");
+		c->Message(Chat::White, "#npcedit Faction - Sets the NPC's faction id");
+		c->Message(Chat::White, "#npcedit Damage - Sets an NPC's damage");
+		c->Message(Chat::White, "#npcedit Meleetype - Sets an NPC's melee types");
+		c->Message(Chat::White, "#npcedit Rangedtype - Sets an NPC's ranged type");
+		c->Message(Chat::White, "#npcedit Ammoidfile - Sets an NPC's ammo id file");
+		c->Message(Chat::White, "#npcedit Aggroradius - Sets an NPC's aggro radius");
+		c->Message(Chat::White, "#npcedit Assistradius - Sets an NPC's assist radius");
+		c->Message(Chat::White, "#npcedit Social - Set to 1 if an NPC should assist others on its faction");
+		c->Message(Chat::White, "#npcedit Runspeed - Sets an NPC's run speed");
+		c->Message(Chat::White, "#npcedit Walkspeed - Sets an NPC's walk speed");
+		c->Message(Chat::White, "#npcedit AGI - Sets an NPC's Agility");
+		c->Message(Chat::White, "#npcedit CHA - Sets an NPC's Charisma");
+		c->Message(Chat::White, "#npcedit DEX - Sets an NPC's Dexterity");
+		c->Message(Chat::White, "#npcedit INT - Sets an NPC's Intelligence");
+		c->Message(Chat::White, "#npcedit STA - Sets an NPC's Stamina");
+		c->Message(Chat::White, "#npcedit STR - Sets an NPC's Strength");
+		c->Message(Chat::White, "#npcedit WIS - Sets an NPC's Wisdom");
+		c->Message(Chat::White, "#npcedit MR - Sets an NPC's Magic Resistance");
+		c->Message(Chat::White, "#npcedit PR - Sets an NPC's Poison Resistance");
+		c->Message(Chat::White, "#npcedit DR - Sets an NPC's Disease Resistance");
+		c->Message(Chat::White, "#npcedit FR - Sets an NPC's Fire Resistance");
+		c->Message(Chat::White, "#npcedit CR - Sets an NPC's Cold Resistance");
+		c->Message(Chat::White, "#npcedit Corrup - Sets an NPC's Corruption Resistance");
+		c->Message(Chat::White, "#npcedit PhR - Sets and NPC's Physical Resistance");
+		c->Message(Chat::White, "#npcedit Seeinvis - Sets an NPC's ability to see invis");
+		c->Message(Chat::White, "#npcedit Seeinvisundead - Sets an NPC's ability to see through invis vs. undead");
+		c->Message(Chat::White, "#npcedit Seehide - Sets an NPC's ability to see through hide");
+		c->Message(Chat::White, "#npcedit Seeimprovedhide - Sets an NPC's ability to see through improved hide");
+		c->Message(Chat::White, "#npcedit AC - Sets an NPC's Armor Class");
+		c->Message(Chat::White, "#npcedit ATK - Sets an NPC's Attack");
+		c->Message(Chat::White, "#npcedit Accuracy - Sets an NPC's Accuracy");
+		c->Message(Chat::White, "#npcedit Avoidance - Sets an NPC's Avoidance");
+		c->Message(Chat::White, "#npcedit npcaggro - Sets an NPC's npc_aggro flag");
+		c->Message(Chat::White, "#npcedit qglobal - Sets an NPC's quest global flag");
+		c->Message(Chat::White, "#npcedit spawn_limit - Sets an NPC's spawn limit counter");
+		c->Message(Chat::White, "#npcedit Attackspeed - Sets an NPC's attack speed modifier");
+		c->Message(Chat::White, "#npcedit Attackdelay - Sets an NPC's attack delay");
+		c->Message(Chat::White, "#npcedit Attackcount - Sets an NPC's attack count");
+		c->Message(Chat::White, "#npcedit findable - Sets an NPC's findable flag");
+		c->Message(Chat::White, "#npcedit trackable - Sets an NPC's trackable flag");
+		c->Message(Chat::White, "#npcedit weapon - Sets an NPC's primary and secondary weapon model");
+		c->Message(Chat::White, "#npcedit featuresave - Saves all current facial features to the database");
+		c->Message(Chat::White, "#npcedit color - Sets an NPC's red, green, and blue armor tint");
+		c->Message(Chat::White, "#npcedit armortint_id - Set an NPC's Armor tint ID");
+		c->Message(Chat::White, "#npcedit setanimation - Set an NPC's animation on spawn (Stored in spawn2 table)");
+		c->Message(Chat::White, "#npcedit scalerate - Set an NPC's scaling rate");
+		c->Message(Chat::White, "#npcedit healscale - Set an NPC's heal scaling rate");
+		c->Message(Chat::White, "#npcedit spellscale - Set an NPC's spell scaling rate");
+		c->Message(Chat::White, "#npcedit no_target - Set an NPC's ability to be targeted with the target hotkey");
+		c->Message(Chat::White, "#npcedit version - Set an NPC's version");
+		c->Message(Chat::White, "#npcedit slow_mitigation - Set an NPC's slow mitigation");
+		c->Message(Chat::White, "#npcedit flymode - Set an NPC's flymode [0 = ground, 1 = flying, 2 = levitate, 3 = water, 4 = floating]");
 
 	}
 
 	uint32 npcTypeID = c->GetTarget()->CastToNPC()->GetNPCTypeID();
 	if (strcasecmp(sep->arg[1], "name") == 0) {
-        c->Message(15,"NPCID %u now has the name %s.", npcTypeID, sep->argplus[2]);
+        c->Message(Chat::Yellow,"NPCID %u now has the name %s.", npcTypeID, sep->argplus[2]);
 		std::string query = StringFormat("UPDATE npc_types SET name = '%s' WHERE id = %i",  sep->argplus[2],npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "lastname") == 0) {
-        c->Message(15,"NPCID %u now has the lastname %s.", npcTypeID, sep->argplus[2]);
+        c->Message(Chat::Yellow,"NPCID %u now has the lastname %s.", npcTypeID, sep->argplus[2]);
 		std::string query = StringFormat("UPDATE npc_types SET lastname = '%s' WHERE id = %i", sep->argplus[2],npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "flymode") == 0) {
-        c->Message(15,"NPCID %u now has flymode [%s]", npcTypeID, sep->argplus[2]);
+        c->Message(Chat::Yellow,"NPCID %u now has flymode [%s]", npcTypeID, sep->argplus[2]);
 		std::string query = StringFormat("UPDATE npc_types SET flymode = '%s' WHERE id = %i",  sep->argplus[2],npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "race") == 0) {
-        c->Message(15,"NPCID %u now has the race %i.", npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has the race %i.", npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET race = %i WHERE id = %i",  atoi(sep->argplus[2]),npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "class") == 0) {
-        c->Message(15,"NPCID %u is now class %i.", npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u is now class %i.", npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET class = %i WHERE id = %i",  atoi(sep->argplus[2]),npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "bodytype") == 0) {
-        c->Message(15,"NPCID %u now has type %i bodytype.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has type %i bodytype.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET bodytype = %i WHERE id = %i",  atoi(sep->argplus[2]),npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "hp") == 0) {
-        c->Message(15,"NPCID %u now has %i Hitpoints.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has %i Hitpoints.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET hp = %i WHERE id = %i",  atoi(sep->argplus[2]),npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "gender") == 0) {
-        c->Message(15,"NPCID %u is now gender %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u is now gender %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET gender = %i WHERE id = %i",  atoi(sep->argplus[2]),npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "texture") == 0) {
-        c->Message(15,"NPCID %u now uses texture %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now uses texture %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET texture = %i WHERE id = %i",  atoi(sep->argplus[2]),npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "helmtexture") == 0) {
-        c->Message(15,"NPCID %u now uses helmtexture %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now uses helmtexture %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET helmtexture = %i WHERE id = %i",  atoi(sep->argplus[2]),npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "armtexture") == 0) {
-        c->Message(15,"NPCID %u now uses armtexture %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now uses armtexture %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET armtexture = %i WHERE id = %i",  atoi(sep->argplus[2]),npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "bracertexture") == 0) {
-        c->Message(15,"NPCID %u now uses bracertexture %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now uses bracertexture %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET bracertexture = %i WHERE id = %i",  atoi(sep->argplus[2]),npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "handtexture") == 0) {
-        c->Message(15,"NPCID %u now uses handtexture %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now uses handtexture %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET handtexture = %i WHERE id = %i",  atoi(sep->argplus[2]),npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "legtexture") == 0) {
-        c->Message(15,"NPCID %u now uses legtexture %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now uses legtexture %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET legtexture = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "feettexture") == 0) {
-        c->Message(15,"NPCID %u now uses feettexture %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now uses feettexture %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET feettexture = %i WHERE id = %i",  atoi(sep->argplus[2]),npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "herosforgemodel") == 0) {
-        c->Message(15,"NPCID %u now uses herosforgemodel %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now uses herosforgemodel %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET herosforgemodel = %i WHERE id = %i",  atoi(sep->argplus[2]),npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "size") == 0) {
-        c->Message(15,"NPCID %u is now size %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u is now size %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET size = %i WHERE id = %i",  atoi(sep->argplus[2]),npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "hpregen") == 0) {
-        c->Message(15,"NPCID %u now regens %i hitpoints per tick.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now regens %i hitpoints per tick.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET hp_regen_rate = %i WHERE id = %i",  atoi(sep->argplus[2]),npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "manaregen") == 0) {
-        c->Message(15,"NPCID %u now regens %i mana per tick.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now regens %i mana per tick.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET mana_regen_rate = %i WHERE id = %i",  atoi(sep->argplus[2]),npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
     if (strcasecmp(sep->arg[1], "loottable") == 0) {
-        c->Message(15,"NPCID %u is now on loottable_id %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u is now on loottable_id %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET loottable_id = %i WHERE id = %i",  atoi(sep->argplus[2]),npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "merchantid") == 0) {
-        c->Message(15,"NPCID %u is now merchant_id %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u is now merchant_id %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET merchant_id = %i WHERE id = %i",  atoi(sep->argplus[2]),npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "alt_currency_id") == 0) {
-        c->Message(15,"NPCID %u now has field 'alt_currency_id' set to %s.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has field 'alt_currency_id' set to %s.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET alt_currency_id = '%s' WHERE id = %i",  sep->argplus[2],npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "npc_spells_effects_id") == 0) {
-        c->Message(15,"NPCID %u now has field 'npc_spells_effects_id' set to %s.",  npcTypeID, sep->argplus[2]);
+        c->Message(Chat::Yellow,"NPCID %u now has field 'npc_spells_effects_id' set to %s.",  npcTypeID, sep->argplus[2]);
 		std::string query = StringFormat("UPDATE npc_types SET npc_spells_effects_id = '%s' WHERE id = %i",  sep->argplus[2],npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "adventure_template_id") == 0) {
-        c->Message(15,"NPCID %u now has field 'adventure_template_id' set to %s.",  npcTypeID, sep->argplus[2]);
+        c->Message(Chat::Yellow,"NPCID %u now has field 'adventure_template_id' set to %s.",  npcTypeID, sep->argplus[2]);
 		std::string query = StringFormat("UPDATE npc_types SET adventure_template_id = '%s' WHERE id = %i",  sep->argplus[2],npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "trap_template") == 0) {
-        c->Message(15,"NPCID %u now has field 'trap_template' set to %s.",  npcTypeID, sep->argplus[2]);
+        c->Message(Chat::Yellow,"NPCID %u now has field 'trap_template' set to %s.",  npcTypeID, sep->argplus[2]);
 		std::string query = StringFormat("UPDATE npc_types SET trap_template = '%s' WHERE id = %i",  sep->argplus[2],npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "special_abilities") == 0) {
-        c->Message(15,"NPCID %u now has field 'special_abilities' set to %s.",  npcTypeID, sep->argplus[2]);
+        c->Message(Chat::Yellow,"NPCID %u now has field 'special_abilities' set to %s.",  npcTypeID, sep->argplus[2]);
 		std::string query = StringFormat("UPDATE npc_types SET special_abilities = '%s' WHERE id = %i",  sep->argplus[2],npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "spell") == 0) {
-        c->Message(15,"NPCID %u now uses spell list %i",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now uses spell list %i",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET npc_spells_id = %i WHERE id = %i",  atoi(sep->argplus[2]),npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "faction") == 0) {
-        c->Message(15,"NPCID %u is now faction %i",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u is now faction %i",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET npc_faction_id = %i WHERE id = %i",  atoi(sep->argplus[2]),npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "damage") == 0) {
-        c->Message(15,"NPCID %u now hits from %i to %i",  npcTypeID, atoi(sep->arg[2]), atoi(sep->arg[3]));
+        c->Message(Chat::Yellow,"NPCID %u now hits from %i to %i",  npcTypeID, atoi(sep->arg[2]), atoi(sep->arg[3]));
 		std::string query = StringFormat("UPDATE npc_types SET mindmg = %i, maxdmg = %i WHERE id = %i",  atoi(sep->arg[2]), atoi(sep->arg[3]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "meleetype") == 0) {
-        c->Message(15,"NPCID %u now has a primary melee type of %i and a secondary melee type of %i.",  npcTypeID, atoi(sep->arg[2]), atoi(sep->arg[3]));
+        c->Message(Chat::Yellow,"NPCID %u now has a primary melee type of %i and a secondary melee type of %i.",  npcTypeID, atoi(sep->arg[2]), atoi(sep->arg[3]));
 		std::string query = StringFormat("UPDATE npc_types SET prim_melee_type = %i, sec_melee_type = %i WHERE id = %i",  atoi(sep->arg[2]), atoi(sep->arg[3]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "rangedtype") == 0) {
-        c->Message(15,"NPCID %u now has a ranged type of %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has a ranged type of %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET ranged_type = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "ammoidfile") == 0) {
-        c->Message(15,"NPCID %u's ammo id file is now %i",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u's ammo id file is now %i",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET ammoidfile = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "aggroradius") == 0) {
-        c->Message(15,"NPCID %u now has an aggro radius of %i",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has an aggro radius of %i",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET aggroradius = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "assistradius") == 0) {
-        c->Message(15,"NPCID %u now has an assist radius of %i",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has an assist radius of %i",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET assistradius = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "social") == 0) {
-        c->Message(15,"NPCID %u social status is now %i",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u social status is now %i",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET social = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "runspeed") == 0) {
-        c->Message(15,"NPCID %u now runs at %f",  npcTypeID, atof(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now runs at %f",  npcTypeID, atof(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET runspeed = %f WHERE id = %i",  atof(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "walkspeed") == 0) {
-        c->Message(15,"NPCID %u now walks at %f",  npcTypeID, atof(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now walks at %f",  npcTypeID, atof(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET walkspeed = %f WHERE id = %i",  atof(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "AGI") == 0) {
-        c->Message(15,"NPCID %u now has %i Agility.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has %i Agility.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET AGI = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "CHA") == 0) {
-        c->Message(15,"NPCID %u now has %i Charisma.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has %i Charisma.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET CHA = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "DEX") == 0) {
-        c->Message(15,"NPCID %u now has %i Dexterity.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has %i Dexterity.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET DEX = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "INT") == 0) {
-        c->Message(15,"NPCID %u now has %i Intelligence.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has %i Intelligence.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET _INT = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "STA") == 0) {
-        c->Message(15,"NPCID %u now has %i Stamina.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has %i Stamina.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET STA = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "STR") == 0) {
-        c->Message(15,"NPCID %u now has %i Strength.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has %i Strength.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET STR = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "WIS") == 0) {
-        c->Message(15,"NPCID %u now has a Magic Resistance of %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has a Magic Resistance of %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET WIS = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "MR") == 0) {
-        c->Message(15,"NPCID %u now has a Magic Resistance of %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has a Magic Resistance of %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET MR = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "DR") == 0) {
-        c->Message(15,"NPCID %u now has a Disease Resistance of %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has a Disease Resistance of %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET DR = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "CR") == 0) {
-        c->Message(15,"NPCID %u now has a Cold Resistance of %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has a Cold Resistance of %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET CR = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
     if (strcasecmp(sep->arg[1], "FR") == 0) {
-        c->Message(15,"NPCID %u now has a Fire Resistance of %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has a Fire Resistance of %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET FR = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
     if (strcasecmp(sep->arg[1], "PR") == 0) {
-        c->Message(15,"NPCID %u now has a Poison Resistance of %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has a Poison Resistance of %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET PR = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "Corrup") == 0) {
-        c->Message(15,"NPCID %u now has a Corruption Resistance of %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has a Corruption Resistance of %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET corrup = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "PhR") == 0) {
-        c->Message(15,"NPCID %u now has a Physical Resistance of %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has a Physical Resistance of %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET PhR = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "seeinvis") == 0) {
-        c->Message(15,"NPCID %u now has seeinvis set to %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has seeinvis set to %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET see_invis = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "seeinvisundead") == 0) {
-        c->Message(15,"NPCID %u now has seeinvisundead set to %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has seeinvisundead set to %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET see_invis_undead = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "seehide") == 0) {
-        c->Message(15,"NPCID %u now has seehide set to %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has seehide set to %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET see_hide = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "seeimprovedhide") == 0) {
-        c->Message(15,"NPCID %u now has seeimprovedhide set to %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has seeimprovedhide set to %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET see_improved_hide = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "AC") == 0) {
-        c->Message(15,"NPCID %u now has %i Armor Class.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has %i Armor Class.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET ac = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "ATK") == 0) {
-        c->Message(15,"NPCID %u now has %i Attack.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has %i Attack.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET atk = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "Accuracy") == 0) {
-        c->Message(15,"NPCID %u now has %i Accuracy.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has %i Accuracy.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET accuracy = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "Avoidance") == 0) {
-        c->Message(15,"NPCID %u now has %i Avoidance.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has %i Avoidance.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET avoidance = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "level") == 0) {
-        c->Message(15,"NPCID %u is now level %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u is now level %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET level = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "maxlevel") == 0) {
-        c->Message(15,"NPCID %u now has a maximum level of %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has a maximum level of %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET maxlevel = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "qglobal") == 0) {
-        c->Message(15,"Quest globals have been %s for NPCID %u",  atoi(sep->arg[2]) == 0 ? "disabled" : "enabled",  npcTypeID);
+        c->Message(Chat::Yellow,"Quest globals have been %s for NPCID %u",  atoi(sep->arg[2]) == 0 ? "disabled" : "enabled",  npcTypeID);
 		std::string query = StringFormat("UPDATE npc_types SET qglobal = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "npcaggro") == 0) {
-        c->Message(15,"NPCID %u will now %s other NPCs with negative faction npc_value",  npcTypeID, atoi(sep->arg[2]) == 0? "not aggro": "aggro");
+        c->Message(Chat::Yellow,"NPCID %u will now %s other NPCs with negative faction npc_value",  npcTypeID, atoi(sep->arg[2]) == 0? "not aggro": "aggro");
 		std::string query = StringFormat("UPDATE npc_types SET npc_aggro = %i WHERE id = %i",  atoi(sep->argplus[2]) == 0? 0: 1, npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "spawn_limit") == 0) {
-        c->Message(15,"NPCID %u now has a spawn limit of %i",  npcTypeID, atoi(sep->arg[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has a spawn limit of %i",  npcTypeID, atoi(sep->arg[2]));
 		std::string query = StringFormat("UPDATE npc_types SET spawn_limit = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "Attackspeed") == 0) {
-        c->Message(15,"NPCID %u now has attack_speed set to %f",  npcTypeID, atof(sep->arg[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has attack_speed set to %f",  npcTypeID, atof(sep->arg[2]));
 		std::string query = StringFormat("UPDATE npc_types SET attack_speed = %f WHERE id = %i",  atof(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "Attackdelay") == 0) {
-		c->Message(15,"NPCID %u now has attack_delay set to %i", npcTypeID,atoi(sep->arg[2]));
+		c->Message(Chat::Yellow,"NPCID %u now has attack_delay set to %i", npcTypeID,atoi(sep->arg[2]));
 		std::string query = StringFormat("UPDATE npc_types SET attack_delay = %i WHERE id = %i", atoi(sep->argplus[2]),npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "Attackcount") == 0) {
-		c->Message(15,"NPCID %u now has attack_count set to %i", npcTypeID,atoi(sep->arg[2]));
+		c->Message(Chat::Yellow,"NPCID %u now has attack_count set to %i", npcTypeID,atoi(sep->arg[2]));
 		std::string query = StringFormat("UPDATE npc_types SET attack_count = %i WHERE id = %i", atoi(sep->argplus[2]),npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "findable") == 0) {
-        c->Message(15,"NPCID %u is now %s",  npcTypeID, atoi(sep->arg[2]) == 0? "not findable": "findable");
+        c->Message(Chat::Yellow,"NPCID %u is now %s",  npcTypeID, atoi(sep->arg[2]) == 0? "not findable": "findable");
 		std::string query = StringFormat("UPDATE npc_types SET findable = %i WHERE id = %i",  atoi(sep->argplus[2]) == 0? 0: 1, npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "trackable") == 0) {
-        c->Message(15,"NPCID %u is now %s",  npcTypeID, atoi(sep->arg[2]) == 0? "not trackable": "trackable");
+        c->Message(Chat::Yellow,"NPCID %u is now %s",  npcTypeID, atoi(sep->arg[2]) == 0? "not trackable": "trackable");
 		std::string query = StringFormat("UPDATE npc_types SET trackable = %i WHERE id = %i",  atoi(sep->argplus[2]) == 0? 0: 1, npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "weapon") == 0) {
-        c->Message(15,"NPCID %u will have item graphic %i set to his primary and item graphic %i set to his secondary on repop.",   npcTypeID, atoi(sep->arg[2]), atoi(sep->arg[3]));
+        c->Message(Chat::Yellow,"NPCID %u will have item graphic %i set to his primary and item graphic %i set to his secondary on repop.",   npcTypeID, atoi(sep->arg[2]), atoi(sep->arg[3]));
 		std::string query = StringFormat("UPDATE npc_types SET d_melee_texture1 = %i, d_melee_texture2 = %i WHERE id = %i",  atoi(sep->arg[2]), atoi(sep->arg[3]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "featuresave") == 0) {
-        c->Message(15,"NPCID %u saved with all current facial feature settings",  npcTypeID);
+        c->Message(Chat::Yellow,"NPCID %u saved with all current facial feature settings",  npcTypeID);
         Mob* target = c->GetTarget();
 		std::string query = StringFormat("UPDATE npc_types "
                                         "SET luclin_haircolor = %i, luclin_beardcolor = %i, "
@@ -7856,14 +8298,14 @@ void command_npcedit(Client *c, const Seperator *sep)
 	}
 
 	if (strcasecmp(sep->arg[1], "color") == 0) {
-        c->Message(15,"NPCID %u now has %i red, %i green, and %i blue tinting on their armor.",  npcTypeID, atoi(sep->arg[2]), atoi(sep->arg[3]), atoi(sep->arg[4]));
+        c->Message(Chat::Yellow,"NPCID %u now has %i red, %i green, and %i blue tinting on their armor.",  npcTypeID, atoi(sep->arg[2]), atoi(sep->arg[3]), atoi(sep->arg[4]));
 		std::string query = StringFormat("UPDATE npc_types SET armortint_red = %i, armortint_green = %i, armortint_blue = %i WHERE id = %i",  atoi(sep->arg[2]), atoi(sep->arg[3]), atoi(sep->arg[4]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "armortint_id") == 0) {
-        c->Message(15,"NPCID %u now has field 'armortint_id' set to %s",  npcTypeID, sep->arg[2]);
+        c->Message(Chat::Yellow,"NPCID %u now has field 'armortint_id' set to %s",  npcTypeID, sep->arg[2]);
 		std::string query = StringFormat("UPDATE npc_types SET armortint_id = '%s' WHERE id = %i",  sep->argplus[2], npcTypeID);
 		database.QueryDatabase(query);
 		return;
@@ -7883,14 +8325,16 @@ void command_npcedit(Client *c, const Seperator *sep)
 			if((strcasecmp(sep->arg[2], "loot" ) == 0) || atoi(sep->arg[2]) == 4)
 				animation = 4; //Looting Animation
 		} else {
-			c->Message(0, "You must specifiy an animation stand, sit, crouch, dead, loot (0-4)");
-			c->Message(0, "Example: #npcedit setanimation sit");
-			c->Message(0, "Example: #npcedit setanimation 0");
+			c->Message(Chat::White, "You must specifiy an animation stand, sit, crouch, dead, loot (0-4)");
+			c->Message(Chat::White, "Example: #npcedit setanimation sit");
+			c->Message(Chat::White, "Example: #npcedit setanimation 0");
 			return;
 		}
 
-		c->Message(15,"NPCID %u now has the animation set to %i on spawn with spawngroup %i",  npcTypeID, animation, c->GetTarget()->CastToNPC()->GetSp2() );
-		std::string query = StringFormat("UPDATE spawn2 SET animation = %i " "WHERE spawngroupID = %i",  animation, c->GetTarget()->CastToNPC()->GetSp2());
+		c->Message(Chat::Yellow,"NPCID %u now has the animation set to %i on spawn with spawngroup %i",  npcTypeID, animation,
+				   c->GetTarget()->CastToNPC()->GetSpawnGroupId() );
+		std::string query = StringFormat("UPDATE spawn2 SET animation = %i " "WHERE spawngroupID = %i",  animation,
+										 c->GetTarget()->CastToNPC()->GetSpawnGroupId());
 		database.QueryDatabase(query);
 
 		c->GetTarget()->SetAppearance(EmuAppearance(animation));
@@ -7898,49 +8342,49 @@ void command_npcedit(Client *c, const Seperator *sep)
 	}
 
 	if (strcasecmp(sep->arg[1], "scalerate") == 0) {
-        c->Message(15,"NPCID %u now has a scaling rate of %i.",  npcTypeID, atoi(sep->arg[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has a scaling rate of %i.",  npcTypeID, atoi(sep->arg[2]));
 		std::string query = StringFormat("UPDATE npc_types SET scalerate = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "healscale") == 0) {
-        c->Message(15, "NPCID %u now has a heal scaling rate of %i.",  npcTypeID, atoi(sep->arg[2]));
+        c->Message(Chat::Yellow, "NPCID %u now has a heal scaling rate of %i.",  npcTypeID, atoi(sep->arg[2]));
 		std::string query = StringFormat("UPDATE npc_types SET healscale = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "spellscale") == 0) {
-        c->Message(15, "NPCID %u now has a spell scaling rate of %i.",  npcTypeID, atoi(sep->arg[2]));
+        c->Message(Chat::Yellow, "NPCID %u now has a spell scaling rate of %i.",  npcTypeID, atoi(sep->arg[2]));
 		std::string query = StringFormat("UPDATE npc_types SET spellscale = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "no_target") == 0) {
-        c->Message(15, "NPCID %u is now %s.",  npcTypeID, atoi(sep->arg[2]) == 0? "targetable": "untargetable");
+        c->Message(Chat::Yellow, "NPCID %u is now %s.",  npcTypeID, atoi(sep->arg[2]) == 0? "targetable": "untargetable");
 		std::string query = StringFormat("UPDATE npc_types SET no_target_hotkey = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "version") == 0) {
-        c->Message(15, "NPCID %u is now version %i.",  npcTypeID, atoi(sep->arg[2]));
+        c->Message(Chat::Yellow, "NPCID %u is now version %i.",  npcTypeID, atoi(sep->arg[2]));
 		std::string query = StringFormat("UPDATE npc_types SET version = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "slow_mitigation") == 0) {
-        c->Message(15, "NPCID %u's slow mitigation limit is now %i.",  npcTypeID, atoi(sep->arg[2]));
+        c->Message(Chat::Yellow, "NPCID %u's slow mitigation limit is now %i.",  npcTypeID, atoi(sep->arg[2]));
 		std::string query = StringFormat("UPDATE npc_types SET slow_mitigation = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if((sep->arg[1][0] == 0 || strcasecmp(sep->arg[1],"*")==0) || ((c->GetTarget()==0) || (c->GetTarget()->IsClient())))
-		c->Message(0, "Type #npcedit help for more info");
+		c->Message(Chat::White, "Type #npcedit help for more info");
 
 }
 
@@ -7967,21 +8411,21 @@ void command_profilereset(Client *c, const Seperator *sep) {
 void command_opcode(Client *c, const Seperator *sep) {
 	if(!strcasecmp(sep->arg[1], "reload" )) {
 		ReloadAllPatches();
-		c->Message(0, "Opcodes for all patches have been reloaded");
+		c->Message(Chat::White, "Opcodes for all patches have been reloaded");
 	}
 }
 
 void command_qglobal(Client *c, const Seperator *sep) {
 	//In-game switch for qglobal column
 	if(sep->arg[1][0] == 0) {
-		c->Message(0, "Syntax: #qglobal [on/off/view]. Requires NPC target.");
+		c->Message(Chat::White, "Syntax: #qglobal [on/off/view]. Requires NPC target.");
 		return;
 	}
 
 	Mob *target = c->GetTarget();
 
 	if(!target || !target->IsNPC()) {
-		c->Message(13, "NPC Target Required!");
+		c->Message(Chat::Red, "NPC Target Required!");
 		return;
 	}
 
@@ -7990,11 +8434,11 @@ void command_qglobal(Client *c, const Seperator *sep) {
                                         target->GetNPCTypeID());
         auto results = database.QueryDatabase(query);
 		if(!results.Success()) {
-			c->Message(15, "Could not update database.");
+			c->Message(Chat::Yellow, "Could not update database.");
 			return;
 		}
 
-        c->Message(15, "Success! Changes take effect on zone reboot.");
+        c->Message(Chat::Yellow, "Success! Changes take effect on zone reboot.");
 		return;
 	}
 
@@ -8003,26 +8447,26 @@ void command_qglobal(Client *c, const Seperator *sep) {
                                         target->GetNPCTypeID());
         auto results = database.QueryDatabase(query);
 		if(!results.Success()) {
-			c->Message(15, "Could not update database.");
+			c->Message(Chat::Yellow, "Could not update database.");
 			return;
 		}
 
-        c->Message(15, "Success! Changes take effect on zone reboot.");
+        c->Message(Chat::Yellow, "Success! Changes take effect on zone reboot.");
 		return;
 	}
 
 	if(!strcasecmp(sep->arg[1], "view")) {
 		const NPCType *type = database.LoadNPCTypesData(target->GetNPCTypeID());
 		if(!type)
-			c->Message(15, "Invalid NPC type.");
+			c->Message(Chat::Yellow, "Invalid NPC type.");
 		else if(type->qglobal)
-			c->Message(15, "This NPC has quest globals active.");
+			c->Message(Chat::Yellow, "This NPC has quest globals active.");
 		else
-			c->Message(15, "This NPC has quest globals disabled.");
+			c->Message(Chat::Yellow, "This NPC has quest globals disabled.");
 		return;
 	}
 
-    c->Message(15, "Invalid action specified.");
+    c->Message(Chat::Yellow, "Invalid action specified.");
 }
 
 void command_path(Client *c, const Seperator *sep)
@@ -8057,7 +8501,7 @@ void command_undye(Client *c, const Seperator *sep)
 	}
 	else
 	{
-		c->Message(0, "ERROR: Client target required");
+		c->Message(Chat::White, "ERROR: Client target required");
 	}
 }
 
@@ -8065,7 +8509,7 @@ void command_ucs(Client *c, const Seperator *sep)
 {
 	if (!c)
 		return;
-	
+
 	Log(Logs::Detail, Logs::UCS_Server, "Character %s attempting ucs reconnect while ucs server is %savailable",
 		c->GetName(), (zone->IsUCSServerAvailable() ? "" : "un"));
 
@@ -8149,7 +8593,7 @@ void command_undyeme(Client *c, const Seperator *sep)
 {
 	if(c) {
 		c->Undye();
-		c->Message(13, "Dye removed from all slots. Please zone for the process to complete.");
+		c->Message(Chat::Red, "Dye removed from all slots. Please zone for the process to complete.");
 	}
 }
 
@@ -8164,23 +8608,23 @@ void command_ginfo(Client *c, const Seperator *sep)
 
 	Group *g = t->GetGroup();
 	if(!g) {
-		c->Message(0, "This client is not in a group");
+		c->Message(Chat::White, "This client is not in a group");
 		return;
 	}
 
-	c->Message(0, "Player: %s is in Group #%lu: with %i members",  t->GetName(), (unsigned long)g->GetID(), g->GroupCount());
+	c->Message(Chat::White, "Player: %s is in Group #%lu: with %i members",  t->GetName(), (unsigned long)g->GetID(), g->GroupCount());
 
 	uint32 r;
 	for(r = 0; r < MAX_GROUP_MEMBERS; r++) {
 		if(g->members[r] == nullptr) {
 			if(g->membername[r][0] == '\0')
 				continue;
-			c->Message(0, "...Zoned Member: %s, Roles: %s %s %s",  g->membername[r],
+			c->Message(Chat::White, "...Zoned Member: %s, Roles: %s %s %s",  g->membername[r],
 				(g->MemberRoles[r] & RoleAssist) ? "Assist" : "",
 				(g->MemberRoles[r] & RoleTank) ? "Tank" : "",
 				(g->MemberRoles[r] & RolePuller) ? "Puller" : "");
 		} else {
-			c->Message(0, "...In-Zone Member: %s (0x%x) Roles: %s %s %s",  g->membername[r], g->members[r],
+			c->Message(Chat::White, "...In-Zone Member: %s (0x%x) Roles: %s %s %s",  g->membername[r], g->members[r],
 				(g->MemberRoles[r] & RoleAssist) ? "Assist" : "",
 				(g->MemberRoles[r] & RoleTank) ? "Tank" : "",
 				(g->MemberRoles[r] & RolePuller) ? "Puller" : "");
@@ -8198,12 +8642,12 @@ void command_hp(Client *c, const Seperator *sep)
 void command_aggro(Client *c, const Seperator *sep)
 {
 	if(c->GetTarget() == nullptr || !c->GetTarget()->IsNPC()) {
-		c->Message(0, "Error: you must have an NPC target.");
+		c->Message(Chat::White, "Error: you must have an NPC target.");
 		return;
 	}
 	float d = atof(sep->arg[1]);
 	if(d == 0.0f) {
-		c->Message(13, "Error: distance argument required.");
+		c->Message(Chat::Red, "Error: distance argument required.");
 		return;
 	}
 	bool verbose = false;
@@ -8219,18 +8663,18 @@ void command_pf(Client *c, const Seperator *sep)
 	if(c->GetTarget())
 	{
 		Mob *who = c->GetTarget();
-		c->Message(0, "POS: (%.2f, %.2f, %.2f)",  who->GetX(), who->GetY(), who->GetZ());
-		c->Message(0, "WP: %s (%d/%d)",  to_string(who->GetCurrentWayPoint()).c_str(), who->IsNPC()?who->CastToNPC()->GetMaxWp():-1);
-		c->Message(0, "pause=%d RAspeed=%d",  who->GetCWPP(), who->GetRunAnimSpeed());
+		c->Message(Chat::White, "POS: (%.2f, %.2f, %.2f)",  who->GetX(), who->GetY(), who->GetZ());
+		c->Message(Chat::White, "WP: %s (%d/%d)",  to_string(who->GetCurrentWayPoint()).c_str(), who->IsNPC()?who->CastToNPC()->GetMaxWp():-1);
+		c->Message(Chat::White, "pause=%d RAspeed=%d",  who->GetCWPP(), who->GetRunAnimSpeed());
 		//who->DumpMovement(c);
 	} else {
-		c->Message(0, "ERROR: target required");
+		c->Message(Chat::White, "ERROR: target required");
 	}
 }
 
 void command_bestz(Client *c, const Seperator *sep) {
 	if (zone->zonemap == nullptr) {
-		c->Message(0,"Map not loaded for this zone");
+		c->Message(Chat::White,"Map not loaded for this zone");
 	} else {
 		glm::vec3 me;
 		me.x = c->GetX();
@@ -8244,16 +8688,16 @@ void command_bestz(Client *c, const Seperator *sep) {
 
 		if (best_z != BEST_Z_INVALID)
 		{
-			c->Message(0, "Z is %.3f at (%.3f, %.3f).",  best_z, me.x, me.y);
+			c->Message(Chat::White, "Z is %.3f at (%.3f, %.3f).",  best_z, me.x, me.y);
 		}
 		else
 		{
-			c->Message(0, "Found no Z.");
+			c->Message(Chat::White, "Found no Z.");
 		}
 	}
 
 	if(zone->watermap == nullptr) {
-		c->Message(0,"Water Region Map not loaded for this zone");
+		c->Message(Chat::White,"Water Region Map not loaded for this zone");
 	} else {
 		WaterRegionType RegionType;
 		float z;
@@ -8262,28 +8706,28 @@ void command_bestz(Client *c, const Seperator *sep) {
 			z=c->GetTarget()->GetZ();
 			auto position = glm::vec3(c->GetTarget()->GetX(), c->GetTarget()->GetY(), z);
 			RegionType = zone->watermap->ReturnRegionType(position);
-			c->Message(0,"InWater returns %d",  zone->watermap->InWater(position));
-			c->Message(0,"InLava returns %d",  zone->watermap->InLava(position));
+			c->Message(Chat::White,"InWater returns %d",  zone->watermap->InWater(position));
+			c->Message(Chat::White,"InLava returns %d",  zone->watermap->InLava(position));
 
 		}
 		else {
 			z=c->GetZ();
 			auto position = glm::vec3(c->GetX(), c->GetY(), z);
 			RegionType = zone->watermap->ReturnRegionType(position);
-			c->Message(0,"InWater returns %d",  zone->watermap->InWater(position));
-			c->Message(0,"InLava returns %d",  zone->watermap->InLava(position));
+			c->Message(Chat::White,"InWater returns %d",  zone->watermap->InWater(position));
+			c->Message(Chat::White,"InLava returns %d",  zone->watermap->InLava(position));
 
 		}
 
 		switch(RegionType) {
-			case RegionTypeNormal:	{ c->Message(0,"There is nothing special about the region you are in!"); break; }
-			case RegionTypeWater:	{ c->Message(0,"You/your target are in Water."); break; }
-			case RegionTypeLava:	{ c->Message(0,"You/your target are in Lava."); break; }
-			case RegionTypeVWater:	{ c->Message(0,"You/your target are in VWater (Icy Water?)."); break; }
-			case RegionTypePVP:	{ c->Message(0, "You/your target are in a pvp enabled area."); break; }
-			case RegionTypeSlime:	{ c->Message(0, "You/your target are in slime."); break; }
-			case RegionTypeIce:	{ c->Message(0, "You/your target are in ice."); break; }
-			default: c->Message(0,"You/your target are in an unknown region type.");
+			case RegionTypeNormal:	{ c->Message(Chat::White,"There is nothing special about the region you are in!"); break; }
+			case RegionTypeWater:	{ c->Message(Chat::White,"You/your target are in Water."); break; }
+			case RegionTypeLava:	{ c->Message(Chat::White,"You/your target are in Lava."); break; }
+			case RegionTypeVWater:	{ c->Message(Chat::White,"You/your target are in VWater (Icy Water?)."); break; }
+			case RegionTypePVP:	{ c->Message(Chat::White, "You/your target are in a pvp enabled area."); break; }
+			case RegionTypeSlime:	{ c->Message(Chat::White, "You/your target are in slime."); break; }
+			case RegionTypeIce:	{ c->Message(Chat::White, "You/your target are in ice."); break; }
+			default: c->Message(Chat::White,"You/your target are in an unknown region type.");
 		}
 	}
 
@@ -8292,7 +8736,7 @@ void command_bestz(Client *c, const Seperator *sep) {
 
 
 void command_reloadstatic(Client *c, const Seperator *sep) {
-	c->Message(0, "Reloading zone static data...");
+	c->Message(Chat::White, "Reloading zone static data...");
 	zone->ReloadStaticData();
 }
 
@@ -8311,13 +8755,13 @@ void command_flags(Client *c, const Seperator *sep) {
 void command_flagedit(Client *c, const Seperator *sep) {
 	//super-command for editing zone flags
 	if(sep->arg[1][0] == '\0' || !strcasecmp(sep->arg[1], "help")) {
-		c->Message(0, "Syntax: #flagedit [lockzone|unlockzone|listzones|give|take].");
-		c->Message(0, "...lockzone [zone id/short] [flag name] - Set the specified flag name on the zone, locking the zone");
-		c->Message(0, "...unlockzone [zone id/short] - Removes the flag requirement from the specified zone");
-		c->Message(0, "...listzones - List all zones which require a flag, and their flag's name");
-		c->Message(0, "...give [zone id/short] - Give your target the zone flag for the specified zone.");
-		c->Message(0, "...take [zone id/short] - Take the zone flag for the specified zone away from your target");
-		c->Message(0, "...Note: use #flags to view flags on a person");
+		c->Message(Chat::White, "Syntax: #flagedit [lockzone|unlockzone|listzones|give|take].");
+		c->Message(Chat::White, "...lockzone [zone id/short] [flag name] - Set the specified flag name on the zone, locking the zone");
+		c->Message(Chat::White, "...unlockzone [zone id/short] - Removes the flag requirement from the specified zone");
+		c->Message(Chat::White, "...listzones - List all zones which require a flag, and their flag's name");
+		c->Message(Chat::White, "...give [zone id/short] - Give your target the zone flag for the specified zone.");
+		c->Message(Chat::White, "...take [zone id/short] - Take the zone flag for the specified zone away from your target");
+		c->Message(Chat::White, "...Note: use #flags to view flags on a person");
 		return;
 	}
 
@@ -8330,13 +8774,13 @@ void command_flagedit(Client *c, const Seperator *sep) {
 			}
 		}
 		if(zoneid < 1) {
-			c->Message(13, "zone required. see help.");
+			c->Message(Chat::Red, "zone required. see help.");
 			return;
 		}
 
 		char flag_name[128];
 		if(sep->argplus[3][0] == '\0') {
-			c->Message(13, "flag name required. see help.");
+			c->Message(Chat::Red, "flag name required. see help.");
 			return;
 		}
 		database.DoEscapeString(flag_name, sep->argplus[3], 64);
@@ -8347,11 +8791,11 @@ void command_flagedit(Client *c, const Seperator *sep) {
                                         flag_name, zoneid, zone->GetInstanceVersion());
         auto results = database.QueryDatabase(query);
 		if(!results.Success()) {
-			c->Message(13, "Error updating zone: %s",  results.ErrorMessage().c_str());
+			c->Message(Chat::Red, "Error updating zone: %s",  results.ErrorMessage().c_str());
 			return;
 		}
 
-        c->Message(15, "Success! Zone %s now requires a flag, named %s",  database.GetZoneName(zoneid), flag_name);
+        c->Message(Chat::Yellow, "Success! Zone %s now requires a flag, named %s",  database.GetZoneName(zoneid), flag_name);
         return;
 	}
 
@@ -8365,7 +8809,7 @@ void command_flagedit(Client *c, const Seperator *sep) {
 		}
 
 		if(zoneid < 1) {
-			c->Message(13, "zone required. see help.");
+			c->Message(Chat::Red, "zone required. see help.");
 			return;
 		}
 
@@ -8374,11 +8818,11 @@ void command_flagedit(Client *c, const Seperator *sep) {
                                         zoneid, zone->GetInstanceVersion());
         auto results = database.QueryDatabase(query);
 		if(!results.Success()) {
-			c->Message(15, "Error updating zone: %s",  results.ErrorMessage().c_str());
+			c->Message(Chat::Yellow, "Error updating zone: %s",  results.ErrorMessage().c_str());
 			return;
 		}
 
-        c->Message(15, "Success! Zone %s no longer requires a flag.",  database.GetZoneName(zoneid));
+        c->Message(Chat::Yellow, "Success! Zone %s no longer requires a flag.",  database.GetZoneName(zoneid));
         return;
 	}
 
@@ -8390,9 +8834,9 @@ void command_flagedit(Client *c, const Seperator *sep) {
             return;
         }
 
-        c->Message(0, "Zones which require flags:");
+        c->Message(Chat::White, "Zones which require flags:");
         for (auto row = results.begin(); row != results.end(); ++row)
-            c->Message(0, "Zone %s (%s,%s) version %s requires key %s",  row[2], row[0], row[1], row[3], row[4]);
+            c->Message(Chat::White, "Zone %s (%s,%s) version %s requires key %s",  row[2], row[0], row[1], row[3], row[4]);
 
         return;
 	}
@@ -8406,13 +8850,13 @@ void command_flagedit(Client *c, const Seperator *sep) {
 			}
 		}
 		if(zoneid < 1) {
-			c->Message(13, "zone required. see help.");
+			c->Message(Chat::Red, "zone required. see help.");
 			return;
 		}
 
 		Mob *t = c->GetTarget();
 		if(t == nullptr || !t->IsClient()) {
-			c->Message(13, "client target required");
+			c->Message(Chat::Red, "client target required");
 			return;
 		}
 
@@ -8429,13 +8873,13 @@ void command_flagedit(Client *c, const Seperator *sep) {
 			}
 		}
 		if(zoneid < 1) {
-			c->Message(13, "zone required. see help.");
+			c->Message(Chat::Red, "zone required. see help.");
 			return;
 		}
 
 		Mob *t = c->GetTarget();
 		if(t == nullptr || !t->IsClient()) {
-			c->Message(13, "client target required");
+			c->Message(Chat::Red, "client target required");
 			return;
 		}
 
@@ -8443,7 +8887,7 @@ void command_flagedit(Client *c, const Seperator *sep) {
 		return;
 	}
 
-    c->Message(15, "Invalid action specified. use '#flagedit help' for help");
+    c->Message(Chat::Yellow, "Invalid action specified. use '#flagedit help' for help");
 }
 
 void command_serverrules(Client *c, const Seperator *sep)
@@ -8457,7 +8901,7 @@ void command_acceptrules(Client *c, const Seperator *sep)
 	{
 		database.SetAgreementFlag(c->AccountID());
 		c->SendAppearancePacket(AT_Anim, ANIM_STAND);
-		c->Message(0,"It is recorded you have agreed to the rules.");
+		c->Message(Chat::White,"It is recorded you have agreed to the rules.");
 	}
 }
 
@@ -8469,7 +8913,7 @@ void command_guildcreate(Client *c, const Seperator *sep)
 	}
 	else
 	{
-		c->Message(0,"Guild name must be more than 4 characters and less than 16.");
+		c->Message(Chat::White,"Guild name must be more than 4 characters and less than 16.");
 	}
 }
 
@@ -8486,17 +8930,17 @@ void command_guildlist(Client *c, const Seperator *sep)
 		tmp->ApprovedMembers(c);
 	}
 	else
-		c->Message(0,"Could not find reference id.");
+		c->Message(Chat::White,"Could not find reference id.");
 }
 
 void command_hatelist(Client *c, const Seperator *sep) {
 	Mob *target = c->GetTarget();
 	if(target == nullptr) {
-		c->Message(0, "Error: you must have a target.");
+		c->Message(Chat::White, "Error: you must have a target.");
 		return;
 	}
 
-	c->Message(0, "Display hate list for %s..",  target->GetName());
+	c->Message(Chat::White, "Display hate list for %s..",  target->GetName());
 	target->PrintHateListToClient(c);
 }
 
@@ -8504,142 +8948,142 @@ void command_hatelist(Client *c, const Seperator *sep) {
 void command_rules(Client *c, const Seperator *sep) {
 	//super-command for managing rules settings
 	if(sep->arg[1][0] == '\0' || !strcasecmp(sep->arg[1], "help")) {
-		c->Message(0, "Syntax: #rules [subcommand].");
-		c->Message(0, "-- Rule Set Manipulation --");
-		c->Message(0, "...listsets - List avaliable rule sets");
-		c->Message(0, "...current - gives the name of the ruleset currently running in this zone");
-		c->Message(0, "...reload - Reload the selected ruleset in this zone");
-		c->Message(0, "...switch (ruleset name) - Change the selected ruleset and load it");
-		c->Message(0, "...load (ruleset name) - Load a ruleset in just this zone without changing the selected set");
+		c->Message(Chat::White, "Syntax: #rules [subcommand].");
+		c->Message(Chat::White, "-- Rule Set Manipulation --");
+		c->Message(Chat::White, "...listsets - List avaliable rule sets");
+		c->Message(Chat::White, "...current - gives the name of the ruleset currently running in this zone");
+		c->Message(Chat::White, "...reload - Reload the selected ruleset in this zone");
+		c->Message(Chat::White, "...switch (ruleset name) - Change the selected ruleset and load it");
+		c->Message(Chat::White, "...load (ruleset name) - Load a ruleset in just this zone without changing the selected set");
 //too lazy to write this right now:
-//		c->Message(0, "...wload (ruleset name) - Load a ruleset in all zones without changing the selected set");
-		c->Message(0, "...store [ruleset name] - Store the running ruleset as the specified name");
-		c->Message(0, "---------------------");
-		c->Message(0, "-- Running Rule Manipulation --");
-		c->Message(0, "...reset - Reset all rules to their default values");
-		c->Message(0, "...get [rule] - Get the specified rule's local value");
-		c->Message(0, "...set (rule) (value) - Set the specified rule to the specified value locally only");
-		c->Message(0, "...setdb (rule) (value) - Set the specified rule to the specified value locally and in the DB");
-		c->Message(0, "...list [catname] - List all rules in the specified category (or all categiries if omitted)");
-		c->Message(0, "...values [catname] - List the value of all rules in the specified category");
+//		c->Message(Chat::White, "...wload (ruleset name) - Load a ruleset in all zones without changing the selected set");
+		c->Message(Chat::White, "...store [ruleset name] - Store the running ruleset as the specified name");
+		c->Message(Chat::White, "---------------------");
+		c->Message(Chat::White, "-- Running Rule Manipulation --");
+		c->Message(Chat::White, "...reset - Reset all rules to their default values");
+		c->Message(Chat::White, "...get [rule] - Get the specified rule's local value");
+		c->Message(Chat::White, "...set (rule) (value) - Set the specified rule to the specified value locally only");
+		c->Message(Chat::White, "...setdb (rule) (value) - Set the specified rule to the specified value locally and in the DB");
+		c->Message(Chat::White, "...list [catname] - List all rules in the specified category (or all categiries if omitted)");
+		c->Message(Chat::White, "...values [catname] - List the value of all rules in the specified category");
 		return;
 	}
 
 	if(!strcasecmp(sep->arg[1], "current")) {
-		c->Message(0, "Currently running ruleset '%s' (%d)",  RuleManager::Instance()->GetActiveRuleset(),
+		c->Message(Chat::White, "Currently running ruleset '%s' (%d)",  RuleManager::Instance()->GetActiveRuleset(),
 			RuleManager::Instance()->GetActiveRulesetID());
 	} else if(!strcasecmp(sep->arg[1], "listsets")) {
 		std::map<int, std::string> sets;
 		if(!RuleManager::Instance()->ListRulesets(&database, sets)) {
-			c->Message(13, "Failed to list rule sets!");
+			c->Message(Chat::Red, "Failed to list rule sets!");
 			return;
 		}
 
-		c->Message(0, "Avaliable rule sets:");
+		c->Message(Chat::White, "Avaliable rule sets:");
 		std::map<int, std::string>::iterator cur, end;
 		cur = sets.begin();
 		end = sets.end();
 		for(; cur != end; ++cur) {
-			c->Message(0, "(%d) %s",  cur->first, cur->second.c_str());
+			c->Message(Chat::White, "(%d) %s",  cur->first, cur->second.c_str());
 		}
 	} else if(!strcasecmp(sep->arg[1], "reload")) {
 		RuleManager::Instance()->LoadRules(&database, RuleManager::Instance()->GetActiveRuleset(), true);
-		c->Message(0, "The active ruleset (%s (%d)) has been reloaded",  RuleManager::Instance()->GetActiveRuleset(),
+		c->Message(Chat::White, "The active ruleset (%s (%d)) has been reloaded",  RuleManager::Instance()->GetActiveRuleset(),
 			RuleManager::Instance()->GetActiveRulesetID());
 	} else if(!strcasecmp(sep->arg[1], "switch")) {
 		//make sure this is a valid rule set..
 		int rsid = RuleManager::Instance()->GetRulesetID(&database, sep->arg[2]);
 		if(rsid < 0) {
-			c->Message(13, "Unknown rule set '%s'",  sep->arg[2]);
+			c->Message(Chat::Red, "Unknown rule set '%s'",  sep->arg[2]);
 			return;
 		}
 		if(!database.SetVariable("RuleSet",  sep->arg[2])) {
-			c->Message(13, "Failed to update variables table to change selected rule set");
+			c->Message(Chat::Red, "Failed to update variables table to change selected rule set");
 			return;
 		}
 
 		//TODO: we likely want to reload this ruleset everywhere...
 		RuleManager::Instance()->LoadRules(&database, sep->arg[2], true);
 
-		c->Message(0, "The selected ruleset has been changed to (%s (%d)) and reloaded locally",  sep->arg[2], rsid);
+		c->Message(Chat::White, "The selected ruleset has been changed to (%s (%d)) and reloaded locally",  sep->arg[2], rsid);
 	} else if(!strcasecmp(sep->arg[1], "load")) {
 		//make sure this is a valid rule set..
 		int rsid = RuleManager::Instance()->GetRulesetID(&database, sep->arg[2]);
 		if(rsid < 0) {
-			c->Message(13, "Unknown rule set '%s'",  sep->arg[2]);
+			c->Message(Chat::Red, "Unknown rule set '%s'",  sep->arg[2]);
 			return;
 		}
 		RuleManager::Instance()->LoadRules(&database, sep->arg[2], true);
-		c->Message(0, "Loaded ruleset '%s' (%d) locally",  sep->arg[2], rsid);
+		c->Message(Chat::White, "Loaded ruleset '%s' (%d) locally",  sep->arg[2], rsid);
 	} else if(!strcasecmp(sep->arg[1], "store")) {
 		if(sep->argnum == 1) {
 			//store current rule set.
 			RuleManager::Instance()->SaveRules(&database);
-			c->Message(0, "Rules saved");
+			c->Message(Chat::White, "Rules saved");
 		} else if(sep->argnum == 2) {
 			RuleManager::Instance()->SaveRules(&database, sep->arg[2]);
 			int prersid = RuleManager::Instance()->GetActiveRulesetID();
 			int rsid = RuleManager::Instance()->GetRulesetID(&database, sep->arg[2]);
 			if(rsid < 0) {
-				c->Message(13, "Unable to query ruleset ID after store, it most likely failed.");
+				c->Message(Chat::Red, "Unable to query ruleset ID after store, it most likely failed.");
 			} else {
-				c->Message(0, "Stored rules as ruleset '%s' (%d)",  sep->arg[2], rsid);
+				c->Message(Chat::White, "Stored rules as ruleset '%s' (%d)",  sep->arg[2], rsid);
 				if(prersid != rsid) {
-					c->Message(0, "Rule set %s (%d) is now active in this zone",  sep->arg[2], rsid);
+					c->Message(Chat::White, "Rule set %s (%d) is now active in this zone",  sep->arg[2], rsid);
 				}
 			}
 		} else {
-			c->Message(13, "Invalid argument count, see help.");
+			c->Message(Chat::Red, "Invalid argument count, see help.");
 			return;
 		}
 	} else if(!strcasecmp(sep->arg[1], "reset")) {
 		RuleManager::Instance()->ResetRules(true);
-		c->Message(0, "The running ruleset has been set to defaults");
-	
+		c->Message(Chat::White, "The running ruleset has been set to defaults");
+
 	} else if(!strcasecmp(sep->arg[1], "get")) {
 		if(sep->argnum != 2) {
-			c->Message(13, "Invalid argument count, see help.");
+			c->Message(Chat::Red, "Invalid argument count, see help.");
 			return;
 		}
 		std::string value;
 		if(!RuleManager::Instance()->GetRule(sep->arg[2], value))
-			c->Message(13, "Unable to find rule %s",  sep->arg[2]);
+			c->Message(Chat::Red, "Unable to find rule %s",  sep->arg[2]);
 		else
-			c->Message(0, "%s - %s",  sep->arg[2], value.c_str());
+			c->Message(Chat::White, "%s - %s",  sep->arg[2], value.c_str());
 
 	} else if(!strcasecmp(sep->arg[1], "set")) {
 		if(sep->argnum != 3) {
-			c->Message(13, "Invalid argument count, see help.");
+			c->Message(Chat::Red, "Invalid argument count, see help.");
 			return;
 		}
 		if(!RuleManager::Instance()->SetRule(sep->arg[2], sep->arg[3], nullptr, false, true)) {
-			c->Message(13, "Failed to modify rule");
+			c->Message(Chat::Red, "Failed to modify rule");
 		} else {
-			c->Message(0, "Rule modified locally.");
+			c->Message(Chat::White, "Rule modified locally.");
 		}
 	} else if(!strcasecmp(sep->arg[1], "setdb")) {
 		if(sep->argnum != 3) {
-			c->Message(13, "Invalid argument count, see help.");
+			c->Message(Chat::Red, "Invalid argument count, see help.");
 			return;
 		}
 		if(!RuleManager::Instance()->SetRule(sep->arg[2], sep->arg[3], &database, true, true)) {
-			c->Message(13, "Failed to modify rule");
+			c->Message(Chat::Red, "Failed to modify rule");
 		} else {
-			c->Message(0, "Rule modified locally and in the database.");
+			c->Message(Chat::White, "Rule modified locally and in the database.");
 		}
 	} else if(!strcasecmp(sep->arg[1], "list")) {
 		if(sep->argnum == 1) {
 			std::vector<const char *> rule_list;
 			if(!RuleManager::Instance()->ListCategories(rule_list)) {
-				c->Message(13, "Failed to list categories!");
+				c->Message(Chat::Red, "Failed to list categories!");
 				return;
 			}
-			c->Message(0, "Rule Categories:");
+			c->Message(Chat::White, "Rule Categories:");
 			std::vector<const char *>::iterator cur, end;
 			cur = rule_list.begin();
 			end = rule_list.end();
 			for(; cur != end; ++cur) {
-				c->Message(0, " %s",  *cur);
+				c->Message(Chat::White, " %s",  *cur);
 			}
 		} else if(sep->argnum == 2) {
 			const char *catfilt = nullptr;
@@ -8647,22 +9091,22 @@ void command_rules(Client *c, const Seperator *sep) {
 				catfilt = sep->arg[2];
 			std::vector<const char *> rule_list;
 			if(!RuleManager::Instance()->ListRules(catfilt, rule_list)) {
-				c->Message(13, "Failed to list rules!");
+				c->Message(Chat::Red, "Failed to list rules!");
 				return;
 			}
-			c->Message(0, "Rules in category %s:",  sep->arg[2]);
+			c->Message(Chat::White, "Rules in category %s:",  sep->arg[2]);
 			std::vector<const char *>::iterator cur, end;
 			cur = rule_list.begin();
 			end = rule_list.end();
 			for(; cur != end; ++cur) {
-				c->Message(0, " %s",  *cur);
+				c->Message(Chat::White, " %s",  *cur);
 			}
 		} else {
-			c->Message(13, "Invalid argument count, see help.");
+			c->Message(Chat::Red, "Invalid argument count, see help.");
 		}
 	} else if(!strcasecmp(sep->arg[1], "values")) {
 		if(sep->argnum != 2) {
-			c->Message(13, "Invalid argument count, see help.");
+			c->Message(Chat::Red, "Invalid argument count, see help.");
 			return;
 		} else {
 			const char *catfilt = nullptr;
@@ -8670,21 +9114,21 @@ void command_rules(Client *c, const Seperator *sep) {
 				catfilt = sep->arg[2];
 			std::vector<const char *> rule_list;
 			if(!RuleManager::Instance()->ListRules(catfilt, rule_list)) {
-				c->Message(13, "Failed to list rules!");
+				c->Message(Chat::Red, "Failed to list rules!");
 				return;
 			}
-			c->Message(0, "Rules & values in category %s:",  sep->arg[2]);
+			c->Message(Chat::White, "Rules & values in category %s:",  sep->arg[2]);
 			std::vector<const char *>::iterator cur, end;
 			cur = rule_list.begin();
 			end = rule_list.end();
 			for(std::string tmp_value; cur != end; ++cur) {
 				if (RuleManager::Instance()->GetRule(*cur, tmp_value))
-					c->Message(0, " %s - %s",  *cur, tmp_value.c_str());
+					c->Message(Chat::White, " %s - %s",  *cur, tmp_value.c_str());
 			}
 		}
 
 	} else {
-		c->Message(15, "Invalid action specified. use '#rules help' for help");
+		c->Message(Chat::Yellow, "Invalid action specified. use '#rules help' for help");
 	}
 }
 
@@ -8692,15 +9136,15 @@ void command_rules(Client *c, const Seperator *sep) {
 void command_task(Client *c, const Seperator *sep) {
 	//super-command for managing tasks
 	if(sep->arg[1][0] == '\0' || !strcasecmp(sep->arg[1], "help")) {
-		c->Message(0, "Syntax: #task [subcommand].");
-		c->Message(0, "-- Task System Commands --");
-		c->Message(0, "...show - List active tasks for a client");
-		c->Message(0, "...update <TaskID> <ActivityID> [Count]");
-		c->Message(0, "...reloadall - Reload all Task information from the database");
-		c->Message(0, "...reload task <TaskID> - Reload Task and Activity informnation for a single task");
-		c->Message(0, "...reload lists - Reload goal/reward list information");
-		c->Message(0, "...reload prox - Reload proximity information");
-		c->Message(0, "...reload sets - Reload task set information");
+		c->Message(Chat::White, "Syntax: #task [subcommand].");
+		c->Message(Chat::White, "-- Task System Commands --");
+		c->Message(Chat::White, "...show - List active tasks for a client");
+		c->Message(Chat::White, "...update <TaskID> <ActivityID> [Count]");
+		c->Message(Chat::White, "...reloadall - Reload all Task information from the database");
+		c->Message(Chat::White, "...reload task <TaskID> - Reload Task and Activity informnation for a single task");
+		c->Message(Chat::White, "...reload lists - Reload goal/reward list information");
+		c->Message(Chat::White, "...reload prox - Reload proximity information");
+		c->Message(Chat::White, "...reload sets - Reload task set information");
 		return;
 	}
 
@@ -8724,51 +9168,51 @@ void command_task(Client *c, const Seperator *sep) {
 				if(Count <= 0)
 					Count = 1;
 			}
-			c->Message(15, "Updating Task %i, Activity %i, Count %i",  TaskID, ActivityID, Count);
+			c->Message(Chat::Yellow, "Updating Task %i, Activity %i, Count %i",  TaskID, ActivityID, Count);
 			c->UpdateTaskActivity(TaskID, ActivityID, Count);
 		}
 		return;
 	}
 	if(!strcasecmp(sep->arg[1], "reloadall")) {
-		c->Message(15, "Sending reloadtasks to world");
+		c->Message(Chat::Yellow, "Sending reloadtasks to world");
 		worldserver.SendReloadTasks(RELOADTASKS);
-		c->Message(15, "Back again");
+		c->Message(Chat::Yellow, "Back again");
 		return;
 	}
 
 	if(!strcasecmp(sep->arg[1], "reload")) {
 		if(sep->arg[2][0] != '\0') {
 			if(!strcasecmp(sep->arg[2], "lists")) {
-				c->Message(15, "Sending reload lists to world");
+				c->Message(Chat::Yellow, "Sending reload lists to world");
 				worldserver.SendReloadTasks(RELOADTASKGOALLISTS);
-				c->Message(15, "Back again");
+				c->Message(Chat::Yellow, "Back again");
 				return;
 			}
 			if(!strcasecmp(sep->arg[2], "prox")) {
-				c->Message(15, "Sending reload proximities to world");
+				c->Message(Chat::Yellow, "Sending reload proximities to world");
 				worldserver.SendReloadTasks(RELOADTASKPROXIMITIES);
-				c->Message(15, "Back again");
+				c->Message(Chat::Yellow, "Back again");
 				return;
 			}
 			if(!strcasecmp(sep->arg[2], "sets")) {
-				c->Message(15, "Sending reload task sets to world");
+				c->Message(Chat::Yellow, "Sending reload task sets to world");
 				worldserver.SendReloadTasks(RELOADTASKSETS);
-				c->Message(15, "Back again");
+				c->Message(Chat::Yellow, "Back again");
 				return;
 			}
 			if(!strcasecmp(sep->arg[2], "task") && (sep->arg[3][0] != '\0')) {
 				int TaskID = atoi(sep->arg[3]);
 				if((TaskID > 0) && (TaskID < MAXTASKS)) {
-					c->Message(15, "Sending reload task %i to world");
+					c->Message(Chat::Yellow, "Sending reload task %i to world");
 					worldserver.SendReloadTasks(RELOADTASKS, TaskID);
-					c->Message(15, "Back again");
+					c->Message(Chat::Yellow, "Back again");
 					return;
 				}
 			}
 		}
 
 	}
-	c->Message(0, "Unable to interpret command. Type #task help");
+	c->Message(Chat::White, "Unable to interpret command. Type #task help");
 
 }
 void command_reloadtitles(Client *c, const Seperator *sep)
@@ -8776,7 +9220,7 @@ void command_reloadtitles(Client *c, const Seperator *sep)
 	auto pack = new ServerPacket(ServerOP_ReloadTitles, 0);
 	worldserver.SendPacket(pack);
 	safe_delete(pack);
-	c->Message(15, "Player Titles Reloaded.");
+	c->Message(Chat::Yellow, "Player Titles Reloaded.");
 
 }
 
@@ -8787,7 +9231,7 @@ void command_traindisc(Client *c, const Seperator *sep)
 		t = c->GetTarget()->CastToClient();
 
 	if (sep->argnum < 1 || !sep->IsNumber(1)) {
-		c->Message(0, "FORMAT: #traindisc <max level> <min level>");
+		c->Message(Chat::White, "FORMAT: #traindisc <max level> <min level>");
 		return;
 	}
 
@@ -8800,17 +9244,17 @@ void command_traindisc(Client *c, const Seperator *sep)
 		min_level = (uint8)RuleI(Character, MaxLevel); // default to Character:MaxLevel if we're not a GM & it's higher than the max level
 
 	if(max_level < 1 || min_level < 1) {
-		c->Message(0, "ERROR: Level must be greater than 1.");
+		c->Message(Chat::White, "ERROR: Level must be greater than 1.");
 		return;
 	}
 	if (min_level > max_level) {
-		c->Message(0, "Error: Min Level must be less than or equal to Max Level.");
+		c->Message(Chat::White, "Error: Min Level must be less than or equal to Max Level.");
 		return;
 	}
 
-	t->Message(0, "Training disciplines");
+	t->Message(Chat::White, "Training disciplines");
 	if(t != c)
-		c->Message(0, "Training disciplines for %s.",  t->GetName());
+		c->Message(Chat::White, "Training disciplines for %s.",  t->GetName());
 	Log(Logs::General, Logs::Normal, "Train disciplines request for %s from %s, levels: %u -> %u",  t->GetName(), c->GetName(), min_level, max_level);
 
 	int spell_id = 0;
@@ -8820,7 +9264,7 @@ void command_traindisc(Client *c, const Seperator *sep)
 
 	for( ; spell_id < SPDAT_RECORDS; ++spell_id) {
 		if (spell_id < 0 || spell_id >= SPDAT_RECORDS) {
-			c->Message(13, "FATAL ERROR: Spell id out-of-range (id: %i, min: 0, max: %i)", spell_id, SPDAT_RECORDS);
+			c->Message(Chat::Red, "FATAL ERROR: Spell id out-of-range (id: %i, min: 0, max: %i)", spell_id, SPDAT_RECORDS);
 			return;
 		}
 
@@ -8833,10 +9277,10 @@ void command_traindisc(Client *c, const Seperator *sep)
 				break;
 			if (spells[spell_id].skill == 52)
 				break;
-			
+
 			uint16 spell_id_ = (uint16)spell_id;
 			if ((spell_id_ != spell_id) || (spell_id != spell_id_)) {
-				c->Message(13, "FATAL ERROR: Type conversion data loss with spell_id (%i != %u)", spell_id, spell_id_);
+				c->Message(Chat::Red, "FATAL ERROR: Type conversion data loss with spell_id (%i != %u)", spell_id, spell_id_);
 				return;
 			}
 
@@ -8845,14 +9289,14 @@ void command_traindisc(Client *c, const Seperator *sep)
 
 			for (uint32 r = 0; r < MAX_PP_DISCIPLINES; ++r) {
 				if (t->GetPP().disciplines.values[r] == spell_id_) {
-					t->Message(13, "You already know this discipline.");
+					t->Message(Chat::Red, "You already know this discipline.");
 					break; // continue the 1st loop
 				}
 				else if (t->GetPP().disciplines.values[r] == 0) {
 					t->GetPP().disciplines.values[r] = spell_id_;
 					database.SaveCharacterDisc(t->CharacterID(), r, spell_id_);
 					change = true;
-					t->Message(0, "You have learned a new discipline!");
+					t->Message(Chat::White, "You have learned a new discipline!");
 					++count; // success counter
 					break; // continue the 1st loop
 				} // if we get to this point, there's already a discipline in this slot, so we continue onto the next slot
@@ -8866,13 +9310,13 @@ void command_traindisc(Client *c, const Seperator *sep)
 		t->SendDisciplineUpdate();
 
 	if (count > 0) {
-		t->Message(0, "Successfully trained %u disciplines.",  count);
+		t->Message(Chat::White, "Successfully trained %u disciplines.",  count);
 		if (t != c)
-			c->Message(0, "Successfully trained %u disciplines for %s.",  count, t->GetName());
+			c->Message(Chat::White, "Successfully trained %u disciplines for %s.",  count, t->GetName());
 	} else {
-		t->Message(0, "No disciplines trained.");
+		t->Message(Chat::White, "No disciplines trained.");
 		if (t != c)
-			c->Message(0, "No disciplines trained for %s.",  t->GetName());
+			c->Message(Chat::White, "No disciplines trained for %s.",  t->GetName());
 	}
 }
 
@@ -8886,7 +9330,7 @@ void command_setgraveyard(Client *c, const Seperator *sep)
 		t=c->GetTarget()->CastToClient();
 
 	if(!sep->arg[1][0]) {
-		c->Message(0, "Usage: #setgraveyard [zonename]");
+		c->Message(Chat::White, "Usage: #setgraveyard [zonename]");
 		return;
 	}
 
@@ -8896,21 +9340,21 @@ void command_setgraveyard(Client *c, const Seperator *sep)
 		graveyard_id = database.CreateGraveyardRecord(zoneid, t->GetPosition());
 
 		if(graveyard_id > 0) {
-			c->Message(0, "Successfuly added a new record for this graveyard!");
+			c->Message(Chat::White, "Successfuly added a new record for this graveyard!");
 			if(database.AddGraveyardIDToZone(zoneid, graveyard_id) > 0) {
-				c->Message(0, "Successfuly added this new graveyard for the zone %s.",  sep->arg[1]);
+				c->Message(Chat::White, "Successfuly added this new graveyard for the zone %s.",  sep->arg[1]);
 				// TODO: Set graveyard data to the running zone process.
-				c->Message(0, "Done!");
+				c->Message(Chat::White, "Done!");
 			}
 			else
-				c->Message(0, "Unable to add this new graveyard to the zone %s.",  sep->arg[1]);
+				c->Message(Chat::White, "Unable to add this new graveyard to the zone %s.",  sep->arg[1]);
 		}
 		else {
-			c->Message(0, "Unable to create a new graveyard record in the database.");
+			c->Message(Chat::White, "Unable to create a new graveyard record in the database.");
 		}
 	}
 	else {
-		c->Message(0, "Unable to retrieve a ZoneID for the zone: %s",  sep->arg[1]);
+		c->Message(Chat::White, "Unable to retrieve a ZoneID for the zone: %s",  sep->arg[1]);
 	}
 
 	return;
@@ -8922,7 +9366,7 @@ void command_deletegraveyard(Client *c, const Seperator *sep)
 	uint32 graveyard_id = 0;
 
 	if(!sep->arg[1][0]) {
-		c->Message(0, "Usage: #deletegraveyard [zonename]");
+		c->Message(Chat::White, "Usage: #deletegraveyard [zonename]");
 		return;
 	}
 
@@ -8931,15 +9375,15 @@ void command_deletegraveyard(Client *c, const Seperator *sep)
 
 	if(zoneid > 0 && graveyard_id > 0) {
 		if(database.DeleteGraveyard(zoneid, graveyard_id))
-			c->Message(0, "Successfuly deleted graveyard %u for zone %s.",  graveyard_id, sep->arg[1]);
+			c->Message(Chat::White, "Successfuly deleted graveyard %u for zone %s.",  graveyard_id, sep->arg[1]);
 		else
-			c->Message(0, "Unable to delete graveyard %u for zone %s.",  graveyard_id, sep->arg[1]);
+			c->Message(Chat::White, "Unable to delete graveyard %u for zone %s.",  graveyard_id, sep->arg[1]);
 	}
 	else {
 		if(zoneid <= 0)
-			c->Message(0, "Unable to retrieve a ZoneID for the zone: %s",  sep->arg[1]);
+			c->Message(Chat::White, "Unable to retrieve a ZoneID for the zone: %s",  sep->arg[1]);
 		else if(graveyard_id <= 0)
-			c->Message(0, "Unable to retrieve a valid GraveyardID for the zone: %s",  sep->arg[1]);
+			c->Message(Chat::White, "Unable to retrieve a valid GraveyardID for the zone: %s",  sep->arg[1]);
 	}
 
 	return;
@@ -8952,14 +9396,14 @@ void command_summonburiedplayercorpse(Client *c, const Seperator *sep)
 	if(c->GetTarget() && c->GetTarget()->IsClient() && c->GetGM())
 		t = c->GetTarget()->CastToClient();
 	else {
-		c->Message(0, "You must first select a target!");
+		c->Message(Chat::White, "You must first select a target!");
 		return;
 	}
 
 	Corpse* PlayerCorpse = database.SummonBuriedCharacterCorpses(t->CharacterID(), t->GetZoneID(), zone->GetInstanceID(), t->GetPosition());
 
 	if(!PlayerCorpse)
-		c->Message(0, "Your target doesn't have any buried corpses.");
+		c->Message(Chat::White, "Your target doesn't have any buried corpses.");
 
 	return;
 }
@@ -8971,16 +9415,16 @@ void command_getplayerburiedcorpsecount(Client *c, const Seperator *sep)
 	if(c->GetTarget() && c->GetTarget()->IsClient() && c->GetGM())
 		t = c->GetTarget()->CastToClient();
 	else {
-		c->Message(0, "You must first select a target!");
+		c->Message(Chat::White, "You must first select a target!");
 		return;
 	}
 
 	uint32 CorpseCount = database.GetCharacterBuriedCorpseCount(t->CharacterID());
 
 	if(CorpseCount > 0)
-		c->Message(0, "Your target has a total of %u buried corpses.",  CorpseCount);
+		c->Message(Chat::White, "Your target has a total of %u buried corpses.",  CorpseCount);
 	else
-		c->Message(0, "Your target doesn't have any buried corpses.");
+		c->Message(Chat::White, "Your target doesn't have any buried corpses.");
 
 	return;
 }
@@ -9005,7 +9449,7 @@ void command_advnpcspawn(Client *c, const Seperator *sep)
 
     if (strcasecmp(sep->arg[1], "maketype") == 0) {
         if(!target || !target->IsNPC()) {
-            c->Message(0, "Target Required!");
+            c->Message(Chat::White, "Target Required!");
             return;
         }
 
@@ -9015,7 +9459,7 @@ void command_advnpcspawn(Client *c, const Seperator *sep)
 
     if (strcasecmp(sep->arg[1], "makegroup") == 0) {
         if(!sep->arg[2]) {
-            c->Message(0, "Format: #advnpdspawn makegroup <name> [spawn limit] [dist] [max x] [min x] [max y] [min y] [delay]");
+            c->Message(Chat::White, "Format: #advnpdspawn makegroup <name> [spawn limit] [dist] [max x] [min x] [max y] [min y] [delay]");
             return;
         }
 
@@ -9032,18 +9476,18 @@ void command_advnpcspawn(Client *c, const Seperator *sep)
                                         (sep->arg[9]? atoi(sep->arg[9]): 0));
         auto results = database.QueryDatabase(query);
         if (!results.Success()) {
-            c->Message(0, "Invalid Arguments -- MySQL gave the following error:");
-            c->Message(13, results.ErrorMessage().c_str());
+            c->Message(Chat::White, "Invalid Arguments -- MySQL gave the following error:");
+            c->Message(Chat::Red, results.ErrorMessage().c_str());
             return;
         }
 
-        c->Message(0, "Group ID %i created successfully!",  results.LastInsertedID());
+        c->Message(Chat::White, "Group ID %i created successfully!",  results.LastInsertedID());
         return;
     }
 
 	if (strcasecmp(sep->arg[1], "addgroupentry") == 0) {
         if(!atoi(sep->arg[2]) || !atoi(sep->arg[3]) || !atoi(sep->arg[4])) {
-            c->Message(0, "Format: #advnpdspawn addgroupentry <spawnggroupID> <npcID> <chance>");
+            c->Message(Chat::White, "Format: #advnpdspawn addgroupentry <spawnggroupID> <npcID> <chance>");
             return;
         }
 
@@ -9052,19 +9496,19 @@ void command_advnpcspawn(Client *c, const Seperator *sep)
                                         atoi(sep->arg[2]), atoi(sep->arg[3]), atoi(sep->arg[4]));
         auto results = database.QueryDatabase(query);
         if (!results.Success()) {
-            c->Message(0, "Invalid Arguments -- MySQL gave the following error:");
-            c->Message(13, results.ErrorMessage().c_str());
+            c->Message(Chat::White, "Invalid Arguments -- MySQL gave the following error:");
+            c->Message(Chat::Red, results.ErrorMessage().c_str());
             return;
         }
 
-        c->Message(0, "NPC %i added to group %i with %i chance!",  atoi(sep->arg[3]), atoi(sep->arg[2]), atoi(sep->arg[4]) );
+        c->Message(Chat::White, "NPC %i added to group %i with %i chance!",  atoi(sep->arg[3]), atoi(sep->arg[2]), atoi(sep->arg[4]) );
 
         return;
     }
 
     if (strcasecmp(sep->arg[1], "editgroupbox") == 0) {
         if(!atof(sep->arg[2]) || !atof(sep->arg[3]) || !atof(sep->arg[4]) || !atof(sep->arg[5]) || !atof(sep->arg[6]) || !atof(sep->arg[7]) || !atof(sep->arg[8])) {
-            c->Message(0, "Format: #advnpdspawn editgroupbox <spawngroupID> <dist> <max x> <min x> <max y> <min y> <delay>");
+            c->Message(Chat::White, "Format: #advnpdspawn editgroupbox <spawngroupID> <dist> <max x> <min x> <max y> <min y> <delay>");
             return;
         }
 
@@ -9075,19 +9519,19 @@ void command_advnpcspawn(Client *c, const Seperator *sep)
                                         atoi(sep->arg[2]));
         auto results = database.QueryDatabase(query);
         if (!results.Success()) {
-            c->Message(0, "Invalid Arguments -- MySQL gave the following error:");
-            c->Message(13, results.ErrorMessage().c_str());
+            c->Message(Chat::White, "Invalid Arguments -- MySQL gave the following error:");
+            c->Message(Chat::Red, results.ErrorMessage().c_str());
             return;
         }
 
-        c->Message(0, "Group ID %i created successfully!",  results.LastInsertedID());
+        c->Message(Chat::White, "Group ID %i created successfully!",  results.LastInsertedID());
 
         return;
     }
 
 	if (strcasecmp(sep->arg[1], "cleargroupbox") == 0) {
         if(!atoi(sep->arg[2])) {
-            c->Message(0, "Format: #advnpdspawn cleargroupbox <spawngroupID>");
+            c->Message(Chat::White, "Format: #advnpdspawn cleargroupbox <spawngroupID>");
             return;
         }
 
@@ -9097,44 +9541,44 @@ void command_advnpcspawn(Client *c, const Seperator *sep)
                                         "WHERE id = '%i' ",  atoi(sep->arg[2]));
         auto results = database.QueryDatabase(query);
         if (!results.Success()) {
-            c->Message(0, "Invalid Arguments -- MySQL gave the following error:");
-            c->Message(13, results.ErrorMessage().c_str());
+            c->Message(Chat::White, "Invalid Arguments -- MySQL gave the following error:");
+            c->Message(Chat::Red, results.ErrorMessage().c_str());
             return;
         }
 
-        c->Message(0, "Group ID %i created successfully!",  results.LastInsertedID());
+        c->Message(Chat::White, "Group ID %i created successfully!",  results.LastInsertedID());
 
         return;
     }
 
 	if (strcasecmp(sep->arg[1], "addgroupspawn") == 0 && atoi(sep->arg[2])!=0) {
         database.NPCSpawnDB(5, zone->GetShortName(), zone->GetInstanceVersion(), c, 0, atoi(sep->arg[2]));
-        c->Message(0, "Mob of group %i added successfully!",  atoi(sep->arg[2]));
+        c->Message(Chat::White, "Mob of group %i added successfully!",  atoi(sep->arg[2]));
         return;
     }
 
 	if (strcasecmp(sep->arg[1], "removegroupspawn") == 0) {
         if (!target || !target->IsNPC()) {
-            c->Message(0, "Error: Need an NPC target.");
+            c->Message(Chat::White, "Error: Need an NPC target.");
             return;
         }
 
         Spawn2* s2 = target->CastToNPC()->respawn2;
 
         if(!s2) {
-            c->Message(0, "removegroupspawn FAILED -- cannot determine which spawn entry in the database this mob came from.");
+            c->Message(Chat::White, "removegroupspawn FAILED -- cannot determine which spawn entry in the database this mob came from.");
             return;
         }
 
         std::string query = StringFormat("DELETE FROM spawn2 WHERE id = '%i'",  s2->GetID());
         auto results = database.QueryDatabase(query);
         if(!results.Success()) {
-            c->Message(13, "Update failed! MySQL gave the following error:");
-            c->Message(13, results.ErrorMessage().c_str());
+            c->Message(Chat::Red, "Update failed! MySQL gave the following error:");
+            c->Message(Chat::Red, results.ErrorMessage().c_str());
             return;
         }
 
-        c->Message(0, "Spawnpoint Removed successfully.");
+        c->Message(Chat::White, "Spawnpoint Removed successfully.");
         target->Depop(false);
 
         return;
@@ -9142,14 +9586,14 @@ void command_advnpcspawn(Client *c, const Seperator *sep)
 
 	if (strcasecmp(sep->arg[1], "movespawn") == 0) {
         if (!target || !target->IsNPC()) {
-            c->Message(0, "Error: Need an NPC target.");
+            c->Message(Chat::White, "Error: Need an NPC target.");
             return;
         }
 
         Spawn2* s2 = target->CastToNPC()->respawn2;
 
         if(!s2) {
-            c->Message(0, "movespawn FAILED -- cannot determine which spawn entry in the database this mob came from.");
+            c->Message(Chat::White, "movespawn FAILED -- cannot determine which spawn entry in the database this mob came from.");
             return;
         }
 
@@ -9158,12 +9602,12 @@ void command_advnpcspawn(Client *c, const Seperator *sep)
                                         c->GetX(), c->GetY(), c->GetZ(), c->GetHeading(),s2->GetID());
         auto results = database.QueryDatabase(query);
         if (!results.Success()) {
-            c->Message(13, "Update failed! MySQL gave the following error:");
-            c->Message(13, results.ErrorMessage().c_str());
+            c->Message(Chat::Red, "Update failed! MySQL gave the following error:");
+            c->Message(Chat::Red, results.ErrorMessage().c_str());
             return;
         }
 
-        c->Message(0, "Updating coordinates successful.");
+        c->Message(Chat::White, "Updating coordinates successful.");
         target->GMMove(c->GetX(), c->GetY(), c->GetZ(), c->GetHeading());
 
         return;
@@ -9171,7 +9615,7 @@ void command_advnpcspawn(Client *c, const Seperator *sep)
 
 	if (strcasecmp(sep->arg[1], "editrespawn") == 0) {
         if (!target || !target->IsNPC()) {
-            c->Message(0, "Error: Need an NPC target.");
+            c->Message(Chat::White, "Error: Need an NPC target.");
             return;
         }
 
@@ -9180,7 +9624,7 @@ void command_advnpcspawn(Client *c, const Seperator *sep)
         uint32 new_rs = 0;
         uint32 new_var = s2->GetVariance();
         if(!sep->IsNumber(2)) {
-            c->Message(0, "editrespawn FAILED -- cannot set respawn to be 0");
+            c->Message(Chat::White, "editrespawn FAILED -- cannot set respawn to be 0");
             return;
         }
 
@@ -9190,7 +9634,7 @@ void command_advnpcspawn(Client *c, const Seperator *sep)
             new_var = atoi(sep->arg[3]);
 
         if(!s2) {
-            c->Message(0, "editrespawn FAILED -- cannot determine which spawn entry in the database this mob came from.");
+            c->Message(Chat::White, "editrespawn FAILED -- cannot determine which spawn entry in the database this mob came from.");
             return;
         }
 
@@ -9198,12 +9642,12 @@ void command_advnpcspawn(Client *c, const Seperator *sep)
                                         "WHERE id = '%i'",  new_rs, new_var, s2->GetID());
         auto results = database.QueryDatabase(query);
         if (!results.Success()) {
-            c->Message(13, "Update failed! MySQL gave the following error:");
-            c->Message(13, results.ErrorMessage().c_str());
+            c->Message(Chat::Red, "Update failed! MySQL gave the following error:");
+            c->Message(Chat::Red, results.ErrorMessage().c_str());
             return;
         }
 
-        c->Message(0, "Updating respawn timer successful.");
+        c->Message(Chat::White, "Updating respawn timer successful.");
         s2->SetRespawnTimer(new_rs);
         s2->SetVariance(new_var);
 
@@ -9212,27 +9656,28 @@ void command_advnpcspawn(Client *c, const Seperator *sep)
 
 	if (strcasecmp(sep->arg[1], "setversion") == 0) {
         if (!target || !target->IsNPC()) {
-            c->Message(0, "Error: Need an NPC target.");
+            c->Message(Chat::White, "Error: Need an NPC target.");
             return;
         }
 
         if(!sep->IsNumber(2)) {
-            c->Message(0, "setversion FAILED -- You must set a version number");
+            c->Message(Chat::White, "setversion FAILED -- You must set a version number");
             return;
         }
 
         int16 version = atoi(sep->arg[2]);
         std::string query = StringFormat("UPDATE spawn2 SET version = %i "
                                         "WHERE spawngroupID = '%i'",
-                                        version, c->GetTarget()->CastToNPC()->GetSp2());
+                                        version, c->GetTarget()->CastToNPC()->GetSpawnGroupId());
         auto results = database.QueryDatabase(query);
         if (!results.Success()) {
-            c->Message(13, "Update failed! MySQL gave the following error:");
-            c->Message(13, results.ErrorMessage().c_str());
+            c->Message(Chat::Red, "Update failed! MySQL gave the following error:");
+            c->Message(Chat::Red, results.ErrorMessage().c_str());
             return;
         }
 
-        c->Message(0, "Version change to %i was successful from SpawnGroupID %i",  version, c->GetTarget()->CastToNPC()->GetSp2());
+        c->Message(Chat::White, "Version change to %i was successful from SpawnGroupID %i",  version,
+				   c->GetTarget()->CastToNPC()->GetSpawnGroupId());
         c->GetTarget()->Depop(false);
 
         return;
@@ -9240,13 +9685,13 @@ void command_advnpcspawn(Client *c, const Seperator *sep)
 
 	if (strcasecmp(sep->arg[1], "testload") == 0 && atoi(sep->arg[2])!=0) {
         database.LoadSpawnGroupsByID(atoi(sep->arg[2]),&zone->spawn_group_list);
-        c->Message(0, "Group %i loaded successfully!",  atoi(sep->arg[2]));
+        c->Message(Chat::White, "Group %i loaded successfully!",  atoi(sep->arg[2]));
         return;
     }
 
-    c->Message(0, "Error: #advnpcspawn: Invalid command.");
-    c->Message(0, "Usage: #advnpcspawn [maketype|makegroup|addgroupentry|addgroupspawn|setversion]");
-    c->Message(0, "Usage: #advnpcspawn [removegroupspawn|movespawn|editrespawn|editgroupbox|cleargroupbox]");
+    c->Message(Chat::White, "Error: #advnpcspawn: Invalid command.");
+    c->Message(Chat::White, "Usage: #advnpcspawn [maketype|makegroup|addgroupentry|addgroupspawn|setversion]");
+    c->Message(Chat::White, "Usage: #advnpcspawn [removegroupspawn|movespawn|editrespawn|editgroupbox|cleargroupbox]");
 }
 
 void command_aggrozone(Client *c, const Seperator *sep) {
@@ -9260,7 +9705,7 @@ void command_aggrozone(Client *c, const Seperator *sep) {
 
 	uint32 hate = atoi(sep->arg[1]); //should default to 0 if we don't enter anything
 	entity_list.AggroZone(m, hate);
-	c->Message(0, "Train to you! Last chance to go invulnerable...");
+	c->Message(Chat::White, "Train to you! Last chance to go invulnerable...");
 }
 
 void command_modifynpcstat(Client *c, const Seperator *sep)
@@ -9270,8 +9715,8 @@ void command_modifynpcstat(Client *c, const Seperator *sep)
 
 	if(sep->arg[1][0] == '\0')
 	{
-		c->Message(0, "usage #modifynpcstat arg value");
-		c->Message(0, "Args: ac, str, sta, agi, dex, wis, _int, cha, max_hp, mr, fr, cr, pr, dr, runspeed, special_attacks, "
+		c->Message(Chat::White, "usage #modifynpcstat arg value");
+		c->Message(Chat::White, "Args: ac, str, sta, agi, dex, wis, _int, cha, max_hp, mr, fr, cr, pr, dr, runspeed, special_attacks, "
 			"attack_speed, atk, accuracy, trackable, min_hit, max_hit, see_invis_undead, see_hide, see_improved_hide, "
 			"hp_regen, mana_regen, aggro, assist, slow_mitigation, loottable_id, healscale, spellscale");
 		return;
@@ -9301,22 +9746,22 @@ void command_instance(Client *c, const Seperator *sep)
 
 	if(strcasecmp(sep->arg[1], "help") == 0)
 	{
-		c->Message(0, "#instance usage:");
-		c->Message(0, "#instance create zone_id version duration - Creates an instance of version 'version' in the "
+		c->Message(Chat::White, "#instance usage:");
+		c->Message(Chat::White, "#instance create zone_id version duration - Creates an instance of version 'version' in the "
 			"zone with id matching zone_id, will last for duration seconds.");
-		c->Message(0, "#instance destroy instance_id - Destroys the instance with id matching instance_id.");
-		c->Message(0, "#instance add instance_id player_name - adds the player 'player_name' to the instance "
+		c->Message(Chat::White, "#instance destroy instance_id - Destroys the instance with id matching instance_id.");
+		c->Message(Chat::White, "#instance add instance_id player_name - adds the player 'player_name' to the instance "
 			"with id matching instance_id.");
-		c->Message(0, "#instance remove instance_id player_name - removes the player 'player_name' from the "
+		c->Message(Chat::White, "#instance remove instance_id player_name - removes the player 'player_name' from the "
 			"instance with id matching instance_id.");
-		c->Message(0, "#instance list player_name - lists all the instances 'player_name' is apart of.");
+		c->Message(Chat::White, "#instance list player_name - lists all the instances 'player_name' is apart of.");
 		return;
 	}
 	else if(strcasecmp(sep->arg[1], "create") == 0)
 	{
 		if(!sep->IsNumber(3) || !sep->IsNumber(4))
 		{
-			c->Message(0, "#instance create zone_id version duration - Creates an instance of version 'version' in the "
+			c->Message(Chat::White, "#instance create zone_id version duration - Creates an instance of version 'version' in the "
 				"zone with id matching zone_id, will last for duration seconds.");
 			return;
 		}
@@ -9339,42 +9784,42 @@ void command_instance(Client *c, const Seperator *sep)
 
 		if(!zn)
 		{
-			c->Message(0, "Zone with id %lu was not found by the server.",  (unsigned long)zone_id);
+			c->Message(Chat::White, "Zone with id %lu was not found by the server.",  (unsigned long)zone_id);
 			return;
 		}
 
 		uint16 id = 0;
 		if(!database.GetUnusedInstanceID(id))
 		{
-			c->Message(0, "Server was unable to find a free instance id.");
+			c->Message(Chat::White, "Server was unable to find a free instance id.");
 			return;
 		}
 
 		if(!database.CreateInstance(id, zone_id, version, duration))
 		{
-			c->Message(0, "Server was unable to create a new instance.");
+			c->Message(Chat::White, "Server was unable to create a new instance.");
 			return;
 		}
 
-		c->Message(0, "New instance %s was created with id %lu.",  zn, (unsigned long)id);
+		c->Message(Chat::White, "New instance %s was created with id %lu.",  zn, (unsigned long)id);
 	}
 	else if(strcasecmp(sep->arg[1], "destroy") == 0)
 	{
 		if(!sep->IsNumber(2))
 		{
-			c->Message(0, "#instance destroy instance_id - Destroys the instance with id matching instance_id.");
+			c->Message(Chat::White, "#instance destroy instance_id - Destroys the instance with id matching instance_id.");
 			return;
 		}
 
 		uint16 id = atoi(sep->arg[2]);
 		database.DeleteInstance(id);
-		c->Message(0, "Destroyed instance with id %lu.",  (unsigned long)id);
+		c->Message(Chat::White, "Destroyed instance with id %lu.",  (unsigned long)id);
 	}
 	else if(strcasecmp(sep->arg[1], "add") == 0)
 	{
 		if(!sep->IsNumber(2))
 		{
-			c->Message(0, "#instance add instance_id player_name - adds the player 'player_name' to the instance "
+			c->Message(Chat::White, "#instance add instance_id player_name - adds the player 'player_name' to the instance "
 				"with id matching instance_id.");
 			return;
 		}
@@ -9384,13 +9829,13 @@ void command_instance(Client *c, const Seperator *sep)
 
 		if(id <= 0 || charid <= 0)
 		{
-			c->Message(0, "Must enter a valid instance id and player name.");
+			c->Message(Chat::White, "Must enter a valid instance id and player name.");
 			return;
 		}
 
 		if(!database.CheckInstanceExists(id))
 		{
-			c->Message(0, "Instance does not exist.");
+			c->Message(Chat::White, "Instance does not exist.");
 			return;
 		}
 
@@ -9401,23 +9846,23 @@ void command_instance(Client *c, const Seperator *sep)
 		{
 			if(database.AddClientToInstance(id, charid))
 			{
-				c->Message(0, "Added client to instance.");
+				c->Message(Chat::White, "Added client to instance.");
 			}
 			else
 			{
-				c->Message(0, "Failed to add client to instance.");
+				c->Message(Chat::White, "Failed to add client to instance.");
 			}
 		}
 		else
 		{
-			c->Message(0, "Client was already saved to %u which has uses the same zone and version as that instance.",  cur_id);
+			c->Message(Chat::White, "Client was already saved to %u which has uses the same zone and version as that instance.",  cur_id);
 		}
 	}
 	else if(strcasecmp(sep->arg[1], "remove") == 0)
 	{
 		if(!sep->IsNumber(2))
 		{
-			c->Message(0, "#instance remove instance_id player_name - removes the player 'player_name' from the "
+			c->Message(Chat::White, "#instance remove instance_id player_name - removes the player 'player_name' from the "
 				"instance with id matching instance_id.");
 			return;
 		}
@@ -9427,16 +9872,16 @@ void command_instance(Client *c, const Seperator *sep)
 
 		if(id <= 0 || charid <= 0)
 		{
-			c->Message(0, "Must enter a valid instance id and player name.");
+			c->Message(Chat::White, "Must enter a valid instance id and player name.");
 		}
 
 		if(database.RemoveClientFromInstance(id, charid))
 		{
-			c->Message(0, "Removed client from instance.");
+			c->Message(Chat::White, "Removed client from instance.");
 		}
 		else
 		{
-			c->Message(0, "Failed to remove client from instance.");
+			c->Message(Chat::White, "Failed to remove client from instance.");
 		}
 	}
 	else if(strcasecmp(sep->arg[1], "list") == 0)
@@ -9446,7 +9891,7 @@ void command_instance(Client *c, const Seperator *sep)
 		{
 			if(c->GetTarget() == nullptr || (c->GetTarget() && !c->GetTarget()->IsClient()))
 			{
-				c->Message(0, "Character not found.");
+				c->Message(Chat::White, "Character not found.");
 				return;
 			}
 			else
@@ -9457,16 +9902,16 @@ void command_instance(Client *c, const Seperator *sep)
 	}
 	else
 	{
-		c->Message(0, "Invalid Argument.");
-		c->Message(0, "#instance usage:");
-		c->Message(0, "#instance create zone_id version duration - Creates an instance of version 'version' in the "
+		c->Message(Chat::White, "Invalid Argument.");
+		c->Message(Chat::White, "#instance usage:");
+		c->Message(Chat::White, "#instance create zone_id version duration - Creates an instance of version 'version' in the "
 			"zone with id matching zone_id, will last for duration seconds.");
-		c->Message(0, "#instance destroy instance_id - Destroys the instance with id matching instance_id.");
-		c->Message(0, "#instance add instance_id player_name - adds the player 'player_name' to the instance "
+		c->Message(Chat::White, "#instance destroy instance_id - Destroys the instance with id matching instance_id.");
+		c->Message(Chat::White, "#instance add instance_id player_name - adds the player 'player_name' to the instance "
 			"with id matching instance_id.");
-		c->Message(0, "#instance remove instance_id player_name - removes the player 'player_name' from the "
+		c->Message(Chat::White, "#instance remove instance_id player_name - removes the player 'player_name' from the "
 			"instance with id matching instance_id.");
-		c->Message(0, "#instance list player_name - lists all the instances 'player_name' is apart of.");
+		c->Message(Chat::White, "#instance list player_name - lists all the instances 'player_name' is apart of.");
 		return;
 	}
 }
@@ -9478,8 +9923,8 @@ void command_setstartzone(Client *c, const Seperator *sep)
 	if(c->GetTarget() && c->GetTarget()->IsClient() && sep->arg[1][0] != 0)
 		target = c->GetTarget()->CastToClient();
 	else {
-		c->Message(0, "Usage: (needs PC target) #setstartzone zonename");
-		c->Message(0, "Optional Usage: Use '#setstartzone reset' or '#setstartzone 0' to clear a starting zone. Player can select a starting zone using /setstartcity");
+		c->Message(Chat::White, "Usage: (needs PC target) #setstartzone zonename");
+		c->Message(Chat::White, "Optional Usage: Use '#setstartzone reset' or '#setstartzone 0' to clear a starting zone. Player can select a starting zone using /setstartcity");
 		return;
 	}
 
@@ -9492,7 +9937,7 @@ void command_setstartzone(Client *c, const Seperator *sep)
 	else {
 		startzone = database.GetZoneID(sep->arg[1]);
 		if(startzone == 0) {
-			c->Message(0, "Unable to locate zone '%s'",  sep->arg[1]);
+			c->Message(Chat::White, "Unable to locate zone '%s'",  sep->arg[1]);
 			return;
 		}
 	}
@@ -9508,73 +9953,73 @@ void command_netstats(Client *c, const Seperator *sep)
 		if (c->GetTarget() && c->GetTarget()->IsClient()) {
 			client = c->GetTarget()->CastToClient();
 		}
-		
+
 		if (strcasecmp(sep->arg[1], "reset") == 0) {
 			auto connection = c->Connection();
-			c->Message(0, "Resetting client stats (packet loss will not read correctly after reset).");
+			c->Message(Chat::White, "Resetting client stats (packet loss will not read correctly after reset).");
 			connection->ResetStats();
 			return;
 		}
-		
+
 		auto connection = c->Connection();
 		auto opts = connection->GetManager()->GetOptions();
 		auto eqs_stats = connection->GetStats();
 		auto &stats = eqs_stats.DaybreakStats;
 		auto now = EQ::Net::Clock::now();
 		auto sec_since_stats_reset = std::chrono::duration_cast<std::chrono::duration<double>>(now - stats.created).count();
-		
-		c->Message(0, "Netstats:");
-		c->Message(0, "--------------------------------------------------------------------");
-		c->Message(0, "Sent Bytes: %u (%.2f/sec)", stats.sent_bytes, stats.sent_bytes / sec_since_stats_reset);
-		c->Message(0, "Recv Bytes: %u (%.2f/sec)", stats.recv_bytes, stats.recv_bytes / sec_since_stats_reset);
-		c->Message(0, "Bytes Before Encode (Sent): %u, Compression Rate: %.2f%%", stats.bytes_before_encode, 
+
+		c->Message(Chat::White, "Netstats:");
+		c->Message(Chat::White, "--------------------------------------------------------------------");
+		c->Message(Chat::White, "Sent Bytes: %u (%.2f/sec)", stats.sent_bytes, stats.sent_bytes / sec_since_stats_reset);
+		c->Message(Chat::White, "Recv Bytes: %u (%.2f/sec)", stats.recv_bytes, stats.recv_bytes / sec_since_stats_reset);
+		c->Message(Chat::White, "Bytes Before Encode (Sent): %u, Compression Rate: %.2f%%", stats.bytes_before_encode,
 			static_cast<double>(stats.bytes_before_encode - stats.sent_bytes) / static_cast<double>(stats.bytes_before_encode) * 100.0);
-		c->Message(0, "Bytes After Decode (Recv): %u, Compression Rate: %.2f%%", stats.bytes_after_decode,
+		c->Message(Chat::White, "Bytes After Decode (Recv): %u, Compression Rate: %.2f%%", stats.bytes_after_decode,
 			static_cast<double>(stats.bytes_after_decode - stats.recv_bytes) / static_cast<double>(stats.bytes_after_decode) * 100.0);
-		c->Message(0, "Min Ping: %u", stats.min_ping);
-		c->Message(0, "Max Ping: %u", stats.max_ping);
-		c->Message(0, "Last Ping: %u", stats.last_ping);
-		c->Message(0, "Average Ping: %u", stats.avg_ping);
-		c->Message(0, "--------------------------------------------------------------------");
-		c->Message(0, "(Realtime) Recv Packets: %u (%.2f/sec)", stats.recv_packets, stats.recv_packets / sec_since_stats_reset);
-		c->Message(0, "(Realtime) Sent Packets: %u (%.2f/sec)", stats.sent_packets, stats.sent_packets / sec_since_stats_reset);
-		c->Message(0, "(Sync) Recv Packets: %u", stats.sync_recv_packets);
-		c->Message(0, "(Sync) Sent Packets: %u", stats.sync_sent_packets);
-		c->Message(0, "(Sync) Remote Recv Packets: %u", stats.sync_remote_recv_packets);
-		c->Message(0, "(Sync) Remote Sent Packets: %u", stats.sync_remote_sent_packets);
-		c->Message(0, "Packet Loss In: %.2f%%", 100.0 * (1.0 - static_cast<double>(stats.sync_recv_packets) / static_cast<double>(stats.sync_remote_sent_packets)));
-		c->Message(0, "Packet Loss Out: %.2f%%", 100.0 * (1.0 - static_cast<double>(stats.sync_remote_recv_packets) / static_cast<double>(stats.sync_sent_packets)));
-		c->Message(0, "--------------------------------------------------------------------");
-		c->Message(0, "Resent Packets: %u (%.2f/sec)", stats.resent_packets, stats.resent_packets / sec_since_stats_reset);
-		c->Message(0, "Resent Fragments: %u (%.2f/sec)", stats.resent_fragments, stats.resent_fragments / sec_since_stats_reset);
-		c->Message(0, "Resent Non-Fragments: %u (%.2f/sec)", stats.resent_full, stats.resent_full / sec_since_stats_reset);
-		c->Message(0, "Dropped Datarate Packets: %u (%.2f/sec)", stats.dropped_datarate_packets, stats.dropped_datarate_packets / sec_since_stats_reset);
-		
+		c->Message(Chat::White, "Min Ping: %u", stats.min_ping);
+		c->Message(Chat::White, "Max Ping: %u", stats.max_ping);
+		c->Message(Chat::White, "Last Ping: %u", stats.last_ping);
+		c->Message(Chat::White, "Average Ping: %u", stats.avg_ping);
+		c->Message(Chat::White, "--------------------------------------------------------------------");
+		c->Message(Chat::White, "(Realtime) Recv Packets: %u (%.2f/sec)", stats.recv_packets, stats.recv_packets / sec_since_stats_reset);
+		c->Message(Chat::White, "(Realtime) Sent Packets: %u (%.2f/sec)", stats.sent_packets, stats.sent_packets / sec_since_stats_reset);
+		c->Message(Chat::White, "(Sync) Recv Packets: %u", stats.sync_recv_packets);
+		c->Message(Chat::White, "(Sync) Sent Packets: %u", stats.sync_sent_packets);
+		c->Message(Chat::White, "(Sync) Remote Recv Packets: %u", stats.sync_remote_recv_packets);
+		c->Message(Chat::White, "(Sync) Remote Sent Packets: %u", stats.sync_remote_sent_packets);
+		c->Message(Chat::White, "Packet Loss In: %.2f%%", 100.0 * (1.0 - static_cast<double>(stats.sync_recv_packets) / static_cast<double>(stats.sync_remote_sent_packets)));
+		c->Message(Chat::White, "Packet Loss Out: %.2f%%", 100.0 * (1.0 - static_cast<double>(stats.sync_remote_recv_packets) / static_cast<double>(stats.sync_sent_packets)));
+		c->Message(Chat::White, "--------------------------------------------------------------------");
+		c->Message(Chat::White, "Resent Packets: %u (%.2f/sec)", stats.resent_packets, stats.resent_packets / sec_since_stats_reset);
+		c->Message(Chat::White, "Resent Fragments: %u (%.2f/sec)", stats.resent_fragments, stats.resent_fragments / sec_since_stats_reset);
+		c->Message(Chat::White, "Resent Non-Fragments: %u (%.2f/sec)", stats.resent_full, stats.resent_full / sec_since_stats_reset);
+		c->Message(Chat::White, "Dropped Datarate Packets: %u (%.2f/sec)", stats.dropped_datarate_packets, stats.dropped_datarate_packets / sec_since_stats_reset);
+
 		if (opts.daybreak_options.outgoing_data_rate > 0.0) {
-			c->Message(0, "Outgoing Link Saturation %.2f%% (%.2fkb/sec)", 100.0 * (1.0 - ((opts.daybreak_options.outgoing_data_rate - stats.datarate_remaining) / opts.daybreak_options.outgoing_data_rate)), opts.daybreak_options.outgoing_data_rate);
+			c->Message(Chat::White, "Outgoing Link Saturation %.2f%% (%.2fkb/sec)", 100.0 * (1.0 - ((opts.daybreak_options.outgoing_data_rate - stats.datarate_remaining) / opts.daybreak_options.outgoing_data_rate)), opts.daybreak_options.outgoing_data_rate);
 		}
-		
+
 		if (strcasecmp(sep->arg[1], "full") == 0) {
-			c->Message(0, "--------------------------------------------------------------------");
-			c->Message(0, "Sent Packet Types");
+			c->Message(Chat::White, "--------------------------------------------------------------------");
+			c->Message(Chat::White, "Sent Packet Types");
 			for (auto i = 0; i < _maxEmuOpcode; ++i) {
 				auto cnt = eqs_stats.SentCount[i];
 				if (cnt > 0) {
-					c->Message(0, "%s: %u (%.2f / sec)", OpcodeNames[i], cnt, cnt / sec_since_stats_reset);
+					c->Message(Chat::White, "%s: %u (%.2f / sec)", OpcodeNames[i], cnt, cnt / sec_since_stats_reset);
 				}
 			}
 
-			c->Message(0, "--------------------------------------------------------------------");
-			c->Message(0, "Recv Packet Types");
+			c->Message(Chat::White, "--------------------------------------------------------------------");
+			c->Message(Chat::White, "Recv Packet Types");
 			for (auto i = 0; i < _maxEmuOpcode; ++i) {
 				auto cnt = eqs_stats.RecvCount[i];
 				if (cnt > 0) {
-					c->Message(0, "%s: %u (%.2f / sec)", OpcodeNames[i], cnt, cnt / sec_since_stats_reset);
+					c->Message(Chat::White, "%s: %u (%.2f / sec)", OpcodeNames[i], cnt, cnt / sec_since_stats_reset);
 				}
 			}
 		}
-		
-		c->Message(0, "--------------------------------------------------------------------");
+
+		c->Message(Chat::White, "--------------------------------------------------------------------");
 	}
 }
 
@@ -9587,7 +10032,7 @@ void command_object(Client *c, const Seperator *sep)
 	const char *usage_string = "Usage: #object List|Add|Edit|Move|Rotate|Save|Copy|Delete|Undo";
 
 	if ((!sep) || (sep->argnum == 0)) {
-		c->Message(0, usage_string);
+		c->Message(Chat::White, usage_string);
 		return;
 	}
 
@@ -9620,7 +10065,7 @@ void command_object(Client *c, const Seperator *sep)
 		// Insufficient or invalid args
 		if ((sep->argnum < 2) || (sep->arg[2][0] < '0') ||
 		    ((sep->arg[2][0] > '9') && ((sep->arg[2][0] & 0xDF) != 'A'))) {
-			c->Message(0, "Usage: #object List All|(radius)");
+			c->Message(Chat::White, "Usage: #object List All|(radius)");
 			return;
 		}
 
@@ -9630,9 +10075,9 @@ void command_object(Client *c, const Seperator *sep)
 			radius = 500; // Invalid radius. Default to 500 units.
 
 		if (radius == 0)
-			c->Message(0, "Objects within this zone:");
+			c->Message(Chat::White, "Objects within this zone:");
 		else
-			c->Message(0, "Objects within %u units of your current location:", radius);
+			c->Message(Chat::White, "Objects within %u units of your current location:", radius);
 
 		std::string query;
 		if (radius)
@@ -9657,7 +10102,7 @@ void command_object(Client *c, const Seperator *sep)
 
 		auto results = database.QueryDatabase(query);
 		if (!results.Success()) {
-			c->Message(0, "Error in objects query");
+			c->Message(Chat::White, "Error in objects query");
 			return;
 		}
 
@@ -9684,27 +10129,27 @@ void command_object(Client *c, const Seperator *sep)
 				if (od.size == 0) // Unknown08 field is optional Size parameter for static objects
 					od.size = 100; // Static object default Size is 100%
 
-				c->Message(0, "- STATIC Object (%s): id %u, x %.1f, y %.1f, z %.1f, h %.1f, model %s, "
+				c->Message(Chat::White, "- STATIC Object (%s): id %u, x %.1f, y %.1f, z %.1f, h %.1f, model %s, "
 					      "size %u, solidtype %u, incline %u",
 					   (od.object_type == 0) ? "locked" : "unlocked", id, od.x, od.y, od.z,
 					   od.heading, od.object_name, od.size, od.solidtype, od.unknown020);
 				break;
 
 			case OT_DROPPEDITEM: // Ground Spawn
-				c->Message(0, "- TEMPORARY Object: id %u, x %.1f, y %.1f, z %.1f, h %.1f, itemid %u, "
+				c->Message(Chat::White, "- TEMPORARY Object: id %u, x %.1f, y %.1f, z %.1f, h %.1f, itemid %u, "
 					      "model %s, icon %u",
 					   id, od.x, od.y, od.z, od.heading, itemid, od.object_name, icon);
 				break;
 
 			default: // All others == Tradeskill Objects
-				c->Message(0, "- TRADESKILL Object: id %u, x %.1f, y %.1f, z %.1f, h %.1f, model %s, "
+				c->Message(Chat::White, "- TRADESKILL Object: id %u, x %.1f, y %.1f, z %.1f, h %.1f, model %s, "
 					      "type %u, icon %u",
 					   id, od.x, od.y, od.z, od.heading, od.object_name, od.object_type, icon);
 				break;
 			}
 		}
 
-		c->Message(0, "%u object%s found", results.RowCount(), (results.RowCount() == 1) ? "" : "s");
+		c->Message(Chat::White, "%u object%s found", results.RowCount(), (results.RowCount() == 1) ? "" : "s");
 		return;
 	}
 
@@ -9712,10 +10157,10 @@ void command_object(Client *c, const Seperator *sep)
 		// Insufficient or invalid arguments
 		if ((sep->argnum < 3) ||
 		    ((sep->arg[3][0] == '\0') && (sep->arg[4][0] < '0') && (sep->arg[4][0] > '9'))) {
-			c->Message(0, "Usage: (Static Object): #object Add [ObjectID] 0 Model [SizePercent] "
+			c->Message(Chat::White, "Usage: (Static Object): #object Add [ObjectID] 0 Model [SizePercent] "
 				      "[SolidType] [Incline]");
-			c->Message(0, "Usage: (Tradeskill Object): #object Add [ObjectID] TypeNum Model Icon");
-			c->Message(0, "- Notes: Model must start with a letter, max length 16. SolidTypes = 0 (Solid), "
+			c->Message(Chat::White, "Usage: (Tradeskill Object): #object Add [ObjectID] TypeNum Model Icon");
+			c->Message(Chat::White, "- Notes: Model must start with a letter, max length 16. SolidTypes = 0 (Solid), "
 				      "1 (Sometimes Non-Solid)");
 			return;
 		}
@@ -9757,7 +10202,7 @@ void command_object(Client *c, const Seperator *sep)
 			break;
 
 		case 1: // Ground Spawn
-			c->Message(0, "ERROR: Object Type 1 is used for temporarily spawned ground spawns and dropped "
+			c->Message(Chat::White, "ERROR: Object Type 1 is used for temporarily spawned ground spawns and dropped "
 				      "items, which are not supported with #object. See the 'ground_spawns' table in "
 				      "the database.");
 			return;
@@ -9766,7 +10211,7 @@ void command_object(Client *c, const Seperator *sep)
 			icon = ((sep->argnum - col) > 3) ? atoi(sep->arg[4 + col]) : 0;
 
 			if (icon == 0) {
-				c->Message(0, "ERROR: Required property 'Icon' not specified for Tradeskill Object");
+				c->Message(Chat::White, "ERROR: Required property 'Icon' not specified for Tradeskill Object");
 				return;
 			}
 
@@ -9795,7 +10240,7 @@ void command_object(Client *c, const Seperator *sep)
 				id = 0;
 
 			if (id == 0) {
-				c->Message(0, "ERROR: An object already exists with the id %u", atoi(sep->arg[2]));
+				c->Message(Chat::White, "ERROR: An object already exists with the id %u", atoi(sep->arg[2]));
 				return;
 			}
 		}
@@ -9823,7 +10268,7 @@ void command_object(Client *c, const Seperator *sep)
 			objectsFound = 1;
 
 		if (objectsFound) {
-			c->Message(0, "ERROR: Object already at this location.");
+			c->Message(Chat::White, "ERROR: Object already at this location.");
 			return;
 		}
 
@@ -9844,7 +10289,7 @@ void command_object(Client *c, const Seperator *sep)
 		strupr(od.object_name); // Model names are always upper-case.
 
 		if ((od.object_name[0] < 'A') || (od.object_name[0] > 'Z')) {
-			c->Message(0, "ERROR: Model name must start with a letter.");
+			c->Message(Chat::White, "ERROR: Model name must start with a letter.");
 			return;
 		}
 
@@ -9885,13 +10330,13 @@ void command_object(Client *c, const Seperator *sep)
 		y2 = 10.0f * cos(c->GetHeading() / 256.0f * 3.14159265f);
 		c->MovePC(c->GetX() - x2, c->GetY() - y2, c->GetZ(), c->GetHeading());
 
-		c->Message(0, "Spawning object with tentative id %u at location (%.1f, %.1f, %.1f heading %.1f). Use "
+		c->Message(Chat::White, "Spawning object with tentative id %u at location (%.1f, %.1f, %.1f heading %.1f). Use "
 			      "'#object Save' to save to database when satisfied with placement.",
 			   id, od.x, od.y, od.z, od.heading);
 
 		// Temporary Static Object
 		if (od.object_type == staticType)
-			c->Message(0, "- Note: Static Object will act like a tradeskill container and will not reflect "
+			c->Message(Chat::White, "- Note: Static Object will act like a tradeskill container and will not reflect "
 				      "size, solidtype, or incline values until you commit with '#object Save', after "
 				      "which it will be unchangeable until you use '#object Edit' and zone back in.");
 
@@ -9901,9 +10346,9 @@ void command_object(Client *c, const Seperator *sep)
 	if (strcasecmp(sep->arg[1], "edit") == 0) {
 
 		if ((sep->argnum < 2) || ((id = atoi(sep->arg[2])) < 1)) {
-			c->Message(0, "Usage: #object Edit (ObjectID) [PropertyName] [NewValue]");
-			c->Message(0, "- Static Object (Type 0) Properties: model, type, size, solidtype, incline");
-			c->Message(0, "- Tradeskill Object (Type 2+) Properties: model, type, icon");
+			c->Message(Chat::White, "Usage: #object Edit (ObjectID) [PropertyName] [NewValue]");
+			c->Message(Chat::White, "- Static Object (Type 0) Properties: model, type, size, solidtype, incline");
+			c->Message(Chat::White, "- Tradeskill Object (Type 2+) Properties: model, type, icon");
 
 			return;
 		}
@@ -9915,7 +10360,7 @@ void command_object(Client *c, const Seperator *sep)
 			// Yep, looks like we can make real-time changes.
 			if (sep->argnum < 4) {
 				// Or not. '#object Edit (ObjectID)' called without PropertyName and NewValue
-				c->Message(0, "Note: Object %u already unlocked and ready for changes", id);
+				c->Message(Chat::White, "Note: Object %u already unlocked and ready for changes", id);
 				return;
 			}
 		} else {
@@ -9923,7 +10368,7 @@ void command_object(Client *c, const Seperator *sep)
 			std::string query = StringFormat("SELECT zoneid, version, type FROM object WHERE id = %u", id);
 			auto results = database.QueryDatabase(query);
 			if (!results.Success() || results.RowCount() == 0) {
-				c->Message(0, "ERROR: Object %u not found", id);
+				c->Message(Chat::White, "ERROR: Object %u not found", id);
 				return;
 			}
 
@@ -9935,13 +10380,13 @@ void command_object(Client *c, const Seperator *sep)
 
 			// Object not in this zone?
 			if (od.zone_id != zone->GetZoneID()) {
-				c->Message(0, "ERROR: Object %u not in this zone.", id);
+				c->Message(Chat::White, "ERROR: Object %u not in this zone.", id);
 				return;
 			}
 
 			// Object not in this instance?
 			if (od.zone_instance != zone->GetInstanceVersion()) {
-				c->Message(0, "ERROR: Object %u not part of this instance version.", id);
+				c->Message(Chat::White, "ERROR: Object %u not part of this instance version.", id);
 				return;
 			}
 
@@ -9952,23 +10397,23 @@ void command_object(Client *c, const Seperator *sep)
 
 				database.QueryDatabase(query);
 
-				c->Message(0, "Static Object %u unlocked for editing. You must zone out and back in to "
+				c->Message(Chat::White, "Static Object %u unlocked for editing. You must zone out and back in to "
 					      "make your changes, then commit them with '#object Save'.",
 					   id);
 				if (sep->argnum >= 4)
-					c->Message(0, "NOTE: The change you specified has not been applied, since the "
+					c->Message(Chat::White, "NOTE: The change you specified has not been applied, since the "
 						      "static object had not been unlocked for editing yet.");
 				return;
 
 			case OT_DROPPEDITEM:
-				c->Message(0, "ERROR: Object %u is a temporarily spawned ground spawn or dropped item, "
+				c->Message(Chat::White, "ERROR: Object %u is a temporarily spawned ground spawn or dropped item, "
 					      "which cannot be manipulated with #object. See the 'ground_spawns' table "
 					      "in the database.",
 					   id);
 				return;
 
 			case staticType:
-				c->Message(0, "ERROR: Object %u has been unlocked for editing, but you must zone out "
+				c->Message(Chat::White, "ERROR: Object %u has been unlocked for editing, but you must zone out "
 					      "and back in for your client to refresh its object table before you can "
 					      "make changes to it.",
 					   id);
@@ -9976,7 +10421,7 @@ void command_object(Client *c, const Seperator *sep)
 
 			default:
 				// Unknown error preventing us from seeing the object in the zone.
-				c->Message(0, "ERROR: Unknown problem attempting to manipulate object %u", id);
+				c->Message(Chat::White, "ERROR: Unknown problem attempting to manipulate object %u", id);
 				return;
 			}
 		}
@@ -9993,7 +10438,7 @@ void command_object(Client *c, const Seperator *sep)
 		if (strcmp(sep->arg[3], "model") == 0) {
 
 			if ((sep->arg[4][0] < 'A') || (sep->arg[4][0] > 'Z')) {
-				c->Message(0, "ERROR: Model names must begin with a letter.");
+				c->Message(Chat::White, "ERROR: Model names must begin with a letter.");
 				return;
 			}
 
@@ -10001,10 +10446,10 @@ void command_object(Client *c, const Seperator *sep)
 
 			o->SetObjectData(&od);
 
-			c->Message(0, "Object %u now being rendered with model '%s'", id, od.object_name);
+			c->Message(Chat::White, "Object %u now being rendered with model '%s'", id, od.object_name);
 		} else if (strcmp(sep->arg[3], "type") == 0) {
 			if ((sep->arg[4][0] < '0') || (sep->arg[4][0] > '9')) {
-				c->Message(0, "ERROR: Invalid type number");
+				c->Message(Chat::White, "ERROR: Invalid type number");
 				return;
 			}
 
@@ -10014,20 +10459,20 @@ void command_object(Client *c, const Seperator *sep)
 			case 0:
 				// Convert Static Object to temporary changeable type
 				od.object_type = staticType;
-				c->Message(0, "Note: Static Object will still act like tradeskill object and will not "
+				c->Message(Chat::White, "Note: Static Object will still act like tradeskill object and will not "
 					      "reflect size, solidtype, or incline settings until committed to the "
 					      "database with '#object Save', after which it will be unchangeable until "
 					      "it is unlocked again with '#object Edit'.");
 				break;
 
 			case OT_DROPPEDITEM:
-				c->Message(0, "ERROR: Object Type 1 is used for temporarily spawned ground spawns and "
+				c->Message(Chat::White, "ERROR: Object Type 1 is used for temporarily spawned ground spawns and "
 					      "dropped items, which are not supported with #object. See the "
 					      "'ground_spawns' table in the database.");
 				return;
 
 			default:
-				c->Message(0, "Object %u changed to Tradeskill Object Type %u", id, od.object_type);
+				c->Message(Chat::White, "Object %u changed to Tradeskill Object Type %u", id, od.object_type);
 				break;
 			}
 
@@ -10041,7 +10486,7 @@ void command_object(Client *c, const Seperator *sep)
 			}
 
 			if ((sep->arg[4][0] < '0') || (sep->arg[4][0] > '9')) {
-				c->Message(0, "ERROR: Invalid size specified. Please enter a number.");
+				c->Message(Chat::White, "ERROR: Invalid size specified. Please enter a number.");
 				return;
 			}
 
@@ -10051,47 +10496,47 @@ void command_object(Client *c, const Seperator *sep)
 			if (od.size == 0) // 0 == unspecified == 100%
 				od.size = 100;
 
-			c->Message(0, "Static Object %u set to %u%% size. Size will take effect when you commit to the "
+			c->Message(Chat::White, "Static Object %u set to %u%% size. Size will take effect when you commit to the "
 				      "database with '#object Save', after which the object will be unchangeable until "
 				      "you unlock it again with '#object Edit' and zone out and back in.",
 				   id, od.size);
 		} else if (strcmp(sep->arg[3], "solidtype") == 0) {
 
 			if (od.object_type != staticType) {
-				c->Message(0, "ERROR: Object %u is not a Static Object and does not support the "
+				c->Message(Chat::White, "ERROR: Object %u is not a Static Object and does not support the "
 					      "SolidType property",
 					   id);
 				return;
 			}
 
 			if ((sep->arg[4][0] < '0') || (sep->arg[4][0] > '9')) {
-				c->Message(0, "ERROR: Invalid solidtype specified. Please enter a number.");
+				c->Message(Chat::White, "ERROR: Invalid solidtype specified. Please enter a number.");
 				return;
 			}
 
 			od.solidtype = atoi(sep->arg[4]);
 			o->SetObjectData(&od);
 
-			c->Message(0, "Static Object %u set to SolidType %u. Change will take effect when you commit "
+			c->Message(Chat::White, "Static Object %u set to SolidType %u. Change will take effect when you commit "
 				      "to the database with '#object Save'. Support for this property is on a "
 				      "per-model basis, mostly seen in smaller objects such as chests and tables.",
 					  id, od.solidtype);
 		} else if (strcmp(sep->arg[3], "icon") == 0) {
 
 			if ((od.object_type < 2) || (od.object_type == staticType)) {
-				c->Message(0, "ERROR: Object %u is not a Tradeskill Object and does not support the "
+				c->Message(Chat::White, "ERROR: Object %u is not a Tradeskill Object and does not support the "
 					      "Icon property",
 					   id);
 				return;
 			}
 
 			if ((icon = atoi(sep->arg[4])) == 0) {
-				c->Message(0, "ERROR: Invalid Icon specified. Please enter an icon number.");
+				c->Message(Chat::White, "ERROR: Invalid Icon specified. Please enter an icon number.");
 				return;
 			}
 
 			o->SetIcon(icon);
-			c->Message(0, "Tradeskill Object %u icon set to %u", id, icon);
+			c->Message(Chat::White, "Tradeskill Object %u icon set to %u", id, icon);
 		} else if (strcmp(sep->arg[3], "incline") == 0) {
 			if (od.object_type != staticType) {
 				c->Message(
@@ -10111,12 +10556,12 @@ void command_object(Client *c, const Seperator *sep)
 			od.unknown020 = atoi(sep->arg[4]);
 			o->SetObjectData(&od);
 
-			c->Message(0, "Static Object %u set to %u incline. Incline will take effect when you commit to "
+			c->Message(Chat::White, "Static Object %u set to %u incline. Incline will take effect when you commit to "
 				      "the database with '#object Save', after which the object will be unchangeable "
 				      "until you unlock it again with '#object Edit' and zone out and back in.",
 				   id, od.unknown020);
 		} else {
-			c->Message(0, "ERROR: Unrecognized property name: %s", sep->arg[3]);
+			c->Message(Chat::White, "ERROR: Unrecognized property name: %s", sep->arg[3]);
 			return;
 		}
 
@@ -10139,7 +10584,7 @@ void command_object(Client *c, const Seperator *sep)
 		    ((id = atoi(sep->arg[2])) == 0) || // ID not specified
 		    (((sep->arg[3][0] < '0') || (sep->arg[3][0] > '9')) && ((sep->arg[3][0] & 0xDF) != 'T') &&
 		     (sep->arg[3][0] != '-') && (sep->arg[3][0] != '.'))) { // Location argument not specified correctly
-			c->Message(0, "Usage: #object Move (ObjectID) ToMe|(x y z [h])");
+			c->Message(Chat::White, "Usage: #object Move (ObjectID) ToMe|(x y z [h])");
 			return;
 		}
 
@@ -10147,7 +10592,7 @@ void command_object(Client *c, const Seperator *sep)
 			std::string query = StringFormat("SELECT zoneid, version, type FROM object WHERE id = %u", id);
 			auto results = database.QueryDatabase(query);
 			if (!results.Success() || results.RowCount() == 0) {
-				c->Message(0, "ERROR: Object %u not found", id);
+				c->Message(Chat::White, "ERROR: Object %u not found", id);
 				return;
 			}
 
@@ -10157,38 +10602,38 @@ void command_object(Client *c, const Seperator *sep)
 			od.object_type = atoi(row[2]);
 
 			if (od.zone_id != zone->GetZoneID()) {
-				c->Message(0, "ERROR: Object %u is not in this zone", id);
+				c->Message(Chat::White, "ERROR: Object %u is not in this zone", id);
 				return;
 			}
 
 			if (od.zone_instance != zone->GetInstanceVersion()) {
-				c->Message(0, "ERROR: Object %u is not in this instance version", id);
+				c->Message(Chat::White, "ERROR: Object %u is not in this instance version", id);
 				return;
 			}
 
 			switch (od.object_type) {
 			case 0:
-				c->Message(0, "ERROR: Object %u is not yet unlocked for editing. Use '#object Edit' "
+				c->Message(Chat::White, "ERROR: Object %u is not yet unlocked for editing. Use '#object Edit' "
 					      "then zone out and back in to move it.",
 					   id);
 				return;
 
 			case staticType:
-				c->Message(0, "ERROR: Object %u has been unlocked for editing, but you must zone out "
+				c->Message(Chat::White, "ERROR: Object %u has been unlocked for editing, but you must zone out "
 					      "and back in before your client sees the change and will allow you to "
 					      "move it.",
 					   id);
 				return;
 
 			case 1:
-				c->Message(0, "ERROR: Object %u is a temporary spawned object and cannot be "
+				c->Message(Chat::White, "ERROR: Object %u is a temporary spawned object and cannot be "
 					      "manipulated with #object. See the 'ground_spawns' table in the "
 					      "database.",
 					   id);
 				return;
 
 			default:
-				c->Message(0, "ERROR: Object %u not located in zone.", id);
+				c->Message(Chat::White, "ERROR: Object %u not located in zone.", id);
 				return;
 			}
 		}
@@ -10243,12 +10688,12 @@ void command_object(Client *c, const Seperator *sep)
 	if (strcasecmp(sep->arg[1], "rotate") == 0) {
 		// Insufficient or invalid arguments
 		if ((sep->argnum < 3) || ((id = atoi(sep->arg[2])) == 0)) {
-			c->Message(0, "Usage: #object Rotate (ObjectID) (Heading, 0-512)");
+			c->Message(Chat::White, "Usage: #object Rotate (ObjectID) (Heading, 0-512)");
 			return;
 		}
 
 		if ((o = entity_list.FindObject(id)) == nullptr) {
-			c->Message(0, "ERROR: Object %u not found in zone, or is a static object not yet unlocked with "
+			c->Message(Chat::White, "ERROR: Object %u not found in zone, or is a static object not yet unlocked with "
 				      "'#object Edit' for editing.",
 				   id);
 			return;
@@ -10272,7 +10717,7 @@ void command_object(Client *c, const Seperator *sep)
 	if (strcasecmp(sep->arg[1], "save") == 0) {
 		// Insufficient or invalid arguments
 		if ((sep->argnum < 2) || ((id = atoi(sep->arg[2])) == 0)) {
-			c->Message(0, "Usage: #object Save (ObjectID)");
+			c->Message(Chat::White, "Usage: #object Save (ObjectID)");
 			return;
 		}
 
@@ -10300,36 +10745,36 @@ void command_object(Client *c, const Seperator *sep)
 			// Object not found in zone. Can't save an object we can't see.
 
 			if (bNewObject) {
-				c->Message(0, "ERROR: Object %u not found", id);
+				c->Message(Chat::White, "ERROR: Object %u not found", id);
 				return;
 			}
 
 			if (od.zone_id != zone->GetZoneID()) {
-				c->Message(0, "ERROR: Wrong Object ID. %u is not part of this zone.", id);
+				c->Message(Chat::White, "ERROR: Wrong Object ID. %u is not part of this zone.", id);
 				return;
 			}
 
 			if (od.zone_instance != zone->GetInstanceVersion()) {
-				c->Message(0, "ERROR: Wrong Object ID. %u is not part of this instance version.", id);
+				c->Message(Chat::White, "ERROR: Wrong Object ID. %u is not part of this instance version.", id);
 				return;
 			}
 
 			if (od.object_type == 0) {
-				c->Message(0, "ERROR: Static Object %u has already been committed. Use '#object Edit "
+				c->Message(Chat::White, "ERROR: Static Object %u has already been committed. Use '#object Edit "
 					      "%u' and zone out and back in to make changes.",
 					   id, id);
 				return;
 			}
 
 			if (od.object_type == 1) {
-				c->Message(0, "ERROR: Object %u is a temporarily spawned ground spawn or dropped item, "
+				c->Message(Chat::White, "ERROR: Object %u is a temporarily spawned ground spawn or dropped item, "
 					      "which is not supported with #object. See the 'ground_spawns' table in "
 					      "the database.",
 					   id);
 				return;
 			}
 
-			c->Message(0, "ERROR: Object %u not found.", id);
+			c->Message(Chat::White, "ERROR: Object %u not found.", id);
 			return;
 		}
 
@@ -10382,28 +10827,28 @@ void command_object(Client *c, const Seperator *sep)
 
 		results = database.QueryDatabase(query);
 		if (!results.Success()) {
-			c->Message(0, "Database Error: %s", results.ErrorMessage().c_str());
+			c->Message(Chat::White, "Database Error: %s", results.ErrorMessage().c_str());
 			return;
 		}
 
 		if (results.RowsAffected() == 0) {
 			// No change made, but no error message given
-			c->Message(0, "Database Error: Could not save change to Object %u", id);
+			c->Message(Chat::White, "Database Error: Could not save change to Object %u", id);
 			return;
 		}
 
 		if (bNewObject) {
 			if (newid == results.LastInsertedID()) {
-				c->Message(0, "Saved new Object %u to database", id);
+				c->Message(Chat::White, "Saved new Object %u to database", id);
 				return;
 			}
 
-			c->Message(0, "Saved Object. NOTE: Database returned a new ID number for object: %u", newid);
+			c->Message(Chat::White, "Saved Object. NOTE: Database returned a new ID number for object: %u", newid);
 			id = newid;
 			return;
 		}
 
-		c->Message(0, "Saved changes to Object %u", id);
+		c->Message(Chat::White, "Saved changes to Object %u", id);
 		newid = id;
 
 		if (od.object_type == 0) {
@@ -10477,7 +10922,7 @@ void command_object(Client *c, const Seperator *sep)
 			entity_list.QueueClients(0, app);
 			safe_delete(app);
 
-			c->Message(0, "NOTE: Object %u is now a static object, and is unchangeable. To make future "
+			c->Message(Chat::White, "NOTE: Object %u is now a static object, and is unchangeable. To make future "
 				      "changes, use '#object Edit' to convert it to a changeable form, then zone out "
 				      "and back in.",
 				   id);
@@ -10489,15 +10934,15 @@ void command_object(Client *c, const Seperator *sep)
 		// Insufficient or invalid arguments
 		if ((sep->argnum < 3) ||
 		    (((sep->arg[2][0] & 0xDF) != 'A') && ((sep->arg[2][0] < '0') || (sep->arg[2][0] > '9')))) {
-			c->Message(0, "Usage: #object Copy All|(ObjectID) (InstanceVersion)");
-			c->Message(0, "- Note: Only objects saved in the database can be copied to another instance.");
+			c->Message(Chat::White, "Usage: #object Copy All|(ObjectID) (InstanceVersion)");
+			c->Message(Chat::White, "- Note: Only objects saved in the database can be copied to another instance.");
 			return;
 		}
 
 		od.zone_instance = atoi(sep->arg[3]);
 
 		if (od.zone_instance == zone->GetInstanceVersion()) {
-			c->Message(0, "ERROR: Source and destination instance versions are the same.");
+			c->Message(Chat::White, "ERROR: Source and destination instance versions are the same.");
 			return;
 		}
 
@@ -10514,11 +10959,11 @@ void command_object(Client *c, const Seperator *sep)
 					 od.zone_instance, zone->GetZoneID(), zone->GetInstanceVersion());
 			auto results = database.QueryDatabase(query);
 			if (!results.Success()) {
-				c->Message(0, "Database Error: %s", results.ErrorMessage().c_str());
+				c->Message(Chat::White, "Database Error: %s", results.ErrorMessage().c_str());
 				return;
 			}
 
-			c->Message(0, "Copied %u object%s into instance version %u", results.RowCount(),
+			c->Message(Chat::White, "Copied %u object%s into instance version %u", results.RowCount(),
 				   (results.RowCount() == 1) ? "" : "s", od.zone_instance);
 			return;
 		}
@@ -10534,7 +10979,7 @@ void command_object(Client *c, const Seperator *sep)
 						 od.zone_instance, id, zone->GetZoneID(), zone->GetInstanceVersion());
 		auto results = database.QueryDatabase(query);
 		if (results.Success() && results.RowsAffected() > 0) {
-			c->Message(0, "Copied Object %u into instance version %u", id, od.zone_instance);
+			c->Message(Chat::White, "Copied Object %u into instance version %u", id, od.zone_instance);
 			return;
 		}
 
@@ -10542,7 +10987,7 @@ void command_object(Client *c, const Seperator *sep)
 
 		// got an error message
 		if (!results.Success()) {
-			c->Message(0, "Database Error: %s", results.ErrorMessage().c_str());
+			c->Message(Chat::White, "Database Error: %s", results.ErrorMessage().c_str());
 			return;
 		}
 
@@ -10554,25 +10999,25 @@ void command_object(Client *c, const Seperator *sep)
 			return;
 
 		if (results.RowCount() == 0) {
-			c->Message(0, "ERROR: Object %u not found", id);
+			c->Message(Chat::White, "ERROR: Object %u not found", id);
 			return;
 		}
 
 		auto row = results.begin();
 		// Wrong ZoneID?
 		if (atoi(row[0]) != zone->GetZoneID()) {
-			c->Message(0, "ERROR: Object %u is not part of this zone.", id);
+			c->Message(Chat::White, "ERROR: Object %u is not part of this zone.", id);
 			return;
 		}
 
 		// Wrong Instance Version?
 		if (atoi(row[1]) != zone->GetInstanceVersion()) {
-			c->Message(0, "ERROR: Object %u is not part of this instance version.", id);
+			c->Message(Chat::White, "ERROR: Object %u is not part of this instance version.", id);
 			return;
 		}
 
 		// Well, NO clue at this point. Just let 'em know something screwed up.
-		c->Message(0, "ERROR: Unknown database error copying Object %u to instance version %u", id,
+		c->Message(Chat::White, "ERROR: Unknown database error copying Object %u to instance version %u", id,
 			   od.zone_instance);
 		return;
 	}
@@ -10580,7 +11025,7 @@ void command_object(Client *c, const Seperator *sep)
 	if (strcasecmp(sep->arg[1], "delete") == 0) {
 
 		if ((sep->argnum < 2) || ((id = atoi(sep->arg[2])) <= 0)) {
-			c->Message(0, "Usage: #object Delete (ObjectID) -- NOTE: Object deletions are permanent and "
+			c->Message(Chat::White, "Usage: #object Delete (ObjectID) -- NOTE: Object deletions are permanent and "
 				      "cannot be undone!");
 			return;
 		}
@@ -10604,7 +11049,7 @@ void command_object(Client *c, const Seperator *sep)
 							 id, zone->GetZoneID(), zone->GetInstanceVersion());
 			auto results = database.QueryDatabase(query);
 
-			c->Message(0, "Object %u deleted", id);
+			c->Message(Chat::White, "Object %u deleted", id);
 			return;
 		}
 
@@ -10618,7 +11063,7 @@ void command_object(Client *c, const Seperator *sep)
 			return;
 
 		if (results.RowCount() == 0) {
-			c->Message(0, "ERROR: Object %u not found in this zone or instance!", id);
+			c->Message(Chat::White, "ERROR: Object %u not found in this zone or instance!", id);
 			return;
 		}
 
@@ -10631,13 +11076,13 @@ void command_object(Client *c, const Seperator *sep)
 					     id, zone->GetZoneID(), zone->GetInstanceVersion());
 			results = database.QueryDatabase(query);
 
-			c->Message(0, "Object %u deleted. NOTE: This static object will remain for anyone currently in "
+			c->Message(Chat::White, "Object %u deleted. NOTE: This static object will remain for anyone currently in "
 				      "the zone until they next zone out and in.",
 				   id);
 			return;
 
 		case 1: // Temporary Spawn
-			c->Message(0, "ERROR: Object %u is a temporarily spawned ground spawn or dropped item, which "
+			c->Message(Chat::White, "ERROR: Object %u is a temporarily spawned ground spawn or dropped item, which "
 				      "is not supported with #object. See the 'ground_spawns' table in the database.",
 				   id);
 			return;
@@ -10649,7 +11094,7 @@ void command_object(Client *c, const Seperator *sep)
 	if (strcasecmp(sep->arg[1], "undo") == 0) {
 		// Insufficient or invalid arguments
 		if ((sep->argnum < 2) || ((id = atoi(sep->arg[2])) == 0)) {
-			c->Message(0, "Usage: #object Undo (ObjectID) -- Reload object from database, undoing any "
+			c->Message(Chat::White, "Usage: #object Undo (ObjectID) -- Reload object from database, undoing any "
 				      "changes you have made");
 			return;
 		}
@@ -10657,13 +11102,13 @@ void command_object(Client *c, const Seperator *sep)
 		o = entity_list.FindObject(id);
 
 		if (!o) {
-			c->Message(0, "ERROR: Object %u not found in zone in a manipulable form. No changes to undo.",
+			c->Message(Chat::White, "ERROR: Object %u not found in zone in a manipulable form. No changes to undo.",
 				   id);
 			return;
 		}
 
 		if (o->GetType() == OT_DROPPEDITEM) {
-			c->Message(0, "ERROR: Object %u is a temporary spawned item and cannot be manipulated with "
+			c->Message(Chat::White, "ERROR: Object %u is a temporary spawned item and cannot be manipulated with "
 				      "#object. See the 'ground_spawns' table in the database.",
 				   id);
 			return;
@@ -10683,7 +11128,7 @@ void command_object(Client *c, const Seperator *sep)
 						 id);
 		auto results = database.QueryDatabase(query);
 		if (!results.Success() || results.RowCount() == 0) {
-			c->Message(0, "Database Error: %s", results.ErrorMessage().c_str());
+			c->Message(Chat::White, "Database Error: %s", results.ErrorMessage().c_str());
 			return;
 		}
 
@@ -10708,11 +11153,11 @@ void command_object(Client *c, const Seperator *sep)
 		o = new Object(id, od.object_type, icon, od, nullptr);
 		entity_list.AddObject(o, true);
 
-		c->Message(0, "Object %u reloaded from database.", id);
+		c->Message(Chat::White, "Object %u reloaded from database.", id);
 		return;
 	}
 
-	c->Message(0, usage_string);
+	c->Message(Chat::White, usage_string);
 }
 
 void command_showspellslist(Client *c, const Seperator *sep)
@@ -10720,12 +11165,12 @@ void command_showspellslist(Client *c, const Seperator *sep)
 	Mob *target = c->GetTarget();
 
 	if (!target) {
-		c->Message(0, "Must target an NPC.");
+		c->Message(Chat::White, "Must target an NPC.");
 		return;
 	}
 
 	if (!target->IsNPC()) {
-		c->Message(0, "%s is not an NPC.",  target->GetName());
+		c->Message(Chat::White, "%s is not an NPC.",  target->GetName());
 		return;
 	}
 
@@ -10737,7 +11182,7 @@ void command_showspellslist(Client *c, const Seperator *sep)
 void command_raidloot(Client *c, const Seperator *sep)
 {
 	if(!sep->arg[1][0]) {
-		c->Message(0, "Usage: #raidloot [LEADER/GROUPLEADER/SELECTED/ALL]");
+		c->Message(Chat::White, "Usage: #raidloot [LEADER/GROUPLEADER/SELECTED/ALL]");
 		return;
 	}
 
@@ -10750,7 +11195,7 @@ void command_raidloot(Client *c, const Seperator *sep)
 			{
 				if(r->members[x].IsRaidLeader == 0)
 				{
-					c->Message(0, "You must be the raid leader to use this command.");
+					c->Message(Chat::White, "You must be the raid leader to use this command.");
 				}
 				else
 				{
@@ -10761,32 +11206,32 @@ void command_raidloot(Client *c, const Seperator *sep)
 
 		if(strcasecmp(sep->arg[1], "LEADER") == 0)
 		{
-			c->Message(15, "Loot type changed to: 1");
+			c->Message(Chat::Yellow, "Loot type changed to: 1");
 			r->ChangeLootType(1);
 		}
 		else if(strcasecmp(sep->arg[1], "GROUPLEADER") == 0)
 		{
-			c->Message(15, "Loot type changed to: 2");
+			c->Message(Chat::Yellow, "Loot type changed to: 2");
 			r->ChangeLootType(2);
 		}
 		else if(strcasecmp(sep->arg[1], "SELECTED") == 0)
 		{
-			c->Message(15, "Loot type changed to: 3");
+			c->Message(Chat::Yellow, "Loot type changed to: 3");
 			r->ChangeLootType(3);
 		}
 		else if(strcasecmp(sep->arg[1], "ALL") == 0)
 		{
-			c->Message(15, "Loot type changed to: 4");
+			c->Message(Chat::Yellow, "Loot type changed to: 4");
 			r->ChangeLootType(4);
 		}
 		else
 		{
-			c->Message(0, "Usage: #raidloot [LEADER/GROUPLEADER/SELECTED/ALL]");
+			c->Message(Chat::White, "Usage: #raidloot [LEADER/GROUPLEADER/SELECTED/ALL]");
 		}
 	}
 	else
 	{
-		c->Message(0, "You must be in a raid to use that command.");
+		c->Message(Chat::White, "You must be in a raid to use that command.");
 	}
 }
 
@@ -10794,7 +11239,7 @@ void command_emoteview(Client *c, const Seperator *sep)
 {
 	if(!c->GetTarget() || !c->GetTarget()->IsNPC())
 	{
-		c->Message(0, "You must target a NPC to view their emotes.");
+		c->Message(Chat::White, "You must target a NPC to view their emotes.");
 		return;
 	}
 
@@ -10810,22 +11255,22 @@ void command_emoteview(Client *c, const Seperator *sep)
 			NPC_Emote_Struct* nes = iterator.GetData();
 			if(emoteid == nes->emoteid)
 			{
-				c->Message(0, "EmoteID: %i Event: %i Type: %i Text: %s",  nes->emoteid, nes->event_, nes->type, nes->text);
+				c->Message(Chat::White, "EmoteID: %i Event: %i Type: %i Text: %s",  nes->emoteid, nes->event_, nes->type, nes->text);
 				count++;
 			}
 			iterator.Advance();
 		}
 		if (count == 0)
-			c->Message(0, "No emotes found.");
+			c->Message(Chat::White, "No emotes found.");
 		else
-			c->Message(0, "%i emote(s) found",  count);
+			c->Message(Chat::White, "%i emote(s) found",  count);
 	}
 }
 
 void command_emotesearch(Client *c, const Seperator *sep)
 {
 	if (sep->arg[1][0] == 0)
-		c->Message(0, "Usage: #emotesearch [search string or emoteid]");
+		c->Message(Chat::White, "Usage: #emotesearch [search string or emoteid]");
 	else
 	{
 		const char *search_criteria=sep->argplus[1];
@@ -10841,15 +11286,15 @@ void command_emotesearch(Client *c, const Seperator *sep)
 			NPC_Emote_Struct* nes = iterator.GetData();
 				if(emoteid == nes->emoteid)
 				{
-					c->Message(0, "EmoteID: %i Event: %i Type: %i Text: %s",  nes->emoteid, nes->event_, nes->type, nes->text);
+					c->Message(Chat::White, "EmoteID: %i Event: %i Type: %i Text: %s",  nes->emoteid, nes->event_, nes->type, nes->text);
 					count++;
 				}
 				iterator.Advance();
 			}
 			if (count == 0)
-				c->Message(0, "No emotes found.");
+				c->Message(Chat::White, "No emotes found.");
 			else
-				c->Message(0, "%i emote(s) found",  count);
+				c->Message(Chat::White, "%i emote(s) found",  count);
 		}
 		else
 		{
@@ -10869,7 +11314,7 @@ void command_emotesearch(Client *c, const Seperator *sep)
 			pdest = strstr(sText, sCriteria);
 				if (pdest != nullptr)
 				{
-					c->Message(0, "EmoteID: %i Event: %i Type: %i Text: %s",  nes->emoteid, nes->event_, nes->type, nes->text);
+					c->Message(Chat::White, "EmoteID: %i Event: %i Type: %i Text: %s",  nes->emoteid, nes->event_, nes->type, nes->text);
 					count++;
 				}
 				if (count == 50)
@@ -10878,9 +11323,9 @@ void command_emotesearch(Client *c, const Seperator *sep)
 				iterator.Advance();
 			}
 			if (count == 50)
-				c->Message(0, "50 emotes shown...too many results.");
+				c->Message(Chat::White, "50 emotes shown...too many results.");
 			else
-				c->Message(0, "%i emote(s) found",  count);
+				c->Message(Chat::White, "%i emote(s) found",  count);
 		}
 	}
 }
@@ -10889,7 +11334,7 @@ void command_reloademote(Client *c, const Seperator *sep)
 {
 	zone->NPCEmoteList.Clear();
 	zone->LoadNPCEmotes(&zone->NPCEmoteList);
-	c->Message(0, "NPC emotes reloaded.");
+	c->Message(Chat::White, "NPC emotes reloaded.");
 }
 
 void command_globalview(Client *c, const Seperator *sep)
@@ -10933,14 +11378,14 @@ void command_globalview(Client *c, const Seperator *sep)
 		auto iter = globalMap.begin();
 		uint32 gcount = 0;
 
-		c->Message(0, "Name, Value");
+		c->Message(Chat::White, "Name, Value");
 		while(iter != globalMap.end())
 		{
-			c->Message(0, "%s %s",  (*iter).name.c_str(), (*iter).value.c_str());
+			c->Message(Chat::White, "%s %s",  (*iter).name.c_str(), (*iter).value.c_str());
 			++iter;
 			++gcount;
 		}
-		c->Message(0, "%u globals loaded.",  gcount);
+		c->Message(Chat::White, "%u globals loaded.",  gcount);
 	}
 	else
 	{
@@ -10966,14 +11411,14 @@ void command_globalview(Client *c, const Seperator *sep)
 		auto iter = globalMap.begin();
 		uint32 gcount = 0;
 
-		c->Message(0, "Name, Value");
+		c->Message(Chat::White, "Name, Value");
 		while(iter != globalMap.end())
 		{
-			c->Message(0, "%s %s",  (*iter).name.c_str(), (*iter).value.c_str());
+			c->Message(Chat::White, "%s %s",  (*iter).name.c_str(), (*iter).value.c_str());
 			++iter;
 			++gcount;
 		}
-		c->Message(0, "%u globals loaded.",  gcount);
+		c->Message(Chat::White, "%u globals loaded.",  gcount);
 	}
 }
 
@@ -10981,7 +11426,7 @@ void command_distance(Client *c, const Seperator *sep) {
 	if(c && c->GetTarget()) {
 		Mob* target = c->GetTarget();
 
-		c->Message(0, "Your target, %s, is %1.1f units from you.",  c->GetTarget()->GetName(), Distance(c->GetPosition(), target->GetPosition()));
+		c->Message(Chat::White, "Your target, %s, is %1.1f units from you.",  c->GetTarget()->GetName(), Distance(c->GetPosition(), target->GetPosition()));
 	}
 }
 
@@ -11025,24 +11470,24 @@ void command_max_all_skills(Client *c, const Seperator *sep)
 void command_showbonusstats(Client *c, const Seperator *sep)
 {
 	if (c->GetTarget() == 0)
-		c->Message(0, "ERROR: No target!");
+		c->Message(Chat::White, "ERROR: No target!");
 	else if (!c->GetTarget()->IsMob() && !c->GetTarget()->IsClient())
-		c->Message(0, "ERROR: Target is not a Mob or Player!");
+		c->Message(Chat::White, "ERROR: Target is not a Mob or Player!");
 	else {
 		bool bAll = false;
 		if(sep->arg[1][0] == '\0' || strcasecmp(sep->arg[1], "all") == 0)
 			bAll = true;
 		if (bAll || (strcasecmp(sep->arg[1], "item")==0)) {
-			c->Message(0, "Target Item Bonuses:");
-			c->Message(0, "  Accuracy: %i%%   Divine Save: %i%%", c->GetTarget()->GetItemBonuses().Accuracy, c->GetTarget()->GetItemBonuses().DivineSaveChance);
-			c->Message(0, "  Flurry: %i%%     HitChance: %i%%", c->GetTarget()->GetItemBonuses().FlurryChance, c->GetTarget()->GetItemBonuses().HitChance / 15);
+			c->Message(Chat::White, "Target Item Bonuses:");
+			c->Message(Chat::White, "  Accuracy: %i%%   Divine Save: %i%%", c->GetTarget()->GetItemBonuses().Accuracy, c->GetTarget()->GetItemBonuses().DivineSaveChance);
+			c->Message(Chat::White, "  Flurry: %i%%     HitChance: %i%%", c->GetTarget()->GetItemBonuses().FlurryChance, c->GetTarget()->GetItemBonuses().HitChance / 15);
 		}
 		if (bAll || (strcasecmp(sep->arg[1], "spell")==0)) {
-			c->Message(0, "  Target Spell Bonuses:");
-			c->Message(0, "  Accuracy: %i%%   Divine Save: %i%%", c->GetTarget()->GetSpellBonuses().Accuracy, c->GetTarget()->GetSpellBonuses().DivineSaveChance);
-			c->Message(0, "  Flurry: %i%%     HitChance: %i%% ", c->GetTarget()->GetSpellBonuses().FlurryChance, c->GetTarget()->GetSpellBonuses().HitChance / 15);
+			c->Message(Chat::White, "  Target Spell Bonuses:");
+			c->Message(Chat::White, "  Accuracy: %i%%   Divine Save: %i%%", c->GetTarget()->GetSpellBonuses().Accuracy, c->GetTarget()->GetSpellBonuses().DivineSaveChance);
+			c->Message(Chat::White, "  Flurry: %i%%     HitChance: %i%% ", c->GetTarget()->GetSpellBonuses().FlurryChance, c->GetTarget()->GetSpellBonuses().HitChance / 15);
 		}
-		c->Message(0, "  Effective Casting Level: %i", c->GetTarget()->GetCasterLevel(0));
+		c->Message(Chat::White, "  Effective Casting Level: %i", c->GetTarget()->GetCasterLevel(0));
 	}
 }
 
@@ -11052,7 +11497,7 @@ void command_reloadallrules(Client *c, const Seperator *sep)
 	{
 		auto pack = new ServerPacket(ServerOP_ReloadRules, 0);
 		worldserver.SendPacket(pack);
-		c->Message(13, "Successfully sent the packet to world to reload rules globally. (including world)");
+		c->Message(Chat::Red, "Successfully sent the packet to world to reload rules globally. (including world)");
 		safe_delete(pack);
 
 	}
@@ -11064,7 +11509,7 @@ void command_reloadworldrules(Client *c, const Seperator *sep)
 	{
 		auto pack = new ServerPacket(ServerOP_ReloadRulesWorld, 0);
 		worldserver.SendPacket(pack);
-		c->Message(13, "Successfully sent the packet to world to reload rules. (only world)");
+		c->Message(Chat::Red, "Successfully sent the packet to world to reload rules. (only world)");
 		safe_delete(pack);
 	}
 }
@@ -11080,11 +11525,11 @@ void command_camerashake(Client *c, const Seperator *sep)
 			scss->duration = atoi(sep->arg[1]);
 			scss->intensity = atoi(sep->arg[2]);
 			worldserver.SendPacket(pack);
-			c->Message(13, "Successfully sent the packet to world! Shake it, world, shake it!");
+			c->Message(Chat::Red, "Successfully sent the packet to world! Shake it, world, shake it!");
 			safe_delete(pack);
 		}
 		else {
-			c->Message(13, "Usage -- #camerashake [duration], [intensity [1-10])");
+			c->Message(Chat::Red, "Usage -- #camerashake [duration], [intensity [1-10])");
 		}
 	}
 	return;
@@ -11096,7 +11541,7 @@ void command_disarmtrap(Client *c, const Seperator *sep)
 
 	if(!target)
 	{
-		c->Message(13, "You must have a target.");
+		c->Message(Chat::Red, "You must have a target.");
 		return;
 	}
 
@@ -11106,13 +11551,13 @@ void command_disarmtrap(Client *c, const Seperator *sep)
 		{
 			if(DistanceSquaredNoZ(c->GetPosition(), target->GetPosition()) > RuleI(Adventure, LDoNTrapDistanceUse))
 			{
-				c->Message(13, "%s is too far away.",  target->GetCleanName());
+				c->Message(Chat::Red, "%s is too far away.",  target->GetCleanName());
 				return;
 			}
 			c->HandleLDoNDisarm(target->CastToNPC(), c->GetSkill(EQEmu::skills::SkillDisarmTraps), LDoNTypeMechanical);
 		}
 		else
-			c->Message(13, "You do not have the disarm trap skill.");
+			c->Message(Chat::Red, "You do not have the disarm trap skill.");
 	}
 }
 
@@ -11121,7 +11566,7 @@ void command_sensetrap(Client *c, const Seperator *sep)
 	Mob * target = c->GetTarget();
 	if(!target)
 	{
-		c->Message(13, "You must have a target.");
+		c->Message(Chat::Red, "You must have a target.");
 		return;
 	}
 
@@ -11131,13 +11576,13 @@ void command_sensetrap(Client *c, const Seperator *sep)
 		{
 			if(DistanceSquaredNoZ(c->GetPosition(), target->GetPosition()) > RuleI(Adventure, LDoNTrapDistanceUse))
 			{
-				c->Message(13, "%s is too far away.",  target->GetCleanName());
+				c->Message(Chat::Red, "%s is too far away.",  target->GetCleanName());
 				return;
 			}
 			c->HandleLDoNSenseTraps(target->CastToNPC(), c->GetSkill(EQEmu::skills::SkillSenseTraps), LDoNTypeMechanical);
 		}
 		else
-			c->Message(13, "You do not have the sense traps skill.");
+			c->Message(Chat::Red, "You do not have the sense traps skill.");
 	}
 }
 
@@ -11146,7 +11591,7 @@ void command_picklock(Client *c, const Seperator *sep)
 	Mob * target = c->GetTarget();
 	if(!target)
 	{
-		c->Message(13, "You must have a target.");
+		c->Message(Chat::Red, "You must have a target.");
 		return;
 	}
 
@@ -11156,20 +11601,20 @@ void command_picklock(Client *c, const Seperator *sep)
 		{
 			if(DistanceSquaredNoZ(c->GetPosition(), target->GetPosition()) > RuleI(Adventure, LDoNTrapDistanceUse))
 			{
-				c->Message(13, "%s is too far away.",  target->GetCleanName());
+				c->Message(Chat::Red, "%s is too far away.",  target->GetCleanName());
 				return;
 			}
 			c->HandleLDoNPickLock(target->CastToNPC(), c->GetSkill(EQEmu::skills::SkillPickLock), LDoNTypeMechanical);
 		}
 		else
-			c->Message(13, "You do not have the pick locks skill.");
+			c->Message(Chat::Red, "You do not have the pick locks skill.");
 	}
 }
 
 void command_profanity(Client *c, const Seperator *sep)
 {
 	std::string arg1(sep->arg[1]);
-	
+
 	while (true) {
 		if (arg1.compare("list") == 0) {
 			// do nothing
@@ -11182,21 +11627,21 @@ void command_profanity(Client *c, const Seperator *sep)
 		}
 		else if (arg1.compare("add") == 0) {
 			if (!EQEmu::ProfanityManager::AddProfanity(&database, sep->arg[2]))
-				c->Message(CC_Red, "Could not add '%s' to the profanity list.", sep->arg[2]);
+				c->Message(Chat::Red, "Could not add '%s' to the profanity list.", sep->arg[2]);
 			auto pack = new ServerPacket(ServerOP_RefreshCensorship);
 			worldserver.SendPacket(pack);
 			safe_delete(pack);
 		}
 		else if (arg1.compare("del") == 0) {
 			if (!EQEmu::ProfanityManager::RemoveProfanity(&database, sep->arg[2]))
-				c->Message(CC_Red, "Could not delete '%s' from the profanity list.", sep->arg[2]);
+				c->Message(Chat::Red, "Could not delete '%s' from the profanity list.", sep->arg[2]);
 			auto pack = new ServerPacket(ServerOP_RefreshCensorship);
 			worldserver.SendPacket(pack);
 			safe_delete(pack);
 		}
 		else if (arg1.compare("reload") == 0) {
 			if (!EQEmu::ProfanityManager::UpdateProfanityList(&database))
-				c->Message(CC_Red, "Could not reload the profanity list.");
+				c->Message(Chat::Red, "Could not reload the profanity list.");
 			auto pack = new ServerPacket(ServerOP_RefreshCensorship);
 			worldserver.SendPacket(pack);
 			safe_delete(pack);
@@ -11217,31 +11662,31 @@ void command_profanity(Client *c, const Seperator *sep)
 			popup.append("** End of List **<br>");
 
 		c->SendPopupToClient("Profanity List", popup.c_str());
-		
+
 		return;
 	}
-	
-	c->Message(0, "Usage: #profanity [list] - shows profanity list");
-	c->Message(0, "Usage: #profanity [clear] - deletes all entries");
-	c->Message(0, "Usage: #profanity [add] [<word>] - adds entry");
-	c->Message(0, "Usage: #profanity [del] [<word>] - deletes entry");
-	c->Message(0, "Usage: #profanity [reload] - reloads profanity list");
+
+	c->Message(Chat::White, "Usage: #profanity [list] - shows profanity list");
+	c->Message(Chat::White, "Usage: #profanity [clear] - deletes all entries");
+	c->Message(Chat::White, "Usage: #profanity [add] [<word>] - adds entry");
+	c->Message(Chat::White, "Usage: #profanity [del] [<word>] - deletes entry");
+	c->Message(Chat::White, "Usage: #profanity [reload] - reloads profanity list");
 }
 
 void command_mysql(Client *c, const Seperator *sep)
 {
 	if(!sep->arg[1][0] || !sep->arg[2][0]) {
-		c->Message(0, "Usage: #mysql query \"Query here\"");
+		c->Message(Chat::White, "Usage: #mysql query \"Query here\"");
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "help") == 0) {
-		c->Message(0, "MYSQL In-Game CLI Interface:");
-		c->Message(0, "Example: #mysql query \"Query goes here quoted\" -s -h");
-		c->Message(0, "To use 'like \"%%something%%\" replace the %% with #");
-		c->Message(0, "Example: #mysql query \"select * from table where name like \"#something#\"");
-		c->Message(0, "-s - Spaces select entries apart");
-		c->Message(0, "-h - Colors every other select result");
+		c->Message(Chat::White, "MYSQL In-Game CLI Interface:");
+		c->Message(Chat::White, "Example: #mysql query \"Query goes here quoted\" -s -h");
+		c->Message(Chat::White, "To use 'like \"%%something%%\" replace the %% with #");
+		c->Message(Chat::White, "Example: #mysql query \"select * from table where name like \"#something#\"");
+		c->Message(Chat::White, "-s - Spaces select entries apart");
+		c->Message(Chat::White, "-h - Colors every other select result");
 		return;
 	}
 
@@ -11255,7 +11700,7 @@ void command_mysql(Client *c, const Seperator *sep)
 				case 's': optionS = true; break;
 				case 'h': optionH = true; break;
 				default:
-                    c->Message(15, "%s, there is no option '%c'",  c->GetName(), sep->arg[argnum][1]);
+                    c->Message(Chat::Yellow, "%s, there is no option '%c'",  c->GetName(), sep->arg[argnum][1]);
                     return;
 			}
 			++argnum;
@@ -11278,7 +11723,7 @@ void command_mysql(Client *c, const Seperator *sep)
             query.insert(pos, "%%");
             pos = query.find('#');
         }
-        c->Message(15, "---Running query: '%s'",  query.c_str());
+        c->Message(Chat::Yellow, "---Running query: '%s'",  query.c_str());
 
         for (auto row = results.begin(); row != results.end(); ++row) {
             std::stringstream lineText;
@@ -11297,7 +11742,7 @@ void command_mysql(Client *c, const Seperator *sep)
             lineVec.push_back(lineText.str());
 
             if(optionS) //This provides spacing for the space switch
-                c->Message(0, " ");
+                c->Message(Chat::White, " ");
             if(optionH) //This option will highlight every other row
                 highlightTextIndex = 1 - highlightTextIndex;
 
@@ -11322,11 +11767,11 @@ void command_xtargets(Client *c, const Seperator *sep)
 
 		if((NewMax < 5) || (NewMax > XTARGET_HARDCAP))
 		{
-			c->Message(13, "Number of XTargets must be between 5 and %i",  XTARGET_HARDCAP);
+			c->Message(Chat::Red, "Number of XTargets must be between 5 and %i",  XTARGET_HARDCAP);
 			return;
 		}
 		t->SetMaxXTargets(NewMax);
-		c->Message(0, "Max number of XTargets set to %i",  NewMax);
+		c->Message(Chat::White, "Max number of XTargets set to %i",  NewMax);
 	}
 	else
 		t->ShowXTargets(c);
@@ -11337,11 +11782,11 @@ void command_zopp(Client *c, const Seperator *sep)
 	if (!c)
 		return;
 	else if (sep->argnum < 3 || sep->argnum > 4)
-		c->Message(0, "Usage: #zopp [trade/summon] [slot id] [item id] [*charges]");
+		c->Message(Chat::White, "Usage: #zopp [trade/summon] [slot id] [item id] [*charges]");
 	else if (!strcasecmp(sep->arg[1], "trade") == 0 && !strcasecmp(sep->arg[1], "t") == 0 && !strcasecmp(sep->arg[1], "summon") == 0 && !strcasecmp(sep->arg[1], "s") == 0)
-		c->Message(0, "Usage: #zopp [trade/summon] [slot id] [item id] [*charges]");
+		c->Message(Chat::White, "Usage: #zopp [trade/summon] [slot id] [item id] [*charges]");
 	else if (!sep->IsNumber(2) || !sep->IsNumber(3) || (sep->argnum == 4 && !sep->IsNumber(4)))
-		c->Message(0, "Usage: #zopp [trade/summon] [slot id] [item id] [*charges]");
+		c->Message(Chat::White, "Usage: #zopp [trade/summon] [slot id] [item id] [*charges]");
 	else {
 		ItemPacketType packettype;
 
@@ -11359,7 +11804,7 @@ void command_zopp(Client *c, const Seperator *sep)
 		const EQEmu::ItemData* FakeItem = database.GetItem(itemid);
 
 		if (!FakeItem) {
-			c->Message(13, "Error: Item [%u] is not a valid item id.",  itemid);
+			c->Message(Chat::Red, "Error: Item [%u] is not a valid item id.",  itemid);
 			return;
 		}
 
@@ -11369,18 +11814,18 @@ void command_zopp(Client *c, const Seperator *sep)
 			item_status = static_cast<int16>(item->MinStatus);
 		}
 		if (item_status > c->Admin()) {
-			c->Message(13, "Error: Insufficient status to use this command.");
+			c->Message(Chat::Red, "Error: Insufficient status to use this command.");
 			return;
 		}
 
 		if (charges < 0 || charges > FakeItem->StackSize) {
-			c->Message(13, "Warning: The specified charge count does not meet expected criteria!");
-			c->Message(0, "Processing request..results may cause unpredictable behavior.");
+			c->Message(Chat::Red, "Warning: The specified charge count does not meet expected criteria!");
+			c->Message(Chat::White, "Processing request..results may cause unpredictable behavior.");
 		}
 
 		EQEmu::ItemInstance* FakeItemInst = database.CreateItem(FakeItem, charges);
 		c->SendItemPacket(slotid, FakeItemInst, packettype);
-		c->Message(0, "Sending zephyr op packet to client - [%s] %s (%u) with %i %s to slot %i.",
+		c->Message(Chat::White, "Sending zephyr op packet to client - [%s] %s (%u) with %i %s to slot %i.",
 			   packettype == ItemPacketTrade ? "Trade" : "Summon",  FakeItem->Name, itemid, charges,
 			   std::abs(charges == 1) ? "charge" : "charges",  slotid);
 		safe_delete(FakeItemInst);
@@ -11404,17 +11849,17 @@ void command_questerrors(Client *c, const Seperator *sep)
 {
 	std::list<std::string> err;
 	parse->GetErrors(err);
-	c->Message(0, "Current Quest Errors:");
+	c->Message(Chat::White, "Current Quest Errors:");
 
 	auto iter = err.begin();
 	int i = 0;
 	while(iter != err.end()) {
 		if(i >= 30) {
-			c->Message(0, "Maximum of 30 Errors shown...");
+			c->Message(Chat::White, "Maximum of 30 Errors shown...");
 			break;
 		}
 
-		c->Message(0, iter->c_str());
+		c->Message(Chat::White, iter->c_str());
 		++i;
 		++iter;
 	}
@@ -11429,20 +11874,20 @@ void command_enablerecipe(Client *c, const Seperator *sep)
 			recipe_id = atoi(sep->arg[1]);
 		}
 		else {
-			c->Message(0, "Invalid number of arguments.\nUsage: #enablerecipe recipe_id");
+			c->Message(Chat::White, "Invalid number of arguments.\nUsage: #enablerecipe recipe_id");
 			return;
 		}
 		if (recipe_id > 0) {
 			success = database.EnableRecipe(recipe_id);
 			if (success) {
-				c->Message(0, "Recipe enabled.");
+				c->Message(Chat::White, "Recipe enabled.");
 			}
 			else {
-				c->Message(0, "Recipe not enabled.");
+				c->Message(Chat::White, "Recipe not enabled.");
 			}
 		}
 		else {
-			c->Message(0, "Invalid recipe id.\nUsage: #enablerecipe recipe_id");
+			c->Message(Chat::White, "Invalid recipe id.\nUsage: #enablerecipe recipe_id");
 		}
 	}
 }
@@ -11456,20 +11901,20 @@ void command_disablerecipe(Client *c, const Seperator *sep)
 			recipe_id = atoi(sep->arg[1]);
 		}
 		else {
-			c->Message(0, "Invalid number of arguments.\nUsage: #disablerecipe recipe_id");
+			c->Message(Chat::White, "Invalid number of arguments.\nUsage: #disablerecipe recipe_id");
 			return;
 		}
 		if (recipe_id > 0) {
 			success = database.DisableRecipe(recipe_id);
 			if (success) {
-				c->Message(0, "Recipe disabled.");
+				c->Message(Chat::White, "Recipe disabled.");
 			}
 			else {
-				c->Message(0, "Recipe not disabled.");
+				c->Message(Chat::White, "Recipe not disabled.");
 			}
 		}
 		else {
-			c->Message(0, "Invalid recipe id.\nUsage: #disablerecipe recipe_id");
+			c->Message(Chat::White, "Invalid recipe id.\nUsage: #disablerecipe recipe_id");
 		}
 	}
 }
@@ -11479,13 +11924,13 @@ void command_npctype_cache(Client *c, const Seperator *sep)
 	if (sep->argnum > 0) {
 		for (int i = 0; i < sep->argnum; ++i) {
 			if (strcasecmp(sep->arg[i + 1], "all") == 0) {
-				c->Message(0, "Clearing all npc types from the cache.");
+				c->Message(Chat::White, "Clearing all npc types from the cache.");
 				zone->ClearNPCTypeCache(-1);
 			}
 			else {
 				int id = atoi(sep->arg[i + 1]);
 				if (id > 0) {
-					c->Message(0, "Clearing npc type %d from the cache.",  id);
+					c->Message(Chat::White, "Clearing npc type %d from the cache.",  id);
 					zone->ClearNPCTypeCache(id);
 					return;
 				}
@@ -11493,9 +11938,9 @@ void command_npctype_cache(Client *c, const Seperator *sep)
 		}
 	}
 	else {
-		c->Message(0, "Usage:");
-		c->Message(0, "#npctype_cache [npctype_id] ...");
-		c->Message(0, "#npctype_cache all");
+		c->Message(Chat::White, "Usage:");
+		c->Message(Chat::White, "#npctype_cache [npctype_id] ...");
+		c->Message(Chat::White, "#npctype_cache all");
 	}
 }
 
@@ -11503,7 +11948,7 @@ void command_merchantopenshop(Client *c, const Seperator *sep)
 {
 	Mob *merchant = c->GetTarget();
 	if (!merchant || merchant->GetClass() != MERCHANT) {
-		c->Message(0, "You must target a merchant to open their shop.");
+		c->Message(Chat::White, "You must target a merchant to open their shop.");
 		return;
 	}
 
@@ -11514,7 +11959,7 @@ void command_merchantcloseshop(Client *c, const Seperator *sep)
 {
 	Mob *merchant = c->GetTarget();
 	if (!merchant || merchant->GetClass() != MERCHANT) {
-		c->Message(0, "You must target a merchant to close their shop.");
+		c->Message(Chat::White, "You must target a merchant to close their shop.");
 		return;
 	}
 
@@ -11532,12 +11977,12 @@ void command_shownpcgloballoot(Client *c, const Seperator *sep)
 	auto tar = c->GetTarget();
 
 	if (!tar || !tar->IsNPC()) {
-		c->Message(0, "You must target an NPC to use this command.");
+		c->Message(Chat::White, "You must target an NPC to use this command.");
 		return;
 	}
 
 	auto npc = tar->CastToNPC();
-	c->Message(0, "GlobalLoot for %s (%d)", npc->GetName(), npc->GetNPCTypeID());
+	c->Message(Chat::White, "GlobalLoot for %s (%d)", npc->GetName(), npc->GetNPCTypeID());
 	zone->ShowNPCGlobalLoot(c, npc);
 }
 
@@ -11546,33 +11991,33 @@ void command_tune(Client *c, const Seperator *sep)
 	//Work in progress - Kayen
 
 	if(sep->arg[1][0] == '\0' || !strcasecmp(sep->arg[1], "help")) {
-		c->Message(0, "Syntax: #tune [subcommand].");
-		c->Message(0, "-- Tune System Commands --");
-		c->Message(0, "-- Usage: Returning recommended combat statistical values based on a desired outcome.");
-		c->Message(0, "-- Note: If targeted mob does not have a target (ie not engaged in combat), YOU will be considered the target.");
-		c->Message(0, "-- Warning: The calculations done in this process are intense and can potentially cause zone crashes depending on parameters set, use with caution!");
-		c->Message(0, "-- Below are OPTIONAL parameters.");
-		c->Message(0, "-- Note: [interval] Determines how fast the stat being checked increases/decreases till it finds the best result. Default [ATK/AC 50][Acc/Avoid 10] ");
-		c->Message(0, "-- Note: [loop_max] Determines how many iterations are done to increases/decreases the stat till it finds the best result. Default [ATK/AC 100][Acc/Avoid 1000]");
-		c->Message(0, "-- Note: [Stat Override] Will override that stat on mob being checkd with the specified value. Default=0");
-		c->Message(0, "-- Note: [Info Level] How much statistical detail is displayed[0 - 3]. Default=0 ");
-		c->Message(0, "-- Note: Results are only approximations usually accurate to +/- 2 intervals.");
+		c->Message(Chat::White, "Syntax: #tune [subcommand].");
+		c->Message(Chat::White, "-- Tune System Commands --");
+		c->Message(Chat::White, "-- Usage: Returning recommended combat statistical values based on a desired outcome.");
+		c->Message(Chat::White, "-- Note: If targeted mob does not have a target (ie not engaged in combat), YOU will be considered the target.");
+		c->Message(Chat::White, "-- Warning: The calculations done in this process are intense and can potentially cause zone crashes depending on parameters set, use with caution!");
+		c->Message(Chat::White, "-- Below are OPTIONAL parameters.");
+		c->Message(Chat::White, "-- Note: [interval] Determines how fast the stat being checked increases/decreases till it finds the best result. Default [ATK/AC 50][Acc/Avoid 10] ");
+		c->Message(Chat::White, "-- Note: [loop_max] Determines how many iterations are done to increases/decreases the stat till it finds the best result. Default [ATK/AC 100][Acc/Avoid 1000]");
+		c->Message(Chat::White, "-- Note: [Stat Override] Will override that stat on mob being checkd with the specified value. Default=0");
+		c->Message(Chat::White, "-- Note: [Info Level] How much statistical detail is displayed[0 - 3]. Default=0 ");
+		c->Message(Chat::White, "-- Note: Results are only approximations usually accurate to +/- 2 intervals.");
 
-		c->Message(0, "... ");
-		c->Message(0, "...### Category A ### Target = ATTACKER ### YOU or Target's Target = DEFENDER ###");
-		c->Message(0, "...### Category B ### Target = DEFENDER ### YOU or Target's Target = ATTACKER ###");
-		c->Message(0, "... ");
-		c->Message(0, "...#Returns recommended ATK adjustment +/- on ATTACKER that will result in an average mitigation pct on DEFENDER. ");
-		c->Message(0, "...tune FindATK [A/B] [pct mitigation] [interval][loop_max][AC Overwride][Info Level]");
-		c->Message(0, "... ");
-		c->Message(0, "...#Returns recommended AC adjustment +/- on DEFENDER for an average mitigation pct from ATTACKER. ");
-		c->Message(0, "...tune FindAC [A/B] [pct mitigation] [interval][loop_max][ATK Overwride][Info Level] ");
-		c->Message(0, "... ");
-		c->Message(0, "...#Returns recommended Accuracy adjustment +/- on ATTACKER that will result in a hit chance pct on DEFENDER. ");
-		c->Message(0, "...tune FindAccuracy [A/B] [hit chance] [interval][loop_max][Avoidance Overwride][Info Level]");
-		c->Message(0, "... ");
-		c->Message(0, "...#Returns recommended Avoidance adjustment +/- on DEFENDER for in a hit chance pct from ATTACKER. ");
-		c->Message(0, "...tune FindAvoidance [A/B] [pct mitigation] [interval][loop_max][Accuracy Overwride][Info Level] ");
+		c->Message(Chat::White, "... ");
+		c->Message(Chat::White, "...### Category A ### Target = ATTACKER ### YOU or Target's Target = DEFENDER ###");
+		c->Message(Chat::White, "...### Category B ### Target = DEFENDER ### YOU or Target's Target = ATTACKER ###");
+		c->Message(Chat::White, "... ");
+		c->Message(Chat::White, "...#Returns recommended ATK adjustment +/- on ATTACKER that will result in an average mitigation pct on DEFENDER. ");
+		c->Message(Chat::White, "...tune FindATK [A/B] [pct mitigation] [interval][loop_max][AC Overwride][Info Level]");
+		c->Message(Chat::White, "... ");
+		c->Message(Chat::White, "...#Returns recommended AC adjustment +/- on DEFENDER for an average mitigation pct from ATTACKER. ");
+		c->Message(Chat::White, "...tune FindAC [A/B] [pct mitigation] [interval][loop_max][ATK Overwride][Info Level] ");
+		c->Message(Chat::White, "... ");
+		c->Message(Chat::White, "...#Returns recommended Accuracy adjustment +/- on ATTACKER that will result in a hit chance pct on DEFENDER. ");
+		c->Message(Chat::White, "...tune FindAccuracy [A/B] [hit chance] [interval][loop_max][Avoidance Overwride][Info Level]");
+		c->Message(Chat::White, "... ");
+		c->Message(Chat::White, "...#Returns recommended Avoidance adjustment +/- on DEFENDER for in a hit chance pct from ATTACKER. ");
+		c->Message(Chat::White, "...tune FindAvoidance [A/B] [pct mitigation] [interval][loop_max][Accuracy Overwride][Info Level] ");
 
 		return;
 	}
@@ -11582,7 +12027,7 @@ void command_tune(Client *c, const Seperator *sep)
 
 	if (!attacker)
 	{
-		c->Message(0, "#Tune - Error no target selected. [#Tune help]");
+		c->Message(Chat::White, "#Tune - Error no target selected. [#Tune help]");
 		return;
 	}
 
@@ -11601,7 +12046,7 @@ void command_tune(Client *c, const Seperator *sep)
 
 		if (!pct_mitigation)
 		{
-			c->Message(13, "#Tune - Error must enter the desired percent mitigation on defender. Ie. Defender to mitigate on average 20 pct of max damage.");
+			c->Message(Chat::Red, "#Tune - Error must enter the desired percent mitigation on defender. Ie. Defender to mitigate on average 20 pct of max damage.");
 			return;
 		}
 
@@ -11619,9 +12064,9 @@ void command_tune(Client *c, const Seperator *sep)
 		else if(!strcasecmp(sep->arg[2], "B"))
 			c->Tune_FindATKByPctMitigation(attacker,defender, pct_mitigation, interval, max_loop,ac_override,info_level);
 		else {
-			c->Message(0, "#Tune - Error no category selcted. [#Tune help]");
-			c->Message(0, "Usage #tune FindATK [A/B] [pct mitigation] [interval][loop_max][AC Overwride][Info Level] ");
-			c->Message(0, "Example #tune FindATK A 60");
+			c->Message(Chat::White, "#Tune - Error no category selcted. [#Tune help]");
+			c->Message(Chat::White, "Usage #tune FindATK [A/B] [pct mitigation] [interval][loop_max][AC Overwride][Info Level] ");
+			c->Message(Chat::White, "Example #tune FindATK A 60");
 		}
 		return;
 	}
@@ -11636,7 +12081,7 @@ void command_tune(Client *c, const Seperator *sep)
 
 		if (!pct_mitigation)
 		{
-			c->Message(13, "#Tune - Error must enter the desired percent mitigation on defender. Ie. Defender to mitigate on average 20 pct of max damage.");
+			c->Message(Chat::Red, "#Tune - Error must enter the desired percent mitigation on defender. Ie. Defender to mitigate on average 20 pct of max damage.");
 			return;
 		}
 
@@ -11654,9 +12099,9 @@ void command_tune(Client *c, const Seperator *sep)
 		else if(!strcasecmp(sep->arg[2], "B"))
 			c->Tune_FindACByPctMitigation(attacker, defender, pct_mitigation, interval, max_loop,atk_override,info_level);
 		else {
-			c->Message(0, "#Tune - Error no category selcted. [#Tune help]");
-			c->Message(0, "Usage #tune FindAC [A/B] [pct mitigation] [interval][loop_max][ATK Overwride][Info Level] ");
-			c->Message(0, "Example #tune FindAC A 60");
+			c->Message(Chat::White, "#Tune - Error no category selcted. [#Tune help]");
+			c->Message(Chat::White, "Usage #tune FindAC [A/B] [pct mitigation] [interval][loop_max][ATK Overwride][Info Level] ");
+			c->Message(Chat::White, "Example #tune FindAC A 60");
 		}
 
 		return;
@@ -11672,7 +12117,7 @@ void command_tune(Client *c, const Seperator *sep)
 
 		if (!hit_chance)
 		{
-			c->Message(10, "#Tune - Error must enter the desired percent mitigation on defender. Ie. Defender to mitigate on average 20 pct of max damage.");
+			c->Message(Chat::NPCQuestSay, "#Tune - Error must enter the desired percent mitigation on defender. Ie. Defender to mitigate on average 20 pct of max damage.");
 			return;
 		}
 
@@ -11687,7 +12132,7 @@ void command_tune(Client *c, const Seperator *sep)
 
 		if (hit_chance > RuleR(Combat,MaxChancetoHit) || hit_chance < RuleR(Combat,MinChancetoHit))
 		{
-			c->Message(10, "#Tune - Error hit chance out of bounds. [Max %.2f Min .2f]",  RuleR(Combat,MaxChancetoHit),RuleR(Combat,MinChancetoHit));
+			c->Message(Chat::NPCQuestSay, "#Tune - Error hit chance out of bounds. [Max %.2f Min .2f]",  RuleR(Combat,MaxChancetoHit),RuleR(Combat,MinChancetoHit));
 			return;
 		}
 
@@ -11696,9 +12141,9 @@ void command_tune(Client *c, const Seperator *sep)
 		else if(!strcasecmp(sep->arg[2], "B"))
 			c->Tune_FindAccuaryByHitChance(attacker, defender, hit_chance, interval, max_loop,avoid_override,info_level);
 		else {
-			c->Message(0, "#Tune - Error no category selcted. [#Tune help]");
-			c->Message(0, "Usage #tune FindAcccuracy [A/B] [hit chance] [interval][loop_max][Avoidance Overwride][Info Level]");
-			c->Message(0, "Exampled #tune FindAccuracy B 30");
+			c->Message(Chat::White, "#Tune - Error no category selcted. [#Tune help]");
+			c->Message(Chat::White, "Usage #tune FindAcccuracy [A/B] [hit chance] [interval][loop_max][Avoidance Overwride][Info Level]");
+			c->Message(Chat::White, "Exampled #tune FindAccuracy B 30");
 		}
 
 		return;
@@ -11714,7 +12159,7 @@ void command_tune(Client *c, const Seperator *sep)
 
 		if (!hit_chance)
 		{
-			c->Message(0, "#Tune - Error must enter the desired hit chance on defender. Ie. Defender to have hit chance of 40 pct.");
+			c->Message(Chat::White, "#Tune - Error must enter the desired hit chance on defender. Ie. Defender to have hit chance of 40 pct.");
 			return;
 		}
 
@@ -11729,7 +12174,7 @@ void command_tune(Client *c, const Seperator *sep)
 
 		if (hit_chance > RuleR(Combat,MaxChancetoHit) || hit_chance < RuleR(Combat,MinChancetoHit))
 		{
-			c->Message(10, "#Tune - Error hit chance out of bounds. [Max %.2f Min .2f]",  RuleR(Combat,MaxChancetoHit),RuleR(Combat,MinChancetoHit));
+			c->Message(Chat::NPCQuestSay, "#Tune - Error hit chance out of bounds. [Max %.2f Min .2f]",  RuleR(Combat,MaxChancetoHit),RuleR(Combat,MinChancetoHit));
 			return;
 		}
 
@@ -11738,9 +12183,9 @@ void command_tune(Client *c, const Seperator *sep)
 		else if(!strcasecmp(sep->arg[2], "B"))
 			c->Tune_FindAvoidanceByHitChance(attacker, defender, hit_chance, interval, max_loop,acc_override, info_level);
 		else {
-			c->Message(0, "#Tune - Error no category selcted. [#Tune help]");
-			c->Message(0, "Usage #tune FindAvoidance [A/B] [hit chance] [interval][loop_max][Accuracy Overwride][Info Level]");
-			c->Message(0, "Exampled #tune FindAvoidance B 30");
+			c->Message(Chat::White, "#Tune - Error no category selcted. [#Tune help]");
+			c->Message(Chat::White, "Usage #tune FindAvoidance [A/B] [hit chance] [interval][loop_max][Accuracy Overwride][Info Level]");
+			c->Message(Chat::White, "Exampled #tune FindAvoidance B 30");
 		}
 
 		return;
@@ -11764,7 +12209,7 @@ void command_logtest(Client *c, const Seperator *sep){
 
 void command_crashtest(Client *c, const Seperator *sep)
 {
-	c->Message(0, "Alright, now we get an GPF ;) ");
+	c->Message(Chat::White, "Alright, now we get an GPF ;) ");
 	char* gpf = 0;
 	memcpy(gpf, "Ready to crash",  30);
 }
@@ -11776,17 +12221,17 @@ void command_logs(Client *c, const Seperator *sep){
 		if (strcasecmp(sep->arg[1], "reload_all") == 0){
 			auto pack = new ServerPacket(ServerOP_ReloadLogs, 0);
 			worldserver.SendPacket(pack);
-			c->Message(13, "Successfully sent the packet to world to reload log settings from the database for all zones");
+			c->Message(Chat::Red, "Successfully sent the packet to world to reload log settings from the database for all zones");
 			safe_delete(pack);
 		}
 		/* #logs list_settings */
 		if (strcasecmp(sep->arg[1], "list_settings") == 0 ||
 			(strcasecmp(sep->arg[1], "set") == 0 && strcasecmp(sep->arg[3], "") == 0)) {
-			c->Message(0, "[Category ID | console | file | gmsay | Category Description]");
+			c->Message(Chat::White, "[Category ID | console | file | gmsay | Category Description]");
 			int redisplay_columns = 0;
 			for (int i            = 0; i < Logs::LogCategory::MaxCategoryID; i++) {
 				if (redisplay_columns == 10) {
-					c->Message(0, "[Category ID | console | file | gmsay | Category Description]");
+					c->Message(Chat::White, "[Category ID | console | file | gmsay | Category Description]");
 					redisplay_columns = 0;
 				}
 				c->Message(
@@ -11817,12 +12262,12 @@ void command_logs(Client *c, const Seperator *sep){
 				logs_set = 1;
 			}
 			else{
-				c->Message(0, "--- #logs set [console|file|gmsay] <category_id> <debug_level (1-3)> - Sets log settings during the lifetime of the zone");
-				c->Message(0, "--- #logs set gmsay 20 1 - Would output Quest errors to gmsay");
+				c->Message(Chat::White, "--- #logs set [console|file|gmsay] <category_id> <debug_level (1-3)> - Sets log settings during the lifetime of the zone");
+				c->Message(Chat::White, "--- #logs set gmsay 20 1 - Would output Quest errors to gmsay");
 			}
 			if (logs_set == 1){
-				c->Message(15, "Your Log Settings have been applied");
-				c->Message(15, "Output Method: %s :: Debug Level: %i - Category: %s",  sep->arg[2], atoi(sep->arg[4]), Logs::LogCategoryName[atoi(sep->arg[3])]);
+				c->Message(Chat::Yellow, "Your Log Settings have been applied");
+				c->Message(Chat::Yellow, "Output Method: %s :: Debug Level: %i - Category: %s",  sep->arg[2], atoi(sep->arg[4]), Logs::LogCategoryName[atoi(sep->arg[3])]);
 			}
 			/* We use a general 'is_category_enabled' now, let's update when we update any output settings
 				This is used in hot places of code to check if its enabled in any way before triggering logs
@@ -11836,10 +12281,10 @@ void command_logs(Client *c, const Seperator *sep){
 		}
 	}
 	else {
-		c->Message(0, "#logs usage:");
-		c->Message(0, "--- #logs reload_all - Reload all settings in world and all zone processes with what is defined in the database");
-		c->Message(0, "--- #logs list_settings - Shows current log settings and categories loaded into the current process' memory");
-		c->Message(0, "--- #logs set [console|file|gmsay] <category_id> <debug_level (1-3)> - Sets log settings during the lifetime of the zone");
+		c->Message(Chat::White, "#logs usage:");
+		c->Message(Chat::White, "--- #logs reload_all - Reload all settings in world and all zone processes with what is defined in the database");
+		c->Message(Chat::White, "--- #logs list_settings - Shows current log settings and categories loaded into the current process' memory");
+		c->Message(Chat::White, "--- #logs set [console|file|gmsay] <category_id> <debug_level (1-3)> - Sets log settings during the lifetime of the zone");
 	}
 }
 
@@ -11868,24 +12313,24 @@ void command_resetaa_timer(Client *c, const Seperator *sep) {
 	if(sep->IsNumber(1))
 	{
 		int timer_id = atoi(sep->arg[1]);
-		c->Message(0, "Reset of timer %i for %s", timer_id, c->GetName());
+		c->Message(Chat::White, "Reset of timer %i for %s", timer_id, c->GetName());
 		c->ResetAlternateAdvancementTimer(timer_id);
 	}
 	else if(!strcasecmp(sep->arg[1], "all"))
 	{
-		c->Message(0, "Reset all timers for %s", c->GetName());
+		c->Message(Chat::White, "Reset all timers for %s", c->GetName());
 		c->ResetAlternateAdvancementTimers();
 	}
 	else
 	{
-		c->Message(0, "usage: #resetaa_timer [all | timer_id]");
+		c->Message(Chat::White, "usage: #resetaa_timer [all | timer_id]");
 	}
 }
 
 void command_reloadaa(Client *c, const Seperator *sep) {
-	c->Message(0, "Reloading Alternate Advancement Data...");
+	c->Message(Chat::White, "Reloading Alternate Advancement Data...");
 	zone->LoadAlternateAdvancement();
-	c->Message(0, "Alternate Advancement Data Reloaded");
+	c->Message(Chat::White, "Alternate Advancement Data Reloaded");
 	entity_list.SendAlternateAdvancementStats();
 }
 
@@ -11910,10 +12355,10 @@ void command_hotfix(Client *c, const Seperator *sep) {
 		}
 #else
 		if(hotfix_name.length() > 0) {
-			system(StringFormat("./shared_memory -hotfix=%s", hotfix_name.c_str()).c_str());
+			if(system(StringFormat("./shared_memory -hotfix=%s", hotfix_name.c_str()).c_str()));
 		}
 		else {
-			system(StringFormat("./shared_memory").c_str());
+			if(system(StringFormat("./shared_memory").c_str()));
 		}
 #endif
 		database.SetVariable("hotfix_name", hotfix_name);
@@ -11924,7 +12369,7 @@ void command_hotfix(Client *c, const Seperator *sep) {
 		}
 		worldserver.SendPacket(&pack);
 
-		if (c) c->Message(0, "Hotfix applied");
+		if (c) c->Message(Chat::White, "Hotfix applied");
 	});
 
 	t1.detach();
@@ -11936,28 +12381,28 @@ void command_load_shared_memory(Client *c, const Seperator *sep) {
 
 	std::string hotfix_name;
 	if(strcasecmp(hotfix.c_str(), sep->arg[1]) == 0) {
-		c->Message(0, "Cannot attempt to load this shared memory segment as it is already loaded.");
+		c->Message(Chat::White, "Cannot attempt to load this shared memory segment as it is already loaded.");
 		return;
 	}
 
 	hotfix_name = sep->arg[1];
-	c->Message(0, "Loading shared memory segment %s", hotfix_name.c_str());
+	c->Message(Chat::White, "Loading shared memory segment %s", hotfix_name.c_str());
 	std::thread t1([c,hotfix_name]() {
 #ifdef _WIN32
 		if(hotfix_name.length() > 0) {
-			system(StringFormat("shared_memory -hotfix=%s", hotfix_name.c_str()).c_str());
+			if(system(StringFormat("shared_memory -hotfix=%s", hotfix_name.c_str()).c_str()));
 		} else {
-			system(StringFormat("shared_memory").c_str());
+			if(system(StringFormat("shared_memory").c_str()));
 		}
 #else
 		if(hotfix_name.length() > 0) {
-			system(StringFormat("./shared_memory -hotfix=%s", hotfix_name.c_str()).c_str());
+			if(system(StringFormat("./shared_memory -hotfix=%s", hotfix_name.c_str()).c_str()));
 		}
 		else {
-			system(StringFormat("./shared_memory").c_str());
+			if(system(StringFormat("./shared_memory").c_str()));
 		}
 #endif
-		c->Message(0, "Shared memory segment finished loading.");
+		c->Message(Chat::White, "Shared memory segment finished loading.");
 	});
 
 	t1.detach();
@@ -11968,7 +12413,7 @@ void command_apply_shared_memory(Client *c, const Seperator *sep) {
 	database.GetVariable("hotfix_name", hotfix);
 	std::string hotfix_name = sep->arg[1];
 
-	c->Message(0, "Applying shared memory segment %s", hotfix_name.c_str());
+	c->Message(Chat::White, "Applying shared memory segment %s", hotfix_name.c_str());
 	database.SetVariable("hotfix_name", hotfix_name);
 
 	ServerPacket pack(ServerOP_ChangeSharedMem, hotfix_name.length() + 1);
@@ -11984,7 +12429,7 @@ void command_reloadperlexportsettings(Client *c, const Seperator *sep)
 	{
 		auto pack = new ServerPacket(ServerOP_ReloadPerlExportSettings, 0);
 		worldserver.SendPacket(pack);
-		c->Message(13, "Successfully sent the packet to world to reload Perl Export settings");
+		c->Message(Chat::Red, "Successfully sent the packet to world to reload Perl Export settings");
 		safe_delete(pack);
 
 	}
@@ -11998,16 +12443,16 @@ void command_trapinfo(Client *c, const Seperator *sep)
 void command_reloadtraps(Client *c, const Seperator *sep)
 {
 	entity_list.UpdateAllTraps(true, true);
-	c->Message(CC_Default, "Traps reloaded for %s.", zone->GetShortName());
+	c->Message(Chat::Default, "Traps reloaded for %s.", zone->GetShortName());
 }
 
 void command_scale(Client *c, const Seperator *sep)
 {
 	if (sep->argnum == 0) {
-		c->Message(15, "# Usage # ");
-		c->Message(15, "#scale [static/dynamic] (With targeted NPC)");
-		c->Message(15, "#scale [npc_name_search] [static/dynamic] (To make zone-wide changes)");
-		c->Message(15, "#scale all [static/dynamic]");
+		c->Message(Chat::Yellow, "# Usage # ");
+		c->Message(Chat::Yellow, "#scale [static/dynamic] (With targeted NPC)");
+		c->Message(Chat::Yellow, "#scale [npc_name_search] [static/dynamic] (To make zone-wide changes)");
+		c->Message(Chat::Yellow, "#scale all [static/dynamic]");
 		return;
 	}
 
@@ -12019,11 +12464,11 @@ void command_scale(Client *c, const Seperator *sep)
 
 		bool apply_status = false;
 		if (strcasecmp(sep->arg[1], "dynamic") == 0) {
-			c->Message(15, "Applying global base scaling to npc dynamically (All stats set to zeroes)...");
+			c->Message(Chat::Yellow, "Applying global base scaling to npc dynamically (All stats set to zeroes)...");
 			apply_status = npc_scale_manager->ApplyGlobalBaseScalingToNPCDynamically(npc);
 		}
 		else if (strcasecmp(sep->arg[1], "static") == 0) {
-			c->Message(15, "Applying global base scaling to npc statically (Copying base stats onto NPC)...");
+			c->Message(Chat::Yellow, "Applying global base scaling to npc statically (Copying base stats onto NPC)...");
 			apply_status = npc_scale_manager->ApplyGlobalBaseScalingToNPCStatically(npc);
 		}
 		else {
@@ -12031,15 +12476,15 @@ void command_scale(Client *c, const Seperator *sep)
 		}
 
 		if (apply_status) {
-			c->Message(15, "Applied to NPC '%s' successfully!", npc->GetName());
+			c->Message(Chat::Yellow, "Applied to NPC '%s' successfully!", npc->GetName());
 		}
 		else {
-			c->Message(15, "Failed to load scaling data from the database "
+			c->Message(Chat::Yellow, "Failed to load scaling data from the database "
 						   "for this npc / type, see 'NPCScaling' log for more info");
 		}
 	}
 	else if (c->GetTarget() && sep->argnum < 2) {
-		c->Message(15, "Target must be an npc!");
+		c->Message(Chat::Yellow, "Target must be an npc!");
 	}
 
 	/**
@@ -12056,9 +12501,9 @@ void command_scale(Client *c, const Seperator *sep)
 		}
 
 		if (scale_type.length() <= 0) {
-			c->Message(15, "You must first set if you intend on using static versus dynamic for these changes");
-			c->Message(15, "#scale [npc_name_search] [static/dynamic]");
-			c->Message(15, "#scale all [static/dynamic]");
+			c->Message(Chat::Yellow, "You must first set if you intend on using static versus dynamic for these changes");
+			c->Message(Chat::Yellow, "#scale [npc_name_search] [static/dynamic]");
+			c->Message(Chat::Yellow, "#scale all [static/dynamic]");
 			return;
 		}
 
@@ -12108,7 +12553,7 @@ void command_scale(Client *c, const Seperator *sep)
 		}
 
 		if (strcasecmp(sep->arg[3], "apply") == 0) {
-			c->Message(15, "%s scaling applied against (%i) NPC's", sep->arg[2], found_count);
+			c->Message(Chat::Yellow, "%s scaling applied against (%i) NPC's", sep->arg[2], found_count);
 		}
 		else {
 
@@ -12118,9 +12563,9 @@ void command_scale(Client *c, const Seperator *sep)
 				sep->arg[2]
 			);
 
-			c->Message(15, "Found (%i) NPC's that match this search...", found_count);
+			c->Message(Chat::Yellow, "Found (%i) NPC's that match this search...", found_count);
 			c->Message(
-				15, "To apply these changes, click <%s> or type %s",
+				Chat::Yellow, "To apply these changes, click <%s> or type %s",
 				EQEmu::SayLinkEngine::GenerateQuestSaylink(saylink, false, "Apply").c_str(),
 				saylink.c_str()
 			);
@@ -12155,7 +12600,7 @@ void command_who(Client *c, const Seperator *sep)
 		return;
 
 	if (results.RowCount() == 0) {
-		c->Message(15, "No results found");
+		c->Message(Chat::Yellow, "No results found");
 		return;
 	}
 
@@ -12167,8 +12612,8 @@ void command_who(Client *c, const Seperator *sep)
 
 	int found_count = 0;
 
-	c->Message(5, "Players in EverQuest");
-	c->Message(5, "--------------------");
+	c->Message(Chat::Magenta, "Players in EverQuest");
+	c->Message(Chat::Magenta, "--------------------");
 
 	for (auto row = results.begin(); row != results.end(); ++row) {
 		auto        account_id      = static_cast<uint32>(atoi(row[0]));
@@ -12245,7 +12690,7 @@ void command_who(Client *c, const Seperator *sep)
 			"There are no players in EverQuest that match those who filters."
 	);
 
-	c->Message(5, message.c_str());
+	c->Message(Chat::Magenta, message.c_str());
 }
 
 void command_network(Client *c, const Seperator *sep)
@@ -12255,57 +12700,57 @@ void command_network(Client *c, const Seperator *sep)
 		auto eqsi = c->Connection();
 		auto manager = eqsi->GetManager();
 		auto opts = manager->GetOptions();
-	
+
 		if (!strcasecmp(sep->arg[2], "all"))
 		{
-			c->Message(0, "max_packet_size: %llu", (uint64_t)opts.daybreak_options.max_packet_size);
-			c->Message(0, "max_connection_count: %llu", (uint64_t)opts.daybreak_options.max_connection_count);
-			c->Message(0, "keepalive_delay_ms: %llu", (uint64_t)opts.daybreak_options.keepalive_delay_ms);
-			c->Message(0, "resend_delay_factor: %.2f", opts.daybreak_options.resend_delay_factor);
-			c->Message(0, "resend_delay_ms: %llu", (uint64_t)opts.daybreak_options.resend_delay_ms);
-			c->Message(0, "resend_delay_min: %llu", (uint64_t)opts.daybreak_options.resend_delay_min);
-			c->Message(0, "resend_delay_max: %llu", (uint64_t)opts.daybreak_options.resend_delay_max);
-			c->Message(0, "connect_delay_ms: %llu", (uint64_t)opts.daybreak_options.connect_delay_ms);
-			c->Message(0, "connect_stale_ms: %llu", (uint64_t)opts.daybreak_options.connect_stale_ms);
-			c->Message(0, "stale_connection_ms: %llu", (uint64_t)opts.daybreak_options.stale_connection_ms);
-			c->Message(0, "crc_length: %llu", (uint64_t)opts.daybreak_options.crc_length);
-			c->Message(0, "hold_size: %llu", (uint64_t)opts.daybreak_options.hold_size);
-			c->Message(0, "hold_length_ms: %llu", (uint64_t)opts.daybreak_options.hold_length_ms);
-			c->Message(0, "simulated_in_packet_loss: %llu", (uint64_t)opts.daybreak_options.simulated_in_packet_loss);
-			c->Message(0, "simulated_out_packet_loss: %llu", (uint64_t)opts.daybreak_options.simulated_out_packet_loss);
-			c->Message(0, "tic_rate_hertz: %.2f", opts.daybreak_options.tic_rate_hertz);
-			c->Message(0, "resend_timeout: %llu", (uint64_t)opts.daybreak_options.resend_timeout);
-			c->Message(0, "connection_close_time: %llu", (uint64_t)opts.daybreak_options.connection_close_time);
-			c->Message(0, "encode_passes[0]: %llu", (uint64_t)opts.daybreak_options.encode_passes[0]);
-			c->Message(0, "encode_passes[1]: %llu", (uint64_t)opts.daybreak_options.encode_passes[1]);
-			c->Message(0, "port: %llu", (uint64_t)opts.daybreak_options.port);
+			c->Message(Chat::White, "max_packet_size: %llu", (uint64_t)opts.daybreak_options.max_packet_size);
+			c->Message(Chat::White, "max_connection_count: %llu", (uint64_t)opts.daybreak_options.max_connection_count);
+			c->Message(Chat::White, "keepalive_delay_ms: %llu", (uint64_t)opts.daybreak_options.keepalive_delay_ms);
+			c->Message(Chat::White, "resend_delay_factor: %.2f", opts.daybreak_options.resend_delay_factor);
+			c->Message(Chat::White, "resend_delay_ms: %llu", (uint64_t)opts.daybreak_options.resend_delay_ms);
+			c->Message(Chat::White, "resend_delay_min: %llu", (uint64_t)opts.daybreak_options.resend_delay_min);
+			c->Message(Chat::White, "resend_delay_max: %llu", (uint64_t)opts.daybreak_options.resend_delay_max);
+			c->Message(Chat::White, "connect_delay_ms: %llu", (uint64_t)opts.daybreak_options.connect_delay_ms);
+			c->Message(Chat::White, "connect_stale_ms: %llu", (uint64_t)opts.daybreak_options.connect_stale_ms);
+			c->Message(Chat::White, "stale_connection_ms: %llu", (uint64_t)opts.daybreak_options.stale_connection_ms);
+			c->Message(Chat::White, "crc_length: %llu", (uint64_t)opts.daybreak_options.crc_length);
+			c->Message(Chat::White, "hold_size: %llu", (uint64_t)opts.daybreak_options.hold_size);
+			c->Message(Chat::White, "hold_length_ms: %llu", (uint64_t)opts.daybreak_options.hold_length_ms);
+			c->Message(Chat::White, "simulated_in_packet_loss: %llu", (uint64_t)opts.daybreak_options.simulated_in_packet_loss);
+			c->Message(Chat::White, "simulated_out_packet_loss: %llu", (uint64_t)opts.daybreak_options.simulated_out_packet_loss);
+			c->Message(Chat::White, "tic_rate_hertz: %.2f", opts.daybreak_options.tic_rate_hertz);
+			c->Message(Chat::White, "resend_timeout: %llu", (uint64_t)opts.daybreak_options.resend_timeout);
+			c->Message(Chat::White, "connection_close_time: %llu", (uint64_t)opts.daybreak_options.connection_close_time);
+			c->Message(Chat::White, "encode_passes[0]: %llu", (uint64_t)opts.daybreak_options.encode_passes[0]);
+			c->Message(Chat::White, "encode_passes[1]: %llu", (uint64_t)opts.daybreak_options.encode_passes[1]);
+			c->Message(Chat::White, "port: %llu", (uint64_t)opts.daybreak_options.port);
 		}
 		else {
-			c->Message(0, "Unknown get option: %s", sep->arg[2]);
-			c->Message(0, "Available options:");
+			c->Message(Chat::White, "Unknown get option: %s", sep->arg[2]);
+			c->Message(Chat::White, "Available options:");
 			//Todo the rest of these when im less lazy.
-			//c->Message(0, "max_packet_size");
-			//c->Message(0, "max_connection_count");
-			//c->Message(0, "keepalive_delay_ms");
-			//c->Message(0, "resend_delay_factor");
-			//c->Message(0, "resend_delay_ms");
-			//c->Message(0, "resend_delay_min");
-			//c->Message(0, "resend_delay_max");
-			//c->Message(0, "connect_delay_ms");
-			//c->Message(0, "connect_stale_ms");
-			//c->Message(0, "stale_connection_ms");
-			//c->Message(0, "crc_length");
-			//c->Message(0, "hold_size");
-			//c->Message(0, "hold_length_ms");
-			//c->Message(0, "simulated_in_packet_loss");
-			//c->Message(0, "simulated_out_packet_loss");
-			//c->Message(0, "tic_rate_hertz");
-			//c->Message(0, "resend_timeout");
-			//c->Message(0, "connection_close_time");
-			//c->Message(0, "encode_passes[0]");
-			//c->Message(0, "encode_passes[1]");
-			//c->Message(0, "port");
-			c->Message(0, "all");
+			//c->Message(Chat::White, "max_packet_size");
+			//c->Message(Chat::White, "max_connection_count");
+			//c->Message(Chat::White, "keepalive_delay_ms");
+			//c->Message(Chat::White, "resend_delay_factor");
+			//c->Message(Chat::White, "resend_delay_ms");
+			//c->Message(Chat::White, "resend_delay_min");
+			//c->Message(Chat::White, "resend_delay_max");
+			//c->Message(Chat::White, "connect_delay_ms");
+			//c->Message(Chat::White, "connect_stale_ms");
+			//c->Message(Chat::White, "stale_connection_ms");
+			//c->Message(Chat::White, "crc_length");
+			//c->Message(Chat::White, "hold_size");
+			//c->Message(Chat::White, "hold_length_ms");
+			//c->Message(Chat::White, "simulated_in_packet_loss");
+			//c->Message(Chat::White, "simulated_out_packet_loss");
+			//c->Message(Chat::White, "tic_rate_hertz");
+			//c->Message(Chat::White, "resend_timeout");
+			//c->Message(Chat::White, "connection_close_time");
+			//c->Message(Chat::White, "encode_passes[0]");
+			//c->Message(Chat::White, "encode_passes[1]");
+			//c->Message(Chat::White, "port");
+			c->Message(Chat::White, "all");
 		}
 	}
 	else if (!strcasecmp(sep->arg[1], "setopt"))
@@ -12313,19 +12758,19 @@ void command_network(Client *c, const Seperator *sep)
 		auto eqsi = c->Connection();
 		auto manager = eqsi->GetManager();
 		auto opts = manager->GetOptions();
-	
+
 		if (!strcasecmp(sep->arg[3], ""))
 		{
-			c->Message(0, "Missing value for set");
+			c->Message(Chat::White, "Missing value for set");
 			return;
 		}
-	
+
 		std::string value = sep->arg[3];
 		if (!strcasecmp(sep->arg[2], "max_connection_count"))
 		{
 			opts.daybreak_options.max_connection_count = std::stoull(value);
 			manager->SetOptions(opts);
-		} 
+		}
 		else if (!strcasecmp(sep->arg[2], "keepalive_delay_ms"))
 		{
 			opts.daybreak_options.keepalive_delay_ms = std::stoull(value);
@@ -12397,30 +12842,30 @@ void command_network(Client *c, const Seperator *sep)
 			manager->SetOptions(opts);
 		}
 		else {
-			c->Message(0, "Unknown set option: %s", sep->arg[2]);
-			c->Message(0, "Available options:");
-			c->Message(0, "max_connection_count");
-			c->Message(0, "keepalive_delay_ms");
-			c->Message(0, "resend_delay_factor");
-			c->Message(0, "resend_delay_ms");
-			c->Message(0, "resend_delay_min");
-			c->Message(0, "resend_delay_max");
-			c->Message(0, "connect_delay_ms");
-			c->Message(0, "connect_stale_ms");
-			c->Message(0, "stale_connection_ms");
-			c->Message(0, "hold_size");
-			c->Message(0, "hold_length_ms");
-			c->Message(0, "simulated_in_packet_loss");
-			c->Message(0, "simulated_out_packet_loss");
-			c->Message(0, "resend_timeout");
-			c->Message(0, "connection_close_time");
+			c->Message(Chat::White, "Unknown set option: %s", sep->arg[2]);
+			c->Message(Chat::White, "Available options:");
+			c->Message(Chat::White, "max_connection_count");
+			c->Message(Chat::White, "keepalive_delay_ms");
+			c->Message(Chat::White, "resend_delay_factor");
+			c->Message(Chat::White, "resend_delay_ms");
+			c->Message(Chat::White, "resend_delay_min");
+			c->Message(Chat::White, "resend_delay_max");
+			c->Message(Chat::White, "connect_delay_ms");
+			c->Message(Chat::White, "connect_stale_ms");
+			c->Message(Chat::White, "stale_connection_ms");
+			c->Message(Chat::White, "hold_size");
+			c->Message(Chat::White, "hold_length_ms");
+			c->Message(Chat::White, "simulated_in_packet_loss");
+			c->Message(Chat::White, "simulated_out_packet_loss");
+			c->Message(Chat::White, "resend_timeout");
+			c->Message(Chat::White, "connection_close_time");
 		}
 	}
 	else {
-		c->Message(0, "Unknown command: %s", sep->arg[1]);
-		c->Message(0, "Network commands avail:");
-		c->Message(0, "getopt optname - Retrieve the current option value set.");
-		c->Message(0, "setopt optname - Set the current option allowed.");
+		c->Message(Chat::White, "Unknown command: %s", sep->arg[1]);
+		c->Message(Chat::White, "Network commands avail:");
+		c->Message(Chat::White, "getopt optname - Retrieve the current option value set.");
+		c->Message(Chat::White, "setopt optname - Set the current option allowed.");
 	}
 }
 
@@ -12443,12 +12888,12 @@ void command_bot(Client *c, const Seperator *sep)
 		if (parse->PlayerHasQuestSub(EVENT_COMMAND)) {
 			int i = parse->EventPlayer(EVENT_COMMAND, c, bot_message, 0);
 			if (i == 0 && !RuleB(Chat, SuppressCommandErrors)) {
-				c->Message(13, "Bot command '%s' not recognized.", bot_message.c_str());
+				c->Message(Chat::Red, "Bot command '%s' not recognized.", bot_message.c_str());
 			}
 		}
 		else {
 			if (!RuleB(Chat, SuppressCommandErrors))
-				c->Message(13, "Bot command '%s' not recognized.", bot_message.c_str());
+				c->Message(Chat::Red, "Bot command '%s' not recognized.", bot_message.c_str());
 		}
 	}
 }
diff --git a/zone/command.h b/zone/command.h
index e11b7bcfb..af92ec3f8 100644
--- a/zone/command.h
+++ b/zone/command.h
@@ -182,6 +182,7 @@ void command_netstats(Client *c, const Seperator *sep);
 void command_network(Client *c, const Seperator *sep);
 void command_npccast(Client *c, const Seperator *sep);
 void command_npcedit(Client *c, const Seperator *sep);
+void command_npceditmass(Client *c, const Seperator *sep);
 void command_npcemote(Client *c, const Seperator *sep);
 void command_npcloot(Client *c, const Seperator *sep);
 void command_npcsay(Client *c, const Seperator *sep);
@@ -247,6 +248,7 @@ void command_repopclose(Client *c, const Seperator *sep);
 void command_resetaa(Client* c,const Seperator *sep);
 void command_resetaa_timer(Client *c, const Seperator *sep);
 void command_revoke(Client *c, const Seperator *sep);
+void command_roambox(Client *c, const Seperator *sep);
 void command_rules(Client *c, const Seperator *sep);
 void command_save(Client *c, const Seperator *sep);
 void command_scale(Client *c, const Seperator *sep);
@@ -286,6 +288,7 @@ void command_showzonegloballoot(Client *c, const Seperator *sep);
 void command_shutdown(Client *c, const Seperator *sep);
 void command_size(Client *c, const Seperator *sep);
 void command_spawn(Client *c, const Seperator *sep);
+void command_spawneditmass(Client *c, const Seperator *sep);
 void command_spawnfix(Client *c, const Seperator *sep);
 void command_spawnstatus(Client *c, const Seperator *sep);
 void command_spellinfo(Client *c, const Seperator *sep);
diff --git a/zone/common.h b/zone/common.h
index 62f1d9771..0ffa67468 100644
--- a/zone/common.h
+++ b/zone/common.h
@@ -272,6 +272,31 @@ enum class LootRequestType : uint8 {
 	AllowedPVPDefined,
 };
 
+namespace Journal {
+	enum class SpeakMode : uint8 {
+		Raw = 0,	// this just uses the raw message
+		Say = 1,	// prints with "%1 says,%2 '%3'" if in another language else "%1 says '%2'"
+		Shout = 2,	// prints with "%1 shouts,%2 '%3'" if in another language else "%1 shouts '%2'"
+		EmoteAlt = 3,	// prints "%2", this should just be the same as raw ...
+		Emote = 4,	// prints "%1 %2" if message doesn't start with "\" or "@", else "%1%2"
+		Group = 5	// prints "%1 tells the group,%2 '%3'"
+	};
+
+	enum class Mode : uint8 {
+		None = 0,
+		Log1 = 1, // 1 and 2 log to journal
+		Log2 = 2, // our current code uses 2
+	};
+
+	struct Options {
+		SpeakMode speak_mode;
+		Mode journal_mode;
+		int8 language;
+		uint32 message_type;
+		uint32 target_spawn_id; // who the message is talking to (limits journaling)
+	};
+};
+
 //this is our internal representation of the BUFF struct, can put whatever we want in it
 struct Buffs_Struct {
 	uint16	spellid;
diff --git a/zone/corpse.cpp b/zone/corpse.cpp
index 3ae12ede0..931804743 100644
--- a/zone/corpse.cpp
+++ b/zone/corpse.cpp
@@ -889,14 +889,14 @@ void Corpse::MakeLootRequestPackets(Client* client, const EQApplicationPacket* a
 
 	if(IsPlayerCorpse() && !corpse_db_id) { // really should try to resave in this case
 		// SendLootReqErrorPacket(client, 0);
-		client->Message(13, "Warning: Corpse's dbid = 0! Corpse will not survive zone shutdown!");
+		client->Message(Chat::Red, "Warning: Corpse's dbid = 0! Corpse will not survive zone shutdown!");
 		std::cout << "Error: PlayerCorpse::MakeLootRequestPackets: dbid = 0!" << std::endl;
 		// return;
 	}
 
 	if(is_locked && client->Admin() < 100) {
 		SendLootReqErrorPacket(client, LootResponse::SomeoneElse);
-		client->Message(13, "Error: Corpse locked by GM.");
+		client->Message(Chat::Red, "Error: Corpse locked by GM.");
 		return;
 	}
 
@@ -960,7 +960,7 @@ void Corpse::MakeLootRequestPackets(Client* client, const EQApplicationPacket* a
 		loot_coin = (tmp[0] == 1 && tmp[1] == '\0');
 
 	if (loot_request_type == LootRequestType::GMPeek || loot_request_type == LootRequestType::GMAllowed) {
-		client->Message(15, "This corpse contains %u platinum, %u gold, %u silver and %u copper.",
+		client->Message(Chat::Yellow, "This corpse contains %u platinum, %u gold, %u silver and %u copper.",
 			GetPlatinum(), GetGold(), GetSilver(), GetCopper());
 
 		auto outapp = new EQApplicationPacket(OP_MoneyOnCorpse, sizeof(moneyOnCorpseStruct));
@@ -1035,7 +1035,7 @@ void Corpse::MakeLootRequestPackets(Client* client, const EQApplicationPacket* a
 		else {
 			Log(Logs::General, Logs::Inventory, "MakeLootRequestPackets() PlayerKillItem %i not found", pkitemid);
 
-			client->Message(CC_Red, "PlayerKillItem (id: %i) could not be found!", pkitemid);
+			client->Message(Chat::Red, "PlayerKillItem (id: %i) could not be found!", pkitemid);
 		}
 
 		client->QueuePacket(app);
@@ -1129,7 +1129,7 @@ void Corpse::LootItem(Client *client, const EQApplicationPacket *app)
 
 	/* To prevent item loss for a player using 'Loot All' who doesn't have inventory space for all their items. */
 	if (RuleB(Character, CheckCursorEmptyWhenLooting) && !client->GetInv().CursorEmpty()) {
-		client->Message(13, "You may not loot an item while you have an item on your cursor.");
+		client->Message(Chat::Red, "You may not loot an item while you have an item on your cursor.");
 		client->QueuePacket(app);
 		SendEndLootErrorPacket(client);
 		/* Unlock corpse for others */
@@ -1146,7 +1146,7 @@ void Corpse::LootItem(Client *client, const EQApplicationPacket *app)
 
 	if (IsPlayerCorpse() && !CanPlayerLoot(client->CharacterID()) && !become_npc &&
 		(char_id != client->CharacterID() && client->Admin() < 150)) {
-		client->Message(13, "Error: This is a player corpse and you dont own it.");
+		client->Message(Chat::Red, "Error: This is a player corpse and you dont own it.");
 		client->QueuePacket(app);
 		SendEndLootErrorPacket(client);
 		return;
@@ -1155,13 +1155,13 @@ void Corpse::LootItem(Client *client, const EQApplicationPacket *app)
 	if (is_locked && client->Admin() < 100) {
 		client->QueuePacket(app);
 		SendLootReqErrorPacket(client, LootResponse::SomeoneElse);
-		client->Message(13, "Error: Corpse locked by GM.");
+		client->Message(Chat::Red, "Error: Corpse locked by GM.");
 		return;
 	}
 
 	if (IsPlayerCorpse() && (char_id != client->CharacterID()) && CanPlayerLoot(client->CharacterID()) &&
 		GetPlayerKillItem() == 0) {
-		client->Message(13, "Error: You cannot loot any more items from this corpse.");
+		client->Message(Chat::Red, "Error: You cannot loot any more items from this corpse.");
 		client->QueuePacket(app);
 		SendEndLootErrorPacket(client);
 		ResetLooter();
@@ -1201,7 +1201,7 @@ void Corpse::LootItem(Client *client, const EQApplicationPacket *app)
 
 	if (client && inst) {
 		if (client->CheckLoreConflict(item)) {
-			client->Message_StringID(0, LOOT_LORE_ERROR);
+			client->MessageString(Chat::White, LOOT_LORE_ERROR);
 			client->QueuePacket(app);
 			SendEndLootErrorPacket(client);
 			ResetLooter();
@@ -1214,7 +1214,7 @@ void Corpse::LootItem(Client *client, const EQApplicationPacket *app)
 				EQEmu::ItemInstance *itm = inst->GetAugment(i);
 				if (itm) {
 					if (client->CheckLoreConflict(itm->GetItem())) {
-						client->Message_StringID(0, LOOT_LORE_ERROR);
+						client->MessageString(Chat::White, LOOT_LORE_ERROR);
 						client->QueuePacket(app);
 						SendEndLootErrorPacket(client);
 						ResetLooter();
@@ -1236,7 +1236,7 @@ void Corpse::LootItem(Client *client, const EQApplicationPacket *app)
 		args.push_back(this);
 		if (parse->EventPlayer(EVENT_LOOT, client, buf, 0, &args) != 0) {
 			lootitem->auto_loot = -1;
-			client->Message_StringID(CC_Red, LOOT_NOT_ALLOWED, inst->GetItem()->Name);
+			client->MessageString(Chat::Red, LOOT_NOT_ALLOWED, inst->GetItem()->Name);
 			client->QueuePacket(app);
 			delete inst;
 			return;
@@ -1312,18 +1312,18 @@ void Corpse::LootItem(Client *client, const EQApplicationPacket *app)
 
 		linker.GenerateLink();
 
-		client->Message_StringID(MT_LootMessages, LOOTED_MESSAGE, linker.Link().c_str());
+		client->MessageString(Chat::Loot, LOOTED_MESSAGE, linker.Link().c_str());
 
 		if (!IsPlayerCorpse()) {
 			Group *g = client->GetGroup();
 			if (g != nullptr) {
-				g->GroupMessage_StringID(client, MT_LootMessages, OTHER_LOOTED_MESSAGE,
+				g->GroupMessageString(client, Chat::Loot, OTHER_LOOTED_MESSAGE,
 					client->GetName(), linker.Link().c_str());
 			}
 			else {
 				Raid *r = client->GetRaid();
 				if (r != nullptr) {
-					r->RaidMessage_StringID(client, MT_LootMessages, OTHER_LOOTED_MESSAGE,
+					r->RaidMessageString(client, Chat::Loot, OTHER_LOOTED_MESSAGE,
 						client->GetName(), linker.Link().c_str());
 				}
 			}
@@ -1371,7 +1371,7 @@ void Corpse::FillSpawnStruct(NewSpawn_Struct* ns, Mob* ForWho) {
 
 void Corpse::QueryLoot(Client* to) {
 	int x = 0, y = 0; // x = visible items, y = total items
-	to->Message(0, "Coin: %ip, %ig, %is, %ic", platinum, gold, silver, copper);
+	to->Message(Chat::White, "Coin: %ip, %ig, %is, %ic", platinum, gold, silver, copper);
 
 	ItemList::iterator cur,end;
 	cur = itemlist.begin();
@@ -1405,19 +1405,19 @@ void Corpse::QueryLoot(Client* to) {
 			const EQEmu::ItemData* item = database.GetItem(sitem->item_id);
 
 			if (item)
-				to->Message(0, "LootSlot: %i Item: %s (%d), Count: %i", sitem->lootslot, item->Name, item->ID, sitem->charges);
+				to->Message(Chat::White, "LootSlot: %i Item: %s (%d), Count: %i", sitem->lootslot, item->Name, item->ID, sitem->charges);
 			else
-				to->Message(0, "Error: 0x%04x", sitem->item_id);
+				to->Message(Chat::White, "Error: 0x%04x", sitem->item_id);
 
 			y++;
 		}
 	}
 
 	if (IsPlayerCorpse()) {
-		to->Message(0, "%i visible %s (%i total) on %s (DBID: %i).", x, x==1?"item":"items", y, this->GetName(), this->GetCorpseDBID());
+		to->Message(Chat::White, "%i visible %s (%i total) on %s (DBID: %i).", x, x==1?"item":"items", y, this->GetName(), this->GetCorpseDBID());
 	}
 	else {
-		to->Message(0, "%i %s on %s.", y, y==1?"item":"items", this->GetName());
+		to->Message(Chat::White, "%i %s on %s.", y, y==1?"item":"items", this->GetName());
 	}
 }
 
@@ -1426,7 +1426,7 @@ bool Corpse::Summon(Client* client, bool spell, bool CheckDistance) {
 	if (!spell) {
 		if (this->GetCharID() == client->CharacterID()) {
 			if (IsLocked() && client->Admin() < 100) {
-				client->Message(13, "That corpse is locked by a GM.");
+				client->Message(Chat::Red, "That corpse is locked by a GM.");
 				return false;
 			}
 			if (!CheckDistance || (DistanceSquaredNoZ(m_Position, client->GetPosition()) <= dist2)) {
@@ -1434,7 +1434,7 @@ bool Corpse::Summon(Client* client, bool spell, bool CheckDistance) {
 				is_corpse_changed = true;
 			}
 			else {
-				client->Message(0, "Corpse is too far away.");
+				client->Message(Chat::White, "Corpse is too far away.");
 				return false;
 			}
 		}
@@ -1449,14 +1449,14 @@ bool Corpse::Summon(Client* client, bool spell, bool CheckDistance) {
 						is_corpse_changed = true;
 					}
 					else {
-						client->Message(0, "Corpse is too far away.");
+						client->Message(Chat::White, "Corpse is too far away.");
 						return false;
 					}
 					consented = true;
 				}
 			}
 			if(!consented) {
-				client->Message(0, "You do not have permission to move this corpse.");
+				client->Message(Chat::White, "You do not have permission to move this corpse.");
 				return false;
 			}
 		}
diff --git a/zone/doors.cpp b/zone/doors.cpp
index 899e3f6b5..d81eb72f8 100644
--- a/zone/doors.cpp
+++ b/zone/doors.cpp
@@ -171,7 +171,7 @@ void Doors::HandleClick(Client* sender, uint8 trigger) {
 			if (RuleI(Adventure, ItemIDToEnablePorts) != 0) {
 				if (!sender->KeyRingCheck(RuleI(Adventure, ItemIDToEnablePorts))) {
 					if (sender->GetInv().HasItem(RuleI(Adventure, ItemIDToEnablePorts)) == INVALID_INDEX) {
-						sender->Message_StringID(13, DUNGEON_SEALED);
+						sender->MessageString(Chat::Red, DUNGEON_SEALED);
 						safe_delete(outapp);
 						return;
 					} else {
@@ -267,7 +267,7 @@ void Doors::HandleClick(Client* sender, uint8 trigger) {
 				strcpy(door_message, "Door is locked by an unknown guild");
 			}
 
-			sender->Message(4, door_message);
+			sender->Message(Chat::LightBlue, door_message);
 			safe_delete(outapp);
 			return;
 		}
@@ -275,13 +275,13 @@ void Doors::HandleClick(Client* sender, uint8 trigger) {
 		/**
 		 * Key required
 		 */
-		sender->Message(4, "This is locked...");
+		sender->Message(Chat::LightBlue, "This is locked...");
 
 		/**
 		 * GM can always open locks
 		 */
 		if (sender->GetGM()) {
-			sender->Message_StringID(4, DOORS_GM);
+			sender->MessageString(Chat::LightBlue, DOORS_GM);
 
 			if (!IsDoorOpen() || (open_type == 58)) {
 				move_door_packet->action = static_cast<uint8>(invert_state == 0 ? OPEN_DOOR : OPEN_INVDOOR);
@@ -306,7 +306,7 @@ void Doors::HandleClick(Client* sender, uint8 trigger) {
 					sender->KeyRingAdd(player_key);
 				}
 
-				sender->Message(4, "You got it open!");
+				sender->Message(Chat::LightBlue, "You got it open!");
 
 				if (!IsDoorOpen() || (open_type == 58)) {
 					move_door_packet->action = static_cast<uint8>(invert_state == 0 ? OPEN_DOOR : OPEN_INVDOOR);
@@ -333,19 +333,19 @@ void Doors::HandleClick(Client* sender, uint8 trigger) {
 						} else {
 							move_door_packet->action = static_cast<uint8>(invert_state == 0 ? CLOSE_DOOR : CLOSE_INVDOOR);
 						}
-						sender->Message_StringID(4, DOORS_SUCCESSFUL_PICK);
+						sender->MessageString(Chat::LightBlue, DOORS_SUCCESSFUL_PICK);
 					} else {
-						sender->Message_StringID(4, DOORS_INSUFFICIENT_SKILL);
+						sender->MessageString(Chat::LightBlue, DOORS_INSUFFICIENT_SKILL);
 						safe_delete(outapp);
 						return;
 					}
 				} else {
-					sender->Message_StringID(4, DOORS_NO_PICK);
+					sender->MessageString(Chat::LightBlue, DOORS_NO_PICK);
 					safe_delete(outapp);
 					return;
 				}
 			} else {
-				sender->Message_StringID(4, DOORS_CANT_PICK);
+				sender->MessageString(Chat::LightBlue, DOORS_CANT_PICK);
 				safe_delete(outapp);
 				return;
 			}
@@ -361,14 +361,14 @@ void Doors::HandleClick(Client* sender, uint8 trigger) {
 			 */
 			if (sender->KeyRingCheck(required_key_item)) {
 				player_key = required_key_item;
-				sender->Message(4, "You got it open!"); // more debug spam
+				sender->Message(Chat::LightBlue, "You got it open!"); // more debug spam
 				if (!IsDoorOpen() || (open_type == 58)) {
 					move_door_packet->action = static_cast<uint8>(invert_state == 0 ? OPEN_DOOR : OPEN_INVDOOR);
 				} else {
 					move_door_packet->action = static_cast<uint8>(invert_state == 0 ? CLOSE_DOOR : CLOSE_INVDOOR);
 				}
 			} else {
-				sender->Message_StringID(4, DOORS_LOCKED);
+				sender->MessageString(Chat::LightBlue, DOORS_LOCKED);
 				safe_delete(outapp);
 				return;
 			}
diff --git a/zone/effects.cpp b/zone/effects.cpp
index 7887eb652..25923b35f 100644
--- a/zone/effects.cpp
+++ b/zone/effects.cpp
@@ -122,11 +122,12 @@ int32 Mob::GetActSpellDamage(uint16 spell_id, int32 value, Mob* target) {
 			else if (IsNPC() && CastToNPC()->GetSpellScale())
 				value = int(static_cast<float>(value) * CastToNPC()->GetSpellScale() / 100.0f);
 
-			entity_list.MessageClose_StringID(this, true, 100, MT_SpellCrits,
-					OTHER_CRIT_BLAST, GetName(), itoa(-value));
+			entity_list.MessageCloseString(
+				this, true, 100, Chat::SpellCrit,
+				OTHER_CRIT_BLAST, GetName(), itoa(-value));
 
 			if (IsClient())
-				Message_StringID(MT_SpellCrits, YOU_CRIT_BLAST, itoa(-value));
+				MessageString(Chat::SpellCrit, YOU_CRIT_BLAST, itoa(-value));
 
 			return value;
 		}
@@ -306,11 +307,12 @@ int32 Mob::GetActSpellHealing(uint16 spell_id, int32 value, Mob* target) {
 			value = int(static_cast<float>(value) * CastToNPC()->GetHealScale() / 100.0f);
 
 		if (Critical) {
-			entity_list.MessageClose_StringID(this, true, 100, MT_SpellCrits,
-					OTHER_CRIT_HEAL, GetName(), itoa(value));
+			entity_list.MessageCloseString(
+				this, true, 100, Chat::SpellCrit,
+				OTHER_CRIT_HEAL, GetName(), itoa(value));
 
 			if (IsClient())
-				Message_StringID(MT_SpellCrits, YOU_CRIT_HEAL, itoa(value));
+				MessageString(Chat::SpellCrit, YOU_CRIT_HEAL, itoa(value));
 		}
 
 		return value;
@@ -432,13 +434,13 @@ bool Client::TrainDiscipline(uint32 itemid) {
 	//get the item info
 	const EQEmu::ItemData *item = database.GetItem(itemid);
 	if(item == nullptr) {
-		Message(13, "Unable to find the tome you turned in!");
+		Message(Chat::Red, "Unable to find the tome you turned in!");
 		Log(Logs::General, Logs::Error, "Unable to find turned in tome id %lu\n", (unsigned long)itemid);
 		return(false);
 	}
 
 	if (!item->IsClassCommon() || item->ItemType != EQEmu::item::ItemTypeSpell) {
-		Message(13, "Invalid item type, you cannot learn from this item.");
+		Message(Chat::Red, "Invalid item type, you cannot learn from this item.");
 		//summon them the item back...
 		SummonItem(itemid);
 		return(false);
@@ -462,7 +464,7 @@ bool Client::TrainDiscipline(uint32 itemid) {
 		item->Name[5] == ':' &&
 		item->Name[6] == ' '
 		)) {
-		Message(13, "This item is not a tome.");
+		Message(Chat::Red, "This item is not a tome.");
 		//summon them the item back...
 		SummonItem(itemid);
 		return(false);
@@ -470,7 +472,7 @@ bool Client::TrainDiscipline(uint32 itemid) {
 
 	int myclass = GetClass();
 	if(myclass == WIZARD || myclass == ENCHANTER || myclass == MAGICIAN || myclass == NECROMANCER) {
-		Message(13, "Your class cannot learn from this tome.");
+		Message(Chat::Red, "Your class cannot learn from this tome.");
 		//summon them the item back...
 		SummonItem(itemid);
 		return(false);
@@ -480,7 +482,7 @@ bool Client::TrainDiscipline(uint32 itemid) {
 	//can we use the item?
 	uint32 cbit = 1 << (myclass-1);
 	if(!(item->Classes & cbit)) {
-		Message(13, "Your class cannot learn from this tome.");
+		Message(Chat::Red, "Your class cannot learn from this tome.");
 		//summon them the item back...
 		SummonItem(itemid);
 		return(false);
@@ -488,7 +490,7 @@ bool Client::TrainDiscipline(uint32 itemid) {
 
 	uint32 spell_id = item->Scroll.Effect;
 	if(!IsValidSpell(spell_id)) {
-		Message(13, "This tome contains invalid knowledge.");
+		Message(Chat::Red, "This tome contains invalid knowledge.");
 		return(false);
 	}
 
@@ -496,14 +498,14 @@ bool Client::TrainDiscipline(uint32 itemid) {
 	const SPDat_Spell_Struct &spell = spells[spell_id];
 	uint8 level_to_use = spell.classes[myclass - 1];
 	if(level_to_use == 255) {
-		Message(13, "Your class cannot learn from this tome.");
+		Message(Chat::Red, "Your class cannot learn from this tome.");
 		//summon them the item back...
 		SummonItem(itemid);
 		return(false);
 	}
 
 	if(level_to_use > GetLevel()) {
-		Message(13, "You must be at least level %d to learn this discipline.", level_to_use);
+		Message(Chat::Red, "You must be at least level %d to learn this discipline.", level_to_use);
 		//summon them the item back...
 		SummonItem(itemid);
 		return(false);
@@ -513,7 +515,7 @@ bool Client::TrainDiscipline(uint32 itemid) {
 	int r;
 	for(r = 0; r < MAX_PP_DISCIPLINES; r++) {
 		if(m_pp.disciplines.values[r] == spell_id) {
-			Message(13, "You already know this discipline.");
+			Message(Chat::Red, "You already know this discipline.");
 			//summon them the item back...
 			SummonItem(itemid);
 			return(false);
@@ -525,7 +527,7 @@ bool Client::TrainDiscipline(uint32 itemid) {
 			return(true);
 		}
 	}
-	Message(13, "You have learned too many disciplines and can learn no more.");
+	Message(Chat::Red, "You have learned too many disciplines and can learn no more.");
 	return(false);
 }
 
@@ -537,7 +539,7 @@ void Client::TrainDiscBySpellID(int32 spell_id)
 			m_pp.disciplines.values[i] = spell_id;
 			database.SaveCharacterDisc(this->CharacterID(), i, spell_id);
 			SendDisciplineUpdate();
-			Message(15, "You have learned a new combat ability!");
+			Message(Chat::Yellow, "You have learned a new combat ability!");
 			return;
 		}
 	}
@@ -581,7 +583,7 @@ bool Client::UseDiscipline(uint32 spell_id, uint32 target) {
 
 	//make sure we can use it..
 	if(!IsValidSpell(spell_id)) {
-		Message(13, "This tome contains invalid knowledge.");
+		Message(Chat::Red, "This tome contains invalid knowledge.");
 		return(false);
 	}
 
@@ -589,13 +591,13 @@ bool Client::UseDiscipline(uint32 spell_id, uint32 target) {
 	const SPDat_Spell_Struct &spell = spells[spell_id];
 	uint8 level_to_use = spell.classes[GetClass() - 1];
 	if(level_to_use == 255) {
-		Message(13, "Your class cannot learn from this tome.");
+		Message(Chat::Red, "Your class cannot learn from this tome.");
 		//should summon them a new one...
 		return(false);
 	}
 
 	if(level_to_use > GetLevel()) {
-		Message_StringID(13, DISC_LEVEL_USE_ERROR);
+		MessageString(Chat::Red, DISC_LEVEL_USE_ERROR);
 		//should summon them a new one...
 		return(false);
 	}
@@ -607,7 +609,7 @@ bool Client::UseDiscipline(uint32 spell_id, uint32 target) {
 
 	// sneak attack discs require you to be hidden for 4 seconds before use
 	if (spell.sneak && (!hidden || (hidden && (Timer::GetCurrentTime() - tmHidden) < 4000))) {
-		Message_StringID(MT_SpellFailure, SNEAK_RESTRICT);
+		MessageString(Chat::SpellFailure, SNEAK_RESTRICT);
 		return false;
 	}
 
@@ -621,7 +623,7 @@ bool Client::UseDiscipline(uint32 spell_id, uint32 target) {
 		/*char val1[20]={0};*/	//unused
 		/*char val2[20]={0};*/	//unused
 		uint32 remain = p_timers.GetRemainingTime(DiscTimer);
-		//Message_StringID(0, DISCIPLINE_CANUSEIN, ConvertArray((remain)/60,val1), ConvertArray(remain%60,val2));
+		//MessageString(Chat::White, DISCIPLINE_CANUSEIN, ConvertArray((remain)/60,val1), ConvertArray(remain%60,val2));
 		Message(0, "You can use this discipline in %d minutes %d seconds.", ((remain)/60), (remain%60));
 		return(false);
 	}
diff --git a/zone/embparser_api.cpp b/zone/embparser_api.cpp
index 154e28566..5cb17ca50 100644
--- a/zone/embparser_api.cpp
+++ b/zone/embparser_api.cpp
@@ -155,12 +155,31 @@ XS(XS__say); // prototype to pass -Wmissing-prototypes
 XS(XS__say) {
 	dXSARGS;
 
-	if (items == 1)
-		quest_manager.say(SvPV_nolen(ST(0)));
-	else if (items == 2)
-		quest_manager.say(SvPV_nolen(ST(0)), (int) SvIV(ST(1)));
-	else
-		Perl_croak(aTHX_ "Usage: quest::say(string message, int language_id])");
+	Journal::Options opts;
+	// we currently default to these
+	opts.speak_mode = Journal::SpeakMode::Say;
+	opts.journal_mode = Journal::Mode::Log2;
+	opts.language = 0;
+	opts.message_type = Chat::NPCQuestSay;
+	if (items == 0 || items > 5) {
+		Perl_croak(aTHX_ "Usage: quest::say(string message, [int language_id], [int message_type], [int speak_mode], [int journal_mode])");
+	} else if (items == 2) {
+		opts.language = (int)SvIV(ST(1));
+	} else if (items == 3) {
+		opts.language = (int)SvIV(ST(1));
+		opts.message_type = (int)SvIV(ST(2));
+	} else if (items == 4) {
+		opts.language = (int)SvIV(ST(1));
+		opts.message_type = (int)SvIV(ST(2));
+		opts.speak_mode = (Journal::SpeakMode)SvIV(ST(3));
+	} else if (items == 5) {
+		opts.language = (int)SvIV(ST(1));
+		opts.message_type = (int)SvIV(ST(2));
+		opts.speak_mode = (Journal::SpeakMode)SvIV(ST(3));
+		opts.journal_mode = (Journal::Mode)SvIV(ST(4));
+	}
+
+	quest_manager.say(SvPV_nolen(ST(0)), opts);
 
 	XSRETURN_EMPTY;
 }
diff --git a/zone/entity.cpp b/zone/entity.cpp
index b488e2f99..148c9e2ef 100644
--- a/zone/entity.cpp
+++ b/zone/entity.cpp
@@ -1235,33 +1235,19 @@ void EntityList::ChannelMessage(Mob *from, uint8 chan_num, uint8 language,
 	while(it != client_list.end()) {
 		Client *client = it->second;
 		eqFilterType filter = FilterNone;
-		if (chan_num == 3) //shout
+		if (chan_num == ChatChannel_Shout) //shout
 			filter = FilterShouts;
-		else if (chan_num == 4) //auction
+		else if (chan_num == ChatChannel_Auction) //auction
 			filter = FilterAuctions;
 		//
 		// Only say is limited in range
-		if (chan_num != 8 || Distance(client->GetPosition(), from->GetPosition()) < 200)
+		if (chan_num != ChatChannel_Say || Distance(client->GetPosition(), from->GetPosition()) < 200)
 			if (filter == FilterNone || client->GetFilter(filter) != FilterHide)
 				client->ChannelMessageSend(from->GetName(), 0, chan_num, language, lang_skill, buffer);
 		++it;
 	}
 }
 
-void EntityList::ChannelMessageSend(Mob *to, uint8 chan_num, uint8 language, const char *message, ...)
-{
-	if (!to->IsClient())
-		return;
-	va_list argptr;
-	char buffer[4096];
-
-	va_start(argptr, message);
-	vsnprintf(buffer, 4096, message, argptr);
-	va_end(argptr);
-
-	to->CastToClient()->ChannelMessageSend(0, 0, chan_num, language, buffer);
-}
-
 void EntityList::SendZoneSpawns(Client *client)
 {
 	EQApplicationPacket *app;
@@ -1685,9 +1671,9 @@ void EntityList::DuelMessage(Mob *winner, Mob *loser, bool flee)
 		//might want some sort of distance check in here?
 		if (cur != winner && cur != loser) {
 			if (flee)
-				cur->Message_StringID(15, DUEL_FLED, winner->GetName(),loser->GetName(),loser->GetName());
+				cur->MessageString(Chat::Yellow, DUEL_FLED, winner->GetName(),loser->GetName(),loser->GetName());
 			else
-				cur->Message_StringID(15, DUEL_FINISHED, winner->GetName(),loser->GetName());
+				cur->MessageString(Chat::Yellow, DUEL_FINISHED, winner->GetName(),loser->GetName());
 		}
 		++it;
 	}
@@ -1727,6 +1713,18 @@ Client *EntityList::GetClientByWID(uint32 iWID)
 	return nullptr;
 }
 
+Client *EntityList::GetClientByLSID(uint32 iLSID)
+{
+	auto it = client_list.begin();
+	while (it != client_list.end()) {
+		if (it->second->LSAccountID() == iLSID) {
+			return it->second;
+		}
+		++it;
+	}
+	return nullptr;
+}
+
 Client *EntityList::GetRandomClient(const glm::vec3& location, float Distance, Client *ExcludeClient)
 {
 	std::vector<Client *> ClientsInRange;
@@ -1995,22 +1993,22 @@ Client *EntityList::GetClientByAccID(uint32 accid)
 }
 
 void EntityList::ChannelMessageFromWorld(const char *from, const char *to,
-		uint8 chan_num, uint32 guild_id, uint8 language, const char *message)
+		uint8 chan_num, uint32 guild_id, uint8 language, uint8 lang_skill, const char *message)
 {
 	for (auto it = client_list.begin(); it != client_list.end(); ++it) {
 		Client *client = it->second;
-		if (chan_num == 0) {
+		if (chan_num == ChatChannel_Guild) {
 			if (!client->IsInGuild(guild_id))
 				continue;
 			if (!guild_mgr.CheckPermission(guild_id, client->GuildRank(), GUILD_HEAR))
 				continue;
 			if (client->GetFilter(FilterGuildChat) == FilterHide)
 				continue;
-		} else if (chan_num == 5) {
+		} else if (chan_num == ChatChannel_OOC) {
 			if (client->GetFilter(FilterOOC) == FilterHide)
 				continue;
 		}
-		client->ChannelMessageSend(from, to, chan_num, language, message);
+		client->ChannelMessageSend(from, to, chan_num, language, lang_skill, message);
 	}
 }
 
@@ -2073,7 +2071,7 @@ void EntityList::QueueClientsGuildBankItemUpdate(const GuildBankItemUpdate_Struc
 void EntityList::MessageStatus(uint32 to_guild_id, int to_minstatus, uint32 type, const char *message, ...)
 {
 	va_list argptr;
-	char buffer[4096];
+	char    buffer[4096];
 
 	va_start(argptr, message);
 	vsnprintf(buffer, 4096, message, argptr);
@@ -2082,75 +2080,242 @@ void EntityList::MessageStatus(uint32 to_guild_id, int to_minstatus, uint32 type
 	auto it = client_list.begin();
 	while (it != client_list.end()) {
 		Client *client = it->second;
-		if ((to_guild_id == 0 || client->IsInGuild(to_guild_id)) && client->Admin() >= to_minstatus)
+		if ((to_guild_id == 0 || client->IsInGuild(to_guild_id)) && client->Admin() >= to_minstatus) {
 			client->Message(type, buffer);
+		}
 		++it;
 	}
 }
 
-// works much like MessageClose, but with formatted strings
-void EntityList::MessageClose_StringID(Mob *sender, bool skipsender, float dist, uint32 type, uint32 string_id, const char* message1,const char* message2,const char* message3,const char* message4,const char* message5,const char* message6,const char* message7,const char* message8,const char* message9)
+/**
+ * @param sender
+ * @param skipsender
+ * @param dist
+ * @param type
+ * @param string_id
+ * @param message1
+ * @param message2
+ * @param message3
+ * @param message4
+ * @param message5
+ * @param message6
+ * @param message7
+ * @param message8
+ * @param message9
+ */
+void EntityList::MessageCloseString(
+	Mob *sender,
+	bool skipsender,
+	float dist,
+	uint32 type,
+	uint32 string_id,
+	const char *message1,
+	const char *message2,
+	const char *message3,
+	const char *message4,
+	const char *message5,
+	const char *message6,
+	const char *message7,
+	const char *message8,
+	const char *message9
+)
 {
 	Client *c;
-	float dist2 = dist * dist;
+	float  dist2 = dist * dist;
 
-	for (auto it = client_list.begin(); it != client_list.end(); ++it) {
-		c = it->second;
-		if(c && DistanceSquared(c->GetPosition(), sender->GetPosition()) <= dist2 && (!skipsender || c != sender))
-			c->Message_StringID(type, string_id, message1, message2, message3, message4, message5, message6, message7, message8, message9);
+	for (auto & it : client_list) {
+		c = it.second;
+		if (c && DistanceSquared(c->GetPosition(), sender->GetPosition()) <= dist2 && (!skipsender || c != sender)) {
+			c->MessageString(
+				type,
+				string_id,
+				message1,
+				message2,
+				message3,
+				message4,
+				message5,
+				message6,
+				message7,
+				message8,
+				message9
+			);
+		}
 	}
 }
 
-void EntityList::FilteredMessageClose_StringID(Mob *sender, bool skipsender,
-		float dist, uint32 type, eqFilterType filter, uint32 string_id,
-		const char *message1, const char *message2, const char *message3,
-		const char *message4, const char *message5, const char *message6,
-		const char *message7, const char *message8, const char *message9)
+/**
+ * @param sender
+ * @param skipsender
+ * @param dist
+ * @param type
+ * @param filter
+ * @param string_id
+ * @param message1
+ * @param message2
+ * @param message3
+ * @param message4
+ * @param message5
+ * @param message6
+ * @param message7
+ * @param message8
+ * @param message9
+ */
+void EntityList::FilteredMessageCloseString(
+	Mob *sender, bool skipsender,
+	float dist,
+	uint32 type,
+	eqFilterType filter,
+	uint32 string_id,
+	const char *message1,
+	const char *message2,
+	const char *message3,
+	const char *message4,
+	const char *message5,
+	const char *message6,
+	const char *message7,
+	const char *message8,
+	const char *message9
+)
 {
 	Client *c;
-	float dist2 = dist * dist;
+	float  dist2 = dist * dist;
 
-	for (auto it = client_list.begin(); it != client_list.end(); ++it) {
-		c = it->second;
-		if (c && DistanceSquared(c->GetPosition(), sender->GetPosition()) <= dist2 && (!skipsender || c != sender))
-			c->FilteredMessage_StringID(sender, type, filter, string_id,
-					message1, message2, message3, message4, message5,
-					message6, message7, message8, message9);
+	for (auto & it : client_list) {
+		c = it.second;
+		if (c && DistanceSquared(c->GetPosition(), sender->GetPosition()) <= dist2 && (!skipsender || c != sender)) {
+			c->FilteredMessageString(
+				sender, type, filter, string_id,
+				message1, message2, message3, message4, message5,
+				message6, message7, message8, message9
+			);
+		}
 	}
 }
 
-void EntityList::Message_StringID(Mob *sender, bool skipsender, uint32 type, uint32 string_id, const char* message1,const char* message2,const char* message3,const char* message4,const char* message5,const char* message6,const char* message7,const char* message8,const char* message9)
+/**
+ *
+ * @param sender
+ * @param skipsender
+ * @param type
+ * @param string_id
+ * @param message1
+ * @param message2
+ * @param message3
+ * @param message4
+ * @param message5
+ * @param message6
+ * @param message7
+ * @param message8
+ * @param message9
+ */
+void EntityList::MessageString(
+	Mob *sender,
+	bool skipsender,
+	uint32 type,
+	uint32 string_id,
+	const char *message1,
+	const char *message2,
+	const char *message3,
+	const char *message4,
+	const char *message5,
+	const char *message6,
+	const char *message7,
+	const char *message8,
+	const char *message9
+)
 {
 	Client *c;
 
-	for (auto it = client_list.begin(); it != client_list.end(); ++it) {
-		c = it->second;
-		if(c && (!skipsender || c != sender))
-			c->Message_StringID(type, string_id, message1, message2, message3, message4, message5, message6, message7, message8, message9);
+	for (auto & it : client_list) {
+		c = it.second;
+		if (c && (!skipsender || c != sender)) {
+			c->MessageString(
+				type,
+				string_id,
+				message1,
+				message2,
+				message3,
+				message4,
+				message5,
+				message6,
+				message7,
+				message8,
+				message9
+			);
+		}
 	}
 }
 
-void EntityList::FilteredMessage_StringID(Mob *sender, bool skipsender,
-		uint32 type, eqFilterType filter, uint32 string_id,
-		const char *message1, const char *message2, const char *message3,
-		const char *message4, const char *message5, const char *message6,
-		const char *message7, const char *message8, const char *message9)
+/**
+ *
+ * @param sender
+ * @param skipsender
+ * @param type
+ * @param filter
+ * @param string_id
+ * @param message1
+ * @param message2
+ * @param message3
+ * @param message4
+ * @param message5
+ * @param message6
+ * @param message7
+ * @param message8
+ * @param message9
+ */
+void EntityList::FilteredMessageString(
+	Mob *sender,
+	bool skipsender,
+	uint32 type,
+	eqFilterType filter,
+	uint32 string_id,
+	const char *message1,
+	const char *message2,
+	const char *message3,
+	const char *message4,
+	const char *message5,
+	const char *message6,
+	const char *message7,
+	const char *message8,
+	const char *message9
+)
 {
 	Client *c;
 
-	for (auto it = client_list.begin(); it != client_list.end(); ++it) {
-		c = it->second;
-		if (c && (!skipsender || c != sender))
-			c->FilteredMessage_StringID(sender, type, filter, string_id,
-					message1, message2, message3, message4, message5, message6,
-					message7, message8, message9);
+	for (auto & it : client_list) {
+		c = it.second;
+		if (c && (!skipsender || c != sender)) {
+			c->FilteredMessageString(
+				sender,
+				type,
+				filter,
+				string_id,
+				message1,
+				message2,
+				message3,
+				message4,
+				message5,
+				message6,
+				message7,
+				message8,
+				message9
+			);
+		}
 	}
 }
 
-void EntityList::MessageClose(Mob* sender, bool skipsender, float dist, uint32 type, const char* message, ...)
+/**
+ * @param sender
+ * @param skipsender
+ * @param dist
+ * @param type
+ * @param message
+ * @param ...
+ */
+void EntityList::MessageClose(Mob *sender, bool skipsender, float dist, uint32 type, const char *message, ...)
 {
 	va_list argptr;
-	char buffer[4096];
+	char    buffer[4096];
 
 	va_start(argptr, message);
 	vsnprintf(buffer, 4095, message, argptr);
@@ -2160,16 +2325,26 @@ void EntityList::MessageClose(Mob* sender, bool skipsender, float dist, uint32 t
 
 	auto it = client_list.begin();
 	while (it != client_list.end()) {
-		if (DistanceSquared(it->second->GetPosition(), sender->GetPosition()) <= dist2 && (!skipsender || it->second != sender))
+		if (DistanceSquared(it->second->GetPosition(), sender->GetPosition()) <= dist2 &&
+			(!skipsender || it->second != sender)) {
 			it->second->Message(type, buffer);
+		}
 		++it;
 	}
 }
 
-void EntityList::FilteredMessageClose(Mob *sender, bool skipsender, float dist, uint32 type, eqFilterType filter, const char *message, ...)
+void EntityList::FilteredMessageClose(
+	Mob *sender,
+	bool skipsender,
+	float dist,
+	uint32 type,
+	eqFilterType filter,
+	const char *message,
+	...
+)
 {
 	va_list argptr;
-	char buffer[4096];
+	char    buffer[4096];
 
 	va_start(argptr, message);
 	vsnprintf(buffer, 4095, message, argptr);
@@ -2179,8 +2354,10 @@ void EntityList::FilteredMessageClose(Mob *sender, bool skipsender, float dist,
 
 	auto it = client_list.begin();
 	while (it != client_list.end()) {
-		if (DistanceSquared(it->second->GetPosition(), sender->GetPosition()) <= dist2 && (!skipsender || it->second != sender))
-			it->second->FilteredMessage(sender, type, filter, buffer);
+		if (DistanceSquared(it->second->GetPosition(), sender->GetPosition()) <= dist2 &&
+			(!skipsender || it->second != sender)) {
+				it->second->FilteredMessage(sender, type, filter, buffer);
+		}
 		++it;
 	}
 }
@@ -2725,15 +2902,15 @@ void EntityList::ListNPCCorpses(Client *client)
 	uint32 x = 0;
 
 	auto it = corpse_list.begin();
-	client->Message(0, "NPC Corpses in the zone:");
+	client->Message(Chat::White, "NPC Corpses in the zone:");
 	while (it != corpse_list.end()) {
 		if (it->second->IsNPCCorpse()) {
-			client->Message(0, "  %5d: %s", it->first, it->second->GetName());
+			client->Message(Chat::White, "  %5d: %s", it->first, it->second->GetName());
 			x++;
 		}
 		++it;
 	}
-	client->Message(0, "%d npc corpses listed.", x);
+	client->Message(Chat::White, "%d npc corpses listed.", x);
 }
 
 void EntityList::ListPlayerCorpses(Client *client)
@@ -2741,15 +2918,15 @@ void EntityList::ListPlayerCorpses(Client *client)
 	uint32 x = 0;
 
 	auto it = corpse_list.begin();
-	client->Message(0, "Player Corpses in the zone:");
+	client->Message(Chat::White, "Player Corpses in the zone:");
 	while (it != corpse_list.end()) {
 		if (it->second->IsPlayerCorpse()) {
-			client->Message(0, "  %5d: %s", it->first, it->second->GetName());
+			client->Message(Chat::White, "  %5d: %s", it->first, it->second->GetName());
 			x++;
 		}
 		++it;
 	}
-	client->Message(0, "%d player corpses listed.", x);
+	client->Message(Chat::White, "%d player corpses listed.", x);
 }
 
 // returns the number of corpses deleted. A negative number indicates an error code.
@@ -2776,7 +2953,7 @@ void EntityList::CorpseFix(Client* c)
 		Corpse* corpse = it->second;
 		if (corpse->IsNPCCorpse()) {
 			if (DistanceNoZ(c->GetPosition(), corpse->GetPosition()) < 100) {
-				c->Message(15, "Attempting to fix %s", it->second->GetCleanName());
+				c->Message(Chat::Yellow, "Attempting to fix %s", it->second->GetCleanName());
 				corpse->GMMove(corpse->GetX(), corpse->GetY(), c->GetZ() + 2, 0);
 			}
 		}
@@ -3551,7 +3728,7 @@ void EntityList::LimitAddNPC(NPC *npc)
 	SpawnLimitRecord r;
 
 	uint16 eid = npc->GetID();
-	r.spawngroup_id = npc->GetSp2();
+	r.spawngroup_id = npc->GetSpawnGroupId();
 	r.npc_type = npc->GetNPCTypeID();
 
 	npc_limit_list[eid] = r;
@@ -3746,25 +3923,27 @@ bool Entity::CheckCoordLosNoZLeaps(float cur_x, float cur_y, float cur_z,
 	return false;
 }
 
-void EntityList::QuestJournalledSayClose(Mob *sender, Client *QuestInitiator,
-		float dist, const char* mobname, const char* message)
+void EntityList::QuestJournalledSayClose(Mob *sender, float dist, const char *mobname, const char *message,
+					 Journal::Options &opts)
 {
-	Client *c = nullptr;
-	float dist2 = dist * dist;
+	SerializeBuffer buf(sizeof(SpecialMesgHeader_Struct) + 12 + 64 + 64);
 
-	// Send the message to the quest initiator such that the client will enter it into the NPC Quest Journal
-	if (QuestInitiator) {
-		auto buf = new char[strlen(mobname) + strlen(message) + 10];
-		sprintf(buf, "%s says, '%s'", mobname, message);
-		QuestInitiator->QuestJournalledMessage(mobname, buf);
-		safe_delete_array(buf);
-	}
-	// Use the old method for all other nearby clients
-	for (auto it = client_list.begin(); it != client_list.end(); ++it) {
-		c = it->second;
-		if(c && (c != QuestInitiator) && DistanceSquared(c->GetPosition(), sender->GetPosition()) <= dist2)
-			c->Message_StringID(10, GENERIC_SAY, mobname, message);
-	}
+	buf.WriteInt8(static_cast<int8>(opts.speak_mode));
+	buf.WriteInt8(static_cast<int8>(opts.journal_mode));
+	buf.WriteInt8(opts.language);
+	buf.WriteInt32(opts.message_type);
+	buf.WriteInt32(opts.target_spawn_id);
+	buf.WriteString(mobname);
+	buf.WriteInt32(0); // location, client doesn't seem to do anything with this
+	buf.WriteInt32(0);
+	buf.WriteInt32(0);
+	buf.WriteString(message);
+
+	auto outapp = new EQApplicationPacket(OP_SpecialMesg, buf);
+
+	// client only bothers logging if target spawn ID matches, safe to send to everyone
+	QueueCloseClients(sender, outapp, false, dist);
+	delete outapp;
 }
 
 Corpse *EntityList::GetClosestCorpse(Mob *sender, const char *Name)
@@ -3880,7 +4059,7 @@ void EntityList::GroupMessage(uint32 gid, const char *from, const char *message)
 			g = it->second->GetGroup();
 			if (g) {
 				if (g->GetID() == gid)
-					it->second->ChannelMessageSend(from, it->second->GetName(), 2, 0, message);
+					it->second->ChannelMessageSend(from, it->second->GetName(), ChatChannel_Group, 0, 100, message);
 			}
 		}
 		++it;
@@ -4632,7 +4811,7 @@ void EntityList::ExpeditionWarning(uint32 minutes_left)
 
 	auto it = client_list.begin();
 	while (it != client_list.end()) {
-		it->second->Message_StringID(15, EXPEDITION_MIN_REMAIN, itoa((int)minutes_left));
+		it->second->MessageString(Chat::Yellow, EXPEDITION_MIN_REMAIN, itoa((int)minutes_left));
 		it->second->QueuePacket(outapp);
 		++it;
 	}
diff --git a/zone/entity.h b/zone/entity.h
index fb9b1f09b..339bbfd8a 100644
--- a/zone/entity.h
+++ b/zone/entity.h
@@ -29,6 +29,7 @@
 
 #include "position.h"
 #include "zonedump.h"
+#include "common.h"
 
 class Encounter;
 class Beacon;
@@ -175,6 +176,7 @@ public:
 	}
 	Client *GetClientByCharID(uint32 iCharID);
 	Client *GetClientByWID(uint32 iWID);
+	Client *GetClientByLSID(uint32 iLSID);
 	Client *GetClient(uint32 ip, uint16 port);
 	Client *GetRandomClient(const glm::vec3& location, float Distance, Client *ExcludeClient = nullptr);
 	Group *GetGroupByMob(Mob* mob);
@@ -319,14 +321,42 @@ public:
 	void	MessageStatus(uint32 to_guilddbid, int to_minstatus, uint32 type, const char* message, ...);
 	void	MessageClose(Mob* sender, bool skipsender, float dist, uint32 type, const char* message, ...);
 	void	FilteredMessageClose(Mob* sender, bool skipsender, float dist, uint32 type, eqFilterType filter, const char* message, ...);
-	void	Message_StringID(Mob *sender, bool skipsender, uint32 type, uint32 string_id, const char* message1=0,const char* message2=0,const char* message3=0,const char* message4=0,const char* message5=0,const char* message6=0,const char* message7=0,const char* message8=0,const char* message9=0);
-	void	FilteredMessage_StringID(Mob *sender, bool skipsender, uint32 type, eqFilterType filter, uint32 string_id, const char* message1=0,const char* message2=0,const char* message3=0,const char* message4=0,const char* message5=0,const char* message6=0,const char* message7=0,const char* message8=0,const char* message9=0);
-	void	MessageClose_StringID(Mob *sender, bool skipsender, float dist, uint32 type, uint32 string_id, const char* message1=0,const char* message2=0,const char* message3=0,const char* message4=0,const char* message5=0,const char* message6=0,const char* message7=0,const char* message8=0,const char* message9=0);
-	void	FilteredMessageClose_StringID(Mob *sender, bool skipsender, float dist, uint32 type, eqFilterType filter, uint32 string_id, const char* message1=0,const char* message2=0,const char* message3=0,const char* message4=0,const char* message5=0,const char* message6=0,const char* message7=0,const char* message8=0,const char* message9=0);
-	void	ChannelMessageFromWorld(const char* from, const char* to, uint8 chan_num, uint32 guilddbid, uint8 language, const char* message);
+	void	MessageString(Mob *sender, bool skipsender, uint32 type, uint32 string_id, const char* message1=0,const char* message2=0,const char* message3=0,const char* message4=0,const char* message5=0,const char* message6=0,const char* message7=0,const char* message8=0,const char* message9=0);
+	void	FilteredMessageString(Mob *sender, bool skipsender, uint32 type, eqFilterType filter, uint32 string_id, const char* message1=0,const char* message2=0,const char* message3=0,const char* message4=0,const char* message5=0,const char* message6=0,const char* message7=0,const char* message8=0,const char* message9=0);
+	void	MessageCloseString(
+		Mob *sender,
+		bool skipsender,
+		float dist,
+		uint32 type,
+		uint32 string_id,
+		const char *message1 = 0,
+		const char *message2 = 0,
+		const char *message3 = 0,
+		const char *message4 = 0,
+		const char *message5 = 0,
+		const char *message6 = 0,
+		const char *message7 = 0,
+		const char *message8 = 0,
+		const char *message9 = 0);
+	void	FilteredMessageCloseString(
+		Mob *sender,
+		bool skipsender,
+		float dist,
+		uint32 type,
+		eqFilterType filter,
+		uint32 string_id,
+		const char *message1 = 0,
+		const char *message2 = 0,
+		const char *message3 = 0,
+		const char *message4 = 0,
+		const char *message5 = 0,
+		const char *message6 = 0,
+		const char *message7 = 0,
+		const char *message8 = 0,
+		const char *message9 = 0);
+	void	ChannelMessageFromWorld(const char* from, const char* to, uint8 chan_num, uint32 guilddbid, uint8 language, uint8 lang_skill, const char* message);
 	void	ChannelMessage(Mob* from, uint8 chan_num, uint8 language, const char* message, ...);
 	void	ChannelMessage(Mob* from, uint8 chan_num, uint8 language, uint8 lang_skill, const char* message, ...);
-	void	ChannelMessageSend(Mob* to, uint8 chan_num, uint8 language, const char* message, ...);
 	void	SendZoneSpawns(Client*);
 	void	SendZonePVPUpdates(Client *);
 	void	SendZoneSpawnsBulk(Client* client);
@@ -338,7 +368,7 @@ public:
 	void	SendNimbusEffects(Client *c);
 	void	SendUntargetable(Client *c);
 	void	DuelMessage(Mob* winner, Mob* loser, bool flee);
-	void	QuestJournalledSayClose(Mob *sender, Client *QuestIntiator, float dist, const char* mobname, const char* message);
+	void	QuestJournalledSayClose(Mob *sender, float dist, const char* mobname, const char* message, Journal::Options &opts);
 	void	GroupMessage(uint32 gid, const char *from, const char *message);
 	void	ExpeditionWarning(uint32 minutes_left);
 
diff --git a/zone/exp.cpp b/zone/exp.cpp
index 63fbff79a..23593f644 100644
--- a/zone/exp.cpp
+++ b/zone/exp.cpp
@@ -333,18 +333,18 @@ void Client::CalculateLeadershipExp(uint32 &add_exp, uint8 conlevel)
 					uint32 mentor_exp = exp * (GetGroup()->GetMentorPercent() / 100.0f);
 					exp -= mentor_exp;
 					mentoree->AddLeadershipEXP(mentor_exp, 0); // ends up rounded down
-					mentoree->Message_StringID(MT_Leadership, GAIN_GROUP_LEADERSHIP_EXP);
+					mentoree->MessageString(Chat::LeaderShip, GAIN_GROUP_LEADERSHIP_EXP);
 				}
 				if (exp > 0)
 				{
 					// possible if you mentor 100% to the other client
 					AddLeadershipEXP(exp, 0); // ends up rounded up if mentored, no idea how live actually does it
-					Message_StringID(MT_Leadership, GAIN_GROUP_LEADERSHIP_EXP);
+					MessageString(Chat::LeaderShip, GAIN_GROUP_LEADERSHIP_EXP);
 				}
 			}
 			else
 			{
-				Message_StringID(MT_Leadership, MAX_GROUP_LEADERSHIP_POINTS);
+				MessageString(Chat::LeaderShip, MAX_GROUP_LEADERSHIP_POINTS);
 			}
 		}
 		else
@@ -357,11 +357,11 @@ void Client::CalculateLeadershipExp(uint32 &add_exp, uint8 conlevel)
 					&& RuleI(Character, KillsPerRaidLeadershipAA) > 0)
 				{
 					AddLeadershipEXP(0, RAID_EXP_PER_POINT / RuleI(Character, KillsPerRaidLeadershipAA));
-					Message_StringID(MT_Leadership, GAIN_RAID_LEADERSHIP_EXP);
+					MessageString(Chat::LeaderShip, GAIN_RAID_LEADERSHIP_EXP);
 				}
 				else
 				{
-					Message_StringID(MT_Leadership, MAX_RAID_LEADERSHIP_POINTS);
+					MessageString(Chat::LeaderShip, MAX_RAID_LEADERSHIP_POINTS);
 				}
 			}
 			else
@@ -378,17 +378,17 @@ void Client::CalculateLeadershipExp(uint32 &add_exp, uint8 conlevel)
 						uint32 mentor_exp = exp * (raid->GetMentorPercent(group_id) / 100.0f);
 						exp -= mentor_exp;
 						mentoree->AddLeadershipEXP(mentor_exp, 0);
-						mentoree->Message_StringID(MT_Leadership, GAIN_GROUP_LEADERSHIP_EXP);
+						mentoree->MessageString(Chat::LeaderShip, GAIN_GROUP_LEADERSHIP_EXP);
 					}
 					if (exp > 0)
 					{
 						AddLeadershipEXP(exp, 0);
-						Message_StringID(MT_Leadership, GAIN_GROUP_LEADERSHIP_EXP);
+						MessageString(Chat::LeaderShip, GAIN_GROUP_LEADERSHIP_EXP);
 					}
 				}
 				else
 				{
-					Message_StringID(MT_Leadership, MAX_GROUP_LEADERSHIP_POINTS);
+					MessageString(Chat::LeaderShip, MAX_GROUP_LEADERSHIP_POINTS);
 				}
 			}
 		}
@@ -514,7 +514,7 @@ void Client::AddEXP(uint32 in_add_exp, uint8 conlevel, bool resexp) {
 
 	// AA Sanity Checking for players who set aa exp and deleveled below allowed aa level.
 	if (GetLevel() <= 50 && m_epp.perAA > 0) {
-		Message(15, "You are below the level allowed to gain AA Experience. AA Experience set to 0%");
+		Message(Chat::Yellow, "You are below the level allowed to gain AA Experience. AA Experience set to 0%");
 		aaexp = 0;
 		m_epp.perAA = 0;
 	}
@@ -528,7 +528,7 @@ void Client::SetEXP(uint32 set_exp, uint32 set_aaxp, bool isrezzexp) {
 
 	auto max_AAXP = GetRequiredAAExperience();
 	if (max_AAXP == 0 || GetEXPForLevel(GetLevel()) == 0xFFFFFFFF) {
-		Message(13, "Error in Client::SetEXP. EXP not set.");
+		Message(Chat::Red, "Error in Client::SetEXP. EXP not set.");
 		return; // Must be invalid class/race
 	}
 	uint32 i = 0;
@@ -564,23 +564,23 @@ void Client::SetEXP(uint32 set_exp, uint32 set_aaxp, bool isrezzexp) {
 
 		if (isrezzexp) {
 			if (RuleI(Character, ShowExpValues) > 0) 
-				Message(MT_Experience, "You regain %s experience from resurrection. %s", exp_amount_message.c_str(), exp_percent_message.c_str());
-			else Message_StringID(MT_Experience, REZ_REGAIN);
+				Message(Chat::Experience, "You regain %s experience from resurrection. %s", exp_amount_message.c_str(), exp_percent_message.c_str());
+			else MessageString(Chat::Experience, REZ_REGAIN);
 		} else {
 			if (membercount > 1) {
 				if (RuleI(Character, ShowExpValues) > 0) 
-					Message(MT_Experience, "You have gained %s party experience! %s", exp_amount_message.c_str(), exp_percent_message.c_str());
-				else Message_StringID(MT_Experience, GAIN_GROUPXP);
+					Message(Chat::Experience, "You have gained %s party experience! %s", exp_amount_message.c_str(), exp_percent_message.c_str());
+				else MessageString(Chat::Experience, GAIN_GROUPXP);
 			}
 			else if (IsRaidGrouped()) {
 				if (RuleI(Character, ShowExpValues) > 0) 
-					Message(MT_Experience, "You have gained %s raid experience! %s", exp_amount_message.c_str(), exp_percent_message.c_str());
-				else Message_StringID(MT_Experience, GAIN_RAIDEXP);
+					Message(Chat::Experience, "You have gained %s raid experience! %s", exp_amount_message.c_str(), exp_percent_message.c_str());
+				else MessageString(Chat::Experience, GAIN_RAIDEXP);
 			} 
 			else {
 				if (RuleI(Character, ShowExpValues) > 0) 
-					Message(MT_Experience, "You have gained %s experience! %s", exp_amount_message.c_str(), exp_percent_message.c_str());
-				else Message_StringID(MT_Experience, GAIN_XP);				
+					Message(Chat::Experience, "You have gained %s experience! %s", exp_amount_message.c_str(), exp_percent_message.c_str());
+				else MessageString(Chat::Experience, GAIN_XP);
 			}
 		}
 	}
@@ -588,9 +588,9 @@ void Client::SetEXP(uint32 set_exp, uint32 set_aaxp, bool isrezzexp) {
 		uint32 exp_lost = m_pp.exp - set_exp;
 		float exp_percent = (float)((float)exp_lost / (float)(GetEXPForLevel(GetLevel() + 1) - GetEXPForLevel(GetLevel())))*(float)100;
 
-		if (RuleI(Character, ShowExpValues) == 1 && exp_lost > 0) Message(15, "You have lost %i experience.", exp_lost);
-		else if (RuleI(Character, ShowExpValues) == 2 && exp_lost > 0) Message(15, "You have lost %i experience. (%.3f%%)", exp_lost, exp_percent);
-		else Message(15, "You have lost experience.");		
+		if (RuleI(Character, ShowExpValues) == 1 && exp_lost > 0) Message(Chat::Yellow, "You have lost %i experience.", exp_lost);
+		else if (RuleI(Character, ShowExpValues) == 2 && exp_lost > 0) Message(Chat::Yellow, "You have lost %i experience. (%.3f%%)", exp_lost, exp_percent);
+		else Message(Chat::Yellow, "You have lost experience.");
 	}
 
 	//check_level represents the level we should be when we have
@@ -654,9 +654,9 @@ void Client::SetEXP(uint32 set_exp, uint32 set_aaxp, bool isrezzexp) {
 		//figure out how many points were actually gained
 		/*uint32 gained = m_pp.aapoints - last_unspentAA;*/	//unused
 
-		//Message(15, "You have gained %d skill points!!", m_pp.aapoints - last_unspentAA);
+		//Message(Chat::Yellow, "You have gained %d skill points!!", m_pp.aapoints - last_unspentAA);
 		char val1[20]={0};
-		Message_StringID(MT_Experience, GAIN_ABILITY_POINT, ConvertArray(m_pp.aapoints, val1),m_pp.aapoints == 1 ? "" : "(s)");	//You have gained an ability point! You now have %1 ability point%2.
+		MessageString(Chat::Experience, GAIN_ABILITY_POINT, ConvertArray(m_pp.aapoints, val1),m_pp.aapoints == 1 ? "" : "(s)");	//You have gained an ability point! You now have %1 ability point%2.
 		
 		/* QS: PlayerLogAARate */
 		if (RuleB(QueryServ, PlayerLogAARate)){
@@ -665,7 +665,7 @@ void Client::SetEXP(uint32 set_exp, uint32 set_aaxp, bool isrezzexp) {
 			QServ->SendQuery(query.c_str());
 		}
 
-		//Message(15, "You now have %d skill points available to spend.", m_pp.aapoints);
+		//Message(Chat::Yellow, "You now have %d skill points available to spend.", m_pp.aapoints);
 	}
 
 	uint8 maxlevel = RuleI(Character, MaxExpLevel) + 1;
@@ -699,18 +699,18 @@ void Client::SetEXP(uint32 set_exp, uint32 set_aaxp, bool isrezzexp) {
 		if (level_increase)
 		{
 			if (level_count == 1)
-				Message_StringID(MT_Experience, GAIN_LEVEL, ConvertArray(check_level, val1));
+				MessageString(Chat::Experience, GAIN_LEVEL, ConvertArray(check_level, val1));
 			else
-				Message(15, "Welcome to level %i!", check_level);
+				Message(Chat::Yellow, "Welcome to level %i!", check_level);
 
 			if (check_level == RuleI(Character, DeathItemLossLevel))
-				Message_StringID(15, CORPSE_ITEM_LOST);
+				MessageString(Chat::Yellow, CORPSE_ITEM_LOST);
 
 			if (check_level == RuleI(Character, DeathExpLossLevel))
-				Message_StringID(15, CORPSE_EXP_LOST);
+				MessageString(Chat::Yellow, CORPSE_EXP_LOST);
 		}
 		else
-			Message_StringID(MT_Experience, LOSE_LEVEL, ConvertArray(check_level, val1));
+			MessageString(Chat::Experience, LOSE_LEVEL, ConvertArray(check_level, val1));
 
 #ifdef BOTS
 		uint8 myoldlevel = GetLevel();
@@ -758,7 +758,7 @@ void Client::SetEXP(uint32 set_exp, uint32 set_aaxp, bool isrezzexp) {
 		char val1[20]={0};
 		char val2[20]={0};
 		char val3[20]={0};
-		Message_StringID(MT_Experience, GM_GAINXP, ConvertArray(set_aaxp,val1),ConvertArray(set_exp,val2),ConvertArray(GetEXPForLevel(GetLevel()+1),val3));	//[GM] You have gained %1 AXP and %2 EXP (%3).
+		MessageString(Chat::Experience, GM_GAINXP, ConvertArray(set_aaxp,val1),ConvertArray(set_exp,val2),ConvertArray(GetEXPForLevel(GetLevel()+1),val3));	//[GM] You have gained %1 AXP and %2 EXP (%3).
 	}
 }
 
@@ -812,7 +812,7 @@ void Client::SetLevel(uint8 set_level, bool command)
 	m_pp.level = set_level;
 	if (command){
 		m_pp.exp = GetEXPForLevel(set_level);
-		Message(15, "Welcome to level %i!", set_level);
+		Message(Chat::Yellow, "Welcome to level %i!", set_level);
 		lu->exp = 0;
 	}
 	else {
@@ -1077,12 +1077,12 @@ void Client::SetLeadershipEXP(uint32 group_exp, uint32 raid_exp) {
 	while(group_exp >= GROUP_EXP_PER_POINT) {
 		group_exp -= GROUP_EXP_PER_POINT;
 		m_pp.group_leadership_points++;
-		Message_StringID(MT_Leadership, GAIN_GROUP_LEADERSHIP_POINT);
+		MessageString(Chat::LeaderShip, GAIN_GROUP_LEADERSHIP_POINT);
 	}
 	while(raid_exp >= RAID_EXP_PER_POINT) {
 		raid_exp -= RAID_EXP_PER_POINT;
 		m_pp.raid_leadership_points++;
-		Message_StringID(MT_Leadership, GAIN_RAID_LEADERSHIP_POINT);
+		MessageString(Chat::LeaderShip, GAIN_RAID_LEADERSHIP_POINT);
 	}
 
 	m_pp.group_leadership_exp = group_exp;
diff --git a/zone/forage.cpp b/zone/forage.cpp
index 7fdbc2f6b..ba2a49e31 100644
--- a/zone/forage.cpp
+++ b/zone/forage.cpp
@@ -161,14 +161,14 @@ bool Client::CanFish() {
 
 	if (!Pole || !Pole->IsClassCommon() || Pole->GetItem()->ItemType != EQEmu::item::ItemTypeFishingPole) {
 		if (m_inv.HasItemByUse(EQEmu::item::ItemTypeFishingPole, 1, invWhereWorn | invWherePersonal | invWhereBank | invWhereSharedBank | invWhereTrading | invWhereCursor))	//We have a fishing pole somewhere, just not equipped
-			Message_StringID(MT_Skills, FISHING_EQUIP_POLE);	//You need to put your fishing pole in your primary hand.
+			MessageString(Chat::Skills, FISHING_EQUIP_POLE);	//You need to put your fishing pole in your primary hand.
 		else	//We don't have a fishing pole anywhere
-			Message_StringID(MT_Skills, FISHING_NO_POLE);	//You can't fish without a fishing pole, go buy one.
+			MessageString(Chat::Skills, FISHING_NO_POLE);	//You can't fish without a fishing pole, go buy one.
 		return false;
 	}
 
 	if (!Bait || !Bait->IsClassCommon() || Bait->GetItem()->ItemType != EQEmu::item::ItemTypeFishingBait) {
-		Message_StringID(MT_Skills, FISHING_NO_BAIT);	//You can't fish without fishing bait, go buy some.
+		MessageString(Chat::Skills, FISHING_NO_BAIT);	//You can't fish without fishing bait, go buy some.
 		return false;
 	}
 
@@ -190,7 +190,7 @@ bool Client::CanFish() {
 		float bestz = zone->zonemap->FindBestZ(rodPosition, nullptr);
 		float len = m_Position.z - bestz;
 		if(len > LineLength || len < 0.0f) {
-			Message_StringID(MT_Skills, FISHING_LAND);
+			MessageString(Chat::Skills, FISHING_LAND);
 			return false;
 		}
 
@@ -203,7 +203,7 @@ bool Client::CanFish() {
 			bool in_water = zone->watermap->InWater(dest) || zone->watermap->InVWater(dest);
 
 			if (in_lava) {
-				Message_StringID(MT_Skills, FISHING_LAVA);	//Trying to catch a fire elemental or something?
+				MessageString(Chat::Skills, FISHING_LAVA);	//Trying to catch a fire elemental or something?
 				return false;
 			}
 
@@ -212,7 +212,7 @@ bool Client::CanFish() {
 			}
 		}
 
-		Message_StringID(MT_Skills, FISHING_LAND);
+		MessageString(Chat::Skills, FISHING_LAND);
 		return false;
 	}
 	return true;
@@ -223,7 +223,7 @@ void Client::GoFish()
 
 	//TODO: generate a message if we're already fishing
 	/*if (!fishing_timer.Check()) {	//this isn't the right check, may need to add something to the Client class like 'bool is_fishing'
-		Message_StringID(0, ALREADY_FISHING);	//You are already fishing!
+		MessageString(Chat::White, ALREADY_FISHING);	//You are already fishing!
 		return;
 	}*/
 
@@ -293,12 +293,12 @@ void Client::GoFish()
 
 							entity_list.AddNPC(npc);
 
-							Message(MT_Emote,
+							Message(Chat::Emote,
 								"You fish up a little more than you bargained for...");
 						}
 					}
 					else {
-						Message(MT_Emote, "You notice something lurking just below the water's surface...");
+						Message(Chat::Emote, "You notice something lurking just below the water's surface...");
 					}
 				}
 			}
@@ -315,17 +315,17 @@ void Client::GoFish()
 		const EQEmu::ItemData* food_item = database.GetItem(food_id);
 
 		if (food_item->ItemType  != EQEmu::item::ItemTypeFood) {
-			Message_StringID(MT_Skills, FISHING_SUCCESS);
+			MessageString(Chat::Skills, FISHING_SUCCESS);
 		}
 		else {
-			Message_StringID(MT_Skills, FISHING_SUCCESS_FISH_NAME, food_item->Name);
+			MessageString(Chat::Skills, FISHING_SUCCESS_FISH_NAME, food_item->Name);
 		}
 
 		EQEmu::ItemInstance* inst = database.CreateItem(food_item, 1);
 		if(inst != nullptr) {
 			if(CheckLoreConflict(inst->GetItem()))
 			{
-				Message_StringID(0, DUP_LORE);
+				MessageString(Chat::White, DUP_LORE);
 				safe_delete(inst);
 			}
 			else
@@ -351,13 +351,13 @@ void Client::GoFish()
 		//chance to use bait when you dont catch anything...
 		if (zone->random.Int(0, 4) == 1) {
 			DeleteItemInInventory(bslot, 1, true);	//do we need client update?
-			Message_StringID(MT_Skills, FISHING_LOST_BAIT);	//You lost your bait!
+			MessageString(Chat::Skills, FISHING_LOST_BAIT);	//You lost your bait!
 		} else {
 			if (zone->random.Int(0, 15) == 1)	//give about a 1 in 15 chance to spill your beer. we could make this a rule, but it doesn't really seem worth it
 				//TODO: check for & consume an alcoholic beverage from inventory when this triggers, and set it as a rule that's disabled by default
-				Message_StringID(MT_Skills, FISHING_SPILL_BEER);	//You spill your beer while bringing in your line.
+				MessageString(Chat::Skills, FISHING_SPILL_BEER);	//You spill your beer while bringing in your line.
 			else
-				Message_StringID(MT_Skills, FISHING_FAILED);	//You didn't catch anything.
+				MessageString(Chat::Skills, FISHING_FAILED);	//You didn't catch anything.
 		}
 
 		parse->EventPlayer(EVENT_FISH_FAILURE, this, "", 0);
@@ -367,7 +367,7 @@ void Client::GoFish()
 	//this is potentially exploitable in that they can fish
 	//and then swap out items in primary slot... too lazy to fix right now
 	if (zone->random.Int(0, 49) == 1) {
-		Message_StringID(MT_Skills, FISHING_POLE_BROKE);	//Your fishing pole broke!
+		MessageString(Chat::Skills, FISHING_POLE_BROKE);	//Your fishing pole broke!
 		DeleteItemInInventory(EQEmu::invslot::slotPrimary, 0, true);
 	}
 
@@ -434,13 +434,13 @@ void Client::ForageItem(bool guarantee) {
 				break;
 			}
 
-		Message_StringID(MT_Skills, stringid);
+		MessageString(Chat::Skills, stringid);
 		EQEmu::ItemInstance* inst = database.CreateItem(food_item, 1);
 		if(inst != nullptr) {
 			// check to make sure it isn't a foraged lore item
 			if(CheckLoreConflict(inst->GetItem()))
 			{
-				Message_StringID(0, DUP_LORE);
+				MessageString(Chat::White, DUP_LORE);
 				safe_delete(inst);
 			}
 			else {
@@ -462,12 +462,12 @@ void Client::ForageItem(bool guarantee) {
 
 		int ChanceSecondForage = aabonuses.ForageAdditionalItems + itembonuses.ForageAdditionalItems + spellbonuses.ForageAdditionalItems;
 		if(!guarantee && zone->random.Roll(ChanceSecondForage)) {
-			Message_StringID(MT_Skills, FORAGE_MASTERY);
+			MessageString(Chat::Skills, FORAGE_MASTERY);
 			ForageItem(true);
 		}
 
 	} else {
-		Message_StringID(MT_Skills, FORAGE_FAILED);
+		MessageString(Chat::Skills, FORAGE_FAILED);
 		parse->EventPlayer(EVENT_FORAGE_FAILURE, this, "", 0);
 	}
 
diff --git a/zone/global_loot_manager.cpp b/zone/global_loot_manager.cpp
index 8e990c0ac..ccdf88840 100644
--- a/zone/global_loot_manager.cpp
+++ b/zone/global_loot_manager.cpp
@@ -21,14 +21,14 @@ std::vector<int> GlobalLootManager::GetGlobalLootTables(NPC *mob) const
 void GlobalLootManager::ShowZoneGlobalLoot(Client *to) const
 {
 	for (auto &e : m_entries)
-		to->Message(0, " %s : %d table %d", e.GetDescription().c_str(), e.GetID(), e.GetLootTableID());
+		to->Message(Chat::White, " %s : %d table %d", e.GetDescription().c_str(), e.GetID(), e.GetLootTableID());
 }
 
 void GlobalLootManager::ShowNPCGlobalLoot(Client *to, NPC *who) const
 {
 	for (auto &e : m_entries) {
 		if (e.PassesRules(who))
-			to->Message(0, " %s : %d table %d", e.GetDescription().c_str(), e.GetID(), e.GetLootTableID());
+			to->Message(Chat::White, " %s : %d table %d", e.GetDescription().c_str(), e.GetID(), e.GetLootTableID());
 	}
 }
 
diff --git a/zone/groups.cpp b/zone/groups.cpp
index a7e05bf49..cef37fbda 100644
--- a/zone/groups.cpp
+++ b/zone/groups.cpp
@@ -199,7 +199,7 @@ void Group::SplitMoney(uint32 copper, uint32 silver, uint32 gold, uint32 platinu
 			Client *c = members[i]->CastToClient();
 			//I could not get MoneyOnCorpse to work, so we use this
 			c->AddMoneyToPP(cpsplit, spsplit, gpsplit, ppsplit, true);
-			c->Message(2, msg.c_str());
+			c->Message(Chat::Green, msg.c_str());
 		}
 	}
 }
@@ -910,7 +910,7 @@ void Group::GroupMessage(Mob* sender, uint8 language, uint8 lang_skill, const ch
 			continue;
 
 		if (members[i]->IsClient() && members[i]->CastToClient()->GetFilter(FilterGroupChat)!=0)
-			members[i]->CastToClient()->ChannelMessageSend(sender->GetName(),members[i]->GetName(),2,language,lang_skill,message);
+			members[i]->CastToClient()->ChannelMessageSend(sender->GetName(),members[i]->GetName(),ChatChannel_Group,language,lang_skill,message);
 	}
 
 	auto pack =
@@ -1236,7 +1236,7 @@ void Group::VerifyGroup() {
 	}
 }
 
-void Group::GroupMessage_StringID(Mob* sender, uint32 type, uint32 string_id, const char* message,const char* message2,const char* message3,const char* message4,const char* message5,const char* message6,const char* message7,const char* message8,const char* message9, uint32 distance) {
+void Group::GroupMessageString(Mob* sender, uint32 type, uint32 string_id, const char* message,const char* message2,const char* message3,const char* message4,const char* message5,const char* message6,const char* message7,const char* message8,const char* message9, uint32 distance) {
 	uint32 i;
 	for (i = 0; i < MAX_GROUP_MEMBERS; i++) {
 		if(members[i] == nullptr)
@@ -1248,7 +1248,7 @@ void Group::GroupMessage_StringID(Mob* sender, uint32 type, uint32 string_id, co
 		if(!members[i]->IsClient())
 			continue;
 
-		members[i]->Message_StringID(type, string_id, message, message2, message3, message4, message5, message6, message7, message8, message9, 0);
+		members[i]->MessageString(type, string_id, message, message2, message3, message4, message5, message6, message7, message8, message9, 0);
 	}
 }
 
@@ -1680,9 +1680,9 @@ void Group::NotifyMainTank(Client *c, uint8 toggle)
 	if (c->ClientVersion() < EQEmu::versions::ClientVersion::SoD)
 	{
 		if(toggle)
-			c->Message(0, "%s is now Main Tank.", MainTankName.c_str());
+			c->Message(Chat::White, "%s is now Main Tank.", MainTankName.c_str());
 		else
-			c->Message(0, "%s is no longer Main Tank.", MainTankName.c_str());
+			c->Message(Chat::White, "%s is no longer Main Tank.", MainTankName.c_str());
 	}
 	else
 	{
@@ -1775,9 +1775,9 @@ void Group::NotifyPuller(Client *c, uint8 toggle)
 	if (c->ClientVersion() < EQEmu::versions::ClientVersion::SoD)
 	{
 		if(toggle)
-			c->Message(0, "%s is now Puller.", PullerName.c_str());
+			c->Message(Chat::White, "%s is now Puller.", PullerName.c_str());
 		else
-			c->Message(0, "%s is no longer Puller.", PullerName.c_str());
+			c->Message(Chat::White, "%s is no longer Puller.", PullerName.c_str());
 	}
 	else
 	{
@@ -2493,4 +2493,4 @@ void Group::QueueClients(Mob *sender, const EQApplicationPacket *app, bool ack_r
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/zone/groups.h b/zone/groups.h
index 913a6c169..0d39409e0 100644
--- a/zone/groups.h
+++ b/zone/groups.h
@@ -74,7 +74,7 @@ public:
 	void	GroupBardPulse(Mob* caster,uint16 spellid);
 	void	SplitExp(uint32 exp, Mob* other);
 	void	GroupMessage(Mob* sender,uint8 language,uint8 lang_skill,const char* message);
-	void	GroupMessage_StringID(Mob* sender, uint32 type, uint32 string_id, const char* message,const char* message2=0,const char* message3=0,const char* message4=0,const char* message5=0,const char* message6=0,const char* message7=0,const char* message8=0,const char* message9=0, uint32 distance = 0);
+	void	GroupMessageString(Mob* sender, uint32 type, uint32 string_id, const char* message,const char* message2=0,const char* message3=0,const char* message4=0,const char* message5=0,const char* message6=0,const char* message7=0,const char* message8=0,const char* message9=0, uint32 distance = 0);
 	uint32	GetTotalGroupDamage(Mob* other);
 	void	SplitMoney(uint32 copper, uint32 silver, uint32 gold, uint32 platinum, Client *splitter = nullptr);
 	inline	void SetLeader(Mob* newleader){ leader=newleader; };
diff --git a/zone/guild_mgr.cpp b/zone/guild_mgr.cpp
index eafe4b9f5..eacfcb474 100644
--- a/zone/guild_mgr.cpp
+++ b/zone/guild_mgr.cpp
@@ -189,7 +189,7 @@ uint8 *ZoneGuildManager::MakeGuildMembers(uint32 guild_id, const char *prefix_na
 }
 
 void ZoneGuildManager::ListGuilds(Client *c) const {
-	c->Message(0, "Listing guilds on the server:");
+	c->Message(Chat::White, "Listing guilds on the server:");
 	char leadername[64];
 	std::map<uint32, GuildInfo *>::const_iterator cur, end;
 	cur = m_guilds.begin();
@@ -199,12 +199,12 @@ void ZoneGuildManager::ListGuilds(Client *c) const {
 		leadername[0] = '\0';
 		database.GetCharName(cur->second->leader_char_id, leadername);
 		if (leadername[0] == '\0')
-			c->Message(0, "  Guild #%i <%s>", cur->first, cur->second->name.c_str());
+			c->Message(Chat::White, "  Guild #%i <%s>", cur->first, cur->second->name.c_str());
 		else
-			c->Message(0, "  Guild #%i <%s> Leader: %s", cur->first, cur->second->name.c_str(), leadername);
+			c->Message(Chat::White, "  Guild #%i <%s> Leader: %s", cur->first, cur->second->name.c_str(), leadername);
 		r++;
 	}
-	c->Message(0, "%i guilds listed.", r);
+	c->Message(Chat::White, "%i guilds listed.", r);
 }
 
 
@@ -212,17 +212,17 @@ void ZoneGuildManager::DescribeGuild(Client *c, uint32 guild_id) const {
 	std::map<uint32, GuildInfo *>::const_iterator res;
 	res = m_guilds.find(guild_id);
 	if(res == m_guilds.end()) {
-		c->Message(0, "Guild %d not found.", guild_id);
+		c->Message(Chat::White, "Guild %d not found.", guild_id);
 		return;
 	}
 
 	const GuildInfo *info = res->second;
 
-	c->Message(0, "Guild info DB# %i <%s>", guild_id, info->name.c_str());
+	c->Message(Chat::White, "Guild info DB# %i <%s>", guild_id, info->name.c_str());
 
 	char leadername[64];
 	database.GetCharName(info->leader_char_id, leadername);
-	c->Message(0, "Guild Leader: %s", leadername);
+	c->Message(Chat::White, "Guild Leader: %s", leadername);
 
 	char permbuffer[256];
 	uint8 i;
@@ -232,8 +232,8 @@ void ZoneGuildManager::DescribeGuild(Client *c, uint32 guild_id) const {
 		for(r = 0; r < _MaxGuildAction; r++)
 			permptr += sprintf(permptr, "  %s: %c", GuildActionNames[r], info->ranks[i].permissions[r]?'Y':'N');
 
-		c->Message(0, "Rank %i: %s", i, info->ranks[i].name.c_str());
-		c->Message(0, "Permissions: %s", permbuffer);
+		c->Message(Chat::White, "Rank %i: %s", i, info->ranks[i].name.c_str());
+		c->Message(Chat::White, "Permissions: %s", permbuffer);
 	}
 
 }
@@ -537,14 +537,14 @@ void ZoneGuildManager::AddMemberApproval(uint32 refid,Client* name)
 	if(tmp != 0)
 	{
 		if(!tmp->AddMemberApproval(name))
-			name->Message(0,"Unable to add to list.");
+			name->Message(Chat::White,"Unable to add to list.");
 		else
 		{
-			name->Message(0,"Added to list.");
+			name->Message(Chat::White,"Added to list.");
 		}
 	}
 	else
-		name->Message(0,"Unable to find guild reference id.");
+		name->Message(Chat::White,"Unable to find guild reference id.");
 }
 
 ZoneGuildManager::~ZoneGuildManager()
@@ -1391,13 +1391,13 @@ bool GuildApproval::ProcessApproval()
 {
 	if(owner && owner->GuildID() != 0)
 	{
-		owner->Message(10,"You are already in a guild! Guild request deleted.");
+		owner->Message(Chat::NPCQuestSay,"You are already in a guild! Guild request deleted.");
 		return false;
 	}
 	if(deletion_timer->Check() || !owner)
 	{
 		if(owner)
-			owner->Message(0,"You took too long! Your guild request has been deleted.");
+			owner->Message(Chat::White,"You took too long! Your guild request has been deleted.");
 		return false;
 	}
 
@@ -1414,7 +1414,7 @@ GuildApproval::GuildApproval(const char* guildname, Client* owner,uint32 id)
 	this->owner = owner;
 	this->refid = id;
 	if(owner)
-		owner->Message(0,"You can now start getting your guild approved, tell your %i members to #guildapprove %i, you have 30 minutes to create your guild.",tmp,GetID());
+		owner->Message(Chat::White,"You can now start getting your guild approved, tell your %i members to #guildapprove %i, you have 30 minutes to create your guild.",tmp,GetID());
 	for(int i=0;i<tmp;i++)
 		members[i] = 0;
 }
@@ -1463,7 +1463,7 @@ void GuildApproval::ApprovedMembers(Client* requestee)
 	for(int i=0;i<tmp;i++)
 	{
 		if(members[i])
-			requestee->Message(0,"%i: %s",i,members[i]->GetName());
+			requestee->Message(Chat::White,"%i: %s",i,members[i]->GetName());
 	}
 }
 
@@ -1484,8 +1484,8 @@ void GuildApproval::GuildApproved()
 	{
 		if(members[i])
 			{
-			owner->Message(0, "%s",members[i]->GetName());
-			owner->Message(0, "%i",members[i]->CharacterID());
+			owner->Message(Chat::White, "%s",members[i]->GetName());
+			owner->Message(Chat::White, "%i",members[i]->CharacterID());
 			guild_mgr.SetGuild(members[i]->CharacterID(),tmpeq,0);
 			size_t len = MBUFFER - strlen(gmembers)+1;
 			strncat(gmembers," ",len);
@@ -1521,7 +1521,7 @@ void GuildApproval::GuildApproved()
 	memcpy(pack->pBuffer, &tmpeq, 4);
 	worldserver.SendPacket(pack);
 	safe_delete(pack);
-	owner->Message(0, "Your guild was created.");
+	owner->Message(Chat::White, "Your guild was created.");
 	owner = 0;
 }
 
diff --git a/zone/hate_list.cpp b/zone/hate_list.cpp
index 242a4c8e3..478c9ac50 100644
--- a/zone/hate_list.cpp
+++ b/zone/hate_list.cpp
@@ -608,7 +608,7 @@ void HateList::PrintHateListToClient(Client *c)
 	while (iterator != list.end())
 	{
 		struct_HateList *e = (*iterator);
-		c->Message(0, "- name: %s, damage: %d, hate: %d",
+		c->Message(Chat::White, "- name: %s, damage: %d, hate: %d",
 			(e->entity_on_hatelist && e->entity_on_hatelist->GetName()) ? e->entity_on_hatelist->GetName() : "(null)",
 			e->hatelist_damage, e->stored_hate_amount);
 
diff --git a/zone/horse.cpp b/zone/horse.cpp
index 6c81b3d21..3871b355d 100644
--- a/zone/horse.cpp
+++ b/zone/horse.cpp
@@ -118,7 +118,7 @@ const NPCType *Horse::BuildHorseType(uint16 spell_id) {
 
 void Client::SummonHorse(uint16 spell_id) {
 	if (GetHorseId() != 0) {
-		Message(13,"You already have a Horse. Get off, Fatbutt!");
+		Message(Chat::Red,"You already have a Horse. Get off, Fatbutt!");
 		return;
 	}
 	if(!Horse::IsHorseSpell(spell_id)) {
diff --git a/zone/inventory.cpp b/zone/inventory.cpp
index ec4f095b0..500663491 100644
--- a/zone/inventory.cpp
+++ b/zone/inventory.cpp
@@ -185,7 +185,7 @@ bool Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2,
 
 	// make sure the item exists
 	if(item == nullptr) {
-		Message(13, "Item %u does not exist.", item_id);
+		Message(Chat::Red, "Item %u does not exist.", item_id);
 		Log(Logs::Detail, Logs::Inventory, "Player %s on account %s attempted to create an item with an invalid id.\n(Item: %u, Aug1: %u, Aug2: %u, Aug3: %u, Aug4: %u, Aug5: %u, Aug6: %u)\n",
 			GetName(), account_name, item_id, aug1, aug2, aug3, aug4, aug5, aug6);
 
@@ -194,13 +194,13 @@ bool Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2,
 	// check that there is not a lore conflict between base item and existing inventory
 	else if(CheckLoreConflict(item)) {
 		// DuplicateLoreMessage(item_id);
-		Message(13, "You already have a lore %s (%i) in your inventory.", item->Name, item_id);
+		Message(Chat::Red, "You already have a lore %s (%i) in your inventory.", item->Name, item_id);
 
 		return false;
 	}
 	// check to make sure we are augmenting an augmentable item
 	else if (((!item->IsClassCommon()) || (item->AugType > 0)) && (aug1 | aug2 | aug3 | aug4 | aug5 | aug6)) {
-		Message(13, "You can not augment an augment or a non-common class item.");
+		Message(Chat::Red, "You can not augment an augment or a non-common class item.");
 		Log(Logs::Detail, Logs::Inventory, "Player %s on account %s attempted to augment an augment or a non-common class item.\n(Item: %u, Aug1: %u, Aug2: %u, Aug3: %u, Aug4: %u, Aug5: %u, Aug5: %u)\n",
 			GetName(), account_name, item->ID, aug1, aug2, aug3, aug4, aug5, aug6);
 
@@ -214,7 +214,7 @@ bool Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2,
 	// check to make sure we are a GM if the item is GM-only
 	/*
 	else if(item->MinStatus && ((this->Admin() < item->MinStatus) || (this->Admin() < RuleI(GM, MinStatusToSummonItem)))) {
-		Message(13, "You are not a GM or do not have the status to summon this item.");
+		Message(Chat::Red, "You are not a GM or do not have the status to summon this item.");
 		Log(Logs::Detail, Logs::Inventory, "Player %s on account %s attempted to create a GM-only item with a status of %i.\n(Item: %u, Aug1: %u, Aug2: %u, Aug3: %u, Aug4: %u, Aug5: %u, Aug6: %u, MinStatus: %u)\n",
 			GetName(), account_name, this->Admin(), item->ID, aug1, aug2, aug3, aug4, aug5, aug6, item->MinStatus);
 
@@ -237,7 +237,7 @@ bool Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2,
 
 		if(augtest == nullptr) {
 			if(augments[iter]) {
-				Message(13, "Augment %u (Aug%i) does not exist.", augments[iter], iter + 1);
+				Message(Chat::Red, "Augment %u (Aug%i) does not exist.", augments[iter], iter + 1);
 				Log(Logs::Detail, Logs::Inventory, "Player %s on account %s attempted to create an augment (Aug%i) with an invalid id.\n(Item: %u, Aug1: %u, Aug2: %u, Aug3: %u, Aug4: %u, Aug5: %u, Aug6: %u)\n",
 					GetName(), account_name, (iter + 1), item->ID, aug1, aug2, aug3, aug4, aug5, aug6);
 
@@ -248,13 +248,13 @@ bool Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2,
 			// check that there is not a lore conflict between augment and existing inventory
 			if(CheckLoreConflict(augtest)) {
 				// DuplicateLoreMessage(augtest->ID);
-				Message(13, "You already have a lore %s (%u) in your inventory.", augtest->Name, augtest->ID);
+				Message(Chat::Red, "You already have a lore %s (%u) in your inventory.", augtest->Name, augtest->ID);
 				
 				return false;
 			}
 			// check that augment is an actual augment
 			else if(augtest->AugType == 0) {
-				Message(13, "%s (%u) (Aug%i) is not an actual augment.", augtest->Name, augtest->ID, iter + 1);
+				Message(Chat::Red, "%s (%u) (Aug%i) is not an actual augment.", augtest->Name, augtest->ID, iter + 1);
 				Log(Logs::Detail, Logs::Inventory, "Player %s on account %s attempted to use a non-augment item (Aug%i) as an augment.\n(Item: %u, Aug1: %u, Aug2: %u, Aug3: %u, Aug4: %u, Aug5: %u, Aug6: %u)\n",
 					GetName(), account_name, item->ID, (iter + 1), aug1, aug2, aug3, aug4, aug5, aug6);
 				
@@ -266,7 +266,7 @@ bool Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2,
 			// check to make sure we are a GM if the augment is GM-only
 			/*
 			else if(augtest->MinStatus && ((this->Admin() < augtest->MinStatus) || (this->Admin() < RuleI(GM, MinStatusToSummonItem)))) {
-				Message(13, "You are not a GM or do not have the status to summon this augment.");
+				Message(Chat::Red, "You are not a GM or do not have the status to summon this augment.");
 				Log(Logs::Detail, Logs::Inventory, "Player %s on account %s attempted to create a GM-only augment (Aug%i) with a status of %i.\n(Item: %u, Aug1: %u, Aug2: %u, Aug3: %u, Aug4: %u, Aug5: %u, MinStatus: %u)\n",
 					GetName(), account_name, (iter + 1), this->Admin(), item->ID, aug1, aug2, aug3, aug4, aug5, aug6, item->MinStatus);
 
@@ -277,7 +277,7 @@ bool Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2,
 			// check for augment type allowance
 			if(enforcewear) {
 				if ((item->AugSlotType[iter] == EQEmu::item::AugTypeNone) || !(((uint32)1 << (item->AugSlotType[iter] - 1)) & augtest->AugType)) {
-					Message(13, "Augment %u (Aug%i) is not acceptable wear on Item %u.", augments[iter], iter + 1, item->ID);
+					Message(Chat::Red, "Augment %u (Aug%i) is not acceptable wear on Item %u.", augments[iter], iter + 1, item->ID);
 					Log(Logs::Detail, Logs::Inventory, "Player %s on account %s attempted to augment an item with an unacceptable augment type (Aug%i).\n(Item: %u, Aug1: %u, Aug2: %u, Aug3: %u, Aug4: %u, Aug5: %u, Aug6: %u)\n",
 						GetName(), account_name, (iter + 1), item->ID, aug1, aug2, aug3, aug4, aug5, aug6);
 
@@ -285,7 +285,7 @@ bool Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2,
 				}
 
 				if(item->AugSlotVisible[iter] == 0) {
-					Message(13, "Item %u has not evolved enough to accept Augment %u (Aug%i).", item->ID, augments[iter], iter + 1);
+					Message(Chat::Red, "Item %u has not evolved enough to accept Augment %u (Aug%i).", item->ID, augments[iter], iter + 1);
 					Log(Logs::Detail, Logs::Inventory, "Player %s on account %s attempted to augment an unevolved item with augment type (Aug%i).\n(Item: %u, Aug1: %u, Aug2: %u, Aug3: %u, Aug4: %u, Aug5: %u, Aug6: %u)\n",
 						GetName(), account_name, (iter + 1), item->ID, aug1, aug2, aug3, aug4, aug5, aug6);
 
@@ -462,7 +462,7 @@ bool Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2,
 				}
 
 				if(restrictfail) {
-					Message(13, "Augment %u (Aug%i) is restricted from wear on Item %u.", augments[iter], (iter + 1), item->ID);
+					Message(Chat::Red, "Augment %u (Aug%i) is restricted from wear on Item %u.", augments[iter], (iter + 1), item->ID);
 					Log(Logs::Detail, Logs::Inventory, "Player %s on account %s attempted to augment an item with a restricted augment (Aug%i).\n(Item: %u, Aug1: %u, Aug2: %u, Aug3: %u, Aug4: %u, Aug5: %u, Aug6: %u)\n",
 						GetName(), account_name, (iter + 1), item->ID, aug1, aug2, aug3, aug4, aug5, aug6);
 
@@ -473,7 +473,7 @@ bool Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2,
 			if(enforceusable) {
 				// check for class usability
 				if(item->Classes && !(classes &= augtest->Classes)) {
-					Message(13, "Augment %u (Aug%i) will result in an item not usable by any class.", augments[iter], (iter + 1));
+					Message(Chat::Red, "Augment %u (Aug%i) will result in an item not usable by any class.", augments[iter], (iter + 1));
 					Log(Logs::Detail, Logs::Inventory, "Player %s on account %s attempted to create an item unusable by any class.\n(Item: %u, Aug1: %u, Aug2: %u, Aug3: %u, Aug4: %u, Aug5: %u, Aug6: %u)\n",
 						GetName(), account_name, item->ID, aug1, aug2, aug3, aug4, aug5, aug6);
 
@@ -482,7 +482,7 @@ bool Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2,
 
 				// check for race usability
 				if(item->Races && !(races &= augtest->Races)) {
-					Message(13, "Augment %u (Aug%i) will result in an item not usable by any race.", augments[iter], (iter + 1));
+					Message(Chat::Red, "Augment %u (Aug%i) will result in an item not usable by any race.", augments[iter], (iter + 1));
 					Log(Logs::Detail, Logs::Inventory, "Player %s on account %s attempted to create an item unusable by any race.\n(Item: %u, Aug1: %u, Aug2: %u, Aug3: %u, Aug4: %u, Aug5: %u, Aug6: %u)\n",
 						GetName(), account_name, item->ID, aug1, aug2, aug3, aug4, aug5, aug6);
 
@@ -491,7 +491,7 @@ bool Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2,
 
 				// check for slot usability
 				if(item->Slots && !(slots &= augtest->Slots)) {
-					Message(13, "Augment %u (Aug%i) will result in an item not usable in any slot.", augments[iter], (iter + 1));
+					Message(Chat::Red, "Augment %u (Aug%i) will result in an item not usable in any slot.", augments[iter], (iter + 1));
 					Log(Logs::Detail, Logs::Inventory, "Player %s on account %s attempted to create an item unusable in any slot.\n(Item: %u, Aug1: %u, Aug2: %u, Aug3: %u, Aug4: %u, Aug5: %u, Aug6: %u)\n",
 						GetName(), account_name, item->ID, aug1, aug2, aug3, aug4, aug5, aug6);
 
@@ -517,7 +517,7 @@ bool Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2,
 	EQEmu::ItemInstance* inst = database.CreateItem(item, charges);
 
 	if(inst == nullptr) {
-		Message(13, "An unknown server error has occurred and your item was not created.");
+		Message(Chat::Red, "An unknown server error has occurred and your item was not created.");
 		// this goes to logfile since this is a major error
 		Log(Logs::General, Logs::Error, "Player %s on account %s encountered an unknown item creation error.\n(Item: %u, Aug1: %u, Aug2: %u, Aug3: %u, Aug4: %u, Aug5: %u, Aug6: %u)\n",
 			GetName(), account_name, item->ID, aug1, aug2, aug3, aug4, aug5, aug6);
@@ -652,7 +652,7 @@ void Client::DropItem(int16 slot_id, bool recurse)
 	} else {
 		// Item doesn't exist in inventory!
 		Log(Logs::General, Logs::Inventory, "DropItem() - No item found in slot %i", slot_id);
-		Message(13, "Error: Item not found in slot %i", slot_id);
+		Message(Chat::Red, "Error: Item not found in slot %i", slot_id);
 		return;
 	}
 
@@ -752,14 +752,14 @@ void Client::DropInst(const EQEmu::ItemInstance* inst)
 {
 	if (!inst) {
 		// Item doesn't exist in inventory!
-		Message(13, "Error: Item not found");
+		Message(Chat::Red, "Error: Item not found");
 		return;
 	}
 
 
 	if (inst->GetItem()->NoDrop == 0)
 	{
-		Message(13, "This item is NODROP. Deleting.");
+		Message(Chat::Red, "This item is NODROP. Deleting.");
 		return;
 	}
 
@@ -853,7 +853,7 @@ void Client::SendCursorBuffer()
 	if (!lore_pass) {
 		Log(Logs::General, Logs::Inventory, "(%s) Duplicate lore items are not allowed - destroying item %s(id:%u) on cursor",
 			GetName(), test_item->Name, test_item->ID);
-		Message_StringID(MT_LootMessages, 290);
+		MessageString(Chat::Loot, 290);
 		parse->EventItem(EVENT_DESTROY_ITEM, this, test_inst, nullptr, "", 0);
 		DeleteItemInInventory(EQEmu::invslot::slotCursor);
 		SendCursorBuffer();
@@ -1520,7 +1520,7 @@ bool Client::SwapItem(MoveItem_Struct* move_in) {
 	if(!IsValidSlot(src_slot_check)){
 		// SoF+ sends a Unix timestamp (should be int32) for src and dst slots every 10 minutes for some reason.
 		if(src_slot_check < 2147483647)
-			Message(13, "Warning: Invalid slot move from slot %u to slot %u with %u charges!", src_slot_check, dst_slot_check, stack_count_check);
+			Message(Chat::Red, "Warning: Invalid slot move from slot %u to slot %u with %u charges!", src_slot_check, dst_slot_check, stack_count_check);
 		Log(Logs::Detail, Logs::Inventory, "Invalid slot move from slot %u to slot %u with %u charges!", src_slot_check, dst_slot_check, stack_count_check);
 		return false;
 	}
@@ -1528,7 +1528,7 @@ bool Client::SwapItem(MoveItem_Struct* move_in) {
 	if(!IsValidSlot(dst_slot_check)) {
 		// SoF+ sends a Unix timestamp (should be int32) for src and dst slots every 10 minutes for some reason.
 		if(src_slot_check < 2147483647)
-			Message(13, "Warning: Invalid slot move from slot %u to slot %u with %u charges!", src_slot_check, dst_slot_check, stack_count_check);
+			Message(Chat::Red, "Warning: Invalid slot move from slot %u to slot %u with %u charges!", src_slot_check, dst_slot_check, stack_count_check);
 		Log(Logs::Detail, Logs::Inventory, "Invalid slot move from slot %u to slot %u with %u charges!", src_slot_check, dst_slot_check, stack_count_check);
 		return false;
 	}
@@ -1555,7 +1555,7 @@ bool Client::SwapItem(MoveItem_Struct* move_in) {
 			if (!lore_pass) {
 				Log(Logs::General, Logs::Inventory, "(%s) Duplicate lore items are not allowed - destroying item %s(id:%u) on cursor",
 					GetName(), test_item->Name, test_item->ID);
-				Message_StringID(MT_LootMessages, 290);
+				MessageString(Chat::Loot, 290);
 				parse->EventItem(EVENT_DESTROY_ITEM, this, test_inst, nullptr, "", 0);
 				DeleteItemInInventory(EQEmu::invslot::slotCursor, 0, true);
 			}
@@ -1608,7 +1608,7 @@ bool Client::SwapItem(MoveItem_Struct* move_in) {
 				banker ? banker->GetName() : "UNKNOWN NPC", distance);
 			database.SetMQDetectionFlag(AccountName(), GetName(), hacked_string, zone->GetShortName());
 			safe_delete_array(hacked_string);
-			Kick();	// Kicking player to avoid item loss do to client and server inventories not being sync'd
+			Kick("Inventory desync");	// Kicking player to avoid item loss do to client and server inventories not being sync'd
 			return false;
 		}
 	}
@@ -1624,7 +1624,7 @@ bool Client::SwapItem(MoveItem_Struct* move_in) {
 		//SetTint(dst_slot_id,src_inst->GetColor());
 		if (src_inst->GetCharges() > 0 && (src_inst->GetCharges() < (int16)move_in->number_in_stack || move_in->number_in_stack > src_inst->GetItem()->StackSize))
 		{
-			Message(13,"Error: Insufficient number in stack.");
+			Message(Chat::Red,"Error: Insufficient number in stack.");
 			return false;
 		}
 	}
@@ -1650,7 +1650,7 @@ bool Client::SwapItem(MoveItem_Struct* move_in) {
 		}
 		if (srcitemid==17899 || srcbagid==17899 || dstitemid==17899 || dstbagid==17899){
 			this->Trader_EndTrader();
-			this->Message(13,"You cannot move your Trader Satchels, or items inside them, while Trading.");
+			this->Message(Chat::Red,"You cannot move your Trader Satchels, or items inside them, while Trading.");
 		}
 	}
 
@@ -1822,14 +1822,14 @@ bool Client::SwapItem(MoveItem_Struct* move_in) {
 	// Step 4: Check for entity trade
 	if (dst_slot_id >= EQEmu::invslot::TRADE_BEGIN && dst_slot_id <= EQEmu::invslot::TRADE_END) {
 		if (src_slot_id != EQEmu::invslot::slotCursor) {
-			Kick();
+			Kick("Trade with non-cursor item");
 			return false;
 		}
 		if (with) {
 			Log(Logs::Detail, Logs::Inventory, "Trade item move from slot %d to slot %d (trade with %s)", src_slot_id, dst_slot_id, with->GetName());
 			// Fill Trade list with items from cursor
 			if (!m_inv[EQEmu::invslot::slotCursor]) {
-				Message(13, "Error: Cursor item not located on server!");
+				Message(Chat::Red, "Error: Cursor item not located on server!");
 				return false;
 			}
 
@@ -1939,7 +1939,7 @@ bool Client::SwapItem(MoveItem_Struct* move_in) {
 				fail_message = "You are not sufficient level to use this item.";
 			
 			if (fail_message)
-				Message(CC_Red, "%s", fail_message);
+				Message(Chat::Red, "%s", fail_message);
 
 			return false;
 		}
@@ -2008,7 +2008,7 @@ void Client::SwapItemResync(MoveItem_Struct* move_slots) {
 	// resync the 'from' and 'to' slots on an as-needed basis
 	// Not as effective as the full process, but less intrusive to gameplay
 	Log(Logs::Detail, Logs::Inventory, "Inventory desyncronization. (charname: %s, source: %i, destination: %i)", GetName(), move_slots->from_slot, move_slots->to_slot);
-	Message(15, "Inventory Desyncronization detected: Resending slot data...");
+	Message(Chat::Yellow, "Inventory Desyncronization detected: Resending slot data...");
 
 	if (move_slots->from_slot >= EQEmu::invslot::EQUIPMENT_BEGIN && move_slots->from_slot <= EQEmu::invbag::CURSOR_BAG_END) {
 		int16 resync_slot = (EQEmu::InventoryProfile::CalcSlotId(move_slots->from_slot) == INVALID_INDEX) ? move_slots->from_slot : EQEmu::InventoryProfile::CalcSlotId(move_slots->from_slot);
@@ -2031,9 +2031,9 @@ void Client::SwapItemResync(MoveItem_Struct* move_slots) {
 				safe_delete(outapp);
 			}
 			safe_delete(token_inst);
-			Message(14, "Source slot %i resyncronized.", move_slots->from_slot);
+			Message(Chat::Lime, "Source slot %i resyncronized.", move_slots->from_slot);
 		}
-		else { Message(13, "Could not resyncronize source slot %i.", move_slots->from_slot); }
+		else { Message(Chat::Red, "Could not resyncronize source slot %i.", move_slots->from_slot); }
 	}
 	else {
 		int16 resync_slot = (EQEmu::InventoryProfile::CalcSlotId(move_slots->from_slot) == INVALID_INDEX) ? move_slots->from_slot : EQEmu::InventoryProfile::CalcSlotId(move_slots->from_slot);
@@ -2046,11 +2046,11 @@ void Client::SwapItemResync(MoveItem_Struct* move_slots) {
 				SendItemPacket(resync_slot, m_inv[resync_slot], ItemPacketTrade);
 
 				safe_delete(token_inst);
-				Message(14, "Source slot %i resyncronized.", move_slots->from_slot);
+				Message(Chat::Lime, "Source slot %i resyncronized.", move_slots->from_slot);
 			}
-			else { Message(13, "Could not resyncronize source slot %i.", move_slots->from_slot); }
+			else { Message(Chat::Red, "Could not resyncronize source slot %i.", move_slots->from_slot); }
 		}
-		else { Message(13, "Could not resyncronize source slot %i.", move_slots->from_slot); }
+		else { Message(Chat::Red, "Could not resyncronize source slot %i.", move_slots->from_slot); }
 	}
 
 	if (move_slots->to_slot >= EQEmu::invslot::EQUIPMENT_BEGIN && move_slots->to_slot <= EQEmu::invbag::CURSOR_BAG_END) {
@@ -2073,9 +2073,9 @@ void Client::SwapItemResync(MoveItem_Struct* move_slots) {
 				safe_delete(outapp);
 			}
 			safe_delete(token_inst);
-			Message(14, "Destination slot %i resyncronized.", move_slots->to_slot);
+			Message(Chat::Lime, "Destination slot %i resyncronized.", move_slots->to_slot);
 		}
-		else { Message(13, "Could not resyncronize destination slot %i.", move_slots->to_slot); }
+		else { Message(Chat::Red, "Could not resyncronize destination slot %i.", move_slots->to_slot); }
 	}
 	else {
 		int16 resync_slot = (EQEmu::InventoryProfile::CalcSlotId(move_slots->to_slot) == INVALID_INDEX) ? move_slots->to_slot : EQEmu::InventoryProfile::CalcSlotId(move_slots->to_slot);
@@ -2088,11 +2088,11 @@ void Client::SwapItemResync(MoveItem_Struct* move_slots) {
 				SendItemPacket(resync_slot, m_inv[resync_slot], ItemPacketTrade);
 
 				safe_delete(token_inst);
-				Message(14, "Destination slot %i resyncronized.", move_slots->to_slot);
+				Message(Chat::Lime, "Destination slot %i resyncronized.", move_slots->to_slot);
 			}
-			else { Message(13, "Could not resyncronize destination slot %i.", move_slots->to_slot); }
+			else { Message(Chat::Red, "Could not resyncronize destination slot %i.", move_slots->to_slot); }
 		}
-		else { Message(13, "Could not resyncronize destination slot %i.", move_slots->to_slot); }
+		else { Message(Chat::Red, "Could not resyncronize destination slot %i.", move_slots->to_slot); }
 	}
 }
 
@@ -2219,7 +2219,7 @@ void Client::DyeArmor(EQEmu::TintProfile* dye){
 				SendWearChange(i);
 			}
 			else{
-				Message(13,"Could not locate A Vial of Prismatic Dye.");
+				Message(Chat::Red,"Could not locate A Vial of Prismatic Dye.");
 				return;
 			}
 		}
@@ -3397,7 +3397,7 @@ bool Client::InterrogateInventory(Client* requester, bool log, bool silent, bool
 		Log(Logs::General, Logs::Error, "Client::InterrogateInventory() called for %s by %s with an error state of %s", GetName(), requester->GetName(), (error ? "TRUE" : "FALSE"));
 	}
 	if (!silent) {
-		requester->Message(1, "--- Inventory Interrogation Report for %s (requested by: %s, error state: %s) ---", GetName(), requester->GetName(), (error ? "TRUE" : "FALSE"));
+		requester->Message(Chat::Default, "--- Inventory Interrogation Report for %s (requested by: %s, error state: %s) ---", GetName(), requester->GetName(), (error ? "TRUE" : "FALSE"));
 	}
 
 	// call InterrogateInventory_ for report
@@ -3406,9 +3406,9 @@ bool Client::InterrogateInventory(Client* requester, bool log, bool silent, bool
 	}
 
 	if (error) {
-		Message(13, "An error has been discovered in your inventory!");
-		Message(13, "Do not log out, zone or re-arrange items until this");
-		Message(13, "issue has been resolved or item loss may occur!");
+		Message(Chat::Red, "An error has been discovered in your inventory!");
+		Message(Chat::Red, "Do not log out, zone or re-arrange items until this");
+		Message(Chat::Red, "issue has been resolved or item loss may occur!");
 
 		if (allowtrip)
 			TripInterrogateInvState();
@@ -3419,8 +3419,8 @@ bool Client::InterrogateInventory(Client* requester, bool log, bool silent, bool
 		Log(Logs::Detail, Logs::None, "[CLIENT] Client::InterrogateInventory() -- End");
 	}
 	if (!silent) {
-		requester->Message(1, "Target interrogation flag: %s", (GetInterrogateInvState() ? "TRUE" : "FALSE"));
-		requester->Message(1, "--- End of Interrogation Report ---");
+		requester->Message(Chat::Default, "Target interrogation flag: %s", (GetInterrogateInvState() ? "TRUE" : "FALSE"));
+		requester->Message(Chat::Default, "--- End of Interrogation Report ---");
 	}
 
 	instmap.clear();
@@ -3466,7 +3466,7 @@ void Client::InterrogateInventory_(bool errorcheck, Client* requester, int16 hea
 				head, depth, i.c_str(), p.c_str(), e.c_str());
 		}
 		if (!silent) {
-			requester->Message(6, "%i:%i - inst: %s - parent: %s%s",
+			requester->Message(Chat::Gray, "%i:%i - inst: %s - parent: %s%s",
 				head, depth, i.c_str(), p.c_str(), e.c_str());
 		}
 
diff --git a/zone/lua_client.cpp b/zone/lua_client.cpp
index 9447c48af..952bc065f 100644
--- a/zone/lua_client.cpp
+++ b/zone/lua_client.cpp
@@ -47,7 +47,7 @@ bool Lua_Client::InZone() {
 
 void Lua_Client::Kick() {
 	Lua_Safe_Call_Void();
-	self->Kick();
+	self->Kick("Lua Quest");
 }
 
 void Lua_Client::Disconnect() {
@@ -1210,6 +1210,16 @@ void Lua_Client::AddAlternateCurrencyValue(uint32 currency, int amount) {
 	self->AddAlternateCurrencyValue(currency, amount, 1);
 }
 
+void Lua_Client::SetAlternateCurrencyValue(uint32 currency, int amount) {
+	Lua_Safe_Call_Void();
+	self->SetAlternateCurrencyValue(currency, amount);
+}
+
+int Lua_Client::GetAlternateCurrencyValue(uint32 currency) {
+	Lua_Safe_Call_Int();
+	return self->GetAlternateCurrencyValue(currency);
+}
+
 void Lua_Client::SendWebLink(const char *site) {
 	Lua_Safe_Call_Void();
 	self->SendWebLink(site);
@@ -1760,6 +1770,8 @@ luabind::scope lua_register_client() {
 		.def("OpenLFGuildWindow", (void(Lua_Client::*)(void))&Lua_Client::OpenLFGuildWindow)
 		.def("Signal", (void(Lua_Client::*)(uint32))&Lua_Client::Signal)
 		.def("AddAlternateCurrencyValue", (void(Lua_Client::*)(uint32,int))&Lua_Client::AddAlternateCurrencyValue)
+		.def("SetAlternateCurrencyValue", (void(Lua_Client::*)(uint32,int))&Lua_Client::SetAlternateCurrencyValue)
+		.def("GetAlternateCurrencyValue", (int(Lua_Client::*)(uint32))&Lua_Client::GetAlternateCurrencyValue)
 		.def("SendWebLink", (void(Lua_Client::*)(const char *))&Lua_Client::SendWebLink)
 		.def("HasSpellScribed", (bool(Lua_Client::*)(int))&Lua_Client::HasSpellScribed)
 		.def("SetAccountFlag", (void(Lua_Client::*)(std::string,std::string))&Lua_Client::SetAccountFlag)
diff --git a/zone/lua_client.h b/zone/lua_client.h
index fee4d31f0..8469ee1f7 100644
--- a/zone/lua_client.h
+++ b/zone/lua_client.h
@@ -269,6 +269,8 @@ public:
 	void OpenLFGuildWindow();
 	void Signal(uint32 id);
 	void AddAlternateCurrencyValue(uint32 currency, int amount);
+	void SetAlternateCurrencyValue(uint32 currency, int amount);
+	int GetAlternateCurrencyValue(uint32 currency);
 	void SendWebLink(const char *site);
 	bool HasSpellScribed(int spell_id);
 	void SetAccountFlag(std::string flag, std::string val);
diff --git a/zone/lua_general.cpp b/zone/lua_general.cpp
index 9dd1d8c9b..4dddd887d 100644
--- a/zone/lua_general.cpp
+++ b/zone/lua_general.cpp
@@ -36,6 +36,8 @@ struct BodyTypes { };
 struct Filters { };
 struct MessageTypes { };
 struct Rule { };
+struct Journal_SpeakMode { };
+struct Journal_Mode { };
 
 struct lua_registered_event {
 	std::string encounter_name;
@@ -2232,91 +2234,92 @@ luabind::scope lua_register_message_types() {
 	return luabind::class_<MessageTypes>("MT")
 		.enum_("constants")
 		[
-			luabind::value("Say", MT_Say),
-			luabind::value("Tell", MT_Tell),
-			luabind::value("Group", MT_Group),
-			luabind::value("Guild", MT_Guild),
-			luabind::value("OOC", MT_OOC),
-			luabind::value("Auction", MT_Auction),
-			luabind::value("Shout", MT_Shout),
-			luabind::value("Emote", MT_Emote),
-			luabind::value("Spells", MT_Spells),
-			luabind::value("YouHitOther", MT_YouHitOther),
-			luabind::value("OtherHitsYou", MT_OtherHitsYou),
-			luabind::value("YouMissOther", MT_YouMissOther),
-			luabind::value("OtherMissesYou", MT_OtherMissesYou),
-			luabind::value("Broadcasts", MT_Broadcasts),
-			luabind::value("Skills", MT_Skills),
-			luabind::value("Disciplines", MT_Disciplines),
-			luabind::value("Unused1", MT_Unused1),
-			luabind::value("DefaultText", MT_DefaultText),
-			luabind::value("Unused2", MT_Unused2),
-			luabind::value("MerchantOffer", MT_MerchantOffer),
-			luabind::value("MerchantBuySell", MT_MerchantBuySell),
-			luabind::value("YourDeath", MT_YourDeath),
-			luabind::value("OtherDeath", MT_OtherDeath),
-			luabind::value("OtherHits", MT_OtherHits),
-			luabind::value("OtherMisses", MT_OtherMisses),
-			luabind::value("Who", MT_Who),
-			luabind::value("YellForHelp", MT_YellForHelp),
-			luabind::value("NonMelee", MT_NonMelee),
-			luabind::value("WornOff", MT_WornOff),
-			luabind::value("MoneySplit", MT_MoneySplit),
-			luabind::value("LootMessages", MT_LootMessages),
-			luabind::value("DiceRoll", MT_DiceRoll),
-			luabind::value("OtherSpells", MT_OtherSpells),
-			luabind::value("SpellFailure", MT_SpellFailure),
-			luabind::value("Chat", MT_Chat),
-			luabind::value("Channel1", MT_Channel1),
-			luabind::value("Channel2", MT_Channel2),
-			luabind::value("Channel3", MT_Channel3),
-			luabind::value("Channel4", MT_Channel4),
-			luabind::value("Channel5", MT_Channel5),
-			luabind::value("Channel6", MT_Channel6),
-			luabind::value("Channel7", MT_Channel7),
-			luabind::value("Channel8", MT_Channel8),
-			luabind::value("Channel9", MT_Channel9),
-			luabind::value("Channel10", MT_Channel10),
-			luabind::value("CritMelee", MT_CritMelee),
-			luabind::value("SpellCrits", MT_SpellCrits),
-			luabind::value("TooFarAway", MT_TooFarAway),
-			luabind::value("NPCRampage", MT_NPCRampage),
-			luabind::value("NPCFlurry", MT_NPCFlurry),
-			luabind::value("NPCEnrage", MT_NPCEnrage),
-			luabind::value("SayEcho", MT_SayEcho),
-			luabind::value("TellEcho", MT_TellEcho),
-			luabind::value("GroupEcho", MT_GroupEcho),
-			luabind::value("GuildEcho", MT_GuildEcho),
-			luabind::value("OOCEcho", MT_OOCEcho),
-			luabind::value("AuctionEcho", MT_AuctionEcho),
-			luabind::value("ShoutECho", MT_ShoutECho),
-			luabind::value("EmoteEcho", MT_EmoteEcho),
-			luabind::value("Chat1Echo", MT_Chat1Echo),
-			luabind::value("Chat2Echo", MT_Chat2Echo),
-			luabind::value("Chat3Echo", MT_Chat3Echo),
-			luabind::value("Chat4Echo", MT_Chat4Echo),
-			luabind::value("Chat5Echo", MT_Chat5Echo),
-			luabind::value("Chat6Echo", MT_Chat6Echo),
-			luabind::value("Chat7Echo", MT_Chat7Echo),
-			luabind::value("Chat8Echo", MT_Chat8Echo),
-			luabind::value("Chat9Echo", MT_Chat9Echo),
-			luabind::value("Chat10Echo", MT_Chat10Echo),
-			luabind::value("DoTDamage", MT_DoTDamage),
-			luabind::value("ItemLink", MT_ItemLink),
-			luabind::value("RaidSay", MT_RaidSay),
-			luabind::value("MyPet", MT_MyPet),
-			luabind::value("DS", MT_DS),
-			luabind::value("Leadership", MT_Leadership),
-			luabind::value("PetFlurry", MT_PetFlurry),
-			luabind::value("PetCrit", MT_PetCrit),
-			luabind::value("FocusEffect", MT_FocusEffect),
-			luabind::value("Experience", MT_Experience),
-			luabind::value("System", MT_System),
-			luabind::value("PetSpell", MT_PetSpell),
-			luabind::value("PetResponse", MT_PetResponse),
-			luabind::value("ItemSpeech", MT_ItemSpeech),
-			luabind::value("StrikeThrough", MT_StrikeThrough),
-			luabind::value("Stun", MT_Stun)
+			luabind::value("NPCQuestSay", Chat::NPCQuestSay),
+			luabind::value("Say", Chat::Say),
+			luabind::value("Tell", Chat::Tell),
+			luabind::value("Group", Chat::Group),
+			luabind::value("Guild", Chat::Guild),
+			luabind::value("OOC", Chat::OOC),
+			luabind::value("Auction", Chat::Auction),
+			luabind::value("Shout", Chat::Shout),
+			luabind::value("Emote", Chat::Emote),
+			luabind::value("Spells", Chat::Spells),
+			luabind::value("YouHitOther", Chat::YouHitOther),
+			luabind::value("OtherHitsYou", Chat::OtherHitYou),
+			luabind::value("YouMissOther", Chat::YouMissOther),
+			luabind::value("OtherMissesYou", Chat::OtherMissYou),
+			luabind::value("Broadcasts", Chat::Broadcasts),
+			luabind::value("Skills", Chat::Skills),
+			luabind::value("Disciplines", Chat::Disciplines),
+			luabind::value("Unused1", Chat::Unused1),
+			luabind::value("DefaultText", Chat::DefaultText),
+			luabind::value("Unused2", Chat::Unused2),
+			luabind::value("MerchantOffer", Chat::MerchantOffer),
+			luabind::value("MerchantBuySell", Chat::MerchantExchange),
+			luabind::value("YourDeath", Chat::YourDeath),
+			luabind::value("OtherDeath", Chat::OtherDeath),
+			luabind::value("OtherHits", Chat::OtherHitOther),
+			luabind::value("OtherMisses", Chat::OtherMissOther),
+			luabind::value("Who", Chat::Who),
+			luabind::value("YellForHelp", Chat::YellForHelp),
+			luabind::value("NonMelee", Chat::NonMelee),
+			luabind::value("WornOff", Chat::SpellWornOff),
+			luabind::value("MoneySplit", Chat::MoneySplit),
+			luabind::value("LootMessages", Chat::Loot),
+			luabind::value("DiceRoll", Chat::DiceRoll),
+			luabind::value("OtherSpells", Chat::OtherSpells),
+			luabind::value("SpellFailure", Chat::SpellFailure),
+			luabind::value("Chat", Chat::ChatChannel),
+			luabind::value("Channel1", Chat::Chat1),
+			luabind::value("Channel2", Chat::Chat2),
+			luabind::value("Channel3", Chat::Chat3),
+			luabind::value("Channel4", Chat::Chat4),
+			luabind::value("Channel5", Chat::Chat5),
+			luabind::value("Channel6", Chat::Chat6),
+			luabind::value("Channel7", Chat::Chat7),
+			luabind::value("Channel8", Chat::Chat8),
+			luabind::value("Channel9", Chat::Chat9),
+			luabind::value("Channel10", Chat::Chat10),
+			luabind::value("CritMelee", Chat::MeleeCrit),
+			luabind::value("SpellCrits", Chat::SpellCrit),
+			luabind::value("TooFarAway", Chat::TooFarAway),
+			luabind::value("NPCRampage", Chat::NPCRampage),
+			luabind::value("NPCFlurry", Chat::NPCFlurry),
+			luabind::value("NPCEnrage", Chat::NPCEnrage),
+			luabind::value("SayEcho", Chat::EchoSay),
+			luabind::value("TellEcho", Chat::EchoTell),
+			luabind::value("GroupEcho", Chat::EchoGroup),
+			luabind::value("GuildEcho", Chat::EchoGuild),
+			luabind::value("OOCEcho", Chat::EchoOOC),
+			luabind::value("AuctionEcho", Chat::EchoAuction),
+			luabind::value("ShoutECho", Chat::EchoShout),
+			luabind::value("EmoteEcho", Chat::EchoEmote),
+			luabind::value("Chat1Echo", Chat::EchoChat1),
+			luabind::value("Chat2Echo", Chat::EchoChat2),
+			luabind::value("Chat3Echo", Chat::EchoChat3),
+			luabind::value("Chat4Echo", Chat::EchoChat4),
+			luabind::value("Chat5Echo", Chat::EchoChat5),
+			luabind::value("Chat6Echo", Chat::EchoChat6),
+			luabind::value("Chat7Echo", Chat::EchoChat7),
+			luabind::value("Chat8Echo", Chat::EchoChat8),
+			luabind::value("Chat9Echo", Chat::EchoChat9),
+			luabind::value("Chat10Echo", Chat::EchoChat10),
+			luabind::value("DoTDamage", Chat::DotDamage),
+			luabind::value("ItemLink", Chat::ItemLink),
+			luabind::value("RaidSay", Chat::RaidSay),
+			luabind::value("MyPet", Chat::MyPet),
+			luabind::value("DS", Chat::DamageShield),
+			luabind::value("Leadership", Chat::LeaderShip),
+			luabind::value("PetFlurry", Chat::PetFlurry),
+			luabind::value("PetCrit", Chat::PetCritical),
+			luabind::value("FocusEffect", Chat::FocusEffect),
+			luabind::value("Experience", Chat::Experience),
+			luabind::value("System", Chat::System),
+			luabind::value("PetSpell", Chat::PetSpell),
+			luabind::value("PetResponse", Chat::PetResponse),
+			luabind::value("ItemSpeech", Chat::ItemSpeech),
+			luabind::value("StrikeThrough", Chat::StrikeThrough),
+			luabind::value("Stun", Chat::Stun)
 		];
 }
 
@@ -2362,4 +2365,27 @@ luabind::scope lua_register_ruleb() {
 		];
 }
 
+luabind::scope lua_register_journal_speakmode() {
+	return luabind::class_<Journal_SpeakMode>("SpeakMode")
+		.enum_("constants")
+		[
+			luabind::value("Raw", static_cast<int>(Journal::SpeakMode::Raw)),
+			luabind::value("Say", static_cast<int>(Journal::SpeakMode::Say)),
+			luabind::value("Shout", static_cast<int>(Journal::SpeakMode::Shout)),
+			luabind::value("EmoteAlt", static_cast<int>(Journal::SpeakMode::EmoteAlt)),
+			luabind::value("Emote", static_cast<int>(Journal::SpeakMode::Emote)),
+			luabind::value("Group", static_cast<int>(Journal::SpeakMode::Group))
+		];
+}
+
+luabind::scope lua_register_journal_mode() {
+	return luabind::class_<Journal_Mode>("JournalMode")
+		.enum_("constants")
+		[
+			luabind::value("None", static_cast<int>(Journal::Mode::None)),
+			luabind::value("Log1", static_cast<int>(Journal::Mode::Log1)),
+			luabind::value("Log2", static_cast<int>(Journal::Mode::Log2))
+		];
+}
+
 #endif
diff --git a/zone/lua_general.h b/zone/lua_general.h
index 4c8b7f8d2..d5b741a76 100644
--- a/zone/lua_general.h
+++ b/zone/lua_general.h
@@ -19,6 +19,8 @@ luabind::scope lua_register_rules_const();
 luabind::scope lua_register_rulei();
 luabind::scope lua_register_ruler();
 luabind::scope lua_register_ruleb();
+luabind::scope lua_register_journal_speakmode();
+luabind::scope lua_register_journal_mode();
 
 #endif
 #endif
diff --git a/zone/lua_mob.cpp b/zone/lua_mob.cpp
index 6bb7ffd0f..765e38d7d 100644
--- a/zone/lua_mob.cpp
+++ b/zone/lua_mob.cpp
@@ -743,9 +743,9 @@ void Lua_Mob::Message(int type, const char *message) {
 	self->Message(type, message);
 }
 
-void Lua_Mob::Message_StringID(int type, int string_id, uint32 distance) {
+void Lua_Mob::MessageString(int type, int string_id, uint32 distance) {
 	Lua_Safe_Call_Void();
-	self->Message_StringID(type, string_id, distance);
+	self->MessageString(type, string_id, distance);
 }
 
 void Lua_Mob::Say(const char *message) {
@@ -753,9 +753,72 @@ void Lua_Mob::Say(const char *message) {
 	self->Say(message);
 }
 
+void Lua_Mob::Say(const char* message, int language) {
+	Lua_Safe_Call_Void();
+	entity_list.ChannelMessage(self, ChatChannel_Say, language, message); // these run through the client channels and probably shouldn't for NPCs, but oh well
+}
+
 void Lua_Mob::QuestSay(Lua_Client client, const char *message) {
 	Lua_Safe_Call_Void();
-	self->QuestJournalledSay(client, message);
+	Journal::Options journal_opts;
+	journal_opts.speak_mode = Journal::SpeakMode::Say;
+	journal_opts.journal_mode = RuleB(NPC, EnableNPCQuestJournal) ? Journal::Mode::Log2 : Journal::Mode::None;
+	journal_opts.language = 0;
+	journal_opts.message_type = Chat::NPCQuestSay;
+	journal_opts.target_spawn_id = 0;
+	self->QuestJournalledSay(client, message, journal_opts);
+}
+
+void Lua_Mob::QuestSay(Lua_Client client, const char *message, luabind::adl::object opts) {
+	Lua_Safe_Call_Void();
+
+	Journal::Options journal_opts;
+	// defaults
+	journal_opts.speak_mode = Journal::SpeakMode::Say;
+	journal_opts.journal_mode = Journal::Mode::Log2;
+	journal_opts.language = 0;
+	journal_opts.message_type = Chat::NPCQuestSay;
+	journal_opts.target_spawn_id = 0;
+
+	if (luabind::type(opts) == LUA_TTABLE) {
+		auto cur = opts["speak_mode"];
+		if (luabind::type(cur) != LUA_TNIL) {
+			try {
+				journal_opts.speak_mode = static_cast<Journal::SpeakMode>(luabind::object_cast<int>(cur));
+			} catch (luabind::cast_failed) {
+			}
+		}
+
+		cur = opts["journal_mode"];
+		if (luabind::type(cur) != LUA_TNIL) {
+			try {
+				journal_opts.journal_mode = static_cast<Journal::Mode>(luabind::object_cast<int>(cur));
+			} catch (luabind::cast_failed) {
+			}
+		}
+
+		cur = opts["language"];
+		if (luabind::type(cur) != LUA_TNIL) {
+			try {
+				journal_opts.language = luabind::object_cast<int>(cur);
+			} catch (luabind::cast_failed) {
+			}
+		}
+
+		cur = opts["message_type"];
+		if (luabind::type(cur) != LUA_TNIL) {
+			try {
+				journal_opts.message_type = luabind::object_cast<int>(cur);
+			} catch (luabind::cast_failed) {
+			}
+		}
+	}
+
+	// if rule disables it, we override provided
+	if (!RuleB(NPC, EnableNPCQuestJournal))
+		journal_opts.journal_mode = Journal::Mode::None;
+
+	self->QuestJournalledSay(client, message, journal_opts);
 }
 
 void Lua_Mob::Shout(const char *message) {
@@ -763,6 +826,11 @@ void Lua_Mob::Shout(const char *message) {
 	self->Shout(message);
 }
 
+void Lua_Mob::Shout(const char* message, int language) {
+	Lua_Safe_Call_Void();
+	entity_list.ChannelMessage(self, ChatChannel_Shout, language, message);
+}
+
 void Lua_Mob::Emote(const char *message) {
 	Lua_Safe_Call_Void();
 	self->Emote(message);
@@ -2318,10 +2386,14 @@ luabind::scope lua_register_mob() {
 		.def("SetCurrentWP", &Lua_Mob::SetCurrentWP)
 		.def("GetSize", &Lua_Mob::GetSize)
 		.def("Message", &Lua_Mob::Message)
-		.def("Message_StringID", &Lua_Mob::Message_StringID)
-		.def("Say", &Lua_Mob::Say)
-		.def("QuestSay", &Lua_Mob::QuestSay)
-		.def("Shout", &Lua_Mob::Shout)
+		.def("MessageString", &Lua_Mob::MessageString)
+		.def("Message_StringID", &Lua_Mob::MessageString)
+		.def("Say", (void(Lua_Mob::*)(const char*))& Lua_Mob::Say)
+		.def("Say", (void(Lua_Mob::*)(const char*, int))& Lua_Mob::Say)
+		.def("QuestSay", (void(Lua_Mob::*)(Lua_Client,const char *))&Lua_Mob::QuestSay)
+		.def("QuestSay", (void(Lua_Mob::*)(Lua_Client,const char *,luabind::adl::object))&Lua_Mob::QuestSay)
+		.def("Shout", (void(Lua_Mob::*)(const char*))& Lua_Mob::Shout)
+		.def("Shout", (void(Lua_Mob::*)(const char*, int))& Lua_Mob::Shout)
 		.def("Emote", &Lua_Mob::Emote)
 		.def("InterruptSpell", (void(Lua_Mob::*)(void))&Lua_Mob::InterruptSpell)
 		.def("InterruptSpell", (void(Lua_Mob::*)(int))&Lua_Mob::InterruptSpell)
diff --git a/zone/lua_mob.h b/zone/lua_mob.h
index ef930597b..82efef265 100644
--- a/zone/lua_mob.h
+++ b/zone/lua_mob.h
@@ -166,10 +166,13 @@ public:
 	void SetCurrentWP(int wp);
 	double GetSize();
 	void Message(int type, const char *message);
-	void Message_StringID(int type, int string_id, uint32 distance);
+	void MessageString(int type, int string_id, uint32 distance);
 	void Say(const char *message);
+	void Say(const char* message, int language);
 	void QuestSay(Lua_Client client, const char *message);
+	void QuestSay(Lua_Client client, const char *message, luabind::adl::object opts);
 	void Shout(const char *message);
+	void Shout(const char* message, int language);
 	void Emote(const char *message);
 	void InterruptSpell();
 	void InterruptSpell(int spell_id);
diff --git a/zone/lua_mod.cpp b/zone/lua_mod.cpp
index a891fb064..8dc77f4f7 100644
--- a/zone/lua_mod.cpp
+++ b/zone/lua_mod.cpp
@@ -1,3 +1,5 @@
+#ifdef LUA_EQEMU
+
 #include "lua.hpp"
 #include <luabind/luabind.hpp>
 #include <luabind/object.hpp>
@@ -629,3 +631,5 @@ void LuaMod::GetExperienceForKill(Client *self, Mob *against, uint32 &returnValu
 		lua_pop(L, n);
 	}
 }
+
+#endif
diff --git a/zone/lua_npc.cpp b/zone/lua_npc.cpp
index cb12bce23..4a8bd12a9 100644
--- a/zone/lua_npc.cpp
+++ b/zone/lua_npc.cpp
@@ -159,7 +159,7 @@ void Lua_NPC::SetSaveWaypoint(int wp) {
 
 void Lua_NPC::SetSp2(int sg2) {
 	Lua_Safe_Call_Void();
-	self->SetSp2(sg2);
+	self->SetSpawnGroupId(sg2);
 }
 
 int Lua_NPC::GetWaypointMax() {
@@ -174,7 +174,7 @@ int Lua_NPC::GetGrid() {
 
 uint32 Lua_NPC::GetSp2() {
 	Lua_Safe_Call_Int();
-	return self->GetSp2();
+	return self->GetSpawnGroupId();
 }
 
 int Lua_NPC::GetNPCFactionID() {
@@ -529,6 +529,24 @@ int Lua_NPC::GetAvoidanceRating()
 	return self->GetAvoidanceRating();
 }
 
+void Lua_NPC::SetSimpleRoamBox(float box_size)
+{
+	Lua_Safe_Call_Void();
+	self->SetSimpleRoamBox(box_size);
+}
+
+void Lua_NPC::SetSimpleRoamBox(float box_size, float move_distance)
+{
+	Lua_Safe_Call_Void();
+	self->SetSimpleRoamBox(box_size, move_distance);
+}
+
+void Lua_NPC::SetSimpleRoamBox(float box_size, float move_distance, int move_delay)
+{
+	Lua_Safe_Call_Void();
+	self->SetSimpleRoamBox(box_size, move_distance, move_delay);
+}
+
 luabind::scope lua_register_npc() {
 	return luabind::class_<Lua_NPC, Lua_Mob>("NPC")
 		.def(luabind::constructor<>())
@@ -614,6 +632,9 @@ luabind::scope lua_register_npc() {
 		.def("GetGuardPointZ", (float(Lua_NPC::*)(void))&Lua_NPC::GetGuardPointZ)
 		.def("SetPrimSkill", (void(Lua_NPC::*)(int))&Lua_NPC::SetPrimSkill)
 		.def("SetSecSkill", (void(Lua_NPC::*)(int))&Lua_NPC::SetSecSkill)
+		.def("SetSimpleRoamBox", (void(Lua_NPC::*)(float))&Lua_NPC::SetSimpleRoamBox)
+		.def("SetSimpleRoamBox", (void(Lua_NPC::*)(float, float))&Lua_NPC::SetSimpleRoamBox)
+		.def("SetSimpleRoamBox", (void(Lua_NPC::*)(float, float, int))&Lua_NPC::SetSimpleRoamBox)
 		.def("GetPrimSkill", (int(Lua_NPC::*)(void))&Lua_NPC::GetPrimSkill)
 		.def("GetSecSkill", (int(Lua_NPC::*)(void))&Lua_NPC::GetSecSkill)
 		.def("GetSwarmOwner", (int(Lua_NPC::*)(void))&Lua_NPC::GetSwarmOwner)
diff --git a/zone/lua_npc.h b/zone/lua_npc.h
index 4c407b3fa..92ad73cd7 100644
--- a/zone/lua_npc.h
+++ b/zone/lua_npc.h
@@ -131,6 +131,9 @@ public:
 	void MerchantCloseShop();
 	int GetRawAC();
 	int GetAvoidanceRating();
+	void SetSimpleRoamBox(float box_size);
+	void SetSimpleRoamBox(float box_size, float move_distance);
+	void SetSimpleRoamBox(float box_size, float move_distance, int move_delay);
 };
 
 #endif
diff --git a/zone/lua_parser.cpp b/zone/lua_parser.cpp
index dda4b2d23..7c7242e4c 100644
--- a/zone/lua_parser.cpp
+++ b/zone/lua_parser.cpp
@@ -1102,7 +1102,9 @@ void LuaParser::MapFunctions(lua_State *L) {
 			lua_register_rules_const(),
 			lua_register_rulei(),
 			lua_register_ruler(),
-			lua_register_ruleb()
+			lua_register_ruleb(),
+			lua_register_journal_speakmode(),
+			lua_register_journal_mode()
 		];
 
 	} catch(std::exception &ex) {
@@ -1298,8 +1300,6 @@ QuestEventID LuaParser::ConvertLuaEvent(QuestEventID evt) {
 	}
 }
 
-#endif
-
 void LuaParser::MeleeMitigation(Mob *self, Mob *attacker, DamageHitInfo &hit, ExtraAttackOptions *opts, bool &ignoreDefault)
 {
 	for (auto &mod : mods_) {
@@ -1372,3 +1372,5 @@ uint32 LuaParser::GetExperienceForKill(Client *self, Mob *against, bool &ignoreD
 	}
 	return retval;
 }
+
+#endif
diff --git a/zone/lua_stat_bonuses.cpp b/zone/lua_stat_bonuses.cpp
index e1fb329cc..0be88fd07 100644
--- a/zone/lua_stat_bonuses.cpp
+++ b/zone/lua_stat_bonuses.cpp
@@ -1,3 +1,5 @@
+#ifdef LUA_EQEMU
+
 #include "lua.hpp"
 #include <luabind/luabind.hpp>
 
@@ -1536,4 +1538,6 @@ luabind::scope lua_register_stat_bonuses() {
 		.def("Assassinate", &Lua_StatBonuses::GetAssassinate)
 		.def("AssassinateLevel", &Lua_StatBonuses::GetAssassinateLevel)
 		.def("ReduceTradeskillFail", &Lua_StatBonuses::GetReduceTradeskillFail);
-}
\ No newline at end of file
+}
+
+#endif
diff --git a/zone/merc.cpp b/zone/merc.cpp
index 7c15fbd65..c48c3fb66 100644
--- a/zone/merc.cpp
+++ b/zone/merc.cpp
@@ -1618,7 +1618,7 @@ void Merc::AI_Process() {
 					{
 						if(zone->random.Roll(flurrychance))
 						{
-							Message_StringID(MT_NPCFlurry, YOU_FLURRY);
+							MessageString(Chat::NPCFlurry, YOU_FLURRY);
 							Attack(GetTarget(), EQEmu::invslot::slotPrimary, false);
 							Attack(GetTarget(), EQEmu::invslot::slotPrimary, false);
 						}
@@ -1637,11 +1637,11 @@ void Merc::AI_Process() {
 				// TODO: Do mercs berserk? Find this out on live...
 				//if (GetClass() == WARRIOR || GetClass() == BERSERKER) {
 				//      if(GetHP() > 0 && !berserk && this->GetHPRatio() < 30) {
-				//              entity_list.MessageClose_StringID(this, false, 200, 0, BERSERK_START, GetName());
+				//              entity_list.MessageCloseString(this, false, 200, 0, BERSERK_START, GetName());
 				//              this->berserk = true;
 				//      }
 				//      if (berserk && this->GetHPRatio() > 30) {
-				//              entity_list.MessageClose_StringID(this, false, 200, 0, BERSERK_END, GetName());
+				//              entity_list.MessageCloseString(this, false, 200, 0, BERSERK_END, GetName());
 				//              this->berserk = false;
 				//      }
 				//}
@@ -2623,7 +2623,7 @@ int16 Merc::GetFocusEffect(focusType type, uint16 spell_id) {
 			realTotal = CalcFocusEffect(type, UsedFocusID, spell_id);
 
 		if (realTotal != 0 && UsedItem)
-			Message_StringID(MT_Spells, BEGINS_TO_GLOW, UsedItem->Name);
+			MessageString(Chat::Spells, BEGINS_TO_GLOW, UsedItem->Name);
 	}
 
 	//Check if spell focus effect exists for the client.
@@ -5321,10 +5321,10 @@ void Client::UpdateMercTimer()
 			Log(Logs::General, Logs::Mercenaries, "UpdateMercTimer Complete for %s.", GetName());
 
 			// Normal upkeep charge message
-			//Message(7, "You have been charged a mercenary upkeep cost of %i plat, and %i gold and your mercenary upkeep cost timer has been reset to 15 minutes.", upkeep_plat, upkeep_gold, (int)(RuleI(Mercs, UpkeepIntervalMS) / 1000 / 60));
+			//Message(Chat::LightGray, "You have been charged a mercenary upkeep cost of %i plat, and %i gold and your mercenary upkeep cost timer has been reset to 15 minutes.", upkeep_plat, upkeep_gold, (int)(RuleI(Mercs, UpkeepIntervalMS) / 1000 / 60));
 
 			// Message below given when too low level to be charged
-			//Message(7, "Your mercenary waived an upkeep cost of %i plat, and %i gold or %i %s and your mercenary upkeep cost timer has been reset to %i minutes", upkeep_plat, upkeep_gold, 1, "Bayle Marks", (int)(RuleI(Mercs, UpkeepIntervalMS) / 1000 / 60));
+			//Message(Chat::LightGray, "Your mercenary waived an upkeep cost of %i plat, and %i gold or %i %s and your mercenary upkeep cost timer has been reset to %i minutes", upkeep_plat, upkeep_gold, 1, "Bayle Marks", (int)(RuleI(Mercs, UpkeepIntervalMS) / 1000 / 60));
 		}
 	}
 }
diff --git a/zone/mob.cpp b/zone/mob.cpp
index b068905a9..46a5c2fc6 100644
--- a/zone/mob.cpp
+++ b/zone/mob.cpp
@@ -1128,7 +1128,10 @@ void Mob::FillSpawnStruct(NewSpawn_Struct* ns, Mob* ForWho)
 	UpdateActiveLight();
 	ns->spawn.light		= m_Light.Type[EQEmu::lightsource::LightActive];
 
-	ns->spawn.showhelm = (helmtexture && helmtexture != 0xFF) ? 1 : 0;
+	if (IsNPC() && race == ERUDITE)
+		ns->spawn.showhelm = 1;
+	else
+		ns->spawn.showhelm = (helmtexture && helmtexture != 0xFF) ? 1 : 0;
 
 	ns->spawn.invis		= (invisible || hidden) ? 1 : 0;	// TODO: load this before spawning players
 	ns->spawn.NPC		= IsClient() ? 0 : 1;
@@ -1548,39 +1551,39 @@ void Mob::ShowStats(Client* client)
 	}
 	else if (IsCorpse()) {
 		if (IsPlayerCorpse()) {
-			client->Message(0, "  CharID: %i  PlayerCorpse: %i", CastToCorpse()->GetCharID(), CastToCorpse()->GetCorpseDBID());
+			client->Message(Chat::White, "  CharID: %i  PlayerCorpse: %i", CastToCorpse()->GetCharID(), CastToCorpse()->GetCorpseDBID());
 		}
 		else {
-			client->Message(0, "  NPCCorpse", GetID());
+			client->Message(Chat::White, "  NPCCorpse", GetID());
 		}
 	}
 	else {
-		client->Message(0, "  Level: %i  AC: %i  Class: %i  Size: %1.1f  Haste: %i", GetLevel(), ACSum(), GetClass(), GetSize(), GetHaste());
-		client->Message(0, "  HP: %i  Max HP: %i",GetHP(), GetMaxHP());
-		client->Message(0, "  Mana: %i  Max Mana: %i", GetMana(), GetMaxMana());
-		client->Message(0, "  Total ATK: %i  Worn/Spell ATK (Cap %i): %i", GetATK(), RuleI(Character, ItemATKCap), GetATKBonus());
-		client->Message(0, "  STR: %i  STA: %i  DEX: %i  AGI: %i  INT: %i  WIS: %i  CHA: %i", GetSTR(), GetSTA(), GetDEX(), GetAGI(), GetINT(), GetWIS(), GetCHA());
-		client->Message(0, "  MR: %i  PR: %i  FR: %i  CR: %i  DR: %i Corruption: %i PhR: %i", GetMR(), GetPR(), GetFR(), GetCR(), GetDR(), GetCorrup(), GetPhR());
-		client->Message(0, "  Race: %i  BaseRace: %i  Texture: %i  HelmTexture: %i  Gender: %i  BaseGender: %i", GetRace(), GetBaseRace(), GetTexture(), GetHelmTexture(), GetGender(), GetBaseGender());
+		client->Message(Chat::White, "  Level: %i  AC: %i  Class: %i  Size: %1.1f  Haste: %i", GetLevel(), ACSum(), GetClass(), GetSize(), GetHaste());
+		client->Message(Chat::White, "  HP: %i  Max HP: %i",GetHP(), GetMaxHP());
+		client->Message(Chat::White, "  Mana: %i  Max Mana: %i", GetMana(), GetMaxMana());
+		client->Message(Chat::White, "  Total ATK: %i  Worn/Spell ATK (Cap %i): %i", GetATK(), RuleI(Character, ItemATKCap), GetATKBonus());
+		client->Message(Chat::White, "  STR: %i  STA: %i  DEX: %i  AGI: %i  INT: %i  WIS: %i  CHA: %i", GetSTR(), GetSTA(), GetDEX(), GetAGI(), GetINT(), GetWIS(), GetCHA());
+		client->Message(Chat::White, "  MR: %i  PR: %i  FR: %i  CR: %i  DR: %i Corruption: %i PhR: %i", GetMR(), GetPR(), GetFR(), GetCR(), GetDR(), GetCorrup(), GetPhR());
+		client->Message(Chat::White, "  Race: %i  BaseRace: %i  Texture: %i  HelmTexture: %i  Gender: %i  BaseGender: %i", GetRace(), GetBaseRace(), GetTexture(), GetHelmTexture(), GetGender(), GetBaseGender());
 		if (client->Admin() >= 100)
-			client->Message(0, "  EntityID: %i  PetID: %i  OwnerID: %i AIControlled: %i Targetted: %i", GetID(), GetPetID(), GetOwnerID(), IsAIControlled(), targeted);
+			client->Message(Chat::White, "  EntityID: %i  PetID: %i  OwnerID: %i AIControlled: %i Targetted: %i", GetID(), GetPetID(), GetOwnerID(), IsAIControlled(), targeted);
 
 		if (IsNPC()) {
 			NPC *n = CastToNPC();
 			uint32 spawngroupid = 0;
 			if(n->respawn2 != 0)
 				spawngroupid = n->respawn2->SpawnGroupID();
-			client->Message(0, "  NPCID: %u  SpawnGroupID: %u Grid: %i LootTable: %u FactionID: %i SpellsID: %u ", GetNPCTypeID(),spawngroupid, n->GetGrid(), n->GetLoottableID(), n->GetNPCFactionID(), n->GetNPCSpellsID());
-			client->Message(0, "  Accuracy: %i MerchantID: %i EmoteID: %i Runspeed: %.3f Walkspeed: %.3f", n->GetAccuracyRating(), n->MerchantType, n->GetEmoteID(), static_cast<float>(0.025f * n->GetRunspeed()), static_cast<float>(0.025f * n->GetWalkspeed()));
+			client->Message(Chat::White, "  NPCID: %u  SpawnGroupID: %u Grid: %i LootTable: %u FactionID: %i SpellsID: %u ", GetNPCTypeID(),spawngroupid, n->GetGrid(), n->GetLoottableID(), n->GetNPCFactionID(), n->GetNPCSpellsID());
+			client->Message(Chat::White, "  Accuracy: %i MerchantID: %i EmoteID: %i Runspeed: %.3f Walkspeed: %.3f", n->GetAccuracyRating(), n->MerchantType, n->GetEmoteID(), static_cast<float>(0.025f * n->GetRunspeed()), static_cast<float>(0.025f * n->GetWalkspeed()));
 			n->QueryLoot(client);
 		}
 		if (IsAIControlled()) {
-			client->Message(0, "  AggroRange: %1.0f  AssistRange: %1.0f", GetAggroRange(), GetAssistRange());
+			client->Message(Chat::White, "  AggroRange: %1.0f  AssistRange: %1.0f", GetAggroRange(), GetAssistRange());
 		}
 
-		client->Message(0, "  compute_tohit: %i TotalToHit: %i", compute_tohit(EQEmu::skills::SkillHandtoHand), GetTotalToHit(EQEmu::skills::SkillHandtoHand, 0));
-		client->Message(0, "  compute_defense: %i TotalDefense: %i", compute_defense(), GetTotalDefense());
-		client->Message(0, "  offense: %i mitigation ac: %i", offense(EQEmu::skills::SkillHandtoHand), GetMitigationAC());
+		client->Message(Chat::White, "  compute_tohit: %i TotalToHit: %i", compute_tohit(EQEmu::skills::SkillHandtoHand), GetTotalToHit(EQEmu::skills::SkillHandtoHand, 0));
+		client->Message(Chat::White, "  compute_defense: %i TotalDefense: %i", compute_defense(), GetTotalDefense());
+		client->Message(Chat::White, "  offense: %i mitigation ac: %i", offense(EQEmu::skills::SkillHandtoHand), GetMitigationAC());
 	}
 }
 
@@ -1617,33 +1620,33 @@ void Mob::DoAnim(const int animnum, int type, bool ackreq, eqFilterType filter)
 void Mob::ShowBuffs(Client* client) {
 	if(SPDAT_RECORDS <= 0)
 		return;
-	client->Message(0, "Buffs on: %s", this->GetName());
+	client->Message(Chat::White, "Buffs on: %s", this->GetName());
 	uint32 i;
 	uint32 buff_count = GetMaxTotalSlots();
 	for (i=0; i < buff_count; i++) {
 		if (buffs[i].spellid != SPELL_UNKNOWN) {
 			if (spells[buffs[i].spellid].buffdurationformula == DF_Permanent)
-				client->Message(0, "  %i: %s: Permanent", i, spells[buffs[i].spellid].name);
+				client->Message(Chat::White, "  %i: %s: Permanent", i, spells[buffs[i].spellid].name);
 			else
-				client->Message(0, "  %i: %s: %i tics left", i, spells[buffs[i].spellid].name, buffs[i].ticsremaining);
+				client->Message(Chat::White, "  %i: %s: %i tics left", i, spells[buffs[i].spellid].name, buffs[i].ticsremaining);
 
 		}
 	}
 	if (IsClient()){
-		client->Message(0, "itembonuses:");
-		client->Message(0, "Atk:%i Ac:%i HP(%i):%i Mana:%i", itembonuses.ATK, itembonuses.AC, itembonuses.HPRegen, itembonuses.HP, itembonuses.Mana);
-		client->Message(0, "Str:%i Sta:%i Dex:%i Agi:%i Int:%i Wis:%i Cha:%i",
+		client->Message(Chat::White, "itembonuses:");
+		client->Message(Chat::White, "Atk:%i Ac:%i HP(%i):%i Mana:%i", itembonuses.ATK, itembonuses.AC, itembonuses.HPRegen, itembonuses.HP, itembonuses.Mana);
+		client->Message(Chat::White, "Str:%i Sta:%i Dex:%i Agi:%i Int:%i Wis:%i Cha:%i",
 			itembonuses.STR,itembonuses.STA,itembonuses.DEX,itembonuses.AGI,itembonuses.INT,itembonuses.WIS,itembonuses.CHA);
-		client->Message(0, "SvMagic:%i SvFire:%i SvCold:%i SvPoison:%i SvDisease:%i",
+		client->Message(Chat::White, "SvMagic:%i SvFire:%i SvCold:%i SvPoison:%i SvDisease:%i",
 				itembonuses.MR,itembonuses.FR,itembonuses.CR,itembonuses.PR,itembonuses.DR);
-		client->Message(0, "DmgShield:%i Haste:%i", itembonuses.DamageShield, itembonuses.haste );
-		client->Message(0, "spellbonuses:");
-		client->Message(0, "Atk:%i Ac:%i HP(%i):%i Mana:%i", spellbonuses.ATK, spellbonuses.AC, spellbonuses.HPRegen, spellbonuses.HP, spellbonuses.Mana);
-		client->Message(0, "Str:%i Sta:%i Dex:%i Agi:%i Int:%i Wis:%i Cha:%i",
+		client->Message(Chat::White, "DmgShield:%i Haste:%i", itembonuses.DamageShield, itembonuses.haste );
+		client->Message(Chat::White, "spellbonuses:");
+		client->Message(Chat::White, "Atk:%i Ac:%i HP(%i):%i Mana:%i", spellbonuses.ATK, spellbonuses.AC, spellbonuses.HPRegen, spellbonuses.HP, spellbonuses.Mana);
+		client->Message(Chat::White, "Str:%i Sta:%i Dex:%i Agi:%i Int:%i Wis:%i Cha:%i",
 			spellbonuses.STR,spellbonuses.STA,spellbonuses.DEX,spellbonuses.AGI,spellbonuses.INT,spellbonuses.WIS,spellbonuses.CHA);
-		client->Message(0, "SvMagic:%i SvFire:%i SvCold:%i SvPoison:%i SvDisease:%i",
+		client->Message(Chat::White, "SvMagic:%i SvFire:%i SvCold:%i SvPoison:%i SvDisease:%i",
 				spellbonuses.MR,spellbonuses.FR,spellbonuses.CR,spellbonuses.PR,spellbonuses.DR);
-		client->Message(0, "DmgShield:%i Haste:%i", spellbonuses.DamageShield, spellbonuses.haste );
+		client->Message(Chat::White, "DmgShield:%i Haste:%i", spellbonuses.DamageShield, spellbonuses.haste );
 	}
 }
 
@@ -1651,15 +1654,15 @@ void Mob::ShowBuffList(Client* client) {
 	if(SPDAT_RECORDS <= 0)
 		return;
 
-	client->Message(0, "Buffs on: %s", this->GetCleanName());
+	client->Message(Chat::White, "Buffs on: %s", this->GetCleanName());
 	uint32 i;
 	uint32 buff_count = GetMaxTotalSlots();
 	for (i = 0; i < buff_count; i++) {
 		if (buffs[i].spellid != SPELL_UNKNOWN) {
 			if (spells[buffs[i].spellid].buffdurationformula == DF_Permanent)
-				client->Message(0, "  %i: %s: Permanent", i, spells[buffs[i].spellid].name);
+				client->Message(Chat::White, "  %i: %s: Permanent", i, spells[buffs[i].spellid].name);
 			else
-				client->Message(0, "  %i: %s: %i tics left", i, spells[buffs[i].spellid].name, buffs[i].ticsremaining);
+				client->Message(Chat::White, "  %i: %s: %i tics left", i, spells[buffs[i].spellid].name, buffs[i].ticsremaining);
 		}
 	}
 }
@@ -2706,7 +2709,7 @@ bool Mob::HateSummon() {
 	if(target)
 	{
 		if(summon_level == 1) {
-			entity_list.MessageClose(this, true, 500, MT_Say, "%s says,'You will not evade me, %s!' ", GetCleanName(), target->GetCleanName() );
+			entity_list.MessageClose(this, true, 500, Chat::Say, "%s says 'You will not evade me, %s!' ", GetCleanName(), target->GetCleanName() );
 
 			if (target->IsClient())
 				target->CastToClient()->MovePC(zone->GetZoneID(), zone->GetInstanceID(), m_Position.x, m_Position.y, m_Position.z, target->GetHeading(), 0, SummonPC);
@@ -2715,7 +2718,7 @@ bool Mob::HateSummon() {
 
 			return true;
 		} else if(summon_level == 2) {
-			entity_list.MessageClose(this, true, 500, MT_Say, "%s says,'You will not evade me, %s!'", GetCleanName(), target->GetCleanName());
+			entity_list.MessageClose(this, true, 500, Chat::Say, "%s says 'You will not evade me, %s!'", GetCleanName(), target->GetCleanName());
 			GMMove(target->GetX(), target->GetY(), target->GetZ());
 		}
 	}
@@ -2786,10 +2789,10 @@ void Mob::WipeHateList()
 	}
 }
 
-uint32 Mob::RandomTimer(int min,int max) {
+uint32 Mob::RandomTimer(int min, int max)
+{
 	int r = 14000;
-	if(min != 0 && max != 0 && min < max)
-	{
+	if (min != 0 && max != 0 && min < max) {
 		r = zone->random.Int(min, max);
 	}
 	return r;
@@ -2832,7 +2835,7 @@ void Mob::Say(const char *format, ...)
 		talker = this;
 	}
 
-	entity_list.MessageClose_StringID(
+	entity_list.MessageCloseString(
 		talker, false, 200, 10,
 		GENERIC_SAY, GetCleanName(), buf
 	);
@@ -2841,48 +2844,50 @@ void Mob::Say(const char *format, ...)
 //
 // this is like the above, but the first parameter is a string id
 //
-void Mob::Say_StringID(uint32 string_id, const char *message3, const char *message4, const char *message5, const char *message6, const char *message7, const char *message8, const char *message9)
+void Mob::SayString(uint32 string_id, const char *message3, const char *message4, const char *message5, const char *message6, const char *message7, const char *message8, const char *message9)
 {
 	char string_id_str[10];
 
 	snprintf(string_id_str, 10, "%d", string_id);
 
-	entity_list.MessageClose_StringID(this, false, 200, 10,
+	entity_list.MessageCloseString(
+		this, false, 200, 10,
 		GENERIC_STRINGID_SAY, GetCleanName(), string_id_str, message3, message4, message5,
 		message6, message7, message8, message9
 	);
 }
 
-void Mob::Say_StringID(uint32 type, uint32 string_id, const char *message3, const char *message4, const char *message5, const char *message6, const char *message7, const char *message8, const char *message9)
+void Mob::SayString(uint32 type, uint32 string_id, const char *message3, const char *message4, const char *message5, const char *message6, const char *message7, const char *message8, const char *message9)
 {
 	char string_id_str[10];
 
 	snprintf(string_id_str, 10, "%d", string_id);
 
-	entity_list.MessageClose_StringID(this, false, 200, type,
+	entity_list.MessageCloseString(
+		this, false, 200, type,
 		GENERIC_STRINGID_SAY, GetCleanName(), string_id_str, message3, message4, message5,
 		message6, message7, message8, message9
 	);
 }
 
-void Mob::SayTo_StringID(Client *to, uint32 string_id, const char *message3, const char *message4, const char *message5, const char *message6, const char *message7, const char *message8, const char *message9)
+void Mob::SayString(Client *to, uint32 string_id, const char *message3, const char *message4, const char *message5, const char *message6, const char *message7, const char *message8, const char *message9)
 {
 	if (!to)
 		return;
 
 	auto string_id_str = std::to_string(string_id);
 
-	to->Message_StringID(10, GENERIC_STRINGID_SAY, GetCleanName(), string_id_str.c_str(), message3, message4, message5, message6, message7, message8, message9);
+	to->MessageString(Chat::NPCQuestSay, GENERIC_STRINGID_SAY, GetCleanName(), string_id_str.c_str(), message3, message4, message5, message6, message7, message8, message9);
 }
 
-void Mob::SayTo_StringID(Client *to, uint32 type, uint32 string_id, const char *message3, const char *message4, const char *message5, const char *message6, const char *message7, const char *message8, const char *message9)
+void Mob::SayString(Client *to, uint32 type, uint32 string_id, const char *message3, const char *message4, const char *message5, const char *message6, const char *message7, const char *message8, const char *message9)
 {
 	if (!to)
 		return;
 
 	auto string_id_str = std::to_string(string_id);
 
-	to->Message_StringID(type, GENERIC_STRINGID_SAY, GetCleanName(), string_id_str.c_str(), message3, message4, message5, message6, message7, message8, message9);
+	to->MessageString(type, GENERIC_STRINGID_SAY, GetCleanName(), string_id_str.c_str(), message3, message4, message5, message6, message7, message8, message9);
 }
 
 void Mob::Shout(const char *format, ...)
@@ -2894,7 +2899,7 @@ void Mob::Shout(const char *format, ...)
 	vsnprintf(buf, 1000, format, ap);
 	va_end(ap);
 
-	entity_list.Message_StringID(this, false, MT_Shout,
+	entity_list.MessageString(this, false, Chat::Shout,
 		GENERIC_SHOUT, GetCleanName(), buf);
 }
 
@@ -2907,13 +2912,19 @@ void Mob::Emote(const char *format, ...)
 	vsnprintf(buf, 1000, format, ap);
 	va_end(ap);
 
-	entity_list.MessageClose_StringID(this, false, 200, 10,
-		GENERIC_EMOTE, GetCleanName(), buf);
+	entity_list.MessageCloseString(
+		this, false, 200, 10,
+		GENERIC_EMOTE, GetCleanName(), buf
+	);
 }
 
-void Mob::QuestJournalledSay(Client *QuestInitiator, const char *str)
+void Mob::QuestJournalledSay(Client *QuestInitiator, const char *str, Journal::Options &opts)
 {
-		entity_list.QuestJournalledSayClose(this, QuestInitiator, 200, GetCleanName(), str);
+	// just in case
+	if (opts.target_spawn_id == 0 && QuestInitiator)
+		opts.target_spawn_id = QuestInitiator->GetID();
+
+	entity_list.QuestJournalledSayClose(this, 200, GetCleanName(), str, opts);
 }
 
 const char *Mob::GetCleanName()
@@ -3562,7 +3573,7 @@ void Mob::TryTwincast(Mob *caster, Mob *target, uint32 spell_id)
 		{
 			if(zone->random.Roll(focus))
 			{
-				Message(MT_Spells,"You twincast %s!",spells[spell_id].name);
+				Message(Chat::Spells,"You twincast %s!", spells[spell_id].name);
 				SpellFinished(spell_id, target, EQEmu::spells::CastingSlot::Item, 0, -1, spells[spell_id].ResistDiff);
 			}
 		}
@@ -4880,16 +4891,16 @@ void Mob::SlowMitigation(Mob* caster)
 	if (GetSlowMitigation() && caster && caster->IsClient())
 	{
 		if ((GetSlowMitigation() > 0) && (GetSlowMitigation() < 26))
-			caster->Message_StringID(MT_SpellFailure, SLOW_MOSTLY_SUCCESSFUL);
+			caster->MessageString(Chat::SpellFailure, SLOW_MOSTLY_SUCCESSFUL);
 
 		else if ((GetSlowMitigation() >= 26) && (GetSlowMitigation() < 74))
-			caster->Message_StringID(MT_SpellFailure, SLOW_PARTIALLY_SUCCESSFUL);
+			caster->MessageString(Chat::SpellFailure, SLOW_PARTIALLY_SUCCESSFUL);
 
 		else if ((GetSlowMitigation() >= 74) && (GetSlowMitigation() < 101))
-			caster->Message_StringID(MT_SpellFailure, SLOW_SLIGHTLY_SUCCESSFUL);
+			caster->MessageString(Chat::SpellFailure, SLOW_SLIGHTLY_SUCCESSFUL);
 
 		else if (GetSlowMitigation() > 100)
-			caster->Message_StringID(MT_SpellFailure, SPELL_OPPOSITE_EFFECT);
+			caster->MessageString(Chat::SpellFailure, SPELL_OPPOSITE_EFFECT);
 	}
 }
 
diff --git a/zone/mob.h b/zone/mob.h
index ea71017c7..1a19eb9fb 100644
--- a/zone/mob.h
+++ b/zone/mob.h
@@ -722,29 +722,29 @@ public:
 	inline void SetRareSpawn(bool in) { rare_spawn = in; }
 
 	virtual void Message(uint32 type, const char* message, ...) { }
-	virtual void Message_StringID(uint32 type, uint32 string_id, uint32 distance = 0) { }
-	virtual void Message_StringID(uint32 type, uint32 string_id, const char* message, const char* message2 = 0,
+	virtual void MessageString(uint32 type, uint32 string_id, uint32 distance = 0) { }
+	virtual void MessageString(uint32 type, uint32 string_id, const char* message, const char* message2 = 0,
 		const char* message3 = 0, const char* message4 = 0, const char* message5 = 0, const char* message6 = 0,
 		const char* message7 = 0, const char* message8 = 0, const char* message9 = 0, uint32 distance = 0) { }
-	virtual void FilteredMessage_StringID(Mob *sender, uint32 type, eqFilterType filter, uint32 string_id) { }
-	virtual void FilteredMessage_StringID(Mob *sender, uint32 type, eqFilterType filter,
+	virtual void FilteredMessageString(Mob *sender, uint32 type, eqFilterType filter, uint32 string_id) { }
+	virtual void FilteredMessageString(Mob *sender, uint32 type, eqFilterType filter,
 			uint32 string_id, const char *message1, const char *message2 = nullptr,
 			const char *message3 = nullptr, const char *message4 = nullptr,
 			const char *message5 = nullptr, const char *message6 = nullptr,
 			const char *message7 = nullptr, const char *message8 = nullptr,
 			const char *message9 = nullptr) { }
 	void Say(const char *format, ...);
-	void Say_StringID(uint32 string_id, const char *message3 = 0, const char *message4 = 0, const char *message5 = 0,
+	void SayString(uint32 string_id, const char *message3 = 0, const char *message4 = 0, const char *message5 = 0,
 		const char *message6 = 0, const char *message7 = 0, const char *message8 = 0, const char *message9 = 0);
-	void Say_StringID(uint32 type, uint32 string_id, const char *message3 = 0, const char *message4 = 0, const char *message5 = 0,
+	void SayString(uint32 type, uint32 string_id, const char *message3 = 0, const char *message4 = 0, const char *message5 = 0,
 		const char *message6 = 0, const char *message7 = 0, const char *message8 = 0, const char *message9 = 0);
-	void SayTo_StringID(Client *to, uint32 string_id, const char *message3 = 0, const char *message4 = 0, const char *message5 = 0,
+	void SayString(Client *to, uint32 string_id, const char *message3 = 0, const char *message4 = 0, const char *message5 = 0,
 		const char *message6 = 0, const char *message7 = 0, const char *message8 = 0, const char *message9 = 0);
-	void SayTo_StringID(Client *to, uint32 type, uint32 string_id, const char *message3 = 0, const char *message4 = 0, const char *message5 = 0,
+	void SayString(Client *to, uint32 type, uint32 string_id, const char *message3 = 0, const char *message4 = 0, const char *message5 = 0,
 		const char *message6 = 0, const char *message7 = 0, const char *message8 = 0, const char *message9 = 0);
 	void Shout(const char *format, ...);
 	void Emote(const char *format, ...);
-	void QuestJournalledSay(Client *QuestInitiator, const char *str);
+	void QuestJournalledSay(Client *QuestInitiator, const char *str, Journal::Options &opts);
 	int32 GetItemStat(uint32 itemid, const char *identifier);
 
 	int16 CalcFocusEffect(focusType type, uint16 focus_id, uint16 spell_id, bool best_focus=false);
diff --git a/zone/mob_ai.cpp b/zone/mob_ai.cpp
index 0df05254e..de7cc68dd 100644
--- a/zone/mob_ai.cpp
+++ b/zone/mob_ai.cpp
@@ -578,7 +578,7 @@ void NPC::AI_Stop() {
 
 void Client::AI_Stop() {
 	Mob::AI_Stop();
-	this->Message_StringID(13,PLAYER_REGAIN);
+	this->MessageString(Chat::Red,PLAYER_REGAIN);
 
 	auto app = new EQApplicationPacket(OP_Charm, sizeof(Charm_Struct));
 	Charm_Struct *ps = (Charm_Struct*)app->pBuffer;
@@ -1579,7 +1579,25 @@ void NPC::AI_DoMovement() {
 
 		if (GetCWP() == EQEmu::WaypointStatus::RoamBoxPauseInProgress && !IsMoving()) {
 			// We have arrived
-			time_until_can_move = Timer::GetCurrentTime() + RandomTimer(roambox_min_delay, roambox_delay);
+
+			int roambox_move_delay = EQEmu::ClampLower(GetRoamboxDelay(), GetRoamboxMinDelay());
+			int move_delay_max     = (roambox_move_delay > 0 ? roambox_move_delay : (int) GetRoamboxMinDelay() * 4);
+			int random_timer       = RandomTimer(
+				GetRoamboxMinDelay(),
+				move_delay_max
+			);
+
+			Log(
+				Logs::Detail,
+				Logs::NPCRoamBox, "(%s) Timer calc | random_timer [%i] roambox_move_delay [%i] move_min [%i] move_max [%i]",
+				this->GetCleanName(),
+				random_timer,
+				roambox_move_delay,
+				(int) GetRoamboxMinDelay(),
+				move_delay_max
+			);
+
+			time_until_can_move = Timer::GetCurrentTime() + random_timer;
 			SetCurrentWP(0);
 			return;
 		}
@@ -1636,25 +1654,51 @@ void NPC::AI_DoMovement() {
 				}
 			}
 
-			roambox_destination_z = 0;
-			/*
-			if (zone->zonemap) {
-				roambox_destination_z = FindGroundZ(roambox_destination_x, roambox_destination_y, this->GetZOffset());
-			}
-				*/
+			PathfinderOptions opts;
+			opts.smooth_path = true;
+			opts.step_size   = RuleR(Pathing, NavmeshStepSize);
+			opts.offset      = GetZOffset();
+			opts.flags       = PathingNotDisabled ^ PathingZoneLine;
 
-			Log(Logs::Detail,
+			auto partial = false;
+			auto stuck   = false;
+			auto route   = zone->pathing->FindPath(
+				glm::vec3(GetX(), GetY(), GetZ()),
+				glm::vec3(
+					roambox_destination_x,
+					roambox_destination_y,
+					GetGroundZ(roambox_destination_x, roambox_destination_y)
+				),
+				partial,
+				stuck,
+				opts
+			);
+
+			if (route.empty()) {
+				Log(
+					Logs::Detail,
+					Logs::NPCRoamBox, "(%s) We don't have a path route... exiting...",
+					this->GetCleanName()
+				);
+				return;
+			}
+
+			roambox_destination_z = 0;
+
+			Log(
+				Logs::General,
 				Logs::NPCRoamBox,
-				"Calculate | NPC: %s distance %.3f | min_x %.3f | max_x %.3f | final_x %.3f | min_y %.3f | max_y %.3f | final_y %.3f",
+				"NPC (%s) distance [%.0f] X (min/max) [%.0f / %.0f] Y (min/max) [%.0f / %.0f] | Dest x/y/z [%.0f / %.0f / %.0f]",
 				this->GetCleanName(),
 				roambox_distance,
 				roambox_min_x,
 				roambox_max_x,
-				roambox_destination_x,
 				roambox_min_y,
 				roambox_max_y,
-				roambox_destination_y);
-			Log(Logs::Detail, Logs::NPCRoamBox, "Dest Z is (%f)", roambox_destination_z);
+				roambox_destination_x,
+				roambox_destination_y,
+				roambox_destination_z
+			);
 
 			SetCurrentWP(EQEmu::WaypointStatus::RoamBoxPauseInProgress);
 			NavigateTo(roambox_destination_x, roambox_destination_y, roambox_destination_z);
@@ -1667,9 +1711,9 @@ void NPC::AI_DoMovement() {
 			pause_timer_complete = true;
 			AI_walking_timer->Disable();
 		}
-		
+
 		int32 gridno = CastToNPC()->GetGrid();
-		
+
 		if (gridno > 0 || cur_wp == EQEmu::WaypointStatus::QuestControlNoGrid) {
 			if (pause_timer_complete == true) { // time to pause at wp is over
 				AI_SetupNextWaypoint();
@@ -1685,7 +1729,7 @@ void NPC::AI_DoMovement() {
 						GetY(),
 						GetZ(),
 						GetGrid());
-		
+
 					SetWaypointPause();
 					SetAppearance(eaStanding, false);
 					if (cur_wp_pause > 0) {
@@ -2029,14 +2073,14 @@ void Mob::StartEnrage()
 
 	// start the timer. need to call IsEnraged frequently since we dont have callback timers :-/
 	bEnraged = true;
-	entity_list.MessageClose_StringID(this, true, 200, MT_NPCEnrage, NPC_ENRAGE_START, GetCleanName());
+	entity_list.MessageCloseString(this, true, 200, Chat::NPCEnrage, NPC_ENRAGE_START, GetCleanName());
 }
 
 void Mob::ProcessEnrage(){
 	if(IsEnraged()){
 		Timer *timer = GetSpecialAbilityTimer(SPECATK_ENRAGE);
 		if(timer && timer->Check()){
-			entity_list.MessageClose_StringID(this, true, 200, MT_NPCEnrage, NPC_ENRAGE_END, GetCleanName());
+			entity_list.MessageCloseString(this, true, 200, Chat::NPCEnrage, NPC_ENRAGE_END, GetCleanName());
 
 			int enraged_cooldown = GetSpecialAbilityParam(SPECATK_ENRAGE, 2);
 			enraged_cooldown = enraged_cooldown > 0 ? enraged_cooldown : EnragedTimer;
@@ -2057,9 +2101,23 @@ bool Mob::Flurry(ExtraAttackOptions *opts)
 	Mob *target = GetTarget();
 	if (target) {
 		if (!IsPet()) {
-			entity_list.MessageClose_StringID(this, true, 200, MT_NPCFlurry, NPC_FLURRY, GetCleanName(), target->GetCleanName());
+			entity_list.MessageCloseString(
+				this,
+				true,
+				200,
+				Chat::NPCFlurry,
+				NPC_FLURRY,
+				GetCleanName(),
+				target->GetCleanName());
 		} else {
-			entity_list.MessageClose_StringID(this, true, 200, MT_PetFlurry, NPC_FLURRY, GetCleanName(), target->GetCleanName());
+			entity_list.MessageCloseString(
+				this,
+				true,
+				200,
+				Chat::PetFlurry,
+				NPC_FLURRY,
+				GetCleanName(),
+				target->GetCleanName());
 		}
 
 		int num_attacks = GetSpecialAbilityParam(SPECATK_FLURRY, 1);
@@ -2096,9 +2154,9 @@ bool Mob::Rampage(ExtraAttackOptions *opts)
 {
 	int index_hit = 0;
 	if (!IsPet())
-		entity_list.MessageClose_StringID(this, true, 200, MT_NPCRampage, NPC_RAMPAGE, GetCleanName());
+		entity_list.MessageCloseString(this, true, 200, Chat::NPCRampage, NPC_RAMPAGE, GetCleanName());
 	else
-		entity_list.MessageClose_StringID(this, true, 200, MT_PetFlurry, NPC_RAMPAGE, GetCleanName());
+		entity_list.MessageCloseString(this, true, 200, Chat::PetFlurry, NPC_RAMPAGE, GetCleanName());
 
 	int rampage_targets = GetSpecialAbilityParam(SPECATK_RAMPAGE, 1);
 	if (rampage_targets == 0) // if set to 0 or not set in the DB
@@ -2153,9 +2211,9 @@ void Mob::AreaRampage(ExtraAttackOptions *opts)
 {
 	int index_hit = 0;
 	if (!IsPet()) { // do not know every pet AA so thought it safer to add this
-		entity_list.MessageClose_StringID(this, true, 200, MT_NPCRampage, AE_RAMPAGE, GetCleanName());
+		entity_list.MessageCloseString(this, true, 200, Chat::NPCRampage, AE_RAMPAGE, GetCleanName());
 	} else {
-		entity_list.MessageClose_StringID(this, true, 200, MT_PetFlurry, AE_RAMPAGE, GetCleanName());
+		entity_list.MessageCloseString(this, true, 200, Chat::PetFlurry, AE_RAMPAGE, GetCleanName());
 	}
 
 	int rampage_targets = GetSpecialAbilityParam(SPECATK_AREA_RAMPAGE, 1);
@@ -2744,7 +2802,7 @@ void NPC::AISpellsList(Client *c)
 		return;
 
 	for (auto it = AIspells.begin(); it != AIspells.end(); ++it)
-		c->Message(0, "%s (%d): Type %d, Priority %d, Recast Delay %d, Resist Adjust %d, Min HP %d, Max HP %d",
+		c->Message(Chat::White, "%s (%d): Type %d, Priority %d, Recast Delay %d, Resist Adjust %d, Min HP %d, Max HP %d",
 				spells[it->spellid].name, it->spellid, it->type, it->priority, it->recast_delay, it->resist_adjust, it->min_hp, it->max_hp);
 
 	return;
diff --git a/zone/mob_info.cpp b/zone/mob_info.cpp
index 174a00330..edac37768 100644
--- a/zone/mob_info.cpp
+++ b/zone/mob_info.cpp
@@ -278,7 +278,7 @@ inline std::string GetMobAttributeByString(Mob *mob, const std::string &attribut
 			return std::to_string((int)npc->GetWalkspeed());
 		}
 		if (attribute == "spawngroup") {
-			return std::to_string(npc->GetSp2());
+			return std::to_string(npc->GetSpawnGroupId());
 		}
 		if (attribute == "grid") {
 			return std::to_string(npc->GetGrid());
@@ -624,7 +624,7 @@ inline void NPCCommandsMenu(Client* client, NPC* npc)
 
 	if (menu_commands.length() > 0) {
 		std::string dev_menu = "[" + EQEmu::SayLinkEngine::GenerateQuestSaylink("#devtools", false, "DevTools") + "] ";;
-		client->Message(0, "| %s [Show Commands] %s", dev_menu.c_str(), menu_commands.c_str());
+		client->Message(Chat::White, "| %s [Show Commands] %s", dev_menu.c_str(), menu_commands.c_str());
 	}
 }
 
diff --git a/zone/mob_movement_manager.cpp b/zone/mob_movement_manager.cpp
index 1fcc19187..2f87a1912 100644
--- a/zone/mob_movement_manager.cpp
+++ b/zone/mob_movement_manager.cpp
@@ -14,40 +14,41 @@
 #include <stdlib.h>
 
 extern double frame_time;
-extern Zone *zone;
+extern Zone   *zone;
 
-class IMovementCommand
-{
+class IMovementCommand {
 public:
 	IMovementCommand() = default;
 	virtual ~IMovementCommand() = default;
-	virtual bool Process(MobMovementManager *mgr, Mob *m) = 0;
+	virtual bool Process(MobMovementManager *mob_movement_manager, Mob *mob) = 0;
 	virtual bool Started() const = 0;
 };
 
-class RotateToCommand : public IMovementCommand
-{
+class RotateToCommand : public IMovementCommand {
 public:
-	RotateToCommand(double rotate_to, double dir, MobMovementMode mode) {
-		m_rotate_to = rotate_to;
-		m_rotate_to_dir = dir;
-		m_rotate_to_mode = mode;
-		m_started = false;
+	RotateToCommand(double rotate_to, double dir, MobMovementMode mob_movement_mode)
+	{
+		m_rotate_to      = rotate_to;
+		m_rotate_to_dir  = dir;
+		m_rotate_to_mode = mob_movement_mode;
+		m_started        = false;
 	}
 
-	virtual ~RotateToCommand() {
+	virtual ~RotateToCommand()
+	{
 
 	}
 
-	virtual bool Process(MobMovementManager *mgr, Mob *m) {
-		if (!m->IsAIControlled()) {
+	virtual bool Process(MobMovementManager *mob_movement_manager, Mob *mob)
+	{
+		if (!mob->IsAIControlled()) {
 			return true;
 		}
 
-		auto rotate_to_speed = m_rotate_to_mode == MovementRunning ? 200.0 :  16.0; //todo: get this from mob
+		auto rotate_to_speed = m_rotate_to_mode == MovementRunning ? 200.0 : 16.0; //todo: get this from mob
 
-		auto from = FixHeading(m->GetHeading());
-		auto to = FixHeading(m_rotate_to);
+		auto from = FixHeading(mob->GetHeading());
+		auto to   = FixHeading(m_rotate_to);
 		auto diff = to - from;
 
 		while (diff < -256.0) {
@@ -62,265 +63,282 @@ public:
 
 		if (!m_started) {
 			m_started = true;
-			m->SetMoving(true);
-		
+			mob->SetMoving(true);
+
 			if (dist > 15.0f && rotate_to_speed > 0.0 && rotate_to_speed <= 25.0) { //send basic rotation
-				mgr->SendCommandToClients(m, 0.0, 0.0, 0.0, m_rotate_to_dir * rotate_to_speed, 0, ClientRangeClose);
+				mob_movement_manager->SendCommandToClients(
+					mob,
+					0.0,
+					0.0,
+					0.0,
+					m_rotate_to_dir * rotate_to_speed,
+					0,
+					ClientRangeClose
+				);
 			}
 		}
-		
+
 		auto td = rotate_to_speed * 19.0 * frame_time;
-		
+
 		if (td >= dist) {
-			m->SetHeading(to);
-			m->SetMoving(false);
-			mgr->SendCommandToClients(m, 0.0, 0.0, 0.0, 0.0, 0, ClientRangeCloseMedium);
+			mob->SetHeading(to);
+			mob->SetMoving(false);
+			mob_movement_manager->SendCommandToClients(mob, 0.0, 0.0, 0.0, 0.0, 0, ClientRangeCloseMedium);
 			return true;
 		}
-		
+
 		from += td * m_rotate_to_dir;
-		m->SetHeading(FixHeading(from));
+		mob->SetHeading(FixHeading(from));
 		return false;
 	}
 
-	virtual bool Started() const {
+	virtual bool Started() const
+	{
 		return m_started;
 	}
 
 private:
-	double m_rotate_to;
-	double m_rotate_to_dir;
+	double          m_rotate_to;
+	double          m_rotate_to_dir;
 	MobMovementMode m_rotate_to_mode;
-	bool m_started;
+	bool            m_started;
 };
 
-class MoveToCommand : public IMovementCommand
-{
+class MoveToCommand : public IMovementCommand {
 public:
-	MoveToCommand(float x, float y, float z, MobMovementMode mode) {
+	MoveToCommand(float x, float y, float z, MobMovementMode mob_movement_mode)
+	{
 		m_distance_moved_since_correction = 0.0;
-		m_move_to_x = x;
-		m_move_to_y = y;
-		m_move_to_z = z;
-		m_move_to_mode = mode;
-		m_last_sent_time = 0.0;
-		m_last_sent_speed = 0;
-		m_started = false;
-		m_total_h_dist = 0.0;
-		m_total_v_dist = 0.0;
+		m_move_to_x                       = x;
+		m_move_to_y                       = y;
+		m_move_to_z                       = z;
+		m_move_to_mode                    = mob_movement_mode;
+		m_last_sent_time                  = 0.0;
+		m_last_sent_speed                 = 0;
+		m_started                         = false;
+		m_total_h_dist                    = 0.0;
+		m_total_v_dist                    = 0.0;
 	}
 
-	virtual ~MoveToCommand() {
+	virtual ~MoveToCommand()
+	{
 
 	}
 
-	virtual bool Process(MobMovementManager *mgr, Mob *m) {
-		if (!m->IsAIControlled()) {
+	/**
+	 * @param mob_movement_manager
+	 * @param mob
+	 * @return
+	 */
+	virtual bool Process(MobMovementManager *mob_movement_manager, Mob *mob)
+	{
+		if (!mob->IsAIControlled()) {
 			return true;
 		}
 
 		//Send a movement packet when you start moving		
-		double current_time = static_cast<double>(Timer::GetCurrentTime()) / 1000.0;
-		int current_speed = 0;
+		double current_time  = static_cast<double>(Timer::GetCurrentTime()) / 1000.0;
+		int    current_speed = 0;
 
 		if (m_move_to_mode == MovementRunning) {
-			if (m->IsFeared()) {
-				current_speed = m->GetFearSpeed();
+			if (mob->IsFeared()) {
+				current_speed = mob->GetFearSpeed();
 			}
 			else {
-				current_speed = m->GetRunspeed();
+				current_speed = mob->GetRunspeed();
 			}
 		}
 		else {
-			current_speed = m->GetWalkspeed();
+			current_speed = mob->GetWalkspeed();
 		}
 
 		if (!m_started) {
 			m_started = true;
 			//rotate to the point
-			m->SetMoving(true);
-			m->SetHeading(m->CalculateHeadingToTarget(m_move_to_x, m_move_to_y));
+			mob->SetMoving(true);
+			mob->SetHeading(mob->CalculateHeadingToTarget(m_move_to_x, m_move_to_y));
 
 			m_last_sent_speed = current_speed;
-			m_last_sent_time = current_time;
-			m_total_h_dist = DistanceNoZ(m->GetPosition(), glm::vec4(m_move_to_x, m_move_to_y, 0.0f, 0.0f));
-			m_total_v_dist = m_move_to_z - m->GetZ();
-			mgr->SendCommandToClients(m, 0.0, 0.0, 0.0, 0.0, current_speed, ClientRangeCloseMedium);
+			m_last_sent_time  = current_time;
+			m_total_h_dist    = DistanceNoZ(mob->GetPosition(), glm::vec4(m_move_to_x, m_move_to_y, 0.0f, 0.0f));
+			m_total_v_dist    = m_move_to_z - mob->GetZ();
+			mob_movement_manager->SendCommandToClients(mob, 0.0, 0.0, 0.0, 0.0, current_speed, ClientRangeCloseMedium);
 		}
 
 		//When speed changes
 		if (current_speed != m_last_sent_speed) {
 			if (RuleB(Map, FixZWhenPathing)) {
-				m->FixZ();
+				mob->FixZ();
 			}
 
 			m_distance_moved_since_correction = 0.0;
 
 			m_last_sent_speed = current_speed;
-			m_last_sent_time = current_time;
-			mgr->SendCommandToClients(m, 0.0, 0.0, 0.0, 0.0, current_speed, ClientRangeCloseMedium);
+			m_last_sent_time  = current_time;
+			mob_movement_manager->SendCommandToClients(mob, 0.0, 0.0, 0.0, 0.0, current_speed, ClientRangeCloseMedium);
 		}
 
 		//If x seconds have passed without sending an update.
 		if (current_time - m_last_sent_time >= 5.0) {
 			if (RuleB(Map, FixZWhenPathing)) {
-				m->FixZ();
+				mob->FixZ();
 			}
 
 			m_distance_moved_since_correction = 0.0;
 
 			m_last_sent_speed = current_speed;
-			m_last_sent_time = current_time;
-			mgr->SendCommandToClients(m, 0.0, 0.0, 0.0, 0.0, current_speed, ClientRangeCloseMedium);
+			m_last_sent_time  = current_time;
+			mob_movement_manager->SendCommandToClients(mob, 0.0, 0.0, 0.0, 0.0, current_speed, ClientRangeCloseMedium);
 		}
 
-		auto &p = m->GetPosition();
+		auto      &p  = mob->GetPosition();
 		glm::vec2 tar(m_move_to_x, m_move_to_y);
 		glm::vec2 pos(p.x, p.y);
-		double len = glm::distance(pos, tar);
+		double    len = glm::distance(pos, tar);
 		if (len == 0) {
 			return true;
 		}
 
-		m->SetMoved(true);
+		mob->SetMoved(true);
 
-		glm::vec2 dir = tar - pos;
-		glm::vec2 ndir = glm::normalize(dir);
-		double distance_moved = frame_time * current_speed * 0.4f * 1.45f;
+		glm::vec2 dir            = tar - pos;
+		glm::vec2 ndir           = glm::normalize(dir);
+		double    distance_moved = frame_time * current_speed * 0.4f * 1.45f;
 
-		if (distance_moved > len) {		
-			if (m->IsNPC()) {
-				entity_list.ProcessMove(m->CastToNPC(), m_move_to_x, m_move_to_y, m_move_to_z);
+		if (distance_moved > len) {
+			if (mob->IsNPC()) {
+				entity_list.ProcessMove(mob->CastToNPC(), m_move_to_x, m_move_to_y, m_move_to_z);
 			}
 
-			m->SetPosition(m_move_to_x, m_move_to_y, m_move_to_z);
-		
+			mob->SetPosition(m_move_to_x, m_move_to_y, m_move_to_z);
+
 			if (RuleB(Map, FixZWhenPathing)) {
-				m->FixZ();
+				mob->FixZ();
 			}
 			return true;
 		}
 		else {
 			glm::vec2 npos = pos + (ndir * static_cast<float>(distance_moved));
-			
+
 			len -= distance_moved;
 			double total_distance_traveled = m_total_h_dist - len;
-			double start_z = m_move_to_z - m_total_v_dist;
-			double z_at_pos = start_z + (m_total_v_dist * (total_distance_traveled / m_total_h_dist));
+			double start_z                 = m_move_to_z - m_total_v_dist;
+			double z_at_pos                = start_z + (m_total_v_dist * (total_distance_traveled / m_total_h_dist));
 
-			if (m->IsNPC()) {
-				entity_list.ProcessMove(m->CastToNPC(), npos.x, npos.y, z_at_pos);
+			if (mob->IsNPC()) {
+				entity_list.ProcessMove(mob->CastToNPC(), npos.x, npos.y, z_at_pos);
 			}
 
-			m->SetPosition(npos.x, npos.y, z_at_pos);
+			mob->SetPosition(npos.x, npos.y, z_at_pos);
 
 
 			if (RuleB(Map, FixZWhenPathing)) {
 				m_distance_moved_since_correction += distance_moved;
 				if (m_distance_moved_since_correction > RuleR(Map, DistanceCanTravelBeforeAdjustment)) {
 					m_distance_moved_since_correction = 0.0;
-					m->FixZ();
+					mob->FixZ();
 				}
 			}
 		}
-		
+
 		return false;
 	}
 
-	virtual bool Started() const {
+	virtual bool Started() const
+	{
 		return m_started;
 	}
 
 protected:
-	double m_distance_moved_since_correction;
-	double m_move_to_x;
-	double m_move_to_y;
-	double m_move_to_z;
+	double          m_distance_moved_since_correction;
+	double          m_move_to_x;
+	double          m_move_to_y;
+	double          m_move_to_z;
 	MobMovementMode m_move_to_mode;
-	bool m_started;
+	bool            m_started;
 
 	double m_last_sent_time;
-	int m_last_sent_speed;
+	int    m_last_sent_speed;
 	double m_total_h_dist;
 	double m_total_v_dist;
 };
 
-class SwimToCommand : public MoveToCommand
-{
+class SwimToCommand : public MoveToCommand {
 public:
-	SwimToCommand(float x, float y, float z, MobMovementMode mode) : MoveToCommand(x, y, z, mode) {
+	SwimToCommand(float x, float y, float z, MobMovementMode mob_movement_mode) : MoveToCommand(x, y, z, mob_movement_mode)
+	{
 
 	}
 
-	virtual bool Process(MobMovementManager *mgr, Mob *m)
+	virtual bool Process(MobMovementManager *mob_movement_manager, Mob *mob)
 	{
-		if (!m->IsAIControlled()) {
+		if (!mob->IsAIControlled()) {
 			return true;
 		}
 
-		//Send a movement packet when you start moving		
-		double current_time = static_cast<double>(Timer::GetCurrentTime()) / 1000.0;
-		int current_speed = 0;
+		//Send a movement packet when you start moving
+		double current_time  = static_cast<double>(Timer::GetCurrentTime()) / 1000.0;
+		int    current_speed = 0;
 
 		if (m_move_to_mode == MovementRunning) {
-			if (m->IsFeared()) {
-				current_speed = m->GetFearSpeed();
+			if (mob->IsFeared()) {
+				current_speed = mob->GetFearSpeed();
 			}
 			else {
-				current_speed = m->GetRunspeed();
+				current_speed = mob->GetRunspeed();
 			}
 		}
 		else {
-			current_speed = m->GetWalkspeed();
+			current_speed = mob->GetWalkspeed();
 		}
 
 		if (!m_started) {
 			m_started = true;
 			//rotate to the point
-			m->SetMoving(true);
-			m->SetHeading(m->CalculateHeadingToTarget(m_move_to_x, m_move_to_y));
+			mob->SetMoving(true);
+			mob->SetHeading(mob->CalculateHeadingToTarget(m_move_to_x, m_move_to_y));
 
 			m_last_sent_speed = current_speed;
-			m_last_sent_time = current_time;
-			m_total_h_dist = DistanceNoZ(m->GetPosition(), glm::vec4(m_move_to_x, m_move_to_y, 0.0f, 0.0f));
-			m_total_v_dist = m_move_to_z - m->GetZ();
-			mgr->SendCommandToClients(m, 0.0, 0.0, 0.0, 0.0, current_speed, ClientRangeCloseMedium);
+			m_last_sent_time  = current_time;
+			m_total_h_dist    = DistanceNoZ(mob->GetPosition(), glm::vec4(m_move_to_x, m_move_to_y, 0.0f, 0.0f));
+			m_total_v_dist    = m_move_to_z - mob->GetZ();
+			mob_movement_manager->SendCommandToClients(mob, 0.0, 0.0, 0.0, 0.0, current_speed, ClientRangeCloseMedium);
 		}
 
 		//When speed changes
 		if (current_speed != m_last_sent_speed) {
 			m_last_sent_speed = current_speed;
-			m_last_sent_time = current_time;
-			mgr->SendCommandToClients(m, 0.0, 0.0, 0.0, 0.0, current_speed, ClientRangeCloseMedium);
+			m_last_sent_time  = current_time;
+			mob_movement_manager->SendCommandToClients(mob, 0.0, 0.0, 0.0, 0.0, current_speed, ClientRangeCloseMedium);
 		}
 
 		//If x seconds have passed without sending an update.
 		if (current_time - m_last_sent_time >= 1.5) {
 			m_last_sent_speed = current_speed;
-			m_last_sent_time = current_time;
-			mgr->SendCommandToClients(m, 0.0, 0.0, 0.0, 0.0, current_speed, ClientRangeCloseMedium);
+			m_last_sent_time  = current_time;
+			mob_movement_manager->SendCommandToClients(mob, 0.0, 0.0, 0.0, 0.0, current_speed, ClientRangeCloseMedium);
 		}
 
-		auto &p = m->GetPosition();
+		auto      &p  = mob->GetPosition();
 		glm::vec2 tar(m_move_to_x, m_move_to_y);
 		glm::vec2 pos(p.x, p.y);
-		double len = glm::distance(pos, tar);
+		double    len = glm::distance(pos, tar);
 		if (len == 0) {
 			return true;
 		}
 
-		m->SetMoved(true);
+		mob->SetMoved(true);
 
-		glm::vec2 dir = tar - pos;
-		glm::vec2 ndir = glm::normalize(dir);
-		double distance_moved = frame_time * current_speed * 0.4f * 1.45f;
+		glm::vec2 dir            = tar - pos;
+		glm::vec2 ndir           = glm::normalize(dir);
+		double    distance_moved = frame_time * current_speed * 0.4f * 1.45f;
 
 		if (distance_moved > len) {
-			if (m->IsNPC()) {
-				entity_list.ProcessMove(m->CastToNPC(), m_move_to_x, m_move_to_y, m_move_to_z);
+			if (mob->IsNPC()) {
+				entity_list.ProcessMove(mob->CastToNPC(), m_move_to_x, m_move_to_y, m_move_to_z);
 			}
 
-			m->SetPosition(m_move_to_x, m_move_to_y, m_move_to_z);
+			mob->SetPosition(m_move_to_x, m_move_to_y, m_move_to_z);
 			return true;
 		}
 		else {
@@ -328,51 +346,54 @@ public:
 
 			len -= distance_moved;
 			double total_distance_traveled = m_total_h_dist - len;
-			double start_z = m_move_to_z - m_total_v_dist;
-			double z_at_pos = start_z + (m_total_v_dist * (total_distance_traveled / m_total_h_dist));
+			double start_z                 = m_move_to_z - m_total_v_dist;
+			double z_at_pos                = start_z + (m_total_v_dist * (total_distance_traveled / m_total_h_dist));
 
-			if (m->IsNPC()) {
-				entity_list.ProcessMove(m->CastToNPC(), npos.x, npos.y, z_at_pos);
+			if (mob->IsNPC()) {
+				entity_list.ProcessMove(mob->CastToNPC(), npos.x, npos.y, z_at_pos);
 			}
 
-			m->SetPosition(npos.x, npos.y, z_at_pos);
+			mob->SetPosition(npos.x, npos.y, z_at_pos);
 		}
 
 		return false;
 	}
 };
 
-class TeleportToCommand : public IMovementCommand
-{
+class TeleportToCommand : public IMovementCommand {
 public:
-	TeleportToCommand(float x, float y, float z, float heading) {
-		m_teleport_to_x = x;
-		m_teleport_to_y = y;
-		m_teleport_to_z = z;
+	TeleportToCommand(float x, float y, float z, float heading)
+	{
+		m_teleport_to_x       = x;
+		m_teleport_to_y       = y;
+		m_teleport_to_z       = z;
 		m_teleport_to_heading = heading;
 	}
 
-	virtual ~TeleportToCommand() {
+	virtual ~TeleportToCommand()
+	{
 
 	}
 
-	virtual bool Process(MobMovementManager *mgr, Mob *m) {
-		if (!m->IsAIControlled()) {
+	virtual bool Process(MobMovementManager *mob_movement_manager, Mob *mob)
+	{
+		if (!mob->IsAIControlled()) {
 			return true;
 		}
 
-		if (m->IsNPC()) {
-			entity_list.ProcessMove(m->CastToNPC(), m_teleport_to_x, m_teleport_to_y, m_teleport_to_z);
+		if (mob->IsNPC()) {
+			entity_list.ProcessMove(mob->CastToNPC(), m_teleport_to_x, m_teleport_to_y, m_teleport_to_z);
 		}
 
-		m->SetPosition(m_teleport_to_x, m_teleport_to_y, m_teleport_to_z);
-		m->SetHeading(mgr->FixHeading(m_teleport_to_heading));
-		mgr->SendCommandToClients(m, 0.0, 0.0, 0.0, 0.0, 0, ClientRangeAny);
+		mob->SetPosition(m_teleport_to_x, m_teleport_to_y, m_teleport_to_z);
+		mob->SetHeading(mob_movement_manager->FixHeading(m_teleport_to_heading));
+		mob_movement_manager->SendCommandToClients(mob, 0.0, 0.0, 0.0, 0.0, 0, ClientRangeAny);
 
 		return true;
 	}
 
-	virtual bool Started() const {
+	virtual bool Started() const
+	{
 		return false;
 	}
 
@@ -384,93 +405,99 @@ private:
 	double m_teleport_to_heading;
 };
 
-class StopMovingCommand : public IMovementCommand
-{
+class StopMovingCommand : public IMovementCommand {
 public:
-	StopMovingCommand() {
+	StopMovingCommand()
+	{
 	}
 
-	virtual ~StopMovingCommand() {
+	virtual ~StopMovingCommand()
+	{
 
 	}
 
-	virtual bool Process(MobMovementManager *mgr, Mob *m) {
-		if (!m->IsAIControlled()) {
+	virtual bool Process(MobMovementManager *mob_movement_manager, Mob *mob)
+	{
+		if (!mob->IsAIControlled()) {
 			return true;
 		}
 
-		if (m->IsMoving()) {
-			m->SetMoving(false);
+		if (mob->IsMoving()) {
+			mob->SetMoving(false);
 			if (RuleB(Map, FixZWhenPathing)) {
-				m->FixZ();
+				mob->FixZ();
 			}
-			mgr->SendCommandToClients(m, 0.0, 0.0, 0.0, 0.0, 0, ClientRangeCloseMedium);
+			mob_movement_manager->SendCommandToClients(mob, 0.0, 0.0, 0.0, 0.0, 0, ClientRangeCloseMedium);
 		}
 		return true;
 	}
 
-	virtual bool Started() const {
+	virtual bool Started() const
+	{
 		return false;
 	}
 };
 
-class EvadeCombatCommand : public IMovementCommand
-{
+class EvadeCombatCommand : public IMovementCommand {
 public:
-	EvadeCombatCommand() {
+	EvadeCombatCommand()
+	{
 	}
 
-	virtual ~EvadeCombatCommand() {
+	virtual ~EvadeCombatCommand()
+	{
 
 	}
 
-	virtual bool Process(MobMovementManager *mgr, Mob *m) {
-		if (!m->IsAIControlled()) {
+	virtual bool Process(MobMovementManager *mob_movement_manager, Mob *mob)
+	{
+		if (!mob->IsAIControlled()) {
 			return true;
 		}
 
-		if (m->IsMoving()) {
-			m->SetMoving(false);
-			mgr->SendCommandToClients(m, 0.0, 0.0, 0.0, 0.0, 0, ClientRangeCloseMedium);
+		if (mob->IsMoving()) {
+			mob->SetMoving(false);
+			mob_movement_manager->SendCommandToClients(mob, 0.0, 0.0, 0.0, 0.0, 0, ClientRangeCloseMedium);
 		}
 
-		m->BuffFadeAll();
-		m->WipeHateList();
-		m->Heal();
+		mob->BuffFadeAll();
+		mob->WipeHateList();
+		mob->Heal();
 
 		return true;
 	}
 
-	virtual bool Started() const {
+	virtual bool Started() const
+	{
 		return false;
 	}
 };
 
-struct MovementStats
-{
-	MovementStats() {
-		LastResetTime = static_cast<double>(Timer::GetCurrentTime()) / 1000.0;
-		TotalSent = 0ULL;
+struct MovementStats {
+	MovementStats()
+	{
+		LastResetTime     = static_cast<double>(Timer::GetCurrentTime()) / 1000.0;
+		TotalSent         = 0ULL;
 		TotalSentMovement = 0ULL;
 		TotalSentPosition = 0ULL;
-		TotalSentHeading = 0ULL;
+		TotalSentHeading  = 0ULL;
 	}
 
-	double LastResetTime;
+	double   LastResetTime;
 	uint64_t TotalSent;
 	uint64_t TotalSentMovement;
 	uint64_t TotalSentPosition;
 	uint64_t TotalSentHeading;
 };
 
-struct NavigateTo
-{
-	NavigateTo() {
-		navigate_to_x = 0.0;
-		navigate_to_y = 0.0;
-		navigate_to_z = 0.0;
+struct NavigateTo {
+	NavigateTo()
+	{
+		navigate_to_x       = 0.0;
+		navigate_to_y       = 0.0;
+		navigate_to_z       = 0.0;
 		navigate_to_heading = 0.0;
-		last_set_time = 0.0;
+		last_set_time       = 0.0;
 	}
 
 	double navigate_to_x;
@@ -480,13 +507,13 @@ struct NavigateTo
 	double last_set_time;
 };
 
-struct MobMovementEntry
-{
+struct MobMovementEntry {
 	std::deque<std::unique_ptr<IMovementCommand>> Commands;
-	NavigateTo NavTo;
+	NavigateTo                                    NavTo;
 };
 
-void AdjustRoute(std::list<IPathfinder::IPathNode> &nodes, Mob *who) {
+void AdjustRoute(std::list<IPathfinder::IPathNode> &nodes, Mob *who)
+{
 	if (!zone->HasMap() || !zone->HasWaterMap()) {
 		return;
 	}
@@ -494,7 +521,7 @@ void AdjustRoute(std::list<IPathfinder::IPathNode> &nodes, Mob *who) {
 	auto offset = who->GetZOffset();
 
 	for (auto &node : nodes) {
-		if(!zone->watermap->InLiquid(node.pos)) {
+		if (!zone->watermap->InLiquid(node.pos)) {
 			auto best_z = zone->zonemap->FindBestZ(node.pos, nullptr);
 			if (best_z != BEST_Z_INVALID) {
 				node.pos.z = best_z + offset;
@@ -503,11 +530,10 @@ void AdjustRoute(std::list<IPathfinder::IPathNode> &nodes, Mob *who) {
 	}
 }
 
-struct MobMovementManager::Implementation
-{
-	std::map<Mob*, MobMovementEntry> Entries;
-	std::vector<Client*> Clients;
-	MovementStats Stats;
+struct MobMovementManager::Implementation {
+	std::map<Mob *, MobMovementEntry> Entries;
+	std::vector<Client *>             Clients;
+	MovementStats                     Stats;
 };
 
 MobMovementManager::MobMovementManager()
@@ -522,12 +548,12 @@ MobMovementManager::~MobMovementManager()
 void MobMovementManager::Process()
 {
 	for (auto &iter : _impl->Entries) {
-		auto &ent = iter.second;
+		auto &ent      = iter.second;
 		auto &commands = ent.Commands;
 
 		while (true != commands.empty()) {
 			auto &cmd = commands.front();
-			auto r = cmd->Process(this, iter.first);
+			auto r    = cmd->Process(this, iter.first);
 
 			if (true != r) {
 				break;
@@ -538,35 +564,52 @@ void MobMovementManager::Process()
 	}
 }
 
-void MobMovementManager::AddMob(Mob *m)
+/**
+ * @param mob
+ */
+void MobMovementManager::AddMob(Mob *mob)
 {
-	_impl->Entries.insert(std::make_pair(m, MobMovementEntry()));
+	_impl->Entries.insert(std::make_pair(mob, MobMovementEntry()));
 }
 
-void MobMovementManager::RemoveMob(Mob *m)
+/**
+ * @param mob
+ */
+void MobMovementManager::RemoveMob(Mob *mob)
 {
-	_impl->Entries.erase(m);
+	_impl->Entries.erase(mob);
 }
 
-void MobMovementManager::AddClient(Client *c)
+/**
+ * @param client
+ */
+void MobMovementManager::AddClient(Client *client)
 {
-	_impl->Clients.push_back(c);
+	_impl->Clients.push_back(client);
 }
 
-void MobMovementManager::RemoveClient(Client *c)
+/**
+ * @param client
+ */
+void MobMovementManager::RemoveClient(Client *client)
 {
 	auto iter = _impl->Clients.begin();
 	while (iter != _impl->Clients.end()) {
-		if (c == *iter) {
+		if (client == *iter) {
 			_impl->Clients.erase(iter);
 			return;
 		}
-	
+
 		++iter;
 	}
 }
 
-void MobMovementManager::RotateTo(Mob *who, float to, MobMovementMode mode)
+/**
+ * @param who
+ * @param to
+ * @param mob_movement_mode
+ */
+void MobMovementManager::RotateTo(Mob *who, float to, MobMovementMode mob_movement_mode)
 {
 	auto iter = _impl->Entries.find(who);
 	auto &ent = (*iter);
@@ -574,20 +617,34 @@ void MobMovementManager::RotateTo(Mob *who, float to, MobMovementMode mode)
 	if (true != ent.second.Commands.empty()) {
 		return;
 	}
-	
-	PushRotateTo(ent.second, who, to, mode);
+
+	PushRotateTo(ent.second, who, to, mob_movement_mode);
 }
 
+/**
+ * @param who
+ * @param x
+ * @param y
+ * @param z
+ * @param heading
+ */
 void MobMovementManager::Teleport(Mob *who, float x, float y, float z, float heading)
 {
 	auto iter = _impl->Entries.find(who);
 	auto &ent = (*iter);
-	
+
 	ent.second.Commands.clear();
 
 	PushTeleportTo(ent.second, x, y, z, heading);
 }
 
+/**
+ * @param who
+ * @param x
+ * @param y
+ * @param z
+ * @param mode
+ */
 void MobMovementManager::NavigateTo(Mob *who, float x, float y, float z, MobMovementMode mode)
 {
 	if (IsPositionEqualWithinCertainZ(glm::vec3(x, y, z), glm::vec3(who->GetX(), who->GetY(), who->GetZ()), 6.0f)) {
@@ -601,8 +658,13 @@ void MobMovementManager::NavigateTo(Mob *who, float x, float y, float z, MobMove
 	double current_time = static_cast<double>(Timer::GetCurrentTime()) / 1000.0;
 	if ((current_time - nav.last_set_time) > 0.5) {
 		//Can potentially recalc
-	
-		auto within = IsPositionWithinSimpleCylinder(glm::vec3(x, y, z), glm::vec3(nav.navigate_to_x, nav.navigate_to_y, nav.navigate_to_z), 1.5f, 6.0f);
+
+		auto within        = IsPositionWithinSimpleCylinder(
+			glm::vec3(x, y, z),
+			glm::vec3(nav.navigate_to_x, nav.navigate_to_y, nav.navigate_to_z),
+			1.5f,
+			6.0f
+		);
 		auto heading_match = IsHeadingEqual(0.0, nav.navigate_to_heading);
 
 		if (false == within || false == heading_match || ent.second.Commands.size() == 0) {
@@ -610,23 +672,27 @@ void MobMovementManager::NavigateTo(Mob *who, float x, float y, float z, MobMove
 
 			//Path is no longer valid, calculate a new path
 			UpdatePath(who, x, y, z, mode);
-			nav.navigate_to_x = x;
-			nav.navigate_to_y = y;
-			nav.navigate_to_z = z;
+			nav.navigate_to_x       = x;
+			nav.navigate_to_y       = y;
+			nav.navigate_to_z       = z;
 			nav.navigate_to_heading = 0.0;
-			nav.last_set_time = current_time;
+			nav.last_set_time       = current_time;
 		}
 	}
 }
 
-void MobMovementManager::StopNavigation(Mob *who) {
+/**
+ * @param who
+ */
+void MobMovementManager::StopNavigation(Mob *who)
+{
 	auto iter = _impl->Entries.find(who);
 	auto &ent = (*iter);
 	auto &nav = ent.second.NavTo;
 
-	nav.navigate_to_x = 0.0;
-	nav.navigate_to_y = 0.0;
-	nav.navigate_to_z = 0.0;
+	nav.navigate_to_x       = 0.0;
+	nav.navigate_to_y       = 0.0;
+	nav.navigate_to_z       = 0.0;
 	nav.navigate_to_heading = 0.0;
 
 	if (true == ent.second.Commands.empty()) {
@@ -643,24 +709,48 @@ void MobMovementManager::StopNavigation(Mob *who) {
 	PushStopMoving(ent.second);
 }
 
-void MobMovementManager::SendCommandToClients(Mob *m, float dx, float dy, float dz, float dh, int anim, ClientRange range)
+/**
+ * @param mob
+ * @param delta_x
+ * @param delta_y
+ * @param delta_z
+ * @param delta_heading
+ * @param anim
+ * @param range
+ * @param single_client
+ */
+void MobMovementManager::SendCommandToClients(
+	Mob *mob,
+	float delta_x,
+	float delta_y,
+	float delta_z,
+	float delta_heading,
+	int anim,
+	ClientRange range,
+	Client* single_client
+)
 {
 	if (range == ClientRangeNone) {
 		return;
 	}
 
 	EQApplicationPacket outapp(OP_ClientUpdate, sizeof(PlayerPositionUpdateServer_Struct));
-	PlayerPositionUpdateServer_Struct *spu = (PlayerPositionUpdateServer_Struct*)outapp.pBuffer;
-	FillCommandStruct(spu, m, dx, dy, dz, dh, anim);
+	auto                *spu = (PlayerPositionUpdateServer_Struct *) outapp.pBuffer;
+
+	FillCommandStruct(spu, mob, delta_x, delta_y, delta_z, delta_heading, anim);
 
 	if (range == ClientRangeAny) {
 		for (auto &c : _impl->Clients) {
+			if (single_client && c != single_client) {
+				continue;
+			}
+
 			_impl->Stats.TotalSent++;
 
 			if (anim != 0) {
 				_impl->Stats.TotalSentMovement++;
 			}
-			else if (dh != 0) {
+			else if (delta_heading != 0) {
 				_impl->Stats.TotalSentHeading++;
 			}
 			else {
@@ -672,26 +762,30 @@ void MobMovementManager::SendCommandToClients(Mob *m, float dx, float dy, float
 	}
 	else {
 		float short_range = RuleR(Pathing, ShortMovementUpdateRange);
-		float long_range = zone->GetMaxMovementUpdateRange();
+		float long_range  = zone->GetNpcPositionUpdateDistance();
 
 		for (auto &c : _impl->Clients) {
-			float dist = c->CalculateDistance(m->GetX(), m->GetY(), m->GetZ());
+			if (single_client && c != single_client) {
+				continue;
+			}
+
+			float distance = c->CalculateDistance(mob->GetX(), mob->GetY(), mob->GetZ());
 
 			bool match = false;
 			if (range & ClientRangeClose) {
-				if (dist < short_range) {
+				if (distance < short_range) {
 					match = true;
 				}
 			}
 
 			if (!match && range & ClientRangeMedium) {
-				if (dist >= short_range && dist < long_range) {
+				if (distance >= short_range && distance < long_range) {
 					match = true;
 				}
 			}
 
 			if (!match && range & ClientRangeLong) {
-				if (dist >= long_range) {
+				if (distance >= long_range) {
 					match = true;
 				}
 			}
@@ -702,7 +796,7 @@ void MobMovementManager::SendCommandToClients(Mob *m, float dx, float dy, float
 				if (anim != 0) {
 					_impl->Stats.TotalSentMovement++;
 				}
-				else if (dh != 0) {
+				else if (delta_heading != 0) {
 					_impl->Stats.TotalSentHeading++;
 				}
 				else {
@@ -715,6 +809,10 @@ void MobMovementManager::SendCommandToClients(Mob *m, float dx, float dy, float
 	}
 }
 
+/**
+ * @param in
+ * @return
+ */
 float MobMovementManager::FixHeading(float in)
 {
 	auto h = in;
@@ -729,83 +827,139 @@ float MobMovementManager::FixHeading(float in)
 	return h;
 }
 
-void MobMovementManager::DumpStats(Client *to)
+/**
+ * @param client
+ */
+void MobMovementManager::DumpStats(Client *client)
 {
 	auto current_time = static_cast<double>(Timer::GetCurrentTime()) / 1000.0;
-	auto total_time = current_time - _impl->Stats.LastResetTime;
+	auto total_time   = current_time - _impl->Stats.LastResetTime;
 
-	to->Message(MT_System, "Dumping Movement Stats:");
-	to->Message(MT_System, "Total Sent: %u (%.2f / sec)", _impl->Stats.TotalSent, static_cast<double>(_impl->Stats.TotalSent) / total_time);
-	to->Message(MT_System, "Total Heading: %u (%.2f / sec)", _impl->Stats.TotalSentHeading, static_cast<double>(_impl->Stats.TotalSentHeading) / total_time);
-	to->Message(MT_System, "Total Movement: %u (%.2f / sec)", _impl->Stats.TotalSentMovement, static_cast<double>(_impl->Stats.TotalSentMovement) / total_time);
-	to->Message(MT_System, "Total Position: %u (%.2f / sec)", _impl->Stats.TotalSentPosition, static_cast<double>(_impl->Stats.TotalSentPosition) / total_time);
+	client->Message(Chat::System, "Dumping Movement Stats:");
+	client->Message(
+		Chat::System,
+		"Total Sent: %u (%.2f / sec)",
+		_impl->Stats.TotalSent,
+		static_cast<double>(_impl->Stats.TotalSent) / total_time
+	);
+	client->Message(
+		Chat::System,
+		"Total Heading: %u (%.2f / sec)",
+		_impl->Stats.TotalSentHeading,
+		static_cast<double>(_impl->Stats.TotalSentHeading) / total_time
+	);
+	client->Message(
+		Chat::System,
+		"Total Movement: %u (%.2f / sec)",
+		_impl->Stats.TotalSentMovement,
+		static_cast<double>(_impl->Stats.TotalSentMovement) / total_time
+	);
+	client->Message(
+		Chat::System,
+		"Total Position: %u (%.2f / sec)",
+		_impl->Stats.TotalSentPosition,
+		static_cast<double>(_impl->Stats.TotalSentPosition) / total_time
+	);
 }
 
 void MobMovementManager::ClearStats()
 {
-	_impl->Stats.LastResetTime = static_cast<double>(Timer::GetCurrentTime()) / 1000.0;
-	_impl->Stats.TotalSent = 0;
-	_impl->Stats.TotalSentHeading = 0;
+	_impl->Stats.LastResetTime     = static_cast<double>(Timer::GetCurrentTime()) / 1000.0;
+	_impl->Stats.TotalSent         = 0;
+	_impl->Stats.TotalSentHeading  = 0;
 	_impl->Stats.TotalSentMovement = 0;
 	_impl->Stats.TotalSentPosition = 0;
 }
 
-void MobMovementManager::FillCommandStruct(PlayerPositionUpdateServer_Struct *spu, Mob *m, float dx, float dy, float dz, float dh, int anim)
+/**
+ * @param position_update
+ * @param mob
+ * @param delta_x
+ * @param delta_y
+ * @param delta_z
+ * @param delta_heading
+ * @param anim
+ */
+void MobMovementManager::FillCommandStruct(
+	PlayerPositionUpdateServer_Struct *position_update,
+	Mob *mob,
+	float delta_x,
+	float delta_y,
+	float delta_z,
+	float delta_heading,
+	int anim
+)
 {
-	memset(spu, 0x00, sizeof(PlayerPositionUpdateServer_Struct));
-	spu->spawn_id = m->GetID();
-	spu->x_pos = FloatToEQ19(m->GetX());
-	spu->y_pos = FloatToEQ19(m->GetY());
-	spu->z_pos = FloatToEQ19(m->GetZ());
-	spu->heading = FloatToEQ12(m->GetHeading());
-	spu->delta_x = FloatToEQ13(dx);
-	spu->delta_y = FloatToEQ13(dy);
-	spu->delta_z = FloatToEQ13(dz);
-	spu->delta_heading = FloatToEQ10(dh);
-	spu->animation = (m->IsBot() ? (int)((float)anim / 1.785714f) : anim);
+	memset(position_update, 0x00, sizeof(PlayerPositionUpdateServer_Struct));
+	position_update->spawn_id      = mob->GetID();
+	position_update->x_pos         = FloatToEQ19(mob->GetX());
+	position_update->y_pos         = FloatToEQ19(mob->GetY());
+	position_update->z_pos         = FloatToEQ19(mob->GetZ());
+	position_update->heading       = FloatToEQ12(mob->GetHeading());
+	position_update->delta_x       = FloatToEQ13(delta_x);
+	position_update->delta_y       = FloatToEQ13(delta_y);
+	position_update->delta_z       = FloatToEQ13(delta_z);
+	position_update->delta_heading = FloatToEQ10(delta_heading);
+	position_update->animation     = (mob->IsBot() ? (int) ((float) anim / 1.785714f) : anim);
 }
 
-void MobMovementManager::UpdatePath(Mob *who, float x, float y, float z, MobMovementMode mode)
+/**
+ * @param who
+ * @param x
+ * @param y
+ * @param z
+ * @param mob_movement_mode
+ */
+void MobMovementManager::UpdatePath(Mob *who, float x, float y, float z, MobMovementMode mob_movement_mode)
 {
 	if (!zone->HasMap() || !zone->HasWaterMap()) {
 		auto iter = _impl->Entries.find(who);
 		auto &ent = (*iter);
-	
-		PushMoveTo(ent.second, x, y, z, mode);
+
+		PushMoveTo(ent.second, x, y, z, mob_movement_mode);
 		PushStopMoving(ent.second);
 		return;
 	}
-	
+
 	if (who->IsBoat()) {
-		UpdatePathBoat(who, x, y, z, mode);
-	} else if (who->IsUnderwaterOnly()) {
-		UpdatePathUnderwater(who, x, y, z, mode);
+		UpdatePathBoat(who, x, y, z, mob_movement_mode);
+	}
+	else if (who->IsUnderwaterOnly()) {
+		UpdatePathUnderwater(who, x, y, z, mob_movement_mode);
 	}
 	else {
-		UpdatePathGround(who, x, y, z, mode);
+		UpdatePathGround(who, x, y, z, mob_movement_mode);
 	}
 }
 
-void MobMovementManager::UpdatePathGround(Mob * who, float x, float y, float z, MobMovementMode mode)
+/**
+ * @param who
+ * @param x
+ * @param y
+ * @param z
+ * @param mode
+ */
+void MobMovementManager::UpdatePathGround(Mob *who, float x, float y, float z, MobMovementMode mode)
 {
 	PathfinderOptions opts;
 	opts.smooth_path = true;
-	opts.step_size = RuleR(Pathing, NavmeshStepSize);
-	opts.offset = who->GetZOffset();
-	opts.flags = PathingNotDisabled ^ PathingZoneLine;
+	opts.step_size   = RuleR(Pathing, NavmeshStepSize);
+	opts.offset      = who->GetZOffset();
+	opts.flags       = PathingNotDisabled ^ PathingZoneLine;
 
 	//This is probably pointless since the nav mesh tool currently sets zonelines to disabled anyway
 	auto partial = false;
-	auto stuck = false;
-	auto route = zone->pathing->FindPath(
+	auto stuck   = false;
+	auto route   = zone->pathing->FindPath(
 		glm::vec3(who->GetX(), who->GetY(), who->GetZ()),
 		glm::vec3(x, y, z),
 		partial,
 		stuck,
-		opts);
+		opts
+	);
 
 	auto eiter = _impl->Entries.find(who);
-	auto &ent = (*eiter);
+	auto &ent  = (*eiter);
 
 	if (route.size() == 0) {
 		HandleStuckBehavior(who, x, y, z, mode);
@@ -813,31 +967,26 @@ void MobMovementManager::UpdatePathGround(Mob * who, float x, float y, float z,
 	}
 
 	AdjustRoute(route, who);
-	   
-	
-	
+
 	//avoid doing any processing if the mob is stuck to allow normal stuck code to work.
-	if (!stuck)
-	{
+	if (!stuck) {
 
 		//there are times when the routes returned are no differen than where the mob is currently standing. What basically happens
-		//is a mob will get 'stuck' in such a way that it should be moving but the 'moving' place is the exact same spot it is at. 
-		//this is a problem and creates an area of ground that if a mob gets to, will stay there forever. If socal this creates a 
-		//"Ball of Death" (tm). This code tries to prevent this by simply warping the mob to the requested x/y. Better to have a warp than 
+		//is a mob will get 'stuck' in such a way that it should be moving but the 'moving' place is the exact same spot it is at.
+		//this is a problem and creates an area of ground that if a mob gets to, will stay there forever. If socal this creates a
+		//"Ball of Death" (tm). This code tries to prevent this by simply warping the mob to the requested x/y. Better to have a warp than
 		//have stuck mobs.
 
-		auto routeNode = route.begin();
+		auto routeNode   = route.begin();
 		bool noValidPath = true;
 		while (routeNode != route.end() && noValidPath == true) {
 			auto &currentNode = (*routeNode);
 
-			if (routeNode == route.end())
-			{
+			if (routeNode == route.end()) {
 				continue;
 			}
 
-			if (!(currentNode.pos.x == who->GetX() && currentNode.pos.y == who->GetY()))
-			{
+			if (!(currentNode.pos.x == who->GetX() && currentNode.pos.y == who->GetY())) {
 				//if one of the nodes to move to, is not our current node, pass it.
 				noValidPath = false;
 				break;
@@ -847,47 +996,62 @@ void MobMovementManager::UpdatePathGround(Mob * who, float x, float y, float z,
 
 		}
 
-		if (noValidPath)
-		{
+		if (noValidPath) {
 			//we are 'stuck' in a path, lets just get out of this by 'teleporting' to the next position.
-			PushTeleportTo(ent.second, x, y, z,
-				CalculateHeadingAngleBetweenPositions(who->GetX(), who->GetY(), x, y));
+			PushTeleportTo(
+				ent.second,
+				x,
+				y,
+				z,
+				CalculateHeadingAngleBetweenPositions(who->GetX(), who->GetY(), x, y)
+			);
+
 			return;
 		}
 
 	}
-	
+
 	auto iter = route.begin();
+
 	glm::vec3 previous_pos(who->GetX(), who->GetY(), who->GetZ());
+
 	bool first_node = true;
-
-
 	while (iter != route.end()) {
 		auto &current_node = (*iter);
-	
+
 		iter++;
-	
+
 		if (iter == route.end()) {
 			continue;
 		}
-	
+
 		previous_pos = current_node.pos;
 		auto &next_node = (*iter);
-	
+
 		if (first_node) {
-	
+
 			if (mode == MovementWalking) {
 				auto h = who->CalculateHeadingToTarget(next_node.pos.x, next_node.pos.y);
 				PushRotateTo(ent.second, who, h, mode);
 			}
-	
+
 			first_node = false;
 		}
-	
+
 		//move to / teleport to node + 1
 		if (next_node.teleport && next_node.pos.x != 0.0f && next_node.pos.y != 0.0f) {
-			PushTeleportTo(ent.second, next_node.pos.x, next_node.pos.y, next_node.pos.z,
-				CalculateHeadingAngleBetweenPositions(current_node.pos.x, current_node.pos.y, next_node.pos.x, next_node.pos.y));
+			PushTeleportTo(
+				ent.second,
+				next_node.pos.x,
+				next_node.pos.y,
+				next_node.pos.z,
+				CalculateHeadingAngleBetweenPositions(
+					current_node.pos.x,
+					current_node.pos.y,
+					next_node.pos.x,
+					next_node.pos.y
+				)
+			);
 		}
 		else {
 			if (zone->watermap->InLiquid(previous_pos)) {
@@ -907,41 +1071,50 @@ void MobMovementManager::UpdatePathGround(Mob * who, float x, float y, float z,
 	}
 }
 
-void MobMovementManager::UpdatePathUnderwater(Mob *who, float x, float y, float z, MobMovementMode mode)
+/**
+ * @param who
+ * @param x
+ * @param y
+ * @param z
+ * @param movement_mode
+ */
+void MobMovementManager::UpdatePathUnderwater(Mob *who, float x, float y, float z, MobMovementMode movement_mode)
 {
 	auto eiter = _impl->Entries.find(who);
-	auto &ent = (*eiter);
-	if (zone->watermap->InLiquid(who->GetPosition()) && zone->watermap->InLiquid(glm::vec3(x, y, z)) && zone->zonemap->CheckLoS(who->GetPosition(), glm::vec3(x, y, z))) {
-		PushSwimTo(ent.second, x, y, z, mode);
+	auto &ent  = (*eiter);
+	if (zone->watermap->InLiquid(who->GetPosition()) && zone->watermap->InLiquid(glm::vec3(x, y, z)) &&
+		zone->zonemap->CheckLoS(who->GetPosition(), glm::vec3(x, y, z))) {
+		PushSwimTo(ent.second, x, y, z, movement_mode);
 		PushStopMoving(ent.second);
 		return;
 	}
 
 	PathfinderOptions opts;
 	opts.smooth_path = true;
-	opts.step_size = RuleR(Pathing, NavmeshStepSize);
-	opts.offset = who->GetZOffset();
-	opts.flags = PathingNotDisabled ^ PathingZoneLine;
+	opts.step_size   = RuleR(Pathing, NavmeshStepSize);
+	opts.offset      = who->GetZOffset();
+	opts.flags       = PathingNotDisabled ^ PathingZoneLine;
 
 	auto partial = false;
-	auto stuck = false;
-	auto route = zone->pathing->FindPath(
+	auto stuck   = false;
+	auto route   = zone->pathing->FindPath(
 		glm::vec3(who->GetX(), who->GetY(), who->GetZ()),
 		glm::vec3(x, y, z),
 		partial,
 		stuck,
-		opts);
+		opts
+	);
 
 	if (route.size() == 0) {
-		HandleStuckBehavior(who, x, y, z, mode);
+		HandleStuckBehavior(who, x, y, z, movement_mode);
 		return;
 	}
 
 	AdjustRoute(route, who);
 
-	auto iter = route.begin();
+	auto      iter       = route.begin();
 	glm::vec3 previous_pos(who->GetX(), who->GetY(), who->GetZ());
-	bool first_node = true;
+	bool      first_node = true;
 
 	while (iter != route.end()) {
 		auto &current_node = (*iter);
@@ -961,7 +1134,7 @@ void MobMovementManager::UpdatePathUnderwater(Mob *who, float x, float y, float
 	}
 
 	if (route.size() == 0) {
-		HandleStuckBehavior(who, x, y, z, mode);
+		HandleStuckBehavior(who, x, y, z, movement_mode);
 		return;
 	}
 
@@ -981,9 +1154,9 @@ void MobMovementManager::UpdatePathUnderwater(Mob *who, float x, float y, float
 
 		if (first_node) {
 
-			if (mode == MovementWalking) {
+			if (movement_mode == MovementWalking) {
 				auto h = who->CalculateHeadingToTarget(next_node.pos.x, next_node.pos.y);
-				PushRotateTo(ent.second, who, h, mode);
+				PushRotateTo(ent.second, who, h, movement_mode);
 			}
 
 			first_node = false;
@@ -991,47 +1164,87 @@ void MobMovementManager::UpdatePathUnderwater(Mob *who, float x, float y, float
 
 		//move to / teleport to node + 1
 		if (next_node.teleport && next_node.pos.x != 0.0f && next_node.pos.y != 0.0f) {
-			PushTeleportTo(ent.second, next_node.pos.x, next_node.pos.y, next_node.pos.z,
-				CalculateHeadingAngleBetweenPositions(current_node.pos.x, current_node.pos.y, next_node.pos.x, next_node.pos.y));
+			PushTeleportTo(
+				ent.second, next_node.pos.x, next_node.pos.y, next_node.pos.z,
+				CalculateHeadingAngleBetweenPositions(
+					current_node.pos.x,
+					current_node.pos.y,
+					next_node.pos.x,
+					next_node.pos.y
+				));
 		}
 		else {
-			PushSwimTo(ent.second, next_node.pos.x, next_node.pos.y, next_node.pos.z, mode);
+			PushSwimTo(ent.second, next_node.pos.x, next_node.pos.y, next_node.pos.z, movement_mode);
 		}
 	}
 
 	if (stuck) {
-		HandleStuckBehavior(who, x, y, z, mode);
+		HandleStuckBehavior(who, x, y, z, movement_mode);
 	}
 	else {
 		PushStopMoving(ent.second);
 	}
 }
 
+/**
+ * @param who
+ * @param x
+ * @param y
+ * @param z
+ * @param mode
+ */
 void MobMovementManager::UpdatePathBoat(Mob *who, float x, float y, float z, MobMovementMode mode)
 {
 	auto eiter = _impl->Entries.find(who);
-	auto &ent = (*eiter);
+	auto &ent  = (*eiter);
 
 	PushSwimTo(ent.second, x, y, z, mode);
 	PushStopMoving(ent.second);
 }
 
+/**
+ * @param ent
+ * @param x
+ * @param y
+ * @param z
+ * @param heading
+ */
 void MobMovementManager::PushTeleportTo(MobMovementEntry &ent, float x, float y, float z, float heading)
 {
 	ent.Commands.push_back(std::unique_ptr<IMovementCommand>(new TeleportToCommand(x, y, z, heading)));
 }
 
-void MobMovementManager::PushMoveTo(MobMovementEntry &ent, float x, float y, float z, MobMovementMode mode)
+/**
+ * @param ent
+ * @param x
+ * @param y
+ * @param z
+ * @param mob_movement_mode
+ */
+void MobMovementManager::PushMoveTo(MobMovementEntry &ent, float x, float y, float z, MobMovementMode mob_movement_mode)
 {
-	ent.Commands.push_back(std::unique_ptr<IMovementCommand>(new MoveToCommand(x, y, z, mode)));
+	ent.Commands.push_back(std::unique_ptr<IMovementCommand>(new MoveToCommand(x, y, z, mob_movement_mode)));
 }
 
-void MobMovementManager::PushSwimTo(MobMovementEntry &ent, float x, float y, float z, MobMovementMode mode)
+/**
+ * @param ent
+ * @param x
+ * @param y
+ * @param z
+ * @param mob_movement_mode
+ */
+void MobMovementManager::PushSwimTo(MobMovementEntry &ent, float x, float y, float z, MobMovementMode mob_movement_mode)
 {
-	ent.Commands.push_back(std::unique_ptr<IMovementCommand>(new SwimToCommand(x, y, z, mode)));
+	ent.Commands.push_back(std::unique_ptr<IMovementCommand>(new SwimToCommand(x, y, z, mob_movement_mode)));
 }
 
-void MobMovementManager::PushRotateTo(MobMovementEntry &ent, Mob *who, float to, MobMovementMode mode)
+/**
+ * @param ent
+ * @param who
+ * @param to
+ * @param mob_movement_mode
+ */
+void MobMovementManager::PushRotateTo(MobMovementEntry &ent, Mob *who, float to, MobMovementMode mob_movement_mode)
 {
 	auto from = FixHeading(who->GetHeading());
 	to = FixHeading(to);
@@ -1050,46 +1263,59 @@ void MobMovementManager::PushRotateTo(MobMovementEntry &ent, Mob *who, float to,
 		diff -= 512.0;
 	}
 
-	ent.Commands.push_back(std::unique_ptr<IMovementCommand>(new RotateToCommand(to, diff > 0 ? 1.0 : -1.0, mode)));
+	ent.Commands.push_back(std::unique_ptr<IMovementCommand>(new RotateToCommand(to, diff > 0 ? 1.0 : -1.0, mob_movement_mode)));
 }
 
-void MobMovementManager::PushStopMoving(MobMovementEntry &ent)
+/**
+ * @param mob_movement_entry
+ */
+void MobMovementManager::PushStopMoving(MobMovementEntry &mob_movement_entry)
 {
-	ent.Commands.push_back(std::unique_ptr<IMovementCommand>(new StopMovingCommand()));
+	mob_movement_entry.Commands.push_back(std::unique_ptr<IMovementCommand>(new StopMovingCommand()));
 }
 
-void MobMovementManager::PushEvadeCombat(MobMovementEntry &ent)
+/**
+ * @param mob_movement_entry
+ */
+void MobMovementManager::PushEvadeCombat(MobMovementEntry &mob_movement_entry)
 {
-	ent.Commands.push_back(std::unique_ptr<IMovementCommand>(new EvadeCombatCommand()));
+	mob_movement_entry.Commands.push_back(std::unique_ptr<IMovementCommand>(new EvadeCombatCommand()));
 }
 
-void MobMovementManager::HandleStuckBehavior(Mob *who, float x, float y, float z, MobMovementMode mode)
+/**
+ * @param who
+ * @param x
+ * @param y
+ * @param z
+ * @param mob_movement_mode
+ */
+void MobMovementManager::HandleStuckBehavior(Mob *who, float x, float y, float z, MobMovementMode mob_movement_mode)
 {
-	auto sb = who->GetStuckBehavior();
+	auto             sb       = who->GetStuckBehavior();
 	MobStuckBehavior behavior = RunToTarget;
 
 	if (sb >= 0 && sb < MaxStuckBehavior) {
-		behavior = (MobStuckBehavior)sb;
+		behavior = (MobStuckBehavior) sb;
 	}
 
 	auto eiter = _impl->Entries.find(who);
-	auto &ent = (*eiter);
+	auto &ent  = (*eiter);
 
 	switch (sb) {
-	case RunToTarget:
-		PushMoveTo(ent.second, x, y, z, mode);
-		PushStopMoving(ent.second);
-		break;
-	case WarpToTarget:
-		PushTeleportTo(ent.second, x, y, z, 0.0f);
-		PushStopMoving(ent.second);
-		break;
-	case TakeNoAction:
-		PushStopMoving(ent.second);
-		break;
-	case EvadeCombat:
-		//PushEvadeCombat(ent.second);
-		PushStopMoving(ent.second);
-		break;
+		case RunToTarget:
+			PushMoveTo(ent.second, x, y, z, mob_movement_mode);
+			PushStopMoving(ent.second);
+			break;
+		case WarpToTarget:
+			PushTeleportTo(ent.second, x, y, z, 0.0f);
+			PushStopMoving(ent.second);
+			break;
+		case TakeNoAction:
+			PushStopMoving(ent.second);
+			break;
+		case EvadeCombat:
+			//PushEvadeCombat(ent.second);
+			PushStopMoving(ent.second);
+			break;
 	}
 }
diff --git a/zone/mob_movement_manager.h b/zone/mob_movement_manager.h
index d9b2e7845..3c616cc5a 100644
--- a/zone/mob_movement_manager.h
+++ b/zone/mob_movement_manager.h
@@ -41,18 +41,29 @@ class MobMovementManager
 public:
 	~MobMovementManager();
 	void Process();
-	void AddMob(Mob *m);
-	void RemoveMob(Mob *m);
-	void AddClient(Client *c);
-	void RemoveClient(Client *c);
+	void AddMob(Mob *mob);
+	void RemoveMob(Mob *mob);
+	void AddClient(Client *client);
+	void RemoveClient(Client *client);
 
-	void RotateTo(Mob *who, float to, MobMovementMode mode = MovementRunning);
+	void RotateTo(Mob *who, float to, MobMovementMode mob_movement_mode = MovementRunning);
 	void Teleport(Mob *who, float x, float y, float z, float heading);
 	void NavigateTo(Mob *who, float x, float y, float z, MobMovementMode mode = MovementRunning);
 	void StopNavigation(Mob *who);
-	void SendCommandToClients(Mob *m, float dx, float dy, float dz, float dh, int anim, ClientRange range);
+
+	void SendCommandToClients(
+		Mob *mob,
+		float delta_x,
+		float delta_y,
+		float delta_z,
+		float delta_heading,
+		int anim,
+		ClientRange range,
+		Client* single_client = nullptr
+	);
+
 	float FixHeading(float in);
-	void DumpStats(Client *to);
+	void DumpStats(Client *client);
 	void ClearStats();
 
 	static MobMovementManager &Get() {
@@ -65,18 +76,18 @@ private:
 	MobMovementManager(const MobMovementManager&);
 	MobMovementManager& operator=(const MobMovementManager&);
 
-	void FillCommandStruct(PlayerPositionUpdateServer_Struct *spu, Mob *m, float dx, float dy, float dz, float dh, int anim);
-	void UpdatePath(Mob *who, float x, float y, float z, MobMovementMode mode);
+	void FillCommandStruct(PlayerPositionUpdateServer_Struct *position_update, Mob *mob, float delta_x, float delta_y, float delta_z, float delta_heading, int anim);
+	void UpdatePath(Mob *who, float x, float y, float z, MobMovementMode mob_movement_mode);
 	void UpdatePathGround(Mob *who, float x, float y, float z, MobMovementMode mode);
-	void UpdatePathUnderwater(Mob *who, float x, float y, float z, MobMovementMode mode);
+	void UpdatePathUnderwater(Mob *who, float x, float y, float z, MobMovementMode movement_mode);
 	void UpdatePathBoat(Mob *who, float x, float y, float z, MobMovementMode mode);
 	void PushTeleportTo(MobMovementEntry &ent, float x, float y, float z, float heading);
-	void PushMoveTo(MobMovementEntry &ent, float x, float y, float z, MobMovementMode mode);
-	void PushSwimTo(MobMovementEntry &ent, float x, float y, float z, MobMovementMode mode);
-	void PushRotateTo(MobMovementEntry &ent, Mob *who, float to, MobMovementMode mode);
-	void PushStopMoving(MobMovementEntry &ent);
-	void PushEvadeCombat(MobMovementEntry &ent);
-	void HandleStuckBehavior(Mob *who, float x, float y, float z, MobMovementMode mode);
+	void PushMoveTo(MobMovementEntry &ent, float x, float y, float z, MobMovementMode mob_movement_mode);
+	void PushSwimTo(MobMovementEntry &ent, float x, float y, float z, MobMovementMode mob_movement_mode);
+	void PushRotateTo(MobMovementEntry &ent, Mob *who, float to, MobMovementMode mob_movement_mode);
+	void PushStopMoving(MobMovementEntry &mob_movement_entry);
+	void PushEvadeCombat(MobMovementEntry &mob_movement_entry);
+	void HandleStuckBehavior(Mob *who, float x, float y, float z, MobMovementMode mob_movement_mode);
 
 	struct Implementation;
 	std::unique_ptr<Implementation> _impl;
diff --git a/zone/net.cpp b/zone/net.cpp
index 6112f0cbd..67616cd04 100644
--- a/zone/net.cpp
+++ b/zone/net.cpp
@@ -514,7 +514,7 @@ int main(int argc, char** argv) {
 		}
 		else {
 			if (worldwasconnected && is_zone_loaded) {
-				entity_list.ChannelMessageFromWorld(0, 0, 6, 0, 0, "WARNING: World server connection lost");
+				entity_list.ChannelMessageFromWorld(0, 0, ChatChannel_Broadcast, 0, 0, 100, "WARNING: World server connection lost");
 				worldwasconnected = false;
 			}
 		}
diff --git a/zone/npc.cpp b/zone/npc.cpp
index 7c51b4212..bbd0bb6f5 100644
--- a/zone/npc.cpp
+++ b/zone/npc.cpp
@@ -146,33 +146,33 @@ NPC::NPC(const NPCType *npc_type_data, Spawn2 *in_respawn, const glm::vec4 &posi
 		size = GetRaceGenderDefaultHeight(race, gender);
 	}
 
-	taunting     = false;
-	proximity    = nullptr;
-	copper       = 0;
-	silver       = 0;
-	gold         = 0;
-	platinum     = 0;
-	max_dmg      = npc_type_data->max_dmg;
-	min_dmg      = npc_type_data->min_dmg;
-	attack_count = npc_type_data->attack_count;
-	grid         = 0;
-	wp_m         = 0;
-	max_wp       = 0;
-	save_wp      = 0;
-	spawn_group  = 0;
-	swarmInfoPtr = nullptr;
-	spellscale   = npc_type_data->spellscale;
-	healscale    = npc_type_data->healscale;
-	pAggroRange  = npc_type_data->aggroradius;
-	pAssistRange = npc_type_data->assistradius;
-	findable     = npc_type_data->findable;
-	trackable    = npc_type_data->trackable;
-	MR           = npc_type_data->MR;
-	CR           = npc_type_data->CR;
-	DR           = npc_type_data->DR;
-	FR           = npc_type_data->FR;
-	PR           = npc_type_data->PR;
-	Corrup       = npc_type_data->Corrup;
+	taunting       = false;
+	proximity      = nullptr;
+	copper         = 0;
+	silver         = 0;
+	gold           = 0;
+	platinum       = 0;
+	max_dmg        = npc_type_data->max_dmg;
+	min_dmg        = npc_type_data->min_dmg;
+	attack_count   = npc_type_data->attack_count;
+	grid           = 0;
+	wp_m           = 0;
+	max_wp         = 0;
+	save_wp        = 0;
+	spawn_group_id = 0;
+	swarmInfoPtr   = nullptr;
+	spellscale     = npc_type_data->spellscale;
+	healscale      = npc_type_data->healscale;
+	pAggroRange    = npc_type_data->aggroradius;
+	pAssistRange   = npc_type_data->assistradius;
+	findable       = npc_type_data->findable;
+	trackable      = npc_type_data->trackable;
+	MR             = npc_type_data->MR;
+	CR             = npc_type_data->CR;
+	DR             = npc_type_data->DR;
+	FR             = npc_type_data->FR;
+	PR             = npc_type_data->PR;
+	Corrup         = npc_type_data->Corrup;
 	PhR          = npc_type_data->PhR;
 	STR          = npc_type_data->STR;
 	STA          = npc_type_data->STA;
@@ -611,7 +611,7 @@ void NPC::ClearItemList() {
 
 void NPC::QueryLoot(Client* to)
 {
-	to->Message(0, "| # Current Loot (%s) LootTableID: %i", GetName(), GetLoottableID());
+	to->Message(Chat::White, "| # Current Loot (%s) LootTableID: %i", GetName(), GetLoottableID());
 
 	int item_count = 0;
 	for (auto cur  = itemlist.begin(); cur != itemlist.end(); ++cur, ++item_count) {
@@ -639,7 +639,7 @@ void NPC::QueryLoot(Client* to)
 		);
 	}
 
-	to->Message(0, "| %i Platinum %i Gold %i Silver %i Copper", platinum, gold, silver, copper);
+	to->Message(Chat::White, "| %i Platinum %i Gold %i Silver %i Copper", platinum, gold, silver, copper);
 }
 
 void NPC::AddCash(uint16 in_copper, uint16 in_silver, uint16 in_gold, uint16 in_platinum) {
@@ -1190,17 +1190,17 @@ NPC* NPC::SpawnNPC(const char* spawncommand, const glm::vec4& position, Client*
 
 		if (client) {
 			// Notify client of spawn data
-			client->Message(0, "New spawn:");
-			client->Message(0, "Name: %s", npc->name);
-			client->Message(0, "Race: %u", npc->race);
-			client->Message(0, "Level: %u", npc->level);
-			client->Message(0, "Material: %u", npc->texture);
-			client->Message(0, "Current/Max HP: %i", npc->max_hp);
-			client->Message(0, "Gender: %u", npc->gender);
-			client->Message(0, "Class: %u", npc->class_);
-			client->Message(0, "Weapon Item Number: %u/%u", npc->d_melee_texture1, npc->d_melee_texture2);
-			client->Message(0, "MerchantID: %u", npc->MerchantType);
-			client->Message(0, "Bodytype: %u", npc->bodytype);
+			client->Message(Chat::White, "New spawn:");
+			client->Message(Chat::White, "Name: %s", npc->name);
+			client->Message(Chat::White, "Race: %u", npc->race);
+			client->Message(Chat::White, "Level: %u", npc->level);
+			client->Message(Chat::White, "Material: %u", npc->texture);
+			client->Message(Chat::White, "Current/Max HP: %i", npc->max_hp);
+			client->Message(Chat::White, "Gender: %u", npc->gender);
+			client->Message(Chat::White, "Class: %u", npc->class_);
+			client->Message(Chat::White, "Weapon Item Number: %u/%u", npc->d_melee_texture1, npc->d_melee_texture2);
+			client->Message(Chat::White, "MerchantID: %u", npc->MerchantType);
+			client->Message(Chat::White, "Bodytype: %u", npc->bodytype);
 		}
 
 		return npc;
@@ -1270,7 +1270,7 @@ uint32 ZoneDatabase::CreateNewNPCCommand(const char *zone, uint32 zone_version,
 	}
 	uint32 spawngroupid = results.LastInsertedID();
 
-	spawn->SetSp2(spawngroupid);
+	spawn->SetSpawnGroupId(spawngroupid);
 	spawn->SetNPCTypeID(npc_type_id);
 
 	query = StringFormat("INSERT INTO spawn2 (zone, version, x, y, z, respawntime, heading, spawngroupID) "
@@ -1355,7 +1355,7 @@ uint32 ZoneDatabase::DeleteSpawnLeaveInNPCTypeTable(const char *zone, Client *cl
 
 	std::string query = StringFormat("SELECT id, spawngroupID FROM spawn2 WHERE "
 					 "zone='%s' AND spawngroupID=%i",
-					 zone, spawn->GetSp2());
+					 zone, spawn->GetSpawnGroupId());
 	auto results = QueryDatabase(query);
 	if (!results.Success())
 		return 0;
@@ -1396,7 +1396,7 @@ uint32 ZoneDatabase::DeleteSpawnRemoveFromNPCTypeTable(const char *zone, uint32
 
 	std::string query = StringFormat("SELECT id, spawngroupID FROM spawn2 WHERE zone = '%s' "
 					 "AND (version = %u OR version = -1) AND spawngroupID = %i",
-					 zone, zone_version, spawn->GetSp2());
+					 zone, zone_version, spawn->GetSpawnGroupId());
 	auto results = QueryDatabase(query);
 	if (!results.Success())
 		return 0;
@@ -1471,7 +1471,7 @@ uint32 ZoneDatabase::AddNPCTypes(const char *zone, uint32 zone_version, Client *
 	npc_type_id = results.LastInsertedID();
 
 	if (client)
-		client->Message(0, "%s npc_type ID %i created successfully!", numberlessName, npc_type_id);
+		client->Message(Chat::White, "%s npc_type ID %i created successfully!", numberlessName, npc_type_id);
 
 	return 1;
 }
@@ -1577,7 +1577,7 @@ void NPC::PickPocket(Client* thief)
 	//make sure were allowed to target them:
 	int over_level = GetLevel();
 	if(over_level > (thief->GetLevel() + THIEF_PICKPOCKET_OVER)) {
-		thief->Message(13, "You are too inexperienced to pick pocket this target");
+		thief->Message(Chat::Red, "You are too inexperienced to pick pocket this target");
 		thief->SendPickPocketResponse(this, 0, PickPocketFailed);
 		//should we check aggro
 		return;
@@ -1587,7 +1587,7 @@ void NPC::PickPocket(Client* thief)
 		if (zone->CanDoCombat())
 			AddToHateList(thief, 50);
 		Say("Stop thief!");
-		thief->Message(13, "You are noticed trying to steal!");
+		thief->Message(Chat::Red, "You are noticed trying to steal!");
 		thief->SendPickPocketResponse(this, 0, PickPocketFailed);
 		return;
 	}
@@ -1694,7 +1694,7 @@ void NPC::PickPocket(Client* thief)
 		return;
 	}
 
-	thief->Message(0, "This target's pockets are empty");
+	thief->Message(Chat::White, "This target's pockets are empty");
 	thief->SendPickPocketResponse(this, 0, PickPocketFailed);
 }
 
@@ -1744,17 +1744,17 @@ void NPC::Disarm(Client* client, int chance) {
 				SendWearChange(matslot);
 			if ((CastToMob()->GetBodyType() == BT_Humanoid || CastToMob()->GetBodyType() == BT_Summoned) && eslot == EQEmu::invslot::slotPrimary)
 				Say("Ahh! My weapon!");
-			client->Message_StringID(MT_Skills, DISARM_SUCCESS, this->GetCleanName());
+			client->MessageString(Chat::Skills, DISARM_SUCCESS, this->GetCleanName());
 			if (chance != 1000)
 				client->CheckIncreaseSkill(EQEmu::skills::SkillDisarm, nullptr, 4);
 			return;
 		}
-		client->Message_StringID(MT_Skills, DISARM_FAILED);
+		client->MessageString(Chat::Skills, DISARM_FAILED);
 		if (chance != 1000)
 			client->CheckIncreaseSkill(EQEmu::skills::SkillDisarm, nullptr, 2);
 		return;
 	}
-	client->Message_StringID(MT_Skills, DISARM_FAILED);
+	client->MessageString(Chat::Skills, DISARM_FAILED);
 }
 
 void Mob::NPCSpecialAttacks(const char* parse, int permtag, bool reset, bool remove) {
@@ -2592,7 +2592,7 @@ void NPC::DoNPCEmote(uint8 event_, uint16 emoteid)
 		else if(nes->type == 2)
 			this->Shout("%s",nes->text);
 		else if(nes->type == 3)
-			entity_list.MessageClose_StringID(this, true, 200, 10, GENERIC_STRING, nes->text);
+			entity_list.MessageCloseString(this, true, 200, 10, GENERIC_STRING, nes->text);
 		else
 			this->Say("%s",nes->text);
 	}
@@ -2924,3 +2924,15 @@ bool NPC::IsProximitySet()
 
 	return false;
 }
+
+void NPC::SetSimpleRoamBox(float box_size, float move_distance, int move_delay)
+{
+	AI_SetRoambox(
+		(move_distance != 0 ? move_distance : box_size / 2),
+		GetX() + box_size,
+		GetX() - box_size,
+		GetY() + box_size,
+		GetY() - box_size,
+		move_delay
+	);
+}
\ No newline at end of file
diff --git a/zone/npc.h b/zone/npc.h
index ea6b3e460..877c2580a 100644
--- a/zone/npc.h
+++ b/zone/npc.h
@@ -214,13 +214,13 @@ public:
 
 	virtual int32 CalcMaxMana();
 	void SetGrid(int32 grid_){ grid=grid_; }
-	void SetSp2(uint32 sg2){ spawn_group=sg2; }
+	void SetSpawnGroupId(uint32 sg2){ spawn_group_id =sg2; }
 	void SetWaypointMax(uint16 wp_){ wp_m=wp_; }
 	void SetSaveWaypoint(uint16 wp_){ save_wp=wp_; }
 
 	uint16 GetWaypointMax() const { return wp_m; }
 	int32 GetGrid() const { return grid; }
-	uint32 GetSp2() const { return spawn_group; }
+	uint32 GetSpawnGroupId() const { return spawn_group_id; }
 	uint32 GetSpawnPointID() const;
 
 	glm::vec4 const GetSpawnPoint() const { return m_SpawnPoint; }
@@ -453,6 +453,8 @@ public:
 
 	bool IgnoreDespawn() { return ignore_despawn; }
 
+	void SetSimpleRoamBox(float box_size, float move_distance = 0, int move_delay = 0);
+
 	float GetRoamboxMaxX() const;
 	float GetRoamboxMaxY() const;
 	float GetRoamboxMinX() const;
@@ -478,13 +480,13 @@ protected:
 	friend class EntityList;
 	friend class Aura;
 	std::list<struct NPCFaction*> faction_list;
-	uint32	copper;
-	uint32	silver;
-	uint32	gold;
-	uint32	platinum;
-	int32	grid;
-	uint32	spawn_group;
-	uint16	wp_m;
+	uint32                        copper;
+	uint32                        silver;
+	uint32                        gold;
+	uint32                        platinum;
+	int32                         grid;
+	uint32                        spawn_group_id;
+	uint16                        wp_m;
 
 	int32	npc_faction_id;
 	int32	primary_faction;
diff --git a/zone/object.cpp b/zone/object.cpp
index 4306c6642..241d3a3f1 100644
--- a/zone/object.cpp
+++ b/zone/object.cpp
@@ -572,7 +572,7 @@ bool Object::HandleClick(Client* sender, const ClickObject_Struct* click_object)
 
 			if (sender->ClientVersion() >= EQEmu::versions::ClientVersion::RoF) {
 				coa->drop_id = 0xFFFFFFFF;
-				sender->Message(0, "Someone else is using that. Try again later.");
+				sender->Message(Chat::White, "Someone else is using that. Try again later.");
 			}
 		}
 
diff --git a/zone/oldcode.cpp b/zone/oldcode.cpp
index 600e8ad5c..7329c73f3 100644
--- a/zone/oldcode.cpp
+++ b/zone/oldcode.cpp
@@ -1198,7 +1198,7 @@ Message(0, "Disc packet id=%d, %x,%x,%x", disc_in->disc_id, disc_in->unknown3[0]
 		char val1[20]={0};
 		char val2[20]={0};
 		uint32 remain = p_timers.GetRemainingTime(pTimerDisciplineReuse);
-		Message_StringID(0,DISCIPLINE_CANUSEIN,ConvertArray((remain)/60,val1),ConvertArray(remain%60,val2));
+		MessageString(Chat::White,DISCIPLINE_CANUSEIN,ConvertArray((remain)/60,val1),ConvertArray(remain%60,val2));
 		//Message(0,"You can use a new discipline in %i minutes %i seconds.", (disc_timer.GetRemainingTime()/1000)/60,	disc_timer.GetRemainingTime()/1000%60);
 		return;
 	}
@@ -1233,7 +1233,7 @@ Message(0, "Disc packet id=%d, %x,%x,%x", disc_in->disc_id, disc_in->unknown3[0]
 			return;
 		duration = 11;
 		reuse = 60*60;
-		entity_list.MessageClose_StringID(this, false, 100, 0, DISCIPLINE_FEARLESS, GetName());
+		entity_list.MessageCloseString(this, false, 100, 0, DISCIPLINE_FEARLESS, GetName());
 		//entity_list.MessageClose(this, false, 100, 0, "%s becomes fearless!", GetName());
 		break;
 	}
diff --git a/zone/pathfinder_nav_mesh.cpp b/zone/pathfinder_nav_mesh.cpp
index 090afa920..262d7a923 100644
--- a/zone/pathfinder_nav_mesh.cpp
+++ b/zone/pathfinder_nav_mesh.cpp
@@ -355,7 +355,7 @@ void PathfinderNavmesh::DebugCommand(Client *c, const Seperator *sep)
 {
 	if (sep->arg[1][0] == '\0' || !strcasecmp(sep->arg[1], "help"))
 	{
-		c->Message(0, "#path show: Plots a path from the user to their target.");
+		c->Message(Chat::White, "#path show: Plots a path from the user to their target.");
 		return;
 	}
 
diff --git a/zone/pathfinder_waypoint.cpp b/zone/pathfinder_waypoint.cpp
index 58ad5afea..83d924499 100644
--- a/zone/pathfinder_waypoint.cpp
+++ b/zone/pathfinder_waypoint.cpp
@@ -200,9 +200,9 @@ void PathfinderWaypoint::DebugCommand(Client *c, const Seperator *sep)
 {
 	if(sep->arg[1][0] == '\0' || !strcasecmp(sep->arg[1], "help"))
 	{
-		c->Message(0, "Syntax: #path shownodes: Spawns a npc to represent every npc node.");
-		c->Message(0, "#path show: Plots a path from the user to their target.");
-		c->Message(0, "#path info node_id: Gives information about node info (requires shownode target).");
+		c->Message(Chat::White, "Syntax: #path shownodes: Spawns a npc to represent every npc node.");
+		c->Message(Chat::White, "#path show: Plots a path from the user to their target.");
+		c->Message(Chat::White, "#path info node_id: Gives information about node info (requires shownode target).");
 		return;
 	}
 	
@@ -425,11 +425,11 @@ void PathfinderWaypoint::NodeInfo(Client *c)
 		return;
 	}
 
-	c->Message(0, "Pathing node: %i at (%.2f, %.2f, %.2f) with bestz %.2f",
+	c->Message(Chat::White, "Pathing node: %i at (%.2f, %.2f, %.2f) with bestz %.2f",
 		node->id, node->v.x, node->v.y, node->v.z, node->bestz);
 
 	for (auto &edge : node->edges) {
-		c->Message(0, "id: %i, distance: %.2f, door id: %i, is teleport: %i",
+		c->Message(Chat::White, "id: %i, distance: %.2f, door id: %i, is teleport: %i",
 			edge.first,
 			edge.second.distance,
 			edge.second.door_id,
diff --git a/zone/pathing.cpp b/zone/pathing.cpp
index 79b7900d2..e579bd0fe 100644
--- a/zone/pathing.cpp
+++ b/zone/pathing.cpp
@@ -50,7 +50,7 @@ void Client::SendPathPacket(const std::vector<FindPerson_Point> &points) {
 		auto points = EQEmu::any_cast<std::vector<FindPerson_Point>>(result);
 		if (points.size() < 2) {
 			if (Admin() > 10) {
-				Message(MT_System, "Too few points");
+				Message(Chat::System, "Too few points");
 			}
 		
 			EQApplicationPacket outapp(OP_FindPersonReply, 0);
@@ -60,7 +60,7 @@ void Client::SendPathPacket(const std::vector<FindPerson_Point> &points) {
 		
 		if (points.size() > 36) {
 			if (Admin() > 10) {
-				Message(MT_System, "Too many points %u", points.size());
+				Message(Chat::System, "Too many points %u", points.size());
 			}
 		
 			EQApplicationPacket outapp(OP_FindPersonReply, 0);
@@ -69,7 +69,7 @@ void Client::SendPathPacket(const std::vector<FindPerson_Point> &points) {
 		}
 		
 		if (Admin() > 10) {
-			Message(MT_System, "Total points %u", points.size());
+			Message(Chat::System, "Total points %u", points.size());
 		}
 		
 		int len = sizeof(FindPersonResult_Struct) + (points.size() + 1) * sizeof(FindPerson_Point);
diff --git a/zone/perl_client.cpp b/zone/perl_client.cpp
index be1bf2a8e..4aac33267 100644
--- a/zone/perl_client.cpp
+++ b/zone/perl_client.cpp
@@ -174,7 +174,7 @@ XS(XS_Client_Kick) {
 		if (THIS == nullptr)
 			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
-		THIS->Kick();
+		THIS->Kick("Perl Quest");
 	}
 	XSRETURN_EMPTY;
 }
@@ -5562,6 +5562,55 @@ XS(XS_Client_AddAlternateCurrencyValue) {
 	XSRETURN_EMPTY;
 }
 
+XS(XS_Client_SetAlternateCurrencyValue); /* prototype to pass -Wmissing-prototypes */
+XS(XS_Client_SetAlternateCurrencyValue) {
+	dXSARGS;
+	if (items != 3)
+		Perl_croak(aTHX_ "Usage: Client::SetAlternateCurrencyValue(THIS, uint32 currency_id, int32 amount)");
+	{
+		Client *THIS;
+		uint32 currency_id = (uint32) SvUV(ST(1));
+		int32  amount      = (int32) SvUV(ST(2));
+
+		if (sv_derived_from(ST(0), "Client")) {
+			IV tmp = SvIV((SV *) SvRV(ST(0)));
+			THIS = INT2PTR(Client *, tmp);
+		} else
+			Perl_croak(aTHX_ "THIS is not of type Client");
+		if (THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
+
+		THIS->SetAlternateCurrencyValue(currency_id, amount);
+	}
+	XSRETURN_EMPTY;
+}
+
+XS(XS_Client_GetAlternateCurrencyValue); /* prototype to pass -Wmissing-prototypes */
+XS(XS_Client_GetAlternateCurrencyValue) {
+	dXSARGS;
+	if (items != 2)
+		Perl_croak(aTHX_ "Usage: Client::GetAlternateCurrencyValue(THIS, uint32 currency_id)");
+	{
+		Client *THIS;
+		uint32 currency_id = (uint32) SvUV(ST(1));
+		int32  RETVAL 	   = 0;
+		dXSTARG;
+
+		if (sv_derived_from(ST(0), "Client")) {
+			IV tmp = SvIV((SV *) SvRV(ST(0)));
+			THIS = INT2PTR(Client *, tmp);
+		} else
+			Perl_croak(aTHX_ "THIS is not of type Client");
+		if (THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
+
+		RETVAL = THIS->GetAlternateCurrencyValue(currency_id);
+		XSprePUSH;
+		PUSHi((IV) RETVAL);
+	}
+	XSRETURN(1);
+}
+
 XS(XS_Client_SendWebLink); /* prototype to pass -Wmissing-prototypes */
 XS(XS_Client_SendWebLink) {
 	dXSARGS;
@@ -6350,6 +6399,7 @@ XS(boot_Client) {
 	newXSproto(strcpy(buf, "GetAccountFlag"), XS_Client_GetAccountFlag, file, "$$");
 	newXSproto(strcpy(buf, "GetAggroCount"), XS_Client_GetAggroCount, file, "$");
 	newXSproto(strcpy(buf, "GetAllMoney"), XS_Client_GetAllMoney, file, "$");
+	newXSproto(strcpy(buf, "GetAlternateCurrencyValue"), XS_Client_GetAlternateCurrencyValue, file, "$$");
 	newXSproto(strcpy(buf, "GetAnon"), XS_Client_GetAnon, file, "$");
 	newXSproto(strcpy(buf, "GetAugmentAt"), XS_Client_GetAugmentAt, file, "$$$");
 	newXSproto(strcpy(buf, "GetAugmentIDAt"), XS_Client_GetAugmentIDAt, file, "$$$");
@@ -6487,6 +6537,7 @@ XS(boot_Client) {
 	newXSproto(strcpy(buf, "SetAAPoints"), XS_Client_SetAAPoints, file, "$$");
 	newXSproto(strcpy(buf, "SetAATitle"), XS_Client_SetAATitle, file, "$$;$");
 	newXSproto(strcpy(buf, "SetAccountFlag"), XS_Client_SetAccountFlag, file, "$$");
+	newXSproto(strcpy(buf, "SetAlternateCurrencyValue"), XS_Client_SetAlternateCurrencyValue, file, "$$$");
 	newXSproto(strcpy(buf, "SetBaseClass"), XS_Client_SetBaseClass, file, "$$");
 	newXSproto(strcpy(buf, "SetBaseGender"), XS_Client_SetBaseGender, file, "$$");
 	newXSproto(strcpy(buf, "SetBaseRace"), XS_Client_SetBaseRace, file, "$$");
diff --git a/zone/perl_mob.cpp b/zone/perl_mob.cpp
index 5dd4ce5be..9ad3a6e8b 100644
--- a/zone/perl_mob.cpp
+++ b/zone/perl_mob.cpp
@@ -3702,7 +3702,7 @@ XS(XS_Mob_Message_StringID) {
 			distance = (uint32) SvUV(ST(3));
 		}
 
-		THIS->Message_StringID(type, string_id, distance);
+		THIS->MessageString(type, string_id, distance);
 	}
 	XSRETURN_EMPTY;
 }
diff --git a/zone/perl_npc.cpp b/zone/perl_npc.cpp
index 8c68af734..366aad2ec 100644
--- a/zone/perl_npc.cpp
+++ b/zone/perl_npc.cpp
@@ -571,7 +571,7 @@ XS(XS_NPC_SetSp2) {
 		if (THIS == nullptr)
 			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
-		THIS->SetSp2(sg2);
+		THIS->SetSpawnGroupId(sg2);
 	}
 	XSRETURN_EMPTY;
 }
@@ -644,7 +644,7 @@ XS(XS_NPC_GetSp2) {
 		if (THIS == nullptr)
 			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
-		RETVAL = THIS->GetSp2();
+		RETVAL = THIS->GetSpawnGroupId();
 		XSprePUSH;
 		PUSHu((UV) RETVAL);
 	}
@@ -2377,6 +2377,42 @@ XS(XS_NPC_GetCombatState) {
 	XSRETURN(1);
 }
 
+XS(XS_NPC_SetSimpleRoamBox); /* prototype to pass -Wmissing-prototypes */
+XS(XS_NPC_SetSimpleRoamBox) {
+	dXSARGS;
+	if (items < 2)
+		Perl_croak(aTHX_ "Usage: NPC::SetSimpleRoamBox(THIS, box_size, move_distance, move_delay)");
+	{
+		NPC *THIS;
+
+		auto  box_size      = (float) SvNV(ST(1));
+		float move_distance = 0;
+		int   move_delay    = 0;
+
+		if (items >= 3) {
+			move_distance = (float) SvNV(ST(2));
+		}
+
+		if (items >= 4) {
+			move_delay = (int) SvIV(ST(3));
+		}
+
+		if (sv_derived_from(ST(0), "NPC")) {
+			IV tmp = SvIV((SV *) SvRV(ST(0)));
+			THIS = INT2PTR(NPC *, tmp);
+		}
+		else {
+			Perl_croak(aTHX_ "THIS is not of type NPC");
+		}
+		if (THIS == nullptr) {
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
+		}
+
+		THIS->SetSimpleRoamBox(box_size, move_distance, move_delay);
+	}
+	XSRETURN_EMPTY;
+}
+
 #ifdef __cplusplus
 extern "C"
 #endif
@@ -2488,6 +2524,7 @@ XS(boot_NPC) {
 	newXSproto(strcpy(buf, "ChangeLastName"), XS_NPC_ChangeLastName, file, "$:$");
 	newXSproto(strcpy(buf, "ClearLastName"), XS_NPC_ClearLastName, file, "$");
 	newXSproto(strcpy(buf, "GetCombatState"), XS_NPC_GetCombatState, file, "$");
+	newXSproto(strcpy(buf, "SetSimpleRoamBox"), XS_NPC_SetSimpleRoamBox, file, "$$;$$");
 	XSRETURN_YES;
 }
 
diff --git a/zone/pets.cpp b/zone/pets.cpp
index 446fffbc4..98a3a906c 100644
--- a/zone/pets.cpp
+++ b/zone/pets.cpp
@@ -212,7 +212,7 @@ void Mob::MakePoweredPet(uint16 spell_id, const char* pettype, int16 petpower,
 	//lookup our pets table record for this type
 	PetRecord record;
 	if(!database.GetPoweredPetEntry(pettype, act_power, &record)) {
-		Message(13, "Unable to find data for pet %s", pettype);
+		Message(Chat::Red, "Unable to find data for pet %s", pettype);
 		Log(Logs::General, Logs::Error, "Unable to find data for pet %s, check pets table.", pettype);
 		return;
 	}
@@ -220,7 +220,7 @@ void Mob::MakePoweredPet(uint16 spell_id, const char* pettype, int16 petpower,
 	//find the NPC data for the specified NPC type
 	const NPCType *base = database.LoadNPCTypesData(record.npc_type);
 	if(base == nullptr) {
-		Message(13, "Unable to load NPC data for pet %s", pettype);
+		Message(Chat::Red, "Unable to load NPC data for pet %s", pettype);
 		Log(Logs::General, Logs::Error, "Unable to load NPC data for pet %s (NPC ID %d), check pets and npc_types tables.", pettype, record.npc_type);
 		return;
 	}
diff --git a/zone/questmgr.cpp b/zone/questmgr.cpp
index 42cb39503..64e5bd008 100644
--- a/zone/questmgr.cpp
+++ b/zone/questmgr.cpp
@@ -154,30 +154,17 @@ void QuestManager::echo(int colour, const char *str) {
 	entity_list.MessageClose(initiator, false, 200, colour, str);
 }
 
-void QuestManager::say(const char *str) {
+void QuestManager::say(const char *str, Journal::Options &opts) {
 	QuestManagerCurrentQuestVars();
 	if (!owner) {
 		Log(Logs::General, Logs::Quests, "QuestManager::say called with nullptr owner. Probably syntax error in quest file.");
 		return;
 	}
 	else {
-		if(RuleB(NPC, EnableNPCQuestJournal) && initiator) {
-			owner->QuestJournalledSay(initiator, str);
-		}
-		else {
-			owner->Say(str);
-		}
-	}
-}
-
-void QuestManager::say(const char *str, uint8 language) {
-	QuestManagerCurrentQuestVars();
-	if (!owner) {
-		Log(Logs::General, Logs::Quests, "QuestManager::say called with nullptr owner. Probably syntax error in quest file.");
-		return;
-	}
-	else {
-		entity_list.ChannelMessage(owner, 8, language, str);
+		// if there is no initiator we still want stuff to work (timers, signals, waypoints, etc)
+		if (!RuleB(NPC, EnableNPCQuestJournal) || initiator == nullptr)
+			opts.journal_mode = Journal::Mode::None;
+		owner->QuestJournalledSay(initiator, str, opts);
 	}
 }
 
@@ -247,59 +234,48 @@ Mob* QuestManager::unique_spawn(int npc_type, int grid, int unused, const glm::v
 	return nullptr;
 }
 
-Mob* QuestManager::spawn_from_spawn2(uint32 spawn2_id)
+Mob *QuestManager::spawn_from_spawn2(uint32 spawn2_id)
 {
-	LinkedListIterator<Spawn2*> iterator(zone->spawn2_list);
+	LinkedListIterator<Spawn2 *> iterator(zone->spawn2_list);
 	iterator.Reset();
 	Spawn2 *found_spawn = nullptr;
 
-	while(iterator.MoreElements())
-	{
-		Spawn2* cur = iterator.GetData();
+	while (iterator.MoreElements()) {
+		Spawn2 *cur = iterator.GetData();
 		iterator.Advance();
-		if(cur->GetID() == spawn2_id)
-		{
+		if (cur->GetID() == spawn2_id) {
 			found_spawn = cur;
 			break;
 		}
 	}
 
-	if(found_spawn)
-	{
-		SpawnGroup* sg = zone->spawn_group_list.GetSpawnGroup(found_spawn->SpawnGroupID());
-		if(!sg)
-		{
-			database.LoadSpawnGroupsByID(found_spawn->SpawnGroupID(),&zone->spawn_group_list);
-			sg = zone->spawn_group_list.GetSpawnGroup(found_spawn->SpawnGroupID());
-			if(!sg)
-			{
+	if (found_spawn) {
+		SpawnGroup *spawn_group = zone->spawn_group_list.GetSpawnGroup(found_spawn->SpawnGroupID());
+		if (!spawn_group) {
+			database.LoadSpawnGroupsByID(found_spawn->SpawnGroupID(), &zone->spawn_group_list);
+			spawn_group = zone->spawn_group_list.GetSpawnGroup(found_spawn->SpawnGroupID());
+			if (!spawn_group) {
 				return nullptr;
 			}
 		}
-		uint32 npcid = sg->GetNPCType();
-		if(npcid == 0)
-		{
+		uint32 npcid = spawn_group->GetNPCType();
+		if (npcid == 0) {
 			return nullptr;
 		}
 
-		const NPCType* tmp = database.LoadNPCTypesData(npcid);
-		if(!tmp)
-		{
+		const NPCType *tmp = database.LoadNPCTypesData(npcid);
+		if (!tmp) {
 			return nullptr;
 		}
 
-		if(tmp->unique_spawn_by_name)
-		{
-			if(!entity_list.LimitCheckName(tmp->name))
-			{
+		if (tmp->unique_spawn_by_name) {
+			if (!entity_list.LimitCheckName(tmp->name)) {
 				return nullptr;
 			}
 		}
 
-		if(tmp->spawn_limit > 0)
-		{
-			if(!entity_list.LimitCheckType(npcid, tmp->spawn_limit))
-			{
+		if (tmp->spawn_limit > 0) {
+			if (!entity_list.LimitCheckType(npcid, tmp->spawn_limit)) {
 				return nullptr;
 			}
 		}
@@ -307,21 +283,35 @@ Mob* QuestManager::spawn_from_spawn2(uint32 spawn2_id)
 		database.UpdateRespawnTime(spawn2_id, zone->GetInstanceID(), 0);
 		found_spawn->SetCurrentNPCID(npcid);
 
-        auto position = glm::vec4(found_spawn->GetX(), found_spawn->GetY(), found_spawn->GetZ(), found_spawn->GetHeading());
+		auto position = glm::vec4(
+			found_spawn->GetX(),
+			found_spawn->GetY(),
+			found_spawn->GetZ(),
+			found_spawn->GetHeading()
+		);
+
 		auto npc = new NPC(tmp, found_spawn, position, GravityBehavior::Water);
 
 		found_spawn->SetNPCPointer(npc);
 		npc->AddLootTable();
-		if (npc->DropsGlobalLoot())
+		if (npc->DropsGlobalLoot()) {
 			npc->CheckGlobalLootTables();
-		npc->SetSp2(found_spawn->SpawnGroupID());
+		}
+		npc->SetSpawnGroupId(found_spawn->SpawnGroupID());
 		entity_list.AddNPC(npc);
 		entity_list.LimitAddNPC(npc);
 
-		if (sg->roamdist && sg->roambox[0] && sg->roambox[1] && sg->roambox[2] && sg->roambox[3] && sg->delay &&
-			sg->min_delay)
-			npc->AI_SetRoambox(sg->roamdist, sg->roambox[0], sg->roambox[1], sg->roambox[2], sg->roambox[3],
-					   sg->delay, sg->min_delay);
+		if (spawn_group->roamdist > 0) {
+			npc->AI_SetRoambox(
+				spawn_group->roamdist,
+				spawn_group->roambox[0],
+				spawn_group->roambox[1],
+				spawn_group->roambox[2],
+				spawn_group->roambox[3],
+				spawn_group->delay,
+				spawn_group->min_delay
+			);
+		}
 		if (zone->InstantGrids()) {
 			found_spawn->LoadGrid();
 		}
@@ -818,13 +808,13 @@ void QuestManager::changedeity(int diety_id) {
 		if(initiator->IsClient())
 		{
 			initiator->SetDeity(diety_id);
-			initiator->Message(15,"Your Deity has been changed/set to: %i", diety_id);
+			initiator->Message(Chat::Yellow,"Your Deity has been changed/set to: %i", diety_id);
 			initiator->Save(1);
-			initiator->Kick();
+			initiator->Kick("Deity change by QuestManager");
 		}
 		else
 		{
-			initiator->Message(15,"Error changing Deity");
+			initiator->Message(Chat::Yellow,"Error changing Deity");
 		}
 	}
 }
@@ -940,11 +930,11 @@ void QuestManager::surname(const char *name) {
 		if(initiator->IsClient())
 		{
 			initiator->ChangeLastName(name);
-			initiator->Message(15,"Your surname has been changed/set to: %s", name);
+			initiator->Message(Chat::Yellow,"Your surname has been changed/set to: %s", name);
 		}
 		else
 		{
-			initiator->Message(15,"Error changing/setting surname");
+			initiator->Message(Chat::Yellow,"Error changing/setting surname");
 		}
 	}
 }
@@ -954,7 +944,7 @@ void QuestManager::permaclass(int class_id) {
 	//Makes the client the class specified
 	initiator->SetBaseClass(class_id);
 	initiator->Save(2);
-	initiator->Kick();
+	initiator->Kick("Base class change by QuestManager");
 }
 
 void QuestManager::permarace(int race_id) {
@@ -962,7 +952,7 @@ void QuestManager::permarace(int race_id) {
 	//Makes the client the race specified
 	initiator->SetBaseRace(race_id);
 	initiator->Save(2);
-	initiator->Kick();
+	initiator->Kick("Base race change by QuestManager");
 }
 
 void QuestManager::permagender(int gender_id) {
@@ -970,7 +960,7 @@ void QuestManager::permagender(int gender_id) {
 	//Makes the client the gender specified
 	initiator->SetBaseGender(gender_id);
 	initiator->Save(2);
-	initiator->Kick();
+	initiator->Kick("Base gender change by QuestManager");
 }
 
 uint16 QuestManager::scribespells(uint8 max_level, uint8 min_level) {
@@ -997,11 +987,11 @@ uint16 QuestManager::scribespells(uint8 max_level, uint8 min_level) {
 			break;
 		}
 		if (spell_id < 0 || spell_id >= SPDAT_RECORDS) {
-			initiator->Message(13, "FATAL ERROR: Spell id out-of-range (id: %i, min: 0, max: %i)", spell_id, SPDAT_RECORDS);
+			initiator->Message(Chat::Red, "FATAL ERROR: Spell id out-of-range (id: %i, min: 0, max: %i)", spell_id, SPDAT_RECORDS);
 			return count;
 		}
 		if (book_slot < 0 || book_slot >= EQEmu::spells::SPELLBOOK_SIZE) {
-			initiator->Message(13, "FATAL ERROR: Book slot out-of-range (slot: %i, min: 0, max: %i)", book_slot, EQEmu::spells::SPELLBOOK_SIZE);
+			initiator->Message(Chat::Red, "FATAL ERROR: Book slot out-of-range (slot: %i, min: 0, max: %i)", book_slot, EQEmu::spells::SPELLBOOK_SIZE);
 			return count;
 		}
 
@@ -1019,7 +1009,7 @@ uint16 QuestManager::scribespells(uint8 max_level, uint8 min_level) {
 
 			uint16 spell_id_ = (uint16)spell_id;
 			if ((spell_id_ != spell_id) || (spell_id != spell_id_)) {
-				initiator->Message(13, "FATAL ERROR: Type conversion data loss with spell_id (%i != %u)", spell_id, spell_id_);
+				initiator->Message(Chat::Red, "FATAL ERROR: Type conversion data loss with spell_id (%i != %u)", spell_id, spell_id_);
 				return count;
 			}
 
@@ -1070,7 +1060,7 @@ uint16 QuestManager::traindiscs(uint8 max_level, uint8 min_level) {
 
 	for( ; spell_id < SPDAT_RECORDS; ++spell_id) {
 		if (spell_id < 0 || spell_id >= SPDAT_RECORDS) {
-			initiator->Message(13, "FATAL ERROR: Spell id out-of-range (id: %i, min: 0, max: %i)", spell_id, SPDAT_RECORDS);
+			initiator->Message(Chat::Red, "FATAL ERROR: Spell id out-of-range (id: %i, min: 0, max: %i)", spell_id, SPDAT_RECORDS);
 			return count;
 		}
 
@@ -1088,7 +1078,7 @@ uint16 QuestManager::traindiscs(uint8 max_level, uint8 min_level) {
 
 			uint16 spell_id_ = (uint16)spell_id;
 			if ((spell_id_ != spell_id) || (spell_id != spell_id_)) {
-				initiator->Message(13, "FATAL ERROR: Type conversion data loss with spell_id (%i != %u)", spell_id, spell_id_);
+				initiator->Message(Chat::Red, "FATAL ERROR: Type conversion data loss with spell_id (%i != %u)", spell_id, spell_id_);
 				return count;
 			}
 
@@ -1097,7 +1087,7 @@ uint16 QuestManager::traindiscs(uint8 max_level, uint8 min_level) {
 
 			for (uint32 r = 0; r < MAX_PP_DISCIPLINES; r++) {
 				if (initiator->GetPP().disciplines.values[r] == spell_id_) {
-					initiator->Message(13, "You already know this discipline.");
+					initiator->Message(Chat::Red, "You already know this discipline.");
 					break; // continue the 1st loop
 				}
 				else if (initiator->GetPP().disciplines.values[r] == 0) {
@@ -1108,7 +1098,7 @@ uint16 QuestManager::traindiscs(uint8 max_level, uint8 min_level) {
 							initiator->GetPP().disciplines.values[r] = spell_id_;
 							database.SaveCharacterDisc(char_id, r, spell_id_);
 							change = true;
-							initiator->Message(0, "You have learned a new discipline!");
+							initiator->Message(Chat::White, "You have learned a new discipline!");
 							++count; // success counter
 						}
 						break; // continue the 1st loop
@@ -1120,7 +1110,7 @@ uint16 QuestManager::traindiscs(uint8 max_level, uint8 min_level) {
 							initiator->GetPP().disciplines.values[r] = spell_id_;
 							database.SaveCharacterDisc(char_id, r, spell_id_);
 							change = true;
-							initiator->Message(0, "You have learned a new discipline!");
+							initiator->Message(Chat::White, "You have learned a new discipline!");
 							++count;
 						}
 						break;
@@ -1129,7 +1119,7 @@ uint16 QuestManager::traindiscs(uint8 max_level, uint8 min_level) {
 						initiator->GetPP().disciplines.values[r] = spell_id_;
 						database.SaveCharacterDisc(char_id, r, spell_id_);
 						change = true;;
-						initiator->Message(0, "You have learned a new discipline!");
+						initiator->Message(Chat::White, "You have learned a new discipline!");
 						++count; // success counter
 						break; // continue the 1st loop
 					}
@@ -1201,7 +1191,7 @@ void QuestManager::givecash(int copper, int silver, int gold, int platinum) {
 		}
 		tmp += " pieces.";
 		if (initiator)
-			initiator->Message(MT_OOC, tmp.c_str());
+			initiator->Message(Chat::OOC, tmp.c_str());
 	}
 }
 
@@ -1422,7 +1412,7 @@ void QuestManager::itemlink(int item_id) {
 		linker.SetLinkType(EQEmu::saylink::SayLinkItemData);
 		linker.SetItemData(item);
 
-		initiator->Message(0, "%s tells you, %s", owner->GetCleanName(), linker.GenerateLink().c_str());
+		initiator->Message(Chat::White, "%s tells you, %s", owner->GetCleanName(), linker.GenerateLink().c_str());
 	}
 }
 
@@ -2175,18 +2165,18 @@ bool QuestManager::createBot(const char *name, const char *lastname, uint8 level
 	{
 		if(Bot::SpawnedBotCount(initiator->CharacterID()) >= MaxBotCreate)
 		{
-			initiator->Message(15,"You have the maximum number of bots allowed.");
+			initiator->Message(Chat::Yellow,"You have the maximum number of bots allowed.");
 			return false;
 		}
 
 		std::string test_name = name;
 		bool available_flag = false;
 		if(!database.botdb.QueryNameAvailablity(test_name, available_flag)) {
-			initiator->Message(0, "%s for '%s'", BotDatabase::fail::QueryNameAvailablity(), (char*)name);
+			initiator->Message(Chat::White, "%s for '%s'", BotDatabase::fail::QueryNameAvailablity(), (char*)name);
 			return false;
 		}
 		if (!available_flag) {
-			initiator->Message(0, "The name %s is already being used or is invalid. Please choose a different name.", (char*)name);
+			initiator->Message(Chat::White, "The name %s is already being used or is invalid. Please choose a different name.", (char*)name);
 			return false;
 		}
 
@@ -2195,23 +2185,23 @@ bool QuestManager::createBot(const char *name, const char *lastname, uint8 level
 		if(NewBot)
 		{
 			if(!NewBot->IsValidRaceClassCombo()) {
-				initiator->Message(0, "That Race/Class combination cannot be created.");
+				initiator->Message(Chat::White, "That Race/Class combination cannot be created.");
 				return false;
 			}
 
 			if(!NewBot->IsValidName()) {
-				initiator->Message(0, "%s has invalid characters. You can use only the A-Z, a-z and _ characters in a bot name.", NewBot->GetCleanName());
+				initiator->Message(Chat::White, "%s has invalid characters. You can use only the A-Z, a-z and _ characters in a bot name.", NewBot->GetCleanName());
 				return false;
 			}
 
 			// Now that all validation is complete, we can save our newly created bot
 			if(!NewBot->Save())
 			{
-				initiator->Message(0, "Unable to save %s as a bot.", NewBot->GetCleanName());
+				initiator->Message(Chat::White, "Unable to save %s as a bot.", NewBot->GetCleanName());
 			}
 			else
 			{
-				initiator->Message(0, "%s saved as bot %u.", NewBot->GetCleanName(), NewBot->GetBotID());
+				initiator->Message(Chat::White, "%s saved as bot %u.", NewBot->GetCleanName(), NewBot->GetBotID());
 				return true;
 			}
 		}
@@ -2668,13 +2658,13 @@ uint16 QuestManager::CreateInstance(const char *zone, int16 version, uint32 dura
 		uint16 id = 0;
 		if(!database.GetUnusedInstanceID(id))
 		{
-			initiator->Message(13, "Server was unable to find a free instance id.");
+			initiator->Message(Chat::Red, "Server was unable to find a free instance id.");
 			return 0;
 		}
 
 		if(!database.CreateInstance(id, zone_id, version, duration))
 		{
-			initiator->Message(13, "Server was unable to create a new instance.");
+			initiator->Message(Chat::Red, "Server was unable to create a new instance.");
 			return 0;
 		}
 		return id;
@@ -2787,9 +2777,9 @@ void QuestManager::RemoveFromInstance(uint16 instance_id)
 	if (initiator)
 	{
 		if (database.RemoveClientFromInstance(instance_id, initiator->CharacterID()))
-			initiator->Message(MT_Say, "Removed client from instance.");
+			initiator->Message(Chat::Say, "Removed client from instance.");
 		else
-			initiator->Message(MT_Say, "Failed to remove client from instance.");
+			initiator->Message(Chat::Say, "Failed to remove client from instance.");
 	}
 }
 
@@ -2805,11 +2795,11 @@ void QuestManager::RemoveAllFromInstance(uint16 instance_id)
 		std::list<uint32> charid_list;
 
 		if (database.RemoveClientsFromInstance(instance_id))
-			initiator->Message(MT_Say, "Removed all players from instance.");
+			initiator->Message(Chat::Say, "Removed all players from instance.");
 		else
 		{
 			database.GetCharactersInInstance(instance_id, charid_list);
-			initiator->Message(MT_Say, "Failed to remove %i player(s) from instance.", charid_list.size()); // once the expedition system is in, this message it not relevant
+			initiator->Message(Chat::Say, "Failed to remove %i player(s) from instance.", charid_list.size()); // once the expedition system is in, this message it not relevant
 		}
 	}
 }
diff --git a/zone/questmgr.h b/zone/questmgr.h
index 6517872d8..1b9ea9c4d 100644
--- a/zone/questmgr.h
+++ b/zone/questmgr.h
@@ -62,8 +62,7 @@ public:
 
 	//quest functions
 	void echo(int colour, const char *str);
-	void say(const char *str);
-	void say(const char *str, uint8 language);
+	void say(const char *str, Journal::Options &opts);
 	void me(const char *str);
 	void summonitem(uint32 itemid, int16 charges = -1);
 	void write(const char *file, const char *str);
diff --git a/zone/raids.cpp b/zone/raids.cpp
index 2bbd83064..9b5485f40 100644
--- a/zone/raids.cpp
+++ b/zone/raids.cpp
@@ -446,7 +446,7 @@ uint32 Raid::GetGroup(Client *c)
 	return 0xFFFFFFFF;
 }
 
-void Raid::RaidSay(const char *msg, Client *c)
+void Raid::RaidSay(const char *msg, Client *c, uint8 language, uint8 lang_skill)
 {
 	if(!c)
 		return;
@@ -455,6 +455,8 @@ void Raid::RaidSay(const char *msg, Client *c)
 	ServerRaidMessage_Struct *rga = (ServerRaidMessage_Struct*)pack->pBuffer;
 	rga->rid = GetID();
 	rga->gid = 0xFFFFFFFF;
+	rga->language = language;
+	rga->lang_skill = lang_skill;
 	strn0cpy(rga->from, c->GetName(), 64);
 
 	strcpy(rga->message, msg); // this is safe because we are allocating enough space for the entire msg above
@@ -463,7 +465,7 @@ void Raid::RaidSay(const char *msg, Client *c)
 	safe_delete(pack);
 }
 
-void Raid::RaidGroupSay(const char *msg, Client *c)
+void Raid::RaidGroupSay(const char *msg, Client *c, uint8 language, uint8 lang_skill)
 {
 	if(!c)
 		return;
@@ -477,6 +479,8 @@ void Raid::RaidGroupSay(const char *msg, Client *c)
 	ServerRaidMessage_Struct *rga = (ServerRaidMessage_Struct*)pack->pBuffer;
 	rga->rid = GetID();
 	rga->gid = groupToUse;
+	rga->language = language;
+	rga->lang_skill = lang_skill;
 	strn0cpy(rga->from, c->GetName(), 64);
 
 	strcpy(rga->message, msg); // this is safe because we are allocating enough space for the entire msg above
@@ -809,7 +813,7 @@ void Raid::SplitMoney(uint32 copper, uint32 silver, uint32 gold, uint32 platinum
 		//I could not get MoneyOnCorpse to work, so we use this
 		members[i].member->AddMoneyToPP(cpsplit, spsplit, gpsplit, ppsplit, true);
 
-		members[i].member->Message(2, msg.c_str());
+		members[i].member->Message(Chat::Green, msg.c_str());
 		}
 	}
 }
@@ -1708,12 +1712,12 @@ const char *Raid::GetClientNameByIndex(uint8 index)
 	return members[index].membername;
 }
 
-void Raid::RaidMessage_StringID(Mob* sender, uint32 type, uint32 string_id, const char* message,const char* message2,const char* message3,const char* message4,const char* message5,const char* message6,const char* message7,const char* message8,const char* message9, uint32 distance) {
+void Raid::RaidMessageString(Mob* sender, uint32 type, uint32 string_id, const char* message,const char* message2,const char* message3,const char* message4,const char* message5,const char* message6,const char* message7,const char* message8,const char* message9, uint32 distance) {
 	uint32 i;
 	for (i = 0; i < MAX_RAID_MEMBERS; i++) {
 		if(members[i].member) {
 			if(members[i].member != sender)
-				members[i].member->Message_StringID(type, string_id, message, message2, message3, message4, message5, message6, message7, message8, message9, distance);
+				members[i].member->MessageString(type, string_id, message, message2, message3, message4, message5, message6, message7, message8, message9, distance);
 		}
 	}
 }
@@ -1821,4 +1825,4 @@ void Raid::QueueClients(Mob *sender, const EQApplicationPacket *app, bool ack_re
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/zone/raids.h b/zone/raids.h
index 9ed9bc11c..260ae6c71 100644
--- a/zone/raids.h
+++ b/zone/raids.h
@@ -152,7 +152,7 @@ public:
 
 	//Actual Implementation Stuff
 
-	void	RaidMessage_StringID(Mob* sender, uint32 type, uint32 string_id, const char* message,const char* message2=0,const char* message3=0,const char* message4=0,const char* message5=0,const char* message6=0,const char* message7=0,const char* message8=0,const char* message9=0, uint32 distance = 0);
+	void	RaidMessageString(Mob* sender, uint32 type, uint32 string_id, const char* message,const char* message2=0,const char* message3=0,const char* message4=0,const char* message5=0,const char* message6=0,const char* message7=0,const char* message8=0,const char* message9=0, uint32 distance = 0);
 	void	CastGroupSpell(Mob* caster,uint16 spellid, uint32 gid);
 	void	SplitExp(uint32 exp, Mob* other);
 	uint32	GetTotalRaidDamage(Mob* other);
@@ -177,8 +177,8 @@ public:
 	void	SendHPManaEndPacketsFrom(Mob *mob);
 	void	SendManaPacketFrom(Mob *mob);
 	void	SendEndurancePacketFrom(Mob *mob);
-	void	RaidSay(const char *msg, Client *c);
-	void	RaidGroupSay(const char *msg, Client *c);
+	void	RaidSay(const char *msg, Client *c, uint8 language, uint8 lang_skill);
+	void	RaidGroupSay(const char *msg, Client *c, uint8 language, uint8 lang_skill);
 
 	//Packet Functions
 	void	SendRaidCreate(Client *to);
diff --git a/zone/spawn2.cpp b/zone/spawn2.cpp
index e004faa4a..93c955d4e 100644
--- a/zone/spawn2.cpp
+++ b/zone/spawn2.cpp
@@ -264,7 +264,7 @@ bool Spawn2::Process() {
 		if (npc->DropsGlobalLoot()) {
 			npc->CheckGlobalLootTables();
 		}
-		npc->SetSp2(spawngroup_id_);
+		npc->SetSpawnGroupId(spawngroup_id_);
 		npc->SaveGuardPointAnim(anim);
 		npc->SetAppearance((EmuAppearance) anim);
 		entity_list.AddNPC(npc);
@@ -274,9 +274,7 @@ bool Spawn2::Process() {
 		/**
 		 * Roambox init
 		 */
-		if (spawn_group->roamdist && spawn_group->roambox[0] && spawn_group->roambox[1] && spawn_group->roambox[2] &&
-			spawn_group->roambox[3] && spawn_group->delay && spawn_group->min_delay) {
-
+		if (spawn_group->roamdist > 0) {
 			npc->AI_SetRoambox(
 				spawn_group->roamdist,
 				spawn_group->roambox[0],
@@ -298,7 +296,8 @@ bool Spawn2::Process() {
 				npcid,
 				x,
 				y,
-				z);
+				z
+			);
 
 			LoadGrid();
 		}
diff --git a/zone/spawngroup.cpp b/zone/spawngroup.cpp
index 7cb5cd803..41cd14060 100644
--- a/zone/spawngroup.cpp
+++ b/zone/spawngroup.cpp
@@ -16,8 +16,8 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
+#include <fmt/format.h>
 #include "../common/global_define.h"
-#include "../common/string_util.h"
 #include "../common/types.h"
 
 #include "entity.h"
@@ -26,209 +26,352 @@
 #include "zonedb.h"
 
 extern EntityList entity_list;
-extern Zone* zone;
+extern Zone       *zone;
 
-SpawnEntry::SpawnEntry( uint32 in_NPCType, int in_chance, uint8 in_npc_spawn_limit ) {
-	NPCType = in_NPCType;
-	chance = in_chance;
+SpawnEntry::SpawnEntry(uint32 in_NPCType, int in_chance, uint8 in_npc_spawn_limit)
+{
+	NPCType         = in_NPCType;
+	chance          = in_chance;
 	npc_spawn_limit = in_npc_spawn_limit;
 }
 
-SpawnGroup::SpawnGroup( uint32 in_id, char* name, int in_group_spawn_limit, float dist, float maxx, float minx, float maxy, float miny, int delay_in, int despawn_in, uint32 despawn_timer_in, int min_delay_in ) {
+SpawnGroup::SpawnGroup(
+	uint32 in_id,
+	char *name,
+	int in_group_spawn_limit,
+	float dist,
+	float maxx,
+	float minx,
+	float maxy,
+	float miny,
+	int delay_in,
+	int despawn_in,
+	uint32 despawn_timer_in,
+	int min_delay_in
+)
+{
 	id = in_id;
-	strn0cpy( name_, name, 120);
+	strn0cpy(name_, name, 120);
 	group_spawn_limit = in_group_spawn_limit;
-	roambox[0]=maxx;
-	roambox[1]=minx;
-	roambox[2]=maxy;
-	roambox[3]=miny;
-	roamdist=dist;
-	min_delay=min_delay_in;
-	delay=delay_in;
-	despawn=despawn_in;
-	despawn_timer=despawn_timer_in;
+	roambox[0] = maxx;
+	roambox[1] = minx;
+	roambox[2] = maxy;
+	roambox[3] = miny;
+	roamdist      = dist;
+	min_delay     = min_delay_in;
+	delay         = delay_in;
+	despawn       = despawn_in;
+	despawn_timer = despawn_timer_in;
 }
 
-uint32 SpawnGroup::GetNPCType() {
+uint32 SpawnGroup::GetNPCType()
+{
 #if EQDEBUG >= 10
 	Log(Logs::General, Logs::None, "SpawnGroup[%08x]::GetNPCType()", (uint32) this);
 #endif
-	int npcType = 0;
+	int npcType     = 0;
 	int totalchance = 0;
 
-	if(!entity_list.LimitCheckGroup(id, group_spawn_limit))
-		return(0);
+	if (!entity_list.LimitCheckGroup(id, group_spawn_limit)) {
+		return (0);
+	}
 
-	std::list<SpawnEntry*>::iterator cur,end;
-	std::list<SpawnEntry*> possible;
+	std::list<SpawnEntry *>::iterator cur, end;
+	std::list<SpawnEntry *>           possible;
 	cur = list_.begin();
 	end = list_.end();
-	for(; cur != end; ++cur) {
+	for (; cur != end; ++cur) {
 		SpawnEntry *se = *cur;
 
-		if(!entity_list.LimitCheckType(se->NPCType, se->npc_spawn_limit))
+		if (!entity_list.LimitCheckType(se->NPCType, se->npc_spawn_limit)) {
 			continue;
+		}
 
 		totalchance += se->chance;
 		possible.push_back(se);
 	}
-	if(totalchance == 0)
+	if (totalchance == 0) {
 		return 0;
+	}
 
 
 	int32 roll = 0;
-	roll = zone->random.Int(0, totalchance-1);
+	roll = zone->random.Int(0, totalchance - 1);
 
 	cur = possible.begin();
 	end = possible.end();
-	for(; cur != end; ++cur) {
+	for (; cur != end; ++cur) {
 		SpawnEntry *se = *cur;
 		if (roll < se->chance) {
 			npcType = se->NPCType;
 			break;
-		} else {
+		}
+		else {
 			roll -= se->chance;
 		}
 	}
 	return npcType;
 }
 
-void SpawnGroup::AddSpawnEntry( SpawnEntry* newEntry ) {
-	list_.push_back( newEntry );
+void SpawnGroup::AddSpawnEntry(SpawnEntry *newEntry)
+{
+	list_.push_back(newEntry);
 }
 
-SpawnGroup::~SpawnGroup() {
-	std::list<SpawnEntry*>::iterator cur,end;
+SpawnGroup::~SpawnGroup()
+{
+	std::list<SpawnEntry *>::iterator cur, end;
 	cur = list_.begin();
 	end = list_.end();
-	for(; cur != end; ++cur) {
-		SpawnEntry* tmp = *cur;
+	for (; cur != end; ++cur) {
+		SpawnEntry *tmp = *cur;
 		safe_delete(tmp);
 	}
 	list_.clear();
 }
 
-SpawnGroupList::~SpawnGroupList() {
-	std::map<uint32, SpawnGroup*>::iterator cur,end;
-	cur = groups.begin();
-	end = groups.end();
-	for(; cur != end; ++cur) {
-		SpawnGroup* tmp = cur->second;
+SpawnGroupList::~SpawnGroupList()
+{
+	std::map<uint32, SpawnGroup *>::iterator cur, end;
+	cur = m_spawn_groups.begin();
+	end = m_spawn_groups.end();
+	for (; cur != end; ++cur) {
+		SpawnGroup *tmp = cur->second;
 		safe_delete(tmp);
 	}
-	groups.clear();
+	m_spawn_groups.clear();
 }
 
-void SpawnGroupList::AddSpawnGroup(SpawnGroup* newGroup) {
-	if(newGroup == nullptr)
+void SpawnGroupList::AddSpawnGroup(SpawnGroup *new_group)
+{
+	if (new_group == nullptr) {
 		return;
-	groups[newGroup->id] = newGroup;
+	}
+
+	m_spawn_groups[new_group->id] = new_group;
 }
 
-SpawnGroup* SpawnGroupList::GetSpawnGroup(uint32 in_id) {
-	if(groups.count(in_id) != 1)
+SpawnGroup *SpawnGroupList::GetSpawnGroup(uint32 in_id)
+{
+	if (m_spawn_groups.count(in_id) != 1) {
 		return nullptr;
-	return(groups[in_id]);
+	}
+
+	return (m_spawn_groups[in_id]);
 }
 
-bool SpawnGroupList::RemoveSpawnGroup(uint32 in_id) {
-	if(groups.count(in_id) != 1)
-		return(false);
+bool SpawnGroupList::RemoveSpawnGroup(uint32 in_id)
+{
+	if (m_spawn_groups.count(in_id) != 1) {
+		return (false);
+	}
 
-	groups.erase(in_id);
-	return(true);
+	m_spawn_groups.erase(in_id);
+
+	return (true);
+}
+
+void SpawnGroupList::ReloadSpawnGroups()
+{
+	ClearSpawnGroups();
+	database.LoadSpawnGroups(zone->GetShortName(), zone->GetInstanceVersion(), &zone->spawn_group_list);
+}
+
+void SpawnGroupList::ClearSpawnGroups()
+{
+	m_spawn_groups.clear();
 }
 
 bool ZoneDatabase::LoadSpawnGroups(const char *zone_name, uint16 version, SpawnGroupList *spawn_group_list)
 {
-	std::string query = StringFormat("SELECT DISTINCT(spawngroupID), spawngroup.name, spawngroup.spawn_limit, "
-					 "spawngroup.dist, spawngroup.max_x, spawngroup.min_x, "
-					 "spawngroup.max_y, spawngroup.min_y, spawngroup.delay, "
-					 "spawngroup.despawn, spawngroup.despawn_timer, spawngroup.mindelay "
-					 "FROM spawn2, spawngroup WHERE spawn2.spawngroupID = spawngroup.ID "
-					 "AND spawn2.version = %u and zone = '%s'",
-					 version, zone_name);
+	std::string query = fmt::format(
+		SQL(
+			SELECT
+			DISTINCT(spawngroupID),
+			spawngroup.name,
+			spawngroup.spawn_limit,
+			spawngroup.dist,
+			spawngroup.max_x,
+			spawngroup.min_x,
+			spawngroup.max_y,
+			spawngroup.min_y,
+			spawngroup.delay,
+			spawngroup.despawn,
+			spawngroup.despawn_timer,
+			spawngroup.mindelay
+				FROM
+				spawn2,
+			spawngroup
+				WHERE
+				spawn2.spawngroupID = spawngroup.ID
+				AND
+				spawn2.version = {} and zone = '{}'
+		),
+		version,
+		zone_name
+	);
+
 	auto results = QueryDatabase(query);
 	if (!results.Success()) {
 		return false;
 	}
 
 	for (auto row = results.begin(); row != results.end(); ++row) {
-		auto newSpawnGroup = new SpawnGroup(atoi(row[0]), row[1], atoi(row[2]), atof(row[3]), atof(row[4]),
-						    atof(row[5]), atof(row[6]), atof(row[7]), atoi(row[8]),
-						    atoi(row[9]), atoi(row[10]), atoi(row[11]));
-		spawn_group_list->AddSpawnGroup(newSpawnGroup);
+		auto new_spawn_group = new SpawnGroup(
+			atoi(row[0]),
+			row[1],
+			atoi(row[2]),
+			atof(row[3]),
+			atof(row[4]),
+			atof(row[5]),
+			atof(row[6]),
+			atof(row[7]),
+			atoi(row[8]),
+			atoi(row[9]),
+			atoi(row[10]),
+			atoi(row[11])
+		);
+
+		spawn_group_list->AddSpawnGroup(new_spawn_group);
 	}
 
-	query = StringFormat("SELECT DISTINCT spawnentry.spawngroupID, npcid, chance, "
-			     "npc_types.spawn_limit AS sl "
-			     "FROM spawnentry, spawn2, npc_types "
-			     "WHERE spawnentry.npcID=npc_types.id "
-			     "AND spawnentry.spawngroupID = spawn2.spawngroupID "
-			     "AND zone = '%s'",
-			     zone_name);
+	query = fmt::format(
+		SQL(
+			SELECT
+				DISTINCT
+			spawnentry.spawngroupID,
+			npcid,
+			chance,
+			npc_types.spawn_limit
+				AS sl
+				FROM
+				spawnentry,
+			spawn2,
+			npc_types
+				WHERE
+				spawnentry.npcID = npc_types.id
+				AND
+				spawnentry.spawngroupID = spawn2.spawngroupID
+				AND
+				zone = '{}'),
+		zone_name
+	);
+
 	results = QueryDatabase(query);
 	if (!results.Success()) {
-		Log(Logs::General, Logs::Error, "Error2 in PopulateZoneLists query '%'", query.c_str());
 		return false;
 	}
 
 	for (auto row = results.begin(); row != results.end(); ++row) {
-		auto newSpawnEntry = new SpawnEntry(atoi(row[1]), atoi(row[2]), row[3] ? atoi(row[3]) : 0);
-		SpawnGroup *sg = spawn_group_list->GetSpawnGroup(atoi(row[0]));
+		auto new_spawn_entry = new SpawnEntry(
+			atoi(row[1]),
+			atoi(row[2]),
+			(row[3] ? atoi(row[3]) : 0)
+		);
 
-		if (!sg) {
-			safe_delete(newSpawnEntry);
+		SpawnGroup *spawn_group = spawn_group_list->GetSpawnGroup(atoi(row[0]));
+
+		if (!spawn_group) {
+			safe_delete(new_spawn_entry);
 			continue;
 		}
 
-		sg->AddSpawnEntry(newSpawnEntry);
+		spawn_group->AddSpawnEntry(new_spawn_entry);
 	}
 
 	return true;
 }
 
-bool ZoneDatabase::LoadSpawnGroupsByID(int spawngroupid, SpawnGroupList *spawn_group_list)
+/**
+ * @param spawn_group_id
+ * @param spawn_group_list
+ * @return
+ */
+bool ZoneDatabase::LoadSpawnGroupsByID(int spawn_group_id, SpawnGroupList *spawn_group_list)
 {
-	std::string query = StringFormat("SELECT DISTINCT(spawngroup.id), spawngroup.name, spawngroup.spawn_limit, "
-					 "spawngroup.dist, spawngroup.max_x, spawngroup.min_x, "
-					 "spawngroup.max_y, spawngroup.min_y, spawngroup.delay, "
-					 "spawngroup.despawn, spawngroup.despawn_timer, spawngroup.mindelay "
-					 "FROM spawngroup WHERE spawngroup.ID = '%i'",
-					 spawngroupid);
+	std::string query = fmt::format(
+		SQL(
+			SELECT DISTINCT
+			(spawngroup.id),
+			spawngroup.name,
+			spawngroup.spawn_limit,
+			spawngroup.dist,
+			spawngroup.max_x,
+			spawngroup.min_x,
+			spawngroup.max_y,
+			spawngroup.min_y,
+			spawngroup.delay,
+			spawngroup.despawn,
+			spawngroup.despawn_timer,
+			spawngroup.mindelay
+				FROM
+					spawngroup
+				WHERE
+				spawngroup.ID = '{}'
+		),
+		spawn_group_id
+	);
+
 	auto results = QueryDatabase(query);
 	if (!results.Success()) {
-		Log(Logs::General, Logs::Error, "Error2 in PopulateZoneLists query %s", query.c_str());
 		return false;
 	}
 
 	for (auto row = results.begin(); row != results.end(); ++row) {
-		auto newSpawnGroup = new SpawnGroup(atoi(row[0]), row[1], atoi(row[2]), atof(row[3]), atof(row[4]),
-						    atof(row[5]), atof(row[6]), atof(row[7]), atoi(row[8]),
-						    atoi(row[9]), atoi(row[10]), atoi(row[11]));
-		spawn_group_list->AddSpawnGroup(newSpawnGroup);
+		auto new_spawn_group = new SpawnGroup(
+			atoi(row[0]),
+			row[1],
+			atoi(row[2]),
+			atof(row[3]),
+			atof(row[4]),
+			atof(row[5]),
+			atof(row[6]),
+			atof(row[7]),
+			atoi(row[8]),
+			atoi(row[9]),
+			atoi(row[10]),
+			atoi(row[11])
+		);
+
+		spawn_group_list->AddSpawnGroup(new_spawn_group);
 	}
 
-	query = StringFormat("SELECT DISTINCT(spawnentry.spawngroupID), spawnentry.npcid, "
-			     "spawnentry.chance, spawngroup.spawn_limit FROM spawnentry, spawngroup "
-			     "WHERE spawnentry.spawngroupID = '%i' AND spawngroup.spawn_limit = '0' "
-			     "ORDER BY chance",
-			     spawngroupid);
+	query   = fmt::format(
+		SQL(
+			SELECT DISTINCT
+			(spawnentry.spawngroupID),
+			spawnentry.npcid,
+			spawnentry.chance,
+			spawngroup.spawn_limit
+				FROM
+				spawnentry,
+			spawngroup
+				WHERE
+				spawnentry.spawngroupID = '{}'
+				AND spawngroup.spawn_limit = '0'
+				ORDER BY chance),
+		spawn_group_id
+	);
+
 	results = QueryDatabase(query);
 	if (!results.Success()) {
-		Log(Logs::General, Logs::Error, "Error3 in PopulateZoneLists query '%s'", query.c_str());
 		return false;
 	}
 
 	for (auto row = results.begin(); row != results.end(); ++row) {
-		auto newSpawnEntry = new SpawnEntry(atoi(row[1]), atoi(row[2]), row[3] ? atoi(row[3]) : 0);
-		SpawnGroup *sg = spawn_group_list->GetSpawnGroup(atoi(row[0]));
-		if (!sg) {
-			safe_delete(newSpawnEntry);
+		auto new_spawn_entry = new SpawnEntry(
+			atoi(row[1]),
+			atoi(row[2]),
+			(row[3] ? atoi(row[3]) : 0)
+		);
+
+		SpawnGroup *spawn_group = spawn_group_list->GetSpawnGroup(atoi(row[0]));
+		if (!spawn_group) {
+			safe_delete(new_spawn_entry);
 			continue;
 		}
 
-		sg->AddSpawnEntry(newSpawnEntry);
+		spawn_group->AddSpawnEntry(new_spawn_entry);
 	}
 
 	return true;
diff --git a/zone/spawngroup.h b/zone/spawngroup.h
index b5f6d18cf..4b68a35eb 100644
--- a/zone/spawngroup.h
+++ b/zone/spawngroup.h
@@ -23,50 +23,63 @@
 #include <map>
 #include <list>
 
-class SpawnEntry
-{
+class SpawnEntry {
 public:
-	SpawnEntry(uint32 in_NPCType, int in_chance, uint8 in_npc_spawn_limit );
-	~SpawnEntry() { }
+	SpawnEntry(uint32 in_NPCType, int in_chance, uint8 in_npc_spawn_limit);
+	~SpawnEntry() {}
 	uint32 NPCType;
-	int chance;
+	int    chance;
 
 	//this is a cached value from npc_types, for speed
 	uint8 npc_spawn_limit; //max # of this entry which can be spawned in this zone
 };
 
-class SpawnGroup
-{
+class SpawnGroup {
 public:
-	SpawnGroup(uint32 in_id, char* name, int in_group_spawn_limit, float dist, float maxx, float minx, float maxy, float miny, int delay_in, int despawn_in, uint32 despawn_timer_in, int min_delay_in );
+	SpawnGroup(
+		uint32 in_id,
+		char *name,
+		int in_group_spawn_limit,
+		float dist,
+		float maxx,
+		float minx,
+		float maxy,
+		float miny,
+		int delay_in,
+		int despawn_in,
+		uint32 despawn_timer_in,
+		int min_delay_in
+	);
+
 	~SpawnGroup();
 	uint32 GetNPCType();
-	void AddSpawnEntry( SpawnEntry* newEntry );
+	void AddSpawnEntry(SpawnEntry *newEntry);
 	uint32 id;
-	float roamdist;
-	float roambox[4];
-	int min_delay;
-	int delay;
-	int despawn;
+	float  roamdist;
+	float  roambox[4];
+	int    min_delay;
+	int    delay;
+	int    despawn;
 	uint32 despawn_timer;
 private:
 	char name_[120];
-	std::list<SpawnEntry*> list_;
+	std::list<SpawnEntry *> list_;
 	uint8 group_spawn_limit; //max # of this entry which can be spawned by this group
 };
 
-class SpawnGroupList
-{
+class SpawnGroupList {
 public:
-	SpawnGroupList() { }
+	SpawnGroupList() {}
 	~SpawnGroupList();
 
-	void AddSpawnGroup(SpawnGroup* newGroup);
-	SpawnGroup* GetSpawnGroup(uint32 id);
+	void AddSpawnGroup(SpawnGroup *new_group);
+	SpawnGroup *GetSpawnGroup(uint32 id);
 	bool RemoveSpawnGroup(uint32 in_id);
+	void ClearSpawnGroups();
+	void ReloadSpawnGroups();
 private:
 	//LinkedList<SpawnGroup*> list_;
-	std::map<uint32, SpawnGroup*> groups;
+	std::map<uint32, SpawnGroup *> m_spawn_groups;
 };
 
 #endif
diff --git a/zone/special_attacks.cpp b/zone/special_attacks.cpp
index bcffa4077..d9666efc6 100644
--- a/zone/special_attacks.cpp
+++ b/zone/special_attacks.cpp
@@ -177,7 +177,7 @@ void Mob::DoSpecialAttackDamage(Mob *who, EQEmu::skills::SkillType skill, int32
 				auto fbash = GetFuriousBash(itm->Focus.Effect);
 				hate = hate * (100 + fbash) / 100;
 				if (fbash)
-					Message_StringID(MT_Spells, GLOWS_RED, itm->Name);
+					MessageString(Chat::Spells, GLOWS_RED, itm->Name);
 			}
 		}
 	}
@@ -283,7 +283,7 @@ void Client::OPCombatAbility(const CombatAbility_Struct *ca_atk)
 		return;
 
 	if (!p_timers.Expired(&database, timer, false)) {
-		Message(13, "Ability recovery time not yet met.");
+		Message(Chat::Red, "Ability recovery time not yet met.");
 		return;
 	}
 
@@ -530,7 +530,7 @@ void Mob::TryBackstab(Mob *other, int ReuseTime) {
 	if(IsClient()) {
 		const EQEmu::ItemInstance *wpn = CastToClient()->GetInv().GetItem(EQEmu::invslot::slotPrimary);
 		if (!wpn || (wpn->GetItem()->ItemType != EQEmu::item::ItemType1HPiercing)){
-			Message_StringID(13, BACKSTAB_WEAPON);
+			MessageString(Chat::Red, BACKSTAB_WEAPON);
 			return;
 		}
 	}
@@ -551,7 +551,7 @@ void Mob::TryBackstab(Mob *other, int ReuseTime) {
 
 	if (bIsBehind || bCanFrontalBS || (IsNPC() && CanFacestab())) { // Player is behind other OR can do Frontal Backstab
 		if (bCanFrontalBS && IsClient()) // I don't think there is any message ...
-			CastToClient()->Message(0,"Your fierce attack is executed with such grace, your target did not see it coming!");
+			CastToClient()->Message(Chat::White,"Your fierce attack is executed with such grace, your target did not see it coming!");
 
 		RogueBackstab(other,false,ReuseTime);
 		if (level > 54) {
@@ -720,11 +720,11 @@ void Client::RangedAttack(Mob* other, bool CanDoubleAttack) {
 	float dist = DistanceSquared(m_Position, other->GetPosition());
 	if(dist > range) {
 		Log(Logs::Detail, Logs::Combat, "Ranged attack out of range... client should catch this. (%f > %f).\n", dist, range);
-		Message_StringID(13,TARGET_OUT_OF_RANGE);//Client enforces range and sends the message, this is a backup just incase.
+		MessageString(Chat::Red,TARGET_OUT_OF_RANGE);//Client enforces range and sends the message, this is a backup just incase.
 		return;
 	}
 	else if(dist < (RuleI(Combat, MinRangedAttackDist)*RuleI(Combat, MinRangedAttackDist))){
-		Message_StringID(15,RANGED_TOO_CLOSE);//Client enforces range and sends the message, this is a backup just incase.
+		MessageString(Chat::Yellow,RANGED_TOO_CLOSE);//Client enforces range and sends the message, this is a backup just incase.
 		return;
 	}
 
@@ -1273,11 +1273,11 @@ void Client::ThrowingAttack(Mob* other, bool CanDoubleAttack) { //old was 51
 	float dist = DistanceSquared(m_Position, other->GetPosition());
 	if(dist > range) {
 		Log(Logs::Detail, Logs::Combat, "Throwing attack out of range... client should catch this. (%f > %f).\n", dist, range);
-		Message_StringID(13,TARGET_OUT_OF_RANGE);//Client enforces range and sends the message, this is a backup just incase.
+		MessageString(Chat::Red,TARGET_OUT_OF_RANGE);//Client enforces range and sends the message, this is a backup just incase.
 		return;
 	}
 	else if(dist < (RuleI(Combat, MinRangedAttackDist)*RuleI(Combat, MinRangedAttackDist))){
-		Message_StringID(15,RANGED_TOO_CLOSE);//Client enforces range and sends the message, this is a backup just incase.
+		MessageString(Chat::Yellow,RANGED_TOO_CLOSE);//Client enforces range and sends the message, this is a backup just incase.
 		return;
 	}
 
@@ -1566,7 +1566,7 @@ void NPC::DoClassAttacks(Mob *target) {
 	//general stuff, for all classes....
 	//only gets used when their primary ability get used too
 	if (taunting && HasOwner() && target->IsNPC() && target->GetBodyType() != BT_Undead && taunt_time) {
-		this->GetOwner()->Message_StringID(MT_PetResponse, PET_TAUNTING);
+		this->GetOwner()->MessageString(Chat::PetResponse, PET_TAUNTING);
 		Taunt(target->CastToNPC(), false);
 	}
 
@@ -1898,7 +1898,7 @@ void Mob::Taunt(NPC *who, bool always_succeed, int chance_bonus, bool FromSpell,
 	// Support for how taunt worked pre 2000 on LIVE - Can not taunt NPC over your level.
 	if ((RuleB(Combat, TauntOverLevel) == false) && (level_difference < 0) ||
 	    who->GetSpecialAbility(IMMUNE_TAUNT)) {
-		Message_StringID(MT_SpellFailure, FAILED_TAUNT);
+		MessageString(Chat::SpellFailure, FAILED_TAUNT);
 		return;
 	}
 
@@ -1953,12 +1953,12 @@ void Mob::Taunt(NPC *who, bool always_succeed, int chance_bonus, bool FromSpell,
 			}
 
 			if (who->CanTalk())
-				who->Say_StringID(SUCCESSFUL_TAUNT, GetCleanName());
+				who->SayString(SUCCESSFUL_TAUNT, GetCleanName());
 		} else {
-			Message_StringID(MT_SpellFailure, FAILED_TAUNT);
+			MessageString(Chat::SpellFailure, FAILED_TAUNT);
 		}
 	} else {
-		Message_StringID(MT_SpellFailure, FAILED_TAUNT);
+		MessageString(Chat::SpellFailure, FAILED_TAUNT);
 	}
 
 	if (HasSkillProcs())
@@ -2003,10 +2003,10 @@ void Mob::InstillDoubt(Mob *who) {
 		SpellOnTarget(229, who, false, true, -2000);
 		//is there a success message?
 	} else {
-		Message_StringID(4,NOT_SCARING);
+		MessageString(Chat::LightBlue,NOT_SCARING);
 		//Idea from WR:
 		/* if (target->IsNPC() && zone->random.Int(0,99) < 10 ) {
-			entity_list.MessageClose(target, false, 50, MT_NPCRampage, "%s lashes out in anger!",target->GetName());
+			entity_list.MessageClose(target, false, 50, Chat::NPCRampage, "%s lashes out in anger!",target->GetName());
 			//should we actually do this? and the range is completely made up, unconfirmed
 			entity_list.AEAttack(target, 50);
 		}*/
@@ -2033,8 +2033,9 @@ int Mob::TryHeadShot(Mob *defender, EQEmu::skills::SkillType skillInUse)
 				chance = chance * norm / 100;
 			chance += aabonuses.HeadShot[0] + spellbonuses.HeadShot[0] + itembonuses.HeadShot[0];
 			if (zone->random.Int(1, 1000) <= chance) {
-				entity_list.MessageClose_StringID(this, false, 200, MT_CritMelee, FATAL_BOW_SHOT,
-								  GetName());
+				entity_list.MessageCloseString(
+					this, false, 200, Chat::MeleeCrit, FATAL_BOW_SHOT,
+					GetName());
 				return HeadShot_Dmg;
 			}
 		}
@@ -2078,8 +2079,9 @@ int Mob::TryAssassinate(Mob *defender, EQEmu::skills::SkillType skillInUse)
 
 		if (Assassinate_Dmg && Assassinate_Level && (defender->GetLevel() <= Assassinate_Level)) {
 			if (zone->random.Int(1, 1000) <= chance) {
-				entity_list.MessageClose_StringID(this, false, 200, MT_CritMelee, ASSASSINATES,
-								  GetName());
+				entity_list.MessageCloseString(
+					this, false, 200, Chat::MeleeCrit, ASSASSINATES,
+					GetName());
 				return Assassinate_Dmg;
 			}
 		}
diff --git a/zone/spell_effects.cpp b/zone/spell_effects.cpp
index 57a396119..037f48a65 100644
--- a/zone/spell_effects.cpp
+++ b/zone/spell_effects.cpp
@@ -387,7 +387,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 							TryTriggerOnValueAmount(false, true);
 #ifdef SPELL_EFFECT_SPAM
 						if (caster)
-							caster->Message(0, "You have gained %+i mana!", effect_value);
+							caster->Message(Chat::White, "You have gained %+i mana!", effect_value);
 #endif
 					}
 				}
@@ -471,7 +471,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 					if(zone->random.Roll(RuleI(Spells, SuccorFailChance))) { //2% Fail chance by default
 
 						if(IsClient()) {
-							CastToClient()->Message_StringID(MT_SpellFailure,SUCCOR_FAIL);
+							CastToClient()->MessageString(Chat::SpellFailure,SUCCOR_FAIL);
 						}
 						break;
 					}
@@ -638,11 +638,11 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 								CastToClient()->SummonItem(13073, fcharges);
 							}
 							else{
-								Message(13, "You can only transmute flesh to bone.");
+								Message(Chat::Red, "You can only transmute flesh to bone.");
 							}
 						}
 					else{
-						Message(13, "You can only transmute flesh to bone.");
+						Message(Chat::Red, "You can only transmute flesh to bone.");
 					}
 				}
 				break;
@@ -703,7 +703,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 						(caster->IsNPC() && !RuleB(Spells, NPCIgnoreBaseImmunity))))))
 				{
 					if (caster)
-						caster->Message_StringID(MT_SpellFailure, IMMUNE_STUN);
+						caster->MessageString(Chat::SpellFailure, IMMUNE_STUN);
 				} else {
 					int stun_resist = itembonuses.StunResist+spellbonuses.StunResist;
 					if (IsClient())
@@ -718,7 +718,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 						Stun(effect_value);
 					} else {
 						if (IsClient())
-							Message_StringID(MT_Stun, SHAKE_OFF_STUN);
+							MessageString(Chat::Stun, SHAKE_OFF_STUN);
 
 						Log(Logs::Detail, Logs::Combat, "Stun Resisted. We had %d percent resist chance.", stun_resist);
 					}
@@ -745,19 +745,19 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 				WipeHateList();
 
 				if (IsClient() && caster->IsClient()) {
-					caster->Message(0, "Unable to cast charm on a fellow player.");
+					caster->Message(Chat::White, "Unable to cast charm on a fellow player.");
 					BuffFadeByEffect(SE_Charm);
 					break;
 				} else if(IsCorpse()) {
-					caster->Message(0, "Unable to cast charm on a corpse.");
+					caster->Message(Chat::White, "Unable to cast charm on a corpse.");
 					BuffFadeByEffect(SE_Charm);
 					break;
 				} else if(caster->GetPet() != nullptr && caster->IsClient()) {
-					caster->Message(0, "You cannot charm something when you already have a pet.");
+					caster->Message(Chat::White, "You cannot charm something when you already have a pet.");
 					BuffFadeByEffect(SE_Charm);
 					break;
 				} else if(GetOwner()) {
-					caster->Message(0, "You cannot charm someone else's pet!");
+					caster->Message(Chat::White, "You cannot charm someone else's pet!");
 					BuffFadeByEffect(SE_Charm);
 					break;
 				}
@@ -847,14 +847,14 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 
 						if(ClosestMob)
 						{
-							Message_StringID(MT_Spells, MessageID);
+							MessageString(Chat::Spells, MessageID);
 							SetHeading(CalculateHeadingToTarget(ClosestMob->GetX(), ClosestMob->GetY()));
 							SetTarget(ClosestMob);
 							CastToClient()->SendTargetCommand(ClosestMob->GetID());
 							SentPositionPacket(0.0f, 0.0f, 0.0f, 0.0f, 0, true);
 						}
 						else
-							Message_StringID(clientMessageError, SENSE_NOTHING);
+							MessageString(Chat::Red, SENSE_NOTHING);
 					}
 				}
 				break;
@@ -939,14 +939,14 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 					{
 						if(!zone->CanBind())
 						{
-							Message_StringID(MT_SpellFailure, CANNOT_BIND);
+							MessageString(Chat::SpellFailure, CANNOT_BIND);
 							break;
 						}
 						if(!zone->IsCity())
 						{
 							if(caster != this)
 							{
-								Message_StringID(MT_SpellFailure, CANNOT_BIND);
+								MessageString(Chat::SpellFailure, CANNOT_BIND);
 								break;
 							}
 							else
@@ -1039,7 +1039,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 					if(zone->random.Roll(effect_value))
 						Gate(spells[spell_id].base2[i] - 1);
 					else if (caster)
-						caster->Message_StringID(MT_SpellFailure,GATE_FAIL);
+						caster->MessageString(Chat::SpellFailure,GATE_FAIL);
 				}
 				break;
 			}
@@ -1051,7 +1051,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 #endif
 				if(GetSpecialAbility(UNDISPELLABLE)){
 					if (caster)
-						caster->Message_StringID(MT_SpellFailure, SPELL_NO_EFFECT, spells[spell_id].name);
+						caster->MessageString(Chat::SpellFailure, SPELL_NO_EFFECT, spells[spell_id].name);
 					break;
 				}
 
@@ -1077,7 +1077,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 #endif
 				if(GetSpecialAbility(UNDISPELLABLE)){
 					if (caster)
-						caster->Message_StringID(MT_SpellFailure, SPELL_NO_EFFECT, spells[spell_id].name);
+						caster->MessageString(Chat::SpellFailure, SPELL_NO_EFFECT, spells[spell_id].name);
 					break;
 				}
 
@@ -1103,7 +1103,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 #endif
 				if(GetSpecialAbility(UNDISPELLABLE)){
 					if (caster)
-						caster->Message_StringID(MT_SpellFailure, SPELL_NO_EFFECT, spells[spell_id].name);
+						caster->MessageString(Chat::SpellFailure, SPELL_NO_EFFECT, spells[spell_id].name);
 					break;
 				}
 
@@ -1155,7 +1155,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 				snprintf(effect_desc, _EDLEN, "Summon Item: %s (id %d)", itemname, spell.base[i]);
 #endif
 				if (!item) {
-					Message(13, "Unable to summon item %d. Item not found.", spell.base[i]);
+					Message(Chat::Red, "Unable to summon item %d. Item not found.", spell.base[i]);
 				} else if (IsClient()) {
 					Client *c = CastToClient();
 					if (c->CheckLoreConflict(item)) {
@@ -1194,10 +1194,10 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 
 				if (!SummonedItem || !SummonedItem->IsClassBag()) {
 					if (caster)
-						caster->Message(13, "SE_SummonItemIntoBag but no bag has been summoned!");
+						caster->Message(Chat::Red, "SE_SummonItemIntoBag but no bag has been summoned!");
 				} else if ((slot = SummonedItem->FirstOpenSlot()) == 0xff) {
 					if (caster)
-						caster->Message(13, "SE_SummonItemIntoBag but no room in summoned bag!");
+						caster->Message(Chat::Red, "SE_SummonItemIntoBag but no room in summoned bag!");
 				} else if (IsClient()) {
 					if (CastToClient()->CheckLoreConflict(item)) {
 						CastToClient()->DuplicateLoreMessage(spell.base[i]);
@@ -1235,7 +1235,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 #endif
 				if(GetPet())
 				{
-					Message_StringID(MT_Shout, ONLY_ONE_PET);
+					MessageString(Chat::Shout, ONLY_ONE_PET);
 				}
 				else
 				{
@@ -1516,7 +1516,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 					{
 						WipeHateList();
 					}
-					Message(13, "Your mind fogs. Who are my friends? Who are my enemies?... it was all so clear a moment ago...");
+					Message(Chat::Red, "Your mind fogs. Who are my friends? Who are my enemies?... it was all so clear a moment ago...");
 				}
 				break;
 			}
@@ -1537,7 +1537,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 					&& caster && (!caster->IsNPC() || (caster->IsNPC() && !RuleB(Spells, NPCIgnoreBaseImmunity)))))
 				{
 					if (caster)
-						caster->Message_StringID(MT_Shout, IMMUNE_STUN);
+						caster->MessageString(Chat::Shout, IMMUNE_STUN);
 				}
 				else
 				{
@@ -1627,7 +1627,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 
 					if (zone->random.Int(0, 99) > spells[spell_id].base[i]) {
 						CastToClient()->SetFeigned(false);
-						entity_list.MessageClose_StringID(this, false, 200, 10, STRING_FEIGNFAILED, GetName());
+						entity_list.MessageCloseString(this, false, 200, 10, STRING_FEIGNFAILED, GetName());
 					} else {
 						CastToClient()->SetFeigned(true);
 					}
@@ -1644,12 +1644,12 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 				{
 					if(caster == this)
 					{
-						Message_StringID(MT_Spells,
+						MessageString(Chat::Spells,
 							SENTINEL_TRIG_YOU);
 					}
 					else
 					{
-						caster->Message_StringID(MT_Spells,
+						caster->MessageString(Chat::Spells,
 							SENTINEL_TRIG_OTHER, GetCleanName());
 					}
 				}
@@ -1757,7 +1757,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 					Group* group = entity_list.GetGroupByClient(TargetClient);
 					if(group) {
 						if(!group->IsGroupMember(TargetClient)) {
-							Message(13, "Your target must be a group member for this spell.");
+							Message(Chat::Red, "Your target must be a group member for this spell.");
 							break;
 						}
 					}
@@ -1770,13 +1770,13 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 							if(gid < 11)
 							{
 								if(r->GetGroup(TargetClient->GetName()) != gid) {
-									Message(13, "Your target must be a group member for this spell.");
+									Message(Chat::Red, "Your target must be a group member for this spell.");
 									break;
 								}
 							}
 						} else {
 							if(TargetClient != this->CastToClient()) {
-								Message(13, "Your target must be a group member for this spell.");
+								Message(Chat::Red, "Your target must be a group member for this spell.");
 								break;
 							}
 						}
@@ -1790,26 +1790,26 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 							Corpse *corpse = entity_list.GetCorpseByOwner(TargetClient);
 							if(corpse) {
 								if(TargetClient == this->CastToClient())
-									Message_StringID(4, SUMMONING_CORPSE, TargetClient->CastToMob()->GetCleanName());
+									MessageString(Chat::LightBlue, SUMMONING_CORPSE, TargetClient->CastToMob()->GetCleanName());
 								else
-									Message_StringID(4, SUMMONING_CORPSE_OTHER, TargetClient->CastToMob()->GetCleanName());
+									MessageString(Chat::LightBlue, SUMMONING_CORPSE_OTHER, TargetClient->CastToMob()->GetCleanName());
 
 								corpse->Summon(CastToClient(), true, true);
 							}
 							else {
 								// No corpse found in the zone
-								Message_StringID(4, CORPSE_CANT_SENSE);
+								MessageString(Chat::LightBlue, CORPSE_CANT_SENSE);
 							}
 						}
 						else if (caster) {
 							char level[4];
 							ConvertArray(effect_value, level);
-							caster->Message_StringID(MT_SpellFailure, 
+							caster->MessageString(Chat::SpellFailure,
 								SPELL_LEVEL_REQ, level);
 						}
 					}
 					else {
-						Message_StringID(4, TARGET_NOT_FOUND);
+						MessageString(Chat::LightBlue, TARGET_NOT_FOUND);
 						Log(Logs::General, Logs::Error, "%s attempted to cast spell id %u with spell effect SE_SummonCorpse, but could not cast target into a Client object.", GetCleanName(), spell_id);
 					}
 				}
@@ -1937,7 +1937,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 							continue;
 						if (effect_value >= static_cast<int>(buffs[j].counters)) {
 							if (caster) {
-								caster->Message(MT_Spells,"You have cured your target of %s!",spells[buffs[j].spellid].name);
+								caster->Message(Chat::Spells,"You have cured your target of %s!",spells[buffs[j].spellid].name);
 								caster->CastOnCurer(buffs[j].spellid);
 								CastOnCure(buffs[j].spellid);
 							}
@@ -1971,7 +1971,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 						if (effect_value >= static_cast<int>(buffs[j].counters))
 						{
 							if (caster) {
-								caster->Message(MT_Spells,"You have cured your target of %s!",spells[buffs[j].spellid].name);
+								caster->Message(Chat::Spells,"You have cured your target of %s!",spells[buffs[j].spellid].name);
 								caster->CastOnCurer(buffs[j].spellid);
 								CastOnCure(buffs[j].spellid);
 							}
@@ -2007,7 +2007,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 						if (effect_value >= static_cast<int>(buffs[j].counters))
 						{
 							if (caster) {
-								caster->Message(MT_Spells,"You have cured your target of %s!",spells[buffs[j].spellid].name);
+								caster->Message(Chat::Spells,"You have cured your target of %s!",spells[buffs[j].spellid].name);
 								caster->CastOnCurer(buffs[j].spellid);
 								CastOnCure(buffs[j].spellid);
 							}
@@ -2042,7 +2042,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 							continue;
 						if (effect_value >= static_cast<int>(buffs[j].counters)) {
 							if (caster) {
-								caster->Message(MT_Spells,"You have cured your target of %s!",spells[buffs[j].spellid].name);
+								caster->Message(Chat::Spells,"You have cured your target of %s!",spells[buffs[j].spellid].name);
 								caster->CastOnCurer(buffs[j].spellid);
 								CastOnCure(buffs[j].spellid);
 							}
@@ -2068,7 +2068,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 					if(GetLevel() <= 52)
 						CastToNPC()->Depop(true);
 					else
-						Message(13, "Your target is too high level to be affected by this spell.");
+						Message(Chat::Red, "Your target is too high level to be affected by this spell.");
 				}
 				break;
 			}
@@ -2115,10 +2115,13 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 					CastToClient()->MovePC(zone->GetZoneID(), zone->GetInstanceID(), caster->GetX(),
 							       caster->GetY(), caster->GetZ(), caster->GetHeading(), 2,
 							       SummonPC);
-					Message(15, "You have been summoned!");
-					entity_list.ClearAggro(this);
+					Message(Chat::Yellow, "You have been summoned!");
+					// only for beneficial spells like Call of the Hero
+					// This clear probably isn't actually needed, but need to investigate more
+					if (IsBeneficialSpell(spell_id))
+						entity_list.ClearAggro(this);
 				} else
-					caster->Message(13, "This spell can only be cast on players.");
+					caster->Message(Chat::Red, "This spell can only be cast on players.");
 
 				break;
 			}
@@ -2725,13 +2728,13 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 			case SE_MassGroupBuff:{
 
 				SetMGB(true);
-				Message_StringID(MT_Disciplines, MGB_STRING);
+				MessageString(Chat::Disciplines, MGB_STRING);
 				break;
 			}
 
 			case SE_IllusionOther: {
 				SetProjectIllusion(true);
-				Message(10, "The power of your next illusion spell will flow to your grouped target in your place.");
+				Message(Chat::NPCQuestSay, "The power of your next illusion spell will flow to your grouped target in your place.");
 				break;
 			}
 
@@ -3572,7 +3575,7 @@ void Mob::DoBuffTic(const Buffs_Struct &buff, int slot, Mob *caster)
 				if (IsAIControlled()) {
 					WipeHateList();
 				}
-				Message(13, "Your mind fogs. Who are my friends? Who are my enemies?... it was all so "
+				Message(Chat::Red, "Your mind fogs. Who are my friends? Who are my enemies?... it was all so "
 					    "clear a moment ago...");
 			}
 			break;
@@ -3643,7 +3646,7 @@ void Mob::DoBuffTic(const Buffs_Struct &buff, int slot, Mob *caster)
 		case SE_Invisibility2:
 		case SE_InvisVsUndead2: {
 			if (buff.ticsremaining <= 3 && buff.ticsremaining > 1) {
-				Message_StringID(MT_Spells, INVIS_BEGIN_BREAK);
+				MessageString(Chat::Spells, INVIS_BEGIN_BREAK);
 			}
 			break;
 		}
@@ -4047,7 +4050,7 @@ void Mob::BuffFadeBySlot(int slot, bool iRecalcBonuses)
 		if(p->IsPet())
 			notify = p->GetOwner();
 		if(p) {
-			notify->Message_StringID(MT_WornOff, SPELL_WORN_OFF_OF,
+			notify->MessageString(Chat::SpellWornOff, SPELL_WORN_OFF_OF,
 				spells[buffs[slot].spellid].name, GetCleanName());
 		}
 	}
@@ -5406,7 +5409,7 @@ int16 Client::GetFocusEffect(focusType type, uint16 spell_id)
 			default:
 				break;
 			}
-			Message_StringID(MT_Spells, string_id, UsedItem->Name);
+			MessageString(Chat::Spells, string_id, UsedItem->Name);
 		}
 	}
 
@@ -5814,9 +5817,15 @@ bool Mob::TryDeathSave() {
 				Message(263, "The gods have healed you for %i points of damage.", HealAmt);
 
 				if(spellbonuses.DeathSave[0] == 2)
-					entity_list.MessageClose_StringID(this, false, 200, MT_CritMelee, DIVINE_INTERVENTION, GetCleanName());
+					entity_list.MessageCloseString(
+						this,
+						false,
+						200,
+						Chat::MeleeCrit,
+						DIVINE_INTERVENTION,
+						GetCleanName());
 				else
-					entity_list.MessageClose_StringID(this, false, 200, MT_CritMelee, DEATH_PACT, GetCleanName());
+					entity_list.MessageCloseString(this, false, 200, Chat::MeleeCrit, DEATH_PACT, GetCleanName());
 
 				SendHPUpdate();
 				BuffFadeBySlot(buffSlot);
@@ -5847,9 +5856,15 @@ bool Mob::TryDeathSave() {
 					Message(263, "The gods have healed you for %i points of damage.", HealAmt);
 
 					if(spellbonuses.DeathSave[0] == 2)
-						entity_list.MessageClose_StringID(this, false, 200, MT_CritMelee, DIVINE_INTERVENTION, GetCleanName());
+						entity_list.MessageCloseString(
+							this,
+							false,
+							200,
+							Chat::MeleeCrit,
+							DIVINE_INTERVENTION,
+							GetCleanName());
 					else
-						entity_list.MessageClose_StringID(this, false, 200, MT_CritMelee, DEATH_PACT, GetCleanName());
+						entity_list.MessageCloseString(this, false, 200, Chat::MeleeCrit, DEATH_PACT, GetCleanName());
 
 					SendHPUpdate();
 					BuffFadeBySlot(buffSlot);
@@ -6802,11 +6817,11 @@ void Client::BreakFeignDeathWhenCastOn(bool IsResisted)
 			chance *= 2;
 
 		if(chance && (zone->random.Roll(chance))){
-			Message_StringID(MT_SpellFailure,FD_CAST_ON_NO_BREAK);
+			MessageString(Chat::SpellFailure,FD_CAST_ON_NO_BREAK);
 			return;
 		}
 	
 		SetFeigned(false);
-		Message_StringID(MT_SpellFailure,FD_CAST_ON);
+		MessageString(Chat::SpellFailure,FD_CAST_ON);
 	}
 }
diff --git a/zone/spells.cpp b/zone/spells.cpp
index 1f938500e..86be6facc 100644
--- a/zone/spells.cpp
+++ b/zone/spells.cpp
@@ -180,9 +180,9 @@ bool Mob::CastSpell(uint16 spell_id, uint16 target_id, CastingSlot slot,
 		Log(Logs::Detail, Logs::Spells, "Spell casting canceled: not able to cast now. Valid? %d, casting %d, waiting? %d, spellend? %d, stunned? %d, feared? %d, mezed? %d, silenced? %d, amnesiad? %d",
 			IsValidSpell(spell_id), casting_spell_id, delaytimer, spellend_timer.Enabled(), IsStunned(), IsFeared(), IsMezzed(), IsSilenced(), IsAmnesiad() );
 		if(IsSilenced() && !IsDiscipline(spell_id))
-			Message_StringID(13, SILENCED_STRING);
+			MessageString(Chat::Red, SILENCED_STRING);
 		if(IsAmnesiad() && IsDiscipline(spell_id))
-			Message_StringID(13, MELEE_SILENCE);
+			MessageString(Chat::Red, MELEE_SILENCE);
 		if(IsClient())
 			CastToClient()->SendSpellBarEnable(spell_id);
 		if(casting_spell_id && IsNPC())
@@ -197,7 +197,7 @@ bool Mob::CastSpell(uint16 spell_id, uint16 target_id, CastingSlot slot,
 		int chance = CastToClient()->GetFocusEffect(focusFcMute, spell_id);//Client only
 
 		if (zone->random.Roll(chance)) {
-			Message_StringID(13, SILENCED_STRING);
+			MessageString(Chat::Red, SILENCED_STRING);
 			if(IsClient())
 				CastToClient()->SendSpellBarEnable(spell_id);
 			return(false);
@@ -205,7 +205,7 @@ bool Mob::CastSpell(uint16 spell_id, uint16 target_id, CastingSlot slot,
 	}
 
 	if(IsDetrimentalSpell(spell_id) && !zone->CanDoCombat()){
-		Message_StringID(13, SPELL_WOULDNT_HOLD);
+		MessageString(Chat::Red, SPELL_WOULDNT_HOLD);
 		if(IsClient())
 			CastToClient()->SendSpellBarEnable(spell_id);
 		if(casting_spell_id && IsNPC())
@@ -257,7 +257,7 @@ bool Mob::CastSpell(uint16 spell_id, uint16 target_id, CastingSlot slot,
 					database.SetHackerFlag(CastToClient()->AccountName(), CastToClient()->GetCleanName(), "Clicking equip-only item with an invalid class");
 				}
 				else {
-					Message_StringID(13, MUST_EQUIP_ITEM);
+					MessageString(Chat::Red, MUST_EQUIP_ITEM);
 				}
 				return(false);
 			}
@@ -272,11 +272,11 @@ bool Mob::CastSpell(uint16 spell_id, uint16 target_id, CastingSlot slot,
 					if (CastToClient()->ClientVersion() >= EQEmu::versions::ClientVersion::RoF)
 					{
 						// Line 181 in eqstr_us.txt was changed in RoF+
-						Message(15, "Your race, class, or deity cannot use this item.");
+						Message(Chat::Yellow, "Your race, class, or deity cannot use this item.");
 					}
 					else
 					{
-						Message_StringID(13, CANNOT_USE_ITEM);
+						MessageString(Chat::Red, CANNOT_USE_ITEM);
 					}
 				}
 				return(false);
@@ -289,7 +289,7 @@ bool Mob::CastSpell(uint16 spell_id, uint16 target_id, CastingSlot slot,
 				database.SetHackerFlag(CastToClient()->AccountName(), CastToClient()->GetCleanName(), "Clicking equip-only item without equiping it");
 			}
 			else {
-				Message_StringID(13, MUST_EQUIP_ITEM);
+				MessageString(Chat::Red, MUST_EQUIP_ITEM);
 			}
 			return(false);
 		}
@@ -298,7 +298,8 @@ bool Mob::CastSpell(uint16 spell_id, uint16 target_id, CastingSlot slot,
 	if(IsClient()) {
 		char temp[64];
 		sprintf(temp, "%d", spell_id);
-		parse->EventPlayer(EVENT_CAST_BEGIN, CastToClient(), temp, 0);
+		if (parse->EventPlayer(EVENT_CAST_BEGIN, CastToClient(), temp, 0) != 0)
+			return false;
 	} else if(IsNPC()) {
 		char temp[64];
 		sprintf(temp, "%d", spell_id);
@@ -369,22 +370,24 @@ bool Mob::DoCastSpell(uint16 spell_id, uint16 target_id, CastingSlot slot,
 		Mob::SetMana(GetMana() - use_mana); // We send StopCasting which will update mana
 		StopCasting();
 
-		Message_StringID(MT_SpellFailure, fizzle_msg);
+		MessageString(Chat::SpellFailure, fizzle_msg);
 
-		/* Song Failure Messages */
-		entity_list.FilteredMessageClose_StringID(
-			this, /* Sender */
-			true, /* Skip Sender */
-			RuleI(Range, SpellMessages), 
-			MT_SpellFailure, /* Type: 289 */
-			(IsClient() ? FilterPCSpells : FilterNPCSpells), /* FilterType: 8 or 9 depending on client/npc */
-			(fizzle_msg == MISS_NOTE ? MISSED_NOTE_OTHER : SPELL_FIZZLE_OTHER), 
+		/**
+		 * Song Failure message
+		 */
+		entity_list.FilteredMessageCloseString(
+			this,
+			true,
+			RuleI(Range, SpellMessages),
+			Chat::SpellFailure,
+			(IsClient() ? FilterPCSpells : FilterNPCSpells),
+			(fizzle_msg == MISS_NOTE ? MISSED_NOTE_OTHER : SPELL_FIZZLE_OTHER),
 			/* 
 				MessageFormat: You miss a note, bringing your song to a close! (if missed note)
 				MessageFormat: A missed note brings %1's song to a close!
 				MessageFormat: %1's spell fizzles!
 			*/
-			GetName() /* Message1 */
+			GetName()
 		);
 
 		TryTriggerOnValueAmount(false, true);
@@ -425,7 +428,7 @@ bool Mob::DoCastSpell(uint16 spell_id, uint16 target_id, CastingSlot slot,
 		Log(Logs::Detail, Logs::Spells, "Spell Error: no target. spell=%d", spell_id);
 		if(IsClient()) {
 			//clients produce messages... npcs should not for this case
-			Message_StringID(13, SPELL_NEED_TAR);
+			MessageString(Chat::Red, SPELL_NEED_TAR);
 			InterruptSpell();
 		} else {
 			InterruptSpell(0, 0, 0);	//the 0 args should cause no messages
@@ -458,7 +461,7 @@ bool Mob::DoCastSpell(uint16 spell_id, uint16 target_id, CastingSlot slot,
 				Log(Logs::Detail, Logs::Spells, "Spell Error not enough mana spell=%d mymana=%d cost=%d\n", spell_id, my_curmana, mana_cost);
 				if(IsClient()) {
 					//clients produce messages... npcs should not for this case
-					Message_StringID(13, INSUFFICIENT_MANA);
+					MessageString(Chat::Red, INSUFFICIENT_MANA);
 					InterruptSpell();
 				} else {
 					InterruptSpell(0, 0, 0);	//the 0 args should cause no messages
@@ -515,7 +518,7 @@ bool Mob::DoCastSpell(uint16 spell_id, uint16 target_id, CastingSlot slot,
 	if (IsClient() && slot == CastingSlot::Item && item_slot != 0xFFFFFFFF) {
 		auto item = CastToClient()->GetInv().GetItem(item_slot);
 		if (item && item->GetItem())
-			Message_StringID(MT_Spells, BEGINS_TO_GLOW, item->GetItem()->Name);
+			MessageString(Chat::Spells, BEGINS_TO_GLOW, item->GetItem()->Name);
 	}
 
 	if (!DoCastingChecks()) {
@@ -572,28 +575,28 @@ bool Mob::DoCastingChecks()
 		if (spell_target && spells[spell_id].targettype != ST_Self && !spell_target->CheckSpellLevelRestriction(spell_id)) {
 			Log(Logs::Detail, Logs::Spells, "Spell %d failed: recipient did not meet the level restrictions", spell_id);
 			if (!IsBardSong(spell_id))
-				Message_StringID(MT_SpellFailure, SPELL_TOO_POWERFUL);
+				MessageString(Chat::SpellFailure, SPELL_TOO_POWERFUL);
 			return false;
 		}
 	}
 
 	if (spells[spell_id].zonetype == 1 && !zone->CanCastOutdoor()) {
-		Message_StringID(13, CAST_OUTDOORS);
+		MessageString(Chat::Red, CAST_OUTDOORS);
 		return false;
 	}
 
 	if (IsEffectInSpell(spell_id, SE_Levitate) && !zone->CanLevitate()) {
-		Message(13, "You can't levitate in this zone.");
+		Message(Chat::Red, "You can't levitate in this zone.");
 		return false;
 	}
 
 	if(zone->IsSpellBlocked(spell_id, glm::vec3(GetPosition()))) {
 		const char *msg = zone->GetSpellBlockedMessage(spell_id, glm::vec3(GetPosition()));
 		if (msg) {
-			Message(13, msg);
+			Message(Chat::Red, msg);
 			return false;
 		} else {
-			Message(13, "You can't cast this spell here.");
+			Message(Chat::Red, "You can't cast this spell here.");
 			return false;
 		}
 	}
@@ -677,7 +680,7 @@ void Client::CheckSongSkillIncrease(uint16 spell_id){
 			if (GetRawSkill(EQEmu::skills::SkillPercussionInstruments) > 0)	// no skill increases if not trained in the instrument
 				CheckIncreaseSkill(EQEmu::skills::SkillPercussionInstruments, nullptr, -15);
 			else
-				Message_StringID(13,NO_INSTRUMENT_SKILL);	// tell the client that they need instrument training
+				MessageString(Chat::Red,NO_INSTRUMENT_SKILL);	// tell the client that they need instrument training
 		}
 		else
 			CheckIncreaseSkill(EQEmu::skills::SkillSinging, nullptr, -15);
@@ -687,7 +690,7 @@ void Client::CheckSongSkillIncrease(uint16 spell_id){
 			if (GetRawSkill(EQEmu::skills::SkillStringedInstruments) > 0)
 				CheckIncreaseSkill(EQEmu::skills::SkillStringedInstruments, nullptr, -15);
 			else
-				Message_StringID(13,NO_INSTRUMENT_SKILL);
+				MessageString(Chat::Red,NO_INSTRUMENT_SKILL);
 		}
 		else
 			CheckIncreaseSkill(EQEmu::skills::SkillSinging, nullptr, -15);
@@ -697,7 +700,7 @@ void Client::CheckSongSkillIncrease(uint16 spell_id){
 			if (GetRawSkill(EQEmu::skills::SkillWindInstruments) > 0)
 				CheckIncreaseSkill(EQEmu::skills::SkillWindInstruments, nullptr, -15);
 			else
-				Message_StringID(13,NO_INSTRUMENT_SKILL);
+				MessageString(Chat::Red,NO_INSTRUMENT_SKILL);
 		}
 		else
 			CheckIncreaseSkill(EQEmu::skills::SkillSinging, nullptr, -15);
@@ -707,7 +710,7 @@ void Client::CheckSongSkillIncrease(uint16 spell_id){
 			if (GetRawSkill(EQEmu::skills::SkillBrassInstruments) > 0)
 				CheckIncreaseSkill(EQEmu::skills::SkillBrassInstruments, nullptr, -15);
 			else
-				Message_StringID(13,NO_INSTRUMENT_SKILL);
+				MessageString(Chat::Red,NO_INSTRUMENT_SKILL);
 		}
 		else
 			CheckIncreaseSkill(EQEmu::skills::SkillSinging, nullptr, -15);
@@ -858,7 +861,7 @@ void Mob::InterruptSpell(uint16 message, uint16 color, uint16 spellid)
 	}
 
 	if(casting_spell_aa_id && IsClient()) { //Rest AA Timer on failed cast
-		CastToClient()->Message_StringID(MT_SpellFailure, ABILITY_FAILED);
+		CastToClient()->MessageString(Chat::SpellFailure, ABILITY_FAILED);
 		CastToClient()->ResetAlternateAdvancementTimer(casting_spell_aa_id);
 	}
 
@@ -937,7 +940,7 @@ void Mob::StopCasting()
 	if (IsClient()) {
 		auto c = CastToClient();
 		if (casting_spell_aa_id) { //Rest AA Timer on failed cast
-			c->Message_StringID(MT_SpellFailure, ABILITY_FAILED);
+			c->MessageString(Chat::SpellFailure, ABILITY_FAILED);
 			c->ResetAlternateAdvancementTimer(casting_spell_aa_id);
 		}
 
@@ -966,7 +969,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo
 	if(IsClient() && slot != CastingSlot::Item && slot != CastingSlot::PotionBelt && spells[spell_id].recast_time > 1000) { // 10 is item
 		if(!CastToClient()->GetPTimers().Expired(&database, pTimerSpellStart + spell_id, false)) {
 			//should we issue a message or send them a spell gem packet?
-			Message_StringID(13, SPELL_RECAST);
+			MessageString(Chat::Red, SPELL_RECAST);
 			Log(Logs::Detail, Logs::Spells, "Casting of %d canceled: spell reuse timer not expired", spell_id);
 			StopCasting();
 			return;
@@ -980,7 +983,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo
 		if(itm && itm->GetItem()->RecastDelay > 0)
 		{
 			if(!CastToClient()->GetPTimers().Expired(&database, (pTimerItemStart + itm->GetItem()->RecastType), false)) {
-				Message_StringID(13, SPELL_RECAST);
+				MessageString(Chat::Red, SPELL_RECAST);
 				Log(Logs::Detail, Logs::Spells, "Casting of %d canceled: item spell reuse timer not expired", spell_id);
 				StopCasting();
 				return;
@@ -1002,7 +1005,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo
 		if(delaytimer)
 		{
 			Log(Logs::Detail, Logs::Spells, "Casting of %d canceled: recast too quickly", spell_id);
-			Message(13, "You are unable to focus.");
+			Message(Chat::Red, "You are unable to focus.");
 			InterruptSpell();
 			return;
 		}
@@ -1012,7 +1015,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo
 	if (casting_spell_id != spell_id)
 	{
 		Log(Logs::Detail, Logs::Spells, "Casting of %d canceled: already casting", spell_id);
-		Message_StringID(13,ALREADY_CASTING);
+		MessageString(Chat::Red,ALREADY_CASTING);
 		InterruptSpell();
 		return;
 	}
@@ -1130,8 +1133,14 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo
 			}
 			// if we got here, we regained concentration
 			regain_conc = true;
-			Message_StringID(MT_Spells,REGAIN_AND_CONTINUE);
-			entity_list.MessageClose_StringID(this, true, RuleI(Range, SpellMessages), MT_Spells, OTHER_REGAIN_CAST, this->GetCleanName());
+			MessageString(Chat::Spells, REGAIN_AND_CONTINUE);
+			entity_list.MessageCloseString(
+				this,
+				true,
+				RuleI(Range, SpellMessages),
+				Chat::Spells,
+				OTHER_REGAIN_CAST,
+				this->GetCleanName());
 		}
 	}
 
@@ -1167,7 +1176,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo
 						case 13000:
 							if(itembonuses.percussionMod == 0) {			// check for the appropriate instrument type
 								HasInstrument = false;
-								c->Message_StringID(13, SONG_NEEDS_DRUM);	// send an error message if missing
+								c->MessageString(Chat::Red, SONG_NEEDS_DRUM);	// send an error message if missing
 							}
 							break;
 
@@ -1175,7 +1184,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo
 						case 13001:
 							if(itembonuses.windMod == 0) {
 								HasInstrument = false;
-								c->Message_StringID(13, SONG_NEEDS_WIND);
+								c->MessageString(Chat::Red, SONG_NEEDS_WIND);
 							}
 							break;
 
@@ -1183,7 +1192,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo
 						case 13011:
 							if(itembonuses.stringedMod == 0) {
 								HasInstrument = false;
-								c->Message_StringID(13, SONG_NEEDS_STRINGS);
+								c->MessageString(Chat::Red, SONG_NEEDS_STRINGS);
 							}
 							break;
 
@@ -1191,7 +1200,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo
 						case 13012:
 							if(itembonuses.brassMod == 0) {
 								HasInstrument = false;
-								c->Message_StringID(13, SONG_NEEDS_BRASS);
+								c->MessageString(Chat::Red, SONG_NEEDS_BRASS);
 							}
 							break;
 
@@ -1202,7 +1211,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo
 					if(!HasInstrument) {	// if the instrument is missing, log it and interrupt the song
 						Log(Logs::Detail, Logs::Spells, "Song %d: Canceled. Missing required instrument %d", spell_id, component);
 						if(c->GetGM())
-							c->Message(0, "Your GM status allows you to finish casting even though you're missing a required instrument.");
+							c->Message(Chat::White, "Your GM status allows you to finish casting even though you're missing a required instrument.");
 						else {
 							InterruptSpell();
 							return;
@@ -1219,13 +1228,13 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo
 					{
 						if (!missingreags)
 						{
-							c->Message_StringID(13, MISSING_SPELL_COMP);
+							c->MessageString(Chat::Red, MISSING_SPELL_COMP);
 							missingreags=true;
 						}
 
 						const EQEmu::ItemData *item = database.GetItem(component);
 						if(item) {
-							c->Message_StringID(13, MISSING_SPELL_COMP_ITEM, item->Name);
+							c->MessageString(Chat::Red, MISSING_SPELL_COMP_ITEM, item->Name);
 							Log(Logs::Detail, Logs::Spells, "Spell %d: Canceled. Missing required reagent %s (%d)", spell_id, item->Name, component);
 						}
 						else {
@@ -1239,7 +1248,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo
 
 			if (missingreags) {
 				if(c->GetGM())
-					c->Message(0, "Your GM status allows you to finish casting even though you're missing required components.");
+					c->Message(Chat::White, "Your GM status allows you to finish casting even though you're missing required components.");
 				else {
 					InterruptSpell();
 					return;
@@ -1269,7 +1278,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo
 						}
 						else
 						{	// some kind of error in the code if this happens
-							c->Message(13, "ERROR: reagent item disappeared while processing?");
+							c->Message(Chat::Red, "ERROR: reagent item disappeared while processing?");
 						}
 					}
 				}
@@ -1321,7 +1330,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo
 		if(IsClient() && fromaug && recastdelay > 0)
 		{
 			if(!CastToClient()->GetPTimers().Expired(&database, (pTimerItemStart + recasttype), false)) {
-				Message_StringID(13, SPELL_RECAST);
+				MessageString(Chat::Red, SPELL_RECAST);
 				Log(Logs::Detail, Logs::Spells, "Casting of %d canceled: item spell reuse timer not expired", spell_id);
 				StopCasting();
 				return;
@@ -1352,7 +1361,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo
 		else
 		{
 			Log(Logs::Detail, Logs::Spells, "Item used to cast spell %d was missing from inventory slot %d after casting!", spell_id, inventory_slot);
-			Message(13, "Casting Error: Active casting item not found in inventory slot %i", inventory_slot);
+			Message(Chat::Red, "Casting Error: Active casting item not found in inventory slot %i", inventory_slot);
 			InterruptSpell();
 			return;
 		}
@@ -1499,7 +1508,7 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
 		targetType = ST_Target;
 
 	if (spell_target && !spell_target->PassCastRestriction(true, spells[spell_id].CastRestriction)){
-		Message_StringID(13,SPELL_NEED_TAR);
+		MessageString(Chat::Red,SPELL_NEED_TAR);
 		return false;
 	}
 
@@ -1509,7 +1518,7 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
 			if (spell_target &&
 			    ((spell_target->IsNPC() && spell_target->IsEngaged()) ||
 			     (spell_target->IsClient() && spell_target->CastToClient()->GetAggroCount()))) {
-				Message_StringID(13, SPELL_NO_EFFECT); // Unsure correct string
+				MessageString(Chat::Red, SPELL_NO_EFFECT); // Unsure correct string
 				return false;
 			}
 		}
@@ -1517,9 +1526,9 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
 		else if (IsBeneficialSpell(spell_id)) {
 			if ((IsNPC() && IsEngaged()) || (IsClient() && CastToClient()->GetAggroCount())) {
 				if (IsDiscipline(spell_id))
-					Message_StringID(13, NO_ABILITY_IN_COMBAT);
+					MessageString(Chat::Red, NO_ABILITY_IN_COMBAT);
 				else
-					Message_StringID(13, NO_CAST_IN_COMBAT);
+					MessageString(Chat::Red, NO_CAST_IN_COMBAT);
 
 				return false;
 			}
@@ -1532,7 +1541,7 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
 			if (spell_target &&
 			    ((spell_target->IsNPC() && !spell_target->IsEngaged()) ||
 			     (spell_target->IsClient() && !spell_target->CastToClient()->GetAggroCount()))) {
-				Message_StringID(13, SPELL_NO_EFFECT); // Unsure correct string
+				MessageString(Chat::Red, SPELL_NO_EFFECT); // Unsure correct string
 				return false;
 			}
 		}
@@ -1540,9 +1549,9 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
 		else if (IsBeneficialSpell(spell_id)) {
 			if ((IsNPC() && !IsEngaged()) || (IsClient() && !CastToClient()->GetAggroCount())) {
 				if (IsDiscipline(spell_id))
-					Message_StringID(13, NO_ABILITY_OUT_OF_COMBAT);
+					MessageString(Chat::Red, NO_ABILITY_OUT_OF_COMBAT);
 				else
-					Message_StringID(13, NO_CAST_OUT_OF_COMBAT);
+					MessageString(Chat::Red, NO_CAST_OUT_OF_COMBAT);
 
 				return false;
 			}
@@ -1579,9 +1588,9 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
 				//invalid target
 				Log(Logs::Detail, Logs::Spells, "Spell %d canceled: invalid target of body type %d (undead)", spell_id, mob_body);
 				if(!spell_target)
-					Message_StringID(13,SPELL_NEED_TAR);
+					MessageString(Chat::Red,SPELL_NEED_TAR);
 				else
-					Message_StringID(13,CANNOT_AFFECT_NPC);
+					MessageString(Chat::Red,CANNOT_AFFECT_NPC);
 				return false;
 			}
 			CastAction = SingleTarget;
@@ -1593,7 +1602,7 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
 			{
 				//invalid target
 				Log(Logs::Detail, Logs::Spells, "Spell %d canceled: invalid target of body type %d (summoned)", spell_id, mob_body);
-				Message_StringID(13,SPELL_NEED_TAR);
+				MessageString(Chat::Red,SPELL_NEED_TAR);
 				return false;
 			}
 			CastAction = SingleTarget;
@@ -1608,7 +1617,7 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
 				Log(Logs::Detail, Logs::Spells, "Spell %d canceled: invalid target of body type %d (summoned pet)",
 							spell_id, mob_body);
 
-				Message_StringID(13, SPELL_NEED_TAR);
+				MessageString(Chat::Red, SPELL_NEED_TAR);
 
 				return false;
 			}
@@ -1632,9 +1641,9 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
 				//invalid target
 				Log(Logs::Detail, Logs::Spells, "Spell %d canceled: invalid target of body type %d (want body Type %d)", spell_id, mob_body, target_bt);
 				if(!spell_target)
-					Message_StringID(13,SPELL_NEED_TAR);
+					MessageString(Chat::Red,SPELL_NEED_TAR);
 				else
-					Message_StringID(13,CANNOT_AFFECT_NPC);
+					MessageString(Chat::Red,CANNOT_AFFECT_NPC);
 				return false;
 			}
 			CastAction = SingleTarget;
@@ -1649,7 +1658,7 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
 				if(!spell_target)
 				{
 					Log(Logs::Detail, Logs::Spells, "Spell %d canceled: invalid target (ldon object)", spell_id);
-					Message_StringID(13,SPELL_NEED_TAR);
+					MessageString(Chat::Red,SPELL_NEED_TAR);
 					return false;
 				}
 				else
@@ -1657,14 +1666,14 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
 					if(!spell_target->IsNPC())
 					{
 						Log(Logs::Detail, Logs::Spells, "Spell %d canceled: invalid target (normal)", spell_id);
-						Message_StringID(13,SPELL_NEED_TAR);
+						MessageString(Chat::Red,SPELL_NEED_TAR);
 						return false;
 					}
 
 					if(spell_target->GetClass() != LDON_TREASURE)
 					{
 						Log(Logs::Detail, Logs::Spells, "Spell %d canceled: invalid target (normal)", spell_id);
-						Message_StringID(13,SPELL_NEED_TAR);
+						MessageString(Chat::Red,SPELL_NEED_TAR);
 						return false;
 					}
 				}
@@ -1673,7 +1682,7 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
 			if(!spell_target)
 			{
 				Log(Logs::Detail, Logs::Spells, "Spell %d canceled: invalid target (normal)", spell_id);
-				Message_StringID(13,SPELL_NEED_TAR);
+				MessageString(Chat::Red,SPELL_NEED_TAR);
 				return false;	// can't cast these unless we have a target
 			}
 			CastAction = SingleTarget;
@@ -1689,7 +1698,7 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
 				if(!spell_target) message = SPELL_NEED_TAR;
 				else if(!spell_target->IsCorpse()) message = ONLY_ON_CORPSES;
 				else if(!spell_target->IsPlayerCorpse()) message = CORPSE_NOT_VALID;
-				Message_StringID(13, message);
+				MessageString(Chat::Red, message);
 				return false;
 			}
 			CastAction = SingleTarget;
@@ -1701,7 +1710,7 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
 			if(!spell_target)
 			{
 				Log(Logs::Detail, Logs::Spells, "Spell %d canceled: invalid target (no pet)", spell_id);
-				Message_StringID(13,NO_PET);
+				MessageString(Chat::Red,NO_PET);
 				return false;	// can't cast these unless we have a target
 			}
 			CastAction = SingleTarget;
@@ -1772,7 +1781,7 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
 			if(!spell_target)
 			{
 				Log(Logs::Detail, Logs::Spells, "Spell %d canceled: invalid target (AOE)", spell_id);
-				Message_StringID(13,SPELL_NEED_TAR);
+				MessageString(Chat::Red,SPELL_NEED_TAR);
 				return false;
 			}
 			ae_center = spell_target;
@@ -1797,7 +1806,7 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
 			}
 
 			if (spell_target && spell_target->IsPet() && spells[spell_id].targettype == ST_GroupNoPets){
-				Message_StringID(13,NO_CAST_ON_PET);
+				MessageString(Chat::Red,NO_CAST_ON_PET);
 				return false;
 			}
 
@@ -1809,7 +1818,7 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
 			if(!spell_target)
 			{
 				Log(Logs::Detail, Logs::Spells, "Spell %d canceled: invalid target (Group Required: Single Target)", spell_id);
-				Message_StringID(13,SPELL_NEED_TAR);
+				MessageString(Chat::Red,SPELL_NEED_TAR);
 				return false;
 			}
 
@@ -1926,14 +1935,14 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
 					if(group_id_caster == 0 || group_id_target == 0)
 					{
 						Log(Logs::Detail, Logs::Spells, "Spell %d canceled: Attempted to cast a Single Target Group spell on a ungrouped member.", spell_id);
-						Message_StringID(13, TARGET_GROUP_MEMBER);
+						MessageString(Chat::Red, TARGET_GROUP_MEMBER);
 						return false;
 					}
 
 					if(group_id_caster != group_id_target)
 					{
 						Log(Logs::Detail, Logs::Spells, "Spell %d canceled: Attempted to cast a Single Target Group spell on a ungrouped member.", spell_id);
-						Message_StringID(13, TARGET_GROUP_MEMBER);
+						MessageString(Chat::Red, TARGET_GROUP_MEMBER);
 						return false;
 					}
 
@@ -2027,7 +2036,7 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, CastingSlot slot, ui
 	if( spells[spell_id].zonetype == 1 && !zone->CanCastOutdoor()){
 		if(IsClient()){
 				if(!CastToClient()->GetGM()){
-					Message_StringID(13, CAST_OUTDOORS);
+					MessageString(Chat::Red, CAST_OUTDOORS);
 					return false;
 				}
 			}
@@ -2036,7 +2045,7 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, CastingSlot slot, ui
 	if(IsEffectInSpell(spell_id, SE_Levitate) && !zone->CanLevitate()){
 			if(IsClient()){
 				if(!CastToClient()->GetGM()){
-					Message(13, "You can't levitate in this zone.");
+					Message(Chat::Red, "You can't levitate in this zone.");
 					return false;
 				}
 			}
@@ -2047,11 +2056,11 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, CastingSlot slot, ui
 		if(zone->IsSpellBlocked(spell_id, glm::vec3(GetPosition()))){
 			const char *msg = zone->GetSpellBlockedMessage(spell_id, glm::vec3(GetPosition()));
 			if(msg){
-				Message(13, msg);
+				Message(Chat::Red, msg);
 				return false;
 			}
 			else{
-				Message(13, "You can't cast this spell here.");
+				Message(Chat::Red, "You can't cast this spell here.");
 				return false;
 			}
 
@@ -2109,14 +2118,14 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, CastingSlot slot, ui
 	if(!spells[spell_id].npc_no_los && spell_target && IsDetrimentalSpell(spell_id) && !CheckLosFN(spell_target) && !IsHarmonySpell(spell_id) && spells[spell_id].targettype != ST_TargetOptional)
 	{
 		Log(Logs::Detail, Logs::Spells, "Spell %d: cannot see target %s", spell_id, spell_target->GetName());
-		Message_StringID(13,CANT_SEE_TARGET);
+		MessageString(Chat::Red,CANT_SEE_TARGET);
 		return false;
 	}
 
 	// check to see if target is a caster mob before performing a mana tap
 	if(spell_target && IsManaTapSpell(spell_id)) {
 		if(spell_target->GetCasterClass() == 'N') {
-			Message_StringID(13, TARGET_NO_MANA);
+			MessageString(Chat::Red, TARGET_NO_MANA);
 			return false;
 		}
 	}
@@ -2140,13 +2149,13 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, CastingSlot slot, ui
 		if(dist2 > range2) {
 			//target is out of range.
 			Log(Logs::Detail, Logs::Spells, "Spell %d: Spell target is out of range (squared: %f > %f)", spell_id, dist2, range2);
-			Message_StringID(13, TARGET_OUT_OF_RANGE);
+			MessageString(Chat::Red, TARGET_OUT_OF_RANGE);
 			return(false);
 		}
 		else if (dist2 < min_range2){
 			//target is too close range.
 			Log(Logs::Detail, Logs::Spells, "Spell %d: Spell target is too close (squared: %f < %f)", spell_id, dist2, min_range2);
-			Message_StringID(13, TARGET_TOO_CLOSE);
+			MessageString(Chat::Red, TARGET_TOO_CLOSE);
 			return(false);
 		}
 
@@ -2161,13 +2170,13 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, CastingSlot slot, ui
 		if(dist2 > range2) {
 			//target is out of range.
 			Log(Logs::Detail, Logs::Spells, "Spell %d: Spell target is out of range (squared: %f > %f)", spell_id, dist2, range2);
-			Message_StringID(13, TARGET_OUT_OF_RANGE);
+			MessageString(Chat::Red, TARGET_OUT_OF_RANGE);
 			return(false);
 		}
 		else if (dist2 < min_range2){
 			//target is too close range.
 			Log(Logs::Detail, Logs::Spells, "Spell %d: Spell target is too close (squared: %f < %f)", spell_id, dist2, min_range2);
-			Message_StringID(13, TARGET_TOO_CLOSE);
+			MessageString(Chat::Red, TARGET_TOO_CLOSE);
 			return(false);
 		}
 
@@ -2517,7 +2526,7 @@ bool Mob::ApplyNextBardPulse(uint16 spell_id, Mob *spell_target, CastingSlot slo
 	if(spell_target && IsDetrimentalSpell(spell_id) && !CheckLosFN(spell_target))
 	{
 		Log(Logs::Detail, Logs::Spells, "Bard Song Pulse %d: cannot see target %s", spell_target->GetName());
-		Message_StringID(13, CANT_SEE_TARGET);
+		MessageString(Chat::Red, CANT_SEE_TARGET);
 		return(false);
 	}
 
@@ -2532,7 +2541,7 @@ bool Mob::ApplyNextBardPulse(uint16 spell_id, Mob *spell_target, CastingSlot slo
 		if(dist2 > range2) {
 			//target is out of range.
 			Log(Logs::Detail, Logs::Spells, "Bard Song Pulse %d: Spell target is out of range (squared: %f > %f)", spell_id, dist2, range2);
-			Message_StringID(13, TARGET_OUT_OF_RANGE);
+			MessageString(Chat::Red, TARGET_OUT_OF_RANGE);
 			return(false);
 		}
 	}
@@ -2891,7 +2900,7 @@ int Mob::CheckStackConflict(uint16 spellid1, int caster_level1, uint16 spellid2,
 
 			if (spellbonuses.Screech == 1) {
 				if (effect2 == SE_Screech && sp2.base[i] == -1) {
-					Message_StringID(MT_SpellFailure, SCREECH_BUFF_BLOCK, sp2.name);
+					MessageString(Chat::SpellFailure, SCREECH_BUFF_BLOCK, sp2.name);
 					return -1;
 				}
 			}
@@ -3212,7 +3221,7 @@ int Mob::AddBuff(Mob *caster, uint16 spell_id, int duration, int32 level_overrid
 				Log(Logs::Detail, Logs::Spells, "Adding buff %d failed: stacking prevented by spell %d in slot %d with caster level %d",
 						spell_id, curbuf.spellid, buffslot, curbuf.casterlevel);
 				if (caster && caster->IsClient() && RuleB(Client, UseLiveBlockedMessage)) {
-					caster->Message(13, "Your %s did not take hold on %s. (Blocked by %s.)", spells[spell_id].name, this->GetName(), spells[curbuf.spellid].name);
+					caster->Message(Chat::Red, "Your %s did not take hold on %s. (Blocked by %s.)", spells[spell_id].name, this->GetName(), spells[curbuf.spellid].name);
 				}
 				return -1;
 			}
@@ -3413,7 +3422,7 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob *spelltar, bool reflect, bool use_r
 	if(!spelltar)
 	{
 		Log(Logs::Detail, Logs::Spells, "Unable to apply spell %d without a target", spell_id);
-		Message(13, "SOT: You must have a target for this spell.");
+		Message(Chat::Red, "SOT: You must have a target for this spell.");
 		return false;
 	}
 
@@ -3422,7 +3431,7 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob *spelltar, bool reflect, bool use_r
 
 	if(IsDetrimentalSpell(spell_id) && !IsAttackAllowed(spelltar, true) && !IsResurrectionEffects(spell_id)) {
 		if(!IsClient() || !CastToClient()->GetGM()) {
-			Message_StringID(MT_SpellFailure, SPELL_NO_HOLD);
+			MessageString(Chat::SpellFailure, SPELL_NO_HOLD);
 			return false;
 		}
 	}
@@ -3587,7 +3596,7 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob *spelltar, bool reflect, bool use_r
 	{
 		if(spelltar->invisible)
 		{
-			spelltar->Message_StringID(MT_SpellFailure, ALREADY_INVIS, GetCleanName());
+			spelltar->MessageString(Chat::SpellFailure, ALREADY_INVIS, GetCleanName());
 			safe_delete(action_packet);
 			return false;
 		}
@@ -3597,7 +3606,7 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob *spelltar, bool reflect, bool use_r
 	{
 		if(spelltar->invisible_undead)
 		{
-			spelltar->Message_StringID(MT_SpellFailure, ALREADY_INVIS, GetCleanName());
+			spelltar->MessageString(Chat::SpellFailure, ALREADY_INVIS, GetCleanName());
 			safe_delete(action_packet);
 			return false;
 		}
@@ -3607,7 +3616,7 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob *spelltar, bool reflect, bool use_r
 	{
 		if(spelltar->invisible_animals)
 		{
-			spelltar->Message_StringID(MT_SpellFailure, ALREADY_INVIS, GetCleanName());
+			spelltar->MessageString(Chat::SpellFailure, ALREADY_INVIS, GetCleanName());
 			safe_delete(action_packet);
 			return false;
 		}
@@ -3687,7 +3696,7 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob *spelltar, bool reflect, bool use_r
 						Log(Logs::Detail, Logs::Spells, "Beneficial ae bard song %d can't take hold %s -> %s, IBA? %d", spell_id, GetName(), spelltar->GetName(), IsBeneficialAllowed(spelltar));
 					} else {
 						Log(Logs::Detail, Logs::Spells, "Beneficial spell %d can't take hold %s -> %s, IBA? %d", spell_id, GetName(), spelltar->GetName(), IsBeneficialAllowed(spelltar));
-						Message_StringID(MT_SpellFailure, SPELL_NO_HOLD);
+						MessageString(Chat::SpellFailure, SPELL_NO_HOLD);
 					}
 					safe_delete(action_packet);
 					return false;
@@ -3697,7 +3706,7 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob *spelltar, bool reflect, bool use_r
 		else if	( !IsAttackAllowed(spelltar, true) && !IsResurrectionEffects(spell_id)) // Detrimental spells - PVP check
 		{
 			Log(Logs::Detail, Logs::Spells, "Detrimental spell %d can't take hold %s -> %s", spell_id, GetName(), spelltar->GetName());
-			spelltar->Message_StringID(MT_SpellFailure, YOU_ARE_PROTECTED, GetCleanName());
+			spelltar->MessageString(Chat::SpellFailure, YOU_ARE_PROTECTED, GetCleanName());
 			safe_delete(action_packet);
 			return false;
 		}
@@ -3734,7 +3743,7 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob *spelltar, bool reflect, bool use_r
 				focus = CalcFocusEffect(focusBlockNextSpell, buffs[b].spellid, spell_id);
 				if(focus) {
 					CheckNumHitsRemaining(NumHit::MatchingSpells, b);
-					Message_StringID(MT_SpellFailure, SPELL_WOULDNT_HOLD);
+					MessageString(Chat::SpellFailure, SPELL_WOULDNT_HOLD);
 					safe_delete(action_packet);
 					return false;
 				}
@@ -3783,18 +3792,18 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob *spelltar, bool reflect, bool use_r
 		if (reflect_chance) {
 
 			if (RuleB(Spells, ReflectMessagesClose)) {
-				entity_list.MessageClose_StringID(
+				entity_list.MessageCloseString(
 					this, /* Sender */
 					false, /* Skip Sender */
 					RuleI(Range, SpellMessages), /* Range */
-					MT_Spells, /* Type */
+					Chat::Spells, /* Type */
 					SPELL_REFLECT, /* String ID */
 					GetCleanName(), /* Message 1 */
 					spelltar->GetCleanName() /* Message 2 */
 				);
 			}
 			else {
-				Message_StringID(MT_Spells, SPELL_REFLECT, GetCleanName(), spelltar->GetCleanName());
+				MessageString(Chat::Spells, SPELL_REFLECT, GetCleanName(), spelltar->GetCleanName());
 			}
 
 			CheckNumHitsRemaining(NumHit::ReflectSpell);
@@ -3826,12 +3835,12 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob *spelltar, bool reflect, bool use_r
 				Log(Logs::Detail, Logs::Spells, "Spell %d was completely resisted by %s", spell_id, spelltar->GetName());
 
 				if (spells[spell_id].resisttype == RESIST_PHYSICAL){
-					Message_StringID(MT_SpellFailure, PHYSICAL_RESIST_FAIL,spells[spell_id].name);
-					spelltar->Message_StringID(MT_SpellFailure, YOU_RESIST, spells[spell_id].name);
+					MessageString(Chat::SpellFailure, PHYSICAL_RESIST_FAIL,spells[spell_id].name);
+					spelltar->MessageString(Chat::SpellFailure, YOU_RESIST, spells[spell_id].name);
 				}
 				else {
-					Message_StringID(MT_SpellFailure, TARGET_RESISTED, spells[spell_id].name);
-					spelltar->Message_StringID(MT_SpellFailure, YOU_RESIST, spells[spell_id].name);
+					MessageString(Chat::SpellFailure, TARGET_RESISTED, spells[spell_id].name);
+					spelltar->MessageString(Chat::SpellFailure, YOU_RESIST, spells[spell_id].name);
 				}
 
 				if (spelltar->IsAIControlled()) {
@@ -3896,7 +3905,7 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob *spelltar, bool reflect, bool use_r
 	{
 		Log(Logs::Detail, Logs::Spells, "Spell %d failed: recipient did not meet the level restrictions", spell_id);
 		if(!IsBardSong(spell_id))
-			Message_StringID(MT_SpellFailure, SPELL_TOO_POWERFUL);
+			MessageString(Chat::SpellFailure, SPELL_TOO_POWERFUL);
 		safe_delete(action_packet);
 		return false;
 	}
@@ -3908,7 +3917,7 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob *spelltar, bool reflect, bool use_r
 		// spell. It's most likely a buff that can't stack.
 		Log(Logs::Detail, Logs::Spells, "Spell %d could not apply its effects %s -> %s\n", spell_id, GetName(), spelltar->GetName());
 		if(casting_spell_aa_id)
-			Message_StringID(MT_SpellFailure, SPELL_NO_HOLD);
+			MessageString(Chat::SpellFailure, SPELL_NO_HOLD);
 		safe_delete(action_packet);
 		return false;
 	}
@@ -3988,14 +3997,14 @@ void Corpse::CastRezz(uint16 spellid, Mob* Caster)
 
 	if(IsRezzed()){
 		if(Caster && Caster->IsClient())
-			Caster->Message(13,"This character has already been resurrected.");
+			Caster->Message(Chat::Red,"This character has already been resurrected.");
 
 		return;
 	}
 	/*
 	if(!can_rez) {
 		if(Caster && Caster->IsClient())
-			Caster->Message_StringID(0, CORPSE_TOO_OLD);
+			Caster->MessageString(Chat::White, CORPSE_TOO_OLD);
 		return;
 	}
 	*/
@@ -4223,7 +4232,7 @@ bool Mob::IsImmuneToSpell(uint16 spell_id, Mob *caster)
 	{
 		if(GetSpecialAbility(UNMEZABLE)) {
 			Log(Logs::Detail, Logs::Spells, "We are immune to Mez spells.");
-			caster->Message_StringID(MT_SpellFailure, CANNOT_MEZ);
+			caster->MessageString(Chat::SpellFailure, CANNOT_MEZ);
 			int32 aggro = caster->CheckAggroAmount(spell_id, this);
 			if(aggro > 0) {
 				AddToHateList(caster, aggro);
@@ -4241,7 +4250,7 @@ bool Mob::IsImmuneToSpell(uint16 spell_id, Mob *caster)
 			(!caster->IsNPC() || (caster->IsNPC() && !RuleB(Spells, NPCIgnoreBaseImmunity))))
 		{
 			Log(Logs::Detail, Logs::Spells, "Our level (%d) is higher than the limit of this Mez spell (%d)", GetLevel(), spells[spell_id].max[effect_index]);
-			caster->Message_StringID(MT_SpellFailure, CANNOT_MEZ_WITH_SPELL);
+			caster->MessageString(Chat::SpellFailure, CANNOT_MEZ_WITH_SPELL);
 			AddToHateList(caster, 1,0,true,false,false,spell_id);
 			return true;
 		}
@@ -4251,7 +4260,7 @@ bool Mob::IsImmuneToSpell(uint16 spell_id, Mob *caster)
 	if(GetSpecialAbility(UNSLOWABLE) && IsEffectInSpell(spell_id, SE_AttackSpeed))
 	{
 		Log(Logs::Detail, Logs::Spells, "We are immune to Slow spells.");
-		caster->Message_StringID(CC_Red, IMMUNE_ATKSPEED);
+		caster->MessageString(Chat::Red, IMMUNE_ATKSPEED);
 		int32 aggro = caster->CheckAggroAmount(spell_id, this);
 		if(aggro > 0) {
 			AddToHateList(caster, aggro);
@@ -4267,7 +4276,7 @@ bool Mob::IsImmuneToSpell(uint16 spell_id, Mob *caster)
 		effect_index = GetSpellEffectIndex(spell_id, SE_Fear);
 		if(GetSpecialAbility(UNFEARABLE)) {
 			Log(Logs::Detail, Logs::Spells, "We are immune to Fear spells.");
-			caster->Message_StringID(CC_Red, IMMUNE_FEAR);	// need to verify message type, not in MQ2Cast for easy look up
+			caster->MessageString(Chat::Red, IMMUNE_FEAR);	// need to verify message type, not in MQ2Cast for easy look up
 			int32 aggro = caster->CheckAggroAmount(spell_id, this);
 			if(aggro > 0) {
 				AddToHateList(caster, aggro);
@@ -4278,13 +4287,13 @@ bool Mob::IsImmuneToSpell(uint16 spell_id, Mob *caster)
 		} else if(IsClient() && caster->IsClient() && (caster->CastToClient()->GetGM() == false))
 		{
 			Log(Logs::Detail, Logs::Spells, "Clients cannot fear eachother!");
-			caster->Message_StringID(CC_Red, IMMUNE_FEAR);	// need to verify message type, not in MQ2Cast for easy look up
+			caster->MessageString(Chat::Red, IMMUNE_FEAR);	// need to verify message type, not in MQ2Cast for easy look up
 			return true;
 		}
 		else if(GetLevel() > spells[spell_id].max[effect_index] && spells[spell_id].max[effect_index] != 0)
 		{
 			Log(Logs::Detail, Logs::Spells, "Level is %d, cannot be feared by this spell.", GetLevel());
-			caster->Message_StringID(MT_Shout, FEAR_TOO_HIGH);
+			caster->MessageString(Chat::Shout, FEAR_TOO_HIGH);
 			int32 aggro = caster->CheckAggroAmount(spell_id, this);
 			if (aggro > 0) {
 				AddToHateList(caster, aggro);
@@ -4295,9 +4304,9 @@ bool Mob::IsImmuneToSpell(uint16 spell_id, Mob *caster)
 		}
 		else if (CheckAATimer(aaTimerWarcry))
 		{
-			Message(13, "Your are immune to fear.");
+			Message(Chat::Red, "Your are immune to fear.");
 			Log(Logs::Detail, Logs::Spells, "Clients has WarCry effect, immune to fear!");
-			caster->Message_StringID(CC_Red, IMMUNE_FEAR);	// need to verify message type, not in MQ2Cast for easy look up
+			caster->MessageString(Chat::Red, IMMUNE_FEAR);	// need to verify message type, not in MQ2Cast for easy look up
 			return true;
 		}
 	}
@@ -4307,7 +4316,7 @@ bool Mob::IsImmuneToSpell(uint16 spell_id, Mob *caster)
 		if(GetSpecialAbility(UNCHARMABLE))
 		{
 			Log(Logs::Detail, Logs::Spells, "We are immune to Charm spells.");
-			caster->Message_StringID(CC_Red, CANNOT_CHARM);	// need to verify message type, not in MQ2Cast for easy look up
+			caster->MessageString(Chat::Red, CANNOT_CHARM);	// need to verify message type, not in MQ2Cast for easy look up
 			int32 aggro = caster->CheckAggroAmount(spell_id, this);
 			if(aggro > 0) {
 				AddToHateList(caster, aggro);
@@ -4320,7 +4329,7 @@ bool Mob::IsImmuneToSpell(uint16 spell_id, Mob *caster)
 		if(this == caster)
 		{
 			Log(Logs::Detail, Logs::Spells, "You are immune to your own charms.");
-			caster->Message(CC_Red, "You cannot charm yourself.");	// need to look up message?
+			caster->Message(Chat::Red, "You cannot charm yourself.");	// need to look up message?
 			return true;
 		}
 
@@ -4333,7 +4342,7 @@ bool Mob::IsImmuneToSpell(uint16 spell_id, Mob *caster)
 			if(GetLevel() > spells[spell_id].max[effect_index] && spells[spell_id].max[effect_index] != 0)
 			{
 				Log(Logs::Detail, Logs::Spells, "Our level (%d) is higher than the limit of this Charm spell (%d)", GetLevel(), spells[spell_id].max[effect_index]);
-				caster->Message_StringID(CC_Red, CANNOT_CHARM_YET);	// need to verify message type, not in MQ2Cast for easy look up<Paste>
+				caster->MessageString(Chat::Red, CANNOT_CHARM_YET);	// need to verify message type, not in MQ2Cast for easy look up<Paste>
 				AddToHateList(caster, 1,0,true,false,false,spell_id);
 				return true;
 			}
@@ -4348,7 +4357,7 @@ bool Mob::IsImmuneToSpell(uint16 spell_id, Mob *caster)
 	{
 		if(GetSpecialAbility(UNSNAREABLE)) {
 			Log(Logs::Detail, Logs::Spells, "We are immune to Snare spells.");
-			caster->Message_StringID(CC_Red, IMMUNE_MOVEMENT);
+			caster->MessageString(Chat::Red, IMMUNE_MOVEMENT);
 			int32 aggro = caster->CheckAggroAmount(spell_id, this);
 			if(aggro > 0) {
 				AddToHateList(caster, aggro);
@@ -4364,7 +4373,7 @@ bool Mob::IsImmuneToSpell(uint16 spell_id, Mob *caster)
 		if(this == caster)
 		{
 			Log(Logs::Detail, Logs::Spells, "You cannot lifetap yourself.");
-			caster->Message_StringID(MT_SpellFailure, CANT_DRAIN_SELF);
+			caster->MessageString(Chat::SpellFailure, CANT_DRAIN_SELF);
 			return true;
 		}
 	}
@@ -4374,7 +4383,7 @@ bool Mob::IsImmuneToSpell(uint16 spell_id, Mob *caster)
 		if(this == caster)
 		{
 			Log(Logs::Detail, Logs::Spells, "You cannot sacrifice yourself.");
-			caster->Message_StringID(MT_SpellFailure, CANNOT_SAC_SELF);
+			caster->MessageString(Chat::SpellFailure, CANNOT_SAC_SELF);
 			return true;
 		}
 	}
@@ -4992,7 +5001,7 @@ void Client::MakeBuffFadePacket(uint16 spell_id, int slot_id, bool send_message)
 		const char *fadetext = spells[spell_id].spell_fades;
 		outapp = new EQApplicationPacket(OP_ColoredText, sizeof(ColoredText_Struct) + strlen(fadetext));
 		ColoredText_Struct *bfm = (ColoredText_Struct *) outapp->pBuffer;
-		bfm->color = MT_Spells;
+		bfm->color = Chat::Spells;
 		memcpy(bfm->msg, fadetext, strlen(fadetext));
 		QueuePacket(outapp);
 		safe_delete(outapp);
diff --git a/zone/tasks.cpp b/zone/tasks.cpp
index da914dd68..ad1fb3242 100644
--- a/zone/tasks.cpp
+++ b/zone/tasks.cpp
@@ -678,7 +678,7 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state)
 		if (taskID == TASKSLOTEMPTY)
 			continue;
 		if (!Tasks[taskID]) {
-			c->Message(13,
+			c->Message(Chat::Red,
 				   "Active Task Slot %i, references a task (%i), that does not exist. "
 				   "Removing from memory. Contact a GM to resolve this.",
 				   i, taskID);
@@ -691,7 +691,7 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state)
 		for (int j = 0; j < Tasks[taskID]->ActivityCount; j++) {
 
 			if (state->ActiveTasks[i].Activity[j].ActivityID != j) {
-				c->Message(13,
+				c->Message(Chat::Red,
 					   "Active Task %i, %s. Activity count does not match expected value."
 					   "Removing from memory. Contact a GM to resolve this.",
 					   taskID, Tasks[taskID]->Title.c_str());
@@ -1001,7 +1001,7 @@ void TaskManager::TaskSetSelector(Client *c, ClientTaskState *state, Mob *mob, i
 		return;
 
 	if (TaskSets[TaskSetID].empty()) {
-		mob->SayTo_StringID(c, CC_Yellow, MAX_ACTIVE_TASKS, c->GetName()); // I think this is suppose to be yellow
+		mob->SayString(c, Chat::Yellow, MAX_ACTIVE_TASKS, c->GetName()); // I think this is suppose to be yellow
 		return;
 	}
 
@@ -1033,7 +1033,7 @@ void TaskManager::TaskSetSelector(Client *c, ClientTaskState *state, Mob *mob, i
 	if (TaskListIndex > 0) {
 		SendTaskSelector(c, mob, TaskListIndex, TaskList);
 	} else {
-		mob->SayTo_StringID(c, CC_Yellow, MAX_ACTIVE_TASKS, c->GetName()); // check color, I think this might be only for (Shared) Tasks, w/e -- think should be yellow
+		mob->SayString(c, Chat::Yellow, MAX_ACTIVE_TASKS, c->GetName()); // check color, I think this might be only for (Shared) Tasks, w/e -- think should be yellow
 	}
 
 	return;
@@ -1065,7 +1065,7 @@ void TaskManager::TaskQuestSetSelector(Client *c, ClientTaskState *state, Mob *m
 	if (TaskListIndex > 0) {
 		SendTaskSelector(c, mob, TaskListIndex, TaskList);
 	} else {
-		mob->SayTo_StringID(c, CC_Yellow, MAX_ACTIVE_TASKS, c->GetName()); // check color, I think this might be only for (Shared) Tasks, w/e -- think should be yellow
+		mob->SayString(c, Chat::Yellow, MAX_ACTIVE_TASKS, c->GetName()); // check color, I think this might be only for (Shared) Tasks, w/e -- think should be yellow
 	}
 
 	return;
@@ -1266,18 +1266,18 @@ void TaskManager::ExplainTask(Client*c, int TaskID) {
 	if(!c) return;
 
 	if((TaskID<=0) || (TaskID>=MAXTASKS)) {
-		c->Message(0, "TaskID out-of-range.");
+		c->Message(Chat::White, "TaskID out-of-range.");
 		return;
 	}
 
 	if(Tasks[TaskID] == nullptr) {
-		c->Message(0, "Task does not exist.");
+		c->Message(Chat::White, "Task does not exist.");
 		return;
 	}
 
 	char Explanation[1000], *ptr;
-	c->Message(0, "Task %4i: Title: %s", TaskID, Tasks[TaskID]->Description.c_str());
-	c->Message(0, "%3i Activities", Tasks[TaskID]->ActivityCount);
+	c->Message(Chat::White, "Task %4i: Title: %s", TaskID, Tasks[TaskID]->Description.c_str());
+	c->Message(Chat::White, "%3i Activities", Tasks[TaskID]->ActivityCount);
 	ptr = Explanation;
 	for(int i=0; i<Tasks[TaskID]->ActivityCount; i++) {
 
@@ -1936,7 +1936,7 @@ void ClientTaskState::IncrementDoneCount(Client *c, TaskInformation *Task, int T
 		// Send the updated task/activity list to the client
 		taskmanager->SendSingleActiveTaskToClient(c, *info, TaskComplete, false);
 		// Inform the client the task has been updated, both by a chat message
-		c->Message(0, "Your task '%s' has been updated.", Task->Title.c_str());
+		c->Message(Chat::White, "Your task '%s' has been updated.", Task->Title.c_str());
 
 		if(Task->Activity[ActivityID].GoalMethod != METHODQUEST) {
 			if (!ignore_quest_update){
@@ -2001,7 +2001,7 @@ void ClientTaskState::RewardTask(Client *c, TaskInformation *Task) {
 				c->SummonItem(Task->RewardID);
 				Item = database.GetItem(Task->RewardID);
 				if(Item)
-					c->Message(15, "You receive %s as a reward.", Item->Name);
+					c->Message(Chat::Yellow, "You receive %s as a reward.", Item->Name);
 			}
 			break;
 		}
@@ -2012,7 +2012,7 @@ void ClientTaskState::RewardTask(Client *c, TaskInformation *Task) {
 				c->SummonItem(RewardList[i]);
 				Item = database.GetItem(RewardList[i]);
 				if(Item)
-					c->Message(15, "You receive %s as a reward.", Item->Name);
+					c->Message(Chat::Yellow, "You receive %s as a reward.", Item->Name);
 			}
 			break;
 		}
@@ -2024,7 +2024,7 @@ void ClientTaskState::RewardTask(Client *c, TaskInformation *Task) {
 	}
 
 	if (!Task->completion_emote.empty())
-		c->SendColoredText(CC_Yellow, Task->completion_emote); // unsure if they use this packet or color, should work
+		c->SendColoredText(Chat::Yellow, Task->completion_emote); // unsure if they use this packet or color, should work
 
 	// just use normal NPC faction ID stuff
 	if (Task->faction_reward)
@@ -2081,7 +2081,7 @@ void ClientTaskState::RewardTask(Client *c, TaskInformation *Task) {
 			CashMessage += " copper";
 		}
 		CashMessage += " pieces.";
-		c->Message(15,CashMessage.c_str());
+		c->Message(Chat::Yellow,CashMessage.c_str());
 	}
 	int32 EXPReward = Task->XPReward;
 	if(EXPReward > 0) {
@@ -2306,12 +2306,12 @@ void ClientTaskState::ResetTaskActivity(Client *c, int TaskID, int ActivityID)
 
 void ClientTaskState::ShowClientTasks(Client *c)
 {
-	c->Message(0, "Task Information:");
+	c->Message(Chat::White, "Task Information:");
 	if (ActiveTask.TaskID != TASKSLOTEMPTY) {
-		c->Message(0, "Task: %i %s", ActiveTask.TaskID, taskmanager->Tasks[ActiveTask.TaskID]->Title.c_str());
-		c->Message(0, "  Description: [%s]\n", taskmanager->Tasks[ActiveTask.TaskID]->Description.c_str());
+		c->Message(Chat::White, "Task: %i %s", ActiveTask.TaskID, taskmanager->Tasks[ActiveTask.TaskID]->Title.c_str());
+		c->Message(Chat::White, "  Description: [%s]\n", taskmanager->Tasks[ActiveTask.TaskID]->Description.c_str());
 		for (int j = 0; j < taskmanager->GetActivityCount(ActiveTask.TaskID); j++) {
-			c->Message(0, "  Activity: %2d, DoneCount: %2d, Status: %d (0=Hidden, 1=Active, 2=Complete)",
+			c->Message(Chat::White, "  Activity: %2d, DoneCount: %2d, Status: %d (0=Hidden, 1=Active, 2=Complete)",
 				   ActiveTask.Activity[j].ActivityID, ActiveTask.Activity[j].DoneCount,
 				   ActiveTask.Activity[j].State);
 		}
@@ -2321,11 +2321,11 @@ void ClientTaskState::ShowClientTasks(Client *c)
 		if (ActiveQuests[i].TaskID == TASKSLOTEMPTY)
 			continue;
 
-		c->Message(0, "Quest: %i %s", ActiveQuests[i].TaskID,
+		c->Message(Chat::White, "Quest: %i %s", ActiveQuests[i].TaskID,
 			   taskmanager->Tasks[ActiveQuests[i].TaskID]->Title.c_str());
-		c->Message(0, "  Description: [%s]\n", taskmanager->Tasks[ActiveQuests[i].TaskID]->Description.c_str());
+		c->Message(Chat::White, "  Description: [%s]\n", taskmanager->Tasks[ActiveQuests[i].TaskID]->Description.c_str());
 		for (int j = 0; j < taskmanager->GetActivityCount(ActiveQuests[i].TaskID); j++) {
-			c->Message(0, "  Activity: %2d, DoneCount: %2d, Status: %d (0=Hidden, 1=Active, 2=Complete)",
+			c->Message(Chat::White, "  Activity: %2d, DoneCount: %2d, Status: %d (0=Hidden, 1=Active, 2=Complete)",
 				   ActiveQuests[i].Activity[j].ActivityID, ActiveQuests[i].Activity[j].DoneCount,
 				   ActiveQuests[i].Activity[j].State);
 		}
@@ -3204,14 +3204,14 @@ void ClientTaskState::RemoveTask(Client *c, int sequenceNumber, TaskType type)
 void ClientTaskState::AcceptNewTask(Client *c, int TaskID, int NPCID, bool enforce_level_requirement)
 {
 	if (!taskmanager || TaskID < 0 || TaskID >= MAXTASKS) {
-		c->Message(13, "Task system not functioning, or TaskID %i out of range.", TaskID);
+		c->Message(Chat::Red, "Task system not functioning, or TaskID %i out of range.", TaskID);
 		return;
 	}
 
 	auto task = taskmanager->Tasks[TaskID];
 
 	if (task == nullptr) {
-		c->Message(13, "Invalid TaskID %i", TaskID);
+		c->Message(Chat::Red, "Invalid TaskID %i", TaskID);
 		return;
 	}
 
@@ -3235,7 +3235,7 @@ void ClientTaskState::AcceptNewTask(Client *c, int TaskID, int NPCID, bool enfor
 	}
 
 	if (max_tasks) {
-		c->Message(13, "You already have the maximum allowable number of active tasks (%i)", MAXACTIVEQUESTS);
+		c->Message(Chat::Red, "You already have the maximum allowable number of active tasks (%i)", MAXACTIVEQUESTS);
 		return;
 	}
 
@@ -3243,14 +3243,14 @@ void ClientTaskState::AcceptNewTask(Client *c, int TaskID, int NPCID, bool enfor
 	if (task->type == TaskType::Quest) {
 		for (int i = 0; i < MAXACTIVEQUESTS; i++) {
 			if (ActiveQuests[i].TaskID == TaskID) {
-				c->Message(13, "You have already been assigned this task.");
+				c->Message(Chat::Red, "You have already been assigned this task.");
 				return;
 			}
 		}
 	}
 
 	if (enforce_level_requirement && !taskmanager->AppropriateLevel(TaskID, c->GetLevel())) {
-		c->Message(13, "You are outside the level range of this task.");
+		c->Message(Chat::Red, "You are outside the level range of this task.");
 		return;
 	}
 
@@ -3287,7 +3287,7 @@ void ClientTaskState::AcceptNewTask(Client *c, int TaskID, int NPCID, bool enfor
 
 	// This shouldn't happen unless there is a bug in the handling of ActiveTaskCount somewhere
 	if (active_slot == nullptr) {
-		c->Message(13, "You already have the maximum allowable number of active tasks (%i)", MAXACTIVEQUESTS);
+		c->Message(Chat::Red, "You already have the maximum allowable number of active tasks (%i)", MAXACTIVEQUESTS);
 		return;
 	}
 
@@ -3309,14 +3309,14 @@ void ClientTaskState::AcceptNewTask(Client *c, int TaskID, int NPCID, bool enfor
 		ActiveTaskCount++;
 
 	taskmanager->SendSingleActiveTaskToClient(c, *active_slot, false, true);
-	c->Message(0, "You have been assigned the task '%s'.", taskmanager->Tasks[TaskID]->Title.c_str());
+	c->Message(Chat::White, "You have been assigned the task '%s'.", taskmanager->Tasks[TaskID]->Title.c_str());
 
 	std::string buf = std::to_string(TaskID);
 
 	NPC *npc = entity_list.GetID(NPCID)->CastToNPC();
 	if(!npc) {
-		c->Message(clientMessageYellow, "Task Giver ID is %i", NPCID);
-		c->Message(clientMessageError, "Unable to find NPC to send EVENT_TASKACCEPTED to. Report this bug.");
+		c->Message(Chat::Yellow, "Task Giver ID is %i", NPCID);
+		c->Message(Chat::Red, "Unable to find NPC to send EVENT_TASKACCEPTED to. Report this bug.");
 		return;
 	}
 
diff --git a/zone/tradeskills.cpp b/zone/tradeskills.cpp
index 3059ce299..62842e5d9 100644
--- a/zone/tradeskills.cpp
+++ b/zone/tradeskills.cpp
@@ -80,7 +80,7 @@ void Object::HandleAugmentation(Client* user, const AugmentItem_Struct* in_augme
 
 				if (itemsFound != 2)
 				{
-					user->Message(13, "Error: Too many/few items in augmentation container.");
+					user->Message(Chat::Red, "Error: Too many/few items in augmentation container.");
 					return;
 				}
 			}
@@ -90,7 +90,7 @@ void Object::HandleAugmentation(Client* user, const AugmentItem_Struct* in_augme
 	if(!container)
 	{
 		Log(Logs::General, Logs::Error, "Player tried to augment an item without a container set.");
-		user->Message(13, "Error: This item is not a container!");
+		user->Message(Chat::Red, "Error: This item is not a container!");
 		return;
 	}
 
@@ -115,7 +115,7 @@ void Object::HandleAugmentation(Client* user, const AugmentItem_Struct* in_augme
 		{
 			// Either 2 augmentable items found or none found
 			// This should never occur due to client restrictions, but prevent in case of a hack
-			user->Message(13, "Error: Must be 1 augmentable item in the sealer");
+			user->Message(Chat::Red, "Error: Must be 1 augmentable item in the sealer");
 			return;
 		}
 	}
@@ -124,11 +124,11 @@ void Object::HandleAugmentation(Client* user, const AugmentItem_Struct* in_augme
 		// This happens if the augment button is clicked more than once quickly while augmenting
 		if (!container->GetItem(0))
 		{
-			user->Message(13, "Error: No item in slot 0 of sealer");
+			user->Message(Chat::Red, "Error: No item in slot 0 of sealer");
 		}
 		if (!container->GetItem(1))
 		{
-			user->Message(13, "Error: No item in slot 1 of sealer");
+			user->Message(Chat::Red, "Error: No item in slot 1 of sealer");
 		}
 		return;
 	}
@@ -160,7 +160,7 @@ void Object::HandleAugmentation(Client* user, const AugmentItem_Struct* in_augme
 		}
 		else
 		{
-			user->Message(13, "Error: No available slot for augment");
+			user->Message(Chat::Red, "Error: No available slot for augment");
 		}
 	}
 	else
@@ -170,7 +170,7 @@ void Object::HandleAugmentation(Client* user, const AugmentItem_Struct* in_augme
 		if (!isSolvent && auged_with->GetItem()->ItemType != EQEmu::item::ItemTypeAugmentationDistiller)
 		{
 			Log(Logs::General, Logs::Error, "Player tried to remove an augment without a solvent or distiller.");
-			user->Message(13, "Error: Missing an augmentation solvent or distiller for removing this augment.");
+			user->Message(Chat::Red, "Error: Missing an augmentation solvent or distiller for removing this augment.");
 
 			return;
 		}
@@ -180,7 +180,7 @@ void Object::HandleAugmentation(Client* user, const AugmentItem_Struct* in_augme
 			if (!isSolvent && auged_with->GetItem()->ID != aug->GetItem()->AugDistiller)
 			{
 				Log(Logs::General, Logs::Error, "Player tried to safely remove an augment with the wrong distiller (item %u vs expected %u).", auged_with->GetItem()->ID, aug->GetItem()->AugDistiller);
-				user->Message(13, "Error: Wrong augmentation distiller for safely removing this augment.");
+				user->Message(Chat::Red, "Error: Wrong augmentation distiller for safely removing this augment.");
 				return;
 			}
 			std::vector<EQEmu::Any> args;
@@ -266,7 +266,7 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob
 
 	if (in_combine->container_slot == EQEmu::invslot::SLOT_TRADESKILL_EXPERIMENT_COMBINE) {
 		if(!worldo) {
-			user->Message(13, "Error: Server is not aware of the tradeskill container you are attempting to use");
+			user->Message(Chat::Red, "Error: Server is not aware of the tradeskill container you are attempting to use");
 			return;
 		}
 		c_type = worldo->m_type;
@@ -291,7 +291,7 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob
 	}
 
 	if (!inst || !inst->IsType(EQEmu::item::ItemClassBag)) {
-		user->Message(13, "Error: Server does not recognize specified tradeskill container");
+		user->Message(Chat::Red, "Error: Server does not recognize specified tradeskill container");
 		return;
 	}
 
@@ -304,12 +304,12 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob
 			user->DeleteItemInInventory(EQEmu::InventoryProfile::CalcSlotId(in_combine->container_slot, 0), 0, true);
 			container->Clear();
 			user->SummonItem(new_weapon->ID, inst->GetCharges(), inst->GetAugmentItemID(0), inst->GetAugmentItemID(1), inst->GetAugmentItemID(2), inst->GetAugmentItemID(3), inst->GetAugmentItemID(4), inst->GetAugmentItemID(5), inst->IsAttuned(), EQEmu::invslot::slotCursor, container->GetItem()->Icon, atoi(container->GetItem()->IDFile + 2));
-			user->Message_StringID(4, TRANSFORM_COMPLETE, inst->GetItem()->Name);
+			user->MessageString(Chat::LightBlue, TRANSFORM_COMPLETE, inst->GetItem()->Name);
 			if (RuleB(Inventory, DeleteTransformationMold))
 				user->DeleteItemInInventory(in_combine->container_slot, 0, true);
 		}
 		else if (inst) {
-			user->Message_StringID(4, TRANSFORM_FAILED, inst->GetItem()->Name);
+			user->MessageString(Chat::LightBlue, TRANSFORM_FAILED, inst->GetItem()->Name);
 		}
 		auto outapp = new EQApplicationPacket(OP_TradeSkillCombine, 0);
 		user->QueuePacket(outapp);
@@ -324,10 +324,10 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob
 			user->DeleteItemInInventory(EQEmu::InventoryProfile::CalcSlotId(in_combine->container_slot, 0), 0, true);
 			container->Clear();
 			user->SummonItem(new_weapon->ID, inst->GetCharges(), inst->GetAugmentItemID(0), inst->GetAugmentItemID(1), inst->GetAugmentItemID(2), inst->GetAugmentItemID(3), inst->GetAugmentItemID(4), inst->GetAugmentItemID(5), inst->IsAttuned(), EQEmu::invslot::slotCursor, 0, 0);
-			user->Message_StringID(4, TRANSFORM_COMPLETE, inst->GetItem()->Name);
+			user->MessageString(Chat::LightBlue, TRANSFORM_COMPLETE, inst->GetItem()->Name);
 		}
 		else if (inst) {
-			user->Message_StringID(4, DETRANSFORM_FAILED, inst->GetItem()->Name);
+			user->MessageString(Chat::LightBlue, DETRANSFORM_FAILED, inst->GetItem()->Name);
 		}
 		auto outapp = new EQApplicationPacket(OP_TradeSkillCombine, 0);
 		user->QueuePacket(outapp);
@@ -337,7 +337,7 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob
 
 	DBTradeskillRecipe_Struct spec;
 	if (!database.GetTradeRecipe(container, c_type, some_id, user->CharacterID(), &spec)) {
-		user->Message_StringID(MT_Emote,TRADESKILL_NOCOMBINE);
+		user->MessageString(Chat::Emote,TRADESKILL_NOCOMBINE);
 		auto outapp = new EQApplicationPacket(OP_TradeSkillCombine, 0);
 		user->QueuePacket(outapp);
 		safe_delete(outapp);
@@ -352,7 +352,7 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob
 	// bit 6 (0x20): unlisted recipe flag
 	if ((spec.must_learn&0xF) == 1 && !spec.has_learnt) {
 		// Made up message for the client. Just giving a DNC is the other option.
-		user->Message(4, "You need to learn how to combine these first.");
+		user->Message(Chat::LightBlue, "You need to learn how to combine these first.");
 		auto outapp = new EQApplicationPacket(OP_TradeSkillCombine, 0);
 		user->QueuePacket(outapp);
 		safe_delete(outapp);
@@ -361,7 +361,7 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob
 	// Character does not have the required skill.
 	if(spec.skill_needed > 0 && user->GetSkill(spec.tradeskill) < spec.skill_needed ) {
 		// Notify client.
-		user->Message(4, "You are not skilled enough.");
+		user->Message(Chat::LightBlue, "You are not skilled enough.");
 		auto outapp = new EQApplicationPacket(OP_TradeSkillCombine, 0);
 		user->QueuePacket(outapp);
 		safe_delete(outapp);
@@ -371,23 +371,23 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob
 	//changing from a switch to string of if's since we don't need to iterate through all of the skills in the SkillType enum
 	if (spec.tradeskill == EQEmu::skills::SkillAlchemy) {
 		if (user_pp.class_ != SHAMAN) {
-			user->Message(13, "This tradeskill can only be performed by a shaman.");
+			user->Message(Chat::Red, "This tradeskill can only be performed by a shaman.");
 			return;
 		}
 		else if (user_pp.level < MIN_LEVEL_ALCHEMY) {
-			user->Message(13, "You cannot perform alchemy until you reach level %i.", MIN_LEVEL_ALCHEMY);
+			user->Message(Chat::Red, "You cannot perform alchemy until you reach level %i.", MIN_LEVEL_ALCHEMY);
 			return;
 		}
 	}
 	else if (spec.tradeskill == EQEmu::skills::SkillTinkering) {
 		if (user_pp.race != GNOME) {
-			user->Message(13, "Only gnomes can tinker.");
+			user->Message(Chat::Red, "Only gnomes can tinker.");
 			return;
 		}
 	}
 	else if (spec.tradeskill == EQEmu::skills::SkillMakePoison) {
 		if (user_pp.class_ != ROGUE) {
-			user->Message(13, "Only rogues can mix poisons.");
+			user->Message(Chat::Red, "Only rogues can mix poisons.");
 			return;
 		}
 	}
@@ -422,7 +422,7 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob
 	// Update Made count
 	if (success) {
 		if (!spec.has_learnt && ((spec.must_learn&0x10) != 0x10)) {
-			user->Message_StringID(4, TRADESKILL_LEARN_RECIPE, spec.name.c_str());
+			user->MessageString(Chat::LightBlue, TRADESKILL_LEARN_RECIPE, spec.name.c_str());
 		}
 		database.UpdateRecipeMadecount(spec.recipe_id, user->CharacterID(), spec.madecount+1);
 	}
@@ -469,7 +469,7 @@ void Object::HandleAutoCombine(Client* user, const RecipeAutoCombine_Struct* rac
 	// This shouldn't happen.
 	if ((spec.must_learn&0xf) && !spec.has_learnt) {
 		// Made up message for the client. Just giving a DNC is the other option.
-		user->Message(4, "You need to learn how to combine these first.");
+		user->Message(Chat::LightBlue, "You need to learn how to combine these first.");
 		user->QueuePacket(outapp);
 		safe_delete(outapp);
 		return;
@@ -540,13 +540,13 @@ void Object::HandleAutoCombine(Client* user, const RecipeAutoCombine_Struct* rac
 
 		safe_delete(outapp);
 
-		user->Message_StringID(MT_Skills, TRADESKILL_MISSING_COMPONENTS);
+		user->MessageString(Chat::Skills, TRADESKILL_MISSING_COMPONENTS);
 
 		for (auto it = MissingItems.begin(); it != MissingItems.end(); ++it) {
 			const EQEmu::ItemData* item = database.GetItem(*it);
 
 			if(item)
-				user->Message_StringID(MT_Skills, TRADESKILL_MISSING_ITEM, item->Name);
+				user->MessageString(Chat::Skills, TRADESKILL_MISSING_ITEM, item->Name);
 		}
 
 		return;
@@ -593,7 +593,7 @@ void Object::HandleAutoCombine(Client* user, const RecipeAutoCombine_Struct* rac
 
 	if (success) {
 		if (!spec.has_learnt && ((spec.must_learn & 0x10) != 0x10)) {
-			user->Message_StringID(4, TRADESKILL_LEARN_RECIPE, spec.name.c_str());
+			user->MessageString(Chat::LightBlue, TRADESKILL_LEARN_RECIPE, spec.name.c_str());
 		}
 		database.UpdateRecipeMadecount(spec.recipe_id, user->CharacterID(), spec.madecount+1);
 	}
@@ -951,7 +951,7 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) {
 		// above critical still stands.
 		// Mastery modifier is: 10%/25%/50% for rank one/two/three
 		chance = 95.0f + (float(user_skill - spec->trivial) / 40.0f);
-		Message_StringID(MT_Emote, TRADESKILL_TRIVIAL);
+		MessageString(Chat::Emote, TRADESKILL_TRIVIAL);
 	} else if(chance < 5) {
 		// Minimum chance is always 5
 		chance = 5;
@@ -978,7 +978,7 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) {
 		if(over_trivial < 0)
 			CheckIncreaseTradeskill(bonusstat, stat_modifier, skillup_modifier, success_modifier, spec->tradeskill);
 
-		Message_StringID(4, TRADESKILL_SUCCEED, spec->name.c_str());
+		MessageString(Chat::LightBlue, TRADESKILL_SUCCEED, spec->name.c_str());
 
 		Log(Logs::Detail, Logs::Tradeskills, "Tradeskill success");
 
@@ -988,7 +988,7 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) {
 			SummonItem(itr->first, itr->second);
 			item = database.GetItem(itr->first);
 			if (this->GetGroup()) {
-				entity_list.MessageGroup(this, true, MT_Skills, "%s has successfully fashioned %s!", GetName(), item->Name);
+				entity_list.MessageGroup(this, true, Chat::Skills, "%s has successfully fashioned %s!", GetName(), item->Name);
 			}
 
 			/* QS: Player_Log_Trade_Skill_Events */
@@ -1010,12 +1010,12 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) {
 		if(over_trivial < 0)
 			CheckIncreaseTradeskill(bonusstat, stat_modifier, skillup_modifier, success_modifier, spec->tradeskill);
 
-		Message_StringID(MT_Emote,TRADESKILL_FAILED);
+		MessageString(Chat::Emote,TRADESKILL_FAILED);
 
 		Log(Logs::Detail, Logs::Tradeskills, "Tradeskill failed");
 			if (this->GetGroup())
 		{
-			entity_list.MessageGroup(this,true,MT_Skills,"%s was unsuccessful in %s tradeskill attempt.",GetName(),this->GetGender() == 0 ? "his" : this->GetGender() == 1 ? "her" : "its");
+			entity_list.MessageGroup(this, true, Chat::Skills,"%s was unsuccessful in %s tradeskill attempt.",GetName(),this->GetGender() == 0 ? "his" : this->GetGender() == 1 ? "her" : "its");
 
 		}
 
@@ -1404,7 +1404,7 @@ void Client::LearnRecipe(uint32 recipeID)
     if (row[1] != nullptr)
         return;
 
-    Message_StringID(4, TRADESKILL_LEARN_RECIPE, row[0]);
+    MessageString(Chat::LightBlue, TRADESKILL_LEARN_RECIPE, row[0]);
     // Actually learn the recipe now
 	query = StringFormat("INSERT INTO char_recipe_list "
                         "SET recipe_id = %u, char_id = %u, madecount = 0 "
diff --git a/zone/trading.cpp b/zone/trading.cpp
index 154fdf148..2d8f03e4f 100644
--- a/zone/trading.cpp
+++ b/zone/trading.cpp
@@ -102,7 +102,7 @@ void Trade::AddEntity(uint16 trade_slot_id, uint32 stack_size) {
 	EQEmu::ItemInstance* inst = client->GetInv().GetItem(EQEmu::invslot::slotCursor);
 
 	if (!inst) {
-		client->Message(13, "Error: Could not find item on your cursor!");
+		client->Message(Chat::Red, "Error: Could not find item on your cursor!");
 		return;
 	}
 
@@ -112,7 +112,7 @@ void Trade::AddEntity(uint16 trade_slot_id, uint32 stack_size) {
 	// (it just didn't handle partial stack move actions)
 	if (stack_size > 0) {
 		if (!inst->IsStackable() || !inst2 || !inst2->GetItem() || (inst->GetID() != inst2->GetID()) || (stack_size > inst->GetCharges())) {
-			client->Kick();
+			client->Kick("Error stacking item in trade");
 			return;
 		}
 
@@ -138,7 +138,7 @@ void Trade::AddEntity(uint16 trade_slot_id, uint32 stack_size) {
 	}
 	else {
 		if (inst2 && inst2->GetID()) {
-			client->Kick();
+			client->Kick("Attempting to add null item to trade");
 			return;
 		}
 
@@ -1110,7 +1110,7 @@ void Client::Trader_EndTrader() {
 			tdis->Unknown000 = 0;
 			tdis->TraderID = Customer->GetID();
 			tdis->Unknown012 = 0;
-			Customer->Message(13, "The Trader is no longer open for business");
+			Customer->Message(Chat::Red, "The Trader is no longer open for business");
 
 			for(int i = 0; i < 80; i++) {
 				if(gis->Items[i] != 0) {
@@ -1628,8 +1628,8 @@ void Client::BuyTraderItem(TraderBuy_Struct* tbs, Client* Trader, const EQApplic
 	Log(Logs::Detail, Logs::Trading, "Actual quantity that will be traded is %i", outtbs->Quantity);
 
 	if((tbs->Price * outtbs->Quantity) <= 0) {
-		Message(13, "Internal error. Aborting trade. Please report this to the ServerOP. Error code is 1");
-		Trader->Message(13, "Internal error. Aborting trade. Please report this to the ServerOP. Error code is 1");
+		Message(Chat::Red, "Internal error. Aborting trade. Please report this to the ServerOP. Error code is 1");
+		Trader->Message(Chat::Red, "Internal error. Aborting trade. Please report this to the ServerOP. Error code is 1");
 		Log(Logs::General, Logs::Error, "Bazaar: Zero price transaction between %s and %s aborted."
 						"Item: %s, Charges: %i, TBS: Qty %i, Price: %i",
 						GetName(), Trader->GetName(),
@@ -1642,7 +1642,7 @@ void Client::BuyTraderItem(TraderBuy_Struct* tbs, Client* Trader, const EQApplic
 	uint64 TotalTransactionValue = static_cast<uint64>(tbs->Price) * static_cast<uint64>(outtbs->Quantity);
 
 	if(TotalTransactionValue > MAX_TRANSACTION_VALUE) {
-		Message(13, "That would exceed the single transaction limit of %u platinum.", MAX_TRANSACTION_VALUE / 1000);
+		Message(Chat::Red, "That would exceed the single transaction limit of %u platinum.", MAX_TRANSACTION_VALUE / 1000);
 		TradeRequestFailed(app);
 		safe_delete(outapp);
 		return;
@@ -1754,7 +1754,7 @@ void Client::SendBazaarWelcome()
 		return;
 
 	auto row = results.begin();
-	Message(10, "There are %i Buyers waiting to purchase your loot. Type /barter to search for them, "
+	Message(Chat::NPCQuestSay, "There are %i Buyers waiting to purchase your loot. Type /barter to search for them, "
 				"or use /buyer to set up your own Buy Lines.", atoi(row[0]));
 }
 
@@ -1945,7 +1945,7 @@ void Client::SendBazaarResults(uint32 TraderID, uint32 Class_, uint32 Race, uint
     uint32 ID = 0;
 
     if (results.RowCount() == static_cast<unsigned long>(RuleI(Bazaar, MaxSearchResults)))
-			Message(15, "Your search reached the limit of %i results. Please narrow your search down by selecting more options.",
+			Message(Chat::Yellow, "Your search reached the limit of %i results. Please narrow your search down by selecting more options.",
 					RuleI(Bazaar, MaxSearchResults));
 
     if(results.RowCount() == 0) {
@@ -2057,7 +2057,7 @@ static void UpdateTraderCustomerItemsAdded(uint32 CustomerID, TraderCharges_Stru
 
 	if(!inst) return;
 
-	Customer->Message(13, "The Trader has put up %s for sale.", item->Name);
+	Customer->Message(Chat::Red, "The Trader has put up %s for sale.", item->Name);
 
 	for(int i = 0; i < 80; i++) {
 
@@ -2105,7 +2105,7 @@ static void UpdateTraderCustomerPriceChanged(uint32 CustomerID, TraderCharges_St
 		tdis->Unknown000 = 0;
 		tdis->TraderID = Customer->GetID();
 		tdis->Unknown012 = 0;
-		Customer->Message(13, "The Trader has withdrawn the %s from sale.", item->Name);
+		Customer->Message(Chat::Red, "The Trader has withdrawn the %s from sale.", item->Name);
 
 		for(int i = 0; i < 80; i++) {
 
@@ -2147,7 +2147,7 @@ static void UpdateTraderCustomerPriceChanged(uint32 CustomerID, TraderCharges_St
 		inst->SetMerchantCount(Charges);
 
 	// Let the customer know the price in the window has suddenly just changed on them.
-	Customer->Message(13, "The Trader has changed the price of %s.", item->Name);
+	Customer->Message(Chat::Red, "The Trader has changed the price of %s.", item->Name);
 
 	for(int i = 0; i < 80; i++) {
 		if((gis->ItemID[i] != ItemID) ||
@@ -2286,7 +2286,7 @@ void Client::HandleTraderPriceUpdate(const EQApplicationPacket *app) {
 			}
 
 			if(SameItemWithDifferingCharges)
-				Message(13, "Warning: You have more than one %s with different charges. They have all been added for sale "
+				Message(Chat::Red, "Warning: You have more than one %s with different charges. They have all been added for sale "
 						"at the same price.", item->Name);
 		}
 
@@ -2333,8 +2333,8 @@ void Client::HandleTraderPriceUpdate(const EQApplicationPacket *app) {
 		tpus->SubAction = BazaarPriceChange_Fail;
 		QueuePacket(app);
 		Trader_EndTrader();
-		Message(13, "You must remove the item from sale before you can increase the price while a customer is browsing.");
-		Message(13, "Click 'Begin Trader' to restart Trader mode with the increased price for this item.");
+		Message(Chat::Red, "You must remove the item from sale before you can increase the price while a customer is browsing.");
+		Message(Chat::Red, "Click 'Begin Trader' to restart Trader mode with the increased price for this item.");
 		safe_delete(gis);
 		return;
 	}
@@ -2387,11 +2387,11 @@ void Client::SendBuyerResults(char* searchString, uint32 searchID) {
     int numberOfRows = results.RowCount();
 
     if(numberOfRows == RuleI(Bazaar, MaxBarterSearchResults))
-        Message(15, "Your search found too many results; some are not displayed.");
+        Message(Chat::Yellow, "Your search found too many results; some are not displayed.");
     else if(strlen(searchString) == 0)
-        Message(10, "There are %i Buy Lines.", numberOfRows);
+        Message(Chat::NPCQuestSay, "There are %i Buy Lines.", numberOfRows);
     else
-        Message(10, "There are %i Buy Lines that match the search string '%s'.", numberOfRows, searchString);
+        Message(Chat::NPCQuestSay, "There are %i Buy Lines that match the search string '%s'.", numberOfRows, searchString);
 
     if(numberOfRows == 0)
         return;
@@ -2466,7 +2466,7 @@ void Client::ShowBuyLines(const EQApplicationPacket *app) {
 	if(!Buyer) {
 		bir->Approval = 0; // Tell the client that the Buyer is unavailable
 		QueuePacket(app);
-		Message(13, "The Buyer has gone away.");
+		Message(Chat::Red, "The Buyer has gone away.");
 		return;
 	}
 
@@ -2475,14 +2475,14 @@ void Client::ShowBuyLines(const EQApplicationPacket *app) {
 	QueuePacket(app);
 
 	if(bir->Approval == 0) {
-		Message_StringID(clientMessageYellow, TRADER_BUSY);
+		MessageString(Chat::Yellow, TRADER_BUSY);
 		return;
 	}
 
 	const char *WelcomeMessagePointer = Buyer->GetBuyerWelcomeMessage();
 
 	if(strlen(WelcomeMessagePointer) > 0)
-		Message(10, "%s greets you, '%s'.", Buyer->GetName(), WelcomeMessagePointer);
+		Message(Chat::NPCQuestSay, "%s greets you, '%s'.", Buyer->GetName(), WelcomeMessagePointer);
 
 	auto outapp = new EQApplicationPacket(OP_Barter, sizeof(BuyerBrowsing_Struct));
 
@@ -2563,7 +2563,7 @@ void Client::SellToBuyer(const EQApplicationPacket *app) {
 	if(!item || !Quantity || !Price || !QtyBuyerWants) return;
 
 	if (m_inv.HasItem(ItemID, Quantity, invWhereWorn | invWherePersonal | invWhereCursor) == INVALID_INDEX) {
-		Message(13, "You do not have %i %s on you.", Quantity, item->Name);
+		Message(Chat::Red, "You do not have %i %s on you.", Quantity, item->Name);
 		return;
 	}
 
@@ -2571,37 +2571,37 @@ void Client::SellToBuyer(const EQApplicationPacket *app) {
 	Client *Buyer = entity_list.GetClientByID(BuyerID);
 
 	if(!Buyer || !Buyer->IsBuyer()) {
-		Message(13, "The Buyer has gone away.");
+		Message(Chat::Red, "The Buyer has gone away.");
 		return;
 	}
 
 	// For Stackable items, HasSpaceForItem will try check if there is space to stack with existing stacks in
 	// the buyer inventory.
 	if(!(Buyer->GetInv().HasSpaceForItem(item, Quantity))) {
-		Message(13, "The Buyer does not have space for %i %s", Quantity, item->Name);
+		Message(Chat::Red, "The Buyer does not have space for %i %s", Quantity, item->Name);
 		return;
 	}
 
 	if((static_cast<uint64>(Quantity) * static_cast<uint64>(Price)) > MAX_TRANSACTION_VALUE) {
-		Message(13, "That would exceed the single transaction limit of %u platinum.", MAX_TRANSACTION_VALUE / 1000);
+		Message(Chat::Red, "That would exceed the single transaction limit of %u platinum.", MAX_TRANSACTION_VALUE / 1000);
 		return;
 	}
 
 	if(!Buyer->HasMoney(Quantity * Price)) {
-		Message(13, "The Buyer does not have sufficient money to purchase that quantity of %s.", item->Name);
-		Buyer->Message(13, "%s tried to sell you %i %s, but you have insufficient funds.", GetName(), Quantity, item->Name);
+		Message(Chat::Red, "The Buyer does not have sufficient money to purchase that quantity of %s.", item->Name);
+		Buyer->Message(Chat::Red, "%s tried to sell you %i %s, but you have insufficient funds.", GetName(), Quantity, item->Name);
 		return;
 	}
 
 	if(Buyer->CheckLoreConflict(item)) {
-		Message(13, "That item is LORE and the Buyer already has one.");
-		Buyer->Message(13, "%s tried to sell you %s but this item is LORE and you already have one.",
+		Message(Chat::Red, "That item is LORE and the Buyer already has one.");
+		Buyer->Message(Chat::Red, "%s tried to sell you %s but this item is LORE and you already have one.",
 					GetName(), item->Name);
 		return;
 	}
 
 	if(item->NoDrop == 0) {
-		Message(13, "That item is NODROP.");
+		Message(Chat::Red, "That item is NODROP.");
 		return;
 	}
 
@@ -2620,7 +2620,7 @@ void Client::SellToBuyer(const EQApplicationPacket *app) {
 					break;
 				}
 				Log(Logs::General, Logs::Error, "Unexpected error while moving item from seller to buyer.");
-				Message(13, "Internal error while processing transaction.");
+				Message(Chat::Red, "Internal error while processing transaction.");
 				return;
 			}
 
@@ -2628,7 +2628,7 @@ void Client::SellToBuyer(const EQApplicationPacket *app) {
 
 			if(!ItemToTransfer || !Buyer->MoveItemToInventory(ItemToTransfer, true)) {
 				Log(Logs::General, Logs::Error, "Unexpected error while moving item from seller to buyer.");
-				Message(13, "Internal error while processing transaction.");
+				Message(Chat::Red, "Internal error while processing transaction.");
 
 				if(ItemToTransfer)
 					safe_delete(ItemToTransfer);
@@ -2666,7 +2666,7 @@ void Client::SellToBuyer(const EQApplicationPacket *app) {
 
 			if (SellerSlot == INVALID_INDEX) {
 				Log(Logs::General, Logs::Error, "Unexpected error while moving item from seller to buyer.");
-				Message(13, "Internal error while processing transaction.");
+				Message(Chat::Red, "Internal error while processing transaction.");
 				return;
 			}
 
@@ -2674,7 +2674,7 @@ void Client::SellToBuyer(const EQApplicationPacket *app) {
 
 			if(!ItemToTransfer) {
 				Log(Logs::General, Logs::Error, "Unexpected error while moving item from seller to buyer.");
-				Message(13, "Internal error while processing transaction.");
+				Message(Chat::Red, "Internal error while processing transaction.");
 				return;
 			}
 
@@ -2686,7 +2686,7 @@ void Client::SellToBuyer(const EQApplicationPacket *app) {
 
 				if(!Buyer->MoveItemToInventory(ItemToTransfer, true)) {
 					Log(Logs::General, Logs::Error, "Unexpected error while moving item from seller to buyer.");
-					Message(13, "Internal error while processing transaction.");
+					Message(Chat::Red, "Internal error while processing transaction.");
 					safe_delete(ItemToTransfer);
 					return;
 				}
@@ -2721,7 +2721,7 @@ void Client::SellToBuyer(const EQApplicationPacket *app) {
 
 				if(!Buyer->MoveItemToInventory(ItemToTransfer, true)) {
 					Log(Logs::General, Logs::Error, "Unexpected error while moving item from seller to buyer.");
-					Message(13, "Internal error while processing transaction.");
+					Message(Chat::Red, "Internal error while processing transaction.");
 					safe_delete(ItemToTransfer);
 					return;
 				}
@@ -2965,19 +2965,19 @@ void Client::UpdateBuyLine(const EQApplicationPacket *app) {
 	}
 	else {
 		if(ItemCount > 0)
-			Message(13, "Buy line %s disabled as Item Compensation is not currently supported.", ItemName);
+			Message(Chat::Red, "Buy line %s disabled as Item Compensation is not currently supported.", ItemName);
 
 		else if(Quantity <= 0)
-			Message(13, "Buy line %s disabled as the quantity is invalid.", ItemName);
+			Message(Chat::Red, "Buy line %s disabled as the quantity is invalid.", ItemName);
 
 		else if(LoreConflict)
-			Message(13, "Buy line %s disabled as the item is LORE and you have one already.", ItemName);
+			Message(Chat::Red, "Buy line %s disabled as the item is LORE and you have one already.", ItemName);
 
 		else if(item->NoDrop == 0)
-			Message(13, "Buy line %s disabled as the item is NODROP.", ItemName);
+			Message(Chat::Red, "Buy line %s disabled as the item is NODROP.", ItemName);
 
 		else if(ToggleOnOff)
-			Message(13, "Buy line %s disabled due to insufficient funds.", ItemName);
+			Message(Chat::Red, "Buy line %s disabled due to insufficient funds.", ItemName);
 
 		else
 			database.RemoveBuyLine(CharacterID(), BuySlot);
@@ -3047,7 +3047,7 @@ void Client::BuyerItemSearch(const EQApplicationPacket *app) {
 			break;
 	}
 	if (Count == MAX_BUYER_ITEMSEARCH_RESULTS)
-		Message(15, "Your search returned more than %i results. Only the first %i are displayed.",
+		Message(Chat::Yellow, "Your search returned more than %i results. Only the first %i are displayed.",
 				MAX_BUYER_ITEMSEARCH_RESULTS, MAX_BUYER_ITEMSEARCH_RESULTS);
 
 	bisr->Action = Barter_BuyerSearch;
diff --git a/zone/trap.cpp b/zone/trap.cpp
index 29314f568..7027f3e28 100644
--- a/zone/trap.cpp
+++ b/zone/trap.cpp
@@ -373,13 +373,13 @@ void EntityList::GetTrapInfo(Client* client)
 		if (cur->IsTrap())
 		{
 			bool isset = (cur->chkarea_timer.Enabled() && !cur->reset_timer.Enabled());
-			client->Message(CC_Default, " Trap: (%d) found at %0.2f,%0.2f,%0.2f. Times Triggered: %d Is Active: %d Group: %d Message: %s", cur->trap_id, cur->m_Position.x, cur->m_Position.y, cur->m_Position.z, cur->times_triggered, isset, cur->group, cur->message.c_str());
+			client->Message(Chat::Default, " Trap: (%d) found at %0.2f,%0.2f,%0.2f. Times Triggered: %d Is Active: %d Group: %d Message: %s", cur->trap_id, cur->m_Position.x, cur->m_Position.y, cur->m_Position.z, cur->times_triggered, isset, cur->group, cur->message.c_str());
 			++count;
 		}
 		++it;
 	}
 
-	client->Message(CC_Default, "%d traps found.", count);
+	client->Message(Chat::Default, "%d traps found.", count);
 }
 
 void EntityList::ClearTrapPointers()
diff --git a/zone/tribute.cpp b/zone/tribute.cpp
index 49ab7911c..eb6ed12ba 100644
--- a/zone/tribute.cpp
+++ b/zone/tribute.cpp
@@ -93,7 +93,7 @@ void Client::ToggleTribute(bool enabled) {
 		}
 
 		if(cost > m_pp.tribute_points) {
-			Message(13, "You do not have enough tribute points to activate your tribute!");
+			Message(Chat::Red, "You do not have enough tribute points to activate your tribute!");
 			ToggleTribute(false);
 			return;
 		}
@@ -250,7 +250,7 @@ int32 Client::TributeItem(uint32 slot, uint32 quantity) {
 	pts = mod_tribute_item_value(pts, m_inv[slot]);
 
 	if(pts < 1) {
-		Message(13, "This item is worthless for favor.");
+		Message(Chat::Red, "This item is worthless for favor.");
 		return(0);
 	}
 
@@ -277,7 +277,7 @@ int32 Client::TributeItem(uint32 slot, uint32 quantity) {
 //returns the number of points received from the tribute
 int32 Client::TributeMoney(uint32 platinum) {
 	if(!TakeMoneyFromPP(platinum * 1000)) {
-		Message(13, "You do not have that much money!");
+		Message(Chat::Red, "You do not have that much money!");
 		return(0);
 	}
 
diff --git a/zone/tune.cpp b/zone/tune.cpp
index c33580549..4d8237464 100644
--- a/zone/tune.cpp
+++ b/zone/tune.cpp
@@ -203,11 +203,11 @@ void Mob::Tune_FindACByPctMitigation(Mob* defender, Mob *attacker, float pct_mit
 				Message(0, "#Tune - [WARNING] Mitigation can not be further decreased due to minium hit value (%i).",minhit);
 
 			if (defender->IsNPC()){
-				Message(7, "#Tune - Recommended NPC AC ADJUSTMENT ( %i ) on ' %s ' for an average mitigation of (+ %.0f) pct from attacker ' %s '.",add_ac,defender->GetCleanName(), pct_mitigation, attacker->GetCleanName());
+				Message(Chat::LightGray, "#Tune - Recommended NPC AC ADJUSTMENT ( %i ) on ' %s ' for an average mitigation of (+ %.0f) pct from attacker ' %s '.",add_ac,defender->GetCleanName(), pct_mitigation, attacker->GetCleanName());
 				Message(0, "#SET: [NPC Attack STAT] = [%i]",add_ac + defender->CastToNPC()->GetRawAC());
 			}
 			if (defender->IsClient()){
-				Message(7, "#Tune - Recommended CLIENT AC ADJUSTMENT ( %i ) on ' %s ' for an average mitigation of (+ %.0f) pct from attacker ' %s '.",add_ac,defender->GetCleanName(), pct_mitigation, attacker->GetCleanName());
+				Message(Chat::LightGray, "#Tune - Recommended CLIENT AC ADJUSTMENT ( %i ) on ' %s ' for an average mitigation of (+ %.0f) pct from attacker ' %s '.",add_ac,defender->GetCleanName(), pct_mitigation, attacker->GetCleanName());
 				Message(0, "#Modify (+/-): [Client AC STAT/SE_AC(1)] [%i]",add_ac);
 			}
 
@@ -249,9 +249,9 @@ int32 Mob::Tune_MeleeMitigation(Mob* GM, Mob *attacker, int32 damage, int32 minh
 
 	if (Msg){
 		
-		GM->Message(0, "######### Melee Mitigation Report: Start [Detail Level %i]#########", Msg);
-		GM->Message(0, "#ATTACKER: %s", attacker->GetCleanName());
-		GM->Message(0, "#DEFENDER: %s", defender->GetCleanName());
+		GM->Message(Chat::White, "######### Melee Mitigation Report: Start [Detail Level %i]#########", Msg);
+		GM->Message(Chat::White, "#ATTACKER: %s", attacker->GetCleanName());
+		GM->Message(Chat::White, "#DEFENDER: %s", defender->GetCleanName());
 	}
 
 	if (RuleB(Combat, UseIntervalAC)) {
@@ -264,16 +264,16 @@ int32 Mob::Tune_MeleeMitigation(Mob* GM, Mob *attacker, int32 damage, int32 minh
 		float weight = 0.0;
 
 		if (Msg >= 2){
-			GM->Message(0, " "); 
-			GM->Message(0, "### Calculate Mitigation Rating ###"); 
+			GM->Message(Chat::White, " ");
+			GM->Message(Chat::White, "### Calculate Mitigation Rating ###");
 			if (aabonuses.CombatStability)
-				GM->Message(0, "# %i #### DEFENDER SE_CombatStability(259) AA Bonus", aabonuses.CombatStability);
+				GM->Message(Chat::White, "# %i #### DEFENDER SE_CombatStability(259) AA Bonus", aabonuses.CombatStability);
 			if (spellbonuses.CombatStability)
-				GM->Message(0, "# %i #### DEFENDER SE_CombatStability(259) Spell Bonus", spellbonuses.CombatStability);
+				GM->Message(Chat::White, "# %i #### DEFENDER SE_CombatStability(259) Spell Bonus", spellbonuses.CombatStability);
 			if (itembonuses.CombatStability)
-				GM->Message(0, "# %i #### DEFENDER SE_CombatStability(259) Worn Bonus", itembonuses.CombatStability);
+				GM->Message(Chat::White, "# %i #### DEFENDER SE_CombatStability(259) Worn Bonus", itembonuses.CombatStability);
 
-			GM->Message(0, "# %.2f #### DEFENDER Base Soft Cap", softcap);
+			GM->Message(Chat::White, "# %.2f #### DEFENDER Base Soft Cap", softcap);
 		}
 
 		float monkweight = RuleI(Combat, MonkACBonusWeight);
@@ -287,11 +287,11 @@ int32 Mob::Tune_MeleeMitigation(Mob* GM, Mob *attacker, int32 damage, int32 minh
 				armor = ac_override;
 			
 			if (Msg >=2 ){
-				GM->Message(0, "# %i #### DEFENDER AC Equiped/Worn Bonus", itembonuses.AC);
-				GM->Message(0, "# %i #### DEFENDER SE_ArmorClass(1) AA Bonus", aabonuses.AC);
-				GM->Message(0, "# %i #### DEFENDER SE_ArmorClass(1) Spell Bonus", spellbonuses.AC);
-				GM->Message(0, "# %i #### DEFENDER Shield AC", shield_ac);
-				GM->Message(0, "# %i #### DEFENDER Total Client Armor - NO shield", armor);
+				GM->Message(Chat::White, "# %i #### DEFENDER AC Equiped/Worn Bonus", itembonuses.AC);
+				GM->Message(Chat::White, "# %i #### DEFENDER SE_ArmorClass(1) AA Bonus", aabonuses.AC);
+				GM->Message(Chat::White, "# %i #### DEFENDER SE_ArmorClass(1) Spell Bonus", spellbonuses.AC);
+				GM->Message(Chat::White, "# %i #### DEFENDER Shield AC", shield_ac);
+				GM->Message(Chat::White, "# %i #### DEFENDER Total Client Armor - NO shield", armor);
 			}
 			
 		} else if (IsNPC()) {
@@ -301,9 +301,9 @@ int32 Mob::Tune_MeleeMitigation(Mob* GM, Mob *attacker, int32 damage, int32 minh
 				armor = ac_override;
 
 			if (Msg >=2 ){
-				GM->Message(0, "# %i #### DEFENDER AC Equiped/Worn Bonus", itembonuses.AC);
-				GM->Message(0, "# %i #### DEFENDER SE_ArmorClass(1) Spell Bonus", spellbonuses.AC);
-				GM->Message(0, "# %i #### DEFENDER NPC AC Stat", CastToNPC()->GetRawAC());
+				GM->Message(Chat::White, "# %i #### DEFENDER AC Equiped/Worn Bonus", itembonuses.AC);
+				GM->Message(Chat::White, "# %i #### DEFENDER SE_ArmorClass(1) Spell Bonus", spellbonuses.AC);
+				GM->Message(Chat::White, "# %i #### DEFENDER NPC AC Stat", CastToNPC()->GetRawAC());
 			}
 
 			int PetACBonus = 0;
@@ -311,7 +311,7 @@ int32 Mob::Tune_MeleeMitigation(Mob* GM, Mob *attacker, int32 damage, int32 minh
 			if (!IsPet()){
 				armor = (armor / RuleR(Combat, NPCACFactor));
 				if (Msg >=2 )
-					GM->Message(0, "# %i #### DEFENDER NPC Armor after RuleR(Combat, NPCACFactor) %.2f", armor, RuleR(Combat, NPCACFactor));
+					GM->Message(Chat::White, "# %i #### DEFENDER NPC Armor after RuleR(Combat, NPCACFactor) %.2f", armor, RuleR(Combat, NPCACFactor));
 			}
 
 			Mob *owner = nullptr;
@@ -325,18 +325,18 @@ int32 Mob::Tune_MeleeMitigation(Mob* GM, Mob *attacker, int32 damage, int32 minh
 
 				if (Msg >=2 ){
 				if (owner->aabonuses.PetMeleeMitigation)
-					GM->Message(0, "# %i #### DEFENDER Pet Owner SE_PetMeleeMitigation(379) AA Bonus", owner->aabonuses.PetMeleeMitigation);
+					GM->Message(Chat::White, "# %i #### DEFENDER Pet Owner SE_PetMeleeMitigation(379) AA Bonus", owner->aabonuses.PetMeleeMitigation);
 				if (owner->spellbonuses.PetMeleeMitigation)
-					GM->Message(0, "# %i #### DEFENDER Pet Owner SE_PetMeleeMitigation(379) Spell Bonus",owner->spellbonuses.PetMeleeMitigation);
+					GM->Message(Chat::White, "# %i #### DEFENDER Pet Owner SE_PetMeleeMitigation(379) Spell Bonus",owner->spellbonuses.PetMeleeMitigation);
 				if (owner->itembonuses.PetMeleeMitigation)
-					GM->Message(0, "# %i #### DEFENDER Pet Owner SE_PetMeleeMitigation(379) Worn Bonus", owner->itembonuses.PetMeleeMitigation);
+					GM->Message(Chat::White, "# %i #### DEFENDER Pet Owner SE_PetMeleeMitigation(379) Worn Bonus", owner->itembonuses.PetMeleeMitigation);
 				}
 			}
 
 			armor += spellbonuses.AC + itembonuses.AC + PetACBonus + 1;
 
 			if (Msg >= 2)
-				GM->Message(0, "# %i #### DEFENDER NPC Total Base Armor",armor);
+				GM->Message(Chat::White, "# %i #### DEFENDER NPC Total Base Armor",armor);
 		}
 
 		if (opts) {
@@ -405,38 +405,38 @@ int32 Mob::Tune_MeleeMitigation(Mob* GM, Mob *attacker, int32 damage, int32 minh
 			
 			armor = softcap + softcap_armor;
 			if (Msg >= 2)
-				GM->Message(0, "# %i #### DEFENDER Final Armor [Soft Cap %i Soft Cap Armor %i]",armor, softcap,softcap_armor);
+				GM->Message(Chat::White, "# %i #### DEFENDER Final Armor [Soft Cap %i Soft Cap Armor %i]",armor, softcap,softcap_armor);
 		}
 		int tmp_armor = armor;
 		if (GetClass() == WIZARD || GetClass() == MAGICIAN ||
 				GetClass() == NECROMANCER || GetClass() == ENCHANTER){
 			mitigation_rating = ((GetSkill(EQEmu::skills::SkillDefense) + itembonuses.HeroicAGI / 10) / 4.0) + armor + 1;
 			if (Msg >= 2)
-				GM->Message(0, "# + %.2f #### DEFENDER Armor Bonus [Defense Skill %i Heroic Agi %i]", mitigation_rating - tmp_armor, GetSkill(EQEmu::skills::SkillDefense), itembonuses.HeroicAGI);
+				GM->Message(Chat::White, "# + %.2f #### DEFENDER Armor Bonus [Defense Skill %i Heroic Agi %i]", mitigation_rating - tmp_armor, GetSkill(EQEmu::skills::SkillDefense), itembonuses.HeroicAGI);
 		}
 		else{
 			mitigation_rating = ((GetSkill(EQEmu::skills::SkillDefense) + itembonuses.HeroicAGI / 10) / 3.0) + (armor * 1.333333) + 1;
 			if (Msg >= 2)
-				GM->Message(0, "# + %.2f #### DEFENDER Armor Bonus [Defense Skill %i Heroic Agi %i]", mitigation_rating - tmp_armor, GetSkill(EQEmu::skills::SkillDefense), itembonuses.HeroicAGI);
+				GM->Message(Chat::White, "# + %.2f #### DEFENDER Armor Bonus [Defense Skill %i Heroic Agi %i]", mitigation_rating - tmp_armor, GetSkill(EQEmu::skills::SkillDefense), itembonuses.HeroicAGI);
 
 		}
 		mitigation_rating *= 0.847;
 
 		if (Msg >= 1)
-			GM->Message(0, "# %.2f #### DEFENDER Final Mitigation Rating", mitigation_rating);
+			GM->Message(Chat::White, "# %.2f #### DEFENDER Final Mitigation Rating", mitigation_rating);
 
 		
 		if (Msg >= 2){
-			GM->Message(0, " ");
-			GM->Message(0, "### Mitigation Bonus Effects ###"); 
+			GM->Message(Chat::White, " ");
+			GM->Message(Chat::White, "### Mitigation Bonus Effects ###");
 			if (itembonuses.MeleeMitigation)
-				GM->Message(0, "# %i #### DEFENDER Item Mod2 Shielding", itembonuses.MeleeMitigation);
+				GM->Message(Chat::White, "# %i #### DEFENDER Item Mod2 Shielding", itembonuses.MeleeMitigation);
 			if (aabonuses.MeleeMitigationEffect)
-				GM->Message(0, "# %i #### DEFENDER SE_MeleeMitigation(168) AA Bonus", aabonuses.MeleeMitigationEffect);
+				GM->Message(Chat::White, "# %i #### DEFENDER SE_MeleeMitigation(168) AA Bonus", aabonuses.MeleeMitigationEffect);
 			if (spellbonuses.MeleeMitigationEffect)
-				GM->Message(0, "# %i #### DEFENDER SE_MeleeMitigation(168) Spell Bonus", spellbonuses.MeleeMitigationEffect);
+				GM->Message(Chat::White, "# %i #### DEFENDER SE_MeleeMitigation(168) Spell Bonus", spellbonuses.MeleeMitigationEffect);
 			if (itembonuses.MeleeMitigationEffect)
-				GM->Message(0, "# %i #### DEFENDER SE_MeleeMitigation(168) Worn Bonus", itembonuses.MeleeMitigationEffect);
+				GM->Message(Chat::White, "# %i #### DEFENDER SE_MeleeMitigation(168) Worn Bonus", itembonuses.MeleeMitigationEffect);
 		}
 
 		mitigation_rating = mod_mitigation_rating(mitigation_rating, attacker);
@@ -458,31 +458,31 @@ int32 Mob::Tune_MeleeMitigation(Mob* GM, Mob *attacker, int32 damage, int32 minh
 		attack_rating = attacker->mod_attack_rating(attack_rating, this);
 
 		if (Msg >= 2){
-			GM->Message(0, " "); 
-			GM->Message(0, "### Calculate Attack Rating ###"); 
+			GM->Message(Chat::White, " ");
+			GM->Message(Chat::White, "### Calculate Attack Rating ###");
 			if (attacker->IsClient()){
-				GM->Message(0, "# %i #### ATTACKER Worn/Equip ATK Bonus", attacker->itembonuses.ATK);
-				GM->Message(0, "# %i #### ATTACKER SE_ATK(2) AA Bonus", attacker->aabonuses.ATK);
-				GM->Message(0, "# %i #### ATTACKER SE_ATK(2) spell Bonus", attacker->spellbonuses.ATK);
-				GM->Message(0, "# %i #### ATTACKER Leadership Bonus", attacker->CastToClient()->GroupLeadershipAAOffenseEnhancement());
-				GM->Message(0, "# %i #### ATTACKER Worn/Equip ATK Bonus", attacker->itembonuses.ATK);
-				GM->Message(0, "# %i #### ATTACKER Worn/Equip ATK Bonus", attacker->itembonuses.ATK);
-				GM->Message(0, "# %.2f #### ATTACKER Strength Stat ATK Bonus [Stat Amt: %i]", ((attacker->GetSTR()-66) * 0.9),attacker->GetSTR());
-				GM->Message(0, "# %.2f #### ATTACKER Offensive Skill ATK Bonus [Stat Amt: %i]", (attacker->GetSkill(EQEmu::skills::SkillOffense)*1.345), attacker->GetSkill(EQEmu::skills::SkillOffense));
+				GM->Message(Chat::White, "# %i #### ATTACKER Worn/Equip ATK Bonus", attacker->itembonuses.ATK);
+				GM->Message(Chat::White, "# %i #### ATTACKER SE_ATK(2) AA Bonus", attacker->aabonuses.ATK);
+				GM->Message(Chat::White, "# %i #### ATTACKER SE_ATK(2) spell Bonus", attacker->spellbonuses.ATK);
+				GM->Message(Chat::White, "# %i #### ATTACKER Leadership Bonus", attacker->CastToClient()->GroupLeadershipAAOffenseEnhancement());
+				GM->Message(Chat::White, "# %i #### ATTACKER Worn/Equip ATK Bonus", attacker->itembonuses.ATK);
+				GM->Message(Chat::White, "# %i #### ATTACKER Worn/Equip ATK Bonus", attacker->itembonuses.ATK);
+				GM->Message(Chat::White, "# %.2f #### ATTACKER Strength Stat ATK Bonus [Stat Amt: %i]", ((attacker->GetSTR()-66) * 0.9),attacker->GetSTR());
+				GM->Message(Chat::White, "# %.2f #### ATTACKER Offensive Skill ATK Bonus [Stat Amt: %i]", (attacker->GetSkill(EQEmu::skills::SkillOffense)*1.345), attacker->GetSkill(EQEmu::skills::SkillOffense));
 			}
 				
 			else{
-				GM->Message(0, "# %i #### ATTACKER Worn/Equip ATK Bonus", attacker->itembonuses.ATK);
-				GM->Message(0, "# %i #### ATTACKER SE_ATK(2) spell Bonus", attacker->spellbonuses.ATK);
-				GM->Message(0, "# %i #### ATTACKER NPC ATK Stat", attacker->CastToNPC()->ATK);
-				GM->Message(0, "# %.2f #### ATTACKER Strength Stat ATK Bonus [Stat Amt: %i]", ((attacker->GetSTR()-66) * 0.9),attacker->GetSTR());
-				GM->Message(0, "# %.2f #### ATTACKER Offensive Skill ATK Bonus [Stat Amt: %i]", (attacker->GetSkill(EQEmu::skills::SkillOffense)*1.345), attacker->GetSkill(EQEmu::skills::SkillOffense));
+				GM->Message(Chat::White, "# %i #### ATTACKER Worn/Equip ATK Bonus", attacker->itembonuses.ATK);
+				GM->Message(Chat::White, "# %i #### ATTACKER SE_ATK(2) spell Bonus", attacker->spellbonuses.ATK);
+				GM->Message(Chat::White, "# %i #### ATTACKER NPC ATK Stat", attacker->CastToNPC()->ATK);
+				GM->Message(Chat::White, "# %.2f #### ATTACKER Strength Stat ATK Bonus [Stat Amt: %i]", ((attacker->GetSTR()-66) * 0.9),attacker->GetSTR());
+				GM->Message(Chat::White, "# %.2f #### ATTACKER Offensive Skill ATK Bonus [Stat Amt: %i]", (attacker->GetSkill(EQEmu::skills::SkillOffense)*1.345), attacker->GetSkill(EQEmu::skills::SkillOffense));
 			}
 		}
 
 		if (Msg >= 1){
-			GM->Message(0, "# %.2f #### ATTACKER Final Attack Rating", attack_rating);
-			GM->Message(0, "######### Melee Mitigation Report: Complete #########", Msg);
+			GM->Message(Chat::White, "# %.2f #### ATTACKER Final Attack Rating", attack_rating);
+			GM->Message(Chat::White, "######### Melee Mitigation Report: Complete #########", Msg);
 		}
 
 
@@ -693,7 +693,7 @@ void Mob::Tune_FindAccuaryByHitChance(Mob* defender, Mob *attacker, float hit_ch
 		tmp_hit_chance = Tune_CheckHitChance(defender, attacker, skillinuse, EQEmu::invslot::slotPrimary, 0, false, 0, avoid_override, add_acc);
 
 		if (Msg >= 3)
-			Message(15, "#Tune - Processing... [%i] [ACCURACY %i] Hit Chance %.2f ",j,add_acc,tmp_hit_chance);
+			Message(Chat::Yellow, "#Tune - Processing... [%i] [ACCURACY %i] Hit Chance %.2f ",j,add_acc,tmp_hit_chance);
 
 		if (interval > 0 && tmp_hit_chance >= hit_chance){
 			end = true;
@@ -727,8 +727,8 @@ void Mob::Tune_FindAccuaryByHitChance(Mob* defender, Mob *attacker, float hit_ch
 		add_acc = add_acc + interval;
 	}
 
-	Message(7, "#Tune - Error: Unable to find desired result for (%.0f) pct - Increase interval (%i) AND/OR max loop value (%i) and run again.", hit_chance, interval, max_loop);
-	Message(7, "#Tune - Parse ended at ACCURACY ADJUSTMENTT ( %i ) at hit chance of (%.0f) / (%.0f) pct.",add_acc,tmp_hit_chance / hit_chance);
+	Message(Chat::LightGray, "#Tune - Error: Unable to find desired result for (%.0f) pct - Increase interval (%i) AND/OR max loop value (%i) and run again.", hit_chance, interval, max_loop);
+	Message(Chat::LightGray, "#Tune - Parse ended at ACCURACY ADJUSTMENTT ( %i ) at hit chance of (%.0f) / (%.0f) pct.",add_acc,tmp_hit_chance / hit_chance);
 }
 
 void Mob::Tune_FindAvoidanceByHitChance(Mob* defender, Mob *attacker, float hit_chance, int interval, int max_loop, int acc_override, int Msg)
diff --git a/zone/waypoints.cpp b/zone/waypoints.cpp
index fb0a85490..ebbf5fda5 100644
--- a/zone/waypoints.cpp
+++ b/zone/waypoints.cpp
@@ -57,7 +57,16 @@ void NPC::AI_SetRoambox(float max_distance, float roam_distance_variance, uint32
 	);
 }
 
-void NPC::AI_SetRoambox(float distance, float max_x, float min_x, float max_y, float min_y, uint32 delay, uint32 min_delay) {
+void NPC::AI_SetRoambox(
+	float distance,
+	float max_x,
+	float min_x,
+	float max_y,
+	float min_y,
+	uint32 delay,
+	uint32 min_delay
+)
+{
 	roambox_distance      = distance;
 	roambox_max_x         = max_x;
 	roambox_min_x         = min_x;
@@ -70,18 +79,18 @@ void NPC::AI_SetRoambox(float distance, float max_x, float min_x, float max_y, f
 
 void NPC::DisplayWaypointInfo(Client *c) {
 
-	c->Message(0, "Mob is on grid %d, in spawn group %d, on waypoint %d/%d",
-		GetGrid(),
-		GetSp2(),
-		GetCurWp(),
-		GetMaxWp());
+	c->Message(Chat::White, "Mob is on grid %d, in spawn group %d, on waypoint %d/%d",
+			   GetGrid(),
+			   GetSpawnGroupId(),
+			   GetCurWp(),
+			   GetMaxWp());
 
 
 	std::vector<wplist>::iterator cur, end;
 	cur = Waypoints.begin();
 	end = Waypoints.end();
 	for (; cur != end; ++cur) {
-		c->Message(0, "Waypoint %d: (%.2f,%.2f,%.2f,%.2f) pause %d",
+		c->Message(Chat::White, "Waypoint %d: (%.2f,%.2f,%.2f,%.2f) pause %d",
 			cur->index,
 			cur->x,
 			cur->y,
@@ -895,7 +904,7 @@ void ZoneDatabase::AssignGrid(Client *client, int grid, int spawn2id) {
 		return;
 	}
 
-	client->Message(0, "Grid assign: spawn2 id = %d updated", spawn2id);
+	client->Message(Chat::White, "Grid assign: spawn2 id = %d updated", spawn2id);
 }
 
 
diff --git a/zone/worldserver.cpp b/zone/worldserver.cpp
index 2487e9a39..dd15f4216 100644
--- a/zone/worldserver.cpp
+++ b/zone/worldserver.cpp
@@ -200,29 +200,35 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 			break;
 		ServerChannelMessage_Struct* scm = (ServerChannelMessage_Struct*)pack->pBuffer;
 		if (scm->deliverto[0] == 0) {
-			entity_list.ChannelMessageFromWorld(scm->from, scm->to, scm->chan_num, scm->guilddbid, scm->language, scm->message);
+			entity_list.ChannelMessageFromWorld(scm->from, scm->to, scm->chan_num, scm->guilddbid, scm->language, scm->lang_skill, scm->message);
 		}
 		else {
 			Client* client = entity_list.GetClientByName(scm->deliverto);
-			if (client) {
-				if (client->Connected()) {
+			if (client && client->Connected()) {
+				if (scm->chan_num == ChatChannel_TellEcho) {
 					if (scm->queued == 1) // tell was queued
 						client->Tell_StringID(QUEUED_TELL, scm->to, scm->message);
 					else if (scm->queued == 2) // tell queue was full
 						client->Tell_StringID(QUEUE_TELL_FULL, scm->to, scm->message);
 					else if (scm->queued == 3) // person was offline
-						client->Message_StringID(MT_TellEcho, TOLD_NOT_ONLINE, scm->to);
-					else // normal stuff
-						client->ChannelMessageSend(scm->from, scm->to, scm->chan_num, scm->language, scm->message);
-					if (!scm->noreply && scm->chan_num != 2) { //dont echo on group chat
-															   // if it's a tell, echo back so it shows up
-						scm->noreply = true;
-						scm->chan_num = 14;
+						client->MessageString(Chat::EchoTell, TOLD_NOT_ONLINE, scm->to);
+					else // normal tell echo "You told Soanso, 'something'"
+							// tell echo doesn't use language, so it looks normal to you even if nobody can understand your tells
+						client->ChannelMessageSend(scm->from, scm->to, scm->chan_num, 0, 100, scm->message);
+				}
+				else if (scm->chan_num == ChatChannel_Tell) {
+					client->ChannelMessageSend(scm->from, scm->to, scm->chan_num, scm->language, scm->lang_skill, scm->message);
+					if (scm->queued == 0) { // this is not a queued tell
+						// if it's a tell, echo back to acknowledge it and make it show on the sender's client
+						scm->chan_num = ChatChannel_TellEcho;
 						memset(scm->deliverto, 0, sizeof(scm->deliverto));
 						strcpy(scm->deliverto, scm->from);
 						SendPacket(pack);
 					}
 				}
+				else {
+					client->ChannelMessageSend(scm->from, scm->to, scm->chan_num, scm->language, scm->lang_skill, scm->message);
+				}
 			}
 		}
 		break;
@@ -368,15 +374,15 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 			switch (ztz->response)
 			{
 			case -2: {
-				entity->CastToClient()->Message(13, "You do not own the required locations to enter this zone.");
+				entity->CastToClient()->Message(Chat::Red, "You do not own the required locations to enter this zone.");
 				break;
 			}
 			case -1: {
-				entity->CastToClient()->Message(13, "The zone is currently full, please try again later.");
+				entity->CastToClient()->Message(Chat::Red, "The zone is currently full, please try again later.");
 				break;
 			}
 			case 0: {
-				entity->CastToClient()->Message(13, "All zone servers are taken at this time, please try again later.");
+				entity->CastToClient()->Message(Chat::Red, "All zone servers are taken at this time, please try again later.");
 				break;
 			}
 			}
@@ -408,7 +414,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 			Client* client = entity_list.GetClientByID(wars->id);
 			if (client) {
 				if (pack->size == 64)//no results
-					client->Message_StringID(0, WHOALL_NO_RESULTS);
+					client->MessageString(Chat::White, WHOALL_NO_RESULTS);
 				else {
 					auto outapp = new EQApplicationPacket(OP_WhoAllResponse, pack->size);
 					memcpy(outapp->pBuffer, pack->pBuffer, pack->size);
@@ -528,7 +534,15 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		ServerZoneIncomingClient_Struct* szic = (ServerZoneIncomingClient_Struct*)pack->pBuffer;
 		if (is_zone_loaded) {
 			SetZoneData(zone->GetZoneID(), zone->GetInstanceID());
+
 			if (szic->zoneid == zone->GetZoneID()) {
+				auto client = entity_list.GetClientByLSID(szic->lsid);
+				if (client) {
+					client->Kick("Dropped by world CLE subsystem");
+					client->Save();
+				}
+
+				zone->RemoveAuth(szic->lsid);
 				zone->AddAuth(szic);
 				// This packet also doubles as "incoming client" notification, lets not shut down before they get here
 				zone->StartShutdownTimer(AUTHENTICATION_TIMEOUT * 1000);
@@ -541,13 +555,30 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		}
 		break;
 	}
+	case ServerOP_DropClient: {
+		if (pack->size != sizeof(ServerZoneDropClient_Struct)) {
+			break;
+		}
+
+		ServerZoneDropClient_Struct* drop = (ServerZoneDropClient_Struct*)pack->pBuffer;
+		if (zone) {
+			zone->RemoveAuth(drop->lsid);
+		
+			auto client = entity_list.GetClientByLSID(drop->lsid);
+			if (client) {
+				client->Kick("Dropped by world CLE subsystem");
+				client->Save();
+			}
+		}
+		break;
+	}
 	case ServerOP_ZonePlayer: {
 		ServerZonePlayer_Struct* szp = (ServerZonePlayer_Struct*)pack->pBuffer;
 		Client* client = entity_list.GetClientByName(szp->name);
 		printf("Zoning %s to %s(%u) - %u\n", client != nullptr ? client->GetCleanName() : "Unknown", szp->zone, database.GetZoneID(szp->zone), szp->instance_id);
 		if (client != 0) {
 			if (strcasecmp(szp->adminname, szp->name) == 0)
-				client->Message(0, "Zoning to: %s", szp->zone);
+				client->Message(Chat::White, "Zoning to: %s", szp->zone);
 			else if (client->GetAnon() == 1 && client->Admin() > szp->adminrank)
 				break;
 			else {
@@ -752,7 +783,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		Client* c = entity_list.GetClientByName(Rezzer);
 
 		if (c)
-			c->Message_StringID(MT_WornOff, REZZ_ALREADY_PENDING);
+			c->MessageString(Chat::SpellWornOff, REZZ_ALREADY_PENDING);
 
 		break;
 	}
@@ -879,7 +910,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 				entity_list.AddGroup(group);
 
 				if (group->GetID() == 0) {
-					Inviter->Message(13, "Unable to get new group id. Cannot create group.");
+					Inviter->Message(Chat::Red, "Unable to get new group id. Cannot create group.");
 					break;
 				}
 
@@ -1352,7 +1383,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 							if (r->members[x].GroupNumber == rmsg->gid) {
 								if (r->members[x].member->GetFilter(FilterGroupChat) != 0)
 								{
-									r->members[x].member->ChannelMessageSend(rmsg->from, r->members[x].member->GetName(), 2, 0, rmsg->message);
+									r->members[x].member->ChannelMessageSend(rmsg->from, r->members[x].member->GetName(), ChatChannel_Group, rmsg->language, rmsg->lang_skill, rmsg->message);
 								}
 							}
 						}
@@ -1377,7 +1408,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 						{
 							if (r->members[x].member->GetFilter(FilterGroupChat) != 0)
 							{
-								r->members[x].member->ChannelMessageSend(rmsg->from, r->members[x].member->GetName(), 15, 0, rmsg->message);
+								r->members[x].member->ChannelMessageSend(rmsg->from, r->members[x].member->GetName(), ChatChannel_Raid, rmsg->language, rmsg->lang_skill, rmsg->message);
 							}
 						}
 					}
@@ -1454,7 +1485,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		ServerOP_Consent_Struct* s = (ServerOP_Consent_Struct*)pack->pBuffer;
 		Client* client = entity_list.GetClientByName(s->ownername);
 		if (client) {
-			client->Message_StringID(0, s->message_string_id);
+			client->MessageString(Chat::White, s->message_string_id);
 		}
 		break;
 	}
@@ -1698,7 +1729,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		if (c)
 		{
 			c->ClearPendingAdventureDoorClick();
-			c->Message_StringID(13, 5141);
+			c->MessageString(Chat::Red, 5141);
 		}
 		break;
 	}
@@ -1720,7 +1751,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		if (c)
 		{
 			c->ClearPendingAdventureLeave();
-			c->Message(13, "You cannot leave this adventure at this time.");
+			c->Message(Chat::Red, "You cannot leave this adventure at this time.");
 		}
 		break;
 	}
@@ -1950,7 +1981,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 	}
 }
 
-bool WorldServer::SendChannelMessage(Client* from, const char* to, uint8 chan_num, uint32 guilddbid, uint8 language, const char* message, ...) {
+bool WorldServer::SendChannelMessage(Client* from, const char* to, uint8 chan_num, uint32 guilddbid, uint8 language, uint8 lang_skill, const char* message, ...) {
 	if (!worldserver.Connected())
 		return false;
 	va_list argptr;
@@ -1984,6 +2015,7 @@ bool WorldServer::SendChannelMessage(Client* from, const char* to, uint8 chan_nu
 	scm->chan_num = chan_num;
 	scm->guilddbid = guilddbid;
 	scm->language = language;
+	scm->lang_skill = lang_skill;
 	scm->queued = 0;
 	strcpy(scm->message, buffer);
 
diff --git a/zone/worldserver.h b/zone/worldserver.h
index 7dc6b02f8..4c1b9ab12 100644
--- a/zone/worldserver.h
+++ b/zone/worldserver.h
@@ -38,7 +38,7 @@ public:
 
 	void HandleMessage(uint16 opcode, const EQ::Net::Packet &p);
 
-	bool SendChannelMessage(Client* from, const char* to, uint8 chan_num, uint32 guilddbid, uint8 language, const char* message, ...);
+	bool SendChannelMessage(Client* from, const char* to, uint8 chan_num, uint32 guilddbid, uint8 language, uint8 lang_skill, const char* message, ...);
 	bool SendEmoteMessage(const char* to, uint32 to_guilddbid, uint32 type, const char* message, ...);
 	bool SendEmoteMessage(const char* to, uint32 to_guilddbid, int16 to_minstatus, uint32 type, const char* message, ...);
 	bool SendVoiceMacro(Client* From, uint32 Type, char* Target, uint32 MacroNumber, uint32 GroupOrRaidID = 0);
diff --git a/zone/zone.cpp b/zone/zone.cpp
index fc35c3499..0a84b3945 100755
--- a/zone/zone.cpp
+++ b/zone/zone.cpp
@@ -55,6 +55,7 @@
 #include "zone_config.h"
 #include "mob_movement_manager.h"
 #include "npc_scale_manager.h"
+#include "../common/data_verification.h"
 
 #include <time.h>
 #include <ctime>
@@ -864,6 +865,8 @@ Zone::Zone(uint32 in_zoneid, uint32 in_instanceid, const char* in_short_name)
 	m_last_ucss_update = 0;
 
 	mMovementManager = &MobMovementManager::Get();
+
+	SetNpcPositionUpdateDistance(0);
 }
 
 Zone::~Zone() {
@@ -1106,6 +1109,7 @@ void Zone::AddAuth(ServerZoneIncomingClient_Struct* szic) {
 	zca->accid = szic->accid;
 	zca->admin = szic->admin;
 	zca->charid = szic->charid;
+	zca->lsid = szic->lsid;
 	zca->tellsoff = szic->tellsoff;
 	strn0cpy(zca->charname, szic->charname, sizeof(zca->charname));
 	strn0cpy(zca->lskey, szic->lskey, sizeof(zca->lskey));
@@ -1113,16 +1117,31 @@ void Zone::AddAuth(ServerZoneIncomingClient_Struct* szic) {
 	client_auth_list.Insert(zca);
 }
 
-void Zone::RemoveAuth(const char* iCharName)
+void Zone::RemoveAuth(const char* iCharName, const char* iLSKey)
 {
 	LinkedListIterator<ZoneClientAuth_Struct*> iterator(client_auth_list);
 
 	iterator.Reset();
 	while (iterator.MoreElements()) {
 		ZoneClientAuth_Struct* zca = iterator.GetData();
-		if (strcasecmp(zca->charname, iCharName) == 0) {
-		iterator.RemoveCurrent();
-		return;
+		if (strcasecmp(zca->charname, iCharName) == 0 && strcasecmp(zca->lskey, iLSKey) == 0) {
+			iterator.RemoveCurrent();
+			return;
+		}
+		iterator.Advance();
+	}
+}
+
+void Zone::RemoveAuth(uint32 lsid)
+{
+	LinkedListIterator<ZoneClientAuth_Struct*> iterator(client_auth_list);
+
+	iterator.Reset();
+	while (iterator.MoreElements()) {
+		ZoneClientAuth_Struct* zca = iterator.GetData();
+		if (zca->lsid == lsid) {
+			iterator.RemoveCurrent();
+			continue;
 		}
 		iterator.Advance();
 	}
@@ -1178,9 +1197,9 @@ uint32 Zone::CountAuth() {
 bool Zone::Process() {
 	spawn_conditions.Process();
 
-	if(spawn2_timer.Check()) {
+	if (spawn2_timer.Check()) {
 
-		LinkedListIterator<Spawn2*> iterator(spawn2_list);
+		LinkedListIterator<Spawn2 *> iterator(spawn2_list);
 
 		EQEmu::InventoryProfile::CleanDirty();
 
@@ -1196,10 +1215,15 @@ bool Zone::Process() {
 			}
 		}
 
-		if(adv_data && !did_adventure_actions)
+		if (adv_data && !did_adventure_actions) {
 			DoAdventureActions();
+		}
 
+		if (GetNpcPositionUpdateDistance() == 0) {
+			CalculateNpcUpdateDistanceSpread();
+		}
 	}
+
 	if(initgrids_timer.Check()) {
 		//delayed grid loading stuff.
 		initgrids_timer.Disable();
@@ -1461,6 +1485,8 @@ bool Zone::Depop(bool StartSpawnTimer) {
 	// clear spell cache
 	database.ClearNPCSpells();
 
+	zone->spawn_group_list.ReloadSpawnGroups();
+
 	return true;
 }
 
@@ -1746,14 +1772,14 @@ void Zone::SpawnStatus(Mob* client) {
 	while(iterator.MoreElements())
 	{
 		if (iterator.GetData()->timer.GetRemainingTime() == 0xFFFFFFFF)
-			client->Message(0, "  %d: %1.1f, %1.1f, %1.1f: disabled", iterator.GetData()->GetID(), iterator.GetData()->GetX(), iterator.GetData()->GetY(), iterator.GetData()->GetZ());
+			client->Message(Chat::White, "  %d: %1.1f, %1.1f, %1.1f: disabled", iterator.GetData()->GetID(), iterator.GetData()->GetX(), iterator.GetData()->GetY(), iterator.GetData()->GetZ());
 		else
-			client->Message(0, "  %d: %1.1f, %1.1f, %1.1f: %1.2f", iterator.GetData()->GetID(), iterator.GetData()->GetX(), iterator.GetData()->GetY(), iterator.GetData()->GetZ(), (float)iterator.GetData()->timer.GetRemainingTime() / 1000);
+			client->Message(Chat::White, "  %d: %1.1f, %1.1f, %1.1f: %1.2f", iterator.GetData()->GetID(), iterator.GetData()->GetX(), iterator.GetData()->GetY(), iterator.GetData()->GetZ(), (float)iterator.GetData()->timer.GetRemainingTime() / 1000);
 
 		x++;
 		iterator.Advance();
 	}
-	client->Message(0, "%i spawns listed.", x);
+	client->Message(Chat::White, "%i spawns listed.", x);
 }
 
 void Zone::ShowEnabledSpawnStatus(Mob* client)
@@ -1768,7 +1794,7 @@ void Zone::ShowEnabledSpawnStatus(Mob* client)
 	{
 		if (iterator.GetData()->timer.GetRemainingTime() != 0xFFFFFFFF)
 		{
-			client->Message(0, "  %d: %1.1f, %1.1f, %1.1f: %1.2f", iterator.GetData()->GetID(), iterator.GetData()->GetX(), iterator.GetData()->GetY(), iterator.GetData()->GetZ(), (float)iterator.GetData()->timer.GetRemainingTime() / 1000);
+			client->Message(Chat::White, "  %d: %1.1f, %1.1f, %1.1f: %1.2f", iterator.GetData()->GetID(), iterator.GetData()->GetX(), iterator.GetData()->GetY(), iterator.GetData()->GetZ(), (float)iterator.GetData()->timer.GetRemainingTime() / 1000);
 			iEnabledCount++;
 		}
 
@@ -1776,7 +1802,7 @@ void Zone::ShowEnabledSpawnStatus(Mob* client)
 		iterator.Advance();
 	}
 
-	client->Message(0, "%i of %i spawns listed.", iEnabledCount, x);
+	client->Message(Chat::White, "%i of %i spawns listed.", iEnabledCount, x);
 }
 
 void Zone::ShowDisabledSpawnStatus(Mob* client)
@@ -1791,7 +1817,7 @@ void Zone::ShowDisabledSpawnStatus(Mob* client)
 	{
 		if (iterator.GetData()->timer.GetRemainingTime() == 0xFFFFFFFF)
 		{
-			client->Message(0, "  %d: %1.1f, %1.1f, %1.1f: disabled", iterator.GetData()->GetID(), iterator.GetData()->GetX(), iterator.GetData()->GetY(), iterator.GetData()->GetZ());
+			client->Message(Chat::White, "  %d: %1.1f, %1.1f, %1.1f: disabled", iterator.GetData()->GetID(), iterator.GetData()->GetX(), iterator.GetData()->GetY(), iterator.GetData()->GetZ());
 			iDisabledCount++;
 		}
 
@@ -1799,7 +1825,7 @@ void Zone::ShowDisabledSpawnStatus(Mob* client)
 		iterator.Advance();
 	}
 
-	client->Message(0, "%i of %i spawns listed.", iDisabledCount, x);
+	client->Message(Chat::White, "%i of %i spawns listed.", iDisabledCount, x);
 }
 
 void Zone::ShowSpawnStatusByID(Mob* client, uint32 spawnid)
@@ -1815,9 +1841,9 @@ void Zone::ShowSpawnStatusByID(Mob* client, uint32 spawnid)
 		if (iterator.GetData()->GetID() == spawnid)
 		{
 			if (iterator.GetData()->timer.GetRemainingTime() == 0xFFFFFFFF)
-				client->Message(0, "  %d: %1.1f, %1.1f, %1.1f: disabled", iterator.GetData()->GetID(), iterator.GetData()->GetX(), iterator.GetData()->GetY(), iterator.GetData()->GetZ());
+				client->Message(Chat::White, "  %d: %1.1f, %1.1f, %1.1f: disabled", iterator.GetData()->GetID(), iterator.GetData()->GetX(), iterator.GetData()->GetY(), iterator.GetData()->GetZ());
 			else
-				client->Message(0, "  %d: %1.1f, %1.1f, %1.1f: %1.2f", iterator.GetData()->GetID(), iterator.GetData()->GetX(), iterator.GetData()->GetY(), iterator.GetData()->GetZ(), (float)iterator.GetData()->timer.GetRemainingTime() / 1000);
+				client->Message(Chat::White, "  %d: %1.1f, %1.1f, %1.1f: %1.2f", iterator.GetData()->GetID(), iterator.GetData()->GetX(), iterator.GetData()->GetY(), iterator.GetData()->GetZ(), (float)iterator.GetData()->timer.GetRemainingTime() / 1000);
 
 			iSpawnIDCount++;
 
@@ -1829,9 +1855,9 @@ void Zone::ShowSpawnStatusByID(Mob* client, uint32 spawnid)
 	}
 
 	if(iSpawnIDCount > 0)
-		client->Message(0, "%i of %i spawns listed.", iSpawnIDCount, x);
+		client->Message(Chat::White, "%i of %i spawns listed.", iSpawnIDCount, x);
 	else
-		client->Message(0, "No matching spawn id was found in this zone.");
+		client->Message(Chat::White, "No matching spawn id was found in this zone.");
 }
 
 bool ZoneDatabase::GetDecayTimes(npcDecayTimes_Struct *npcCorpseDecayTimes)
@@ -2349,3 +2375,59 @@ void Zone::SetUCSServerAvailable(bool ucss_available, uint32 update_timestamp) {
 	if (m_last_ucss_update < update_timestamp)
 		m_ucss_available = ucss_available;
 }
+
+int Zone::GetNpcPositionUpdateDistance() const
+{
+	return npc_position_update_distance;
+}
+
+void Zone::SetNpcPositionUpdateDistance(int in_npc_position_update_distance)
+{
+	Zone::npc_position_update_distance = in_npc_position_update_distance;
+}
+
+void Zone::CalculateNpcUpdateDistanceSpread()
+{
+	float max_x = 0;
+	float max_y = 0;
+	float min_x = 0;
+	float min_y = 0;
+
+	auto &mob_list = entity_list.GetMobList();
+
+	for (auto &it : mob_list) {
+		Mob *entity = it.second;
+		if (!entity->IsNPC()) {
+			continue;
+		}
+
+		if (entity->GetX() <= min_x) {
+			min_x = entity->GetX();
+		}
+
+		if (entity->GetY() <= min_y) {
+			min_y = entity->GetY();
+		}
+
+		if (entity->GetX() >= max_x) {
+			max_x = entity->GetX();
+		}
+
+		if (entity->GetY() >= max_y) {
+			max_y = entity->GetY();
+		}
+	}
+
+	int x_spread        = int(abs(max_x - min_x));
+	int y_spread        = int(abs(max_y - min_y));
+	int combined_spread = int(abs((x_spread + y_spread) / 2));
+	int update_distance = EQEmu::ClampLower(int(combined_spread / 4), int(zone->GetMaxMovementUpdateRange()));
+
+	SetNpcPositionUpdateDistance(update_distance);
+
+	Log(Logs::General, Logs::Debug,
+		"NPC update spread distance set to [%i] combined_spread [%i]",
+		update_distance,
+		combined_spread
+	);
+}
\ No newline at end of file
diff --git a/zone/zone.h b/zone/zone.h
index e86fdc339..176fe0cb3 100755
--- a/zone/zone.h
+++ b/zone/zone.h
@@ -52,6 +52,7 @@ struct ZoneClientAuth_Struct {
 	uint32 accid;
 	int16  admin;
 	uint32 charid;
+	uint32 lsid;
 	bool   tellsoff;
 	char   charname[64];
 	char   lskey[30];
@@ -125,6 +126,9 @@ public:
 	bool Process();
 	bool SaveZoneCFG();
 
+	int GetNpcPositionUpdateDistance() const;
+	void SetNpcPositionUpdateDistance(int in_npc_position_update_distance);
+
 	char *adv_data;
 
 	const char *GetSpellBlockedMessage(uint32 spell_id, const glm::vec3 &location);
@@ -218,6 +222,7 @@ public:
 	void ChangeWeather();
 	void ClearBlockedSpells();
 	void ClearNPCTypeCache(int id);
+	void CalculateNpcUpdateDistanceSpread();
 	void DelAggroMob() { aggroedmobs--; }
 	void DeleteQGlobal(std::string name, uint32 npcID, uint32 charID, uint32 zoneID);
 	void Despawn(uint32 spawngroupID);
@@ -243,7 +248,8 @@ public:
 	void LoadZoneDoors(const char *zone, int16 version);
 	void ReloadStaticData();
 	void ReloadWorld(uint32 Option);
-	void RemoveAuth(const char *iCharName);
+	void RemoveAuth(const char *iCharName, const char *iLSKey);
+	void RemoveAuth(uint32 lsid);
 	void Repop(uint32 delay = 0);
 	void RepopClose(const glm::vec4 &client_position, uint32 repop_distance);
 	void RequestUCSServerStatus();
@@ -288,7 +294,7 @@ public:
 		 */
 		find_replace(message, std::string("%"), std::string("."));
 
-		if (message.find("\n") != std::string::npos) {
+		if (message.find('\n') != std::string::npos) {
 			auto message_split = SplitString(message, '\n');
 			entity_list.MessageStatus(
 				0,
@@ -343,6 +349,7 @@ private:
 	glm::vec4 m_Graveyard;
 	int       default_ruleset;
 	int       totalBS;
+	int       npc_position_update_distance;
 	int32     aggroedmobs;
 	uint8     zone_type;
 	uint16    instanceversion;
diff --git a/zone/zonedb.cpp b/zone/zonedb.cpp
index e2825da5a..91f456768 100755
--- a/zone/zonedb.cpp
+++ b/zone/zonedb.cpp
@@ -3061,10 +3061,10 @@ bool ZoneDatabase::SaveMerc(Merc *merc) {
 
 		auto results = database.QueryDatabase(query);
 		if(!results.Success()) {
-			owner->Message(13, results.ErrorMessage().c_str());
+			owner->Message(Chat::Red, results.ErrorMessage().c_str());
 			return false;
 		} else if (results.RowsAffected() != 1) {
-			owner->Message(13, "Unable to save merc to the database.");
+			owner->Message(Chat::Red, "Unable to save merc to the database.");
 			return false;
 		}
 
@@ -3095,10 +3095,10 @@ bool ZoneDatabase::SaveMerc(Merc *merc) {
 
 	auto results = database.QueryDatabase(query);
 	if (!results.Success()) {
-		owner->Message(13, results.ErrorMessage().c_str());
+		owner->Message(Chat::Red, results.ErrorMessage().c_str());
 		return false;
 	} else if (results.RowsAffected() != 1) {
-		owner->Message(13, "Unable to save merc to the database.");
+		owner->Message(Chat::Red, "Unable to save merc to the database.");
 		return false;
 	}
 
@@ -3544,10 +3544,10 @@ void ZoneDatabase::ListAllInstances(Client* client, uint32 charid)
 
     char name[64];
     database.GetCharName(charid, name);
-    client->Message(0, "%s is part of the following instances:", name);
+    client->Message(Chat::White, "%s is part of the following instances:", name);
 
     for (auto row = results.begin(); row != results.end(); ++row) {
-        client->Message(0, "%s - id: %lu, version: %lu", database.GetZoneName(atoi(row[1])),
+        client->Message(Chat::White, "%s - id: %lu, version: %lu", database.GetZoneName(atoi(row[1])),
 				(unsigned long)atoi(row[0]), (unsigned long)atoi(row[2]));
     }
 }
diff --git a/zone/zonedb.h b/zone/zonedb.h
index f2103715a..e93a40713 100644
--- a/zone/zonedb.h
+++ b/zone/zonedb.h
@@ -409,7 +409,7 @@ public:
 
 	/* Spawns and Spawn Points  */
 	bool		LoadSpawnGroups(const char* zone_name, uint16 version, SpawnGroupList* spawn_group_list);
-	bool		LoadSpawnGroupsByID(int spawngroupid, SpawnGroupList* spawn_group_list);
+	bool		LoadSpawnGroupsByID(int spawn_group_id, SpawnGroupList* spawn_group_list);
 	bool		PopulateZoneSpawnList(uint32 zoneid, LinkedList<Spawn2*> &spawn2_list, int16 version, uint32 repopdelay = 0);
 	bool		PopulateZoneSpawnListClose(uint32 zoneid, LinkedList<Spawn2*> &spawn2_list, int16 version, const glm::vec4& client_position, uint32 repop_distance);
 	Spawn2*		LoadSpawn2(LinkedList<Spawn2*> &spawn2_list, uint32 spawn2id, uint32 timeleft);
diff --git a/zone/zoning.cpp b/zone/zoning.cpp
index dbe9346b7..800ee8cd2 100644
--- a/zone/zoning.cpp
+++ b/zone/zoning.cpp
@@ -96,7 +96,7 @@ void Client::Handle_OP_ZoneChange(const EQApplicationPacket *app) {
 				//that can be a valid un-zolicited zone request?
 
 				//Todo cheat detection
-				Message(13, "Invalid unsolicited zone request.");
+				Message(Chat::Red, "Invalid unsolicited zone request.");
 				Log(Logs::General, Logs::Error, "Zoning %s: Invalid unsolicited zone request to zone id '%d'.", GetName(), target_zone_id);
 				SendZoneCancel(zc);
 				return;
@@ -142,14 +142,14 @@ void Client::Handle_OP_ZoneChange(const EQApplicationPacket *app) {
 		//make sure we are in it and it's unexpired.
 		if(!database.VerifyInstanceAlive(target_instance_id, CharacterID()))
 		{
-			Message(13, "Instance ID was expired or you were not in it.");
+			Message(Chat::Red, "Instance ID was expired or you were not in it.");
 			SendZoneCancel(zc);
 			return;
 		}
 
 		if(!database.VerifyZoneInstance(target_zone_id, target_instance_id))
 		{
-			Message(13, "Instance ID was %u does not go with zone id %u", target_instance_id, target_zone_id);
+			Message(Chat::Red, "Instance ID was %u does not go with zone id %u", target_instance_id, target_zone_id);
 			SendZoneCancel(zc);
 			return;
 		}
@@ -159,7 +159,7 @@ void Client::Handle_OP_ZoneChange(const EQApplicationPacket *app) {
 	const char *target_zone_name = database.GetZoneName(target_zone_id);
 	if(target_zone_name == nullptr) {
 		//invalid zone...
-		Message(13, "Invalid target zone ID.");
+		Message(Chat::Red, "Invalid target zone ID.");
 		Log(Logs::General, Logs::Error, "Zoning %s: Unable to get zone name for zone id '%d'.", GetName(), target_zone_id);
 		SendZoneCancel(zc);
 		return;
@@ -172,7 +172,7 @@ void Client::Handle_OP_ZoneChange(const EQApplicationPacket *app) {
 	char flag_needed[128];
 	if(!database.GetSafePoints(target_zone_name, database.GetInstanceVersion(target_instance_id), &safe_x, &safe_y, &safe_z, &minstatus, &minlevel, flag_needed)) {
 		//invalid zone...
-		Message(13, "Invalid target zone while getting safe points.");
+		Message(Chat::Red, "Invalid target zone while getting safe points.");
 		Log(Logs::General, Logs::Error, "Zoning %s: Unable to get safe coordinates for zone '%s'.", GetName(), target_zone_name);
 		SendZoneCancel(zc);
 		return;
@@ -277,7 +277,7 @@ void Client::Handle_OP_ZoneChange(const EQApplicationPacket *app) {
 		//the flag needed string is not empty, meaning a flag is required.
 		if(Admin() < minStatusToIgnoreZoneFlags && !HasZoneFlag(target_zone_id))
 		{
-			Message(13, "You do not have the flag to enter %s.", target_zone_name);
+			Message(Chat::Red, "You do not have the flag to enter %s.", target_zone_name);
 			myerror = ZONE_ERROR_NOEXPERIENCE;
 		}
 	}
@@ -453,7 +453,7 @@ void Client::ProcessMovePC(uint32 zoneID, uint32 instance_id, float x, float y,
 			ZonePC(zoneID, instance_id, x, y, z, heading, ignorerestrictions, zm);
 			break;
 		case GMSummon:
-			Message(15, "You have been summoned by a GM!");
+			Message(Chat::Yellow, "You have been summoned by a GM!");
 			ZonePC(zoneID, instance_id, x, y, z, heading, ignorerestrictions, zm);
 			break;
 		case ZoneToBindPoint:
@@ -463,11 +463,11 @@ void Client::ProcessMovePC(uint32 zoneID, uint32 instance_id, float x, float y,
 			ZonePC(zoneID, instance_id, x, y, z, heading, ignorerestrictions, zm);
 			break;
 		case SummonPC:
-			Message(15, "You have been summoned!");
+			Message(Chat::Yellow, "You have been summoned!");
 			ZonePC(zoneID, instance_id, x, y, z, heading, ignorerestrictions, zm);
 			break;
 		case Rewind:
-			Message(15, "Rewinding to previous location.");
+			Message(Chat::Yellow, "Rewinding to previous location.");
 			ZonePC(zoneID, instance_id, x, y, z, heading, ignorerestrictions, zm);
 			break;
 		default:
@@ -486,7 +486,7 @@ void Client::ZonePC(uint32 zoneID, uint32 instance_id, float x, float y, float z
 	database.GetZoneLongName(pShortZoneName, &pZoneName);
 
 	if(!pZoneName) {
-		Message(13, "Invalid zone number specified");
+		Message(Chat::Red, "Invalid zone number specified");
 		safe_delete_array(pZoneName);
 		return;
 	}
@@ -560,7 +560,7 @@ void Client::ZonePC(uint32 zoneID, uint32 instance_id, float x, float y, float z
 			Entity* entity = entity_list.GetID(entity_id_being_looted);
 			if (entity == 0)
 			{
-				Message(13, "Error: OP_EndLootRequest: Corpse not found (ent = 0)");
+				Message(Chat::Red, "Error: OP_EndLootRequest: Corpse not found (ent = 0)");
 				if (ClientVersion() >= EQEmu::versions::ClientVersion::SoD)
 					Corpse::SendEndLootErrorPacket(this);
 				else
@@ -568,7 +568,7 @@ void Client::ZonePC(uint32 zoneID, uint32 instance_id, float x, float y, float z
 			}
 			else if (!entity->IsCorpse())
 			{
-				Message(13, "Error: OP_EndLootRequest: Corpse not found (!entity->IsCorpse())");
+				Message(Chat::Red, "Error: OP_EndLootRequest: Corpse not found (!entity->IsCorpse())");
 				Corpse::SendLootReqErrorPacket(this);
 			}
 			else
@@ -723,7 +723,7 @@ void Client::Gate(uint8 bindnum) {
 }
 
 void NPC::Gate(uint8 bindnum) {
-	entity_list.MessageClose_StringID(this, true, RuleI(Range, SpellMessages), MT_Spells, GATES, GetCleanName());
+	entity_list.MessageCloseString(this, true, RuleI(Range, SpellMessages), Chat::Spells, GATES, GetCleanName());
 
 	Mob::Gate(bindnum);
 }
@@ -814,7 +814,7 @@ bool Client::HasZoneFlag(uint32 zone_id) const {
 
 void Client::SendZoneFlagInfo(Client *to) const {
 	if(zone_flags.empty()) {
-		to->Message(0, "%s has no zone flags.", GetName());
+		to->Message(Chat::White, "%s has no zone flags.", GetName());
 		return;
 	}
 
@@ -823,7 +823,7 @@ void Client::SendZoneFlagInfo(Client *to) const {
 	end = zone_flags.end();
 	char empty[1] = { '\0' };
 
-	to->Message(0, "Flags for %s:", GetName());
+	to->Message(Chat::White, "Flags for %s:", GetName());
 
 	for(; cur != end; ++cur) {
 		uint32 zoneid = *cur;
@@ -843,7 +843,7 @@ void Client::SendZoneFlagInfo(Client *to) const {
 			strcpy(flag_name, "(ERROR GETTING NAME)");
 		}
 
-		to->Message(0, "Has Flag %s for zone %s (%d,%s)", flag_name, long_name, zoneid, short_name);
+		to->Message(Chat::White, "Has Flag %s for zone %s (%d,%s)", flag_name, long_name, zoneid, short_name);
 		if(long_name != empty)
 			delete[] long_name;
 	}