diff --git a/init.lua b/init.lua
index 193af4e..b1f44cd 100644
--- a/init.lua
+++ b/init.lua
@@ -190,6 +190,11 @@ require('telescope').setup {
       },
     },
   },
+  pickers = {
+    find_files = {
+      theme = "ivy",
+    }
+  },
 }
 
 -- Enable telescope fzf native, if installed
@@ -322,6 +327,18 @@ local on_attach = function(_, bufnr)
   vim.api.nvim_buf_create_user_command(bufnr, 'Format', function(_)
     vim.lsp.buf.format()
   end, { desc = 'Format current buffer with LSP' })
+
+  vim.lsp.handlers['textDocument/hover'] = vim.lsp.with(
+    vim.lsp.handlers.hover, {
+      border = "single"
+    }
+  )
+  vim.lsp.handlers['textDocument/signatureHelp'] = vim.lsp.with(
+    vim.lsp.handlers.signatureHelp, {
+      border = "single"
+    }
+  )
+  vim.diagnostic.config({ float = { border = "single" } })
 end
 
 local servers = {
diff --git a/lua/custom/plugins/cmp.lua b/lua/custom/plugins/cmp.lua
index 2b31db4..65b5b72 100644
--- a/lua/custom/plugins/cmp.lua
+++ b/lua/custom/plugins/cmp.lua
@@ -49,6 +49,7 @@ return {
   },
   config = function()
     local cmp = require 'cmp'
+    local winhighlight = "Normal:NormalFloat,FloatBorder:FloatBorder,CursorLine:PmenuSel"
     local luasnip = require 'luasnip'
     require('luasnip.loaders.from_vscode').lazy_load()
     luasnip.config.setup {}
@@ -137,8 +138,8 @@ return {
         end,
       },
       window = {
-        completion = cmp.config.window.bordered({}),
-        documentation = cmp.config.window.bordered({}),
+        completion = cmp.config.window.bordered({ winhighlight }),
+        documentation = cmp.config.window.bordered({ winhighlight }),
       },
     }
 
diff --git a/lua/custom/plugins/moonfly.lua b/lua/custom/plugins/moonfly.lua
new file mode 100644
index 0000000..1354a8d
--- /dev/null
+++ b/lua/custom/plugins/moonfly.lua
@@ -0,0 +1,12 @@
+return {
+  "bluz71/vim-nightfly-colors",
+  name = "nightfly",
+  lazy = false,
+  priority = 1000,
+  config = function()
+    vim.o.termguicolors = true
+    vim.cmd [[colorscheme nightfly]]
+    vim.g.nightflyCursorColor = true
+    vim.g.nightflyNormalFloat = true
+  end
+}
diff --git a/lua/custom/plugins/neosolarized.lua b/lua/custom/plugins/neosolarized.lua
index d0f9f62..822693d 100644
--- a/lua/custom/plugins/neosolarized.lua
+++ b/lua/custom/plugins/neosolarized.lua
@@ -1,57 +1,48 @@
-return {
-  "svrana/neosolarized.nvim",
-  priority = 1000,
-  dependencies = { "tjdevries/colorbuddy.vim" },
-  config = function()
-    local status, n = pcall(require, "neosolarized")
-    if (not status) then return end
-
-    vim.o.termguicolors = true
-
-    n.setup({
-      comment_italics = true,
-    })
-
-    local cb = require('colorbuddy.init')
-    local Color = cb.Color
-    local colors = cb.colors
-    local Group = cb.Group
-    local groups = cb.groups
-    local styles = cb.styles
-
-    Color.new('white', '#ffffff')
-    Color.new('black', '#000000')
-    Group.new('CursorLine', colors.none, colors.base03, styles.NONE, colors.base1)
-    Group.new('CursorLineNr', colors.yellow, colors.black, styles.NONE, colors.base1)
-    Group.new('Visual', colors.none, colors.base03, styles.reverse)
-
-    local cError = groups.Error.fg
-    local cInfo = groups.Information.fg
-    local cWarn = groups.Warning.fg
-    local cHint = groups.Hint.fg
-
-    Group.new("DiagnosticVirtualTextError", cError, cError:dark():dark():dark():dark(), styles.NONE)
-    Group.new("DiagnosticVirtualTextInfo", cInfo, cInfo:dark():dark():dark(), styles.NONE)
-    Group.new("DiagnosticVirtualTextWarn", cWarn, cWarn:dark():dark():dark(), styles.NONE)
-    Group.new("DiagnosticVirtualTextHint", cHint, cHint:dark():dark():dark(), styles.NONE)
-    Group.new("DiagnosticUnderlineError", colors.none, colors.none, styles.undercurl, cError)
-    Group.new("DiagnosticUnderlineWarn", colors.none, colors.none, styles.undercurl, cWarn)
-    Group.new("DiagnosticUnderlineInfo", colors.none, colors.none, styles.undercurl, cInfo)
-    Group.new("DiagnosticUnderlineHint", colors.none, colors.none, styles.undercurl, cHint)
-    Group.new("Macro", groups.PreProc, colors.none, styles.italic + styles.bold)
-    Group.link("Function", groups.Function, colors.none, styles.italic)
-    Group.new("Conditional", groups.Statement, colors.none, styles.italic)
-    Group.new("Boolean", groups.Constant, colors.none, styles.bold)
-    Group.new("HoverBorder", colors.yellow, colors.none, styles.NONE)
-  end
-}
-
--- SolarizedLight = {
---   'maxmx03/solarized.nvim',
---   lazy = false,
+return {}
+-- return {
+--   "svrana/neosolarized.nvim",
 --   priority = 1000,
+--   dependencies = { "tjdevries/colorbuddy.vim" },
 --   config = function()
---     vim.o.background = 'light'
---     vim.cmd.colorscheme 'solarized'
---   end,
+--     local status, n = pcall(require, "neosolarized")
+--     if (not status) then return end
+--
+--     vim.o.termguicolors = true
+--
+--     n.setup({
+--       comment_italics = true,
+--     })
+--
+--     local cb = require('colorbuddy.init')
+--     local Color = cb.Color
+--     local colors = cb.colors
+--     local Group = cb.Group
+--     local groups = cb.groups
+--     local styles = cb.styles
+--
+--     Color.new('white', '#ffffff')
+--     Color.new('black', '#000000')
+--     Group.new('CursorLine', colors.none, colors.base03, styles.NONE, colors.base1)
+--     Group.new('CursorLineNr', colors.yellow, colors.black, styles.NONE, colors.base1)
+--     Group.new('Visual', colors.none, colors.base03, styles.reverse)
+--
+--     local cError = groups.Error.fg
+--     local cInfo = groups.Information.fg
+--     local cWarn = groups.Warning.fg
+--     local cHint = groups.Hint.fg
+--
+--     Group.new("DiagnosticVirtualTextError", cError, cError:dark():dark():dark():dark(), styles.NONE)
+--     Group.new("DiagnosticVirtualTextInfo", cInfo, cInfo:dark():dark():dark(), styles.NONE)
+--     Group.new("DiagnosticVirtualTextWarn", cWarn, cWarn:dark():dark():dark(), styles.NONE)
+--     Group.new("DiagnosticVirtualTextHint", cHint, cHint:dark():dark():dark(), styles.NONE)
+--     Group.new("DiagnosticUnderlineError", colors.none, colors.none, styles.undercurl, cError)
+--     Group.new("DiagnosticUnderlineWarn", colors.none, colors.none, styles.undercurl, cWarn)
+--     Group.new("DiagnosticUnderlineInfo", colors.none, colors.none, styles.undercurl, cInfo)
+--     Group.new("DiagnosticUnderlineHint", colors.none, colors.none, styles.undercurl, cHint)
+--     Group.new("Macro", groups.PreProc, colors.none, styles.italic + styles.bold)
+--     Group.link("Function", groups.Function, colors.none, styles.italic)
+--     Group.new("Conditional", groups.Statement, colors.none, styles.italic)
+--     Group.new("Boolean", groups.Constant, colors.none, styles.bold)
+--     Group.new("HoverBorder", colors.yellow, colors.none, styles.NONE)
+--   end
 -- }
diff --git a/lua/custom/plugins/yuck.lua b/lua/custom/plugins/yuck.lua
new file mode 100644
index 0000000..eac6c18
--- /dev/null
+++ b/lua/custom/plugins/yuck.lua
@@ -0,0 +1,3 @@
+return {
+  "elkowar/yuck.vim",
+}