diff --git a/code/__HELPERS/piping_colors_lists.dm b/code/__HELPERS/piping_colors_lists.dm
index 8ab7918fc93..35e9a42e61c 100644
--- a/code/__HELPERS/piping_colors_lists.dm
+++ b/code/__HELPERS/piping_colors_lists.dm
@@ -1,9 +1,8 @@
 ///All colors available to pipes and atmos components
-GLOBAL_LIST_INIT(pipe_paint_colors, sortList(list(
-	"grey" = COLOR_VERY_LIGHT_GRAY,
+GLOBAL_LIST_INIT(pipe_paint_colors, list(
+	"green" = COLOR_VIBRANT_LIME,
 	"blue" = COLOR_BLUE,
 	"red" = COLOR_RED,
-	"green" = COLOR_VIBRANT_LIME,
 	"orange" = COLOR_TAN_ORANGE,
 	"cyan" = COLOR_CYAN,
 	"dark" = COLOR_DARK,
@@ -11,8 +10,9 @@ GLOBAL_LIST_INIT(pipe_paint_colors, sortList(list(
 	"brown" = COLOR_BROWN,
 	"pink" = COLOR_LIGHT_PINK,
 	"purple" = COLOR_PURPLE,
-	"violet" = COLOR_STRONG_VIOLET
-)))
+	"violet" = COLOR_STRONG_VIOLET,
+	"omni" = COLOR_VERY_LIGHT_GRAY
+))
 
 ///List that sorts the colors and is used for setting up the pipes layer so that they overlap correctly
 GLOBAL_LIST_INIT(pipe_colors_ordered, sortList(list(
@@ -32,7 +32,7 @@ GLOBAL_LIST_INIT(pipe_colors_ordered, sortList(list(
 
 ///Names shown in the examine for every colored atmos component
 GLOBAL_LIST_INIT(pipe_color_name, sortList(list(
-	COLOR_VERY_LIGHT_GRAY = "grey",
+	COLOR_VERY_LIGHT_GRAY = "omni",
 	COLOR_BLUE = "blue",
 	COLOR_RED = "red",
 	COLOR_VIBRANT_LIME = "green",
diff --git a/code/game/objects/items/RPD.dm b/code/game/objects/items/RPD.dm
index 869d5581216..a209428f560 100644
--- a/code/game/objects/items/RPD.dm
+++ b/code/game/objects/items/RPD.dm
@@ -207,7 +207,7 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
 	///Is the device of the flipped type?
 	var/p_flipped = FALSE
 	///Color of the device we are going to spawn
-	var/paint_color = "grey"
+	var/paint_color = "green"
 	///Speed of building atmos devices
 	var/atmos_build_speed = 0.5 SECONDS
 	///Speed of building disposal devices