diff --git a/code/__DEFINES/color_defines.dm b/code/__DEFINES/color_defines.dm
index 2f8c847c66ee..98aa5963c3bd 100644
--- a/code/__DEFINES/color_defines.dm
+++ b/code/__DEFINES/color_defines.dm
@@ -129,6 +129,11 @@
 #define COLOR_THEME_OPERATIVE "#B8221F"
 #define COLOR_THEME_GLASS "#75A4C4"
 #define COLOR_THEME_CLOCKWORK "#CFBA47"
+// SS220 ADDITION - START
+#define COLOR_THEME_VAPORWAVE "#bc3ce3"
+#define COLOR_THEME_DETECTIVE "#c7b08b"
+#define COLOR_THEME_TRASENKNOX "#3ce375"
+// SS220 ADDITION - END
 
 // Color matrix utilities
 #define COLOR_MATRIX_ADD(C) list(COLOR_RED, COLOR_GREEN, COLOR_BLUE, C)
diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm
index ac905dd1216a..4aa40db1f936 100644
--- a/code/__HELPERS/type2type.dm
+++ b/code/__HELPERS/type2type.dm
@@ -209,16 +209,16 @@
 			return 'icons/mob/screen_white.dmi'
 		if("Midnight")
 			return 'icons/mob/screen_midnight.dmi'
-		// SS220 ADDITION START
+		// SS220 ADDITION - START
 		if("Vaporwave")
 			return 'modular_ss220/aesthetics/skin/icons/screen_vaporwave.dmi'
 		if("Detective")
 			return 'modular_ss220/aesthetics/skin/icons/screen_detective.dmi'
-		if("Trasen")
+		if("Trasenknox")
 			return 'modular_ss220/aesthetics/skin/icons/screen_trasenknox.dmi'
 		if("Clockwork")
 			return 'modular_ss220/aesthetics/skin/icons/screen_clockwork.dmi'
-		// SS220 ADDITION END
+		// SS220 ADDITION - END
 		else
 			return 'icons/mob/screen_midnight.dmi'
 
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index d6ba038494ce..05dd35832fbf 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -779,6 +779,14 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons
 				outline_color = COLOR_THEME_CLOCKWORK //if you want free gbp go fix the fact that clockwork's tooltip css is glass'
 			if("glass")
 				outline_color = COLOR_THEME_GLASS
+			// SS220 ADDITION - START
+			if("vaporwave")
+				outline_color = COLOR_THEME_VAPORWAVE
+			if("detective")
+				outline_color = COLOR_THEME_DETECTIVE
+			if("trasenknox")
+				outline_color = COLOR_THEME_TRASENKNOX
+			// SS220 ADDITION - END
 			else //this should never happen, hopefully
 				outline_color = COLOR_WHITE
 	if(color)
diff --git a/code/modules/client/preference/link_processing.dm b/code/modules/client/preference/link_processing.dm
index 266f9098890e..afe4b0716fed 100644
--- a/code/modules/client/preference/link_processing.dm
+++ b/code/modules/client/preference/link_processing.dm
@@ -929,7 +929,7 @@
 				if("hear_adminhelps")
 					sound ^= SOUND_ADMINHELP
 				if("ui")
-					var/new_UI_style = tgui_input_list(user, "Choose your UI style", "UI style", list("Midnight", "Plasmafire", "Retro", "Slimecore", "Operative", "White"))
+					var/new_UI_style = tgui_input_list(user, "Choose your UI style", "UI style", list("Midnight", "Plasmafire", "Retro", "Slimecore", "Operative", "White", "Vaporwave", "Detective", "Trasenknox", "Clockwork")) // SS220 EDIT "Vaporwave, Detective, Trasenknox, Clockwork"
 					if(!new_UI_style)
 						return
 					switch(new_UI_style)
@@ -945,16 +945,16 @@
 							UI_style = "Operative"
 						if("White")
 							UI_style = "White"
-						// SS220 ADDITION START
+						// SS220 ADDITION - START
 						if("Vaporwave")
 							UI_style = "Vaporwave"
 						if("Detective")
 							UI_style = "Detective"
-						if("Trasen")
-							UI_style = "Trasen"
+						if("Trasenknox")
+							UI_style = "Trasenknox"
 						if("Clockwork")
 							UI_style = "Clockwork"
-						// SS220 ADDITION END
+						// SS220 ADDITION - END
 
 					if(ishuman(usr)) //mid-round preference changes, for aesthetics
 						var/mob/living/carbon/human/H = usr
diff --git a/code/modules/client/preference/preferences_mysql.dm b/code/modules/client/preference/preferences_mysql.dm
index 67e00f4661e3..50eb770d861a 100644
--- a/code/modules/client/preference/preferences_mysql.dm
+++ b/code/modules/client/preference/preferences_mysql.dm
@@ -35,7 +35,7 @@
 
 	//Sanitize
 	ooccolor		= sanitize_hexcolor(ooccolor, initial(ooccolor))
-	UI_style		= sanitize_inlist(UI_style, list("White", "Midnight", "Plasmafire", "Retro", "Slimecore", "Operative", "Vaporwave", "Detective", "Trasen", "Clockwork"), initial(UI_style))// SS220 ADDITIONS "Vaporwave, Detective, Trasen, Clockwork"
+	UI_style		= sanitize_inlist(UI_style, list("White", "Midnight", "Plasmafire", "Retro", "Slimecore", "Operative", "Vaporwave", "Detective", "Trasenknox", "Clockwork"), initial(UI_style)) // SS220 EDIT "Vaporwave, Detective, Trasenknox, Clockwork"
 	default_slot	= sanitize_integer(default_slot, 1, max_save_slots, initial(default_slot))
 	toggles			= sanitize_integer(toggles, 0, TOGGLES_TOTAL, initial(toggles))
 	toggles2		= sanitize_integer(toggles2, 0, TOGGLES_2_TOTAL, initial(toggles2))
diff --git a/code/modules/tooltip/tooltip.html b/code/modules/tooltip/tooltip.html
index d2c6016b1a94..31c1350ab65f 100644
--- a/code/modules/tooltip/tooltip.html
+++ b/code/modules/tooltip/tooltip.html
@@ -77,6 +77,19 @@
 		.operative .wrap {border-color: #1E0101;}
 		.operative .content {color: #FFFFFF; border-color: #750000; background-color: #350000;}
 
+		/* SS220 ADDITION - START */
+		.clockwork .wrap {border-color: #170800;}
+		.clockwork .content {color: #B18B25; border-color: #000000; background-color: #5F380E;}
+
+		.vaporwave .wrap {border-color: #0c122c;}
+		.vaporwave .content {color: #bc3ce3; border-color: #170c2c; background-color: #1d1a22;}
+
+		.detective .wrap {border-color: #2c0F0c;}
+		.detective .content {color: #c7b08b; border-color: #2c0F0c; background-color: #221c1a;}
+
+		.trasenknox .wrap {border-color: #998e81;}
+		.trasenknox .content {color: #3ce375; border-color: #998e81; background-color: #1e1d21;}
+		/* SS220 ADDITION - END */
 
 	</style>
 </head>
diff --git a/modular_ss220/aesthetics/skin/icons/screen_clockwork.dmi b/modular_ss220/aesthetics/skin/icons/screen_clockwork.dmi
index 33a1d999ec4a..6d788556420e 100644
Binary files a/modular_ss220/aesthetics/skin/icons/screen_clockwork.dmi and b/modular_ss220/aesthetics/skin/icons/screen_clockwork.dmi differ
diff --git a/modular_ss220/aesthetics/skin/icons/screen_detective.dmi b/modular_ss220/aesthetics/skin/icons/screen_detective.dmi
index 304b91e93363..eda7ad91bd9a 100644
Binary files a/modular_ss220/aesthetics/skin/icons/screen_detective.dmi and b/modular_ss220/aesthetics/skin/icons/screen_detective.dmi differ
diff --git a/modular_ss220/aesthetics/skin/icons/screen_trasenknox.dmi b/modular_ss220/aesthetics/skin/icons/screen_trasenknox.dmi
index 9f8c6c60be46..b58fb49e4522 100644
Binary files a/modular_ss220/aesthetics/skin/icons/screen_trasenknox.dmi and b/modular_ss220/aesthetics/skin/icons/screen_trasenknox.dmi differ