diff --git a/assets/wallpaper.png b/assets/wallpaper.png
new file mode 100644
index 0000000..3c68631
Binary files /dev/null and b/assets/wallpaper.png differ
diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix
index b240099..b5b200a 100644
--- a/hosts/desktop/home.nix
+++ b/hosts/desktop/home.nix
@@ -7,7 +7,6 @@
     ../../modules/home/programs/common.nix
     ../../modules/home/programs/develop.nix
     ../../modules/home/programs/firefox.nix
-    ../../modules/home/programs/kitty.nix
     ../../modules/home/programs/modrinth.nix
     ../../modules/home/programs/neovim
     ../../modules/home/programs/git.nix
diff --git a/hosts/laptop/default.nix b/hosts/laptop/default.nix
index a571c91..bced051 100644
--- a/hosts/laptop/default.nix
+++ b/hosts/laptop/default.nix
@@ -9,11 +9,9 @@
     ../../modules/system/programs/steam.nix
     ../../modules/system/programs/syncthing.nix
     ../../modules/system/programs/thunar.nix
-    ../../modules/system/programs/virtualization.nix
-    ../../modules/system/programs/waydroid.nix
     ../../modules/system/utils/common.nix
     ../../modules/system/utils/docker.nix
-    ../../modules/system/utils/fprint.nix
+#    ../../modules/system/utils/fprint.nix
     ../../modules/system/utils/garbage-collection.nix
     ../../modules/system/utils/locale.nix
   ];
@@ -23,11 +21,6 @@
 
     substituters = [
       "https://nix-community.cachix.org"
-#      "https://cache.nixos.org/"
-    ];
-    trusted-public-keys = [
-#      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-#      "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
     ];
   };
 
diff --git a/hosts/laptop/hardware-configuration.nix b/hosts/laptop/hardware-configuration.nix
index 502f011..6c1a39d 100644
--- a/hosts/laptop/hardware-configuration.nix
+++ b/hosts/laptop/hardware-configuration.nix
@@ -14,18 +14,17 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/e8be61cf-dea9-4a94-a414-38a4246c8a5b";
+    { device = "/dev/disk/by-uuid/4f1908a5-46e5-411e-a8ea-ef97e45337f0";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/0C1D-2896";
+    { device = "/dev/disk/by-uuid/B9AD-ABDC";
       fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
     };
 
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/c6c5b3d7-7d49-4aff-ba91-cb0ac68808a6"; }
-    ];
+  swapDevices = [ ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix
index 83ad5bb..520575a 100644
--- a/hosts/laptop/home.nix
+++ b/hosts/laptop/home.nix
@@ -7,8 +7,6 @@
     ../../modules/home/programs/common.nix
     ../../modules/home/programs/firefox.nix
     ../../modules/home/programs/git.nix
-    ../../modules/home/programs/joplin.nix
-    ../../modules/home/programs/kitty.nix
     ../../modules/home/programs/modrinth.nix
     ../../modules/home/programs/neovim
     ../../modules/home/programs/ssh.nix
diff --git a/modules/home/desktop/hyprland/default.nix b/modules/home/desktop/hyprland/default.nix
index a990c4b..39c4420 100644
--- a/modules/home/desktop/hyprland/default.nix
+++ b/modules/home/desktop/hyprland/default.nix
@@ -2,17 +2,15 @@
 
 {
   imports = [
+#    ./hyprpaper.nix
     ./waybar.nix
-    ./hyprpaper.nix
-    ./hyprlock.nix
     ./fixes.nix
-    ./hypridle.nix
     ./dunst.nix
     ./rofi.nix
   ];
 
   home.packages = with pkgs; [
-    kitty
+    alacritty
     wev
     brightnessctl
     playerctl
@@ -30,7 +28,6 @@
 
       exec-once = [
         "waybar"
-        "hyprpaper"
         "lxqt-policykit-agent"
       ];
 
@@ -70,6 +67,7 @@
 
       misc = {
         vfr = "true";
+        force_default_wallpaper = "0";
       };
 
       xwayland = {
@@ -90,10 +88,11 @@
       ] else [ ];
 
       bind = [
-        "$mod, Q, exec, kitty"
+        "$mod, Q, exec, alacritty"
         "$mod, SPACE, exec, rofi -show drun"
         ",Print, exec, grimblast copy area"
         "$mod,ESCAPE, exec, nwg-bar"
+        "$mod, P, exit"
 
         "$mod, C, killactive"
         "$mod SHIFT, C, exec, hyprctl kill"
diff --git a/modules/home/desktop/hyprland/fixes.nix b/modules/home/desktop/hyprland/fixes.nix
index 8b5c095..f739bb0 100644
--- a/modules/home/desktop/hyprland/fixes.nix
+++ b/modules/home/desktop/hyprland/fixes.nix
@@ -12,8 +12,4 @@
   home.sessionVariables = {
     NIXOS_OZONE_WL = "1";
   };
-
-  programs.bash = {
-    enable = true;
-  };
 }
diff --git a/modules/home/desktop/hyprland/hypridle.nix b/modules/home/desktop/hyprland/hypridle.nix
deleted file mode 100644
index b1e1707..0000000
--- a/modules/home/desktop/hyprland/hypridle.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ inputs, pkgs, lib, hostName, ... }:
-
-{
-  imports = [
-    inputs.hypridle.homeManagerModules.default
-  ];
-
-  services.hypridle = {
-    enable = if hostName == "xv-laptop" then true else false;
-    lockCmd = "pidof ${inputs.hyprlock.packages.${pkgs.system}.hyprlock}/bin/hyprlock || ${inputs.hyprlock.packages.${pkgs.system}.hyprlock}/bin/hyprlock";      # avoid starting multiple hyprlock instances.
-    beforeSleepCmd = "${inputs.hyprlock.packages.${pkgs.system}.hyprlock}/bin/hyprlock";   # lock before suspend.
-    afterSleepCmd = "${pkgs.hyprland}/bin/hyprctl dispatch dpms on"; # to avoid having to press a key twice to turn on the display.
-
-    listeners = [
-      {
-        timeout = 180;                                # 2.5min.
-        onTimeout = "${pkgs.brightnessctl}/bin/brightnessctl -s set 10";         # set monitor backlight to minimum, avoid 0 on OLED monitor.
-        onResume = "${pkgs.brightnessctl}/bin/brightnessctl -r";
-      }
-      {
-        timeout = 300;                                # 5min
-        onTimeout = "${inputs.hyprlock.packages.${pkgs.system}.hyprlock}/bin/hyprlock";
-      }
-      {
-        timeout = 380;                                 # 5.5min
-        onTimeout = "${pkgs.hyprland}/bin/hyprctl dispatch dpms off";        # screen off when timeout has passed
-        onResume = "${pkgs.hyprland}/bin/hyprctl dispatch dpms on";
-      }
-      {
-        timeout = 600;                                # 30min
-        onTimeout = "systemctl suspend";                # suspend pc
-      }
-    ];
-  };
-}
diff --git a/modules/home/desktop/hyprland/hyprlock.nix b/modules/home/desktop/hyprland/hyprlock.nix
deleted file mode 100644
index 0347365..0000000
--- a/modules/home/desktop/hyprland/hyprlock.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ inputs, config, ... }:
-
-{
-  imports = [
-    inputs.hyprlock.homeManagerModules.default
-  ];
-
-  programs.hyprlock = {
-    enable = true;
-    backgrounds = [
-      {
-        monitor = "";
-        path = "$HOME/Pictures/wallpaper-2.png";
-        blur_passes = 1;
-      }
-    ];
-    input-fields = [{
-      monitor = "";
-      size = {
-        width = 400;
-      };
-      fade_on_empty = false;
-      dots_size = 0.3;
-      dots_center = true;
-      outline_thickness = -1;
-      outer_color = "0xff${config.colorScheme.palette.base05}";
-      inner_color = "0xff${config.colorScheme.palette.base00}";
-      font_color = "0xff${config.colorScheme.palette.base05}";
-      placeholder_text = "<i>Press enter for fingerprint</i>";
-      position.x = 0;
-      position.y = -50;
-    }];
-    labels = [{
-      font_size = 80;
-      color = "0xff${config.colorScheme.palette.base06}";
-      position.x = 0;
-      position.y = 250;
-      font_family = "DejaVuSansM Nerd Font Mono";
-      text = "$TIME";
-    }];
-  };
-}
diff --git a/modules/home/desktop/hyprland/hyprpaper.nix b/modules/home/desktop/hyprland/hyprpaper.nix
index 8a95ce3..ca045c8 100644
--- a/modules/home/desktop/hyprland/hyprpaper.nix
+++ b/modules/home/desktop/hyprland/hyprpaper.nix
@@ -1,20 +1,11 @@
-{ pkgs, ... }:
+{ ... }:
 
 {
-  home.packages = with pkgs; [
-    hyprpaper
-  ];
-
-  # https://wallhaven.cc/w/4veopp
-
-  home.file.".config/hypr/hyprpaper.conf" = {
+	services.hyprpaper = {
     enable = true;
-    executable = false;
-    text =''
-      preload = ~/Pictures/wallpaper.png
-
-      wallpaper = ,~/Pictures/wallpaper.png
-      ipc = off
-    '';
+    settings = {
+      preload = [ "~/nix/assets/wallpaper.png"];
+      wallpaper = [ ",~/nix/assets/wallpaper.png"];
+    };
   };
 }
diff --git a/modules/home/programs/alacritty.nix b/modules/home/programs/alacritty.nix
new file mode 100644
index 0000000..738e1d1
--- /dev/null
+++ b/modules/home/programs/alacritty.nix
@@ -0,0 +1,44 @@
+{ config, ... }:
+
+{
+  programs.alacritty = {
+    enable = true;
+    settings = {
+      window = {
+        opacity = 0.8;
+        padding = { x = 10; y = 10; };
+      };
+      colors = {
+        draw_bold_text_with_bright_colors = false;
+        primary = {
+          background = "0x${config.colorScheme.palette.base00}";
+          foreground = "0x${config.colorScheme.palette.base05}";
+        };
+        cursor = {
+          text = "0x${config.colorScheme.palette.base00}";
+          cursor = "0x${config.colorScheme.palette.base05}";
+        };
+        normal = {
+          black = "0x${config.colorScheme.palette.base00}";
+          red = "0x${config.colorScheme.palette.base08}";
+          green = "0x${config.colorScheme.palette.base0B}";
+          yellow = "0x${config.colorScheme.palette.base0A}";
+          blue = "0x${config.colorScheme.palette.base0D}";
+          magenta = "0x${config.colorScheme.palette.base0E}";
+          cyan = "0x${config.colorScheme.palette.base0C}";
+          white = "0x${config.colorScheme.palette.base05}";
+        };
+        bright = {
+          black = "0x${config.colorScheme.palette.base03}";
+          red = "0x${config.colorScheme.palette.base09}";
+          green = "0x${config.colorScheme.palette.base01}";
+          yellow = "0x${config.colorScheme.palette.base02}";
+          blue = "0x${config.colorScheme.palette.base04}";
+          magenta = "0x${config.colorScheme.palette.base06}";
+          cyan = "0x${config.colorScheme.palette.base0F}";
+          white = "0x${config.colorScheme.palette.base07}";
+        };
+      };
+    };
+  };
+}
diff --git a/modules/home/programs/barrier.nix b/modules/home/programs/barrier.nix
deleted file mode 100644
index 043618c..0000000
--- a/modules/home/programs/barrier.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ pkgs, hostName, ... }:
-
-{
-  services.barrier.client =
-    if hostName == "xv-desktop"
-    then {
-      enable = false;
-    }
-    else { enable = true; };
-
-
-  home.packages = if hostName == "xv-desktop" then with pkgs; [
-    barrier
-  ] else [];
-}
diff --git a/modules/home/programs/common.nix b/modules/home/programs/common.nix
index f11a584..83877d5 100644
--- a/modules/home/programs/common.nix
+++ b/modules/home/programs/common.nix
@@ -1,6 +1,13 @@
 { pkgs, ...}:
 
 {
+  imports = [
+    ./alacritty.nix
+    ./helix.nix
+    ./librewolf.nix
+    ./shell.nix
+  ];
+
   home.packages = with pkgs; [
     libreoffice
     onlyoffice-bin
@@ -10,11 +17,7 @@
     unstable.localsend
     bitwarden
     pavucontrol
-    unstable.youtube-music
-    unstable.organicmaps
     unstable.cubiomes-viewer
-    bottles
-    sshfs
     unstable.yt-dlp
 
     # Image editing
diff --git a/modules/home/programs/helix.nix b/modules/home/programs/helix.nix
new file mode 100644
index 0000000..247bd27
--- /dev/null
+++ b/modules/home/programs/helix.nix
@@ -0,0 +1,103 @@
+{ config, pkgs, ... }:
+
+{
+  programs.helix = {
+    enable = true;
+    package = pkgs.unstable.helix;
+    defaultEditor = true;
+    settings = {
+      theme = "base16";
+    };
+    themes = {
+      base16 = let
+        base00 = "#${config.colorScheme.palette.base00}";
+        base01 = "#${config.colorScheme.palette.base01}";
+        base02 = "#${config.colorScheme.palette.base02}";
+        base03 = "#${config.colorScheme.palette.base03}";
+        base04 = "#${config.colorScheme.palette.base04}";
+        base05 = "#${config.colorScheme.palette.base05}";
+        base06 = "#${config.colorScheme.palette.base06}";
+        base07 = "#${config.colorScheme.palette.base07}";
+        base08 = "#${config.colorScheme.palette.base08}";
+        base09 = "#${config.colorScheme.palette.base09}";
+        base0A = "#${config.colorScheme.palette.base0A}";
+        base0B = "#${config.colorScheme.palette.base0B}";
+        base0C = "#${config.colorScheme.palette.base0C}";
+        base0D = "#${config.colorScheme.palette.base0D}";
+        base0E = "#${config.colorScheme.palette.base0E}";
+        base0F = "#${config.colorScheme.palette.base0F}";
+      in  {
+        "attributes" = base09;
+        "comment" = { fg = base03; modifiers = ["italic"]; };
+        "constant" = base09;
+        "constant.character.escape" = base0C;
+        "constant.numeric" = base09;
+        "constructor" = base0D;
+        "debug" = base03;
+        "diagnostic" = { modifiers = ["underlined"]; };
+        "diff.delta" = base09;
+        "diff.minus" = base08;
+        "diff.plus" = base0B;
+        "error" = base08;
+        "function" = base0D;
+        "hint" = base03;
+        "info" = base0D;
+        "keyword" = base0E;
+        "label" = base0E;
+        "namespace" = base0E;
+        "operator" = base05;
+        "special" = base0D;
+        "string"  = base0B;
+        "type" = base0A;
+        "variable" = base08;
+        "variable.other.member" = base0B;
+        "warning" = base09;
+
+        "markup.bold" = { fg = base0A; modifiers = ["bold"]; };
+        "markup.heading" = base0D;
+        "markup.italic" = { fg = base0E; modifiers = ["italic"]; };
+        "markup.link.text" = base08;
+        "markup.link.url" = { fg = base09; modifiers = ["underlined"]; };
+        "markup.list" = base08;
+        "markup.quote" = base0C;
+        "markup.raw" = base0B;
+        "markup.strikethrough" = { modifiers = ["crossed_out"]; };
+
+        "diagnostic.hint" = { underline = { style = "curl"; }; };
+        "diagnostic.info" = { underline = { style = "curl"; }; };
+        "diagnostic.warning" = { underline = { style = "curl"; }; };
+        "diagnostic.error" = { underline = { style = "curl"; }; };
+
+#        "ui.background" = { bg = base00; };
+        "ui.bufferline.active" = { fg = base00; bg = base03; modifiers = ["bold"]; };
+        "ui.bufferline" = { fg = base04; bg = base00; };
+        "ui.cursor" = { fg = base0A; modifiers = ["reversed"]; };
+        "ui.cursor.insert" = { fg = base0A; modifiers = ["reversed"]; };
+        "ui.cursorline.primary" = { fg = base05; bg = base01; };
+        "ui.cursor.match" = { fg = base0A; modifiers = ["reversed"]; };
+        "ui.cursor.select" = { fg = base0A; modifiers = ["reversed"]; };
+        "ui.gutter" = { bg = base00; };
+        "ui.help" = { fg = base06; bg = base01; };
+        "ui.linenr" = { fg = base03; bg = base00; };
+        "ui.linenr.selected" = { fg = base04; bg = base01; modifiers = ["bold"]; };
+        "ui.menu" = { fg = base05; bg = base01; };
+        "ui.menu.scroll" = { fg = base03; bg = base01; };
+        "ui.menu.selected" = { fg = base01; bg = base04; };
+        "ui.popup" = { bg = base01; };
+        "ui.selection" = { bg = base02; };
+        "ui.selection.primary" = { bg = base02; };
+        "ui.statusline" = { fg = base04; bg = base01; };
+        "ui.statusline.inactive" = { bg = base01; fg = base03; };
+        "ui.statusline.insert" = { fg = base00; bg = base0B; };
+        "ui.statusline.normal" = { fg = base00; bg = base03; };
+        "ui.statusline.select" = { fg = base00; bg = base0F; };
+        "ui.text" = base05;
+        "ui.text.focus" = base05;
+        "ui.virtual.indent-guide" = { fg = base03; };
+        "ui.virtual.inlay-hint" = { fg = base01; };
+        "ui.virtual.ruler" = { bg = base01; };
+        "ui.window" = { bg = base01; };
+      };
+    };
+  };
+}
diff --git a/modules/home/programs/joplin.nix b/modules/home/programs/joplin.nix
deleted file mode 100644
index 0d9896e..0000000
--- a/modules/home/programs/joplin.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ pkgs, ... }:
-
-{
-  home.packages = with pkgs; [
-    unstable.joplin-desktop
-  ];
-}
diff --git a/modules/home/programs/librewolf.nix b/modules/home/programs/librewolf.nix
new file mode 100644
index 0000000..913e507
--- /dev/null
+++ b/modules/home/programs/librewolf.nix
@@ -0,0 +1,12 @@
+{ ... }:
+
+{
+  programs.librewolf = {
+    enable = true;
+    settings = {
+      "webgl.disabled" = false;
+      "privacy.resistFingerprinting" = false;
+      "privacy.clearOnShutdown.cookies" = false;
+    };
+  };
+}
diff --git a/modules/home/programs/shell.nix b/modules/home/programs/shell.nix
new file mode 100644
index 0000000..0d40fab
--- /dev/null
+++ b/modules/home/programs/shell.nix
@@ -0,0 +1,35 @@
+{ pkgs, ... }:
+
+{
+  home.packages = with pkgs; [
+    eza    
+    bat
+  ];
+
+  home.shellAliases = {
+    ls = "eza";   
+  };
+
+  programs.bash = {
+    enable = true;
+  };
+
+  programs.zellij = {
+    enable = true;
+    enableBashIntegration = true;
+  };
+
+  home.file.zellij = {
+    target = ".config/zellij/config.kdl";
+    text = ''
+      pane_frames false
+      default_layout "compact"
+      keybinds {
+        normal {
+          bind "Ctrl e" { ToggleFloatingPanes; SwitchToMode "normal"; }
+        }
+      }
+    '';
+  };
+
+}
diff --git a/modules/system/desktop/hyprland.nix b/modules/system/desktop/hyprland.nix
index de06ffd..d1987b8 100644
--- a/modules/system/desktop/hyprland.nix
+++ b/modules/system/desktop/hyprland.nix
@@ -3,6 +3,7 @@
 {
   programs.hyprland = {
     enable = true;
+    package = pkgs.unstable.hyprland;
     xwayland.enable = true;
   };
 
diff --git a/modules/system/desktop/plasma.nix b/modules/system/desktop/plasma.nix
deleted file mode 100644
index 7460d48..0000000
--- a/modules/system/desktop/plasma.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ ... }:
-
-{
-  services.xserver.enable = true;
-  services.xserver.displayManager.sddm.enable = true;
-  services.xserver.desktopManager.plasma5.enable = true;
-
-  sound.enable = true;
-  hardware.pulseaudio.enable = false;
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-  };
-
-  programs.dconf.enable = true;
-}
diff --git a/modules/system/programs/sunshine.nix b/modules/system/programs/sunshine.nix
deleted file mode 100644
index 405a3a6..0000000
--- a/modules/system/programs/sunshine.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ pkgs, ... }:
-
-{
-  environment.systemPackages = with pkgs; [
-    unstable.sunshine
-  ];
-
-  services.udev.extraRules = ''
-    KERNEL=="uinput", SUBSYSTEM=="misc", OPTIONS+="static_node=uinput", TAG+="uaccess"
-  '';
-
-  services.avahi = {
-    enable = true;
-  };
-
-  networking.firewall = {
-    allowedTCPPorts = [ 48010 ];
-    allowedTCPPortRanges = [
-      { from = 47984; to = 47990; }
-    ];
-    allowedUDPPortRanges = [
-      { from = 47998; to = 48000; }
-    ];
-  };
-}
diff --git a/modules/system/programs/syncthing.nix b/modules/system/programs/syncthing.nix
index ecc7fa8..a095567 100644
--- a/modules/system/programs/syncthing.nix
+++ b/modules/system/programs/syncthing.nix
@@ -24,10 +24,6 @@
           path = "/home/xeovalyte/Documents";
           devices = [ "xv-server" ];
         };
-        "xeovalyte-logseq" = {
-          path = "/home/xeovalyte/Logseq";
-          devices = [ "xv-server" ];
-        };
       };
     };
   };
diff --git a/modules/system/programs/waydroid.nix b/modules/system/programs/waydroid.nix
deleted file mode 100644
index c194c51..0000000
--- a/modules/system/programs/waydroid.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ ... }:
-
-{
-  virtualisation.waydroid.enable = true;
-}