diff --git a/alacritty/alacritty.yml b/alacritty/alacritty.yml
index feff783..1d07d19 100644
--- a/alacritty/alacritty.yml
+++ b/alacritty/alacritty.yml
@@ -105,11 +105,11 @@ colors:
 font:
   normal:
     #family: IBM Plex Mono
-    family: Source Code Pro
+    #family: Source Code Pro
     #family: BlexMono Nerd Font
     #family: Fira Code
     #family: Blex Mono Bold Nerd Font Complete
-    #family: Comic Code Ligatures
+    family: Comic Code Ligatures
     style:  
   size: 12
 
diff --git a/i3/config b/i3/config
index d24feb8..cbd6c48 100644
--- a/i3/config
+++ b/i3/config
@@ -18,6 +18,7 @@ set_from_resource $split i3wm.color10 "#9E664B0"
 #font pango: IBM Plex Mono 11px
 #font pango: JetBrains Mono 8
 font pango: BlexMono Nerd Font 11px
+#font pango: Iosevka Nerd Font 13px
 #font pango: Comic Code Ligatures Medium 11px
 #font pango: Fira Code 11px
 
@@ -231,7 +232,7 @@ bindsym $mod+Shift+d exec rofi -show drun -show-icons true
 
 #neomutt mail
 #bindsym $mod+m exec --no-startup-id alacritty -e neomutt
-bindsym $mod+m exec --no-startup-id kitty -e neomutt 
+#bindsym $mod+m exec --no-startup-id kitty -e neomutt 
 #bindsym $mod+Shift+m exec --no-startup-id mullvad-vpn #not used atm!
 
 #float certian windows
@@ -239,6 +240,7 @@ for_window [class="feh" instance="feh"] floating enable
 for_window [class="org.pwmt.zathura" instance="zathura"] floating enable
 for_window [class="gl" instance="mpv"] floating enable
 for_window [instance="gammy"] floating enable
+for_window [class="^.*"] border pixel 3
 
 #wpg
 #bindsym $mod+$alt+t exec wpg -m && wpg --brt $(wpg -c) 10.6 && wpg -s $(wpg -c) && bash /home/simon/.scripts/getwal
diff --git a/kitty/kitty.conf b/kitty/kitty.conf
index 11c3cd2..921f2de 100644
--- a/kitty/kitty.conf
+++ b/kitty/kitty.conf
@@ -7,10 +7,13 @@
 #: characters.
 
 #font_family      Fira Code Regular
-font_family      SauceCodePro Nerd Font
+#font_family      SauceCodePro Nerd Font
 #font_family      IBM Plex Mono
 #font_family      BlexMono Nerd Font
 #font_family      Comic Code Ligatures
+#font_family      Iosevka 
+font_family      Iosevka Nerd Font
+#font_family      Simsun
 bold_font        auto
 italic_font      auto
 bold_italic_font auto
diff --git a/nvim/init.vim b/nvim/init.vim
index a8d5c82..e2985d8 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -27,7 +27,7 @@ Plug 'junegunn/fzf.vim'
 Plug 'junegunn/limelight.vim'
 
 " NERDTree
-Plug 'scrooloose/nerdtree'
+Plug 'preservim/nerdtree'
 
 " Improvements Plug 'terryma/vim-multiple-cursors'
 Plug 'tpope/vim-eunuch'
@@ -72,6 +72,8 @@ autocmd FileType go nmap <leader>b :<C-u>call <SID>build_go_files()<CR>
 let g:go_def_mode='gopls'
 let g:go_info_mode='gopls'
 let g:go_list_type = "quickfix"
+
+set autowrite
 """"""""""""""""""""""""""""""GO""""""""""""""""""""""""""""""""""""""""
 
 " JAVA
@@ -193,7 +195,6 @@ inoremap <F10> <c-g>u<Esc>[s1z=`]a<c-g>u
 
 au BufNewFile ~/vimwiki/diary/*.md :silent 0r !~/.config/nvim/generate-vimwiki-diary-template '%'
 
-let NERDTreeMapOpenInTab='<ENTER>'
 
 " Insert Date
 nnoremap <silent><leader>d :put=system('date +%d/%b/%Y')<CR>
diff --git a/nvim/spell/en.utf-8.add b/nvim/spell/en.utf-8.add
index 7aa757c..92acda8 100644
--- a/nvim/spell/en.utf-8.add
+++ b/nvim/spell/en.utf-8.add
@@ -194,3 +194,18 @@ HTML5
 tannoy
 Alexa
 YT
+command
+Pantone
+CSCU9X5
+desample
+Bicubic
+Metafiles
+UML
+Backpatching
+Inlining
+JIT
+GI
+HotSpot
+kern
+CounterTeller
+Arduino
diff --git a/nvim/spell/en.utf-8.add.spl b/nvim/spell/en.utf-8.add.spl
index dcaed6b..0b71bdc 100644
Binary files a/nvim/spell/en.utf-8.add.spl and b/nvim/spell/en.utf-8.add.spl differ