@fresh-editor/fresh-editor 0.3.4 → 0.3.6

package/plugins/theme_editor.i18n.json

@@ -131,10 +131,16 @@
     "field.ruler_bg_desc": "Barva svislé čáry pravítka",
     "field.diff_add_bg": "Diff Added pozadí",
     "field.diff_add_bg_desc": "Diff added řádek pozadí",
+    "field.diff_add_fg": "Diff Added popředí",
+    "field.diff_add_fg_desc": "Diff added řádek popředí",
     "field.diff_remove_bg": "Diff Removed pozadí",
     "field.diff_remove_bg_desc": "Diff removed řádek pozadí",
+    "field.diff_remove_fg": "Diff Removed popředí",
+    "field.diff_remove_fg_desc": "Diff removed řádek popředí",
     "field.diff_modify_bg": "Diff upraveno pozadí",
     "field.diff_modify_bg_desc": "Diff upraveno řádek pozadí",
+    "field.diff_modify_fg": "Diff upraveno popředí",
+    "field.diff_modify_fg_desc": "Diff upraveno řádek popředí",
     "field.tab_active_fg": "aktivní Tab popředí",
     "field.tab_active_fg_desc": "aktivní tab text barva",
     "field.tab_active_bg": "aktivní Tab pozadí",
@@ -624,14 +630,20 @@
     "prompt.delete_no": "Cancel",
     "field.diff_add_bg": "Diff Added Background",
     "field.diff_add_bg_desc": "Diff added line background",
+    "field.diff_add_fg": "Diff Added Foreground",
+    "field.diff_add_fg_desc": "Diff added line foreground",
     "field.diff_remove_bg": "Diff Removed Background",
     "field.diff_remove_bg_desc": "Diff removed line background",
+    "field.diff_remove_fg": "Diff Removed Foreground",
+    "field.diff_remove_fg_desc": "Diff removed line foreground",
     "field.diff_add_highlight_bg": "Diff Hinzugefügt Hervorhebung",
     "field.diff_add_highlight_bg_desc": "Wort-Hervorhebung für hinzugefügten Inhalt",
     "field.diff_remove_highlight_bg": "Diff Entfernt Hervorhebung",
     "field.diff_remove_highlight_bg_desc": "Wort-Hervorhebung für entfernten Inhalt",
     "field.diff_modify_bg": "Diff Modified Background",
     "field.diff_modify_bg_desc": "Diff modified line background",
+    "field.diff_modify_fg": "Diff Modified Foreground",
+    "field.diff_modify_fg_desc": "Diff modified line foreground",
     "field.status_warning_indicator_bg": "Warning Indicator Background",
     "field.status_warning_indicator_bg_desc": "Warning indicator background in status bar",
     "field.status_warning_indicator_fg": "Warning Indicator Foreground",
@@ -817,14 +829,20 @@
     "field.ruler_bg_desc": "Vertical ruler line color",
     "field.diff_add_bg": "Diff Added Background",
     "field.diff_add_bg_desc": "Diff added line background",
+    "field.diff_add_fg": "Diff Added Foreground",
+    "field.diff_add_fg_desc": "Diff added line foreground",
     "field.diff_remove_bg": "Diff Removed Background",
     "field.diff_remove_bg_desc": "Diff removed line background",
+    "field.diff_remove_fg": "Diff Removed Foreground",
+    "field.diff_remove_fg_desc": "Diff removed line foreground",
     "field.diff_add_highlight_bg": "Diff Added Highlight",
     "field.diff_add_highlight_bg_desc": "Word-level highlight for added content",
     "field.diff_remove_highlight_bg": "Diff Removed Highlight",
     "field.diff_remove_highlight_bg_desc": "Word-level highlight for removed content",
     "field.diff_modify_bg": "Diff Modified Background",
     "field.diff_modify_bg_desc": "Diff modified line background",
+    "field.diff_modify_fg": "Diff Modified Foreground",
+    "field.diff_modify_fg_desc": "Diff modified line foreground",
     "field.tab_active_fg": "Active Tab Foreground",
     "field.tab_active_fg_desc": "Active tab text color",
     "field.tab_active_bg": "Active Tab Background",
@@ -1310,14 +1328,20 @@
     "prompt.delete_no": "Cancel",
     "field.diff_add_bg": "Diff Added Background",
     "field.diff_add_bg_desc": "Diff added line background",
+    "field.diff_add_fg": "Diff Added Foreground",
+    "field.diff_add_fg_desc": "Diff added line foreground",
     "field.diff_remove_bg": "Diff Removed Background",
     "field.diff_remove_bg_desc": "Diff removed line background",
+    "field.diff_remove_fg": "Diff Removed Foreground",
+    "field.diff_remove_fg_desc": "Diff removed line foreground",
     "field.diff_add_highlight_bg": "Resaltado Diff Añadido",
     "field.diff_add_highlight_bg_desc": "Resaltado a nivel de palabra para contenido añadido",
     "field.diff_remove_highlight_bg": "Resaltado Diff Eliminado",
     "field.diff_remove_highlight_bg_desc": "Resaltado a nivel de palabra para contenido eliminado",
     "field.diff_modify_bg": "Diff Modified Background",
     "field.diff_modify_bg_desc": "Diff modified line background",
+    "field.diff_modify_fg": "Diff Modified Foreground",
+    "field.diff_modify_fg_desc": "Diff modified line foreground",
     "field.status_warning_indicator_bg": "Warning Indicator Background",
     "field.status_warning_indicator_bg_desc": "Warning indicator background in status bar",
     "field.status_warning_indicator_fg": "Warning Indicator Foreground",
@@ -1653,14 +1677,20 @@
     "prompt.delete_no": "Cancel",
     "field.diff_add_bg": "Diff Added Background",
     "field.diff_add_bg_desc": "Diff added line background",
+    "field.diff_add_fg": "Diff Added Foreground",
+    "field.diff_add_fg_desc": "Diff added line foreground",
     "field.diff_remove_bg": "Diff Removed Background",
     "field.diff_remove_bg_desc": "Diff removed line background",
+    "field.diff_remove_fg": "Diff Removed Foreground",
+    "field.diff_remove_fg_desc": "Diff removed line foreground",
     "field.diff_add_highlight_bg": "Surlignage Diff Ajouté",
     "field.diff_add_highlight_bg_desc": "Surlignage au niveau des mots pour le contenu ajouté",
     "field.diff_remove_highlight_bg": "Surlignage Diff Supprimé",
     "field.diff_remove_highlight_bg_desc": "Surlignage au niveau des mots pour le contenu supprimé",
     "field.diff_modify_bg": "Diff Modified Background",
     "field.diff_modify_bg_desc": "Diff modified line background",
+    "field.diff_modify_fg": "Diff Modified Foreground",
+    "field.diff_modify_fg_desc": "Diff modified line foreground",
     "field.status_warning_indicator_bg": "Warning Indicator Background",
     "field.status_warning_indicator_bg_desc": "Warning indicator background in status bar",
     "field.status_warning_indicator_fg": "Warning Indicator Foreground",
@@ -1996,14 +2026,20 @@
     "prompt.delete_no": "Cancel",
     "field.diff_add_bg": "Diff Added Background",
     "field.diff_add_bg_desc": "Diff added line background",
+    "field.diff_add_fg": "Diff Added Foreground",
+    "field.diff_add_fg_desc": "Diff added line foreground",
     "field.diff_remove_bg": "Diff Removed Background",
     "field.diff_remove_bg_desc": "Diff removed line background",
+    "field.diff_remove_fg": "Diff Removed Foreground",
+    "field.diff_remove_fg_desc": "Diff removed line foreground",
     "field.diff_add_highlight_bg": "Diff追加ハイライト",
     "field.diff_add_highlight_bg_desc": "追加コンテンツの単語レベルハイライト",
     "field.diff_remove_highlight_bg": "Diff削除ハイライト",
     "field.diff_remove_highlight_bg_desc": "削除コンテンツの単語レベルハイライト",
     "field.diff_modify_bg": "Diff Modified Background",
     "field.diff_modify_bg_desc": "Diff modified line background",
+    "field.diff_modify_fg": "Diff Modified Foreground",
+    "field.diff_modify_fg_desc": "Diff modified line foreground",
     "field.status_warning_indicator_bg": "Warning Indicator Background",
     "field.status_warning_indicator_bg_desc": "Warning indicator background in status bar",
     "field.status_warning_indicator_fg": "Warning Indicator Foreground",
@@ -2189,10 +2225,16 @@
     "field.ruler_bg_desc": "수직 눈금자 선 색상",
     "field.diff_add_bg": "Diff Added 배경",
     "field.diff_add_bg_desc": "Diff added 줄 배경",
+    "field.diff_add_fg": "Diff Added 전경",
+    "field.diff_add_fg_desc": "Diff added 줄 전경",
     "field.diff_remove_bg": "Diff Removed 배경",
     "field.diff_remove_bg_desc": "Diff removed 줄 배경",
+    "field.diff_remove_fg": "Diff Removed 전경",
+    "field.diff_remove_fg_desc": "Diff removed 줄 전경",
     "field.diff_modify_bg": "Diff 수정됨 배경",
     "field.diff_modify_bg_desc": "Diff 수정됨 줄 배경",
+    "field.diff_modify_fg": "Diff 수정됨 전경",
+    "field.diff_modify_fg_desc": "Diff 수정됨 줄 전경",
     "field.tab_active_fg": "활성 Tab 전경",
     "field.tab_active_fg_desc": "활성 tab 텍스트 색상",
     "field.tab_active_bg": "활성 Tab 배경",
@@ -2532,10 +2574,16 @@
     "field.ruler_bg_desc": "Cor da linha da regua vertical",
     "field.diff_add_bg": "Diff Added fundo",
     "field.diff_add_bg_desc": "Diff added linha fundo",
+    "field.diff_add_fg": "Diff Added primeiro plano",
+    "field.diff_add_fg_desc": "Diff added linha primeiro plano",
     "field.diff_remove_bg": "Diff Removed fundo",
     "field.diff_remove_bg_desc": "Diff removed linha fundo",
+    "field.diff_remove_fg": "Diff Removed primeiro plano",
+    "field.diff_remove_fg_desc": "Diff removed linha primeiro plano",
     "field.diff_modify_bg": "Diff modificado fundo",
     "field.diff_modify_bg_desc": "Diff modificado linha fundo",
+    "field.diff_modify_fg": "Diff modificado primeiro plano",
+    "field.diff_modify_fg_desc": "Diff modificado linha primeiro plano",
     "field.tab_active_fg": "ativo Tab primeiro plano",
     "field.tab_active_fg_desc": "ativo tab texto cor",
     "field.tab_active_bg": "ativo Tab fundo",
@@ -2875,10 +2923,16 @@
     "field.ruler_bg_desc": "Цвет вертикальной линии линейки",
     "field.diff_add_bg": "Diff Added фон",
     "field.diff_add_bg_desc": "Diff added строка фон",
+    "field.diff_add_fg": "Diff Added передний план",
+    "field.diff_add_fg_desc": "Diff added строка передний план",
     "field.diff_remove_bg": "Diff Removed фон",
     "field.diff_remove_bg_desc": "Diff removed строка фон",
+    "field.diff_remove_fg": "Diff Removed передний план",
+    "field.diff_remove_fg_desc": "Diff removed строка передний план",
     "field.diff_modify_bg": "Diff изменено фон",
     "field.diff_modify_bg_desc": "Diff изменено строка фон",
+    "field.diff_modify_fg": "Diff изменено передний план",
+    "field.diff_modify_fg_desc": "Diff изменено строка передний план",
     "field.tab_active_fg": "активный Tab передний план",
     "field.tab_active_fg_desc": "активный tab текст цвет",
     "field.tab_active_bg": "активный Tab фон",
@@ -3218,10 +3272,16 @@
     "field.ruler_bg_desc": "สีเส้นไม้บรรทัดแนวตั้ง",
     "field.diff_add_bg": "Diff Added พื้นหลัง",
     "field.diff_add_bg_desc": "Diff added บรรทัด พื้นหลัง",
+    "field.diff_add_fg": "Diff Added พื้นหน้า",
+    "field.diff_add_fg_desc": "Diff added บรรทัด พื้นหน้า",
     "field.diff_remove_bg": "Diff Removed พื้นหลัง",
     "field.diff_remove_bg_desc": "Diff removed บรรทัด พื้นหลัง",
+    "field.diff_remove_fg": "Diff Removed พื้นหน้า",
+    "field.diff_remove_fg_desc": "Diff removed บรรทัด พื้นหน้า",
     "field.diff_modify_bg": "Diff แก้ไขแล้ว พื้นหลัง",
     "field.diff_modify_bg_desc": "Diff แก้ไขแล้ว บรรทัด พื้นหลัง",
+    "field.diff_modify_fg": "Diff แก้ไขแล้ว พื้นหน้า",
+    "field.diff_modify_fg_desc": "Diff แก้ไขแล้ว บรรทัด พื้นหน้า",
     "field.tab_active_fg": "ใช้งาน Tab พื้นหน้า",
     "field.tab_active_fg_desc": "ใช้งาน tab ข้อความ สี",
     "field.tab_active_bg": "ใช้งาน Tab พื้นหลัง",
@@ -3561,10 +3621,16 @@
     "field.ruler_bg_desc": "Колір вертикальної лінії лінійки",
     "field.diff_add_bg": "Diff Added фон",
     "field.diff_add_bg_desc": "Diff added рядок фон",
+    "field.diff_add_fg": "Diff Added передній план",
+    "field.diff_add_fg_desc": "Diff added рядок передній план",
     "field.diff_remove_bg": "Diff Removed фон",
     "field.diff_remove_bg_desc": "Diff removed рядок фон",
+    "field.diff_remove_fg": "Diff Removed передній план",
+    "field.diff_remove_fg_desc": "Diff removed рядок передній план",
     "field.diff_modify_bg": "Diff змінено фон",
     "field.diff_modify_bg_desc": "Diff змінено рядок фон",
+    "field.diff_modify_fg": "Diff змінено передній план",
+    "field.diff_modify_fg_desc": "Diff змінено рядок передній план",
     "field.tab_active_fg": "активний Tab передній план",
     "field.tab_active_fg_desc": "активний tab текст колір",
     "field.tab_active_bg": "активний Tab фон",
@@ -3904,10 +3970,16 @@
     "field.ruler_bg_desc": "Màu đường thước kẻ dọc",
     "field.diff_add_bg": "Nền diff thêm",
     "field.diff_add_bg_desc": "Nền dòng diff được thêm",
+    "field.diff_add_fg": "Tiền cảnh diff thêm",
+    "field.diff_add_fg_desc": "Tiền cảnh dòng diff được thêm",
     "field.diff_remove_bg": "Nền diff xóa",
     "field.diff_remove_bg_desc": "Nền dòng diff bị xóa",
+    "field.diff_remove_fg": "Tiền cảnh diff xóa",
+    "field.diff_remove_fg_desc": "Tiền cảnh dòng diff bị xóa",
     "field.diff_modify_bg": "Nền diff sửa đổi",
     "field.diff_modify_bg_desc": "Nền dòng diff đã sửa đổi",
+    "field.diff_modify_fg": "Tiền cảnh diff sửa đổi",
+    "field.diff_modify_fg_desc": "Tiền cảnh dòng diff đã sửa đổi",
     "field.tab_active_fg": "Tiền cảnh tab hoạt động",
     "field.tab_active_fg_desc": "Màu văn bản tab hoạt động",
     "field.tab_active_bg": "Nền tab hoạt động",
@@ -4397,14 +4469,20 @@
     "prompt.delete_no": "Cancel",
     "field.diff_add_bg": "Diff Added Background",
     "field.diff_add_bg_desc": "Diff added line background",
+    "field.diff_add_fg": "Diff Added Foreground",
+    "field.diff_add_fg_desc": "Diff added line foreground",
     "field.diff_remove_bg": "Diff Removed Background",
     "field.diff_remove_bg_desc": "Diff removed line background",
+    "field.diff_remove_fg": "Diff Removed Foreground",
+    "field.diff_remove_fg_desc": "Diff removed line foreground",
     "field.diff_add_highlight_bg": "Diff添加高亮",
     "field.diff_add_highlight_bg_desc": "添加内容的词级高亮",
     "field.diff_remove_highlight_bg": "Diff删除高亮",
     "field.diff_remove_highlight_bg_desc": "删除内容的词级高亮",
     "field.diff_modify_bg": "Diff Modified Background",
     "field.diff_modify_bg_desc": "Diff modified line background",
+    "field.diff_modify_fg": "Diff Modified Foreground",
+    "field.diff_modify_fg_desc": "Diff modified line foreground",
     "field.status_warning_indicator_bg": "Warning Indicator Background",
     "field.status_warning_indicator_bg_desc": "Warning indicator background in status bar",
     "field.status_warning_indicator_fg": "Warning Indicator Foreground",
@@ -4566,10 +4644,16 @@
     "field.ruler_bg_desc": "Colore della linea del righello verticale",
     "field.diff_add_bg": "Sfondo Diff Aggiunta",
     "field.diff_add_bg_desc": "Sfondo della riga aggiunta nel diff",
+    "field.diff_add_fg": "Primo piano Diff Aggiunta",
+    "field.diff_add_fg_desc": "Primo piano della riga aggiunta nel diff",
     "field.diff_remove_bg": "Sfondo Diff Rimozione",
     "field.diff_remove_bg_desc": "Sfondo della riga rimossa nel diff",
+    "field.diff_remove_fg": "Primo piano Diff Rimozione",
+    "field.diff_remove_fg_desc": "Primo piano della riga rimossa nel diff",
     "field.diff_modify_bg": "Sfondo Diff Modifica",
     "field.diff_modify_bg_desc": "Sfondo della riga modificata nel diff",
+    "field.diff_modify_fg": "Primo piano Diff Modifica",
+    "field.diff_modify_fg_desc": "Primo piano della riga modificata nel diff",
     "field.tab_active_fg": "Primo piano scheda attiva",
     "field.tab_active_fg_desc": "Colore del testo della scheda attiva",
     "field.tab_active_bg": "Sfondo scheda attiva",

package/plugins/theme_editor.ts

@@ -1,4 +1,5 @@
 /// <reference path="./lib/fresh.d.ts" />
+import { hintBar, parseHintString, WidgetPanel } from "./lib/index.ts";
 const editor = getEditor();
 
 
@@ -414,6 +415,12 @@ interface ThemeEditorState {
   viewportWidth: number;
   /** Buffer group ID (when using buffer groups) */
   groupId: number | null;
+  /** Widget panel rendering the footer hint bar. Created when the
+   * buffer-group view opens. The tree and picker panels still use
+   * `setPanelContent` because they own the focus model (header
+   * row, separator, optional filter line, then selectable section /
+   * field rows) which doesn't map cleanly to a single List today. */
+  footerPanel: WidgetPanel | null;
   /** Panel buffer IDs keyed by panel name */
   panelBuffers: Record<string, number>;
 }
@@ -478,6 +485,7 @@ const state: ThemeEditorState = {
   viewportHeight: 40,
   viewportWidth: 120,
   groupId: null,
+  footerPanel: null,
   panelBuffers: {},
 };
 
@@ -1437,9 +1445,16 @@ function buildPickerPanelEntries(): TextPropertyEntry[] {
   return entries;
 }
 
-function buildFooterPanelEntries(): TextPropertyEntry[] {
-  const hintText = " ↑↓ Navigate  Tab Switch Panel  Enter Edit  /Filter  Ctrl+S Save  Esc Close";
-  return [{ text: hintText + "\n", style: { fg: colors.header } }];
+/** Render the footer hints into the footer widget panel. The hint
+ * string follows `parseHintString`'s convention (tokens separated
+ * by two spaces; each token is `<keys>:<label>` or `<keys> <label>`)
+ * so the host's HintBar styles the keys with `ui.help_key_fg`
+ * consistently with every other plugin's footer. */
+function renderThemeEditorFooter(): void {
+  if (state.footerPanel === null) return;
+  const hintString =
+    "↑↓:Navigate  Tab:Switch Panel  Enter:Edit  /:Filter  Ctrl+S:Save  Esc:Close";
+  state.footerPanel.set(hintBar(parseHintString(hintString)));
 }
 
 function updateDisplay(): void {
@@ -1456,7 +1471,7 @@ function updateDisplay(): void {
   if (state.groupId !== null) {
     editor.setPanelContent(state.groupId, "tree", buildTreePanelEntries());
     editor.setPanelContent(state.groupId, "picker", buildPickerPanelEntries());
-    editor.setPanelContent(state.groupId, "footer", buildFooterPanelEntries());
+    renderThemeEditorFooter();
 
     // Keep the selected tree row in view. The plugin's `selectedIndex`
     // navigation doesn't move the buffer cursor, so without this the
@@ -2678,6 +2693,13 @@ async function doOpenThemeEditor(): Promise<void> {
   state.bufferId = groupResult.panels["tree"]; // representative buffer
   state.splitId = null;
 
+  // Mount the footer as a widget panel (HintBar). Tree + picker
+  // panels still use `setPanelContent` (see updateDisplay).
+  const footerBufferId = groupResult.panels["footer"];
+  if (typeof footerBufferId === "number") {
+    state.footerPanel = new WidgetPanel(footerBufferId);
+  }
+
   if (state.bufferId !== null) {
     // Set initial content for all panels
     updateDisplay();
@@ -2714,7 +2736,10 @@ registerHandler("theme_editor_close", theme_editor_close);
  * Actually close the editor (called after confirmation or when no changes)
  */
 function doCloseEditor(): void {
-  // Close the buffer group (or fall back to single buffer close)
+  // Close the buffer group (or fall back to single buffer close).
+  // Closing the buffer group tears down the footer buffer too,
+  // implicitly dropping the widget panel rendering into it.
+  state.footerPanel = null;
   if (state.groupId !== null) {
     editor.closeBufferGroup(state.groupId);
     state.groupId = null;

package/plugins/tsconfig.json

@@ -21,6 +21,7 @@
     "lib/search-utils.ts",
     "lib/types.ts",
     "lib/virtual-buffer-factory.ts",
+    "lib/widgets.ts",
     "astro-lsp.ts",
     "audit_mode.ts",
     "bash-lsp.ts",
@@ -48,6 +49,7 @@
     "git_gutter.ts",
     "git_log.ts",
     "gleam-lsp.ts",
+    "goto_with_selection.ts",
     "go-lsp.ts",
     "graphql-lsp.ts",
     "haskell-lsp.ts",

package/plugins/vi_mode.ts

@@ -2889,24 +2889,25 @@ editor.on("prompt_confirmed", async (args) => {
 
 let viModeEnabled = false;
 
-function vi_mode_toggle(): void {
-  editor.debug("[vi_mode_toggle] called, viModeEnabled was: " + viModeEnabled);
-  viModeEnabled = !viModeEnabled;
-  editor.debug("[vi_mode_toggle] viModeEnabled now: " + viModeEnabled);
+function enableVi(): void {
+  if (viModeEnabled) return;
+  viModeEnabled = true;
+  switchMode("normal");
+  editor.setStatus(editor.t("status.enabled"));
+}
 
-  if (viModeEnabled) {
-    editor.debug("[vi_mode_toggle] enabling vi mode, calling switchMode('normal')");
-    switchMode("normal");
-    editor.debug("[vi_mode_toggle] switchMode done, setting status");
-    editor.setStatus(editor.t("status.enabled"));
-  } else {
-    editor.debug("[vi_mode_toggle] disabling vi mode");
-    editor.setEditorMode(null);
-    state.mode = "normal";
-    state.pendingOperator = null;
-    editor.setStatus(editor.t("status.disabled"));
-  }
-  editor.debug("[vi_mode_toggle] done");
+function disableVi(): void {
+  if (!viModeEnabled) return;
+  viModeEnabled = false;
+  editor.setEditorMode(null);
+  state.mode = "normal";
+  state.pendingOperator = null;
+  editor.setStatus(editor.t("status.disabled"));
+}
+
+function vi_mode_toggle(): void {
+  if (viModeEnabled) disableVi();
+  else enableVi();
 }
 registerHandler("vi_mode_toggle", vi_mode_toggle);
 
@@ -2917,6 +2918,26 @@ editor.registerCommand(
   null,  // Always visible - needed to enable vi mode in the first place
 );
 
+export type ViModeApi = {
+  toggle(): void;
+  enable(): void;
+  disable(): void;
+  isEnabled(): boolean;
+};
+
+declare global {
+  interface FreshPluginRegistry {
+    "vi-mode": ViModeApi;
+  }
+}
+
+editor.exportPluginApi("vi-mode", {
+  toggle: vi_mode_toggle,
+  enable: enableVi,
+  disable: disableVi,
+  isEnabled: () => viModeEnabled,
+} satisfies ViModeApi);
+
 // ============================================================================
 // Initialization
 // ============================================================================

package/themes/terminal.json

@@ -15,6 +15,9 @@
     "diff_add_highlight_bg": "LightGreen",
     "diff_remove_highlight_bg": "LightRed",
     "diff_modify_bg": "Yellow",
+    "diff_add_fg": "Black",
+    "diff_remove_fg": "White",
+    "diff_modify_fg": "Black",
     "ruler_bg": "DarkGray",
     "whitespace_indicator_fg": "DarkGray",
     "after_eof_bg": "Default"