diff --git a/core/tabs/applications-setup/tab_data.toml b/core/tabs/applications-setup/tab_data.toml
index 1b72b0e53..363ad0341 100644
--- a/core/tabs/applications-setup/tab_data.toml
+++ b/core/tabs/applications-setup/tab_data.toml
@@ -24,6 +24,10 @@ name = "DWM-Titus"
 description = "DWM is a dynamic window manager for X.\nIt manages windows in tiled, monocle and floating layouts.\nAll of the layouts can be applied dynamically, optimising the environment for the application in use and the task performed.\nThis command installs and configures DWM and a desktop manager.\nThe list of patches applied can be found in CTT's DWM repository\nhttps://github.com/ChrisTitusTech/dwm-titus"
 script = "dwmtitus-setup.sh"
 
+[[data]]
+name = "Docker Setup"
+script = "docker-setup.sh"
+
 [[data]]
 name = "Fastfetch"
 description = "Fastfetch is a neofetch-like tool for fetching system information and displaying it prettily.\nIt is written mainly in C, with performance and customizability in mind.\nThis command installs fastfetch and configures from CTT's mybash repository.\nhttps://github.com/ChrisTitusTech/mybash"
@@ -34,6 +38,10 @@ name = "Flatpak / Flathub"
 description = "Flatpak is a universal application sandbox for Linux that uses isolated packages from Flathub to prevent conflicts and system alterations, while alleviating dependency concerns.\nThis command installs Flatpak and adds the Flathub repository"
 script = "setup-flatpak.sh"
 
+[[data]]
+name = "Grub Theme Setup"
+script = "grub-theme.sh"
+
 [[data]]
 name = "Kitty"
 description = "kitty is a free and open-source GPU-accelerated terminal emulator for Linux, macOS, and some BSD distributions, focused on performance and features.\nkitty is written in a mix of C and Python programming languages.\n This command installs and configures kitty."
diff --git a/core/tabs/system-setup/tab_data.toml b/core/tabs/system-setup/tab_data.toml
index 22612d94d..57a3fbbb5 100644
--- a/core/tabs/system-setup/tab_data.toml
+++ b/core/tabs/system-setup/tab_data.toml
@@ -55,19 +55,11 @@ name = "Virtualization Setup"
 description = "Enables Virtualization through dnf"
 script = "fedora/virtualization.sh"
 
-[[data]]
-name = "Auto Mount Drive"
-script = "auto-mount.sh"
-
 [[data]]
 name = "Build Prerequisites"
 description = "This script is designed to handle the installation of various software dependencies across different Linux distributions"
 script = "compile-setup.sh"
 
-[[data]]
-name = "Docker Setup"
-script = "docker-setup.sh"
-
 [[data]]
 name = "Full System Cleanup"
 script = "system-cleanup.sh"
@@ -87,15 +79,7 @@ name = "Global Theme"
 description = "This script is designed to handle the installation and configuration of global theming"
 script = "global-theme.sh"
 
-[[data]]
-name = "Grub Theme Setup"
-script = "grub-theme.sh"
-
 [[data]]
 name = "Remove Snaps"
 description = "This script is designed to remove snap"
 script = "remove-snaps.sh"
-
-[[data]]
-name = "SSH-Samba Setup"
-script = "samba-ssh-setup.sh"
diff --git a/core/tabs/utils/tab_data.toml b/core/tabs/utils/tab_data.toml
index 050d72f1f..c0b0b4676 100644
--- a/core/tabs/utils/tab_data.toml
+++ b/core/tabs/utils/tab_data.toml
@@ -19,6 +19,10 @@ name = "Auto Detect Displays"
 description = "This utility is designed to detect and apply recommended configuration for monitors connected with your system"
 script = "monitor-control/auto_detect_displays.sh"
 
+[[data]]
+name = "Auto Mount Drive"
+script = "auto-mount.sh"
+
 [[data.entries]]
 name = "Change Orientation"
 description = "This utility is designed to change the orientation of monitors in your system"
@@ -55,6 +59,10 @@ description = "This utility is designed to reset scaling of a monitor in your sy
 script = "monitor-control/reset_scaling.sh"
 matches = true
 
+[[data]]
+name = "SSH-Samba Setup"
+script = "samba-ssh-setup.sh"
+
 [[data.entries]]
 name = "Scale Monitors"
 description = "This utility is designed to change the scaling of monitors in your system"