diff --git a/home-manager/modules/theming.nix b/home-manager/modules/theming.nix
index 3e46fb5..b4be760 100644
--- a/home-manager/modules/theming.nix
+++ b/home-manager/modules/theming.nix
@@ -1,32 +1,48 @@
 { pkgs, ... }: {
-  # Enable qt
-  qt.enable = true;
 
-  # Use gtk platform theme
-  qt.platformTheme = "gtk";
+  qt = {
+    # Enable qt
+    enable = true;
 
-  # Use gtk2 style
-  qt.style.name = "gtk2";
+    # Use gtk platform theme
+    platformTheme = "gtk";
 
-  # Enable gtk
-  gtk.enable = true;
+    # Use gtk2 style
+    style.name = "gtk2";
+  };
 
-  # Gtk cursor theme
-  gtk.cursorTheme.package = pkgs.catppuccin-cursors.frappeRosewater;
-  gtk.cursorTheme.name = "Catppuccin-Frappe-Rosewater-Cursors";
+  home.pointerCursor = {
+    gtk.enable = true;
 
-  # Gtk look theme
-  gtk.theme.package = pkgs.catppuccin-gtk;
-  gtk.theme.name = "Catppuccin-Frappe-Standard-Blue-Dark";
+    # Cursor theme
+    package = pkgs.catppuccin-cursors.frappeRosewater;
+    name = "Catppuccin-Frappe-Rosewater-Cursors";
+    size = 16;
+  };
 
-  # Gtk icon theme
-  gtk.iconTheme.package = (pkgs.catppuccin-papirus-folders.override {
-    flavor = "frappe";
-    accent = "pink";
-  });
-  gtk.iconTheme.name = "Papirus-Dark";
+  gtk = {
+    # Enable gtk
+    enable = true;
 
-  # Font name
-  gtk.font.name = "Noto Sans";
-  gtk.font.size = 10;
+    # look theme
+    theme = {
+      package = pkgs.catppuccin-gtk;
+      name = "Catppuccin-Frappe-Standard-Blue-Dark";
+    };
+
+    # icon theme
+    iconTheme = {
+      package = (pkgs.catppuccin-papirus-folders.override {
+        flavor = "frappe";
+        accent = "pink";
+      });
+      name = "Papirus-Dark";
+    };
+
+    # Font name
+    font = {
+      name = "Noto Sans";
+      size = 10;
+    };
+  };
 }