diff --git a/.Xresources b/.Xresources
index ef18b23..c36193f 100644
--- a/.Xresources
+++ b/.Xresources
@@ -1,3 +1,4 @@
+Xft.dpi: 96
 Xcursor.size: 16
 ! URxvt
 URxvt.font:xft:IBM Plex Mono:size=8
diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index f87d437..973b8a4 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -4,6 +4,8 @@ set -x MANPAGER "sh -c 'col -bx | bat -l man -p'"
 set -x fish_prompt_pwd_dir_length 1
 set -x fish_greeting ''
 set fish_complete_path $fish_complete_path /usr/share/fish/competions
+set -x JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64
+set -x JIRA_API_TOKEN NDE2ODEyOTM5OTI2Ontw1zkanbJ8sAFMDUI1Y0QxOH7d
 
 # This file is run by all fish instances.
 # To include configuration only for login shells, use
diff --git a/.config/i3/config b/.config/i3/config
index 891ebae..a4f7d47 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -12,8 +12,9 @@
 set_from_resource $main_color i3wm.color1 #fdff00
 set_from_resource $secondary_color i3wm.color0 #98d1ce
 set_from_resource $bg_color i3wm.color4 #0c1014
-set $output_main DP-0
-set $output_secondary DVI-D-0
+set $output_main DP-0.1
+set $output_secondary DP-0.3
+set $refresh_i3status killall -SIGUSR1 i3status-rs
 
 # Font for window titles. Will also be used by the bar unless a different font
 # is used in the bar {} block below.
@@ -246,8 +247,6 @@ client.focused          $main_color $main_color $bg_color #2e9ef4
 client.focused_inactive $main_color $bg_color $main_color #2e9ef4
 client.unfocused        $bg_color $bg_color $main_color #2e9ef4
 
-focus_on_window_activation focus
-
 for_window [instance="fontpreview"] floating enable
 for_window [class="^Chrome$" title=" - Chromium$"] border none
 for_window [class="firefox"] border none
@@ -259,8 +258,11 @@ assign [class="com-mathworks-util-PostVMInit" title="^Fig"] $ws10
 new_window pixel 1
 new_float pixel 3
 hide_edge_borders smart
+#focus_on_window_activation focus
 focus_on_window_activation urgent
 
 workspace_auto_back_and_forth yes
 
 popup_during_fullscreen smart
+
+focus_wrapping false
diff --git a/.config/i3/i3status-rs.toml b/.config/i3/i3status-rs.toml
index d170d88..79ef55e 100644
--- a/.config/i3/i3status-rs.toml
+++ b/.config/i3/i3status-rs.toml
@@ -1,6 +1,11 @@
 theme = "solarized-dark"
 icons = "awesome"
 
+[[block]]
+block = "custom"
+command = "echo vpn:(vpn | head -1 | cut -d: -f 2)"
+interval = 5
+
 [[block]]
 block = "disk_space"
 path = "/home"
diff --git a/.config/i3/wallpaper.jpg b/.config/i3/wallpaper.jpg
index f3509c1..d818080 100644
Binary files a/.config/i3/wallpaper.jpg and b/.config/i3/wallpaper.jpg differ
diff --git a/.config/nvim/after/plugin/gitsigns.rc.lua b/.config/nvim/after/plugin/gitsigns.rc.lua
index e6d5a0a..ba4da77 100644
--- a/.config/nvim/after/plugin/gitsigns.rc.lua
+++ b/.config/nvim/after/plugin/gitsigns.rc.lua
@@ -1,48 +1,87 @@
 require('gitsigns').setup {
-    signs = {
-    add          = {hl = 'GitSignsAdd'   , text = '+', numhl='GitSignsAddNr'   , linehl='GitSignsAddLn'},
-    change       = {hl = 'GitSignsChange', text = '~', numhl='GitSignsChangeNr', linehl='GitSignsChangeLn'},
-    delete       = {hl = 'GitSignsDelete', text = '-', numhl='GitSignsDeleteNr', linehl='GitSignsDeleteLn'},
+  signs = {
+    add          = {hl = 'GitSignsAdd'   , text = '│', numhl='GitSignsAddNr'   , linehl='GitSignsAddLn'},
+    change       = {hl = 'GitSignsChange', text = '│', numhl='GitSignsChangeNr', linehl='GitSignsChangeLn'},
+    delete       = {hl = 'GitSignsDelete', text = '_', numhl='GitSignsDeleteNr', linehl='GitSignsDeleteLn'},
     topdelete    = {hl = 'GitSignsDelete', text = '‾', numhl='GitSignsDeleteNr', linehl='GitSignsDeleteLn'},
     changedelete = {hl = 'GitSignsChange', text = '~', numhl='GitSignsChangeNr', linehl='GitSignsChangeLn'},
   },
   signcolumn = true,  -- Toggle with `:Gitsigns toggle_signs`
-  numhl      = false, -- Toggle with `:Gitsigns toggle_numhl`
+  numhl      = true, -- Toggle with `:Gitsigns toggle_numhl`
   linehl     = false, -- Toggle with `:Gitsigns toggle_linehl`
   word_diff  = false, -- Toggle with `:Gitsigns toggle_word_diff`
-  keymaps = {
-    -- Default keymap options
-    noremap = true,
+  --keymaps = {
+  --  -- Default keymap options
+  --  noremap = true,
 
-    ['n ]c'] = { expr = true, "&diff ? ']c' : '<cmd>Gitsigns next_hunk<CR>'"},
-    ['n [c'] = { expr = true, "&diff ? '[c' : '<cmd>Gitsigns prev_hunk<CR>'"},
+  --  ['n ]c'] = { expr = true, "&diff ? ']c' : '<cmd>Gitsigns next_hunk<CR>'"},
+  --  ['n [c'] = { expr = true, "&diff ? '[c' : '<cmd>Gitsigns prev_hunk<CR>'"},
 
-    ['n <leader>hs'] = '<cmd>Gitsigns stage_hunk<CR>',
-    ['v <leader>hs'] = ':Gitsigns stage_hunk<CR>',
-    ['n <leader>hu'] = '<cmd>Gitsigns undo_stage_hunk<CR>',
-    ['n <leader>hr'] = '<cmd>Gitsigns reset_hunk<CR>',
-    ['v <leader>hr'] = ':Gitsigns reset_hunk<CR>',
-    ['n <leader>hR'] = '<cmd>Gitsigns reset_buffer<CR>',
-    ['n <leader>hp'] = '<cmd>Gitsigns preview_hunk<CR>',
-    ['n <leader>hb'] = '<cmd>lua require"gitsigns".blame_line{full=true}<CR>',
-    ['n <leader>hS'] = '<cmd>Gitsigns stage_buffer<CR>',
-    ['n <leader>hU'] = '<cmd>Gitsigns reset_buffer_index<CR>',
+  --  ['n <leader>hs'] = '<cmd>Gitsigns stage_hunk<CR>',
+  --  ['v <leader>hs'] = '<cmd>Gitsigns stage_hunk<CR>',
+  --  ['n <leader>hu'] = '<cmd>Gitsigns undo_stage_hunk<CR>',
+  --  ['n <leader>hr'] = '<cmd>Gitsigns reset_hunk<CR>',
+  --  ['v <leader>hr'] = '<cmd>:Gitsigns reset_hunk<CR>',
+  --  ['n <leader>hR'] = '<cmd>Gitsigns reset_buffer<CR>',
+  --  ['n <leader>hp'] = '<cmd>Gitsigns preview_hunk<CR>',
+  --  ['n <leader>hb'] = '<cmd>lua require"gitsigns".blame_line{full=true}<CR>',
+  --  ['n <leader>hS'] = '<cmd>Gitsigns stage_buffer<CR>',
+  --  ['n <leader>hU'] = '<cmd>Gitsigns reset_buffer_index<CR>',
+
+  --  -- Text objects
+  --  ['o ih'] = '<cmd><C-U>Gitsigns select_hunk<CR>',
+  --  ['x ih'] = '<cmd><C-U>Gitsigns select_hunk<CR>'
+  --},
+  on_attach = function(bufnr)
+    local gs = package.loaded.gitsigns
+
+    local function map(mode, l, r, opts)
+      opts = opts or {}
+      opts.buffer = bufnr
+      vim.keymap.set(mode, l, r, opts)
+    end
+
+    -- Navigation
+    map('n', ']c', function()
+      if vim.wo.diff then return ']c' end
+      vim.schedule(function() gs.next_hunk() end)
+      return '<Ignore>'
+    end, {expr=true})
+
+    map('n', '[c', function()
+      if vim.wo.diff then return '[c' end
+      vim.schedule(function() gs.prev_hunk() end)
+      return '<Ignore>'
+    end, {expr=true})
+
+    -- Actions
+    map({'n', 'v'}, '<leader>hs', '<cmd>Gitsigns stage_hunk<CR>')
+    map({'n', 'v'}, '<leader>hr', '<cmd>Gitsigns reset_hunk<CR>')
+    map('n', '<leader>hS', gs.stage_buffer)
+    map('n', '<leader>hu', gs.undo_stage_hunk)
+    map('n', '<leader>hR', gs.reset_buffer)
+    map('n', '<leader>hp', gs.preview_hunk)
+    map('n', '<leader>hb', function() gs.blame_line{full=true} end)
+    map('n', '<leader>tb', gs.toggle_current_line_blame)
+    map('n', '<leader>hd', gs.diffthis)
+    map('n', '<leader>hD', function() gs.diffthis('~') end)
+    map('n', '<leader>td', gs.toggle_deleted)
+
+    -- Text object
+    map({'o', 'x'}, 'ih', ':<C-U>Gitsigns select_hunk<CR>')
+  end,
 
-    -- Text objects
-    ['o ih'] = ':<C-U>Gitsigns select_hunk<CR>',
-    ['x ih'] = ':<C-U>Gitsigns select_hunk<CR>'
-  },
   watch_gitdir = {
     interval = 1000,
     follow_files = true
   },
   attach_to_untracked = true,
-  current_line_blame = false, -- Toggle with `:Gitsigns toggle_current_line_blame`
+  current_line_blame = true, -- Toggle with `:Gitsigns toggle_current_line_blame`
   current_line_blame_opts = {
     virt_text = true,
     virt_text_pos = 'eol', -- 'eol' | 'overlay' | 'right_align'
     delay = 1000,
-    ignore_whitespace = false,
+    ignore_whitespace = true,
   },
   current_line_blame_formatter_opts = {
     relative_time = false
diff --git a/.config/nvim/after/plugin/icons.rc.lua b/.config/nvim/after/plugin/icons.rc.lua
index 002e144..0aa3628 100644
--- a/.config/nvim/after/plugin/icons.rc.lua
+++ b/.config/nvim/after/plugin/icons.rc.lua
@@ -1,5 +1,5 @@
-require("icon-picker")
-
-local opts = { noremap = true, silent = true }
-
-vim.keymap.set("n", "<leader>o", "<cmd>PickIcons<cr>", opts)
+-- require("icon-picker")
+-- 
+-- local opts = { noremap = true, silent = true }
+-- 
+-- vim.keymap.set("n", "<leader>o", "<cmd>PickIcons<cr>", opts)
diff --git a/.config/nvim/after/plugin/indent.rc.lua b/.config/nvim/after/plugin/indent.rc.lua
index a45c3ff..3ed3e19 100644
--- a/.config/nvim/after/plugin/indent.rc.lua
+++ b/.config/nvim/after/plugin/indent.rc.lua
@@ -1,22 +1,22 @@
-require("indent_blankline").setup {
-    char = "",
-    show_current_context = true,
-    --show_current_context_start = true,
-    space_char_blankline = " ",
-    char_highlight_list = {
-        "IndentBlanklineIndent1",
-        "IndentBlanklineIndent2",
-        "IndentBlanklineIndent3",
-        "IndentBlanklineIndent4",
-        "IndentBlanklineIndent5",
-        "IndentBlanklineIndent6",
-    },
-    space_char_highlight_list = {
-        "IndentBlanklineIndent1",
-        "IndentBlanklineIndent2",
-        "IndentBlanklineIndent3",
-        "IndentBlanklineIndent4",
-        "IndentBlanklineIndent5",
-        "IndentBlanklineIndent6",
-    },
-}
+--require("indent_blankline").setup {
+--    char = "",
+--    show_current_context = true,
+--    --show_current_context_start = true,
+--    space_char_blankline = " ",
+--    char_highlight_list = {
+--        "IndentBlanklineIndent1",
+--        "IndentBlanklineIndent2",
+--        "IndentBlanklineIndent3",
+--        "IndentBlanklineIndent4",
+--        "IndentBlanklineIndent5",
+--        "IndentBlanklineIndent6",
+--    },
+--    space_char_highlight_list = {
+--        "IndentBlanklineIndent1",
+--        "IndentBlanklineIndent2",
+--        "IndentBlanklineIndent3",
+--        "IndentBlanklineIndent4",
+--        "IndentBlanklineIndent5",
+--        "IndentBlanklineIndent6",
+--    },
+--}
diff --git a/.config/nvim/after/plugin/lspconfig.rc.lua b/.config/nvim/after/plugin/lspconfig.rc.lua
index 0137d08..08f14a2 100644
--- a/.config/nvim/after/plugin/lspconfig.rc.lua
+++ b/.config/nvim/after/plugin/lspconfig.rc.lua
@@ -34,6 +34,12 @@ local on_attach = function(client, bufnr)
 
   require'illuminate'.on_attach(client)
   require'virtualtypes'.on_attach()
+  require'lsp_signature'.on_attach({
+    floating_window = true,
+    floating_window_above_cur_line = false,
+    floating_window_off_x = 500,
+    floating_window_off_y = -5,
+  })
 end
 
 local signs = {
diff --git a/.config/nvim/after/plugin/signature.rc.vim b/.config/nvim/after/plugin/signature.rc.vim
deleted file mode 100644
index 868ce1a..0000000
--- a/.config/nvim/after/plugin/signature.rc.vim
+++ /dev/null
@@ -1,9 +0,0 @@
-"let g:signature_help_config = {
-"      \ 'border': v:true,
-"      \ 'maxWidth': 80,
-"      \ 'maxHeight': 30,
-"      \ 'style': "virtual",
-"      \ 'onTriggerChar': v:false,
-"      \ 'multiLabel': v:false,
-"      \ }
-"call signature_help#enable()
diff --git a/.config/nvim/after/plugin/telescope.rc.vim b/.config/nvim/after/plugin/telescope.rc.vim
index fa1154f..b030aca 100644
--- a/.config/nvim/after/plugin/telescope.rc.vim
+++ b/.config/nvim/after/plugin/telescope.rc.vim
@@ -12,7 +12,8 @@ EOF
 
 " Using Lua functions
 nnoremap <leader>f <cmd>lua require('telescope.builtin').find_files()<cr>
-nnoremap <leader>a <cmd>lua require('telescope.builtin').live_grep()<cr>
+nnoremap <leader>a <cmd>lua require('telescope.builtin').grep_string()<cr>
+nnoremap <leader>A <cmd>lua require('telescope.builtin').live_grep()<cr>
 nnoremap <leader>b <cmd>lua require('telescope.builtin').buffers()<cr>
 nnoremap <leader>r <cmd>lua require('telescope.builtin').resume()<cr>
 "nnoremap <leader>fh <cmd>lua require('telescope.builtin').help_tags()<cr>
diff --git a/.config/nvim/after/plugin/themer.rc.lua b/.config/nvim/after/plugin/themer.rc.lua
index 302fe03..1abe3c3 100644
--- a/.config/nvim/after/plugin/themer.rc.lua
+++ b/.config/nvim/after/plugin/themer.rc.lua
@@ -1,11 +1,11 @@
-require("themer").setup({
-    colorscheme = "scery",
-    enable_installer = true,
-    styles = {
-        ["function"] = { style = 'italic' },
-            functionbuiltin = { style = 'italic' },
-            variable = { style = 'italic' },
-            variableBuiltIn = { style = 'italic' },
-            parameter  = { style = 'italic' },
-    },
-})
+--require("themer").setup({
+--    colorscheme = "scery",
+--    enable_installer = true,
+--    styles = {
+--        ["function"] = { style = 'italic' },
+--            functionbuiltin = { style = 'italic' },
+--            variable = { style = 'italic' },
+--            variableBuiltIn = { style = 'italic' },
+--            parameter  = { style = 'italic' },
+--    },
+--})
diff --git a/.config/nvim/after/plugin/treesitter.rc.lua b/.config/nvim/after/plugin/treesitter.rc.lua
index 07fa237..b43f1d5 100644
--- a/.config/nvim/after/plugin/treesitter.rc.lua
+++ b/.config/nvim/after/plugin/treesitter.rc.lua
@@ -23,7 +23,7 @@ ts.setup {
   incremental_selection = {
     enable = true,
     keymaps = {
-      init_selection = "tis",
+      init_selection = "ti",
       node_incremental = "ti",
       scope_incremental = "ts",
       node_decremental = "td",
diff --git a/.config/nvim/after/plugin/vim-cmake.rc.vim b/.config/nvim/after/plugin/vim-cmake.rc.vim
index 0bf26f0..29e52d7 100644
--- a/.config/nvim/after/plugin/vim-cmake.rc.vim
+++ b/.config/nvim/after/plugin/vim-cmake.rc.vim
@@ -1,5 +1,7 @@
 let g:cmake_build_options = [ "-j10" ]
 
+let g:cmake_root_markers = ['.svn']
+
 
 let g:cmake_jump_on_error = 0 " We do not want to focus the console
 augroup vim-cmake-group
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 5da8d4d..d97fcbe 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -1,3 +1,8 @@
+lua << EOF
+vim.g.loaded = 1
+vim.g.loaded_netrwPlugin = 1
+EOF
+
 let plug_install = 0
 let autoload_plug_path = stdpath('config') . '/autoload/plug.vim'
 
@@ -9,137 +14,124 @@ if !filereadable(autoload_plug_path)
 endif
 unlet autoload_plug_path
 
+
 call plug#begin('~/.config/nvim/plugins')
 
 " Code development helpers {{{
-Plug 'neovim/nvim-lspconfig'
-Plug 'p00f/clangd_extensions.nvim'
+"Plug 'nvim-treesitter/nvim-treesitter-textobjects'
+"Plug 'nvim-treesitter/playground'
+"Plug 'p00f/nvim-ts-rainbow'
 "Plug 'ray-x/lsp_signature.nvim'
-Plug 'matsui54/denops-signature_help'
-Plug 'jubnzv/virtual-types.nvim'
-Plug 'RRethy/vim-illuminate'
-Plug 'mizlan/iswap.nvim'
-Plug 'Saecki/crates.nvim' | Plug 'jose-elias-alvarez/null-ls.nvim'
-
-"Plug 'dbeniamine/cheat.sh-vim'
-"Plug 'puremourning/vimspector'
 "Plug 'vim-test/vim-test'
-Plug 'lukas-reineke/indent-blankline.nvim'
-Plug 'liuchengxu/vista.vim'
-
-Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
-Plug 'nvim-treesitter/playground'
-Plug 'p00f/nvim-ts-rainbow'
-Plug 'romgrk/nvim-treesitter-context'
-
+Plug 'RRethy/vim-illuminate'
+Plug 'Saecki/crates.nvim' | Plug 'jose-elias-alvarez/null-ls.nvim'
+Plug 'andrewferrier/debugprint.nvim'
 Plug 'cdelledonne/vim-cmake'
-
-Plug 'andymass/vim-matchup'
-Plug 'numToStr/Comment.nvim'
-Plug 'danymat/neogen'
-
+Plug 'jubnzv/virtual-types.nvim'
 Plug 'krady21/compiler-explorer.nvim'
+Plug 'liuchengxu/vista.vim'
+Plug 'matsui54/denops-signature_help'
+Plug 'mizlan/iswap.nvim'
+Plug 'neovim/nvim-lspconfig'
+Plug 'numToStr/Comment.nvim'
+Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
+Plug 'p00f/clangd_extensions.nvim'
+Plug 'ray-x/lsp_signature.nvim'
+Plug 'romgrk/nvim-treesitter-context'
 " }}}
 
 " Completion {{{
-Plug 'ms-jpq/coq_nvim'
 Plug 'ms-jpq/coq.artifacts', {'branch': 'artifacts'}
+Plug 'ms-jpq/coq_nvim'
 " }}}
 
 " Files switch, jump and grep-like tools {{{
-Plug 'kyazdani42/nvim-web-devicons'
-Plug 'kyazdani42/nvim-tree.lua'
-Plug 'nvim-lua/popup.nvim'
-Plug 'nvim-lua/plenary.nvim'
-Plug 'nvim-telescope/telescope.nvim'
-Plug 'fhill2/telescope-ultisnips.nvim'
-Plug 'stevearc/dressing.nvim'
+"Plug 'inside/vim-search-pulse'
 Plug 'MunifTanjim/nui.nvim'
-Plug 'inside/vim-search-pulse'
-Plug 'wellle/targets.vim'
-Plug 'numToStr/FTerm.nvim'
+Plug 'fhill2/telescope-ultisnips.nvim'
 Plug 'ggandor/leap.nvim'
+Plug 'kyazdani42/nvim-tree.lua'
+Plug 'kyazdani42/nvim-web-devicons'
+Plug 'numToStr/FTerm.nvim'
+Plug 'nvim-lua/plenary.nvim'
+Plug 'nvim-lua/popup.nvim'
+Plug 'nvim-telescope/telescope.nvim'
+Plug 'wellle/targets.vim'
 " }}}
 
 " Git integration {{{
-Plug 'tpope/vim-fugitive'
-Plug 'APZelos/blamer.nvim'
+"Plug 'APZelos/blamer.nvim'
 Plug 'lewis6991/gitsigns.nvim'
+Plug 'tpope/vim-fugitive'
 " }}}
 
 " Support for random filetypes {{{
-"Plug 'weirongxu/plantuml-previewer.vim' |
-Plug 'kergoth/vim-bitbake' " Bitbake templates and syntax
-Plug 'aklt/plantuml-syntax'
-Plug 'iamcco/markdown-preview.nvim', { 'do': { -> mkdp#util#install() }, 'for': ['markdown', 'vim-plug']}
+"Plug 'chrisbra/csv.vim'
+"Plug 'iamcco/markdown-preview.nvim', { 'do': { -> mkdp#util#install() }, 'for': ['markdown', 'vim-plug']}
 "Plug 'vim-pandoc/vim-pandoc'
-Plug 'chrisbra/csv.vim'
+"Plug 'weirongxu/plantuml-previewer.vim' |
+Plug 'aklt/plantuml-syntax'
+Plug 'kergoth/vim-bitbake' " Bitbake templates and syntax
 " }}}
 
 " Other plugins (external tools, etc) {{{
-"Plug 'MortenStabenau/matlab-vim'
-"Plug 'junegunn/goyo.vim'
-Plug 'lukas-reineke/virt-column.nvim'
-Plug 'folke/which-key.nvim'
-"Plug 'glacambre/firenvim'
 "Plug 'JMcKiern/vim-shoot'
-"Plug 'protex/better-digraphs.nvim'
+"Plug 'MortenStabenau/matlab-vim'
+"Plug 'glacambre/firenvim'
+"Plug 'junegunn/goyo.vim'
+Plug 'folke/which-key.nvim'
+Plug 'lukas-reineke/virt-column.nvim'
+Plug 'nvim-lualine/lualine.nvim'
+Plug 'protex/better-digraphs.nvim'
 " }}}
 
 " Note taking {{{
-"Plug 'vimwiki/vimwiki'
-"Plug 'michal-h21/vimwiki-sync'
+" select one note taking app
+"Plug 'SidOfc/mkdx'
 "Plug 'michal-h21/vim-zettel'
+"Plug 'michal-h21/vimwiki-sync'
+"Plug 'nvim-neorg/neorg'
+"Plug 'vimwiki/vimwiki', { 'branch': 'dev' }
+Plug 'jakewvincent/mkdnflow.nvim'
 " }}}
 
-" Colorschemes {{{
-Plug 'vim-airline/vim-airline' | Plug 'vim-airline/vim-airline-themes'
+" Appearance {{{
 "Plug 'jaredgorski/spacecamp'
 "Plug 'lifepillar/vim-gruvbox8'
-"Plug 'dylanaraps/wal'
-"Plug 'tanvirtin/monokai.nvim'
 "Plug 'marko-cerovac/material.nvim'
+"Plug 'srcery-colors/srcery-vim'
+"Plug 'tanvirtin/monokai.nvim'
+Plug 'stevearc/dressing.nvim'
 " }}}
 
 " Testing phase {{{
-Plug 'nvim-neorg/neorg'
-Plug 'themercorp/themer.lua'
-"Plug 'mfussenegger/nvim-dap'
-Plug 'frabjous/knap'
-Plug 'kevinhwang91/nvim-ufo' | Plug 'kevinhwang91/promise-async'
-Plug 'ziontee113/icon-picker.nvim'
-Plug 'RRethy/vim-hexokinase', { 'do': 'make hexokinase' }
-Plug 'anuvyklack/pretty-fold.nvim'
-Plug 'anuvyklack/fold-preview.nvim' | Plug 'anuvyklack/keymap-amend.nvim'
-Plug 'anuvyklack/windows.nvim' | Plug 'anuvyklack/middleclass' | Plug 'anuvyklack/animation.nvim'
+"Plug 'RRethy/vim-hexokinase', { 'do': 'make hexokinase' }
 "Plug 'https://git.sr.ht/%7Ewhynothugo/lsp_lines.nvim'
+"Plug 'kevinhwang91/nvim-ufo' | Plug 'kevinhwang91/promise-async'
+"Plug 'mfussenegger/nvim-dap'
+"Plug 'mfussenegger/nvim-dap'
+"Plug 'nguyenvukhang/nvim-toggler'
+"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 'euclio/vim-markdown-composer', {'do': ':!cargo build --release --locked'}
+Plug 'frabjous/knap'
+Plug 'ftilde/vim-ugdb'
+Plug 'gorbit99/codewindow.nvim'
+Plug 'https://gitlab.com/yorickpeterse/nvim-window.git'
+Plug 'kevinhwang91/nvim-ufo' | Plug 'kevinhwang91/promise-async'
+Plug 'nvim-neorg/neorg'
+Plug 'samodostal/image.nvim'
+Plug 'ziontee113/icon-picker.nvim'
 " }}}
 
 call plug#end()
 
-lua << EOF
-
-require('fold-preview').setup()
-
-require('pretty-fold').ft_setup('cpp', {
-   process_comment_signs = false,
-   comment_signs = {
-      '/**', -- C++ Doxygen comments
-   },
-   stop_words = {
-      -- ╟─ "*" ──╭───────╮── "@brief" ──╭───────╮──╢
-      --          ╰─ WSP ─╯              ╰─ WSP ─╯
-      '%*%s*@brief%s*',
-   },
-})
-
---require('lsp_lines').setup()
-
-require('compiler-explorer').setup()
-EOF
-
 set termguicolors
-set shell=bash
+set shell=/bin/bash
 
 if plug_install
     PlugInstall --sync
@@ -147,6 +139,8 @@ endif
 unlet plug_install
 
 set number
+set relativenumber
+set numberwidth=1
 set clipboard+=unnamedplus
 
 set noshowmode
@@ -161,11 +155,11 @@ EOF
 set colorcolumn=80
 
 set background=dark
-"Wal scheme:
-"colorscheme wal
 "Material scheme:
 "let g:material_style = "deep ocean"
-"colorscheme material
+colorscheme enfocado
+
+lua require('lualine').setup { options = { theme = 'enfocado' } }
 
 "highlight MatchParen cterm=underline ctermbg=black ctermfg=NONE
 "highlight VirtColumn ctermfg=DarkGrey ctermbg=NONE
@@ -186,7 +180,7 @@ set smartcase
 set gdefault
 
 set textwidth=80
-set formatoptions+=t
+set formatoptions+=tlo/qj
 set scrolloff=10
 set nowrap
 set sidescroll=5
@@ -240,7 +234,8 @@ set nobackup
 set nowritebackup
 
 " New dynamic window height
-set cmdheight=0
+"set cmdheight=0
+set cmdheight=1
 
 " Having longer updatetime (default is 4000 ms = 4 s) leads to noticeable
 " delays and poor user experience.
@@ -250,11 +245,14 @@ set updatetime=300
 set shortmess+=c
 set shortmess-=F
 
-set signcolumn=number
+set signcolumn=auto
 
 set wildmode=longest,list,full
+set completeopt=menuone,noselect
 
-match Error /\s\+$\|DU\cPA/
+set mouse=
+
+"match Error /\s\+$\|DU\cPA/
 
 setglobal virtualedit=block
 setglobal shiftround
@@ -276,3 +274,35 @@ let g:blamer_relative_time = 0
 """"""""""""""""""
 set guifont=IBM\ Plex\ Mono\ Text:h8
 let g:neovide_cursor_vfx_mode = "pixiedust"
+
+lua << EOF
+vim.o.splitbelow = true
+vim.o.splitright = true
+
+require('fold-preview').setup()
+require('pretty-fold').ft_setup('cpp', {
+   process_comment_signs = false,
+   comment_signs = {
+      '/**', -- C++ Doxygen comments
+   },
+   stop_words = {
+      -- ╟─ "*" ──╭───────╮── "@brief" ──╭───────╮──╢
+      --          ╰─ WSP ─╯              ╰─ WSP ─╯
+      '%*%s*@brief%s*',
+   },
+})
+--require('lsp_lines').setup()
+require('compiler-explorer').setup()
+
+require('image').setup {
+    render = {
+    min_padding = 5,
+    show_label = true,
+    use_dither = true,
+  },
+  events = {
+    update_on_nvim_resize = true,
+  },
+}
+
+EOF
diff --git a/.gitconfig b/.gitconfig
index 49554cf..ee0161b 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,8 +1,8 @@
 [push]
 	default = simple
 [user]
-	name = Robert Kmiec
-	email = robert.r.kmiec@gmail.com
+	name = Robert Kmieć
+	email = KmcR@viessmann.com
 [core]
 	editor = nvim
 	pager = delta
diff --git a/.local/share/yadm/archive b/.local/share/yadm/archive
index 3af560a..0d03a19 100644
Binary files a/.local/share/yadm/archive and b/.local/share/yadm/archive differ