diff --git a/modules/base/starship.nix b/modules/base/starship.nix
index 0a0b38e..0da7519 100644
--- a/modules/base/starship.nix
+++ b/modules/base/starship.nix
@@ -2,7 +2,6 @@
   flake.modules.homeManager.cholli =
     { ... }:
     {
-      catppuccin.starship.enable = false;
       programs = {
         starship = {
           enable = true;
diff --git a/modules/desktop/niri.nix b/modules/desktop/niri.nix
index aff7673..505e118 100644
--- a/modules/desktop/niri.nix
+++ b/modules/desktop/niri.nix
@@ -14,14 +14,12 @@
 
         environment.systemPackages = with pkgs; [
           kitty
-          fuzzel
 
           inputs.niri-flake.packages.${pkgs.system}.xwayland-satellite-unstable
 
           wl-clipboard
           xsel
 
-          waybar
           libnotify
         ];
 
@@ -76,15 +74,33 @@
       }:
       {
         config = lib.mkIf (osConfig.networking.hostName == "yggdrasil" && osConfig.programs.niri.enable) {
+          catppuccin = {
+            flavor = "mocha";
+            accent = "lavender";
+            cursors = {
+              enable = true;
+            };
+
+            fuzzel = {
+              enable = true;
+            };
+
+            mako = {
+              enable = true;
+            };
+          };
+
           services.mako = {
             enable = true;
             settings = {
               border-radius = 15;
-              border-color = "#505050";
-              background-color = "#00000070";
             };
           };
 
+          programs.fuzzel = {
+            enable = true;
+          };
+
           programs.niri.settings = {
             prefer-no-csd = true;
 
@@ -144,6 +160,11 @@
               };
             };
 
+            cursor = {
+              hide-when-typing = true;
+              hide-after-inactive-ms = 10000;
+            };
+
             hotkey-overlay.skip-at-startup = true;
 
             screenshot-path = "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png";
@@ -207,12 +228,25 @@
               {
                 matches = [
                   {
-                    app-id = "1password";
+                    # This matches any subwindow of 1password e.g. the confirmation window for ssh keys
+                    app-id = "1Password";
+                    title = "1Password";
                     is-floating = true;
-                    is-focused = false;
                   }
                 ];
 
+                # this works, the border is drawn correctly
+                border = {
+                  enable = true;
+                  width = 2;
+                  active.color = "#3a9657";
+                  inactive.color = "#dbd11c";
+                };
+
+                #this does not seem to work
+                open-focused = true;
+                open-on-output = "DP-1";
+
               }
               {
                 matches = [
@@ -225,6 +259,18 @@
                 open-on-workspace = "02-steam";
                 open-maximized = true;
               }
+              {
+                matches = [
+                  {
+                    app-id = "obsidian";
+                  }
+                  {
+                    app-id = "teams-for-linux";
+                  }
+                ];
+
+                open-on-workspace = "03-work";
+              }
               {
                 matches = [
                   {
@@ -259,6 +305,7 @@
                 matches = [
                   {
                     app-id = "1Password";
+                    at-startup = true;
                   }
                 ];
 
@@ -460,12 +507,11 @@
             spawn-at-startup = [
               { argv = [ "waybar" ]; }
               { argv = [ "zen-beta" ]; }
-              { argv = [ "steam" ]; }
               { argv = [ "obsidian" ]; }
               { argv = [ "discord" ]; }
               { argv = [ "1password" ]; }
+              { sh = "steam"; }
             ];
-
           };
 
         };