diff --git a/after/plugin/colors.lua b/after/plugin/colors.lua
deleted file mode 100644
index f66eafb8..00000000
--- a/after/plugin/colors.lua
+++ /dev/null
@@ -1,15 +0,0 @@
-require('rose-pine').setup {
-  disable_background = true,
-}
-
-function ColorMyPencils(color)
-  color = color or 'rose-pine'
-  vim.cmd.colorscheme(color)
-
-  vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' })
-  vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none' })
-end
-
-ColorMyPencils()
-
-vim.cmd 'autocmd BufEnter * ThematicRandom'
diff --git a/init.lua b/init.lua
index cf4a3790..ce5f4182 100644
--- a/init.lua
+++ b/init.lua
@@ -266,8 +266,13 @@ require('lazy').setup({
   --    Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
   --
   --    For additional information see: https://github.com/folke/lazy.nvim#-structuring-your-plugins
-  -- { import = 'custom.plugins' },
-}, {})
+  { import = 'custom.plugins' },
+}, {
+  concurrency = 10,
+})
+
+vim.o.wrap = true
+vim.o.relativenumber = true
 
 -- [[ Setting options ]]
 -- See `:help vim.o`
diff --git a/lazy-lock.json b/lazy-lock.json
new file mode 100644
index 00000000..ae336f2b
--- /dev/null
+++ b/lazy-lock.json
@@ -0,0 +1,158 @@
+{
+  "Alduin": { "branch": "master", "commit": "6575a0f167fef521c404681b96caebdb2b9cc4cd" },
+  "Apprentice": { "branch": "master", "commit": "59ad13661fa15edaf72c62218903c7817b5a3691" },
+  "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
+  "LuaSnip": { "branch": "master", "commit": "57c9f5c31b3d712376c704673eac8e948c82e9c1" },
+  "Sierra": { "branch": "master", "commit": "2ec52616385b50f9580176d83209810549128402" },
+  "alpha-nvim": { "branch": "main", "commit": "29074eeb869a6cbac9ce1fbbd04f5f5940311b32" },
+  "anthraxylon": { "branch": "main", "commit": "17f72d640c2c842393eb32b58788f1c23f0da225" },
+  "aquarium-vim": { "branch": "develop", "commit": "d09b1feda1148797aa5ff0dbca8d8e3256d028d5" },
+  "arctic.nvim": { "branch": "main", "commit": "e7003654536d79c16dd1ec4c28412fd02979c4ed" },
+  "aurora": { "branch": "master", "commit": "6157dffe86f20d891df723c0c6734676295b01e0" },
+  "aylin.vim": { "branch": "master", "commit": "d9532f02f5ea8f396fc62c50bb34c348b4a9aa02" },
+  "ayu-vim": { "branch": "master", "commit": "0745635421688ce777f663d13531996cb4da6514" },
+  "blue-moon": { "branch": "master", "commit": "179ac53aae7a82ecbbc5a2589c304361846e8be8" },
+  "bluloco.nvim": { "branch": "main", "commit": "efd790d690febdab74d8d012b6109e490a2db68d" },
+  "boo-colorscheme-nvim": { "branch": "main", "commit": "6955fd56e496231856f9d3b2e525b4d9fc9fc363" },
+  "bufferline.nvim": { "branch": "main", "commit": "e48ce1805697e4bb97bc171c081e849a65859244" },
+  "catppuccin": { "branch": "main", "commit": "079500a625f3ae5aa6efb758f1a17fe4c7a57e52" },
+  "challenger_deep": { "branch": "master", "commit": "e3d5b7d9711c7ebbf12c63c2345116985656da0d" },
+  "cmp-copilot": { "branch": "main", "commit": "1f3f31c54bd71e41ed157430702bc2837ea582ab" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
+  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
+  "cmp-tabnine": { "branch": "main", "commit": "b93f82ef5150e578677fc2e2b4b328b19eed77e1" },
+  "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
+  "codeium.vim": { "branch": "main", "commit": "c18f6642f2bd071ab0154e5d333697067f9c4b70" },
+  "colorbuddy.nvim": { "branch": "dev", "commit": "8508c6f5f6ef03c59ea864870e215d19ac7ff8bb" },
+  "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" },
+  "copilot.lua": { "branch": "master", "commit": "dcaaed5b58e6c2d395bca18d25d34e6384856722" },
+  "copilot.vim": { "branch": "release", "commit": "5b19fb001d7f31c4c7c5556d7a97b243bd29f45f" },
+  "deferred-clipboard.nvim": { "branch": "master", "commit": "810a29d166eaa41afc220cc7cd85eeaa3c43b37f" },
+  "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" },
+  "dracula": { "branch": "master", "commit": "6495b4ff40479ec7705addb4ea800ec308026648" },
+  "embark": { "branch": "main", "commit": "7efd788d2e7b2d0a923cb6dabad7e2c11ab7aa95" },
+  "eva01.vim": { "branch": "main", "commit": "2312dcc98e99d31f0bb9513449302fa8d92f93a3" },
+  "everblush": { "branch": "main", "commit": "9a0e695fdd57b340d3ba2b72406e3ca519029f25" },
+  "falcon": { "branch": "master", "commit": "634cef5919b14d0c68cec6fc7b094554e8ef9d7f" },
+  "feline.nvim": { "branch": "master", "commit": "3587f57480b88e8009df7b36dc84e9c7ff8f2c49" },
+  "fidget.nvim": { "branch": "main", "commit": "7638c0dd51be8078e10263d73eecfdd42262d69b" },
+  "flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" },
+  "flattened": { "branch": "master", "commit": "0f3e0e4d17ebf5cb8c8e70ca1c93f1f90deb7929" },
+  "flit.nvim": { "branch": "main", "commit": "f4e9af572a62c808c8de214da672f2a115a98c35" },
+  "fogbell.vim": { "branch": "master", "commit": "274cc13184f6a7d0589650c0763c94cef431b319" },
+  "friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" },
+  "fzf": { "branch": "master", "commit": "87fc1c84b8700e694ec341b36ac3ce29a7a30e6b" },
+  "fzf-lua": { "branch": "main", "commit": "407323ade0ebca1bb4f26453c1aacbb246654139" },
+  "gitsigns.nvim": { "branch": "main", "commit": "d195f0c35ced5174d3ecce1c4c8ebb3b5bc23fa9" },
+  "gloombuddy": { "branch": "main", "commit": "d59866faf296b46cb6e54889b47f4b9a366ed093" },
+  "happy_hacking.vim": { "branch": "main", "commit": "e2e73d9cac5ff7acfc37bd090f1d709eac94c9a9" },
+  "harpoon": { "branch": "master", "commit": "867e212ac153e793f95b316d1731f3ca1894625e" },
+  "human.vim": { "branch": "main", "commit": "1910a9b43a88254bf98051dce65fc3fa3915022a" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "f3eb33c04c3c5028b4efa7dbf8f68abdb6ab50ed" },
+  "jellybeans-nvim": { "branch": "main", "commit": "12a8687daf82bb4f69c5cb1dcc672bd9c5e6a094" },
+  "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" },
+  "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" },
+  "leap.nvim": { "branch": "main", "commit": "bad02b384173c8a1bb9e66dea9f50c852deef8d6" },
+  "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" },
+  "lush.nvim": { "branch": "main", "commit": "f76741886b356586f9dfe8e312fbd1ab0fd1084f" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "9453e3d6cd2ca45d96e20f343e8f1b927364b630" },
+  "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" },
+  "material.vim": { "branch": "main", "commit": "b47e7f884cb606c19a20e8e520dfa10c3b3a52f9" },
+  "melange": { "branch": "master", "commit": "ca3444c8e5002ee5ab6f077660317f869c7b6a36" },
+  "mellifluous.nvim": { "branch": "main", "commit": "255ca5326477f315e64a9ff0af03e033f4dd7ae8" },
+  "minimalist": { "branch": "master", "commit": "74b50e01c4bbd38b45768bc97022f5e6764a3f37" },
+  "modus-theme-vim": { "branch": "master", "commit": "4d827fbf1aad55f4d62225f7b999efc5023864a3" },
+  "neoconf.nvim": { "branch": "main", "commit": "64437787dba70fce50dad7bfbb97d184c5bc340f" },
+  "neodev.nvim": { "branch": "main", "commit": "018e1161ed771ef2b54f346240bcf69931594396" },
+  "neogit": { "branch": "master", "commit": "801143ee4db4121fc11a6468daae6680ba9fab51" },
+  "neon": { "branch": "main", "commit": "7765aaa7d1cd3804176140644640766e4411c766" },
+  "night-owl.vim": { "branch": "master", "commit": "783a41a27f7fe55ed91d1ec0f0351d06ae17fbc7" },
+  "nightfox.nvim": { "branch": "main", "commit": "5a7746360f044820a97e654fa4fc7043c744e8e8" },
+  "nordic.nvim": { "branch": "main", "commit": "cd552784eeeae61644fec60f6cc52c267dbddc73" },
+  "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" },
+  "nvim-autopairs": { "branch": "master", "commit": "0f04d78619cce9a5af4f355968040f7d675854a1" },
+  "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" },
+  "nvim-deus": { "branch": "master", "commit": "f18b762fd0b92db4e0e1453e3da381e972ed86af" },
+  "nvim-hybrid": { "branch": "main", "commit": "89206396ba22b2518f5db08d96e9aab800902163" },
+  "nvim-juliana": { "branch": "master", "commit": "bc90caab4932ff2eb02c3f7a76ffb9d585609eb0" },
+  "nvim-lspconfig": { "branch": "master", "commit": "e85816c5803410cacb52e9b4fbdb72a1f1a6bd11" },
+  "nvim-noirbuddy": { "branch": "master", "commit": "12d752e6201b31b262e85ade30ffac26d7721752" },
+  "nvim-spectre": { "branch": "master", "commit": "a18a58015b46f02b4fe537ebfffd82e46110ff24" },
+  "nvim-treesitter": { "branch": "master", "commit": "251c855236fd99174563fd01b60b1eeaaf8ea806" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "ec1c5bdb3d87ac971749fa6c7dbc2b14884f1f6a" },
+  "nvim-web-devicons": { "branch": "master", "commit": "a1425903ab52a0a0460622519e827f224e5b4fee" },
+  "nvimgelion": { "branch": "main", "commit": "00415dc607300239f0d3e6097f8430738e658ba0" },
+  "oceanic-next": { "branch": "master", "commit": "09833f72d5ba23de2e8bcae18f479f326f5f677a" },
+  "ofirkai.nvim": { "branch": "master", "commit": "cbb499d11827eb6b340a93f01fb5953dacaa935c" },
+  "oh-lucy.nvim": { "branch": "main", "commit": "706c74fe8dcc2014dc17bbc861a05d27623e06e3" },
+  "onedark.nvim": { "branch": "master", "commit": "c5476a091b0f1b4e853db91c91ff941f848a1cdd" },
+  "oxocarbon.nvim": { "branch": "main", "commit": "c5846d10cbe4131cc5e32c6d00beaf59cb60f6a2" },
+  "palenight.vim": { "branch": "master", "commit": "5552a6349bcd927df9f17db34f017b77b963e503" },
+  "palenightfall.nvim": { "branch": "main", "commit": "25a1e7d43256834a671174e5d83edb57f7bec1e0" },
+  "pinkmare": { "branch": "main", "commit": "581dc6c5ab6c1b76599faeb6578c7190b6ab357c" },
+  "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" },
+  "purify": { "branch": "master", "commit": "70011ccc3225feb2e7bedda36d226adcf221f7ae" },
+  "rasmus.nvim": { "branch": "main", "commit": "f824de95d446686e479781c0c2b778c177da528f" },
+  "rose-pine": { "branch": "main", "commit": "92762f4fa2144c05db760ea254f4c399a56a7ef5" },
+  "rust-tools.nvim": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" },
+  "rust.vim": { "branch": "master", "commit": "889b9a7515db477f4cb6808bef1769e53493c578" },
+  "sacredforest-vim": { "branch": "master", "commit": "829e8c6f983d832e79c787d5ef1b5c49da0402d9" },
+  "sentiment.nvim": { "branch": "main", "commit": "54a6db15b630eccfa98c32a76baf90f21c6f1e40" },
+  "space-vim-theme": { "branch": "master", "commit": "4790dbba31f678f75af4f4c7a1465008542bd979" },
+  "tabnine-nvim": { "branch": "master", "commit": "3237a2800fd928477e10d6e122cce09abfb97cc2" },
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
+  "telescope-symbols.nvim": { "branch": "master", "commit": "a6d0127a53d39b9fc2af75bd169d288166118aec" },
+  "telescope.nvim": { "branch": "0.1.x", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
+  "tender.vim": { "branch": "master", "commit": "7746453a045eaa97dc413a7209268345f33f3243" },
+  "termschool-vim-theme": { "branch": "master", "commit": "1dcb99dc4051f5fa1e095ade25586f38b7ec39cd" },
+  "todo-comments.nvim": { "branch": "main", "commit": "4a6737a8d70fe1ac55c64dfa47fcb189ca431872" },
+  "tokyonight.nvim": { "branch": "main", "commit": "f247ee700b569ed43f39320413a13ba9b0aef0db" },
+  "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" },
+  "tune.nvim": { "branch": "main", "commit": "3b0a3931e4423bf3306ad60fffff25875e9c27d2" },
+  "vim-afterglow": { "branch": "master", "commit": "d27af1a1c8188523d2625475896b130b562bc98c" },
+  "vim-be-good": { "branch": "master", "commit": "c290810728a4f75e334b07dc0f3a4cdea908d351" },
+  "vim-colors-lucid": { "branch": "master", "commit": "4efacf11f4bda195a4dd2612a87515a2ebd6b3a0" },
+  "vim-colors-off": { "branch": "main", "commit": "2879dc5d358a4856873ca708399b34a436a0f3ec" },
+  "vim-colors-pencil": { "branch": "master", "commit": "1101118fa3e3038568541e9a67511513aac5d19b" },
+  "vim-colors-plain": { "branch": "master", "commit": "908ed31ad398c18b47a3f4f71c97313754484ff8" },
+  "vim-colors-solarized": { "branch": "master", "commit": "528a59f26d12278698bb946f8fb82a63711eec21" },
+  "vim-deep-space": { "branch": "master", "commit": "126d52f4f77877385cd44d983709053d1aab6635" },
+  "vim-dichromatic": { "branch": "master", "commit": "9765a72ce24ddae48afe12c316583a22c82ad812" },
+  "vim-dogrun": { "branch": "main", "commit": "940814494be4adb066d4eb96409a85cb84c0bd6b" },
+  "vim-enfocado": { "branch": "main", "commit": "2a8fffdff1a20473f0fbacef10f2fb356e039b31" },
+  "vim-envy": { "branch": "master", "commit": "e1afb0cd542fc4afeb779f1c894abf5527d965ea" },
+  "vim-fish": { "branch": "master", "commit": "50b95cbbcd09c046121367d49039710e9dc9c15f" },
+  "vim-fugitive": { "branch": "master", "commit": "59659093581aad2afacedc81f009ed6a4bfad275" },
+  "vim-gotham": { "branch": "main", "commit": "747ee82960b4a7ed75ac133bb84bfc02b5ac9e27" },
+  "vim-latex": { "branch": "master", "commit": "5987380b4ff4c960c99c02df1d379a639ac461a7" },
+  "vim-leuven-theme": { "branch": "master", "commit": "a182ff0a3e7bc4df8dbcc4866ab59bcffcf2a1ec" },
+  "vim-lexical": { "branch": "master", "commit": "9204fcafcea0a75c01eb8a2833e4837b2294fc5c" },
+  "vim-litecorrect": { "branch": "master", "commit": "a914b1240c2ad35f9a11c0211c15b9199a9af73a" },
+  "vim-lucius": { "branch": "master", "commit": "b5dea9864ae64714da4635993ad2fc2703e7c832" },
+  "vim-monochrome": { "branch": "main", "commit": "c4f18812bbdbe640ffddf69e0c5734ec87d6b5e7" },
+  "vim-monokai-tasty": { "branch": "master", "commit": "247324e0170e19de0018e7c8e437f83b6f0ef6fc" },
+  "vim-moonfly-colors": { "branch": "cterm-compat", "commit": "7b812579edd4136022530fe851754dc494a33037" },
+  "vim-nightfly-colors": { "branch": "master", "commit": "06ad2689ebd251a71c6caeb9fb47e231773c9b47" },
+  "vim-one": { "branch": "master", "commit": "187f5c85b682c1933f8780d4d419c55d26a82e24" },
+  "vim-orbital": { "branch": "master", "commit": "39ba0c7e995185ff262bb88b5af71394bafd5087" },
+  "vim-pencil": { "branch": "master", "commit": "6d70438a8886eaf933c38a7a43a61adb0a7815ed" },
+  "vim-pink-moon": { "branch": "master", "commit": "ab1980d1f216aea8060d935b7220bdc42d05a92b" },
+  "vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" },
+  "vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" },
+  "vim-sensible": { "branch": "master", "commit": "3e878abfd6ddc6fb5dba48b41f2b72c3a2f8249f" },
+  "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" },
+  "vim-solarized8": { "branch": "master", "commit": "bde9cab3d9e9368f0b62f94149ab51607fcb8b68" },
+  "vim-startuptime": { "branch": "master", "commit": "454b3de856b7bd298700de33d79774ca9b9e3875" },
+  "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
+  "vim-textobj-quote": { "branch": "master", "commit": "e99ad285c950576a394a64ff334106b32b23418a" },
+  "vim-textobj-sentence": { "branch": "master", "commit": "c5dd562aff2c389dfc8cd55e6499854d352a80b8" },
+  "vim-textobj-user": { "branch": "master", "commit": "41a675ddbeefd6a93664a4dc52f302fe3086a933" },
+  "vim-thematic": { "branch": "master", "commit": "472da813a0dc0198d565d732ded5c39bfde650c0" },
+  "vim-theme-papaya": { "branch": "master", "commit": "dcb18be55215f44418d75b6f071773f80ed87caa" },
+  "vim-vinegar": { "branch": "master", "commit": "bb1bcddf43cfebe05eb565a84ab069b357d0b3d6" },
+  "vim-wordy": { "branch": "master", "commit": "590927f57277666e032702b26e4e0c82717cc3cb" },
+  "vimtex": { "branch": "master", "commit": "e7ce03ea517c5b61ec9703a44019481678d60af3" },
+  "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" },
+  "zen-mode.nvim": { "branch": "main", "commit": "50e2e2a36cc97847d9ab3b1a3555ba2ef6839b50" },
+  "zephyr-nvim": { "branch": "main", "commit": "7fd86b7164442d3b5ec2c81b2694d040e716b5cf" }
+}
\ No newline at end of file
diff --git a/lua/custom/plugins/autocmds.lua b/lua/custom/plugins/autocmds.lua
index b4520589..9dbc450b 100644
--- a/lua/custom/plugins/autocmds.lua
+++ b/lua/custom/plugins/autocmds.lua
@@ -1,72 +1,72 @@
 -- Taken from https://www.lazyvim.org/configuration/general
 
 local function augroup(name)
-    return vim.api.nvim_create_augroup("lazyvim_" .. name, { clear = true })
+  return vim.api.nvim_create_augroup('lazyvim_' .. name, { clear = true })
 end
 
 -- Check if we need to reload the file when it changed
-vim.api.nvim_create_autocmd({ "FocusGained", "TermClose", "TermLeave" }, {
-    group = augroup("checktime"),
-    command = "checktime",
+vim.api.nvim_create_autocmd({ 'FocusGained', 'TermClose', 'TermLeave' }, {
+  group = augroup 'checktime',
+  command = 'checktime',
 })
 
 -- Highlight on yank
-vim.api.nvim_create_autocmd("TextYankPost", {
-    group = augroup("highlight_yank"),
-    callback = function()
-        vim.highlight.on_yank()
-    end,
-})
+-- vim.api.nvim_create_autocmd("TextYankPost", {
+--     group = augroup("highlight_yank"),
+--     callback = function()
+--         vim.highlight.on_yank()
+--     end,
+-- })
 
 -- resize splits if window got resized
-vim.api.nvim_create_autocmd({ "VimResized" }, {
-    group = augroup("resize_splits"),
-    callback = function()
-        vim.cmd("tabdo wincmd =")
-    end,
+vim.api.nvim_create_autocmd({ 'VimResized' }, {
+  group = augroup 'resize_splits',
+  callback = function()
+    vim.cmd 'tabdo wincmd ='
+  end,
 })
 
 -- go to last loc when opening a buffer
-vim.api.nvim_create_autocmd("BufReadPost", {
-    group = augroup("last_loc"),
-    callback = function()
-        local mark = vim.api.nvim_buf_get_mark(0, '"')
-        local lcount = vim.api.nvim_buf_line_count(0)
-        if mark[1] > 0 and mark[1] <= lcount then
-            pcall(vim.api.nvim_win_set_cursor, 0, mark)
-        end
-    end,
+vim.api.nvim_create_autocmd('BufReadPost', {
+  group = augroup 'last_loc',
+  callback = function()
+    local mark = vim.api.nvim_buf_get_mark(0, '"')
+    local lcount = vim.api.nvim_buf_line_count(0)
+    if mark[1] > 0 and mark[1] <= lcount then
+      pcall(vim.api.nvim_win_set_cursor, 0, mark)
+    end
+  end,
 })
 
 -- close some filetypes with <q>
-vim.api.nvim_create_autocmd("FileType", {
-    group = augroup("close_with_q"),
-    pattern = {
-        "PlenaryTestPopup",
-        "help",
-        "lspinfo",
-        "man",
-        "notify",
-        "qf",
-        "query", -- :InspectTree
-        "spectre_panel",
-        "startuptime",
-        "tsplayground",
-    },
-    callback = function(event)
-        vim.bo[event.buf].buflisted = false
-        vim.keymap.set("n", "q", "<cmd>close<cr>", { buffer = event.buf, silent = true })
-    end,
+vim.api.nvim_create_autocmd('FileType', {
+  group = augroup 'close_with_q',
+  pattern = {
+    'PlenaryTestPopup',
+    'help',
+    'lspinfo',
+    'man',
+    'notify',
+    'qf',
+    'query', -- :InspectTree
+    'spectre_panel',
+    'startuptime',
+    'tsplayground',
+  },
+  callback = function(event)
+    vim.bo[event.buf].buflisted = false
+    vim.keymap.set('n', 'q', '<cmd>close<cr>', { buffer = event.buf, silent = true })
+  end,
 })
 
 -- wrap and check for spell in text filetypes
-vim.api.nvim_create_autocmd("FileType", {
-    group = augroup("wrap_spell"),
-    pattern = { "gitcommit", "markdown" },
-    callback = function()
-        vim.opt_local.wrap = true
-        vim.opt_local.spell = true
-    end,
+vim.api.nvim_create_autocmd('FileType', {
+  group = augroup 'wrap_spell',
+  pattern = { 'gitcommit', 'markdown' },
+  callback = function()
+    vim.opt_local.wrap = true
+    vim.opt_local.spell = true
+  end,
 })
 
 return {}
diff --git a/lua/custom/plugins/base.lua b/lua/custom/plugins/base.lua
index 975a224f..9ecec267 100644
--- a/lua/custom/plugins/base.lua
+++ b/lua/custom/plugins/base.lua
@@ -9,8 +9,8 @@ if has_unnamedplus then
   vim.o.clipboard = 'unnamedplus'
 end
 
-vim.api.nvim_buf_set_keymap(0, 'n', 'y', '"+y', { noremap = true, silent = true })
-vim.api.nvim_buf_set_keymap(0, 'n', 'p', '"+p', { noremap = true, silent = true })
+-- vim.api.nvim_buf_set_keymap(0, 'n', 'y', '"+y', { noremap = true, silent = true })
+-- vim.api.nvim_buf_set_keymap(0, 'n', 'p', '"+p', { noremap = true, silent = true })
 
 local function set_json_filetype()
   if string.match(vim.api.nvim_buf_get_name(0), '%.geojson$') or string.match(vim.api.nvim_buf_get_name(0), '%.json$') then
diff --git a/lua/custom/plugins/cmp-tabnine.lua b/lua/custom/plugins/cmp-tabnine.lua
index 4deaad9e..c4560cf1 100644
--- a/lua/custom/plugins/cmp-tabnine.lua
+++ b/lua/custom/plugins/cmp-tabnine.lua
@@ -1,5 +1,18 @@
+local uname = vim.loop.os_uname()
+local sysname = uname.sysname
+local machine = uname.machine
+
+local enableCmpTabnine = true
+
+-- Check if the system is Linux and the machine is aarch64
+if sysname == "Linux" and machine == "aarch64" then
+  -- Disable cmp-tabnine plugin
+  enableCmpTabnine = false
+end
+
 return {
   'tzachar/cmp-tabnine',
+  enabled = enableCmpTabnine,
   build = './install.sh',
   dependencies = { 'hrsh7th/nvim-cmp' },
   config = function()
diff --git a/lua/custom/plugins/codeium.lua b/lua/custom/plugins/codeium.lua
index 1ac3696e..ce2bd33b 100644
--- a/lua/custom/plugins/codeium.lua
+++ b/lua/custom/plugins/codeium.lua
@@ -1 +1,17 @@
-return { 'Exafunction/codeium.vim' }
+local uname = vim.loop.os_uname()
+local sysname = uname.sysname
+local machine = uname.machine
+
+local enableCodeium = true
+
+-- Check if the system is Linux and the machine is aarch64
+if sysname == "Linux" and machine == "aarch64" then
+  -- Disable cmp-tabnine plugin
+  enableCodeium = false
+end
+
+
+return {
+    'Exafunction/codeium.vim',
+    enabled = enableCodeium
+}
diff --git a/lua/custom/plugins/colorschemes/alduin.lua b/lua/custom/plugins/colorschemes/alduin.lua
new file mode 100644
index 00000000..7313f0fc
--- /dev/null
+++ b/lua/custom/plugins/colorschemes/alduin.lua
@@ -0,0 +1 @@
+return { 'AlessandroYorba/Alduin' }
diff --git a/lua/custom/plugins/themes/anthraxylon.lua b/lua/custom/plugins/colorschemes/anthraxylon.lua
similarity index 100%
rename from lua/custom/plugins/themes/anthraxylon.lua
rename to lua/custom/plugins/colorschemes/anthraxylon.lua
diff --git a/lua/custom/plugins/themes/apprentice.lua b/lua/custom/plugins/colorschemes/apprentice.lua
similarity index 100%
rename from lua/custom/plugins/themes/apprentice.lua
rename to lua/custom/plugins/colorschemes/apprentice.lua
diff --git a/lua/custom/plugins/themes/aquarium-vim.lua b/lua/custom/plugins/colorschemes/aquarium-vim.lua
similarity index 100%
rename from lua/custom/plugins/themes/aquarium-vim.lua
rename to lua/custom/plugins/colorschemes/aquarium-vim.lua
diff --git a/lua/custom/plugins/colorschemes/arctic.lua b/lua/custom/plugins/colorschemes/arctic.lua
new file mode 100644
index 00000000..635f6bb8
--- /dev/null
+++ b/lua/custom/plugins/colorschemes/arctic.lua
@@ -0,0 +1,4 @@
+return {
+  'rockyzhang24/arctic.nvim',
+  dependencies = { 'rktjmp/lush.nvim' },
+}
diff --git a/lua/custom/plugins/colorschemes/aurora.lua b/lua/custom/plugins/colorschemes/aurora.lua
new file mode 100644
index 00000000..025e453e
--- /dev/null
+++ b/lua/custom/plugins/colorschemes/aurora.lua
@@ -0,0 +1 @@
+return { 'ray-x/aurora' }
diff --git a/lua/custom/plugins/themes/aylin.lua b/lua/custom/plugins/colorschemes/aylin.lua
similarity index 100%
rename from lua/custom/plugins/themes/aylin.lua
rename to lua/custom/plugins/colorschemes/aylin.lua
diff --git a/lua/custom/plugins/themes/ayu-vim.lua b/lua/custom/plugins/colorschemes/ayu-vim.lua
similarity index 100%
rename from lua/custom/plugins/themes/ayu-vim.lua
rename to lua/custom/plugins/colorschemes/ayu-vim.lua
diff --git a/lua/custom/plugins/themes/blue-moon.lua b/lua/custom/plugins/colorschemes/blue-moon.lua
similarity index 100%
rename from lua/custom/plugins/themes/blue-moon.lua
rename to lua/custom/plugins/colorschemes/blue-moon.lua
diff --git a/lua/custom/plugins/themes/bluloco.lua b/lua/custom/plugins/colorschemes/bluloco.lua
similarity index 100%
rename from lua/custom/plugins/themes/bluloco.lua
rename to lua/custom/plugins/colorschemes/bluloco.lua
diff --git a/lua/custom/plugins/colorschemes/boo-colorscheme.lua b/lua/custom/plugins/colorschemes/boo-colorscheme.lua
new file mode 100644
index 00000000..cefaeb88
--- /dev/null
+++ b/lua/custom/plugins/colorschemes/boo-colorscheme.lua
@@ -0,0 +1 @@
+return { 'rockerBOO/boo-colorscheme-nvim' }
diff --git a/lua/custom/plugins/themes/catppuccin.lua b/lua/custom/plugins/colorschemes/catppuccin.lua
similarity index 100%
rename from lua/custom/plugins/themes/catppuccin.lua
rename to lua/custom/plugins/colorschemes/catppuccin.lua
diff --git a/lua/custom/plugins/themes/challenger-deep.lua b/lua/custom/plugins/colorschemes/challenger-deep.lua
similarity index 100%
rename from lua/custom/plugins/themes/challenger-deep.lua
rename to lua/custom/plugins/colorschemes/challenger-deep.lua
diff --git a/lua/custom/plugins/themes/dracula.lua b/lua/custom/plugins/colorschemes/dracula.lua
similarity index 100%
rename from lua/custom/plugins/themes/dracula.lua
rename to lua/custom/plugins/colorschemes/dracula.lua
diff --git a/lua/custom/plugins/themes/embark.lua b/lua/custom/plugins/colorschemes/embark.lua
similarity index 100%
rename from lua/custom/plugins/themes/embark.lua
rename to lua/custom/plugins/colorschemes/embark.lua
diff --git a/lua/custom/plugins/themes/eva01.lua b/lua/custom/plugins/colorschemes/eva01.lua
similarity index 100%
rename from lua/custom/plugins/themes/eva01.lua
rename to lua/custom/plugins/colorschemes/eva01.lua
diff --git a/lua/custom/plugins/themes/everblush.lua b/lua/custom/plugins/colorschemes/everblush.lua
similarity index 100%
rename from lua/custom/plugins/themes/everblush.lua
rename to lua/custom/plugins/colorschemes/everblush.lua
diff --git a/lua/custom/plugins/themes/falcon.lua b/lua/custom/plugins/colorschemes/falcon.lua
similarity index 100%
rename from lua/custom/plugins/themes/falcon.lua
rename to lua/custom/plugins/colorschemes/falcon.lua
diff --git a/lua/custom/plugins/themes/flattened.lua b/lua/custom/plugins/colorschemes/flattened.lua
similarity index 100%
rename from lua/custom/plugins/themes/flattened.lua
rename to lua/custom/plugins/colorschemes/flattened.lua
diff --git a/lua/custom/plugins/colorschemes/fogbell.lua b/lua/custom/plugins/colorschemes/fogbell.lua
new file mode 100644
index 00000000..2d600130
--- /dev/null
+++ b/lua/custom/plugins/colorschemes/fogbell.lua
@@ -0,0 +1 @@
+return { 'jaredgorski/fogbell.vim' }
diff --git a/lua/custom/plugins/themes/gloombuddy.lua b/lua/custom/plugins/colorschemes/gloombuddy.lua
similarity index 100%
rename from lua/custom/plugins/themes/gloombuddy.lua
rename to lua/custom/plugins/colorschemes/gloombuddy.lua
diff --git a/lua/custom/plugins/colorschemes/happy_hacking.lua b/lua/custom/plugins/colorschemes/happy_hacking.lua
new file mode 100644
index 00000000..6a4213ce
--- /dev/null
+++ b/lua/custom/plugins/colorschemes/happy_hacking.lua
@@ -0,0 +1 @@
+return { 'yorickpeterse/happy_hacking.vim' }
diff --git a/lua/custom/plugins/themes/init.lua b/lua/custom/plugins/colorschemes/init.lua
similarity index 80%
rename from lua/custom/plugins/themes/init.lua
rename to lua/custom/plugins/colorschemes/init.lua
index 5bc8fe3b..2fd24407 100644
--- a/lua/custom/plugins/themes/init.lua
+++ b/lua/custom/plugins/colorschemes/init.lua
@@ -2,4 +2,4 @@
 --  I promise not to create any merge conflicts in this directory :)
 --
 -- See the kickstart.nvim README for more information
-return { import = "custom.plugins.themes" }
+return { import = 'custom.plugins.colorschemes' }
diff --git a/lua/custom/plugins/colorschemes/jellybeans.lua b/lua/custom/plugins/colorschemes/jellybeans.lua
new file mode 100644
index 00000000..7c07c9cd
--- /dev/null
+++ b/lua/custom/plugins/colorschemes/jellybeans.lua
@@ -0,0 +1 @@
+return { 'metalelf0/jellybeans-nvim' }
diff --git a/lua/custom/plugins/themes/kanagawa.lua b/lua/custom/plugins/colorschemes/kanagawa.lua
similarity index 100%
rename from lua/custom/plugins/themes/kanagawa.lua
rename to lua/custom/plugins/colorschemes/kanagawa.lua
diff --git a/lua/custom/plugins/themes/malifluous.lua b/lua/custom/plugins/colorschemes/malifluous.lua
similarity index 100%
rename from lua/custom/plugins/themes/malifluous.lua
rename to lua/custom/plugins/colorschemes/malifluous.lua
diff --git a/lua/custom/plugins/themes/material.lua b/lua/custom/plugins/colorschemes/material.lua
similarity index 100%
rename from lua/custom/plugins/themes/material.lua
rename to lua/custom/plugins/colorschemes/material.lua
diff --git a/lua/custom/plugins/themes/melange.lua b/lua/custom/plugins/colorschemes/melange.lua
similarity index 100%
rename from lua/custom/plugins/themes/melange.lua
rename to lua/custom/plugins/colorschemes/melange.lua
diff --git a/lua/custom/plugins/colorschemes/mellifluous.lua b/lua/custom/plugins/colorschemes/mellifluous.lua
new file mode 100644
index 00000000..f5ffdc39
--- /dev/null
+++ b/lua/custom/plugins/colorschemes/mellifluous.lua
@@ -0,0 +1 @@
+return { 'ramojus/mellifluous.nvim' }
diff --git a/lua/custom/plugins/themes/minimalist.lua b/lua/custom/plugins/colorschemes/minimalist.lua
similarity index 100%
rename from lua/custom/plugins/themes/minimalist.lua
rename to lua/custom/plugins/colorschemes/minimalist.lua
diff --git a/lua/custom/plugins/themes/modus-theme-vim.lua b/lua/custom/plugins/colorschemes/modus-theme-vim.lua
similarity index 100%
rename from lua/custom/plugins/themes/modus-theme-vim.lua
rename to lua/custom/plugins/colorschemes/modus-theme-vim.lua
diff --git a/lua/custom/plugins/themes/monochrome.lua b/lua/custom/plugins/colorschemes/monochrome.lua
similarity index 100%
rename from lua/custom/plugins/themes/monochrome.lua
rename to lua/custom/plugins/colorschemes/monochrome.lua
diff --git a/lua/custom/plugins/themes/neon.lua b/lua/custom/plugins/colorschemes/neon.lua
similarity index 100%
rename from lua/custom/plugins/themes/neon.lua
rename to lua/custom/plugins/colorschemes/neon.lua
diff --git a/lua/custom/plugins/themes/night-own.lua b/lua/custom/plugins/colorschemes/night-own.lua
similarity index 100%
rename from lua/custom/plugins/themes/night-own.lua
rename to lua/custom/plugins/colorschemes/night-own.lua
diff --git a/lua/custom/plugins/themes/nightfox.lua b/lua/custom/plugins/colorschemes/nightfox.lua
similarity index 100%
rename from lua/custom/plugins/themes/nightfox.lua
rename to lua/custom/plugins/colorschemes/nightfox.lua
diff --git a/lua/custom/plugins/themes/nordic.lua b/lua/custom/plugins/colorschemes/nordic.lua
similarity index 100%
rename from lua/custom/plugins/themes/nordic.lua
rename to lua/custom/plugins/colorschemes/nordic.lua
diff --git a/lua/custom/plugins/themes/nvim-deus.lua b/lua/custom/plugins/colorschemes/nvim-deus.lua
similarity index 100%
rename from lua/custom/plugins/themes/nvim-deus.lua
rename to lua/custom/plugins/colorschemes/nvim-deus.lua
diff --git a/lua/custom/plugins/themes/nvim-hybrid.lua b/lua/custom/plugins/colorschemes/nvim-hybrid.lua
similarity index 100%
rename from lua/custom/plugins/themes/nvim-hybrid.lua
rename to lua/custom/plugins/colorschemes/nvim-hybrid.lua
diff --git a/lua/custom/plugins/themes/nvim-juliana.lua b/lua/custom/plugins/colorschemes/nvim-juliana.lua
similarity index 100%
rename from lua/custom/plugins/themes/nvim-juliana.lua
rename to lua/custom/plugins/colorschemes/nvim-juliana.lua
diff --git a/lua/custom/plugins/themes/nvim-noirbuddy.lua b/lua/custom/plugins/colorschemes/nvim-noirbuddy.lua
similarity index 100%
rename from lua/custom/plugins/themes/nvim-noirbuddy.lua
rename to lua/custom/plugins/colorschemes/nvim-noirbuddy.lua
diff --git a/lua/custom/plugins/themes/nvimgelion.lua b/lua/custom/plugins/colorschemes/nvimgelion.lua
similarity index 100%
rename from lua/custom/plugins/themes/nvimgelion.lua
rename to lua/custom/plugins/colorschemes/nvimgelion.lua
diff --git a/lua/custom/plugins/themes/oceanic-next.lua b/lua/custom/plugins/colorschemes/oceanic-next.lua
similarity index 100%
rename from lua/custom/plugins/themes/oceanic-next.lua
rename to lua/custom/plugins/colorschemes/oceanic-next.lua
diff --git a/lua/custom/plugins/colorschemes/ofirkai.lua b/lua/custom/plugins/colorschemes/ofirkai.lua
new file mode 100644
index 00000000..9a0949dc
--- /dev/null
+++ b/lua/custom/plugins/colorschemes/ofirkai.lua
@@ -0,0 +1 @@
+return { 'ofirgall/ofirkai.nvim' }
diff --git a/lua/custom/plugins/themes/oh-lucy.lua b/lua/custom/plugins/colorschemes/oh-lucy.lua
similarity index 100%
rename from lua/custom/plugins/themes/oh-lucy.lua
rename to lua/custom/plugins/colorschemes/oh-lucy.lua
diff --git a/lua/custom/plugins/themes/oxocarbon.lua b/lua/custom/plugins/colorschemes/oxocarbon.lua
similarity index 100%
rename from lua/custom/plugins/themes/oxocarbon.lua
rename to lua/custom/plugins/colorschemes/oxocarbon.lua
diff --git a/lua/custom/plugins/themes/palenight.lua b/lua/custom/plugins/colorschemes/palenight.lua
similarity index 100%
rename from lua/custom/plugins/themes/palenight.lua
rename to lua/custom/plugins/colorschemes/palenight.lua
diff --git a/lua/custom/plugins/themes/palenightfall.lua b/lua/custom/plugins/colorschemes/palenightfall.lua
similarity index 100%
rename from lua/custom/plugins/themes/palenightfall.lua
rename to lua/custom/plugins/colorschemes/palenightfall.lua
diff --git a/lua/custom/plugins/themes/pinkmare.lua b/lua/custom/plugins/colorschemes/pinkmare.lua
similarity index 100%
rename from lua/custom/plugins/themes/pinkmare.lua
rename to lua/custom/plugins/colorschemes/pinkmare.lua
diff --git a/lua/custom/plugins/themes/purify.lua b/lua/custom/plugins/colorschemes/purify.lua
similarity index 100%
rename from lua/custom/plugins/themes/purify.lua
rename to lua/custom/plugins/colorschemes/purify.lua
diff --git a/lua/custom/plugins/themes/rasmus.lua b/lua/custom/plugins/colorschemes/rasmus.lua
similarity index 100%
rename from lua/custom/plugins/themes/rasmus.lua
rename to lua/custom/plugins/colorschemes/rasmus.lua
diff --git a/lua/custom/plugins/themes/rose-pine.lua b/lua/custom/plugins/colorschemes/rose-pine.lua
similarity index 100%
rename from lua/custom/plugins/themes/rose-pine.lua
rename to lua/custom/plugins/colorschemes/rose-pine.lua
diff --git a/lua/custom/plugins/themes/sacredforest-vim.lua b/lua/custom/plugins/colorschemes/sacredforest-vim.lua
similarity index 100%
rename from lua/custom/plugins/themes/sacredforest-vim.lua
rename to lua/custom/plugins/colorschemes/sacredforest-vim.lua
diff --git a/lua/custom/plugins/colorschemes/sierra.lua b/lua/custom/plugins/colorschemes/sierra.lua
new file mode 100644
index 00000000..c3de130a
--- /dev/null
+++ b/lua/custom/plugins/colorschemes/sierra.lua
@@ -0,0 +1 @@
+return { 'AlessandroYorba/Sierra' }
diff --git a/lua/custom/plugins/colorschemes/space-vim-theme.lua b/lua/custom/plugins/colorschemes/space-vim-theme.lua
new file mode 100644
index 00000000..776beaf1
--- /dev/null
+++ b/lua/custom/plugins/colorschemes/space-vim-theme.lua
@@ -0,0 +1 @@
+return { 'liuchengxu/space-vim-theme' }
diff --git a/lua/custom/plugins/themes/tender.lua b/lua/custom/plugins/colorschemes/tender.lua
similarity index 100%
rename from lua/custom/plugins/themes/tender.lua
rename to lua/custom/plugins/colorschemes/tender.lua
diff --git a/lua/custom/plugins/colorschemes/termschool.lua b/lua/custom/plugins/colorschemes/termschool.lua
new file mode 100644
index 00000000..7dfb5f8e
--- /dev/null
+++ b/lua/custom/plugins/colorschemes/termschool.lua
@@ -0,0 +1 @@
+return { 'marcopaganini/termschool-vim-theme' }
diff --git a/lua/custom/plugins/themes/tokyonight.lua b/lua/custom/plugins/colorschemes/tokyonight.lua
similarity index 100%
rename from lua/custom/plugins/themes/tokyonight.lua
rename to lua/custom/plugins/colorschemes/tokyonight.lua
diff --git a/lua/custom/plugins/themes/vim-afterglow.lua b/lua/custom/plugins/colorschemes/vim-afterglow.lua
similarity index 100%
rename from lua/custom/plugins/themes/vim-afterglow.lua
rename to lua/custom/plugins/colorschemes/vim-afterglow.lua
diff --git a/lua/custom/plugins/colorschemes/vim-colors-lucid.lua b/lua/custom/plugins/colorschemes/vim-colors-lucid.lua
new file mode 100644
index 00000000..20edde6b
--- /dev/null
+++ b/lua/custom/plugins/colorschemes/vim-colors-lucid.lua
@@ -0,0 +1 @@
+return { 'cseelus/vim-colors-lucid' }
diff --git a/lua/custom/plugins/themes/vim-colors-off.lua b/lua/custom/plugins/colorschemes/vim-colors-off.lua
similarity index 100%
rename from lua/custom/plugins/themes/vim-colors-off.lua
rename to lua/custom/plugins/colorschemes/vim-colors-off.lua
diff --git a/lua/custom/plugins/themes/vim-colors-pencil.lua b/lua/custom/plugins/colorschemes/vim-colors-pencil.lua
similarity index 100%
rename from lua/custom/plugins/themes/vim-colors-pencil.lua
rename to lua/custom/plugins/colorschemes/vim-colors-pencil.lua
diff --git a/lua/custom/plugins/themes/vim-colors-plain.lua b/lua/custom/plugins/colorschemes/vim-colors-plain.lua
similarity index 100%
rename from lua/custom/plugins/themes/vim-colors-plain.lua
rename to lua/custom/plugins/colorschemes/vim-colors-plain.lua
diff --git a/lua/custom/plugins/themes/vim-colors-solarized.lua b/lua/custom/plugins/colorschemes/vim-colors-solarized.lua
similarity index 100%
rename from lua/custom/plugins/themes/vim-colors-solarized.lua
rename to lua/custom/plugins/colorschemes/vim-colors-solarized.lua
diff --git a/lua/custom/plugins/colorschemes/vim-deep-space.lua b/lua/custom/plugins/colorschemes/vim-deep-space.lua
new file mode 100644
index 00000000..01bddee0
--- /dev/null
+++ b/lua/custom/plugins/colorschemes/vim-deep-space.lua
@@ -0,0 +1 @@
+return { 'tyrannicaltoucan/vim-deep-space' }
diff --git a/lua/custom/plugins/themes/vim-dichromatic.lua b/lua/custom/plugins/colorschemes/vim-dichromatic.lua
similarity index 100%
rename from lua/custom/plugins/themes/vim-dichromatic.lua
rename to lua/custom/plugins/colorschemes/vim-dichromatic.lua
diff --git a/lua/custom/plugins/colorschemes/vim-dogrun.lua b/lua/custom/plugins/colorschemes/vim-dogrun.lua
new file mode 100644
index 00000000..abaf936e
--- /dev/null
+++ b/lua/custom/plugins/colorschemes/vim-dogrun.lua
@@ -0,0 +1 @@
+return { 'wadackel/vim-dogrun' }
diff --git a/lua/custom/plugins/themes/vim-enfocado.lua b/lua/custom/plugins/colorschemes/vim-enfocado.lua
similarity index 100%
rename from lua/custom/plugins/themes/vim-enfocado.lua
rename to lua/custom/plugins/colorschemes/vim-enfocado.lua
diff --git a/lua/custom/plugins/themes/vim-envy.lua b/lua/custom/plugins/colorschemes/vim-envy.lua
similarity index 100%
rename from lua/custom/plugins/themes/vim-envy.lua
rename to lua/custom/plugins/colorschemes/vim-envy.lua
diff --git a/lua/custom/plugins/themes/vim-gotham.lua b/lua/custom/plugins/colorschemes/vim-gotham.lua
similarity index 100%
rename from lua/custom/plugins/themes/vim-gotham.lua
rename to lua/custom/plugins/colorschemes/vim-gotham.lua
diff --git a/lua/custom/plugins/themes/vim-leuven-theme.lua b/lua/custom/plugins/colorschemes/vim-leuven-theme.lua
similarity index 100%
rename from lua/custom/plugins/themes/vim-leuven-theme.lua
rename to lua/custom/plugins/colorschemes/vim-leuven-theme.lua
diff --git a/lua/custom/plugins/themes/vim-lucius.lua b/lua/custom/plugins/colorschemes/vim-lucius.lua
similarity index 100%
rename from lua/custom/plugins/themes/vim-lucius.lua
rename to lua/custom/plugins/colorschemes/vim-lucius.lua
diff --git a/lua/custom/plugins/themes/vim-monokai-tasty.lua b/lua/custom/plugins/colorschemes/vim-monokai-tasty.lua
similarity index 100%
rename from lua/custom/plugins/themes/vim-monokai-tasty.lua
rename to lua/custom/plugins/colorschemes/vim-monokai-tasty.lua
diff --git a/lua/custom/plugins/themes/vim-moonfly-colors.lua b/lua/custom/plugins/colorschemes/vim-moonfly-colors.lua
similarity index 100%
rename from lua/custom/plugins/themes/vim-moonfly-colors.lua
rename to lua/custom/plugins/colorschemes/vim-moonfly-colors.lua
diff --git a/lua/custom/plugins/themes/vim-nightfly-colors.lua b/lua/custom/plugins/colorschemes/vim-nightfly-colors.lua
similarity index 100%
rename from lua/custom/plugins/themes/vim-nightfly-colors.lua
rename to lua/custom/plugins/colorschemes/vim-nightfly-colors.lua
diff --git a/lua/custom/plugins/colorschemes/vim-one.lua b/lua/custom/plugins/colorschemes/vim-one.lua
new file mode 100644
index 00000000..49570902
--- /dev/null
+++ b/lua/custom/plugins/colorschemes/vim-one.lua
@@ -0,0 +1 @@
+return { 'rakr/vim-one' }
diff --git a/lua/custom/plugins/colorschemes/vim-orbital.lua b/lua/custom/plugins/colorschemes/vim-orbital.lua
new file mode 100644
index 00000000..c9416d57
--- /dev/null
+++ b/lua/custom/plugins/colorschemes/vim-orbital.lua
@@ -0,0 +1 @@
+return { 'fcpg/vim-orbital' }
diff --git a/lua/custom/plugins/themes/vim-pink-moon.lua b/lua/custom/plugins/colorschemes/vim-pink-moon.lua
similarity index 100%
rename from lua/custom/plugins/themes/vim-pink-moon.lua
rename to lua/custom/plugins/colorschemes/vim-pink-moon.lua
diff --git a/lua/custom/plugins/themes/vim-solarized8.lua b/lua/custom/plugins/colorschemes/vim-solarized8.lua
similarity index 100%
rename from lua/custom/plugins/themes/vim-solarized8.lua
rename to lua/custom/plugins/colorschemes/vim-solarized8.lua
diff --git a/lua/custom/plugins/themes/vim-thematic.lua b/lua/custom/plugins/colorschemes/vim-thematic.lua
similarity index 100%
rename from lua/custom/plugins/themes/vim-thematic.lua
rename to lua/custom/plugins/colorschemes/vim-thematic.lua
diff --git a/lua/custom/plugins/themes/vim-theme-papaya.lua b/lua/custom/plugins/colorschemes/vim-theme-papaya.lua
similarity index 100%
rename from lua/custom/plugins/themes/vim-theme-papaya.lua
rename to lua/custom/plugins/colorschemes/vim-theme-papaya.lua
diff --git a/lua/custom/plugins/themes/zephyr-nvim.lua b/lua/custom/plugins/colorschemes/zephyr-nvim.lua
similarity index 100%
rename from lua/custom/plugins/themes/zephyr-nvim.lua
rename to lua/custom/plugins/colorschemes/zephyr-nvim.lua
diff --git a/lua/custom/plugins/flash.lua b/lua/custom/plugins/flash.lua
new file mode 100644
index 00000000..2c0dcce9
--- /dev/null
+++ b/lua/custom/plugins/flash.lua
@@ -0,0 +1,23 @@
+return {
+  'folke/flash.nvim',
+  event = 'VeryLazy',
+  ---@type Flash.Config
+  opts = {},
+  keys = {
+    {
+      's',
+      mode = { 'n', 'x', 'o' },
+      function()
+        -- default options: exact mode, multi window, all directions, with a backdrop
+        require('flash').jump()
+      end,
+    },
+    {
+      'S',
+      mode = { 'n', 'o', 'x' },
+      function()
+        require('flash').treesitter()
+      end,
+    },
+  },
+}
diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua
index be0eb9d8..7b9e6c9c 100644
--- a/lua/custom/plugins/init.lua
+++ b/lua/custom/plugins/init.lua
@@ -2,4 +2,6 @@
 --  I promise not to create any merge conflicts in this directory :)
 --
 -- See the kickstart.nvim README for more information
+vim.o.wrap = true
+
 return {}
diff --git a/lua/custom/plugins/languages/latex.lua b/lua/custom/plugins/languages/latex.lua
new file mode 100644
index 00000000..e667933a
--- /dev/null
+++ b/lua/custom/plugins/languages/latex.lua
@@ -0,0 +1,3 @@
+return {
+  'lervag/vimtex',
+}
diff --git a/lua/custom/plugins/options.lua b/lua/custom/plugins/options.lua
index 20a4f4f8..60791018 100644
--- a/lua/custom/plugins/options.lua
+++ b/lua/custom/plugins/options.lua
@@ -46,6 +46,7 @@ opt.updatetime = 200 -- Save swap file and trigger CursorHold
 opt.wildmode = 'longest:full,full' -- Command-line completion mode
 opt.winminwidth = 5 -- Minimum window width
 -- opt.wrap = false -- Disable line wrap
+opt.wrap = true
 
 if vim.fn.has 'nvim-0.9.0' == 1 then
   opt.splitkeep = 'screen'
diff --git a/lua/custom/plugins/sentiment.lua b/lua/custom/plugins/sentiment.lua
new file mode 100644
index 00000000..25b60f29
--- /dev/null
+++ b/lua/custom/plugins/sentiment.lua
@@ -0,0 +1,12 @@
+return {
+  'utilyre/sentiment.nvim',
+  version = '*',
+  event = 'VeryLazy', -- keep for lazy loading
+  opts = {
+    -- config
+  },
+  init = function()
+    -- `matchparen.vim` needs to be disabled manually in case of lazy loading
+    vim.g.loaded_matchparen = 1
+  end,
+}
diff --git a/lua/custom/plugins/tabnine.lua b/lua/custom/plugins/tabnine.lua
index 01c63a9a..d6540a7f 100644
--- a/lua/custom/plugins/tabnine.lua
+++ b/lua/custom/plugins/tabnine.lua
@@ -1,5 +1,18 @@
+local uname = vim.loop.os_uname()
+local sysname = uname.sysname
+local machine = uname.machine
+
+local enableTabnine = true
+
+-- Check if the system is Linux and the machine is aarch64
+if sysname == "Linux" and machine == "aarch64" then
+  -- Disable cmp-tabnine plugin
+  enableTabnine = false
+end
+
 return {
   'codota/tabnine-nvim',
+  enabled = enableTabnine,
   build = './dl_binaries.sh',
   config = function()
     require('tabnine').setup {
diff --git a/lua/custom/plugins/telescope-symbols.lua b/lua/custom/plugins/telescope-symbols.lua
new file mode 100644
index 00000000..7e159e18
--- /dev/null
+++ b/lua/custom/plugins/telescope-symbols.lua
@@ -0,0 +1,7 @@
+return {
+    'nvim-telescope/telescope-symbols.nvim',
+    dependencies = { 'nvim-telescope/telescope.nvim' },
+    config = function()
+        vim.keymap.set('n', '<leader>ee', ':Telescope symbols<CR>', {})
+    end,
+}
diff --git a/lua/custom/plugins/themes/alduin.lua b/lua/custom/plugins/themes/alduin.lua
deleted file mode 100644
index d1303bbb..00000000
--- a/lua/custom/plugins/themes/alduin.lua
+++ /dev/null
@@ -1 +0,0 @@
-return { 'rafamadriz/neon' }
diff --git a/lua/custom/plugins/themes/space-vim-dark.lua b/lua/custom/plugins/themes/space-vim-dark.lua
deleted file mode 100644
index d85e4630..00000000
--- a/lua/custom/plugins/themes/space-vim-dark.lua
+++ /dev/null
@@ -1 +0,0 @@
-return { 'liuchengxu/space-vim-dark' }
diff --git a/lua/custom/plugins/tune.lua b/lua/custom/plugins/tune.lua
new file mode 100644
index 00000000..0284b5c7
--- /dev/null
+++ b/lua/custom/plugins/tune.lua
@@ -0,0 +1,9 @@
+return {
+  'thomasmarcel/tune.nvim',
+  config = function()
+    local tune = require 'tune'
+    tune.setup()
+    tune.pick_random_colorscheme()
+  end,
+  priority = 10,
+}