diff --git a/profiles/desktop/.config/i3/config b/profiles/desktop/.config/i3/config
index c262fe0..a38d5a7 100644
--- a/profiles/desktop/.config/i3/config
+++ b/profiles/desktop/.config/i3/config
@@ -43,15 +43,7 @@ set $refresh_i3status killall -SIGUSR1 i3status
 bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +1% && $refresh_i3status
 bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -1% && $refresh_i3status
 bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status
-bindsym $mod+F4 exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status
-
-# Pipewire-pulse
-bindsym $mod+F3 exec pactl set-sink-mute 0 toggle
-bindsym $mod+F3 --release exec pkill -RTMIN+1 i3blocks
-bindsym $mod+F1 exec pactl set-sink-volume 0 -1%
-bindsym $mod+F1 --release exec pkill -RTMIN+1 i3blocks
-bindsym $mod+F2 exec pactl set-sink-volume 0 +1%
-bindsym $mod+F2 --release exec pkill -RTMIN+1 i3blocks
+bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status
 
 # Media player controls
 bindsym XF86AudioPlay exec playerctl play-pause
@@ -136,15 +128,27 @@ bindsym $mod+a focus parent
 # Define names for default workspaces for which we configure key bindings later on.
 # We use variables to avoid repeating the names in multiple places.
 set $ws1 "1: "
-set $ws2 "2: "
-set $ws3 "3: "
-set $ws4 "4: "
-set $ws5 "5: Torrenty"
+set $ws2 "2: "
+set $ws3 "3: "
+set $ws4 "4: Torrenty"
+set $ws5 "5: Soulseek"
 set $ws6 "6: Libreoffice"
 set $ws7 "7: Wirtualki"
-set $ws8 "8: Emacs"
-set $ws9 "9"
+set $ws8 "8: "
+set $ws9 "9: "
 set $ws10 "10"
+set $wsF1 "11"
+set $wsF2 "12"
+set $wsF3 "13"
+set $wsF4 "14"
+set $wsF5 "15"
+set $wsF6 "16"
+set $wsF7 "17"
+set $wsF8 "18"
+set $wsF9 "19: Tor Browser"
+set $wsF10 "20: "
+set $wsF11 "21: KeePass"
+set $wsF12 "22: Inne"
 
 # switch to workspace
 bindsym $mod+1 workspace number $ws1
@@ -157,6 +161,18 @@ bindsym $mod+7 workspace number $ws7
 bindsym $mod+8 workspace number $ws8
 bindsym $mod+9 workspace number $ws9
 bindsym $mod+0 workspace number $ws10
+bindsym $mod+F1 workspace number $wsF1
+bindsym $mod+F2 workspace number $wsF2
+bindsym $mod+F3 workspace number $wsF3
+bindsym $mod+F4 workspace number $wsF4
+bindsym $mod+F5 workspace number $wsF5
+bindsym $mod+F6 workspace number $wsF6
+bindsym $mod+F7 workspace number $wsF7
+bindsym $mod+F8 workspace number $wsF8
+bindsym $mod+F9 workspace number $wsF9
+bindsym $mod+F10 workspace number $wsF10
+bindsym $mod+F11 workspace number $wsF11
+bindsym $mod+F12 workspace number $wsF12
 
 # move focused container to workspace
 bindsym $mod+Shift+1 move container to workspace number $ws1
@@ -169,6 +185,18 @@ bindsym $mod+Shift+7 move container to workspace number $ws7
 bindsym $mod+Shift+8 move container to workspace number $ws8
 bindsym $mod+Shift+9 move container to workspace number $ws9
 bindsym $mod+Shift+0 move container to workspace number $ws10
+bindsym $mod+Shift+F1 move container to workspace number $wsF1
+bindsym $mod+Shift+F2 move container to workspace number $wsF2
+bindsym $mod+Shift+F3 move container to workspace number $wsF3
+bindsym $mod+Shift+F4 move container to workspace number $wsF4
+bindsym $mod+Shift+F5 move container to workspace number $wsF5
+bindsym $mod+Shift+F6 move container to workspace number $wsF6
+bindsym $mod+Shift+F7 move container to workspace number $wsF7
+bindsym $mod+Shift+F8 move container to workspace number $wsF8
+bindsym $mod+Shift+F9 move container to workspace number $wsF9
+bindsym $mod+Shift+F10 move container to workspace number $wsF10
+bindsym $mod+Shift+F11 move container to workspace number $wsF11
+bindsym $mod+Shift+F12 move container to workspace number $wsF12
 
 # reload the configuration file
 bindsym $mod+Shift+c reload
@@ -232,10 +260,8 @@ bar {
         	separator #000000
 
         	focused_workspace  #34003f #6e0284 #ffffff
-        	#active_workspace   #333333 #5f676a #ffffff
         	inactive_workspace #220028 #35013f #888888
         	urgent_workspace   #470801 #630000 #ffffff
-        	#binding_mode       #2f343a #900000 #ffffff
 	}
 }
 
@@ -259,35 +285,31 @@ bindsym $mod+x exec $Locker
 workspace_layout tabbed
 
 # window assignments
-assign [class="[Ff]irefox.*"] $ws2
-assign [class="[Ll]ibre[Ww]olf"] $ws2
-assign [class="[Cc]hromium"] $ws3
-assign [class="[Gg]oogle[ -]*[Cc]hrome.*"] $ws3
-assign [class="[Tt]hunderbird.*"] $ws4
-assign [class="[Tt]or\s*[Bb]rowser"] $ws10
-assign [class="[Nn]yxt"] $ws10
-assign [class="qutebrowser"] $ws10
-assign [class="[Ll]uakit"] $ws10
-assign [class="[Vv]irt[ -]*manager"] $ws7
-assign [class="[Vv]irt[ -]*viewer"] $ws7
-assign [class="[Qq]emu"] $ws7
-assign [class="q[Bb]ittorrent"] $ws5
+assign [class="[Cc]hromium"] $ws2
+assign [class="[Tt]hunderbird"] $ws3
+assign [class="q[Bb]ittorrent"] $ws4
 assign [class="[Nn]icotine"] $ws5
 assign [class="[Ll]ibreoffice.*"] $ws6
-assign [class="[Mm]ullvad.*"] $ws10
-assign [class="[Qq]t[ -]*[Cc]reator"] $ws10
-assign [class="[Ee]macs"] $ws8
-assign [class="[Kk]iwix"] $ws10
-assign [class="[Gg]alaxy[ -]*[Bb]uds[ -]*[Cc]lient"] $ws10
-assign [class="[Kk]ee[Pp]ass.*"] $ws10
-assign [class="[Tt]hunar"] $ws10
-assign [class="[Pp][Hh][Pp][Ss]torm"] $ws10
-assign [class="[Rr]uby[Mm]ine"] $ws10
-assign [class="[Dd]ata[Gg]rip"] $ws10
-assign [class="[Ww]eb[Ss]torm"] $ws10
-assign [class="[Jj]etbrains.*"] $ws10
+assign [class="[Vv]irt.*[Mm]anager"] $ws7
+assign [class="[Vv]irt.*[Vv]iewer"] $ws7
+assign [class="[Qq]emu"] $ws7
+assign [class="[Ff]irefox"] $ws8
+assign [class="[Ii]ce[Ww]easel"] $ws8
+assign [class="[Aa]browser"] $ws8
+assign [class="[Ll]ibre[Ww]olf"] $ws8
+assign [class="[Ee]macs"] $ws9
+assign [class="[Tt]or.*[Bb]rowser"] $wsF9
+assign [class="[Kk]iwix"] $wsF10
+assign [class="[Kk]ee[Pp]ass"] $wsF11
+assign [class="[Mm]ullvad.*"] $wsF12
+assign [class="[Gg]alaxy.*[Bb]uds.*[Cc]lient"] $wsF12
+assign [class="qutebrowser"] $wsF12
+assign [class="[Tt]hunar"] $wsF12
+assign [class="[Ll]uakit"] $wsF12
+assign [class="[Ss]ea[Mm]onkey"] $wsF12
 for_window [class="[Tt]or\s*[Bb]rowser"] floating enable, border normal
 for_window [class="[Ff]lame[Ss]hot"] floating enable, border normal
+for_window [class="[Pp]inentry"] floating enable, border normal
 
 # color scheme for windows
 #                       border          background      text            indicator (a line which shows where the next window will be placed)     
@@ -312,3 +334,9 @@ bindsym $mod+Print exec flameshot full -u -p ~/Pictures/Screenshots
 bindsym $mod+Shift+Print exec flameshot gui -u -p ~/Pictures/Screenshots
 bindsym Print exec flameshot full -p ~/Pictures/Screenshots
 bindsym Shift+Print exec flameshot gui -p ~/Pictures/Screenshots
+
+# autostart
+exec --no-startup-id chromium
+exec --no-startup-id thunderbird
+workspace $ws1 output primary
+exec --no-startup-id alacritty