diff --git a/.config/nvim/after/available/lspconfig.rc.lua b/.config/nvim/after/available/lspconfig.rc.lua
index 17e1482..54250db 100644
--- a/.config/nvim/after/available/lspconfig.rc.lua
+++ b/.config/nvim/after/available/lspconfig.rc.lua
@@ -137,7 +137,7 @@ nvim_lsp.pylsp.setup({
 
 -- Use a loop to conveniently call 'setup' on multiple servers and
 -- map buffer local keybindings when the language server attaches
-local servers = { "cmake", "rust_analyzer", "bashls" }
+local servers = { "cmake", "rust_analyzer", "bashls", "marksman" }
 for _, lsp in ipairs(servers) do
   nvim_lsp[lsp].setup({
     on_attach = on_attach,
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index db569a2..92fe812 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -37,6 +37,7 @@ Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
 Plug 'p00f/clangd_extensions.nvim'
 Plug 'ray-x/lsp_signature.nvim'
 Plug 'romgrk/nvim-treesitter-context'
+Plug 'ftilde/vim-ugdb'
 " }}}
 
 " Completion {{{
@@ -80,6 +81,7 @@ Plug 'tpope/vim-fugitive'
 "Plug 'weirongxu/plantuml-previewer.vim' |
 Plug 'aklt/plantuml-syntax'
 Plug 'kergoth/vim-bitbake' " Bitbake templates and syntax
+Plug 'toppair/peek.nvim', {'do': ':!deno task --quiet build:fast'}
 " }}}
 
 " Other plugins (external tools, etc) {{{
@@ -94,6 +96,7 @@ Plug 'protex/better-digraphs.nvim'
 " Note taking {{{
 Plug 'nvim-neorg/neorg'
 Plug 'jakewvincent/mkdnflow.nvim'
+Plug 'AckslD/nvim-FeMaco.lua'
 " }}}
 
 " Appearance {{{
@@ -102,7 +105,13 @@ Plug 'jakewvincent/mkdnflow.nvim'
 "Plug 'marko-cerovac/material.nvim'
 "Plug 'srcery-colors/srcery-vim'
 "Plug 'tanvirtin/monokai.nvim'
+Plug 'anuvyklack/fold-preview.nvim' | Plug 'anuvyklack/keymap-amend.nvim'
+Plug 'anuvyklack/pretty-fold.nvim'
+Plug 'anuvyklack/windows.nvim' | Plug 'anuvyklack/middleclass' | Plug 'anuvyklack/animation.nvim'
+Plug 'lukas-reineke/virt-column.nvim'
 Plug 'stevearc/dressing.nvim'
+Plug 'wuelnerdotexe/vim-enfocado'
+Plug 'fenetikm/falcon'
 " }}}
 
 " Testing phase {{{
@@ -115,26 +124,17 @@ Plug 'stevearc/dressing.nvim'
 "Plug 'nguyenvukhang/nvim-toggler'
 "Plug 'rgroli/other.nvim' " Currently doesn't support C/C++
 "Plug 'smolovk/projector.nvim'
-Plug 'AckslD/nvim-FeMaco.lua'
 Plug 'Pocco81/true-zen.nvim'
-Plug 'anuvyklack/fold-preview.nvim' | Plug 'anuvyklack/keymap-amend.nvim'
-Plug 'anuvyklack/pretty-fold.nvim'
-Plug 'anuvyklack/windows.nvim' | Plug 'anuvyklack/middleclass' | Plug 'anuvyklack/animation.nvim'
-Plug 'fenetikm/falcon'
 Plug 'frabjous/knap'
-Plug 'ftilde/vim-ugdb'
 Plug 'gorbit99/codewindow.nvim'
-Plug 'https://gitlab.com/yorickpeterse/nvim-window.git'
 Plug 'krivahtoo/silicon.nvim', { 'do': './install.sh' }
-Plug 'lukas-reineke/virt-column.nvim'
 Plug 'nat-418/boole.nvim'
 Plug 'nullchilly/fsread.nvim'
 Plug 'nyngwang/murmur.lua'
 Plug 'samodostal/image.nvim'
 Plug 'simrat39/symbols-outline.nvim'
-Plug 'toppair/peek.nvim', {'do': ':!deno task --quiet build:fast'}
-Plug 'wuelnerdotexe/vim-enfocado'
 Plug 'ziontee113/icon-picker.nvim'
+Plug 'cbochs/grapple.nvim'
 " }}}
 
 call plug#end()
@@ -269,20 +269,14 @@ setglobal shiftround
 let g:vimwiki_list = [{'path': '~/vimwiki/',
                       \ 'syntax': 'markdown', 'ext': '.md'}]
 
-let g:blamer_enabled = 1
-let g:blamer_show_in_insert_modes = 0
-let g:blamer_template = '<committer> <committer-time> <summary>'
-let g:blamer_date_format = '%Y-%m-%d'
-let g:blamer_relative_time = 0
-"highlight Blamer guifg=lightgrey
-
-"packadd termdebug
-
 """"""""""""""""""
 "  gui settings  "
 """"""""""""""""""
-set guifont=IBM\ Plex\ Mono\ Text:h8
+set guifont=IBM\ Plex\ Mono\ Text:h9:e-subpixelantyalias
 let g:neovide_cursor_vfx_mode = "pixiedust"
+let g:neovide_refresh_rate = 120
+let g:neovide_refresh_rate_idle = 5
+let g:neovide_remember_window_size = v:false
 
 lua << EOF
 vim.o.splitbelow = true