diff --git a/after/plugin/dap.lua b/after/plugin/dap.lua
index b18325e..91664de 100644
--- a/after/plugin/dap.lua
+++ b/after/plugin/dap.lua
@@ -19,6 +19,6 @@ dap.listeners.before.event_exited["dapui_config"] = function()
   dapui.close()
 end
 
-vim.api.nvim_create_user_command("DapUIFloat", function ()
-    dapui.float_element()
+vim.api.nvim_create_user_command("DapUIFloat", function (at)
+    dapui.float_element(at.args)
 end, {})
diff --git a/after/plugin/statusline.lua b/after/plugin/statusline.lua
index 62a04bc..8aeacfb 100755
--- a/after/plugin/statusline.lua
+++ b/after/plugin/statusline.lua
@@ -4,6 +4,7 @@ local utils = require("heirline.utils")
 local colors = {
     bright_bg = utils.get_highlight("Folded").bg,
     bright_fg = utils.get_highlight("Folded").fg,
+    dark_bg = "#0c0c0c",
     red = utils.get_highlight("DiagnosticError").fg,
     dark_red = utils.get_highlight("DiffDelete").bg,
     green = utils.get_highlight("String").fg,
@@ -113,7 +114,7 @@ local ViMode = {
     },
 }
 
-ViMode = utils.surround({ "", "" }, "bright_bg", { ViMode})
+ViMode = utils.surround({ "", "" }, "dark_bg", { ViMode})
 
 local FileNameBlock = {
     -- let's first set up some attributes needed by this component and it's children
@@ -217,7 +218,7 @@ local FileLastModified = {
     end
 }
 
-FileNameBlock = utils.surround({ "", "" }, "bright_bg", FileNameBlock)
+FileNameBlock = utils.surround({ "", "" }, "dark_bg", FileNameBlock)
 
 -- We're getting minimalists here!
 local Ruler = {
@@ -227,7 +228,7 @@ local Ruler = {
     -- %P = percentage through file of displayed window
     provider = "%7(%l/%3L%):%2c %P",
 }
-Ruler = utils.surround({ "", "" }, "bright_bg", Ruler)
+Ruler = utils.surround({ "", "" }, "dark_bg", Ruler)
 
 -- I take no credits for this! :lion:
 local ScrollBar ={
@@ -242,7 +243,7 @@ local ScrollBar ={
         local i = math.floor((curr_line - 1) / lines * #self.sbar) + 1
         return string.rep(self.sbar[i], 2)
     end,
-    hl = { fg = "blue", bg = "bright_bg" },
+    hl = { fg = "blue", bg = "dark_bg" },
 }
 
 local LSPActive = {
@@ -263,7 +264,7 @@ local LSPActive = {
     hl = { fg = "green", bold = true },
 }
 
-LSPActive = utils.surround({ "", "" }, "bright_bg", LSPActive)
+LSPActive = utils.surround({ "", "" }, "dark_bg", LSPActive)
 
 -- Full nerd (with icon colors and clickable elements)!
 -- works in multi window, but does not support flexible components (yet ...)
diff --git a/after/queries/markdown/highlights.scm b/after/queries/markdown/highlights.scm
new file mode 100644
index 0000000..7afebd7
--- /dev/null
+++ b/after/queries/markdown/highlights.scm
@@ -0,0 +1,6 @@
+((atx_h1_marker) (#set! conceal "◉"))
+((atx_h2_marker) (#set! conceal " ○"))
+((atx_h3_marker) (#set! conceal "  ✸"))
+((atx_h4_marker) (#set! conceal "   ✿"))
+((atx_h5_marker) (#set! conceal "    ●"))
+((atx_h6_marker) (#set! conceal "     ◇"))
diff --git a/lazy-lock.json b/lazy-lock.json
new file mode 100644
index 0000000..d6145f4
--- /dev/null
+++ b/lazy-lock.json
@@ -0,0 +1,90 @@
+{
+  "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
+  "LuaSnip": { "branch": "master", "commit": "8efa4e402a24df6a4713a2ec653147c49e8f73de" },
+  "catppuccin": { "branch": "main", "commit": "85e93601e0f0b48aa2c6bbfae4d0e9d7a1898280" },
+  "close-buffers.nvim": { "branch": "master", "commit": "3acbcad1211572342632a6c0151f839e7dead27f" },
+  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },
+  "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
+  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
+  "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
+  "color-picker.nvim": { "branch": "master", "commit": "06cb5f853535dea529a523e9a0e8884cdf9eba4d" },
+  "copilot.lua": { "branch": "master", "commit": "1a8032ae496916ccc7a7a52ee79194fbef29f462" },
+  "crates.nvim": { "branch": "main", "commit": "1dffccc0a95f656ebe00cacb4de282473430c5a1" },
+  "dressing.nvim": { "branch": "master", "commit": "c1e1d5fa44fe08811b6ef4aadac2b50e602f9504" },
+  "editorconfig-vim": { "branch": "master", "commit": "aefcf3d735122f349b172302d164d5eb61cd7e5f" },
+  "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" },
+  "friendly-snippets": { "branch": "main", "commit": "ebf6d6e83494cdd88a54a429340256f4dbb6a052" },
+  "gitsigns.nvim": { "branch": "main", "commit": "bce4576a9047085a528c479a7fe1e2f6b787b6c1" },
+  "gruvbox-baby": { "branch": "main", "commit": "4f45f5182b986ea8099b8ad0207e07f1bc49a47f" },
+  "harpoon": { "branch": "master", "commit": "21f4c47c6803d64ddb934a5b314dcb1b8e7365dc" },
+  "heirline.nvim": { "branch": "master", "commit": "7f1e805dfc001d5dbb7d894105063f463f6c7dcc" },
+  "hop.nvim": { "branch": "master", "commit": "1a1eceafe54b5081eae4cb91c723abd1d450f34b" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "9637670896b68805430e2f72cf5d16be5b97a22a" },
+  "kanagawa.nvim": { "branch": "master", "commit": "a4e99f089110c6d00bc33f5497709200e914e763" },
+  "lazy.nvim": { "branch": "main", "commit": "3ad55ae678876516156cca2f361c51f7952a924b" },
+  "lsp-inlayhints.nvim": { "branch": "main", "commit": "d981f65c9ae0b6062176f0accb9c151daeda6f16" },
+  "lsp-lens.nvim": { "branch": "main", "commit": "296e0d33dddba1a1de9b69143f189cb994111c5a" },
+  "lsp_signature.nvim": { "branch": "master", "commit": "bdf3dc7bb03edd25c2173e0e31c2fb122052ed23" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "2451adb9bdb0fd32140bf3aa8dbc17ff60050db3" },
+  "mason-nvim-dap.nvim": { "branch": "main", "commit": "6148b51db945b55b3b725da39eaea6441e59dff8" },
+  "mason.nvim": { "branch": "main", "commit": "d66c60e17dd6fd8165194b1d14d21f7eb2c1697a" },
+  "mellow.nvim": { "branch": "main", "commit": "6e5845571d4543b282cf915f2410c5b77064c014" },
+  "mini.nvim": { "branch": "main", "commit": "ed7c355bbeb8939e0dfe5099aa13c8ac9709396c" },
+  "minimal.nvim": { "branch": "main", "commit": "22d837b814d3bd22625640ef63cc73b8507f291d" },
+  "neo-tree.nvim": { "branch": "v2.x", "commit": "80dc74d081823649809f78370fa5b204aa9a853a" },
+  "neodev.nvim": { "branch": "main", "commit": "e9dd1535759794635a951644c183beb327879407" },
+  "neoscroll.nvim": { "branch": "master", "commit": "4bc0212e9f2a7bc7fe7a6bceb15b33e39f0f41fb" },
+  "nightfox.nvim": { "branch": "main", "commit": "ee3525fdfbe2ed81270a336ccbe62f433165357b" },
+  "nui.nvim": { "branch": "main", "commit": "c8de23342caf8d50b15d6b28368d36a56a69d76f" },
+  "numb.nvim": { "branch": "master", "commit": "3f7d4a74bd456e747a1278ea1672b26116e0824d" },
+  "nvim-autopairs": { "branch": "master", "commit": "7b3eb9b5813a22188c4dbb248475fcbaf9f4d195" },
+  "nvim-bqf": { "branch": "main", "commit": "8784eebf34371049b641646d00232c2603215297" },
+  "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" },
+  "nvim-dap": { "branch": "master", "commit": "b3d4408e29d924fe130c9397a7c3b3630b3ea671" },
+  "nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" },
+  "nvim-dap-virtual-text": { "branch": "master", "commit": "57f1dbd0458dd84a286b27768c142e1567f3ce3b" },
+  "nvim-jdtls": { "branch": "master", "commit": "3ca419c52a7c20a2565237db2c110ed68fc7e6f1" },
+  "nvim-lspconfig": { "branch": "master", "commit": "4266f9bb36b4fb09edd19b67d95043cf7ff88ddf" },
+  "nvim-navbuddy": { "branch": "master", "commit": "f137a3466a6cd1965cdcc5398daff54e66eebbe5" },
+  "nvim-navic": { "branch": "master", "commit": "0ffa7ffe6588f3417e680439872f5049e38a24db" },
+  "nvim-notify": { "branch": "master", "commit": "94859430020f5cf32a1b97ddd9e596fed9db7981" },
+  "nvim-surround": { "branch": "main", "commit": "1c2ef599abeeb98e40706830bcd27e90e259367a" },
+  "nvim-treesitter": { "branch": "master", "commit": "b7f2dd5dfbd24a1239844e15637b637b990df164" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "b6c763db8cc486215ba96e0a67418848a710ab25" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "bd103502252027434ec42f628d2dbf54821d4ce6" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" },
+  "nvim-ts-rainbow2": { "branch": "master", "commit": "b3120cd5ae9ca524af9cb602f41e12e301fa985f" },
+  "nvim-web-devicons": { "branch": "master", "commit": "973ab742f143a796a779af4d786ec409116a0d87" },
+  "oh-lucy.nvim": { "branch": "main", "commit": "706c74fe8dcc2014dc17bbc861a05d27623e06e3" },
+  "one_monokai.nvim": { "branch": "main", "commit": "cb45ecb019be679e32373896bb42545818b6d884" },
+  "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" },
+  "plenary.nvim": { "branch": "master", "commit": "9ce85b0f7dcfe5358c0be937ad23e456907d410b" },
+  "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
+  "pretty-fold.nvim": { "branch": "master", "commit": "a7d8b424abe0eedf50116c460fbe6dfd5783b1d5" },
+  "rainbow_csv.nvim": { "branch": "main", "commit": "7318d7b4e52029b291d28bfb48d8d2c6809f78d3" },
+  "rust-tools.nvim": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" },
+  "sonokai": { "branch": "master", "commit": "17308ee6d9c764bfc1e0fa97213e7a99701b4144" },
+  "sort.nvim": { "branch": "main", "commit": "c789da6968337d2a61104a929880b5f144e02855" },
+  "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" },
+  "telescope-dap.nvim": { "branch": "master", "commit": "4e2d5efb92062f0b865fe59b200b5ed7793833bf" },
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
+  "telescope.nvim": { "branch": "0.1.x", "commit": "54930e1abfc94409e1bb9266e752ef8379008592" },
+  "todo-comments.nvim": { "branch": "main", "commit": "3094ead8edfa9040de2421deddec55d3762f64d1" },
+  "toggleterm.nvim": { "branch": "main", "commit": "b90a1381e9b5b8596f49070ee86c71db267ac868" },
+  "tokyodark.nvim": { "branch": "master", "commit": "4bfb42924274abc5de9f5f4779075b77c6112c85" },
+  "transparent.nvim": { "branch": "main", "commit": "3af6232c8d39d51062702e875ff6407c1eeb0391" },
+  "undotree": { "branch": "master", "commit": "0e11ba7325efbbb3f3bebe06213afa3e7ec75131" },
+  "vim-cmake": { "branch": "master", "commit": "6b7b18130c30e1d498c0ec8fca3c18951273e4ea" },
+  "vim-dadbod": { "branch": "master", "commit": "7d80bbd11c407a09e0f7b869c38f3dec3902805f" },
+  "vim-dadbod-completion": { "branch": "master", "commit": "fc7321a17f4c55db11fae89a884ddf4724020bae" },
+  "vim-dadbod-ui": { "branch": "master", "commit": "5c4cad56f2774c3cd3a6ee9944c787820f2fcb20" },
+  "vim-glsl": { "branch": "master", "commit": "bfd330a271933c3372fcfa8ce052970746c8e9dd" },
+  "vim-racer": { "branch": "master", "commit": "d1aead98a936cd8165b3329511d7c987226eb3a6" },
+  "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" },
+  "vim-visual-multi": { "branch": "master", "commit": "724bd53adfbaf32e129b001658b45d4c5c29ca1a" },
+  "which-key.nvim": { "branch": "main", "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" },
+  "wilder.nvim": { "branch": "master", "commit": "679f348dc90d80ff9ba0e7c470c40a4d038dcecf" },
+  "zig-tools.nvim": { "branch": "master", "commit": "78a85278fe5d480da2f01df4db898757d7e953b5" },
+  "zig.vim": { "branch": "master", "commit": "15841fc4fecfb1b6c02da9b4cc17ced135edbf8e" }
+}
\ No newline at end of file
diff --git a/lua/.luarc.json b/lua/.luarc.json
new file mode 100644
index 0000000..300cf9f
--- /dev/null
+++ b/lua/.luarc.json
@@ -0,0 +1,83 @@
+{
+    "workspace.library": [
+        "/home/d/.local/share/nvim/lazy/neodev.nvim/types/stable",
+        "/usr/share/nvim/runtime/lua",
+        "/home/d/.local/share/nvim/lazy/nvim-navic/lua",
+        "/home/d/.local/share/nvim/lazy/cmp-path/lua",
+        "/home/d/.local/share/nvim/lazy/kanagawa.nvim/lua",
+        "/home/d/.local/share/nvim/lazy/copilot.lua/lua",
+        "/home/d/.local/share/nvim/lazy/sort.nvim/lua",
+        "/home/d/.local/share/nvim/lazy/nvim-treesitter-context/lua",
+        "/home/d/.local/share/nvim/lazy/color-picker.nvim/lua",
+        "/home/d/.local/share/nvim/lazy/nvim-treesitter-textobjects/lua",
+        "/home/d/.local/share/nvim/lazy/playground/lua",
+        "/home/d/.local/share/nvim/lazy/rainbow_csv.nvim/lua",
+        "/home/d/.local/share/nvim/lazy/telescope.nvim/lua",
+        "/home/d/.local/share/nvim/lazy/rust-tools.nvim/lua",
+        "/home/d/.local/share/nvim/lazy/nvim-autopairs/lua",
+        "/home/d/.local/share/nvim/lazy/nvim-ts-rainbow2/lua",
+        "/home/d/.local/share/nvim/lazy/crates.nvim/lua",
+        "/home/d/.local/share/nvim/lazy/popup.nvim/lua",
+        "/home/d/.local/share/nvim/lazy/nvim-ts-autotag/lua",
+        "/home/d/.local/share/nvim/lazy/nvim-dap/lua",
+        "/home/d/.local/share/nvim/lazy/nvim-notify/lua",
+        "/home/d/.local/share/nvim/lazy/zig-tools.nvim/lua",
+        "/home/d/.local/share/nvim/lazy/neo-tree.nvim/lua",
+        "/home/d/.local/share/nvim/lazy/mini.nvim/lua",
+        "/home/d/.local/share/nvim/lazy/nvim-web-devicons/lua",
+        "/home/d/.local/share/nvim/lazy/nvim-dap-ui/lua",
+        "/home/d/.local/share/nvim/lazy/nvim-jdtls/lua",
+        "/home/d/.local/share/nvim/lazy/telescope-dap.nvim/lua",
+        "/home/d/.local/share/nvim/lazy/lazy.nvim/lua",
+        "/home/d/.local/share/nvim/lazy/catppuccin/lua",
+        "/home/d/.local/share/nvim/lazy/sonokai/lua",
+        "/home/d/.local/share/nvim/lazy/gitsigns.nvim/lua",
+        "/home/d/.local/share/nvim/lazy/oh-lucy.nvim/lua",
+        "/home/d/.local/share/nvim/lazy/mellow.nvim/lua",
+        "/home/d/.local/share/nvim/lazy/minimal.nvim/lua",
+        "/home/d/.local/share/nvim/lazy/one_monokai.nvim/lua",
+        "/home/d/.local/share/nvim/lazy/transparent.nvim/lua",
+        "/home/d/.local/share/nvim/lazy/indent-blankline.nvim/lua",
+        "/home/d/.local/share/nvim/lazy/tokyodark.nvim/lua",
+        "/home/d/.local/share/nvim/lazy/gruvbox-baby/lua",
+        "/home/d/.local/share/nvim/lazy/nightfox.nvim/lua",
+        "/home/d/.local/share/nvim/lazy/which-key.nvim/lua",
+        "/home/d/.local/share/nvim/lazy/lsp_signature.nvim/lua",
+        "/home/d/.local/share/nvim/lazy/vim-dadbod-completion/lua",
+        "/home/d/.local/share/nvim/lazy/close-buffers.nvim/lua",
+        "/home/d/.local/share/nvim/lazy/mason-nvim-dap.nvim/lua",
+        "/home/d/.local/share/nvim/lazy/heirline.nvim/lua",
+        "/home/d/.local/share/nvim/lazy/lsp-lens.nvim/lua",
+        "/home/d/.local/share/nvim/lazy/nvim-cmp/lua",
+        "/home/d/.local/share/nvim/lazy/telescope-fzf-native.nvim/lua",
+        "/home/d/.local/share/nvim/lazy/nvim-navbuddy/lua",
+        "/home/d/.local/share/nvim/lazy/nvim-lspconfig/lua",
+        "/home/d/.local/share/nvim/lazy/mason.nvim/lua",
+        "/home/d/.local/share/nvim/lazy/toggleterm.nvim/lua",
+        "/home/d/.local/share/nvim/lazy/neodev.nvim/lua",
+        "/home/d/.local/share/nvim/lazy/dressing.nvim/lua",
+        "/home/d/.local/share/nvim/lazy/pretty-fold.nvim/lua",
+        "/home/d/.local/share/nvim/lazy/mason-lspconfig.nvim/lua",
+        "/home/d/.local/share/nvim/lazy/nvim-treesitter/lua",
+        "/home/d/.local/share/nvim/lazy/neoscroll.nvim/lua",
+        "/home/d/.local/share/nvim/lazy/hop.nvim/lua",
+        "/home/d/.local/share/nvim/lazy/fidget.nvim/lua",
+        "/home/d/.local/share/nvim/lazy/cmp-nvim-lsp/lua",
+        "/home/d/.local/share/nvim/lazy/todo-comments.nvim/lua",
+        "/home/d/.local/share/nvim/lazy/cmp_luasnip/lua",
+        "/home/d/.local/share/nvim/lazy/LuaSnip/lua",
+        "/home/d/.local/share/nvim/lazy/harpoon/lua",
+        "/home/d/.local/share/nvim/lazy/plenary.nvim/lua",
+        "/home/d/.local/share/nvim/lazy/numb.nvim/lua",
+        "/home/d/.local/share/nvim/lazy/Comment.nvim/lua",
+        "/home/d/.local/share/nvim/lazy/cmp-nvim-lua/lua",
+        "/home/d/.local/share/nvim/lazy/lsp-inlayhints.nvim/lua",
+        "/home/d/.local/share/nvim/lazy/nui.nvim/lua",
+        "/home/d/.local/share/nvim/lazy/nvim-bqf/lua",
+        "/home/d/.local/share/nvim/lazy/nvim-surround/lua",
+        "/home/d/.local/share/nvim/lazy/cmp-buffer/lua",
+        "/home/d/.local/share/nvim/lazy/wilder.nvim/lua",
+        "/home/d/.config/nvim/lua",
+        "${3rd}/luv/library"
+    ]
+}
\ No newline at end of file
diff --git a/lua/config/commands.lua b/lua/config/commands.lua
index 3dfe5e8..86bc4cd 100644
--- a/lua/config/commands.lua
+++ b/lua/config/commands.lua
@@ -80,3 +80,12 @@ end, {})
 vim.api.nvim_create_user_command("RetabFile", function ()
     vim.cmd(":set ts=2 sts=2 noet | retab! | set ts=4 sts=4 et | retab!")
 end, {})
+
+vim.api.nvim_create_user_command("Make", function (args)
+    local vimCmd = "TermExec cmd=\"make"
+    if (args["args"]) then
+        vimCmd = vimCmd .. " " .. args["args"]
+    end
+    vimCmd = vimCmd .. "\""
+    vim.cmd(vimCmd)
+end, {nargs = "*"})
diff --git a/lua/config/packages.lua b/lua/config/packages.lua
index e2bc027..33492dd 100644
--- a/lua/config/packages.lua
+++ b/lua/config/packages.lua
@@ -77,6 +77,7 @@ return {
             "mfussenegger/nvim-dap"
         },
     },
+    {"theHamsta/nvim-dap-virtual-text", opts = {}},
     "nvim-telescope/telescope-dap.nvim",
 
     -- git