diff --git a/modules/home/desktop/gnome/default.nix b/modules/home/desktop/gnome/default.nix
index 3c96963..c6d29d5 100644
--- a/modules/home/desktop/gnome/default.nix
+++ b/modules/home/desktop/gnome/default.nix
@@ -1,17 +1,16 @@
 {
   lib,
   pkgs,
-  host,
   config,
   osConfig,
   namespace,
   ...
 }: with lib; with lib.${namespace};
 let
-  cfg = config.${host}.desktop.gnome;
+  cfg = config.${namespace}.desktop.gnome;
 in
 {
-  options.${host}.desktop.gnome = with types; {
+  options.${namespace}.desktop.gnome = with types; {
     enabled-extensions = mkOption {
       type = listOf package;
       default = with pkgs.gnomeExtensions; [ dash-to-dock user-themes blur-my-shell appindicator unite color-picker clipboard-history ];
diff --git a/modules/home/themes/catppuccin/global/default.nix b/modules/home/themes/catppuccin/global/default.nix
index 189704d..e2b153a 100644
--- a/modules/home/themes/catppuccin/global/default.nix
+++ b/modules/home/themes/catppuccin/global/default.nix
@@ -6,8 +6,8 @@
     accent = "blue";
     flavor = "macchiato";
 
-    pointerCursor.enable = true;
-    pointerCursor.accent = "blue";
-    pointerCursor.flavor = "macchiato";
+    cursors.enable = true;
+    cursors.accent = "blue";
+    cursors.flavor = "macchiato";
   };
 }
diff --git a/modules/home/themes/catppuccin/gnome/default.nix b/modules/home/themes/catppuccin/gnome/default.nix
index e1152f4..cdf7a93 100644
--- a/modules/home/themes/catppuccin/gnome/default.nix
+++ b/modules/home/themes/catppuccin/gnome/default.nix
@@ -101,10 +101,10 @@ let
     '';
   };
 
-  cfg = config.themes.catppuccin.gtk;
+  cfg = config.${namespace}.themes.catppuccin.gtk;
 in
 {
-  options.themes.catppuccin.gtk = { enable = mkEnableOption "Enable the Catppuccin theme for GTK"; };
+  options.${namespace}.themes.catppuccin.gtk = { enable = mkEnableOption "Enable the Catppuccin theme for GTK"; };
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
@@ -120,17 +120,9 @@ in
       enable = true;
 
       font = {
-        name = "Ubuntu";
+        name = "Poppins";
         size = 12;
-        package = pkgs.ubuntu-sans;
-      };
-
-      catppuccin = {
-        icon = {
-          enable = true;
-          accent = "maroon";
-          flavor = "mocha";
-        };
+        package = pkgs.poppins;
       };
 
       theme = {
@@ -150,6 +142,16 @@ in
       };
     };
 
+    catppuccin = {
+      gtk = {
+        icon = {
+          enable = true;
+          accent = "maroon";
+          flavor = "mocha";
+        };
+      };
+    };
+
     dconf.settings = {
       "org/gnome/shell/extensions/user-theme" = {
         name = "Colloid-Dark-Catppuccin";