diff --git a/modules/workspace/i3blocks/scripts/calendar.nix b/modules/workspace/i3blocks/scripts/calendar.nix
index f96ff03..e5adf78 100644
--- a/modules/workspace/i3blocks/scripts/calendar.nix
+++ b/modules/workspace/i3blocks/scripts/calendar.nix
@@ -12,10 +12,6 @@
   else
     echo -n `date -d "$DATE" +'%H:%M %a'`
   fi
-  if [[ $BLOCK_BUTTON == "1" ]]
-  then
-    ${config.defaultApplications.term.cmd} --hold -e "${gcalcli}/bin/gcalcli agenda"
-  fi
   if [[ $((`date -d "$DATE" +%s`-`date +%s`)) -lt 1800 ]]
   then
     code=33
diff --git a/modules/workspace/i3blocks/scripts/connections.nix b/modules/workspace/i3blocks/scripts/connections.nix
index 9cfc579..455cddc 100644
--- a/modules/workspace/i3blocks/scripts/connections.nix
+++ b/modules/workspace/i3blocks/scripts/connections.nix
@@ -1,6 +1,5 @@
 { bash, networkmanager, iconfont, config, modemmanager, ... }: ''
   #!${bash}/bin/bash
-  [[ $BLOCK_BUTTON -eq 1 ]] && ${config.defaultApplications.term.cmd} -e ${networkmanager}/bin/nmtui-connect
   CONNECTIONS=$(${networkmanager}/bin/nmcli con show --active | tail +2 | tr -s ' ' | rev | cut -d' ' -f3 | rev)
   text=""
   for connection in $CONNECTIONS
diff --git a/modules/workspace/i3blocks/scripts/sound.nix b/modules/workspace/i3blocks/scripts/sound.nix
index 933f761..f78254c 100644
--- a/modules/workspace/i3blocks/scripts/sound.nix
+++ b/modules/workspace/i3blocks/scripts/sound.nix
@@ -1,7 +1,6 @@
 { pamixer, lxqt, iconfont, ... }: ''
   case $BLOCK_BUTTON in
        2) ${pamixer}/bin/pamixer -t;;
-       3) ${lxqt.pavucontrol-qt}/bin/pavucontrol-qt & ;;
        4) ${pamixer}/bin/pamixer -i 5;;
        5) ${pamixer}/bin/pamixer -d 5;;
   esac
diff --git a/modules/workspace/i3blocks/scripts/weather.nix b/modules/workspace/i3blocks/scripts/weather.nix
index dd43493..a31780a 100644
--- a/modules/workspace/i3blocks/scripts/weather.nix
+++ b/modules/workspace/i3blocks/scripts/weather.nix
@@ -2,9 +2,4 @@
   #!${bash}/bin/bash
   WTTR=$(curl wttr.in/?format=1)
   echo "<span font=\"Roboto Mono 11\">$WTTR</span>"
-  if [[ $BLOCK_BUTTON == 1 ]]
-  then
-    ${config.defaultApplications.term.cmd} --hold -e "${curl}/bin/curl wttr.in"
-  fi
 ''
- 
diff --git a/modules/workspace/sway/default.nix b/modules/workspace/sway/default.nix
index aab6852..b37bc68 100755
--- a/modules/workspace/sway/default.nix
+++ b/modules/workspace/sway/default.nix
@@ -112,7 +112,7 @@ in {
         "${modifier}+q" = "kill";
         "${modifier}+Return" = "exec ${apps.term.cmd}";
         "${modifier}+e" = "exec ${apps.editor.cmd}";
-        "${modifier}+l" = "layout toggle all";
+        "${modifier}+o" = "layout toggle all";
 
         "${modifier}+Left" = "focus child; focus left; ${moveMouse}";
         "${modifier}+Right" = "focus child; focus right; ${moveMouse}";
@@ -144,9 +144,13 @@ in {
         "${modifier}+r" = "mode resize";
         "${modifier}+Shift+f" = "floating toggle";
 
-        "${modifier}+j" = "focus mode_toggle";
         "${modifier}+Escape" = "exec ${apps.monitor.cmd}";
 
+        "${modifier}+j" = "exec ${pkgs.playerctl}/bin/playerctl previous";
+        "${modifier}+k" = "exec ${pkgs.playerctl}/bin/playerctl play-pause";
+        "${modifier}+l" = "exec ${pkgs.playerctl}/bin/playerctl next";
+        "${modifier}+i" = "exec ${pkgs.lxqt.pavucontrol-qt}/bin/pavucontrol-qt";
+
         "${modifier}+Print" = script "screenshot"
           "${pkgs.grim}/bin/grim Pictures/$(date +'%Y-%m-%d+%H:%M:%S').png";
 
@@ -161,7 +165,6 @@ in {
             ${pkgs.grim}/bin/grim -g "$(${pkgs.slurp}/bin/slurp)" - | ${pkgs.wl-clipboard}/bin/wl-copy'';
 
         "${modifier}+x" = "move workspace to output right";
-        "${modifier}+k" = "exec '${pkgs.xorg.xkill}/bin/xkill'";
         "${modifier}+F5" = "reload";
         "${modifier}+Shift+F5" = "exit";
         "${modifier}+Shift+h" = "layout splith";
@@ -174,10 +177,10 @@ in {
         "${modifier}+F12" = "output * dpms on";
         "${modifier}+End" = "exec ${lock}";
         "${modifier}+p" = "sticky toggle";
-        "${modifier}+i" =
+        "${modifier}+z" =
           script "0x0" ''wl-paste | curl -F"file=@-" https://0x0.st | wl-copy'';
         "${modifier}+b" = "focus mode_toggle";
-        "${modifier}+z" = script "lambda-launcher"
+        "${modifier}+Space" = script "lambda-launcher"
           "${pkgs.lambda-launcher}/bin/lambda-launcher";
         "XF86AudioPlay" = "exec ${pkgs.playerctl}/bin/playerctl play-pause";
         "XF86AudioNext" = "exec ${pkgs.playerctl}/bin/playerctl next";