diff --git a/home/default.nix b/home/default.nix
index 5bda713..5c29bd5 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -26,15 +26,6 @@ in
       ./services
     ];
 
-    dconf.settings = {
-      "io/elementary/files/preferences" = {
-        "singleclick-select" = true;
-      };
-      "org/gtk/settings/file-chooser" = {
-        "sort-directories-first" = true;
-      };
-    };
-
     xdg.enable = true;
     xdg.mime.enable = true;
     xdg.mimeApps.enable = true;
diff --git a/home/gtk.nix b/home/gtk.nix
index 33620f1..f67c076 100644
--- a/home/gtk.nix
+++ b/home/gtk.nix
@@ -42,7 +42,13 @@ in
 
   dconf.settings = {
     "org/gnome/desktop/interface" = {
-      "color-scheme" = "prefer-dark";
+      color-scheme = "prefer-dark";
+    };
+    "org/gnome/desktop/wm/preferences" = {
+      button-layout = ":appmenu";
+    };
+    "org/gtk/settings/file-chooser" = {
+      sort-directories-first = true;
     };
   };
 }
diff --git a/home/programs/default.nix b/home/programs/default.nix
index f359281..4945458 100644
--- a/home/programs/default.nix
+++ b/home/programs/default.nix
@@ -5,6 +5,7 @@
     ./btop.nix
     ./direnv.nix
     ./exa.nix
+    ./files.nix
     ./firefox.nix
     ./git.nix
     ./github-cli.nix
@@ -29,7 +30,6 @@
     gnome.gnome-system-monitor
     gnome3.gnome-disk-utility
     lazydocker
-    pantheon.elementary-files
     pavucontrol
     ripgrep
     spotify-tui
diff --git a/home/programs/files.nix b/home/programs/files.nix
new file mode 100644
index 0000000..d62f9a9
--- /dev/null
+++ b/home/programs/files.nix
@@ -0,0 +1,8 @@
+{ pkgs, ... }: {
+  home.packages = [ pkgs.pantheon.elementary-files ];
+  dconf.settings = {
+    "io/elementary/files/preferences" = {
+      singleclick-select = true;
+    };
+  };
+}
diff --git a/home/programs/virt-manager.nix b/home/programs/virt-manager.nix
index 796023a..a235947 100644
--- a/home/programs/virt-manager.nix
+++ b/home/programs/virt-manager.nix
@@ -2,17 +2,17 @@
   home.packages = [ pkgs.virt-manager ];
   dconf.settings = {
     "org/virt-manager/virt-manager/confirm" = {
-      "forcepoweroff" = false;
+      forcepoweroff = false;
     };
     "org/virt-manager/virt-manager/connections" = {
-      "autoconnect" = [ "qemu:///system" ];
-      "uris" = [ "qemu:///system" ];
+      autoconnect = [ "qemu:///system" ];
+      uris = [ "qemu:///system" ];
     };
-    "org/virt-manager/virt-manager/new-vm" = { "firmware" = "uefi"; };
+    "org/virt-manager/virt-manager/new-vm" = { firmware = "uefi"; };
     "org/virt-manager/virt-manager/stats" = {
-      "enable-disk-poll" = true;
-      "enable-net-poll" = true;
+      enable-disk-poll = true;
+      enable-net-poll = true;
     };
-    "org/virt-manager/virt-manager/vmlist-fields" = { "network-traffic" = true; };
+    "org/virt-manager/virt-manager/vmlist-fields" = { network-traffic = true; };
   };
 }