diff --git a/_locales/de/messages.json b/_locales/de/messages.json
index c2ce82c..a190aed 100644
--- a/_locales/de/messages.json
+++ b/_locales/de/messages.json
@@ -172,5 +172,131 @@
   },
   "next": {
     "message": "Nächste"
+  },
+  "duplicate": {
+    "message": "Duplizieren"
+  },
+  "merge": {
+    "message": "Zusammenführen"
+  },
+  "move": {
+    "message": "Verschieben"
+  },
+  "copy": {
+    "message": "Kopieren"
+  },
+  "merge_lists_min_two": {
+    "message": "Wählen Sie mindestens zwei Listen zum Zusammenführen aus."
+  },
+  "merge_lists_confirm": {
+    "message": "{count} Liste(n) in \"{target}\" zusammenführen? Quelllisten werden entfernt."
+  },
+  "delete_current_list": {
+    "message": "Aktuelle Liste löschen?"
+  },
+  "delete_lists_confirm": {
+    "message": "{count} ausgewählte Liste(n) löschen?"
+  },
+  "invalid_import_format": {
+    "message": "Ungültiges Dateiformat. Bitte wählen Sie eine gültige Goose Highlighter-Exportdatei."
+  },
+  "import_failed": {
+    "message": "Import der Datei fehlgeschlagen. Bitte stellen Sie sicher, dass es sich um eine gültige JSON-Datei handelt."
+  },
+  "import_confirm": {
+    "message": "{count} Liste(n) mit insgesamt {words} Wort/Wörtern importieren?"
+  },
+  "import_success": {
+    "message": "{count} Liste(n) mit {words} Wort/Wörtern erfolgreich importiert."
+  },
+  "preview_label": {
+    "message": "Vorschau"
+  },
+  "preview_text": {
+    "message": "So wird Ihr hervorgehobener Text angezeigt."
+  },
+  "preview_text_before": {
+    "message": "So wird Ihr"
+  },
+  "preview_text_highlight": {
+    "message": "hervorgehobener Text"
+  },
+  "preview_text_after": {
+    "message": "angezeigt."
+  },
+  "enable_highlighting_title": {
+    "message": "Hervorhebung aktivieren"
+  },
+  "enable_highlighting_subtitle": {
+    "message": "Hervorhebungen auf Seiten anzeigen"
+  },
+  "manage_lists": {
+    "message": "Listen verwalten"
+  },
+  "background_label": {
+    "message": "Hintergrund"
+  },
+  "foreground_label": {
+    "message": "Vordergrund"
+  },
+  "multi_select_hint": {
+    "message": "Klicken zum Auswählen • Strg/Cmd+Klick für Mehrfachauswahl"
+  },
+  "dark_mode_title": {
+    "message": "Dunkelmodus"
+  },
+  "dark_mode_subtitle": {
+    "message": "Zwischen hellem und dunklem Design wechseln"
+  },
+  "list_manager_title": {
+    "message": "Listenverwaltung"
+  },
+  "words_label": {
+    "message": "Wörter"
+  },
+  "active_label": {
+    "message": "aktiv"
+  },
+  "inactive_label": {
+    "message": "inaktiv"
+  },
+  "drag_words_hint": {
+    "message": "Klicken zum Auswählen • Strg/Cmd+Klick für Mehrfachauswahl • Wörter zu Listen ziehen zum Kopieren"
+  },
+  "drag_lists_hint": {
+    "message": "Listen ziehen zum Neuordnen • Strg+Klick für Mehrfachauswahl"
+  },
+  "showing_items": {
+    "message": "Zeige {start}-{end} von {total} Wörtern"
+  },
+  "items_per_page": {
+    "message": "Elemente pro Seite:"
+  },
+  "page_info": {
+    "message": "Seite {current} von {total}"
+  },
+  "toggle_active": {
+    "message": "Aktiv umschalten"
+  },
+  "rename_list_title": {
+    "message": "Liste umbenennen"
+  },
+  "new_list_title": {
+    "message": "Neue Liste"
+  },
+  "delete_list_title": {
+    "message": "Liste löschen"
+  },
+  "list_active_badge": {
+    "message": "Aktiv"
+  },
+  "list_paused_badge": {
+    "message": "Pausiert"
+  },
+  "words_stats": {
+    "message": "{total} Wörter • {active} aktiv • {inactive} inaktiv"
+  },
+  "rename_list": {
+    "message": "Liste umbenennen"
   }
 }
\ No newline at end of file
diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 0d6c0c8..fd0ea0f 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -178,5 +178,161 @@
   },
   "next": {
     "message": "Next"
+  },
+  "duplicate": {
+    "message": "Duplicate"
+  },
+  "merge": {
+    "message": "Merge"
+  },
+  "move": {
+    "message": "Move"
+  },
+  "copy": {
+    "message": "Copy"
+  },
+  "merge_lists_min_two": {
+    "message": "Select at least two lists to merge."
+  },
+  "merge_lists_confirm": {
+    "message": "Merge {count} list(s) into \"{target}\"? Source lists will be removed."
+  },
+  "delete_current_list": {
+    "message": "Delete current list?"
+  },
+  "delete_lists_confirm": {
+    "message": "Delete {count} selected list(s)?"
+  },
+  "invalid_import_format": {
+    "message": "Invalid file format. Please select a valid Goose Highlighter export file."
+  },
+  "import_failed": {
+    "message": "Failed to import file. Please ensure it is a valid JSON file."
+  },
+  "import_confirm": {
+    "message": "Import {count} list(s) with {words} total word(s)?"
+  },
+  "import_success": {
+    "message": "Successfully imported {count} list(s) with {words} word(s)."
+  },
+  "preview_label": {
+    "message": "Preview"
+  },
+  "preview_text": {
+    "message": "This is how your highlighted text will appear."
+  },
+  "preview_text_before": {
+    "message": "This is how your"
+  },
+  "preview_text_highlight": {
+    "message": "highlighted text"
+  },
+  "preview_text_after": {
+    "message": "will appear."
+  },
+  "enable_highlighting_title": {
+    "message": "Enable Highlighting"
+  },
+  "enable_highlighting_subtitle": {
+    "message": "Show highlights on pages"
+  },
+  "manage_lists": {
+    "message": "Manage Lists"
+  },
+  "background_label": {
+    "message": "Background"
+  },
+  "foreground_label": {
+    "message": "Foreground"
+  },
+  "multi_select_hint": {
+    "message": "Click to select • Ctrl/Cmd+Click for multi-select"
+  },
+  "dark_mode_title": {
+    "message": "Dark Mode"
+  },
+  "dark_mode_subtitle": {
+    "message": "Toggle dark/light theme"
+  },
+  "list_manager_title": {
+    "message": "List Manager"
+  },
+  "words_label": {
+    "message": "words"
+  },
+  "active_label": {
+    "message": "active"
+  },
+  "inactive_label": {
+    "message": "inactive"
+  },
+  "drag_words_hint": {
+    "message": "Click to select • Ctrl/Cmd+Click for multi-select • Drag words to lists to copy"
+  },
+  "drag_lists_hint": {
+    "message": "Drag lists to reorder • Ctrl+Click for multi-select"
+  },
+  "showing_items": {
+    "message": "Showing {start}-{end} of {total} words"
+  },
+  "items_per_page": {
+    "message": "Items per page:"
+  },
+  "page_info": {
+    "message": "Page {current} of {total}"
+  },
+  "toggle_active": {
+    "message": "toggle active"
+  },
+  "rename_list_title": {
+    "message": "Rename list"
+  },
+  "new_list_title": {
+    "message": "New list"
+  },
+  "delete_list_title": {
+    "message": "Delete list"
+  },
+  "list_active_badge": {
+    "message": "Active"
+  },
+  "list_paused_badge": {
+    "message": "Paused"
+  },
+  "words_stats": {
+    "message": "{total} words • {active} active • {inactive} inactive"
+  },
+  "rename_list": {
+    "message": "Rename List"
+  },
+  "no_words_in_list": {
+    "message": "No words in this list."
+  },
+  "edit_word": {
+    "message": "Edit word"
+  },
+  "first_page": {
+    "message": "First page"
+  },
+  "previous_page": {
+    "message": "Previous page"
+  },
+  "next_page": {
+    "message": "Next page"
+  },
+  "last_page": {
+    "message": "Last page"
+  },
+  "enter_list_name": {
+    "message": "Enter list name:"
+  },
+  "cannot_delete_last_list": {
+    "message": "Cannot delete the last list"
+  },
+  "edit_list_name_and_colors_title": {
+    "message": "Edit list name and colors"
+  },
+  "close": {
+    "message": "Close"
   }
 }
\ No newline at end of file
diff --git a/_locales/es/messages.json b/_locales/es/messages.json
index f473ca7..967f591 100644
--- a/_locales/es/messages.json
+++ b/_locales/es/messages.json
@@ -178,5 +178,131 @@
   },
   "next": {
     "message": "Siguiente"
+  },
+  "duplicate": {
+    "message": "Duplicar"
+  },
+  "merge": {
+    "message": "Combinar"
+  },
+  "move": {
+    "message": "Mover"
+  },
+  "copy": {
+    "message": "Copiar"
+  },
+  "merge_lists_min_two": {
+    "message": "Seleccione al menos dos listas para combinar."
+  },
+  "merge_lists_confirm": {
+    "message": "¿Combinar {count} lista(s) en \"{target}\"? Las listas de origen se eliminarán."
+  },
+  "delete_current_list": {
+    "message": "¿Eliminar la lista actual?"
+  },
+  "delete_lists_confirm": {
+    "message": "¿Eliminar {count} lista(s) seleccionada(s)?"
+  },
+  "invalid_import_format": {
+    "message": "Formato de archivo no válido. Seleccione un archivo de exportación válido de Goose Highlighter."
+  },
+  "import_failed": {
+    "message": "Error al importar el archivo. Asegúrese de que sea un archivo JSON válido."
+  },
+  "import_confirm": {
+    "message": "¿Importar {count} lista(s) con {words} palabra(s) en total?"
+  },
+  "import_success": {
+    "message": "Se importaron correctamente {count} lista(s) con {words} palabra(s)."
+  },
+  "preview_label": {
+    "message": "Vista previa"
+  },
+  "preview_text": {
+    "message": "Así es como aparecerá su texto resaltado."
+  },
+  "preview_text_before": {
+    "message": "Así es como aparecerá su"
+  },
+  "preview_text_highlight": {
+    "message": "texto resaltado"
+  },
+  "preview_text_after": {
+    "message": "."
+  },
+  "enable_highlighting_title": {
+    "message": "Activar resaltado"
+  },
+  "enable_highlighting_subtitle": {
+    "message": "Mostrar resaltados en páginas"
+  },
+  "manage_lists": {
+    "message": "Gestionar listas"
+  },
+  "background_label": {
+    "message": "Fondo"
+  },
+  "foreground_label": {
+    "message": "Texto"
+  },
+  "multi_select_hint": {
+    "message": "Clic para seleccionar • Ctrl/Cmd+Clic para selección múltiple"
+  },
+  "dark_mode_title": {
+    "message": "Modo oscuro"
+  },
+  "dark_mode_subtitle": {
+    "message": "Alternar tema claro/oscuro"
+  },
+  "list_manager_title": {
+    "message": "Gestor de listas"
+  },
+  "words_label": {
+    "message": "palabras"
+  },
+  "active_label": {
+    "message": "activo"
+  },
+  "inactive_label": {
+    "message": "inactivo"
+  },
+  "drag_words_hint": {
+    "message": "Clic para seleccionar • Ctrl/Cmd+Clic para selección múltiple • Arrastrar palabras a listas para copiar"
+  },
+  "drag_lists_hint": {
+    "message": "Arrastrar listas para reordenar • Ctrl+Clic para selección múltiple"
+  },
+  "showing_items": {
+    "message": "Mostrando {start}-{end} de {total} palabras"
+  },
+  "items_per_page": {
+    "message": "Elementos por página:"
+  },
+  "page_info": {
+    "message": "Página {current} de {total}"
+  },
+  "toggle_active": {
+    "message": "alternar activo"
+  },
+  "rename_list_title": {
+    "message": "Renombrar lista"
+  },
+  "new_list_title": {
+    "message": "Nueva lista"
+  },
+  "delete_list_title": {
+    "message": "Eliminar lista"
+  },
+  "list_active_badge": {
+    "message": "Activo"
+  },
+  "list_paused_badge": {
+    "message": "Pausado"
+  },
+  "words_stats": {
+    "message": "{total} palabras • {active} activas • {inactive} inactivas"
+  },
+  "rename_list": {
+    "message": "Renombrar lista"
   }
 }
\ No newline at end of file
diff --git a/_locales/fr/messages.json b/_locales/fr/messages.json
index 1fac6e8..44712d2 100644
--- a/_locales/fr/messages.json
+++ b/_locales/fr/messages.json
@@ -178,5 +178,131 @@
     },
     "next": {
         "message": "Suivant"
+    },
+    "duplicate": {
+        "message": "Dupliquer"
+    },
+    "merge": {
+        "message": "Fusionner"
+    },
+    "move": {
+        "message": "Déplacer"
+    },
+    "copy": {
+        "message": "Copier"
+    },
+    "merge_lists_min_two": {
+        "message": "Sélectionnez au moins deux listes à fusionner."
+    },
+    "merge_lists_confirm": {
+        "message": "Fusionner {count} liste(s) dans \"{target}\" ? Les listes sources seront supprimées."
+    },
+    "delete_current_list": {
+        "message": "Supprimer la liste actuelle ?"
+    },
+    "delete_lists_confirm": {
+        "message": "Supprimer {count} liste(s) sélectionnée(s) ?"
+    },
+    "invalid_import_format": {
+        "message": "Format de fichier invalide. Veuillez sélectionner un fichier d'exportation Goose Highlighter valide."
+    },
+    "import_failed": {
+        "message": "Échec de l'importation du fichier. Veuillez vous assurer qu'il s'agit d'un fichier JSON valide."
+    },
+    "import_confirm": {
+        "message": "Importer {count} liste(s) avec {words} mot(s) au total ?"
+    },
+    "import_success": {
+        "message": "{count} liste(s) avec {words} mot(s) importée(s) avec succès."
+    },
+    "preview_label": {
+        "message": "Aperçu"
+    },
+    "preview_text": {
+        "message": "Voici comment votre texte surligné apparaîtra."
+    },
+    "preview_text_before": {
+        "message": "Voici comment votre"
+    },
+    "preview_text_highlight": {
+        "message": "texte surligné"
+    },
+    "preview_text_after": {
+        "message": "apparaîtra."
+    },
+    "enable_highlighting_title": {
+        "message": "Activer la surbrillance"
+    },
+    "enable_highlighting_subtitle": {
+        "message": "Afficher les surlignages sur les pages"
+    },
+    "manage_lists": {
+        "message": "Gérer les listes"
+    },
+    "background_label": {
+        "message": "Arrière-plan"
+    },
+    "foreground_label": {
+        "message": "Texte"
+    },
+    "multi_select_hint": {
+        "message": "Cliquer pour sélectionner • Ctrl/Cmd+Clic pour sélection multiple"
+    },
+    "dark_mode_title": {
+        "message": "Mode sombre"
+    },
+    "dark_mode_subtitle": {
+        "message": "Basculer entre thème clair/sombre"
+    },
+    "list_manager_title": {
+        "message": "Gestionnaire de listes"
+    },
+    "words_label": {
+        "message": "mots"
+    },
+    "active_label": {
+        "message": "actif"
+    },
+    "inactive_label": {
+        "message": "inactif"
+    },
+    "drag_words_hint": {
+        "message": "Cliquer pour sélectionner • Ctrl/Cmd+Clic pour sélection multiple • Glisser les mots vers les listes pour copier"
+    },
+    "drag_lists_hint": {
+        "message": "Glisser les listes pour réorganiser • Ctrl+Clic pour sélection multiple"
+    },
+    "showing_items": {
+        "message": "Affichage de {start}-{end} sur {total} mots"
+    },
+    "items_per_page": {
+        "message": "Éléments par page :"
+    },
+    "page_info": {
+        "message": "Page {current} sur {total}"
+    },
+    "toggle_active": {
+        "message": "basculer actif"
+    },
+    "rename_list_title": {
+        "message": "Renommer la liste"
+    },
+    "new_list_title": {
+        "message": "Nouvelle liste"
+    },
+    "delete_list_title": {
+        "message": "Supprimer la liste"
+    },
+    "list_active_badge": {
+        "message": "Actif"
+    },
+    "list_paused_badge": {
+        "message": "En pause"
+    },
+    "words_stats": {
+        "message": "{total} mots • {active} actifs • {inactive} inactifs"
+    },
+    "rename_list": {
+        "message": "Renommer la liste"
     }
 }
\ No newline at end of file
diff --git a/_locales/hi/messages.json b/_locales/hi/messages.json
index b0337b5..c91b039 100644
--- a/_locales/hi/messages.json
+++ b/_locales/hi/messages.json
@@ -178,5 +178,131 @@
     },
     "next": {
         "message": "अगला"
+    },
+    "duplicate": {
+        "message": "डुप्लिकेट"
+    },
+    "merge": {
+        "message": "मर्ज करें"
+    },
+    "move": {
+        "message": "स्थानांतरित करें"
+    },
+    "copy": {
+        "message": "कॉपी करें"
+    },
+    "merge_lists_min_two": {
+        "message": "मर्ज करने के लिए कम से कम दो सूचियाँ चुनें।"
+    },
+    "merge_lists_confirm": {
+        "message": "{count} सूची(याँ) को \"{target}\" में मर्ज करें? स्रोत सूचियाँ हटा दी जाएंगी।"
+    },
+    "delete_current_list": {
+        "message": "वर्तमान सूची हटाएं?"
+    },
+    "delete_lists_confirm": {
+        "message": "{count} चयनित सूची(याँ) हटाएं?"
+    },
+    "invalid_import_format": {
+        "message": "अमान्य फ़ाइल प्रारूप। कृपया एक मान्य Goose Highlighter निर्यात फ़ाइल चुनें।"
+    },
+    "import_failed": {
+        "message": "फ़ाइल आयात करने में विफल। कृपया सुनिश्चित करें कि यह एक मान्य JSON फ़ाइल है।"
+    },
+    "import_confirm": {
+        "message": "कुल {words} शब्द(ों) के साथ {count} सूची(याँ) आयात करें?"
+    },
+    "import_success": {
+        "message": "{words} शब्द(ों) के साथ {count} सूची(याँ) सफलतापूर्वक आयात की गईं।"
+    },
+    "preview_label": {
+        "message": "पूर्वावलोकन"
+    },
+    "preview_text": {
+        "message": "आपका हाइलाइट किया गया टेक्स्ट इस तरह दिखाई देगा।"
+    },
+    "preview_text_before": {
+        "message": "आपका"
+    },
+    "preview_text_highlight": {
+        "message": "हाइलाइट किया गया टेक्स्ट"
+    },
+    "preview_text_after": {
+        "message": "इस तरह दिखाई देगा।"
+    },
+    "enable_highlighting_title": {
+        "message": "हाइलाइटिंग सक्षम करें"
+    },
+    "enable_highlighting_subtitle": {
+        "message": "पृष्ठों पर हाइलाइट दिखाएं"
+    },
+    "manage_lists": {
+        "message": "सूचियाँ प्रबंधित करें"
+    },
+    "background_label": {
+        "message": "पृष्ठभूमि"
+    },
+    "foreground_label": {
+        "message": "अग्रभूमि"
+    },
+    "multi_select_hint": {
+        "message": "चुनने के लिए क्लिक करें • एकाधिक चयन के लिए Ctrl/Cmd+क्लिक"
+    },
+    "dark_mode_title": {
+        "message": "डार्क मोड"
+    },
+    "dark_mode_subtitle": {
+        "message": "हल्की/गहरी थीम टॉगल करें"
+    },
+    "list_manager_title": {
+        "message": "सूची प्रबंधक"
+    },
+    "words_label": {
+        "message": "शब्द"
+    },
+    "active_label": {
+        "message": "सक्रिय"
+    },
+    "inactive_label": {
+        "message": "निष्क्रिय"
+    },
+    "drag_words_hint": {
+        "message": "चुनने के लिए क्लिक करें • एकाधिक चयन के लिए Ctrl/Cmd+क्लिक • कॉपी करने के लिए शब्दों को सूचियों में खींचें"
+    },
+    "drag_lists_hint": {
+        "message": "पुनः क्रमित करने के लिए सूचियों को खींचें • एकाधिक चयन के लिए Ctrl+क्लिक"
+    },
+    "showing_items": {
+        "message": "{total} शब्दों में से {start}-{end} दिखा रहे हैं"
+    },
+    "items_per_page": {
+        "message": "प्रति पृष्ठ आइटम:"
+    },
+    "page_info": {
+        "message": "पृष्ठ {current} का {total}"
+    },
+    "toggle_active": {
+        "message": "सक्रिय टॉगल करें"
+    },
+    "rename_list_title": {
+        "message": "सूची का नाम बदलें"
+    },
+    "new_list_title": {
+        "message": "नई सूची"
+    },
+    "delete_list_title": {
+        "message": "सूची हटाएं"
+    },
+    "list_active_badge": {
+        "message": "सक्रिय"
+    },
+    "list_paused_badge": {
+        "message": "रोका गया"
+    },
+    "words_stats": {
+        "message": "{total} शब्द • {active} सक्रिय • {inactive} निष्क्रिय"
+    },
+    "rename_list": {
+        "message": "सूची का नाम बदलें"
     }
 }
\ No newline at end of file
diff --git a/_locales/it/messages.json b/_locales/it/messages.json
index a9fd1cd..ca0cc09 100644
--- a/_locales/it/messages.json
+++ b/_locales/it/messages.json
@@ -178,5 +178,131 @@
     },
     "next": {
         "message": "Successivo"
+    },
+    "duplicate": {
+        "message": "Duplica"
+    },
+    "merge": {
+        "message": "Unisci"
+    },
+    "move": {
+        "message": "Sposta"
+    },
+    "copy": {
+        "message": "Copia"
+    },
+    "merge_lists_min_two": {
+        "message": "Seleziona almeno due elenchi da unire."
+    },
+    "merge_lists_confirm": {
+        "message": "Unire {count} elenco/i in \"{target}\"? Gli elenchi di origine verranno rimossi."
+    },
+    "delete_current_list": {
+        "message": "Eliminare l'elenco corrente?"
+    },
+    "delete_lists_confirm": {
+        "message": "Eliminare {count} elenco/i selezionato/i?"
+    },
+    "invalid_import_format": {
+        "message": "Formato file non valido. Seleziona un file di esportazione Goose Highlighter valido."
+    },
+    "import_failed": {
+        "message": "Importazione del file non riuscita. Assicurati che sia un file JSON valido."
+    },
+    "import_confirm": {
+        "message": "Importare {count} elenco/i con {words} parola/e totali?"
+    },
+    "import_success": {
+        "message": "Importati con successo {count} elenco/i con {words} parola/e."
+    },
+    "preview_label": {
+        "message": "Anteprima"
+    },
+    "preview_text": {
+        "message": "Ecco come apparirà il tuo testo evidenziato."
+    },
+    "preview_text_before": {
+        "message": "Ecco come apparirà il tuo"
+    },
+    "preview_text_highlight": {
+        "message": "testo evidenziato"
+    },
+    "preview_text_after": {
+        "message": "."
+    },
+    "enable_highlighting_title": {
+        "message": "Abilita evidenziazione"
+    },
+    "enable_highlighting_subtitle": {
+        "message": "Mostra evidenziazioni sulle pagine"
+    },
+    "manage_lists": {
+        "message": "Gestisci elenchi"
+    },
+    "background_label": {
+        "message": "Sfondo"
+    },
+    "foreground_label": {
+        "message": "Testo"
+    },
+    "multi_select_hint": {
+        "message": "Clicca per selezionare • Ctrl/Cmd+Clic per selezione multipla"
+    },
+    "dark_mode_title": {
+        "message": "Modalità scura"
+    },
+    "dark_mode_subtitle": {
+        "message": "Passa tra tema chiaro/scuro"
+    },
+    "list_manager_title": {
+        "message": "Gestore elenchi"
+    },
+    "words_label": {
+        "message": "parole"
+    },
+    "active_label": {
+        "message": "attivo"
+    },
+    "inactive_label": {
+        "message": "inattivo"
+    },
+    "drag_words_hint": {
+        "message": "Clicca per selezionare • Ctrl/Cmd+Clic per selezione multipla • Trascina parole negli elenchi per copiare"
+    },
+    "drag_lists_hint": {
+        "message": "Trascina elenchi per riordinare • Ctrl+Clic per selezione multipla"
+    },
+    "showing_items": {
+        "message": "Visualizzazione di {start}-{end} su {total} parole"
+    },
+    "items_per_page": {
+        "message": "Elementi per pagina:"
+    },
+    "page_info": {
+        "message": "Pagina {current} di {total}"
+    },
+    "toggle_active": {
+        "message": "attiva/disattiva"
+    },
+    "rename_list_title": {
+        "message": "Rinomina elenco"
+    },
+    "new_list_title": {
+        "message": "Nuovo elenco"
+    },
+    "delete_list_title": {
+        "message": "Elimina elenco"
+    },
+    "list_active_badge": {
+        "message": "Attivo"
+    },
+    "list_paused_badge": {
+        "message": "In pausa"
+    },
+    "words_stats": {
+        "message": "{total} parole • {active} attive • {inactive} inattive"
+    },
+    "rename_list": {
+        "message": "Rinomina elenco"
     }
 }
\ No newline at end of file
diff --git a/_locales/ja/messages.json b/_locales/ja/messages.json
index 9fe838b..ef27a05 100644
--- a/_locales/ja/messages.json
+++ b/_locales/ja/messages.json
@@ -178,5 +178,131 @@
     },
     "next": {
         "message": "次へ"
+    },
+    "duplicate": {
+        "message": "複製"
+    },
+    "merge": {
+        "message": "統合"
+    },
+    "move": {
+        "message": "移動"
+    },
+    "copy": {
+        "message": "コピー"
+    },
+    "merge_lists_min_two": {
+        "message": "統合するには少なくとも2つのリストを選択してください。"
+    },
+    "merge_lists_confirm": {
+        "message": "{count}個のリストを\"{target}\"に統合しますか？ソースリストは削除されます。"
+    },
+    "delete_current_list": {
+        "message": "現在のリストを削除しますか？"
+    },
+    "delete_lists_confirm": {
+        "message": "選択した{count}個のリストを削除しますか？"
+    },
+    "invalid_import_format": {
+        "message": "無効なファイル形式です。有効なGoose Highlighterエクスポートファイルを選択してください。"
+    },
+    "import_failed": {
+        "message": "ファイルのインポートに失敗しました。有効なJSONファイルであることを確認してください。"
+    },
+    "import_confirm": {
+        "message": "合計{words}個の単語を含む{count}個のリストをインポートしますか？"
+    },
+    "import_success": {
+        "message": "{words}個の単語を含む{count}個のリストを正常にインポートしました。"
+    },
+    "preview_label": {
+        "message": "プレビュー"
+    },
+    "preview_text": {
+        "message": "ハイライトされたテキストはこのように表示されます。"
+    },
+    "preview_text_before": {
+        "message": ""
+    },
+    "preview_text_highlight": {
+        "message": "ハイライトされたテキスト"
+    },
+    "preview_text_after": {
+        "message": "はこのように表示されます。"
+    },
+    "enable_highlighting_title": {
+        "message": "ハイライトを有効にする"
+    },
+    "enable_highlighting_subtitle": {
+        "message": "ページにハイライトを表示"
+    },
+    "manage_lists": {
+        "message": "リストを管理"
+    },
+    "background_label": {
+        "message": "背景"
+    },
+    "foreground_label": {
+        "message": "前景"
+    },
+    "multi_select_hint": {
+        "message": "クリックして選択 • Ctrl/Cmd+クリックで複数選択"
+    },
+    "dark_mode_title": {
+        "message": "ダークモード"
+    },
+    "dark_mode_subtitle": {
+        "message": "ライト/ダークテーマを切り替え"
+    },
+    "list_manager_title": {
+        "message": "リストマネージャー"
+    },
+    "words_label": {
+        "message": "単語"
+    },
+    "active_label": {
+        "message": "有効"
+    },
+    "inactive_label": {
+        "message": "無効"
+    },
+    "drag_words_hint": {
+        "message": "クリックして選択 • Ctrl/Cmd+クリックで複数選択 • 単語をリストにドラッグしてコピー"
+    },
+    "drag_lists_hint": {
+        "message": "リストをドラッグして並べ替え • Ctrl+クリックで複数選択"
+    },
+    "showing_items": {
+        "message": "{total}単語中{start}-{end}を表示"
+    },
+    "items_per_page": {
+        "message": "ページあたりのアイテム数:"
+    },
+    "page_info": {
+        "message": "ページ{current}/{total}"
+    },
+    "toggle_active": {
+        "message": "有効/無効を切り替え"
+    },
+    "rename_list_title": {
+        "message": "リスト名を変更"
+    },
+    "new_list_title": {
+        "message": "新しいリスト"
+    },
+    "delete_list_title": {
+        "message": "リストを削除"
+    },
+    "list_active_badge": {
+        "message": "有効"
+    },
+    "list_paused_badge": {
+        "message": "一時停止"
+    },
+    "words_stats": {
+        "message": "{total}単語 • {active}有効 • {inactive}無効"
+    },
+    "rename_list": {
+        "message": "リスト名を変更"
     }
 }
\ No newline at end of file
diff --git a/_locales/ko/messages.json b/_locales/ko/messages.json
index 38c058d..fc7baab 100644
--- a/_locales/ko/messages.json
+++ b/_locales/ko/messages.json
@@ -178,5 +178,131 @@
     },
     "next": {
         "message": "다음"
+    },
+    "duplicate": {
+        "message": "복제"
+    },
+    "merge": {
+        "message": "병합"
+    },
+    "move": {
+        "message": "이동"
+    },
+    "copy": {
+        "message": "복사"
+    },
+    "merge_lists_min_two": {
+        "message": "병합하려면 최소 두 개의 리스트를 선택하세요."
+    },
+    "merge_lists_confirm": {
+        "message": "{count}개의 리스트를 \"{target}\"에 병합하시겠습니까? 소스 리스트는 제거됩니다."
+    },
+    "delete_current_list": {
+        "message": "현재 리스트를 삭제하시겠습니까?"
+    },
+    "delete_lists_confirm": {
+        "message": "선택한 {count}개의 리스트를 삭제하시겠습니까?"
+    },
+    "invalid_import_format": {
+        "message": "잘못된 파일 형식입니다. 유효한 Goose Highlighter 내보내기 파일을 선택하세요."
+    },
+    "import_failed": {
+        "message": "파일 가져오기에 실패했습니다. 유효한 JSON 파일인지 확인하세요."
+    },
+    "import_confirm": {
+        "message": "총 {words}개의 단어가 포함된 {count}개의 리스트를 가져오시겠습니까?"
+    },
+    "import_success": {
+        "message": "{words}개의 단어가 포함된 {count}개의 리스트를 성공적으로 가져왔습니다."
+    },
+    "preview_label": {
+        "message": "미리보기"
+    },
+    "preview_text": {
+        "message": "하이라이트된 텍스트가 이렇게 표시됩니다."
+    },
+    "preview_text_before": {
+        "message": ""
+    },
+    "preview_text_highlight": {
+        "message": "하이라이트된 텍스트"
+    },
+    "preview_text_after": {
+        "message": "가 이렇게 표시됩니다."
+    },
+    "enable_highlighting_title": {
+        "message": "하이라이트 활성화"
+    },
+    "enable_highlighting_subtitle": {
+        "message": "페이지에 하이라이트 표시"
+    },
+    "manage_lists": {
+        "message": "리스트 관리"
+    },
+    "background_label": {
+        "message": "배경"
+    },
+    "foreground_label": {
+        "message": "전경"
+    },
+    "multi_select_hint": {
+        "message": "클릭하여 선택 • Ctrl/Cmd+클릭으로 다중 선택"
+    },
+    "dark_mode_title": {
+        "message": "다크 모드"
+    },
+    "dark_mode_subtitle": {
+        "message": "밝은/어두운 테마 전환"
+    },
+    "list_manager_title": {
+        "message": "리스트 관리자"
+    },
+    "words_label": {
+        "message": "단어"
+    },
+    "active_label": {
+        "message": "활성"
+    },
+    "inactive_label": {
+        "message": "비활성"
+    },
+    "drag_words_hint": {
+        "message": "클릭하여 선택 • Ctrl/Cmd+클릭으로 다중 선택 • 단어를 리스트로 드래그하여 복사"
+    },
+    "drag_lists_hint": {
+        "message": "리스트를 드래그하여 재정렬 • Ctrl+클릭으로 다중 선택"
+    },
+    "showing_items": {
+        "message": "{total}개 단어 중 {start}-{end} 표시"
+    },
+    "items_per_page": {
+        "message": "페이지당 항목 수:"
+    },
+    "page_info": {
+        "message": "페이지 {current}/{total}"
+    },
+    "toggle_active": {
+        "message": "활성 전환"
+    },
+    "rename_list_title": {
+        "message": "리스트 이름 변경"
+    },
+    "new_list_title": {
+        "message": "새 리스트"
+    },
+    "delete_list_title": {
+        "message": "리스트 삭제"
+    },
+    "list_active_badge": {
+        "message": "활성"
+    },
+    "list_paused_badge": {
+        "message": "일시정지"
+    },
+    "words_stats": {
+        "message": "{total}개 단어 • {active}개 활성 • {inactive}개 비활성"
+    },
+    "rename_list": {
+        "message": "리스트 이름 변경"
     }
 }
\ No newline at end of file
diff --git a/_locales/nl/messages.json b/_locales/nl/messages.json
index 3f3768d..6e3d2bf 100644
--- a/_locales/nl/messages.json
+++ b/_locales/nl/messages.json
@@ -178,5 +178,131 @@
   },
   "next": {
     "message": "Volgende"
+  },
+  "duplicate": {
+    "message": "Dupliceren"
+  },
+  "merge": {
+    "message": "Samenvoegen"
+  },
+  "move": {
+    "message": "Verplaatsen"
+  },
+  "copy": {
+    "message": "Kopiëren"
+  },
+  "merge_lists_min_two": {
+    "message": "Selecteer minimaal twee lijsten om samen te voegen."
+  },
+  "merge_lists_confirm": {
+    "message": "{count} lijst(en) samenvoegen in \"{target}\"? Bronlijsten worden verwijderd."
+  },
+  "delete_current_list": {
+    "message": "Huidige lijst verwijderen?"
+  },
+  "delete_lists_confirm": {
+    "message": "{count} geselecteerde lijst(en) verwijderen?"
+  },
+  "invalid_import_format": {
+    "message": "Ongeldig bestandsformaat. Selecteer een geldig Goose Highlighter exportbestand."
+  },
+  "import_failed": {
+    "message": "Importeren van bestand mislukt. Zorg ervoor dat het een geldig JSON-bestand is."
+  },
+  "import_confirm": {
+    "message": "{count} lijst(en) met in totaal {words} woord(en) importeren?"
+  },
+  "import_success": {
+    "message": "{count} lijst(en) met {words} woord(en) succesvol geïmporteerd."
+  },
+  "preview_label": {
+    "message": "Voorbeeld"
+  },
+  "preview_text": {
+    "message": "Zo zal uw gemarkeerde tekst verschijnen."
+  },
+  "preview_text_before": {
+    "message": "Zo zal uw"
+  },
+  "preview_text_highlight": {
+    "message": "gemarkeerde tekst"
+  },
+  "preview_text_after": {
+    "message": "verschijnen."
+  },
+  "enable_highlighting_title": {
+    "message": "Markeren inschakelen"
+  },
+  "enable_highlighting_subtitle": {
+    "message": "Markeringen op pagina's weergeven"
+  },
+  "manage_lists": {
+    "message": "Lijsten beheren"
+  },
+  "background_label": {
+    "message": "Achtergrond"
+  },
+  "foreground_label": {
+    "message": "Voorgrond"
+  },
+  "multi_select_hint": {
+    "message": "Klik om te selecteren • Ctrl/Cmd+Klik voor meervoudige selectie"
+  },
+  "dark_mode_title": {
+    "message": "Donkere modus"
+  },
+  "dark_mode_subtitle": {
+    "message": "Schakel tussen licht/donker thema"
+  },
+  "list_manager_title": {
+    "message": "Lijstbeheerder"
+  },
+  "words_label": {
+    "message": "woorden"
+  },
+  "active_label": {
+    "message": "actief"
+  },
+  "inactive_label": {
+    "message": "inactief"
+  },
+  "drag_words_hint": {
+    "message": "Klik om te selecteren • Ctrl/Cmd+Klik voor meervoudige selectie • Sleep woorden naar lijsten om te kopiëren"
+  },
+  "drag_lists_hint": {
+    "message": "Sleep lijsten om te herschikken • Ctrl+Klik voor meervoudige selectie"
+  },
+  "showing_items": {
+    "message": "{start}-{end} van {total} woorden weergegeven"
+  },
+  "items_per_page": {
+    "message": "Items per pagina:"
+  },
+  "page_info": {
+    "message": "Pagina {current} van {total}"
+  },
+  "toggle_active": {
+    "message": "actief schakelen"
+  },
+  "rename_list_title": {
+    "message": "Lijst hernoemen"
+  },
+  "new_list_title": {
+    "message": "Nieuwe lijst"
+  },
+  "delete_list_title": {
+    "message": "Lijst verwijderen"
+  },
+  "list_active_badge": {
+    "message": "Actief"
+  },
+  "list_paused_badge": {
+    "message": "Gepauzeerd"
+  },
+  "words_stats": {
+    "message": "{total} woorden • {active} actief • {inactive} inactief"
+  },
+  "rename_list": {
+    "message": "Lijst hernoemen"
   }
 }
\ No newline at end of file
diff --git a/_locales/pl/messages.json b/_locales/pl/messages.json
index 3b3da2f..6832e0d 100644
--- a/_locales/pl/messages.json
+++ b/_locales/pl/messages.json
@@ -178,5 +178,131 @@
   },
   "next": {
     "message": "Następny"
+  },
+  "duplicate": {
+    "message": "Duplikuj"
+  },
+  "merge": {
+    "message": "Scal"
+  },
+  "move": {
+    "message": "Przenieś"
+  },
+  "copy": {
+    "message": "Kopiuj"
+  },
+  "merge_lists_min_two": {
+    "message": "Wybierz co najmniej dwie listy do scalenia."
+  },
+  "merge_lists_confirm": {
+    "message": "Scalić {count} list(y) w \"{target}\"? Listy źródłowe zostaną usunięte."
+  },
+  "delete_current_list": {
+    "message": "Usunąć bieżącą listę?"
+  },
+  "delete_lists_confirm": {
+    "message": "Usunąć {count} wybraną/e listę/y?"
+  },
+  "invalid_import_format": {
+    "message": "Nieprawidłowy format pliku. Wybierz prawidłowy plik eksportu Goose Highlighter."
+  },
+  "import_failed": {
+    "message": "Nie udało się zaimportować pliku. Upewnij się, że jest to prawidłowy plik JSON."
+  },
+  "import_confirm": {
+    "message": "Zaimportować {count} list(y) z łącznie {words} słowami?"
+  },
+  "import_success": {
+    "message": "Pomyślnie zaimportowano {count} list(y) z {words} słowami."
+  },
+  "preview_label": {
+    "message": "Podgląd"
+  },
+  "preview_text": {
+    "message": "Tak będzie wyglądał Twój podświetlony tekst."
+  },
+  "preview_text_before": {
+    "message": "Tak będzie wyglądał Twój"
+  },
+  "preview_text_highlight": {
+    "message": "podświetlony tekst"
+  },
+  "preview_text_after": {
+    "message": "."
+  },
+  "enable_highlighting_title": {
+    "message": "Włącz podświetlanie"
+  },
+  "enable_highlighting_subtitle": {
+    "message": "Pokaż podświetlenia na stronach"
+  },
+  "manage_lists": {
+    "message": "Zarządzaj listami"
+  },
+  "background_label": {
+    "message": "Tło"
+  },
+  "foreground_label": {
+    "message": "Pierwszy plan"
+  },
+  "multi_select_hint": {
+    "message": "Kliknij, aby zaznaczyć • Ctrl/Cmd+Klik dla wielokrotnego zaznaczenia"
+  },
+  "dark_mode_title": {
+    "message": "Tryb ciemny"
+  },
+  "dark_mode_subtitle": {
+    "message": "Przełącz między jasnym/ciemnym motywem"
+  },
+  "list_manager_title": {
+    "message": "Menedżer list"
+  },
+  "words_label": {
+    "message": "słowa"
+  },
+  "active_label": {
+    "message": "aktywny"
+  },
+  "inactive_label": {
+    "message": "nieaktywny"
+  },
+  "drag_words_hint": {
+    "message": "Kliknij, aby zaznaczyć • Ctrl/Cmd+Klik dla wielokrotnego zaznaczenia • Przeciągnij słowa do list, aby skopiować"
+  },
+  "drag_lists_hint": {
+    "message": "Przeciągnij listy, aby zmienić kolejność • Ctrl+Klik dla wielokrotnego zaznaczenia"
+  },
+  "showing_items": {
+    "message": "Wyświetlanie {start}-{end} z {total} słów"
+  },
+  "items_per_page": {
+    "message": "Elementów na stronę:"
+  },
+  "page_info": {
+    "message": "Strona {current} z {total}"
+  },
+  "toggle_active": {
+    "message": "przełącz aktywny"
+  },
+  "rename_list_title": {
+    "message": "Zmień nazwę listy"
+  },
+  "new_list_title": {
+    "message": "Nowa lista"
+  },
+  "delete_list_title": {
+    "message": "Usuń listę"
+  },
+  "list_active_badge": {
+    "message": "Aktywny"
+  },
+  "list_paused_badge": {
+    "message": "Wstrzymany"
+  },
+  "words_stats": {
+    "message": "{total} słów • {active} aktywnych • {inactive} nieaktywnych"
+  },
+  "rename_list": {
+    "message": "Zmień nazwę listy"
   }
 }
\ No newline at end of file
diff --git a/_locales/pt_BR/messages.json b/_locales/pt_BR/messages.json
index 9d1fbbb..e9579fa 100644
--- a/_locales/pt_BR/messages.json
+++ b/_locales/pt_BR/messages.json
@@ -1,103 +1,109 @@
 {
-    "extension_name": {
-        "message": "Goose Highlighter"
-    },
-    "extension_description": {
-        "message": "Destaque palavras e frases em qualquer site. Crie listas personalizadas, use cores, importe/exporte e muito mais."
-    },
-    "select_list": {
-        "message": "Selecionar lista:"
-    },
-    "new_list": {
-        "message": "Nova lista"
-    },
-    "delete_list": {
-        "message": "Excluir lista"
-    },
-    "list_name": {
-        "message": "Nome da lista:"
-    },
-    "background": {
-        "message": "Fundo:"
-    },
-    "foreground": {
-        "message": "Texto:"
-    },
-    "enable_highlight": {
-        "message": "Ativar destaque"
-    },
-    "apply": {
-        "message": "Aplicar"
-    },
-    "paste_hint": {
-        "message": "Cole palavras ou frases aqui. Cada nova palavra/frase deve começar na próxima linha."
-    },
-    "apply_paste": {
-        "message": "Adicionar palavras"
-    },
-    "select_all": {
-        "message": "Selecionar"
-    },
-    "delete_selected": {
-        "message": "Excluir"
-    },
-    "disable_selected": {
-        "message": "Desativar"
-    },
-    "enable_selected": {
-        "message": "Ativar"
-    },
-    "import_list": {
-        "message": "Importar JSON"
-    },
-    "export_list": {
-        "message": "Exportar JSON"
-    },
-    "default_list_name": {
-        "message": "Lista padrão"
-    },
-    "new_list_name": {
-        "message": "Nova lista"
-    },
-    "word_active_label": {
-        "message": "ativo"
-    },
-    "invalid_json_error": {
-        "message": "Arquivo JSON inválido"
-    },
-    "confirm_delete_list": {
-        "message": "Tem certeza de que deseja excluir esta lista?"
-    },
-    "confirm_delete_words": {
-        "message": "Tem certeza de que deseja excluir as palavras selecionadas?"
-    },
-    "deselect_all": {
-        "message": "Desmarcar"
-    },
-    "highlight_lists": {
-        "message": "Listas de destaque"
-    },
-    "dark_mode": {
-        "message": "Modo escuro"
-    },
-    "list_settings": {
-        "message": "Configurações da lista"
-    },
-    "word_list": {
-        "message": "Lista de palavras"
-    },
-    "add_words": {
-        "message": "Adicionar palavras"
-    },
-    "global_highlight_toggle": {
-        "message": "Ativar"
-    },
-    "search_placeholder": {
+  "extension_name": {
+    "message": "Goose Highlighter"
+  },
+  "extension_description": {
+    "message": "Destaque palavras e frases em qualquer site. Crie listas personalizadas, use cores, importe/exporte e muito mais."
+  },
+  "select_list": {
+    "message": "Selecionar lista:"
+  },
+  "new_list": {
+    "message": "Nova lista"
+  },
+  "delete_list": {
+    "message": "Excluir lista"
+  },
+  "list_name": {
+    "message": "Nome da lista:"
+  },
+  "background": {
+    "message": "Fundo:"
+  },
+  "foreground": {
+    "message": "Texto:"
+  },
+  "enable_highlight": {
+    "message": "Ativar destaque"
+  },
+  "apply": {
+    "message": "Aplicar"
+  },
+  "paste_hint": {
+    "message": "Cole palavras ou frases aqui. Cada nova palavra/frase deve começar na próxima linha."
+  },
+  "apply_paste": {
+    "message": "Adicionar palavras"
+  },
+  "select_all": {
+    "message": "Selecionar"
+  },
+  "delete_selected": {
+    "message": "Excluir"
+  },
+  "disable_selected": {
+    "message": "Desativar"
+  },
+  "enable_selected": {
+    "message": "Ativar"
+  },
+  "import_list": {
+    "message": "Importar JSON"
+  },
+  "export_list": {
+    "message": "Exportar JSON"
+  },
+  "default_list_name": {
+    "message": "Lista padrão"
+  },
+  "new_list_name": {
+    "message": "Nova lista"
+  },
+  "word_active_label": {
+    "message": "ativo"
+  },
+  "invalid_json_error": {
+    "message": "Arquivo JSON inválido"
+  },
+  "confirm_delete_list": {
+    "message": "Tem certeza de que deseja excluir esta lista?"
+  },
+  "confirm_delete_words": {
+    "message": "Tem certeza de que deseja excluir as palavras selecionadas?"
+  },
+  "deselect_all": {
+    "message": "Desmarcar"
+  },
+  "highlight_lists": {
+    "message": "Listas de destaque"
+  },
+  "dark_mode": {
+    "message": "Modo escuro"
+  },
+  "list_settings": {
+    "message": "Configurações da lista"
+  },
+  "word_list": {
+    "message": "Lista de palavras"
+  },
+  "add_words": {
+    "message": "Adicionar palavras"
+  },
+  "global_highlight_toggle": {
+    "message": "Ativar"
+  },
+  "search_placeholder": {
     "message": "Pesquisar..."
-},
-  "options": { "message": "Opções" },
-  "match_case": { "message": "Diferenciar maiúsculas/minúsculas" },
-  "match_whole": { "message": "Palavra inteira" },
+  },
+  "options": {
+    "message": "Opções"
+  },
+  "match_case": {
+    "message": "Diferenciar maiúsculas/minúsculas"
+  },
+  "match_whole": {
+    "message": "Palavra inteira"
+  },
   "site_exceptions": {
     "message": "Exceções de sites"
   },
@@ -172,5 +178,131 @@
   },
   "next": {
     "message": "Próximo"
+  },
+  "duplicate": {
+    "message": "Duplicar"
+  },
+  "merge": {
+    "message": "Mesclar"
+  },
+  "move": {
+    "message": "Mover"
+  },
+  "copy": {
+    "message": "Copiar"
+  },
+  "merge_lists_min_two": {
+    "message": "Selecione pelo menos duas listas para mesclar."
+  },
+  "merge_lists_confirm": {
+    "message": "Mesclar {count} lista(s) em \"{target}\"? As listas de origem serão removidas."
+  },
+  "delete_current_list": {
+    "message": "Excluir lista atual?"
+  },
+  "delete_lists_confirm": {
+    "message": "Excluir {count} lista(s) selecionada(s)?"
+  },
+  "invalid_import_format": {
+    "message": "Formato de arquivo inválido. Selecione um arquivo de exportação válido do Goose Highlighter."
+  },
+  "import_failed": {
+    "message": "Falha ao importar arquivo. Certifique-se de que é um arquivo JSON válido."
+  },
+  "import_confirm": {
+    "message": "Importar {count} lista(s) com {words} palavra(s) no total?"
+  },
+  "import_success": {
+    "message": "{count} lista(s) com {words} palavra(s) importada(s) com sucesso."
+  },
+  "preview_label": {
+    "message": "Visualização"
+  },
+  "preview_text": {
+    "message": "É assim que seu texto destacado aparecerá."
+  },
+  "preview_text_before": {
+    "message": "É assim que seu"
+  },
+  "preview_text_highlight": {
+    "message": "texto destacado"
+  },
+  "preview_text_after": {
+    "message": "aparecerá."
+  },
+  "enable_highlighting_title": {
+    "message": "Ativar destaque"
+  },
+  "enable_highlighting_subtitle": {
+    "message": "Mostrar destaques nas páginas"
+  },
+  "manage_lists": {
+    "message": "Gerenciar listas"
+  },
+  "background_label": {
+    "message": "Fundo"
+  },
+  "foreground_label": {
+    "message": "Texto"
+  },
+  "multi_select_hint": {
+    "message": "Clique para selecionar • Ctrl/Cmd+Clique para seleção múltipla"
+  },
+  "dark_mode_title": {
+    "message": "Modo escuro"
+  },
+  "dark_mode_subtitle": {
+    "message": "Alternar entre tema claro/escuro"
+  },
+  "list_manager_title": {
+    "message": "Gerenciador de listas"
+  },
+  "words_label": {
+    "message": "palavras"
+  },
+  "active_label": {
+    "message": "ativo"
+  },
+  "inactive_label": {
+    "message": "inativo"
+  },
+  "drag_words_hint": {
+    "message": "Clique para selecionar • Ctrl/Cmd+Clique para seleção múltipla • Arraste palavras para listas para copiar"
+  },
+  "drag_lists_hint": {
+    "message": "Arraste listas para reordenar • Ctrl+Clique para seleção múltipla"
+  },
+  "showing_items": {
+    "message": "Mostrando {start}-{end} de {total} palavras"
+  },
+  "items_per_page": {
+    "message": "Itens por página:"
+  },
+  "page_info": {
+    "message": "Página {current} de {total}"
+  },
+  "toggle_active": {
+    "message": "alternar ativo"
+  },
+  "rename_list_title": {
+    "message": "Renomear lista"
+  },
+  "new_list_title": {
+    "message": "Nova lista"
+  },
+  "delete_list_title": {
+    "message": "Excluir lista"
+  },
+  "list_active_badge": {
+    "message": "Ativo"
+  },
+  "list_paused_badge": {
+    "message": "Pausado"
+  },
+  "words_stats": {
+    "message": "{total} palavras • {active} ativas • {inactive} inativas"
+  },
+  "rename_list": {
+    "message": "Renomear lista"
   }
 }
\ No newline at end of file
diff --git a/_locales/ru/messages.json b/_locales/ru/messages.json
index 1df5ad9..2c479cf 100644
--- a/_locales/ru/messages.json
+++ b/_locales/ru/messages.json
@@ -178,5 +178,132 @@
   },
   "next": {
     "message": "Следующее"
+  },
+  "duplicate": {
+    "message": "Дублировать"
+  },
+  "merge": {
+    "message": "Объединить"
+  },
+  "move": {
+    "message": "Переместить"
+  },
+  "copy": {
+    "message": "Копировать"
+  },
+  "merge_lists_min_two": {
+    "message": "Выберите как минимум два списка для объединения."
+  },
+  "merge_lists_confirm": {
+    "message": "Объединить {count} список(ов) в \"{target}\"? Исходные списки будут удалены."
+  },
+  "delete_current_list": {
+    "message": "Удалить текущий список?"
+  },
+  "delete_lists_confirm": {
+    "message": "Удалить {count} выбранный(ых) список(ов)?"
+  },
+  "invalid_import_format": {
+    "message": "Неверный формат файла. Выберите действительный файл экспорта Goose Highlighter."
+  },
+  "import_failed": {
+    "message": "Не удалось импортировать файл. Убедитесь, что это действительный файл JSON."
+  },
+  "import_confirm": {
+    "message": "Импортировать {count} список(ов) с {words} словами всего?"
+  },
+  "import_success": {
+    "message": "Успешно импортировано {count} список(ов) с {words} словами."
+}
+,
+  "preview_label": {
+    "message": "Предпросмотр"
+  },
+  "preview_text": {
+    "message": "Так будет выглядеть выделенный текст."
+  },
+  "preview_text_before": {
+    "message": "Так будет выглядеть"
+  },
+  "preview_text_highlight": {
+    "message": "выделенный текст"
+  },
+  "preview_text_after": {
+    "message": "."
+  },
+  "enable_highlighting_title": {
+    "message": "Включить выделение"
+  },
+  "enable_highlighting_subtitle": {
+    "message": "Выделять слова из выбранного списка"
+  },
+  "manage_lists": {
+    "message": "Управление списками"
+  },
+  "background_label": {
+    "message": "Фон"
+  },
+  "foreground_label": {
+    "message": "Текст"
+  },
+  "multi_select_hint": {
+    "message": "Нажмите для выбора • Ctrl/Cmd+Клик для множественного выбора"
+  },
+  "dark_mode_title": {
+    "message": "Темная тема"
+  },
+  "dark_mode_subtitle": {
+    "message": "Переключить светлую/темную тему"
+  },
+  "list_manager_title": {
+    "message": "Управление списками"
+  },
+  "words_label": {
+    "message": "слова"
+  },
+  "active_label": {
+    "message": "активно"
+  },
+  "inactive_label": {
+    "message": "неактивно"
+  },
+  "drag_words_hint": {
+    "message": "Нажмите для выбора • Ctrl/Cmd+Клик для множественного выбора • Перетащите слова в списки для копирования"
+  },
+  "drag_lists_hint": {
+    "message": "Перетащите для изменения порядка • Ctrl+Клик для множественного выбора"
+  },
+  "showing_items": {
+    "message": "Показано {start}-{end} из {total} слов"
+  },
+  "items_per_page": {
+    "message": "Элементов на странице:"
+  },
+  "page_info": {
+    "message": "Страница {current} из {total}"
+  },
+  "toggle_active": {
+    "message": "переключить активность"
+  },
+  "rename_list_title": {
+    "message": "Переименовать список"
+  },
+  "new_list_title": {
+    "message": "Новый список"
+  },
+  "delete_list_title": {
+    "message": "Удалить список"
+  },
+  "list_active_badge": {
+    "message": "Активен"
+  },
+  "list_paused_badge": {
+    "message": "Приостановлен"
+  },
+  "words_stats": {
+    "message": "{total} слов • {active} активных • {inactive} неактивных"
+  },
+  "rename_list": {
+    "message": "Переименовать список"
   }
 }
\ No newline at end of file
diff --git a/_locales/tr/messages.json b/_locales/tr/messages.json
index 299bb20..72c832a 100644
--- a/_locales/tr/messages.json
+++ b/_locales/tr/messages.json
@@ -178,5 +178,131 @@
   },
   "next": {
     "message": "Sonraki"
+  },
+  "duplicate": {
+    "message": "Çoğalt"
+  },
+  "merge": {
+    "message": "Birleştir"
+  },
+  "move": {
+    "message": "Taşı"
+  },
+  "copy": {
+    "message": "Kopyala"
+  },
+  "merge_lists_min_two": {
+    "message": "Birleştirmek için en az iki liste seçin."
+  },
+  "merge_lists_confirm": {
+    "message": "{count} listeyi \"{target}\" ile birleştir? Kaynak listeler kaldırılacak."
+  },
+  "delete_current_list": {
+    "message": "Mevcut listeyi sil?"
+  },
+  "delete_lists_confirm": {
+    "message": "Seçili {count} listeyi sil?"
+  },
+  "invalid_import_format": {
+    "message": "Geçersiz dosya formatı. Lütfen geçerli bir Goose Highlighter dışa aktarma dosyası seçin."
+  },
+  "import_failed": {
+    "message": "Dosya içe aktarılamadı. Lütfen geçerli bir JSON dosyası olduğundan emin olun."
+  },
+  "import_confirm": {
+    "message": "Toplam {words} kelime içeren {count} liste içe aktarılsın mı?"
+  },
+  "import_success": {
+    "message": "{words} kelime içeren {count} liste başarıyla içe aktarıldı."
+  },
+  "preview_label": {
+    "message": "Önizleme"
+  },
+  "preview_text": {
+    "message": "Vurgulanan metniniz böyle görünecek."
+  },
+  "preview_text_before": {
+    "message": "Vurgulanan metniniz"
+  },
+  "preview_text_highlight": {
+    "message": "böyle"
+  },
+  "preview_text_after": {
+    "message": "görünecek."
+  },
+  "enable_highlighting_title": {
+    "message": "Vurgulamayı Etkinleştir"
+  },
+  "enable_highlighting_subtitle": {
+    "message": "Sayfalarda vurguları göster"
+  },
+  "manage_lists": {
+    "message": "Listeleri Yönet"
+  },
+  "background_label": {
+    "message": "Arka Plan"
+  },
+  "foreground_label": {
+    "message": "Ön Plan"
+  },
+  "multi_select_hint": {
+    "message": "Seçmek için tıklayın • Çoklu seçim için Ctrl/Cmd+Tıklama"
+  },
+  "dark_mode_title": {
+    "message": "Karanlık Mod"
+  },
+  "dark_mode_subtitle": {
+    "message": "Açık/koyu tema arasında geçiş yap"
+  },
+  "list_manager_title": {
+    "message": "Liste Yöneticisi"
+  },
+  "words_label": {
+    "message": "kelime"
+  },
+  "active_label": {
+    "message": "aktif"
+  },
+  "inactive_label": {
+    "message": "pasif"
+  },
+  "drag_words_hint": {
+    "message": "Seçmek için tıklayın • Çoklu seçim için Ctrl/Cmd+Tıklama • Kopyalamak için kelimeleri listelere sürükleyin"
+  },
+  "drag_lists_hint": {
+    "message": "Yeniden sıralamak için listeleri sürükleyin • Çoklu seçim için Ctrl+Tıklama"
+  },
+  "showing_items": {
+    "message": "{total} kelimeden {start}-{end} gösteriliyor"
+  },
+  "items_per_page": {
+    "message": "Sayfa başına öğe:"
+  },
+  "page_info": {
+    "message": "Sayfa {current} / {total}"
+  },
+  "toggle_active": {
+    "message": "aktif/pasif değiştir"
+  },
+  "rename_list_title": {
+    "message": "Listeyi yeniden adlandır"
+  },
+  "new_list_title": {
+    "message": "Yeni liste"
+  },
+  "delete_list_title": {
+    "message": "Listeyi sil"
+  },
+  "list_active_badge": {
+    "message": "Aktif"
+  },
+  "list_paused_badge": {
+    "message": "Duraklatıldı"
+  },
+  "words_stats": {
+    "message": "{total} kelime • {active} aktif • {inactive} pasif"
+  },
+  "rename_list": {
+    "message": "Listeyi Yeniden Adlandır"
   }
 }
\ No newline at end of file
diff --git a/_locales/zh_CN/messages.json b/_locales/zh_CN/messages.json
index ec3ec03..9a9e329 100644
--- a/_locales/zh_CN/messages.json
+++ b/_locales/zh_CN/messages.json
@@ -178,5 +178,131 @@
   },
   "next": {
     "message": "下一个"
+  },
+  "duplicate": {
+    "message": "复制"
+  },
+  "merge": {
+    "message": "合并"
+  },
+  "move": {
+    "message": "移动"
+  },
+  "copy": {
+    "message": "复制"
+  },
+  "merge_lists_min_two": {
+    "message": "选择至少两个列表进行合并。"
+  },
+  "merge_lists_confirm": {
+    "message": "将 {count} 个列表合并到 \"{target}\"？源列表将被删除。"
+  },
+  "delete_current_list": {
+    "message": "删除当前列表？"
+  },
+  "delete_lists_confirm": {
+    "message": "删除 {count} 个选定的列表？"
+  },
+  "invalid_import_format": {
+    "message": "无效的文件格式。请选择有效的 Goose Highlighter 导出文件。"
+  },
+  "import_failed": {
+    "message": "导入文件失败。请确保它是有效的 JSON 文件。"
+  },
+  "import_confirm": {
+    "message": "导入 {count} 个列表，共 {words} 个单词？"
+  },
+  "import_success": {
+    "message": "成功导入 {count} 个列表，共 {words} 个单词。"
+  },
+  "preview_label": {
+    "message": "预览"
+  },
+  "preview_text": {
+    "message": "您的高亮文本将如此显示。"
+  },
+  "preview_text_before": {
+    "message": "您的"
+  },
+  "preview_text_highlight": {
+    "message": "高亮文本"
+  },
+  "preview_text_after": {
+    "message": "将如此显示。"
+  },
+  "enable_highlighting_title": {
+    "message": "启用高亮"
+  },
+  "enable_highlighting_subtitle": {
+    "message": "在页面上显示高亮"
+  },
+  "manage_lists": {
+    "message": "管理列表"
+  },
+  "background_label": {
+    "message": "背景"
+  },
+  "foreground_label": {
+    "message": "前景"
+  },
+  "multi_select_hint": {
+    "message": "点击选择 • Ctrl/Cmd+点击多选"
+  },
+  "dark_mode_title": {
+    "message": "暗黑模式"
+  },
+  "dark_mode_subtitle": {
+    "message": "切换亮色/暗色主题"
+  },
+  "list_manager_title": {
+    "message": "列表管理器"
+  },
+  "words_label": {
+    "message": "单词"
+  },
+  "active_label": {
+    "message": "激活"
+  },
+  "inactive_label": {
+    "message": "未激活"
+  },
+  "drag_words_hint": {
+    "message": "点击选择 • Ctrl/Cmd+点击多选 • 拖动单词到列表以复制"
+  },
+  "drag_lists_hint": {
+    "message": "拖动列表以重新排序 • Ctrl+点击多选"
+  },
+  "showing_items": {
+    "message": "显示 {start}-{end} / 共 {total} 个单词"
+  },
+  "items_per_page": {
+    "message": "每页项目数："
+  },
+  "page_info": {
+    "message": "第 {current} 页，共 {total} 页"
+  },
+  "toggle_active": {
+    "message": "切换激活状态"
+  },
+  "rename_list_title": {
+    "message": "重命名列表"
+  },
+  "new_list_title": {
+    "message": "新建列表"
+  },
+  "delete_list_title": {
+    "message": "删除列表"
+  },
+  "list_active_badge": {
+    "message": "激活"
+  },
+  "list_paused_badge": {
+    "message": "已暂停"
+  },
+  "words_stats": {
+    "message": "{total} 个单词 • {active} 个激活 • {inactive} 个未激活"
+  },
+  "rename_list": {
+    "message": "重命名列表"
   }
 }
\ No newline at end of file
diff --git a/list-manager/list-manager.css b/list-manager/list-manager.css
index 6eb3b05..36f4308 100644
--- a/list-manager/list-manager.css
+++ b/list-manager/list-manager.css
@@ -1,8 +1,11 @@
+@import url('../shared/fonts.css');
 @import url('../shared/colors.css');
 @import url('../shared/ui-components.css');
 
 * {
   box-sizing: border-box;
+  margin: 0;
+  padding: 0;
 }
 
 html {
@@ -10,19 +13,17 @@ html {
 }
 
 body {
-  font-family: 'Inter', -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+  font-family: var(--font-sans);
+  font-size: var(--text-base);
+  line-height: var(--leading-normal);
+  letter-spacing: var(--tracking-tight);
   margin: 0;
-  background: radial-gradient(120% 120% at 10% 0%, rgba(204, 106, 42, 0.08) 0%, transparent 45%),
-    linear-gradient(180deg, var(--bg-color) 0%, #f5efe9 100%);
+  background: var(--bg-color);
   color: var(--text-color);
   height: 100%;
   overflow: hidden;
-}
-
-html.dark body,
-body.dark {
-  background: radial-gradient(120% 120% at 10% 0%, rgba(242, 168, 101, 0.08) 0%, transparent 45%),
-    linear-gradient(180deg, var(--bg-color) 0%, #0f0d0b 100%);
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
 }
 
 .app {
@@ -32,65 +33,115 @@ body.dark {
   overflow: hidden;
 }
 
+.app button {
+  border-radius: 6px;
+}
+
+.app .icon-btn {
+  min-width: 28px;
+  min-height: 28px;
+  border-radius: 6px;
+}
+
 .topbar {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  padding: 16px 20px;
-  background: linear-gradient(145deg, #f6eee7 0%, #f0e8df 100%);
+  padding: 8px 16px;
+  background: var(--bg-color);
   border-bottom: 1px solid var(--input-border);
-  box-shadow: var(--shadow);
-}
-
-html.dark .topbar,
-body.dark .topbar {
-  background: linear-gradient(145deg, #2b211b 0%, #231a14 100%);
+  flex-shrink: 0;
 }
 
 .title {
   display: flex;
   align-items: center;
-  gap: 12px;
+  gap: 10px;
 }
 
 .title img {
-  height: 36px;
-  width: 36px;
+  height: 28px;
+  width: 28px;
+  border-radius: 8px;
+  background: var(--text-color);
+  padding: 4px;
+  object-fit: contain;
+}
+
+html.dark .title img,
+body.dark .title img {
+  background: var(--highlight-tag);
 }
 
 .name {
   font-weight: 600;
-  font-size: 1.05rem;
+  font-size: 13px;
+  color: var(--text-color);
 }
 
 .subtitle {
-  font-size: 0.85rem;
-  opacity: 0.7;
+  font-size: 11px;
+  opacity: 0.6;
 }
 
-.topbar-actions {
-  display: flex;
-  gap: 10px;
+.topbar-actions button {
+  min-height: 28px;
+  padding: 4px 10px;
+  font-size: 12px;
+  border-radius: 6px;
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+}
+
+.topbar-actions button.primary {
+  background: var(--accent);
+  color: var(--accent-text);
+  border: none;
+}
+
+.topbar-actions button.primary:hover {
+  background: var(--accent-hover);
+}
+
+.topbar-actions button.ghost {
+  background: var(--input-bg);
+  border: 1px solid var(--input-border);
+  color: var(--text-color);
+}
+
+.topbar-actions button.ghost:hover {
+  background: var(--section-bg);
+}
+
+.topbar-actions .icon-toggle {
+  width: 28px;
+  height: 28px;
+  padding: 0;
+  border-radius: 6px;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
 }
 
 .layout {
   display: grid;
   grid-template-columns: minmax(280px, 25%) 1fr;
-  gap: 16px;
-  padding: 16px;
+  gap: 12px;
+  padding: 12px;
   flex: 1;
   overflow: hidden;
   min-height: 0;
 }
 
 .panel {
-  background: var(--panel-bg);
+  background: var(--section-bg);
   border: 1px solid var(--input-border);
-  border-radius: var(--border-radius);
-  padding: 14px;
+  border-radius: 8px;
+  padding: 12px;
   display: flex;
   flex-direction: column;
-  gap: 12px;
+  gap: 10px;
   overflow: hidden;
   min-height: 0;
 }
@@ -99,13 +150,13 @@ body.dark .topbar {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  gap: 12px;
+  gap: 10px;
 }
 
 .lists-panel .panel-header {
   flex-direction: column;
   align-items: flex-start;
-  gap: 8px;
+  gap: 6px;
 }
 
 .lists-panel .panel-header h2 {
@@ -114,12 +165,14 @@ body.dark .topbar {
 
 .panel-header h2 {
   margin: 0;
-  font-size: 1rem;
+  font-size: 13px;
+  font-weight: 600;
+  color: var(--text-color);
 }
 
 .panel-actions {
   display: flex;
-  gap: 8px;
+  gap: 6px;
   flex-wrap: wrap;
 }
 
@@ -129,8 +182,10 @@ body.dark .topbar {
 }
 
 .lists-panel .panel-actions button {
-  padding: 6px 10px;
-  font-size: 0.8rem;
+  padding: 4px 8px;
+  font-size: 12px;
+  border-radius: 6px;
+  min-height: 28px;
 }
 
 .panel-actions.secondary {
@@ -138,82 +193,46 @@ body.dark .topbar {
   gap: 6px;
 }
 
+.panel-actions.secondary button {
+  padding: 4px 8px;
+  font-size: 12px;
+  border-radius: 6px;
+  min-height: 28px;
+}
+
 .list-hint {
-  font-size: 0.8rem;
-  opacity: 0.7;
-  margin-top: -4px;
+  font-size: 11px;
+  opacity: 0.6;
+  margin-top: -2px;
 }
 
 .selection-hint {
-  font-size: 0.75rem;
+  font-size: 12px;
+  color: var(--text-color);
   opacity: 0.6;
   margin-top: 4px;
   font-style: italic;
+  text-align: center;
 }
 
 .lists {
   display: flex;
   flex-direction: column;
-  gap: 10px;
+  gap: 8px;
   overflow-y: auto;
   padding-right: 4px;
   flex: 1;
   min-height: 0;
 }
 
-/* Custom scrollbar styling - List Manager Specific */
-.lists::-webkit-scrollbar,
-.word-list::-webkit-scrollbar {
-  width: 8px;
-}
-
-.lists::-webkit-scrollbar-track,
-.word-list::-webkit-scrollbar-track {
-  background: #f0e8df;
-  border-radius: 10px;
-}
-
-.lists::-webkit-scrollbar-thumb,
-.word-list::-webkit-scrollbar-thumb {
-  background: var(--input-border);
-  border-radius: 10px;
-  transition: background 0.2s ease;
-}
-
-.lists::-webkit-scrollbar-thumb:hover,
-.word-list::-webkit-scrollbar-thumb:hover {
-  background: #d4c4b8;
-}
-
-html.dark .lists::-webkit-scrollbar-track,
-html.dark .word-list::-webkit-scrollbar-track,
-body.dark .lists::-webkit-scrollbar-track,
-body.dark .word-list::-webkit-scrollbar-track {
-  background: #1a1511;
-}
-
-html.dark .lists::-webkit-scrollbar-thumb,
-html.dark .word-list::-webkit-scrollbar-thumb,
-body.dark .lists::-webkit-scrollbar-thumb,
-body.dark .word-list::-webkit-scrollbar-thumb {
-  background: var(--input-border);
-}
-
-html.dark .lists::-webkit-scrollbar-thumb:hover,
-html.dark .word-list::-webkit-scrollbar-thumb:hover,
-body.dark .lists::-webkit-scrollbar-thumb:hover,
-body.dark .word-list::-webkit-scrollbar-thumb:hover {
-  background: #4a3e36;
-}
-
 .list-item {
-  background: #ffffff;
+  background: var(--input-bg);
   border: 2px solid transparent;
-  border-radius: 12px;
-  padding: 10px 12px;
+  border-radius: 8px;
+  padding: 8px 10px;
   display: grid;
   grid-template-columns: 1fr auto;
-  gap: 10px;
+  gap: 8px;
   align-items: center;
   cursor: pointer;
   transition: all 0.2s ease;
@@ -221,52 +240,28 @@ body.dark .word-list::-webkit-scrollbar-thumb:hover {
 }
 
 .list-item:hover {
-  background: #f9f4f0;
-  border-color: rgba(204, 106, 42, 0.3);
+  background: var(--section-bg);
+  border-color: var(--input-border);
 }
 
 .list-item.active {
   border-color: var(--accent);
-  box-shadow: 0 6px 12px rgba(0, 0, 0, 0.1);
-  background: #fffaf6;
+  box-shadow: var(--shadow-sm);
+  background: var(--section-bg);
 }
 
 .list-item.selected {
-  background: rgba(204, 106, 42, 0.1);
+  background: var(--section-bg);
   border-color: rgba(204, 106, 42, 0.5);
 }
 
-.list-item.selected.active {
-  border-color: var(--accent);
-  background: rgba(204, 106, 42, 0.15);
-}
-
-html.dark .list-item,
-body.dark .list-item {
-  background: #1f1813;
-}
-
-html.dark .list-item:hover,
-body.dark .list-item:hover {
-  background: #251f19;
-  border-color: rgba(242, 168, 101, 0.3);
-}
-
-html.dark .list-item.active,
-body.dark .list-item.active {
-  box-shadow: 0 6px 12px rgba(0, 0, 0, 0.3);
-  background: #2a2218;
-}
-
 html.dark .list-item.selected,
 body.dark .list-item.selected {
-  background: rgba(242, 168, 101, 0.15);
-  border-color: rgba(242, 168, 101, 0.6);
+  border-color: rgba(255, 140, 0, 0.5);
 }
 
-html.dark .list-item.selected.active,
-body.dark .list-item.selected.active {
-  background: rgba(242, 168, 101, 0.2);
+.list-item.selected.active {
+  border-color: var(--accent);
 }
 
 .list-item.drag-over {
@@ -282,19 +277,31 @@ body.dark .list-item.selected.active {
 
 .list-name {
   font-weight: 600;
+  font-size: 13px;
 }
 
 .list-stats {
-  font-size: 0.75rem;
+  font-size: 11px;
   opacity: 0.7;
 }
 
 .list-badge {
-  font-size: 0.75rem;
-  padding: 4px 8px;
+  font-size: 11px;
+  padding: 2px 6px;
   border-radius: 999px;
   border: 1px solid var(--input-border);
   opacity: 0.8;
+  cursor: pointer;
+  user-select: none;
+}
+
+.list-badge:hover {
+  opacity: 1;
+}
+
+.list-badge:focus-visible {
+  outline: 2px solid var(--accent);
+  outline-offset: 2px;
 }
 
 .details-panel {
@@ -308,17 +315,12 @@ body.dark .list-item.selected.active {
 .list-settings {
   display: none;
   gap: 8px;
-  padding: 8px;
-  background: rgba(204, 106, 42, 0.05);
-  border-radius: 8px;
+  padding: 8px 10px;
+  background: var(--input-bg);
+  border-radius: 6px;
   border: 1px solid var(--input-border);
 }
 
-html.dark .list-settings,
-body.dark .list-settings {
-  background: rgba(242, 168, 101, 0.08);
-}
-
 .list-settings.expanded {
   display: flex;
   flex-direction: column;
@@ -327,7 +329,8 @@ body.dark .list-settings {
 .list-settings input[type="text"] {
   width: 100%;
   padding: 6px 10px;
-  font-size: 0.9rem;
+  font-size: 13px;
+  border-radius: 6px;
 }
 
 .color-row {
@@ -340,7 +343,7 @@ body.dark .list-settings {
   display: flex;
   align-items: center;
   gap: 6px;
-  font-size: 0.85rem;
+  font-size: 12px;
   flex: 1;
 }
 
@@ -356,9 +359,11 @@ body.dark .list-settings {
 }
 
 .compact-btn {
-  padding: 6px 12px;
+  padding: 4px 10px;
   min-width: auto;
   height: 32px;
+  border-radius: 6px;
+  font-size: 13px;
 }
 
 .compact-header {
@@ -375,7 +380,8 @@ body.dark .list-settings {
 
 .list-title-section h2 {
   margin: 0;
-  font-size: 1rem;
+  font-size: 13px;
+  font-weight: 600;
   max-width: 300px;
   overflow: hidden;
   text-overflow: ellipsis;
@@ -392,100 +398,132 @@ body.dark .list-settings {
 .add-words {
   display: flex;
   gap: 10px;
-  align-items: stretch;
+  align-items: flex-start;
 }
 
 .add-words textarea {
   flex: 1;
-  min-height: 64px;
+  min-height: 56px;
   resize: vertical;
   background: var(--input-bg);
   color: var(--text-color);
   border: 1px solid var(--input-border);
-  border-radius: 10px;
-  padding: 8px 10px;
+  border-radius: 8px;
+  padding: 6px 10px;
+  font-size: 13px;
+}
+
+.add-words textarea:focus {
+  outline: none;
+  border-color: var(--accent);
 }
 
 .add-words button {
-  min-width: 120px;
+  min-width: 100px;
+  height: 32px;
+  border-radius: 6px;
+  font-size: 13px;
+  flex-shrink: 0;
 }
 
+/* Word controls: action row matches popup .word-actions-row / .word-action-btn */
 .word-controls .row {
   display: flex;
-  gap: 8px;
   flex-wrap: wrap;
+  gap: 6px;
+  align-items: center;
+}
+
+.word-controls .row button {
+  height: 26px;
+  padding: 0 8px;
+  font-size: 12px;
+  border-radius: 6px;
+  background: var(--input-bg);
+  border: 1px solid var(--input-border);
+  color: var(--text-color);
+}
+
+.word-controls .row button:hover {
+  background: var(--section-bg);
+}
+
+.word-controls .row button.danger {
+  background: rgba(239, 68, 68, 0.1);
+  border-color: rgba(239, 68, 68, 0.3);
+  color: var(--danger);
+}
+
+.word-controls .row button.danger:hover {
+  background: rgba(239, 68, 68, 0.2);
 }
 
 .word-controls input[type="text"],
 .word-controls select {
   flex: 1;
-  min-width: 160px;
+  min-width: 140px;
+  min-height: 32px;
+  padding: 0 10px;
+  font-size: 14px;
+  border-radius: 8px;
 }
 
+#wordSearch {
+  height: 32px;
+  padding: 0 10px;
+  font-size: 14px;
+  border-radius: 8px;
+}
+
+/* Search/move row: align input, select and buttons to same height */
+.word-controls .row:has(#wordSearch) button {
+  height: 32px;
+}
+
+/* Word list container – matches popup .word-list-container */
 .word-list {
+  flex: 1;
   overflow-y: auto;
+  background: var(--input-bg);
   border: 1px solid var(--input-border);
-  border-radius: 12px;
-  padding: 8px;
-  background: #f9f4f0;
+  border-radius: 8px;
+  min-height: 0;
   display: flex;
   flex-direction: column;
-  gap: 8px;
-  flex: 1 1 0;
-  min-height: 0;
 }
 
-html.dark .word-list,
-body.dark .word-list {
-  background: #1a1511;
-}
-
-.empty {
-  padding: 12px;
+.word-list .empty {
+  padding: 16px;
   text-align: center;
-  opacity: 0.7;
-  font-size: 0.9rem;
+  font-size: 14px;
+  color: var(--text-color);
+  opacity: 0.6;
 }
 
+/* Word item – matches popup .word-item (flex row, border-bottom, left accent when selected) */
 .word-item {
-  display: grid;
-  grid-template-columns: 1fr auto auto auto auto;
-  gap: 8px;
+  display: flex;
   align-items: center;
-  padding: 8px 10px;
-  border-radius: 10px;
-  background: #ffffff;
-  border: 2px solid transparent;
+  gap: 8px;
+  padding: 6px 10px;
   cursor: pointer;
-  transition: all 0.2s ease;
-  position: relative;
+  transition: all 0.2s;
+  border-bottom: 1px solid var(--input-border);
+  min-width: 0;
+}
+
+.word-item:last-child {
+  border-bottom: none;
 }
 
 .word-item:hover {
-  background: #f9f4f0;
-  border-color: rgba(204, 106, 42, 0.2);
+  background: var(--highlight-tag);
 }
 
 .word-item.selected {
-  background: rgba(204, 106, 42, 0.1);
-  border-color: rgba(204, 106, 42, 0.5);
-}
-
-html.dark .word-item,
-body.dark .word-item {
-  background: #201915;
-}
-
-html.dark .word-item:hover,
-body.dark .word-item:hover {
-  background: #2a2218;
-  border-color: rgba(242, 168, 101, 0.2);
-}
-
-html.dark .word-item.selected,
-body.dark .word-item.selected {
-  background: rgba(242, 168, 101, 0.15);
-  border-color: rgba(242, 168, 101, 0.6);
+  background: var(--section-bg);
+  border-left: 3px solid var(--accent);
+  padding-left: 9px;
 }
 
 .word-item.disabled {
@@ -493,10 +531,13 @@ body.dark .word-item.selected {
 }
 
 .word-text {
-  font-size: 0.9rem;
+  flex: 1;
+  font-size: 14px;
+  color: var(--text-color);
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
+  min-width: 0;
   user-select: none;
 }
 
@@ -506,13 +547,19 @@ body.dark .word-item.selected {
 
 .word-edit-input {
   display: none;
-  width: 100%;
-  background: var(--input-bg);
-  color: var(--text-color);
+  flex: 1;
+  height: 28px;
+  padding: 0 8px;
+  background: var(--bg-color);
   border: 1px solid var(--accent);
-  border-radius: 8px;
-  padding: 4px 8px;
-  font-size: 0.9rem;
+  border-radius: 4px;
+  font-size: 14px;
+  color: var(--text-color);
+  min-width: 0;
+}
+
+.word-edit-input:focus {
+  outline: none;
 }
 
 .word-edit-input.active {
@@ -521,8 +568,9 @@ body.dark .word-item.selected {
 
 .word-actions {
   display: flex;
-  gap: 4px;
   align-items: center;
+  gap: 4px;
+  flex-shrink: 0;
   pointer-events: auto;
 }
 
@@ -530,35 +578,79 @@ body.dark .word-item.selected {
   pointer-events: auto;
 }
 
-
-
-input[type="color"] {
+/* Word item icon button – matches popup .word-item-icon-btn */
+.word-item .icon-btn {
+  width: 28px;
+  height: 28px;
+  min-width: 28px;
+  min-height: 28px;
   padding: 0;
-  height: 36px;
-  border-radius: 10px;
+  background: transparent;
+  border: none;
+  border-radius: 4px;
+  color: var(--text-color);
+  opacity: 0.6;
+}
+
+.word-item .icon-btn:hover {
+  opacity: 1;
+  background: var(--highlight-tag);
+  color: var(--accent);
+}
+
+.word-item .icon-btn i {
+  font-size: 14px;
+}
+
+/* Word item color picker – matches popup .word-item-color-picker */
+.word-item input[type="color"] {
+  width: 28px;
+  height: 28px;
+  border-radius: 4px;
   border: 1px solid var(--input-border);
-  background: #1f1813;
   cursor: pointer;
+  padding: 0;
+  flex-shrink: 0;
+}
+
+.word-item input[type="color"]::-webkit-color-swatch-wrapper {
+  padding: 0;
+  border-radius: 3px;
+}
+
+.word-item input[type="color"]::-webkit-color-swatch {
+  border: none;
+  border-radius: 3px;
+}
+
+.word-item input[type="color"]:hover {
+  border-color: var(--accent);
+}
+
+.word-item .word-item-eye-toggle {
+  flex-shrink: 0;
+}
+
+
+
+.app input[type="color"] {
+  padding: 0;
+  height: 32px;
+  border-radius: 6px;
+  border: 1px solid var(--input-border);
+  cursor: pointer;
+}
+
+.app input[type="color"]:hover {
+  border-color: var(--accent);
 }
 
 .colors input[type="color"] {
   width: 100%;
 }
 
-.word-item input[type="color"] {
-  width: 38px;
-  height: 28px;
-  border-radius: 8px;
-  cursor: pointer;
-}
-
-.word-item input[type="color"]:hover {
-  transform: scale(1.05);
-  transition: transform 0.2s ease;
-}
-
 .stats {
-  font-size: 0.85rem;
+  font-size: 12px;
   opacity: 0.7;
 }
 
@@ -567,22 +659,17 @@ input[type="color"] {
   flex-direction: row;
   align-items: center;
   justify-content: space-between;
-  gap: 12px;
-  padding: 8px 12px;
-  background: #f9f4f0;
+  gap: 10px;
+  padding: 6px 10px;
+  background: var(--section-bg);
   border: 1px solid var(--input-border);
-  border-radius: 12px;
+  border-radius: 8px;
   flex-shrink: 0;
   flex-wrap: wrap;
 }
 
-html.dark .pagination-container,
-body.dark .pagination-container {
-  background: #1a1511;
-}
-
 .pagination-info {
-  font-size: 0.8rem;
+  font-size: 12px;
   opacity: 0.8;
   white-space: nowrap;
 }
@@ -594,9 +681,9 @@ body.dark .pagination-container {
 }
 
 .pagination-btn {
-  background: var(--button-bg);
+  background: var(--input-bg);
   border: 1px solid var(--input-border);
-  color: var(--button-text);
+  color: var(--text-color);
   border-radius: 6px;
   padding: 4px 6px;
   cursor: pointer;
@@ -606,11 +693,11 @@ body.dark .pagination-container {
   justify-content: center;
   min-width: 28px;
   min-height: 28px;
-  font-size: 0.75rem;
+  font-size: 12px;
 }
 
 .pagination-btn:hover:not(:disabled) {
-  background: var(--button-hover);
+  background: var(--section-bg);
   border-color: var(--accent);
 }
 
@@ -622,11 +709,11 @@ body.dark .pagination-container {
 .pagination-pages {
   display: flex;
   align-items: center;
-  padding: 0 8px;
+  padding: 0 6px;
 }
 
 .page-info {
-  font-size: 0.8rem;
+  font-size: 12px;
   opacity: 0.9;
   font-weight: 500;
 }
@@ -635,7 +722,7 @@ body.dark .pagination-container {
   display: flex;
   align-items: center;
   gap: 6px;
-  font-size: 0.8rem;
+  font-size: 12px;
 }
 
 .page-size-controls label {
@@ -649,7 +736,7 @@ body.dark .pagination-container {
   border: 1px solid var(--input-border);
   border-radius: 6px;
   padding: 3px 6px;
-  font-size: 0.8rem;
+  font-size: 12px;
   min-width: 55px;
 }
 
diff --git a/list-manager/list-manager.html b/list-manager/list-manager.html
index a7caf9d..ebf0b64 100644
--- a/list-manager/list-manager.html
+++ b/list-manager/list-manager.html
@@ -4,10 +4,9 @@
 <head>
   <meta charset="UTF-8" />
   <meta name="viewport" content="width=1280" />
-  <title>Goose Highlighter - List Manager</title>
+  <title data-i18n="extension_name">Goose Highlighter - List Manager</title>
   <link rel="stylesheet" href="list-manager.css" />
   <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.0/css/all.min.css" />
-  <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;600&display=swap" rel="stylesheet">
 </head>
 
 <body>
@@ -16,18 +15,18 @@
       <div class="title">
         <img src="../img/logo-outlined.png" alt="Goose Highlighter" />
         <div>
-          <div class="name">Goose Highlighter</div>
-          <div class="subtitle">List Manager</div>
+          <div class="name" data-i18n="extension_name">Goose Highlighter</div>
+          <div class="subtitle" data-i18n="list_manager_title">List Manager</div>
         </div>
       </div>
 <div class="topbar-actions">
-        <label class="icon-toggle" title="Toggle dark mode">
+        <label class="icon-toggle" data-i18n-title="toggle_dark_mode_title" title="Toggle dark mode">
           <input type="checkbox" class="hidden-toggle" id="themeToggle" />
           <i class="toggle-icon theme-icon fa-solid"></i>
         </label>
-        <button id="importListBtn" class="ghost"><i class="fa-solid fa-upload"></i> Import List</button>
-        <button id="exportListBtn" class="ghost"><i class="fa-solid fa-download"></i> Export List</button>
-        <button id="newListBtn" class="primary"><i class="fa-solid fa-plus"></i> New List</button>
+        <button id="importListBtn" class="ghost"><i class="fa-solid fa-upload"></i> <span data-i18n="import_list">Import List</span></button>
+        <button id="exportListBtn" class="ghost"><i class="fa-solid fa-download"></i> <span data-i18n="export_list">Export List</span></button>
+        <button id="newListBtn" class="primary"><i class="fa-solid fa-plus"></i> <span data-i18n="new_list">New List</span></button>
       </div>
       <input type="file" id="importFileInput" accept=".json" style="display: none;" />
     </header>
@@ -35,18 +34,14 @@
     <main class="layout">
       <section class="panel lists-panel">
         <div class="panel-header">
-          <h2>Lists</h2>
+          <h2 data-i18n="tab_lists">Lists</h2>
           <div class="panel-actions">
-            <button id="duplicateListBtn"><i class="fa-solid fa-clone"></i> Duplicate</button>
-            <button id="mergeListsBtn"><i class="fa-solid fa-code-merge"></i> Merge</button>
-            <button id="deleteListsBtn" class="danger"><i class="fa-solid fa-trash"></i> Delete</button>
+            <button id="duplicateListBtn"><i class="fa-solid fa-clone"></i> <span data-i18n="duplicate">Duplicate</span></button>
+            <button id="mergeListsBtn"><i class="fa-solid fa-code-merge"></i> <span data-i18n="merge">Merge</span></button>
+            <button id="deleteListsBtn" class="danger"><i class="fa-solid fa-trash"></i> <span data-i18n="delete_selected">Delete</span></button>
           </div>
         </div>
-        <div class="panel-actions secondary">
-          <button id="activateListsBtn"><i class="fa-solid fa-circle-check"></i> Activate</button>
-          <button id="deactivateListsBtn"><i class="fa-solid fa-circle-xmark"></i> Deactivate</button>
-        </div>
-        <div class="list-hint">Drag lists to reorder • Ctrl+Click for multi-select</div>
+        <div class="list-hint" data-i18n="drag_lists_hint">Drag lists to reorder • Ctrl+Click for multi-select</div>
         <div id="listsContainer" class="lists"></div>
       </section>
 
@@ -54,22 +49,22 @@
         <div class="panel-header compact-header">
           <div class="list-title-section">
             <h2 id="selectedListName">Selected List</h2>
-            <button id="editListNameBtn" class="icon-btn" title="Edit list name and colors">
+            <button id="editListNameBtn" class="icon-btn" data-i18n-title="edit_list_name_and_colors_title" title="Edit list name and colors">
               <i class="fa-solid fa-pen"></i>
             </button>
           </div>
           <div class="stats" id="listStats">0 words</div>
         </div>
         <div class="list-settings collapsed" id="listSettingsPanel">
-          <input type="text" id="listName" placeholder="List name" />
+          <input type="text" id="listName" data-i18n="list_name" placeholder="List name" />
           <div class="color-row">
             <label class="compact-label">
-              <span>BG</span>
-              <input type="color" id="listBg" />
+              <span data-i18n="background">BG</span>
+              <input type="color" id="listBg" data-i18n-title="background_color_title" />
             </label>
             <label class="compact-label">
-              <span>FG</span>
-              <input type="color" id="listFg" />
+              <span data-i18n="foreground">FG</span>
+              <input type="color" id="listFg" data-i18n-title="text_color_title" />
             </label>
             <button id="applyListSettingsBtn" class="compact-btn primary"><i class="fa-solid fa-check"></i></button>
           </div>
@@ -77,23 +72,23 @@
 
         <div class="word-controls">
           <div class="add-words">
-            <textarea id="bulkAddWords" placeholder="Paste words here..."></textarea>
-            <button id="addWordsBtn" class="primary"><i class="fa-solid fa-plus"></i> Add Words</button>
+            <textarea id="bulkAddWords" data-i18n="paste_hint" placeholder="Paste words here..."></textarea>
+            <button id="addWordsBtn" class="primary"><i class="fa-solid fa-plus"></i> <span data-i18n="add_words">Add Words</span></button>
           </div>
           <div class="row">
-            <button id="selectAllWordsBtn">Select All</button>
-            <button id="clearSelectedWordsBtn">Clear</button>
-            <button id="enableWordsBtn">Enable</button>
-            <button id="disableWordsBtn">Disable</button>
-            <button id="deleteWordsBtn" class="danger">Delete</button>
+            <button id="selectAllWordsBtn" data-i18n="select_all">Select All</button>
+            <button id="clearSelectedWordsBtn" data-i18n="deselect_all">Clear</button>
+            <button id="enableWordsBtn" data-i18n="enable_selected">Enable</button>
+            <button id="disableWordsBtn" data-i18n="disable_selected">Disable</button>
+            <button id="deleteWordsBtn" class="danger" data-i18n="delete_selected">Delete</button>
           </div>
           <div class="row">
-            <input type="text" id="wordSearch" placeholder="Search words..." />
+            <input type="text" id="wordSearch" data-i18n="search_placeholder" placeholder="Search words..." />
             <select id="targetListSelect"></select>
-            <button id="moveWordsBtn"><i class="fa-solid fa-arrow-right"></i> Move</button>
-            <button id="copyWordsBtn"><i class="fa-solid fa-copy"></i> Copy</button>
+            <button id="moveWordsBtn"><i class="fa-solid fa-arrow-right"></i> <span data-i18n="move">Move</span></button>
+            <button id="copyWordsBtn"><i class="fa-solid fa-copy"></i> <span data-i18n="copy">Copy</span></button>
           </div>
-          <div class="selection-hint">Click to select • Ctrl/Cmd+Click for multi-select • Drag words to lists to copy</div>
+          <div class="selection-hint" data-i18n="drag_words_hint">Click to select • Ctrl/Cmd+Click for multi-select • Drag words to lists to copy</div>
         </div>
 
 <div id="wordList" class="word-list"></div>
diff --git a/popup/popup.css b/popup/popup.css
index 38cfe8e..1c496ae 100644
--- a/popup/popup.css
+++ b/popup/popup.css
@@ -1,4 +1,6 @@
+@import url('../shared/fonts.css');
 @import url('../shared/colors.css');
+@import url('../shared/ui-components.css');
 
 /* Reset and Base Styles */
 * {
@@ -8,11 +10,14 @@
 }
 
 body {
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', sans-serif;
+  font-family: var(--font-sans);
+  font-size: var(--text-base);
+  line-height: var(--leading-normal);
+  letter-spacing: var(--tracking-tight);
   background: var(--bg-color);
   color: var(--text-color);
-  width: 600px;
-  min-height: 600px;
+  width: 380px;
+  min-height: 500px;
   max-height: 600px;
   overflow: hidden;
   -webkit-font-smoothing: antialiased;
@@ -71,7 +76,7 @@ body {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  padding: 16px 20px;
+  padding: 6px 12px;
   border-bottom: 1px solid var(--input-border);
   background: var(--bg-color);
   flex-shrink: 0;
@@ -80,20 +85,25 @@ body {
 .header-content {
   display: flex;
   align-items: center;
-  gap: 10px;
+  gap: 6px;
 }
 
 .header-logo {
-  width: 32px;
-  height: 32px;
+  width: 28px;
+  height: 28px;
   border-radius: 8px;
-  background: var(--highlight-tag);
+  background: var(--text-color);
   display: flex;
   align-items: center;
   justify-content: center;
   padding: 4px;
 }
 
+html.dark .header-logo,
+body.dark .header-logo {
+  background: var(--highlight-tag);
+}
+
 .header-logo img {
   width: 100%;
   height: 100%;
@@ -101,101 +111,150 @@ body {
 }
 
 .header-title {
-  font-size: 14px;
+  font-size: var(--text-base);
   font-weight: 600;
+  letter-spacing: var(--tracking-tight);
   color: var(--text-color);
 }
 
-/* Switch Component */
-.switch-wrapper {
-  position: relative;
-  display: inline-block;
-  width: 44px;
-  height: 24px;
-  cursor: pointer;
+.header-actions {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  flex-shrink: 0;
 }
 
-.switch-input {
+.header-settings-btn,
+.header-power-toggle {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 28px;
+  height: 28px;
+  min-width: 28px;
+  min-height: 28px;
+  padding: 0;
+  line-height: 0;
+}
+
+.header-settings-btn {
+  flex-shrink: 0;
+}
+
+.header-settings-btn i {
+  font-size: 14px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+/* Header power toggle (on/off) */
+.header-power-toggle {
+  cursor: pointer;
+  border-radius: 6px;
+}
+
+.header-power-input {
+  position: absolute;
   opacity: 0;
   width: 0;
   height: 0;
-  position: absolute;
+  margin: 0;
+  pointer-events: none;
 }
 
-.switch-slider {
-  position: absolute;
-  cursor: pointer;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background-color: var(--input-border);
-  transition: 0.3s;
-  border-radius: 24px;
+.power-icon-wrapper {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 28px;
+  height: 28px;
+  line-height: 0;
+  color: var(--text-color);
+  opacity: 0.4;
+  transition: color 0.2s, opacity 0.2s;
 }
 
-.switch-slider:before {
-  position: absolute;
-  content: "";
-  height: 18px;
-  width: 18px;
-  left: 3px;
-  bottom: 3px;
-  background-color: white;
-  transition: 0.3s;
-  border-radius: 50%;
+.power-icon-wrapper i {
+  font-size: 14px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 1em;
+  height: 1em;
+  line-height: 1;
+  /* Compensate for Font Awesome power-off glyph optical offset */
+  transform: translate(1px, 1px);
+  margin-right: 4px;
 }
 
-.switch-input:checked + .switch-slider {
-  background-color: var(--accent);
+.power-icon-wrapper:hover {
+  opacity: 0.7;
 }
 
-.switch-input:checked + .switch-slider:before {
-  transform: translateX(20px);
+.header-power-toggle .header-power-input:checked ~ .power-icon-wrapper {
+  color: var(--accent);
+  opacity: 1;
+}
+
+.header-power-toggle .header-power-input:checked ~ .power-icon-wrapper:hover {
+  opacity: 1;
 }
 
 /* Tabs */
 .tabs {
   display: flex;
   align-items: center;
-  gap: 4px;
-  padding: 12px 16px;
+  gap: 2px;
+  padding: 4px 6px;
   border-bottom: 1px solid var(--input-border);
   background: transparent;
   flex-shrink: 0;
+  min-width: 0;
 }
 
 .tab-button {
-  flex: 1;
+  flex: 1 1 0;
+  min-width: 0;
   display: flex;
   align-items: center;
   justify-content: center;
-  gap: 6px;
-  padding: 6px 12px;
-  font-size: 12px;
+  gap: 4px;
+  padding: 5px 4px;
+  font-size: 11px;
   font-weight: 500;
-  color: var(--text-color);
-  opacity: 0.6;
+  color: var(--tab-inactive-color);
   background: transparent;
   border: none;
-  border-radius: 6px;
+  border-radius: 5px;
   cursor: pointer;
   transition: all 0.2s;
 }
 
 .tab-button:hover {
-  opacity: 0.9;
-  background: var(--section-bg);
+  color: var(--text-color);
 }
 
 .tab-button.active {
-  opacity: 1;
-  background: var(--section-bg);
+  background: var(--tab-active-bg);
   color: var(--text-color);
 }
 
 .tab-button i {
-  font-size: 14px;
+  font-size: 11px;
+  flex-shrink: 0;
+  opacity: 0.9;
+}
+
+.tab-button.active i {
+  opacity: 1;
+}
+
+.tab-button span {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  min-width: 0;
 }
 
 /* Tab Content */
@@ -213,10 +272,10 @@ body {
 .tab-inner {
   flex: 1;
   overflow-y: auto;
-  padding: 20px;
+  padding: 8px 12px;
   display: flex;
   flex-direction: column;
-  gap: 16px;
+  gap: 6px;
   min-height: 0;
 }
 
@@ -224,12 +283,12 @@ body {
 .list-selector-section {
   display: flex;
   flex-direction: column;
-  gap: 12px;
+  gap: 6px;
 }
 
 .list-selector-row {
   display: flex;
-  gap: 8px;
+  gap: 6px;
 }
 
 .list-dropdown-wrapper {
@@ -239,17 +298,17 @@ body {
 
 .list-dropdown-button {
   width: 100%;
-  height: 40px;
+  height: 32px;
   display: flex;
   align-items: center;
   justify-content: space-between;
-  padding: 0 12px;
+  padding: 0 10px;
   background: var(--input-bg);
   border: 1px solid var(--input-border);
-  border-radius: 8px;
+  border-radius: 6px;
   cursor: pointer;
   transition: all 0.2s;
-  font-size: 14px;
+  font-size: var(--text-md);
   color: var(--text-color);
 }
 
@@ -260,18 +319,18 @@ body {
 .list-dropdown-content {
   display: flex;
   align-items: center;
-  gap: 8px;
+  gap: 6px;
 }
 
 .list-color-indicator {
-  width: 12px;
-  height: 12px;
+  width: 10px;
+  height: 10px;
   border-radius: 50%;
   flex-shrink: 0;
 }
 
 .list-dropdown-text {
-  font-size: 14px;
+  font-size: var(--text-base);
   color: var(--text-color);
 }
 
@@ -325,14 +384,14 @@ body {
 }
 
 .icon-button {
-  width: 40px;
-  height: 40px;
+  width: 32px;
+  height: 32px;
   display: flex;
   align-items: center;
   justify-content: center;
   background: var(--input-bg);
   border: 1px solid var(--input-border);
-  border-radius: 8px;
+  border-radius: 6px;
   cursor: pointer;
   transition: all 0.2s;
   flex-shrink: 0;
@@ -349,7 +408,7 @@ body {
 }
 
 .icon-button i {
-  font-size: 16px;
+  font-size: 14px;
   color: var(--text-color);
 }
 
@@ -363,17 +422,18 @@ body {
 
 .manage-lists-btn {
   width: 100%;
-  height: 36px;
+  height: 28px;
   display: flex;
   align-items: center;
   justify-content: center;
-  gap: 8px;
+  gap: 6px;
   background: var(--input-bg);
   border: 1px solid var(--input-border);
-  border-radius: 8px;
+  border-radius: 6px;
   cursor: pointer;
   transition: all 0.2s;
-  font-size: 14px;
+  font-size: var(--text-base);
+  font-weight: 500;
   color: var(--text-color);
 }
 
@@ -382,24 +442,35 @@ body {
 }
 
 .manage-lists-btn i {
-  font-size: 16px;
+  font-size: 14px;
 }
 
 /* Color Pickers */
 .color-pickers-row {
   display: flex;
-  gap: 16px;
+  flex-direction: row;
+  gap: 8px;
+  min-width: 0;
 }
 
 .color-picker-group {
   flex: 1;
   display: flex;
   flex-direction: column;
-  gap: 6px;
+  align-items: stretch;
+  gap: 4px;
+  min-width: 0;
+}
+
+.color-picker-group .color-picker-label {
+  flex-shrink: 0;
 }
 
 .color-picker-label {
-  font-size: 12px;
+  font-size: var(--text-xs);
+  font-weight: 500;
+  letter-spacing: var(--tracking-wide);
+  text-transform: uppercase;
   color: var(--text-color);
   opacity: 0.6;
 }
@@ -407,13 +478,15 @@ body {
 .color-picker-input-group {
   display: flex;
   align-items: center;
-  gap: 8px;
+  gap: 6px;
+  flex: 1;
+  min-width: 0;
 }
 
 .color-picker-swatch {
-  width: 40px;
-  height: 40px;
-  border-radius: 8px;
+  width: 32px;
+  height: 32px;
+  border-radius: 5px;
   border: 2px solid var(--input-border);
   cursor: pointer;
   background: transparent;
@@ -422,24 +495,26 @@ body {
 
 .color-picker-swatch::-webkit-color-swatch-wrapper {
   padding: 0;
-  border-radius: 6px;
+  border-radius: 4px;
 }
 
 .color-picker-swatch::-webkit-color-swatch {
   border: none;
-  border-radius: 6px;
+  border-radius: 4px;
 }
 
 .color-picker-text {
   flex: 1;
-  height: 40px;
-  padding: 0 12px;
+  min-width: 0;
+  height: 32px;
+  padding: 0 8px;
   background: var(--input-bg);
   border: 1px solid var(--input-border);
-  border-radius: 8px;
-  font-size: 14px;
-  font-family: 'Courier New', monospace;
+  border-radius: 6px;
+  font-size: var(--text-sm);
+  font-family: var(--font-mono);
   text-transform: uppercase;
+  letter-spacing: 0.05em;
   color: var(--text-color);
 }
 
@@ -452,40 +527,43 @@ body {
 .preview-section {
   display: flex;
   flex-direction: column;
-  gap: 6px;
+  gap: 2px;
 }
 
 .preview-label {
-  font-size: 12px;
+  font-size: var(--text-xs);
+  font-weight: 500;
+  letter-spacing: var(--tracking-wide);
+  text-transform: uppercase;
   color: var(--text-color);
   opacity: 0.6;
 }
 
 .preview-box {
-  padding: 12px;
+  padding: 6px 10px;
   background: var(--input-bg);
   border: 1px solid var(--input-border);
-  border-radius: 8px;
+  border-radius: 6px;
 }
 
 .preview-text {
-  font-size: 14px;
+  font-size: var(--text-base);
   color: var(--text-color);
-  opacity: 0.6;
-  line-height: 1.5;
+  line-height: var(--leading-relaxed);
 }
 
 .preview-highlight {
   padding: 2px 4px;
-  border-radius: 4px;
+  border-radius: 3px;
+  transition: all 0.2s ease;
 }
 
 /* Enable Toggle */
 .enable-toggle-section {
-  padding: 12px;
+  padding: 6px 10px;
   background: var(--input-bg);
   border: 1px solid var(--input-border);
-  border-radius: 8px;
+  border-radius: 6px;
 }
 
 .enable-toggle-content {
@@ -501,13 +579,13 @@ body {
 }
 
 .enable-toggle-title {
-  font-size: 14px;
+  font-size: var(--text-base);
   font-weight: 500;
   color: var(--text-color);
 }
 
 .enable-toggle-subtitle {
-  font-size: 12px;
+  font-size: var(--text-xs);
   color: var(--text-color);
   opacity: 0.6;
 }
@@ -515,7 +593,7 @@ body {
 /* Apply Button */
 .apply-button {
   width: 100%;
-  height: 40px;
+  height: 32px;
   display: flex;
   align-items: center;
   justify-content: center;
@@ -523,10 +601,11 @@ body {
   background: var(--accent);
   color: var(--accent-text);
   border: none;
-  border-radius: 8px;
+  border-radius: 6px;
   cursor: pointer;
-  font-size: 14px;
-  font-weight: 500;
+  font-size: var(--text-base);
+  font-weight: 600;
+  letter-spacing: var(--tracking-tight);
   transition: all 0.2s;
 }
 
@@ -535,30 +614,30 @@ body {
 }
 
 .apply-button i {
-  font-size: 16px;
+  font-size: 14px;
 }
 
 /* Words Tab Styles */
 .add-words-section {
   display: flex;
   flex-direction: column;
-  gap: 8px;
+  gap: 4px;
 }
 
 .section-label {
   display: flex;
   align-items: center;
-  gap: 6px;
-  font-size: 12px;
-  font-weight: 500;
-  color: var(--text-color);
-  opacity: 0.6;
+  gap: 4px;
+  font-size: var(--text-xs);
+  font-weight: 600;
+  letter-spacing: var(--tracking-wide);
   text-transform: uppercase;
-  letter-spacing: 0.5px;
+  color: var(--text-color);
+  opacity: 0.7;
 }
 
 .section-label i {
-  font-size: 14px;
+  font-size: 12px;
 }
 
 .word-count-badge {
@@ -567,16 +646,20 @@ body {
 }
 
 .add-words-textarea {
-  min-height: 72px;
-  padding: 10px 12px;
+  min-height: 56px;
+  padding: 6px 8px;
   background: var(--input-bg);
   border: 1px solid var(--input-border);
   border-radius: 8px;
-  font-size: 14px;
+  font-size: var(--text-md);
   color: var(--text-color);
-  font-family: inherit;
+  font-family: var(--font-sans);
   resize: none;
-  line-height: 1.5;
+  line-height: var(--leading-relaxed);
+}
+
+.add-words-textarea::placeholder {
+  font-size: 12px;
 }
 
 .add-words-textarea:focus {
@@ -586,7 +669,7 @@ body {
 
 .add-words-button {
   width: 100%;
-  height: 36px;
+  height: 28px;
   display: flex;
   align-items: center;
   justify-content: center;
@@ -595,8 +678,8 @@ body {
   border: none;
   border-radius: 8px;
   cursor: pointer;
-  font-size: 14px;
-  font-weight: 500;
+  font-size: var(--text-md);
+  font-weight: 600;
   transition: all 0.2s;
 }
 
@@ -613,7 +696,7 @@ body {
 .word-list-section {
   display: flex;
   flex-direction: column;
-  gap: 8px;
+  gap: 4px;
   flex: 1;
   min-height: 0;
 }
@@ -631,13 +714,14 @@ body {
 }
 
 .word-action-btn {
-  height: 28px;
-  padding: 0 10px;
+  height: 26px;
+  padding: 0 8px;
   background: var(--input-bg);
   border: 1px solid var(--input-border);
   border-radius: 6px;
   cursor: pointer;
-  font-size: 12px;
+  font-size: var(--text-sm);
+  font-weight: 500;
   color: var(--text-color);
   transition: all 0.2s;
 }
@@ -666,25 +750,14 @@ body {
   position: relative;
 }
 
-.word-search-icon {
-  position: absolute;
-  left: 12px;
-  top: 50%;
-  transform: translateY(-50%);
-  font-size: 16px;
-  color: var(--text-color);
-  opacity: 0.6;
-  pointer-events: none;
-}
-
 .word-search-input {
   width: 100%;
-  height: 36px;
-  padding: 0 12px 0 36px;
+  height: 32px;
+  padding: 0 12px;
   background: var(--input-bg);
   border: 1px solid var(--input-border);
   border-radius: 8px;
-  font-size: 14px;
+  font-size: var(--text-md);
   color: var(--text-color);
 }
 
@@ -700,12 +773,12 @@ body {
   background: var(--input-bg);
   border: 1px solid var(--input-border);
   border-radius: 8px;
-  max-height: 180px;
+  max-height: 200px;
   min-height: 0;
 }
 
 .word-list-empty {
-  padding: 24px;
+  padding: 16px;
   text-align: center;
   font-size: 14px;
   color: var(--text-color);
@@ -716,7 +789,7 @@ body {
   display: flex;
   align-items: center;
   gap: 8px;
-  padding: 8px 12px;
+  padding: 6px 10px;
   cursor: pointer;
   transition: all 0.2s;
   border-bottom: 1px solid var(--input-border);
@@ -732,34 +805,8 @@ body {
 
 .word-item.selected {
   background: var(--section-bg);
-}
-
-.word-item-checkbox {
-  width: 16px;
-  height: 16px;
-  border: 1.5px solid var(--text-color);
-  border-radius: 4px;
-  cursor: pointer;
-  flex-shrink: 0;
-  opacity: 0.6;
-  position: relative;
-  background: transparent;
-}
-
-.word-item-checkbox.checked {
-  background: var(--accent);
-  border-color: var(--accent);
-  opacity: 1;
-}
-
-.word-item-checkbox.checked::after {
-  content: "✓";
-  position: absolute;
-  top: -3px;
-  left: 2px;
-  color: white;
-  font-size: 12px;
-  font-weight: bold;
+  border-left: 3px solid var(--accent);
+  padding-left: 9px;
 }
 
 .word-item-text {
@@ -844,10 +891,6 @@ body {
   border-color: var(--accent);
 }
 
-.word-item-switch {
-  flex-shrink: 0;
-}
-
 .word-list-hint {
   font-size: 12px;
   color: var(--text-color);
@@ -861,7 +904,7 @@ body {
   display: flex;
   align-items: center;
   justify-content: center;
-  padding: 32px;
+  padding: 20px;
   text-align: center;
 }
 
@@ -875,7 +918,7 @@ body {
 .page-highlights-section {
   display: flex;
   flex-direction: column;
-  gap: 12px;
+  gap: 6px;
   flex: 1;
   min-height: 0;
 }
@@ -884,7 +927,7 @@ body {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  padding: 12px 16px;
+  padding: 8px 10px;
   background: var(--input-bg);
   border: 1px solid var(--input-border);
   border-radius: 8px;
@@ -899,7 +942,8 @@ body {
 
 .refresh-button {
   width: 100%;
-  height: 36px;
+  min-height: 28px;
+  height: 28px;
   display: flex;
   align-items: center;
   justify-content: center;
@@ -911,6 +955,7 @@ body {
   font-size: 14px;
   color: var(--text-color);
   transition: all 0.2s;
+  flex-shrink: 0;
 }
 
 .refresh-button:hover {
@@ -931,7 +976,7 @@ body {
 }
 
 .page-highlights-empty {
-  padding: 24px;
+  padding: 16px;
   text-align: center;
   font-size: 14px;
   color: var(--text-color);
@@ -943,7 +988,7 @@ body {
   align-items: center;
   justify-content: space-between;
   gap: 12px;
-  padding: 12px;
+  padding: 10px 12px;
   border-bottom: 1px solid var(--input-border);
   cursor: pointer;
   transition: all 0.2s;
@@ -1026,14 +1071,15 @@ body {
 .exceptions-section {
   display: flex;
   flex-direction: column;
-  gap: 12px;
+  gap: 6px;
   flex: 1;
   min-height: 0;
 }
 
 .exception-toggle-btn {
   width: 100%;
-  height: 40px;
+  min-height: 32px;
+  height: 32px;
   display: flex;
   align-items: center;
   justify-content: center;
@@ -1045,6 +1091,7 @@ body {
   font-size: 14px;
   color: var(--text-color);
   transition: all 0.2s;
+  flex-shrink: 0;
 }
 
 .exception-toggle-btn:hover {
@@ -1068,7 +1115,7 @@ body {
 .exceptions-list-wrapper {
   display: flex;
   flex-direction: column;
-  gap: 8px;
+  gap: 6px;
   flex: 1;
   min-height: 0;
 }
@@ -1087,7 +1134,7 @@ body {
   align-items: center;
   justify-content: space-between;
   gap: 12px;
-  padding: 12px;
+  padding: 10px 12px;
   border-bottom: 1px solid var(--input-border);
   transition: background 0.2s;
 }
@@ -1120,12 +1167,19 @@ body {
   white-space: nowrap;
   flex-shrink: 0;
   transition: all 0.2s;
+  display: flex;
+  align-items: center;
+  gap: 4px;
 }
 
 .exception-remove:hover {
   background: #dc2626;
 }
 
+.exception-remove i {
+  font-size: 12px;
+}
+
 .clear-exceptions-btn {
   width: 100%;
   height: 40px;
@@ -1150,21 +1204,73 @@ body {
   font-size: 16px;
 }
 
-/* Options Tab */
-.options-section {
-  display: flex;
-  flex-direction: column;
-  gap: 16px;
+/* Settings Overlay */
+.settings-overlay {
+  display: none;
+  position: fixed;
+  inset: 0;
+  background: rgba(0, 0, 0, 0.5);
+  z-index: 1000;
+  align-items: center;
+  justify-content: center;
+  padding: 16px;
 }
 
+.settings-overlay.open {
+  display: flex;
+}
+
+.settings-overlay-content {
+  background: var(--bg-color);
+  border: 1px solid var(--input-border);
+  border-radius: 8px;
+  max-width: 100%;
+  max-height: 100%;
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
+  box-shadow: 0 10px 40px rgba(0, 0, 0, 0.3);
+}
+
+.settings-overlay-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 10px 12px;
+  border-bottom: 1px solid var(--input-border);
+  flex-shrink: 0;
+}
+
+.settings-overlay-title {
+  font-size: var(--text-md);
+  font-weight: 600;
+  letter-spacing: var(--tracking-tight);
+  color: var(--text-color);
+  margin: 0;
+}
+
+.settings-close-btn {
+  width: 28px;
+  height: 28px;
+}
+
+.settings-overlay-body {
+  padding: 12px;
+  overflow-y: auto;
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+}
+
+/* Options (used in overlay) */
 .options-checkboxes {
   display: flex;
   flex-direction: column;
-  gap: 12px;
-  padding: 12px;
+  gap: 6px;
+  padding: 8px 10px;
   background: var(--input-bg);
   border: 1px solid var(--input-border);
-  border-radius: 8px;
+  border-radius: 6px;
 }
 
 .option-checkbox-label {
@@ -1203,6 +1309,37 @@ body {
   font-weight: bold;
 }
 
+.theme-toggle-section {
+  padding: 8px 10px;
+  background: var(--input-bg);
+  border: 1px solid var(--input-border);
+  border-radius: 6px;
+}
+
+.theme-toggle-content {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.theme-toggle-text {
+  display: flex;
+  flex-direction: column;
+  gap: 2px;
+}
+
+.theme-toggle-title {
+  font-size: var(--text-md);
+  font-weight: 500;
+  color: var(--text-color);
+}
+
+.theme-toggle-subtitle {
+  font-size: var(--text-sm);
+  color: var(--text-color);
+  opacity: 0.6;
+}
+
 .options-buttons {
   display: flex;
   gap: 8px;
@@ -1210,7 +1347,7 @@ body {
 
 .option-button {
   flex: 1;
-  height: 40px;
+  height: 32px;
   display: flex;
   align-items: center;
   justify-content: center;
@@ -1219,7 +1356,8 @@ body {
   border: 1px solid var(--input-border);
   border-radius: 8px;
   cursor: pointer;
-  font-size: 14px;
+  font-size: var(--text-md);
+  font-weight: 500;
   color: var(--text-color);
   transition: all 0.2s;
 }
@@ -1237,25 +1375,23 @@ body {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  padding: 12px 20px;
+  padding: 5px 12px;
   border-top: 1px solid var(--input-border);
   background: var(--section-bg);
   flex-shrink: 0;
 }
 
 .footer-version {
-  font-size: 12px;
-  color: var(--text-color);
-  opacity: 0.6;
+  font-size: var(--text-xs);
+  color: var(--footer-text);
 }
 
 .footer-link {
   display: flex;
   align-items: center;
-  gap: 6px;
-  font-size: 12px;
-  color: var(--text-color);
-  opacity: 0.6;
+  gap: 4px;
+  font-size: var(--text-xs);
+  color: var(--footer-text);
   text-decoration: none;
   transition: all 0.2s;
 }
@@ -1266,7 +1402,7 @@ body {
 }
 
 .footer-link i {
-  font-size: 14px;
+  font-size: 12px;
 }
 
 /* Scrollbar Styles */
diff --git a/popup/popup.html b/popup/popup.html
index 77e0331..d49ec0c 100644
--- a/popup/popup.html
+++ b/popup/popup.html
@@ -19,14 +19,21 @@
     <div class="header">
       <div class="header-content">
         <div class="header-logo">
-          <img src="../img/logo-outlined.png" alt="Goose" style="width: 20px; height: 20px;">
+          <img src="../img/logo-outlined.png" alt="Goose" style="width: 18px; height: 18px;">
         </div>
         <span class="header-title" data-i18n="extension_name">Goose Highlighter</span>
       </div>
-      <label class="switch-wrapper">
-        <input type="checkbox" id="globalHighlightToggle" class="switch-input" />
-        <span class="switch-slider"></span>
-      </label>
+      <div class="header-actions">
+        <button class="icon-button header-settings-btn" id="settingsBtn" data-i18n-title="options" title="Options" aria-label="Settings">
+          <i class="fa-solid fa-gear"></i>
+        </button>
+        <label class="header-power-toggle" title="Toggle highlighting" aria-label="Toggle highlighting">
+          <input type="checkbox" id="globalHighlightToggle" class="header-power-input" />
+          <span class="power-icon-wrapper">
+            <i class="fa-solid fa-power-off"></i>
+          </span>
+        </label>
+      </div>
     </div>
 
     <!-- Tabs -->
@@ -47,10 +54,6 @@
         <i class="fa-solid fa-ban"></i>
         <span data-i18n="tab_exceptions">Exceptions</span>
       </button>
-      <button class="tab-button" data-tab="options">
-        <i class="fa-solid fa-sliders"></i>
-        <span data-i18n="options">Options</span>
-      </button>
     </div>
 
     <!-- Lists Tab -->
@@ -71,13 +74,13 @@
                 <!-- Populated dynamically -->
               </div>
             </div>
-            <button class="icon-button" id="renameListBtn" title="Rename List">
+            <button class="icon-button" id="renameListBtn" data-i18n-title="rename_list_title" title="Rename list">
               <i class="fa-solid fa-pen"></i>
             </button>
-            <button class="icon-button" id="newListBtn" title="New List">
+            <button class="icon-button" id="newListBtn" data-i18n-title="new_list_title" title="New list">
               <i class="fa-solid fa-plus"></i>
             </button>
-            <button class="icon-button danger" id="deleteListBtn" title="Delete List">
+            <button class="icon-button danger" id="deleteListBtn" data-i18n-title="delete_list_title" title="Delete list">
               <i class="fa-solid fa-trash"></i>
             </button>
           </div>
@@ -85,20 +88,20 @@
           <!-- Manage Lists Button -->
           <button class="manage-lists-btn" id="manageListsBtn">
             <i class="fa-solid fa-layer-group"></i>
-            <span>Manage Lists</span>
+            <span data-i18n="manage_lists">Manage Lists</span>
           </button>
 
           <!-- Color Pickers -->
           <div class="color-pickers-row">
             <div class="color-picker-group">
-              <label class="color-picker-label">Background</label>
+              <label class="color-picker-label" data-i18n="background_label">Background</label>
               <div class="color-picker-input-group">
                 <input type="color" id="listBg" class="color-picker-swatch" />
                 <input type="text" id="listBgText" class="color-picker-text" maxlength="7" />
               </div>
             </div>
             <div class="color-picker-group">
-              <label class="color-picker-label">Foreground</label>
+              <label class="color-picker-label" data-i18n="foreground_label">Foreground</label>
               <div class="color-picker-input-group">
                 <input type="color" id="listFg" class="color-picker-swatch" />
                 <input type="text" id="listFgText" class="color-picker-text" maxlength="7" />
@@ -108,10 +111,12 @@
 
           <!-- Preview -->
           <div class="preview-section">
-            <label class="preview-label">Preview</label>
+            <label class="preview-label" data-i18n="preview_label">Preview</label>
             <div class="preview-box">
               <p class="preview-text">
-                This is how your <span class="preview-highlight" id="previewHighlight">highlighted text</span> will appear.
+                <span data-i18n="preview_text_before">This is how your</span>
+                <span class="preview-highlight" id="previewHighlight" data-i18n="preview_text_highlight">highlighted text</span>
+                <span data-i18n="preview_text_after">will appear.</span>
               </p>
             </div>
           </div>
@@ -120,8 +125,8 @@
           <div class="enable-toggle-section">
             <div class="enable-toggle-content">
               <div class="enable-toggle-text">
-                <p class="enable-toggle-title">Enable Highlighting</p>
-                <p class="enable-toggle-subtitle">Show highlights on pages</p>
+                <p class="enable-toggle-title" data-i18n="enable_highlighting_title">Enable Highlighting</p>
+                <p class="enable-toggle-subtitle" data-i18n="enable_highlighting_subtitle">Show highlights on pages</p>
               </div>
               <label class="switch-wrapper">
                 <input type="checkbox" id="listActive" class="switch-input" />
@@ -185,7 +190,6 @@
 
           <!-- Search -->
           <div class="word-search-wrapper">
-            <i class="fa-solid fa-search word-search-icon"></i>
             <input type="text" id="wordSearch" class="word-search-input" data-i18n="search_placeholder" placeholder="Search..." />
           </div>
 
@@ -193,7 +197,7 @@
           <div id="wordList" class="word-list-container"></div>
 
           <!-- Help text -->
-          <p class="word-list-hint">Click to select • Ctrl/Cmd+Click for multi-select</p>
+          <p class="word-list-hint" data-i18n="multi_select_hint">Click to select • Ctrl/Cmd+Click for multi-select</p>
         </div>
       </div>
     </div>
@@ -246,15 +250,16 @@
       </div>
     </div>
 
-    <!-- Options Tab -->
-    <div class="tab-content" data-tab-content="options">
-      <div class="tab-inner">
-        <div class="options-section">
-          <label class="section-label">
-            <i class="fa-solid fa-sliders"></i>
-            <span data-i18n="options">Options</span>
-          </label>
-          
+    <!-- Settings Overlay -->
+    <div class="settings-overlay" id="settingsOverlay">
+      <div class="settings-overlay-content">
+        <div class="settings-overlay-header">
+          <h3 class="settings-overlay-title" data-i18n="options">Options</h3>
+          <button class="icon-button settings-close-btn" id="settingsCloseBtn" aria-label="Close">
+            <i class="fa-solid fa-xmark"></i>
+          </button>
+        </div>
+        <div class="settings-overlay-body">
           <div class="options-checkboxes">
             <label class="option-checkbox-label">
               <input type="checkbox" id="matchCase" class="option-checkbox" />
@@ -266,6 +271,19 @@
             </label>
           </div>
 
+          <div class="theme-toggle-section">
+            <div class="theme-toggle-content">
+              <div class="theme-toggle-text">
+                <p class="theme-toggle-title" data-i18n="dark_mode_title">Dark Mode</p>
+                <p class="theme-toggle-subtitle" data-i18n="dark_mode_subtitle">Toggle dark/light theme</p>
+              </div>
+              <label class="switch-wrapper">
+                <input type="checkbox" id="themeToggle" class="switch-input" />
+                <span class="switch-slider"></span>
+              </label>
+            </div>
+          </div>
+
           <div class="options-buttons">
             <button class="option-button" id="importBtn">
               <i class="fa-solid fa-upload"></i>
diff --git a/shared/colors.css b/shared/colors.css
index 73ef68d..955a123 100644
--- a/shared/colors.css
+++ b/shared/colors.css
@@ -1,52 +1,73 @@
 /* Shared Color Scheme */
+
+/* Typography + Light theme */
 :root {
-  --bg-color: #fbf6f1;
-  --text-color: #3b2a21;
+  --font-sans: 'DM Sans', -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+  --font-mono: 'DM Sans', ui-monospace, monospace;
+  --text-xs: 11px;
+  --text-sm: 12px;
+  --text-base: 13px;
+  --text-md: 14px;
+  --text-lg: 16px;
+  --leading-tight: 1.25;
+  --leading-normal: 1.4;
+  --leading-relaxed: 1.5;
+  --tracking-tight: -0.01em;
+  --tracking-wide: 0.05em;
+  --bg-color: #f5f5f5;
+  --text-color: #2d2d2d;
   --input-bg: #ffffff;
-  --input-border: #e6d7cc;
-  --button-bg: #f6eee7;
-  --button-hover: #efe3d9;
-  --button-text: #3b2a21;
-  --accent: #cc6a2a;
+  --input-border: #e0e0e0;
+  --button-bg: #ffffff;
+  --button-hover: #eeeeee;
+  --button-text: #2d2d2d;
+  --accent: #ff8c00;
   --accent-text: #ffffff;
-  --accent-hover: #e07b36;
-  --highlight-tag: #f2e7dd;
-  --highlight-tag-border: #e7d2c1;
+  --accent-hover: #ff9f1a;
+  --highlight-tag: #fff3e6;
+  --highlight-tag-border: #ffe4cc;
   --danger: #ef4444;
-  --success: #10b981;
-  --shadow: 0 10px 22px rgba(59, 42, 33, 0.12);
-  --shadow-sm: 0 4px 10px rgba(59, 42, 33, 0.08);
+  --success: #22c55e;
+  --shadow: 0 10px 22px rgba(0, 0, 0, 0.08);
+  --shadow-sm: 0 4px 10px rgba(0, 0, 0, 0.06);
   --border-radius: 12px;
-  --section-bg: #fffaf6;
-  --panel-bg: #fffaf6;
-  --switch-bg: #e1d5cb;
-  --checkbox-accent: #cc6a2a;
-  --checkbox-border: #d8c8bb;
-  --focus-ring: 0 0 0 3px rgba(204, 106, 42, 0.2);
+  --section-bg: #ffffff;
+  --panel-bg: #ffffff;
+  --switch-bg: #e0e0e0;
+  --checkbox-accent: #ff8c00;
+  --checkbox-border: #d0d0d0;
+  --focus-ring: 0 0 0 3px rgba(255, 140, 0, 0.25);
+  --footer-text: #6b6b6b;
+  --tab-active-bg: #e8e8e8;
+  --tab-inactive-color: #6b6b6b;
 }
 
+/* Dark theme */
 html.dark,
 body.dark {
-  --bg-color: #12100e;
-  --text-color: #f4ede6;
-  --input-bg: #1a1714;
-  --input-border: #3a2e26;
-  --button-bg: #2b211b;
-  --button-hover: #3a2c24;
-  --button-text: #f7efe9;
-  --accent: #f2a865;
-  --accent-hover: #f7c38a;
-  --accent-text: #1b120b;
-  --highlight-tag: #231a14;
-  --highlight-tag-border: #46372c;
+  --bg-color: #0d0d0d;
+  --text-color: #f0f0f0;
+  --input-bg: #171717;
+  --input-border: #2a2a2a;
+  --button-bg: #171717;
+  --button-hover: #222222;
+  --button-text: #f0f0f0;
+  --accent: #ff8c00;
+  --accent-text: #ffffff;
+  --accent-hover: #ff9f1a;
+  --highlight-tag: #171717;
+  --highlight-tag-border: #2a2a2a;
   --danger: #f87171;
-  --success: #4ade80;
-  --shadow: 0 10px 22px rgba(0, 0, 0, 0.5);
-  --shadow-sm: 0 4px 10px rgba(0, 0, 0, 0.4);
-  --section-bg: #17130f;
-  --panel-bg: #17130f;
-  --switch-bg: #4b3a2f;
-  --checkbox-accent: #f2a865;
-  --checkbox-border: #5a483b;
-  --focus-ring: 0 0 0 3px rgba(242, 168, 101, 0.2);
+  --success: #22c55e;
+  --shadow: 0 10px 22px rgba(0, 0, 0, 0.6);
+  --shadow-sm: 0 4px 10px rgba(0, 0, 0, 0.5);
+  --section-bg: #121212;
+  --panel-bg: #121212;
+  --switch-bg: #2a2a2a;
+  --checkbox-accent: #ff8c00;
+  --checkbox-border: #333333;
+  --focus-ring: 0 0 0 3px rgba(255, 140, 0, 0.3);
+  --footer-text: #8a8a8a;
+  --tab-active-bg: #2b2b2b;
+  --tab-inactive-color: #adadad;
 }
diff --git a/shared/fonts.css b/shared/fonts.css
new file mode 100644
index 0000000..afced53
--- /dev/null
+++ b/shared/fonts.css
@@ -0,0 +1,24 @@
+/* DM Sans – https://fontsource.org/fonts/dm-sans */
+@font-face {
+  font-family: 'DM Sans';
+  font-style: normal;
+  font-display: swap;
+  font-weight: 400;
+  src: url(https://cdn.jsdelivr.net/fontsource/fonts/dm-sans@latest/latin-400-normal.woff2) format('woff2');
+}
+
+@font-face {
+  font-family: 'DM Sans';
+  font-style: normal;
+  font-display: swap;
+  font-weight: 500;
+  src: url(https://cdn.jsdelivr.net/fontsource/fonts/dm-sans@latest/latin-500-normal.woff2) format('woff2');
+}
+
+@font-face {
+  font-family: 'DM Sans';
+  font-style: normal;
+  font-display: swap;
+  font-weight: 600;
+  src: url(https://cdn.jsdelivr.net/fontsource/fonts/dm-sans@latest/latin-600-normal.woff2) format('woff2');
+}
diff --git a/shared/ui-components.css b/shared/ui-components.css
index 6f5ba84..eccd47b 100644
--- a/shared/ui-components.css
+++ b/shared/ui-components.css
@@ -7,7 +7,7 @@ button {
   color: var(--button-text);
   cursor: pointer;
   transition: all 0.2s ease;
-  font-size: 0.85rem;
+  font-size: var(--text-base, 13px);
   font-family: inherit;
   font-weight: 500;
   display: inline-flex;
@@ -15,7 +15,7 @@ button {
   justify-content: center;
   gap: 5px;
   white-space: nowrap;
-  line-height: 1.2;
+  line-height: var(--leading-tight, 1.25);
 }
 
 button:hover {
@@ -81,7 +81,7 @@ button:disabled {
 
 .icon-btn:hover {
   opacity: 1;
-  background: rgba(242, 168, 101, 0.15);
+  background: rgba(255, 140, 0, 0.15);
   color: var(--accent);
 }
 
@@ -89,42 +89,56 @@ button:disabled {
   pointer-events: none;
 }
 
-/* Toggle Switches */
-.toggle-btn {
+/* Shared Switch (label + input + span) – used in popup and list manager */
+.switch-wrapper {
+  position: relative;
+  display: inline-block;
   width: 40px;
   height: 22px;
-  background: rgba(255, 255, 255, 0.1);
-  border: 1px solid var(--input-border);
-  border-radius: 11px;
-  position: relative;
   cursor: pointer;
-  transition: all 0.2s ease;
-  padding: 0;
   flex-shrink: 0;
 }
 
-.toggle-btn::after {
-  content: '';
+.switch-input {
+  opacity: 0;
+  width: 0;
+  height: 0;
   position: absolute;
-  width: 16px;
+}
+
+.switch-slider {
+  position: absolute;
+  cursor: pointer;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: var(--input-border);
+  transition: 0.3s;
+  border-radius: 11px;
+}
+
+.switch-slider:before {
+  position: absolute;
+  content: "";
   height: 16px;
-  background: var(--text-color);
-  border-radius: 50%;
-  top: 2px;
+  width: 16px;
   left: 2px;
-  transition: all 0.2s ease;
+  bottom: 2px;
+  background-color: white;
+  transition: 0.3s;
+  border-radius: 50%;
 }
 
-.toggle-btn.active {
-  background: var(--accent);
-  border-color: var(--accent);
+.switch-input:checked + .switch-slider {
+  background-color: var(--accent);
 }
 
-.toggle-btn.active::after {
-  left: 20px;
-  background: var(--accent-text);
+.switch-input:checked + .switch-slider:before {
+  transform: translateX(18px);
 }
 
+
 /* Switch Toggle (Checkbox Style) */
 input[type="checkbox"].switch {
   -webkit-appearance: none;
@@ -254,9 +268,10 @@ select {
   border: 1px solid var(--input-border);
   background-color: var(--input-bg);
   color: var(--text-color);
-  font-size: 0.85em;
+  font-size: var(--text-base, 13px);
   box-sizing: border-box;
   font-family: inherit;
+  line-height: var(--leading-normal, 1.4);
 }
 
 input[type="text"]:focus,
@@ -352,3 +367,79 @@ input[type="color"]::-moz-color-swatch {
 #themeToggle:checked + .theme-icon::before {
   content: "\f186"; /* moon icon */
 }
+
+/* Word list eye toggle (active/disabled) – replaces switch in word items */
+.word-item-eye-toggle {
+  position: relative;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 28px;
+  height: 28px;
+  min-width: 28px;
+  margin-right: 6px;
+  border: none;
+  border-radius: 4px;
+  cursor: pointer;
+  background: transparent;
+  color: var(--text-color);
+  opacity: 0.7;
+  flex-shrink: 0;
+  transition: opacity 0.2s ease, background-color 0.2s ease, color 0.2s ease;
+}
+
+.word-item-eye-toggle:hover {
+  opacity: 1;
+  background: var(--highlight-tag);
+  color: var(--accent);
+}
+
+.word-item-eye-input {
+  position: absolute;
+  opacity: 0;
+  width: 0;
+  height: 0;
+  pointer-events: none;
+}
+
+.word-item-eye-icon {
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 14px;
+  height: 14px;
+  pointer-events: none;
+}
+
+.word-item-eye-icon i {
+  position: absolute;
+  font-size: 14px;
+  inset: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  transition: opacity 0.2s ease;
+}
+
+/* Active state: show eye, hide eye-slash */
+.word-item-eye-input:checked ~ .word-item-eye-icon .eye-active {
+  opacity: 1;
+  color: var(--accent);
+}
+
+.word-item-eye-input:checked ~ .word-item-eye-icon .eye-disabled {
+  opacity: 0;
+  pointer-events: none;
+}
+
+/* Disabled state: show eye-slash, hide eye */
+.word-item-eye-input:not(:checked) ~ .word-item-eye-icon .eye-active {
+  opacity: 0;
+  pointer-events: none;
+}
+
+.word-item-eye-input:not(:checked) ~ .word-item-eye-icon .eye-disabled {
+  opacity: 1;
+  color: var(--text-color);
+}
diff --git a/src/content/HighlightEngine.ts b/src/content/HighlightEngine.ts
index aa4ac16..e8ac8f4 100644
--- a/src/content/HighlightEngine.ts
+++ b/src/content/HighlightEngine.ts
@@ -53,7 +53,7 @@ export class HighlightEngine {
             popup.className = 'goose-highlighter-textarea-popup';
             popup.innerHTML = `
               <div class="gh-popup-titlebar">
-                <button class="gh-popup-close" title="Close">&times;</button>
+                <button class="gh-popup-close" title="${chrome.i18n.getMessage('close') || 'Close'}">&times;</button>
               </div>
               <pre class="gh-popup-pre">${HighlightEngine.renderHighlighted(text, pattern)}</pre>
             `;
diff --git a/src/list-manager/ListManagerController.ts b/src/list-manager/ListManagerController.ts
index 82dd072..4ec0ebd 100644
--- a/src/list-manager/ListManagerController.ts
+++ b/src/list-manager/ListManagerController.ts
@@ -45,8 +45,6 @@ async initialize(): Promise<void> {
     document.getElementById('duplicateListBtn')?.addEventListener('click', () => this.duplicateCurrentList());
     document.getElementById('mergeListsBtn')?.addEventListener('click', () => this.mergeSelectedLists());
     document.getElementById('deleteListsBtn')?.addEventListener('click', () => this.deleteSelectedLists());
-    document.getElementById('activateListsBtn')?.addEventListener('click', () => this.setSelectedListsActive(true));
-    document.getElementById('deactivateListsBtn')?.addEventListener('click', () => this.setSelectedListsActive(false));
     document.getElementById('editListNameBtn')?.addEventListener('click', () => this.toggleListSettings());
     document.getElementById('applyListSettingsBtn')?.addEventListener('click', () => this.applyListSettings());
     document.getElementById('importListBtn')?.addEventListener('click', () => this.triggerImport());
@@ -74,6 +72,7 @@ const wordSearch = document.getElementById('wordSearch') as HTMLInputElement;
 
     const listsContainer = document.getElementById('listsContainer');
     listsContainer?.addEventListener('click', (e) => this.handleListClick(e));
+    listsContainer?.addEventListener('keydown', (e) => this.handleListsKeydown(e));
     listsContainer?.addEventListener('dragstart', (e) => this.handleDragStart(e));
     listsContainer?.addEventListener('dragover', (e) => this.handleDragOver(e));
     listsContainer?.addEventListener('drop', (e) => this.handleDrop(e));
@@ -140,7 +139,7 @@ const wordSearch = document.getElementById('wordSearch') as HTMLInputElement;
   private mergeSelectedLists(): void {
     const selected = this.getSelectedListIndices();
     if (selected.length < 2) {
-      alert('Select at least two lists to merge.');
+      alert(chrome.i18n.getMessage('merge_lists_min_two') || 'Select at least two lists to merge.');
       return;
     }
 
@@ -148,7 +147,10 @@ const wordSearch = document.getElementById('wordSearch') as HTMLInputElement;
     const target = this.lists[targetIndex];
     if (!target) return;
 
-    const confirmMessage = `Merge ${selected.length - 1} list(s) into "${target.name}"? Source lists will be removed.`;
+    const confirmMessage = chrome.i18n.getMessage('merge_lists_confirm')
+      ?.replace('{count}', String(selected.length - 1))
+      .replace('{target}', target.name) 
+      || `Merge ${selected.length - 1} list(s) into "${target.name}"? Source lists will be removed.`;
     if (!confirm(confirmMessage)) return;
 
     const sourceIndices = selected.filter(index => index !== targetIndex).sort((a, b) => b - a);
@@ -169,10 +171,13 @@ const wordSearch = document.getElementById('wordSearch') as HTMLInputElement;
     const selected = this.getSelectedListIndices();
     if (selected.length === 0) {
       if (!this.lists[this.currentListIndex]) return;
-      if (!confirm('Delete current list?')) return;
+      if (!confirm(chrome.i18n.getMessage('delete_current_list') || 'Delete current list?')) return;
       this.lists.splice(this.currentListIndex, 1);
     } else {
-      if (!confirm(`Delete ${selected.length} selected list(s)?`)) return;
+      const confirmMessage = chrome.i18n.getMessage('delete_lists_confirm')
+        ?.replace('{count}', String(selected.length))
+        || `Delete ${selected.length} selected list(s)?`;
+      if (!confirm(confirmMessage)) return;
       selected.sort((a, b) => b - a).forEach(index => this.lists.splice(index, 1));
     }
 
@@ -186,17 +191,12 @@ const wordSearch = document.getElementById('wordSearch') as HTMLInputElement;
     this.save();
   }
 
-  private setSelectedListsActive(active: boolean): void {
-    const selected = this.getSelectedListIndices();
-    if (selected.length === 0) {
-      const list = this.lists[this.currentListIndex];
-      if (list) list.active = active;
-    } else {
-      selected.forEach(index => {
-        if (this.lists[index]) this.lists[index].active = active;
-      });
+  private toggleListActive(index: number): void {
+    const list = this.lists[index];
+    if (list) {
+      list.active = !list.active;
+      this.save();
     }
-    this.save();
   }
 
   private applyListSettings(): void {
@@ -265,13 +265,14 @@ const wordSearch = document.getElementById('wordSearch') as HTMLInputElement;
       const data = JSON.parse(text);
       
       if (!this.validateImportData(data)) {
-        alert('Invalid file format. Please select a valid Goose Highlighter export file.');
+        alert(chrome.i18n.getMessage('invalid_import_format') || 'Invalid file format. Please select a valid Goose Highlighter export file.');
         return;
       }
 
       this.importLists(data);
     } catch (error) {
       console.error('Import error:', error);
+      alert(chrome.i18n.getMessage('import_failed') || 'Failed to import file. Please ensure it is a valid JSON file.');
       alert('Failed to import file. Please ensure it is a valid JSON file.');
     }
   }
@@ -361,7 +362,10 @@ const wordSearch = document.getElementById('wordSearch') as HTMLInputElement;
   private deleteSelectedWords(): void {
     const list = this.lists[this.currentListIndex];
     if (!list || this.selectedWords.size === 0) return;
-    if (!confirm(`Delete ${this.selectedWords.size} selected word(s)?`)) return;
+    const confirmMessage = chrome.i18n.getMessage('confirm_delete_words')
+      ?.replace('{count}', String(this.selectedWords.size))
+      || `Delete ${this.selectedWords.size} selected word(s)?`;
+    if (!confirm(confirmMessage)) return;
 
     list.words = list.words.filter((_, i) => !this.selectedWords.has(i));
     this.selectedWords.clear();
@@ -429,6 +433,14 @@ const wordSearch = document.getElementById('wordSearch') as HTMLInputElement;
     const index = Number(listItem.dataset.index);
     if (Number.isNaN(index)) return;
 
+    // Click on active/paused badge toggles that list's active state
+    if (target.closest('.list-badge')) {
+      event.preventDefault();
+      event.stopPropagation();
+      this.toggleListActive(index);
+      return;
+    }
+
     const mouseEvent = event as MouseEvent;
     // Ctrl/Cmd + click for multi-select
     if (mouseEvent.ctrlKey || mouseEvent.metaKey) {
@@ -449,6 +461,18 @@ const wordSearch = document.getElementById('wordSearch') as HTMLInputElement;
     this.render();
   }
 
+  private handleListsKeydown(event: KeyboardEvent): void {
+    const target = event.target as HTMLElement;
+    const badge = target.closest('.list-badge');
+    if (!badge) return;
+    const listItem = badge.closest('.list-item') as HTMLElement | null;
+    if (!listItem) return;
+    if (event.key !== 'Enter' && event.key !== ' ') return;
+    event.preventDefault();
+    const index = Number(listItem.dataset.index);
+    if (!Number.isNaN(index)) this.toggleListActive(index);
+  }
+
   private handleDragStart(event: DragEvent): void {
     const target = (event.target as HTMLElement).closest('.list-item') as HTMLElement | null;
     if (!target) return;
@@ -595,16 +619,8 @@ const wordSearch = document.getElementById('wordSearch') as HTMLInputElement;
       return;
     }
 
-    // Handle toggle button click
-    if (target.classList.contains('toggle-btn')) {
-      event.stopPropagation();
-      const index = Number(target.dataset.index);
-      if (Number.isNaN(index)) return;
-      const word = list.words[index];
-      if (word) {
-        word.active = !word.active;
-        this.save();
-      }
+    // Don't select if clicking on eye toggle
+    if (target.closest('.word-item-eye-toggle')) {
       return;
     }
 
@@ -655,6 +671,22 @@ const wordSearch = document.getElementById('wordSearch') as HTMLInputElement;
     const list = this.lists[this.currentListIndex];
     if (!list) return;
 
+    // Handle eye toggle (active/disabled)
+    if (target.classList.contains('word-item-eye-input')) {
+      const wordItem = target.closest('.word-item') as HTMLElement;
+      if (wordItem) {
+        const index = Number(wordItem.dataset.index);
+        if (!Number.isNaN(index)) {
+          const word = list.words[index];
+          if (word) {
+            word.active = target.checked;
+            this.save();
+          }
+        }
+      }
+      return;
+    }
+
     const editIndex = Number(target.dataset.bgEdit ?? target.dataset.fgEdit ?? -1);
     if (Number.isNaN(editIndex) || editIndex < 0) return;
 
@@ -749,12 +781,20 @@ const wordSearch = document.getElementById('wordSearch') as HTMLInputElement;
       if (this.selectedLists.has(index)) item.classList.add('selected');
       item.draggable = true;
       item.dataset.index = index.toString();
+      
+      const wordsLabel = chrome.i18n.getMessage('words_label') || 'words';
+      const activeLabel = chrome.i18n.getMessage('active_label') || 'active';
+      const badgeText = list.active 
+        ? (chrome.i18n.getMessage('list_active_badge') || 'Active')
+        : (chrome.i18n.getMessage('list_paused_badge') || 'Paused');
+      const toggleBadgeTitle = chrome.i18n.getMessage('toggle_active') || 'Toggle active';
+      
       item.innerHTML = `
         <div class="list-meta">
           <div class="list-name">${DOMUtils.escapeHtml(list.name)}</div>
-          <div class="list-stats">${total} words • ${activeCount} active</div>
+          <div class="list-stats">${total} ${wordsLabel} • ${activeCount} ${activeLabel}</div>
         </div>
-        <div class="list-badge">${list.active ? 'Active' : 'Paused'}</div>
+        <div class="list-badge" role="button" title="${DOMUtils.escapeHtml(toggleBadgeTitle)}" tabindex="0" aria-label="${DOMUtils.escapeHtml(toggleBadgeTitle)}">${badgeText}</div>
       `;
       container.appendChild(item);
     });
@@ -777,7 +817,10 @@ const wordSearch = document.getElementById('wordSearch') as HTMLInputElement;
     if (stats) {
       const activeCount = list.words.filter(word => word.active).length;
       const inactiveCount = list.words.length - activeCount;
-      stats.textContent = `${list.words.length} words • ${activeCount} active • ${inactiveCount} inactive`;
+      const wordsLabel = chrome.i18n.getMessage('words_label') || 'words';
+      const activeLabel = chrome.i18n.getMessage('active_label') || 'active';
+      const inactiveLabel = chrome.i18n.getMessage('inactive_label') || 'inactive';
+      stats.textContent = `${list.words.length} ${wordsLabel} • ${activeCount} ${activeLabel} • ${inactiveCount} ${inactiveLabel}`;
     }
 
     // Collapse settings panel when switching lists
@@ -811,7 +854,8 @@ private renderWords(): void {
     this.totalWords = entries.length;
 
     if (entries.length === 0) {
-      wordList.innerHTML = '<div class="empty">No words in this list.</div>';
+      const emptyMessage = chrome.i18n.getMessage('no_words_in_list') || 'No words in this list.';
+      wordList.innerHTML = `<div class="empty">${emptyMessage}</div>`;
       this.renderPaginationControls();
       return;
     }
@@ -820,6 +864,11 @@ private renderWords(): void {
     const endIndex = Math.min(startIndex + this.pageSize, this.totalWords);
     const paginatedEntries = entries.slice(startIndex, endIndex);
 
+    const editWordTitle = chrome.i18n.getMessage('edit_word') || 'Edit word';
+    const bgColorTitle = chrome.i18n.getMessage('background_color_title') || 'Background color';
+    const fgColorTitle = chrome.i18n.getMessage('text_color_title') || 'Text color';
+    const toggleActiveTitle = chrome.i18n.getMessage('toggle_active') || 'Toggle active';
+
     wordList.innerHTML = paginatedEntries.map(entry => {
       const word = entry.word;
       const index = entry.index;
@@ -829,12 +878,18 @@ private renderWords(): void {
           <span class="word-text">${DOMUtils.escapeHtml(word.wordStr)}</span>
           <input type="text" class="word-edit-input" value="${DOMUtils.escapeHtml(word.wordStr)}" data-word-edit="${index}">
           <div class="word-actions">
-            <button class="icon-btn edit-word-btn" data-index="${index}" title="Edit word">
+            <button class="icon-btn edit-word-btn" data-index="${index}" title="${editWordTitle}">
               <i class="fa-solid fa-pen"></i>
             </button>
-            <input type="color" value="${word.background || list.background}" data-bg-edit="${index}" title="Background color">
-            <input type="color" value="${word.foreground || list.foreground}" data-fg-edit="${index}" title="Foreground color">
-            <button class="toggle-btn ${word.active ? 'active' : ''}" data-index="${index}" title="Toggle active"></button>
+            <input type="color" value="${word.background || list.background}" data-bg-edit="${index}" title="${bgColorTitle}">
+            <input type="color" value="${word.foreground || list.foreground}" data-fg-edit="${index}" title="${fgColorTitle}">
+            <label class="word-item-eye-toggle" title="${toggleActiveTitle}" aria-label="${toggleActiveTitle}">
+              <input type="checkbox" class="word-item-eye-input" ${word.active ? 'checked' : ''} data-index="${index}">
+              <span class="word-item-eye-icon">
+                <i class="fa-solid fa-eye eye-active"></i>
+                <i class="fa-solid fa-eye-slash eye-disabled"></i>
+              </span>
+            </label>
           </div>
         </div>
       `;
@@ -849,38 +904,55 @@ private renderWords(): void {
 
     const totalPages = Math.ceil(this.totalWords / this.pageSize);
     
-if (totalPages <= 1) {
+    if (totalPages <= 1) {
       paginationContainer.style.display = 'none';
       return;
     }
 
-const startItem = (this.currentPage - 1) * this.pageSize + 1;
+    const startItem = (this.currentPage - 1) * this.pageSize + 1;
     const endItem = Math.min(this.currentPage * this.pageSize, this.totalWords);
 
+    const showingText = chrome.i18n.getMessage('showing_items')
+      ?.replace('{start}', String(startItem))
+      .replace('{end}', String(endItem))
+      .replace('{total}', String(this.totalWords))
+      || `Showing ${startItem}-${endItem} of ${this.totalWords} words`;
+    
+    const pageInfoText = chrome.i18n.getMessage('page_info')
+      ?.replace('{current}', String(this.currentPage))
+      .replace('{total}', String(totalPages))
+      || `Page ${this.currentPage} of ${totalPages}`;
+    
+    const itemsPerPageLabel = chrome.i18n.getMessage('items_per_page') || 'Items per page:';
+    const firstPageTitle = chrome.i18n.getMessage('first_page') || 'First page';
+    const prevPageTitle = chrome.i18n.getMessage('previous_page') || 'Previous page';
+    const nextPageTitle = chrome.i18n.getMessage('next_page') || 'Next page';
+    const lastPageTitle = chrome.i18n.getMessage('last_page') || 'Last page';
+
     paginationContainer.style.display = 'flex';
     paginationContainer.innerHTML = `
       <div class="pagination-info">
-        Showing ${startItem}-${endItem} of ${this.totalWords} words
+        ${showingText}
       </div>
       <div class="pagination-controls">
-        <button class="pagination-btn" id="firstPageBtn" ${this.currentPage === 1 ? 'disabled' : ''} title="First page">
+        <button class="pagination-btn" id="firstPageBtn" ${this.currentPage === 1 ? 'disabled' : ''} title="${firstPageTitle}">
           <i class="fa-solid fa-angles-left"></i>
         </button>
-        <button class="pagination-btn" id="prevPageBtn" ${this.currentPage === 1 ? 'disabled' : ''} title="Previous page">
+        <button class="pagination-btn" id="prevPageBtn" ${this.currentPage === 1 ? 'disabled' : ''} title="${prevPageTitle}">
           <i class="fa-solid fa-angle-left"></i>
         </button>
         <div class="pagination-pages">
-          <span class="page-info">Page ${this.currentPage} of ${totalPages}</span>
+          <span class="page-info">${pageInfoText}</span>
         </div>
-        <button class="pagination-btn" id="nextPageBtn" ${this.currentPage === totalPages ? 'disabled' : ''} title="Next page">
+        <button class="pagination-btn" id="nextPageBtn" ${this.currentPage === totalPages ? 'disabled' : ''} title="${nextPageTitle}">
           <i class="fa-solid fa-angle-right"></i>
         </button>
-        <button class="pagination-btn" id="lastPageBtn" ${this.currentPage === totalPages ? 'disabled' : ''} title="Last page">
+        <button class="pagination-btn" id="lastPageBtn" ${this.currentPage === totalPages ? 'disabled' : ''} title="${lastPageTitle}">
           <i class="fa-solid fa-angles-right"></i>
         </button>
       </div>
       <div class="page-size-controls">
-        <label for="pageSizeSelect">Items per page:</label>
+        <label for="pageSizeSelect">${itemsPerPageLabel}</label>
         <select id="pageSizeSelect" class="page-size-select">
           <option value="25" ${this.pageSize === 25 ? 'selected' : ''}>25</option>
           <option value="50" ${this.pageSize === 50 ? 'selected' : ''}>50</option>
diff --git a/src/list-manager/list-manager.ts b/src/list-manager/list-manager.ts
index 2c53349..f204c9b 100644
--- a/src/list-manager/list-manager.ts
+++ b/src/list-manager/list-manager.ts
@@ -1,5 +1,31 @@
 import { ListManagerController } from './ListManagerController.js';
 
+function localizePage(): void {
+  const elements = document.querySelectorAll('[data-i18n]');
+  elements.forEach(element => {
+    const message = (element as HTMLElement).dataset.i18n!;
+    const localizedText = chrome.i18n.getMessage(message);
+    if (localizedText) {
+      if ((element.tagName === 'INPUT' || element.tagName === 'TEXTAREA') && (element as HTMLInputElement).hasAttribute('placeholder')) {
+        (element as HTMLInputElement).placeholder = localizedText;
+      } else {
+        element.textContent = localizedText;
+      }
+    }
+  });
+
+  const titleElements = document.querySelectorAll('[data-i18n-title]');
+  titleElements.forEach(element => {
+    const key = element.getAttribute('data-i18n-title');
+    if (key) {
+      const translation = chrome.i18n.getMessage(key);
+      if (translation) {
+        element.setAttribute('title', translation);
+      }
+    }
+  });
+}
+
 const savedTheme = localStorage.getItem('theme');
 if (savedTheme === 'light') {
   document.documentElement.classList.add('light');
@@ -8,6 +34,7 @@ if (savedTheme === 'light') {
 }
 
 document.addEventListener('DOMContentLoaded', async () => {
+  localizePage();
   const controller = new ListManagerController();
   await controller.initialize();
 });
diff --git a/src/popup/PopupController.ts b/src/popup/PopupController.ts
index add0a1b..a397f32 100644
--- a/src/popup/PopupController.ts
+++ b/src/popup/PopupController.ts
@@ -69,7 +69,7 @@ export class PopupController {
 
   private loadActiveTab(): void {
     const saved = localStorage.getItem('goose-highlighter-active-tab');
-    if (saved) {
+    if (saved && saved !== 'options') {
       this.activeTab = saved;
     }
   }
@@ -109,6 +109,7 @@ export class PopupController {
 
   private setupEventListeners(): void {
     this.setupTabs();
+    this.setupSettingsOverlay();
     this.setupListManagement();
     this.setupWordManagement();
     this.setupSettings();
@@ -119,6 +120,26 @@ export class PopupController {
     this.setupStorageSync();
   }
 
+  private setupSettingsOverlay(): void {
+    const overlay = document.getElementById('settingsOverlay');
+    const settingsBtn = document.getElementById('settingsBtn');
+    const closeBtn = document.getElementById('settingsCloseBtn');
+
+    settingsBtn?.addEventListener('click', () => {
+      overlay?.classList.add('open');
+    });
+
+    closeBtn?.addEventListener('click', () => {
+      overlay?.classList.remove('open');
+    });
+
+    overlay?.addEventListener('click', (e) => {
+      if (e.target === overlay) {
+        overlay.classList.remove('open');
+      }
+    });
+  }
+
   private setupTabs(): void {
     document.querySelectorAll('.tab-button').forEach(button => {
       button.addEventListener('click', () => {
@@ -257,20 +278,6 @@ export class PopupController {
       const list = this.lists[this.currentListIndex];
       if (!list) return;
 
-      // Handle checkbox click
-      if (target.classList.contains('word-item-checkbox')) {
-        e.stopPropagation();
-        const wordItem = target.closest('.word-item') as HTMLElement;
-        if (wordItem) {
-          const index = Number(wordItem.dataset.index);
-          if (!Number.isNaN(index)) {
-            const mouseEvent = e as MouseEvent;
-            this.toggleWordSelection(index, mouseEvent.ctrlKey || mouseEvent.metaKey);
-          }
-        }
-        return;
-      }
-
       // Handle edit button click
       const editBtn = target.closest('.word-item-icon-btn.edit-word-btn') as HTMLElement | null;
       if (editBtn) {
@@ -299,8 +306,8 @@ export class PopupController {
         return;
       }
 
-      // Don't select if clicking on switch
-      if (target.closest('.switch-wrapper')) {
+      // Don't select if clicking on eye toggle
+      if (target.closest('.word-item-eye-toggle')) {
         return;
       }
 
@@ -318,9 +325,9 @@ export class PopupController {
     wordList.addEventListener('change', (e) => {
       const target = e.target as HTMLInputElement;
       const list = this.lists[this.currentListIndex];
-      
-      // Handle switch toggle
-      if (target.classList.contains('switch-input')) {
+
+      // Handle eye toggle (active/disabled)
+      if (target.classList.contains('word-item-eye-input')) {
         const wordItem = target.closest('.word-item') as HTMLElement;
         if (wordItem) {
           const index = Number(wordItem.dataset.index);
@@ -393,17 +400,16 @@ export class PopupController {
 
   private toggleWordSelection(index: number, multiSelect: boolean): void {
     if (multiSelect) {
+      // Ctrl/Cmd + click for multi-select
       if (this.selectedCheckboxes.has(index)) {
         this.selectedCheckboxes.delete(index);
       } else {
         this.selectedCheckboxes.add(index);
       }
     } else {
-      if (this.selectedCheckboxes.has(index)) {
-        this.selectedCheckboxes.delete(index);
-      } else {
-        this.selectedCheckboxes.add(index);
-      }
+      // Regular click - clear all and select only this one
+      this.selectedCheckboxes.clear();
+      this.selectedCheckboxes.add(index);
     }
     this.renderWords();
   }
@@ -598,10 +604,10 @@ export class PopupController {
           ${highlight.count > 1 ? `
             <div class="page-highlight-nav">
               <button class="highlight-prev" title="${chrome.i18n.getMessage('previous') || 'Previous'}">
-                <i class="lucide lucide-chevron-up"></i>
+                <i class="fa-solid fa-chevron-up"></i>
               </button>
               <button class="highlight-next" title="${chrome.i18n.getMessage('next') || 'Next'}">
-                <i class="lucide lucide-chevron-down"></i>
+                <i class="fa-solid fa-chevron-down"></i>
               </button>
             </div>
           ` : ''}
@@ -705,16 +711,32 @@ export class PopupController {
   }
 
   private setupTheme(): void {
-    // Theme is now controlled by system/browser preference
-    // Remove the manual theme toggle from the UI
+    const themeToggle = document.getElementById('themeToggle') as HTMLInputElement;
+    
+    // Load saved theme
     const savedTheme = localStorage.getItem('theme');
     if (savedTheme === 'light') {
       document.documentElement.classList.remove('dark');
       document.documentElement.classList.add('light');
+      if (themeToggle) themeToggle.checked = false;
     } else {
       document.documentElement.classList.add('dark');
       document.documentElement.classList.remove('light');
+      if (themeToggle) themeToggle.checked = true;
     }
+
+    // Setup toggle listener
+    themeToggle?.addEventListener('change', () => {
+      if (themeToggle.checked) {
+        document.documentElement.classList.add('dark');
+        document.documentElement.classList.remove('light');
+        localStorage.setItem('theme', 'dark');
+      } else {
+        document.documentElement.classList.remove('dark');
+        document.documentElement.classList.add('light');
+        localStorage.setItem('theme', 'light');
+      }
+    });
   }
 
   private applyListSettings(): void {
@@ -904,7 +926,6 @@ export class PopupController {
 
     return `
       <div class="word-item ${isSelected ? 'selected' : ''}" data-index="${realIndex}">
-        <div class="word-item-checkbox ${isSelected ? 'checked' : ''}"></div>
         <span class="word-item-text">${DOMUtils.escapeHtml(word.wordStr)}</span>
         <input type="text" class="word-item-edit-input" value="${DOMUtils.escapeHtml(word.wordStr)}" data-word-edit="${realIndex}" style="display: none;">
         <div class="word-item-actions">
@@ -913,9 +934,12 @@ export class PopupController {
           </button>
           <input type="color" value="${bgColor}" data-bg-edit="${realIndex}" class="word-item-color-picker" title="${chrome.i18n.getMessage('background_color_title') || 'Background color'}">
           <input type="color" value="${fgColor}" data-fg-edit="${realIndex}" class="word-item-color-picker" title="${chrome.i18n.getMessage('text_color_title') || 'Text color'}">
-          <label class="switch-wrapper word-item-switch">
-            <input type="checkbox" class="switch-input" ${word.active !== false ? 'checked' : ''} title="${chrome.i18n.getMessage('toggle_active') || 'Toggle active'}">
-            <span class="switch-slider"></span>
+          <label class="word-item-eye-toggle" title="${chrome.i18n.getMessage('toggle_active') || 'Toggle active'}" aria-label="${chrome.i18n.getMessage('toggle_active') || 'Toggle active'}">
+            <input type="checkbox" class="word-item-eye-input" ${word.active !== false ? 'checked' : ''} data-index="${realIndex}">
+            <span class="word-item-eye-icon">
+              <i class="fa-solid fa-eye eye-active"></i>
+              <i class="fa-solid fa-eye-slash eye-disabled"></i>
+            </span>
           </label>
         </div>
       </div>
@@ -955,7 +979,10 @@ export class PopupController {
     container.innerHTML = this.exceptionsList.map(domain =>
       `<div class="exception-item">
         <span class="exception-domain">${DOMUtils.escapeHtml(domain)}</span>
-        <button class="exception-remove" data-domain="${DOMUtils.escapeHtml(domain)}">${chrome.i18n.getMessage('remove') || 'Remove'}</button>
+        <button class="exception-remove" data-domain="${DOMUtils.escapeHtml(domain)}">
+          <i class="fa-solid fa-trash"></i>
+          ${chrome.i18n.getMessage('remove') || 'Remove'}
+        </button>
       </div>`
     ).join('');
   }
diff --git a/src/popup/popup.ts b/src/popup/popup.ts
index 064c78d..608a371 100644
--- a/src/popup/popup.ts
+++ b/src/popup/popup.ts
@@ -20,6 +20,17 @@ function localizePage(): void {
       }
     }
   });
+
+  const titleElements = document.querySelectorAll('[data-i18n-title]');
+  titleElements.forEach(element => {
+    const key = element.getAttribute('data-i18n-title');
+    if (key) {
+      const translation = chrome.i18n.getMessage(key);
+      if (translation) {
+        element.setAttribute('title', translation);
+      }
+    }
+  });
 }
 
 function displayVersion(): void {