diff --git a/src/commands/applications-setup/tab_data.json b/src/commands/applications-setup/tab_data.json
new file mode 100644
index 00000000..538966d3
--- /dev/null
+++ b/src/commands/applications-setup/tab_data.json
@@ -0,0 +1,47 @@
+{
+    "name": "Applications Setup",
+    "data": [
+        {
+            "script": {
+                "name": "Alacritty",
+                "data": "alacritty-setup.sh"
+            }
+        },
+        {
+            "command": {
+                "name": "Bash Prompt",
+                "data": "bash -c \"$(curl -s https://raw.githubusercontent.com/ChrisTitusTech/mybash/main/setup.sh)\""
+            }
+        },
+        {
+            "script": {
+                "name": "DWM-Titus",
+                "data": "dwmtitus-setup.sh"
+            }
+        },
+        {
+            "script": {
+                "name": "Kitty",
+                "data": "kitty-setup.sh"
+            }
+        },
+        {
+            "command": {
+                "name": "Neovim",
+                "data": "bash -c \"$(curl -s https://raw.githubusercontent.com/ChrisTitusTech/neovim/main/setup.sh)\""
+            }
+        },
+        {
+            "script": {
+                "name": "Rofi",
+                "data": "rofi-setup.sh"
+            }
+        },
+        {
+            "script": {
+                "name": "ZSH Prompt",
+                "data": "zsh-setup.sh"
+            }
+        }
+    ]
+}
diff --git a/src/commands/security/tab_data.json b/src/commands/security/tab_data.json
new file mode 100644
index 00000000..603a1ac1
--- /dev/null
+++ b/src/commands/security/tab_data.json
@@ -0,0 +1,6 @@
+{
+    "name": "Security",
+    "data": [
+        {"script": { "name": "Firewall Baselines (CTT)", "data": "firewall-baselines.sh" }}
+    ]
+}
diff --git a/src/commands/system-update.sh b/src/commands/system-setup/system-update.sh
similarity index 100%
rename from src/commands/system-update.sh
rename to src/commands/system-setup/system-update.sh
diff --git a/src/commands/system-setup/tab_data.json b/src/commands/system-setup/tab_data.json
new file mode 100644
index 00000000..6cd91094
--- /dev/null
+++ b/src/commands/system-setup/tab_data.json
@@ -0,0 +1,35 @@
+{
+    "name": "System Setup",
+    "data": [
+        {
+            "script": {
+                "name": "Full System Update",
+                "data": "system-update.sh"
+            }
+        },
+        {
+            "script": {
+                "name": "Build Prerequisites",
+                "data": "1-compile-setup.sh"
+            }
+        },
+        {
+            "script": {
+                "name": "Gaming Dependencies",
+                "data": "2-gaming-setup.sh"
+            }
+        },
+        {
+            "script": {
+                "name": "Global Theme",
+                "data": "3-global-theme.sh"
+            }
+        },
+        {
+            "script": {
+                "name": "Remove Snaps",
+                "data": "4-remove-snaps.sh"
+            }
+        }
+    ]
+}
diff --git a/src/commands/tabs.json b/src/commands/tabs.json
new file mode 100644
index 00000000..c3c753b7
--- /dev/null
+++ b/src/commands/tabs.json
@@ -0,0 +1,6 @@
+[
+    "system-setup/tab_data.json",
+    "applications-setup/tab_data.json",
+    "security/tab_data.json",
+    "utils/tab_data.json"
+]
diff --git a/src/commands/utils/tab_data.json b/src/commands/utils/tab_data.json
new file mode 100644
index 00000000..2de6cbe2
--- /dev/null
+++ b/src/commands/utils/tab_data.json
@@ -0,0 +1,101 @@
+{
+    "name": "Utilities",
+    "data": [
+        {
+            "script": {
+                "name": "WiFi Manager",
+                "data": "wifi-control.sh"
+            }
+        },
+        {
+            "script": {
+                "name": "Bluetooth Manager",
+                "data": "bluetooth-control.sh"
+            }
+        },
+        {
+            "directory": {
+                "name": "Monitor Control",
+                "preconditions": [
+                    {
+                        "matches": true,
+                        "data": {
+                            "environment": "XDG_SESSION_TYPE"
+                        },
+                        "values": [
+                            "x11"
+                        ]
+                    }
+                ],
+                "data": [
+                    {
+                        "script": {
+                            "name": "Set Resolution",
+                            "data": "monitor-control/set_resolutions.sh"
+                        }
+                    },
+                    {
+                        "script": {
+                            "name": "Duplicate Displays",
+                            "data": "monitor-control/duplicate_displays.sh"
+                        }
+                    },
+                    {
+                        "script": {
+                            "name": "Extend Displays",
+                            "data": "monitor-control/extend_displays.sh"
+                        }
+                    },
+                    {
+                        "script": {
+                            "name": "Auto Detect Displays",
+                            "data": "monitor-control/auto_detect_displays.sh"
+                        }
+                    },
+                    {
+                        "script": {
+                            "name": "Enable Monitor",
+                            "data": "monitor-control/enable_monitor.sh"
+                        }
+                    },
+                    {
+                        "script": {
+                            "name": "Disable Monitor",
+                            "data": "monitor-control/disable_monitor.sh"
+                        }
+                    },
+                    {
+                        "script": {
+                            "name": "Set Primary Monitor",
+                            "data": "monitor-control/set_primary_monitor.sh"
+                        }
+                    },
+                    {
+                        "script": {
+                            "name": "Change Orientation",
+                            "data": "monitor-control/change_orientation.sh"
+                        }
+                    },
+                    {
+                        "script": {
+                            "name": "Manage Arrangement",
+                            "data": "monitor-control/manage_arrangement.sh"
+                        }
+                    },
+                    {
+                        "script": {
+                            "name": "Scale Monitors",
+                            "data": "monitor-control/scale_monitor.sh"
+                        }
+                    },
+                    {
+                        "script": {
+                            "name": "Reset Scaling",
+                            "data": "monitor-control/reset_scaling.sh"
+                        }
+                    }
+                ]
+            }
+        }
+    ]
+}