diff --git a/modules/home/gui/desktop/theming/gtk/config/cursorTheme.nix b/modules/home/gui/desktop/theming/gtk/config/cursorTheme.nix
deleted file mode 100755
index 23a9967..0000000
--- a/modules/home/gui/desktop/theming/gtk/config/cursorTheme.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  pkgs,
-  flake,
-  ...
-}:
-let
-  inherit (flake.config.aesthetics.themes) cursor;
-in
-{
-  name = "catppuccin-macchiato-dark-cursors";
-  package = pkgs.catppuccin-cursors.macchiatoDark;
-  size = cursor.size;
-}
diff --git a/modules/home/gui/desktop/theming/gtk/config/gtk3.nix b/modules/home/gui/desktop/theming/gtk/config/gtk3.nix
deleted file mode 100755
index ee1ec73..0000000
--- a/modules/home/gui/desktop/theming/gtk/config/gtk3.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  extraConfig = {
-    gtk-application-prefer-dark-theme = true;
-  };
-}
diff --git a/modules/home/gui/desktop/theming/gtk/config/homeCursor.nix b/modules/home/gui/desktop/theming/gtk/config/homeCursor.nix
deleted file mode 100755
index 037cc12..0000000
--- a/modules/home/gui/desktop/theming/gtk/config/homeCursor.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ pkgs, flake, ... }:
-let
-  inherit (flake.config.aesthetics.themes)
-    cursor
-    ;
-in
-{
-  gtk.enable = true;
-  x11.enable = true;
-  name = "catppuccin-mocha-dark-cursors";
-  package = pkgs.catppuccin-cursors.macchiatoDark;
-  size = cursor.size;
-}
diff --git a/modules/home/gui/desktop/theming/gtk/config/iconTheme.nix b/modules/home/gui/desktop/theming/gtk/config/iconTheme.nix
deleted file mode 100755
index 199e53d..0000000
--- a/modules/home/gui/desktop/theming/gtk/config/iconTheme.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ pkgs, ... }:
-{
-  package = pkgs.catppuccin-papirus-folders.override {
-    flavor = "macchiato";
-    accent = "mauve";
-  };
-  name = "Papirus-Dark";
-}
diff --git a/modules/home/gui/desktop/theming/gtk/config/theme.nix b/modules/home/gui/desktop/theming/gtk/config/theme.nix
deleted file mode 100755
index ae38e2a..0000000
--- a/modules/home/gui/desktop/theming/gtk/config/theme.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ pkgs, ... }:
-{
-  package = pkgs.catppuccin-gtk.override {
-    size = "compact";
-    variant = "macchiato";
-    accents = [
-      "mauve"
-    ];
-  };
-  name = "catppuccin-macchiato-mauve-compact";
-}
diff --git a/modules/home/gui/desktop/theming/gtk/default.nix b/modules/home/gui/desktop/theming/gtk/default.nix
index 16938af..498427a 100755
--- a/modules/home/gui/desktop/theming/gtk/default.nix
+++ b/modules/home/gui/desktop/theming/gtk/default.nix
@@ -1,37 +1,43 @@
 { pkgs, flake, ... }:
 let
-  configPath = ./config;
-  cursorThemePath = import (configPath + /cursorTheme.nix) {
-    inherit
-      flake
-      pkgs
-      ;
-  };
-  iconThemePath = import (configPath + /iconTheme.nix) {
-    inherit
-      pkgs
-      ;
-  };
-  themePath = import (configPath + /theme.nix) {
-    inherit
-      pkgs
-      ;
-  };
-  homeCursorPath = import (configPath + /homeCursor.nix) {
-    inherit
-      flake
-      pkgs
-      ;
-  };
-  gtk3Path = import (configPath + /gtk3.nix);
+  inherit (flake.config.aesthetics.themes) cursor;
 in
 {
   gtk = {
     enable = true;
-    gtk3 = gtk3Path;
-    cursorTheme = cursorThemePath;
-    iconTheme = iconThemePath;
-    theme = themePath;
+    gtk3 = {
+      extraConfig = {
+        gtk-application-prefer-dark-theme = true;
+      };
+    };
+    cursorTheme = {
+      name = "catppuccin-macchiato-dark-cursors";
+      package = pkgs.catppuccin-cursors.macchiatoDark;
+      size = cursor.size;
+    };
+    iconTheme = {
+      package = pkgs.catppuccin-papirus-folders.override {
+        flavor = "macchiato";
+        accent = "mauve";
+      };
+      name = "Papirus-Dark";
+    };
+    theme = {
+      package = pkgs.catppuccin-gtk.override {
+        size = "compact";
+        variant = "macchiato";
+        accents = [
+          "mauve"
+        ];
+      };
+      name = "catppuccin-macchiato-mauve-compact";
+    };
+  };
+  home.pointerCursor = {
+    gtk.enable = true;
+    x11.enable = true;
+    name = "catppuccin-mocha-dark-cursors";
+    package = pkgs.catppuccin-cursors.macchiatoDark;
+    size = cursor.size;
   };
-  home.pointerCursor = homeCursorPath;
 }