diff --git a/justfile b/justfile
index 483e46c..4021089 100644
--- a/justfile
+++ b/justfile
@@ -3,10 +3,10 @@ default:
 
 # Update a specific flake input
 update input:
-    nix flake lock --update-input "{{input}}" --commit-lock-file
+    nix flake lock --update-input {{input}} --commit-lock-file
 
 build-vm:
-    nixos-rebuild build-vm --fallback --flake .#vm --print-build-logs
+    nixos-rebuild build-vm --flake .#vm --print-build-logs
 
 run-vm: build-vm
     QEMU_OPTS="$QEMU_OPTS_WL" result/bin/run-nixos-vm
diff --git a/modules/hm/gui/sway.nix b/modules/hm/gui/sway.nix
index 5ed2293..37194da 100644
--- a/modules/hm/gui/sway.nix
+++ b/modules/hm/gui/sway.nix
@@ -11,7 +11,7 @@ in
   config = lib.mkIf (config.jhome.enable && config.jhome.gui.enable && cfg.enable) {
     # Window Manager
     wayland.windowManager.sway = {
-      inherit (cfg) enable;
+      inherit (cfg.sway) enable;
       config =
         let
           inherit (config.jhome.gui) terminal;
@@ -30,7 +30,7 @@ in
           };
         in
         {
-          modifier = "Mod4";
+          modifier = "Mod 4";
           inherit terminal menu;
           # Appearance
           bars = [ ]; # Waybar is started as a systemd service
@@ -73,23 +73,25 @@ in
               datadir = "${schema}/share/gsettings-schemas/${schema.name}";
             in
             [
-              (cmdAlways "${pkgs.writers.writeDash "configure-gtk" ''
-                export XDG_DATA_DIRS="${datadir}:$XDG_DATA_DIRS"
+              (cmdAlways (
+                pkgs.writers.writeDash "configure-gtk" ''
+                  export XDG_DATA_DIRS="${datadir}:$XDG_DATA_DIRS"
 
-                gnome_schema=org.gnome.desktop.interface
-                config="${config.xdg.configHome}/gtk-3.0/settings.ini"
-                if [ ! -f "$config" ]; then exit 1; fi
-                # Read settings from gtk3
-                gtk_theme="$(${pkgs.gnugrep}/bin/grep 'gtk-theme-name' "$config" | ${pkgs.gnused}/bin/sed 's/.*\s*=\s*//')"
-                icon_theme="$(${pkgs.gnugrep}/bin/grep 'gtk-icon-theme-name' "$config" | ${pkgs.gnused}/bin/sed 's/.*\s*=\s*//')"
-                cursor_theme="$(${pkgs.gnugrep}/bin/grep 'gtk-cursor-theme-name' "$config" | ${pkgs.gnused}/bin/sed 's/.*\s*=\s*//')"
-                font_name="$(grep 'gtk-font-name' "$config" | sed 's/.*\s*=\s*//')"
-                ${pkgs.glib}/bin/gsettings set "$gnome_schema" gtk-theme "$gtk_theme"
-                ${pkgs.glib}/bin/gsettings set "$gnome_schema" icon-theme "$icon_theme"
-                ${pkgs.glib}/bin/gsettings set "$gnome_schema" cursor-theme "$cursor_theme"
-                ${pkgs.glib}/bin/gsettings set "$gnome_schema" font-name "$font_name"
-                ${pkgs.glib}/bin/gsettings set "$gnome_schema" color-scheme prefer-dark
-              ''}")
+                  gnome_schema=org.gnome.desktop.interface
+                  config="${config.xdg.configHome}/gtk-3.0/settings.ini"
+                  if [ ! -f "$config" ]; then exit 1; fi
+                  # Read settings from gtk3
+                  gtk_theme="$(${pkgs.gnugrep}/bin/grep 'gtk-theme-name' "$config" | ${pkgs.gnused}/bin/sed 's/.*\s*=\s*//')"
+                  icon_theme="$(${pkgs.gnugrep}/bin/grep 'gtk-icon-theme-name' "$config" | ${pkgs.gnused}/bin/sed 's/.*\s*=\s*//')"
+                  cursor_theme="$(${pkgs.gnugrep}/bin/grep 'gtk-cursor-theme-name' "$config" | ${pkgs.gnused}/bin/sed 's/.*\s*=\s*//')"
+                  font_name="$(grep 'gtk-font-name' "$config" | sed 's/.*\s*=\s*//')"
+                  ${pkgs.glib}/bin/gsettings set "$gnome_schema" gtk-theme "$gtk_theme"
+                  ${pkgs.glib}/bin/gsettings set "$gnome_schema" icon-theme "$icon_theme"
+                  ${pkgs.glib}/bin/gsettings set "$gnome_schema" cursor-theme "$cursor_theme"
+                  ${pkgs.glib}/bin/gsettings set "$gnome_schema" font-name "$font_name"
+                  ${pkgs.glib}/bin/gsettings set "$gnome_schema" color-scheme prefer-dark
+                ''
+              ))
             ]
             ++ (builtins.map cmdAlways cfg.exec.always)
             ++ (builtins.map cmdOnce cfg.exec.once);