diff --git a/laptop-nord/.config/alacritty/alacritty.yml b/laptop-nord/.config/alacritty/alacritty.yml
index 80f846c..948cad1 100644
--- a/laptop-nord/.config/alacritty/alacritty.yml
+++ b/laptop-nord/.config/alacritty/alacritty.yml
@@ -34,7 +34,7 @@ window:
   # Blank space added around the window in pixels. This padding is scaled
   # by DPI and the specified value is always added at both opposing sides.
   padding:
-    x: 20
+    x: 15
     y: 15
 
   # Spread additional padding evenly around the terminal content.
@@ -270,16 +270,16 @@ colors:
 #   - Linear
 #
 # Specifying a `duration` of `0` will disable the visual bell.
-visual_bell:
-  animation: EaseOutExpo
-  duration: 0
-  color: '#ffffff'
+#visual_bell:
+#  animation: EaseOutExpo
+#  duration: 0
+#  color: '#ffffff'
 
 # Background opacity
 #
 # Window opacity as a floating point number from `0.0` to `1.0`.
 # The value `0.0` is completely transparent and `1.0` is opaque.
-background_opacity: 0.82
+background_opacity: 0.9
 
 selection:
   #semantic_escape_chars: ",│`|:\"' ()[]{}<>\t"
@@ -288,7 +288,7 @@ selection:
   save_to_clipboard: true
 
 # Allow terminal applications to change Alacritty's window title.
-dynamic_title: true
+window.dynamic_title: true
 
 cursor:
   # Cursor style
diff --git a/laptop-nord/.config/dunst/dunstrc b/laptop-nord/.config/dunst/dunstrc
index beede9b..d0ce5e6 100644
--- a/laptop-nord/.config/dunst/dunstrc
+++ b/laptop-nord/.config/dunst/dunstrc
@@ -164,7 +164,7 @@
     icon_position = left
 
     # Scale larger icons down to this size, set to 0 to disable
-    max_icon_size = 85
+    max_icon_size = 60
 
     # Paths to default icons.
     icon_path = /home/marc/.icons/default
diff --git a/laptop-nord/.config/i3/config b/laptop-nord/.config/i3/config
index 860c1d1..6d07b7a 100644
--- a/laptop-nord/.config/i3/config
+++ b/laptop-nord/.config/i3/config
@@ -1,28 +1,31 @@
+#  ▄▄   ▄▄ ▄▄▄▄▄▄ ▄▄▄▄▄▄   ▄▄▄▄▄▄▄ ▄▄  ▄▄▄▄▄▄▄    ▄▄▄ ▄▄▄▄▄▄▄    ▄▄▄▄▄▄▄ ▄▄▄▄▄▄▄ ▄▄    ▄ ▄▄▄▄▄▄▄ ▄▄▄ ▄▄▄▄▄▄▄
+# █  █▄█  █      █   ▄  █ █       █  ██       █  █   █       █  █       █       █  █  █ █       █   █       █
+# █       █  ▄   █  █ █ █ █       █▄▄██  ▄▄▄▄▄█  █   █▄▄▄    █  █       █   ▄   █   █▄█ █    ▄▄▄█   █   ▄▄▄▄█
+# █       █ █▄█  █   █▄▄█▄█     ▄▄█   █ █▄▄▄▄▄   █   █▄▄▄█   █  █     ▄▄█  █ █  █       █   █▄▄▄█   █  █  ▄▄
+# █       █      █    ▄▄  █    █      █▄▄▄▄▄  █  █   █▄▄▄    █  █    █  █  █▄█  █  ▄    █    ▄▄▄█   █  █ █  █
+# █ ██▄██ █  ▄   █   █  █ █    █▄▄     ▄▄▄▄▄█ █  █   █▄▄▄█   █  █    █▄▄█       █ █ █   █   █   █   █  █▄▄█ █
+# █▄█   █▄█▄█ █▄▄█▄▄▄█  █▄█▄▄▄▄▄▄▄█   █▄▄▄▄▄▄▄█  █▄▄▄█▄▄▄▄▄▄▄█  █▄▄▄▄▄▄▄█▄▄▄▄▄▄▄█▄█  █▄▄█▄▄▄█   █▄▄▄█▄▄▄▄▄▄▄█
+
+# Set Mod Keys
 set $mod Mod4
+floating_modifier $mod
 
 # Font for Window Titles
 font pango:FiraCode Nerd Font Mono 8
 
-# The combination of xss-lock, nm-applet and pactl is a popular choice, so
-# they are included here as an example. Modify as you see fit.
-# xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the
-# screen before suspend. Use loginctl lock-session to lock your screen.
-exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
-
-# Use Mouse+$mod to drag floating windows to their wanted position
-floating_modifier $mod
-
-### Keybinds ###
+# ============================== Keybinds (except workspaces)
 #Terminal
 bindsym $mod+Return exec --no-startup-id alacritty
 bindsym $mod+Ctrl+Return exec --no-startup-id xterm
 
-# Locking
+# Leaving
 bindsym $mod+Shift+BackSpace exec "~/scripts/lock-laptop.sh"
-
-# Exit Session
 bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'Logout?' -B 'Yes!' 'i3-msg exit'"
 
+# Config refresh
+bindsym $mod+Shift+c reload
+bindsym $mod+Shift+r restart
+
 # Windows
 bindsym $mod+h focus left
 bindsym $mod+j focus down
@@ -44,14 +47,12 @@ bindsym $mod+Shift+q kill
 bindsym $mod+f fullscreen toggle
 bindsym $mod+Shift+space floating toggle
 
-# Layout
 bindsym $mod+s layout toggle stacking splith
 
 # Create splits just like in vim
 bindsym $mod+Shift+s split v
 bindsym $mod+Shift+v split h
 
-# Workspace Cycle
 bindsym $mod+n workspace next
 bindsym $mod+p workspace prev
 
@@ -61,28 +62,28 @@ bindsym $mod+space exec "~/.config/rofi/launchers-git/launcher.sh"
 set $nord0d '#2e3440'
 set $frost2d '#eceff4'
 set $greend '#A3BE8C'
-bindsym $mod+d exec "dmenu_run -fn 'FiraCode Nerd Font Mono' -nb #2e3440 -sb #a3be8c -nf #eceff4 -sf #2e3440"
+bindsym $mod+d exec "dmenu_run -fn 'FiraCode Nerd Font Mono' -nb '#2e3440' -sb '#a3be8c' -nf '#eceff4' -sf '#2e3440'"
 
-#bindsym --release $mod+Shift+p exec"import ~/screenshots/Screenshot-$(date '+%Y%m%d-%H%M%S').png"
+# Screenhot
 bindsym $mod+Shift+p exec "flameshot gui"
 
-# Screen brightness
+# Screen brightness with light
 bindsym XF86MonBrightnessUp exec light -A 5 # increase
 bindsym XF86MonBrightnessDown exec light -U 5 # decrease
 
-# Volume
+# Volume witg pactl
 bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +2%
 bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -2%
 bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle
 bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle
 
-# Sound Control
+# Music Control with playerctl
 bindsym XF86AudioPlay exec playerctl play
 bindsym XF86AudioPause exec playerctl pause
 bindsym XF86AudioNext exec playerctl next
 bindsym XF86AudioPrev exec playerctl previous
 
-### Workspaces ###
+# ======================================== Workspaces
 set $ws1 "1"
 set $ws2 "2"
 set $ws3 "3"
@@ -118,14 +119,13 @@ 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+c reload
-bindsym $mod+Shift+r restart
-
-### Design ###
+# ============================== Design
+# Remove title
 new_window 1pixel
+
+# Set Border
 for_window [class="^.*"] border pixel 0
 
-# Colors from https://www.nordtheme.com/
 set $nord0 "#2e3440"
 
 set $blue1 "#88c0d0"
@@ -136,30 +136,26 @@ set $frost2 "#eceff4"
 
 set $green "#A3BE8C"
 
-set $red "#bf616a" 
+set $red "#bf616a"
+
 # class                 border  backgr.text    indic. child_border
-client.focused          $nord0  $nord0 $frost2 $nord0 $nord0
-client.focused_inactive $nord0  $blue3 $nord0  $nord0 $nord0
+client.focused          $blue1  $blue1 $nord0  $nord0 $nord0
+client.focused_inactive $blue1  $blue1 $nord0  $nord0 $nord0
 client.unfocused        $nord0  $nord0 $frost0 $blue1 $nord0
 client.urgent           $red    $red   $frost2 $red   $red
 client.background       #ffffff
 
-# Monitors
-set $monitor1 "eDP-1"
-set $monitor2 "HDMI-1"
-
+# i3-gaps
 gaps inner 8
-# polybar height + gaps inner
-gaps top 35
-
-bindsym $mod+Ctrl+1 move workspace to output $monitor1
-bindsym $mod+Ctrl+2 move workspace to output $monitor2
+gaps top 35 # polybar height + gaps inner
 
+# ============================== Autostart
 # Keyboard layout
 exec setxkbmap -layout za
 
-# Start programs
+# Programs
 exec feh --bg-scale $HOME/data/wallpaper/wallpaper.png
+exec nm-applet &
 exec dunst &
 exec picom --experimental-backends
-exec --no-startup-id ~/.config/polybar/launch.sh &amp
+exec --no-startup-id ~/.config/polybar/launch.sh laptop &amp
diff --git a/laptop-nord/.config/picom.conf b/laptop-nord/.config/picom.conf
index d46ee48..ddf86bd 100644
--- a/laptop-nord/.config/picom.conf
+++ b/laptop-nord/.config/picom.conf
@@ -4,12 +4,14 @@ opacity-rule = [
     "95:class_g *?= 'XTerm'",
 ];
 
-inactive-dim = 0.2;
+#inactive-dim = 0.15;
+inactive-opacity = 0.9;
 
 backend = "glx";
 blur: {
     method: "dual_kawase";
-    strength = 7;
+    size = 2;
+    strength = 4;
     background = false;
     background-frame = false;
     background-fixed = false;
diff --git a/laptop-nord/.config/polybar/config b/laptop-nord/.config/polybar/config
index 9a50751..ed92b75 100644
--- a/laptop-nord/.config/polybar/config
+++ b/laptop-nord/.config/polybar/config
@@ -1,5 +1,4 @@
-; vim: ft=dosini
-
+; ft=dosini
 [colors]
 transparent = #00000000
 
@@ -43,13 +42,29 @@ radius = 12
 height = 27px
 
 foreground = ${colors.foreground}
-background = #d12e3440
+background = #2e3440
 
 module-margin= 0
 
 wm-name = i3
 wm-restack = i3
 
+################################################################################
+[bar/all]
+inherit = bar/global
+width = 80%
+
+override-redirect = true
+
+padding = 3
+
+offset-x = 10%:-8px
+offset-y = 8px
+
+modules-left = i3
+modules-center = spotify
+modules-right = update brightness volume date
+
 ################################################################################
 [bar/workspaces]
 inherit = bar/global
@@ -63,14 +78,13 @@ offset-y = 8px
 modules-center = i3
 
 ################################################################################
-[bar/middle]
+[bar/music]
 inherit = bar/global
-width = 25%
+width = 22%
 
 override-redirect = true
-fixed-center = true
 
-offset-x = 37.25%
+offset-x = 11.5%-8px
 offset-y = 8px
 
 modules-center = spotify
@@ -78,17 +92,30 @@ modules-center = spotify
 ################################################################################
 [bar/status]
 inherit = bar/global
-width = 31%
+width = 22%
 
 override-redirect = true
 fixed-center = true
 
-offset-x = 69%:-8px
+offset-x = 67%:-8px
 offset-y = 8px
 
-#tray-position = left
+modules-center = update backlight volume battery date
 
-modules-center = update backlight volume battery network date
+################################################################################
+[bar/tray]
+inherit = bar/global
+width = 10%
+
+override-redirect = true
+fixed-center = true
+
+offset-x = 90%:-8px
+offset-y = 8px
+
+tray-position = center
+
+modules-center = update
 
 ###############################################################################
 [module/i3]
@@ -116,6 +143,7 @@ ws-icon-default = 
 #label-focused = ""
 label-focused = "%icon%"
 label-focused-padding = 1
+label-focused-underline = ${colors.red}
 
 #label-unfocused = ""
 label-unfocused = "%icon%"
@@ -135,7 +163,7 @@ format-padding = 1
 interval = 1.0
 
 #time =  %I:%M %p - %A, %d %B %Y
-time =  %I:%M %p - %d.%m.%Y
+time =  %I:%M %p  %d.%m.%Y
 time-alt =  %I:%M %p
 
 format = <label>
diff --git a/laptop-nord/.config/polybar/launch.sh b/laptop-nord/.config/polybar/launch.sh
index 5a8bbf3..c27af98 100755
--- a/laptop-nord/.config/polybar/launch.sh
+++ b/laptop-nord/.config/polybar/launch.sh
@@ -3,9 +3,15 @@ while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done
 
 if type "xrandr"; then
   for mon in $(xrandr --query | grep " connected" | cut -d" " -f1); do
-    MONITOR=$mon polybar --reload workspaces &
-    MONITOR=$mon polybar --reload middle &
-    MONITOR=$mon polybar --reload status &
+    if [ "$1" = "laptop" ]; then
+      MONITOR=$mon polybar --reload workspaces &
+      MONITOR=$mon polybar --reload music &
+      MONITOR=$mon polybar --reload status &
+      MONITOR=$mon polybar --reload tray &
+    fi
+    if [ "$1" = "all" ]; then
+      MONITOR=$mon polybar --reload all &
+    fi
   done
 else
     echo "No Bars loaded."
diff --git a/laptop-nord/.config/polybar/scripts/song.sh b/laptop-nord/.config/polybar/scripts/song.sh
index 62a5fa8..ba2254a 100755
--- a/laptop-nord/.config/polybar/scripts/song.sh
+++ b/laptop-nord/.config/polybar/scripts/song.sh
@@ -1,15 +1,17 @@
 #!/bin/sh
 
+length=20
+
 function scroll () {
 	prefix="$1"
 	scrolling="$2"
-	temp="$(echo "$scrolling"| sed "s/^\(.\{20\}\)\(.*\)$/\1[\2]/"| sed "s/\[ *\]$//"| sed "s/\[.*\]$//")"
+	temp="$(echo "$scrolling"| sed "s/^\(.\{$length\}\)\(.*\)$/\1[\2]/"| sed "s/\[ *\]$//"| sed "s/\[.*\]$//")"
 	suffix="$3"
-	if [ "$(echo -n $scrolling |wc -c)" -gt 20 ]; then
+	if [ "$(echo -n $scrolling |wc -c)" -gt $length ]; then
 		echo "$prefix%{T7}$temp%{T-}$suffix"
 		sleep 0.5
 
-		zscroll -l 20 \
+		zscroll -l $length \
         		--delay 0.2 \
 			--before-text "$prefix%{T7}" \
 			--after-text "%{T-}$suffix" \
@@ -23,7 +25,7 @@ function scroll () {
 } #
 
 function get_artist () {
-	echo "$(playerctl -p spotify metadata --format "{{ artist }}"| sed -e "s/[[(]....*[])]*//g" | sed "s/ *$//"| sed "s/^\(.\{20\}[^ ]*\)\(.*\)$/\1[\2]/"| sed "s/\[ *\]$//"| sed "s/\[.*\]$/.../")"
+	echo "$(playerctl -p spotify metadata --format "{{ artist }}"| sed -e "s/[[(]....*[])]*//g" | sed "s/ *$//"| sed "s/^\(.\{$length\}[^ ]*\)\(.*\)$/\1[\2]/"| sed "s/\[ *\]$//"| sed "s/\[.*\]$/.../")"
 } #
 
 function get_title () {
diff --git a/laptop-nord/.config/ranger/rc.conf b/laptop-nord/.config/ranger/rc.conf
index 034cee2..51552bd 100644
--- a/laptop-nord/.config/ranger/rc.conf
+++ b/laptop-nord/.config/ranger/rc.conf
@@ -1,6 +1,6 @@
 set preview_images true
-#set preview_images_method ueberzug
-set preview_images_method w3m
+set preview_images_method ueberzug
+#set preview_images_method w3m
 
 #icons
 default_linemode devicons
diff --git a/laptop-nord/.gitconfig b/laptop-nord/.gitconfig
index 807331c..0bfe488 100644
--- a/laptop-nord/.gitconfig
+++ b/laptop-nord/.gitconfig
@@ -1,6 +1,6 @@
 [user]
 	name = Marco Thomas
-	email = ma_tho@web.de
+	email = mthomas@marcmk.de
 [alias]
 	aa = add .
 	st = status
@@ -12,4 +12,4 @@
 	b = branch
 	l = pull
 	p = push
-	log = log --oneline --decorate --graph
+	lg = log --oneline --decorate --graph
diff --git a/laptop-nord/.tmux.conf b/laptop-nord/.tmux.conf
index 897fa3c..8919fd6 100644
--- a/laptop-nord/.tmux.conf
+++ b/laptop-nord/.tmux.conf
@@ -18,6 +18,10 @@ set -g base-index 1
 setw -g pane-base-index 1
 
 # colors
-set -g status-bg blue
-set -g status-fg black
+set -g status-bg black
+set -g status-fg white
 set -g status-right '%Y.%m.%d %H:%M'
+
+set-window-option -g window-status-current-style fg=black
+set-window-option -g window-status-current-style fg=black,bg=cyan,bright
+set-window-option -g window-status-activity-style fg=brightred
diff --git a/laptop-nord/.vimrc b/laptop-nord/.vimrc
index 500f9b4..f6a8c32 100644
--- a/laptop-nord/.vimrc
+++ b/laptop-nord/.vimrc
@@ -64,13 +64,17 @@ syntax on
 colorscheme nord
 filetype indent plugin on
 
+"set termguicolors
+"let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
+"let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
+
 " ============================== General
 set number
 set relativenumber
 
 set showmatch " highlights paranthesis
 set mat=5
-set noswapfile " can be problamatic on some systems
+set noswapfile " can be problematic on some systems
 set confirm " can't quit without saving
 set noshowmode " don't show mode in status
 set noshowcmd " don't show command in status