diff --git a/hosts/solaire/modules/theme.nix b/hosts/solaire/modules/theme.nix
index c13b513..2ae62f8 100644
--- a/hosts/solaire/modules/theme.nix
+++ b/hosts/solaire/modules/theme.nix
@@ -1,11 +1,6 @@
-{pkgs, ...}: {
+_: {
   theme = {
     enable = true;
     wallpaper = ../../../wallpapers/lucy-edgerunners-wallpaper.jpg;
-    schemeName = "rose-pine";
-    gtk.theme = {
-      name = "rose-pine";
-      package = pkgs.rose-pine-gtk-theme;
-    };
   };
 }
diff --git a/hosts/vamos/modules/theme.nix b/hosts/vamos/modules/theme.nix
index e747a87..79c955f 100644
--- a/hosts/vamos/modules/theme.nix
+++ b/hosts/vamos/modules/theme.nix
@@ -5,10 +5,5 @@
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/e0cf0eb237dc5baba86661a3572b20a6183c1876/wallpapers/nix-wallpaper-nineish-catppuccin-frappe.png?raw=true";
       hash = "sha256-/HAtpGwLxjNfJvX5/4YZfM8jPNStaM3gisK8+ImRmQ4=";
     };
-    schemeName = "rose-pine";
-    gtk.theme = {
-      name = "rose-pine";
-      package = pkgs.rose-pine-gtk-theme;
-    };
   };
 }
diff --git a/modules/theme/default.nix b/modules/theme/default.nix
index 286b699..357ad28 100644
--- a/modules/theme/default.nix
+++ b/modules/theme/default.nix
@@ -21,8 +21,8 @@ in {
         Name of the tinted-theming color scheme to use.
       '';
       type = enum (attrNames inputs.basix.schemeData.base16);
-      example = "catppuccin-macchiato";
-      default = "catppuccin-macchiato";
+      example = "rose-pine";
+      default = "rose-pine";
     };
 
     wallpaper = mkOption {
@@ -42,14 +42,14 @@ in {
         description = ''
           Name of the cursor theme.
         '';
-        default = "phinger-cursors-dark";
+        default = "BreezeX-RosePine-Linux";
       };
       package = mkOption {
         type = package;
         description = ''
           Package providing the cursor theme.
         '';
-        default = pkgs.phinger-cursors;
+        default = pkgs.rose-pine-cursor;
       };
       size = mkOption {
         description = ''
@@ -65,10 +65,10 @@ in {
     mkIf cfg.enable
     {
       home-manager.users.nezia = {
-        imports = [inputs.nvf.homeManagerModules.default];
-
         home.pointerCursor = {
           inherit (config.theme.cursorTheme) name package size;
+          x11.enable = true;
+          gtk.enable = true;
         };
 
         services.swaync.style =