diff --git a/config/waybar/left.json b/config/waybar/left.json
index 9fae4c0..3ec3295 100644
--- a/config/waybar/left.json
+++ b/config/waybar/left.json
@@ -2,7 +2,8 @@
 	"modules-left": [
         "sway/workspaces",
         "idle_inhibitor",
-        "custom/media"
+        "custom/media",
+        "custom/browser"
     ],
 	"modules-right": [
         "disk", 
diff --git a/config/waybar/modules.json b/config/waybar/modules.json
index eaaaca9..c1d7529 100644
--- a/config/waybar/modules.json
+++ b/config/waybar/modules.json
@@ -23,10 +23,15 @@
 
 
     "bluetooth": {
-        "format": "\uf294 {status}",
-        "format-disabled": "\uf294",
-        "on-click": "~/.scripts/bluetoggle.sh",
-        "on-click-right": "blueman-manager"
+        "format-disabled": "<big>\uf294</big>",
+        "format-off": "\uf294",
+        "format-on": "<big>\uf294</big>",
+        "format-connected": "<big>\uf294</big>c",
+        "max-length": 10.3,
+        "on-click": "alacritty --title 'FZF-Jump' -e ~/.scripts/fzf-jump/standalone.sh ~/.scripts/fzf-jump/modules/bluetooth.sh",
+        "tooltip-format": "{status} ({num_connections}):\n{device_enumerate}", 
+        "tooltip-format-enumerate-connected": "{device_alias}\t{device_address}",
+        "tooltip-format-enumerate-connected-battery": "{device_alias}\t{device_address}\t{device_battery_percentage}"
     },
     
 
@@ -38,6 +43,13 @@
 	},
 
 
+    "custom/browser": {
+        "format": "\uf120",
+        "on-click": "alacritty -t 'FZF-Jump' -e ~/.scripts/fzf-jump/launcher.sh",
+        "tooltip-format": "Launch an application"
+    },
+
+
     "custom/media": {
         "escape": true,
         "exec": "~/.config/waybar/mediaplayer.py 2> /dev/null",
@@ -78,10 +90,11 @@
     "network": {
         "format-disconnected": "\uf127", 
         "format-ethernet": "\uf6ff {ifname}: {ipadds}/{cidr}",
-        "format-wifi": "\uf1eb {essid} ({signalStrength}%)",
+        "format-wifi": "\uf1eb",
         "interval": 5,
         "on-click-right": "alacritty -e nmtui",
-        "tooltip-format": "{ifname}: {ipaddr}"
+        "tooltip-format": "{ifname}: {ipaddr}",
+        "tooltip-format-wifi": "{essid} ({signalStrength}%) - {ifname}: {ipaddr}"
     },
 
 
diff --git a/config/waybar/style.css b/config/waybar/style.css
index 5b08181..3c6168e 100644
--- a/config/waybar/style.css
+++ b/config/waybar/style.css
@@ -48,7 +48,7 @@ window#waybar {
 #custom-media, #disk, #idle_inhibitor, #memory, 
 #mode, #mpd, #network, #pulseaudio, #temperature, 
 #tray {
-    padding: 0 10px;
+    padding: 0 5px;
 }
 
 /* If workspaces is the leftmost module, omit left margin */
@@ -89,6 +89,11 @@ label:focus {
     animation-direction: alternate;
 }
 
+#bluetooth.disabled,
+#bluetooth.off {
+    opacity: 0.6;
+}
+
 #custom-media {
     color: #2a5c45;
     background-color: #66cc99;