diff --git a/.drone.yml b/.drone.yml
index 527c0853..23805095 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -123,7 +123,7 @@ steps:
       - |
         nix --print-build-logs --verbose \
           develop --command \
-            bud build bootstrap isoImage
+            bud build bootstrap bootstrapIso
       - cp $(readlink -f result)/iso/*.iso /var/nix/iso-cache/
 
   - name: "Publish ISO"
@@ -158,6 +158,6 @@ volumes:
 
 ---
 kind: signature
-hmac: 7aa9b1eadc2638d7c0b6da2eea92cce650232a8c44ce9ab4a2b0e563f7432693
+hmac: bdbefb07b97dc8efc44d8eb36ee4d1bb89eec3b7255b49929e126e86a4b4a788
 
 ...
diff --git a/flake.lock b/flake.lock
index 3713f1cc..8fc8adf4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -188,15 +188,15 @@
         "nixpkgs-unstable": "nixpkgs-unstable"
       },
       "locked": {
-        "lastModified": 1651349453,
-        "narHash": "sha256-0ZAYPYWXm16reXFT0bJi/4f6GeYubnlj2YruXcmp0hs=",
-        "owner": "pub-solar",
+        "lastModified": 1651210705,
+        "narHash": "sha256-2RzKrjEnWDhsBQ4Et2gm2LjV5pXyszeqV1xNe+LtNT8=",
+        "owner": "divnix",
         "repo": "digga",
-        "rev": "531dd67b7aef37d7828fb28c2e45f09de0425c6b",
+        "rev": "0ffa2dff5ede12a03ca83fbc514972f94cf18f42",
         "type": "github"
       },
       "original": {
-        "owner": "pub-solar",
+        "owner": "divnix",
         "repo": "digga",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 340ca686..e9b91fc9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,7 +11,7 @@
       nixos.url = "github:nixos/nixpkgs/nixos-21.11";
       latest.url = "github:nixos/nixpkgs/nixos-unstable";
 
-      digga.url = "github:pub-solar/digga";
+      digga.url = "github:divnix/digga";
       digga.inputs.nixpkgs.follows = "nixos";
       digga.inputs.nixlib.follows = "nixos";
       digga.inputs.home-manager.follows = "home";
diff --git a/modules/sway/config/config.d/custom-keybindings.conf b/modules/sway/config/config.d/custom-keybindings.conf
index 5faddece..d5887e3e 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 27ae794a..eb4427aa 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 83f407e4..35013dd2 100644
--- a/modules/sway/default.nix
+++ b/modules/sway/default.nix
@@ -86,6 +86,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 2541fdd0..5cc81ca8 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