diff --git a/modules/regreet/default.nix b/modules/regreet/default.nix
index b5750e7..af8d959 100644
--- a/modules/regreet/default.nix
+++ b/modules/regreet/default.nix
@@ -29,20 +29,39 @@ in
     programs.regreet = {
       enable = true;
       package = regreetWrapper;
+      theme = {
+        name = "Orchis-Dark";
+        package = pkgs.orchis-theme.override {
+          tweaks = [
+            "compact"
+            "macos"
+          ];
+          border-radius = 5;
+        };
+      };
+
+      iconTheme = {
+        name = "elementary";
+        package = pkgs.pantheon.elementary-icon-theme;
+      };
+
+      cursorTheme = {
+        name = "catppuccin-mocha-dark-cursors";
+        package = pkgs.catppuccin-cursors.mochaDark;
+      };
+
+      font = {
+        name = "Monaspace Neon";
+        size = 16;
+        package = pkgs.monaspace;
+      };
+
       settings = {
         background = {
           path = cfg.wallpaper;
           fit = "Cover";
         };
 
-        GTK = {
-          application_prefer_dark_theme = true;
-          theme_name = "Orchis-Dark";
-          cursor_theme = "Catppuccin-Mocha-Dark-Cursors";
-          icon_theme_name = "elementary";
-          font_name = "Monaspace Neon 16";
-        };
-
         commands = {
           reboot = [
             "systemctl"