diff --git a/bin/set-video-wallpaper b/bin/set-video-wallpaper
deleted file mode 100755
index 3b3ab13..0000000
--- a/bin/set-video-wallpaper
+++ /dev/null
@@ -1,5 +0,0 @@
-#! /bin/bash
-
-killall mpvpaper
-
-mpvpaper -o "no-audio" VGA-1 ~/Videos/Witcher-3.mp4
diff --git a/bin/set-wallpaper b/bin/set-wallpaper
new file mode 100755
index 0000000..bff411a
--- /dev/null
+++ b/bin/set-wallpaper
@@ -0,0 +1,39 @@
+#! /bin/bash
+
+arg=$1
+
+if [[ "$arg" == "" ]] ; then
+  echo "Usage: set-wallpaper [--restore]|[/path/to/image/or/video]"
+  exit
+fi
+
+set_wallpaper() {
+  killall mpvpaper 2>> /dev/null
+  killall swaybg 2>> /dev/null
+
+  echo $1
+  if [[ "$1" == *.mkv || "$1" == *.mov || "$1" == *mp4 ]] ; then
+    echo "Setting video wallpaper using mpvpaper"
+
+    /sbin/mpvpaper -o "no-audio" VGA-1 $1
+
+    echo "Video wallpaper has been set"
+  elif [[ "$1" == *.jpeg || "$1" == *.jpg || "$1" == *.png ]] ; then
+    echo "Setting image wallpaper using swaybg"
+
+    /sbin/swaybg -i $1 -m fill &
+
+    echo "Image wallpaper has been set"
+  fi
+}
+
+if [[ "$arg" == "--restore" ]] ; then
+  path=$(cat $HOME/.wallpaper)
+
+  set_wallpaper $path
+else
+  echo "$arg" > $HOME/.wallpaper
+
+  echo "Saved $arg as a wallpaper but you need to run 'set-wallpaper --restore'"
+fi
+
diff --git a/sway/config b/sway/config
index 552e4f3..b86365f 100644
--- a/sway/config
+++ b/sway/config
@@ -43,9 +43,6 @@ gaps inner 10
 floating_modifier $mod normal
 font FiraCode 10
 
-# Draw wallpaper
-# output * bg `$HOME/dotfiles/bin/get-random-wallpaper.py` fill
-
 # Keyboard layout
 input * {
   xkb_layout "us,ru"
@@ -87,7 +84,7 @@ for_window [class="MuPDF"] floating enable
 #
 exec_always --no-startup-id $HOME/.config/waybar/launch.sh
 exec_always --no-startup-id dunst
-exec_always --no-startup-id $HOME/dotfiles/bin/set-video-wallpaper
+exec_always --no-startup-id $HOME/dotfiles/bin/set-wallpaper --restore