diff --git a/swaylock/config.bak b/swaylock/config.bak
new file mode 100644
index 0000000..88da4e4
--- /dev/null
+++ b/swaylock/config.bak
@@ -0,0 +1,37 @@
+image=/home/nick/build/nord-backgrounds/avogadr.io/1920x1080/caffeine.png
+font=Kanit Medium
+indicator-radius=100
+indicator-thickness=20
+#indicator-idle-visible
+#no-unlock-indicator
+
+inside-color=4c566aee
+inside-clear-color=b48eadee
+inside-ver-color=8fbcbbee
+inside-wrong-color=bf616aee
+line-uses-inside
+
+key-hl-color=88c0d0ee
+layout-border-color=434c5eee
+
+ring-color=8fbcbbee
+ring-clear-color=ebcb8bee
+ring-ver-color=8fbcbbee
+ring-wrong-color=bf616aee
+separator-color=5e81acee
+
+text-color=d8dee9ee
+text-clear-color=2e3440ee
+text-ver-color=2e3440ee
+text-wrong-color=2e3440ee
+
+# Swaylock Effects options
+timestr=%H:%M
+datestr=%a %d %b
+fade-in=1
+grace=5
+indicator
+clock
+screenshots
+#effect-pixelate=5
+effect-blur=5x10
diff --git a/wal/templates/colors-swaylock b/wal/templates/colors-swaylock
new file mode 100644
index 0000000..0e2278a
--- /dev/null
+++ b/wal/templates/colors-swaylock
@@ -0,0 +1,37 @@
+image=/home/nick/build/nord-backgrounds/avogadr.io/1920x1080/caffeine.png
+font=Kanit Medium
+indicator-radius=100
+indicator-thickness=20
+#indicator-idle-visible
+#no-unlock-indicator
+
+inside-color={background.strip}ee
+inside-clear-color={color2.strip}ee
+inside-ver-color={color6.strip}ee
+inside-wrong-color={color2.strip}ee
+line-uses-inside
+
+key-hl-color={color4.strip}ee
+layout-border-color={color4.strip}ee
+
+ring-color={color6.strip}ee
+ring-clear-color={color2.strip}ee
+ring-ver-color={color6.strip}ee
+ring-wrong-color={color2.strip}ee
+separator-color={color5.strip}ee
+
+text-color={foreground.strip}
+text-clear-color={foreground.strip}
+text-ver-color={foreground.strip}
+text-wrong-color={foreground.strip}
+
+# Swaylock Effects options
+timestr=%H:%M
+datestr=%a %d %b
+fade-in=1
+grace=5
+indicator
+clock
+screenshots
+#effect-pixelate=5
+effect-blur=5x10
diff --git a/waybar/config.siji b/waybar/config.siji
new file mode 100644
index 0000000..b259631
--- /dev/null
+++ b/waybar/config.siji
@@ -0,0 +1,234 @@
+// -*- mode: json -*-
+[
+{
+	"layer": "bottom",
+	"position": "left",
+	"margin-top": 0,
+	"margin-left": 0,
+	"margin-bottom": 0,
+	"modules-left": ["wlr/taskbar"],
+	//"modules-center": ["sway/window"],
+	"modules-right": ["tray"],
+	"wlr/taskbar": {
+		"all-outputs": false,
+		"format": "{icon}",
+		"icon-theme": "Zafiro",
+		"icon-size": 16,
+		"on-click": "activate",
+		"on-middle-click": "close",
+		"on-right-click": "minimize"
+	},
+	"sway/window": {
+		"rotate": 90
+	},
+	"tray": {
+		"icon-size": 14,
+		"spacing": 10
+	}
+},
+{
+	"layer": "bottom",
+	"position": "top",
+	"margin-top": 0,
+	"margin-right": 0,
+	"margin-left": 0,
+	"modules-left": [
+		"sway/workspaces",
+		"custom/separator",
+		"idle_inhibitor",
+		"custom/separator",
+		"sway/mode"
+	],
+	"modules-center": [
+		"cpu",
+		"custom/separator",
+		"memory",
+		"custom/swap",
+		"custom/separator",
+		"clock",
+		"custom/separator",
+		"disk#1",
+		"disk#2",
+		"custom/separator",
+		"battery"
+	],
+	"modules-right": [
+		"custom/covid",
+		"custom/separator",
+		"custom/weather",
+		"custom/separator",
+		"custom/updates",
+		"custom/auroch",
+		"custom/separator",
+		"backlight",
+		"custom/separator",
+		"pulseaudio",
+		"custom/separator",
+		//"tray",
+		//"custom/separator",
+		"custom/reboot",
+		"custom/shutdown"
+	],
+	"sway/workspaces": {
+		"disable-scroll": true,
+ 		"all-outputs": true,
+ 		"format": "{name} {icon}",
+		"format-icons": {
+			"1": "",
+			"2": "",
+			"3": "",
+			"4": "",
+			"urgent": "",
+			"focused": "",
+			"default": ""
+		}
+	},
+	"idle_inhibitor": {
+		"format": "{icon}",
+		"format-icons": {
+			"activated": "",
+			"deactivated": ""
+		}
+	},
+	"sway/mode": {
+		"format": "{}"
+	},
+	"backlight": {
+		"format": "{icon} {percent}%",
+		"format-icons": ["", ""],
+		"on-scroll-up": "brightnessctl set +5%",
+		"on-scroll-down": "brightnessctl set 5%-"
+	},
+	"clock": {
+		"format": "{:%a %d %b %H:%M}",
+		"tooltip": true
+	},
+	"pulseaudio": {
+		"format": "{icon} {volume}%  {format_source}",
+		"format-bluetooth": "{icon} {volume}%  {format_source}",
+		"format-bluetooth-muted": " {icon}  {format_source}",
+		"format-muted": " {format_source}",
+		"format-source": " {volume}%",
+		"format-source-muted": " -",
+		"format-icons": {
+			"headphone": "",
+			"headset": "",
+			"default": [
+				"",
+				"",
+				""
+			]
+		},
+		"on-click": "pavucontrol"
+	},
+	"memory": {
+		"states": {
+			"good": 0,
+			"warning": 60,
+			"critical": 80
+		},
+		"interval": 5,
+		"format": " {}%"
+	},
+	"cpu": {
+		"states": {
+			"good": 0,
+			"warning": 70,
+			"critical": 95
+		},
+		"interval": 1,
+		"format": " {usage:2}%"
+	},
+	"battery": {
+		"states": {
+			"good": 100,
+			"warning": 30,
+			"critical": 15
+		},
+		"format": "{icon} {capacity}%",
+		"format-icons": [
+			"",
+			"",
+			"",
+			"",
+			""
+		]
+	},
+	"disk#1": {
+		"states": {
+			"good": 0,
+			"warning": 70,
+			"critical": 95
+		},
+		"interval": 5,
+		"format": "  {percentage_used:2}%",
+		"path": "/"
+	},
+	"disk#2": {
+		"states": {
+			"good": 0,
+			"warning": 70,
+			"critical": 95
+		},
+		"interval": 5,
+		"format": "  {percentage_used:2}%",
+		"path": "/home"
+	},
+	"custom/updates": {
+		"format": " {}",
+		"return-type": "json",
+		"interval": 5,
+		"exec": "cat ~/tmp/updates.json",
+		"exec-if": "file  ~/tmp/updates.json",
+		"on-click": "kitty --class aptus-upgrade ~/.config/waybar/modules/updates/updates.sh; systemctl --user start updates.service",
+		"tooltip": true
+	},
+	"custom/auroch": {
+		"format": "  {}",
+		"return-type": "json",
+		"exec": "cat ~/tmp/auroch.json",
+		"exec-if": "file  ~/tmp/auroch.json",
+		"on-click": "systemctl --user start auroch.service",
+		"interval": 5,
+		"tooltip": true
+	},
+	"custom/swap": {
+		"format": " {}",
+		"interval": 5,
+		"exec": "free -h | grep Swap | awk '{print $3}'"
+	},
+	"custom/separator": {
+		"format": "",
+		"tooltip": false
+	},
+	"custom/shutdown": {
+		"format": "",
+		"on-click": "~/.config/waybar/modules/shutdown.sh",
+		"tooltip": false
+	},
+	"custom/reboot": {
+		"format": "",
+		"on-click": "~/.config/waybar/modules/reboot.sh",
+		"tooltip": false
+	},
+	"custom/weather": {
+		"format": "{}",
+		"exec": "~/.config/waybar/modules/weather.sh",
+		"interval": 3600
+	},
+	"custom/spotify": {
+		"interval": 1,
+		"return-type": "json",
+		"exec": "~/.config/waybar/modules/spotify.sh",
+		"exec-if": "pgrep spotify",
+		"escape": true
+	},
+	"custom/covid": {
+		"interval": 3600,
+		"exec": "~/.config/waybar/modules/covid/covid-checker ltla E07000012",
+		"return-type": "json",
+		"format": "{icon} {}",
+		"format-icons": ["", ""]
+	}
+}
+]