diff --git a/.config/ags/scripts/color_generation/switchwall.sh b/.config/ags/scripts/color_generation/switchwall.sh
index b41304112..e3ab24ded 100755
--- a/.config/ags/scripts/color_generation/switchwall.sh
+++ b/.config/ags/scripts/color_generation/switchwall.sh
@@ -3,6 +3,55 @@
 XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
 CONFIG_DIR="$XDG_CONFIG_HOME/ags"
 
+THUMBNAIL_DIR="/tmp/mpvpaper_thumbnails"
+CUSTOM_DIR="$XDG_CONFIG_HOME/hypr/custom"
+RESTORE_SCRIPT_DIR="$CUSTOM_DIR/scripts"
+RESTORE_SCRIPT="$RESTORE_SCRIPT_DIR/__restore_video_wallpaper.sh"
+
+VIDEO_OPTS="no-audio loop hwdec=auto scale=bilinear interpolation=no video-sync=display-resample panscan=1.0 video-scale-x=1.0 video-scale-y=1.0 video-align-x=0.5 video-align-y=0.5"
+
+mkdir -p "$THUMBNAIL_DIR"
+mkdir -p "$RESTORE_SCRIPT_DIR"
+
+is_video() {
+	local extension="${1##*.}"
+	[[ "$extension" == "mp4" || "$extension" == "mkv" || "$extension" == "webm" ]] && return 0 || return 1
+}
+
+kill_existing_mpvpaper() {
+    # Abort all mpvpapers' instance
+    pkill -f -9 mpvpaper || true
+}
+
+create_restore_script() {
+	local video_path=$1
+
+	cat > "$RESTORE_SCRIPT.tmp" << EOF
+#!/bin/bash
+# Generated by switchwall.sh - Don't modify it by yourself.
+# Time: $(date)
+
+pkill -f -9 mpvpaper
+
+for monitor in \$(hyprctl monitors -j | jq -r '.[] | .name'); do
+    mpvpaper -o "$VIDEO_OPTS" "\$monitor" "$video_path" &
+    sleep 0.1
+done
+EOF
+
+	mv "$RESTORE_SCRIPT.tmp" "$RESTORE_SCRIPT"
+	chmod +x "$RESTORE_SCRIPT"
+}
+
+remove_restore() {
+	cat > "$RESTORE_SCRIPT.tmp" << EOF
+#!/bin/bash
+# The content of this script will be generated by switchwall.sh - Don't modify it by yourself.	
+EOF
+
+	mv "$RESTORE_SCRIPT.tmp" "$RESTORE_SCRIPT"
+}
+
 switch() {
 	imgpath=$1
 	read scale screenx screeny screensizey < <(hyprctl monitors -j | jq '.[] | select(.focused) | .scale, .x, .y, .height' | xargs)
@@ -17,16 +66,63 @@ switch() {
 		exit 0
 	fi
 
-	# agsv1 run-js "wallpaper.set('')"
-	# sleep 0.1 && agsv1 run-js "wallpaper.set('${imgpath}')" &
-	swww img "$imgpath" --transition-step 100 --transition-fps 120 \
-		--transition-type grow --transition-angle 30 --transition-duration 1 \
-		--transition-pos "$cursorposx, $cursorposy_inverted"
+	kill_existing_mpvpaper
+
+	if is_video "$imgpath"; then
+		missing_deps=()
+		if ! command -v mpvpaper &> /dev/null; then
+			missing_deps+=("mpvpaper")
+		fi
+
+		if ! command -v ffmpeg &> /dev/null; then
+			missing_deps+=("ffmpeg")
+		fi
+
+		if [ ${#missing_deps[@]} -gt 0 ]; then
+			echo "Missing deps: ${missing_deps[*]}"
+			echo "Arch: "
+			echo "	yay -S ${missing_deps[*]}"
+			exit 0
+		fi
+
+		local video_path=$1
+		
+		monitors=$(hyprctl monitors -j | jq -r '.[] | .name')
+
+		for monitor in $monitors; do
+			mpvpaper -o "$VIDEO_OPTS" "$monitor" "$video_path" &
+			sleep 0.1
+		done
+
+		# We take the first frame of video to colorgen
+		thumbnail="$THUMBNAIL_DIR/$(basename "$imgpath").jpg"
+		ffmpeg -y -i "$imgpath" -vframes 1 "$thumbnail" 2>/dev/null
+
+		if [ -f "$thumbnail" ]; then
+			"$CONFIG_DIR"/scripts/color_generation/colorgen.sh "$thumbnail" --apply --smart
+			create_restore_script "$video_path" 
+		else
+			echo "Cannot create image to colorgen"
+		fi
+	else
+		# agsv1 run-js "wallpaper.set('')"
+		# sleep 0.1 && agsv1 run-js "wallpaper.set('${imgpath}')" &
+		swww img "$imgpath" --transition-step 100 --transition-fps 120 \
+			--transition-type grow --transition-angle 30 --transition-duration 1 \
+			--transition-pos "$cursorposx, $cursorposy_inverted"
+
+		"$CONFIG_DIR"/scripts/color_generation/colorgen.sh "$imgpath" --apply --smart
+		remove_restore
+	fi
 }
 
 if [ "$1" == "--noswitch" ]; then
-	imgpath=$(swww query | awk -F 'image: ' '{print $2}')
-	# imgpath=$(agsv1 run-js 'wallpaper.get(0)')
+	if pgrep -f mpvpaper > /dev/null; then
+		imgpath=$(ps -eo cmd | grep mpvpaper | grep -v grep | awk '{for(i=NF;i>0;i--) if($i!~/^-/) {print $i; break}}')
+	else
+		imgpath=$(swww query | awk -F 'image: ' '{print $2}')
+		# imgpath=$(agsv1 run-js 'wallpaper.get(0)')
+	fi
 elif [[ "$1" ]]; then
 	switch "$1"
 else
@@ -35,6 +131,3 @@ else
     cd "$(xdg-user-dir PICTURES)/Wallpapers" || cd "$(xdg-user-dir PICTURES)" || return 1
 	switch "$(yad --width 1200 --height 800 --file --add-preview --large-preview --title='Choose wallpaper')"
 fi
-
-# Generate colors for ags n stuff
-"$CONFIG_DIR"/scripts/color_generation/colorgen.sh "${imgpath}" --apply --smart
diff --git a/.config/hypr/custom/scripts/__restore_video_wallpaper.sh b/.config/hypr/custom/scripts/__restore_video_wallpaper.sh
new file mode 100644
index 000000000..ea4b4fbd3
--- /dev/null
+++ b/.config/hypr/custom/scripts/__restore_video_wallpaper.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+# The content of this script will be generated by switchwall.sh - Don't modify it by yourself.
diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf
index aa7c076c8..b34a3fb97 100644
--- a/.config/hypr/hyprland.conf
+++ b/.config/hypr/hyprland.conf
@@ -15,4 +15,3 @@ source=~/.config/hypr/custom/execs.conf
 source=~/.config/hypr/custom/general.conf
 source=~/.config/hypr/custom/rules.conf
 source=~/.config/hypr/custom/keybinds.conf
-
diff --git a/.config/hypr/hyprland/execs.conf b/.config/hypr/hyprland/execs.conf
index 232f7e1da..1c3ab3b14 100644
--- a/.config/hypr/hyprland/execs.conf
+++ b/.config/hypr/hyprland/execs.conf
@@ -1,5 +1,6 @@
 # Bar, wallpaper
 exec-once = swww-daemon --format xrgb
+exec-once = bash ~/.config/hypr/custom/scripts/__restore_video_wallpaper.sh
 exec-once = /usr/lib/geoclue-2.0/demos/agent & gammastep
 exec-once = agsv1 &