diff --git a/i3-scrot.conf b/i3-scrot.conf
index 78da6bb..3b6dfd0 100644
--- a/i3-scrot.conf
+++ b/i3-scrot.conf
@@ -1 +1 @@
-scrot_dir=/home/julian/Pictures
+scrot_dir=/home/julian/Pictures/screenshots
diff --git a/i3/config b/i3/config
index 8c97d63..70e77db 100644
--- a/i3/config
+++ b/i3/config
@@ -41,7 +41,7 @@ bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOU
 floating_modifier $mod
 
 # start a terminal
-bindsym $mod+Return exec xfce4-terminal
+bindsym $mod+Return exec alacritty
 
 # kill focused window
 bindsym $mod+Shift+q kill
@@ -57,10 +57,10 @@ bindsym $mod+d exec dmenu_recency -i
 # bindsym $mod+d exec --no-startup-id i3-dmenu-desktop
 
 # change focus
-bindsym $mod+j focus left
-bindsym $mod+k focus down
-bindsym $mod+l focus up
-bindsym $mod+odiaeresis focus right
+# bindsym $mod+h focus left
+bindsym $mod+j focus down
+bindsym $mod+k focus up
+bindsym $mod+l focus right
 
 # alternatively, you can use the cursor keys:
 bindsym $mod+Left focus left
@@ -69,10 +69,10 @@ bindsym $mod+Up focus up
 bindsym $mod+Right focus right
 
 # move focused window
-bindsym $mod+Shift+j move left
-bindsym $mod+Shift+k move down
-bindsym $mod+Shift+l move up
-bindsym $mod+Shift+odiaeresis move right
+bindsym $mod+Shift+h move left
+bindsym $mod+Shift+j move down
+bindsym $mod+Shift+k move up
+bindsym $mod+Shift+l move right
 
 # alternatively, you can use the cursor keys:
 bindsym $mod+Shift+Left move left
@@ -156,8 +156,8 @@ bindsym $mod+Shift+9 move container to workspace number $ws9; workspace $ws9
 bindsym $mod+Shift+0 move container to workspace number $ws10; workspace $ws10
 
 # Monitor config
-set $monitor_left DVI-D-0
-set $monitor_right DVI-D-1
+set $monitor_left eDP1
+set $monitor_right HDMI1
 
 workspace $ws1 output $monitor_left
 workspace $ws2 output $monitor_left
@@ -227,16 +227,43 @@ mode "$mode_system" {
 }
 bindsym $mod+Shift+e mode "$mode_system"
 
-set $mode_screenshot Screenshot (w) Active window, (s) Selection
-mode "$mode_screenshot" {
+#set $mode_test System (l) lock, (e) logout, (r) reboot, (s) shutdown
+#set $mode_screenshot_file Screenshot to file (w) Active window, (s) Selection, (d) Desktop
+#mode "$mode_screenshot_file" {
+#    	bindsym l exec --no-startup-id i3exit lock, mode "default"
+#    	bindsym e exec --no-startup-id i3exit logout, mode "default"
+#    	bindsym r exec --no-startup-id i3exit reboot, mode "default"
+#   	bindsym s exec --no-startup-id i3exit shutdown, mode "default"
+#
+#   	# back to normal: Enter or Escape
+#   	bindsym Return mode "default"
+#   	bindsym Escape mode "default"
+#}
+#bindsym $mod+Shift+Print mode "$mode_screenshot_file"
+
+set $mode_screenshot_file Screenshot to file (w) Active window, (s) Selection, (d) Desktop
+mode "$mode_screenshot_file" {
     	bindsym w exec --no-startup-id "i3-scrot -w", mode "default"
-    	bindsym s exec --no-startup-id "flameshot gui", mode "default"
-   	bindsym Return exec --no-startup-id "flameshot gui", mode "default"
+    	bindsym --release s exec --no-startup-id "i3-scrot -s", mode "default"
+    	bindsym d exec --no-startup-id "i3-scrot -d", mode "default"
+   	bindsym --release Return exec --no-startup-id "i3-scrot -s", mode "default"
+
+   	#back to normal: Escape
+   	bindsym Escape mode "default"
+}
+bindsym $mod+Shift+Print mode "$mode_screenshot_file"
+
+set $mode_screenshot_clipboard Screenshot to clipboard (w) Active window, (s) Selection, (d) Desktop
+mode "$mode_screenshot_clipboard" {
+    	bindsym w exec --no-startup-id "i3-scrot -wc", mode "default"
+    	bindsym --release s exec --no-startup-id "i3-scrot -sc", mode "default"
+    	bindsym d exec --no-startup-id "i3-scrot -dc", mode "default"
+   	bindsym --release Return exec --no-startup-id "i3-scrot -sc", mode "default"
 
    	# back to normal: Escape
    	bindsym Escape mode "default"
 }
-bindsym $mod+Print mode "$mode_screenshot"
+bindsym $mod+Print mode "$mode_screenshot_clipboard"
 
 bindsym $mod+Ctrl+Right move workspace to output right
 bindsym $mod+Ctrl+Left move workspace to output right
@@ -258,7 +285,7 @@ assign [class="Element"] workspace $ws9
 assign [class="Thunderbird"] workspace $ws10
 assign [class="zoom"] workspace $ws5
 
-for_window [class="firefox"] focus
+#for_window [class="firefox"] focus
 #for_window [class="Thunderbird"] focus
 for_window [class="TelegramDesktop"] no_focus
 for_window [class="Rocket.Chat"] no_focus
@@ -277,7 +304,7 @@ exec --no-startup-id "i3-msg 'workspace 9: Chat; append_layout ~/.config/i3/work
 
 exec firefox
 exec thunderbird
-#exec chat.rocket.RocketChat no_focus
+exec chat.rocket.RocketChat no_focus
 exec im.riot.Riot no_focus
 exec telegram-desktop no_focus
 
@@ -292,6 +319,10 @@ exec --no-startup-id pamac-tray
 exec --no-startup-id msm_notifier
 # Audio
 exec --no-startup-id start-pulseaudio-x11
+# Display setup
+exec_always --no-startup-id /home/julian/.screenlayout/defaultlayout.sh 
+# Background image
+exec_always --no-startup-id "sleep 1; feh --bg-fill /home/julian/nextcloud/space.jpg"
 
 # Default workspaces at startup (no need because autostart applications get always focused)
 #exec --no-startup-id i3-msg workspace $ws1
diff --git a/i3/i3exit b/i3/i3exit
deleted file mode 100755
index 70ee124..0000000
--- a/i3/i3exit
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-lock() {
-    i3lock
-}
-
-case "$1" in
-    lock)
-        lock
-        ;;
-    logout)
-        i3-msg exit
-        ;;
-    suspend)
-        lock && systemctl suspend
-        ;;
-    hibernate)
-        lock && systemctl hibernate
-        ;;
-    reboot)
-        systemctl reboot
-        ;;
-    shutdown)
-        systemctl poweroff
-        ;;
-    *)
-        echo "Usage: $0 {lock|logout|suspend|hibernate|reboot|shutdown}"
-        exit 2
-esac
-
-exit 0
diff --git a/i3/setupZoom b/i3/setupZoom
index a41a0a4..68b3a84 100755
--- a/i3/setupZoom
+++ b/i3/setupZoom
@@ -2,5 +2,5 @@
 
 zoom &
 
-i3-msg "workspace --no-auto-back-and-forth 5; exec mousepad /home/julian/Nextcloud/studium/zoom.txt"
+i3-msg "workspace --no-auto-back-and-forth 5; exec mousepad /home/julian/nextcloud/studium/zoom.txt"
 i3-msg "workspace --no-auto-back-and-forth 5; append_layout ~/.config/i3/workspace-zoom.json"
diff --git a/i3/workspace-chat.json b/i3/workspace-chat.json
index 4b2e01d..4ddef67 100644
--- a/i3/workspace-chat.json
+++ b/i3/workspace-chat.json
@@ -1,53 +1,99 @@
 // vim:ts=4:sw=4:et
 {
-    // splith split container with 2 children
+    "border": "none",
+    "current_border_width": 2,
+    "floating": "auto_off",
+    "geometry": {
+       "height": 1026,
+       "width": 560,
+       "x": 1680,
+       "y": 24
+    },
+    "marks": [],
+    "name": "Telegram",
+    "percent": 0.5,
+    "swallows": [
+       {
+        "class": "^TelegramDesktop$",
+        "instance": "^telegram\\-desktop$"
+       // "title": "^Telegram\\ \\(18\\)$"
+       }
+    ],
+    "type": "con"
+}
+
+{
+    // splitv split container with 2 children
     "border": "normal",
     "floating": "auto_off",
-    "layout": "splith",
+    "layout": "splitv",
     "marks": [],
-    "percent": 1,
+    "percent": 0.5,
     "type": "con",
     "nodes": [
         {
-            "border": "none",
-            "current_border_width": 2,
+            // splith split container with 1 children
+            "border": "normal",
             "floating": "auto_off",
-            "geometry": {
-               "height": 1026,
-               "width": 560,
-               "x": 1680,
-               "y": 24
-            },
+            "layout": "splith",
             "marks": [],
-            "name": "Telegram",
             "percent": 0.5,
-            "swallows": [
-               {
-                "class": "^TelegramDesktop$",
-                "instance": "^telegram\\-desktop$"
-               // "title": "^Telegram\\ \\(18\\)$"
-               }
-            ],
-            "type": "con"
+            "type": "con",
+            "nodes": [
+                {
+                    // splith split container with 1 children
+                    "border": "normal",
+                    "floating": "auto_off",
+                    "layout": "splith",
+                    "marks": [],
+                    "percent": 1,
+                    "type": "con",
+                    "nodes": [
+                        {
+                            "border": "normal",
+                            "current_border_width": 2,
+                            "floating": "auto_off",
+                            "geometry": {
+                               "height": 1002,
+                               "width": 800,
+                               "x": 2242,
+                               "y": 46
+                            },
+                            "marks": [],
+                            "name": "Element",
+                            "percent": 1,
+                            "swallows": [
+                               {
+                                "class": "^Element$",
+                                "instance": "^element$"
+                               // "title": "^Element\\ \\|\\ Skipper$",
+                               // "window_role": "^browser\\-window$"
+                               }
+                            ],
+                            "type": "con"
+                        }
+                    ]
+                }
+            ]
         },
         {
             "border": "normal",
             "current_border_width": 2,
             "floating": "auto_off",
             "geometry": {
-               "height": 1002,
-               "width": 800,
-               "x": 2242,
-               "y": 46
+               "height": 715,
+               "width": 1366,
+               "x": 183,
+               "y": 396
             },
             "marks": [],
-            "name": "Element",
+            "name": "Rocket Chat",
             "percent": 0.5,
             "swallows": [
                {
-                "class": "^Element$",
-                "instance": "^element$"
-               // "title": "^Element\\ \\|\\ wmutter$",
+                "class": "^Rocket\\.Chat$",
+                "instance": "^rocket\\.chat$"
+               // "title": "^Chat\\ der\\ Uni\\ Würzburg$",
                // "window_role": "^browser\\-window$"
                }
             ],
diff --git a/i3blocks/config b/i3blocks/config
index 031b245..117b198 100644
--- a/i3blocks/config
+++ b/i3blocks/config
@@ -21,11 +21,6 @@ LABEL=
 interval=10
 signal=10
 
-[keyboard]
-command=./keyboard
-interval=10
-LABEL=
-
 [calendar]
 command=./calendar
 interval=1