diff --git a/flake.nix b/flake.nix
index 5e8899b..d04c0b3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -75,6 +75,7 @@
                # Add Disko for disk management
                disko.nixosModules.disko
                ./disko-config.nix
+               ./garrus.nix
                ./gnome.nix
                ./configuration.nix
                home-manager.nixosModules.home-manager
@@ -113,8 +114,8 @@
                # Add Disko for disk management
                disko.nixosModules.disko
                ./disko-config.nix
-               ./gnome.nix
                ./drack.nix
+               ./gnome.nix
                ./configuration.nix
                home-manager.nixosModules.home-manager
                {
diff --git a/hosts/x86_64/garrus/configuration.nix b/hosts/x86_64/garrus/configuration.nix
index ca99ef6..fddca66 100644
--- a/hosts/x86_64/garrus/configuration.nix
+++ b/hosts/x86_64/garrus/configuration.nix
@@ -10,12 +10,12 @@
         firmware-manager
 
         # COSMIC Utils
-        cosmic-ext-tweaks
-        cosmic-ext-forecast
-        cosmic-ext-tasks
-        cosmic-ext-calculator
-        cosmic-ext-examine
-        stellarshot
+        tweaks
+        forecast
+        tasks
+        calculator
+        examine
+        #stellarshot
     ];
 
 }