diff --git a/code/datums/chat_message.dm b/code/datums/chat_message.dm
index 710273edba0..3b443410567 100644
--- a/code/datums/chat_message.dm
+++ b/code/datums/chat_message.dm
@@ -151,8 +151,15 @@ var/list/runechat_image_cache = list()
 	// If we heard our name, it's important
 	// Differnt from our own system of name emphasis, maybe unify
 	var/list/names = splittext(owner.name, " ")
-	for (var/word in names)
-		text = replacetext(text, word, span_bold("[word]"))
+	var/list/parts = list(owner.name)
+
+	for(var/word in names)
+		if(length(word) > 3)
+			parts += word
+
+	var/regex/message_regex = new("\\b(" + parts.Join("|") + ")\\b(?!\[^<]*>)", "gi")
+
+	text = message_regex.Replace_char(text, span_bold("$1"))
 
 	var/list/prefixes
 
diff --git a/code/modules/pda/ai.dm b/code/modules/pda/ai.dm
index 7ef6b223ccf..50275a6ee2b 100644
--- a/code/modules/pda/ai.dm
+++ b/code/modules/pda/ai.dm
@@ -9,7 +9,8 @@
 		new/datum/data/pda/app/main_menu,
 		new/datum/data/pda/app/notekeeper,
 		new/datum/data/pda/app/news,
-		new/datum/data/pda/app/messenger)
+		new/datum/data/pda/app/messenger,
+		new/datum/data/pda/app/game_launcher)
 	special_handling = TRUE
 
 /obj/item/pda/ai/proc/set_name_and_job(newname as text, newjob as text, newrank as null|text)
diff --git a/code/modules/vore/eating/belly_import.dm b/code/modules/vore/eating/belly_import.dm
index e0230506952..a2186b81de4 100644
--- a/code/modules/vore/eating/belly_import.dm
+++ b/code/modules/vore/eating/belly_import.dm
@@ -905,6 +905,16 @@
 			for(var/at_flag in belly_data["autotransfer_blacklist"])
 				new_belly.autotransfer_blacklist += new_belly.autotransfer_flags_list[at_flag]
 
+		if(islist(belly_data["autotransfer_whitelist_items"]))
+			new_belly.autotransfer_whitelist_items = 0
+			for(var/at_flag in belly_data["autotransfer_whitelist_items"])
+				new_belly.autotransfer_whitelist_items += new_belly.autotransfer_flags_list_items[at_flag]
+
+		if(islist(belly_data["autotransfer_blacklist_items"]))
+			new_belly.autotransfer_blacklist_items = 0
+			for(var/at_flag in belly_data["autotransfer_blacklist_items"])
+				new_belly.autotransfer_blacklist_items += new_belly.autotransfer_flags_list_items[at_flag]
+
 		if(islist(belly_data["autotransfer_secondary_whitelist"]))
 			new_belly.autotransfer_secondary_whitelist = 0
 			for(var/at_flag in belly_data["autotransfer_secondary_whitelist"])
@@ -915,6 +925,16 @@
 			for(var/at_flag in belly_data["autotransfer_secondary_blacklist"])
 				new_belly.autotransfer_secondary_blacklist += new_belly.autotransfer_flags_list[at_flag]
 
+		if(islist(belly_data["autotransfer_secondary_whitelist_items"]))
+			new_belly.autotransfer_secondary_whitelist_items = 0
+			for(var/at_flag in belly_data["autotransfer_secondary_whitelist_items"])
+				new_belly.autotransfer_secondary_whitelist_items += new_belly.autotransfer_flags_list_items[at_flag]
+
+		if(islist(belly_data["autotransfer_secondary_blacklist_items"]))
+			new_belly.autotransfer_secondary_blacklist_items = 0
+			for(var/at_flag in belly_data["autotransfer_secondary_blacklist_items"])
+				new_belly.autotransfer_secondary_blacklist_items += new_belly.autotransfer_flags_list_items[at_flag]
+
 		if(isnum(belly_data["absorbchance"]))
 			var/new_absorbchance = belly_data["absorbchance"]
 			new_belly.absorbchance = sanitize_integer(new_absorbchance, 0, 100, initial(new_belly.absorbchance))
diff --git a/dependencies.sh b/dependencies.sh
index 9741786a368..0c588f7020b 100644
--- a/dependencies.sh
+++ b/dependencies.sh
@@ -8,7 +8,7 @@ export BYOND_MAJOR=516
 export BYOND_MINOR=1677
 
 # Macro Count
-export MACRO_COUNT=6
+export MACRO_COUNT=7
 
 #rust_g git tag
 export RUST_G_VERSION=6.0.1
diff --git a/interface/skin.dmf b/interface/skin.dmf
index c50364e41c7..d9d0e6ecefc 100644
--- a/interface/skin.dmf
+++ b/interface/skin.dmf
@@ -1327,7 +1327,7 @@ window "mapwindow"
 		saved-params = "icon-size"
 		on-show = ".winset\"mainwindow.mainvsplit.left=mapwindow\""
 		on-hide = ".winset\"mainwindow.mainvsplit.left=\""
-		style = ".center { text-align: center; } .runechatdiv {background-color: #20202070} .black_outline { -dm-text-outline: 1px black } .boldtext { font-weight: bold; } .maptext { font-family: 'Grand9K Pixel'; font-size: 6pt; -dm-text-outline: 1px black; color: white; line-height: 1.0; } .command_headset { font-weight: bold;\tfont-size: 8px; } .small { font-size: 6px; } .very_small { font-size: 5px;} .big { font-size: 8px; } .reallybig { font-size: 8px; } .extremelybig { font-size: 8px; } .greentext { color: #00FF00; font-size: 7px; } .redtext { color: #FF0000; font-size: 7px; } .clown { color: #FF69Bf; font-size: 7px;  font-weight: bold; } .his_grace { color: #15D512; } .hypnophrase { color: #0d0d0d; font-weight: bold; } .yell { font-weight: bold; } .italics { font-size: 7px; font-style: italic; }"
+		style = ".center { text-align: center; } .runechatdiv {background-color: #20202070} .black_outline { -dm-text-outline: 1px black } .bold { font-weight: bold; } .maptext { font-family: 'Grand9K Pixel'; font-size: 6pt; -dm-text-outline: 1px black; color: white; line-height: 1.0; } .command_headset { font-weight: bold;\tfont-size: 8px; } .small { font-size: 6px; } .very_small { font-size: 5px;} .big { font-size: 8px; } .reallybig { font-size: 8px; } .extremelybig { font-size: 8px; } .greentext { color: #00FF00; font-size: 7px; } .redtext { color: #FF0000; font-size: 7px; } .clown { color: #FF69Bf; font-size: 7px;  font-weight: bold; } .his_grace { color: #15D512; } .hypnophrase { color: #0d0d0d; font-weight: bold; } .yell { font-weight: bold; } .italics { font-size: 7px; font-style: italic; }"
 	elem "lobby_browser"
 		type = BROWSER
 		pos = 0,0