diff --git a/internal/tui/components/dialogs/lazygit/lazygit.go b/internal/tui/components/dialogs/lazygit/lazygit.go
index ff2447a6bc523a8044fd002a94cc2240c4c6a823..0a6820d4c874f5d6224fbdb7d3c9b4e6052e151e 100644
--- a/internal/tui/components/dialogs/lazygit/lazygit.go
+++ b/internal/tui/components/dialogs/lazygit/lazygit.go
@@ -93,17 +93,17 @@ func createThemedConfig() string {
     defaultFgColor:
       - default
 `,
-		colorToHex(t.BorderFocus), // Active border: purple (Charple)
-		colorToHex(t.Border),      // Inactive border: gray (Charcoal)
-		colorToHex(t.Info),        // Search border: blue (Malibu) - calmer than warning
-		colorToHex(t.FgMuted),     // Options text: muted gray (Squid) - matches help text
-		colorToHex(t.Primary),     // Selected line bg: purple (Charple) - matches TextSelected
-		colorToHex(t.BgSubtle),    // Inactive selected: subtle gray (Charcoal)
-		colorToHex(t.Success),     // Cherry-picked fg: green (Guac) - positive action
-		colorToHex(t.BgSubtle),    // Cherry-picked bg: subtle (Charcoal)
-		colorToHex(t.Info),        // Marked base fg: blue (Malibu) - distinct from cherry
-		colorToHex(t.BgSubtle),    // Marked base bg: subtle (Charcoal)
-		colorToHex(t.Error),       // Unstaged changes: red (Sriracha)
+		colorToHex(t.BorderFocus),
+		colorToHex(t.FgMuted),
+		colorToHex(t.Info),
+		colorToHex(t.FgMuted),
+		colorToHex(t.Primary),
+		colorToHex(t.BgSubtle),
+		colorToHex(t.Success),
+		colorToHex(t.BgSubtle),
+		colorToHex(t.Info),
+		colorToHex(t.BgSubtle),
+		colorToHex(t.Error),
 	)
 
 	f, err := os.CreateTemp("", "crush-lazygit-*.yml")
diff --git a/internal/tui/components/dialogs/termdialog/termdialog.go b/internal/tui/components/dialogs/termdialog/termdialog.go
index b3c85d7f6360436a2e3820e42a8f2e54314b9c40..88f3091e1f5b4c083016107b19f22a35d013db07 100644
--- a/internal/tui/components/dialogs/termdialog/termdialog.go
+++ b/internal/tui/components/dialogs/termdialog/termdialog.go
@@ -149,7 +149,6 @@ func (d *Dialog) handleResize(msg tea.WindowSizeMsg) (util.Model, tea.Cmd) {
 }
 
 func (d *Dialog) handleKey(msg tea.KeyPressMsg) (util.Model, tea.Cmd) {
-	// Forward all keys to the terminal.
 	if msg.Text != "" {
 		d.term.SendText(msg.Text)
 	} else {
@@ -232,10 +231,8 @@ func (d *Dialog) Cursor() *tea.Cursor {
 	t := styles.CurrentTheme()
 	row, col := d.Position()
 	cursor := tea.NewCursor(x, y)
-	// Adjust for dialog position: border (1) + header height
 	cursor.X += col + 1
 	cursor.Y += row + 1 + headerHeight
-	// Match the app's cursor style
 	cursor.Color = t.Secondary
 	cursor.Shape = tea.CursorBlock
 	cursor.Blink = true