diff --git a/Content.Client/Power/APC/ApcVisualizerComponent.cs b/Content.Client/Power/APC/ApcVisualizerComponent.cs
index e356a80177287e..87cb70019f5081 100644
--- a/Content.Client/Power/APC/ApcVisualizerComponent.cs
+++ b/Content.Client/Power/APC/ApcVisualizerComponent.cs
@@ -87,7 +87,7 @@ public sealed partial class ApcVisualsComponent : Component
     /// </summary>
     [DataField("screenColors")]
     [ViewVariables(VVAccess.ReadWrite)]
-    public Color[] ScreenColors = new Color[(byte)ApcChargeState.NumStates]{Color.FromHex("#d1332e"), Color.FromHex("#dcdc28"), Color.FromHex("#82ff4c"), Color.FromHex("#ffac1c")};
+    public Color[] ScreenColors = new Color[(byte)ApcChargeState.NumStates]{Color.FromHex("#d1332e"), Color.FromHex("#2e8ad1"), Color.FromHex("#3db83b"), Color.FromHex("#ffac1c")};
 
     /// <summary>
     /// The sprite state of the unlit overlay used for the APC screen when the APC has been emagged.
diff --git a/Resources/Prototypes/Entities/Structures/Power/apc.yml b/Resources/Prototypes/Entities/Structures/Power/apc.yml
index 1621ac858cdf45..71e45064954403 100644
--- a/Resources/Prototypes/Entities/Structures/Power/apc.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/apc.yml
@@ -35,26 +35,21 @@
     - state: display-charging
       shader: unshaded
       map: ["enum.ApcVisualLayers.ChargeState"]
-    - state: lock0-locked
+    - state: lock0-unlocked
       shader: unshaded
       map: ["enum.ApcVisualLayers.InterfaceLock"]
-      visible: false
-    - state: lock1-locked
+    - state: lock1-unlocked
       shader: unshaded
       map: ["enum.ApcVisualLayers.PanelLock"]
-      visible: false
-    - state: lock1-locked #when these are implemented get actual sprites.
+    - state: channel0-auto_on
       shader: unshaded
       map: ["enum.ApcVisualLayers.Equipment"]
-      visible: false
-    - state: lock1-locked
+    - state: channel1-auto_on
       shader: unshaded
       map: ["enum.ApcVisualLayers.Lighting"]
-      visible: false
-    - state: lock1-locked
+    - state: channel2-auto_on
       shader: unshaded
       map: ["enum.ApcVisualLayers.Environment"]
-      visible: false
   - type: Appearance
   - type: ApcVisuals
   - type: Battery
diff --git a/Resources/Prototypes/Entities/Structures/Power/substation.yml b/Resources/Prototypes/Entities/Structures/Power/substation.yml
index 0543485584f28d..63d874f4ed98a0 100644
--- a/Resources/Prototypes/Entities/Structures/Power/substation.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/substation.yml
@@ -23,8 +23,8 @@
   - type: ExaminableBattery
   - type: PointLight
     radius: 1.5
-    energy: 1
-    color: "#ff6900"
+    energy: 1.6
+    color: "#3db83b"
     castShadows: false
   - type: NodeContainer
     examinable: true
@@ -127,11 +127,10 @@
       path: /Audio/Ambience/Objects/buzzing.ogg
   - type: PointLight
     radius: 1.5
-    energy: 1
-    color: "#ff6900"
+    energy: 1.6
+    color: "#3db83b"
     netsync: false
     castShadows: false
-    offset: 0, -0.2
   - type: Clickable
   - type: AccessReader
     access: [["Engineering"]]
@@ -153,7 +152,7 @@
     sprite: Structures/Power/substation.rsi
     layers:
     - state: substation_wall
-    - state: screen_wall
+    - state: screen
       shader: unshaded
   - type: Battery
     maxCharge: 2000000
diff --git a/Resources/Textures/Structures/Power/apc.rsi/base.png b/Resources/Textures/Structures/Power/apc.rsi/base.png
index 68b83101d21fc7..2b42c54935a53e 100644
Binary files a/Resources/Textures/Structures/Power/apc.rsi/base.png and b/Resources/Textures/Structures/Power/apc.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/broken.png b/Resources/Textures/Structures/Power/apc.rsi/broken.png
index bb54b4bdc7dc14..092694c371fa9c 100644
Binary files a/Resources/Textures/Structures/Power/apc.rsi/broken.png and b/Resources/Textures/Structures/Power/apc.rsi/broken.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel0-auto_off.png b/Resources/Textures/Structures/Power/apc.rsi/channel0-auto_off.png
new file mode 100644
index 00000000000000..ba84b7d6db5e4c
Binary files /dev/null and b/Resources/Textures/Structures/Power/apc.rsi/channel0-auto_off.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel0-auto_on.png b/Resources/Textures/Structures/Power/apc.rsi/channel0-auto_on.png
new file mode 100644
index 00000000000000..6cce72f795f187
Binary files /dev/null and b/Resources/Textures/Structures/Power/apc.rsi/channel0-auto_on.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel0-manual_off.png b/Resources/Textures/Structures/Power/apc.rsi/channel0-manual_off.png
new file mode 100644
index 00000000000000..61ae057d5085bb
Binary files /dev/null and b/Resources/Textures/Structures/Power/apc.rsi/channel0-manual_off.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel0-manual_on.png b/Resources/Textures/Structures/Power/apc.rsi/channel0-manual_on.png
new file mode 100644
index 00000000000000..6cc48bd1a55876
Binary files /dev/null and b/Resources/Textures/Structures/Power/apc.rsi/channel0-manual_on.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel1-auto_off.png b/Resources/Textures/Structures/Power/apc.rsi/channel1-auto_off.png
new file mode 100644
index 00000000000000..b31bed6c6ba591
Binary files /dev/null and b/Resources/Textures/Structures/Power/apc.rsi/channel1-auto_off.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel1-auto_on.png b/Resources/Textures/Structures/Power/apc.rsi/channel1-auto_on.png
new file mode 100644
index 00000000000000..959a05cde08460
Binary files /dev/null and b/Resources/Textures/Structures/Power/apc.rsi/channel1-auto_on.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel1-manual_off.png b/Resources/Textures/Structures/Power/apc.rsi/channel1-manual_off.png
new file mode 100644
index 00000000000000..3bb505ecb86d8e
Binary files /dev/null and b/Resources/Textures/Structures/Power/apc.rsi/channel1-manual_off.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel1-manual_on.png b/Resources/Textures/Structures/Power/apc.rsi/channel1-manual_on.png
new file mode 100644
index 00000000000000..bd8b013310c1d9
Binary files /dev/null and b/Resources/Textures/Structures/Power/apc.rsi/channel1-manual_on.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel2-auto_off.png b/Resources/Textures/Structures/Power/apc.rsi/channel2-auto_off.png
new file mode 100644
index 00000000000000..0cca86022087f8
Binary files /dev/null and b/Resources/Textures/Structures/Power/apc.rsi/channel2-auto_off.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel2-auto_on.png b/Resources/Textures/Structures/Power/apc.rsi/channel2-auto_on.png
new file mode 100644
index 00000000000000..56802dc04378d4
Binary files /dev/null and b/Resources/Textures/Structures/Power/apc.rsi/channel2-auto_on.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel2-manual_off.png b/Resources/Textures/Structures/Power/apc.rsi/channel2-manual_off.png
new file mode 100644
index 00000000000000..5ac134cb54b5c3
Binary files /dev/null and b/Resources/Textures/Structures/Power/apc.rsi/channel2-manual_off.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel2-manual_on.png b/Resources/Textures/Structures/Power/apc.rsi/channel2-manual_on.png
new file mode 100644
index 00000000000000..5ebec4feeeb303
Binary files /dev/null and b/Resources/Textures/Structures/Power/apc.rsi/channel2-manual_on.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/display-charging.png b/Resources/Textures/Structures/Power/apc.rsi/display-charging.png
index 0f26ba31bd31de..67e3b3df19b80f 100644
Binary files a/Resources/Textures/Structures/Power/apc.rsi/display-charging.png and b/Resources/Textures/Structures/Power/apc.rsi/display-charging.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/display-full.png b/Resources/Textures/Structures/Power/apc.rsi/display-full.png
index 9b1e28db26d9ab..1739853e2b7482 100644
Binary files a/Resources/Textures/Structures/Power/apc.rsi/display-full.png and b/Resources/Textures/Structures/Power/apc.rsi/display-full.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/display-lack.png b/Resources/Textures/Structures/Power/apc.rsi/display-lack.png
index e360f9c6bb0388..c4c103eeb9637b 100644
Binary files a/Resources/Textures/Structures/Power/apc.rsi/display-lack.png and b/Resources/Textures/Structures/Power/apc.rsi/display-lack.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/display-remote.png b/Resources/Textures/Structures/Power/apc.rsi/display-remote.png
index 089eb9345e78d5..be343a987b0cc7 100644
Binary files a/Resources/Textures/Structures/Power/apc.rsi/display-remote.png and b/Resources/Textures/Structures/Power/apc.rsi/display-remote.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png b/Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png
index 140ae850be75c6..2713c5506a26dd 100644
Binary files a/Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png and b/Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/frame.png b/Resources/Textures/Structures/Power/apc.rsi/frame.png
index 4f8ba4d56effee..7d3529f63f585d 100644
Binary files a/Resources/Textures/Structures/Power/apc.rsi/frame.png and b/Resources/Textures/Structures/Power/apc.rsi/frame.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/lock0-locked.png b/Resources/Textures/Structures/Power/apc.rsi/lock0-locked.png
index 20f2e17d94c50d..45562de8a662c3 100644
Binary files a/Resources/Textures/Structures/Power/apc.rsi/lock0-locked.png and b/Resources/Textures/Structures/Power/apc.rsi/lock0-locked.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/lock0-unlocked.png b/Resources/Textures/Structures/Power/apc.rsi/lock0-unlocked.png
new file mode 100644
index 00000000000000..f6377a36b127b3
Binary files /dev/null and b/Resources/Textures/Structures/Power/apc.rsi/lock0-unlocked.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/lock1-locked.png b/Resources/Textures/Structures/Power/apc.rsi/lock1-locked.png
index 3dfeb215d2ff01..f92c04aac46374 100644
Binary files a/Resources/Textures/Structures/Power/apc.rsi/lock1-locked.png and b/Resources/Textures/Structures/Power/apc.rsi/lock1-locked.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/lock1-unlocked.png b/Resources/Textures/Structures/Power/apc.rsi/lock1-unlocked.png
new file mode 100644
index 00000000000000..44f9af733faa82
Binary files /dev/null and b/Resources/Textures/Structures/Power/apc.rsi/lock1-unlocked.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/meta.json b/Resources/Textures/Structures/Power/apc.rsi/meta.json
index 66df303df9466e..82f78ccb875d61 100644
--- a/Resources/Textures/Structures/Power/apc.rsi/meta.json
+++ b/Resources/Textures/Structures/Power/apc.rsi/meta.json
@@ -1,106 +1,88 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/9c7d509354ee030300f63c701da63c17928c3b3b and heavily modified by EmoGarbage404 (github)",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/9c7d509354ee030300f63c701da63c17928c3b3b and modified by Swept",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
-      "name": "base",
-      "directions": 4
+      "name": "base"
     },
 	{
       "name": "static"
     },
     {
-      "name": "broken",
-      "directions": 4
+      "name": "broken"
     },
     {
-      "name": "frame",
-      "directions": 4
+      "name": "frame"
     },
     {
-      "name": "panel",
-      "directions": 4
+      "name": "panel"
     },
     {
-      "name": "lock0-locked",
-      "directions": 4
+      "name": "lock0-unlocked"
     },
     {
-      "name": "lock1-locked",
-      "directions": 4
+      "name": "lock0-locked"
+    },
+    {
+      "name": "lock1-unlocked"
+    },
+    {
+      "name": "lock1-locked"
+    },
+    {
+      "name": "channel0-auto_off"
+    },
+    {
+      "name": "channel0-manual_off"
+    },
+    {
+      "name": "channel0-auto_on"
+    },
+    {
+      "name": "channel0-manual_on"
+    },
+    {
+      "name": "channel1-auto_off"
+    },
+    {
+      "name": "channel1-manual_off"
+    },
+    {
+      "name": "channel1-auto_on"
+    },
+    {
+      "name": "channel1-manual_on"
+    },
+    {
+      "name": "channel2-auto_off"
+    },
+    {
+      "name": "channel2-manual_off"
+    },
+    {
+      "name": "channel2-auto_on"
+    },
+    {
+      "name": "channel2-manual_on"
     },
     {
       "name": "display-lack",
-      "directions": 4,
       "delays": [
         [
-          0.25,
-          0.25,
-          1,
-          3
-        ],
-        [
-          0.25,
-          0.25,
-          1,
-          3
-        ],
-        [
-          0.25,
-          0.25,
           1,
-          3
-        ],
-        [
-          0.25,
-          0.25,
-          1,
-          3
+          2
         ]
       ]
     },
     {
       "name": "display-charging",
-      "directions": 4,
       "delays": [
         [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.2
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.2
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.2
-        ],
-        [
-          0.1,
-          0.1,
           0.1,
           0.1,
           0.1,
@@ -112,20 +94,7 @@
     },
     {
       "name": "display-full",
-      "directions": 4,
       "delays": [
-        [
-          1,
-          1
-        ],
-        [
-          1,
-          1
-        ],
-        [
-          1,
-          1
-        ],
         [
           1,
           1
@@ -134,29 +103,7 @@
     },
     {
       "name": "display-remote",
-      "directions": 4,
       "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
         [
           0.1,
           0.1,
@@ -168,20 +115,7 @@
     },
     {
       "name": "emag-unlit",
-      "directions": 4,
       "delays": [
-        [
-          0.5,
-          0.5
-        ],
-        [
-          0.5,
-          0.5
-        ],
-        [
-          0.5,
-          0.5
-        ],
         [
           0.5,
           0.5
diff --git a/Resources/Textures/Structures/Power/apc.rsi/panel.png b/Resources/Textures/Structures/Power/apc.rsi/panel.png
index 9e64b70a503745..97f8471f29e30d 100644
Binary files a/Resources/Textures/Structures/Power/apc.rsi/panel.png and b/Resources/Textures/Structures/Power/apc.rsi/panel.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/static.png b/Resources/Textures/Structures/Power/apc.rsi/static.png
index 7275cfc9feb518..43089d0d81144d 100644
Binary files a/Resources/Textures/Structures/Power/apc.rsi/static.png and b/Resources/Textures/Structures/Power/apc.rsi/static.png differ
diff --git a/Resources/Textures/Structures/Power/substation.rsi/charging.png b/Resources/Textures/Structures/Power/substation.rsi/charging.png
index 7675535164c696..538dc2b7a84725 100644
Binary files a/Resources/Textures/Structures/Power/substation.rsi/charging.png and b/Resources/Textures/Structures/Power/substation.rsi/charging.png differ
diff --git a/Resources/Textures/Structures/Power/substation.rsi/dead.png b/Resources/Textures/Structures/Power/substation.rsi/dead.png
index 27440c1c7704fb..9fbff744ca74ec 100644
Binary files a/Resources/Textures/Structures/Power/substation.rsi/dead.png and b/Resources/Textures/Structures/Power/substation.rsi/dead.png differ
diff --git a/Resources/Textures/Structures/Power/substation.rsi/full.png b/Resources/Textures/Structures/Power/substation.rsi/full.png
index d0b9726cacf1f8..d179742669917d 100644
Binary files a/Resources/Textures/Structures/Power/substation.rsi/full.png and b/Resources/Textures/Structures/Power/substation.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Power/substation.rsi/meta.json b/Resources/Textures/Structures/Power/substation.rsi/meta.json
index d19066274d15e5..0125458641c7e4 100644
--- a/Resources/Textures/Structures/Power/substation.rsi/meta.json
+++ b/Resources/Textures/Structures/Power/substation.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
-  "license": "CC0-1.0",
-  "copyright": "Created by EmoGarbage404 (github)",
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Drawn by Ubaser.",
   "size": {
     "x": 32,
     "y": 32
@@ -13,39 +13,8 @@
 	{
 	  "name": "substation_static"
 	},
-    {
-      "name": "substation_wall",
-      "directions": 4
-    },
-    {
-      "name": "screen_wall",
-      "directions": 4,
-      "delays": [
-        [
-          5.0,
-          0.5,
-          0.5,
-          0.5
-        ],
-        [
-          5.0,
-          0.5,
-          0.5,
-          0.5
-        ],
-        [
-          5.0,
-          0.5,
-          0.5,
-          0.5
-        ],
-        [
-          5.0,
-          0.5,
-          0.5,
-          0.5
-        ]
-      ]
+    {		
+      "name": "substation_wall"
     },
 	{
 	  "name": "substation_wall_static"
@@ -54,31 +23,21 @@
       "name": "full"
     },
     {
-      "name": "charging",
-      "delays": [
-        [
-          0.1,
-          0.1
-        ]
-      ]
+      "name": "charging"
     },
     {
-      "name": "dead",
-      "delays": [
-        [
-          0.3,
-          0.1
-        ]
-      ]
+      "name": "dead"
     },
     {
       "name": "screen",
       "delays": [
         [
-          5.0,
-          0.5,
-          0.5,
-          0.5
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15
         ]
       ]
     }
diff --git a/Resources/Textures/Structures/Power/substation.rsi/screen.png b/Resources/Textures/Structures/Power/substation.rsi/screen.png
index 24420ec31ca2d5..60c922c53f622e 100644
Binary files a/Resources/Textures/Structures/Power/substation.rsi/screen.png and b/Resources/Textures/Structures/Power/substation.rsi/screen.png differ
diff --git a/Resources/Textures/Structures/Power/substation.rsi/screen_wall.png b/Resources/Textures/Structures/Power/substation.rsi/screen_wall.png
deleted file mode 100644
index c1dfb87b1c1fd3..00000000000000
Binary files a/Resources/Textures/Structures/Power/substation.rsi/screen_wall.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Power/substation.rsi/substation.png b/Resources/Textures/Structures/Power/substation.rsi/substation.png
index 68ef981ae5f3ca..b9d1eb18d8fc4e 100644
Binary files a/Resources/Textures/Structures/Power/substation.rsi/substation.png and b/Resources/Textures/Structures/Power/substation.rsi/substation.png differ
diff --git a/Resources/Textures/Structures/Power/substation.rsi/substation_static.png b/Resources/Textures/Structures/Power/substation.rsi/substation_static.png
index eee995843f1949..9d5b8598f4b8d9 100644
Binary files a/Resources/Textures/Structures/Power/substation.rsi/substation_static.png and b/Resources/Textures/Structures/Power/substation.rsi/substation_static.png differ
diff --git a/Resources/Textures/Structures/Power/substation.rsi/substation_wall.png b/Resources/Textures/Structures/Power/substation.rsi/substation_wall.png
index ab250c6747ddcc..155ced7128aadd 100644
Binary files a/Resources/Textures/Structures/Power/substation.rsi/substation_wall.png and b/Resources/Textures/Structures/Power/substation.rsi/substation_wall.png differ
diff --git a/Resources/Textures/Structures/Power/substation.rsi/substation_wall_static.png b/Resources/Textures/Structures/Power/substation.rsi/substation_wall_static.png
index f4cc933b4a505d..e810e6a5a4a1f0 100644
Binary files a/Resources/Textures/Structures/Power/substation.rsi/substation_wall_static.png and b/Resources/Textures/Structures/Power/substation.rsi/substation_wall_static.png differ