diff --git a/.install/packages/hyprland-packages.sh b/.install/packages/hyprland-packages.sh
index 80b9e72..b81a8fa 100644
--- a/.install/packages/hyprland-packages.sh
+++ b/.install/packages/hyprland-packages.sh
@@ -1,5 +1,6 @@
 packagesPacman=(
     "hyprland"
+    "hyprpaper"
     "xdg-desktop-portal-hyprland" 
     "waybar" 
     "grim" 
diff --git a/.settings/wallpaper-engine.sh b/.settings/wallpaper-engine.sh
new file mode 100644
index 0000000..16f3d37
--- /dev/null
+++ b/.settings/wallpaper-engine.sh
@@ -0,0 +1 @@
+swww
\ No newline at end of file
diff --git a/.version/name b/.version/name
index 4fdf0ae..0409c16 100644
--- a/.version/name
+++ b/.version/name
@@ -1 +1 @@
-2.8.3.4
\ No newline at end of file
+2.8.4
\ No newline at end of file
diff --git a/.version/version b/.version/version
index 539d6d3..7f9ce49 100644
--- a/.version/version
+++ b/.version/version
@@ -1 +1 @@
-2834
\ No newline at end of file
+2840
\ No newline at end of file
diff --git a/CHANGELOG b/CHANGELOG
index 1b81a8d..333443d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+Version 2.8.4
+https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.8.4
+--------------------------------------------------------
+- In the ML4W Dotfiles Settings App you can now switch between the wallpaper applications swww or hyprpaper. In case of issues with the default application swww you can select hyprpaper. The wallpaper application can also be disabled but background images for wlogout, hyprlock and rofi will be generated with the selected wallpaper. 
+PLEASE NOTE: Logout & Login is required after a change.
+
 Version 2.8.3.4
 https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.8.3.4
 --------------------------------------------------------
diff --git a/README.md b/README.md
index 54b1444..768a646 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# ML4W Dotfiles 2.8.3.4
+# ML4W Dotfiles 2.8.4
 
 An advanced configuration of Hyprland and Qtile for Arch Linux based distributions. This package includes an installation script to install and setup the required components.
 
diff --git a/apps/ML4W_Dotfiles_Settings-x86_64.AppImage b/apps/ML4W_Dotfiles_Settings-x86_64.AppImage
index b11bb2a..7df1f21 100755
Binary files a/apps/ML4W_Dotfiles_Settings-x86_64.AppImage and b/apps/ML4W_Dotfiles_Settings-x86_64.AppImage differ
diff --git a/hypr/conf/autostart.conf b/hypr/conf/autostart.conf
index dacaf1c..5a28c57 100644
--- a/hypr/conf/autostart.conf
+++ b/hypr/conf/autostart.conf
@@ -26,11 +26,8 @@ exec-once = hypridle
 # Load cliphist history
 exec-once = wl-paste --watch cliphist store
 
-# Initialize swww
-exec-once = swww init || swww-daemon --format xrgb
-
-# Load last wallpaper and waybar with pywal colors
-exec-once = ~/dotfiles/hypr/scripts/wallpaper.sh init
+# Initialize Wallpaper Engine
+exec-once = ~/dotfiles/hypr/scripts/init-wallpaper-engine.sh
 
 # Start ML4W Welcome App
 exec-once = ~/dotfiles/hypr/scripts/ml4w-welcome-autostart.sh
diff --git a/hypr/hyprpaper.conf b/hypr/hyprpaper.conf
new file mode 100644
index 0000000..957cd64
--- /dev/null
+++ b/hypr/hyprpaper.conf
@@ -0,0 +1,2 @@
+preload = ~/wallpaper/hyprland.jpg
+wallpaper = ,~/wallpaper/hyprland.jpg
\ No newline at end of file
diff --git a/hypr/scripts/init-wallpaper-engine.sh b/hypr/scripts/init-wallpaper-engine.sh
new file mode 100755
index 0000000..901ab43
--- /dev/null
+++ b/hypr/scripts/init-wallpaper-engine.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+wallpaper_engine=$(cat $HOME/dotfiles/.settings/wallpaper-engine.sh)
+if [ "$wallpaper_engine" == "swww" ] ;then
+    # swww
+    echo ":: Using swww"
+    swww init
+    swww-daemon --format xrgb
+    sleep 0.5
+    ~/dotfiles/hypr/scripts/wallpaper.sh init
+elif [ "$wallpaper_engine" == "hyprpaper" ] ;then    
+    # hyprpaper
+    echo ":: Using hyprpaper"
+    # hyprpaper
+    sleep 0.5
+    ~/dotfiles/hypr/scripts/wallpaper.sh init
+else
+    echo ":: Wallpaper Engine disabled"
+    ~/dotfiles/hypr/scripts/wallpaper.sh init
+fi
+
diff --git a/hypr/scripts/wallpaper.sh b/hypr/scripts/wallpaper.sh
index f548d25..563e626 100755
--- a/hypr/scripts/wallpaper.sh
+++ b/hypr/scripts/wallpaper.sh
@@ -88,12 +88,28 @@ transition_type="wipe"
 # transition_type="outer"
 # transition_type="random"
 
-swww img $wallpaper \
-    --transition-bezier .43,1.19,1,.4 \
-    --transition-fps=60 \
-    --transition-type=$transition_type \
-    --transition-duration=0.7 \
-    --transition-pos "$( hyprctl cursorpos )"
+wallpaper_engine=$(cat $HOME/dotfiles/.settings/wallpaper-engine.sh)
+if [ "$wallpaper_engine" == "swww" ] ;then
+    # swww
+    echo ":: Using swww"
+    swww img $wallpaper \
+        --transition-bezier .43,1.19,1,.4 \
+        --transition-fps=60 \
+        --transition-type=$transition_type \
+        --transition-duration=0.7 \
+        --transition-pos "$( hyprctl cursorpos )"
+elif [ "$wallpaper_engine" == "hyprpaper" ] ;then
+    # hyprpaper
+    echo ":: Using hyprpaper"
+    killall hyprpaper
+    echo -n "" > $HOME/dotfiles/hypr/hyprpaper.conf
+    echo "preload = $wallpaper" >> $HOME/dotfiles/hypr/hyprpaper.conf
+    echo "wallpaper = ,$wallpaper" >> $HOME/dotfiles/hypr/hyprpaper.conf
+    echo "splash = false" >> $HOME/dotfiles/hypr/hyprpaper.conf
+    hyprpaper &
+else
+    echo ":: Wallpaper Engine disabled"
+fi
 
 if [ "$1" == "init" ] ;then
     echo ":: Init"