diff --git a/modules/graphical/adw-gtk3.nix b/modules/graphical/adw-gtk3.nix
new file mode 100644
index 0000000..4d5cdf6
--- /dev/null
+++ b/modules/graphical/adw-gtk3.nix
@@ -0,0 +1,4 @@
+{pkgs, ...}: {
+  environment.systemPackages = [pkgs.adw-gtk3];
+  users.users.quadradical.maid.gsettings.settings.org.gnome.desktop.interface.gtk-theme = "adw-gtk3";
+}
diff --git a/modules/graphical/clocks.nix b/modules/graphical/clocks.nix
new file mode 100644
index 0000000..c57eec0
--- /dev/null
+++ b/modules/graphical/clocks.nix
@@ -0,0 +1,12 @@
+{
+  users.users.quadradical.maid.gsettings.settings.org.gnome.clocks.timers = [
+    {
+      duration = 600;
+      name = "Break";
+    }
+    {
+      duration = 3000;
+      name = "Work";
+    }
+  ];
+}
diff --git a/modules/graphical/dconf/default.nix b/modules/graphical/dconf/default.nix
deleted file mode 100644
index 876eebb..0000000
--- a/modules/graphical/dconf/default.nix
+++ /dev/null
@@ -1,126 +0,0 @@
-{
-  lib,
-  pkgs,
-  ...
-}: {
-  programs.dconf.profiles.user.databases = [
-    {
-      # Can't lock because of home manager
-      # lockAll = true;
-      settings = lib.mapAttrs (_:
-        lib.mapAttrs (name: value:
-          if builtins.isInt value
-          then lib.gvariant.mkInt32 value
-          else value)) (with lib.gvariant; {
-        "org/gnome/shell/extensions/rounded-window-corners-reborn" = {
-          border-width = -5;
-          skip-libadwaita-app = false;
-          skip-libhandy-app = false;
-        };
-        "org/gnome/shell/extensions/pop-shell" = rec {
-          active-hint = true;
-          tile-by-default = true;
-          active-hint-border-radius = mkUint32 16;
-          gap-inner = mkUint32 3;
-          gap-outer = gap-inner;
-        };
-
-        "org/gnome/shell/extensions/just-perfection" = {
-          accessibility-menu = false;
-          activities-button = true;
-          calendar = true;
-          clock-menu = true;
-          clock-menu-position = 0;
-          dash = false;
-          dash-app-running = false;
-          dash-separator = false;
-          events-button = false;
-          keyboard-layout = false;
-          panel-size = 0;
-          power-icon = true;
-          quick-settings = true;
-          quick-settings-dark-mode = false;
-          show-apps-button = false;
-          startup-status = 0;
-          window-menu-take-screenshot-button = false;
-          window-picker-icon = true;
-          workspace = true;
-          workspace-switcher-size = 0;
-          world-clock = false;
-        };
-
-        "org/gnome/shell/extensions/display-brightness-ddcutil" = {
-          allow-zero-brightness = true;
-          button-location = 1;
-          ddcutil-binary-path = lib.meta.getExe pkgs.ddcutil;
-          decrease-brightness-shortcut = ["XF86MonBrightnessDown"];
-          increase-brightness-shortcut = ["XF86MonBrightnessUp"];
-          hide-system-indicator = true;
-          only-all-slider = true;
-          position-system-menu = 3.0;
-          show-internal-slider = false;
-          show-all-slider = true;
-          show-display-name = false;
-          show-osd = true;
-          show-value-label = false;
-          step-change-keyboard = 2.0;
-        };
-
-        "org/gnome/shell/extensions/burn-my-windows".active-profile = toString ./burn-my-windows.conf;
-
-        "org/gnome/desktop/wm/preferences".focus-mode = "mouse";
-
-        "org/gnome/shell" = {
-          disable-user-extensions = true;
-          enabled-extensions = [
-            "blur-my-shell@aunetx"
-            "pop-shell@system76.com"
-            "rounded-window-corners@fxgn"
-            "burn-my-windows@schneegans.github.com"
-            "fullscreen-avoider@noobsai.github.com"
-            "appindicatorsupport@rgcjonas.gmail.com"
-            "compiz-windows-effect@hermes83.github.com"
-            "display-brightness-ddcutil@themightydeity.github.com"
-            "launch-new-instance@gnome-shell-extensions.gcampax.github.com"
-          ];
-          disabled-extensions = [
-            "just-perfection-desktop@just-perfection"
-          ];
-        };
-
-        "org/gnome/settings-daemon/plugins/media-keys".custom-keybindings = ["/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/"];
-
-        "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = {
-          binding = "<Super>e";
-          command = "nautilus";
-          name = "Files";
-        };
-
-        "org/gnome/desktop/search-providers".sort-order = ["org.gnome.Contacts.desktop" "org.gnome.Documents.desktop" "org.gnome.Nautilus.desktop"];
-
-        "org/gnome/desktop/interface" = rec {
-          color-scheme = "prefer-dark";
-          enable-animations = true;
-
-          cursor-theme = "GoogleDot-Blue";
-          cursor-size = 24;
-
-          gtk-theme = "adw-gtk3";
-          icon-theme = "Papirus";
-          toolkit-accessibility = false;
-
-          font-hinting = "slight";
-          font-antialiasing = "grayscale";
-
-          font-name = "sans";
-          document-font-name = font-name;
-          monospace-font-name = "monospace";
-        };
-
-        #         "org/gnome/Ptyxis".default-profile-uuid = "quadradical";
-        #
-        #         "org/gnome/Ptyxis/Profiles/quadradical".palette = "nord";
-      });
-    }
-  ];
-}
diff --git a/modules/graphical/desktop.nix b/modules/graphical/desktop.nix
deleted file mode 100644
index 583d198..0000000
--- a/modules/graphical/desktop.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  environment.sessionVariables.NIXOS_OZONE_WL = "1";
-
-  services = {
-    desktopManager.gnome.enable = true;
-    displayManager.gdm.enable = true;
-  };
-}
diff --git a/modules/graphical/gnome.nix b/modules/graphical/gnome.nix
deleted file mode 100644
index 3c76bb4..0000000
--- a/modules/graphical/gnome.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{pkgs, ...}: {
-  programs.nautilus-open-any-terminal = {
-    enable = true;
-    terminal = "ptyxis";
-  };
-
-  environment = {
-    sessionVariables.XDG_CURRENT_DESKTOP = "GNOME";
-
-    systemPackages = with pkgs.gnomeExtensions; [
-      valent
-      pop-shell
-      appindicator
-      blur-my-shell
-      just-perfection
-      burn-my-windows
-      fullscreen-avoider
-      launch-new-instance
-      compiz-windows-effect
-      rounded-window-corners-reborn
-      brightness-control-using-ddcutil
-    ];
-
-    gnome.excludePackages = with pkgs; [
-      yelp
-      orca
-      totem
-      xterm
-      evince
-      decibels
-      epiphany
-      gnome-logs
-      gnome-tour
-      gnome-music
-      simple-scan
-      gnome-console
-      gnome-software
-      gnome-user-docs
-      gnome-characters
-      gnome-font-viewer
-      gnome-connections
-      gnome-text-editor
-      gnome-system-monitor
-    ];
-  };
-}
diff --git a/background.jpg b/modules/graphical/gnome/background.jpg
similarity index 100%
rename from background.jpg
rename to modules/graphical/gnome/background.jpg
diff --git a/modules/graphical/dconf/burn-my-windows.conf b/modules/graphical/gnome/burn-my-windows.conf
similarity index 100%
rename from modules/graphical/dconf/burn-my-windows.conf
rename to modules/graphical/gnome/burn-my-windows.conf
diff --git a/modules/graphical/gnome/default.nix b/modules/graphical/gnome/default.nix
new file mode 100644
index 0000000..3bfc908
--- /dev/null
+++ b/modules/graphical/gnome/default.nix
@@ -0,0 +1,51 @@
+{
+  services = {
+    desktopManager.gnome.enable = true;
+    displayManager.gdm.enable = true;
+  };
+
+  users.users.quadradical.maid.gsettings.settings.org.gnome = {
+    desktop = {
+      wm.preferences.focus-mode = "mouse";
+      search-providers.sort-order = ["org.gnome.Contacts.desktop" "org.gnome.Documents.desktop" "org.gnome.Nautilus.desktop"];
+
+      background = rec {
+        picture-uri = "file://${./background.jpg}";
+        picture-uri-dark = picture-uri;
+      };
+
+      interface = rec {
+        color-scheme = "prefer-dark";
+
+        cursor-theme = "GoogleDot-Blue";
+        cursor-size = 24;
+
+        icon-theme = "Papirus";
+        toolkit-accessibility = false;
+
+        font-name = "sans";
+        document-font-name = font-name;
+        monospace-font-name = "monospace";
+
+        show-battery-percentage = true;
+      };
+
+      lockdown = {
+        disable-printing = true;
+        disable-print-setup = true;
+        user-administration-disabled = true;
+      };
+
+      peripherals.touchpad.disable-while-typing = false;
+    };
+
+    shell = {
+      remember-mount-password = true;
+      favorite-apps = ["librewolf.desktop" "org.gnome.Geary.desktop" "org.gnome.Nautilus.desktop"];
+    };
+
+    mutter.edge-tiling = false;
+    system.location.enabled = true;
+    settings-daemon.plugins.media-keys.calculator-static = [];
+  };
+}
diff --git a/modules/graphical/gnome/extensions.nix b/modules/graphical/gnome/extensions.nix
new file mode 100644
index 0000000..69b486c
--- /dev/null
+++ b/modules/graphical/gnome/extensions.nix
@@ -0,0 +1,121 @@
+{
+  pkgs,
+  lib,
+  ...
+}: {
+  environment = {
+    systemPackages = with pkgs.gnomeExtensions; [
+      valent
+      pop-shell
+      appindicator
+      blur-my-shell
+      just-perfection
+      burn-my-windows
+      fullscreen-avoider
+      launch-new-instance
+      compiz-windows-effect
+      rounded-window-corners-reborn
+      brightness-control-using-ddcutil
+    ];
+
+    gnome.excludePackages = with pkgs; [
+      yelp
+      orca
+      totem
+      xterm
+      evince
+      decibels
+      epiphany
+      gnome-logs
+      gnome-tour
+      gnome-music
+      simple-scan
+      gnome-console
+      gnome-software
+      gnome-user-docs
+      gnome-characters
+      gnome-font-viewer
+      gnome-connections
+      gnome-text-editor
+      gnome-system-monitor
+    ];
+  };
+
+  users.users.quadradical.maid.gsettings.settings.org.gnome.shell = {
+    disable-user-extensions = false;
+    allow-extension-installation = false;
+    enabled-extensions = [
+      "blur-my-shell@aunetx"
+      "pop-shell@system76.com"
+      "rounded-window-corners@fxgn"
+      "burn-my-windows@schneegans.github.com"
+      "fullscreen-avoider@noobsai.github.com"
+      "appindicatorsupport@rgcjonas.gmail.com"
+      "compiz-windows-effect@hermes83.github.com"
+      "display-brightness-ddcutil@themightydeity.github.com"
+      "launch-new-instance@gnome-shell-extensions.gcampax.github.com"
+    ];
+    disabled-extensions = [
+      "just-perfection-desktop@just-perfection"
+    ];
+
+    extensions = {
+      rounded-window-corners-reborn = {
+        border-width = -5;
+        skip-libadwaita-app = false;
+        skip-libhandy-app = false;
+      };
+
+      pop-shell = rec {
+        active-hint = true;
+        tile-by-default = true;
+        active-hint-border-radius = 16;
+        gap-inner = 3;
+        gap-outer = gap-inner;
+      };
+
+      just-perfection = {
+        accessibility-menu = false;
+        activities-button = true;
+        calendar = true;
+        clock-menu = true;
+        clock-menu-position = 0;
+        dash = false;
+        dash-app-running = false;
+        dash-separator = false;
+        events-button = false;
+        keyboard-layout = false;
+        panel-size = 0;
+        power-icon = true;
+        quick-settings = true;
+        quick-settings-dark-mode = false;
+        show-apps-button = false;
+        startup-status = 0;
+        window-menu-take-screenshot-button = false;
+        window-picker-icon = true;
+        workspace = true;
+        workspace-switcher-size = 0;
+        world-clock = false;
+      };
+
+      display-brightness-ddcutil = {
+        allow-zero-brightness = true;
+        button-location = 1;
+        ddcutil-binary-path = lib.meta.getExe pkgs.ddcutil;
+        decrease-brightness-shortcut = ["XF86MonBrightnessDown"];
+        increase-brightness-shortcut = ["XF86MonBrightnessUp"];
+        hide-system-indicator = true;
+        only-all-slider = true;
+        position-system-menu = 3.0;
+        show-internal-slider = false;
+        show-all-slider = true;
+        show-display-name = false;
+        show-osd = true;
+        show-value-label = false;
+        step-change-keyboard = 2.0;
+      };
+
+      burn-my-windows.active-profile = toString ./burn-my-windows.conf;
+    };
+  };
+}
diff --git a/modules/graphical/ozone.nix b/modules/graphical/ozone.nix
new file mode 100644
index 0000000..cb9a526
--- /dev/null
+++ b/modules/graphical/ozone.nix
@@ -0,0 +1 @@
+{environment.sessionVariables.NIXOS_OZONE_WL = "1";}
diff --git a/modules/graphical/packages.nix b/modules/graphical/packages.nix
index 4dcf7b9..bf3b074 100644
--- a/modules/graphical/packages.nix
+++ b/modules/graphical/packages.nix
@@ -3,7 +3,6 @@
   environment.systemPackages = with pkgs; [
     tuba
     gradia
-    ptyxis
     gapless
     resources
     wl-clipboard
diff --git a/modules/graphical/ptyxis.nix b/modules/graphical/ptyxis.nix
new file mode 100644
index 0000000..914a318
--- /dev/null
+++ b/modules/graphical/ptyxis.nix
@@ -0,0 +1,16 @@
+{pkgs, ...}: {
+  environment.systemPackages = [
+    pkgs.ptyxis
+  ];
+
+  programs.nautilus-open-any-terminal = {
+    enable = true;
+    terminal = "ptyxis";
+  };
+
+  users.users.quadradical.maid.gsettings.settings.org.gnome.Ptyxis = rec {
+    default-profile-uuid = "quadradical";
+    profile-uuids = [default-profile-uuid];
+    Profiles.${default-profile-uuid}.palette = "nord";
+  };
+}
diff --git a/stylix.nix b/stylix.nix
index b2361b9..fc9c5d8 100755
--- a/stylix.nix
+++ b/stylix.nix
@@ -2,7 +2,6 @@
   stylix = {
     enable = true;
     polarity = "dark";
-    image = ./background.jpg;
     enableReleaseChecks = false;
     base16Scheme = "${pkgs.base16-schemes}/share/themes/nord.yaml";
     targets = {