diff --git a/modules/nvim/config/lua/plugins/lualine.lua b/modules/nvim/config/lua/plugins/lualine.lua
index 96d2b6d..c07e627 100644
--- a/modules/nvim/config/lua/plugins/lualine.lua
+++ b/modules/nvim/config/lua/plugins/lualine.lua
@@ -1,9 +1,54 @@
+local colors = {
+  black = "#0d0e1c",
+  white = "#ffffff",
+  red = "#ef8386",
+  green = "#88ca9f",
+  blue = "#82b0ec",
+  magenta = "#caa6df",
+  cyan = "#9ac8e0",
+  gray = "#4a4f69",
+  darkgray = "#1d2235",
+  lightgray = "#989898",
+}
+
+local modus_vivendi_tinted = {
+  normal = {
+    a = { bg = colors.blue, fg = colors.black, gui = "bold" },
+    b = { bg = colors.darkgray, fg = colors.blue },
+    c = { bg = colors.darkgray, fg = colors.white },
+  },
+  insert = {
+    a = { bg = colors.cyan, fg = colors.black, gui = "bold" },
+    b = { bg = colors.darkgray, fg = colors.cyan },
+    c = { bg = colors.darkgray, fg = colors.white },
+  },
+  visual = {
+    a = { bg = colors.magenta, fg = colors.black, gui = "bold" },
+    b = { bg = colors.darkgray, fg = colors.magenta },
+    c = { bg = colors.darkgray, fg = colors.white },
+  },
+  replace = {
+    a = { bg = colors.red, fg = colors.black, gui = "bold" },
+    b = { bg = colors.darkgray, fg = colors.red },
+    c = { bg = colors.darkgray, fg = colors.white },
+  },
+  command = {
+    a = { bg = colors.green, fg = colors.black, gui = "bold" },
+    b = { bg = colors.darkgray, fg = colors.green },
+    c = { bg = colors.darkgray, fg = colors.white },
+  },
+  inactive = {
+    a = { bg = colors.black, fg = colors.lightgray },
+    b = { bg = colors.black, fg = colors.lightgray },
+    c = { bg = colors.black, fg = colors.lightgray },
+  },
+}
+
 return {
-  -- TODO: Fix colorscheme for lualine
   "nvim-lualine/lualine.nvim",
   opts = {
     options = {
-      theme = "auto",
+      theme = modus_vivendi_tinted,
       icons_enabled = false,
       -- globalstatus = true
       component_separators = { left = "|", right = "|" },
@@ -34,11 +79,10 @@ return {
           },
         },
         "encoding",
-        "filetype",
       },
       lualine_c = {},
       lualine_x = {},
-      lualine_y = { "branch", "diff", "diagnostics", "lsp_status" },
+      lualine_y = { "branch", "diff", "diagnostics" },
       lualine_z = { "progress" },
     },
   },
diff --git a/modules/nvim/config/lua/plugins/which-key.lua b/modules/nvim/config/lua/plugins/which-key.lua
index 150c5b5..9df24d1 100644
--- a/modules/nvim/config/lua/plugins/which-key.lua
+++ b/modules/nvim/config/lua/plugins/which-key.lua
@@ -118,8 +118,8 @@ return {
       },
       {
         "<leader>wd",
-        "<cmd>bd<cr>",
-        desc = "Delete buffer and window",
+        "<cmd>close<cr>",
+        desc = "Delete window only",
         mode = "n",
       },