diff --git a/README.md b/README.md
index fda6e90..ba8a970 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,8 @@ alsa-utils pulseaudio pulseaudio-alsa pulseaudio-bluetooth playerctl xdotool \
 pavucontrol btrfs-progs udiskie blueman acpi acpid tlp conky stow openssh xsel \
 firefox veracrypt keepassxc ranger rofi chromium delta-git tesseract-data-eng \
 neofetch xf86-video-amdgpu lib32-mesa libva-mesa-driver lxappearance mesa-vdpau \
-lib32-libva-mesa-driver lib32-mesa-vdpau tesseract-data-eng p7zip
+lib32-libva-mesa-driver lib32-mesa-vdpau tesseract-data-eng p7zip pandoc-cli \
+nvtop wireguard-tools nmap bind wireshark-qt iperf3 cargo-flamegraph
 ```
 
 ## Picture
@@ -46,3 +47,24 @@ stow zsh
 I'm using pcmanfm with [[Sweet - New Flavor](https://www.gnome-look.org/p/1253385/)].
 The downloaded file needs to be extracted into `~/.themes/`.
 The Icons are from the related icon set: [[Candy Icons](https://www.gnome-look.org/p/1305251)].
+
+## ohmyzsh
+
+Plugins for ohmyzsh
+
+### eza
+
+```sh
+git clone https://github.com/z-shell/zsh-eza ~/.oh-my-zsh/custom/plugins/zsh-eza
+```
+
+## Environment
+
+Add
+
+```sh
+VISUAL=/usr/bin/nvim
+EDITOR=/usr/bin/nvim
+```
+
+to `/etc/environment`.
diff --git a/config/.config/i3/config b/config/.config/i3/config
index d24e7ba..d5f3837 100644
--- a/config/.config/i3/config
+++ b/config/.config/i3/config
@@ -105,8 +105,7 @@ bindsym $mod+Shift+space  exec --no-startup-id python ~/.scripts/i3lock.py
 bindsym $mod+Shift+s exec poweroff
 
 # start a terminal
-bindsym $mod+space exec alacritty
-bindsym $mod+Return exec alacritty -e zellij
+bindsym $mod+Return exec alacritty
 
 # kill focused window
 bindsym $mod+Shift+q kill
@@ -128,6 +127,14 @@ bindsym XF86AudioNext exec "playerctl next"
 bindsym XF86AudioPrevious exec "playerctl previous"
 bindsym XF86AudioMicMute exec "amixer set Capture toggle"
 
+# F9-F12 on Thinkpad
+bindsym XF86Display exec lxrandr
+bindsym XF86Messenger exec signal-desktop
+bindsym XF86Go exec dunstify -r 3 "Go"
+bindsym Cancel exec dunstify -r 3 "Cancel"
+bindsym XF86Favorites exec dunstify -r 3 "Favorites"
+
+
 # Application Shortcuts
 bindsym $mod+b exec firefox
 bindsym $mod+p exec firefox --private-window https://tudattr.dev
diff --git a/config/.config/zellij/config.kdl b/config/.config/zellij/config.kdl
index 0ef636d..892104d 100644
--- a/config/.config/zellij/config.kdl
+++ b/config/.config/zellij/config.kdl
@@ -1,8 +1,6 @@
 // If you'd like to override the default keybindings completely, be sure to change "keybinds" to "keybinds clear-defaults=true"
 keybinds {
     normal clear-defaults=true {
-        // uncomment this and adjust key if using copy_on_select=false
-        // bind "Alt c" { Copy; }
         bind "F1" {SwitchToMode "Tab"; }
         bind "F2" {SwitchToMode "Pane"; }
         bind "F5" {SwitchToMode "Session"; }
@@ -22,6 +20,25 @@ keybinds {
         bind "Alt -" { Resize "Decrease"; }
 
     }
+    tab {
+        bind "Ctrl t" { SwitchToMode "Normal"; }
+        bind "r" { SwitchToMode "RenameTab"; TabNameInput 0; }
+        bind "h" "Left" "Up" "k" { GoToPreviousTab; }
+        bind "l" "Right" "Down" "j" { GoToNextTab; }
+        bind "n" { NewTab; SwitchToMode "Normal"; }
+        bind "x" { CloseTab; SwitchToMode "Normal"; }
+        bind "s" { ToggleActiveSyncTab; SwitchToMode "Normal"; }
+        bind "1" { GoToTab 1; SwitchToMode "Normal"; }
+        bind "2" { GoToTab 2; SwitchToMode "Normal"; }
+        bind "3" { GoToTab 3; SwitchToMode "Normal"; }
+        bind "4" { GoToTab 4; SwitchToMode "Normal"; }
+        bind "5" { GoToTab 5; SwitchToMode "Normal"; }
+        bind "6" { GoToTab 6; SwitchToMode "Normal"; }
+        bind "7" { GoToTab 7; SwitchToMode "Normal"; }
+        bind "8" { GoToTab 8; SwitchToMode "Normal"; }
+        bind "9" { GoToTab 9; SwitchToMode "Normal"; }
+        bind "Tab" { ToggleTab; }
+    }
     locked {
         bind "F12" { SwitchToMode "Normal"; }
     }
@@ -63,25 +80,6 @@ keybinds {
         bind "k" "Up" { MovePane "Up"; }
         bind "l" "Right" { MovePane "Right"; }
     }
-    tab {
-        bind "Ctrl t" { SwitchToMode "Normal"; }
-        bind "r" { SwitchToMode "RenameTab"; TabNameInput 0; }
-        bind "h" "Left" "Up" "k" { GoToPreviousTab; }
-        bind "l" "Right" "Down" "j" { GoToNextTab; }
-        bind "n" { NewTab; SwitchToMode "Normal"; }
-        bind "x" { CloseTab; SwitchToMode "Normal"; }
-        bind "s" { ToggleActiveSyncTab; SwitchToMode "Normal"; }
-        bind "1" { GoToTab 1; SwitchToMode "Normal"; }
-        bind "2" { GoToTab 2; SwitchToMode "Normal"; }
-        bind "3" { GoToTab 3; SwitchToMode "Normal"; }
-        bind "4" { GoToTab 4; SwitchToMode "Normal"; }
-        bind "5" { GoToTab 5; SwitchToMode "Normal"; }
-        bind "6" { GoToTab 6; SwitchToMode "Normal"; }
-        bind "7" { GoToTab 7; SwitchToMode "Normal"; }
-        bind "8" { GoToTab 8; SwitchToMode "Normal"; }
-        bind "9" { GoToTab 9; SwitchToMode "Normal"; }
-        bind "Tab" { ToggleTab; }
-    }
     scroll {
         bind "Ctrl s" { SwitchToMode "Normal"; }
         bind "e" { EditScrollback; SwitchToMode "Normal"; }
@@ -299,7 +297,7 @@ theme "tokyo-night-dark"
 // Path to the default editor to use to edit pane scrollbuffer
 // Default: $EDITOR or $VISUAL
 //
-// scrollback_editor "/usr/bin/vim"
+scrollback_editor "/usr/bin/nvim"
 
 // When attaching to an existing session with other users,
 // should the session be mirrored (true)
diff --git a/config/.ssh/config b/config/.ssh/config
index f352fae..c7bba14 100644
--- a/config/.ssh/config
+++ b/config/.ssh/config
@@ -18,6 +18,7 @@ Host git.tudattr.dev
     Port 2222
     User git
     IdentityFile /mnt/veracrypt1/git
+    ProxyJump mii
 
 # Homeserver
 Host madrigal
diff --git a/zsh/.zshrc b/zsh/.zshrc
index d7909f6..3137235 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -45,31 +45,16 @@ setopt SHARE_HISTORY
 
 # Alias
 alias q="exit"
-alias b="byobu"
 alias vim="nvim"
 alias cat="bat --pager=never"
 alias ranger='ranger --choosedir=$HOME/.rangerdir; LASTDIR=`cat $HOME/.rangerdir`; cd "$LASTDIR"'
 alias xsel='xsel -ib'
-alias msfconsole="msfconsole -x \"db_connect metasploit@msf\""
-alias ed="\emacs --daemon"
-alias e="open_emacs"
 alias df="df -h"
 alias picpaste="xclip -selection clipboard -t image/png -o"
-alias eledger="emacsclient -nw ~/Documents/Finanzen/Ledger/MyBudget.ledger"
-alias sshconfig="emacsclient -nw ~/.ssh/config"
-alias econfig="emacsclient -nw ~/.doom.d/init.el"
 alias wttr="curl wttr.in/Essen"
-alias tvres="xrandr --output HDMI1 --transform 1.02,0,-20,0,1.02,-10,0,0,1"
-alias defaultres="xrandr --output HDMI1 --transform 1.00,0,0,0,1.00,0,0,0,1"
-alias zshconfig="emacsclient -nw ~/.zshrc; source ~/.zshrc;"
 alias notify="dunstify \"ping~\""
-alias ekill="pkill emacs; pkill emacsclient; ed"
 alias latexmk="latexmk -f -pdf -interaction=nonstopmode"
 alias picotik="picocom --b 115200 /dev/ttyUSB0"
-alias ls="eza"
-## git
-alias gps="git push soft --all"
-alias gras="add_soft_git"
 
 # Theme
 ZSH_THEME="agnoster"
@@ -79,17 +64,24 @@ plugins=(
     git
     history
     z
+    zsh-eza
 )
 
 randpw() { < /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c${1:-$1};echo;};
 
+autoload -U +X bashcompinit && bashcompinit
+
+if [[ -z "$ZELLIJ" ]]; then
+    if [[ "$ZELLIJ_AUTO_ATTACH" == "true" ]]; then
+        zellij attach -c
+    else
+        zellij
+    fi
+
+    if [[ "$ZELLIJ_AUTO_EXIT" == "true" ]]; then
+        exit
+    fi
+fi
+
 # Source
 source $ZSH/oh-my-zsh.sh
-
-add_soft_git() { git remote add soft ssh://git.aya01:/$1 }
-open_emacs() { emacsclient -c $1 & disown; };
-
-autoload -U +X bashcompinit && bashcompinit
-complete -o nospace -C /usr/bin/terraform terraform
-
-# echo "rm -rf braincells/*"