diff --git a/config/.config/nvim/lazy-lock.json b/config/.config/nvim/lazy-lock.json
index ba95d09..a7ffb03 100644
--- a/config/.config/nvim/lazy-lock.json
+++ b/config/.config/nvim/lazy-lock.json
@@ -60,9 +60,13 @@
   "neo-tree.nvim": { "branch": "v2.x", "commit": "80dc74d081823649809f78370fa5b204aa9a853a" },
   "neodev.nvim": { "branch": "main", "commit": "f972d7e6cd21b691199565cfe3e6487e774a4e8f" },
   "neoscopes": { "branch": "main", "commit": "470dff042004b93c10d262e8b0ad7bf6f703f86f" },
+<<<<<<< HEAD
   "neovim-ayu": { "branch": "master", "commit": "76dbf939b38e03ac5f9bd711ab3e434999f715c8" },
   "neovim-throttle-debounce": { "branch": "main", "commit": "5247b097df15016ab31db672b77ec4938bb9cbfd" },
   "nui.nvim": { "branch": "main", "commit": "c0c8e347ceac53030f5c1ece1c5a5b6a17a25b32" },
+=======
+  "nui.nvim": { "branch": "main", "commit": "257dccc43b4badc735978f0791d216f7d665b75a" },
+>>>>>>> 4c8f5e4 (personal themes)
   "nvim-cmp": { "branch": "main", "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" },
   "nvim-cmp-buffer-lines": { "branch": "master", "commit": "924ccc04dc5c919b6baa05d45818025baa82699a" },
   "nvim-dap": { "branch": "master", "commit": "e154fdb6d70b3765d71f296e718b29d8b7026a63" },
@@ -74,9 +78,15 @@
   "nvim-notify": { "branch": "master", "commit": "e4a2022f4fec2d5ebc79afa612f96d8b11c627b3" },
   "nvim-scrollbar": { "branch": "main", "commit": "35f99d559041c7c0eff3a41f9093581ceea534e8" },
   "nvim-surround": { "branch": "main", "commit": "18016d6af52edc9f1c794dcf6665a26a2962d2ee" },
+<<<<<<< HEAD
   "nvim-treesitter": { "branch": "master", "commit": "7da3cb6323d1e1fbfc4d7dc05cac74946458b8a0" },
   "nvim-treesitter-context": { "branch": "master", "commit": "bf4d15ee4e96ff5201f16a4ed14443670662eb90" },
   "nvim-web-devicons": { "branch": "master", "commit": "cdbcca210cf3655aa9b31ebf2422763ecd85ee5c" },
+=======
+  "nvim-treesitter": { "branch": "master", "commit": "b056e4227b1c5d3ecfe96941352364c0c10668df" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "bf4d15ee4e96ff5201f16a4ed14443670662eb90" },
+  "nvim-web-devicons": { "branch": "master", "commit": "7b1c4a8743e71627beb4e00d0a225247ab6eb2f7" },
+>>>>>>> 4c8f5e4 (personal themes)
   "omnisharp-extended-lsp.nvim": { "branch": "main", "commit": "53edfb413a54c9e55dcddc9e9fa4977a897e4425" },
   "onedark.nvim": { "branch": "main", "commit": "b5161f0c631571640485be5d1c059cab82c86872" },
   "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" },
diff --git a/vim/.vim/lua/plugins/base.lua b/vim/.vim/lua/plugins/base.lua
index 054622d..387facb 100644
--- a/vim/.vim/lua/plugins/base.lua
+++ b/vim/.vim/lua/plugins/base.lua
@@ -5,6 +5,7 @@ return {
 	{ "nvim-lua/plenary.nvim", lazy = false },
 	{ "nvim-tree/nvim-web-devicons", lazy = false },
 	{ "squk/java-syntax.vim", ft = "java" },
+	{ "squk/gdrama-syntax.vim", dir = vim.fn.expand("$HOME/dev/gdrama-syntax.vim") },
 	{ "echasnovski/mini.splitjoin", version = "*" },
 	{
 		"andweeb/presence.nvim",
diff --git a/vim/.vim/lua/plugins/nvim-treesitter.lua b/vim/.vim/lua/plugins/nvim-treesitter.lua
index 04d1502..9d97b66 100644
--- a/vim/.vim/lua/plugins/nvim-treesitter.lua
+++ b/vim/.vim/lua/plugins/nvim-treesitter.lua
@@ -53,9 +53,9 @@ return {
 						--TODO write a custom Java treesitter parser for comments
 						--@link
 						--
-						-- if lang == "java" then
-						--     return true
-						-- end
+						if lang == "gdrama" then
+							return true
+						end
 
 						local max_filesize = 100 * 1024 -- 100 KB
 						local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf))
diff --git a/vim/.vim/lua/plugins/themes-personal.lua b/vim/.vim/lua/plugins/themes-personal.lua
index b333383..852d50f 100644
--- a/vim/.vim/lua/plugins/themes-personal.lua
+++ b/vim/.vim/lua/plugins/themes-personal.lua
@@ -7,7 +7,7 @@ return {
 		priority = 1000, -- make sure to load this before all the other start plugins
 		-- cond = not use_google(),
 		config = function()
-			-- vim.cmd("colorscheme kanagawa")
+			vim.cmd("colorscheme kanagawa-wave")
 		end,
 	},
 	{
@@ -16,7 +16,7 @@ return {
 		priority = 1000, -- make sure to load this before all the other start plugins
 		cond = not use_google(),
 		config = function()
-			vim.cmd("colorscheme oxocarbon")
+			-- vim.cmd("colorscheme oxocarbon")
 		end,
 	},
 	{