diff --git a/home-manager/modules/ezpcusr.nix b/home-manager/modules/ezpcusr.nix
index a66c2d5..4a5cb7a 100644
--- a/home-manager/modules/ezpcusr.nix
+++ b/home-manager/modules/ezpcusr.nix
@@ -368,124 +368,96 @@ in
           position = "left";
           height = null;
 
-          modules-left = [ "sway/workspaces" "custom/right-arrow-dark" "custom/right-arrow-light" "custom/weather-temp" "custom/weather-precip" "custom/weather-wind" "custom/right-arrow-dark" ];
-          modules-center = [ "custom/left-arrow-dark" "clock#1" "clock#2" "custom/left-arrow-light" "custom/left-arrow-dark" "mpd" "custom/right-arrow-dark" "custom/right-arrow-light" "clock#3" "custom/right-arrow-dark" ];
-          modules-right = [ "custom/left-arrow-dark" "pulseaudio" "custom/left-arrow-light" "custom/left-arrow-dark" "memory" "custom/left-arrow-light" "custom/left-arrow-dark" "cpu" "custom/left-arrow-light" "custom/left-arrow-dark" ] ++ lib.optionals cfg.battery [ "battery" "custom/left-arrow-light" "custom/left-arrow-dark" ] ++ [ "tray" ];
+          modules-left = [ "sway/workspaces" "custom/weather-temp" "custom/weather-precip" "custom/weather-wind" ];
+          modules-center = [ "clock#1" "clock#2" "mpd" "clock#3" ];
+          modules-right = [ "pulseaudio" "memory" "cpu" ] ++ lib.optionals cfg.battery [ "battery" ] ++ [ "tray" ];
 
-          modules =
-            let
-              checkWttr = "${pkgs.bash}/bin/bash -c '! (${pkgs.curl}/bin/curl wttr.in/${cfg.location}?format=+ | ${pkgs.gnugrep}/bin/grep \\'^Unknown location;\\')'";
-            in
-            {
-              "custom/left-arrow-dark" = {
-                format = "";
-                tooltip = false;
-                rotate = 270;
-              };
-              "custom/left-arrow-light" = {
-                format = "";
-                tooltip = false;
-                rotate = 270;
-              };
-              "custom/right-arrow-dark" = {
-                format = "";
-                tooltip = false;
-                rotate = 270;
-              };
-              "custom/right-arrow-light" = {
-                format = "";
-                tooltip = false;
-                rotate = 270;
-              };
+          modules = {
+            "custom/weather-temp" = {
+              exec = "${pkgs.curl}/bin/curl 'wttr.in/${cfg.location}?format=%c+%t' || echo ERR";
+              on-click = "${pkgs.xdg-utils}/bin/xdg-open 'https://weather.com/weather/today/l/85625'";
+              on-click-right = "${pkgs.xdg-utils}/bin/xdg-open 'https://wttr.in/${cfg.location}'";
+              interval = 900;
+            };
+            "custom/weather-precip" = {
+              exec = "${pkgs.curl}/bin/curl 'wttr.in/${cfg.location}?format=🌧️+%p'";
+              on-click = "${pkgs.xdg-utils}/bin/xdg-open 'https://www.lightningmaps.org/'";
+              on-click-right = "${pkgs.xdg-utils}/bin/xdg-open 'https://wttr.in/${cfg.location}'";
+              interval = 900;
+            };
+            "custom/weather-wind" = {
+              exec = "${pkgs.curl}/bin/curl 'wttr.in/${cfg.location}?format=🌬️+%w'";
+              on-click = "${pkgs.xdg-utils}/bin/xdg-open 'https://www.ventusky.com/";
+              on-click-right = "${pkgs.xdg-utils}/bin/xdg-open 'https://wttr.in/${cfg.location}'";
+              interval = 900;
+            };
 
-              "custom/weather-temp" = {
-                exec-if = checkWttr;
-                exec = "${pkgs.curl}/bin/curl 'wttr.in/${cfg.location}?format=%c+%t' || echo ERR";
-                on-click = "${pkgs.xdg-utils}/bin/xdg-open 'https://weather.com/weather/today/l/85625'";
-                on-click-right = "${pkgs.xdg-utils}/bin/xdg-open 'https://wttr.in/${cfg.location}'";
-                interval = 900;
-              };
-              "custom/weather-precip" = {
-                exec-if = checkWttr;
-                exec = "${pkgs.curl}/bin/curl 'wttr.in/${cfg.location}?format=🌧️+%p'";
-                on-click = "${pkgs.xdg-utils}/bin/xdg-open 'https://www.lightningmaps.org/'";
-                on-click-right = "${pkgs.xdg-utils}/bin/xdg-open 'https://wttr.in/${cfg.location}'";
-                interval = 900;
-              };
-              "custom/weather-wind" = {
-                exec-if = checkWttr;
-                exec = "${pkgs.curl}/bin/curl 'wttr.in/${cfg.location}?format=🌬️+%w'";
-                on-click = "${pkgs.xdg-utils}/bin/xdg-open 'https://www.ventusky.com/";
-                on-click-right = "${pkgs.xdg-utils}/bin/xdg-open 'https://wttr.in/${cfg.location}'";
-                interval = 900;
-              };
-
-              mpd = {
-                rotate = 90;
-                max-length = 60;
-                format = "{stateIcon} {artist} - {title}";
-                format-stopped = "⏹ STOPPED";
-                state-icons = {
-                  paused = "";
-                  playing = "";
-                };
-              };
-
-              "sway/workspaces" = {
-                disable-scroll = true;
-              };
-
-              "clock#1" = {
-                tooltip = false;
-                format = "{:%a}";
-              };
-              "clock#2" = {
-                tooltip = false;
-                format = "{:%m-%d}";
-              };
-              "clock#3" = {
-                tooltip = false;
-                format = "{:%I:%M %p}";
-              };
-
-              pulseaudio = {
-                format = "{icon} {volume}%";
-                format-bluetooth = "{icon} {volume}%";
-                format-muted = "MUTE";
-                format-icons = {
-                  headphone = "";
-                  default = "";
-                };
-                on-click = "${pkgs.pulseaudio}/bin/pactl set-source-mute @DEFAULT_SOURCE@ toggle";
-                on-click-right = "${pkgs.pavucontrol}/bin/pavucontrol";
-              };
-
-              memory = {
-                interval = 10;
-                format = " {}%";
-              };
-
-              cpu = {
-                interval = 10;
-                format = " {usage}%";
-              };
-
-              battery = {
-                states = {
-                  good = 90;
-                  warning = 25;
-                  critical = 10;
-                };
-                format = "{icon} {capacity}%";
-                format-icons = [ "" "" "" "" "" ];
-              };
-
-              tray = {
-                icon-size = 18;
-                spacing = 5;
+            mpd = {
+              rotate = 90;
+              max-length = 60;
+              format = "{stateIcon} {artist} - {title}";
+              format-stopped = "⏹ STOPPED";
+              state-icons = {
+                paused = "";
+                playing = "";
               };
             };
 
+            "sway/workspaces" = {
+              disable-scroll = true;
+            };
+
+            "clock#1" = {
+              tooltip = false;
+              format = "{:%a}";
+            };
+            "clock#2" = {
+              tooltip = false;
+              format = "{:%m-%d}";
+            };
+            "clock#3" = {
+              tooltip = false;
+              format = "{:%I:%M %p}";
+            };
+
+            pulseaudio = {
+              format = "{icon} {volume}%";
+              format-bluetooth = "{icon} {volume}%";
+              format-muted = "MUTE";
+              format-icons = {
+                headphone = "";
+                default = "";
+              };
+              on-click = "${pkgs.pulseaudio}/bin/pactl set-source-mute @DEFAULT_SOURCE@ toggle";
+              on-click-right = "${pkgs.pavucontrol}/bin/pavucontrol";
+            };
+
+            memory = {
+              interval = 10;
+              format = " {}%";
+            };
+
+            cpu = {
+              interval = 10;
+              format = " {usage}%";
+            };
+
+            battery = {
+              states = {
+                good = 90;
+                warning = 25;
+                critical = 10;
+              };
+              format = "{icon} {capacity}%";
+              format-icons = [ "" "" "" "" "" ];
+            };
+
+            tray = {
+              icon-size = 18;
+              spacing = 5;
+            };
+          };
+
         } // cfg.waybarConfig)
       ];
 
@@ -495,18 +467,6 @@ in
           color: #${config.colors.base16.base06};
         }
 
-        #custom-right-arrow-dark,
-        #custom-left-arrow-dark {
-          color: #${config.colors.base16.base00};
-          font-size: 15px;
-        }
-        #custom-right-arrow-light,
-        #custom-left-arrow-light {
-          color: #${config.colors.base16.base01};
-          background: #${config.colors.base16.base00};
-          font-size: 15px;
-        }
-
         #workspaces,
         #clock.1,
         #clock.2,