diff --git a/README.md b/README.md
index e216b73..e49e6d7 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,8 @@
 + WM: i3
 
 ## Programs
-+ Launcher: rofi
++ Editor: nvim
++ Launcher: dmenu + rofi
 + Bar: polybar
 + Notifications: dunst
 + Compositor: [picom](https://github.com/ibhagwan/picom)
@@ -13,6 +14,10 @@
 + Info: [fet.sh](https://github.com/6gk/fet.sh)
 + Screenshots: Flameshot
 
+## Dependencies
+
++ Vundle: `git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim`
+
 ## Fonts
 + Fira Code Regular Nerd Font Complete Mono.ttf: General
 + IPAGothic.ttf: Japanese Characters
diff --git a/laptop/.Xresources b/laptop/.Xresources
index b9f61a1..96b6b55 100644
--- a/laptop/.Xresources
+++ b/laptop/.Xresources
@@ -1,50 +1,59 @@
-! Copyright (c) 2016-present Arctic Ice Studio <development@arcticicestudio.com>
-! ! Copyright (c) 2016-present Sven Greb <code@svengreb.de>
-!
-! ! Project:    Nord XResources
-! ! Version:    0.1.0
-! ! Repository: https://github.com/arcticicestudio/nord-xresources
-! ! License:    MIT
-!
-#define nord0 #2E3440
-#define nord1 #3B4252
-#define nord2 #434C5E
-#define nord3 #4C566A
-#define nord4 #D8DEE9
-#define nord5 #E5E9F0
-#define nord6 #ECEFF4
-#define nord7 #8FBCBB
-#define nord8 #88C0D0
-#define nord9 #81A1C1
-#define nord10 #5E81AC
-#define nord11 #BF616A
-#define nord12 #D08770
-#define nord13 #EBCB8B
-#define nord14 #A3BE8C
-#define nord15 #B48EAD
+#define S_base03        #002b36
+#define S_base02        #073642
+#define S_base01        #586e75
+#define S_base00        #657b83
+#define S_base0         #839496
+#define S_base1         #93a1a1
+#define S_base2         #eee8d5
+#define S_base3         #fdf6e3
 
-*.foreground:   nord4
-*.background:   nord0
-*.cursorColor:  nord4
-*fading: 35
-*fadeColor: nord3
+*background:            S_base03
+*foreground:            S_base0
+*fadeColor:             S_base03
+*cursorColor:           S_base1
+*pointerColorBackground:S_base01
+*pointerColorForeground:S_base1
 
-*.color0: nord1
-*.color1: nord11
-*.color2: nord14
-*.color3: nord13
-*.color4: nord9
-*.color5: nord15
-*.color6: nord8
-*.color7: nord5
-*.color8: nord3
-*.color9: nord11
-*.color10: nord14
-*.color11: nord13
-*.color12: nord9
-*.color13: nord15
-*.color14: nord7
-*.color15: nord6
+#define S_yellow        #b58900
+#define S_orange        #cb4b16
+#define S_red           #dc322f
+#define S_magenta       #d33682
+#define S_violet        #6c71c4
+#define S_blue          #268bd2
+#define S_cyan          #2aa198
+#define S_green         #859900
+
+!! black dark/light
+*color0:                S_base02
+*color8:                S_base03
+
+!! red dark/light
+*color1:                S_red
+*color9:                S_orange
+
+!! green dark/light
+*color2:                S_green
+*color10:               S_base01
+
+!! yellow dark/light
+*color3:                S_yellow
+*color11:               S_base00
+
+!! blue dark/light
+*color4:                S_blue
+*color12:               S_base0
+
+!! magenta dark/light
+*color5:                S_magenta
+*color13:               S_violet
+
+!! cyan dark/light
+*color6:                S_cyan
+*color14:               S_base1
+
+!! white dark/light
+*color7:                S_base2
+*color15:               S_base3
 
 !! Some extra xterm settings
 ! Font
diff --git a/laptop/.config/alacritty/alacritty.yml b/laptop/.config/alacritty/alacritty.yml
index b41e71d..ec1766f 100644
--- a/laptop/.config/alacritty/alacritty.yml
+++ b/laptop/.config/alacritty/alacritty.yml
@@ -87,34 +87,34 @@ font:
   #  x: 0
   #  y: 0
 
-# Colors (Ayu Dark)
+# Colors (Solarized Dark)
 colors:
   # Default colors
   primary:
-    background: '0x0A0E14'
-    foreground: '0xB3B1AD'
+    background: '0x002b36'
+    foreground: '0x839496'
 
   # Normal colors
   normal:
-    black:   '0x01060E'
-    red:     '0xEA6C73'
-    green:   '0x91B362'
-    yellow:  '0xF9AF4F'
-    blue:    '0x53BDFA'
-    magenta: '0xFAE994'
-    cyan:    '0x90E1C6'
-    white:   '0xC7C7C7'
+    black:   '0x073642'
+    red:     '0xdc322f'
+    green:   '0x859900'
+    yellow:  '0xb58900'
+    blue:    '0x268bd2'
+    magenta: '0xd33682'
+    cyan:    '0x2aa198'
+    white:   '0xeee8d5'
 
   # Bright colors
   bright:
-    black:   '0x686868'
-    red:     '0xF07178'
-    green:   '0xC2D94C'
-    yellow:  '0xFFB454'
-    blue:    '0x59C2FF'
-    magenta: '0xFFEE99'
-    cyan:    '0x95E6CB'
-    white:   '0xFFFFFF'
+    black:   '0x002b36'
+    red:     '0xcb4b16'
+    green:   '0x586e75'
+    yellow:  '0x657b83'
+    blue:    '0x839496'
+    magenta: '0x6c71c4'
+    cyan:    '0x93a1a1'
+    white:   '0xfdf6e3'
 
 background_opacity: 0.95
 
diff --git a/laptop/.config/i3/config b/laptop/.config/i3/config
index d04b6d8..afefb5c 100644
--- a/laptop/.config/i3/config
+++ b/laptop/.config/i3/config
@@ -57,17 +57,18 @@ bindsym $mod+n workspace next
 bindsym $mod+p workspace prev
 
 # Rofi and dmenu
-bindsym $mod+d exec "~/.config/rofi/launchers-git/launcher.sh"
-bindsym $mod+space exec "~/.config/rofi/launchers-git/launcher.sh"
+bindsym $mod+space exec rofi -show run
 
-set $nord0d '#2e3440'
-set $frost2d '#eceff4'
-set $greend '#A3BE8C'
-bindsym $mod+Shift+d exec "dmenu_run -fn 'FiraCode Nerd Font Mono' -nb '#2e3440' -sb '#a3be8c' -nf '#eceff4' -sf '#2e3440'"
+set $fg '#ffffff'
+set $bg '#000000'
+bindsym $mod+d exec "dmenu_run -fn 'FiraCode Nerd Font Mono' -nb $bg -sb $fg -nf $fg -sf $bg"
 
 # Screenhot
 bindsym $mod+Shift+p exec "flameshot gui"
 
+# Filemanager
+bindsym $mod+e exec nautilus
+
 # Screen brightness with light
 bindsym XF86MonBrightnessUp exec light -A 5 # increase
 bindsym XF86MonBrightnessDown exec light -U 5 # decrease
@@ -162,5 +163,5 @@ exec setxkbmap -layout za
 # Programs
 exec feh --bg-scale $HOME/data/wallpaper/wallpaper.png
 exec dunst &
-exec picom
+exec picom &
 exec --no-startup-id ~/.config/polybar/launch.sh laptop &amp
diff --git a/laptop/.config/nvim/.netrwhist b/laptop/.config/nvim/.netrwhist
index 400ff14..2fb1f39 100644
--- a/laptop/.config/nvim/.netrwhist
+++ b/laptop/.config/nvim/.netrwhist
@@ -1,5 +1,6 @@
 let g:netrw_dirhistmax  =10
-let g:netrw_dirhistcnt =4
+let g:netrw_dirhistcnt =5
+let g:netrw_dirhist_5='/home/marc/.mutt/user'
 let g:netrw_dirhist_4='/home/marc/dots/laptop/.config/rofi'
 let g:netrw_dirhist_3='/home/marc/.config/rofi'
 let g:netrw_dirhist_2='/home/marc/.config/dunst'
diff --git a/laptop/.config/polybar/config b/laptop/.config/polybar/config
index 49bcf3c..6bad01b 100644
--- a/laptop/.config/polybar/config
+++ b/laptop/.config/polybar/config
@@ -2,8 +2,10 @@
 
 [colors]
 background = #000000
-foreground = ${xrdb:color7}
-foreground-alt = ${xrdb:color8}
+#foreground = ${xrdb:color7}
+foreground = #ffffff
+#foreground-alt = ${xrdb:color8}
+foreground-alt = #555555
 urgent = ${xrdb:color1}
 
 [bar/main]
@@ -68,13 +70,13 @@ label-maxlen = 100
 
 [module/date]
 type = internal/date
-date = %H:%M - %d.%m.%Y%
+date = %H:%M - %a %d.%m.%Y%
 
 [module/backlight]
 type = internal/backlight
 #ls -1 /sys/class/backlight
 card = amdgpu_bl0
-label = brgt %percentage%%
+label = lgt %percentage%%
 
 [module/battery]
 type = internal/battery
@@ -97,3 +99,4 @@ interval = 3.0
 accumulate-stats = true
 unknown-as-up = true
 label-connected = %essid%
+label-disconnected = no wifi
diff --git a/laptop/.config/rofi/config.rasi b/laptop/.config/rofi/config.rasi
index 63876f2..f76e6c3 100644
--- a/laptop/.config/rofi/config.rasi
+++ b/laptop/.config/rofi/config.rasi
@@ -1,9 +1,50 @@
-/** Configured For Applets **/
-
 configuration {
-  show-icons:         true;
-  icon-theme:         "Papirus";
-  location: 5;
-  yoffset: -50;
-  xoffset: -20;
+  modi: "run,drun,window";
+  width: 20;
+  font: "FiraCode Nerd Font 12";
+  terminal: "alacritty";
+  disable-history: true;
+  sidebar-mode: true;
+  tokenize: true;
+  m: "-5";
+  line-margin: 2;
+  line-padding: 1;
+  separator-style: "none";
+  hide-scrollbar: true;
+  window-format: "{w} {c}";
+}
+
+* {
+  bg: #0F1212;
+  fg: #e3e3e3;
+  accent: #131717;
+  background-color: @bg;
+  text-color: @fg;
+}
+
+window {
+  padding: 30px;
+  border-radius: 5px;
+}
+
+prompt, entry {
+  text-color: @fg;
+  padding: 3px;
+}
+
+element {
+  border-radius: 2px;
+  padding: 4px;
+}
+
+element selected {
+  background-color: @fg;
+  text-color: @bg;
+}
+
+button selected {
+  background-color: @fg;
+  text-color: @bg;
+  border-radius: 2px;
+  padding: 3px;
 }
diff --git a/laptop/.config/rofi/launchers-git/appdrawer.rasi b/laptop/.config/rofi/launchers-git/appdrawer.rasi
deleted file mode 100644
index 537ae44..0000000
--- a/laptop/.config/rofi/launchers-git/appdrawer.rasi
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- *
- * Author : Aditya Shakya (adi1090x)
- * Mail : adi1090x@gmail.com
- * Github : @adi1090x
- * Reddit : @adi1090x
- *
- */
-
-configuration {
-    font:                           "FiraCode Nerd Font Mono 10";
-    show-icons:                     true;
-	icon-theme: 					"Papirus";
-    display-drun: 					"";
-    drun-display-format:            "{name}";
-    threads:                        0;
-    scroll-method:                  0;
-    disable-history:                false;
-    fullscreen:                     false;
-	hide-scrollbar: 				true;
-	sidebar-mode: 					false;
-}
-
-* {
-    background:                     #01060E;
-    background-alt:                 #01060E;
-    background-ib:                  #0A0E14;
-    foreground:                     #fdfdfd;
-    border:               			#0A0E14;
-    border-sel:               		#79e6f3;
-    selected:               		#282a36;
-    urgent:                         #f37f97;
-}
-
-window {
-    transparency:                   "real";
-    background-color:               @background;
-    text-color:                     @foreground;
-    border:                  		6px;
-    border-radius:                  15px;
-    border-color:                  	@border;
-    height:                         1037px;
-    width:                          25%;
-    location:                       west;
-    anchor:                         west;
-    x-offset:                       14px;
-    y-offset:                       14px;
-}
-
-prompt {
-    enabled: 						true;
-	padding: 						0px 8px 0px 4px;
-	background-color: 				@background-ib;
-	text-color: 					@foreground;
-	font:							"FiraCode Nerd Font Mono 20";
-}
-
-
-inputbar {
-    background-color:               @background-ib;
-    text-color:                     @foreground;
-    expand:                         false;
-    border:                  		0px 0px 0px 0px;
-    border-radius:                  30px;
-    border-color:                  	@border;
-    margin:                         0px 0px 0px 0px;
-    padding:                        2px 2px 2px 2px;
-    position:                       center;
-}
-
-entry {
-    background-color:               @background-ib;
-    text-color:                     @foreground;
-    placeholder-color:              @foreground;
-    expand:                         true;
-    horizontal-align:               0;
-    padding:                        8px 2px 2px 2px;
-    placeholder:                    "Search Apps";
-    blink:                          true;
-}
-
-case-indicator {
-    background-color:               @background-ib;
-    text-color:                     @foreground;
-    spacing:                        0;
-}
-
-
-listview {
-    background-color:               @background;
-    columns:                        2;
-    spacing:                        4px;
-    cycle:                          false;
-    dynamic:                        true;
-    layout:                         vertical;
-}
-
-mainbox {
-    background-color:               @background;
-    children:                       [ inputbar, listview ];
-    spacing:                       	10px;
-    padding:                        8px 15px 8px 15px;
-}
-
-element {
-    background-color:               @background;
-    text-color:                     @foreground;
-    orientation:                    vertical;
-    border-radius:                  0px;
-    margin:                         0px 5px 0px 5px;
-    padding:                        10px 0px 10px 0px;
-}
-
-element-icon {
-    size:                           64px;
-    border:                         0px;
-}
-
-element-text {
-    expand:                         true;
-    horizontal-align:               0.5;
-    vertical-align:                 0.5;
-    margin:                         5px 10px 0px 10px;
-}
-
-element normal.urgent,
-element alternate.urgent {
-    background-color:               @urgent;
-    text-color:                     @foreground;
-    border-radius:                  9px;
-}
-
-element normal.active,
-element alternate.active {
-    background-color:               @background-alt;
-    text-color:                     @foreground;
-}
-
-element selected {
-    background-color:               @selected;
-    text-color:                     @foreground;
-    border:                  		0px 0px 2px 0px;
-    border-radius:                  4px;
-    border-color:                  	@border-sel;
-}
-
-element selected.urgent {
-    background-color:               @urgent;
-    text-color:                     @foreground;
-}
-
-element selected.active {
-    background-color:               @background-alt;
-    color:                          @foreground;
-}
diff --git a/laptop/.config/rofi/launchers-git/launcher.sh b/laptop/.config/rofi/launchers-git/launcher.sh
deleted file mode 100755
index 3f691a4..0000000
--- a/laptop/.config/rofi/launchers-git/launcher.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-
-## Author : Aditya Shakya (adi1090x)
-## Mail : adi1090x@gmail.com
-## Github : @adi1090x
-## Reddit : @adi1090x
-
-# Available Styles
-# >> Styles Below Only Works With "rofi-git(AUR)", Current Version: 1.5.4-76-gca067234
-#
-# blurry	blurry_full		kde_simplemenu		kde_krunner		launchpad
-# gnome_do	slingshot		appdrawer			appfolder		column
-# row		row_center		screen				row_dock		row_dropdown
-
-style="appdrawer"
-
-rofi -no-lazy-grab -show drun -theme launchers-git/"$style".rasi
diff --git a/laptop/.gitconfig b/laptop/.gitconfig
index 0bfe488..245337d 100644
--- a/laptop/.gitconfig
+++ b/laptop/.gitconfig
@@ -10,6 +10,6 @@
 	ca = commit -v --amend
 	co = checkout
 	b = branch
-	l = pull
-	p = push
+	pl = pull --rebase
+	ps = push
 	lg = log --oneline --decorate --graph
diff --git a/laptop/.tmux.conf b/laptop/.tmux.conf
index 79a7e18..751c7c3 100644
--- a/laptop/.tmux.conf
+++ b/laptop/.tmux.conf
@@ -16,17 +16,20 @@ set-option -g mouse on
 set -g base-index 1
 setw -g pane-base-index 1
 
+# reload bind
+bind-key r source-file ~/.tmux.conf
+
 # status bar
-set -g status-bg black
+set -g status-bg default
 set -g status-fg white
 set -g status-right '%Y.%m.%d %H:%M'
 
-# Remove Bar Asteriks
 setw -g window-status-current-format '<#{?window_zoomed_flag,#[fg=red],}#I:#W#{?window_zoomed_flag,#[fg=red],}>'
 setw -g window-status-format '#I:#W'
 
 set -g status-left ''
-set -g status-right '#(date) [#S]'
+set -g status-right '%H:%M - %d.%m.%Y [session #S on #h]'
+set -g status-right-length 120
 
 set-window-option -g window-status-current-style fg=green,bg=default
 set-window-option -g window-status-activity-style fg=brightred
diff --git a/laptop/.vimrc b/laptop/.vimrc
index eb71bdf..accc2f0 100644
--- a/laptop/.vimrc
+++ b/laptop/.vimrc
@@ -16,12 +16,12 @@ call vundle#begin()
 
 Plugin 'VundleVim/Vundle.vim'
 
-" Show git changes
-Plugin 'airblade/vim-gitgutter'
-
 " Automatic intendations
 Plugin 'tpope/vim-sleuth'
 
+" Pairs
+Plugin 'jiangmiao/auto-pairs'
+
 " fzf
 if executable("fzf")
     Plugin 'junegunn/fzf'
@@ -29,16 +29,15 @@ if executable("fzf")
 endif
 
 " Colors
-Plugin 'arcticicestudio/nord-vim'
-Plugin 'ayu-theme/ayu-vim'
+Plugin 'altercation/vim-colors-solarized'
 
 call vundle#end()
 filetype plugin indent on
 
 " ============================== Colors
 syntax on
-set termguicolors
-colorscheme ayu
+set background=dark
+colorscheme solarized
 hi Normal ctermbg=NONE guibg=NONE
 filetype indent plugin on
 
diff --git a/laptop/.zshrc b/laptop/.zshrc
index 7698af8..d65aaa3 100644
--- a/laptop/.zshrc
+++ b/laptop/.zshrc
@@ -24,7 +24,7 @@ export PATH=$PATH:$HOME/.local/bin:$HOME/scripts
 alias fontslist="fc-list :scalable=true:spacing=mono: family"
 alias fontscache="fc-cache -f -v"
 
-if [[ -x $(which fzf 2> /dev/null) ]]; then
+if [[ -x $(which nvim 2> /dev/null) ]]; then
     alias vim="nvim"
 fi
 
diff --git a/laptop/scripts/lock-laptop.sh b/laptop/scripts/lock-laptop.sh
index 4eac4ed..ea10864 100755
--- a/laptop/scripts/lock-laptop.sh
+++ b/laptop/scripts/lock-laptop.sh
@@ -17,7 +17,7 @@ green="a3be8c"
 inside="${nord0}77"
 
 i3lock \
-    -i ~/data/wallpaper/forest_staircase.png \
+    -i ~/data/wallpaper/lockscreen.png \
     \
     --insidecolor=${inside} \
     --ringcolor=${nord0}ff \
diff --git a/screenshots/wallpaper.png b/screenshots/wallpaper.png
new file mode 100644
index 0000000..adfbe6a
Binary files /dev/null and b/screenshots/wallpaper.png differ