diff --git a/modules/desktop/gnome.nix b/modules/desktop/gnome.nix
index 2bc1bc9..50865a2 100644
--- a/modules/desktop/gnome.nix
+++ b/modules/desktop/gnome.nix
@@ -21,6 +21,53 @@ in {
 
     programs.dconf.enable = true;
     dconf.settings = {
+      "io/github/celluloid-player/celluloid" = {
+        draggable-video-area-enable = true;
+      };
+      "org/gnome/desktop/interface" = {
+        cursor-theme = "Adwaita";
+        enable-hot-corners = false;
+        font-name = "Cantarell 11";
+        icon-theme = "MoreWaita";
+        monospace-font-name = "UbuntuMono Nerd Font 11";
+      };
+      "org/gnome/desktop/peripherals/touchpad" = {
+        tap-to-click = true;
+      };
+      "org/gnome/desktop/sound" = {
+        theme-name = "freedesktop";
+      };
+      "org/gnome/desktop/search-providers" = {
+        disabled = [ "org.gnome.Epiphany.desktop" ];
+      };
+      "org/gnome/desktop/wm/keybindings" = {
+        switch-group = [ "<Super>grave" ];
+        switch-group-backward = [ "<Shift><Super>grave" ];
+      };
+      "org/gnome/desktop/wm/preferences" = {
+        button-layout = "appmenu:close";
+      };
+      "org/gnome/gnome-session" = {
+        auto-save-session = true;
+      };
+      "org/gnome/gnome-system-monitor" = {
+        show-dependencies = true;
+      };
+      "org/gnome/mutter" = {
+        center-new-windows = true;
+        edge-tiling = true;
+        experimental-features = [ "scale-monitor-framebuffer" ];
+      };
+      "org/gnome/settings-daemon/plugins/media-keys" = {
+        volume-up = [
+          "<Shift>F12"
+          "XF86AudioRaiseVolume"
+        ];
+        volume-down = [
+          "<Shift>F11"
+          "XF86AudioLowerVolume"
+        ];
+      };
       "org/gnome/shell" = {
         disable-user-extensions = false;
         enabled-extensions = [
@@ -99,11 +146,10 @@ in {
         screen-left-gap = 8;
         window-gap = 8;
       };
-      "org/gnome/desktop/peripherals/touchpad" = {
-        tap-to-click = true;
-      };
-      "org/gnome/desktop/search-providers" = {
-        disabled = [ "org.gnome.Epiphany.desktop" ];
+      "org/gnome/Console" = {
+        font-scale = 1.4;
+        use-system-font = false;
+        custom-font = "ComicShannsMono Nerd Font 10";
       };
       "org/gtk/settings/file-chooser" = {
         show-hidden = true;
@@ -113,44 +159,6 @@ in {
         show-hidden = true;
         sort-directories-first = true;
       };
-      "org/gnome/settings-daemon/plugins/media-keys" = {
-        volume-up = [
-          "<Shift>F12"
-          "XF86AudioRaiseVolume"
-        ];
-        volume-down = [
-          "<Shift>F11"
-          "XF86AudioLowerVolume"
-        ];
-      };
-      "org/gnome/gnome-session" = {
-        auto-save-session = true;
-      };
-      "org/gnome/gnome-system-monitor" = {
-        show-dependencies = true;
-      };
-      "org/gnome/Console" = {
-        font-scale = 1.4;
-        use-system-font = false;
-        custom-font = "ComicShannsMono Nerd Font 10";
-      };
-      "org/gnome/mutter" = {
-        center-new-windows = true;
-        edge-tiling = true;
-        experimental-features = [ "scale-monitor-framebuffer" ];
-      };
-      "org/gnome/desktop/interface" = {
-        enable-hot-corners = false;
-        icon-theme = "MoreWaita";
-        monospace-font-name = "UbuntuMono Nerd Font 11";
-      };
-      "org/gnome/desktop/wm/keybindings" = {
-        switch-group = [ "<Super>grave" ];
-        switch-group-backward = [ "<Shift><Super>grave" ];
-      };
-      "io/github/celluloid-player/celluloid" = {
-        draggable-video-area-enable = true;
-      };
     };
 
     user.packages = with pkgs; [