diff --git a/lua/cosmic/core/pluginsInit.lua b/lua/cosmic/core/pluginsInit.lua
index 4711919..ebe6745 100644
--- a/lua/cosmic/core/pluginsInit.lua
+++ b/lua/cosmic/core/pluginsInit.lua
@@ -87,7 +87,11 @@ return packer.startup(function()
 
   use({
     'CosmicNvim/cosmic-ui',
-    requires = { 'MunifTanjim/nui.nvim', 'nvim-lua/plenary.nvim', 'ray-x/lsp_signature.nvim' },
+    requires = {
+      'MunifTanjim/nui.nvim',
+      'nvim-lua/plenary.nvim',
+      'ray-x/lsp_signature.nvim',
+    },
     config = function()
       local diagnostic = {}
       local hover = {}
@@ -133,7 +137,7 @@ return packer.startup(function()
   use({
     'hrsh7th/nvim-cmp',
     config = function()
-      require('cosmic.lsp.autocomplete').init()
+      require('cosmic-ui').setup_autocomplete()
     end,
     requires = {
       { 'hrsh7th/cmp-nvim-lsp', after = 'nvim-cmp' },
@@ -144,7 +148,7 @@ return packer.startup(function()
       {
         'windwp/nvim-autopairs',
         config = function()
-          require('cosmic.lsp.autocomplete').autopairs()
+          require('cosmic.modules.auto-pairs')
         end,
         after = 'cmp-path',
       },
diff --git a/lua/cosmic/modules/auto-pairs/init.lua b/lua/cosmic/modules/auto-pairs/init.lua
new file mode 100644
index 0000000..d356627
--- /dev/null
+++ b/lua/cosmic/modules/auto-pairs/init.lua
@@ -0,0 +1,7 @@
+require('nvim-autopairs').setup({
+  disable_filetype = { 'TelescopePrompt', 'vim' },
+})
+
+local cmp_autopairs = require('nvim-autopairs.completion.cmp')
+local cmp = require('cmp')
+cmp.event:on('confirm_done', cmp_autopairs.on_confirm_done({ map_char = { tex = '' } }))
diff --git a/lua/cosmic/theme/plugins.lua b/lua/cosmic/theme/plugins.lua
index a8d9350..2f66112 100644
--- a/lua/cosmic/theme/plugins.lua
+++ b/lua/cosmic/theme/plugins.lua
@@ -26,6 +26,7 @@ function M.init(use, config)
 
   use({
     'catppuccin/nvim',
+    branch = 'dev-rc',
     as = 'catppuccin',
     config = function()
       local catppuccin = require('catppuccin')