diff --git a/modules/apps/default.nix b/modules/apps/default.nix
index 954f6c1..a231777 100644
--- a/modules/apps/default.nix
+++ b/modules/apps/default.nix
@@ -6,7 +6,6 @@
 }: let
   inherit (lib) mkIf mkForce;
   inherit (config) conf;
-  mkXwlWrapper = import ../niri/xwl-wrapper.nix;
   time = pkgs.makeDesktopItem {
     name = "peaclock-desktop";
     desktopName = "Time";
@@ -94,16 +93,10 @@ in
             fractal
             element-desktop
             papers
+            prusa-slicer
           ]
           ++ [
             time
-          ]
-          ++ [
-            (mkXwlWrapper {
-              pkgs = pkgs;
-              name = "Prusa";
-              pkg = "prusa-slicer";
-            })
           ];
 
         file = {
diff --git a/modules/niri/default.nix b/modules/niri/default.nix
index ed831cd..e959b0f 100644
--- a/modules/niri/default.nix
+++ b/modules/niri/default.nix
@@ -37,8 +37,8 @@ in
 
     home-manager.users.${conf.username} = {
       home.packages = with pkgs; [
-        swayidle
         wl-clipboard
+        xwayland-satellite
       ];
 
       services.swayosd = {
diff --git a/modules/niri/niri.conf.nix b/modules/niri/niri.conf.nix
index 499c809..f75023a 100644
--- a/modules/niri/niri.conf.nix
+++ b/modules/niri/niri.conf.nix
@@ -127,8 +127,13 @@ in {
 
   hotkey-overlay.skip-at-startup = true;
 
+  environment = {
+    DISPLAY = ":3";
+  };
+
   spawn-at-startup = [
     {command = ["waybar"];}
+    {command = ["xwayland-satellite" ":3"];}
   ];
 
   binds = {
diff --git a/modules/niri/sddm.theme.nix b/modules/niri/sddm.theme.nix
deleted file mode 100644
index 146aab2..0000000
--- a/modules/niri/sddm.theme.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{config, ...}: let
-  base = config.theme.base;
-  surface = config.theme.surface;
-  text = config.theme.text;
-in {
-  style = ''
-    [General]
-    # Password mask character
-    passwordCharacter=*
-    # Mask password characters or not ("true" or "false")
-    passwordMask=true
-    # value "1" is all display width, "0.5" is a half of display width etc.
-    passwordInputWidth=0.5
-    # Background color of password input
-    passwordInputBackground=${surface}
-    # Radius of password input corners
-    passwordInputRadius=8
-    # "true" for visible cursor, "false"
-    passwordInputCursorVisible=false
-    # Font size of password (in points)
-    passwordFontSize=96
-    passwordCursorColor=${text}
-    passwordTextColor=
-
-    # Show or not sessions choose label
-    showSessionsByDefault=false
-    # Font size of sessions choose label (in points).
-    sessionsFontSize=24
-
-    # Show or not users choose label
-    showUsersByDefault=false
-    # Font size of users choose label (in points)
-    usersFontSize=48
-
-    # Path to background image
-    background=
-    # Or use just one color
-    backgroundFill=${base}
-    backgroundFillMode=aspect
-
-    # Default text color for all labels
-    basicTextColor=${text}
-
-    # Radius of background blur
-    blurRadius=
-  '';
-}
diff --git a/modules/niri/sddm.wallpaper.png b/modules/niri/sddm.wallpaper.png
deleted file mode 100644
index dd7ba2f..0000000
Binary files a/modules/niri/sddm.wallpaper.png and /dev/null differ
diff --git a/modules/niri/wallpaper.png b/modules/niri/wallpaper.png
deleted file mode 100644
index f0dcd0b..0000000
Binary files a/modules/niri/wallpaper.png and /dev/null differ
diff --git a/modules/niri/xwl-wrapper.nix b/modules/niri/xwl-wrapper.nix
deleted file mode 100644
index 8fe8810..0000000
--- a/modules/niri/xwl-wrapper.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  pkgs,
-  name,
-  pkg ? name,
-  exe ? pkg,
-  ...
-}: let
-  inherit (pkgs.lib) concatStrings;
-  config = pkgs.writeTextFile {
-    name = concatStrings ["i3-config" name];
-    text = ''
-      exec ${pkgs.${pkg}}/bin/${exe}
-    '';
-  };
-in
-  pkgs.makeDesktopItem {
-    name = name;
-    desktopName = name;
-    exec = "${pkgs.xwayland-run}/bin/xwayland-run -- ${pkgs.i3}/bin/i3 -c ${config}";
-  }