diff --git a/.emacs.d/emacs-custom.el b/.emacs.d/emacs-custom.el
index 4689ba3..2dde3d7 100644
--- a/.emacs.d/emacs-custom.el
+++ b/.emacs.d/emacs-custom.el
@@ -7,7 +7,7 @@
  '(livedown-browser nil)
  '(livedown-open t)
  '(livedown-port 1337)
- '(package-selected-packages (quote (markdown-mode use-package magit dracula-theme))))
+ '(package-selected-packages (quote (markdown-mode magit dracula-theme use-package))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index f7dd56c..b38f4f3 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -33,9 +33,8 @@
   (awesome-tab-mode t))
 (awesome-tab-mode t)
 
-;;awesome-tab-backward j-down, k-up, l-left, h-right
-(global-set-key (kbd "C-x k") 'awesome-tab-backward-tab)
-(global-set-key (kbd "C-x h") 'awesome-tab-forward-tab)
+(global-set-key (kbd "C-x j") 'awesome-tab-backward-tab)
+(global-set-key (kbd "C-x k") 'awesome-tab-forward-tab)
 
 ;; Theme
 (use-package dracula-theme
@@ -69,24 +68,6 @@
  '(livedown-browser nil))  ; browser to use
 (global-set-key (kbd "C-M-m") 'livedown-preview)
 
-;; Mew
- (autoload 'mew "mew" nil t)
- (autoload 'mew-send "mew" nil t)
- ;; Optional setup (Read Mail menu for Emacs 21):
- (if (boundp 'read-mail-command)
-     (setq read-mail-command 'mew))
- ;; Optional setup (e.g. C-xm for sending a message):
- (autoload 'mew-user-agent-compose "mew" nil t)
- (if (boundp 'mail-user-agent)
-     (setq mail-user-agent 'mew-user-agent))
- (if (fboundp 'define-mail-user-agent)
-     (define-mail-user-agent
-       'mew-user-agent
-       'mew-user-agent-compose
-       'mew-draft-send-message
-       'mew-draft-kill
-       'mew-send-hook))
-
 ;;; --- Look & Feel ---
 
 ;; no toolbar:
diff --git a/.vimrc-gentoo b/.vimrc-gentoo
index ba8760a..8b049fc 100644
--- a/.vimrc-gentoo
+++ b/.vimrc-gentoo
@@ -13,8 +13,9 @@ au BufWritePre * let &bex = '@' . strftime("%F.%H:%M")
 
 " plugins
 call plug#begin('~/.vim/plugged')
-Plug 'scrooloose/nerdtree', "{ 'on':  'NERDTreeToggle' }
-"Plug 'nmante/vim-latex-live-preview'
+Plug 'scrooloose/nerdtree' 
+Plug 'vimwiki/vimwiki'
+Plug 'nmante/vim-latex-live-preview'
 Plug 'lervag/vimtex'
 Plug 'junegunn/goyo.vim'
 Plug 'prettier/vim-prettier', { 'do': 'npm install --force' }
@@ -25,6 +26,9 @@ Plug 'iamcco/markdown-preview.nvim', { 'do': 'npm install --force' }
 " npm install --force 
 call plug#end()
 
+" Vim wiki
+let g:vimwiki_list = [{'path': '~/git/notes', 'syntax': 'markdown', 'ext': '.md'}]
+
 " Status-line
 set statusline=
 set statusline+=%#IncSearch#
@@ -43,12 +47,13 @@ set incsearch
 set noshowmode
 set cursorline
 set cmdheight=1
-let g:livepreview_previewer = 'mupdf'
 syntax on
 filetype plugin indent on
-
 set encoding=utf-8
 
+" livepreviewer
+let g:livepreview_previewer = 'mupdf'
+
 " line numbers
 set number
 set ruler
@@ -100,7 +105,6 @@ nnoremap <silent> <C-t> :tabnew <CR>
 nnoremap <F11> :Goyo <CR>
 nnoremap <F7> :tabprevious<CR>
 nnoremap <F8> :tabnext<CR>
-nnoremap <F2> :GoRun<CR>
 
 cnoremap w!! execute 'silent! write !sudo tee % >/dev/null' <bar> edit!
 
@@ -118,6 +122,7 @@ autocmd BufRead,BufNewFile /tmp/neomutt* map ZZ :Goyo\|x!<CR>
 autocmd BufRead,BufNewFile /tmp/neomutt* map ZQ :Goyo\|q!<CR>
 
 " Auto add notes git
-autocmd BufWritePost *.md :Prettier 
-autocmd BufWritePost *.md execute '!git add % && git commit -m "Auto-commit: saved %" && git push' | redraw! 
+au BufNewFile,BufFilePre,BufRead *.md set filetype=markdown
+"autocmd BufWritePost *.md :Prettier 
+"autocmd BufWritePost *.md execute '!git add % && git commit -m "Auto-commit: saved %" && git push' | redraw! 
 
diff --git a/.zshrc b/.zshrc
index cde8f29..3ee057f 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,4 +1,3 @@
-cd $HOME
 parse_git_branch() {
     git symbolic-ref --short HEAD 2> /dev/null
 }
@@ -83,9 +82,10 @@ alias vpnd="sudo /root/.local/bin/protonvpn d"
 alias prolog="swipl"
 alias tv="~/MEGA/tv/tv.sh"
 alias newswork="newsboat --url=$HOME/.config/newsboat/urlswork"
-alias vim="vim -u $HOME/.vimrc-gentoo"
+alias vim="vim -u $HOME/.vimrc-gentoo -p"
 alias denpl="trans en:pl"
 alias dplen="trans pl:en"
+alias notes="vim $HOME/git/notes/index.md"
 
 # Cleaning-up
 export KODI_DATA="$HOME/.config/kodi"