diff --git a/depot/hosts/yule/home/base16.nix b/depot/hosts/yule/home/base16.nix
index f12e97f5..e92cfee0 100644
--- a/depot/hosts/yule/home/base16.nix
+++ b/depot/hosts/yule/home/base16.nix
@@ -1,5 +1,5 @@
 { config, ... }:
 
 {
-  base16.alias.default = "tomorrow.tomorrow";
+  base16.alias.default = "atelier.atelier-cave-light";
 }
diff --git a/depot/users/kat/base/base16.nix b/depot/users/kat/base/base16.nix
index d2e518d3..cc20a88c 100644
--- a/depot/users/kat/base/base16.nix
+++ b/depot/users/kat/base/base16.nix
@@ -3,9 +3,9 @@
 {
   base16 = {
     shell.enable = true;
-    schemes = [ "tomorrow.tomorrow-night-eighties" "tomorrow.tomorrow" ];
-    alias.light = "tomorrow.tomorrow";
-    alias.dark = "tomorrow.tomorrow-night-eighties";
+    schemes = [ "atelier.atelier-cave" "atelier.atelier-cave-light" "tomorrow.tomorrow-night-eighties" "tomorrow.tomorrow" ];
+    alias.light = "atelier.atelier-cave-light";
+    alias.dark = "atelier.atelier-cave";
   };
   #  home.base16-shell = {
   #    enable = true;
diff --git a/depot/users/kat/sway/waybar/default.nix b/depot/users/kat/sway/waybar/default.nix
index ddcf6672..651df79a 100644
--- a/depot/users/kat/sway/waybar/default.nix
+++ b/depot/users/kat/sway/waybar/default.nix
@@ -34,7 +34,7 @@ in
         modules = {
           "sway/workspaces" = { format = "{name}"; };
           "sway/window" = {
-            format = " {}";
+           format = " {}";
             max-length = 50;
           };
           #"custom/weather" = {
@@ -49,13 +49,13 @@ in
             spacing = 2;
           };
           "custom/gpg-status" = {
-            format = " {}";
+            format = "{}";
             interval = 300;
             return-type = "json";
             exec = "${pkgs.kat-gpg-status}/bin/kat-gpg-status";
           };
           "custom/konawall" = {
-            format = "  {}";
+            format = "{}";
             interval = "once";
             return-type = "json";
             exec = "${pkgs.konawall-toggle}/bin/konawall-status";
@@ -83,7 +83,7 @@ in
             };
           };
           backlight = {
-            format = "BL {percent}%";
+            format = "{icon} {percent}%";
             format-icons = [ "" "" ];
             on-scroll-up = "${pkgs.light}/bin/light -A 1";
             on-scroll-down = "${pkgs.light}/bin/light -U 1";
@@ -114,7 +114,7 @@ in
           };
           network = {
             format-wifi = "直";
-            format-ethernet = " {ifname}";
+            format-ethernet = "";
             format-linked = " {ifname} (NO IP)";
             format-disconnected = " DC";
             format-alt = "{ifname}: {ipaddr}/{cidr}";
@@ -133,19 +133,19 @@ in
             interval = 1;
           };
           "clock#arc" = {
-            format = "♡-{:%H}";
+            format = "♥-{:%H}";
             tooltip = true;
             timezone = "America/Vancouver";
             tooltip-format = "{:%A, %F %R %z (%Z)}";
           };
           "clock#miku" = {
-            format = "♡+{:%H}";
+            format = "♥+{:%H}";
             tooltip = true;
             timezone = "Pacific/Auckland";
             tooltip-format = "{:%A, %F %R %z (%Z)}";
           };
           "clock#hex" = {
-            format = "♡+{:%H}";
+            format = "♥+{:%H}";
             tooltip = true;
             timezone = "Europe/Berlin";
             tooltip-format = "{:%A, %F %R %z (%Z)}";
diff --git a/depot/users/kat/sway/waybar/waybar.css.nix b/depot/users/kat/sway/waybar/waybar.css.nix
index f9b588cf..ef6962e0 100644
--- a/depot/users/kat/sway/waybar/waybar.css.nix
+++ b/depot/users/kat/sway/waybar/waybar.css.nix
@@ -35,7 +35,7 @@ in ''
 
   .modules-left, .modules-center, .modules-right {
     margin: 2px 8px;
-    background: ${hextorgba base16.base00 0.75};
+    background: ${hextorgba base16.base00 0.85};
     border-radius: 6px;
   }
 
@@ -49,7 +49,7 @@ in ''
 
   tooltip {
     padding: 2px;
-    background: ${hextorgba base16.base00 0.75};
+    background: ${hextorgba base16.base00 0.85};
     border-radius: 6px;
   }
 
@@ -97,9 +97,9 @@ in ''
     color: ${base16.base0D};
   }
 
-  #clock.arc { ${bcolor base16.base0D} }
+  #clock.arc { ${bcolor base16.base0B} }
   #clock.miku { ${bcolor base16.base0C} }
-  #clock.hex { ${bcolor base16.base0E} }
+  #clock.hex { ${bcolor base16.base0F} }
   #custom-konawall.enabled { ${bcolor base16.base0E} }
   #custom-konawall.disabled { ${bcolor base16.base0D} }
   #idle_inhibitor.activated { ${bcolor base16.base0E} }
diff --git a/pkgs/kat-gpg-status/kat-gpg-status.sh b/pkgs/kat-gpg-status/kat-gpg-status.sh
index ce8b983d..0a8fceec 100644
--- a/pkgs/kat-gpg-status/kat-gpg-status.sh
+++ b/pkgs/kat-gpg-status/kat-gpg-status.sh
@@ -4,9 +4,9 @@ set -o pipefail
 
 if gpg --card-status &> /dev/null; then
 	user="$(gpg --card-status | grep 'Login data' | awk '{print $NF}')";
-	status='{"text": "", "alt": "User: '"$user"'", "class": "enabled"}'
+	status='{"text": "", "alt": "User: '"$user"'", "class": "enabled"}'
 else
-	status='{"text": "", "alt": "No card is connected.", "class": "disabled"}'
+	status='{"text": "", "alt": "No card is connected.", "class": "disabled"}'
 fi
 
 echo $status
diff --git a/pkgs/konawall-toggle/status.sh b/pkgs/konawall-toggle/status.sh
index 0c44b438..5e7c69a5 100644
--- a/pkgs/konawall-toggle/status.sh
+++ b/pkgs/konawall-toggle/status.sh
@@ -5,9 +5,9 @@ set -o pipefail
 sleep 0.5s
 
 if systemctl --user is-active konawall-rotation.timer --quiet; then
-	status='{"text": "", "alt": "Konawall is enabled.", "class": "enabled"}'
+	status='{"text": "", "alt": "Konawall is enabled.", "class": "enabled"}'
 else
-	status='{"text": "", "alt": "Konawall is disabled.", "class": "disable"}'
+	status='{"text": "", "alt": "Konawall is disabled.", "class": "disabled"}'
 fi
 
 echo $status