diff --git a/config/foot/foot.ini b/config/foot/foot.ini
new file mode 100644
index 0000000..1d92e84
--- /dev/null
+++ b/config/foot/foot.ini
@@ -0,0 +1,3 @@
+[colors]
+alpha=0.75
+
diff --git a/config/sway/config b/config/sway/config
index 45a75f5..ab4572f 100644
--- a/config/sway/config
+++ b/config/sway/config
@@ -5,11 +5,14 @@ set $left a
 set $down s
 set $right d
 
+set $terminal foot
+
 # Basics
-bindsym --no-repeat $mod+Return exec alacritty
+bindsym --no-repeat $mod+Return exec $$terminal
 bindsym --no-repeat $mod+q kill
 bindsym --no-repeat $mod+Shift+c reload
 bindsym --no-repeat $mod+Shift+e exec swaynag -t warning -m 'Log out?' -B 'Log out.' 'swaymsg exit' -B 'Reboot' 'systemctl reboot' -B 'Shutdown' 'systemctl poweroff' -s 'Cancel'
+bindsym --no-repeat --inhibited $mod+Shift+z seat - shortcuts_inhibitor toggle
 floating_modifier $mod normal
 
 # Moving around
@@ -94,17 +97,40 @@ bindsym --no-repeat Mod1+Space exec qdbus org.kde.krunner /App display
 
 
 # ===================== Input/Output =======================
+# Keyboard
 input * {
     xkb_layout "us"
     xkb_options "compose:ralt"
 }
 
+# Touchpad
 input type:touchpad {
     tap enable
     natural_scroll disable
     middle_emulation enable
 }
 
+# Wallpaper
+# Sway insists on following the config file symlink for relative paths in bg clause
+# so have to give full path here.
+set $wallpaper ~/.config/sway/wallpaper
+
+output * bg $wallpaper fill
+
+# Lock screen and power saving
+set $swaylock_cmd "swaylock -f -i $wallpaper"
+
+bindsym --no-repeat $mod+k exec 'swaymsg "output * dpms on"'
+bindsym --no-repeat $mod+Shift+k exec 'swaymsg "output * dpms off"'
+bindsym --no-repeat $mod+l exec $swaylock_cmd
+exec swayidle -w \
+    timeout 600 $swaylock_cmd \
+    timeout 150 'swaymsg "output * dpms off"' \
+        resume 'swaymsg "output * dpms on"' \
+    before-sleep $swaylock_cmd \
+    after-resume 'swaymsg "output * dpms on"'
+
+
 # ===================== Status Bar =========================
 bar 1 {
     mode dock
@@ -117,6 +143,7 @@ bar 1 {
     }
 }
 
+
 # ===================== Window Rules =======================
 # Dialogs
 for_window [app_id="org.kde.dolphin" title="(Extracting Files|File Already Exists|Moving|Compressing .* files) .*" tiling] floating enable
@@ -129,6 +156,7 @@ for_window [app_id="org.keepassxc.KeePassXC" title="KeePassXC - Browser Access R
 for_window [app_id="org.kde.krunner"] floating enable
 for_window [app_id="org.kde.klipper"] floating enable
 
+
 # ====================== Autostart =========================
 exec /usr/lib/geoclue-2.0/demos/agent
 exec gammastep
@@ -140,16 +168,6 @@ exec /usr/lib/pam_kwallet_init
 exec dunst
 exec swayrd
 
-bindsym --no-repeat $mod+k exec 'swaymsg "output * dpms on"'
-bindsym --no-repeat $mod+Shift+k exec 'swaymsg "output * dpms off"'
-bindsym --no-repeat $mod+l exec 'swaylock -i ~/.config/sway/wallpaper'
-exec swayidle -w \
-    timeout 600 'swaylock -f -i ~/.config/sway/wallpaper' \
-    timeout 150 'swaymsg "output * dpms off"' \
-        resume 'swaymsg "output * dpms on"' \
-    before-sleep 'swaylock -f -i ~/.config/sway/wallpaper' \
-    after-resume 'swaymsg "output * dpms on"'
-
 
 # ======================= Include ===========================
 include /etc/sway/config.d/*
diff --git a/config/sway/local@hibari b/config/sway/local@hibari
new file mode 100644
index 0000000..59e43c6
--- /dev/null
+++ b/config/sway/local@hibari
@@ -0,0 +1,21 @@
+# vim: ft=i3
+
+input 0:0:silead_ts {
+    map_to_output DSI-1
+}
+
+output DSI-1 {
+    transform 90
+}
+
+bar 1 {
+    output DSI-1
+}
+
+# No xwayland
+xwayland disable
+
+
+# ====================== Autostart =========================
+exec ~/.local/bin/ffy
+
diff --git a/config/sway/local@hikage b/config/sway/local@hikage
index b8865e9..880ecd1 100644
--- a/config/sway/local@hikage
+++ b/config/sway/local@hikage
@@ -1,11 +1,6 @@
-# kak: filetype=i3
-# Sway insists on following the config file symlink for relative paths in bg clause
-# so have to give full path here.
-output * bg ~/.config/sway/wallpaper fill
-
+# vim: ft=i3
 bar 1 {
     output eDP-1
-    font pango:Noto Sans Mono, Font Awesome 5 Free, Font Awesome 5 Brands 12
     # Breeze is broken as of 2022-01-18
     icon_theme "Adwaita"
 }
@@ -14,8 +9,6 @@ bindsym --no-repeat $mod+Shift+w exec ensure-lvup /opt/virt-session/viewer Windo
 bindsym --no-repeat $mod+Shift+1 output eDP-1 mode 1920x1080
 bindsym --no-repeat $mod+Shift+2 output eDP-1 mode --custom 1280x720
 
-bindsym --no-repeat --inhibited $mod+Shift+z seat - shortcuts_inhibitor toggle
-
 bindsym --no-repeat $mod+Shift+Return exec wezterm
 
 for_window [app_id="virt-viewer"] inhibit_idle open
diff --git a/config/sway/status.toml@hibari b/config/sway/status.toml@hibari
new file mode 100644
index 0000000..34f4770
--- /dev/null
+++ b/config/sway/status.toml@hibari
@@ -0,0 +1,52 @@
+# vim: ft=toml
+
+theme = "solarized-dark"
+icons = "awesome5"
+
+[[block]]
+block = "networkmanager"
+on_click = "foot -e nmtui"
+
+[[block]]
+block = "memory"
+display_type = "memory"
+format_mem = "{mem_used_percents}"
+format_swap = "{swap_used_percents}"
+
+[[block]]
+block = "cpu"
+interval = 5
+
+[[block]]
+block = "disk_space"
+path = "/"
+alias = "/"
+info_type = "available"
+unit = "GB"
+interval = 20
+warning = 20.0
+alert = 10.0
+
+[[block]]
+block = "time"
+interval = 5
+format = "%a %d/%m %R"
+
+[[block]]
+block = "sound"
+
+[[block]]
+block = "backlight"
+
+#[[block]]
+#block = "hueshift"
+#hue_shifter = "gammastep"
+
+[[block]]
+block = "battery"
+interval = 30
+device = "axp288_fuel_gauge"
+
+[[block]]
+block = "notify"
+