diff --git a/hm_modules/bspwm.nix b/hm_modules/bspwm.nix
index 79e1548..05a881b 100644
--- a/hm_modules/bspwm.nix
+++ b/hm_modules/bspwm.nix
@@ -34,7 +34,6 @@ in
     };
     startupPrograms = [
       "${monitorSetupScript}" # Setup monitors
-      "systemctl --user restart polybar" # Restart polybar
       "${xsetroot} -solid black -cursor_name left_ptr" # Set cursor
       "${pkgs.update-background}/bin/update-background" # Set background
     ];
diff --git a/hm_modules/sxhkd.nix b/hm_modules/sxhkd.nix
index bf0fae5..3af0980 100644
--- a/hm_modules/sxhkd.nix
+++ b/hm_modules/sxhkd.nix
@@ -23,6 +23,10 @@
       emojiChooser = "rofimoji --skin-tone light -a copy";
       yad = "${pkgs.yad}/bin/yad";
       notify = "${pkgs.libnotify}/bin/notify-send";
+      resetBspwm = pkgs.writeShellScript "resetBspwm" ''
+        bspc wm -r
+        systemctl --user restart polybar # Restart polybar
+      '';
       moveAllNodesToPrimary = pkgs.writeShellScript "moveAllNodesToPrimary" ''
         comm -23 <(bspc query -N | sort) <(bspc query -m primary -N | sort) | while read n; do bspc node $n -m primary; done
       '';
@@ -40,7 +44,7 @@
           ${yad} --question --center --on-top --sticky --timeout=30 --timeout-indicator=bottom --image=gnome-shutdown --title "Shutdown" --text "Do you want to shutdown?" && bspc quit
         '';
         "super + alt + o" = "${moveAllNodesToPrimary}";
-        "super + alt + r" = "bspc wm -r";
+        "super + alt + r" = "${resetBspwm}";
         "super + alt + {Right,Down,Left}" = "playerctl {next,play-pause,previous}";
         "super + alt + shift + {h,j,k,l}" = "bspc node -z {right -20 0,top 0 20,bottom 0 -20,left 20 0}";
         "super + bracket{left,right}" = "bspc desktop -f {prev,next}.local";
diff --git a/odin/hm.nix b/odin/hm.nix
index 427071b..5f4aa14 100644
--- a/odin/hm.nix
+++ b/odin/hm.nix
@@ -9,6 +9,7 @@
       arandr
       authy
       bitwarden
+      calibre
       cava
       discord
       dmenu
@@ -131,7 +132,7 @@
     ../hm_modules/obs-studio.nix
     ../hm_modules/office.nix
     ../hm_modules/pass.nix
-    # ../hm_modules/picom.nix
+    ../hm_modules/picom.nix
     ../hm_modules/polybar.nix
     # ../hm_modules/pro_audio.nix
     # ../hm_modules/pycharm.nix
diff --git a/thor/hm.nix b/thor/hm.nix
index a52e5d7..ad64517 100644
--- a/thor/hm.nix
+++ b/thor/hm.nix
@@ -8,6 +8,7 @@
     packages = with pkgs; [
       arandr
       authy
+      calibre
       bitwarden
       discord
       dmenu