diff --git a/common/desktop_environment/hyprland/home_manager/default.nix b/common/desktop_environment/hyprland/home_manager/default.nix
index 5b6dad2..f22b944 100644
--- a/common/desktop_environment/hyprland/home_manager/default.nix
+++ b/common/desktop_environment/hyprland/home_manager/default.nix
@@ -3,11 +3,11 @@
   imports = [
     ./theme.nix
     ./hyprland.nix
-    ./hyprlock.nix
     ./hyprpanel.nix
     ./hyprpolkitagent.nix
-    # ./quickshell.nix
+    # ./quickshell.nix # TODO replace hyprpanel with custom quickshell...
     ./wofi.nix
-    # ./swaync.nix
+    # ./swaync.nix # notifications, hyprpanel has notifications but I want to replace hyprpanel sometime so keeping this here as reference
+    ./swaylock.nix
   ];
 }
diff --git a/common/desktop_environment/hyprland/home_manager/hyprland.nix b/common/desktop_environment/hyprland/home_manager/hyprland.nix
index ff4ca0b..30f33d4 100644
--- a/common/desktop_environment/hyprland/home_manager/hyprland.nix
+++ b/common/desktop_environment/hyprland/home_manager/hyprland.nix
@@ -92,7 +92,7 @@ in
         "$mainMod, Return, exec, ${cfg.terminalCommand}"
         "$mainMod, Space, exec, pkill wofi || wofi --show drun"
         "$mainMod, q, killactive"
-        "$mainMod SHIFT, q, exec, hyprlock"
+        "$mainMod SHIFT, q, exec, swaylock"
         "$mainMod, f, togglefloating"
         "$mainMod, g, pseudo"
         "$mainMod, t, togglesplit"
@@ -129,7 +129,7 @@ in
 
       bindr = [
         # overview
-        "$mainMod, SUPER_L, overview:toggle, all"
+        "$mainMod, SUPER_L, overview:toggle"
       ];
 
       binde = [
diff --git a/common/desktop_environment/hyprland/home_manager/hyprlock.nix b/common/desktop_environment/hyprland/home_manager/hyprlock.nix
deleted file mode 100644
index 1f43e91..0000000
--- a/common/desktop_environment/hyprland/home_manager/hyprlock.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  ...
-}:
-{
-  programs.hyprlock = {
-    enable = true;
-    settings = {
-      hide_cursor = true;
-      # no_fade_in = true;
-    };
-  };
-}
diff --git a/common/desktop_environment/hyprland/home_manager/hyprpanel.nix b/common/desktop_environment/hyprland/home_manager/hyprpanel.nix
index bf6681a..7f4b66d 100644
--- a/common/desktop_environment/hyprland/home_manager/hyprpanel.nix
+++ b/common/desktop_environment/hyprland/home_manager/hyprpanel.nix
@@ -58,8 +58,6 @@
             "workspaces"
             "media"
             "volume"
-            "systray"
-            "cava"
           ];
 
           middle = [
@@ -88,7 +86,10 @@
           middle = [
             "clock"
           ];
-          right = [ ];
+          right = [
+            "systray"
+            "cava"
+          ];
         };
       };
       bar.workspaces = {
@@ -98,6 +99,7 @@
         showWsIcons = true;
         showApplicationIcons = false;
         workspaceMask = true;
+        numbered_active_indicator = "highlight";
         workspaceIconMap = {
           "1" = "一"; # "1" いち | ひとつ
           "2" = "二"; # "2" に | ふたつ
@@ -109,6 +111,16 @@
           "8" = "八"; # "8" はち | やっつ
           "9" = "九"; # "9" きゅう | ここのつ
           "10" = "十"; # "10" じゅう | とお
+          "11" = "十一"; # "11" じゅういち | じゅうひとつ
+          "12" = "十二"; # "12" じゅうに | じゅうふたつ
+          "13" = "十三"; # "13" じゅうさん | じゅうみっつ
+          "14" = "十四"; # "14" じゅうし | じゅうよん
+          "15" = "十五"; # "15" じゅうご | じゅういつつ
+          "16" = "十六"; # "16" じゅうろく | じゅうむっつ
+          "17" = "十七"; # "17" じゅうしち | じゅうななつ
+          "18" = "十八"; # "18" じゅうはち | じゅうやっつ
+          "19" = "十九"; # "19" じゅうきゅう | じゅうここのつ
+          "20" = "二十"; # "20" にじゅう | にじっつ
         };
       };
       notifications.ignore = [ "spotify" ];
diff --git a/common/desktop_environment/hyprland/home_manager/swaylock.nix b/common/desktop_environment/hyprland/home_manager/swaylock.nix
new file mode 100644
index 0000000..06ebf13
--- /dev/null
+++ b/common/desktop_environment/hyprland/home_manager/swaylock.nix
@@ -0,0 +1,17 @@
+{
+  ...
+}:
+{
+  programs.swaylock = {
+    enable = true;
+    settings = {
+      color = "#000000";
+      indicator-caps-lock = true;
+      indicator-idle-visible = true;
+      indicator-radius = 100;
+      indicator-thickness = 10;
+      font = "JetBrainsMono Nerd Font Regular";
+      font-size = 20;
+    };
+  };
+}