diff --git a/.Xresources b/.Xresources
new file mode 100644
index 0000000..5c1bb0c
--- /dev/null
+++ b/.Xresources
@@ -0,0 +1 @@
+Xcursor.size: 24
diff --git a/.config/i3/config b/.config/i3/config
index 872ae55..9926593 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -1,10 +1,10 @@
 set $mod Mod4
-exec_always "setxkbmap -layout 'de,gr,de' -variant 'nodeadkeys,basic,neo'"
+exec_always --no-startup-id "setxkbmap -layout 'de,gr,de' -variant 'nodeadkeys,basic,neo' -option caps:escape"
 
 include ~/.config/i3/config.d/*
 
 bindsym $mod+d exec --no-startup-id rofi -show run -config ~/.config/rofi/config.rasi
-bindsym $mod+Return exec kitty
+bindsym $mod+Return exec --no-startup-id kitty
 bindsym $mod+Shift+q kill
 
 bindsym $mod+Shift+c reload
@@ -12,9 +12,9 @@ bindsym $mod+Shift+r restart
 bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"
 
 mode "exit: [l]ogout, [r]eboot, [s]hutdown" {
-  bindsym l exec i3-msg exit
-  bindsym r exec systemctl reboot
-  bindsym s exec systemctl shutdown
+  bindsym l exec --no-startup-id i3-msg exit
+  bindsym r exec --no-startup-id systemctl reboot
+  bindsym s exec --no-startup-id systemctl shutdown
   bindsym Escape mode "default"
   bindsym Return mode "default"
 }
@@ -28,10 +28,10 @@ bindsym Shift+XF86AudioRaiseVolume exec --no-startup-id pulsemixer --change-volu
 bindsym Shift+XF86AudioLowerVolume exec --no-startup-id pulsemixer --change-volume -5 --max-volume 300 #decrease sound volume
 bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle # mute sound
 
-bindsym XF86AudioPlay exec playerctl play-pause
-bindsym XF86AudioPause exec playerctl play-pause
-bindsym XF86AudioNext exec playerctl next
-bindsym XF86AudioPrev exec playerctl previous
+bindsym XF86AudioPlay exec --no-startup-id playerctl play-pause
+bindsym XF86AudioPause exec --no-startup-id playerctl play-pause
+bindsym XF86AudioNext exec --no-startup-id playerctl next
+bindsym XF86AudioPrev exec --no-startup-id playerctl previous
 
 bindsym XF86MonBrightnessUp exec --no-startup-id brightnessctl set +5%
 bindsym XF86MonBrightnessDown exec --no-startup-id brightnessctl set 5%-
diff --git a/.config/i3/config.d/autostart.conf b/.config/i3/config.d/autostart.conf
index 2e4a7bf..a0a27f5 100644
--- a/.config/i3/config.d/autostart.conf
+++ b/.config/i3/config.d/autostart.conf
@@ -1,5 +1,5 @@
 exec --no-startup-id dex --autostart --environment i3
 exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
-exec --no-startup-id nm-applet &
-exec --no-startup-id blueman-applet &
+exec_always --no-startup-id nm-applet &
+exec_always --no-startup-id blueman-applet &
 
diff --git a/.config/i3/config.d/ui.conf b/.config/i3/config.d/ui.conf
index 6a6d8da..30f136b 100644
--- a/.config/i3/config.d/ui.conf
+++ b/.config/i3/config.d/ui.conf
@@ -42,17 +42,17 @@ exec --no-startup-id i3-msg 'workspace $ws1; exec kitty; $ws1'
 # Multiple monitors
 
 workspace $ws1 output DP-1-3 eDP-1
-workspace $ws2 output DP-1-3 eDP-1
-workspace $ws3 output DP-1-3 eDP-1
+workspace $ws2 output eDP-1 DP-1-3
+workspace $ws3 output eDP-1 DP-1-3
 workspace $ws4 output DP-1-3 eDP-1
 workspace $ws5 output eDP-1
 workspace $ws6 output eDP-1
 workspace $ws7 output eDP-1
 workspace $ws8 output eDP-1
 
-exec_always --no-startup-id xrandr --output eDP-1 --primary --mode 1920x1080 --pos 1920x903 --rotate normal --output DP-1-3 --mode 1920x1200 --pos 0x0 --rotate normal
-bindsym $mod+m exec --no-startup-id xrandr --output eDP-1 --primary --mode 1920x1080 --pos 1920x903 --rotate normal --output DP-1-3 --mode 1920x1200 --pos 0x0 --rotate normal
-# bindsym $mod+m exec --no-startup-id xrandr --output HDMI2 --auto --right-of eDP1
+# exec_always --no-startup-id xrandr --output eDP-1 --primary --mode 1920x1080 --pos 1920x903 --rotate normal --output DP-1-3 --mode 1920x1200 --pos 0x0 --rotate normal
+# bindsym $mod+m exec --no-startup-id xrandr --output eDP-1 --primary --mode 1920x1080 --pos 1920x903 --rotate normal --output DP-1-3 --mode 1920x1200 --pos 0x0 --rotate normal
+# # bindsym $mod+m exec --no-startup-id xrandr --output HDMI2 --auto --right-of eDP1
 
 
 # Normal stuff