diff --git a/after/ftplugin/cpp.lua b/after/ftplugin/cpp.lua
new file mode 100644
index 0000000..268abf9
--- /dev/null
+++ b/after/ftplugin/cpp.lua
@@ -0,0 +1,5 @@
+local tab_spacing = 2
+vim.opt.tabstop = tab_spacing
+vim.opt.softtabstop = tab_spacing
+vim.opt.shiftwidth = tab_spacing
+vim.opt_local.makeprg = 'msbuild .\\game.vcxproj /p:Configuration=Release /p:Platform=x64'
diff --git a/after/ftplugin/php.lua b/after/ftplugin/php.lua
new file mode 100644
index 0000000..e8f0c0c
--- /dev/null
+++ b/after/ftplugin/php.lua
@@ -0,0 +1,4 @@
+vim.keymap.set("n", "<space>pa", function()
+  package.loaded["php.artisan"] = nil
+  require("php.artisan").telescope_select_artisan()
+end)
diff --git a/after/plugin/colors.lua b/after/plugin/colors.lua
new file mode 100644
index 0000000..c0ac275
--- /dev/null
+++ b/after/plugin/colors.lua
@@ -0,0 +1,10 @@
+function ColorMyPencils(color)
+    color = color or "catppuccin"
+    vim.cmd.colorscheme(color)
+
+    -- make transparent BG
+    vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
+    vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
+end
+
+ColorMyPencils()
diff --git a/lazy-lock.json b/lazy-lock.json
index 8693e3e..51e76b0 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -36,6 +36,7 @@
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
   "telescope.nvim": { "branch": "master", "commit": "cb3f98d935842836cc115e8c9e4b38c1380fbb6b" },
   "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
+  "tokyonight.nvim": { "branch": "main", "commit": "2c85fad417170d4572ead7bf9fdd706057bd73d7" },
   "trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" },
   "twilight.nvim": { "branch": "main", "commit": "1584c0b0a979b71fd86b18d302ba84e9aba85b1b" },
   "undotree": { "branch": "master", "commit": "78b5241191852ffa9bb5da5ff2ee033160798c3b" },
@@ -44,6 +45,5 @@
   "vim-dadbod-completion": { "branch": "master", "commit": "880f7e9f2959e567c718d52550f9fae1aa07aa81" },
   "vim-dadbod-ui": { "branch": "master", "commit": "f29c85ab42861c6ef683289b0c6a51e0d436dcf6" },
   "vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" },
-  "which-key.nvim": { "branch": "main", "commit": "fb070344402cfc662299d9914f5546d840a22126" },
   "zen-mode.nvim": { "branch": "main", "commit": "29b292bdc58b76a6c8f294c961a8bf92c5a6ebd6" }
 }
diff --git a/lua/barink/after/plugin/colors.lua b/lua/barink/after/plugin/colors.lua
deleted file mode 100644
index 89836e9..0000000
--- a/lua/barink/after/plugin/colors.lua
+++ /dev/null
@@ -1,10 +0,0 @@
-function ColorMyPencils(color)
-    color = color or "tokyonight"
-    vim.cmd.colorscheme(color)
-
-    -- make transparent BG
-     vim.api.nvim_set_hl(0, "Normal", {bg = "none"})
-     vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none"})
-end
-
-ColorMyPencils()
diff --git a/lua/barink/plugins/lsp.lua b/lua/barink/plugins/lsp.lua
index 5d49239..bcb131c 100644
--- a/lua/barink/plugins/lsp.lua
+++ b/lua/barink/plugins/lsp.lua
@@ -56,7 +56,7 @@ return
             mapping = cmp.mapping.preset.insert({
                 ['<C-b>'] = cmp.mapping.scroll_docs(-4),
                 ['<C-f>'] = cmp.mapping.scroll_docs(4),
-                ['<C-Space>'] = cmp.mapping.complete(),
+                ['<C-space>'] = cmp.mapping.complete(),
                 ['<C-e>'] = cmp.mapping.abort(),
                 ['<C-y>'] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
             }),
diff --git a/lua/barink/plugins/theme.lua b/lua/barink/plugins/theme.lua
index 6c5e379..d6d65de 100644
--- a/lua/barink/plugins/theme.lua
+++ b/lua/barink/plugins/theme.lua
@@ -1,30 +1,27 @@
--- return {
---         "folke/tokyonight.nvim",
---         lazy = false,
---         priority = 1000,
---         opts = {},
---         config = function()
---             require("tokyonight").setup({
---                 style = "night",
---                 light_style = "day",
---                 transparent = true,
---                 terminal_colors = true,
---                 dim_inactive = false,
---                 lualine_bold = false,
---             })
--- 
---             vim.cmd [[colorscheme tokyonight]]
---         end
---     }
-
 return {
     {
-    "catppuccin/nvim",
-    name="catppuccin",
-    priority=1000,
-    config = function ()
-        require("catppuccin").setup()
-        vim.cmd.colorscheme('catppuccin')
-    end
+        "folke/tokyonight.nvim",
+        lazy = false,
+        priority = 1000,
+        opts = {},
+        config = function()
+            require("tokyonight").setup({
+                style = "night",
+                light_style = "day",
+                transparent = true,
+                terminal_colors = true,
+                dim_inactive = false,
+                lualine_bold = false,
+            })
+        end
+    },
+    {
+        "catppuccin/nvim",
+        name = "catppuccin",
+        priority = 1000,
+        config = function()
+            require("catppuccin").setup()
+            vim.cmd.colorscheme('catppuccin')
+        end
     }
 }