diff --git a/.config/river/init b/.config/river/init
index 64c32f3..f612124 100755
--- a/.config/river/init
+++ b/.config/river/init
@@ -7,13 +7,15 @@
 export XDG_CURRENT_DESKTOP=river
 export XDG_SESSION_TYPE=wayland
 
+export XCURSOR_SIZE=36
+
 ## Start portals
 dbus-update-activation-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
 xdg-desktop-portal-wlr &
 xdg-desktop-portal &
 
 ## Start easyeffects
-flatpak run com.github.wwmm.easyeffects --gapplication-service &
+#flatpak run com.github.wwmm.easyeffects --gapplication-service &
 
 # Mod1+Shift+Return to start an instance of foot (https://codeberg.org/dnkl/foot)
 riverctl map normal Mod1+Shift Return spawn foot
@@ -183,7 +185,7 @@ riverctl map normal Mod1+Shift Print spawn "grim -g \"\$(slurp -p)\" -t ppm - |
 riverctl focus-follows-cursor normal
 
 # Borders & Colors
-riverctl background-color 0x002b36
+riverctl background-color 0x202223
 riverctl border-color-focused 0x93a1a1
 riverctl border-color-unfocused 0x586e75
 riverctl border-width 1
diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc
index 25fa9ba..3edb44e 100644
--- a/.config/waybar/config.jsonc
+++ b/.config/waybar/config.jsonc
@@ -2,7 +2,7 @@
 	"position": "bottom",
 	"modules-left": ["river/tags", "river/window"],
 	"modules-center": [],
-	"modules-right": ["tray", "network", "custom/audio", "clock"],
+	"modules-right": ["tray", "bluetooth", "network", "custom/audio", "battery", "clock"],
 
 	"river/tags": {
 		"num-tags": 9
@@ -51,14 +51,14 @@
 		//"on-click-right": "~/.scripts/restart_network.sh"
 	},
 
-	//"bluetooth": {
-	//	"on-click": "foot bluetuith",
-	//	"on-click-right": "~/.scripts/toggle_bluetooth.sh",
-	//	"format-on": "󰂯",
-	//	"format-off": "󰂲",
-	//	"format-disabled": "󰂲",
-	//	"format-connected": "󰂱"
-	//},
+	"bluetooth": {
+		"on-click": "foot bluetuith",
+		"on-click-right": "~/.scripts/toggle_bluetooth.sh",
+		"format-on": "󰂯",
+		"format-off": "󰂲",
+		"format-disabled": "󰂲",
+		"format-connected": "󰂱"
+	},
 
 	//"wireplumber": {
 	//	"format": "{icon} {volume}%",
@@ -87,19 +87,19 @@
 		"on-scroll-down": "pamixer --decrease 5"
 	},
 
-	//"battery": {
-	//	"states": {
-	//			"good": 95,
-	//			"warning": 30,
-	//			"critical": 15
-	//	},
-	//	"format":"{icon} {capacity}%",
-	//	"format-charging": "󰂄 {capacity}%",
-	//	"format-plugged": "󱐋",
-	//	"format-icons": ["󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"],
-	//	"interval": 30,
-	//	"tooltip-format": "{time}",
-	//},
+	"battery": {
+		"states": {
+				"good": 95,
+				"warning": 30,
+				"critical": 15
+		},
+		"format":"{icon} {capacity}%",
+		"format-charging": "󰂄 {capacity}%",
+		"format-plugged": "󱐋",
+		"format-icons": ["󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"],
+		"interval": 30,
+		"tooltip-format": "{time}",
+	},
 
 	"tray": {
 		"spacing": 10
diff --git a/.local/bin/toggle_audio b/.local/bin/toggle_audio
index 26a4762..e861a76 100755
--- a/.local/bin/toggle_audio
+++ b/.local/bin/toggle_audio
@@ -1,33 +1,32 @@
 #!/usr/bin/env bash
-# Toggle default PipeWire sink between Steinberg UR22mkII and Starship/Matisse
+# Toggle default PipeWire sink between Built-in Audio and Cisco 700 USB Adapter
 
-# sinks
-#STEINBERG_ID=60
-#STARSHIP_ID=59
+# Get sinks section
 SINKS=$(wpctl status | sed -n '/Sinks:/,/Sources:/p')
 
-# Extract IDs (ignore default *) and match specific names
-STARSHIP_ID=$(echo "$SINKS" | tr -d '*' | grep -i "Starship" | grep -v "Easy Effects" | awk '{print $2}' | tr -d '.')
-STEINBERG_ID=$(echo "$SINKS" | tr -d '*' | grep -i "Steinberg" | grep -v "Easy Effects" | awk '{print $2}' | tr -d '.')
+# Extract IDs (ignore default * and Easy Effects virtual sinks)
+BUILTIN_ID=$(echo "$SINKS" | tr -d '*' | grep -i "Built-in Audio" | grep -v "Easy Effects" | awk '{print $2}' | tr -d '.')
+CISCO_ID=$(echo "$SINKS" | tr -d '*' | grep -i "Cisco HS 730-0TG" | grep -v "Easy Effects" | awk '{print $2}' | tr -d '.')
 
 # Get current default sink name (not just the ID)
 CURRENT_SINK=$(wpctl status | awk '/Audio\/Sink/ {print $3}')
 
 # Detect which sink is active and toggle
-if [[ "$CURRENT_SINK" == *"Steinberg"* ]]; then
-    echo "Switching to Starship/Matisse output..."
-    wpctl set-default "$STARSHIP_ID"
+if [[ "$CURRENT_SINK" == *"alsa_output.pci-0000_00_1f.3.analog-stereo"* ]]; then
+    echo "Switching to Cisco HS 730-0TG..."
+    wpctl set-default "$CISCO_ID"
 else
-    echo "Switching to Steinberg UR22mkII output..."
-    wpctl set-default "$STEINBERG_ID"
+    echo "Switching to Built-in Audio..."
+    wpctl set-default "$BUILTIN_ID"
 fi
 
-# Optionally move active streams
+# Move active streams to new default sink
 echo "Moving active streams to new sink..."
-for stream in $(wpctl status | awk '/\. Stream/{print $1}'); do
+for stream in $(wpctl status | awk '/\. Stream/ {print $1}'); do
     wpctl move-stream "$stream" @DEFAULT_AUDIO_SINK@ 2>/dev/null
 done
 
 # Confirm new default
 echo "New default sink:"
 wpctl status | grep "Audio/Sink"
+
diff --git a/.local/bin/waybar_audio.sh b/.local/bin/waybar_audio.sh
index 1f482a8..84a0449 100755
--- a/.local/bin/waybar_audio.sh
+++ b/.local/bin/waybar_audio.sh
@@ -9,13 +9,13 @@ muted=$(pamixer --get-mute)
 # Determine alt value for Waybar
 if [ "$muted" = "true" ]; then
   case "$sink_name" in
-    *Steinberg*) alt="headphones-muted" ;;
-    *) alt="speaker-muted" ;;
+    *Cisco*) alt="headphones-muted" ;;
+    *)       alt="speaker-muted" ;;
   esac
 else
   case "$sink_name" in
-    *Steinberg*) alt="headphones" ;;
-    *) alt="speaker" ;;
+    *Cisco*) alt="headphones" ;;
+    *)       alt="speaker" ;;
   esac
 fi