diff --git a/home/modules/baseline.nix b/home/modules/baseline.nix
index 1d4f0b1..b4bdc1f 100644
--- a/home/modules/baseline.nix
+++ b/home/modules/baseline.nix
@@ -34,7 +34,6 @@ in {
         zip
       ];
       keyboard = {
-        #TODO switch to normal people variant
         layout = "us";
         variant = "altgr-intl";
       };
diff --git a/home/modules/gui/sway.nix b/home/modules/gui/sway.nix
index 90e0109..0bb16dc 100644
--- a/home/modules/gui/sway.nix
+++ b/home/modules/gui/sway.nix
@@ -57,7 +57,7 @@ in {
         input = {
           "*" = {
             xkb_layout = "us";
-            xkb_variant = "altgr-intl"; #TODO change to normal ppl keeb too
+            xkb_variant = "altgr-intl";
           };
         };
 
diff --git a/home/modules/gui/waybar.nix b/home/modules/gui/waybar.nix
index 9aa66a1..eb73361 100644
--- a/home/modules/gui/waybar.nix
+++ b/home/modules/gui/waybar.nix
@@ -65,7 +65,7 @@ in {
             icon-size = 12;
           };
         };
-      }; #TODO font negro n shit
+      };
       style = ''
         * {
           font-family: "JetBrains Mono", monospace;
@@ -75,9 +75,9 @@ in {
           box-shadow: none;
         }
 
-        /* Entire bar: fully transparent, no border */
+        /* Entire bar: blacc, no border */
         window#waybar {
-          background: transparent;
+          background: #000000;
           color: #eaeaea;
           margin: 0;
           padding: 0;
@@ -118,11 +118,11 @@ in {
         #workspaces button.focused {
           background: rgba(255, 255, 255, 0.10);
           color: #ffffff;
-          border-bottom: 2px solid #ffffff;
+          box-shadow: inset 0 -2px #ffffff;
         }
         #workspaces button.urgent {
           background: rgba(255, 80, 80, 0.25);
-          border-bottom: 2px solid #ff5050;
+          box-shadow: inset 0 -2px #ff5050;
         }
 
         /* Focused window title: single line, no glow */
@@ -145,7 +145,7 @@ in {
         #clock, #battery, #network, #pulseaudio, #backlight, #cpu, #memory, #temperature, #tray {
           padding: 0 6px;
           margin: 0;
-          background: transparent;
+          background: #000000;
           color: #eaeaea;
         }