diff --git a/setwll b/setwll
index 1500472..5dae995 100755
--- a/setwll
+++ b/setwll
@@ -65,18 +65,25 @@ fi
 
 
 if [ "$WAYLAND_DISPLAY" ]; then
-    current_wal="$(hyprctl hyprpaper listactive | grep HDMI-A-1 | sed 's/HDMI-A-1 = //')"
-    hyprctl hyprpaper preload $primary
-    hyprctl hyprpaper wallpaper "HDMI-A-1,$primary"
-    if [ $unload == 1 ]; then
-        hyprctl hyprpaper unload "$current_wal"
-    fi
+    if [ "$XDG_CURRENT_DESKTOP" == "sway:wlroots" ]; then
+        PID=$(pidof swaybg)
+        swaybg -o HDMI-A-1 -i $primary -m fill -o DP-1 -i $secondary -m fill & disown
+        sleep 0.4s
+        kill $PID
+    else
+        current_wal="$(hyprctl hyprpaper listactive | grep HDMI-A-1 | sed 's/HDMI-A-1 = //')"
+        hyprctl hyprpaper preload $primary
+        hyprctl hyprpaper wallpaper "HDMI-A-1,$primary"
+        if [ $unload == 1 ]; then
+            hyprctl hyprpaper unload "$current_wal"
+        fi
 
-    current_wal="$(hyprctl hyprpaper listactive | grep DP-1 | sed 's/DP-1 = //')"
-    hyprctl hyprpaper preload $secondary
-    hyprctl hyprpaper wallpaper "DP-1,$secondary"
-    if [ $unload == 1 ]; then
-        hyprctl hyprpaper unload "$current_wal"
+        current_wal="$(hyprctl hyprpaper listactive | grep DP-1 | sed 's/DP-1 = //')"
+        hyprctl hyprpaper preload $secondary
+        hyprctl hyprpaper wallpaper "DP-1,$secondary"
+        if [ $unload == 1 ]; then
+            hyprctl hyprpaper unload "$current_wal"
+        fi
     fi
 else
     if [ -z "$1" ]; then
diff --git a/targets/waybar.sh b/targets/waybar.sh
index d2d354d..bc56d5e 100755
--- a/targets/waybar.sh
+++ b/targets/waybar.sh
@@ -33,6 +33,11 @@ printf "* {
   border-radius: 5px;
 }
 
+#workspaces button.focused {
+  color: $color14;
+  border-radius: 5px;
+}
+
 button {
   background: transparent;
 }
diff --git a/themes/forest2.sh b/themes/forest2.sh
new file mode 100755
index 0000000..45100ff
--- /dev/null
+++ b/themes/forest2.sh
@@ -0,0 +1,36 @@
+# Shell variables
+# Generated by 'wal'
+wallpaper='/home/iceyrazor/stuff/media/wallpapers/forest-wallhaven-md3r6y.jpg'
+
+# Special
+background='#0F0E0C'
+foreground='#c5aaa2'
+cursor='#c5aaa2'
+
+# Colors
+color0='#0F0E0C'
+color1='#51342D'
+color2='#44453F'
+color3='#575355'
+color4='#94370A'
+color5='#A74914'
+color6='#E0570D'
+color7='#c5aaa2'
+color8='#897671'
+color9='#51342D'
+color10='#44453F'
+color11='#575355'
+color12='#94370A'
+color13='#A74914'
+color14='#E0570D'
+color15='#c5aaa2'
+
+# FZF colors
+export FZF_DEFAULT_OPTS="
+    $FZF_DEFAULT_OPTS
+    --color fg:7,bg:0,hl:1,fg+:232,bg+:1,hl+:255
+    --color info:7,prompt:2,spinner:1,pointer:232,marker:1
+"
+
+# Fix LS_COLORS being unreadable.
+export LS_COLORS="${LS_COLORS}:su=30;41:ow=30;42:st=30;44:"
diff --git a/themes/sand.sh b/themes/sand.sh
new file mode 100755
index 0000000..a7ba683
--- /dev/null
+++ b/themes/sand.sh
@@ -0,0 +1,36 @@
+# Shell variables
+# Generated by 'wal'
+wallpaper='/home/iceyrazor/out.png'
+
+# Special
+background='#161316'
+foreground='#dedddc'
+cursor='#dedddc'
+
+# Colors
+color0='#161316'
+color1='#968773'
+color2='#C7977A'
+color3='#77838D'
+color4='#A4A1A1'
+color5='#BABBBE'
+color6='#D1C6B9'
+color7='#dedddc'
+color8='#9b9a9a'
+color9='#968773'
+color10='#C7977A'
+color11='#77838D'
+color12='#A4A1A1'
+color13='#BABBBE'
+color14='#D1C6B9'
+color15='#dedddc'
+
+# FZF colors
+export FZF_DEFAULT_OPTS="
+    $FZF_DEFAULT_OPTS
+    --color fg:7,bg:0,hl:1,fg+:232,bg+:1,hl+:255
+    --color info:7,prompt:2,spinner:1,pointer:232,marker:1
+"
+
+# Fix LS_COLORS being unreadable.
+export LS_COLORS="${LS_COLORS}:su=30;41:ow=30;42:st=30;44:"