diff --git a/.config/waybar/modules/cpu.jsonc b/.config/waybar/modules/cpu.jsonc
index 4b652349..82ea49db 100644
--- a/.config/waybar/modules/cpu.jsonc
+++ b/.config/waybar/modules/cpu.jsonc
@@ -1,6 +1,6 @@
 {
   "cpu": {
-    "on-click": "kitty --class center-float-large btop",
+    "on-click": "pypr toggle btop",
     "format": "CPU: {usage}%",
     "tooltip": false,
     "interval": 2,
diff --git a/.config/waybar/modules/custom-gpu-usage.jsonc b/.config/waybar/modules/custom-gpu-usage.jsonc
index 61ea8130..f151e49b 100644
--- a/.config/waybar/modules/custom-gpu-usage.jsonc
+++ b/.config/waybar/modules/custom-gpu-usage.jsonc
@@ -1,7 +1,7 @@
 {
   "custom/gpu-usage": {
     "exec": "cat /sys/class/hwmon/hwmon4/device/gpu_busy_percent",
-    "on-click": "kitty --class center-float-large nvtop",
+    "on-click": "pypr toggle nvtop",
     "format": "GPU: {}%",
     "return-type": "",
     "interval": 2,
diff --git a/.config/waybar/modules/memory.jsonc b/.config/waybar/modules/memory.jsonc
index 31a2e6e1..3edb32c6 100644
--- a/.config/waybar/modules/memory.jsonc
+++ b/.config/waybar/modules/memory.jsonc
@@ -1,7 +1,7 @@
 {
   "memory": {
     "format": "{}%  ",
-    "on-click": "kitty --class center-float-large btop",
+    "on-click": "pypr toggle btop",
     "tooltip": true,
     "interval": 2,
   },
diff --git a/.config/waybar/modules/temperature-cpu.jsonc b/.config/waybar/modules/temperature-cpu.jsonc
index 14860986..df0a4f1a 100644
--- a/.config/waybar/modules/temperature-cpu.jsonc
+++ b/.config/waybar/modules/temperature-cpu.jsonc
@@ -1,7 +1,7 @@
 {
   "temperature#cpu": {
     "critical-threshold": 90,
-    "on-click": "kitty --class center-float-large btop",
+    "on-click": "pypr toggle btop",
     "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
     "format-critical": "{icon} {temperatureC}°C",
     "format": "{icon} {temperatureC}°C",
diff --git a/.config/waybar/modules/temperature-gpu.jsonc b/.config/waybar/modules/temperature-gpu.jsonc
index 2555ea7a..e706e315 100644
--- a/.config/waybar/modules/temperature-gpu.jsonc
+++ b/.config/waybar/modules/temperature-gpu.jsonc
@@ -1,7 +1,7 @@
 {
   "temperature#gpu": {
     "critical-threshold": 80,
-    "on-click": "kitty --class center-float-large nvtop",
+    "on-click": "pypr toggle nvtop",
     "hwmon-path": "/sys/class/hwmon/hwmon4/temp1_input",
     "format-critical": "{icon} {temperatureC}°C",
     "format": "{icon} {temperatureC}°C",