diff --git a/lua/ow/lsp.lua b/lua/ow/lsp.lua
index 018cfbf..4f5b0a0 100644
--- a/lua/ow/lsp.lua
+++ b/lua/ow/lsp.lua
@@ -141,7 +141,7 @@ local function setup_diagnostics()
         float = {
             show_header = false,
             source = true,
-            border = "single",
+            border = "rounded",
             focusable = false,
             format = function(diagnostic)
                 return string.format("%s", diagnostic.message)
diff --git a/lua/ow/lsp/keymap.lua b/lua/ow/lsp/keymap.lua
index 4114f90..29ee260 100644
--- a/lua/ow/lsp/keymap.lua
+++ b/lua/ow/lsp/keymap.lua
@@ -52,14 +52,14 @@ function M:init(server, bufnr)
             mode = { "n", "i" },
             lhs = "<C-k>",
             rhs = function()
-                vim.lsp.buf.hover({ border = "single", max_width = 80 })
+                vim.lsp.buf.hover({ border = "rounded", max_width = 80 })
             end,
         },
         {
             mode = { "n", "i" },
             lhs = "<C-j>",
             rhs = function()
-                vim.lsp.buf.signature_help({ border = "single", max_width = 80 })
+                vim.lsp.buf.signature_help({ border = "rounded", max_width = 80 })
             end,
         },
         {
diff --git a/lua/ow/plugins/cmp.lua b/lua/ow/plugins/cmp.lua
index 79b4aef..85ed6fa 100644
--- a/lua/ow/plugins/cmp.lua
+++ b/lua/ow/plugins/cmp.lua
@@ -151,18 +151,12 @@ return {
                 { name = "orgmode" },
                 { name = "path" },
             },
+            window = {
+                completion = cmp.config.window.bordered(),
+                documentation = cmp.config.window.bordered(),
+            }
         }
 
-        if utils.has_module("moonfly") then
-            local winhighlight = {
-                winhighlight = "Normal:NormalFloat,FloatBorder:FloatBorder,CursorLine:PmenuSel",
-            }
-            opts.window = {
-                completion = cmp.config.window.bordered(winhighlight),
-                documentation = cmp.config.window.bordered(winhighlight),
-            }
-        end
-
         cmp.setup(opts)
         cmp.setup.cmdline("/", {
             mapping = cmp.mapping.preset.cmdline(),
diff --git a/lua/ow/plugins/orgmode.lua b/lua/ow/plugins/orgmode.lua
index f10d3b8..f132cbd 100644
--- a/lua/ow/plugins/orgmode.lua
+++ b/lua/ow/plugins/orgmode.lua
@@ -23,7 +23,7 @@ return {
             DISCARDED = ":foreground grey :weight bold",
         },
         win_split_mode = "float",
-        win_border = "single",
+        win_border = "rounded",
         org_archive_location = "~/Documents/org/archive.org::",
         org_log_done = "note",
         org_log_into_drawer = "LOGBOOK",