diff --git a/Makefile b/Makefile
index 9bed463..daff010 100644
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,8 @@ PROJECTS_ROOT := $(HOME)/Projects
 DOCUMENTS_ROOT := $(HOME)/Documents
 PICTURES_ROOT := $(HOME)/Pictures
 SCREENSHOTS_ROOT := $(PICTURES_ROOT)/Screenshots
+WALLPAPERS_ROOT := $(PICTURES_ROOT)/Wallpapers
+LOCKSCREENS_ROOT := $(PICTURES_ROOT)/Lockscreens
 PERSONAL_PROJECTS_ROOT := $(PROJECTS_ROOT)/Personal
 PRACTICE_PROJECTS_ROOT := $(PERSONAL_PROJECTS_ROOT)/Mixed\ Technology/Practice
 COPY_TOOL := pbcopy
@@ -361,6 +363,14 @@ oh_my_fish: check_os
 	@curl https://raw.githubusercontent.com/oh-my-fish/oh-my-fish/master/bin/install | fish
 	@fish -c "omf install"
 
+.PHONY: wallpapers_and_lockscreens
+wallpapers_and_lockscreens: check_os
+	@echo "Copying default wallpapers and lockscreens..."
+	@mkdir -p $(WALLPAPERS_ROOT)
+	@mkdir -p $(LOCKSCREENS_ROOT)
+	@cp /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png $(WALLPAPERS_ROOT)
+	@cp /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png $(LOCKSCREENS_ROOT)
+
 .PHONY: homebrew
 homebrew: check_os
 	@echo "Installing homebrew..."
diff --git a/symlinks/config/sway/conf.d/03_wallpaper b/symlinks/config/sway/conf.d/03_wallpaper
new file mode 100644
index 0000000..7ae2867
--- /dev/null
+++ b/symlinks/config/sway/conf.d/03_wallpaper
@@ -0,0 +1 @@
+exec swaybg -i "$(shuf -n1 -e ~/Pictures/Wallpapers/*.png)" -m fill
diff --git a/symlinks/config/sway/conf.d/20_lockconfig b/symlinks/config/sway/conf.d/20_lockconfig
index 73bc1d6..67344be 100644
--- a/symlinks/config/sway/conf.d/20_lockconfig
+++ b/symlinks/config/sway/conf.d/20_lockconfig
@@ -1,5 +1,5 @@
 # Define locker script
-set $locker ~/bin/lockscreen
+set $locker swaylock -f -i "$(shuf -n1 -e ~/Pictures/Lockscreens/*.png)" -s fill
 bindsym $alt+L exec $locker
 
 # IDLE CONFIG
diff --git a/symlinks/config/sway/config b/symlinks/config/sway/config
index 1eb5cb9..ffcdb86 100644
--- a/symlinks/config/sway/config
+++ b/symlinks/config/sway/config
@@ -1,7 +1,5 @@
 # Read `man 5 sway` for a complete reference.
 
-exec ~/.azotebg
-
 # Font for window titles. Will also be used by the bar unless a different font
 # is used in the bar {} block below.
 font pango:Cantarell 12px