diff --git a/dot_config/aerc/aerc.conf b/dot_config/aerc/aerc.conf
new file mode 100644
index 0000000..9233b0b
--- /dev/null
+++ b/dot_config/aerc/aerc.conf
@@ -0,0 +1,4 @@
+[filters]
+subject,~^\[PATCH=awk -f /usr/share/aerc/filters/hldiff
+text/*=awk -f /usr/share/aerc/filters/plaintext
+
diff --git a/dot_config/aerc/binds.conf b/dot_config/aerc/binds.conf
index cc751a7..56fb4f8 100644
--- a/dot_config/aerc/binds.conf
+++ b/dot_config/aerc/binds.conf
@@ -18,6 +18,7 @@ ra = :reply -aq<Enter>
 
 [view]
 q = :close<Enter>
+t = :toggle-headers<Enter>
 a = :archive flat<Enter>
 f = :forward<Enter>
 rr = :reply -q<Enter>
diff --git a/dot_config/nvim/airline.vim b/dot_config/nvim/airline.vim
new file mode 100644
index 0000000..1ab4749
--- /dev/null
+++ b/dot_config/nvim/airline.vim
@@ -0,0 +1,3 @@
+let g:airline_powerline_fonts = 1
+let g:airline#extensions#tabline#buffer_nr_show = 1
+let g:airline#extensions#tabline#enabled = 1
diff --git a/dot_config/nvim/coc-settings.json b/dot_config/nvim/coc-settings.json
index bfd870e..11d56ca 100644
--- a/dot_config/nvim/coc-settings.json
+++ b/dot_config/nvim/coc-settings.json
@@ -1,3 +1,4 @@
 {
+	"python.jediEnabled": false
 }
 
diff --git a/dot_config/nvim/coc.vim b/dot_config/nvim/coc.vim
index 9c68524..83538c8 100644
--- a/dot_config/nvim/coc.vim
+++ b/dot_config/nvim/coc.vim
@@ -6,7 +6,7 @@ set cmdheight=2
 set shortmess+=c
 set signcolumn=yes
 
-inoremap <silent><expr> <c-space> coc#refresh()
+set statusline^=%{coc#status()}%{get(b:,'coc_current_function','')}
 
 function! s:show_documentation()
   if (index(['vim','help'], &filetype) >= 0)
@@ -18,3 +18,24 @@ endfunction
 
 " Binds
 nnoremap <silent> K :call <SID>show_documentation()<CR>
+nnoremap <silent> <space>a  :<C-u>CocList diagnostics<cr>
+nnoremap <silent> <space>e  :<C-u>CocList extensions<cr>
+nnoremap <silent> <space>c  :<C-u>CocList commands<cr>
+nnoremap <silent> <space>o  :<C-u>CocList outline<cr>
+nnoremap <silent> <space>s  :<C-u>CocList -I symbols<cr>
+nnoremap <silent> <space>j  :<C-u>CocNext<CR>
+nnoremap <silent> <space>k  :<C-u>CocPrev<CR>
+nnoremap <silent> <space>p  :<C-u>CocListResume<CR>
+
+nmap <silent> [g <Plug>(coc-diagnostic-prev)
+nmap <silent> ]g <Plug>(coc-diagnostic-next)
+nmap <silent> gd <Plug>(coc-definition)
+nmap <silent> gy <Plug>(coc-type-definition)
+nmap <silent> gi <Plug>(coc-implementation)
+nmap <silent> gr <Plug>(coc-references)
+nmap <leader>rn <Plug>(coc-rename)
+nmap <leader>f  <Plug>(coc-format-selected)
+
+xmap <leader>f  <Plug>(coc-format-selected)
+
+inoremap <silent><expr> <c-space> coc#refresh()
diff --git a/dot_config/nvim/init.vim b/dot_config/nvim/init.vim
index 5f6d871..43dc1a1 100644
--- a/dot_config/nvim/init.vim
+++ b/dot_config/nvim/init.vim
@@ -1,27 +1,29 @@
 call plug#begin(stdpath('config') . '/plugged')
 
+Plug 'vim-airline/vim-airline'
+exe 'source' (stdpath('config') . '/airline.vim')
+
 Plug 'neoclide/coc.nvim', {'branch': 'release'}
 exe 'source' (stdpath('config') . '/coc.vim')
 
 Plug 'preservim/nerdtree'
 exe 'source' (stdpath('config') . '/nerdtree.vim')
 
-Plug 'tomasiser/vim-code-dark'
 Plug 'ctrlpvim/ctrlp.vim'
+Plug 'mhinz/vim-startify'
+Plug 'tomasiser/vim-code-dark'
+Plug 'jiangmiao/auto-pairs'
+Plug 'GutenYe/json5.vim'
 
 Plug 'godlygeek/tabular'
 Plug 'plasticboy/vim-markdown'
 let g:vim_markdown_new_list_item_indent = 2
  
 " Plug 'editorconfig/editorconfig-vim'
-" Plug 'vim-airline/vim-airline'
-" Plug 'mhinz/vim-startify'
 " Plug 'dense-analysis/ale'
 " Plug 'vim-syntastic/syntastic'
 " Plug 'majutsushi/tagbar'
-" Plug 'jiangmiao/auto-pairs'
 " Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
-" Plug 'GutenYe/json5.vim'
 " 
 " Plug 'autozimu/LanguageClient-neovim', {
 "     \ 'branch': 'next',
@@ -49,10 +51,14 @@ syntax on
 filetype on
 filetype plugin indent on
 
+" Binds
+
 let mapleader = ";"
+
 nnoremap T :vsplit<BAR>vertical resize 54<BAR>terminal<CR>i
 
-" Plugin-related maps
+imap kj <Esc>
+imap ;; <Esc>:w<CR>i
 
 nmap <F8> :TagbarToggle<CR>
 
@@ -71,11 +77,3 @@ nmap <F8> :TagbarToggle<CR>
 
 " Plugin-related configs
 
-let g:airline#extensions#tabline#buffer_nr_show = 1
-let g:airline#extensions#tabline#enabled = 1
-
-let g:deoplete#enable_at_startup = 1
-
-" let g:rustfmt_autosave = 1
-let g:racer_experimental_completer = 1
-
diff --git a/dot_config/sway/config b/dot_config/sway/config
index 2831203..662bda1 100644
--- a/dot_config/sway/config
+++ b/dot_config/sway/config
@@ -7,6 +7,7 @@ for_window [class=".*"] opacity $opacity
 for_window [app_id=".*"] opacity $opacity
 
 # STARTUP
+exec --no-startup-id mpd
 exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
 exec --no-startup-id waybar
 exec --no-startup-id nm-applet
@@ -15,13 +16,14 @@ exec --no-startup-id dunst
 
 # KEY BINDS
 bindsym $mod+Return exec i3-sensible-terminal
-bindsym $mod+l exec i3lock-fancy
+bindsym $mod+l exec swaylock
 bindsym $mod+m exec alacritty -e aerc
 bindsym $mod+p exec $HOME/.local/scripts/passmenu.sh
 bindsym $mod+semicolon exec alacritty -e nvim $HOME/todos.md
 bindsym $mod+space exec bemenu-run
-bindsym Print exec $HOME/.local/scripts/screenshot.sh select
-bindsym ctrl+Print exec $HOME/.local/scripts/screenshot.sh fullscreen
+bindsym Print exec bash -c 'grim "$HOME/Screenshots/$(date +%Y-%m-%d-%H:%M:%S).png" && wl-copy < "$HOME/Screenshots/$(date +%Y-%m-%d-%H:%M:%S).png"'
+# bindsym Print exec $HOME/.local/scripts/screenshot.sh select
+# bindsym ctrl+Print exec $HOME/.local/scripts/screenshot.sh fullscreen
 
 bindsym $mod+Shift+q kill
 bindsym $mod+f fullscreen toggle
diff --git a/dot_config/waybar/config b/dot_config/waybar/config
index 15785ab..4b4da48 100644
--- a/dot_config/waybar/config
+++ b/dot_config/waybar/config
@@ -3,8 +3,24 @@
 {
 	"layer": "top",
 	"position": "bottom",
-	"modules-left": ["sway/workspaces", "sway/mode"]
+	"modules-left": ["sway/workspaces", "sway/mode"],
+	"modules-center": ["sway/window"],
+	"modules-right": ["mpd", "disk", "network", "pulseaudio", "clock", "tray"],
+
+	"disk": {
+		"format": "DISK: {percentage_free}%"
+	},
+
+	"clock": {
+		"format": "{:%m-%d / %H:%M}",
+		"tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>"
+	},
+
+	"pulseaudio": {
+		"format": "VOL {volume}%",
+		"on-click": "pavucontrol"
+	}
 }
 
-// vim: set ft=json5 tabstop=4 :
+// vim: set ft=json5 ts=4 sw=4 tw=0 :
 
diff --git a/dot_zshrc b/dot_zshrc
index df1860c..d143ee4 100644
--- a/dot_zshrc
+++ b/dot_zshrc
@@ -17,6 +17,10 @@ source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zs
 export PATH="$HOME/.local/scripts:$HOME/.dotnet/tools:$PATH:$HOME/go/bin"
 [ -f "${GHCUP_INSTALL_BASE_PREFIX:=$HOME}/.ghcup/env" ] && source "${GHCUP_INSTALL_BASE_PREFIX:=$HOME}/.ghcup/env"
 
+[[ -s /home/michael/.autojump/etc/profile.d/autojump.sh ]] && source /home/michael/.autojump/etc/profile.d/autojump.sh
+autoload -U compinit && compinit -u
+
+
 # opam configuration
 test -r /home/michael/.opam/opam-init/init.zsh && . /home/michael/.opam/opam-init/init.zsh > /dev/null 2> /dev/null || true