diff --git a/.drone.yml b/.drone.yml
index f683f2a..2380509 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -140,7 +140,7 @@ steps:
         from_secret: ssh_port
       key:
         from_secret: ssh_key
-      target: /var/www/pub.solar
+      target: /srv/os
       source:
         - /var/nix/iso-cache/*.iso
       strip_components: 3
@@ -158,6 +158,6 @@ volumes:
 
 ---
 kind: signature
-hmac: e806a6980afdc1bf451be231db1a61e7917822a1f78afe3f2136eadfd632d521
+hmac: bdbefb07b97dc8efc44d8eb36ee4d1bb89eec3b7255b49929e126e86a4b4a788
 
 ...
diff --git a/modules/graphical/default.nix b/modules/graphical/default.nix
index d38b4d1..0bb9781 100644
--- a/modules/graphical/default.nix
+++ b/modules/graphical/default.nix
@@ -26,6 +26,11 @@ in
         default = { };
       };
     };
+    autologin.enable = mkOption {
+      type = types.bool;
+      default = true;
+      description = "Feature flag enabling autologin after boot.";
+    };
     wayland.software-renderer.enable = mkOption {
       type = types.bool;
       default = false;
@@ -54,7 +59,7 @@ in
       };
     };
 
-    services.getty.autologinUser = mkForce "${psCfg.user.name}";
+    services.getty.autologinUser = mkIf cfg.autologin.enable "${psCfg.user.name}";
 
     qt5 = {
       enable = true;
diff --git a/modules/sway/config/config.d/custom-keybindings.conf b/modules/sway/config/config.d/custom-keybindings.conf
index c394a69..ce7145a 100644
--- a/modules/sway/config/config.d/custom-keybindings.conf
+++ b/modules/sway/config/config.d/custom-keybindings.conf
@@ -37,7 +37,7 @@ set $mode_system (l)ock, (e)xit, (s)uspend, (h)ibernate, (r)eboot, (Shift+s)hutd
 bindsym $mod+0 mode "$mode_system"
 mode "$mode_system" {
     bindsym l exec swaylock-bg, mode "default"
-    bindsym e exec swaymsg exit, mode "default"
+    bindsym e exec systemctl --user stop graphical-session.target, mode "default"
     bindsym s exec systemctl suspend, mode "default"
     bindsym h exec systemctl hibernate, mode "default"
     bindsym r exec systemctl reboot, mode "default"
diff --git a/modules/sway/config/config.d/theme.conf b/modules/sway/config/config.d/theme.conf
index 27ae794..eb4427a 100644
--- a/modules/sway/config/config.d/theme.conf
+++ b/modules/sway/config/config.d/theme.conf
@@ -11,3 +11,6 @@ exec_always import-gtk-settings \
     gtk-theme:gtk-theme-name \
     icon-theme:gtk-icon-theme-name \
     cursor-theme:gtk-cursor-theme-name
+
+# Workaround to fix cursor scaling, see https://github.com/swaywm/sway/issues/4112
+seat seat0 xcursor_theme Adwaita
diff --git a/modules/sway/default.nix b/modules/sway/default.nix
index 79c5525..bf6c963 100644
--- a/modules/sway/default.nix
+++ b/modules/sway/default.nix
@@ -90,6 +90,7 @@ in
         #programs.waybar.systemd.enable = true;
 
         systemd.user.services.mako = import ./mako.service.nix pkgs;
+        systemd.user.services.sway = import ./sway.service.nix pkgs;
         systemd.user.services.swayidle = import ./swayidle.service.nix pkgs;
         systemd.user.services.xsettingsd = import ./xsettingsd.service.nix pkgs;
         systemd.user.services.waybar = import ./waybar.service.nix pkgs;
diff --git a/modules/terminal-life/zsh/default.nix b/modules/terminal-life/zsh/default.nix
index 88de58b..66ae354 100644
--- a/modules/terminal-life/zsh/default.nix
+++ b/modules/terminal-life/zsh/default.nix
@@ -19,7 +19,7 @@ in
   };
 
   loginExtra = ''
-    [ "$(tty)" = "/dev/tty1" ] && exec sway
+    [ "$(tty)" = "/dev/tty1" ] && exec ${pkgs.sway-service}/bin/sway-service
   '';
 
   shellAliases = {
@@ -86,7 +86,7 @@ in
 
     precmd () {
       DIR_NAME=$(pwd | sed "s|^$HOME|~|g")
-      echo -e "\e]2;$DIR_NAME\e\\"
+      echo -e -n "\e]2;$DIR_NAME\e\\"
     }
 
     # If a command is not found, show me where it is
diff --git a/profiles/base-user/.config/git/gitmessage.nix b/profiles/base-user/.config/git/gitmessage.nix
index 7f4b1c6..0d80f46 100644
--- a/profiles/base-user/.config/git/gitmessage.nix
+++ b/profiles/base-user/.config/git/gitmessage.nix
@@ -18,15 +18,5 @@ in
 # ^ Remember ending with an extra blank line
 # At the end: Include Co-authored-by for all contributors.
 #
-Co-authored-by: ${user.fullName} <${user.email}>
-
-# Please enter the commit message for your changes. Lines starting
-# with '#' will be ignored, and an empty message aborts the commit.
-#
-# On branch master
-# Your branch is up to date with 'origin/main'.
-#
-# Changes to be committed:
-#       new file:   installation.md
-#
+# Co-authored-by: Example Name <email@example.com>
 ''