diff --git a/nvim/lua/darcula/keymaps.lua b/nvim/lua/darcula/keymaps.lua
index 7eb2e4b..957c070 100644
--- a/nvim/lua/darcula/keymaps.lua
+++ b/nvim/lua/darcula/keymaps.lua
@@ -263,6 +263,28 @@ if NV_DARCULA_ENABLE_COC then
   end
 end
 
+function M.codex()
+  local opts = {silent = true}
+  km.map(
+    km.leader "rc",
+    function()
+      vim.ui.input(
+        {prompt = "Codex prompt: "},
+        function(prompt)
+          local command = "codex chat --tui --resume"
+          if prompt and prompt ~= "" then
+            command = command .. " " .. vim.fn.shellescape(prompt)
+          end
+
+          vim.cmd("botright vertical split")
+          vim.cmd("terminal " .. command)
+        end
+      )
+    end,
+    opts
+  )
+end
+
 function M.commenting()
   local opts = {remap = true, silent = true}
 
@@ -561,6 +583,28 @@ function M.gui()
   end
 end
 
+function M.kiro()
+  local opts = {silent = true}
+  km.map(
+    km.leader "rk",
+    function()
+      vim.ui.input(
+        {prompt = "Kiro prompt: "},
+        function(prompt)
+          local command = "kiro-cli chat --tui --resume"
+          if prompt and prompt ~= "" then
+            command = command .. " " .. vim.fn.shellescape(prompt)
+          end
+
+          vim.cmd("botright vertical split")
+          vim.cmd("terminal " .. command)
+        end
+      )
+    end,
+    opts
+  )
+end
+
 if not NV_DARCULA_ENABLE_COC then
   function M.lsp()
     local opts = {remap = false, silent = true}
@@ -1441,6 +1485,7 @@ end
   if NV_DARCULA_ENABLE_COC then
     M.coc()
   end
+  M.codex()
   M.commenting()
   M.cppman()
   M.cspell()
@@ -1448,6 +1493,7 @@ end
   M.editing()
   M.flutter()
   M.gui()
+  M.kiro()
   if not NV_DARCULA_ENABLE_COC then
     M.lsp()
   end
diff --git a/nvim/lua/darcula/setup/050_mason.lua b/nvim/lua/darcula/setup/050_mason.lua
index f38184c..54a8d8f 100644
--- a/nvim/lua/darcula/setup/050_mason.lua
+++ b/nvim/lua/darcula/setup/050_mason.lua
@@ -43,6 +43,5 @@ installer.setup {
     ["mason-null-ls"] = false,
     ["mason-nvim-dap"] = false
   },
-  run_on_start = false
+  run_on_start = true
 }
-installer.check_install(false, true)