diff --git a/.config/waybar/config b/.config/waybar/config
index ca9ac18..4427970 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -6,7 +6,7 @@
     "modules-left": ["sway/workspaces", "sway/mode"],
     "modules-center": ["sway/window"],
     //"modules-right": ["tray", "custom/spotify", "custom/weather", "custom/mail", "custom/storage", "backlight", "pulseaudio", "network", "idle_inhibitor", "battery", "clock"],
-    "modules-right": ["pulseaudio", "backlight", "idle_inhibitor", "battery", "clock", "tray"],
+    "modules-right": ["pulseaudio", "backlight", "idle_inhibitor", "network", "battery", "clock", "tray"],
     "sway/mode": {
         "format": " {}"
     },
@@ -24,30 +24,46 @@
         "tooltip": false
     },
     "battery": {
-        "format": "{icon}  {capacity}%",
-        "format-alt": "{icon}  {timeTo}",
+        "format": "{icon} {capacity}%",
+        //"format-alt": "{icon} {timeTo}",
+
         "format-icons": ["", "", "", "", ""],
-        "format-charging": "  {capacity}%",
-        "format-charging-alt": "  {timeTo}%",
+        //"format-icons": ["", "", "", "", "", "", "", "", "", "", ""],
+
+        "format-charging": " {capacity}%",
+        "format-full": " {capacity}%",
+
         "interval": 10,
+
         "states": {
             "warning": 25,
             "critical": 10
         },
+
+        //"format-discharging-critical": " {capacity}%",
+
         "tooltip": true,
-        "tooltip-format": "{capacity} {timeTo}"
+        "tooltip-format": "Capacity: {capacity}%\n{timeTo}",
     },
     "network": {
         "format": "{icon}",
-        "format-alt": "{ipaddr}/{cidr} {icon}",
+
+        "format-alt": "{icon} {signalStrength}%",
         "format-alt-click": "click-right",
+
         "format-icons": {
-            "wifi": ["", "" ,""],
-            "ethernet": [""],
-            "disconnected": [""]
+            "wifi": [""],
+            "ethernet": [""],
+            "disconnected": [""]
         },
-        "on-click": "termite -e nmtui",
-    "tooltip": false
+
+        "interval": 10,
+
+        "on-click": "alacritty -e nmtui",
+
+        "tooltip": true,
+        "tooltip-format": "Connected via {ifname}\nIP: {ipaddr}/{cidr}\nBandwidth: {bandwidthDownBits} | {bandwidthUpBits}",
+        "tooltip-format-wifi": "Connected to {essid} on {ifname}\nSignal Strength: {signalStrength}% ({signaldBm}dBm)\nIP: {ipaddr}/{cidr}\nBandwidth: {bandwidthDownBits} | {bandwidthUpBits}",
     },
     "pulseaudio": {
         "format": "{icon}  {volume}%",
@@ -55,10 +71,10 @@
         "format-alt-click": "click-right",
         "format-muted": "ﱝ",
         "format-icons": {
-            "phone": [" ", " ", " ", " "],
+            //"phone": [" ", " ", " ", " "],
             "default": ["奄", "奔", "墳"]
         },
-        "scroll-step": 10,
+        "scroll-step": 5,
         "on-click": "pavucontrol-qt",
         "tooltip": false
     },
@@ -81,7 +97,7 @@
         "format": "{icon}",
         "format-alt": "{percent}% {icon}",
         "format-alt-click": "click-right",
-        "format-icons": ["", ""],
+        "format-icons": ["", "", ""],
         "on-scroll-down": "light -U 1",
         "on-scroll-up": "light -A 1"
     },