diff --git a/modules/home/default.nix b/modules/home/default.nix
index 550bdad..0cd5aaf 100755
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -60,14 +60,15 @@ in
             usbImager
             virtManager
             # polychromatic
+            dolphin
             espanso
             claudeCode
             jamesDsp
             zoom
             academic
-            hypr
+            # hypr
             # niri
-            wayland
+            # wayland
             theming
             ;
         };
diff --git a/modules/home/gui/apps/tools/nautilus/default.nix b/modules/home/gui/apps/tools/nautilus/default.nix
deleted file mode 100644
index 033b204..0000000
--- a/modules/home/gui/apps/tools/nautilus/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  pkgs,
-  ...
-}:
-{
-  home.packages = builtins.attrValues {
-    inherit (pkgs)
-      nautilus
-      sushi
-      ;
-  };
-}
diff --git a/modules/home/gui/desktop/hypr/land/config/bind.nix b/modules/home/gui/desktop/hypr/land/config/bind-user0.nix
similarity index 93%
rename from modules/home/gui/desktop/hypr/land/config/bind.nix
rename to modules/home/gui/desktop/hypr/land/config/bind-user0.nix
index a6b5eaa..ec09490 100755
--- a/modules/home/gui/desktop/hypr/land/config/bind.nix
+++ b/modules/home/gui/desktop/hypr/land/config/bind-user0.nix
@@ -2,16 +2,17 @@ let
   superBinds = builtins.map (x: "SUPER, " + x) [
     # Apps
     "Z, exec, obsidian"
+    "L, exec, slack"
     "H, exec, feishin"
     "G, exec, scrcpy"
-    "L, exec, thunar"
+    "K, exec, ghostty -e nu -e y"
     "S, exec, steam"
     "R, exec, ghostty -e zellij a dotfiles"
     "N, exec, signal-desktop"
     "T, exec, zeditor"
     "B, exec, floorp"
     "X, exec, freetube"
-    "V, exec, vesktop"
+    "V, exec, discordcanary"
     "M, exec, element-desktop"
     "D, exec, ghostty"
     "P, exec, bitwarden"
@@ -34,7 +35,7 @@ let
     "PageUp, exec, playerctl next"
     "PageDown, exec, playerctl previous"
     "Home, exec, playerctl play-pause"
-    "Space, exec, fuzzel"
+    "Space, exec, rm -r /home/$USER/.cache/tofi* ; tofi-drun"
   ];
 
   superShiftBinds = builtins.map (x: "SUPER SHIFT, " + x) [
diff --git a/modules/home/gui/desktop/hypr/land/config/bind-user1.nix b/modules/home/gui/desktop/hypr/land/config/bind-user1.nix
new file mode 100755
index 0000000..ca6a4c7
--- /dev/null
+++ b/modules/home/gui/desktop/hypr/land/config/bind-user1.nix
@@ -0,0 +1,91 @@
+let
+  superBinds = builtins.map (x: "SUPER, " + x) [
+    # Apps
+    "B, exec, brave"
+    "E, exec, ghostty -e nu -e y"
+    "S, exec, steam"
+    "N, exec, signal-desktop"
+    "D, exec, discordcanary"
+    "R, exec, flatpak run org.vinegarhq.Sober"
+    "T, exec, ghostty"
+    "P, exec, spotify"
+    "M, exec, prismlauncher"
+    "J, exec, jellyfinmediaplayer"
+    "L, exec, lutris"
+    # Workspaces
+    "1, workspace, 1"
+    "2, workspace, 2"
+    "3, workspace, 3"
+    "4, workspace, 4"
+    "5, workspace, 5"
+    # Windows
+    "X, killactive"
+    "bracketright, splitratio, 0.33"
+    "bracketleft, splitratio, -0.33"
+    "Tab, fullscreen, 0"
+    "F, togglefloating"
+    # Window Focus
+    "left, movefocus, l"
+    "up, movefocus, u"
+    "down, movefocus, d"
+    "right, movefocus, r"
+    # Audio
+    "PageUp, exec, playerctl next"
+    "PageDown, exec, playerctl previous"
+    "Home, exec, playerctl play-pause"
+    "Space, exec, rm -r /home/$USER/.cache/tofi* ; tofi-drun"
+  ];
+
+  superShiftBinds = builtins.map (x: "SUPER SHIFT, " + x) [
+    # Super+shift binds
+    # Window Move
+    "left, movewindow, l"
+    "up, movewindow, u"
+    "down, movewindow, d"
+    "right, movewindow, r"
+    # Quick Action
+    "S, exec, flameshot gui"
+    "period, exec, emote"
+    "Backspace, layoutmsg, togglesplit"
+    "P, pin, enable"
+    # "Print, exec, grim -g \"$(slurp)\""
+    # Utility
+    "End, exec, shutdown now"
+    "Insert, exec, systemctl reboot"
+    "Home, exec, swaylock"
+    "1, movetoworkspacesilent, 1"
+    "2, movetoworkspacesilent, 2"
+    "3, movetoworkspacesilent, 3"
+    "4, movetoworkspacesilent, 4"
+    "5, movetoworkspacesilent, 5"
+  ];
+  superCtrlBinds = builtins.map (x: "SUPER CTRL, " + x) [
+    # Super+shift binds
+  ];
+
+  altBinds = builtins.map (x: "ALT, " + x) [
+    # Alt binds
+  ];
+
+  shiftBinds = builtins.map (x: "SHIFT, " + x) [
+    # Shift binds
+  ];
+
+  ctrlBinds = builtins.map (x: "CTRL, " + x) [
+    # Ctrl binds
+  ];
+
+  ctrlShiftBinds = builtins.map (x: "CTRL SHIFT, " + x) [
+    # Ctrl+shift binds
+    # "End, exec, shutdown now"
+  ];
+in
+superBinds
+++ superShiftBinds
+++ superCtrlBinds
+++ altBinds
+++ ctrlBinds
+++ ctrlShiftBinds
+++ shiftBinds
+# Docs
+# https://wiki.hyprland.org/Getting-Started/Master-Tutorial/
diff --git a/modules/home/gui/desktop/hypr/land/default.nix b/modules/home/gui/desktop/hypr/land/default.nix
index 8325eb1..018f359 100755
--- a/modules/home/gui/desktop/hypr/land/default.nix
+++ b/modules/home/gui/desktop/hypr/land/default.nix
@@ -1,13 +1,17 @@
 {
   flake,
   config,
+  pkgs,
   ...
 }:
 let
+
+  inherit (flake.config.people) user1;
+  user = config.home.username;
+
   configPath = ./config;
   configImports = {
     animations = import (configPath + /animations.nix);
-    bind = import (configPath + /bind.nix);
     bindm = import (configPath + /bindm.nix);
     binds = import (configPath + /binds.nix);
     # bindl = import (configPath + /bindl.nix);
@@ -20,6 +24,15 @@ let
     windowrulev2 = import (configPath + /windowrulev2.nix);
     xwayland = import (configPath + /xwayland.nix);
     monitor = import (configPath + /monitor.nix);
+    bind =
+      let
+        bindConfig =
+          if user == user1 then
+            import (configPath + /bind-user1.nix)
+          else
+            import (configPath + /bind-user0.nix);
+      in
+      bindConfig;
   };
 in
 {
diff --git a/modules/home/gui/desktop/niri/default.nix b/modules/home/gui/desktop/niri/default.nix
index 03ad4b6..e076fd4 100755
--- a/modules/home/gui/desktop/niri/default.nix
+++ b/modules/home/gui/desktop/niri/default.nix
@@ -2,7 +2,6 @@
   config,
   flake,
   pkgs,
-  lib,
   ...
 }:
 let
@@ -39,11 +38,6 @@ in
         workspace4 = "extra";
       in
       {
-        # environment = {
-        #   QT_QPA_PLATFORM = "wayland";
-        #   DISPLAY = null;
-        # };
-
         prefer-no-csd = true;
 
         cursor = {
@@ -56,7 +50,7 @@ in
         };
 
         spawn-at-startup = [
-          # { command = [ "xwayland-satellite" ]; }
+          { command = [ "swaylock" ]; }
           { command = [ "wl-clipboard" ]; }
           { command = [ "wpaperd" ]; }
           { command = [ "gammastep" ]; }
@@ -150,9 +144,9 @@ in
           # "Super+Enter".action = niri.toggle-overview;
 
           "Super+1".action = niri.focus-workspace workspace0;
-          "Super+4".action = niri.focus-workspace workspace1;
+          "Super+2".action = niri.focus-workspace workspace1;
           "Super+3".action = niri.focus-workspace workspace2;
-          "Super+2".action = niri.focus-workspace workspace3;
+          "Super+4".action = niri.focus-workspace workspace3;
           "Super+5".action = niri.focus-workspace workspace4;
 
           "Super+c".action = niri.focus-column-or-monitor-left;
@@ -297,7 +291,6 @@ in
             open-on-workspace = workspace3;
           }
           {
-            # opacity = 0.90;
             clip-to-geometry = true;
             focus-ring.enable = false;
             geometry-corner-radius =
@@ -314,22 +307,16 @@ in
         ];
 
         layout = {
-          # always-center-single-column = true;
           default-column-width = {
             proportion = 0.5;
           };
-          preset-column-widths = [
-            { proportion = 1. / 3.; }
-            { proportion = 1. / 2.; }
-            { proportion = 2. / 3.; }
-          ];
           border = {
             enable = true;
             width = 2;
             active.color = makeColour el.base0E;
             inactive.color = makeColour el.base02;
           };
-          gaps = 5;
+          gaps = 10;
           shadow = {
             enable = true;
             color = el.base11;
@@ -359,9 +346,5 @@ in
         };
       };
   };
-  # home.packages = builtins.attrValues {
-  #   inherit (pkgs)
-  #     xwayland-satellite
-  #     ;
-  # };
+
 }
diff --git a/modules/home/gui/desktop/wayland/waybar/config/settings.nix b/modules/home/gui/desktop/wayland/waybar/config/settings.nix
index 7dccbd1..5c03305 100755
--- a/modules/home/gui/desktop/wayland/waybar/config/settings.nix
+++ b/modules/home/gui/desktop/wayland/waybar/config/settings.nix
@@ -12,12 +12,13 @@ in
     margin-left = 5;
     margin-right = 5;
     modules-left = [
-      "custom/launcher"
-      "hyprland/workspaces"
+      "custom/weather"
+      # "niri/workspaces"
     ];
 
     modules-center = [
-      "custom/weather"
+      # "custom/launcher"
+      "clock"
     ];
 
     modules-right = [
@@ -29,7 +30,7 @@ in
       "pulseaudio"
       # "network"
       "battery"
-      "clock"
+      # "clock"
     ];
 
     clock = {
@@ -44,33 +45,24 @@ in
       format-alt = " {:%d/%m}";
     };
 
-    "hyprland/workspaces" = {
-      active-only = false;
-      disable-scroll = true;
-      format = "{icon}";
-      on-click = "activate";
-      format-icons = {
-        "1" = "◉";
-        "2" = "◉";
-        "3" = "◉";
-        "4" = "◉";
-        "5" = "◉";
-        urgent = "";
-        default = "◉";
-        sort-by-number = true;
-      };
-      persistent-workspaces = {
-        "1" = [ ];
-        "2" = [ ];
-        "3" = [ ];
-        "4" = [ ];
-        "5" = [ ];
-      };
-    };
+    # "niri/workspaces" = {
+    #   active-only = false;
+    #   disable-scroll = true;
+    #   format = "{icon}";
+    #   on-click = "activate";
+    #   format-icons = {
+    #     # focused = "◉";
+    #     # active = "◉";
+    #     # empty = "◯";
+    #     # urgent = "";
+    #     # default = "◯";
+    #     # sort-by-number = true;
+    #   };
+    # };
 
     memory = {
-      format = " {}%";
-      format-alt = " {used} GiB"; # 
+      format = "󰟜 {}%";
+      format-alt = "󰟜 {used} GiB"; # 
       interval = 2;
     };
 
@@ -123,7 +115,8 @@ in
     };
     "custom/launcher" = {
       format = "";
-      on-click = "fuzzel";
+      on-click = "rm -r /home/$USER/.cache/tofi* ; tofi-drun";
+      # on-click-right = "pkill tofi || wallpaper-picker";
       tooltip = false;
     };
 
diff --git a/modules/home/gui/desktop/wayland/waybar/config/style.nix b/modules/home/gui/desktop/wayland/waybar/config/style.nix
index e062be9..c46b407 100755
--- a/modules/home/gui/desktop/wayland/waybar/config/style.nix
+++ b/modules/home/gui/desktop/wayland/waybar/config/style.nix
@@ -41,7 +41,7 @@ in
 ''
 
   * {
-      min-height: 34px;
+      min-height: 30px;
       border-radius: 0;
       font-family: ${custom.font};
       font-weight: ${custom.font_weight};
@@ -58,20 +58,22 @@ in
 
   #workspaces {
       font-size: 18px;
-      padding-left: 5px;
-      margin-bottom: 0px;
+      padding-left: 15px;
+      margin-bottom: 2px;
   }
   #workspaces button {
       color: #${custom.button_color};
-      padding: 0px 5px 0px 5px;
-      opacity: ${custom.opacityBt};
-  }
-  #workspaces button.empty {
-      color: #${custom.background_3};
+      padding: 5px 0px 5px 0px;
   }
   #workspaces button.active {
       color: #${custom.text_color};
   }
+  #workspaces button.empty {
+      color: #${custom.button_color};
+  }
+  #workspaces button.focused {
+      color: #${custom.text_color};
+  }
 
   #tray, #pulseaudio, #privacy, #cpu, #memory, #disk, #clock {
       font-size: ${custom.font_size};
@@ -98,6 +100,7 @@ in
   }
 
   #clock {
+      font-size: 14px;
   }
 
   #battery {
@@ -118,5 +121,6 @@ in
       font-size: 14px;
       color: #${custom.text_color};
       font-weight: ${custom.font_weight};
+      padding-left: 10px;
   }
 ''
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 0e0004b..716d325 100755
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -10,12 +10,13 @@ in
           mullvad
           syncthing
           ollama
-          # plasma
+          plasma
           sddm
-          hypr
+          # hypr
           # niri
-          wayland
+          # wayland
           searx
+          portals
           xserver
           flatpak
           wireGuard
diff --git a/modules/nixos/desktop/sddm/default.nix b/modules/nixos/desktop/sddm/default.nix
index c65f22f..31fd7d8 100755
--- a/modules/nixos/desktop/sddm/default.nix
+++ b/modules/nixos/desktop/sddm/default.nix
@@ -1,26 +1,10 @@
-{ pkgs, flake, ... }:
-let
-  inherit (flake.config.aesthetics.themes) fonts;
-in
 {
   services = {
     displayManager = {
       sddm = {
         enable = true;
-        enableHidpi = true;
-        theme = "catppuccin-mocha";
+        wayland.enable = true;
       };
     };
   };
-  environment = {
-    systemPackages = [
-      (pkgs.catppuccin-sddm.override {
-        flavor = "mocha";
-        font = "${fonts.names.name0}";
-        fontSize = "${toString fonts.sizes.desktop.size0}";
-        loginBackground = true;
-      })
-    ];
-  };
-
 }
diff --git a/modules/nixos/desktop/wayland/portals/default.nix b/modules/nixos/desktop/wayland/portals/default.nix
index 0a99cee..9b2ab45 100755
--- a/modules/nixos/desktop/wayland/portals/default.nix
+++ b/modules/nixos/desktop/wayland/portals/default.nix
@@ -5,23 +5,12 @@
   xdg = {
     portal = {
       enable = true;
-      config = {
-        niri = {
-          default = [
-            "wlr"
-            "gtk"
-            "gnome"
-          ];
-        };
-      };
-
       wlr.enable = true;
       config.common.default = "*";
       xdgOpenUsePortal = true;
       extraPortals = builtins.attrValues {
         inherit (pkgs)
           xdg-desktop-portal-gtk
-          xdg-desktop-portal-gnome
           # xdg-desktop-portal-hyprland
           xdg-desktop-portal-wlr
           ;
diff --git a/systems/mars/config/filesystem.nix b/systems/mars/config/filesystem.nix
index 7c21811..d6c0475 100755
--- a/systems/mars/config/filesystem.nix
+++ b/systems/mars/config/filesystem.nix
@@ -67,11 +67,11 @@ in
     in
     {
       "/" = {
-        device = "/dev/disk/by-uuid/6328deb2-075a-471e-8396-459921a82832";
+        device = "/dev/disk/by-uuid/1de87c26-c123-44c0-9c9b-6d2480bdeb7d";
         fsType = "ext4";
       };
       "/boot" = {
-        device = "/dev/disk/by-uuid/6152-9BBC";
+        device = "/dev/disk/by-uuid/6A1F-3641";
         fsType = "vfat";
         options = mars.boot.options;
       };
@@ -83,7 +83,7 @@ in
     ));
 
   swapDevices = [
-    { device = "/dev/disk/by-uuid/c8839bac-980b-4b24-9c36-504965acc964"; }
+    { device = "/dev/disk/by-uuid/8b1d43a7-baf8-4d15-a1ad-dc0c9dda6970"; }
   ];
 
   systemd.tmpfiles.rules = [