diff --git a/hm-imports/nvim/config/lua/coc.lua b/hm-imports/nvim/config/lua/coc.lua
index 72fecd8c..4a5b2e7d 100644
--- a/hm-imports/nvim/config/lua/coc.lua
+++ b/hm-imports/nvim/config/lua/coc.lua
@@ -146,8 +146,8 @@ keyset("v", "<C-b>", 'coc#float#has_scroll() ? coc#float#scroll(0) : "<C-b>"', o
 
 -- Use CTRL-S for selections ranges
 -- Requires 'textDocument/selectionRange' support of language server
-keyset("n", "<C-r>", "<Plug>(coc-range-select)", {silent = true})
-keyset("x", "<C-r>", "<Plug>(coc-range-select)", {silent = true})
+keyset("n", "<C-f>", "<Plug>(coc-range-select)", {silent = true})
+keyset("x", "<C-f>", "<Plug>(coc-range-select)", {silent = true})
 
 
 -- Add `:Format` command to format current buffer
@@ -183,4 +183,4 @@ keyset("n", ",j", ":<C-u>CocNext<cr>", opts)
 -- Do default action for previous item
 keyset("n", ",k", ":<C-u>CocPrev<cr>", opts)
 -- Resume latest coc list
-keyset("n", ",<space>p", ":<C-u>CocListResume<cr>", opts)
+keyset("n", ",p", ":<C-u>CocListResume<cr>", opts)
diff --git a/hm-imports/nvim/config/lua/plugin/noice.lua b/hm-imports/nvim/config/lua/plugin/noice.lua
index 938a4b10..b8235b7b 100644
--- a/hm-imports/nvim/config/lua/plugin/noice.lua
+++ b/hm-imports/nvim/config/lua/plugin/noice.lua
@@ -1,14 +1,8 @@
 require("noice").setup({
-  lsp = {
-    -- override markdown rendering so that **cmp** and other plugins use **Treesitter**
-    override = {
-      ["vim.lsp.util.convert_input_to_markdown_lines"] = true,
-      ["vim.lsp.util.stylize_markdown"] = true,
-      ["cmp.entry.get_documentation"] = true,
-    },
-  },
-  messages = {
-    view = "mini"
+  views = {
+    notify = {
+      merge = true,
+    }
   },
   -- you can enable a preset for easier configuration
   presets = {
diff --git a/hm-imports/nvim/config/lua/plugin/treesitter.lua b/hm-imports/nvim/config/lua/plugin/treesitter.lua
new file mode 100644
index 00000000..8559c440
--- /dev/null
+++ b/hm-imports/nvim/config/lua/plugin/treesitter.lua
@@ -0,0 +1,20 @@
+require'nvim-treesitter.configs'.setup {
+  highlight = {
+    enable = true,
+    use_languagetree = true,
+  },
+  indent = {
+    enable = true,
+  },
+  autotag = {
+    enable = true,
+  },
+  context_commentstring = {
+    enable = true,
+    enable_autocmd = false,
+  },
+  refactor = {
+    highlight_definitions = { enable = true },
+    highlight_current_scope = { enable = false },
+  },
+}