diff --git a/home-manager/home.nix b/home-manager/home.nix
index c6bd06d..2c7f71f 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -11,7 +11,7 @@
     ./hyprland.nix
     ./waybar.nix
     ./swaync.nix
-    ./hyprlock.nix
+    ./swaylock.nix
     ./fish.nix
     ./eza.nix
     ./nvf.nix
diff --git a/home-manager/hyprland.nix b/home-manager/hyprland.nix
deleted file mode 100644
index 5912de6..0000000
--- a/home-manager/hyprland.nix
+++ /dev/null
@@ -1,134 +0,0 @@
-{ ... }:
-{
-  # Enable Hyprland compositor
-  wayland.windowManager.hyprland = {
-    enable = true;
-    xwayland.enable = true;
-    systemd.variables = [ "--all" ];
-    settings = {
-      misc = {
-        enable_anr_dialog = false; # disable application not repsonding dialog as it tends to just get in the way when trying to fix the unresponsive application
-      };
-      # Monitor config for home desk layout
-      monitor = [
-        "eDP-2, 2560x1600@165, 0x0, auto" # main laptop monitor
-        "desc:Lenovo Group Limited LEN G24-10 U5B4ZAM2, 1920x1080@119.98, 960x-1080, auto" # left external monitor
-        "desc:Lenovo Group Limited LEN G24-10 U5B4KL78, 1920x1080@119.98, -960x-1080, auto" # right external monitor
-        ", preferred, auto-center-up, 1" # any other monitors get added centrally above, this is meant for TVs really
-      ];
-      workspace = [
-        "name:bg_noise, monitor:desc:Lenovo Group Limited LEN G24-10 U5B4ZAM2, default:true, persistent:true"
-        "name:comms, monitor:desc:Lenovo Group Limited LEN G24-10 U5B4KL78, default:true, persistent:true"
-        "name:main, monitor:eDP-2, default:true, persistent:true"
-      ];
-      windowrulev2 = [
-        "keepaspectratio,class:^(librewolf)$,title:^(Picture-in-Picture)$"
-        "noborder,class:^(librewolf)$,title:^(Picture-in-Picture)$"
-        #"fakefullscreen,class:^(librewolf)$,title:^(Floorp)$"
-        #"fakefullscreen,class:^(librewolf)$,title:^(Picture-in-Picture)$"
-        "pin,class:^(librewolf)$,title:^(Floorp)$"
-        "pin,class:^(librewolf)$,title:^(Picture-in-Picture)$"
-        "float,class:^(librewolf)$,title:^(Floorp)$"
-        "float,class:^(librewolf)$,title:^(Picture-in-Picture)$"
-      ];
-
-      # Define SUPER key as mod key
-      "$mod" = "SUPER";
-
-      # Set keyboard layout
-      input = {
-        kb_layout = "gb";
-        follow_mouse = 1;
-        mouse_refocus = false;
-        touchpad = {
-          disable_while_typing = true;
-        };
-      };
-      # Gestures
-      gesture = [
-        "3, horizontal, workspace"
-      ];
-      # General settings
-      general = {
-        gaps_out = 10;
-        border_size = 2;
-      };
-      decoration = {
-        rounding = 10;
-
-      };
-
-      # Allow using SUPER + left click to move windows and SUPER + right click to resize windows
-      bindm = [
-        "$mod, mouse:272, movewindow"
-        "$mod, mouse:273, resizewindow"
-      ];
-      exec-once = [
-        "[workspace name:comms silent; move -100%,100%] telegram-desktop"
-        "[workspace name:comms silent; move -100%,-100%] signal-desktop --enable-features=UseOzonePlatform --ozone-platform=wayland"
-        "[workspace name:comms silent; move 100%,100%] librewolf https://web.whatsapp.com https://instagram.com"
-        "[workspace name:comms silent; move 100%,-100%] vesktop"
-
-        "[workspace name:bg_noise] librewolf https://www.youtube.com/playlist?list=WL"
-
-        "[workspace name:main] kitty"
-
-        "nm-applet --indicator"
-        "blueman-applet"
-        "trayscale"
-        "owncloud"
-      ];
-      # Declare all keybinds
-      bind = [
-        # Keybind for setting fullscreen
-        "$mod, F11, fullscreen"
-        # Keybinds for starting programs
-        "$mod, F, exec, librewolf"
-        "$mod, 1, exec, kitty"
-        "$mod, D, exec, vesktop"
-        "$mod, space, exec, bash -c 'wofi --show drun, run'"
-
-        # Keybind for toggling touchpad
-        "$mod, j, exec, sh $scripts/hyprland/touchpad_toggle.sh"
-
-        # Screenshot tool
-        ", Print, exec, hyprshot -m region -o ~/Pictures/Screenshots"
-
-        # Screen locking
-        "$mod alt, l, exec, hyprlock"
-
-        # Window management
-        "$mod, x, killactive"
-        "$mod, tab, togglefloating"
-
-        # Vim keybinds for changing focus
-        "$mod, h, movefocus, l"
-        "$mod, j, movefocus, d"
-        "$mod, k, movefocus, u"
-        "$mod, l, movefocus, r"
-
-        # Vim keybinds for moving windows
-        "$mod shift, h, movewindow, l"
-        "$mod shift, j, movewindow, d"
-        "$mod shift, k, movewindow, u"
-        "$mod shift, l, movewindow, r"
-
-        # workspace swipe but with $mod+scroll
-        "$mod, mouse_up, workspace, r+1"
-        "$mod, left, workspace, m-1"
-        "$mod, mouse_down, workspace, m-1"
-        "$mod, right, workspace, r+1"
-        # send window to workspace
-        "$mod shift, mouse_up, movetoworkspace, r+1"
-        "$mod shift, left, movetoworkspace, m-1"
-        "$mod shift, mouse_down, movetoworkspace, m-1"
-        "$mod shift, right, movetoworkspace, r+1"
-      ];
-
-      # Prevent xwayland apps from looking pixellated, cursor scaling to compensate for this is defined in home.nix
-      xwayland = {
-        force_zero_scaling = true;
-      };
-    };
-  };
-}
diff --git a/home-manager/hyprlock.nix b/home-manager/hyprlock.nix
deleted file mode 100644
index eb282cc..0000000
--- a/home-manager/hyprlock.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ pkgs, lib, ... }:
-{
-  programs.hyprlock = {
-    enable = true;
-    settings = {
-      general = {
-        disable_loading_bar = true;
-        grace = 0;
-        hide_cursor = true;
-        no_fade_in = false;
-      };
-
-      background = lib.mkForce [
-        {
-          path = "screenshot";
-          blur_passes = 3;
-          blur_size = 8;
-        }
-      ];
-
-      input-field = lib.mkForce [
-        {
-          size = "200, 50";
-          position = "0, -80";
-          monitor = "eDP-2";
-          dots_center = true;
-          fade_on_empty = false;
-          font_color = "rgb(202, 211, 245)";
-          inner_color = "rgb(91, 96, 120)";
-          outer_color = "rgb(24, 25, 38)";
-          outline_thickness = 5;
-          #          placeholder_text = "<span foreground="##cad3f5">Password...</span>";
-          #          shadow_passes = 2;
-        }
-      ];
-    };
-  };
-}
diff --git a/home-manager/niri.nix b/home-manager/niri.nix
index 7c4516d..8b60a2b 100644
--- a/home-manager/niri.nix
+++ b/home-manager/niri.nix
@@ -98,7 +98,7 @@
           "Mod+F".action = spawn "librewolf";
           "Mod+D".action = spawn "vesktop";
           "Mod+Space".action = spawn "fuzzel";
-          "Mod+Alt+L".action = spawn "hyprlock";
+          "Mod+Alt+L".action = spawn "swaylock";
           "Print".action = spawn "sh -c niri msg action screenshot";
           "Mod+2".action = show-hotkey-overlay;
           # window controls
diff --git a/home-manager/packages.nix b/home-manager/packages.nix
index 39aa9f7..7e1a65e 100644
--- a/home-manager/packages.nix
+++ b/home-manager/packages.nix
@@ -2,7 +2,6 @@
 {
   # packages that i dont need to use a module for
   home.packages = with pkgs; [
-    hyprshot # Screenshot tool
     powerline-fonts # Fonts
     nix-output-monitor # Provides a dependency graph for nix builds
     bitwarden-desktop # Integrates with bitwarden extension
diff --git a/home-manager/stylix.nix b/home-manager/stylix.nix
index 8b3d187..23dd19f 100644
--- a/home-manager/stylix.nix
+++ b/home-manager/stylix.nix
@@ -3,7 +3,11 @@
   stylix = {
     enable = true;
     base16Scheme = "${pkgs.base16-schemes}/share/themes/heetch.yaml";
+    polarity = "dark";
     image = ./wallpaper.jpg;
+    opacity = {
+      desktop = 0.8;
+    };
     fonts = {
       serif = {
         package = pkgs.dejavu_fonts;
@@ -30,7 +34,6 @@
       name = "Bibata-Modern-Classic";
       size = 24;
     };
-    polarity = "dark";
     targets = {
       librewolf.profileNames = [ "blue" ];
     };
diff --git a/home-manager/swaylock.nix b/home-manager/swaylock.nix
new file mode 100644
index 0000000..d551746
--- /dev/null
+++ b/home-manager/swaylock.nix
@@ -0,0 +1,14 @@
+{ pkgs, ... }: {
+  programs.swaylock = {
+    enable = true;
+    package = pkgs.swaylock-effects;
+    settings = {
+      screenshots = true;
+      #effect-pixelate= "50";
+      effect-blur = "10x5";
+      clock = true;
+      indicator= true;
+      indicator-caps-lock = true;
+    };
+  };
+}
diff --git a/home-manager/waybar.nix b/home-manager/waybar.nix
index c208ed5..08f2e7f 100644
--- a/home-manager/waybar.nix
+++ b/home-manager/waybar.nix
@@ -26,6 +26,7 @@
             "interval" = 1;
             "calendar" = {
               "mode" = "month";
+              "on-scroll" = 1;
               "format" = {
                 "months" = "<span color='#${config.lib.stylix.colors.base0E}'><b>{}</b></span>";
                 "weekdays" = "<span color='#${config.lib.stylix.colors.base08}'><b>{}</b></span>";
diff --git a/scripts/hyprland/touchpad_toggle.sh b/scripts/hyprland/touchpad_toggle.sh
deleted file mode 100644
index 6697c47..0000000
--- a/scripts/hyprland/touchpad_toggle.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/usr/bin/env bash
-
-#
-# Script to toggle a given device.
-# Use the following command to choose what device you want to toggle:
-#   hyprctl devices
-#
-# Courtesy of r/hyprland Reddit community:
-#   https://reddit.com/r/hyprland/comments/11kr8bl/hotkey_disable_touchpad/
-#   https://reddit.com/r/hyprland/comments/1bqohmd/dynamically_enabledisable_device/
-#
-# Ported, generalized, improved and overengineered by Bahar Kurt for
-# Diana's dotfiles.
-#
-
-# HACK: Try to set a nonexistent config under "device:" so that
-# Hyprland refreshes all properties inside.
-hyprctl keyword device:a true > /dev/null 2>&1
-
-# Set device to be toggled
-export HYPRLAND_DEVICE="$(hyprctl devices | grep touchpad | sed '/2-synaptics-touchpad/d; s/.*	//')"
-export HYPRLAND_VARIABLE="device[${HYPRLAND_DEVICE}]:enabled"
-
-if [ -z "$XDG_RUNTIME_DIR" ]; then
-  export XDG_RUNTIME_DIR=/run/user/$(id -u)
-fi
-
-# Check if device is currently enabled
-export STATUS_FILE="$XDG_RUNTIME_DIR/touchpad.status"
-
-# Try to get the touchpad status from status file.
-if [ -f "$STATUS_FILE" ]; then
-  export TOUCHPAD_ENABLED="$(cat "$STATUS_FILE")"
-fi
-
-# Toggle the touchpad
-if [ "$TOUCHPAD_ENABLED" != "false" ]; then
-  # The touchpad is known to be, or assumed to be, enabled (not disabled).
-  export PREVIOUS_STATUS="true"
-  export TOUCHPAD_ENABLED="false"
-  # Try to disable the touchpad. If it fails, set the new status to enabled.
-  hyprctl --batch -r -- keyword "$HYPRLAND_VARIABLE" $TOUCHPAD_ENABLED || export TOUCHPAD_ENABLED="true"
-else
-  # The touchpad is known to be disabled.
-  export PREVIOUS_STATUS="false"
-  export TOUCHPAD_ENABLED="true"
-  # Try to enable the touchpad. If it fails, set the new status to disabled.
-  hyprctl --batch -r -- keyword "$HYPRLAND_VARIABLE" $TOUCHPAD_ENABLED || export TOUCHPAD_ENABLED="false"
-fi
-
-# Write the new touchpad status into the status file.
-echo "$TOUCHPAD_ENABLED" > "$STATUS_FILE"
-
-# Generate the notification message.
-export NOTIFMSG="Touchpad "
-
-if [ "$TOUCHPAD_ENABLED" == "$PREVIOUS_STATUS" ]; then
-  export NOTIFMSG+="could not be "
-  # Touchpad could not be...
-fi
-
-if [ "$PREVIOUS_STATUS" == "true" ]; then
-  export NOTIFMSG+="disabled."
-  # Touchpad (could not be) disabled.
-else
-  export NOTIFMSG+="enabled."
-  # Touchpad (could not be) enabled.
-fi
-
-notify-send -u normal "$NOTIFMSG"