diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index a17dba5..4198f6b 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -95,6 +95,9 @@ vim.o.shiftwidth = 4
 vim.o.softtabstop = 4
 vim.o.textwidth = 80
 
+-- set session options
+vim.o.sessionoptions = "blank,buffers,curdir,folds,help,tabpages,winsize,winpos,terminal,localoptions"
+
 -- read files correctly
 vim.filetype.add({
   extension = {
diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index be1f970..efe4f77 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -14,6 +14,7 @@
   "conform.nvim": { "branch": "master", "commit": "086a40dc7ed8242c03be9f47fbcee68699cc2395" },
   "cpsm": { "branch": "master", "commit": "c32a9b7dc9d5b516505bc8ab58ceb15f64735830" },
   "csvview.nvim": { "branch": "main", "commit": "7022e18a0fbae9aecf99a3ba02b2a541edc2b8a1" },
+  "dial.nvim": { "branch": "master", "commit": "f2634758455cfa52a8acea6f142dcd6271a1bf57" },
   "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
   "edgy.nvim": { "branch": "main", "commit": "8bfd2808994a988c975694122f68624b8a219f5f" },
   "file-renamer.nvim": { "branch": "master", "commit": "893e8e7bf0050daf1b94a429bf7d14146f1b78df" },
@@ -78,7 +79,10 @@
   "telescope-words.nvim": { "branch": "main", "commit": "295d51fe1e525fee18c0c164ad0ae5fb23273aa0" },
   "telescope.nvim": { "branch": "master", "commit": "776b509f80dd49d8205b9b0d94485568236d1192" },
   "tidy.nvim": { "branch": "main", "commit": "8b6921150b16f38f48a2459a844a0c2b4c916914" },
+  "tiny-inline-diagnostic.nvim": { "branch": "main", "commit": "ba133b3e932416e4b9507095731a6d7276878fe8" },
   "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" },
+  "treesj": { "branch": "main", "commit": "26bc2a8432ba3ea79ed6aa346fba780a3d372570" },
+  "treewalker.nvim": { "branch": "main", "commit": "7baacb0efbdc2ac523ede90e266d685bc2227673" },
   "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" },
   "undotree": { "branch": "master", "commit": "6fa6b57cda8459e1e4b2ca34df702f55242f4e4d" },
   "vim-abolish": { "branch": "master", "commit": "dcbfe065297d31823561ba787f51056c147aa682" },
diff --git a/.config/nvim/lua/keymap.lua b/.config/nvim/lua/keymap.lua
index 776e656..fe4ad93 100644
--- a/.config/nvim/lua/keymap.lua
+++ b/.config/nvim/lua/keymap.lua
@@ -160,7 +160,6 @@ wk.add({
     desc = "LSP: list references",
     noremap = true,
   },
-  { mode = "n", "K", vim.lsp.buf.hover(), desc = "LSP: show documentation", noremap = true },
   {
     mode = "n",
     "<F8>",
@@ -284,19 +283,6 @@ wk.add({
     noremap = true,
   },
   { mode = "n", "<F10>s", "z=", desc = "Spell: display suggestions" },
-  -- kevinhwang91/nvim-ufo
-  {
-    mode = "n",
-    "K",
-    function()
-      local winid = require("ufo").peekFoldedLinesUnderCursor()
-      if not winid then
-        vim.lsp.buf.hover()
-      end
-    end,
-    desc = "LSP: peek folded section",
-    noremap = true,
-  },
   -- kevinhwang91/nvim-hlslens
   {
     mode = "n",
@@ -398,5 +384,58 @@ wk.add({
   -- huynle/ogpt-nvim
   { mode = "n", "<leader>ai", ":OGPT<CR>", desc = "OGTP: Open AI View", noremap = true },
   -- potamides/pantran.nvim
-  { mode = {"n", "v"}, "<leader>tr", ":Pantran<CR>", desc = "Pantran: translate", noremap = true },
+  {
+    mode = { "n", "v" },
+    "<leader>tr",
+    ":Pantran<CR>",
+    desc = "Pantran: translate",
+    noremap = true,
+  },
+  -- aaronik/treewalkr.nvim
+  { mode = { "n", "v" }, "<leader><C-k>", "<cmd>Treewalker Up<cr>", silent = true },
+  { mode = { "n", "v" }, "<leader><C-j>", "<cmd>Treewalker Down<cr>", silent = true },
+  { mode = { "n", "v" }, "<leader><C-h>", "<cmd>Treewalker Left<cr>", silent = true },
+  { mode = { "n", "v" }, "<leader><C-l>", "<cmd>Treewalker Right<cr>", silent = true },
+  { mode = { "n" }, "<leader><C-S-k>", "<cmd>Treewalker SwapUp<cr>", silent = true },
+  { mode = { "n" }, "<leader><C-S-j>", "<cmd>Treewalker SwapDown<cr>", silent = true },
+  { mode = { "n" }, "<leader><C-S-h>", "<cmd>Treewalker SwapLeft<cr>", silent = true },
+  { mode = { "n" }, "<leader><C-S-l>", "<cmd>Treewalker SwapRight<cr>", silent = true },
+
+  -- monaqa/dial.nvim
+  {
+    mode = { "n" },
+    "<C-a>",
+    function()
+      require("dial.map").manipulate("increment", "normal")
+    end,
+    silent = true,
+  },
+  {
+    mode = { "n" },
+    "<C-x>",
+    function()
+      require("dial.map").manipulate("decrement", "normal")
+    end,
+    silent = true,
+  },
+
+  -- Wansmer/treesj
+  {
+    mode = { "n" },
+    "<leader>m",
+    function()
+      require("treesj").toggle()
+    end,
+  },
+})
+
+-- kevinhwang91/nvim-ufo - lspconfig
+vim.keymap.set("n", "K", function()
+  local winid = require("ufo").peekFoldedLinesUnderCursor()
+  if not winid then
+    vim.lsp.buf.hover({ border = "rounded" })
+  end
+end, {
+  buffer = bufnr,
+  desc = "LSP: show documentation / peek folded section",
 })
diff --git a/.config/nvim/lua/plugins/dial.lua b/.config/nvim/lua/plugins/dial.lua
new file mode 100644
index 0000000..cfdf0e4
--- /dev/null
+++ b/.config/nvim/lua/plugins/dial.lua
@@ -0,0 +1,24 @@
+return {
+  -- improves vims increment and decrement functions
+  "monaqa/dial.nvim",
+  config = function()
+    local augend = require("dial.augend")
+    require("dial.config").augends:register_group{
+      default = {
+        augend.integer.alias.decimal,
+        augend.integer.alias.hex,
+        augend.date.alias["%Y/%m/%d"],
+        augend.date.alias["%d.%m.%Y"],
+        augend.date.alias["%d.%m.%y"],
+        augend.date.alias["%H:%M"],
+        augend.constant.alias.de_weekday,
+        augend.constant.alias.de_weekday_full,
+        augend.constant.alias.bool,
+        augend.constant.alias.Bool,
+        augend.semver.alias.semver,
+        augend.constant.alias.en_weekday,
+        augend.constant.alias.en_weekday_full,
+      },
+    }
+  end
+}
diff --git a/.config/nvim/lua/plugins/goto-preview.lua b/.config/nvim/lua/plugins/goto-preview.lua
index 1d3351b..5ebd2bf 100644
--- a/.config/nvim/lua/plugins/goto-preview.lua
+++ b/.config/nvim/lua/plugins/goto-preview.lua
@@ -3,6 +3,9 @@ return {
   "rmagatti/goto-preview",
   dependencies = "rmagatti/logger.nvim",
   config = function()
-    require("goto-preview").setup({})
+    require("goto-preview").setup({
+      border = "rounded",
+      preview_window_title = { enable = true, position = "center" },
+    })
   end,
 }
diff --git a/.config/nvim/lua/plugins/leap.lua b/.config/nvim/lua/plugins/leap.lua
index d1ebb62..e4d1598 100644
--- a/.config/nvim/lua/plugins/leap.lua
+++ b/.config/nvim/lua/plugins/leap.lua
@@ -6,7 +6,6 @@ return {
     require("leap").opts.equivalence_classes = { " \t\r\n", "([{", ")]}", "'\"`" }
     require("leap").opts.special_keys.prev_target = "<backspace>"
     require("leap").opts.special_keys.prev_group = "<backspace>"
-    require("leap.user").set_repeat_keys("<enter>", "<backspace>")
     require("leap").opts.safe_labels = "sfnut/SFNLHMUGTZ?"
     require("leap").opts.labels = "sfnjklhodweimbuyvrgtaqpcxz/SFNJKLHODWEIMBUYVRGTAQPCXZ?"
   end,
diff --git a/.config/nvim/lua/plugins/tiny-inline-diagnostic.lua b/.config/nvim/lua/plugins/tiny-inline-diagnostic.lua
new file mode 100644
index 0000000..9eca2d5
--- /dev/null
+++ b/.config/nvim/lua/plugins/tiny-inline-diagnostic.lua
@@ -0,0 +1,13 @@
+return {
+  -- display inline diagnostics
+  "rachartier/tiny-inline-diagnostic.nvim",
+  event = "VeryLazy",
+  priority = 1000,
+  config = function()
+    require("tiny-inline-diagnostic").setup({
+      preset = "classic",
+      transparent_bg = true,
+    })
+    vim.diagnostic.config({ virtual_text = false })
+  end,
+}
diff --git a/.config/nvim/lua/plugins/treesj.lua b/.config/nvim/lua/plugins/treesj.lua
new file mode 100644
index 0000000..9017427
--- /dev/null
+++ b/.config/nvim/lua/plugins/treesj.lua
@@ -0,0 +1,8 @@
+return {
+  -- improves splitting and joining blocks
+  'Wansmer/treesj',
+  dependencies = { 'nvim-treesitter/nvim-treesitter' },
+  config = function()
+    require('treesj').setup()
+  end,
+}
diff --git a/.config/nvim/lua/plugins/treewalker.lua b/.config/nvim/lua/plugins/treewalker.lua
new file mode 100644
index 0000000..9ea6c31
--- /dev/null
+++ b/.config/nvim/lua/plugins/treewalker.lua
@@ -0,0 +1,4 @@
+return {
+  -- improved movement for code
+  "aaronik/treewalker.nvim",
+}