diff --git a/README.org b/README.org
index 0941839..05875a7 100644
--- a/README.org
+++ b/README.org
@@ -3883,14 +3883,33 @@ postlock() {
 
 *** Shikane
 
-**** Docked
+**** Post Switch
+
+#+BEGIN_SRC shell :shebang #!/usr/bin/env bash :tangle shikane/.scripts/shikane-postswitch.sh
+if [ $XDG_SESSION_DESKTOP == "Hyprland" ]; then
+    hyprctl reload
+fi
+
+systemctl --user restart waybar.service
+$HOME/.scripts/gammastep.sh --on
+#+END_SRC
+
+**** Timeout
+
+#+BEGIN_SRC toml :tangle shikane/.config/shikane/config.toml
+timeout = 0
+#+END_SRC
+
+**** Profiles
+
+***** Docked
 
 #+BEGIN_SRC toml :tangle shikane/.config/shikane/config.toml
 [[profile]]
 name = "docked"
 exec = [
     "notify-send shikane \"Profile $SHIKANE_PROFILE_NAME has been applied\" &",
-    "$HOME/.scripts/gammastep.sh --on"
+    "$HOME/.scripts/shikane-postswitch.sh"
 ]
 
 [[profile.output]]
@@ -3925,14 +3944,14 @@ transform = "normal"
 adaptive_sync = false
 #+END_SRC
 
-**** Mobile
+***** Mobile
 
 #+BEGIN_SRC toml :tangle shikane/.config/shikane/config.toml
 [[profile]]
 name = "mobile"
 exec = [
     "notify-send shikane \"Profile $SHIKANE_PROFILE_NAME has been applied\" &",
-    "$HOME/.scripts/gammastep.sh --on"
+    "$HOME/.scripts/shikane-postswitch.sh"
 ]
 
 [[profile.output]]
diff --git a/shikane/.config/shikane/config.toml b/shikane/.config/shikane/config.toml
index 1b3f2df..8a67cae 100644
--- a/shikane/.config/shikane/config.toml
+++ b/shikane/.config/shikane/config.toml
@@ -1,8 +1,10 @@
+timeout = 0
+
 [[profile]]
 name = "docked"
 exec = [
     "notify-send shikane \"Profile $SHIKANE_PROFILE_NAME has been applied\" &",
-    "$HOME/.scripts/gammastep.sh --on"
+    "$HOME/.scripts/shikane-postswitch.sh"
 ]
 
 [[profile.output]]
@@ -40,7 +42,7 @@ adaptive_sync = false
 name = "mobile"
 exec = [
     "notify-send shikane \"Profile $SHIKANE_PROFILE_NAME has been applied\" &",
-    "$HOME/.scripts/gammastep.sh --on"
+    "$HOME/.scripts/shikane-postswitch.sh"
 ]
 
 [[profile.output]]
diff --git a/shikane/.scripts/shikane-postswitch.sh b/shikane/.scripts/shikane-postswitch.sh
new file mode 100755
index 0000000..c921f45
--- /dev/null
+++ b/shikane/.scripts/shikane-postswitch.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+if [ $XDG_SESSION_DESKTOP == "Hyprland" ]; then
+    hyprctl reload
+fi
+
+systemctl --user restart waybar.service
+$HOME/.scripts/gammastep.sh --on