diff --git a/.config/sway/config b/.config/sway/config
index 644486c..6874bf9 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -2,7 +2,8 @@
 set $mod Mod4
 set $term alacritty
 # set $menu tofi-drun | xargs swaymsg exec --
-set $menu tofi_prefix_hack && tofi-drun | xargs swaymsg exec --
+# set $menu tofi_prefix_hack && tofi-drun | xargs swaymsg exec --
+set $menu j4-dmenu-desktop --i3-ipc --dmenu=bemenu
 
 set $left h
 set $down j
@@ -28,10 +29,12 @@ exec xrandr --output DP-2 --primary
 
 # set swaysock env to make swaymsg commands accessible for systemd
 exec --no-startup-id systemctl --user set-environment SWAYSOCK=$SWAYSOCK
+exec --no-startup-id systemctl --user set-environment DBUS_SESSION_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS
 
 bar {
 	id 1
-	mode hide
+	# TODO enable after bemenu focus bug fix
+	# mode hide
 	tray_output none
 	font Hack Nerd Font 9 
 	status_command "~/Scripts/sway/bar.sh"
@@ -53,7 +56,7 @@ output HDMI-A-2 position 4480 360 mode 1920x1080@60Hz disable
 # input configuration
 # you can get the names of your inputs by running: swaymsg -t get_inputs
 # read `man 5 sway-input` for more information about this section.
-input type:pointer {
+input "1133:16505:Logitech_G_Pro" {
 	pointer_accel 0
 	accel_profile "flat"
 }
@@ -169,6 +172,14 @@ workspace 28 output HDMI-A-1
 workspace 29 output HDMI-A-1
 
 workspace 31 output HDMI-A-2
+workspace 32 output HDMI-A-2
+workspace 33 output HDMI-A-2
+workspace 34 output HDMI-A-2
+workspace 35 output HDMI-A-2
+workspace 36 output HDMI-A-2
+workspace 37 output HDMI-A-2
+workspace 38 output HDMI-A-2
+workspace 39 output HDMI-A-2
 
 # move mouse to focused window/workspace
 mouse_warping output
@@ -225,6 +236,17 @@ bindsym --to-code --no-warn $mod+Alt+7 workspace 27
 bindsym --to-code --no-warn $mod+Alt+8 workspace 28
 bindsym --to-code --no-warn $mod+Alt+9 workspace 29
 
+bindsym --to-code --no-warn $mod+Ctrl+1 workspace 31
+bindsym --to-code --no-warn $mod+Ctrl+2 workspace 32
+bindsym --to-code --no-warn $mod+Ctrl+3 workspace 33
+bindsym --to-code --no-warn $mod+Ctrl+4 workspace 34
+bindsym --to-code --no-warn $mod+Ctrl+5 workspace 35
+bindsym --to-code --no-warn $mod+Ctrl+6 workspace 36
+bindsym --to-code --no-warn $mod+Ctrl+7 workspace 37
+bindsym --to-code --no-warn $mod+Ctrl+8 workspace 38
+bindsym --to-code --no-warn $mod+Ctrl+9 workspace 39
+
+
 # does not work, 
 # bindsym --to-code --no-warn $mod+Shift_R+1 workspace 21
 # bindsym --to-code --no-warn $mod+Shift_R+2 workspace 22
@@ -273,13 +295,22 @@ bindsym --to-code $mod+Shift+bracketleft exec playerctl -p mpd volume 0.05-
 bindsym --to-code $mod+Shift+bracketright exec playerctl -p mpd volume 0.05+
 bindsym --to-code $mod+Shift+y exec playerctl -p mpd shuffle Toggle
 
-set $sink "alsa_output.pci-0000_29_00.0.analog-stereo"
+set $sink_pc "alsa_output.pci-0000_29_00.0.analog-stereo"
+set $sink_tv "alsa_output.pci-0000_2f_00.1.hdmi-stereo-extra3"
+set $sink_combined "combined_output"
 
 # special keys to adjust volume via pulseaudio
-bindsym --to-code --locked XF86AudioMute exec pactl set-sink-mute $sink toggle
-bindsym --to-code --locked XF86AudioLowerVolume exec pactl set-sink-volume $sink -5%
-bindsym --to-code --locked XF86AudioRaiseVolume exec pactl set-sink-volume $sink +5%
-bindsym --to-code --locked XF86AudioMicMute exec pactl set-source-mute $sink toggle
+bindsym --to-code --locked XF86AudioMute exec pactl set-sink-mute $sink_pc toggle
+
+bindsym --to-code --locked XF86AudioLowerVolume exec pactl set-sink-volume $sink_pc -5%
+bindsym --to-code --locked XF86AudioRaiseVolume exec pactl set-sink-volume $sink_pc +5%
+
+bindsym --to-code --locked $mod+XF86AudioLowerVolume exec pactl set-sink-volume $sink_tv -2.5%
+bindsym --to-code --locked $mod+XF86AudioRaiseVolume exec pactl set-sink-volume $sink_tv +2.5%
+
+bindsym --to-code --locked $mod+XF86AudioMute exec pactl set-sink-mute $sink_tv toggle
+
+bindsym --to-code --locked XF86AudioMicMute exec pactl set-source-mute $sink_pc toggle
 bindsym --to-code --locked XF86AudioPlay exec playerctl play-pause
 bindsym --to-code --locked XF86AudioPause exec playerctl play-pause
 bindsym --to-code --locked XF86AudioNext exec playerctl next