diff --git a/nixos/home-manager/env/common-touchinput.nix b/nixos/home-manager/env/common-touchinput.nix
new file mode 100644
index 00000000..7c031574
--- /dev/null
+++ b/nixos/home-manager/env/common-touchinput.nix
@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    squeekboard
+    lisgd
+  ];
+  programs.wlogout = {
+    enable = true;
+  };
+}
diff --git a/nixos/home-manager/env/common-wayland.nix b/nixos/home-manager/env/common-wayland.nix
index 977a6139..d096b78f 100644
--- a/nixos/home-manager/env/common-wayland.nix
+++ b/nixos/home-manager/env/common-wayland.nix
@@ -6,6 +6,7 @@
     ./rofi.nix
   ];
   home.packages = with pkgs; [
+    swaylock-effects
     swayimg
     hyprpaper
     dolphin
@@ -13,6 +14,7 @@
     socat
   ];
   programs.swaylock.settings = {
+    enable = true;
     screenshots = true;
     clock = true;
     indicator = true;
diff --git a/nixos/home-manager/env/sway.nix b/nixos/home-manager/env/sway.nix
index 889e54d6..b31b6808 100644
--- a/nixos/home-manager/env/sway.nix
+++ b/nixos/home-manager/env/sway.nix
@@ -1,7 +1,10 @@
-{ ... }:
+{ pkgs, ... }:
 {
   imports = [ ./common-wayland.nix ];
   #xdg.configFile."sway".source = ./config/sway;
+  home.packages = with pkgs; [
+    brightnessctl
+  ];
   wayland.windowManager.sway = {
     enable = true;
   };
diff --git a/nixos/home-manager/northstar-xenia.nix b/nixos/home-manager/northstar-xenia.nix
index 83ae064c..48e56a91 100644
--- a/nixos/home-manager/northstar-xenia.nix
+++ b/nixos/home-manager/northstar-xenia.nix
@@ -1,9 +1,10 @@
 { ... }: {
   imports = [
     ./env/sway.nix
+    ./env/common-touchinput.nix
     ./packages/env/bash.nix
     ./packages/tui
-    ./packages/gui/browser.nix
+    ./packages/gui/browser-wayland.nix
     ./packages/gui/foot.nix
     ./packages/gui/kitty.nix
   ];