diff --git a/config/amfora/config.toml b/config/amfora/config.toml
new file mode 100644
index 0000000..f302a75
--- /dev/null
+++ b/config/amfora/config.toml
@@ -0,0 +1,68 @@
+[a-general]
+home   = "gemini://gus.guru/search"
+search = "gemini://gus.guru/search"
+http           = "default"
+color          = true
+ansi           = true
+bullets        = true
+auto_redirect  = false
+emoji_favicons = false
+left_margin    = 0.15
+max_width      = 100
+downloads      = "Downloads"
+page_max_size  = 2097152
+page_max_time  = 10
+scrollbar      = "auto"
+
+
+[keybindings]
+bind_quit   = "q"
+bind_reload = "Ctrl-R"
+bind_save   = "Ctrl-S"
+bind_edit   = "I"
+bind_bottom = "i"
+
+# Navigation
+bind_back    = "H"
+bind_forward = "L"
+
+# Bookmaeks
+bind_bookmarks    = "b"
+bind_add_bookmark = "B"
+
+# Tab
+bind_new_tab   = "t"
+bind_close_tab = "T"
+bind_next_tab  = "J"
+bind_prev_tab  = "K"
+
+[[mediatype-handlers]]
+cmd       = ["feh"]
+types     = ["image"]
+no_prompt = true
+
+[cache]
+max_size  = 0
+max_pages = 30
+timeout   = 1800
+
+[subscriptions]
+popup            = true
+workers          = 3
+update_interval  = 1800
+entries_per_page = 20
+
+[theme]
+bg = "#262A2B"
+fg = "#dfdfdf"
+tab_num = "#797979"
+bottombar_text = "#dfdfdf"
+bottombar_bg = "#1F2324"
+scrollbar = "#1F2324"
+btn_bg = "#1F2324"
+btn_text = "#dfdfdf"
+
+[auth]
+[auth.certs]
+[auth.keys]
+[proxies]
diff --git a/config/nvim/init.vim b/config/nvim/init.vim
index 5e36c8c..4b99c2a 100644
--- a/config/nvim/init.vim
+++ b/config/nvim/init.vim
@@ -68,17 +68,17 @@ set visualbell t_vb=
 
 
 "== Aliases
-command! Term     :vs|wincmd L|vert res 50|set nonu nornu|startinsert|term
-command! Prettier :silent !prettier % --write
-command! ESlint   :!eslint %
-command! Black    :silent !black %
+command! W        :w
+command! Wq       :wq
+command! Term     :vs|wincmd L|set nonu nornu|startinsert|term
+command! Prettier :silent !prettier -w %
 command! AutoPep8 :silent !autopep8 % --in-place
-command! Flake8   :!flake8 %
+command! Black    :silent !black %
+command! Isort    :silent !isort %
 command! GoFmt    :silent !gofmt -w %
-command! GoLint   :!golint %
 
 
-"== Settings for specific files
+"== Settings for specific languages
 autocmd FileType python setlocal ex sw=4 ts=4
 autocmd FileType go setlocal noex sw=4 ts=4
 autocmd FileType javascript,javascriptreact,yaml setlocal et sw=2 ts=2
@@ -86,6 +86,11 @@ autocmd FileType javascript,javascriptreact,yaml setlocal et sw=2 ts=2
 
 "== ALE
 let g:ale_disable_lsp = 1
+let g:ale_sign_info = "•"
+let g:ale_sign_error = "•"
+let g:ale_sign_warning = "•"
+let g:ale_sign_style_error = "•"
+let g:ale_sign_style_warning = "•"
 let g:ale_echo_msg_format = '%severity%: %s'
 let g:ale_linters = {
 \ 'javascript': ['eslint'],
@@ -95,6 +100,7 @@ let g:ale_linters = {
 
 
 "== NERDTree
+let NERDTreeIgnore = ["__pycache__", "*.pyc"]
 let g:NERDTreeWinPos = "right"
 let g:NERDTreeMinimalUI = 1
 let g:NERDTreeWinSize = 24
@@ -124,8 +130,8 @@ nnoremap <C-l> :wincmd l<CR>
 " Split
 nnoremap spv :vsp<CR>
 nnoremap sph :sp<CR>
-nnoremap spj :wincmd K<CR>
-nnoremap spk :wincmd L<CR>
+nnoremap spk :wincmd K<CR>
+nnoremap spl :wincmd L<CR>
 
 " Tab
 nnoremap tn :tabnew<CR>
@@ -142,7 +148,8 @@ noremap <A-9> :tabn 9<CR>
 " Buffer
 nnoremap <leader>j :bnext<CR>
 nnoremap <leader>k :bprev<CR>
-nnoremap <leader>h :bdele<CR>
+nnoremap <leader>c :bdele<CR>
+nnoremap <leader>b :buffers<CR>
 
 " Working with system clipboard
 noremap <leader>c "+y<CR>
diff --git a/gitconfig b/gitconfig
index e9b0ed4..577e671 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,5 +1,5 @@
 [user]
-  name = Smirnov Alexandr
+  name = Smirnov Alexander
   email = ss2316544@gmail.com
 
 [core]
diff --git a/tmux.conf b/tmux.conf
index 01ad50d..de641d5 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -20,17 +20,18 @@ set-option -sa terminal-overrides ",*:Tc"
 
 ## HOME/END key support
 bind-key -n Home send Escape "OH"
-bind-key -n End send Escape "OF"
+bind-key -n End  send Escape "OF"
 
 ## Reload config
 bind r source-file ~/.tmux.conf \; display 'Reloaded tmux config'
 
-## Vim keys for change/resize window
+## Vim keys for change window
 bind -r h select-pane -L
 bind -r j select-pane -D
 bind -r k select-pane -U
 bind -r l select-pane -R
 
+## Vim keys for resize window
 bind -r H resize-pane -L 2
 bind -r J resize-pane -D 2
 bind -r K resize-pane -U 2
diff --git a/vscode/settings.json b/vscode/settings.json
index 440213b..f4fa725 100644
--- a/vscode/settings.json
+++ b/vscode/settings.json
@@ -7,10 +7,10 @@
   "workbench.startupEditor": "newUntitledFile",
   "editor.formatOnPaste": true,
   "editor.minimap.enabled": false,
-  "explorer.confirmDelete": false,
-  "explorer.confirmDragAndDrop": false,
+  "explorer.confirmDelete": false, "explorer.confirmDragAndDrop": false, "window.menuBarVisibility": "hidden",
   "workbench.sideBar.location": "right",
-  "window.menuBarVisibility": "hidden",
+  "workbench.panel.defaultLocation": "right",
+  "terminal.external.linuxExec": "kitty",
 
   "editor.tabCompletion": "on",
   "editor.tabSize": 4,
diff --git a/zshrc b/zshrc
index 17887ae..4acb7da 100644
--- a/zshrc
+++ b/zshrc
@@ -1,4 +1,4 @@
-export PATH="$HOME/.yarn/bin:$HOME/bin:$HOME/.local/bin:$HOME/go/bin:$PATH"
+export PATH="$HOME/.yarn/bin:$HOME/bin:$HOME/.local/bin:$HOME/go/bin:$HOME/.golang/bin:$PATH"
 export EDITOR="nvim"
 export GOPATH="$HOME/go"
 
@@ -6,7 +6,7 @@ export GOPATH="$HOME/go"
 export OMH="$HOME/.oh-my-zsh"
 ZSH_THEME="simple"
 DISABLE_AUTO_TITLE="true"
-plugins=(yarn nvm)
+plugins=(yarn)
 source $OMH/oh-my-zsh.sh
 
 ### Aliases