diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm
index c759cf4a1f5..07771dbb680 100644
--- a/code/__DEFINES/misc.dm
+++ b/code/__DEFINES/misc.dm
@@ -278,14 +278,19 @@
                                0.4,0.6,0.0,\
                                0.2,0.2,0.6)
 
-#define LIST_GREYSCALE_REPLACE list("red" = "lightgrey", "blue" = "darkgrey", "green" = "darkgrey", "orange" = "lightgrey", "brown" = "darkgrey",\
-									"gold" = "lightgrey", "cyan" = "lightgrey", "navy" = "darkgrey", "purple" = "darkgrey", "pink"= "lightgrey")
+#define LIST_REPLACE_RENAME list("rebeccapurple" = "dark purple", "darkslategrey" = "dark grey", "darkolivegreen" = "dark green", "darkslateblue" = "dark blue",\
+								 "darkkhaki" = "khaki", "darkseagreen" = "light green", "midnightblue" = "blue", "lightgrey" = "light grey", "darkgrey" = "dark grey",\
+								 "steelblue" = "blue", "goldenrod" = "gold")
 
-#define LIST_VULP_REPLACE list("red" = "goldenrod", "green" = "goldenrod", "orange" = "peru", "purple" = "skyblue", "pink" = "skyblue",\
-							   "cyan" = "skyblue")
+#define LIST_GREYSCALE_REPLACE list("red" = "lightgrey", "blue" = "grey", "green" = "grey", "orange" = "lightgrey", "brown" = "grey",\
+									"gold" = "lightgrey", "cyan" = "lightgrey", "navy" = "grey", "purple" = "grey", "pink"= "lightgrey")
 
-#define LIST_TAJ_REPLACE list("red" = "goldenrod", "green" = "goldenrod", "orange" = "peru", "purple" = "skyblue", "pink" = "skyblue",\
-							   "cyan" = "skyblue")
+#define LIST_VULP_REPLACE list("pink" = "beige", "orange" = "goldenrod", "gold" = "goldenrod", "red" = "darkolivegreen", "brown" = "darkolivegreen",\
+									 "green" = "darkslategrey", "cyan" = "steelblue", "purple" = "darkslategrey", "navy" = "midnightblue")
+
+#define LIST_TAJ_REPLACE list("red" = "rebeccapurple", "brown" = "rebeccapurple", "purple" = "darkslateblue", "blue" = "darkslateblue",\
+									 "green" = "darkolivegreen", "orange" = "darkkhaki", "gold" = "darkkhaki", "cyan" = "darkseagreen", \
+									 "navy" = "midnightblue", "pink" = "lightgrey")
 
 
 //Gun trigger guards
diff --git a/code/datums/wires/wires.dm b/code/datums/wires/wires.dm
index 5cd73f9bd5c..b192045d29d 100644
--- a/code/datums/wires/wires.dm
+++ b/code/datums/wires/wires.dm
@@ -94,22 +94,32 @@ var/list/wireColours = list("red", "blue", "green", "black", "orange", "brown",
 	var/list/W[0]
 	for(var/colour in wires)
 		var/new_colour = colour
+		var/colour_name = colour
 		if(colour in replace_colours)
 			new_colour = replace_colours[colour]
+			if(new_colour in LIST_REPLACE_RENAME)
+				colour_name = LIST_REPLACE_RENAME[new_colour]
+			else
+				colour_name = new_colour
 		else
 			new_colour = colour
-		W[++W.len] = list("seen_colour" = capitalize(new_colour),"colour" = capitalize(colour), "cut" = IsColourCut(colour), "index" = can_see_wire_index(user) ? GetWireName(GetIndex(colour)) : null, "attached" = IsAttached(colour))
+			colour_name = new_colour
+		W[++W.len] = list("colour_name" = capitalize(colour_name), "seen_colour" = capitalize(new_colour),"colour" = capitalize(colour), "cut" = IsColourCut(colour), "index" = can_see_wire_index(user) ? GetWireName(GetIndex(colour)) : null, "attached" = IsAttached(colour))
 
 	if(W.len > 0)
 		data["wires"] = W
 
 	var/list/status = get_status()
 	if(replace_colours)
-		for(var/colour in replace_colours)
-			var/i
-			for(i=1, i<=status.len, i++)
+		var/i
+		for(i=1, i<=status.len, i++)
+			for(var/colour in replace_colours)
+				var/new_colour = replace_colours[colour]
+				if(new_colour in LIST_REPLACE_RENAME)
+					new_colour = LIST_REPLACE_RENAME[new_colour]
 				if(findtext(status[i],colour))
-					status[i] = replacetext(status[i],colour,replace_colours[colour])
+					status[i] = replacetext(status[i],colour,new_colour)
+					break
 	data["status_len"] = status.len
 	data["status"] = status
 
diff --git a/nano/templates/wires.tmpl b/nano/templates/wires.tmpl
index eb1b7183692..2702d97d7dc 100644
--- a/nano/templates/wires.tmpl
+++ b/nano/templates/wires.tmpl
@@ -2,7 +2,7 @@
 	<table style='width:100%;'>
 		{{for data.wires}}
 			<tr>
-			<td style='color: {{:value.seen_colour}};'>{{:value.seen_colour}} {{if value.index}}({{:value.index}}){{/if}}</td>
+			<td style='color: {{:value.seen_colour}};'>{{:value.colour_name}} {{if value.index}}({{:value.index}}){{/if}}</td>
 			<td class='floatRight'>
 			{{:helper.link(value.cut ? 'Mend' : 'Cut', null, {'action' : 'cut', 'wire' : value.colour})}}
 			{{:helper.link('Pulse', null, {'action' : 'pulse', 'wire' : value.colour})}}