diff --git a/assets/wallpaper-2-blurred.png b/assets/wallpaper-2-blurred.png
new file mode 100644
index 0000000..318c8dd
Binary files /dev/null and b/assets/wallpaper-2-blurred.png differ
diff --git a/modules/home/desktop-environments/niri/default.nix b/modules/home/desktop-environments/niri/default.nix
index 0231e67..64b2e37 100644
--- a/modules/home/desktop-environments/niri/default.nix
+++ b/modules/home/desktop-environments/niri/default.nix
@@ -18,6 +18,8 @@ in {
   imports = [
     inputs.niri.homeModules.niri
     ./waybar.nix
+    ./mako.nix
+    ./swww.nix
   ];
 
   config = mkIf cfg.enable {
@@ -70,7 +72,10 @@ in {
     programs.niri.settings.spawn-at-startup = [
       { command = ["vesktop"]; }
       { command = ["thunderbird"]; }
+      { command = ["xwayland-satellite" ":10"]; }
     ];
+
+    programs.niri.settings.environment.DISPLAY = ":10";
     
     programs.niri.settings.window-rules = [
       {
@@ -82,6 +87,16 @@ in {
       }
     ];
 
+    # Configure overview
+    programs.niri.settings.layer-rules = [
+      {
+        matches = [
+          { namespace = "wallpaper"; }
+        ];
+        place-within-backdrop = true;
+      }
+    ];
+
     programs.niri.settings.binds = with config.lib.niri.actions; {
       "Mod+Shift+Slash".action = show-hotkey-overlay;
 
diff --git a/modules/home/desktop-environments/niri/mako.nix b/modules/home/desktop-environments/niri/mako.nix
new file mode 100644
index 0000000..4670fd2
--- /dev/null
+++ b/modules/home/desktop-environments/niri/mako.nix
@@ -0,0 +1,21 @@
+{ config, pkgs, lib, inputs, ... }:
+
+with lib;
+
+let
+  cfg = config.settings.desktop-environments.niri.mako;
+in {
+  options = {
+    settings.desktop-environments.niri.mako.enable = lib.mkOption {
+      type = lib.types.bool;
+      description = ''
+        Enable mako notifiaction deamon
+      '';
+      default = config.settings.desktop-environments.niri.enable;
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.mako.enable = true;
+  };
+}
diff --git a/modules/home/desktop-environments/niri/swww.nix b/modules/home/desktop-environments/niri/swww.nix
new file mode 100644
index 0000000..331441b
--- /dev/null
+++ b/modules/home/desktop-environments/niri/swww.nix
@@ -0,0 +1,56 @@
+{ config, pkgs, lib, inputs, ... }:
+
+with lib;
+
+let
+  cfg = config.settings.desktop-environments.niri.swww;
+in {
+  options = {
+    settings.desktop-environments.niri.swww.enable = lib.mkOption {
+      type = lib.types.bool;
+      description = ''
+        Enable swww wallpapers deamon
+      '';
+      default = config.settings.desktop-environments.niri.enable;
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [
+      swww
+      swaybg
+    ];
+
+    systemd.user.services.swaybg = {
+      Unit = {
+        After = [ "graphical-session.target" ];
+        PartOf = [ "graphical-session.target" ];
+        Requisite = [ "graphical-session.target" ];
+        Description = "Enable swaybg wallpaper management";
+      };
+      Install = {
+        WantedBy = [ "niri.service"];
+      };
+      Service = {
+          ExecStart = ''${pkgs.swaybg}/bin/swaybg -m fill -i "%h/nix/assets/wallpaper-2-blurred.png"'';
+          Restart = ''on-failure'';
+      };
+    };
+
+    systemd.user.services.swww = {
+      Unit = {
+        After = [ "graphical-session.target" ];
+        PartOf = [ "graphical-session.target" ];
+        Requisite = [ "graphical-session.target" ];
+        Description = "Enable swww wallpaper management";
+      };
+      Install = {
+        WantedBy = [ "niri.service"];
+      };
+      Service = {
+          ExecStart = ''${pkgs.swww}/bin/swww-daemon'';
+          Restart = ''on-failure'';
+      };
+    };
+  };
+}
diff --git a/modules/home/desktop-environments/niri/waybar.nix b/modules/home/desktop-environments/niri/waybar.nix
index 56bed5d..064aa28 100644
--- a/modules/home/desktop-environments/niri/waybar.nix
+++ b/modules/home/desktop-environments/niri/waybar.nix
@@ -61,6 +61,10 @@ in {
         padding: 0 5px;
       }
 
+      window#waybar {
+        background: rgba(0,0,0,0.4);
+      }
+
       #workspaces button.active {
         border-bottom: 2px solid @base05;
       }
diff --git a/modules/home/theming/stylix.nix b/modules/home/theming/stylix.nix
index ba285b7..0c9998b 100644
--- a/modules/home/theming/stylix.nix
+++ b/modules/home/theming/stylix.nix
@@ -42,7 +42,16 @@ in {
     stylix.base16Scheme = lib.mkIf (cfg.theme != "theme") "${pkgs.base16-schemes}/share/themes/${cfg.theme}.yaml";
 
     stylix.autoEnable = true;
-    # stylix.opacity.terminal = 0.9;
+
+    stylix.fonts.monospace = {
+      package = pkgs.nerd-fonts.dejavu-sans-mono;
+      name = "DejaVuSansM Nerd Font Mono";
+    };
+
+    # stylix.fonts.monospace = {
+    #   package = pkgs.dejavu_fonts;
+    #   name = "DejaVu Sans Mono";
+    # };
 
     stylix.cursor = {
       package = pkgs.phinger-cursors;