diff --git a/nvim/coc-settings.json b/nvim/coc-settings.json
index 0c96b97..5cbbc58 100644
--- a/nvim/coc-settings.json
+++ b/nvim/coc-settings.json
@@ -7,6 +7,7 @@
     "typescriptreact",
     "vue",
     "svelte",
+    "astro",
     "html",
     "css",
     "json",
@@ -25,7 +26,6 @@
     "typescriptreact",
     "html",
     "vue",
-    "markdown",
     "svelte"
   ],
   "eslint.validate": [
@@ -35,7 +35,6 @@
     "typescriptreact",
     "html",
     "vue",
-    "markdown",
     "svelte"
   ]
 }
diff --git a/nvim/init.vim b/nvim/init.vim
index a03d052..93d2794 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -52,8 +52,9 @@ command! -nargs=0 C :e $MYVIMRC
 " Type ':R' to reload config file
 command! -nargs=0 R :source $MYVIMRC
 
-" Save and close all buffers with ZZ
+" Save and close all buffers with ZZ or Ctrl-C
 nnoremap ZZ :wa<CR>:qa<CR>
+nnoremap <C-c> :wa<CR>:qa<CR>
 
 " Exit Terminal mode with Ctrl+k
 tnoremap <C-k> <C-\><C-n>
diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua
index aa57156..41fb27f 100644
--- a/nvim/lua/plugins.lua
+++ b/nvim/lua/plugins.lua
@@ -36,6 +36,7 @@ require("lazy").setup({
         "coc-tsserver", 
         "@yaegassy/coc-volar", 
         "coc-svelte",
+        "@yaegassy/coc-astro",
         "@yaegassy/coc-tailwindcss3",
         "coc-emmet", 
         "coc-prettier", 
@@ -43,6 +44,7 @@ require("lazy").setup({
       }
 
       vim.api.nvim_command("autocmd BufWritePre *.go :call CocAction('runCommand', 'editor.action.organizeImport')")
+      vim.api.nvim_exec([[autocmd BufNewFile,BufRead *.astro set filetype=astro]], false)
     end
   },
 
@@ -56,6 +58,15 @@ require("lazy").setup({
     end
   },
 
+  -- Support for Astro
+  {
+    "wuelnerdotexe/vim-astro",
+    ft = "astro",
+    init = function()
+      vim.g.astro_typescript = "enable"
+    end
+  },
+
   -- Add two-character motions with s and S
   {
     "ggandor/leap.nvim",