diff --git a/BNA8/com.inductiveautomation.perspective/session-props/props.json b/BNA8/com.inductiveautomation.perspective/session-props/props.json
index 051dfe83..c8dbd680 100644
--- a/BNA8/com.inductiveautomation.perspective/session-props/props.json
+++ b/BNA8/com.inductiveautomation.perspective/session-props/props.json
@@ -21,6 +21,17 @@
       "show_solenoids": true
     },
     "areaHover": [],
+    "colours": {
+      "Fallback": "#00FF00",
+      "colour_impaired": false,
+      "state0": "#8C8C8C",
+      "state1": "#FF0000",
+      "state2": "#FF8000",
+      "state3": "#FFFF00",
+      "state4": "#007EFC",
+      "state5": "#00CC00",
+      "state6": "#CCCCFF"
+    },
     "covert": true,
     "currentGraphic": "Windows/Graphics/Overview",
     "demoHighlight": "",
@@ -56,7 +67,7 @@
         "$": [
           "ds",
           192,
-          1755608623601
+          1762091240274
         ],
         "$columns": [
           {
diff --git a/BNA8/com.inductiveautomation.perspective/session-props/resource.json b/BNA8/com.inductiveautomation.perspective/session-props/resource.json
index c002fe92..4d42dc6b 100644
--- a/BNA8/com.inductiveautomation.perspective/session-props/resource.json
+++ b/BNA8/com.inductiveautomation.perspective/session-props/resource.json
@@ -9,8 +9,8 @@
   "attributes": {
     "lastModification": {
       "actor": "admin",
-      "timestamp": "2025-11-02T11:47:21Z"
+      "timestamp": "2025-11-02T13:47:22Z"
     },
-    "lastModificationSignature": "579281a681d52ea6c65932fd3316b732cc0227ed6f84eed73f0fc8f85e8f9354"
+    "lastModificationSignature": "a2c944a32f5fd92be06f01e2bc7b42257bfbdc0199594c44df672f322d86ede9"
   }
 }
\ No newline at end of file
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Custom_Views/View-Scaler/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Custom_Views/View-Scaler/resource.json
index 5c1078d7..f7bbc5ae 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/Custom_Views/View-Scaler/resource.json
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Custom_Views/View-Scaler/resource.json
@@ -10,8 +10,8 @@
   "attributes": {
     "lastModification": {
       "actor": "admin",
-      "timestamp": "2025-10-22T12:27:11Z"
+      "timestamp": "2025-11-02T14:01:35Z"
     },
-    "lastModificationSignature": "92dc526633cdadc1c051b1e20b2f353c904c49baab3bfdc197c3dda4d1a687b2"
+    "lastModificationSignature": "81ad03a1b648ce4ddc4fea5154f3ead8a942c9da25b9ca38fe702d986fae2ff9"
   }
 }
\ No newline at end of file
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Custom_Views/View-Scaler/thumbnail.png b/BNA8/com.inductiveautomation.perspective/views/autStand/Custom_Views/View-Scaler/thumbnail.png
index 15ecc5fe..17aaa614 100644
Binary files a/BNA8/com.inductiveautomation.perspective/views/autStand/Custom_Views/View-Scaler/thumbnail.png and b/BNA8/com.inductiveautomation.perspective/views/autStand/Custom_Views/View-Scaler/thumbnail.png differ
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Custom_Views/View-Scaler/view.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Custom_Views/View-Scaler/view.json
index a298f03d..ae638cad 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/Custom_Views/View-Scaler/view.json
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Custom_Views/View-Scaler/view.json
@@ -573,7 +573,7 @@
           "dom": {
             "onClick": {
               "config": {
-                "script": "\t\n\t# Read current rotation string\n\tcurrentRotation \u003d self.session.custom.rotation\n\t\n\tcurrentAngle \u003d currentRotation.replace(\"deg\", \"\")\n\t\n\t# Increment by 90° and wrap around 360\n\tnewAngle \u003d (int(currentAngle) + 90) % 360\n\t\n\t# Save back as string with \"deg\"\n\tself.session.custom.rotation \u003d str(newAngle) + \"deg\""
+                "script": "\n\tcurrentRotation \u003d self.session.custom.rotation\n\t\n\tcurrentAngle \u003d currentRotation.replace(\"deg\", \"\")\n\t\n\t# Increment by 90° and wrap around 360\n\tnewAngle \u003d (int(currentAngle) + 90) % 360\n\t\n\t# Save back as string with \"deg\"\n\tself.session.custom.rotation \u003d str(newAngle) + \"deg\"\n\t\t\n\t# Reset XY\t\t\n\tself.view.custom.x \u003d 0\n\tself.view.custom.y \u003d 0"
               },
               "scope": "G",
               "type": "script"
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Legend_Popup/Legend-DOO/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Legend_Popup/Legend-DOO/resource.json
index ead29192..574c5717 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Legend_Popup/Legend-DOO/resource.json
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Legend_Popup/Legend-DOO/resource.json
@@ -9,9 +9,9 @@
   ],
   "attributes": {
     "lastModification": {
-      "actor": "external",
-      "timestamp": "2025-10-20T13:55:55Z"
+      "actor": "admin",
+      "timestamp": "2025-11-02T13:44:14Z"
     },
-    "lastModificationSignature": "41d3e7f73602e0970e76f44b19a93c1c765e31bd8af102b89ba19b4d62c3d8d2"
+    "lastModificationSignature": "3e6db598724e3b3931d9577f18d64e369688efca95d46e1da9a248ada5fbbfa1"
   }
 }
\ No newline at end of file
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Legend_Popup/Legend-DOO/thumbnail.png b/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Legend_Popup/Legend-DOO/thumbnail.png
index 5260ddea..4e6d4d03 100644
Binary files a/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Legend_Popup/Legend-DOO/thumbnail.png and b/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Legend_Popup/Legend-DOO/thumbnail.png differ
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Legend_Popup/Legend-DOO/view.json b/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Legend_Popup/Legend-DOO/view.json
index 4a9b82dd..0b308663 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Legend_Popup/Legend-DOO/view.json
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Legend_Popup/Legend-DOO/view.json
@@ -27,7 +27,7 @@
         "props": {
           "page": 1,
           "pageCount": 32,
-          "source": "http://127.0.0.1:5500/Description%20of%20Operations%20-%20Amazon%20BNA8.pdf",
+          "source": "\\Description of Operations - Amazon BNA8.pdf",
           "style": {
             "overflow": "hidden"
           }
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Legend_Popup/Legend-popup-view/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Legend_Popup/Legend-popup-view/resource.json
index 93aaa7dd..5fa5dbb6 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Legend_Popup/Legend-popup-view/resource.json
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Legend_Popup/Legend-popup-view/resource.json
@@ -9,9 +9,9 @@
   ],
   "attributes": {
     "lastModification": {
-      "actor": "external",
-      "timestamp": "2025-10-20T13:55:55Z"
+      "actor": "admin",
+      "timestamp": "2025-11-02T13:52:38Z"
     },
-    "lastModificationSignature": "4246013ff4b649aaaf11b554dbee278907f7e35735a47791578e0dde0e09198a"
+    "lastModificationSignature": "60adce8695a26b46b4224e94590373bffdd59006b1400007a082f9f1b3abe177"
   }
 }
\ No newline at end of file
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Legend_Popup/Legend-popup-view/thumbnail.png b/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Legend_Popup/Legend-popup-view/thumbnail.png
index 5d4da168..9208a5a0 100644
Binary files a/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Legend_Popup/Legend-popup-view/thumbnail.png and b/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Legend_Popup/Legend-popup-view/thumbnail.png differ
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Legend_Popup/Legend-popup-view/view.json b/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Legend_Popup/Legend-popup-view/view.json
index e629337f..06fc79c2 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Legend_Popup/Legend-popup-view/view.json
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Legend_Popup/Legend-popup-view/view.json
@@ -30,14 +30,6 @@
           "classes": ""
         }
       },
-      {
-        "Name": "Conveyor",
-        "Path": "autStand/Equipment/Conveyor45",
-        "instancePosition": {},
-        "instanceStyle": {
-          "classes": ""
-        }
-      },
       {
         "Name": "Conveyor",
         "Path": "autStand/Equipment/Conveyor_Left90",
@@ -83,7 +75,7 @@
         }
       },
       {
-        "Name": "Tracking Photoeye",
+        "Name": "Photoeye",
         "Path": "autStand/Equipment/Photoeye_Tracking",
         "instancePosition": {},
         "instanceStyle": {
@@ -98,14 +90,6 @@
           "classes": ""
         }
       },
-      {
-        "Name": "Chute Photoeye",
-        "Path": "autStand/Equipment/Photoeye_Chute",
-        "instancePosition": {},
-        "instanceStyle": {
-          "classes": ""
-        }
-      },
       {
         "Name": "Proximity Switch",
         "Path": "autStand/Equipment/ProxSensor",
@@ -189,6 +173,13 @@
         "instanceStyle": {
           "classes": ""
         }
+      },
+      {
+        "Path": "autStand/Equipment/DPM",
+        "instancePosition": {},
+        "instanceStyle": {
+          "classes": ""
+        }
       }
     ]
   },
@@ -831,17 +822,10 @@
               "enabled": null,
               "script": "\tif currentValue.value \u003d\u003d 2:\n\t\tsystem.perspective.closePopup(\"TZyBcXB7\")\n\t\tsystem.perspective.openPopup(\n\t\t    id\u003d\"DOO\", \n\t\t    view\u003d\"autStand/PopUp-Views/Legend_Popup/Legend-DOO\", \n\t\t    title\u003d\"Description of Operations - Amazon BNA8\",\n\t\t    modal\u003dTrue,\n\t\t    draggable\u003dFalse,\n\t\t    resizable\u003dFalse,\n\t\t    showCloseIcon\u003dTrue,\n\t\t)"
             }
-          },
-          "props.tabs[0]": {
-            "binding": {
-              "config": {
-                "expression": "if({session.custom.colours.colour_impaired}\u003dTrue, \u0027Alt Color\u0027, \u0027Color\u0027)"
-              },
-              "type": "expr"
-            }
           }
         },
         "props": {
+          "currentTabIndex": 1,
           "menuStyle": {
             "fontWeight": "bold"
           },
@@ -849,7 +833,7 @@
             "classes": "Background-Styles/Controller"
           },
           "tabs": [
-            null,
+            "Color",
             "Icons",
             "DOO"
           ]
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Legend_Popup/Legend-row/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Legend_Popup/Legend-row/resource.json
index b2f8af89..292ed744 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Legend_Popup/Legend-row/resource.json
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Legend_Popup/Legend-row/resource.json
@@ -9,9 +9,9 @@
   ],
   "attributes": {
     "lastModification": {
-      "actor": "external",
-      "timestamp": "2025-10-20T13:55:55Z"
+      "actor": "admin",
+      "timestamp": "2025-11-02T13:58:12Z"
     },
-    "lastModificationSignature": "f63b62d2ea7a4e21276bc055d75a3e110bbdba5469aaa450789d1b9bb4546f6b"
+    "lastModificationSignature": "e0c05a167565f75315a4cca7c626926a9d0cae1dad7c06a8e03848b485ade791"
   }
 }
\ No newline at end of file
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Legend_Popup/Legend-row/thumbnail.png b/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Legend_Popup/Legend-row/thumbnail.png
index 465a7db4..c060caa6 100644
Binary files a/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Legend_Popup/Legend-row/thumbnail.png and b/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Legend_Popup/Legend-row/thumbnail.png differ
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Legend_Popup/Legend-row/view.json b/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Legend_Popup/Legend-row/view.json
index 55621d1e..b7a6a888 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Legend_Popup/Legend-row/view.json
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Legend_Popup/Legend-row/view.json
@@ -48,7 +48,7 @@
                   "name": "EmbeddedView"
                 },
                 "position": {
-                  "basis": "35px",
+                  "basis": "100%",
                   "grow": 1
                 },
                 "propConfig": {
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Legend_Popup/Legend-table/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Legend_Popup/Legend-table/resource.json
index 5fb8d8d5..46f005fb 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Legend_Popup/Legend-table/resource.json
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Legend_Popup/Legend-table/resource.json
@@ -9,9 +9,9 @@
   ],
   "attributes": {
     "lastModification": {
-      "actor": "external",
-      "timestamp": "2025-10-20T13:55:55Z"
+      "actor": "admin",
+      "timestamp": "2025-11-02T13:52:09Z"
     },
-    "lastModificationSignature": "ed79e7e6a612e729cb1da8866e5183a1905356cee7b137e206eefdc0401c9a79"
+    "lastModificationSignature": "0c496b9f609c55815a682e709f3075bc5df059550b52cd4632aa055469aebbce"
   }
 }
\ No newline at end of file
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Legend_Popup/Legend-table/thumbnail.png b/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Legend_Popup/Legend-table/thumbnail.png
index 871d19f8..4b416e0a 100644
Binary files a/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Legend_Popup/Legend-table/thumbnail.png and b/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Legend_Popup/Legend-table/thumbnail.png differ
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Legend_Popup/Legend-table/view.json b/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Legend_Popup/Legend-table/view.json
index 51556f29..b76b0e1e 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Legend_Popup/Legend-table/view.json
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Legend_Popup/Legend-table/view.json
@@ -9,6 +9,44 @@
           "classes": ""
         }
       },
+      {
+        "Path": "autStand/Equipment/Camera",
+        "instancePosition": {},
+        "instanceStyle": {
+          "classes": ""
+        }
+      },
+      {
+        "Name": "Chute",
+        "Path": "autStand/Equipment/Conveyor",
+        "instancePosition": {},
+        "instanceStyle": {
+          "classes": ""
+        }
+      },
+      {
+        "Path": "autStand/Equipment/Conveyor",
+        "instancePosition": {},
+        "instanceStyle": {
+          "classes": ""
+        }
+      },
+      {
+        "Name": "Conveyor",
+        "Path": "autStand/Equipment/Conveyor_Left90",
+        "instancePosition": {},
+        "instanceStyle": {
+          "classes": ""
+        }
+      },
+      {
+        "Name": "Conveyor",
+        "Path": "autStand/Equipment/Conveyor_Right90",
+        "instancePosition": {},
+        "instanceStyle": {
+          "classes": ""
+        }
+      },
       {
         "Path": "autStand/Equipment/DPM",
         "instancePosition": {},
@@ -22,6 +60,127 @@
         "instanceStyle": {
           "classes": ""
         }
+      },
+      {
+        "Path": "autStand/Equipment/Encoder",
+        "instancePosition": {},
+        "instanceStyle": {
+          "classes": ""
+        }
+      },
+      {
+        "Path": "autStand/Equipment/MCM",
+        "instancePosition": {},
+        "instanceStyle": {
+          "classes": ""
+        }
+      },
+      {
+        "Name": "Photoeye",
+        "Path": "autStand/Equipment/Photoeye_Tracking",
+        "instancePosition": {},
+        "instanceStyle": {
+          "classes": ""
+        }
+      },
+      {
+        "Name": "Long Range Photoeye",
+        "Path": "autStand/Equipment/Photoeye_Long",
+        "instancePosition": {},
+        "instanceStyle": {
+          "classes": ""
+        }
+      },
+      {
+        "Name": "Proximity Switch",
+        "Path": "autStand/Equipment/ProxSensor",
+        "instancePosition": {},
+        "instanceStyle": {
+          "classes": ""
+        }
+      },
+      {
+        "Name": "Start/Stop Button",
+        "Path": "autStand/Equipment/SS_Button",
+        "instancePosition": {},
+        "instanceStyle": {
+          "classes": ""
+        }
+      },
+      {
+        "Path": "autStand/Equipment/IO_Block",
+        "instancePosition": {},
+        "instanceStyle": {
+          "classes": ""
+        }
+      },
+      {
+        "Path": "autStand/Equipment/Solenoid",
+        "instancePosition": {},
+        "instanceStyle": {
+          "classes": ""
+        }
+      },
+      {
+        "Path": "autStand/Equipment/VFD",
+        "instancePosition": {},
+        "instanceStyle": {
+          "classes": ""
+        }
+      },
+      {
+        "Name": "Beacon_G",
+        "Path": "autStand/Equipment/Beacon",
+        "instancePosition": {},
+        "instanceStyle": {
+          "classes": ""
+        }
+      },
+      {
+        "Name": "Beacon_A",
+        "Path": "autStand/Equipment/Beacon",
+        "instancePosition": {},
+        "instanceStyle": {
+          "classes": ""
+        }
+      },
+      {
+        "Name": "Beacon_R",
+        "Path": "autStand/Equipment/Beacon",
+        "instancePosition": {},
+        "instanceStyle": {
+          "classes": ""
+        }
+      },
+      {
+        "Name": "Beacon_B",
+        "Path": "autStand/Equipment/Beacon",
+        "instancePosition": {},
+        "instanceStyle": {
+          "classes": ""
+        }
+      },
+      {
+        "Name": "Beacon_H",
+        "Path": "autStand/Equipment/Beacon",
+        "instancePosition": {},
+        "instanceStyle": {
+          "classes": ""
+        }
+      },
+      {
+        "Path": "autStand/Equipment/Scanner",
+        "instancePosition": {},
+        "instanceStyle": {
+          "classes": ""
+        }
+      },
+      {
+        "Path": "autStand/Equipment/DPM",
+        "instancePosition": {},
+        "instanceStyle": {
+          "classes": ""
+        }
       }
     ]
   },