chore(release): 1.10.2

## [1.10.2](https://github.com/obsqrbtz/goose-highlighter/compare/v1.10.1...v1.10.2) (2025-11-22)

### Bug Fixes

* do not highlight textareas. create badge with popup instead ([f800318](f800318e66))
* update badge when textarea text changes ([5d7766d](5d7766d5fd))

.vscode/settings.json

@@ -0,0 +1,2 @@
+{
+}

CHANGELOG.md

@@ -1,3 +1,34 @@
+## [1.10.2](https://github.com/obsqrbtz/goose-highlighter/compare/v1.10.1...v1.10.2) (2025-11-22)
+
+
+### Bug Fixes
+
+* do not highlight textareas. create badge with popup instead ([f800318](https://github.com/obsqrbtz/goose-highlighter/commit/f800318e66aba17eb95d60c3bfa44c5215989314))
+* update badge when textarea text changes ([5d7766d](https://github.com/obsqrbtz/goose-highlighter/commit/5d7766d5fd3df0204f64eb15f938cb2a459897ad))
+
+## [1.10.1](https://github.com/obsqrbtz/goose-highlighter/compare/v1.10.0...v1.10.1) (2025-11-20)
+
+
+### Bug Fixes
+
+* add fake highlighting for textareas ([f3c999a](https://github.com/obsqrbtz/goose-highlighter/commit/f3c999ad192d20ad4024261d8b3c8628de21382a))
+* correct matches list buttons handling ([f895327](https://github.com/obsqrbtz/goose-highlighter/commit/f895327eb0efc325309fea02eb4030eb8301916a))
+* go to textarea match ([fc4ef86](https://github.com/obsqrbtz/goose-highlighter/commit/fc4ef8655d0a4bce8ef6b67e45f5929e21c9b746))
+
+# [1.10.0](https://github.com/obsqrbtz/goose-highlighter/compare/v1.9.3...v1.10.0) (2025-11-20)
+
+
+### Bug Fixes
+
+* lighten debounce() usage, do not do full re-render on every change ([348d64f](https://github.com/obsqrbtz/goose-highlighter/commit/348d64f35693c11e7b14edcbe59b910195974950))
+* made placeholder for textarea, added outline offset ([4f32be0](https://github.com/obsqrbtz/goose-highlighter/commit/4f32be0b93b5a39dcb034b4a15bbeca05add0a1f))
+
+
+### Features
+
+* new tabbed layout ([18e167c](https://github.com/obsqrbtz/goose-highlighter/commit/18e167cb7f2e758e09b201f7eff4cdbad080774e))
+* show all found words and allow jump to them (beta) ([1a4c91f](https://github.com/obsqrbtz/goose-highlighter/commit/1a4c91fd5e35cc2227a580465ba9078200200623))
+
 ## [1.9.3](https://github.com/obsqrbtz/goose-highlighter/compare/v1.9.2...v1.9.3) (2025-11-18)
 
 

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 Daniel Dada
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -8,6 +8,7 @@ Goose Highlighter is a browser extension that allows you to highlight words on a
 - **Custom Colors:** Set background and foreground for each list or individual word.
 - **Bulk Add:** Paste multiple words at once.
 - **Enable/Disable:** Toggle highlighting globally, per list, or per word.
+- **Page Navigation:** View all highlights on the current page and jump to any occurrence with a single click.
 - **Site Exceptions:** Add specific websites to an exceptions list to disable highlighting there.
 - **Import/Export:** Backup or share your highlight lists and exceptions as JSON files.
 

_locales/de/messages.json

@@ -26,8 +26,11 @@
     "enable_highlight": {
         "message": "Hervorhebung aktivieren"
     },
+    "apply": {
+        "message": "Anwenden"
+    },
     "paste_hint": {
-        "message": "Wörter hier einfügen"
+        "message": "Fügen Sie hier Wörter oder Phrasen ein. Jedes neue Wort/jede neue Phrase sollte in der nächsten Zeile beginnen."
     },
     "apply_paste": {
         "message": "Wörter hinzufügen"
@@ -102,7 +105,7 @@
     "message": "Zu Ausnahmen hinzufügen"
   },
   "remove_exception": {
-    "message": "Aus Ausnahmen entfernen"
+    "message": "Aktuelle entfernen"
   },
   "manage_exceptions": {
     "message": "Verwalten"
@@ -118,5 +121,56 @@
   },
   "remove": {
     "message": "Entfernen"
+  },
+  "tab_lists": {
+    "message": "Listen"
+  },
+  "tab_words": {
+    "message": "Wörter"
+  },
+  "tab_exceptions": {
+    "message": "Ausnahmen"
+  },
+  "no_exceptions": {
+    "message": "Keine Ausnahmen"
+  },
+  "toggle_highlighting_title": {
+    "message": "Hervorhebung umschalten"
+  },
+  "toggle_dark_mode_title": {
+    "message": "Dunkelmodus umschalten"
+  },
+  "select_title": {
+    "message": "Auswählen"
+  },
+  "word_placeholder": {
+    "message": "Wort oder Phrase"
+  },
+  "background_color_title": {
+    "message": "Hintergrundfarbe"
+  },
+  "text_color_title": {
+    "message": "Textfarbe"
+  },
+  "tab_page_highlights": {
+    "message": "Auf Seite"
+  },
+  "highlights_on_page": {
+    "message": "Hervorhebungen auf dieser Seite"
+  },
+  "total_highlights": {
+    "message": "Gesamt"
+  },
+  "refresh": {
+    "message": "Aktualisieren"
+  },
+  "no_highlights_on_page": {
+    "message": "Keine Hervorhebungen auf dieser Seite gefunden"
+  },
+  "previous": {
+    "message": "Vorherige"
+  },
+  "next": {
+    "message": "Nächste"
   }
 }

_locales/en/messages.json

@@ -26,8 +26,11 @@
   "enable_highlight": {
     "message": "Enable Highlight"
   },
+  "apply": {
+    "message": "Apply"
+  },
   "paste_hint": {
-    "message": "Paste words here"
+    "message": "Paste words or phrases here. Each new word/phrase should start from next line."
   },
   "apply_paste": {
     "message": "Add Words"
@@ -108,7 +111,7 @@
     "message": "Add to Exceptions"
   },
   "remove_exception": {
-    "message": "Remove from Exceptions"
+    "message": "Remove current"
   },
   "manage_exceptions": {
     "message": "Manage"
@@ -124,5 +127,56 @@
   },
   "remove": {
     "message": "Remove"
+  },
+  "tab_lists": {
+    "message": "Lists"
+  },
+  "tab_words": {
+    "message": "Words"
+  },
+  "tab_exceptions": {
+    "message": "Exceptions"
+  },
+  "no_exceptions": {
+    "message": "No exceptions"
+  },
+  "toggle_highlighting_title": {
+    "message": "Toggle highlighting"
+  },
+  "toggle_dark_mode_title": {
+    "message": "Toggle dark mode"
+  },
+  "select_title": {
+    "message": "Select"
+  },
+  "word_placeholder": {
+    "message": "Word or phrase"
+  },
+  "background_color_title": {
+    "message": "Background color"
+  },
+  "text_color_title": {
+    "message": "Text color"
+  },
+  "tab_page_highlights": {
+    "message": "On Page"
+  },
+  "highlights_on_page": {
+    "message": "Highlights on This Page"
+  },
+  "total_highlights": {
+    "message": "Total"
+  },
+  "refresh": {
+    "message": "Refresh"
+  },
+  "no_highlights_on_page": {
+    "message": "No highlights found on this page"
+  },
+  "previous": {
+    "message": "Previous"
+  },
+  "next": {
+    "message": "Next"
   }
 }

_locales/es/messages.json

@@ -26,8 +26,11 @@
   "enable_highlight": {
     "message": "Activar resaltado"
   },
+  "apply": {
+    "message": "Aplicar"
+  },
   "paste_hint": {
-    "message": "Pega las palabras aquí"
+    "message": "Pegue palabras o frases aquí. Cada nueva palabra/frase debe comenzar en la siguiente línea."
   },
   "apply_paste": {
     "message": "Agregar palabras"
@@ -108,7 +111,7 @@
     "message": "Agregar a excepciones"
   },
   "remove_exception": {
-    "message": "Quitar de excepciones"
+    "message": "Eliminar actual"
   },
   "manage_exceptions": {
     "message": "Gestionar"
@@ -124,5 +127,56 @@
   },
   "remove": {
     "message": "Eliminar"
+  },
+  "tab_lists": {
+    "message": "Listas"
+  },
+  "tab_words": {
+    "message": "Palabras"
+  },
+  "tab_exceptions": {
+    "message": "Excepciones"
+  },
+  "no_exceptions": {
+    "message": "Sin excepciones"
+  },
+  "toggle_highlighting_title": {
+    "message": "Alternar resaltado"
+  },
+  "toggle_dark_mode_title": {
+    "message": "Alternar modo oscuro"
+  },
+  "select_title": {
+    "message": "Seleccionar"
+  },
+  "word_placeholder": {
+    "message": "Palabra o frase"
+  },
+  "background_color_title": {
+    "message": "Color de fondo"
+  },
+  "text_color_title": {
+    "message": "Color de texto"
+  },
+  "tab_page_highlights": {
+    "message": "En página"
+  },
+  "highlights_on_page": {
+    "message": "Resaltados en esta página"
+  },
+  "total_highlights": {
+    "message": "Total"
+  },
+  "refresh": {
+    "message": "Actualizar"
+  },
+  "no_highlights_on_page": {
+    "message": "No se encontraron resaltados en esta página"
+  },
+  "previous": {
+    "message": "Anterior"
+  },
+  "next": {
+    "message": "Siguiente"
   }
 }

_locales/fr/messages.json

@@ -26,8 +26,11 @@
     "enable_highlight": {
         "message": "Activer la surbrillance"
     },
+    "apply": {
+        "message": "Appliquer"
+    },
     "paste_hint": {
-        "message": "Collez les mots ici"
+        "message": "Collez des mots ou des phrases ici. Chaque nouveau mot/phrase doit commencer sur la ligne suivante."
     },
     "apply_paste": {
         "message": "Ajouter des mots"
@@ -108,7 +111,7 @@
         "message": "Ajouter aux exceptions"
     },
     "remove_exception": {
-        "message": "Retirer des exceptions"
+        "message": "Supprimer l'actuel"
     },
     "manage_exceptions": {
         "message": "Gérer"
@@ -124,5 +127,56 @@
     },
     "remove": {
         "message": "Supprimer"
+    },
+    "tab_lists": {
+        "message": "Listes"
+    },
+    "tab_words": {
+        "message": "Mots"
+    },
+    "tab_exceptions": {
+        "message": "Exceptions"
+    },
+    "no_exceptions": {
+        "message": "Aucune exception"
+    },
+    "toggle_highlighting_title": {
+        "message": "Activer/désactiver la surbrillance"
+    },
+    "toggle_dark_mode_title": {
+        "message": "Activer/désactiver le mode sombre"
+    },
+    "select_title": {
+        "message": "Sélectionner"
+    },
+    "word_placeholder": {
+        "message": "Mot ou phrase"
+    },
+    "background_color_title": {
+        "message": "Couleur d'arrière-plan"
+    },
+    "text_color_title": {
+        "message": "Couleur du texte"
+    },
+    "tab_page_highlights": {
+        "message": "Sur la page"
+    },
+    "highlights_on_page": {
+        "message": "Surlignages sur cette page"
+    },
+    "total_highlights": {
+        "message": "Total"
+    },
+    "refresh": {
+        "message": "Actualiser"
+    },
+    "no_highlights_on_page": {
+        "message": "Aucun surlignage trouvé sur cette page"
+    },
+    "previous": {
+        "message": "Précédent"
+    },
+    "next": {
+        "message": "Suivant"
     }
 }

_locales/hi/messages.json

@@ -26,8 +26,11 @@
     "enable_highlight": {
         "message": "हाइलाइट सक्षम करें"
     },
+    "apply": {
+        "message": "लागू करें"
+    },
     "paste_hint": {
-        "message": "यहाँ शब्द चिपकाएँ"
+        "message": "यहाँ शब्द या वाक्यांश चिपकाएँ। प्रत्येक नया शब्द/वाक्यांश अगली पंक्ति से शुरू होना चाहिए।"
     },
     "apply_paste": {
         "message": "शब्द जोड़ें"
@@ -108,7 +111,7 @@
         "message": "अपवादों में जोड़ें"
     },
     "remove_exception": {
-        "message": "अपवादों से हटाएं"
+        "message": "वर्तमान हटाएं"
     },
     "manage_exceptions": {
         "message": "प्रबंधित करें"
@@ -124,5 +127,56 @@
     },
     "remove": {
         "message": "हटाएं"
+    },
+    "tab_lists": {
+        "message": "सूचियाँ"
+    },
+    "tab_words": {
+        "message": "शब्द"
+    },
+    "tab_exceptions": {
+        "message": "अपवाद"
+    },
+    "no_exceptions": {
+        "message": "कोई अपवाद नहीं"
+    },
+    "toggle_highlighting_title": {
+        "message": "हाइलाइटिंग टॉगल करें"
+    },
+    "toggle_dark_mode_title": {
+        "message": "डार्क मोड टॉगल करें"
+    },
+    "select_title": {
+        "message": "चुनें"
+    },
+    "word_placeholder": {
+        "message": "शब्द या वाक्यांश"
+    },
+    "background_color_title": {
+        "message": "पृष्ठभूमि रंग"
+    },
+    "text_color_title": {
+        "message": "पाठ रंग"
+    },
+    "tab_page_highlights": {
+        "message": "पृष्ठ पर"
+    },
+    "highlights_on_page": {
+        "message": "इस पृष्ठ पर हाइलाइट"
+    },
+    "total_highlights": {
+        "message": "कुल"
+    },
+    "refresh": {
+        "message": "रीफ्रेश करें"
+    },
+    "no_highlights_on_page": {
+        "message": "इस पृष्ठ पर कोई हाइलाइट नहीं मिला"
+    },
+    "previous": {
+        "message": "पिछला"
+    },
+    "next": {
+        "message": "अगला"
     }
 }

_locales/it/messages.json

@@ -26,8 +26,11 @@
     "enable_highlight": {
         "message": "Abilita evidenziazione"
     },
+    "apply": {
+        "message": "Applica"
+    },
     "paste_hint": {
-        "message": "Incolla le parole qui"
+        "message": "Incolla parole o frasi qui. Ogni nuova parola/frase deve iniziare dalla riga successiva."
     },
     "apply_paste": {
         "message": "Aggiungi parole"
@@ -108,7 +111,7 @@
         "message": "Aggiungi alle eccezioni"
     },
     "remove_exception": {
-        "message": "Rimuovi dalle eccezioni"
+        "message": "Rimuovi corrente"
     },
     "manage_exceptions": {
         "message": "Gestisci"
@@ -124,5 +127,56 @@
     },
     "remove": {
         "message": "Rimuovi"
+    },
+    "tab_lists": {
+        "message": "Elenchi"
+    },
+    "tab_words": {
+        "message": "Parole"
+    },
+    "tab_exceptions": {
+        "message": "Eccezioni"
+    },
+    "no_exceptions": {
+        "message": "Nessuna eccezione"
+    },
+    "toggle_highlighting_title": {
+        "message": "Attiva/disattiva evidenziazione"
+    },
+    "toggle_dark_mode_title": {
+        "message": "Attiva/disattiva modalità scura"
+    },
+    "select_title": {
+        "message": "Seleziona"
+    },
+    "word_placeholder": {
+        "message": "Parola o frase"
+    },
+    "background_color_title": {
+        "message": "Colore di sfondo"
+    },
+    "text_color_title": {
+        "message": "Colore del testo"
+    },
+    "tab_page_highlights": {
+        "message": "Sulla pagina"
+    },
+    "highlights_on_page": {
+        "message": "Evidenziazioni su questa pagina"
+    },
+    "total_highlights": {
+        "message": "Totale"
+    },
+    "refresh": {
+        "message": "Aggiorna"
+    },
+    "no_highlights_on_page": {
+        "message": "Nessuna evidenziazione trovata su questa pagina"
+    },
+    "previous": {
+        "message": "Precedente"
+    },
+    "next": {
+        "message": "Successivo"
     }
 }

_locales/ja/messages.json

@@ -26,8 +26,11 @@
     "enable_highlight": {
         "message": "ハイライトを有効にする"
     },
+    "apply": {
+        "message": "適用"
+    },
     "paste_hint": {
-        "message": "ここに単語を貼り付けてください"
+        "message": "ここに単語またはフレーズを貼り付けてください。各新しい単語/フレーズは次の行から始める必要があります。"
     },
     "apply_paste": {
         "message": "単語を追加"
@@ -108,7 +111,7 @@
         "message": "例外に追加"
     },
     "remove_exception": {
-        "message": "例外から削除"
+        "message": "現在を削除"
     },
     "manage_exceptions": {
         "message": "管理"
@@ -124,5 +127,56 @@
     },
     "remove": {
         "message": "削除"
+    },
+    "tab_lists": {
+        "message": "リスト"
+    },
+    "tab_words": {
+        "message": "単語"
+    },
+    "tab_exceptions": {
+        "message": "例外"
+    },
+    "no_exceptions": {
+        "message": "例外なし"
+    },
+    "toggle_highlighting_title": {
+        "message": "ハイライトの切り替え"
+    },
+    "toggle_dark_mode_title": {
+        "message": "ダークモードの切り替え"
+    },
+    "select_title": {
+        "message": "選択"
+    },
+    "word_placeholder": {
+        "message": "単語またはフレーズ"
+    },
+    "background_color_title": {
+        "message": "背景色"
+    },
+    "text_color_title": {
+        "message": "文字色"
+    },
+    "tab_page_highlights": {
+        "message": "ページ上"
+    },
+    "highlights_on_page": {
+        "message": "このページのハイライト"
+    },
+    "total_highlights": {
+        "message": "合計"
+    },
+    "refresh": {
+        "message": "更新"
+    },
+    "no_highlights_on_page": {
+        "message": "このページにハイライトが見つかりません"
+    },
+    "previous": {
+        "message": "前へ"
+    },
+    "next": {
+        "message": "次へ"
     }
 }

_locales/ko/messages.json

@@ -26,8 +26,11 @@
     "enable_highlight": {
         "message": "하이라이트 활성화"
     },
+    "apply": {
+        "message": "적용"
+    },
     "paste_hint": {
-        "message": "여기에 단어를 붙여넣기"
+        "message": "여기에 단어나 구문을 붙여넣으세요. 각 새 단어/구문은 다음 줄에서 시작해야 합니다."
     },
     "apply_paste": {
         "message": "단어 추가"
@@ -108,7 +111,7 @@
         "message": "예외에 추가"
     },
     "remove_exception": {
-        "message": "예외에서 제거"
+        "message": "현재 제거"
     },
     "manage_exceptions": {
         "message": "관리"
@@ -124,5 +127,56 @@
     },
     "remove": {
         "message": "제거"
+    },
+    "tab_lists": {
+        "message": "리스트"
+    },
+    "tab_words": {
+        "message": "단어"
+    },
+    "tab_exceptions": {
+        "message": "예외"
+    },
+    "no_exceptions": {
+        "message": "예외 없음"
+    },
+    "toggle_highlighting_title": {
+        "message": "하이라이트 전환"
+    },
+    "toggle_dark_mode_title": {
+        "message": "다크 모드 전환"
+    },
+    "select_title": {
+        "message": "선택"
+    },
+    "word_placeholder": {
+        "message": "단어 또는 구문"
+    },
+    "background_color_title": {
+        "message": "배경색"
+    },
+    "text_color_title": {
+        "message": "글자색"
+    },
+    "tab_page_highlights": {
+        "message": "페이지에서"
+    },
+    "highlights_on_page": {
+        "message": "이 페이지의 하이라이트"
+    },
+    "total_highlights": {
+        "message": "전체"
+    },
+    "refresh": {
+        "message": "새로고침"
+    },
+    "no_highlights_on_page": {
+        "message": "이 페이지에서 하이라이트를 찾을 수 없습니다"
+    },
+    "previous": {
+        "message": "이전"
+    },
+    "next": {
+        "message": "다음"
     }
 }

_locales/nl/messages.json

@@ -26,8 +26,11 @@
   "enable_highlight": {
     "message": "Markeren inschakelen"
   },
+  "apply": {
+    "message": "Toepassen"
+  },
   "paste_hint": {
-    "message": "Plak hier de woorden"
+    "message": "Plak hier woorden of zinnen. Elk nieuw woord/zin moet op de volgende regel beginnen."
   },
   "apply_paste": {
     "message": "Woorden toevoegen"
@@ -108,7 +111,7 @@
     "message": "Toevoegen aan uitzonderingen"
   },
   "remove_exception": {
-    "message": "Verwijderen uit uitzonderingen"
+    "message": "Huidige verwijderen"
   },
   "manage_exceptions": {
     "message": "Beheren"
@@ -124,5 +127,56 @@
   },
   "remove": {
     "message": "Verwijderen"
+  },
+  "tab_lists": {
+    "message": "Lijsten"
+  },
+  "tab_words": {
+    "message": "Woorden"
+  },
+  "tab_exceptions": {
+    "message": "Uitzonderingen"
+  },
+  "no_exceptions": {
+    "message": "Geen uitzonderingen"
+  },
+  "toggle_highlighting_title": {
+    "message": "Markeren in-/uitschakelen"
+  },
+  "toggle_dark_mode_title": {
+    "message": "Donkere modus in-/uitschakelen"
+  },
+  "select_title": {
+    "message": "Selecteren"
+  },
+  "word_placeholder": {
+    "message": "Woord of zin"
+  },
+  "background_color_title": {
+    "message": "Achtergrondkleur"
+  },
+  "text_color_title": {
+    "message": "Tekstkleur"
+  },
+  "tab_page_highlights": {
+    "message": "Op pagina"
+  },
+  "highlights_on_page": {
+    "message": "Markeringen op deze pagina"
+  },
+  "total_highlights": {
+    "message": "Totaal"
+  },
+  "refresh": {
+    "message": "Vernieuwen"
+  },
+  "no_highlights_on_page": {
+    "message": "Geen markeringen gevonden op deze pagina"
+  },
+  "previous": {
+    "message": "Vorige"
+  },
+  "next": {
+    "message": "Volgende"
   }
 }

_locales/pl/messages.json

@@ -26,8 +26,11 @@
   "enable_highlight": {
     "message": "Włącz podświetlanie"
   },
+  "apply": {
+    "message": "Zastosuj"
+  },
   "paste_hint": {
-    "message": "Wklej tutaj słowa"
+    "message": "Wklej tutaj słowa lub frazy. Każde nowe słowo/fraza powinno zaczynać się od następnej linii."
   },
   "apply_paste": {
     "message": "Dodaj słowa"
@@ -108,7 +111,7 @@
     "message": "Dodaj do wyjątków"
   },
   "remove_exception": {
-    "message": "Usuń z wyjątków"
+    "message": "Usuń bieżący"
   },
   "manage_exceptions": {
     "message": "Zarządzaj"
@@ -124,5 +127,56 @@
   },
   "remove": {
     "message": "Usuń"
+  },
+  "tab_lists": {
+    "message": "Listy"
+  },
+  "tab_words": {
+    "message": "Słowa"
+  },
+  "tab_exceptions": {
+    "message": "Wyjątki"
+  },
+  "no_exceptions": {
+    "message": "Brak wyjątków"
+  },
+  "toggle_highlighting_title": {
+    "message": "Przełącz podświetlanie"
+  },
+  "toggle_dark_mode_title": {
+    "message": "Przełącz tryb ciemny"
+  },
+  "select_title": {
+    "message": "Zaznacz"
+  },
+  "word_placeholder": {
+    "message": "Słowo lub fraza"
+  },
+  "background_color_title": {
+    "message": "Kolor tła"
+  },
+  "text_color_title": {
+    "message": "Kolor tekstu"
+  },
+  "tab_page_highlights": {
+    "message": "Na stronie"
+  },
+  "highlights_on_page": {
+    "message": "Podświetlenia na tej stronie"
+  },
+  "total_highlights": {
+    "message": "Łącznie"
+  },
+  "refresh": {
+    "message": "Odśwież"
+  },
+  "no_highlights_on_page": {
+    "message": "Nie znaleziono podświetleń na tej stronie"
+  },
+  "previous": {
+    "message": "Poprzedni"
+  },
+  "next": {
+    "message": "Następny"
   }
 }

_locales/pt_BR/messages.json

@@ -26,8 +26,11 @@
     "enable_highlight": {
         "message": "Ativar destaque"
     },
+    "apply": {
+        "message": "Aplicar"
+    },
     "paste_hint": {
-        "message": "Cole as palavras aqui"
+        "message": "Cole palavras ou frases aqui. Cada nova palavra/frase deve começar na próxima linha."
     },
     "apply_paste": {
         "message": "Adicionar palavras"
@@ -102,7 +105,7 @@
     "message": "Adicionar às exceções"
   },
   "remove_exception": {
-    "message": "Remover das exceções"
+    "message": "Remover atual"
   },
   "manage_exceptions": {
     "message": "Gerenciar"
@@ -118,5 +121,56 @@
   },
   "remove": {
     "message": "Remover"
+  },
+  "tab_lists": {
+    "message": "Listas"
+  },
+  "tab_words": {
+    "message": "Palavras"
+  },
+  "tab_exceptions": {
+    "message": "Exceções"
+  },
+  "no_exceptions": {
+    "message": "Sem exceções"
+  },
+  "toggle_highlighting_title": {
+    "message": "Alternar destaque"
+  },
+  "toggle_dark_mode_title": {
+    "message": "Alternar modo escuro"
+  },
+  "select_title": {
+    "message": "Selecionar"
+  },
+  "word_placeholder": {
+    "message": "Palavra ou frase"
+  },
+  "background_color_title": {
+    "message": "Cor de fundo"
+  },
+  "text_color_title": {
+    "message": "Cor do texto"
+  },
+  "tab_page_highlights": {
+    "message": "Na página"
+  },
+  "highlights_on_page": {
+    "message": "Destaques nesta página"
+  },
+  "total_highlights": {
+    "message": "Total"
+  },
+  "refresh": {
+    "message": "Atualizar"
+  },
+  "no_highlights_on_page": {
+    "message": "Nenhum destaque encontrado nesta página"
+  },
+  "previous": {
+    "message": "Anterior"
+  },
+  "next": {
+    "message": "Próximo"
   }
 }

_locales/ru/messages.json

@@ -26,8 +26,11 @@
   "enable_highlight": {
     "message": "Включить выделение"
   },
+  "apply": {
+    "message": "Применить"
+  },
   "paste_hint": {
-    "message": "Вставьте список слов здесь"
+    "message": "Вставьте сюда слова или фразы. Каждое новое слово/фраза должны начинаться с новой строки."
   },
   "apply_paste": {
     "message": "Добавить слова"
@@ -124,5 +127,56 @@
   },
   "remove": {
     "message": "Удалить"
+  },
+  "tab_lists": {
+    "message": "Списки"
+  },
+  "tab_words": {
+    "message": "Слова"
+  },
+  "tab_exceptions": {
+    "message": "Исключения"
+  },
+  "no_exceptions": {
+    "message": "Нет исключений"
+  },
+  "toggle_highlighting_title": {
+    "message": "Выделение(вкл/выкл)"
+  },
+  "toggle_dark_mode_title": {
+    "message": "Темная/светлая тема"
+  },
+  "select_title": {
+    "message": "Выбрать"
+  },
+  "word_placeholder": {
+    "message": "Слово или фраза"
+  },
+  "background_color_title": {
+    "message": "Цвет фона"
+  },
+  "text_color_title": {
+    "message": "Цвет текста"
+  },
+  "tab_page_highlights": {
+    "message": "На странице"
+  },
+  "highlights_on_page": {
+    "message": "Найдено на этой странице"
+  },
+  "total_highlights": {
+    "message": "Всего"
+  },
+  "refresh": {
+    "message": "Обновить"
+  },
+  "no_highlights_on_page": {
+    "message": "На этой странице не найдены слова из списка"
+  },
+  "previous": {
+    "message": "Предыдущее"
+  },
+  "next": {
+    "message": "Следующее"
   }
 }

_locales/tr/messages.json

@@ -26,8 +26,11 @@
   "enable_highlight": {
     "message": "Vurgulamayı Etkinleştir"
   },
+  "apply": {
+    "message": "Uygula"
+  },
   "paste_hint": {
-    "message": "Kelimeleri buraya yapıştırın"
+    "message": "Kelimeleri veya ifadeleri buraya yapıştırın. Her yeni kelime/ifade bir sonraki satırdan başlamalıdır."
   },
   "apply_paste": {
     "message": "Kelimeleri Ekle"
@@ -108,7 +111,7 @@
     "message": "İstisnalara Ekle"
   },
   "remove_exception": {
-    "message": "İstisnalardan Çıkar"
+    "message": "Mevcut olanı kaldır"
   },
   "manage_exceptions": {
     "message": "Yönet"
@@ -124,5 +127,56 @@
   },
   "remove": {
     "message": "Kaldır"
+  },
+  "tab_lists": {
+    "message": "Listeler"
+  },
+  "tab_words": {
+    "message": "Kelimeler"
+  },
+  "tab_exceptions": {
+    "message": "İstisnalar"
+  },
+  "no_exceptions": {
+    "message": "İstisna yok"
+  },
+  "toggle_highlighting_title": {
+    "message": "Vurgulamayı aç/kapat"
+  },
+  "toggle_dark_mode_title": {
+    "message": "Karanlık modu aç/kapat"
+  },
+  "select_title": {
+    "message": "Seç"
+  },
+  "word_placeholder": {
+    "message": "Kelime veya ifade"
+  },
+  "background_color_title": {
+    "message": "Arka plan rengi"
+  },
+  "text_color_title": {
+    "message": "Metin rengi"
+  },
+  "tab_page_highlights": {
+    "message": "Sayfada"
+  },
+  "highlights_on_page": {
+    "message": "Bu sayfadaki vurgular"
+  },
+  "total_highlights": {
+    "message": "Toplam"
+  },
+  "refresh": {
+    "message": "Yenile"
+  },
+  "no_highlights_on_page": {
+    "message": "Bu sayfada vurgu bulunamadı"
+  },
+  "previous": {
+    "message": "Önceki"
+  },
+  "next": {
+    "message": "Sonraki"
   }
 }

_locales/zh_CN/messages.json

@@ -26,8 +26,11 @@
   "enable_highlight": {
     "message": "启用高亮"
   },
+  "apply": {
+    "message": "应用"
+  },
   "paste_hint": {
-    "message": "在此粘贴单词"
+    "message": "在此粘贴单词或短语。每个新单词/短语应从下一行开始。"
   },
   "apply_paste": {
     "message": "添加单词"
@@ -108,7 +111,7 @@
     "message": "添加到例外"
   },
   "remove_exception": {
-    "message": "从例外中移除"
+    "message": "移除当前"
   },
   "manage_exceptions": {
     "message": "管理"
@@ -124,5 +127,56 @@
   },
   "remove": {
     "message": "移除"
+  },
+  "tab_lists": {
+    "message": "列表"
+  },
+  "tab_words": {
+    "message": "单词"
+  },
+  "tab_exceptions": {
+    "message": "例外"
+  },
+  "no_exceptions": {
+    "message": "无例外"
+  },
+  "toggle_highlighting_title": {
+    "message": "切换高亮"
+  },
+  "toggle_dark_mode_title": {
+    "message": "切换暗黑模式"
+  },
+  "select_title": {
+    "message": "选择"
+  },
+  "word_placeholder": {
+    "message": "单词或短语"
+  },
+  "background_color_title": {
+    "message": "背景颜色"
+  },
+  "text_color_title": {
+    "message": "文字颜色"
+  },
+  "tab_page_highlights": {
+    "message": "页面上"
+  },
+  "highlights_on_page": {
+    "message": "此页面上的高亮"
+  },
+  "total_highlights": {
+    "message": "总计"
+  },
+  "refresh": {
+    "message": "刷新"
+  },
+  "no_highlights_on_page": {
+    "message": "此页面上未找到高亮"
+  },
+  "previous": {
+    "message": "上一个"
+  },
+  "next": {
+    "message": "下一个"
   }
 }

manifest.json

@@ -2,7 +2,7 @@
   "manifest_version": 3,
   "name": "__MSG_extension_name__",
   "description": "__MSG_extension_description__",
-  "version": "1.9.3",
+  "version": "1.10.2",
   "default_locale": "en",
   "permissions": [
     "scripting",

popup/popup.html

@@ -11,52 +11,37 @@
 </head>
 
 <body class="dark">
+  <div class="loading-overlay">
+    <div class="loading-spinner"></div>
+  </div>
   <div class="container">
 
     <div class="header-bar">
       <span class="title">
-        <i class="fa-solid fa-highlighter"></i> Goose Highlighter
+        <img src="../img/logo-outlined.png" alt="Goose Highlighter" style="height: 28px; vertical-align: middle; margin-right: 8px;"> Goose Highlighter
       </span>
       <div class="icon-toggles">
-        <label class="icon-toggle" title="Toggle highlighting">
+        <label class="icon-toggle" data-i18n-title="toggle_highlighting_title" title="Toggle highlighting">
           <input type="checkbox" class="hidden-toggle" id="globalHighlightToggle" />
           <i class="toggle-icon global-icon fa-solid"></i>
         </label>
-        <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>
       </div>
     </div>
 
-    <div class="section" data-section="exceptions">
+    <div class="tabs">
-      <div class="section-header">
+      <button class="tab-button active" data-tab="lists"><i class="fa-solid fa-list"></i> <span data-i18n="tab_lists">Lists</span></button>
-        <h2><i class="fa-solid fa-ban"></i> <span data-i18n="site_exceptions">Site Exceptions</span></h2>
+      <button class="tab-button" data-tab="words"><i class="fa-solid fa-tags"></i> <span data-i18n="tab_words">Words</span></button>
-        <button class="collapse-toggle" data-target="exceptions">
+      <button class="tab-button" data-tab="page-highlights"><i class="fa-solid fa-location-dot"></i> <span data-i18n="tab_page_highlights">On Page</span></button>
-          <i class="fa-solid fa-chevron-up"></i>
+      <button class="tab-button" data-tab="exceptions"><i class="fa-solid fa-ban"></i> <span data-i18n="tab_exceptions">Exceptions</span></button>
-        </button>
+      <button class="tab-button" data-tab="options"><i class="fa-solid fa-sliders"></i> <span data-i18n="options">Options</span></button>
-      </div>
-      <div class="section-content" id="exceptions-content">
-        <div class="button-row">
-          <button id="toggleExceptionBtn"><i class="fa-solid fa-ban"></i> <span id="exceptionBtnText" data-i18n="add_exception">Add to Exceptions</span></button>
-          <button id="manageExceptionsBtn"><i class="fa-solid fa-list"></i> <span data-i18n="manage_exceptions">Manage</span></button>
-        </div>
-        <div id="exceptionsPanel" class="exceptions-panel" style="display: none;">
-          <h3 data-i18n="exceptions_list">Exception Sites:</h3>
-          <div id="exceptionsList" class="exceptions-list"></div>
-          <button id="clearExceptionsBtn" class="danger"><i class="fa-solid fa-trash"></i> <span data-i18n="clear_all">Clear All</span></button>
-        </div>
-      </div>
     </div>
 
-    <div class="section" data-section="lists">
+    <div class="tab-content active" data-tab-content="lists">
-      <div class="section-header">
+      <div class="section" data-section="lists">
-        <h2><i class="fa-solid fa-list"></i> <span data-i18n="highlight_lists">Highlight Lists</span></h2>
-        <button class="collapse-toggle" data-target="lists">
-          <i class="fa-solid fa-chevron-up"></i>
-        </button>
-      </div>
-      <div class="section-content" id="lists-content">
         <label for="listSelect" data-i18n="select_list">Select List:</label>
         <select id="listSelect"></select>
         <div class="button-row">
@@ -65,16 +50,9 @@
               data-i18n="delete_list">Delete</span></button>
         </div>
       </div>
-    </div>
 
-    <div class="section" data-section="settings">
+      <div class="section" data-section="settings">
-      <div class="section-header">
+        <h3><i class="fa-solid fa-gear"></i> <span data-i18n="list_settings">List Settings</span></h3>
-        <h2><i class="fa-solid fa-gear"></i> <span data-i18n="list_settings">List Settings</span></h2>
-        <button class="collapse-toggle" data-target="settings">
-          <i class="fa-solid fa-chevron-up"></i>
-        </button>
-      </div>
-      <div class="section-content" id="settings-content">
         <label><span data-i18n="list_name">List Name:</span> <input type="text" id="listName" /></label>
         <div class="color-row">
           <div class="color-label">
@@ -94,28 +72,15 @@
       </div>
     </div>
 
-    <div class="section" data-section="addwords">
+    <div class="tab-content" data-tab-content="words">
-      <div class="section-header">
+      <div class="section" data-section="addwords">
-        <h2><i class="fa-solid fa-pen"></i> <span data-i18n="add_words">Add Words</span></h2>
+        <h3><i class="fa-solid fa-pen"></i> <span data-i18n="add_words">Add Words</span></h3>
-        <button class="collapse-toggle" data-target="addwords">
-          <i class="fa-solid fa-chevron-up"></i>
-        </button>
-      </div>
-      <div class="section-content" id="addwords-content">
         <textarea id="bulkPaste" data-i18n="paste_hint" placeholder="Paste words here..."></textarea>
         <button id="addWordsBtn"><span data-i18n="apply_paste">Add Words</span></button>
       </div>
-    </div>
 
-    <div class="section" data-section="wordlist">
+      <div class="section" data-section="wordlist">
-      <div class="section-header">
+        <h3><i class="fa-solid fa-tags"></i> <span data-i18n="word_list">Word List</span> (<span id="wordCount">0</span>)</h3>
-        <h2><i class="fa-solid fa-tags"></i> <span data-i18n="word_list">Word List</span>(<span id="wordCount">0</span>)
-        </h2>
-        <button class="collapse-toggle" data-target="wordlist">
-          <i class="fa-solid fa-chevron-up"></i>
-        </button>
-      </div>
-      <div class="section-content" id="wordlist-content">
         <div class="button-row wrap">
           <button id="selectAllBtn"><span data-i18n="select_all">Select All</span></button>
           <button id="deselectAllBtn"><span data-i18n="deselect_all">Clear</span></button>
@@ -128,14 +93,32 @@
       </div>
     </div>
 
-    <div class="section" data-section="options">
+    <div class="tab-content" data-tab-content="page-highlights">
-      <div class="section-header">
+      <div class="section" data-section="page-highlights">
-        <h2><i class="fa-solid fa-sliders"></i> <span data-i18n="options">Options</span></h2>
+        <h3><i class="fa-solid fa-location-dot"></i> <span data-i18n="highlights_on_page">Highlights on This Page</span></h3>
-        <button class="collapse-toggle" data-target="options">
+        <div class="page-highlights-info">
-          <i class="fa-solid fa-chevron-up"></i>
+          <span data-i18n="total_highlights">Total:</span> <strong id="totalHighlightsCount">0</strong>
-        </button>
+        </div>
+        <button id="refreshHighlightsBtn"><i class="fa-solid fa-rotate"></i> <span data-i18n="refresh">Refresh</span></button>
+        <div id="pageHighlightsList" class="page-highlights-list"></div>
       </div>
-      <div class="section-content" id="options-content">
+    </div>
+
+    <div class="tab-content" data-tab-content="exceptions">
+      <div class="section" data-section="exceptions">
+        <h3><i class="fa-solid fa-ban"></i> <span data-i18n="site_exceptions">Site Exceptions</span></h3>
+        <div class="button-row">
+          <button id="toggleExceptionBtn"><i class="fa-solid fa-plus"></i> <span id="exceptionBtnText" data-i18n="add_exception">Add to Exceptions</span></button>
+        </div>
+        <h3 data-i18n="exceptions_list">Exception Sites:</h3>
+        <div id="exceptionsList" class="exceptions-list"></div>
+        <button id="clearExceptionsBtn" class="danger"><i class="fa-solid fa-trash"></i> <span data-i18n="clear_all">Clear All</span></button>
+      </div>
+    </div>
+
+    <div class="tab-content" data-tab-content="options">
+      <div class="section" data-section="options">
+        <h3><i class="fa-solid fa-sliders"></i> <span data-i18n="options">Options</span></h3>
         <div class="button-row" style="margin-bottom:8px;">
           <label><input type="checkbox" id="matchCase" /> <span data-i18n="match_case">Match Case</span></label>
           <label><input type="checkbox" id="matchWhole" /> <span data-i18n="match_whole">Match Whole Word</span></label>

src/content/ContentScript.ts

@@ -2,7 +2,6 @@ import { HighlightList, MessageData } from '../types.js';
 import { StorageService } from '../services/StorageService.js';
 import { MessageService } from '../services/MessageService.js';
 import { HighlightEngine } from './HighlightEngine.js';
-import { DOMUtils } from '../utils/DOMUtils.js';
 
 export class ContentScript {
   private lists: HighlightList[] = [];
@@ -22,7 +21,6 @@ export class ContentScript {
   private async initialize(): Promise<void> {
     await this.loadSettings();
     this.setupMessageListener();
-    this.setupScrollHandler();
     this.processHighlights();
   }
 
@@ -49,28 +47,31 @@ export class ContentScript {
   }
 
   private setupMessageListener(): void {
-    MessageService.onMessage((message: MessageData) => {
+    MessageService.onMessage((message: MessageData, sender: any, sendResponse: (response?: any) => void) => {
       switch (message.type) {
         case 'WORD_LIST_UPDATED':
           this.handleWordListUpdate();
-          break;
+          return false;
         case 'GLOBAL_TOGGLE_UPDATED':
           this.handleGlobalToggleUpdate(message.enabled!);
-          break;
+          return false;
         case 'MATCH_OPTIONS_UPDATED':
           this.handleMatchOptionsUpdate(message.matchCase!, message.matchWhole!);
-          break;
+          return false;
         case 'EXCEPTIONS_LIST_UPDATED':
           this.handleExceptionsUpdate();
-          break;
+          return false;
+        case 'GET_PAGE_HIGHLIGHTS':
+          this.handleGetPageHighlights(sendResponse);
+          return true;
+        case 'SCROLL_TO_HIGHLIGHT':
+          this.handleScrollToHighlight(message.word!, message.index!);
+          return false;
       }
+      return false;
     });
   }
 
-  private setupScrollHandler(): void {
-    const debouncedProcess = DOMUtils.debounce(() => this.processHighlights(), CONSTANTS.DEBOUNCE_DELAY);
-    window.addEventListener('scroll', debouncedProcess);
-  }
 
   private async handleWordListUpdate(): Promise<void> {
     const data = await StorageService.get(['lists']);
@@ -112,4 +113,27 @@ export class ContentScript {
       this.isProcessing = false;
     }
   }
+
+  private handleGetPageHighlights(sendResponse: (response: any) => void): void {
+    const activeWords: ActiveWord[] = [];
+    
+    for (const list of this.lists) {
+      if (!list.active) continue;
+      for (const word of list.words) {
+        if (!word.active) continue;
+        activeWords.push({
+          text: word.wordStr,
+          background: word.background || list.background,
+          foreground: word.foreground || list.foreground
+        });
+      }
+    }
+
+    const highlights = this.highlightEngine.getPageHighlights(activeWords);
+    sendResponse({ highlights });
+  }
+
+  private handleScrollToHighlight(word: string, index: number): void {
+    this.highlightEngine.scrollToHighlight(word, index);
+  }
 }

src/content/HighlightEngine.ts

@@ -1,16 +1,87 @@
 import { HighlightList, ActiveWord, CONSTANTS } from '../types.js';
 import { DOMUtils } from '../utils/DOMUtils.js';
 
+
 export class HighlightEngine {
+      private static escapeHtml(text: string): string {
+        const div = document.createElement('div');
+        div.textContent = text;
+        return div.innerHTML;
+      }
+
+      private static renderHighlighted(text: string, pattern: RegExp): string {
+        let html = '';
+        let lastIndex = 0;
+        pattern.lastIndex = 0;
+        let match;
+        while ((match = pattern.exec(text)) !== null) {
+          html += HighlightEngine.escapeHtml(text.substring(lastIndex, match.index));
+          html += `<mark>${HighlightEngine.escapeHtml(match[0])}</mark>`;
+          lastIndex = match.index + match[0].length;
+        }
+        html += HighlightEngine.escapeHtml(text.substring(lastIndex));
+        return html;
+      }
+
+      private static createOrUpdateBadge(input: HTMLTextAreaElement | HTMLInputElement, pattern: RegExp): void {
+        const text = input.value;
+        let matchCount = 0;
+        pattern.lastIndex = 0;
+        let match;
+        while ((match = pattern.exec(text)) !== null) {
+          matchCount++;
+        }
+        const oldBadge = input.parentElement?.querySelector('.goose-highlighter-textarea-badge');
+        if (oldBadge) oldBadge.remove();
+        if (matchCount > 0) {
+          const badge = document.createElement('div');
+          badge.className = 'goose-highlighter-textarea-badge';
+          badge.textContent = matchCount.toString();
+          badge.setAttribute('data-round', matchCount > 9 ? 'false' : 'true');
+          badge.style.position = 'absolute';
+          badge.style.left = '4px';
+          badge.style.top = '4px';
+          badge.style.zIndex = '10000';
+          const parent = input.parentElement;
+          if (parent && window.getComputedStyle(parent).position === 'static') {
+            parent.style.position = 'relative';
+          }
+          parent?.appendChild(badge);
+          badge.addEventListener('click', () => {
+            document.querySelectorAll('.goose-highlighter-textarea-popup').forEach(p => p.remove());
+            const popup = document.createElement('div');
+            popup.className = 'goose-highlighter-textarea-popup';
+            popup.innerHTML = `
+              <div class="gh-popup-titlebar">
+                <button class="gh-popup-close" title="Close">&times;</button>
+              </div>
+              <pre class="gh-popup-pre">${HighlightEngine.renderHighlighted(text, pattern)}</pre>
+            `;
+            document.body.appendChild(popup);
+            const closeBtn = popup.querySelector('.gh-popup-close');
+            closeBtn?.addEventListener('click', () => popup.remove());
+          });
+        }
+      }
+
+      private static attachBadgeListener(input: HTMLTextAreaElement | HTMLInputElement, pattern: RegExp): void {
+        const updateBadge = () => HighlightEngine.createOrUpdateBadge(input, pattern);
+        updateBadge();
+        input.removeEventListener('input', updateBadge);
+        input.addEventListener('input', updateBadge);
+      }
+    private _textareaMatchInfo: Array<{ input: HTMLTextAreaElement | HTMLInputElement; count: number; text: string }> = [];
   private styleSheet: CSSStyleSheet | null = null;
   private highlights = new Map<string, Highlight>();
+  private highlightsByWord = new Map<string, Range[]>();
+  private textareaMatchesByWord = new Map<string, Array<{ input: HTMLTextAreaElement | HTMLInputElement; position: number }>>();
   private observer: MutationObserver;
   private isHighlighting = false;
+  private currentMatchCase = false;
 
   constructor(private onUpdate: () => void) {
     this.observer = new MutationObserver(DOMUtils.debounce((mutations: MutationRecord[]) => {
       if (this.isHighlighting) return;
-
       const hasContentChanges = mutations.some((mutation: MutationRecord) => {
         if (mutation.type !== 'childList') return false;
         const allNodes = [...Array.from(mutation.addedNodes), ...Array.from(mutation.removedNodes)];
@@ -20,7 +91,6 @@ export class HighlightEngine {
           return false;
         });
       });
-
       if (hasContentChanges) {
         this.onUpdate();
       }
@@ -62,6 +132,7 @@ export class HighlightEngine {
     this.clearHighlightsInternal();
   }
 
+
   private getTextNodes(): Text[] {
     const textNodes: Text[] = [];
     const walker = document.createTreeWalker(
@@ -69,7 +140,7 @@ export class HighlightEngine {
       NodeFilter.SHOW_TEXT,
       {
         acceptNode: (node: Text) => {
-          if (node.parentNode && ['SCRIPT', 'STYLE', 'NOSCRIPT', 'IFRAME'].includes(node.parentNode.nodeName)) {
+          if (node.parentNode && ['SCRIPT', 'STYLE', 'NOSCRIPT', 'IFRAME', 'TEXTAREA', 'INPUT'].includes(node.parentNode.nodeName)) {
             return NodeFilter.FILTER_REJECT;
           }
           if (!node.nodeValue?.trim()) {
@@ -106,6 +177,8 @@ export class HighlightEngine {
     if (this.isHighlighting) return;
     this.isHighlighting = true;
 
+    this.currentMatchCase = matchCase;
+
     this.observer.disconnect();
     this.clearHighlightsInternal();
 
@@ -143,6 +216,8 @@ export class HighlightEngine {
       const textNodes = this.getTextNodes();
 
       const rangesByStyle = new Map<number, Range[]>();
+      this.highlightsByWord.clear();
+      this.textareaMatchesByWord.clear();
 
       for (const node of textNodes) {
         if (!node.nodeValue) continue;
@@ -164,6 +239,11 @@ export class HighlightEngine {
               rangesByStyle.set(styleIdx, []);
             }
             rangesByStyle.get(styleIdx)!.push(range);
+
+            if (!this.highlightsByWord.has(lookup)) {
+              this.highlightsByWord.set(lookup, []);
+            }
+            this.highlightsByWord.get(lookup)!.push(range);
           }
         }
       }
@@ -174,6 +254,8 @@ export class HighlightEngine {
         this.highlights.set(highlightName, highlight);
         CSS.highlights.set(highlightName, highlight);
       }
+
+      this.highlightTextareas(pattern, styleMap, activeWords);
     } catch (e) {
       console.error('Regex error:', e);
     }
@@ -182,12 +264,154 @@ export class HighlightEngine {
     this.isHighlighting = false;
   }
 
+  private highlightTextareas(pattern: RegExp, styleMap: Map<string, number>, activeWords: ActiveWord[]): void {
+    if (!document.getElementById('gh-textarea-badge-style')) {
+      const style = document.createElement('style');
+      style.id = 'gh-textarea-badge-style';
+      style.textContent = `
+        :root {
+          --gh-badge-accent: #ec9c23;
+          --gh-badge-text: #000;
+          --gh-badge-border: #2d2d2d;
+          --gh-popup-bg: #161616;
+          --gh-popup-border: #ec9c23;
+          --gh-popup-radius: 10px;
+          --gh-popup-shadow: 0 4px 12px rgba(0,0,0,0.4);
+        }
+        .goose-highlighter-textarea-badge {
+          position: absolute !important;
+          left: 4px !important;
+          top: 4px !important;
+          background: var(--gh-badge-accent);
+          color: var(--gh-badge-text);
+          font-family: inherit;
+          font-weight: bold;
+          font-size: 14px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          box-shadow: 0 2px 6px rgba(0,0,0,0.15);
+          cursor: pointer;
+          z-index: 10000;
+          padding: 0 10px;
+          height: 22px;
+          min-width: 22px;
+          border-radius: 12px;
+          border: 2px solid var(--gh-badge-border);
+          transition: box-shadow 0.2s, background 0.2s;
+        }
+        .goose-highlighter-textarea-badge[data-round="true"] {
+          border-radius: 50%;
+          padding: 0;
+          min-width: 22px;
+        }
+        .goose-highlighter-textarea-badge:hover {
+          box-shadow: 0 4px 12px rgba(236,156,35,0.25);
+          background: #ffb84d;
+        }
+        .goose-highlighter-textarea-popup {
+          position: fixed;
+          left: 50%;
+          top: 50%;
+          transform: translate(-50%, -50%);
+          background: var(--gh-popup-bg);
+          border: 2px solid var(--gh-popup-border);
+          border-radius: var(--gh-popup-radius);
+          box-shadow: var(--gh-popup-shadow);
+          padding: 0 0 20px 0;
+          z-index: 10001;
+          max-width: 420px;
+          max-height: 70vh;
+          overflow: auto;
+          color: #e8e8e8;
+          font-family: 'Inter', 'Segoe UI', sans-serif;
+        }
+        .gh-popup-titlebar {
+          display: flex;
+          align-items: center;
+          justify-content: flex-end;
+          background: #191919;
+          border-top-left-radius: var(--gh-popup-radius);
+          border-top-right-radius: var(--gh-popup-radius);
+          height: 32px;
+          padding: 0 8px 0 0;
+          border-bottom: 1px solid #222;
+          position: relative;
+        }
+        .gh-popup-close {
+          background: none;
+          color: #e8e8e8;
+          border: none;
+          font-size: 22px;
+          font-weight: bold;
+          cursor: pointer;
+          padding: 0 6px;
+          border-radius: 4px;
+          transition: background 0.2s, color 0.2s;
+          z-index: 10002;
+          line-height: 1;
+        }
+        .gh-popup-close:hover {
+          background: #ec9c23;
+          color: #222;
+        }
+        .goose-highlighter-textarea-popup::-webkit-scrollbar {
+          width: 10px;
+          background: #222;
+          border-radius: 8px;
+        }
+        .goose-highlighter-textarea-popup::-webkit-scrollbar-thumb {
+          background: var(--gh-badge-accent);
+          border-radius: 8px;
+          border: 2px solid #222;
+        }
+        .goose-highlighter-textarea-popup::-webkit-scrollbar-thumb:hover {
+          background: #ffb84d;
+        }
+        .goose-highlighter-textarea-popup {
+          scrollbar-width: thin;
+          scrollbar-color: var(--gh-badge-accent) #222;
+        }
+        .gh-popup-pre {
+          background: #222;
+          border-radius: 7px;
+          padding: 10px 12px;
+          border: 1px solid #333;
+          color: #e8e8e8;
+          font-size: 15px;
+          font-family: inherit;
+          margin: 16px 16px 0 16px;
+          white-space: pre-wrap;
+          word-break: break-word;
+          overflow-wrap: break-word;
+        }
+        .gh-popup-pre mark {
+          background: none;
+          color: #ec9c23;
+          font-weight: bold;
+          border-radius: 0;
+          padding: 0;
+        }
+      `;
+      document.head.appendChild(style);
+    }
+    const textareas = document.querySelectorAll('textarea, input[type="text"], input[type="search"], input[type="email"], input[type="url"]');
+    this._textareaMatchInfo = [];
+    document.querySelectorAll('.goose-highlighter-textarea-badge').forEach(badge => badge.remove());
+    for (const element of Array.from(textareas)) {
+      const input = element as HTMLTextAreaElement | HTMLInputElement;
+      HighlightEngine.attachBadgeListener(input, pattern);
+    }
+  }
+
+
   private clearHighlightsInternal(): void {
     for (const name of this.highlights.keys()) {
       CSS.highlights.delete(name);
     }
     this.highlights.clear();
-
+    this.highlightsByWord.clear();
+    this.textareaMatchesByWord.clear();
     if (this.styleSheet && this.styleSheet.cssRules.length > 0) {
       while (this.styleSheet.cssRules.length > 0) {
         this.styleSheet.deleteRule(0);
@@ -195,6 +419,163 @@ export class HighlightEngine {
     }
   }
 
+  getPageHighlights(activeWords: ActiveWord[]): Array<{ word: string; count: number; background: string; foreground: string }> {
+    const seen = new Map<string, { word: string; count: number; background: string; foreground: string }>();
+
+    for (const activeWord of activeWords) {
+      const lookup = this.currentMatchCase ? activeWord.text : activeWord.text.toLowerCase();
+      const ranges = this.highlightsByWord.get(lookup);
+      const textareaMatches = this.textareaMatchesByWord.get(lookup);
+
+      const totalCount = (ranges?.length || 0) + (textareaMatches?.length || 0);
+
+      if (totalCount > 0 && !seen.has(lookup)) {
+        seen.set(lookup, {
+          word: activeWord.text,
+          count: totalCount,
+          background: activeWord.background,
+          foreground: activeWord.foreground
+        });
+      }
+    }
+
+    return Array.from(seen.values());
+  }
+
+  scrollToHighlight(word: string, index: number): void {
+    const lookup = this.currentMatchCase ? word : word.toLowerCase();
+    const ranges = this.highlightsByWord.get(lookup) || [];
+    const textareaMatches = this.textareaMatchesByWord.get(lookup) || [];
+
+    const totalMatches = ranges.length + textareaMatches.length;
+    if (totalMatches === 0) return;
+
+    const targetIndex = Math.min(index, totalMatches - 1);
+
+    try {
+      if (targetIndex >= ranges.length) {
+        const textareaIndex = targetIndex - ranges.length;
+        const textareaMatch = textareaMatches[textareaIndex];
+        this.scrollToTextareaMatch(textareaMatch.input, textareaMatch.position, word.length);
+        return;
+      }
+
+      const range = ranges[targetIndex];
+      if (!range) return;
+
+      // First, scroll any scrollable containers
+      const element = range.commonAncestorContainer.nodeType === Node.TEXT_NODE
+        ? range.commonAncestorContainer.parentElement
+        : range.commonAncestorContainer as Element;
+
+      if (element) {
+        this.scrollIntoViewInContainers(element);
+      }
+
+      // Then scroll the main window
+      const rect = range.getBoundingClientRect();
+      const absoluteTop = window.pageYOffset + rect.top;
+      const middle = absoluteTop - (window.innerHeight / 2) + (rect.height / 2);
+
+      window.scrollTo({
+        top: middle,
+        behavior: 'smooth'
+      });
+
+      const flashHighlight = new Highlight(range);
+      CSS.highlights.set('gh-flash', flashHighlight);
+
+      if (this.styleSheet) {
+        const flashRule = '::highlight(gh-flash) { background-color: rgba(255, 165, 0, 0.8); box-shadow: 0 0 10px 3px rgba(255, 165, 0, 0.8); }';
+        const ruleIndex = this.styleSheet.insertRule(flashRule, this.styleSheet.cssRules.length);
+
+        setTimeout(() => {
+          CSS.highlights.delete('gh-flash');
+          if (this.styleSheet && ruleIndex < this.styleSheet.cssRules.length) {
+            this.styleSheet.deleteRule(ruleIndex);
+          }
+        }, 600);
+      }
+    } catch (e) {
+      console.error('Error scrolling to highlight:', e);
+    }
+  }
+
+  private scrollToTextareaMatch(input: HTMLTextAreaElement | HTMLInputElement, position: number, wordLength: number): void {
+    input.scrollIntoView({ behavior: 'smooth', block: 'center' });
+
+    if (input.tagName === 'TEXTAREA') {
+      const textarea = input as HTMLTextAreaElement;
+      const text = textarea.value;
+      const beforeText = text.substring(0, position);
+      const lines = beforeText.split('\n');
+      const lineNumber = lines.length - 1;
+
+      const computedStyle = window.getComputedStyle(textarea);
+      const lineHeight = parseFloat(computedStyle.lineHeight) || parseFloat(computedStyle.fontSize) * 1.2;
+
+      const targetScrollTop = lineNumber * lineHeight - (textarea.clientHeight / 2);
+      textarea.scrollTop = Math.max(0, targetScrollTop);
+    }
+
+    input.focus();
+    input.setSelectionRange(position, position + wordLength);
+
+  }
+
+  private getTextPosition(overlay: HTMLElement, targetMark: HTMLElement): number {
+    let position = 0;
+    const walker = document.createTreeWalker(overlay, NodeFilter.SHOW_TEXT | NodeFilter.SHOW_ELEMENT);
+
+    let node: Node | null;
+    while ((node = walker.nextNode())) {
+      if (node === targetMark) {
+        return position;
+      }
+      if (node.nodeType === Node.TEXT_NODE) {
+        position += node.textContent?.length || 0;
+      }
+    }
+
+    return position;
+  }
+
+  private scrollIntoViewInContainers(element: Element): void {
+    let current: Element | null = element;
+
+    while (current && current !== document.body) {
+      const parent: HTMLElement | null = current.parentElement;
+      if (!parent) break;
+
+      const parentStyle = window.getComputedStyle(parent);
+      const isScrollable = (
+        (parentStyle.overflow === 'auto' || parentStyle.overflow === 'scroll' ||
+          parentStyle.overflowY === 'auto' || parentStyle.overflowY === 'scroll' ||
+          parentStyle.overflowX === 'auto' || parentStyle.overflowX === 'scroll') &&
+        (parent.scrollHeight > parent.clientHeight || parent.scrollWidth > parent.clientWidth)
+      );
+
+      if (isScrollable) {
+        const parentRect = parent.getBoundingClientRect();
+        const elementRect = element.getBoundingClientRect();
+
+        if (elementRect.top < parentRect.top) {
+          parent.scrollTop -= (parentRect.top - elementRect.top) + 20;
+        } else if (elementRect.bottom > parentRect.bottom) {
+          parent.scrollTop += (elementRect.bottom - parentRect.bottom) + 20;
+        }
+
+        if (elementRect.left < parentRect.left) {
+          parent.scrollLeft -= (parentRect.left - elementRect.left) + 20;
+        } else if (elementRect.right > parentRect.right) {
+          parent.scrollLeft += (elementRect.right - parentRect.right) + 20;
+        }
+      }
+
+      current = parent;
+    }
+  }
+
   stopObserving(): void {
     this.observer.disconnect();
   }

src/popup/PopupController.ts

@@ -1,4 +1,4 @@
-import { HighlightList, HighlightWord, ExportData } from '../types.js';
+import { HighlightList, HighlightWord, ExportData, HighlightInfo } from '../types.js';
 import { StorageService } from '../services/StorageService.js';
 import { MessageService } from '../services/MessageService.js';
 import { DOMUtils } from '../utils/DOMUtils.js';
@@ -13,15 +13,26 @@ export class PopupController {
   private matchWholeEnabled = false;
   private exceptionsList: string[] = [];
   private currentTabHost = '';
-  private sectionStates: Record<string, boolean> = {};
+  private activeTab = 'lists';
+  private pageHighlights: Array<{ word: string; count: number; background: string; foreground: string }> = [];
+  private highlightIndices = new Map<string, number>();
 
   async initialize(): Promise<void> {
     await this.loadData();
     await this.getCurrentTab();
-    this.loadSectionStates();
+    this.loadActiveTab();
-    this.initializeSectionStates();
+    this.translateTitles();
     this.setupEventListeners();
     this.render();
+    this.hideLoadingOverlay();
+  }
+
+  private hideLoadingOverlay(): void {
+    const overlay = document.querySelector('.loading-overlay');
+    if (overlay) {
+      overlay.classList.add('hidden');
+      setTimeout(() => overlay.remove(), 200);
+    }
   }
 
   private async loadData(): Promise<void> {
@@ -56,78 +67,66 @@ export class PopupController {
     }
   }
 
-  private loadSectionStates(): void {
+  private loadActiveTab(): void {
-    const saved = localStorage.getItem('goose-highlighter-section-states');
+    const saved = localStorage.getItem('goose-highlighter-active-tab');
     if (saved) {
-      try {
+      this.activeTab = saved;
-        this.sectionStates = JSON.parse(saved);
-      } catch {
-        this.sectionStates = {};
-      }
     }
   }
 
-  private saveSectionStates(): void {
+  private translateTitles(): void {
-    localStorage.setItem('goose-highlighter-section-states', JSON.stringify(this.sectionStates));
+    document.querySelectorAll('[data-i18n-title]').forEach(element => {
-  }
+      const key = element.getAttribute('data-i18n-title');
-
+      if (key) {
-  private initializeSectionStates(): void {
+        const translation = chrome.i18n.getMessage(key);
-    Object.keys(this.sectionStates).forEach(sectionName => {
+        if (translation) {
-      const section = document.querySelector(`[data-section="${sectionName}"]`);
+          element.setAttribute('title', translation);
-      if (section && this.sectionStates[sectionName]) {
+        }
-        section.classList.add('collapsed');
       }
     });
   }
 
+  private saveActiveTab(): void {
+    localStorage.setItem('goose-highlighter-active-tab', this.activeTab);
+  }
+
+  private switchTab(tabName: string): void {
+    this.activeTab = tabName;
+    this.saveActiveTab();
+
+    document.querySelectorAll('.tab-button').forEach(btn => {
+      btn.classList.toggle('active', btn.getAttribute('data-tab') === tabName);
+    });
+
+    document.querySelectorAll('.tab-content').forEach(content => {
+      content.classList.toggle('active', content.getAttribute('data-tab-content') === tabName);
+    });
+
+    if (tabName === 'page-highlights') {
+      this.loadPageHighlights();
+    }
+  }
+
   private setupEventListeners(): void {
-    this.setupSectionToggles();
+    this.setupTabs();
     this.setupListManagement();
     this.setupWordManagement();
     this.setupSettings();
+    this.setupPageHighlights();
     this.setupExceptions();
     this.setupImportExport();
     this.setupTheme();
   }
 
-  private setupSectionToggles(): void {
+  private setupTabs(): void {
-    document.querySelectorAll('.collapse-toggle').forEach(button => {
+    document.querySelectorAll('.tab-button').forEach(button => {
-      button.addEventListener('click', (e) => {
+      button.addEventListener('click', () => {
-        e.stopPropagation();
+        const tabName = (button as HTMLElement).getAttribute('data-tab');
-        const targetSection = (button as HTMLElement).getAttribute('data-target');
+        if (tabName) this.switchTab(tabName);
-        if (targetSection) this.toggleSection(targetSection);
       });
     });
 
-    document.querySelectorAll('.section-header').forEach(header => {
+    this.switchTab(this.activeTab);
-      header.addEventListener('click', (e) => {
-        if ((e.target as HTMLElement).tagName === 'BUTTON' ||
-          (e.target as HTMLElement).tagName === 'INPUT' ||
-          (e.target as HTMLElement).closest('button')) {
-          return;
-        }
-        const section = (header as HTMLElement).closest('.section');
-        const sectionName = section?.getAttribute('data-section');
-        if (sectionName) this.toggleSection(sectionName);
-      });
-    });
-  }
-
-  private toggleSection(sectionName: string): void {
-    const section = document.querySelector(`[data-section="${sectionName}"]`);
-    if (!section) return;
-
-    const isCollapsed = section.classList.contains('collapsed');
-
-    if (isCollapsed) {
-      section.classList.remove('collapsed');
-      this.sectionStates[sectionName] = false;
-    } else {
-      section.classList.add('collapsed');
-      this.sectionStates[sectionName] = true;
-    }
-
-    this.saveSectionStates();
   }
 
   private setupListManagement(): void {
@@ -199,24 +198,18 @@ export class PopupController {
   private setupWordListEvents(wordList: HTMLDivElement): void {
     wordList.addEventListener('change', (e) => {
       const target = e.target as HTMLInputElement;
-      if (target.type === 'checkbox') {
+      if (target.type === 'checkbox' && target.dataset.index != null) {
-        if (target.dataset.index != null) {
+        const index = +target.dataset.index;
-          const index = +target.dataset.index;
+        if (target.checked) {
-          if (target.checked) {
+          this.selectedCheckboxes.add(index);
-            this.selectedCheckboxes.add(index);
+        } else {
-          } else {
+          this.selectedCheckboxes.delete(index);
-            this.selectedCheckboxes.delete(index);
-          }
-          this.renderWords();
-        } else if (target.dataset.activeEdit != null) {
-          const index = +target.dataset.activeEdit;
-          this.lists[this.currentListIndex].words[index].active = target.checked;
-          this.save();
         }
+        this.renderWords();
       }
     });
 
-    wordList.addEventListener('input', (e) => {
+    wordList.addEventListener('change', (e) => {
       const target = e.target as HTMLInputElement;
       const index = +(target.dataset.bgEdit ?? target.dataset.fgEdit ?? -1);
       if (index === -1) return;
@@ -242,13 +235,14 @@ export class PopupController {
       }
     });
 
-    let scrollTimeout: number;
+    let scrolling = false;
     wordList.addEventListener('scroll', () => {
-      if (scrollTimeout) return;
+      if (scrolling) return;
-      scrollTimeout = window.setTimeout(() => {
+      scrolling = true;
-        requestAnimationFrame(() => this.renderWords());
+      requestAnimationFrame(() => {
-        scrollTimeout = 0;
+        this.renderWords();
-      }, 16);
+        scrolling = false;
+      });
     });
   }
 
@@ -301,24 +295,147 @@ export class PopupController {
     const matchCase = document.getElementById('matchCase') as HTMLInputElement;
     const matchWhole = document.getElementById('matchWhole') as HTMLInputElement;
 
-    globalToggle.addEventListener('change', () => {
+    globalToggle.addEventListener('change', async () => {
       this.globalHighlightEnabled = globalToggle.checked;
-      this.updateGlobalToggleState();
+      await StorageService.update('globalHighlightEnabled', this.globalHighlightEnabled);
+      MessageService.sendToAllTabs({
+        type: 'GLOBAL_TOGGLE_UPDATED',
+        enabled: this.globalHighlightEnabled
+      });
     });
 
-    matchCase.addEventListener('change', () => {
+    matchCase.addEventListener('change', async () => {
       this.matchCaseEnabled = matchCase.checked;
-      this.save();
+      await StorageService.update('matchCaseEnabled', this.matchCaseEnabled);
+      MessageService.sendToAllTabs({
+        type: 'MATCH_OPTIONS_UPDATED',
+        matchCase: this.matchCaseEnabled,
+        matchWhole: this.matchWholeEnabled
+      });
     });
 
-    matchWhole.addEventListener('change', () => {
+    matchWhole.addEventListener('change', async () => {
       this.matchWholeEnabled = matchWhole.checked;
-      this.save();
+      await StorageService.update('matchWholeEnabled', this.matchWholeEnabled);
+      MessageService.sendToAllTabs({
+        type: 'MATCH_OPTIONS_UPDATED',
+        matchCase: this.matchCaseEnabled,
+        matchWhole: this.matchWholeEnabled
+      });
     });
   }
 
+  private setupPageHighlights(): void {
+    document.getElementById('refreshHighlightsBtn')?.addEventListener('click', async () => {
+      await this.loadPageHighlights();
+    });
+
+    document.getElementById('pageHighlightsList')?.addEventListener('click', async (e) => {
+      const target = e.target as HTMLElement;
+      const item = target.closest('.page-highlight-item') as HTMLElement;
+      
+      if (!item) return;
+
+      const word = item.dataset.word;
+      if (!word) return;
+
+      const button = target.closest('button');
+      
+      if (button?.classList.contains('highlight-prev')) {
+        e.stopPropagation();
+        await this.navigateHighlight(word, -1);
+      } else if (button?.classList.contains('highlight-next')) {
+        e.stopPropagation();
+        await this.navigateHighlight(word, 1);
+      } else if (!button) {
+        const currentIndex = this.highlightIndices.get(word) || 0;
+        await this.jumpToHighlight(word, currentIndex);
+      }
+    });
+  }
+
+  private async loadPageHighlights(): Promise<void> {
+    try {
+      const response = await MessageService.sendToActiveTab({ type: 'GET_PAGE_HIGHLIGHTS' });
+      
+      if (response && response.highlights) {
+        this.pageHighlights = response.highlights;
+        this.highlightIndices.clear();
+        this.pageHighlights.forEach(h => this.highlightIndices.set(h.word, 0));
+        this.renderPageHighlights();
+      }
+    } catch (e) {
+      console.error('Error loading page highlights:', e);
+      this.pageHighlights = [];
+      this.renderPageHighlights();
+    }
+  }
+
+  private async jumpToHighlight(word: string, index: number): Promise<void> {
+    this.highlightIndices.set(word, index);
+    await MessageService.sendToActiveTab({
+      type: 'SCROLL_TO_HIGHLIGHT',
+      word,
+      index
+    });
+    this.renderPageHighlights();
+  }
+
+  private async navigateHighlight(word: string, direction: number): Promise<void> {
+    const highlight = this.pageHighlights.find(h => h.word === word);
+    if (!highlight) return;
+
+    const currentIndex = this.highlightIndices.get(word) || 0;
+    let newIndex = currentIndex + direction;
+
+    if (newIndex < 0) newIndex = highlight.count - 1;
+    if (newIndex >= highlight.count) newIndex = 0;
+
+    await this.jumpToHighlight(word, newIndex);
+  }
+
+  private renderPageHighlights(): void {
+    const container = document.getElementById('pageHighlightsList');
+    const countElement = document.getElementById('totalHighlightsCount');
+    
+    if (!container || !countElement) return;
+
+    const totalCount = this.pageHighlights.reduce((sum, h) => sum + h.count, 0);
+    countElement.textContent = totalCount.toString();
+
+    if (this.pageHighlights.length === 0) {
+      container.innerHTML = `<div class="page-highlights-empty">${chrome.i18n.getMessage('no_highlights_on_page') || 'No highlights on this page'}</div>`;
+      return;
+    }
+
+    container.innerHTML = this.pageHighlights.map(highlight => {
+      const currentIndex = this.highlightIndices.get(highlight.word) || 0;
+      return `
+        <div class="page-highlight-item" data-word="${DOMUtils.escapeHtml(highlight.word)}">
+          <div class="page-highlight-word">
+            <span class="page-highlight-preview" style="background-color: ${highlight.background}; color: ${highlight.foreground};">
+              ${DOMUtils.escapeHtml(highlight.word)}
+            </span>
+            ${highlight.count > 1 ? `<span class="page-highlight-position">${currentIndex + 1}/${highlight.count}</span>` : ''}
+          </div>
+          <span class="page-highlight-count">${highlight.count}</span>
+          ${highlight.count > 1 ? `
+            <div class="page-highlight-nav">
+              <button class="highlight-prev" title="${chrome.i18n.getMessage('previous') || 'Previous'}">
+                <i class="fa-solid fa-chevron-up"></i>
+              </button>
+              <button class="highlight-next" title="${chrome.i18n.getMessage('next') || 'Next'}">
+                <i class="fa-solid fa-chevron-down"></i>
+              </button>
+            </div>
+          ` : ''}
+        </div>
+      `;
+    }).join('');
+  }
+
   private setupExceptions(): void {
-    document.getElementById('toggleExceptionBtn')?.addEventListener('click', () => {
+    document.getElementById('toggleExceptionBtn')?.addEventListener('click', async () => {
       if (!this.currentTabHost) return;
 
       const isException = this.exceptionsList.includes(this.currentTabHost);
@@ -331,34 +448,29 @@ export class PopupController {
 
       this.updateExceptionButton();
       this.renderExceptions();
-      this.save();
+      await StorageService.update('exceptionsList', this.exceptionsList);
+      MessageService.sendToAllTabs({ type: 'EXCEPTIONS_LIST_UPDATED' });
     });
 
-    document.getElementById('manageExceptionsBtn')?.addEventListener('click', () => {
+    document.getElementById('clearExceptionsBtn')?.addEventListener('click', async () => {
-      const panel = document.getElementById('exceptionsPanel');
-      if (panel) {
-        const isVisible = panel.style.display !== 'none';
-        panel.style.display = isVisible ? 'none' : 'block';
-      }
-    });
-
-    document.getElementById('clearExceptionsBtn')?.addEventListener('click', () => {
       if (confirm(chrome.i18n.getMessage('confirm_clear_exceptions') || 'Clear all exceptions?')) {
         this.exceptionsList = [];
         this.updateExceptionButton();
         this.renderExceptions();
-        this.save();
+        await StorageService.update('exceptionsList', this.exceptionsList);
+        MessageService.sendToAllTabs({ type: 'EXCEPTIONS_LIST_UPDATED' });
       }
     });
 
-    document.getElementById('exceptionsList')?.addEventListener('click', (e) => {
+    document.getElementById('exceptionsList')?.addEventListener('click', async (e) => {
       const target = e.target as HTMLElement;
       if (target.classList.contains('exception-remove')) {
         const domain = target.dataset.domain!;
         this.exceptionsList = this.exceptionsList.filter(d => d !== domain);
         this.updateExceptionButton();
         this.renderExceptions();
-        this.save();
+        await StorageService.update('exceptionsList', this.exceptionsList);
+        MessageService.sendToAllTabs({ type: 'EXCEPTIONS_LIST_UPDATED' });
       }
     });
   }
@@ -467,29 +579,13 @@ export class PopupController {
       exceptionsList: this.exceptionsList
     });
 
-    this.render();
+    this.renderLists();
     MessageService.sendToAllTabs({ type: 'WORD_LIST_UPDATED' });
-    MessageService.sendToAllTabs({
-      type: 'GLOBAL_TOGGLE_UPDATED',
-      enabled: this.globalHighlightEnabled
-    });
-    MessageService.sendToAllTabs({
-      type: 'MATCH_OPTIONS_UPDATED',
-      matchCase: this.matchCaseEnabled,
-      matchWhole: this.matchWholeEnabled
-    });
-    MessageService.sendToAllTabs({ type: 'EXCEPTIONS_LIST_UPDATED' });
   }
 
 
 
-  private async updateGlobalToggleState(): Promise<void> {
+
-    await StorageService.update('globalHighlightEnabled', this.globalHighlightEnabled);
-    MessageService.sendToAllTabs({
-      type: 'GLOBAL_TOGGLE_UPDATED',
-      enabled: this.globalHighlightEnabled
-    });
-  }
 
   private render(): void {
     this.renderLists();
@@ -527,19 +623,19 @@ export class PopupController {
     }
 
     const itemHeight = 32;
-    const containerHeight = wordList.clientHeight;
+    const itemSpacing = 2;
+    const totalItemHeight = itemHeight + itemSpacing;
+    const containerHeight = wordList.clientHeight || 250;
     const scrollTop = wordList.scrollTop;
-    const startIndex = Math.floor(scrollTop / itemHeight);
+    const startIndex = Math.max(0, Math.floor(scrollTop / totalItemHeight) - 1);
-    const endIndex = Math.min(
+    const visibleCount = Math.ceil(containerHeight / totalItemHeight);
-      startIndex + Math.ceil(containerHeight / itemHeight) + 2,
+    const endIndex = Math.min(startIndex + visibleCount + 2, filteredWords.length);
-      filteredWords.length
-    );
 
     wordList.innerHTML = '';
 
     const spacer = document.createElement('div');
     spacer.style.position = 'relative';
-    spacer.style.height = `${filteredWords.length * itemHeight}px`;
+    spacer.style.height = `${filteredWords.length * totalItemHeight}px`;
     spacer.style.width = '100%';
 
     for (let i = startIndex; i < endIndex; i++) {
@@ -561,32 +657,22 @@ export class PopupController {
 
   private createWordItem(word: HighlightWord, realIndex: number, displayIndex: number, itemHeight: number): HTMLDivElement {
     const container = document.createElement('div');
+    container.className = 'word-item';
+    if (word.active === false) {
+      container.classList.add('disabled');
+    }
     container.style.cssText = `
-      height: ${itemHeight}px;
       position: absolute;
-      top: ${displayIndex * itemHeight}px;
+      top: ${displayIndex * (itemHeight + 2)}px;
-      width: calc(100% - 8px);
-      left: 4px;
-      right: 4px;
-      display: flex;
-      align-items: center;
-      gap: 6px;
-      padding: 0 4px;
-      box-sizing: border-box;
-      background: var(--highlight-tag);
-      border: 1px solid var(--highlight-tag-border);
     `;
 
     const list = this.lists[this.currentListIndex];
 
     container.innerHTML = `
-      <input type="checkbox" class="word-checkbox" data-index="${realIndex}" ${this.selectedCheckboxes.has(realIndex) ? 'checked' : ''}>
+      <input type="checkbox" class="word-checkbox" data-index="${realIndex}" ${this.selectedCheckboxes.has(realIndex) ? 'checked' : ''} title="${chrome.i18n.getMessage('select_title') || 'Select'}">
-      <input type="text" value="${DOMUtils.escapeHtml(word.wordStr)}" data-word-edit="${realIndex}" style="flex-grow: 1; min-width: 0; padding: 4px 8px; border-radius: 4px; border: 1px solid var(--input-border); background-color: var(--input-bg); color: var(--text-color);">
+      <input type="text" value="${DOMUtils.escapeHtml(word.wordStr)}" data-word-edit="${realIndex}" placeholder="${chrome.i18n.getMessage('word_placeholder') || 'Word or phrase'}">
-      <input type="color" value="${word.background || list.background}" data-bg-edit="${realIndex}" style="width: 24px; height: 24px; flex-shrink: 0;">
+      <input type="color" value="${word.background || list.background}" data-bg-edit="${realIndex}" title="${chrome.i18n.getMessage('background_color_title') || 'Background color'}">
-      <input type="color" value="${word.foreground || list.foreground}" data-fg-edit="${realIndex}" style="width: 24px; height: 24px; flex-shrink: 0;">
+      <input type="color" value="${word.foreground || list.foreground}" data-fg-edit="${realIndex}" title="${chrome.i18n.getMessage('text_color_title') || 'Text color'}">
-      <label class="word-active" style="display: flex; align-items: center; gap: 4px; flex-shrink: 0;">
-        <input type="checkbox" ${word.active !== false ? 'checked' : ''} data-active-edit="${realIndex}" class="switch">
-      </label>
     `;
 
     return container;
@@ -604,12 +690,12 @@ export class PopupController {
       btnText.textContent = chrome.i18n.getMessage('remove_exception') || 'Remove from Exceptions';
       toggleBtn.className = 'danger';
       const icon = toggleBtn.querySelector('i');
-      if (icon) icon.className = 'fa-solid fa-check';
+      if (icon) icon.className = 'fa-solid fa-trash';
     } else {
       btnText.textContent = chrome.i18n.getMessage('add_exception') || 'Add to Exceptions';
       toggleBtn.className = '';
       const icon = toggleBtn.querySelector('i');
-      if (icon) icon.className = 'fa-solid fa-ban';
+      if (icon) icon.className = 'fa-solid fa-plus';
     }
   }
 
@@ -618,7 +704,7 @@ export class PopupController {
     if (!container) return;
 
     if (this.exceptionsList.length === 0) {
-      container.innerHTML = '<div class="exception-item">No exceptions</div>';
+      container.innerHTML = `<div class="exception-item">${chrome.i18n.getMessage('no_exceptions') || 'No exceptions'}</div>`;
       return;
     }
 

src/popup/popup.ts

@@ -6,7 +6,7 @@ function localizePage(): void {
     const message = (element as HTMLElement).dataset.i18n!;
     const localizedText = chrome.i18n.getMessage(message);
     if (localizedText) {
-      if (element.tagName === 'INPUT' && (element as HTMLInputElement).hasAttribute('placeholder')) {
+      if ((element.tagName === 'INPUT' || element.tagName === 'TEXTAREA') && (element as HTMLInputElement).hasAttribute('placeholder')) {
         (element as HTMLInputElement).placeholder = localizedText;
       } else {
         element.textContent = localizedText;

src/services/MessageService.ts

@@ -19,7 +19,15 @@ export class MessageService {
     });
   }
 
-  static onMessage(callback: (message: MessageData) => void): void {
+  static onMessage(callback: (message: MessageData, sender: any, sendResponse: (response?: any) => void) => void | boolean): void {
     chrome.runtime.onMessage.addListener(callback);
   }
+
+  static async sendToActiveTab(message: MessageData): Promise<any> {
+    const [tab] = await chrome.tabs.query({ active: true, currentWindow: true });
+    if (tab.id) {
+      return chrome.tabs.sendMessage(tab.id, message);
+    }
+    return null;
+  }
 }

src/types.ts

@@ -28,11 +28,21 @@ export interface ActiveWord {
   foreground: string;
 }
 
+export interface HighlightInfo {
+  word: string;
+  count: number;
+  background: string;
+  foreground: string;
+}
+
 export interface MessageData {
-  type: 'WORD_LIST_UPDATED' | 'GLOBAL_TOGGLE_UPDATED' | 'MATCH_OPTIONS_UPDATED' | 'EXCEPTIONS_LIST_UPDATED';
+  type: 'WORD_LIST_UPDATED' | 'GLOBAL_TOGGLE_UPDATED' | 'MATCH_OPTIONS_UPDATED' | 'EXCEPTIONS_LIST_UPDATED' | 'GET_PAGE_HIGHLIGHTS' | 'PAGE_HIGHLIGHTS_RESPONSE' | 'SCROLL_TO_HIGHLIGHT';
   enabled?: boolean;
   matchCase?: boolean;
   matchWhole?: boolean;
+  highlights?: HighlightInfo[];
+  word?: string;
+  index?: number;
 }
 
 export interface ExportData {
@@ -50,6 +60,6 @@ export const DEFAULT_STORAGE: StorageData = {
 
 export const CONSTANTS = {
   WORD_ITEM_HEIGHT: 32,
-  DEBOUNCE_DELAY: 300,
+  DEBOUNCE_DELAY: 150,
   SCROLL_THROTTLE: 16
 } as const;