diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf
new file mode 100644
index 0000000..46f8715
--- /dev/null
+++ b/.config/fontconfig/fonts.conf
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- https://sw.kovidgoyal.net/kitty/faq/#kitty-is-not-able-to-use-my-favorite-font -->
+<fontconfig>
+  <match target="scan">
+    <test name="family"><string>Monaspace Argon Var</string></test>
+    <edit name="spacing"><int>100</int></edit>
+  </match>
+  <match target="scan">
+    <test name="family"><string>Monaspace Krypton Var</string></test>
+    <edit name="spacing"><int>100</int></edit>
+  </match>
+  <match target="scan">
+    <test name="family"><string>Monaspace Neon Var</string></test>
+    <edit name="spacing"><int>100</int></edit>
+  </match>
+  <match target="scan">
+    <test name="family"><string>Monaspace Radon Var</string></test>
+    <edit name="spacing"><int>100</int></edit>
+  </match>
+  <match target="scan">
+    <test name="family"><string>Monaspace Xenon Var</string></test>
+    <edit name="spacing"><int>100</int></edit>
+  </match>
+</fontconfig>
diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf
index e66d7e9..64edab1 100644
--- a/.config/kitty/kitty.conf
+++ b/.config/kitty/kitty.conf
@@ -1,7 +1,8 @@
 font_family      JetBrainsMono Nerd Font
-italic_font      Source Code Pro
-bold_italic_font Source Code Pro
-font_size 10.0
+italic_font      Monaspace Radon Var
+bold_font        auto
+bold_italic_font auto
+font_size        11.0
 include          gruvbox_dark_soft.conf
 background_opacity 0.95
 enable_audio_bell no
diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index 99397ca..4a9739d 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -1,7 +1,15 @@
 {
   "cellular-automaton.nvim": { "branch": "main", "commit": "b7d056dab963b5d3f2c560d92937cb51db61cb5b" },
-  "cmp-lsp.nvim": { "branch": "main", "commit": "60e1e16308c862f678ea02b8430befa20c8fda6c" },
+  "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" },
+  "cmp-emoji": { "branch": "main", "commit": "19075c36d5820253d32e2478b6aaf3734aeaafa0" },
+  "cmp-latex-symbols": { "branch": "main", "commit": "165fb66afdbd016eaa1570e41672c4c557b57124" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },
+  "cmp-nvim-lsp-document-symbol": { "branch": "main", "commit": "f0f53f704c08ea501f9d222b23491b0d354644b0" },
+  "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "3d8912ebeb56e5ae08ef0906e3a54de1c66b92f1" },
+  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
+  "cmp-tmux": { "branch": "main", "commit": "97ec06b8030b8bf6d1fd83d49bdd16c98e04c845" },
   "cmp-treesitter": { "branch": "master", "commit": "b8bc760dfcc624edd5454f0982b63786a822eed9" },
+  "cmp_kitty": { "branch": "main", "commit": "a0716db2efb4c452600ef1e4a3ca610889279118" },
   "codeium.vim": { "branch": "main", "commit": "1efe2a2cdf516094bdb211aa8a1d45ef01836207" },
   "git-messenger.vim": { "branch": "master", "commit": "8a61bdfa351d4df9a9118ee1d3f45edbed617072" },
   "gruvbox.nvim": { "branch": "main", "commit": "517b012757fbe7a4d6e507baf5cc75837e62734f" },
@@ -10,9 +18,10 @@
   "nvim-cmp": { "branch": "main", "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" },
   "nvim-dap": { "branch": "master", "commit": "e154fdb6d70b3765d71f296e718b29d8b7026a63" },
   "nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" },
-  "nvim-lspconfig": { "branch": "master", "commit": "7fedba8b1f8d0080c775851c429b88fd2ed4c6f5" },
-  "nvim-tree.lua": { "branch": "master", "commit": "fb892973477e131042d737c9fc822c7c2ace5076" },
-  "nvim-treesitter": { "branch": "master", "commit": "3da5cfb4a2505bc10d6fe3c193c69adac13423a8" },
+  "nvim-html-css": { "branch": "main", "commit": "c072b05c56a40d3ec7874fa487723e6bef5d97f8" },
+  "nvim-lspconfig": { "branch": "master", "commit": "3ede70ccb292b20020f194b42d9508946fc5da51" },
+  "nvim-tree.lua": { "branch": "master", "commit": "8c534822a7d16c83cf69928c53e1d8a13bd2734a" },
+  "nvim-treesitter": { "branch": "master", "commit": "cd583cfb5b492c4f81edc5e1916c9f59b7b0ef16" },
   "nvim-treesitter-endwise": { "branch": "master", "commit": "4c344ffc8d54d7e1ba2cefaaa2c10ea93aa1cc2d" },
   "nvim-web-devicons": { "branch": "master", "commit": "cdbcca210cf3655aa9b31ebf2422763ecd85ee5c" },
   "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" },
diff --git a/.config/nvim/lua/completion.lua b/.config/nvim/lua/completion.lua
index f8d607e..bbb3255 100644
--- a/.config/nvim/lua/completion.lua
+++ b/.config/nvim/lua/completion.lua
@@ -19,9 +19,17 @@ cmp.setup({
   }),
   sources = cmp.config.sources({
     { name = 'nvim_lsp' },
+    { name = 'nvim_lsp_document_symbol' },
+    { name = 'nvim_lsp_signature_help' },
     { name = 'vsnip' },
     { name = 'path' },
     { name = 'treesitter' },
+    { name = 'buffer' },
+    { name = 'tmux' },
+    { name = 'kitty' },
+    { name = 'latex_symbols' },
+    { name = 'emoji' },
+    { name = 'html-css' },
   }),
   formatting = {
     format = lspkind.cmp_format({
diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua
index 6724675..056a864 100644
--- a/.config/nvim/lua/plugins.lua
+++ b/.config/nvim/lua/plugins.lua
@@ -35,16 +35,24 @@ require("lazy").setup({
   },
   -- Completion framework
   "hrsh7th/nvim-cmp",
+  "hrsh7th/cmp-nvim-lsp",
+  "hrsh7th/cmp-nvim-lsp-document-symbol",
+  "hrsh7th/cmp-nvim-lsp-signature-help",
+  "ray-x/cmp-treesitter",
+  "hrsh7th/cmp-path",
+  "hrsh7th/cmp-cmdline",
+  "andersevenrud/cmp-tmux",
+  "garyhurtz/cmp_kitty",
+  "kdheepak/cmp-latex-symbols",
+  "hrsh7th/cmp-emoji",
+  "Jezda1337/nvim-html-css",
+
   -- LSP setup
   "neovim/nvim-lspconfig",
   -- Icons for Treesitter/nvim-tree
   "nvim-tree/nvim-web-devicons",
   -- LSP icons
   "onsails/lspkind.nvim",
-  -- LSP completion
-  "sar/cmp-lsp.nvim",
-  -- Treesitter completion
-  "ray-x/cmp-treesitter",
   -- Git blame popup
   "rhysd/git-messenger.vim",
   -- Debugger