diff --git a/dot_config/hypr/binds.conf b/dot_config/hypr/binds.conf
index 89ba2eb..2916e4c 100644
--- a/dot_config/hypr/binds.conf
+++ b/dot_config/hypr/binds.conf
@@ -33,7 +33,7 @@ bind = $mod SHIFT, W, exec, rofi -show window -theme catppuccin-macchiato
 # bind = ALT_L, Tab, exec, killall -SIGUSR1 sfwbar
 bind = $mod, P, pseudo,  # dwindle only
 # bind = $mod SHIFT, P, exec, hyprctl dispatch dpms off
-# bind = $mod SHIFT, L, exec, ~/.config/hypr/bsplock
+# bind = $mod SHIFT, L, exec, swaylock
 bind = $mod, V, exec, cliphist list | rofi -dmenu | cliphist decode | wl-copy
 bind = $mod, N, exec, networkmanager_dmenu
 bind = CAPS, , exec, swayosd-client --caps-lock-led
diff --git a/dot_config/hypr/exec.conf b/dot_config/hypr/exec.conf
index 81f92ec..340cf82 100644
--- a/dot_config/hypr/exec.conf
+++ b/dot_config/hypr/exec.conf
@@ -11,7 +11,7 @@ exec-once = swayosd-server &
 # exec-once = eww daemon
 exec-once = nm-applet
 
-exec-once = swayidle before-sleep 'loginctl lock-session' lock '/home/eric/.config/hypr/bsplock'
+exec-once = swayidle before-sleep 'loginctl lock-session' lock 'swaylock'
 exec-once = wl-paste --type text --watch cliphist store #Stores only text data
 exec-once = wl-paste --type image --watch cliphist store #Stores only image data
 exec-once = systemctl start --user foot-server
diff --git a/dot_config/hypr/executable_bsplock b/dot_config/hypr/executable_bsplock
deleted file mode 100644
index 4a7a831..0000000
--- a/dot_config/hypr/executable_bsplock
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/bin/env bash
-
-## Copyright (C) 2020-2021 Aditya Shakya <adi1090x@gmail.com>
-## Everyone is permitted to copy and distribute copies of this file under GNU-GPL3
-
-## i3lock for bspwm for Archcraft OS.
-
-## Get colors -----------------
-FG="#CDD6F4"
-BG="#1E1E2E"
-
-BLACK="#45475A"
-RED="#F38BA8"
-GREEN="#A6E3A1"
-YELLOW="#F9E2AF"
-BLUE="#89B4FA"
-MAGENTA="#F5C2E7"
-CYAN="#94E2D5"
-WHITE="#BAC2DE"
-
-TOTD=`fortune -n 90 -s | head -n 1`
-
-## Exec	-----------------
-
-#betterlockscreen --lock \
-#-- \
-#--{time,date,layout,verif,wrong,greeter}-font="Iosevka" \
-swaylock \
--f \
---color="${BG}FF"			\
-\
---inside-ver-color=${GREEN}	\
---inside-wrong-color=${RED}	\
---inside-color="${BG}00"	\
-\
---ring-ver-color=${GREEN}	\
---ring-wrong-color=${RED}	\
---ring-color="#f5e0dc"		\
-\
---line-color=${BG}			\
---separator-color=${BG}		\
-\
---key-hl-color=${YELLOW}		\
---bs-hl-color=${RED}			\
-\
---font="Iosevka"			\
---font-size=18							\
-\
---indicator-radius 120 \
---indicator-thickness 8
-
-# swaylock-effects
-#--screenshots \
-#--effect-blur 7x16 \
-#--effect-vignette 0.5:0.2 \
-
-# swayidle -w \
-# timeout 10 \
-
-# hyprctl dispatch dpms off
-# systemctl suspend
diff --git a/dot_config/niri/config.kdl b/dot_config/niri/config.kdl
index ee3465e..37e8f2b 100644
--- a/dot_config/niri/config.kdl
+++ b/dot_config/niri/config.kdl
@@ -715,5 +715,5 @@ spawn-at-startup "kdeconnect-indicator"
 spawn-at-startup "wl-paste" "--type" "text" "--watch" "cliphist" "store"
 spawn-at-startup "wl-paste" "--type" "image" "--watch" "cliphist" "store"
 spawn-at-startup "swayosd-server"
-spawn-at-startup "swayidle before-sleep 'loginctl lock-session' lock '/home/eric/.config/hypr/bsplock' &"
+spawn-at-startup "swayidle before-sleep 'loginctl lock-session' lock 'swaylock' &"
 spawn-at-startup "xwayland-satellite"
diff --git a/dot_config/river/executable_init b/dot_config/river/executable_init
index 1e560f5..bb398b9 100644
--- a/dot_config/river/executable_init
+++ b/dot_config/river/executable_init
@@ -305,5 +305,5 @@ wl-paste --type image --watch cliphist store & #Stores only image data
 /usr/lib/polkit-kde-authentication-agent-1 &
 
 ## lock
-swayidle before-sleep 'loginctl lock-session' lock '/home/eric/.config/hypr/bsplock' &
+swayidle before-sleep 'loginctl lock-session' lock 'swaylock' &
 
diff --git a/dot_config/sway/config b/dot_config/sway/config
index ea9bc92..52d6c3c 100644
--- a/dot_config/sway/config
+++ b/dot_config/sway/config
@@ -448,7 +448,7 @@ exec systemctl start --user foot-server
 exec systemctl start --user sunshine
 exec wl-paste --type text --watch cliphist store
 exec wl-paste --type image --watch cliphist store
-exec swayidle before-sleep 'loginctl lock-session' lock '/home/eric/.config/hypr/bsplock'
+exec swayidle before-sleep 'loginctl lock-session' lock 'swaylock'
 # exec /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &
 exec /usr/lib/polkit-kde-authentication-agent-1 &
 exec rm -f /tmp/sovpipe && mkfifo /tmp/sovpipe && tail -f /tmp/sovpipe | sov -t 200 -n -c 1 -s $HOME/.config/sov
diff --git a/dot_config/swaylock/config b/dot_config/swaylock/config
new file mode 100644
index 0000000..2710830
--- /dev/null
+++ b/dot_config/swaylock/config
@@ -0,0 +1,22 @@
+color=#1E1E2EFF
+
+inside-ver-color=#A6E3A1
+inside-wrong-color=#F38BA8
+inside-color=#1E1E2E00
+
+ring-ver-color=#A6E3A1
+ring-wrong-color=#A6E3A1
+ring-color=#f5e0dc
+
+line-color=#1E1E2E
+separator-color=#1E1E2E
+
+key-hl-color=#F9E2AF
+bs-hl-color=#F38BA8
+
+font="FiraCode Nerd Font"
+font-size=18
+
+indicator-radius=120
+indicator-thickness=8
+
diff --git a/dot_config/waybar/config.jsonc b/dot_config/waybar/config.jsonc
index 6403a98..061a457 100644
--- a/dot_config/waybar/config.jsonc
+++ b/dot_config/waybar/config.jsonc
@@ -7,6 +7,7 @@
     "hyprland/workspaces",
     "sway/workspaces#sway",
     "river/tags",
+    // "custom/workspaces",
     // "river/layout",
 
     "group/visualisation"
@@ -166,6 +167,9 @@
     "min-length": 4,
     "align": "right"
   },
+  "custom/workspaces": {
+    "exec": "$HOME/.config/waybar/modules/workspaces.nu \"$WAYBAR_OUTPUT_NAME\""
+  },
   "wlr/taskbar": {
     "all-outputs": false,
     "format": "{icon}",
@@ -347,10 +351,10 @@
     ]
   },
   "network": {
-    "format-wifi": "",
-    "format-ethernet": "󰈀",
+    "format-wifi": " ",
+    "format-ethernet": "󰈀 ",
     "format-linked": "{ifname} (No IP) ",
-    "format-disconnected": "󰤮   Disconnected",
+    "format-disconnected": "󰤮   Disconnected ",
     "tooltip-format-ethernet": "{ifname} | {ipaddr}/{cidr} | Down Speed: {bandwidthDownBits}, Up Speed: {bandwidthUpBits}",
     "tooltip-format-wifi": "{ifname} | {ipaddr}/{cidr} | {essid} | Signal Strenght: {signalStrength}% | Down Speed: {bandwidthDownBits}, Up Speed: {bandwidthUpBits}",
     "on-click": "networkmanager_dmenu"