diff --git a/gui/waybar/thinkpad b/gui/waybar/thinkpad
index b63d598..161d134 100644
--- a/gui/waybar/thinkpad
+++ b/gui/waybar/thinkpad
@@ -33,14 +33,18 @@
     "network": {
         "interval": 2,
         "format-icons": ["󰤟 ", "󰤢 ", "󰤥 ", "󰤨 "],
-        "format-ethernet": "ETH: {bandwidthTotalBytes}",
-        "format-wifi": "WLAN: {icon}",
-        "tooltip-format": "DOWN: {bandwidthDownBits} UP: {bandwidthUpBits} IP: {ipaddr}"
+        "format-disconnected": "󰌙 ",
+        "format-ethernet": "󰌘 ",
+        "format-wifi": "{icon}",
+        "tooltip-format-wifi": "{essid} {ipaddr}  {bandwidthDownBits}  {bandwidthUpBits}",
+        "tooltip-format-ethernet": "{ipaddr} CAP: {bandwidthTotalBits}  {bandwidthDownBits}  {bandwidthUpBits}"
     },
     "battery": {
-        "format": "BAT: {capacity}%",
+        "format": "{icon} {capacity}%",
+        "format-charging": "󰂄 {capacity}%",
+        "format-icons": [ "󰂎", "󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"],
         "format-tooltip": "{timeTo}",
-        "format-time":  "{H} hours {M} minutes",
+        "format-time":  "{H}:{M}",
     },
     "custom/bg": {
         "exec": "echo -e '\uf1c5'",