diff --git a/dot/file/profile b/dot/file/profile
index 8e174e3..6618371 100755
--- a/dot/file/profile
+++ b/dot/file/profile
@@ -72,6 +72,8 @@ export_loop  \
 	XOUTPUT_DAEMON 'kanshi' \
 	XSOUND_CONTROL 'pavucontrol' \
 	XFILE_MANAGER 'thunar' \
+	XRESOURCE_MONITOR '$XTERMINAL -e htop' \
+	XCALENDAR '$XTERMINAL -e calcurse' \
 
 
 test -r $SETENV && . "$SETENV" && setenv profile
diff --git a/waybar/config.jsonc b/waybar/config.jsonc
index b5ff505..4edaae8 100644
--- a/waybar/config.jsonc
+++ b/waybar/config.jsonc
@@ -8,7 +8,7 @@
 		"min-length": 50,
 		"on-scroll-up" : "riverctl focus-view next",
 		"on-scroll-down" : "riverctl focus-view previous",
-		"on-click-right" : "riverctl close"
+		"on-click-middle" : "riverctl close"
 	},
 
 	"river/mode" : {
@@ -70,7 +70,8 @@
 
 	"clock" : {
 		"format" : "{:%EY-%m-%d %H:%M:%S}",
-		"interval" : 1
+		"interval" : 1,
+		"on-click": "$XCALENDAR"
 	},
 
 	"bluetooth" : {
@@ -89,8 +90,8 @@
 			]
 		},
 		"scroll-step": 5,
-		"on-click": "pamixer -t",
-		"on-click-right": "pavucontrol"
+		"on-click-right": "pamixer -t",
+		"on-click": "pavucontrol"
 	},
 	"memory": {
 		"interval": 5,
@@ -98,7 +99,8 @@
 	},
 	"cpu": {
 		"interval": 5,
-		"format": "CPU {usage:2}%"
+		"format": "CPU {usage:2}%",
+		"on-click": "$XRESOURCE_MONITOR"
 	},
 	"battery": {
 		"states": {