diff --git a/modules/home/default.nix b/modules/home/default.nix
index 02ef6ad..fc04e1f 100755
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -31,6 +31,7 @@ in
             obsidian
             libreOffice
             okular
+            zathura
             kolourPaint
             imageViewing
             obsStudio
@@ -166,7 +167,9 @@ in
             scrcpy
             bitwarden
             emote
-            desktop
+            hypr
+            wayland
+            theming
             ;
         };
       };
diff --git a/modules/home/gui/apps/media/docs/docViewing/zathura/default.nix b/modules/home/gui/apps/media/docs/docViewing/zathura/default.nix
new file mode 100644
index 0000000..d6043a0
--- /dev/null
+++ b/modules/home/gui/apps/media/docs/docViewing/zathura/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      zathura
+      ;
+  };
+}
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 94%
rename from modules/home/gui/desktop/hypr/land/config/bind.nix
rename to modules/home/gui/desktop/hypr/land/config/bind-user0.nix
index 5e06db2..485a085 100755
--- a/modules/home/gui/desktop/hypr/land/config/bind.nix
+++ b/modules/home/gui/desktop/hypr/land/config/bind-user0.nix
@@ -1,12 +1,4 @@
-{
-  flake,
-  config,
-  ...
-}:
 let
-  inherit (flake.config.people) user0 user1;
-  user = config.home.username;
-
   superBinds = builtins.map (x: "SUPER, " + x) [
     # Apps
     "Z, exec, obsidian"
@@ -15,7 +7,7 @@ let
     "G, exec, scrcpy"
     "K, exec, ghostty -e nu -e y"
     "S, exec, steam"
-    "R, exec, obs"
+    "R, exec, ghostty -e zellij a dotfiles"
     "N, exec, signal-desktop"
     "T, exec, zeditor"
     "B, exec, floorp"
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 3ec6ec8..c33e346 100755
--- a/modules/home/gui/desktop/hypr/land/default.nix
+++ b/modules/home/gui/desktop/hypr/land/default.nix
@@ -6,10 +6,12 @@
 }:
 let
 
+  inherit (flake.config.people) user0;
+  user = config.home.username;
+
   configPath = ./config;
   configImports = {
     animations = import (configPath + /animations.nix);
-    bind = import (configPath + /bind.nix) { inherit flake config; };
     bindm = import (configPath + /bindm.nix);
     binds = import (configPath + /binds.nix);
     # bindl = import (configPath + /bindl.nix);
@@ -21,6 +23,15 @@ let
     misc = import (configPath + /misc.nix);
     windowrulev2 = import (configPath + /windowrulev2.nix);
     xwayland = import (configPath + /xwayland.nix);
+    bind =
+      let
+        bindConfig =
+          if user == user0 then
+            import (configPath + /bind-user0.nix)
+          else
+            import (configPath + /bind-user1.nix);
+      in
+      bindConfig;
   };
 in
 {
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 6150751..0f37717 100755
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -32,7 +32,8 @@ in
     deimos = {
       imports = builtins.attrValues {
         inherit (modules)
-          gnome
+          hypr
+          wayland
           flatpak
           xserver
           ;