diff --git a/CHANGELOG b/CHANGELOG
index 341c5e4..939d60c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,7 +7,8 @@ https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.9
 - Waybar Taskbar Module hidden by default. Can be enabled again in the ML4W Settings App
 - Hyprpaper is now the default wallpaper engine. swww can be activiated 
 - Animations can be disabled in the Dotfiles Settings app
-- Animations can be toggled (enabled/disabled) with SUPER + SHIFT + A
+- Animations can be toggled (enabled/disabled) temporarily with SUPER + SHIFT + A
+- Keyboard layout is part of the system information module of waybar
 
 Version 2.8.4
 https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.8.4
diff --git a/hypr/conf/keybindings/default.conf b/hypr/conf/keybindings/default.conf
index 5c62294..02f8c7d 100644
--- a/hypr/conf/keybindings/default.conf
+++ b/hypr/conf/keybindings/default.conf
@@ -31,7 +31,7 @@ bind = $mainMod SHIFT, down, resizeactive, 0 100
 bind = $mainMod, G, togglegroup
 
 # Actions
-bind = $mainMod SHIFT, A, exec, ~/dotfiles/hypr/scripts/toggle-animations.sh toggle
+bind = $mainMod SHIFT, A, exec, ~/dotfiles/hypr/scripts/toggle-animations.sh
 bind = $mainMod, PRINT, exec, ~/dotfiles/hypr/scripts/screenshot.sh
 bind = $mainMod CTRL, Q, exec, wlogout
 bind = $mainMod SHIFT, W, exec, ~/dotfiles/hypr/scripts/wallpaper.sh
diff --git a/hypr/conf/ml4w.conf b/hypr/conf/ml4w.conf
index fae3903..ff04ece 100644
--- a/hypr/conf/ml4w.conf
+++ b/hypr/conf/ml4w.conf
@@ -35,4 +35,3 @@ env = APPIMAGELAUNCHER_DISABLE,1
 exec-once = ~/dotfiles/hypr/scripts/ml4w-welcome-autostart.sh
 exec-once = ~/.config/ml4w-hyprland-settings/hyprctl.sh
 exec-once = ~/dotfiles/hypr/scripts/eww.sh
-exec-once = ~/dotfiles/hypr/scripts/toggle-animations.sh
diff --git a/hypr/scripts/toggle-animations.sh b/hypr/scripts/toggle-animations.sh
index cd4c06f..867ecf4 100755
--- a/hypr/scripts/toggle-animations.sh
+++ b/hypr/scripts/toggle-animations.sh
@@ -1,19 +1,13 @@
 #!/bin/bash
-cache_file="$HOME/.cache/current_animation"
-if [[ "$1" == "toggle" ]]; then
-    if [[ ! $(cat $HOME/dotfiles/hypr/conf/animation.conf) == *"disabled"* ]]; then
-        if [ ! -f $cache_file ] ;then
-            touch $cache_file
-            echo $(cat $HOME/dotfiles/hypr/conf/animation.conf) > "$cache_file"
-            echo "source = ~/dotfiles/hypr/conf/animations/disabled.conf" > "$HOME/dotfiles/hypr/conf/animation.conf"
-        else
-            echo $(cat "$cache_file") > "$HOME/dotfiles/hypr/conf/animation.conf"
-            rm $cache_file
-        fi
-    fi
+cache_file="$HOME/.cache/toggle_animation"
+if [[ $(cat $HOME/dotfiles/hypr/conf/animation.conf) == *"disabled"* ]]; then
+    echo ":: Toggle blocked by disabled.conf variation."
 else
     if [ -f $cache_file ] ;then
+        hyprctl keyword animations:enabled true
         rm $cache_file
+    else
+        hyprctl keyword animations:enabled false
+        touch $cache_file
     fi
-    echo "source = ~/dotfiles/hypr/conf/animations/default.conf" > "$HOME/dotfiles/hypr/conf/animation.conf"
 fi
\ No newline at end of file