diff --git a/modules/_neovim/autocmd.nix b/modules/_neovim/autocmd.nix
index 50f6058..db961a5 100644
--- a/modules/_neovim/autocmd.nix
+++ b/modules/_neovim/autocmd.nix
@@ -5,6 +5,21 @@
 		};
 
 		autoCmd = [
+			{
+				event = ["VimEnter" "ColorScheme"];
+				group = "Christoph";
+				pattern = "*";
+				callback.__raw = ''
+					function()
+						local base = require("rose-pine.palette").base
+						local foam = require("rose-pine.palette").foam
+						vim.api.nvim_set_hl(0, "NormalFloat", { bg = base })
+						vim.api.nvim_set_hl(0, "FloatTitle", { fg = foam, bg = base, bold = true })
+						vim.api.nvim_set_hl(0, "MiniPickPrompt", { bg = base, bold = true })
+						vim.api.nvim_set_hl(0, "MiniPickBorderText", { bg = base })
+					end
+				'';
+			}
 			{
 				event = "BufWritePre";
 				group = "Christoph";
@@ -29,16 +44,6 @@
 				pattern = "elixir,eelixir,heex";
 				command = "setlocal expandtab tabstop=2 shiftwidth=2 softtabstop=2";
 			}
-			{
-				event = "FileType";
-				group = "Christoph";
-				pattern = "opencode,opencode_output";
-				callback.__raw = ''
-					function()
-						vim.b.ministatusline_disable = true
-					end
-				'';
-			}
 		];
 	};
 }
diff --git a/modules/_neovim/default.nix b/modules/_neovim/default.nix
index a3dad34..453dd0b 100644
--- a/modules/_neovim/default.nix
+++ b/modules/_neovim/default.nix
@@ -31,8 +31,10 @@
 			enable = true;
 			settings = {
 				variant = "dawn";
+				extend_background_behind_borders = false;
 			};
 		};
+
 	};
 
 	home.shellAliases = {
diff --git a/modules/_neovim/plugins/opencode.nix b/modules/_neovim/plugins/opencode.nix
index 5048f32..a5e0a24 100644
--- a/modules/_neovim/plugins/opencode.nix
+++ b/modules/_neovim/plugins/opencode.nix
@@ -14,6 +14,19 @@
 		};
 in {
 	programs.nixvim = {
+		autoCmd = [
+			{
+				event = "FileType";
+				group = "Christoph";
+				pattern = "opencode,opencode_output";
+				callback.__raw = ''
+					function()
+						vim.b.ministatusline_disable = true
+					end
+				'';
+			}
+		];
+
 		extraPlugins = [
 			opencode-nvim
 		];