diff --git a/laptop-nord/.config/alacritty/alacritty.yml b/laptop-nord/.config/alacritty/alacritty.yml
index 073dfd3..1069718 100644
--- a/laptop-nord/.config/alacritty/alacritty.yml
+++ b/laptop-nord/.config/alacritty/alacritty.yml
@@ -136,7 +136,7 @@ font:
     #style: Bold Italic
 
   # Point size
-  size: 11.0
+  size: 12.0
 
   # Offset is the extra space around each character. `offset.y` can be thought of
   # as modifying the line spacing, and `offset.x` as modifying the letter spacing.
@@ -170,7 +170,36 @@ font:
 # If `true`, bold text is drawn using the bright color variants.
 #draw_bold_text_with_bright_colors: false
 
-# Colors (Tomorrow Night Bright)
+# Colors (One Dark)
+# colors:
+#   # Default colors
+#   primary:
+#     background: '0x1e2127'
+#     foreground: '0xabb2bf'
+# 
+#   # Normal colors
+#   normal:
+#     black:   '0x1e2127'
+#     red:     '0xe06c75'
+#     green:   '0x98c379'
+#     yellow:  '0xd19a66'
+#     blue:    '0x61afef'
+#     magenta: '0xc678dd'
+#     cyan:    '0x56b6c2'
+#     white:   '0xabb2bf'
+# 
+#   # Bright colors
+#   bright:
+#     black:   '0x5c6370'
+#     red:     '0xe06c75'
+#     green:   '0x98c379'
+#     yellow:  '0xd19a66'
+#     blue:    '0x61afef'
+#     magenta: '0xc678dd'
+#     cyan:    '0x56b6c2'
+#     white:   '0xffffff'
+
+#Colors Nord
 colors:
   # Default colors
   primary:
@@ -279,7 +308,7 @@ colors:
 #
 # 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.9
+background_opacity: 0.95
 
 selection:
   #semantic_escape_chars: ",│`|:\"' ()[]{}<>\t"
diff --git a/laptop-nord/.config/i3/config b/laptop-nord/.config/i3/config
index 494b3c3..27958de 100644
--- a/laptop-nord/.config/i3/config
+++ b/laptop-nord/.config/i3/config
@@ -124,7 +124,7 @@ bindsym $mod+Shift+0 move container to workspace number $ws10
 new_window 1pixel
 
 # Set Border
-for_window [class="^.*"] border pixel 0
+for_window [class="^.*"] border pixel 5
 
 set $nord0 "#2e3440"
 
@@ -135,11 +135,11 @@ set $frost0 "#d8dee9"
 set $frost2 "#eceff4"
 
 set $green "#A3BE8C"
-
+set $yellow "#EBCB8B"
 set $red "#bf616a"
 
 # class                 border  backgr.text    indic. child_border
-client.focused          $blue1  $blue1 $nord0  $nord0 $nord0
+client.focused          $green  $green $nord0  $green $green
 client.focused_inactive $blue1  $blue1 $nord0  $nord0 $nord0
 client.unfocused        $nord0  $nord0 $frost0 $blue1 $nord0
 client.urgent           $red    $red   $frost2 $red   $red
diff --git a/laptop-nord/.config/picom.conf b/laptop-nord/.config/picom.conf
index ebf8dff..f9a5a58 100644
--- a/laptop-nord/.config/picom.conf
+++ b/laptop-nord/.config/picom.conf
@@ -5,8 +5,9 @@ opacity-rule = [
 ];
 
 #inactive-dim = 0.15;
-inactive-opacity = 0.9;
+#inactive-opacity = 0.9;
 
+detect-rounded-corners = true;
 corner-radius = 8.0;
 rounded-corners-exclude= [
     "class_g = 'i3-frame'",
diff --git a/laptop-nord/.config/polybar/config b/laptop-nord/.config/polybar/config
index 6ee6fd0..cd7d4d8 100644
--- a/laptop-nord/.config/polybar/config
+++ b/laptop-nord/.config/polybar/config
@@ -97,7 +97,7 @@ width = 20%
 override-redirect = true
 fixed-center = true
 
-offset-x = 72%:-8px
+offset-x = 80%:-8px
 offset-y = 8px
 
 module-margin = 1
@@ -114,6 +114,8 @@ width = 7%
 override-redirect = true
 fixed-center = true
 
+bottom = true
+
 offset-x = 93%:-8px
 offset-y = 8px
 
@@ -129,6 +131,7 @@ type = internal/i3
 pin-workspaces = true
 wrapping-scroll = false
 
+
 format = <label-state> <label-mode>
 
 foreground = ${colors.foreground}
diff --git a/laptop-nord/.tmux.conf b/laptop-nord/.tmux.conf
index 204fce9..79a7e18 100644
--- a/laptop-nord/.tmux.conf
+++ b/laptop-nord/.tmux.conf
@@ -1,4 +1,4 @@
-set -g default-terminal "screen-256color"
+set -g default-terminal "tmux-256color"
 
 #some vi behaviour
 bind-key -r h select-pane -L
@@ -9,22 +9,24 @@ bind-key -r l select-pane -R
 bind-key v split-window -h
 bind-key s split-window -v
 
+# enable mouse
 set-option -g mouse on
 
 # start pane index at 1
 set -g base-index 1
 setw -g pane-base-index 1
 
-# colors
+# status bar
 set -g status-bg black
 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'
+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-right ''
+set -g status-left ''
+set -g status-right '#(date) [#S]'
 
 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-nord/.vimrc b/laptop-nord/.vimrc
index 2fe5694..5b6e52a 100644
--- a/laptop-nord/.vimrc
+++ b/laptop-nord/.vimrc
@@ -22,39 +22,14 @@ Plugin 'airblade/vim-gitgutter'
 " Automatic intendations
 Plugin 'tpope/vim-sleuth'
 
-" Match parents
-Plugin 'tmsvg/pear-tree'
-
-let g:pear_tree_smart_openers=1
-let g:pear_tree_smart_closers=1
-let g:pear_tree_smart_backspace=1
-
-let g:pear_tree_pairs = {
-            \ '(': {'closer': ')'},
-            \ '[': {'closer': ']'},
-            \ '{': {'closer': '}'},
-            \ "'": {'closer': "'"},
-            \ '"': {'closer': '"'},
-            \ '<': {'closer': '>'}
-            \ }
-
 " fzf
 if executable("fzf")
     Plugin 'junegunn/fzf'
     Plugin 'junegunn/fzf.vim'
-
-    nmap <C-f> :Files<CR>
 endif
 
 " Colors
 Plugin 'arcticicestudio/nord-vim'
-Plugin 'vim-airline/vim-airline'
-Plugin 'vim-airline/vim-airline-themes'
-
-let g:airline_theme='nord'
-let g:airline_powerline_fonts = 1
-let g:bufferline_echo = 0
-set guifont="FiraCode Nerd Font Mono"
 
 call vundle#end()
 filetype plugin indent on
@@ -64,10 +39,6 @@ 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
@@ -75,6 +46,7 @@ set cursorline
 set ruler
 
 set showmatch " highlights paranthesis
+set laststatus=0 " remove status bar
 set mat=5
 set noswapfile " can be problematic on some systems
 set confirm " can't quit without saving
@@ -85,6 +57,7 @@ set mouse=c
 set undolevels=1337 " memegods can make mistakes
 set backspace=indent,eol,start
 set wildmenu " autocomplete :e
+set scrolloff=7 " min lines aboive or below the cursor
 
 " ============================== Indents and Whitespaces
 set list
@@ -116,6 +89,9 @@ cmap Q q
 cmap W w
 cmap q1 q!
 
+" fzf
+nmap <C-f> :Files<CR>
+
 " ============================== Snippets
 iab lbf \textbf{}<LEFT>
 iab lframe \begin{frame}{}<CR><CR>\end{frame}<UP>
diff --git a/laptop-nord/linkdots.sh b/laptop-nord/linkdots.sh
index ed3191b..60c8952 100755
--- a/laptop-nord/linkdots.sh
+++ b/laptop-nord/linkdots.sh
@@ -10,7 +10,7 @@ rm -rf $HOME/scripts
 ln -sf $path/scripts $HOME/scripts
 
 # Home directory
-home_files=".dir_colors .gitconfig .tmux.conf .vimrc .Xresources .zshrc"
+home_files=".dir_colors .gitconfig .tmux.conf .vimrc .Xresources .zshrc .zsh_highlighting"
 for file in $home_files
 do
 	ln -sf $path/$file $HOME/$file