diff --git a/modules/_neovim/plugins/opencode.nix b/modules/_neovim/plugins/opencode.nix
index 9e6e4c6..132b62c 100644
--- a/modules/_neovim/plugins/opencode.nix
+++ b/modules/_neovim/plugins/opencode.nix
@@ -10,8 +10,18 @@
 					rev = "800c4f891f5d940f2805780a39872a0207b5a446";
 					hash = "sha256-3xyZux5S8ThBsi7AC4AWnd2h2LEI5L+I5Am2PNWKu64=";
 				};
-			doCheck = false;
-		};
+		doCheck = false;
+		postPatch = ''
+			# Widen sign column and move border further left for more padding
+			sed -i "s/signcolumn', 'yes'/signcolumn', 'yes:2'/" lua/opencode/ui/output_window.lua
+			sed -i "s/, -3)/, -5)/g" lua/opencode/ui/formatter.lua
+			sed -i "s/win_col = -3/win_col = -5/g" lua/opencode/ui/formatter.lua
+			# Fix off-by-one: user border starts 1 line too early (bleeds into header empty line)
+			sed -i 's/start_line = output:get_line_count() *$/start_line = output:get_line_count() + 1/' lua/opencode/ui/formatter.lua
+			# Fix file mention border starting 1 line too early
+			sed -i 's/file_line - 1, file_line/file_line, file_line/' lua/opencode/ui/formatter.lua
+		'';
+	};
 in {
 	programs.nixvim = {
 		autoCmd = [
@@ -38,6 +48,10 @@ in {
 				ui = {
 					icons = {
 						preset = "text",
+						overrides = {
+							header_user = "● ",
+							header_assistant = "» ",
+						},
 					},
 					input = {
 						text = {
@@ -47,17 +61,17 @@ in {
 				},
 			})
 
+			local p = require("rose-pine.palette")
 			local hl = vim.api.nvim_set_hl
-			hl(0, "OpencodeBorder", { fg = "#9893a5" })
-			hl(0, "OpencodeMessageRoleUser", { fg = "#faf4ed" })
-			hl(0, "OpencodeToolBorder", { fg = "#faf4ed" })
-				hl(0, "OpencodeDiffAdd", { bg = "#dfeadf" })
-				hl(0, "OpencodeDiffDelete", { bg = "#f2dde2" })
-				hl(0, "OpencodeAgentPlan", { bg = "#907aa9", fg = "#fffaf3" })
-				hl(0, "OpencodeAgentBuild", { bg = "#56949f", fg = "#fffaf3" })
-				hl(0, "OpencodeAgentCustom", { bg = "#ea9d34", fg = "#fffaf3" })
-				hl(0, "OpencodeContestualAction", { bg = "#dfdad9" })
-				hl(0, "OpencodeInputLegend", { bg = "#f2e9e1", fg = "#797593" })
+			hl(0, "OpencodeBorder", { fg = p.muted })
+			hl(0, "OpencodeToolBorder", { fg = p.base })
+			hl(0, "OpencodeDiffAdd", { bg = p.highlight_med })
+			hl(0, "OpencodeDiffDelete", { bg = p.overlay })
+			hl(0, "OpencodeAgentPlan", { bg = p.iris, fg = p.surface })
+			hl(0, "OpencodeAgentBuild", { bg = p.foam, fg = p.surface })
+			hl(0, "OpencodeAgentCustom", { bg = p.gold, fg = p.surface })
+			hl(0, "OpencodeContestualAction", { bg = p.highlight_med })
+			hl(0, "OpencodeInputLegend", { bg = p.overlay, fg = p.subtle })
 		'';
 	};
 }