diff --git a/lua/config/lazy.lua b/lua/config/lazy.lua
index d9405885..532a0ef0 100644
--- a/lua/config/lazy.lua
+++ b/lua/config/lazy.lua
@@ -6,6 +6,20 @@ if not vim.loop.fs_stat(lazypath) then
 end
 vim.opt.rtp:prepend(vim.env.LAZY or lazypath)
 
+local _border = "single"
+
+vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, {
+  border = _border,
+})
+
+vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, {
+  border = _border,
+})
+
+vim.diagnostic.config({
+  float = { border = _border },
+})
+
 require("lazy").setup({
   spec = {
     { "LazyVim/LazyVim", import = "lazyvim.plugins" },
diff --git a/lua/plugins/cmp.lua b/lua/plugins/cmp.lua
new file mode 100644
index 00000000..db198194
--- /dev/null
+++ b/lua/plugins/cmp.lua
@@ -0,0 +1,20 @@
+return {
+  "hrsh7th/nvim-cmp",
+  dependencies = { "hrsh7th/cmp-emoji" },
+  ---@param opts cmp.ConfigSchema
+  opts = function(_, opts)
+    local cmp = require("cmp")
+    opts.sources = cmp.config.sources(vim.list_extend(opts.sources, { { name = "emoji" } }))
+    cmp.setup({
+      window = {
+        completion = {
+          border = "single",
+          -- winhighlight = "Normal:Pmenu,FloatBorder:Pmenu,CursorLine:PmenuThumb,Search:None",
+        },
+        documentation = {
+          border = "single",
+        },
+      },
+    })
+  end,
+}