diff --git a/waybar/.config/waybar/config.jsonc b/waybar/.config/waybar/config.jsonc
index 7560713..1e728a5 100644
--- a/waybar/.config/waybar/config.jsonc
+++ b/waybar/.config/waybar/config.jsonc
@@ -31,9 +31,9 @@
     "disable-scroll": true,
     "disable-markup": false,
     "all-outputs": true,
-    "format": " {icon} ",
-    "on-click": "activate",
     "sort-by-number": true,
+    "format": "{index}",
+    "on-click": "activate",
     "format-icons": {
       "1": "",
       "2": "",
@@ -121,12 +121,17 @@
   },
   "network": {
     "interval": 1,
-    "format-wifi": "{essid} ",
-    "format-ethernet": "{ifname} ({ipaddr}) 󰈀",
-    "format-linked": "{essid} (No IP) 󰈁",
-    "format-disconnected": "Disconnected ⚠",
-    "tooltip": false,
-    "on-click": "nm-connection-editor &"
+    "tooltip": true,
+    "format-wifi": "{icon}",
+    "format-ethernet": "{icon}",
+    "format-linked": "󰈁",
+    "format-icons": ["󰤟", "󰤢", "󰤥", "󰤨"],
+    "format-disconnected": "󰈂",
+    "tooltip-format": "{ifname}",
+    "tooltip-format-wifi": "{essid} ({signalStrength}%)  ",
+    "tooltip-format-ethernet": "{ifname}  ",
+    "tooltip-format-disconnected": "Disconnected",
+    "on-click": "nm-connection-editor &",
   },
   "temperature": {
     "hwmon-path": "/sys/class/hwmon/hwmon6/temp2_input",
@@ -143,7 +148,7 @@
     "spacing": 5
   },
   "bluetooth": {
-    "format": "{status} ",
+    "format": "",
     "format-connected": "{device_alias} ",
     "format-connected-battery": "{device_alias} {device_battery_percentage}% ",
     "format-off": "󰂲", // "format-device-preference": [ "device1", "device2" ], // preference list deciding the displayed device
diff --git a/waybar/.config/waybar/style.css b/waybar/.config/waybar/style.css
index 1362a3a..758ef1e 100644
--- a/waybar/.config/waybar/style.css
+++ b/waybar/.config/waybar/style.css
@@ -25,9 +25,9 @@ window#waybar {
   background-color: transparent;
 }
 window > box {
-  margin-left: 5px;
-  margin-right: 5px;
-  margin-top: 5px;
+  /* margin-left: 5px; */
+  /* margin-right: 5px; */
+  /* margin-top: 5px; */
   background-color: @base;
 }
 #workspaces {