diff --git a/apps/gui/waybar.nix b/apps/gui/waybar.nix
index fc651edc0059727b61aa0e8bae8d22197bd26d8e..abb7fa0a7ffa90d4a72b8905fd4c1ea4b410efc6 100644
--- a/apps/gui/waybar.nix
+++ b/apps/gui/waybar.nix
@@ -3,26 +3,10 @@ {
   programs.waybar = {
     enable = true;
     settings.bar = {
-      network = {
-        format-alt = "{icon} {signalStrength}%";
-        tooltip-format-wifi = "{icon} {essid} {signalStrength}%";
-        format = "{icon}";
-        format-disabled = "󰤭";
-        on-click-right = "${pkgs.lib.getExe' pkgs.networkmanagerapplet "nm-connection-editor"}";
-        format-icons = [
-          "󰤯"
-          "󰤟"
-          "󰤢"
-          "󰤥"
-          "󰤨"
-        ];
-      };
       backlight = {
         device = "intel_backlight";
-        format-alt = "{icon} {percent}%";
         format = "{icon}";
         format-icons = [
-          ""
           ""
           ""
           ""
@@ -32,12 +16,11 @@           ""
           ""
           ""
           ""
-          ""
         ];
       };
       battery = {
-        format-alt = "{icon} {capacity}%";
         format = "{icon}";
+        format-alt = "{icon}";
         format-charging = "󰂄";
         format-icons = [
           "󰁺"
@@ -57,8 +40,8 @@           warning = 30;
         };
       };
       clock = {
-        format = "󰥔 {:%I:%M %p}";
-        format-alt = " {:%m/%d/%Y}";
+        format = "🕒 {:%I:%M %p}";
+        format-alt = "📅 {:%m/%d/%Y}";
         timezone = "America/Chicago";
         tooltip-format = "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>";
       };
@@ -70,7 +53,6 @@       };
       "custom/power" = {
         format = "⏻";
         on-click = "${pkgs.lib.getExe pkgs.wlogout} &";
-        on-click-right = "swaylock & systemctl suspend";
         tooltip = false;
       };
       layer = "top";
@@ -78,7 +60,6 @@       modules-right = [
         "pulseaudio"
         "backlight"
         "battery"
-        "network"
         "clock"
         "tray"
         "custom/lock"
@@ -86,8 +67,7 @@         "custom/power"
       ];
       position = "top";
       pulseaudio = {
-        format-alt = "{icon} {volume}%";
-        format = "{icon}";
+        format = "{icon}  {volume}%";
         format-icons = {
           default = [
             ""
@@ -96,7 +76,7 @@             " "
           ];
         };
         format-muted = "";
-        on-click-right = "${pkgs.lib.getExe pkgs.pavucontrol}";
+        on-click = "${pkgs.lib.getExe pkgs.pavucontrol}";
       };
       tray = {
         icon-size = 21;
@@ -116,7 +96,6 @@         color: @text;
         margin: 5px 5px;
       }
 
-      #network,
       #tray,
       #backlight,
       #clock,
@@ -153,10 +132,6 @@       }
 
       #backlight, #battery {
           border-radius: 0;
-      }
-
-      #network {
-        color: @lavender;
       }
 
       #pulseaudio {
diff --git a/apps/gui/wlogout.nix b/apps/gui/wlogout.nix
index 4de9aa5599abc4298b327caae0a4a55c8e79459a..54fe8b3c73d0d1e725982f74870f88fffa75f51b 100644
--- a/apps/gui/wlogout.nix
+++ b/apps/gui/wlogout.nix
@@ -28,7 +28,7 @@         "keybind" = "s";
       }
       {
         "label" = "suspend";
-        "action" = "swaylock & systemctl suspend";
+        "action" = "systemctl suspend";
         "text" = "Suspend";
         "keybind" = "u";
       }