diff --git a/Resources/Prototypes/Entities/Constructible/Ground/gascanisters.yml b/Resources/Prototypes/Entities/Constructible/Ground/gascanisters.yml
index 53b7a7b633..20bedf1e39 100644
--- a/Resources/Prototypes/Entities/Constructible/Ground/gascanisters.yml
+++ b/Resources/Prototypes/Entities/Constructible/Ground/gascanisters.yml
@@ -21,8 +21,6 @@
   - type: UserInterface
   - type: Appearance
 
-
-
 - type: entity
   parent: GasCanisterBase
   id: GasCanister
@@ -80,8 +78,6 @@
         - 1478.6513029 # nitrogen 79%
       temperature: 293.15
 
-
-
 - type: entity
   parent: GasCanister
   id: OxygenCanister
@@ -97,8 +93,6 @@
         - 1871.71051 # oxygen
       temperature: 293.15
 
-
-
 - type: entity
   parent: GasCanister
   id: PhoronCanister
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/black-1.png b/Resources/Textures/Constructible/Atmos/canister.rsi/black-1.png
index 0cfd66e778..791f22c958 100644
Binary files a/Resources/Textures/Constructible/Atmos/canister.rsi/black-1.png and b/Resources/Textures/Constructible/Atmos/canister.rsi/black-1.png differ
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/black.png b/Resources/Textures/Constructible/Atmos/canister.rsi/black.png
index 88a571ea84..c7c4d4732e 100644
Binary files a/Resources/Textures/Constructible/Atmos/canister.rsi/black.png and b/Resources/Textures/Constructible/Atmos/canister.rsi/black.png differ
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/blue-1.png b/Resources/Textures/Constructible/Atmos/canister.rsi/blue-1.png
index bc5989e497..f07bedd7ea 100644
Binary files a/Resources/Textures/Constructible/Atmos/canister.rsi/blue-1.png and b/Resources/Textures/Constructible/Atmos/canister.rsi/blue-1.png differ
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/blue.png b/Resources/Textures/Constructible/Atmos/canister.rsi/blue.png
index 28e7317cc4..412994d96c 100644
Binary files a/Resources/Textures/Constructible/Atmos/canister.rsi/blue.png and b/Resources/Textures/Constructible/Atmos/canister.rsi/blue.png differ
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/can-connector.png b/Resources/Textures/Constructible/Atmos/canister.rsi/can-connector.png
index 0ce73b87f3..7996e1b26d 100644
Binary files a/Resources/Textures/Constructible/Atmos/canister.rsi/can-connector.png and b/Resources/Textures/Constructible/Atmos/canister.rsi/can-connector.png differ
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/can-o0.png b/Resources/Textures/Constructible/Atmos/canister.rsi/can-o0.png
index 3e6c3657fc..5f13bbacae 100644
Binary files a/Resources/Textures/Constructible/Atmos/canister.rsi/can-o0.png and b/Resources/Textures/Constructible/Atmos/canister.rsi/can-o0.png differ
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/can-o1.png b/Resources/Textures/Constructible/Atmos/canister.rsi/can-o1.png
index bdd7f13328..2e548fcaca 100644
Binary files a/Resources/Textures/Constructible/Atmos/canister.rsi/can-o1.png and b/Resources/Textures/Constructible/Atmos/canister.rsi/can-o1.png differ
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/can-o2.png b/Resources/Textures/Constructible/Atmos/canister.rsi/can-o2.png
index f8c0937b1f..094ee1e3c6 100644
Binary files a/Resources/Textures/Constructible/Atmos/canister.rsi/can-o2.png and b/Resources/Textures/Constructible/Atmos/canister.rsi/can-o2.png differ
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/can-o3.png b/Resources/Textures/Constructible/Atmos/canister.rsi/can-o3.png
index fa7bf241fe..014ed7833d 100644
Binary files a/Resources/Textures/Constructible/Atmos/canister.rsi/can-o3.png and b/Resources/Textures/Constructible/Atmos/canister.rsi/can-o3.png differ
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/can-open.png b/Resources/Textures/Constructible/Atmos/canister.rsi/can-open.png
index 369b2340aa..67f9117ebd 100644
Binary files a/Resources/Textures/Constructible/Atmos/canister.rsi/can-open.png and b/Resources/Textures/Constructible/Atmos/canister.rsi/can-open.png differ
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/darkblue-1.png b/Resources/Textures/Constructible/Atmos/canister.rsi/darkblue-1.png
new file mode 100644
index 0000000000..c8bea6c38a
Binary files /dev/null and b/Resources/Textures/Constructible/Atmos/canister.rsi/darkblue-1.png differ
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/darkblue.png b/Resources/Textures/Constructible/Atmos/canister.rsi/darkblue.png
new file mode 100644
index 0000000000..06a097b0bd
Binary files /dev/null and b/Resources/Textures/Constructible/Atmos/canister.rsi/darkblue.png differ
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/freon-1.png b/Resources/Textures/Constructible/Atmos/canister.rsi/freon-1.png
new file mode 100644
index 0000000000..46d3f7c36c
Binary files /dev/null and b/Resources/Textures/Constructible/Atmos/canister.rsi/freon-1.png differ
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/freon.png b/Resources/Textures/Constructible/Atmos/canister.rsi/freon.png
new file mode 100644
index 0000000000..635be6c787
Binary files /dev/null and b/Resources/Textures/Constructible/Atmos/canister.rsi/freon.png differ
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/green-1.png b/Resources/Textures/Constructible/Atmos/canister.rsi/green-1.png
new file mode 100644
index 0000000000..df9958d3e6
Binary files /dev/null and b/Resources/Textures/Constructible/Atmos/canister.rsi/green-1.png differ
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/green.png b/Resources/Textures/Constructible/Atmos/canister.rsi/green.png
new file mode 100644
index 0000000000..75d21b0918
Binary files /dev/null and b/Resources/Textures/Constructible/Atmos/canister.rsi/green.png differ
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/grey-1.png b/Resources/Textures/Constructible/Atmos/canister.rsi/grey-1.png
index 167983cfe5..1782cc29e8 100644
Binary files a/Resources/Textures/Constructible/Atmos/canister.rsi/grey-1.png and b/Resources/Textures/Constructible/Atmos/canister.rsi/grey-1.png differ
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/grey.png b/Resources/Textures/Constructible/Atmos/canister.rsi/grey.png
index 6a046f8ce1..f7ef5a60f9 100644
Binary files a/Resources/Textures/Constructible/Atmos/canister.rsi/grey.png and b/Resources/Textures/Constructible/Atmos/canister.rsi/grey.png differ
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/meta.json b/Resources/Textures/Constructible/Atmos/canister.rsi/meta.json
index 4a22cf8e66..1ed2f81b91 100644
--- a/Resources/Textures/Constructible/Atmos/canister.rsi/meta.json
+++ b/Resources/Textures/Constructible/Atmos/canister.rsi/meta.json
@@ -1,56 +1,31 @@
 {
   "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8581a636acfc1517611a680b7711a74fc7ef335",
   "size": {
     "x": 32,
     "y": 32
   },
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/discordia-space/CEV-Eris",
   "states": [
     {
       "name": "black",
-      "directions": 1,
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "directions": 1
     },
     {
       "name": "black-1",
-      "directions": 1,
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "directions": 1
     },
     {
       "name": "blue",
-      "directions": 1,
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "directions": 1
     },
     {
       "name": "blue-1",
-      "directions": 1,
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "directions": 1
     },
     {
       "name": "can-connector",
-      "directions": 1,
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "directions": 1
     },
     {
       "name": "can-o0",
@@ -64,138 +39,95 @@
     },
     {
       "name": "can-o1",
-      "directions": 1,
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "directions": 1
     },
     {
       "name": "can-o2",
-      "directions": 1,
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "directions": 1
     },
     {
       "name": "can-o3",
-      "directions": 1,
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "directions": 1
     },
     {
       "name": "can-oa1",
-      "directions": 1,
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "directions": 1
     },
     {
       "name": "can-open",
-      "directions": 1,
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "directions": 1
     },
     {
       "name": "grey",
-      "directions": 1,
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "directions": 1
     },
     {
       "name": "grey-1",
-      "directions": 1,
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "directions": 1
     },
     {
       "name": "orange",
-      "directions": 1,
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "directions": 1
     },
     {
       "name": "orange-1",
-      "directions": 1,
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "directions": 1
     },
     {
       "name": "red",
-      "directions": 1,
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "directions": 1
     },
     {
       "name": "red-1",
-      "directions": 1,
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "directions": 1
     },
     {
       "name": "redws",
-      "directions": 1,
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "directions": 1
     },
     {
       "name": "redws-1",
-      "directions": 1,
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "directions": 1
     },
     {
       "name": "yellow",
-      "directions": 1,
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "directions": 1
     },
     {
       "name": "yellow-1",
-      "directions": 1,
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "directions": 1
+    },
+    {
+      "name": "green",
+      "directions": 1
+    },
+    {
+      "name": "green-1",
+      "directions": 1
+    },
+    {
+      "name": "darkblue",
+      "directions": 1
+    },
+    {
+      "name": "darkblue-1",
+      "directions": 1
+    },
+    {
+      "name": "freon",
+      "directions": 1
+    },
+    {
+      "name": "freon-1",
+      "directions": 1
+    },
+    {
+      "name": "water_vapor",
+      "directions": 1
+    },
+    {
+      "name": "water_vapor-1",
+      "directions": 1
     }
   ]
 }
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/orange-1.png b/Resources/Textures/Constructible/Atmos/canister.rsi/orange-1.png
index 420eba60af..4d0714e545 100644
Binary files a/Resources/Textures/Constructible/Atmos/canister.rsi/orange-1.png and b/Resources/Textures/Constructible/Atmos/canister.rsi/orange-1.png differ
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/orange.png b/Resources/Textures/Constructible/Atmos/canister.rsi/orange.png
index c21c352f8f..2c8b6b429f 100644
Binary files a/Resources/Textures/Constructible/Atmos/canister.rsi/orange.png and b/Resources/Textures/Constructible/Atmos/canister.rsi/orange.png differ
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/red-1.png b/Resources/Textures/Constructible/Atmos/canister.rsi/red-1.png
index fada97a48f..0f43f9d142 100644
Binary files a/Resources/Textures/Constructible/Atmos/canister.rsi/red-1.png and b/Resources/Textures/Constructible/Atmos/canister.rsi/red-1.png differ
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/red.png b/Resources/Textures/Constructible/Atmos/canister.rsi/red.png
index 998a5d859e..4e1a047b38 100644
Binary files a/Resources/Textures/Constructible/Atmos/canister.rsi/red.png and b/Resources/Textures/Constructible/Atmos/canister.rsi/red.png differ
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/redws-1.png b/Resources/Textures/Constructible/Atmos/canister.rsi/redws-1.png
index 0dab9bdf7a..d5c412875d 100644
Binary files a/Resources/Textures/Constructible/Atmos/canister.rsi/redws-1.png and b/Resources/Textures/Constructible/Atmos/canister.rsi/redws-1.png differ
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/redws.png b/Resources/Textures/Constructible/Atmos/canister.rsi/redws.png
index 4b28f64788..8390cb6539 100644
Binary files a/Resources/Textures/Constructible/Atmos/canister.rsi/redws.png and b/Resources/Textures/Constructible/Atmos/canister.rsi/redws.png differ
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/scrubber-connector.png b/Resources/Textures/Constructible/Atmos/canister.rsi/scrubber-connector.png
index 7e3822babe..261bbdb340 100644
Binary files a/Resources/Textures/Constructible/Atmos/canister.rsi/scrubber-connector.png and b/Resources/Textures/Constructible/Atmos/canister.rsi/scrubber-connector.png differ
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/water_vapor-1.png b/Resources/Textures/Constructible/Atmos/canister.rsi/water_vapor-1.png
new file mode 100644
index 0000000000..ec8c065097
Binary files /dev/null and b/Resources/Textures/Constructible/Atmos/canister.rsi/water_vapor-1.png differ
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/water_vapor.png b/Resources/Textures/Constructible/Atmos/canister.rsi/water_vapor.png
new file mode 100644
index 0000000000..ee8b7979ce
Binary files /dev/null and b/Resources/Textures/Constructible/Atmos/canister.rsi/water_vapor.png differ
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/yellow-1.png b/Resources/Textures/Constructible/Atmos/canister.rsi/yellow-1.png
index 707993bbcc..3937104ebe 100644
Binary files a/Resources/Textures/Constructible/Atmos/canister.rsi/yellow-1.png and b/Resources/Textures/Constructible/Atmos/canister.rsi/yellow-1.png differ
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/yellow.png b/Resources/Textures/Constructible/Atmos/canister.rsi/yellow.png
index d4ca097a7f..595ceb298b 100644
Binary files a/Resources/Textures/Constructible/Atmos/canister.rsi/yellow.png and b/Resources/Textures/Constructible/Atmos/canister.rsi/yellow.png differ