diff --git a/git/.config/git/config b/git/.config/git/config
index 361923b..a39d586 100644
--- a/git/.config/git/config
+++ b/git/.config/git/config
@@ -3,7 +3,10 @@
   name          = Marty Oehme
   signingkey    = 73BA40D5AFAF49C9
 [init]
-	defaultBranch = main
+  defaultBranch = main
+[sendemail]
+  smtpserver = "/usr/bin/msmtp"
+  annotate = yes
 [alias]
   ignore        = "!gitignore -f"
   pushmerge     = "push -o merge_request.merge_when_pipeline_succeeds" # see https://docs.gitlab.com/ce/user/project/push_options.html # merge-when-pipeline-succeeds-alias
diff --git a/nvim/.config/nvim/lua/maps.lua b/nvim/.config/nvim/lua/maps.lua
index 8234d08..cc8a371 100644
--- a/nvim/.config/nvim/lua/maps.lua
+++ b/nvim/.config/nvim/lua/maps.lua
@@ -38,10 +38,12 @@ local function wrap_up()
     if vim.v.count == 0 then return 'gk' end
     return 'k'
 end
+
 local function wrap_down()
     if vim.v.count == 0 then return 'gj' end
     return 'j'
 end
+
 map.n.nore.expr['k'] = wrap_up
 map.n.nore.expr['j'] = wrap_down
 
@@ -54,7 +56,7 @@ map.i.nore['<C-l>'] = '<esc>guiw`]a'
 
 -- let me save stuff as sudo when I forget to call vim with it
 map.c.nore['w!!'] =
-    [[execute 'silent! write !sudo tee % >/dev/null' <bar> edit!]]
+[[execute 'silent! write !sudo tee % >/dev/null' <bar> edit!]]
 
 -- yank current filename/filepath to f buffer
 map.n.nore['yp'] = ':let @p = expand("%")<Cr>'
@@ -123,16 +125,16 @@ map.n.nore['<leader>E'] = ':Vifm getcwd()<cr>'
 -- PLUGIN: Telescope GLOBAL FUZZY FINDING
 -- buffers and files in current workdir
 map.n.nore['<leader>s'] =
-    [[:lua require 'telescope.builtin'.buffers(require 'telescope.themes'.get_ivy())<cr>]]
+[[:lua require 'telescope.builtin'.buffers(require 'telescope.themes'.get_ivy())<cr>]]
 -- most recently used / MRU, bound to S since it is essentially a larger
 -- go-back intention than just buffers
 map.n.nore['<leader>S'] =
-    [[:lua require 'telescope.builtin'.oldfiles(require 'telescope.themes'.get_ivy())<cr>]]
+[[:lua require 'telescope.builtin'.oldfiles(require 'telescope.themes'.get_ivy())<cr>]]
 -- fuzzy find files in cwd
 map.n.nore['<leader>f'] = [[:lua require 'telescope.builtin'.find_files()<cr>]]
 -- fuzzy find hidden files in cwd
 map.n.nore['<leader><c-f>'] =
-    [[:lua require 'telescope.builtin'.find_files({hidden=true})<cr>]]
+[[:lua require 'telescope.builtin'.find_files({hidden=true})<cr>]]
 -- general full-text search in cwd with rg
 map.n.nore['<leader>F'] = [[:lua require 'telescope.builtin'.live_grep()<cr>]]
 
@@ -140,25 +142,25 @@ map.n.nore['<leader>F'] = [[:lua require 'telescope.builtin'.live_grep()<cr>]]
 map.n.nore['<leader>gs'] = [[:lua require 'telescope.builtin'.git_status()<cr>]]
 -- git buffercommits
 map.n.nore['<leader>gb'] =
-    [[:lua require 'telescope.builtin'.git_bcommits()<cr>]]
+[[:lua require 'telescope.builtin'.git_bcommits()<cr>]]
 -- git commitlog
 map.n.nore['<leader>gl'] =
-    [[:lua require 'telescope.builtin'.git_commits()<cr>]]
+[[:lua require 'telescope.builtin'.git_commits()<cr>]]
 
 -- helptags
 map.n.nore['<leader><F1>'] =
-    [[:lua require 'telescope.builtin'.help_tags()<cr>]]
+[[:lua require 'telescope.builtin'.help_tags()<cr>]]
 -- manpages
 map.n.nore['<leader><F2>'] =
-    [[:lua require 'telescope.builtin'.man_pages()<cr>]]
+[[:lua require 'telescope.builtin'.man_pages()<cr>]]
 
 -- colorschemes
 map.n.nore['<leader><F8>'] =
-    [[:lua require 'telescope.builtin'.colorscheme(require 'telescope.themes'.get_ivy())<cr>]]
+[[:lua require 'telescope.builtin'.colorscheme(require 'telescope.themes'.get_ivy())<cr>]]
 
 -- spell suggestions
 map.n.nore['z='] =
-    [[:lua require 'telescope.builtin'.spell_suggest(require 'telescope.themes'.get_ivy())<cr>]]
+[[:lua require 'telescope.builtin'.spell_suggest(require 'telescope.themes'.get_ivy())<cr>]]
 
 -- PLUGIN: betterdigraphs
 -- allow normal digraph insertion on c-k, telescope search on c-k c-k
@@ -183,8 +185,7 @@ map.x.nore.silent['<localleader>q'] = 'gq'
 map.n.nore.silent['<localleader>Q'] = 'vapJgqap'
 
 -- Enter distraction free prose mode with F11
-map.n.nore.silent['<F11>'] = ':TZAtaraxis<cr>'
-map.n.nore.silent['<F10>'] = ':TZMinimalist<cr>'
+map.n.nore.silent['<F11>'] = ':ZenMode<cr>'
 
 -- PLUGIN: fzf-bibtex
 -- map @@ to automatically insert citation reference at cursor
@@ -216,19 +217,19 @@ map.x['ga'] = '<Plug>(EasyAlign)'
 map.n['ga'] = '<Plug>(EasyAlign)'
 
 -- PLUGIN: Navigator.nvim
-map.n.nore.silent['<c-h>'] = "<CMD>lua require('Navigator').left()<CR>"
-map.n.nore.silent['<c-k>'] = "<CMD>lua require('Navigator').up()<CR>"
-map.n.nore.silent['<c-l>'] = "<CMD>lua require('Navigator').right()<CR>"
-map.n.nore.silent['<c-j>'] = "<CMD>lua require('Navigator').down()<CR>"
-map.n.nore.silent['<c-p>'] = "<CMD>lua require('Navigator').previous()<CR>"
+map.n.nore.silent['<c-w>h'] = "<CMD>lua require('Navigator').left()<CR>"
+map.n.nore.silent['<c-w>k'] = "<CMD>lua require('Navigator').up()<CR>"
+map.n.nore.silent['<c-w>l'] = "<CMD>lua require('Navigator').right()<CR>"
+map.n.nore.silent['<c-w>j'] = "<CMD>lua require('Navigator').down()<CR>"
+map.n.nore.silent['<c-w>p'] = "<CMD>lua require('Navigator').previous()<CR>"
 
 -- PLUGIN: compe.nvim
 -- lsp keymaps are set in lsp settings, only for lsp buffers
 map.i.nore.expr.silent['<c-space>'] = 'compe#complete()'
 map.i.expr['<Tab>'] =
-    [[vsnip#jumpable(1) ? '<Plug>(vsnip-jump-next)' : '<Tab>']]
+[[vsnip#jumpable(1) ? '<Plug>(vsnip-jump-next)' : '<Tab>']]
 map.i.expr['<S-Tab>'] =
-    [[vsnip#jumpable(-1) ? '<Plug>(vsnip-jump-next)' : '<S-Tab>']]
+[[vsnip#jumpable(-1) ? '<Plug>(vsnip-jump-next)' : '<S-Tab>']]
 
 -- PLUGIN: symbols-outline.nvim
 map.n.nore.silent['<leader>o'] = "<cmd>SymbolsOutline<cr>"
diff --git a/nvim/.config/nvim/lua/plug/_format.lua b/nvim/.config/nvim/lua/plug/_format.lua
index 487b57e..e4cdeac 100644
--- a/nvim/.config/nvim/lua/plug/_format.lua
+++ b/nvim/.config/nvim/lua/plug/_format.lua
@@ -14,7 +14,7 @@ local prettierfmt = {
     end
 }
 local shfmt = {
-    function() return {exe = "shfmt", args = {"-i 4"}, stdin = true} end
+    function() return { exe = "shfmt", args = { "-i 4" }, stdin = true } end
 }
 
 local formatters = {
@@ -29,20 +29,19 @@ local formatters = {
             }
         end
     },
-    go = {function() return {exe = "goimports", stdin = true} end},
+    go = { function() return { exe = "goimports", stdin = true } end },
     html = prettierfmt,
     javascript = prettierfmt,
     json = prettierfmt,
     lua = {
         function()
-            return
-                {exe = "lua-format", args = {"--indent-width", 4}, stdin = true}
+            return { exe = "lua-format", args = { "--indent-width", 4 }, stdin = true }
         end
     },
-    python = {function() return {exe = "black", args = {"-"}, stdin = true} end},
+    python = { function() return { exe = "black", args = { "-" }, stdin = true } end },
     rust = {
         function()
-            return {exe = "rustfmt", args = {"--emit=stdout"}, stdin = true}
+            return { exe = "rustfmt", args = { "--emit=stdout" }, stdin = true }
         end
     },
     sh = shfmt,
@@ -50,7 +49,7 @@ local formatters = {
     zsh = shfmt
 }
 
-require('formatter').setup({logging = false, filetype = formatters})
+require('formatter').setup({ logging = false, filetype = formatters })
 
 -- Format on save:
 -- gather filetypes to autocorrect for each activated formatter above
diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua
index 3f11bdc..5bc3c37 100644
--- a/nvim/.config/nvim/lua/plugins.lua
+++ b/nvim/.config/nvim/lua/plugins.lua
@@ -102,20 +102,8 @@ require("packer").startup(function()
         ft = { "quarto" }
     }
     use 'micarmst/vim-spellsync' -- personal dict improvements for git sync
-    use { -- provide distraction free writing
-        'Pocco81/TrueZen.nvim',
-        config = function()
-            require("true-zen").setup({
-                integrations = {
-                    gitsigns = true,
-                    lualine = true,
-                    tmux = { global = false },
-                    limelight = true
-                }
-            })
-        end
-    }
-    use { 'junegunn/limelight.vim', event = 'BufRead' } -- provide even distraction free-er writing (lowlight paragraphs)
+    use { 'folke/zen-mode.nvim', config = require('zen-mode').setup() } -- provide distraction free writing
+    use 'folke/twilight.nvim' -- provide even distraction free-er writing (lowlight paragraphs)
     use 'alok/notational-fzf-vim' -- quickly search through the wiki
 
     -- languages
diff --git a/qutebrowser/.config/qutebrowser/url.py b/qutebrowser/.config/qutebrowser/url.py
index 01bc9df..f09f43f 100644
--- a/qutebrowser/.config/qutebrowser/url.py
+++ b/qutebrowser/.config/qutebrowser/url.py
@@ -8,6 +8,7 @@ c.url.searchengines = {
     "aur": "https://aur.archlinux.org/packages/?K={}",
     "d": "https://www.dict.cc/?s={}",
     "ddg": "https://duckduckgo.com/?q={}",
+    "docker": "https://hub.docker.com/search?q={}",
     "dt": "https://www.deepl.com/translator#en/de/{}",
     "g": "https://www.google.com/search?q={}",
     "gh": "https://github.com/search?q={}",