diff --git a/lua/codecraft/core/colorscheme.lua b/lua/codecraft/core/colorscheme.lua
index 3a67b17fa6b7be93685dbaba9fe77d3e2fdcb155..ccd9657d4acf52255aab52e25582e5810a204707 100644
--- a/lua/codecraft/core/colorscheme.lua
+++ b/lua/codecraft/core/colorscheme.lua
@@ -12,4 +12,4 @@
 -- onedark
 -- catppuccin
 
-vim.cmd[[colorscheme catppuccin]]
+vim.cmd[[colorscheme lunar]]
diff --git a/lua/codecraft/plugin-setup.lua b/lua/codecraft/plugin-setup.lua
index 3444d93dd11a44f5f403cb47a9f8e0bd9962d0cc..e5785b1728bec44a35aa42a3f28a6b4e4ce739ea 100644
--- a/lua/codecraft/plugin-setup.lua
+++ b/lua/codecraft/plugin-setup.lua
@@ -36,16 +36,6 @@ require('packer').startup(function(use)
   use 'alvan/vim-closetag'
 
   use 'tpope/vim-surround'
-  -- Chat GPT
-  use({
-    "jackMort/ChatGPT.nvim",
-    requires = {
-      "MunifTanjim/nui.nvim",
-      "nvim-lua/plenary.nvim",
-      "nvim-telescope/telescope.nvim"
-    }
-  })
-
   -- debugging
   use 'mfussenegger/nvim-dap'
   use 'jay-babu/mason-nvim-dap.nvim'
diff --git a/lua/codecraft/plugin/chatgpt.lua b/lua/codecraft/plugin/chatgpt.lua
deleted file mode 100644
index e529e44b0ffff1bdb3dfb35fe7ea2a75c5896432..0000000000000000000000000000000000000000
--- a/lua/codecraft/plugin/chatgpt.lua
+++ /dev/null
@@ -1,70 +0,0 @@
-require("chatgpt").setup({
-  -- welcome_message = WELCOME_MESSAGE, -- set to "" if you don't like the fancy godot robot 
-  loading_text = "loading",
-  question_sign = "", -- you can use emoji if you want e.g. 🙂
-  answer_sign = "ﮧ", -- 🤖
-  max_line_length = 120,
-  yank_register = "+",
-  chat_layout = {
-    relative = "editor",
-    position = "50%",
-    size = {
-      height = "80%",
-      width = "80%",
-    },
-  },
-  settings_window = {
-    border = {
-      style = "rounded",
-      text = {
-        top = " Settings ",
-      },
-    },
-  },
-  chat_window = {
-    filetype = "chatgpt",
-    border = {
-      highlight = "FloatBorder",
-      style = "rounded",
-      text = {
-        top = " ChatGPT ",
-      },
-    },
-  },
-  chat_input = {
-    prompt = " > ",
-    border = {
-      highlight = "FloatBorder",
-      style = "rounded",
-      text = {
-        top_align = "center",
-        top = " Prompt ",
-      },
-    },
-  },
-  openai_params = {
-    model = "text-davinci-003",
-    frequency_penalty = 0,
-    presence_penalty = 0,
-    max_tokens = 300,
-    temperature = 0,
-
-    top_p = 1,
-    n = 1,
-  },
-  openai_edit_params = {
-    model = "code-davinci-edit-001",
-    temperature = 0,
-    top_p = 1,
-    n = 1,
-  },
-  keymaps = {
-    close = { "<Esc>" },
-    yank_last = "<C-y>",
-    scroll_up = "<C-u>",
-    scroll_down = "<C-d>",
-    toggle_settings = "<C-o>",
-    new_session = "<C-n>",
-    cycle_windows = "<Tab>",
-  },
-})
diff --git a/lua/codecraft/plugin/lsp/null-ls.lua b/lua/codecraft/plugin/lsp/null-ls.lua
index 799ee1892ec2576f6643234d5acc9657425c06c5..ac40e92889af62db2f75bcb48b80d48f953f0c43 100644
--- a/lua/codecraft/plugin/lsp/null-ls.lua
+++ b/lua/codecraft/plugin/lsp/null-ls.lua
@@ -8,7 +8,8 @@ local augroup = vim.api.nvim_create_augroup("LspFormatting", {})
 
 local formatters_linters = {
   prettier = {},
-  erb_lint = {}
+  erb_lint = {},
+  rustfmt = {},
 }
 
 mason_null_ls.setup({
@@ -17,7 +18,8 @@ mason_null_ls.setup({
 null_ls.setup ({
   sources = {
     formatting.prettier,
-    diagnostics.erb_lint
+    diagnostics.erb_lint,
+    formatting.rustfmt,
   },
   on_attach = function(current_client, bufnr)
     if current_client.supports_method("textDocument/formatting") then