diff --git a/MTN6_Simulation/com.inductiveautomation.perspective/views/Simulations/Station_EPC/resource.json b/MTN6_Simulation/com.inductiveautomation.perspective/views/Simulations/Station_EPC/resource.json
new file mode 100644
index 0000000..efd799e
--- /dev/null
+++ b/MTN6_Simulation/com.inductiveautomation.perspective/views/Simulations/Station_EPC/resource.json
@@ -0,0 +1,17 @@
+{
+  "scope": "G",
+  "version": 1,
+  "restricted": false,
+  "overridable": true,
+  "files": [
+    "view.json",
+    "thumbnail.png"
+  ],
+  "attributes": {
+    "lastModification": {
+      "actor": "admin",
+      "timestamp": "2025-06-04T13:27:50Z"
+    },
+    "lastModificationSignature": "9f2d15bec701a5b47b90a28d7896be38790e8558b3a7d75693a0944b90035a45"
+  }
+}
\ No newline at end of file
diff --git a/MTN6_Simulation/com.inductiveautomation.perspective/views/Simulations/Station_EPC/thumbnail.png b/MTN6_Simulation/com.inductiveautomation.perspective/views/Simulations/Station_EPC/thumbnail.png
new file mode 100644
index 0000000..aeddab0
Binary files /dev/null and b/MTN6_Simulation/com.inductiveautomation.perspective/views/Simulations/Station_EPC/thumbnail.png differ
diff --git a/MTN6_Simulation/com.inductiveautomation.perspective/views/Simulations/Station_EPC/view.json b/MTN6_Simulation/com.inductiveautomation.perspective/views/Simulations/Station_EPC/view.json
new file mode 100644
index 0000000..9570255
--- /dev/null
+++ b/MTN6_Simulation/com.inductiveautomation.perspective/views/Simulations/Station_EPC/view.json
@@ -0,0 +1,263 @@
+{
+  "custom": {},
+  "params": {},
+  "props": {
+    "defaultSize": {
+      "height": 1080,
+      "width": 1920
+    }
+  },
+  "root": {
+    "children": [
+      {
+        "meta": {
+          "name": "Image"
+        },
+        "position": {
+          "height": 1080,
+          "width": 1920,
+          "x": -2.0088348388671875,
+          "y": 0.0000629425048828125
+        },
+        "props": {
+          "source": "http://127.0.0.1:5500/Station_EPC.svg"
+        },
+        "type": "ia.display.image"
+      },
+      {
+        "meta": {
+          "name": "UL1_3_VFD1"
+        },
+        "position": {
+          "height": 292,
+          "width": 290,
+          "x": 813,
+          "y": 376.979
+        },
+        "props": {
+          "params": {
+            "directionLeft": false,
+            "forceFaultStatus": null,
+            "forceRunningStatus": null,
+            "tagProps": [
+              "/System/Conveyor/UL1_3_VFD1",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value"
+            ]
+          },
+          "path": "Symbol-Views/Equipment-Views/Status"
+        },
+        "type": "ia.display.view"
+      },
+      {
+        "meta": {
+          "name": "UL1_3_EPC1_Line"
+        },
+        "position": {
+          "height": 30,
+          "rotate": {
+            "angle": 0
+          },
+          "width": 1376,
+          "x": 303.83,
+          "y": 720.21
+        },
+        "props": {
+          "params": {
+            "forceFaultStatus": null,
+            "tagProps": [
+              "/System/Station/EPC/UL1_3_EPC1",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value"
+            ]
+          },
+          "path": "Symbol-Views/Equipment-Views/PullChord_Line"
+        },
+        "type": "ia.display.view"
+      },
+      {
+        "meta": {
+          "name": "UL1_3_EPC2_Line"
+        },
+        "position": {
+          "height": 30,
+          "rotate": {
+            "angle": 0
+          },
+          "width": 1360,
+          "x": 312.93,
+          "y": 294.02
+        },
+        "props": {
+          "params": {
+            "forceFaultStatus": null,
+            "tagProps": [
+              "/System/Station/EPC/UL1_3_EPC2",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value"
+            ]
+          },
+          "path": "Symbol-Views/Equipment-Views/PullChord_Line"
+        },
+        "type": "ia.display.view"
+      },
+      {
+        "meta": {
+          "name": "UL1_3_EPC2"
+        },
+        "position": {
+          "height": 178,
+          "rotate": {
+            "angle": 90
+          },
+          "width": 185,
+          "x": 134,
+          "y": 220
+        },
+        "props": {
+          "params": {
+            "forceFaultStatus": null,
+            "tagProps": [
+              "/System/Station/EPC/UL1_3_EPC2",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value"
+            ]
+          },
+          "path": "Symbol-Views/Equipment-Views/PullChord"
+        },
+        "type": "ia.display.view"
+      },
+      {
+        "meta": {
+          "name": "UL1_3_EPC1"
+        },
+        "position": {
+          "height": 178,
+          "rotate": {
+            "angle": "90deg"
+          },
+          "width": 185,
+          "x": 134,
+          "y": 645
+        },
+        "props": {
+          "params": {
+            "forceFaultStatus": null,
+            "tagProps": [
+              "/System/Station/EPC/UL1_3_EPC1",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value"
+            ]
+          },
+          "path": "Symbol-Views/Equipment-Views/PullChord"
+        },
+        "type": "ia.display.view"
+      },
+      {
+        "meta": {
+          "name": "UL1_3_EPC1_END"
+        },
+        "position": {
+          "height": 150,
+          "rotate": {
+            "angle": 90
+          },
+          "width": 80,
+          "x": 1687.89,
+          "y": 660.19
+        },
+        "props": {
+          "params": {
+            "forceFaultStatus": null,
+            "tagProps": [
+              "/System/Station/EPC/UL1_3_EPC1",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value"
+            ]
+          },
+          "path": "Symbol-Views/Equipment-Views/PullChord_End"
+        },
+        "type": "ia.display.view"
+      },
+      {
+        "meta": {
+          "name": "UL1_3_EPC2_END"
+        },
+        "position": {
+          "height": 150,
+          "rotate": {
+            "angle": 90
+          },
+          "width": 80,
+          "x": 1682.89,
+          "y": 235.19
+        },
+        "props": {
+          "params": {
+            "forceFaultStatus": null,
+            "tagProps": [
+              "/System/Station/EPC/UL1_3_EPC2",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value"
+            ]
+          },
+          "path": "Symbol-Views/Equipment-Views/PullChord_End"
+        },
+        "type": "ia.display.view"
+      }
+    ],
+    "meta": {
+      "name": "root"
+    },
+    "type": "ia.container.coord"
+  }
+}
\ No newline at end of file
diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PullChord/view.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PullChord/view.json
index c513773..d461dfc 100644
--- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PullChord/view.json
+++ b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PullChord/view.json
@@ -1,16 +1,12 @@
 {
   "custom": {
-    "alarm_message": null,
-    "covert_mode": true,
     "disconnected": false,
-    "display_icon": true,
-    "error": false,
-    "isMatch": 0,
     "plc": "value",
     "priority": 0,
     "priority_string": "No active alarms",
-    "searchId": "value",
-    "state": 5
+    "searchId": "PLC01",
+    "state": 0,
+    "state_string": "Normal"
   },
   "params": {
     "forceFaultStatus": null,
@@ -29,24 +25,6 @@
     ]
   },
   "propConfig": {
-    "custom.alarm_message": {
-      "persistent": true
-    },
-    "custom.covert_mode": {
-      "binding": {
-        "config": {
-          "path": "this.custom.state"
-        },
-        "transforms": [
-          {
-            "expression": "case(\t{value},\r\n\t\t0, {session.custom.alarm_filter.show_safety},\r\n\t\t1, True,\r\n\t\t2, True,\r\n\t\t3, {session.custom.alarm_filter.show_safety},\r\n\t\t4, {session.custom.alarm_filter.show_safety},\r\n\t\t5, {session.custom.alarm_filter.show_safety},\r\n\t\tFalse)",
-            "type": "expression"
-          }
-        ],
-        "type": "property"
-      },
-      "persistent": true
-    },
     "custom.disconnected": {
       "binding": {
         "config": {
@@ -68,39 +46,6 @@
       },
       "persistent": true
     },
-    "custom.display_icon": {
-      "binding": {
-        "config": {
-          "expression": "{this.custom.covert_mode}||{this.custom.isMatch}\u003e0"
-        },
-        "type": "expr"
-      },
-      "persistent": true
-    },
-    "custom.error": {
-      "binding": {
-        "config": {
-          "path": "view.custom.state"
-        },
-        "transforms": [
-          {
-            "expression": "0 \u003c {value} \u0026\u0026 {value} \u003c 5",
-            "type": "expression"
-          }
-        ],
-        "type": "property"
-      },
-      "persistent": true
-    },
-    "custom.isMatch": {
-      "binding": {
-        "config": {
-          "expression": "if({view.params.tagProps[0]}\u003d\"value\",0,\nif({this.custom.searchId}\u003d{view.params.tagProps[0]},100,0))"
-        },
-        "type": "expr"
-      },
-      "persistent": true
-    },
     "custom.plc": {
       "binding": {
         "config": {
@@ -128,18 +73,6 @@
             "mappings": [
               {
                 "input": 1,
-                "output": 4
-              },
-              {
-                "input": 2,
-                "output": 3
-              },
-              {
-                "input": 3,
-                "output": 2
-              },
-              {
-                "input": 4,
                 "output": 1
               }
             ],
@@ -154,9 +87,27 @@
     "custom.priority_string": {
       "binding": {
         "config": {
-          "expression": "case({view.custom.state},\r\n1, \"High\",\r\n2, \"Medium\",\r\n3, \"Low\",\r\n4, \"Diagnostic\",\r\n5, \"No active alarms\",\r\n\"Unknown\")"
+          "path": "view.custom.state"
         },
-        "type": "expr"
+        "transforms": [
+          {
+            "fallback": "Unknown",
+            "inputType": "scalar",
+            "mappings": [
+              {
+                "input": 1,
+                "output": "High"
+              },
+              {
+                "input": 0,
+                "output": "No active alarms"
+              }
+            ],
+            "outputType": "scalar",
+            "type": "map"
+          }
+        ],
+        "type": "property"
       },
       "persistent": true
     },
@@ -178,7 +129,7 @@
             "0": "{view.params.tagProps[0]}",
             "fc": "{session.custom.fc}"
           },
-          "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/ALARMST"
+          "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/Alarm/Estopped"
         },
         "transforms": [
           {
@@ -186,28 +137,16 @@
             "type": "expression"
           },
           {
-            "fallback": null,
+            "fallback": 0,
             "inputType": "scalar",
             "mappings": [
               {
-                "input": 4,
+                "input": true,
                 "output": 1
               },
               {
-                "input": 3,
-                "output": 2
-              },
-              {
-                "input": 2,
-                "output": 3
-              },
-              {
-                "input": 1,
-                "output": 4
-              },
-              {
-                "input": 0,
-                "output": 5
+                "input": false,
+                "output": 0
               }
             ],
             "outputType": "scalar",
@@ -218,6 +157,15 @@
       },
       "persistent": true
     },
+    "custom.state_string": {
+      "binding": {
+        "config": {
+          "expression": "case({view.custom.state},\r\n1, \"Active\",\r\n0, \"Normal\",\r\n\"Unknown\")"
+        },
+        "type": "expr"
+      },
+      "persistent": true
+    },
     "params.forceFaultStatus": {
       "paramDirection": "input",
       "persistent": true
@@ -253,15 +201,27 @@
           "props.elements[0].fill.paint": {
             "binding": {
               "config": {
-                "expression": "\u0027#AAAAAA\u0027"
+                "path": "view.custom.state"
               },
               "transforms": [
                 {
-                  "expression": "if({view.custom.display_icon}\u0026\u0026 {view.custom.isMatch}\u003d0,{value},{value}+\u002700\u0027)",
-                  "type": "expression"
+                  "fallback": "#AC0000",
+                  "inputType": "scalar",
+                  "mappings": [
+                    {
+                      "input": 0,
+                      "output": "#AAAAAA"
+                    },
+                    {
+                      "input": 1,
+                      "output": "#AAAAAA"
+                    }
+                  ],
+                  "outputType": "color",
+                  "type": "map"
                 }
               ],
-              "type": "expr"
+              "type": "property"
             }
           },
           "props.elements[1].fill.paint": {
@@ -271,7 +231,7 @@
               },
               "transforms": [
                 {
-                  "expression": "case({value},\r\n1,{session.custom.colours.state1},\r\n2,{session.custom.colours.state1},\r\n3,{session.custom.colours.state1},\r\n4,{session.custom.colours.state1},\r\n{session.custom.colours.state5}\r\n)",
+                  "expression": "case({value},\r\n0,{session.custom.colours.state5},\r\n{session.custom.colours.state1}\r\n)",
                   "type": "expression"
                 }
               ],
@@ -281,11 +241,11 @@
           "props.elements[2].visibility": {
             "binding": {
               "config": {
-                "path": "view.custom.error"
+                "path": "view.custom.state"
               },
               "transforms": [
                 {
-                  "expression": "if(!{value} \u0026\u0026 {view.custom.display_icon}, \u0027visible\u0027, \u0027hidden\u0027)",
+                  "expression": "if(\r\n  !{value} \u0026\u0026 \r\n  {view.custom.state} \u003d 0 \u0026\u0026 \r\n  {parent.meta.visible}, \r\n  \u0027visible\u0027, \r\n  \u0027hidden\u0027\r\n)",
                   "type": "expression"
                 }
               ],
@@ -295,78 +255,16 @@
           "props.elements[3].visibility": {
             "binding": {
               "config": {
-                "path": "view.custom.error"
+                "path": "view.custom.state"
               },
               "transforms": [
                 {
-                  "expression": "if({value} \u0026\u0026 {view.custom.display_icon}, \u0027visible\u0027, \u0027hidden\u0027)",
+                  "expression": "if(\r\n  {value} \u0026\u0026 \r\n  {view.custom.state} \u003e\u003d 1 \u0026\u0026 \r\n  {parent.meta.visible}, \r\n  \u0027visible\u0027, \r\n  \u0027hidden\u0027\r\n)",
                   "type": "expression"
                 }
               ],
               "type": "property"
             }
-          },
-          "props.style.classes": {
-            "binding": {
-              "config": {
-                "expression": "if({session.custom.colours.colour_impaired} \u003d True \u0026\u0026 {view.custom.isMatch} \u003e 0,\r\n{view.custom.state} + 100 + {view.custom.isMatch},\r\n{view.custom.state} + {view.custom.isMatch})"
-              },
-              "transforms": [
-                {
-                  "fallback": "",
-                  "inputType": "scalar",
-                  "mappings": [
-                    {
-                      "input": 101,
-                      "output": "State-Styles/State101"
-                    },
-                    {
-                      "input": 102,
-                      "output": "State-Styles/State102"
-                    },
-                    {
-                      "input": 103,
-                      "output": "State-Styles/State103"
-                    },
-                    {
-                      "input": 104,
-                      "output": "State-Styles/State104"
-                    },
-                    {
-                      "input": 105,
-                      "output": "State-Styles/State105"
-                    },
-                    {
-                      "input": 106,
-                      "output": "State-Styles/State106"
-                    },
-                    {
-                      "input": 201,
-                      "output": "State-Styles/State201"
-                    },
-                    {
-                      "input": 202,
-                      "output": "State-Styles/State202"
-                    },
-                    {
-                      "input": 203,
-                      "output": "State-Styles/State203"
-                    },
-                    {
-                      "input": 204,
-                      "output": "State-Styles/State204"
-                    },
-                    {
-                      "input": 205,
-                      "output": "State-Styles/State205"
-                    }
-                  ],
-                  "outputType": "style-list",
-                  "type": "map"
-                }
-              ],
-              "type": "expr"
-            }
           }
         },
         "props": {
@@ -428,7 +326,6 @@
               "type": "path"
             }
           ],
-          "style": {},
           "viewBox": "-0.5 -0.5 27 42"
         },
         "type": "ia.shapes.svg"
@@ -476,7 +373,7 @@
           },
           "transforms": [
             {
-              "expression": "case({value},\r\n0,{session.custom.colours.state0},\r\n1,{session.custom.colours.state1},\r\n2,{session.custom.colours.state2},\r\n3,{session.custom.colours.state3},\r\n4,{session.custom.colours.state4},\r\n5,{session.custom.colours.state5},\r\n6,{session.custom.colours.state6},\r\n{session.custom.colours.fallback}\r\n)",
+              "expression": "case({value},\r\n0,{session.custom.colours.state5},\r\n1,{session.custom.colours.state1},\r\n{session.custom.colours.fallback}\r\n)",
               "type": "expression"
             }
           ],
@@ -495,18 +392,6 @@
               "mappings": [
                 {
                   "input": 1,
-                  "output": "Alarms-Styles/Diagnostic"
-                },
-                {
-                  "input": 2,
-                  "output": "Alarms-Styles/Low"
-                },
-                {
-                  "input": 3,
-                  "output": "Alarms-Styles/Medium"
-                },
-                {
-                  "input": 4,
                   "output": "Alarms-Styles/High"
                 }
               ],
@@ -524,7 +409,7 @@
           },
           "transforms": [
             {
-              "expression": "if({session.custom.colours.colour_impaired},\r\n\t\u0027#000000\u0027,\r\n\tcase(\t{value},\r\n\t\t\t1,\u0027#FFFFFF\u0027,\r\n\t\t\t2,\u0027#000000\u0027,\r\n\t\t\t3,\u0027#000000\u0027,\r\n\t\t\t4,\u0027#FFFFFF\u0027,\r\n\t\t\t5,\u0027#FFFFFF\u0027,\r\n\t\t\t\u0027#000000\u0027)\r\n\t)",
+              "expression": "if({session.custom.colours.colour_impaired},\r\n\t\u0027#000000\u0027,\r\n\tcase(\t{value},\r\n\t\t\t1,\u0027#000000\u0027,\r\n\t\t\t\u0027#FFFFFF\u0027)\r\n\t)",
               "type": "expression"
             }
           ],
@@ -542,7 +427,7 @@
       "meta.visible": {
         "binding": {
           "config": {
-            "path": "view.custom.display_icon"
+            "path": "session.custom.alarm_filter.show_safety"
           },
           "type": "property"
         }
diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PullChord_End/view.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PullChord_End/view.json
index 9e5f0ea..f32295b 100644
--- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PullChord_End/view.json
+++ b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PullChord_End/view.json
@@ -1,16 +1,12 @@
 {
   "custom": {
-    "alarm_message": null,
-    "covert_mode": true,
     "disconnected": false,
-    "display_icon": true,
-    "error": false,
-    "isMatch": 0,
     "plc": "value",
     "priority": 0,
-    "priority_string": "No active alarms",
-    "searchId": "value",
-    "state": 5
+    "priority_string": "Low",
+    "searchId": "PLC01",
+    "state": 0,
+    "state_string": "Normal"
   },
   "params": {
     "forceFaultStatus": null,
@@ -29,24 +25,6 @@
     ]
   },
   "propConfig": {
-    "custom.alarm_message": {
-      "persistent": true
-    },
-    "custom.covert_mode": {
-      "binding": {
-        "config": {
-          "path": "this.custom.state"
-        },
-        "transforms": [
-          {
-            "expression": "case(\t{value},\r\n\t\t0, {session.custom.alarm_filter.show_safety},\r\n\t\t1, True,\r\n\t\t2, True,\r\n\t\t3, {session.custom.alarm_filter.show_safety},\r\n\t\t4, {session.custom.alarm_filter.show_safety},\r\n\t\t5, {session.custom.alarm_filter.show_safety},\r\n\t\tFalse)",
-            "type": "expression"
-          }
-        ],
-        "type": "property"
-      },
-      "persistent": true
-    },
     "custom.disconnected": {
       "binding": {
         "config": {
@@ -68,39 +46,6 @@
       },
       "persistent": true
     },
-    "custom.display_icon": {
-      "binding": {
-        "config": {
-          "expression": "{this.custom.covert_mode}||{this.custom.isMatch}\u003e0"
-        },
-        "type": "expr"
-      },
-      "persistent": true
-    },
-    "custom.error": {
-      "binding": {
-        "config": {
-          "path": "view.custom.state"
-        },
-        "transforms": [
-          {
-            "expression": "0 \u003c {value} \u0026\u0026 {value} \u003c 5",
-            "type": "expression"
-          }
-        ],
-        "type": "property"
-      },
-      "persistent": true
-    },
-    "custom.isMatch": {
-      "binding": {
-        "config": {
-          "expression": "if({view.params.tagProps[0]}\u003d\"value\",0,\nif({this.custom.searchId}\u003d{view.params.tagProps[0]},100,0))"
-        },
-        "type": "expr"
-      },
-      "persistent": true
-    },
     "custom.plc": {
       "binding": {
         "config": {
@@ -123,24 +68,12 @@
         },
         "transforms": [
           {
-            "fallback": 0,
+            "fallback": 1,
             "inputType": "scalar",
             "mappings": [
               {
-                "input": 1,
-                "output": 4
-              },
-              {
-                "input": 2,
-                "output": 3
-              },
-              {
-                "input": 3,
-                "output": 2
-              },
-              {
-                "input": 4,
-                "output": 1
+                "input": 0,
+                "output": 0
               }
             ],
             "outputType": "scalar",
@@ -154,7 +87,7 @@
     "custom.priority_string": {
       "binding": {
         "config": {
-          "expression": "case({view.custom.state},\r\n1, \"High\",\r\n2, \"Medium\",\r\n3, \"Low\",\r\n4, \"Diagnostic\",\r\n5, \"No active alarms\",\r\n\"Unknown\")"
+          "expression": "case({view.custom.state},\r\n1, \"High\",\r\n0, \"Low\",\r\n\"Unknown\")"
         },
         "type": "expr"
       },
@@ -178,7 +111,7 @@
             "0": "{view.params.tagProps[0]}",
             "fc": "{session.custom.fc}"
           },
-          "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/ALARMST"
+          "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/Alarm/Estopped"
         },
         "transforms": [
           {
@@ -186,28 +119,16 @@
             "type": "expression"
           },
           {
-            "fallback": null,
+            "fallback": 0,
             "inputType": "scalar",
             "mappings": [
               {
-                "input": 4,
+                "input": true,
                 "output": 1
               },
               {
-                "input": 3,
-                "output": 2
-              },
-              {
-                "input": 2,
-                "output": 3
-              },
-              {
-                "input": 1,
-                "output": 4
-              },
-              {
-                "input": 0,
-                "output": 5
+                "input": false,
+                "output": 0
               }
             ],
             "outputType": "scalar",
@@ -218,6 +139,15 @@
       },
       "persistent": true
     },
+    "custom.state_string": {
+      "binding": {
+        "config": {
+          "expression": "case({view.custom.state},\r\n1, \"Active\",\r\n0, \"Normal\",\r\n\"Unknown\")"
+        },
+        "type": "expr"
+      },
+      "persistent": true
+    },
     "params.forceFaultStatus": {
       "paramDirection": "input",
       "persistent": true
@@ -248,10 +178,36 @@
           "width": 1
         },
         "propConfig": {
+          "props.elements[0].fill.paint": {
+            "binding": {
+              "config": {
+                "path": "view.custom.state"
+              },
+              "transforms": [
+                {
+                  "fallback": "#AC0000",
+                  "inputType": "scalar",
+                  "mappings": [
+                    {
+                      "input": 0,
+                      "output": "#AAAAAA"
+                    },
+                    {
+                      "input": 1,
+                      "output": "#B79D9D"
+                    }
+                  ],
+                  "outputType": "color",
+                  "type": "map"
+                }
+              ],
+              "type": "property"
+            }
+          },
           "props.style.classes": {
             "binding": {
               "config": {
-                "expression": "if({session.custom.colours.colour_impaired} \u003d True \u0026\u0026 {view.custom.isMatch} \u003e 0,\r\n{view.custom.state} + 100 + {view.custom.isMatch},\r\n{view.custom.state} + {view.custom.isMatch})"
+                "expression": "if({session.custom.colours.colour_impaired} \u003d True,\r\n{view.custom.state} + 100,\r\n{view.custom.state})"
               },
               "transforms": [
                 {
@@ -315,9 +271,7 @@
           "elements": [
             {
               "d": "M 0.01621377,0.01595147 H 25.93719 V 41.138171 H 0.01621377 Z",
-              "fill": {
-                "paint": "#D5D5D5"
-              },
+              "fill": {},
               "name": "path",
               "stroke": {
                 "paint": "#000000",
@@ -375,7 +329,7 @@
           },
           "transforms": [
             {
-              "expression": "case({value},\r\n0,{session.custom.colours.state0},\r\n1,{session.custom.colours.state1},\r\n2,{session.custom.colours.state2},\r\n3,{session.custom.colours.state3},\r\n4,{session.custom.colours.state4},\r\n5,{session.custom.colours.state5},\r\n6,{session.custom.colours.state6},\r\n{session.custom.colours.fallback}\r\n)",
+              "expression": "case({value},\r\n0,{session.custom.colours.state5},\r\n1,{session.custom.colours.state1},\r\n{session.custom.colours.fallback}\r\n)",
               "type": "expression"
             }
           ],
@@ -394,18 +348,6 @@
               "mappings": [
                 {
                   "input": 1,
-                  "output": "Alarms-Styles/Diagnostic"
-                },
-                {
-                  "input": 2,
-                  "output": "Alarms-Styles/Low"
-                },
-                {
-                  "input": 3,
-                  "output": "Alarms-Styles/Medium"
-                },
-                {
-                  "input": 4,
                   "output": "Alarms-Styles/High"
                 }
               ],
@@ -423,7 +365,7 @@
           },
           "transforms": [
             {
-              "expression": "if({session.custom.colours.colour_impaired},\r\n\t\u0027#000000\u0027,\r\n\tcase(\t{value},\r\n\t\t\t1,\u0027#FFFFFF\u0027,\r\n\t\t\t2,\u0027#000000\u0027,\r\n\t\t\t3,\u0027#000000\u0027,\r\n\t\t\t4,\u0027#FFFFFF\u0027,\r\n\t\t\t5,\u0027#FFFFFF\u0027,\r\n\t\t\t\u0027#000000\u0027)\r\n\t)",
+              "expression": "if({session.custom.colours.colour_impaired},\r\n\t\u0027#000000\u0027,\r\n\tcase(\t{value},\r\n\t\t\t1,\u0027#000000\u0027,\r\n\t\t\t\u0027#FFFFFF\u0027)\r\n\t)",
               "type": "expression"
             }
           ],
@@ -441,7 +383,7 @@
       "meta.visible": {
         "binding": {
           "config": {
-            "path": "view.custom.display_icon"
+            "path": "session.custom.alarm_filter.show_safety"
           },
           "type": "property"
         }
diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PullChord_Line/view.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PullChord_Line/view.json
index 49e77b6..cbd9e2b 100644
--- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PullChord_Line/view.json
+++ b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PullChord_Line/view.json
@@ -1,16 +1,13 @@
 {
   "custom": {
     "alarm_message": null,
-    "covert_mode": true,
     "disconnected": false,
-    "display_icon": true,
-    "error": false,
-    "isMatch": 0,
     "plc": "value",
     "priority": 0,
     "priority_string": "No active alarms",
     "searchId": "PLC01",
-    "state": 5
+    "state": 0,
+    "state_string": "Normal"
   },
   "params": {
     "forceFaultStatus": null,
@@ -29,24 +26,6 @@
     ]
   },
   "propConfig": {
-    "custom.alarm_message": {
-      "persistent": true
-    },
-    "custom.covert_mode": {
-      "binding": {
-        "config": {
-          "path": "this.custom.state"
-        },
-        "transforms": [
-          {
-            "expression": "case(\t{value},\r\n\t\t0, {session.custom.alarm_filter.show_safety},\r\n\t\t1, True,\r\n\t\t2, True,\r\n\t\t3, {session.custom.alarm_filter.show_safety},\r\n\t\t4, {session.custom.alarm_filter.show_safety},\r\n\t\t5, {session.custom.alarm_filter.show_safety},\r\n\t\tFalse)",
-            "type": "expression"
-          }
-        ],
-        "type": "property"
-      },
-      "persistent": true
-    },
     "custom.disconnected": {
       "binding": {
         "config": {
@@ -68,39 +47,6 @@
       },
       "persistent": true
     },
-    "custom.display_icon": {
-      "binding": {
-        "config": {
-          "expression": "{this.custom.covert_mode}||{this.custom.isMatch}\u003e0"
-        },
-        "type": "expr"
-      },
-      "persistent": true
-    },
-    "custom.error": {
-      "binding": {
-        "config": {
-          "path": "view.custom.state"
-        },
-        "transforms": [
-          {
-            "expression": "0 \u003c {value} \u0026\u0026 {value} \u003c 5",
-            "type": "expression"
-          }
-        ],
-        "type": "property"
-      },
-      "persistent": true
-    },
-    "custom.isMatch": {
-      "binding": {
-        "config": {
-          "expression": "if({view.params.tagProps[0]}\u003d\"value\",0,\nif({this.custom.searchId}\u003d{view.params.tagProps[0]},100,0))"
-        },
-        "type": "expr"
-      },
-      "persistent": true
-    },
     "custom.plc": {
       "binding": {
         "config": {
@@ -123,24 +69,12 @@
         },
         "transforms": [
           {
-            "fallback": 0,
+            "fallback": 1,
             "inputType": "scalar",
             "mappings": [
               {
-                "input": 1,
-                "output": 4
-              },
-              {
-                "input": 2,
-                "output": 3
-              },
-              {
-                "input": 3,
-                "output": 2
-              },
-              {
-                "input": 4,
-                "output": 1
+                "input": 0,
+                "output": 0
               }
             ],
             "outputType": "scalar",
@@ -154,7 +88,7 @@
     "custom.priority_string": {
       "binding": {
         "config": {
-          "expression": "case({view.custom.state},\r\n1, \"High\",\r\n2, \"Medium\",\r\n3, \"Low\",\r\n4, \"Diagnostic\",\r\n5, \"No active alarms\",\r\n\"Unknown\")"
+          "expression": "case({view.custom.state},\r\n1, \"High\",\r\n0, \"No active alarms\",\r\n\"Unknown\")"
         },
         "type": "expr"
       },
@@ -178,7 +112,7 @@
             "0": "{view.params.tagProps[0]}",
             "fc": "{session.custom.fc}"
           },
-          "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/ALARMST"
+          "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/Alarm/Estopped"
         },
         "transforms": [
           {
@@ -186,28 +120,16 @@
             "type": "expression"
           },
           {
-            "fallback": null,
+            "fallback": 0,
             "inputType": "scalar",
             "mappings": [
               {
-                "input": 4,
+                "input": true,
                 "output": 1
               },
               {
-                "input": 3,
-                "output": 2
-              },
-              {
-                "input": 2,
-                "output": 3
-              },
-              {
-                "input": 1,
-                "output": 4
-              },
-              {
-                "input": 0,
-                "output": 5
+                "input": false,
+                "output": 0
               }
             ],
             "outputType": "scalar",
@@ -218,6 +140,15 @@
       },
       "persistent": true
     },
+    "custom.state_string": {
+      "binding": {
+        "config": {
+          "expression": "case({view.custom.state},\r\n1, \"Active\",\r\n0, \"Normal\",\r\n\"Unknown\")"
+        },
+        "type": "expr"
+      },
+      "persistent": true
+    },
     "params.forceFaultStatus": {
       "paramDirection": "input",
       "persistent": true
@@ -251,11 +182,11 @@
           "props.elements[0].visibility": {
             "binding": {
               "config": {
-                "path": "view.custom.error"
+                "path": "view.custom.state"
               },
               "transforms": [
                 {
-                  "expression": "if({value}, \u0027visible\u0027,\u0027hidden\u0027)",
+                  "expression": "if(\r\n  ({value} \u003d 0 || {value} \u003d 1 || !{parent.meta.visible}),\r\n  \u0027hidden\u0027,\r\n  \u0027visible\u0027\r\n)",
                   "type": "expression"
                 }
               ],
@@ -265,11 +196,11 @@
           "props.elements[1].visibility": {
             "binding": {
               "config": {
-                "path": "view.custom.error"
+                "path": "view.custom.state"
               },
               "transforms": [
                 {
-                  "expression": "if({value}, \u0027visible\u0027,\u0027hidden\u0027)",
+                  "expression": "if(\r\n  ({value} \u003d 0 || {value} \u003d 1 || !{parent.meta.visible}),\r\n  \u0027hidden\u0027,\r\n  \u0027visible\u0027\r\n)",
                   "type": "expression"
                 }
               ],
@@ -283,72 +214,30 @@
               },
               "transforms": [
                 {
-                  "expression": "case({value},\r\n1,{session.custom.colours.state1},\r\n2,{session.custom.colours.state1},\r\n3,{session.custom.colours.state1},\r\n4,{session.custom.colours.state1},\r\n\u0027#000000\u0027\r\n)",
-                  "type": "expression"
+                  "fallback": "#800000",
+                  "inputType": "scalar",
+                  "mappings": [
+                    {
+                      "input": 1,
+                      "output": "#FF0000"
+                    },
+                    {
+                      "input": 0,
+                      "output": "#000000"
+                    }
+                  ],
+                  "outputType": "color",
+                  "type": "map"
                 }
               ],
               "type": "property"
             }
           },
-          "props.style.classes": {
+          "props.elements[2].visibility": {
             "binding": {
               "config": {
-                "expression": "if({session.custom.colours.colour_impaired} \u003d True \u0026\u0026 {view.custom.isMatch} \u003e 0,\r\n{view.custom.state} + 100 + {view.custom.isMatch},\r\n{view.custom.state} + {view.custom.isMatch})"
+                "expression": "if({parent.meta.visible}, \u0027visible\u0027, \u0027hidden\u0027)"
               },
-              "transforms": [
-                {
-                  "fallback": "",
-                  "inputType": "scalar",
-                  "mappings": [
-                    {
-                      "input": 101,
-                      "output": "State-Styles/State101"
-                    },
-                    {
-                      "input": 102,
-                      "output": "State-Styles/State102"
-                    },
-                    {
-                      "input": 103,
-                      "output": "State-Styles/State103"
-                    },
-                    {
-                      "input": 104,
-                      "output": "State-Styles/State104"
-                    },
-                    {
-                      "input": 105,
-                      "output": "State-Styles/State105"
-                    },
-                    {
-                      "input": 106,
-                      "output": "State-Styles/State106"
-                    },
-                    {
-                      "input": 201,
-                      "output": "State-Styles/State201"
-                    },
-                    {
-                      "input": 202,
-                      "output": "State-Styles/State202"
-                    },
-                    {
-                      "input": 203,
-                      "output": "State-Styles/State203"
-                    },
-                    {
-                      "input": 204,
-                      "output": "State-Styles/State204"
-                    },
-                    {
-                      "input": 205,
-                      "output": "State-Styles/State205"
-                    }
-                  ],
-                  "outputType": "style-list",
-                  "type": "map"
-                }
-              ],
               "type": "expr"
             }
           }
@@ -397,7 +286,6 @@
             }
           ],
           "preserveAspectRatio": "none",
-          "style": {},
           "viewBox": "-0.5 -0.5 102 12"
         },
         "type": "ia.shapes.svg"
@@ -445,7 +333,7 @@
           },
           "transforms": [
             {
-              "expression": "case({value},\r\n0,{session.custom.colours.state0},\r\n1,{session.custom.colours.state1},\r\n2,{session.custom.colours.state2},\r\n3,{session.custom.colours.state3},\r\n4,{session.custom.colours.state4},\r\n5,{session.custom.colours.state5},\r\n6,{session.custom.colours.state6},\r\n{session.custom.colours.fallback}\r\n)",
+              "expression": "case({value},\r\n0,{session.custom.colours.state5},\r\n1,{session.custom.colours.state1},\r\n{session.custom.colours.fallback}\r\n)",
               "type": "expression"
             }
           ],
@@ -464,18 +352,6 @@
               "mappings": [
                 {
                   "input": 1,
-                  "output": "Alarms-Styles/Diagnostic"
-                },
-                {
-                  "input": 2,
-                  "output": "Alarms-Styles/Low"
-                },
-                {
-                  "input": 3,
-                  "output": "Alarms-Styles/Medium"
-                },
-                {
-                  "input": 4,
                   "output": "Alarms-Styles/High"
                 }
               ],
@@ -493,7 +369,7 @@
           },
           "transforms": [
             {
-              "expression": "if({session.custom.colours.colour_impaired},\r\n\t\u0027#000000\u0027,\r\n\tcase(\t{value},\r\n\t\t\t1,\u0027#FFFFFF\u0027,\r\n\t\t\t2,\u0027#000000\u0027,\r\n\t\t\t3,\u0027#000000\u0027,\r\n\t\t\t4,\u0027#FFFFFF\u0027,\r\n\t\t\t5,\u0027#FFFFFF\u0027,\r\n\t\t\t\u0027#000000\u0027)\r\n\t)",
+              "expression": "if({session.custom.colours.colour_impaired},\r\n\t\u0027#000000\u0027,\r\n\tcase(\t{value},\r\n\t\t\t1,\u0027#000000\u0027,\r\n\t\t\t\u0027#FFFFFF\u0027)\r\n\t)",
               "type": "expression"
             }
           ],
@@ -511,7 +387,7 @@
       "meta.visible": {
         "binding": {
           "config": {
-            "path": "view.custom.display_icon"
+            "path": "session.custom.alarm_filter.show_safety"
           },
           "type": "property"
         }
@@ -546,6 +422,7 @@
     "props": {
       "mode": "percent",
       "style": {
+        "borderStyle": "none",
         "cursor": "pointer",
         "overflow": "visible"
       }
diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PullChord_Line_Vertical/view.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PullChord_Line_Vertical/view.json
index 1bb31fc..7b2d2cd 100644
--- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PullChord_Line_Vertical/view.json
+++ b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PullChord_Line_Vertical/view.json
@@ -1,16 +1,12 @@
 {
   "custom": {
-    "alarm_message": null,
-    "covert_mode": true,
     "disconnected": false,
-    "display_icon": true,
-    "error": false,
-    "isMatch": 0,
     "plc": "value",
     "priority": 0,
-    "priority_string": "No active alarms",
-    "searchId": "value",
-    "state": 5
+    "priority_string": "Unknown",
+    "searchId": "PLC01",
+    "state": 0,
+    "state_string": "Normal"
   },
   "params": {
     "forceFaultStatus": null,
@@ -29,24 +25,6 @@
     ]
   },
   "propConfig": {
-    "custom.alarm_message": {
-      "persistent": true
-    },
-    "custom.covert_mode": {
-      "binding": {
-        "config": {
-          "path": "this.custom.state"
-        },
-        "transforms": [
-          {
-            "expression": "case(\t{value},\r\n\t\t0, {session.custom.alarm_filter.show_safety},\r\n\t\t1, True,\r\n\t\t2, True,\r\n\t\t3, {session.custom.alarm_filter.show_safety},\r\n\t\t4, {session.custom.alarm_filter.show_safety},\r\n\t\t5, {session.custom.alarm_filter.show_safety},\r\n\t\tFalse)",
-            "type": "expression"
-          }
-        ],
-        "type": "property"
-      },
-      "persistent": true
-    },
     "custom.disconnected": {
       "binding": {
         "config": {
@@ -68,39 +46,6 @@
       },
       "persistent": true
     },
-    "custom.display_icon": {
-      "binding": {
-        "config": {
-          "expression": "{this.custom.covert_mode}||{this.custom.isMatch}\u003e0"
-        },
-        "type": "expr"
-      },
-      "persistent": true
-    },
-    "custom.error": {
-      "binding": {
-        "config": {
-          "path": "view.custom.state"
-        },
-        "transforms": [
-          {
-            "expression": "0 \u003c {value} \u0026\u0026 {value} \u003c 5",
-            "type": "expression"
-          }
-        ],
-        "type": "property"
-      },
-      "persistent": true
-    },
-    "custom.isMatch": {
-      "binding": {
-        "config": {
-          "expression": "if({view.params.tagProps[0]}\u003d\"value\",0,\nif({this.custom.searchId}\u003d{view.params.tagProps[0]},100,0))"
-        },
-        "type": "expr"
-      },
-      "persistent": true
-    },
     "custom.plc": {
       "binding": {
         "config": {
@@ -123,24 +68,12 @@
         },
         "transforms": [
           {
-            "fallback": 0,
+            "fallback": 1,
             "inputType": "scalar",
             "mappings": [
               {
-                "input": 1,
-                "output": 4
-              },
-              {
-                "input": 2,
-                "output": 3
-              },
-              {
-                "input": 3,
-                "output": 2
-              },
-              {
-                "input": 4,
-                "output": 1
+                "input": 0,
+                "output": 0
               }
             ],
             "outputType": "scalar",
@@ -178,7 +111,7 @@
             "0": "{view.params.tagProps[0]}",
             "fc": "{session.custom.fc}"
           },
-          "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/ALARMST"
+          "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/Alarm/Estopped"
         },
         "transforms": [
           {
@@ -186,28 +119,16 @@
             "type": "expression"
           },
           {
-            "fallback": null,
+            "fallback": 0,
             "inputType": "scalar",
             "mappings": [
               {
-                "input": 4,
+                "input": true,
                 "output": 1
               },
               {
-                "input": 3,
-                "output": 2
-              },
-              {
-                "input": 2,
-                "output": 3
-              },
-              {
-                "input": 1,
-                "output": 4
-              },
-              {
-                "input": 0,
-                "output": 5
+                "input": false,
+                "output": 0
               }
             ],
             "outputType": "scalar",
@@ -218,6 +139,15 @@
       },
       "persistent": true
     },
+    "custom.state_string": {
+      "binding": {
+        "config": {
+          "expression": "case({view.custom.state},\r\n1, \"Active\",\r\n0, \"Normal\",\r\n\"Unknown\")"
+        },
+        "type": "expr"
+      },
+      "persistent": true
+    },
     "params.forceFaultStatus": {
       "paramDirection": "input",
       "persistent": true
@@ -251,11 +181,11 @@
           "props.elements[0].visibility": {
             "binding": {
               "config": {
-                "path": "view.custom.error"
+                "path": "view.custom.state"
               },
               "transforms": [
                 {
-                  "expression": "if({value}, \u0027visible\u0027,\u0027hidden\u0027)",
+                  "expression": "if(\r\n  ({value} \u003d 0 || {value} \u003d 1 || !{parent.meta.visible}),\r\n  \u0027hidden\u0027,\r\n  \u0027visible\u0027\r\n)",
                   "type": "expression"
                 }
               ],
@@ -265,11 +195,11 @@
           "props.elements[1].visibility": {
             "binding": {
               "config": {
-                "path": "view.custom.error"
+                "path": "view.custom.state"
               },
               "transforms": [
                 {
-                  "expression": "if({value}, \u0027visible\u0027,\u0027hidden\u0027)",
+                  "expression": "if(\r\n  ({value} \u003d 0 || {value} \u003d 1 || !{parent.meta.visible}),\r\n  \u0027hidden\u0027,\r\n  \u0027visible\u0027\r\n)",
                   "type": "expression"
                 }
               ],
@@ -283,8 +213,20 @@
               },
               "transforms": [
                 {
-                  "expression": "case({value},\r\n1,{session.custom.colours.state1},\r\n2,{session.custom.colours.state1},\r\n3,{session.custom.colours.state1},\r\n4,{session.custom.colours.state1},\r\n\u0027#000000\u0027\r\n)",
-                  "type": "expression"
+                  "fallback": "#800000",
+                  "inputType": "scalar",
+                  "mappings": [
+                    {
+                      "input": 1,
+                      "output": "#FF0000"
+                    },
+                    {
+                      "input": 0,
+                      "output": "#000000"
+                    }
+                  ],
+                  "outputType": "color",
+                  "type": "map"
                 }
               ],
               "type": "property"
@@ -293,7 +235,7 @@
           "props.style.classes": {
             "binding": {
               "config": {
-                "expression": "if({session.custom.colours.colour_impaired} \u003d True \u0026\u0026 {view.custom.isMatch} \u003e 0,\r\n{view.custom.state} + 100 + {view.custom.isMatch},\r\n{view.custom.state} + {view.custom.isMatch})"
+                "expression": "if({session.custom.colours.colour_impaired} \u003d True,\r\n{view.custom.state} + 100,\r\n{view.custom.state})"
               },
               "transforms": [
                 {
@@ -445,7 +387,7 @@
           },
           "transforms": [
             {
-              "expression": "case({value},\r\n0,{session.custom.colours.state0},\r\n1,{session.custom.colours.state1},\r\n2,{session.custom.colours.state2},\r\n3,{session.custom.colours.state3},\r\n4,{session.custom.colours.state4},\r\n5,{session.custom.colours.state5},\r\n6,{session.custom.colours.state6},\r\n{session.custom.colours.fallback}\r\n)",
+              "expression": "case({value},\r\n0,{session.custom.colours.state5},\r\n1,{session.custom.colours.state1},\r\n{session.custom.colours.fallback}\r\n)",
               "type": "expression"
             }
           ],
@@ -464,18 +406,6 @@
               "mappings": [
                 {
                   "input": 1,
-                  "output": "Alarms-Styles/Diagnostic"
-                },
-                {
-                  "input": 2,
-                  "output": "Alarms-Styles/Low"
-                },
-                {
-                  "input": 3,
-                  "output": "Alarms-Styles/Medium"
-                },
-                {
-                  "input": 4,
                   "output": "Alarms-Styles/High"
                 }
               ],
@@ -493,7 +423,7 @@
           },
           "transforms": [
             {
-              "expression": "if({session.custom.colours.colour_impaired},\r\n\t\u0027#000000\u0027,\r\n\tcase(\t{value},\r\n\t\t\t1,\u0027#FFFFFF\u0027,\r\n\t\t\t2,\u0027#000000\u0027,\r\n\t\t\t3,\u0027#000000\u0027,\r\n\t\t\t4,\u0027#FFFFFF\u0027,\r\n\t\t\t5,\u0027#FFFFFF\u0027,\r\n\t\t\t\u0027#000000\u0027)\r\n\t)",
+              "expression": "if({session.custom.colours.colour_impaired},\r\n\t\u0027#000000\u0027,\r\n\tcase(\t{value},\r\n\t\t\t1,\u0027#000000\u0027,\r\n\t\t\t\u0027#FFFFFF\u0027)\r\n\t)",
               "type": "expression"
             }
           ],
@@ -503,7 +433,7 @@
       "meta.tooltip.text": {
         "binding": {
           "config": {
-            "expression": "if({view.custom.disconnected} \u003d False,\n\tif(isNull({view.custom.alarm_message}),\n\t\"Source Id: \" + {view.params.tagProps[0]} +\n\t\", Priority: \" + {view.custom.priority_string},\n\t\"Source Id: \" + {view.params.tagProps[0]} +\n\t\", Alarm: \" + {view.custom.alarm_message} +\n\t\", Priority: \" + {view.custom.priority_string}),\n\"Source Id: \" +{view.params.tagProps[0]} + \", Priority: Unknown\")"
+            "expression": "if({view.custom.disconnected} \u003d False,\n\tif(isNull({view.custom.alarm_message}),\n\t\"Source Id: \" + {view.params.tagProps[0]} +\n\t\", Priority: \" + {view.custom.priority_string} +\n\t\", State: \" + {view.custom.state},\n\t\"Source Id: \" + {view.params.tagProps[0]} +\n\t\", Alarm: \" + {view.custom.alarm_message} +\n\t\", Priority: \" + {view.custom.priority_string} +\n\t\", State: \" + {view.custom.state}),\n\"Source Id: \" +{view.params.tagProps[0]} + \", Priority: Unknown, State: Unknown\")"
           },
           "type": "expr"
         }
@@ -511,7 +441,7 @@
       "meta.visible": {
         "binding": {
           "config": {
-            "path": "view.custom.display_icon"
+            "path": "session.custom.alarm_filter.show_safety"
           },
           "type": "property"
         }
diff --git a/image_server_simulation/VFD.svg b/image_server_simulation/VFD.svg
new file mode 100644
index 0000000..4c508c4
--- /dev/null
+++ b/image_server_simulation/VFD.svg
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="1920"
+   height="1080"
+   viewBox="0 0 1920 1080"
+   version="1.1"
+   id="svg1"
+   inkscape:version="1.4.2 (f4327f4, 2025-05-13)"
+   sodipodi:docname="Station_JR_PB.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="px"
+     inkscape:zoom="0.427164"
+     inkscape:cx="1271.1745"
+     inkscape:cy="1049.948"
+     inkscape:window-width="3840"
+     inkscape:window-height="2054"
+     inkscape:window-x="-11"
+     inkscape:window-y="-11"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1"
+     showgrid="false" />
+  <defs
+     id="defs1" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#000000;fill-opacity:0;stroke:#000000;stroke-width:3.30526"
+       id="rect1"
+       width="1660.9377"
+       height="267.5712"
+       x="141.9962"
+       y="388.26218" />
+  </g>
+</svg>
diff --git a/tags/Station_tag.json b/tags/Station_tag.json
new file mode 100644
index 0000000..6db1c65
--- /dev/null
+++ b/tags/Station_tag.json
@@ -0,0 +1,100 @@
+{
+  "name": "Station",
+  "tagType": "Folder",
+  "tags": [
+    {
+      "name": "Buttons",
+      "tagType": "Folder",
+      "tags": [
+        {
+          "name": "UL1_3_JR_PB1",
+          "typeId": "TagProp",
+          "tagType": "UdtInstance",
+          "tags": [
+            {
+              "value": 0,
+              "name": "ALARMST",
+              "tagType": "AtomicTag"
+            },
+            {
+              "name": "STATE",
+              "tagType": "AtomicTag"
+            },
+            {
+              "name": "DCN",
+              "tagType": "AtomicTag"
+            }
+          ]
+        },
+        {
+          "name": "UL1_3_JR_PB2",
+          "typeId": "TagProp",
+          "tagType": "UdtInstance",
+          "tags": [
+            {
+              "name": "DCN",
+              "tagType": "AtomicTag"
+            },
+            {
+              "name": "ALARMST",
+              "tagType": "AtomicTag"
+            },
+            {
+              "value": 1,
+              "name": "STATE",
+              "tagType": "AtomicTag"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name": "EPC",
+      "tagType": "Folder",
+      "tags": [
+        {
+          "name": "UL1_3_EPC2",
+          "typeId": "Station",
+          "tagType": "UdtInstance",
+          "tags": [
+            {
+              "name": "Alarm",
+              "tagType": "Folder",
+              "tags": [
+                {
+                  "name": "Estopped",
+                  "tagType": "AtomicTag"
+                }
+              ]
+            },
+            {
+              "name": "STATE",
+              "tagType": "AtomicTag"
+            }
+          ]
+        },
+        {
+          "name": "UL1_3_EPC1",
+          "typeId": "Station",
+          "tagType": "UdtInstance",
+          "tags": [
+            {
+              "name": "STATE",
+              "tagType": "AtomicTag"
+            },
+            {
+              "name": "Alarm",
+              "tagType": "Folder",
+              "tags": [
+                {
+                  "name": "Estopped",
+                  "tagType": "AtomicTag"
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/tags/Station_udt.json b/tags/Station_udt.json
new file mode 100644
index 0000000..32fce2f
--- /dev/null
+++ b/tags/Station_udt.json
@@ -0,0 +1,44 @@
+{
+  "name": "Station",
+  "tagType": "UdtType",
+  "tags": [
+    {
+      "name": "Alarm",
+      "tagType": "Folder",
+      "tags": [
+        {
+          "opcItemPath": {
+            "bindType": "parameter",
+            "binding": "ns\u003d1;s\u003d[PLC]{InstanceName}.HMI.Alarm.Stopped"
+          },
+          "valueSource": "opc",
+          "dataType": "Boolean",
+          "name": "Stopped",
+          "tagType": "AtomicTag",
+          "opcServer": "PLC"
+        },
+        {
+          "opcItemPath": {
+            "bindType": "parameter",
+            "binding": "ns\u003d1;s\u003d[PLC]{InstanceName}.HMI.Alarm.EStopped"
+          },
+          "valueSource": "opc",
+          "dataType": "Boolean",
+          "name": "Estopped",
+          "tagType": "AtomicTag",
+          "opcServer": "PLC"
+        }
+      ]
+    },
+    {
+      "opcItemPath": {
+        "bindType": "parameter",
+        "binding": "ns\u003d1;s\u003d[PLC]{InstanceName}.HMI.STATE"
+      },
+      "valueSource": "opc",
+      "name": "STATE",
+      "tagType": "AtomicTag",
+      "opcServer": "PLC"
+    }
+  ]
+}
\ No newline at end of file