diff --git a/config/custom.css b/config/custom.css
index 9004cb4..98fed36 100755
--- a/config/custom.css
+++ b/config/custom.css
@@ -99,11 +99,25 @@ body {
 
 /* Per-tab backgrounds */
 body.tab-glance          { background-image: url("/images/bg-glance.jpg") !important; }
+body.tab-netgrimoire     { background-image: url("/images/netgrimoire-BG (chatgpt)") !important; }
+body.tab-codex           { background-image: url("/images/codex-BG (Gemini).png") !important; }
+body.tab-watch           { background-image: url("/images/watch-BG (Gemini).png") !important; }
+body.tab-ward            { background-image: url("/images/ward-BG (Gemini).png") !important; }
+body.tab-vault           { background-image: url("/images/vault-BG (gemini).png") !important; }
+body.tab-shadow          { background-image: url("/images/shadow-BG (chatgpt).png") !important; }
+body.tab-pncfish         { background-image: url("/images/pncfish-BG (gemini).png") !important; }
+body.tab-green           { background-image: url("/images/green-BG.png") !important; }
+body.tab-pocket          { background-image: url("/images/pocket-BG") !important; }
+
 body.tab-pncharris       { background-image: url("/images/pncharris-bg.png") !important; }
-body.tab-netgrimoire     { background-image: url("/images/Netgrimoire-bg.png") !important; }
+
 body.tab-wasted-bandwidth{ background-image: url("/images/Wasted-bandwidth-bg.png") !important; }
 body.tab-nucking-futz    { background-image: url("/images/Nucking-futz-bg.png") !important; }
 
+
+
+
+
 /* Page overlay — keep background visible but readable */
 #page-wrapper {
   background-color: rgba(0, 0, 0, 0.42);
diff --git a/config/layout.yaml b/config/layout.yaml
index c04d4ed..653ca0c 100644
--- a/config/layout.yaml
+++ b/config/layout.yaml
@@ -47,4 +47,82 @@
           - type: services
             title: Nucking-Futz Services
             filter:
-              label: homepage.group=nucking-futz
\ No newline at end of file
+              label: homepage.group=nucking-futz
+
+- Codex:
+    style: column
+    columns:
+      - width: full
+        sections:
+          - type: services
+            title: Netgrimoire Documentation/Configuration
+            filter:
+              label: homepage.group=codex
+- Watch:
+    style: column
+    columns:
+      - width: full
+        sections:
+          - type: services
+            title: Netgrimoire Monitoring
+            filter:
+              label: homepage.group=watch
+
+- Ward:
+    style: column
+    columns:
+      - width: full
+        sections:
+          - type: services
+            title: Netgrimoire Security
+            filter:
+              label: homepage.group=ward
+
+- Vault:
+    style: column
+    columns:
+      - width: full
+        sections:
+          - type: services
+            title: Netgrimoire Data
+            filter:
+              label: homepage.group=Vault
+- Shadow:
+    style: column
+    columns:
+      - width: full
+        sections:
+          - type: services
+            title: Netgrimoire Aquisition
+            filter:
+              label: homepage.group=Shadow
+
+- PNCFish:
+    style: column
+    columns:
+      - width: full
+        sections:
+          - type: services
+            title: PNC Fish & More
+            filter:
+              label: homepage.group=fish
+
+- Green:
+    style: column
+    columns:
+      - width: full
+        sections:
+          - type: services
+            title: Netgrimoire Green Door
+            filter:
+              label: homepage.group=Green
+
+- Pocket:
+    style: column
+    columns:
+      - width: full
+        sections:
+          - type: services
+            title: Pocket Grimoire
+            filter:
+              label: homepage.group=pocket
\ No newline at end of file
diff --git a/config/services.yaml b/config/services.yaml
index 98bcebf..0b60394 100755
--- a/config/services.yaml
+++ b/config/services.yaml
@@ -20,25 +20,6 @@
 # NETGRIMOIRE TAB
 # ============================================================
 
-- Monitoring:
-    - Service Graylog:
-        href: https://log.netgrimoire.com
-        name: Graylog
-        icon: graylog.png
-        description: Log Aggregation
-
-    - Service LibreNMS:
-        href: http://npm.netgrimoire.com
-        name: LibreNMS
-        icon: librenms.png
-        description: Network Monitoring
-
-    - Service Scrutiny:
-        href: https://scrutiny.netgrimoire.com
-        name: Scrutiny
-        icon: scrutiny.png
-        description: S.M.A.R.T Monitoring
-
 - Management:
     - Service Mailcow:
         href: https://mail.netgrimoire.com
@@ -69,16 +50,6 @@
               label: Blocked
               format: number
 
-    - Service Opnsense:
-        href: https://192.168.3.4:8443
-        name: OPNsense Firewall
-        icon: opnsense.png
-        description: Internal Only
-        widget:
-          type: opnsense
-          url: https://192.168.3.4:8443
-          username: {{HOMEPAGE_VAR_OPNSENSE_USER}}
-          password: {{HOMEPAGE_VAR_OPNSENSE_PASS}}
 
     - Service TPLink:
         href: http://192.168.5.6
@@ -105,25 +76,59 @@
         icon: windows-11.png
         description: Windows
 
-
 # ============================================================
-# PNCHARRIS TAB
+# CODEX TAB
 # ============================================================
 
-- PNCHarris Apps:
-    - Service Immich:
-        href: https://immich.netgrimoire.com
-        name: Immich
-        icon: immich.png
-        description: Photo Management
+
+
+# ============================================================
+# WATCH TAB
+# ============================================================
+
+- Monitoring:
+    - Service Graylog:
+        href: https://log.netgrimoire.com
+        name: Graylog
+        icon: graylog.png
+        description: Log Aggregation
+
+    - Service LibreNMS:
+        href: http://npm.netgrimoire.com
+        name: LibreNMS
+        icon: librenms.png
+        description: Network Monitoring
+
+    - Service Scrutiny:
+        href: https://scrutiny.netgrimoire.com
+        name: Scrutiny
+        icon: scrutiny.png
+        description: S.M.A.R.T Monitoring
+
+# ============================================================
+# WARD TAB
+# ============================================================
+
+- Security:
+
+    - Service Opnsense:
+        href: https://192.168.3.4:8443
+        name: OPNsense Firewall
+        icon: opnsense.png
+        description: Internal Only
         widget:
-          type: immich
-          url: https://immich.netgrimoire.com
-          key: {{HOMEPAGE_VAR_IMMICH_KEY}}
+          type: opnsense
+          url: https://192.168.3.4:8443
+          username: {{HOMEPAGE_VAR_OPNSENSE_USER}}
+          password: {{HOMEPAGE_VAR_OPNSENSE_PASS}}
+
+# ============================================================
+# Vault TAB
+# ============================================================
 
 
 # ============================================================
-# WASTED-BANDWIDTH TAB
+# Shadow TAB
 # ============================================================
 
 - VPN Protected Apps:
@@ -151,10 +156,30 @@
 
 
 # ============================================================
-# NUCKING-FUTZ TAB
+# PNCHARRIS TAB
 # ============================================================
 
-- Nucking Apps:
+- PNCHarris Apps:
+    - Service Immich:
+        href: https://immich.netgrimoire.com
+        name: Immich
+        icon: immich.png
+        description: Photo Management
+        widget:
+          type: immich
+          url: https://immich.netgrimoire.com
+          key: {{HOMEPAGE_VAR_IMMICH_KEY}}
+
+
+# ============================================================
+# PNCFish TAB
+# ============================================================
+
+# ============================================================
+# Greeen TAB
+# ============================================================
+
+- Green Apps:
     - Service Greenfin:
         href: http://jellyfin.netgrimoire.com:7096
         name: GreenFin
@@ -169,4 +194,16 @@
     - Service Namer:
         href: https://namer.wasted-bandwidth.net
         name: Namer
-        icon: sh-namecheap.svg
\ No newline at end of file
+        icon: sh-namecheap.svg
+
+# ============================================================
+# Pocket TAB
+# ============================================================
+
+
+
+
+# ============================================================
+# NUCKING-FUTZ TAB
+# ============================================================
+