diff --git a/.config/i3/config b/.config/i3/config
index 8e9e6ad..9f8879f 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -67,7 +67,7 @@ client.background $black
 ###---Starting External Scripts---###
 
 #Start bluealsa
-exec --no-startup-id sudo bluealsa &
+#exec --no-startup-id sudo bluealsa &
 #Twmn
 exec --no-startup-id twmnd &
 #Album art for mpd/mopidy
diff --git a/.config/polybar/config b/.config/polybar/config
index 07a3937..992e113 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -25,7 +25,7 @@ monitor = ${env:MONITOR:eDP-1}
 include-file = ~/.config/polybar/top-bar
 modules-left = i3 gpmdp
 modules-center = term chrome editor fm music vpn
-modules-right = pkg pulseaudio battery backlight wlan networkmanager date clock powermenu
+modules-right = pkg pulseaudio-rofi-output battery backlight wlan networkmanager date clock powermenu
 
 ;tray-position = right
 ;tray-padding = 2
@@ -39,17 +39,19 @@ modules-left = hostname vpncheck
 modules-center = cpu memory temperature
 modules-right = openweather
 
+[module/pulseaudio-rofi-output]
+type = custom/script
+exec = ~/.config/Scripts/pulseaudio-rofi.sh --output_volume_listener
+tail = true
+click-right = ~/.config/Scripts/pulseaudio-rofi.sh --output
+click-left = ~/.config/Scripts/pulseaudio-rofi.sh --mute
+scroll-up =  ~/.config/Scripts/pulseaudio-rofi.sh --volume_up
+scroll-down = ~/.config/Scripts/pulseaudio-rofi.sh --volume_down
+
 [module/pulseaudio]
 type = internal/pulseaudio
-; Sink to be used, if it exists (find using `pacmd list-sinks`, name field)
-; If not, uses default sink
-;sink = alsa_output.pci-0000_00_0e.0.analog-stereo
 sink = bluez_sink.E8_07_BF_33_4D_F2.headset_head_unit
-; Use PA_VOLUME_UI_MAX (~153%) if true, or PA_VOLUME_NORM (100%) if false
-; Default: true
 use-ui-max = true
-; Interval for volume increase/decrease (in percent points)
-; Default: 5
 interval = 5
 format-volume = <ramp-volume> <label-volume>
 label-volume = %percentage%%
@@ -63,25 +65,30 @@ ramp-volume-foreground = ${colors.foreground-alt}
 ramp-headphones-0 = 
 ramp-headphones-1 = 
 
-[module/nm-launcher]
-type = custom/script
-exec = ~/.config/Scripts/nm-applet/applet.sh
-label = %output%
-interval = 0.5
-click-left = nm-connection-editor
-click-middle = ~/.config/Scripts/nm-applet/applet.sh --ssid
-click-right = ~/.config/Scripts/nm-applet/applet.sh --vpn
+;[module/backlight]
+;type = custom/script
+;interval = 0.2
+;exec = ~/.config/Scripts/backlight.sh
+;scroll-up = exec light -A 5
+;scroll-down = exec light -U 5
+;format-prefix = " "
+;label = %output%
+;label-foreground = ${colors.foreground}
+;format-padding = 1
 
 [module/backlight]
-type = custom/script
-interval = 0.2
-exec = ~/.config/Scripts/backlight.sh
-scroll-up = exec light -A 5
-scroll-down = exec light -U 5
-format-prefix = " "
-label = %output%
-label-foreground = ${colors.foreground}
-format-padding = 1
+type = internal/xbacklight
+output = eDP-1
+enable-scroll = true
+format = <ramp> <label>
+label = %percentage%%
+ramp-0 = 
+ramp-1 = 
+ramp-2 = 
+bar-width = 10
+bar-indicator = |
+bar-fill = ─
+bar-empty = ─
 
 [module/vpncheck]
 type = custom/script
@@ -104,17 +111,14 @@ exec = echo "$(uname -nr)"
 type = internal/temperature
 thermal-zone = 0
 warn-temperature = 65
-
 format = <ramp> <label>
 format-underline = ${xrdb:color1}
 ;format-underline = #f50a4d
 format-warn = <ramp> <label-warn>
 format-warn-underline = ${self.format-underline}
-
 label = %temperature-c%
 label-warn =  %temperature-c%
 label-warn-foreground = ${colors.alert}
-
 ramp-0 = 
 ramp-1 = 
 ramp-2 = 
@@ -122,17 +126,6 @@ ramp-3 = 
 ramp-4 = 
 ramp-foreground = ${colors.foreground}
 
-
-;[module/github]
-;type = internal/github
-; Accessing an access token stored in file
-;token = ${file:~/.token1}
-; Whether empty notifications should be displayed or not
-;empty-notifications = false
-; Number of seconds in between requests
-;interval = 10
-;format-prefix = ""
-
 [module/pkg]
 type = custom/script
 exec = "~/.config/Scripts/arch-updates.sh -s"
diff --git a/.config/polybar/top-bar b/.config/polybar/top-bar
index ea2dc28..0e70b2e 100644
--- a/.config/polybar/top-bar
+++ b/.config/polybar/top-bar
@@ -17,6 +17,6 @@ font-0 = TamzenForPowerline:pixelsize=12;1
 ;font-0 = TerminessTTF Nerd Font:pixelsize=10;1
 font-1 = unifont:fontformat=truetype:size=8:antialias=false;0
 font-2 = FontAwesome:size=10;1
-font-3 = Material Icons:size=14;5
+font-3 = Material Icons:size=10;2
 scroll-up = i3wm-wsnext
 scroll-down = i3wm-wsprev