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))
chore: refactor badge handling and highlight rendering for textareas
2026-04-09 04:29:09 +03:00 · 2025-11-22 05:41:02 +03:00 · 2025-11-22 05:29:06 +03:00 · 2025-11-22 05:19:46 +03:00 · 2025-11-22 05:16:40 +03:00 · 2025-11-20 22:47:21 +03:00
42 changed files with 4276 additions and 2711 deletions
--- a/.github/workflows/publish-extension.yml
+++ b/.github/workflows/publish-extension.yml
@@ -2,7 +2,8 @@ name: Publish Chrome Extension

 on:
  push:
-    branches: [ main ]
+    tags:
+      - 'v*'

 jobs:
  publish:
@@ -32,9 +33,12 @@ jobs:
        id: version
        run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT

+      - name: Update manifest version
+        run: node scripts/update-manifest-version.js ${{ steps.version.outputs.VERSION }}
+
      - name: Create zip package
        run: |
-          zip -r goose-highlighter.zip . -x '*.git*' 'node_modules/*' 'src/*' 'versioning.md' '.releaserc.json' 'package.json' 'package-lock.json' 'README.md' 'tsconfig.json' 'eslint.config.mjs'
+          zip -r goose-highlighter.zip . -x '*.git*' 'node_modules/*' 'src/*' 'scripts/*' 'versioning.md' '.releaserc.json' 'package.json' 'package-lock.json' 'README.md' 'tsconfig.json' 'eslint.config.mjs'

      - name: Install webstore upload CLI
        run: npm install -g chrome-webstore-upload-cli
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -39,7 +39,7 @@ jobs:
      - name: Create extension zip
        run: |
          zip -r goose-highlighter-${{ steps.version.outputs.VERSION }}.zip . \
-            -x '*.git*' 'node_modules/*' 'src/*' 'versioning.md' '.releaserc.json' \
+            -x '*.git*' 'node_modules/*' 'src/*' 'scripts/*' 'versioning.md' '.releaserc.json' \
               'package.json' 'package-lock.json' 'README.md' 'tsconfig.json' \
               'eslint.config.mjs' '.github/*' 'CHANGELOG.md' 'PRIVACY.MD'

@@ -57,7 +57,7 @@ jobs:
          
          # Copy all files except excluded ones to temp directory
          rsync -av --exclude='.git*' --exclude='node_modules' --exclude='src' \
-                --exclude='versioning.md' --exclude='.releaserc.json' \
+                --exclude='scripts' --exclude='versioning.md' --exclude='.releaserc.json' \
                --exclude='package.json' --exclude='package-lock.json' \
                --exclude='README.md' --exclude='tsconfig.json' \
                --exclude='eslint.config.mjs' --exclude='.github' \
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
 node_modules

 dist
+
+# Auto-generated files
+src/content-standalone.ts
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -0,0 +1,2 @@
+{
+}
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,91 @@
+## [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)
+
+
+### Bug Fixes
+
+* use CSS Custom Highlight API to avoid dom modifications (fixes [#1](https://github.com/obsqrbtz/goose-highlighter/issues/1)) ([3f2bb60](https://github.com/obsqrbtz/goose-highlighter/commit/3f2bb6080ba3a9ac0599ad6594f0d877c12bb62f))
+
+## [1.9.2](https://github.com/obsqrbtz/goose-highlighter/compare/v1.9.1...v1.9.2) (2025-11-14)
+
+
+### Bug Fixes
+
+* **highlight:** prevent creating extra <span>'s ([#1](https://github.com/obsqrbtz/goose-highlighter/issues/1)) ([affddd3](https://github.com/obsqrbtz/goose-highlighter/commit/affddd3dbc7de30100ca134ec65f4dc090275ca5))
+
+## [1.9.1](https://github.com/obsqrbtz/goose-highlighter/compare/v1.9.0...v1.9.1) (2025-11-05)
+
+
+### Bug Fixes
+
+* remove halowen styling ([172aa75](https://github.com/obsqrbtz/goose-highlighter/commit/172aa7583b325761af43c780db4ac61dc4bda99b))
+
+# [1.9.0](https://github.com/obsqrbtz/goose-highlighter/compare/v1.8.5...v1.9.0) (2025-10-31)
+
+
+### Features
+
+* haloween styling ([5ef380e](https://github.com/obsqrbtz/goose-highlighter/commit/5ef380e54447f45f7360dd4b7b84456aae55bfee))
+
+## [1.8.5](https://github.com/obsqrbtz/goose-highlighter/compare/v1.8.4...v1.8.5) (2025-10-29)
+
+
+### Bug Fixes
+
+* highlight colors when multiple list have different configurations ([67577c8](https://github.com/obsqrbtz/goose-highlighter/commit/67577c89cffca1ab6d40a8913e51b7c3c6f91c85))
+
+## [1.8.4](https://github.com/obsqrbtz/goose-highlighter/compare/v1.8.3...v1.8.4) (2025-10-28)
+
+
+### Bug Fixes
+
+* do not re-highlight when already processing highlights ([8be53f3](https://github.com/obsqrbtz/goose-highlighter/commit/8be53f32402c2f0f228ca003ef3805c5ff0b6e88))
+
+## [1.8.3](https://github.com/obsqrbtz/goose-highlighter/compare/v1.8.2...v1.8.3) (2025-10-08)
+
+
+### Bug Fixes
+
+* stop observing when highlightting is disabled ([d7c8dbb](https://github.com/obsqrbtz/goose-highlighter/commit/d7c8dbb5f0011afe83739841218aa737794074e3))
+
+## [1.8.2](https://github.com/obsqrbtz/goose-highlighter/compare/v1.8.1...v1.8.2) (2025-10-08)
+
+
+### Bug Fixes
+
+* do not call save() on all keypresses in textboxes ([687d7c9](https://github.com/obsqrbtz/goose-highlighter/commit/687d7c9e62f0f282ce73e86cdc62aaf275c9dafe))
+* do not save anything in list settings section until presses the apply button ([0734bf3](https://github.com/obsqrbtz/goose-highlighter/commit/0734bf330824c60f0d5c4784e99660b9e652efd6))
+
 # [1.8.0](https://github.com/obsqrbtz/goose-highlighter/compare/v1.7.2...v1.8.0) (2025-10-07)


--- a/21
+++ b/21
@@ -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.
--- a/README.md
+++ b/README.md
@@ -1,16 +1,59 @@
-# Goose Highlighter
+# <img src="img/logo.png" alt="Goose Highlighter Logo" width="32" style="vertical-align: middle;"> Goose Highlighter

-Goose Highlighter is a browser extension that allows you to highlight custom words and phrases on any webpage. Organize your highlights into lists, customize their appearance, and toggle highlighting or theme modes with ease.
+Goose Highlighter is a browser extension that allows you to highlight words on any webpage.

 ## Features

 - **Multiple Highlight Lists:** Organize words into separate lists.
- **Custom Colors:** Set background and foreground for each list and individual word.
+- **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.
- **Site Exceptions:** Add websites to an exceptions list to disable highlighting on specific sites.
+- **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.

 ## Install

- go to [Chrome Web Store page](https://chromewebstore.google.com/detail/goose-highlighter/kdoehicejfnccbmecpkfjlbljpfogoep) and choose `Add to chrome`.
+### From Chrome Web Store (Recommended)
+- Go to [Chrome Web Store page](https://chromewebstore.google.com/detail/goose-highlighter/kdoehicejfnccbmecpkfjlbljpfogoep) and choose `Add to chrome`.
+
+### Manual Installation
+
+#### Option 1: Install from CRX File (Releases)
+1. **Download:** Get the latest `.crx` file from the [Releases section](https://github.com/obsqrbtz/goose-highlighter/releases)
+2. **Install in Chrome:**
+   - Open Chrome and go to `chrome://extensions/`
+   - Enable "Developer mode" (toggle in top-right corner)
+   - Drag and drop the `.crx` file onto the extensions page
+   - Click "Add extension" when prompted
+
+#### Option 2: Install from ZIP File (Releases)
+1. **Download:** Get the latest `.zip` file from the [Releases section](https://github.com/obsqrbtz/goose-highlighter/releases)
+2. **Extract:** Unzip the downloaded file to a folder of your choice
+3. **Load in Chrome:**
+   - Open Chrome and go to `chrome://extensions/`
+   - Enable "Developer mode" (toggle in top-right corner)
+   - Click "Load unpacked" button
+   - Select the extracted folder containing the extension files
+
+#### Option 3: Build from Source
+1. **Prerequisites:** Node.js 20+ and npm
+2. **Clone the repository:**
+   ```bash
+   git clone https://github.com/obsqrbtz/goose-highlighter.git
+   cd goose-highlighter
+   ```
+3. **Install dependencies:**
+   ```bash
+   npm install
+   ```
+4. **Build the extension:**
+   ```bash
+   npm run build
+   ```
+5. **Load in Chrome:**
+   - Open Chrome and go to `chrome://extensions/`
+   - Enable "Developer mode" (toggle in top-right corner)
+   - Click "Load unpacked" button
+   - Select the entire `goose-highlighter` folder (not the `dist` folder)
+
--- a/_locales/de/messages.json
+++ b/_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"
  }
 }
--- a/_locales/en/messages.json
+++ b/_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"
  }
 }
--- a/_locales/es/messages.json
+++ b/_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"
  }
 }
--- a/_locales/fr/messages.json
+++ b/_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"
    }
 }
--- a/_locales/hi/messages.json
+++ b/_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": "अगला"
    }
 }
--- a/_locales/it/messages.json
+++ b/_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"
    }
 }
--- a/_locales/ja/messages.json
+++ b/_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": "次へ"
    }
 }
--- a/_locales/ko/messages.json
+++ b/_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": "다음"
    }
 }
--- a/_locales/nl/messages.json
+++ b/_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"
  }
 }
--- a/_locales/pl/messages.json
+++ b/_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"
  }
 }
--- a/_locales/pt_BR/messages.json
+++ b/_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"
  }
 }
--- a/_locales/ru/messages.json
+++ b/_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": "Следующее"
  }
 }
--- a/_locales/tr/messages.json
+++ b/_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"
  }
 }
--- a/_locales/zh_CN/messages.json
+++ b/_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": "下一个"
  }
 }
--- a/img/logo-outlined.png
+++ b/img/logo-outlined.png
--- a/img/logo.png
+++ b/img/logo.png
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
  "manifest_version": 3,
  "name": "__MSG_extension_name__",
  "description": "__MSG_extension_description__",
-  "version": "1.8.0",
+  "version": "1.10.2",
  "default_locale": "en",
  "permissions": [
    "scripting",
@@ -17,7 +17,8 @@
    "default_icon": "icons/icon128.png"
  },
  "background": {
-    "service_worker": "dist/background.js"
+    "service_worker": "dist/background.js",
+    "type": "module"
  },
  "icons": {
    "48": "icons/icon48.png",
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -8,11 +8,11 @@
    "@types/chrome": "^0.0.270",
    "eslint": "^9.30.0",
    "globals": "^16.2.0",
-    "semantic-release": "^24.2.5",
+    "semantic-release": "^24.2.9",
    "typescript": "^5.6.0"
  },
  "scripts": {
-    "build": "tsc",
+    "build": "node scripts/build-content-standalone.js && tsc",
    "watch": "tsc --watch",
    "clean": "rimraf dist",
    "rebuild": "npm run clean && npm run build",
--- a/popup/popup.css
+++ b/popup/popup.css
--- a/popup/popup.html
+++ b/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="section-header">
-        <h2><i class="fa-solid fa-ban"></i> <span data-i18n="site_exceptions">Site Exceptions</span></h2>
-        <button class="collapse-toggle" data-target="exceptions">
-          <i class="fa-solid fa-chevron-up"></i>
-        </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 class="tabs">
+      <button class="tab-button active" data-tab="lists"><i class="fa-solid fa-list"></i> <span data-i18n="tab_lists">Lists</span></button>
+      <button class="tab-button" data-tab="words"><i class="fa-solid fa-tags"></i> <span data-i18n="tab_words">Words</span></button>
+      <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>
+      <button class="tab-button" data-tab="exceptions"><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>

+    <div class="tab-content active" data-tab-content="lists">
      <div class="section" data-section="lists">
-      <div class="section-header">
-        <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-header">
-        <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">
+        <h3><i class="fa-solid fa-gear"></i> <span data-i18n="list_settings">List Settings</span></h3>
        <label><span data-i18n="list_name">List Name:</span> <input type="text" id="listName" /></label>
        <div class="color-row">
          <div class="color-label">
@@ -90,31 +68,19 @@
          <span data-i18n="enable_highlight">Enable Highlighting</span>
          <input type="checkbox" class="switch" id="listActive" />
        </label>
+        <button id="applyListSettingsBtn"><i class="fa-solid fa-check"></i> <span data-i18n="apply">Apply</span></button>
      </div>
    </div>

+    <div class="tab-content" data-tab-content="words">
      <div class="section" data-section="addwords">
-      <div class="section-header">
-        <h2><i class="fa-solid fa-pen"></i> <span data-i18n="add_words">Add Words</span></h2>
-        <button class="collapse-toggle" data-target="addwords">
-          <i class="fa-solid fa-chevron-up"></i>
-        </button>
-      </div>
-      <div class="section-content" id="addwords-content">
+        <h3><i class="fa-solid fa-pen"></i> <span data-i18n="add_words">Add Words</span></h3>
        <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-header">
-        <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">
+        <h3><i class="fa-solid fa-tags"></i> <span data-i18n="word_list">Word List</span> (<span id="wordCount">0</span>)</h3>
        <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>
@@ -127,14 +93,32 @@
      </div>
    </div>

-    <div class="section" data-section="options">
-      <div class="section-header">
-        <h2><i class="fa-solid fa-sliders"></i> <span data-i18n="options">Options</span></h2>
-        <button class="collapse-toggle" data-target="options">
-          <i class="fa-solid fa-chevron-up"></i>
-        </button>
+    <div class="tab-content" data-tab-content="page-highlights">
+      <div class="section" data-section="page-highlights">
+        <h3><i class="fa-solid fa-location-dot"></i> <span data-i18n="highlights_on_page">Highlights on This Page</span></h3>
+        <div class="page-highlights-info">
+          <span data-i18n="total_highlights">Total:</span> <strong id="totalHighlightsCount">0</strong>
        </div>
-      <div class="section-content" id="options-content">
+        <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>
+
+    <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>
@@ -148,7 +132,17 @@
    </div>
  </div>

-  <script src="../dist/popup/popup.js"></script>
+  <footer class="footer">
+    <div class="footer-content">
+      <span class="version">v<span id="version-number">...</span></span>
+      <a href="https://github.com/obsqrbtz/goose-highlighter" target="_blank" class="github-link">
+        <i class="fa-brands fa-github"></i>
+        <span>GitHub</span>
+      </a>
+    </div>
+  </footer>
+
+  <script type="module" src="../dist/popup/popup.js"></script>
 </body>

 </html>
--- a/scripts/build-content-standalone.js
+++ b/scripts/build-content-standalone.js
@@ -0,0 +1,39 @@
+const fs = require('fs');
+
+const typesContent = fs.readFileSync('src/types.ts', 'utf8');
+const domUtilsContent = fs.readFileSync('src/utils/DOMUtils.ts', 'utf8');
+const storageServiceContent = fs.readFileSync('src/services/StorageService.ts', 'utf8');
+const messageServiceContent = fs.readFileSync('src/services/MessageService.ts', 'utf8');
+const highlightEngineContent = fs.readFileSync('src/content/HighlightEngine.ts', 'utf8');
+const contentScriptContent = fs.readFileSync('src/content/ContentScript.ts', 'utf8');
+const mainContent = fs.readFileSync('src/main.ts', 'utf8');
+
+function extractDefinitions(content, filename) {
+  // Remove import statements
+  let cleaned = content.replace(/^import\s+.*?;?\s*$/gm, '');
+  
+  // Remove export keywords but keep the definitions
+  cleaned = cleaned.replace(/^export\s+/gm, '');
+  
+  // Add a comment header
+  cleaned = `// === ${filename} ===\n${cleaned}\n`;
+  
+  return cleaned;
+}
+
+// Extract and combine all definitions
+const combinedContent = `// Auto-generated standalone content script
+// Do not edit this file directly - edit the source files and rebuild
+
+${extractDefinitions(typesContent, 'types.ts')}
+${extractDefinitions(domUtilsContent, 'utils/DOMUtils.ts')}
+${extractDefinitions(storageServiceContent, 'services/StorageService.ts')}
+${extractDefinitions(messageServiceContent, 'services/MessageService.ts')}
+${extractDefinitions(highlightEngineContent, 'content/HighlightEngine.ts')}
+${extractDefinitions(contentScriptContent, 'content/ContentScript.ts')}
+${extractDefinitions(mainContent, 'main.ts')}
+`;
+
+fs.writeFileSync('src/content-standalone.ts', combinedContent);
+
+console.log('Generated standalone content script');
--- a/scripts/update-manifest-version.js
+++ b/scripts/update-manifest-version.js
@@ -2,7 +2,7 @@ const fs = require('fs');

 const version = process.argv[2];
 if (!version) {
-    console.log('ℹ️ No version passed, skipping manifest update');
+    console.log('No version passed, skipping manifest update');
    process.exit(0);
 }

@@ -10,4 +10,4 @@ const manifest = JSON.parse(fs.readFileSync('manifest.json', 'utf-8'));
 manifest.version = version;
 fs.writeFileSync('manifest.json', JSON.stringify(manifest, null, 2));

-console.log(`✅ Updated manifest.json to version ${version}`);
+console.log(`Updated manifest.json to version ${version}`);
--- a/src/background.ts
+++ b/src/background.ts
@@ -1,20 +1,36 @@
-// Handle tab updates to inject content script
+import { StorageService } from './services/StorageService.js';
+
+class BackgroundService {
+    constructor() {
+        this.initialize();
+    }
+
+    private initialize(): void {
+        this.setupTabUpdateListener();
+        this.setupInstallListener();
+    }
+
+    private setupTabUpdateListener(): void {
        chrome.tabs.onUpdated.addListener((tabId: number, changeInfo: chrome.tabs.TabChangeInfo, tab: chrome.tabs.Tab): void => {
            if (changeInfo.status === 'complete' && tab.url && /^https?:/.test(tab.url)) {
                chrome.scripting.executeScript({
                    target: { tabId },
-            files: ['dist/main.js']
+                    files: ['dist/content-standalone.js']
                }).catch((err: unknown) => {
                    console.warn('Injection failed:', err);
                });
            }
        });
+    }

-// Initialize storage on extension install
-chrome.runtime.onInstalled.addListener((): void => {
-    chrome.storage.local.get(['exceptionsList'], (result: any) => {
-        if (!result.exceptionsList) {
-            chrome.storage.local.set({ exceptionsList: [] });
+    private setupInstallListener(): void {
+        chrome.runtime.onInstalled.addListener(async (): Promise<void> => {
+            const data = await StorageService.get(['exceptionsList']);
+            if (!data.exceptionsList) {
+                await StorageService.update('exceptionsList', []);
            }
        });
-});
+    }
+}
+
+new BackgroundService();
--- a/src/content/ContentScript.ts
+++ b/src/content/ContentScript.ts
@@ -0,0 +1,139 @@
+import { HighlightList, MessageData } from '../types.js';
+import { StorageService } from '../services/StorageService.js';
+import { MessageService } from '../services/MessageService.js';
+import { HighlightEngine } from './HighlightEngine.js';
+
+export class ContentScript {
+  private lists: HighlightList[] = [];
+  private isGlobalHighlightEnabled = true;
+  private exceptionsList: string[] = [];
+  private isCurrentSiteException = false;
+  private matchCase = false;
+  private matchWhole = false;
+  private highlightEngine: HighlightEngine;
+  private isProcessing = false;
+
+  constructor() {
+    this.highlightEngine = new HighlightEngine(() => this.processHighlights());
+    this.initialize();
+  }
+
+  private async initialize(): Promise<void> {
+    await this.loadSettings();
+    this.setupMessageListener();
+    this.processHighlights();
+  }
+
+  private async loadSettings(): Promise<void> {
+    const data = await StorageService.get([
+      'lists', 
+      'globalHighlightEnabled', 
+      'matchCaseEnabled', 
+      'matchWholeEnabled', 
+      'exceptionsList'
+    ]);
+
+    this.lists = data.lists || [];
+    this.isGlobalHighlightEnabled = data.globalHighlightEnabled ?? true;
+    this.matchCase = data.matchCaseEnabled ?? false;
+    this.matchWhole = data.matchWholeEnabled ?? false;
+    this.exceptionsList = data.exceptionsList || [];
+    this.isCurrentSiteException = this.checkCurrentSiteException();
+  }
+
+  private checkCurrentSiteException(): boolean {
+    const currentHostname = window.location.hostname;
+    return this.exceptionsList.includes(currentHostname);
+  }
+
+  private setupMessageListener(): void {
+    MessageService.onMessage((message: MessageData, sender: any, sendResponse: (response?: any) => void) => {
+      switch (message.type) {
+        case 'WORD_LIST_UPDATED':
+          this.handleWordListUpdate();
+          return false;
+        case 'GLOBAL_TOGGLE_UPDATED':
+          this.handleGlobalToggleUpdate(message.enabled!);
+          return false;
+        case 'MATCH_OPTIONS_UPDATED':
+          this.handleMatchOptionsUpdate(message.matchCase!, message.matchWhole!);
+          return false;
+        case 'EXCEPTIONS_LIST_UPDATED':
+          this.handleExceptionsUpdate();
+          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 async handleWordListUpdate(): Promise<void> {
+    const data = await StorageService.get(['lists']);
+    this.lists = data.lists || [];
+    this.processHighlights();
+  }
+
+  private handleGlobalToggleUpdate(enabled: boolean): void {
+    this.isGlobalHighlightEnabled = enabled;
+    this.processHighlights();
+  }
+
+  private handleMatchOptionsUpdate(matchCase: boolean, matchWhole: boolean): void {
+    this.matchCase = matchCase;
+    this.matchWhole = matchWhole;
+    this.processHighlights();
+  }
+
+  private async handleExceptionsUpdate(): Promise<void> {
+    const data = await StorageService.get(['exceptionsList']);
+    this.exceptionsList = data.exceptionsList || [];
+    this.isCurrentSiteException = this.checkCurrentSiteException();
+    this.processHighlights();
+  }
+
+  private processHighlights(): void {
+    if (this.isProcessing) return;
+    this.isProcessing = true;
+
+    try {
+      if (!this.isGlobalHighlightEnabled || this.isCurrentSiteException) {
+        this.highlightEngine.clearHighlights();
+        this.highlightEngine.stopObserving();
+        return;
+      }
+
+      this.highlightEngine.highlight(this.lists, this.matchCase, this.matchWhole);
+    } finally {
+      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);
+  }
+}
--- a/src/content/HighlightEngine.ts
+++ b/src/content/HighlightEngine.ts
@@ -0,0 +1,595 @@
+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)];
+        return allNodes.some(node => {
+          if (node.nodeType === Node.TEXT_NODE) return true;
+          if (node instanceof Element) return true;
+          return false;
+        });
+      });
+      if (hasContentChanges) {
+        this.onUpdate();
+      }
+    }, CONSTANTS.DEBOUNCE_DELAY));
+  }
+
+  private initializeStyleSheet(): void {
+    if (!this.styleSheet) {
+      const style = document.createElement('style');
+      style.id = 'goose-highlighter-styles';
+      document.head.appendChild(style);
+      this.styleSheet = style.sheet!;
+    }
+  }
+
+  private updateHighlightStyles(activeWords: ActiveWord[]): void {
+    this.initializeStyleSheet();
+
+    while (this.styleSheet!.cssRules.length > 0) {
+      this.styleSheet!.deleteRule(0);
+    }
+
+    const uniqueStyles = new Map<string, number>();
+    let styleIndex = 0;
+
+    for (const word of activeWords) {
+      const styleKey = `${word.background}-${word.foreground}`;
+      if (!uniqueStyles.has(styleKey)) {
+        uniqueStyles.set(styleKey, styleIndex);
+        const rule = `::highlight(gh-${styleIndex}) { background-color: ${word.background}; color: ${word.foreground}; }`;
+        this.styleSheet!.insertRule(rule, this.styleSheet!.cssRules.length);
+        styleIndex++;
+      }
+    }
+  }
+
+  clearHighlights(): void {
+    this.observer.disconnect();
+    this.clearHighlightsInternal();
+  }
+
+
+  private getTextNodes(): Text[] {
+    const textNodes: Text[] = [];
+    const walker = document.createTreeWalker(
+      document.body,
+      NodeFilter.SHOW_TEXT,
+      {
+        acceptNode: (node: Text) => {
+          if (node.parentNode && ['SCRIPT', 'STYLE', 'NOSCRIPT', 'IFRAME', 'TEXTAREA', 'INPUT'].includes(node.parentNode.nodeName)) {
+            return NodeFilter.FILTER_REJECT;
+          }
+          if (!node.nodeValue?.trim()) {
+            return NodeFilter.FILTER_SKIP;
+          }
+          return NodeFilter.FILTER_ACCEPT;
+        }
+      }
+    );
+
+    while (walker.nextNode()) {
+      textNodes.push(walker.currentNode as Text);
+    }
+    return textNodes;
+  }
+
+  private extractActiveWords(lists: HighlightList[]): ActiveWord[] {
+    const activeWords: ActiveWord[] = [];
+    for (const list of 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
+        });
+      }
+    }
+    return activeWords;
+  }
+
+  highlight(lists: HighlightList[], matchCase: boolean, matchWhole: boolean): void {
+    if (this.isHighlighting) return;
+    this.isHighlighting = true;
+
+    this.currentMatchCase = matchCase;
+
+    this.observer.disconnect();
+    this.clearHighlightsInternal();
+
+    const activeWords = this.extractActiveWords(lists);
+    if (activeWords.length === 0) {
+      this.startObserving();
+      this.isHighlighting = false;
+      return;
+    }
+
+    this.updateHighlightStyles(activeWords);
+
+    const styleMap = new Map<string, number>();
+    const uniqueStyles = new Map<string, number>();
+    let styleIndex = 0;
+
+    for (const word of activeWords) {
+      const styleKey = `${word.background}-${word.foreground}`;
+      if (!uniqueStyles.has(styleKey)) {
+        uniqueStyles.set(styleKey, styleIndex++);
+      }
+      const lookup = matchCase ? word.text : word.text.toLowerCase();
+      styleMap.set(lookup, uniqueStyles.get(styleKey)!);
+    }
+
+    const flags = matchCase ? 'gu' : 'giu';
+    let wordsPattern = Array.from(styleMap.keys()).map(DOMUtils.escapeRegex).join('|');
+
+    if (matchWhole) {
+      wordsPattern = `(?:(?<!\\p{L})|^)(${wordsPattern})(?:(?!\\p{L})|$)`;
+    }
+
+    try {
+      const pattern = new RegExp(`(${wordsPattern})`, flags);
+      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;
+
+        const text = node.nodeValue;
+        pattern.lastIndex = 0;
+        let match;
+
+        while ((match = pattern.exec(text)) !== null) {
+          const lookup = matchCase ? match[0] : match[0].toLowerCase();
+          const styleIdx = styleMap.get(lookup);
+
+          if (styleIdx !== undefined) {
+            const range = new Range();
+            range.setStart(node, match.index);
+            range.setEnd(node, match.index + match[0].length);
+
+            if (!rangesByStyle.has(styleIdx)) {
+              rangesByStyle.set(styleIdx, []);
+            }
+            rangesByStyle.get(styleIdx)!.push(range);
+
+            if (!this.highlightsByWord.has(lookup)) {
+              this.highlightsByWord.set(lookup, []);
+            }
+            this.highlightsByWord.get(lookup)!.push(range);
+          }
+        }
+      }
+
+      for (const [styleIdx, ranges] of rangesByStyle) {
+        const highlight = new Highlight(...ranges);
+        const highlightName = `gh-${styleIdx}`;
+        this.highlights.set(highlightName, highlight);
+        CSS.highlights.set(highlightName, highlight);
+      }
+
+      this.highlightTextareas(pattern, styleMap, activeWords);
+    } catch (e) {
+      console.error('Regex error:', e);
+    }
+
+    this.startObserving();
+    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);
+      }
+    }
+  }
+
+  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();
+  }
+
+  private startObserving(): void {
+    this.observer.observe(document.body, {
+      childList: true,
+      subtree: true,
+      attributes: false
+    });
+  }
+
+  destroy(): void {
+    this.observer.disconnect();
+    this.clearHighlights();
+  }
+}
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,205 +1,3 @@
-// @ts-nocheck
-let currentLists = [];
-let isGlobalHighlightEnabled = true;
-let exceptionsList = [];
-let isCurrentSiteException = false;
-let matchCase = false;
-let matchWhole = false;
-let styleSheet = null;
-let wordStyleMap = new Map();
+import { ContentScript } from './content/ContentScript.js';

-function escapeRegex(s) {
-  return s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-}
-
-function isCurrentSiteInExceptions() {
-  const currentHostname = window.location.hostname;
-  return exceptionsList.includes(currentHostname);
-}
-
-function initializeStyleSheet() {
-  if (!styleSheet) {
-    const style = document.createElement('style');
-    style.id = 'goose-highlighter-styles';
-    document.head.appendChild(style);
-    styleSheet = style.sheet;
-  }
-}
-
-function updateWordStyles(activeWords) {
-  initializeStyleSheet();
-  
-  while (styleSheet.cssRules.length > 0) {
-    styleSheet.deleteRule(0);
-  }
-  
-  wordStyleMap.clear();
-  const uniqueStyles = new Map();
-  
-  for (const word of activeWords) {
-    const styleKey = `${word.background}-${word.foreground}`;
-    if (!uniqueStyles.has(styleKey)) {
-      const className = `highlighted-word-${uniqueStyles.size}`;
-      uniqueStyles.set(styleKey, className);
-      
-      const rule = `.${className} { background: ${word.background}; color: ${word.foreground}; padding: 0 2px; }`;
-      styleSheet.insertRule(rule, styleSheet.cssRules.length);
-    }
-    
-    const lookup = matchCase ? word.text : word.text.toLowerCase();
-    wordStyleMap.set(lookup, uniqueStyles.get(styleKey));
-  }
-}
-
-function clearHighlights() {
-  const highlightedElements = document.querySelectorAll('[data-gh]');
-  for (const element of highlightedElements) {
-    const parent = element.parentNode;
-    if (parent) {
-      parent.replaceChild(document.createTextNode(element.textContent), element);
-      parent.normalize();
-    }
-  }
-}
-
-
-function processNodes() {
-  observer.disconnect();
-  clearHighlights();
-
-  if (!isGlobalHighlightEnabled || isCurrentSiteException) {
-    observer.observe(document.body, {
-      childList: true,
-      subtree: true,
-      characterData: true
-    });
-    return;
-  }
-
-  const textNodes = [];
-  const walker = document.createTreeWalker(document.body, NodeFilter.SHOW_TEXT, {
-    acceptNode: node => {
-      if (node.parentNode && node.parentNode.hasAttribute('data-gh')) return NodeFilter.FILTER_REJECT;
-      if (node.parentNode && ['SCRIPT', 'STYLE', 'NOSCRIPT', 'IFRAME'].includes(node.parentNode.nodeName)) return NodeFilter.FILTER_REJECT;
-      if (!node.nodeValue.trim()) return NodeFilter.FILTER_SKIP;
-      return NodeFilter.FILTER_ACCEPT;
-    }
-  });
-
-  while (walker.nextNode()) textNodes.push(walker.currentNode);
-
-  const activeWords = [];
-  for (const list of currentLists) {
-    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
-      });
-    }
-  }
-
-if (activeWords.length > 0) {
-  updateWordStyles(activeWords);
-  
-  const wordMap = new Map();
-  for (const word of activeWords) {
-    wordMap.set(matchCase ? word.text : word.text.toLowerCase(), word);
-  }
-
-  let flags = matchCase ? 'gu' : 'giu';
-  let wordsPattern = Array.from(wordMap.keys()).map(escapeRegex).join('|');
-  
-  if (matchWhole) {
-    wordsPattern = `(?:(?<!\\p{L})|^)(${wordsPattern})(?:(?!\\p{L})|$)`;
-  }
-  
-  try {
-    const pattern = new RegExp(`(${wordsPattern})`, flags);
-
-    for (const node of textNodes) {
-      if (!node.nodeValue || !pattern.test(node.nodeValue)) continue;
-
-      const span = document.createElement('span');
-      span.innerHTML = node.nodeValue.replace(pattern, match => {
-        const lookup = matchCase ? match : match.toLowerCase();
-        const className = wordStyleMap.get(lookup) || 'highlighted-word-0';
-        return `<span data-gh class="${className}">${match}</span>`;
-      });
-
-      node.parentNode.replaceChild(span, node);
-    }
-  } catch (e) {
-    console.error('Regex error:', e);
-  }
-}
-
-  observer.observe(document.body, {
-    childList: true,
-    subtree: true,
-    characterData: true
-  });
-}
-
-const debouncedProcessNodes = debounce(processNodes, 300);
-
-function setListsAndUpdate(lists) {
-  currentLists = lists;
-  debouncedProcessNodes();
-}
-
-function debounce(func, wait) {
-  let timeout;
-  return function () {
-    const context = this, args = arguments;
-    clearTimeout(timeout);
-    timeout = setTimeout(() => func.apply(context, args), wait);
-  };
-}
-
-// Initial highlight on load
-chrome.storage.local.get(['lists', 'globalHighlightEnabled', 'matchCaseEnabled', 'matchWholeEnabled', 'exceptionsList'], ({ lists, globalHighlightEnabled, matchCaseEnabled, matchWholeEnabled, exceptionsList: exceptions }) => {
-  if (Array.isArray(lists)) setListsAndUpdate(lists);
-  if (globalHighlightEnabled !== undefined) {
-    isGlobalHighlightEnabled = globalHighlightEnabled;
-  }
-  matchCase = !!matchCaseEnabled;
-  matchWhole = !!matchWholeEnabled;
-  exceptionsList = Array.isArray(exceptions) ? exceptions : [];
-  isCurrentSiteException = isCurrentSiteInExceptions();
-  processNodes();
-});
-
-// Listen for updates from the popup and re-apply highlights
-chrome.runtime.onMessage.addListener((message) => {
-  if (message.type === 'WORD_LIST_UPDATED') {
-    chrome.storage.local.get('lists', ({ lists }) => {
-      if (Array.isArray(lists)) setListsAndUpdate(lists);
-    });
-  } else if (message.type === 'GLOBAL_TOGGLE_UPDATED') {
-    isGlobalHighlightEnabled = message.enabled;
-    processNodes();
-  } else if (message.type === 'MATCH_OPTIONS_UPDATED') {
-    matchCase = !!message.matchCase;
-    matchWhole = !!message.matchWhole;
-    processNodes();
-  } else if (message.type === 'EXCEPTIONS_LIST_UPDATED') {
-    chrome.storage.local.get('exceptionsList', ({ exceptionsList: exceptions }) => {
-      exceptionsList = Array.isArray(exceptions) ? exceptions : [];
-      isCurrentSiteException = isCurrentSiteInExceptions();
-      processNodes();
-    });
-  }
-});
-
-// Set up observer and scroll handler
-const observer = new MutationObserver(debouncedProcessNodes);
-observer.observe(document.body, {
-  childList: true,
-  subtree: true,
-  characterData: true
-});
-
-window.addEventListener('scroll', debouncedProcessNodes);
+new ContentScript();
--- a/src/popup/PopupController.ts
+++ b/src/popup/PopupController.ts
@@ -0,0 +1,724 @@
+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';
+
+export class PopupController {
+  private lists: HighlightList[] = [];
+  private currentListIndex = 0;
+  private selectedCheckboxes = new Set<number>();
+  private globalHighlightEnabled = true;
+  private wordSearchQuery = '';
+  private matchCaseEnabled = false;
+  private matchWholeEnabled = false;
+  private exceptionsList: string[] = [];
+  private currentTabHost = '';
+  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.loadActiveTab();
+    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> {
+    const data = await StorageService.get();
+    this.lists = data.lists || [];
+    this.globalHighlightEnabled = data.globalHighlightEnabled ?? true;
+    this.matchCaseEnabled = data.matchCaseEnabled ?? false;
+    this.matchWholeEnabled = data.matchWholeEnabled ?? false;
+    this.exceptionsList = data.exceptionsList || [];
+
+    if (this.lists.length === 0) {
+      this.lists.push({
+        id: Date.now(),
+        name: chrome.i18n.getMessage('default_list_name') || 'Default List',
+        background: '#ffff00',
+        foreground: '#000000',
+        active: true,
+        words: []
+      });
+    }
+  }
+
+  private async getCurrentTab(): Promise<void> {
+    try {
+      const [tab] = await chrome.tabs.query({ active: true, currentWindow: true });
+      if (tab?.url) {
+        const url = new URL(tab.url);
+        this.currentTabHost = url.hostname;
+      }
+    } catch (e) {
+      console.warn('Could not get current tab:', e);
+    }
+  }
+
+  private loadActiveTab(): void {
+    const saved = localStorage.getItem('goose-highlighter-active-tab');
+    if (saved) {
+      this.activeTab = saved;
+    }
+  }
+
+  private translateTitles(): void {
+    document.querySelectorAll('[data-i18n-title]').forEach(element => {
+      const key = element.getAttribute('data-i18n-title');
+      if (key) {
+        const translation = chrome.i18n.getMessage(key);
+        if (translation) {
+          element.setAttribute('title', translation);
+        }
+      }
+    });
+  }
+
+  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.setupTabs();
+    this.setupListManagement();
+    this.setupWordManagement();
+    this.setupSettings();
+    this.setupPageHighlights();
+    this.setupExceptions();
+    this.setupImportExport();
+    this.setupTheme();
+  }
+
+  private setupTabs(): void {
+    document.querySelectorAll('.tab-button').forEach(button => {
+      button.addEventListener('click', () => {
+        const tabName = (button as HTMLElement).getAttribute('data-tab');
+        if (tabName) this.switchTab(tabName);
+      });
+    });
+
+    this.switchTab(this.activeTab);
+  }
+
+  private setupListManagement(): void {
+    const listSelect = document.getElementById('listSelect') as HTMLSelectElement;
+
+    listSelect.addEventListener('change', () => {
+      this.selectedCheckboxes.clear();
+      this.currentListIndex = +listSelect.value;
+      this.renderWords();
+      this.updateListForm();
+    });
+
+    // Apply button for list settings
+    document.getElementById('applyListSettingsBtn')?.addEventListener('click', () => {
+      this.applyListSettings();
+    });
+
+    document.getElementById('newListBtn')?.addEventListener('click', () => {
+      this.lists.push({
+        id: Date.now(),
+        name: chrome.i18n.getMessage('new_list_name') || 'New List',
+        background: '#ffff00',
+        foreground: '#000000',
+        active: true,
+        words: []
+      });
+      this.currentListIndex = this.lists.length - 1;
+      this.save();
+    });
+
+    document.getElementById('deleteListBtn')?.addEventListener('click', () => {
+      if (confirm(chrome.i18n.getMessage('confirm_delete_list') || 'Delete this list?')) {
+        this.lists.splice(this.currentListIndex, 1);
+        this.currentListIndex = Math.max(0, this.currentListIndex - 1);
+        this.save();
+      }
+    });
+  }
+
+  private setupWordManagement(): void {
+    const bulkPaste = document.getElementById('bulkPaste') as HTMLTextAreaElement;
+    const wordList = document.getElementById('wordList') as HTMLDivElement;
+    const wordSearch = document.getElementById('wordSearch') as HTMLInputElement;
+
+    document.getElementById('addWordsBtn')?.addEventListener('click', () => {
+      const words = bulkPaste.value.split(/\n+/).map(w => w.trim()).filter(Boolean);
+      const list = this.lists[this.currentListIndex];
+      for (const w of words) {
+        list.words.push({
+          wordStr: w,
+          background: '',
+          foreground: '',
+          active: true
+        });
+      }
+      bulkPaste.value = '';
+      this.save();
+    });
+
+    this.setupWordListEvents(wordList);
+    this.setupWordSelection();
+
+    wordSearch.addEventListener('input', (e) => {
+      this.wordSearchQuery = (e.target as HTMLInputElement).value;
+      this.renderWords();
+    });
+  }
+
+  private setupWordListEvents(wordList: HTMLDivElement): void {
+    wordList.addEventListener('change', (e) => {
+      const target = e.target as HTMLInputElement;
+      if (target.type === 'checkbox' && target.dataset.index != null) {
+        const index = +target.dataset.index;
+        if (target.checked) {
+          this.selectedCheckboxes.add(index);
+        } else {
+          this.selectedCheckboxes.delete(index);
+        }
+        this.renderWords();
+      }
+    });
+
+    wordList.addEventListener('change', (e) => {
+      const target = e.target as HTMLInputElement;
+      const index = +(target.dataset.bgEdit ?? target.dataset.fgEdit ?? -1);
+      if (index === -1) return;
+
+      const word = this.lists[this.currentListIndex].words[index];
+      if (target.dataset.bgEdit != null) word.background = target.value;
+      if (target.dataset.fgEdit != null) word.foreground = target.value;
+
+      this.save();
+    });
+
+    wordList.addEventListener('keydown', (e) => {
+      if (e.key === 'Enter') {
+        const target = e.target as HTMLInputElement;
+        const index = +(target.dataset.wordEdit ?? -1);
+        if (index === -1) return;
+
+        const word = this.lists[this.currentListIndex].words[index];
+        if (target.dataset.wordEdit != null) {
+          word.wordStr = target.value;
+          this.save();
+        }
+      }
+    });
+
+    let scrolling = false;
+    wordList.addEventListener('scroll', () => {
+      if (scrolling) return;
+      scrolling = true;
+      requestAnimationFrame(() => {
+        this.renderWords();
+        scrolling = false;
+      });
+    });
+  }
+
+  private setupWordSelection(): void {
+    document.getElementById('selectAllBtn')?.addEventListener('click', () => {
+      const list = this.lists[this.currentListIndex];
+      list.words.forEach((_, index) => {
+        this.selectedCheckboxes.add(index);
+      });
+      this.renderWords();
+    });
+
+    document.getElementById('deselectAllBtn')?.addEventListener('click', () => {
+      this.selectedCheckboxes.clear();
+      this.renderWords();
+    });
+
+    document.getElementById('deleteSelectedBtn')?.addEventListener('click', () => {
+      if (confirm(chrome.i18n.getMessage('confirm_delete_words') || 'Delete selected words?')) {
+        const list = this.lists[this.currentListIndex];
+        const toDelete = Array.from(this.selectedCheckboxes);
+        this.lists[this.currentListIndex].words = list.words.filter((_, i) => !toDelete.includes(i));
+        this.selectedCheckboxes.clear();
+        this.save();
+        this.renderWords();
+      }
+    });
+
+    document.getElementById('enableSelectedBtn')?.addEventListener('click', () => {
+      const list = this.lists[this.currentListIndex];
+      this.selectedCheckboxes.forEach(index => {
+        list.words[index].active = true;
+      });
+      this.save();
+      this.renderWords();
+    });
+
+    document.getElementById('disableSelectedBtn')?.addEventListener('click', () => {
+      const list = this.lists[this.currentListIndex];
+      this.selectedCheckboxes.forEach(index => {
+        list.words[index].active = false;
+      });
+      this.save();
+      this.renderWords();
+    });
+  }
+
+  private setupSettings(): void {
+    const globalToggle = document.getElementById('globalHighlightToggle') as HTMLInputElement;
+    const matchCase = document.getElementById('matchCase') as HTMLInputElement;
+    const matchWhole = document.getElementById('matchWhole') as HTMLInputElement;
+
+    globalToggle.addEventListener('change', async () => {
+      this.globalHighlightEnabled = globalToggle.checked;
+      await StorageService.update('globalHighlightEnabled', this.globalHighlightEnabled);
+      MessageService.sendToAllTabs({
+        type: 'GLOBAL_TOGGLE_UPDATED',
+        enabled: this.globalHighlightEnabled
+      });
+    });
+
+    matchCase.addEventListener('change', async () => {
+      this.matchCaseEnabled = matchCase.checked;
+      await StorageService.update('matchCaseEnabled', this.matchCaseEnabled);
+      MessageService.sendToAllTabs({
+        type: 'MATCH_OPTIONS_UPDATED',
+        matchCase: this.matchCaseEnabled,
+        matchWhole: this.matchWholeEnabled
+      });
+    });
+
+    matchWhole.addEventListener('change', async () => {
+      this.matchWholeEnabled = matchWhole.checked;
+      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', async () => {
+      if (!this.currentTabHost) return;
+
+      const isException = this.exceptionsList.includes(this.currentTabHost);
+
+      if (isException) {
+        this.exceptionsList = this.exceptionsList.filter(domain => domain !== this.currentTabHost);
+      } else {
+        this.exceptionsList.push(this.currentTabHost);
+      }
+
+      this.updateExceptionButton();
+      this.renderExceptions();
+      await StorageService.update('exceptionsList', this.exceptionsList);
+      MessageService.sendToAllTabs({ type: 'EXCEPTIONS_LIST_UPDATED' });
+    });
+
+    document.getElementById('clearExceptionsBtn')?.addEventListener('click', async () => {
+      if (confirm(chrome.i18n.getMessage('confirm_clear_exceptions') || 'Clear all exceptions?')) {
+        this.exceptionsList = [];
+        this.updateExceptionButton();
+        this.renderExceptions();
+        await StorageService.update('exceptionsList', this.exceptionsList);
+        MessageService.sendToAllTabs({ type: 'EXCEPTIONS_LIST_UPDATED' });
+      }
+    });
+
+    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();
+        await StorageService.update('exceptionsList', this.exceptionsList);
+        MessageService.sendToAllTabs({ type: 'EXCEPTIONS_LIST_UPDATED' });
+      }
+    });
+  }
+
+  private setupImportExport(): void {
+    const importInput = document.getElementById('importInput') as HTMLInputElement;
+
+    document.getElementById('exportBtn')?.addEventListener('click', () => {
+      const exportData: ExportData = {
+        lists: this.lists,
+        exceptionsList: this.exceptionsList
+      };
+      const blob = new Blob([JSON.stringify(exportData, null, 2)], { type: 'application/json' });
+      const url = URL.createObjectURL(blob);
+      const a = document.createElement('a');
+      a.href = url;
+      a.download = 'highlight-lists.json';
+      a.click();
+      URL.revokeObjectURL(url);
+    });
+
+    document.getElementById('importBtn')?.addEventListener('click', () => {
+      importInput.click();
+    });
+
+    importInput.addEventListener('change', (e) => {
+      const file = (e.target as HTMLInputElement).files?.[0];
+      if (!file) return;
+
+      const reader = new FileReader();
+      reader.onload = (e) => {
+        try {
+          const data = JSON.parse(e.target?.result as string);
+
+          if (Array.isArray(data)) {
+            this.lists = data;
+          } else if (data && typeof data === 'object') {
+            if (Array.isArray(data.lists)) {
+              this.lists = data.lists;
+            }
+            if (Array.isArray(data.exceptionsList)) {
+              this.exceptionsList = data.exceptionsList;
+            }
+          }
+
+          this.currentListIndex = 0;
+          this.updateExceptionButton();
+          this.renderExceptions();
+          this.save();
+        } catch (err) {
+          alert(chrome.i18n.getMessage('invalid_json_error') + ': ' + (err as Error).message);
+        }
+      };
+      reader.readAsText(file);
+    });
+  }
+
+  private setupTheme(): void {
+    const toggle = document.getElementById('themeToggle') as HTMLInputElement;
+    const body = document.body;
+
+    const savedTheme = localStorage.getItem('theme');
+    if (savedTheme === 'light') {
+      body.classList.remove('dark');
+      body.classList.add('light');
+      toggle.checked = false;
+    } else {
+      body.classList.add('dark');
+      body.classList.remove('light');
+      toggle.checked = true;
+    }
+
+    toggle.addEventListener('change', () => {
+      if (toggle.checked) {
+        body.classList.add('dark');
+        body.classList.remove('light');
+        localStorage.setItem('theme', 'dark');
+      } else {
+        body.classList.remove('dark');
+        body.classList.add('light');
+        localStorage.setItem('theme', 'light');
+      }
+    });
+  }
+
+  private applyListSettings(): void {
+    const listName = document.getElementById('listName') as HTMLInputElement;
+    const listBg = document.getElementById('listBg') as HTMLInputElement;
+    const listFg = document.getElementById('listFg') as HTMLInputElement;
+    const listActive = document.getElementById('listActive') as HTMLInputElement;
+
+    this.lists[this.currentListIndex].name = listName.value;
+    this.lists[this.currentListIndex].background = listBg.value;
+    this.lists[this.currentListIndex].foreground = listFg.value;
+    this.lists[this.currentListIndex].active = listActive.checked;
+
+    this.save();
+  }
+
+  private async save(): Promise<void> {
+    await StorageService.set({
+      lists: this.lists,
+      globalHighlightEnabled: this.globalHighlightEnabled,
+      matchCaseEnabled: this.matchCaseEnabled,
+      matchWholeEnabled: this.matchWholeEnabled,
+      exceptionsList: this.exceptionsList
+    });
+
+    this.renderLists();
+    MessageService.sendToAllTabs({ type: 'WORD_LIST_UPDATED' });
+  }
+
+
+
+
+
+  private render(): void {
+    this.renderLists();
+    this.renderWords();
+    this.renderExceptions();
+    this.updateExceptionButton();
+    this.updateFormValues();
+  }
+
+  private renderLists(): void {
+    const listSelect = document.getElementById('listSelect') as HTMLSelectElement;
+    listSelect.innerHTML = this.lists.map((list, index) =>
+      `<option value="${index}">${DOMUtils.escapeHtml(list.name)}</option>`
+    ).join('');
+    listSelect.value = this.currentListIndex.toString();
+    this.updateListForm();
+  }
+
+  private updateListForm(): void {
+    const list = this.lists[this.currentListIndex];
+    (document.getElementById('listName') as HTMLInputElement).value = list.name;
+    (document.getElementById('listBg') as HTMLInputElement).value = list.background;
+    (document.getElementById('listFg') as HTMLInputElement).value = list.foreground;
+    (document.getElementById('listActive') as HTMLInputElement).checked = list.active;
+  }
+
+  private renderWords(): void {
+    const list = this.lists[this.currentListIndex];
+    const wordList = document.getElementById('wordList') as HTMLDivElement;
+
+    let filteredWords = list.words;
+    if (this.wordSearchQuery.trim()) {
+      const q = this.wordSearchQuery.trim().toLowerCase();
+      filteredWords = list.words.filter(w => w.wordStr.toLowerCase().includes(q));
+    }
+
+    const itemHeight = 32;
+    const itemSpacing = 2;
+    const totalItemHeight = itemHeight + itemSpacing;
+    const containerHeight = wordList.clientHeight || 250;
+    const scrollTop = wordList.scrollTop;
+    const startIndex = Math.max(0, Math.floor(scrollTop / totalItemHeight) - 1);
+    const visibleCount = Math.ceil(containerHeight / totalItemHeight);
+    const endIndex = Math.min(startIndex + visibleCount + 2, filteredWords.length);
+
+    wordList.innerHTML = '';
+
+    const spacer = document.createElement('div');
+    spacer.style.position = 'relative';
+    spacer.style.height = `${filteredWords.length * totalItemHeight}px`;
+    spacer.style.width = '100%';
+
+    for (let i = startIndex; i < endIndex; i++) {
+      const w = filteredWords[i];
+      if (!w) continue;
+
+      const realIndex = list.words.indexOf(w);
+      const container = this.createWordItem(w, realIndex, i, itemHeight);
+      spacer.appendChild(container);
+    }
+
+    wordList.appendChild(spacer);
+
+    const wordCount = document.getElementById('wordCount');
+    if (wordCount) {
+      wordCount.textContent = filteredWords.length.toString();
+    }
+  }
+
+  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 = `
+      position: absolute;
+      top: ${displayIndex * (itemHeight + 2)}px;
+    `;
+
+    const list = this.lists[this.currentListIndex];
+
+    container.innerHTML = `
+      <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}" placeholder="${chrome.i18n.getMessage('word_placeholder') || 'Word or phrase'}">
+      <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}" title="${chrome.i18n.getMessage('text_color_title') || 'Text color'}">
+    `;
+
+    return container;
+  }
+
+  private updateExceptionButton(): void {
+    const toggleBtn = document.getElementById('toggleExceptionBtn');
+    const btnText = document.getElementById('exceptionBtnText');
+
+    if (!toggleBtn || !btnText || !this.currentTabHost) return;
+
+    const isException = this.exceptionsList.includes(this.currentTabHost);
+
+    if (isException) {
+      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-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-plus';
+    }
+  }
+
+  private renderExceptions(): void {
+    const container = document.getElementById('exceptionsList');
+    if (!container) return;
+
+    if (this.exceptionsList.length === 0) {
+      container.innerHTML = `<div class="exception-item">${chrome.i18n.getMessage('no_exceptions') || 'No exceptions'}</div>`;
+      return;
+    }
+
+    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>
+      </div>`
+    ).join('');
+  }
+
+  private updateFormValues(): void {
+    (document.getElementById('globalHighlightToggle') as HTMLInputElement).checked = this.globalHighlightEnabled;
+    (document.getElementById('matchCase') as HTMLInputElement).checked = this.matchCaseEnabled;
+    (document.getElementById('matchWhole') as HTMLInputElement).checked = this.matchWholeEnabled;
+  }
+}
--- a/src/popup/popup.ts
+++ b/src/popup/popup.ts
@@ -1,542 +1,13 @@
-// @ts-nocheck
-const listSelect = document.getElementById('listSelect');
-const listName = document.getElementById('listName');
-const listBg = document.getElementById('listBg');
-const listFg = document.getElementById('listFg');
-const listActive = document.getElementById('listActive');
-const bulkPaste = document.getElementById('bulkPaste');
-const wordList = document.getElementById('wordList');
-const importInput = document.getElementById('importInput');
-const matchCase = document.getElementById('matchCase');
-const matchWhole = document.getElementById('matchWhole');
-let lists = [];
-let currentListIndex = 0;
-let selectedCheckboxes = new Set();
-let globalHighlightEnabled = true;
-let wordSearchQuery = '';
-let matchCaseEnabled = false;
-let matchWholeEnabled = false;
-let exceptionsList = [];
-let currentTabHost = '';
-let sectionStates = {};
+import { PopupController } from './PopupController.js';

-function loadSectionStates() {
-  const saved = localStorage.getItem('goose-highlighter-section-states');
-  if (saved) {
-    try {
-      sectionStates = JSON.parse(saved);
-    } catch {
-      sectionStates = {};
-    }
-  }
-}
-
-function saveSectionStates() {
-  localStorage.setItem('goose-highlighter-section-states', JSON.stringify(sectionStates));
-}
-
-function toggleSection(sectionName) {
-  const section = document.querySelector(`[data-section="${sectionName}"]`);
-  if (!section) return;
-  
-  const isCollapsed = section.classList.contains('collapsed');
-  
-  if (isCollapsed) {
-    section.classList.remove('collapsed');
-    sectionStates[sectionName] = false;
-  } else {
-    section.classList.add('collapsed');
-    sectionStates[sectionName] = true;
-  }
-  
-  saveSectionStates();
-}
-
-function initializeSectionStates() {
-  loadSectionStates();
-  
-  // Apply saved states
-  Object.keys(sectionStates).forEach(sectionName => {
-    const section = document.querySelector(`[data-section="${sectionName}"]`);
-    if (section && sectionStates[sectionName]) {
-      section.classList.add('collapsed');
-    }
-  });
-}
-
-function escapeHtml(str) {
-  return str.replace(/[&<>"']/g, function (m) {
-    return ({
-      '&': '&amp;',
-      '<': '&lt;',
-      '>': '&gt;',
-      '"': '&quot;',
-      '\'': '&#39;'
-    })[m];
-  });
-}
-
-async function save() {
-  await chrome.storage.local.set({
-    lists: lists,
-    globalHighlightEnabled: globalHighlightEnabled,
-    matchCaseEnabled,
-    matchWholeEnabled,
-    exceptionsList
-  });
-  renderLists();
-  renderWords();
-
-  chrome.tabs.query({}, function (tabs) {
-    for (let tab of tabs) {
-      if (tab.id) {
-        chrome.tabs.sendMessage(tab.id, { type: 'WORD_LIST_UPDATED' });
-        chrome.tabs.sendMessage(tab.id, {
-          type: 'GLOBAL_TOGGLE_UPDATED',
-          enabled: globalHighlightEnabled
-        });
-        chrome.tabs.sendMessage(tab.id, {
-          type: 'MATCH_OPTIONS_UPDATED',
-          matchCase: matchCaseEnabled,
-          matchWhole: matchWholeEnabled
-        });
-        chrome.tabs.sendMessage(tab.id, { type: 'EXCEPTIONS_LIST_UPDATED' });
-      }
-    }
-  });
-}
-
-async function updateGlobalToggleState() {
-  await chrome.storage.local.set({ globalHighlightEnabled: globalHighlightEnabled });
-  chrome.tabs.query({}, function (tabs) {
-    for (let tab of tabs) {
-      if (tab.id) {
-        chrome.tabs.sendMessage(tab.id, {
-          type: 'GLOBAL_TOGGLE_UPDATED',
-          enabled: globalHighlightEnabled
-        });
-      }
-    }
-  });
-}
-
-async function load() {
-  const res = await chrome.storage.local.get({
-    lists: [],
-    globalHighlightEnabled: true,
-    matchCaseEnabled: false,
-    matchWholeEnabled: false,
-    exceptionsList: []
-  });
-  lists = res.lists;
-  globalHighlightEnabled = res.globalHighlightEnabled !== false;
-  matchCaseEnabled = !!res.matchCaseEnabled;
-  matchWholeEnabled = !!res.matchWholeEnabled;
-  exceptionsList = res.exceptionsList || [];
-  matchCase.checked = matchCaseEnabled;
-  matchWhole.checked = matchWholeEnabled;
-
-  try {
-    const [tab] = await chrome.tabs.query({ active: true, currentWindow: true });
-    if (tab && tab.url) {
-      const url = new URL(tab.url);
-      currentTabHost = url.hostname;
-      updateExceptionButton();
-    }
-  } catch (e) {
-    console.warn('Could not get current tab:', e);
-  }
-
-  if (!lists.length) {
-    lists.push({
-      id: Date.now(),
-      name: chrome.i18n.getMessage('default_list_name'),
-      background: '#ffff00',
-      foreground: '#000000',
-      active: true,
-      words: []
-    });
-  }
-  renderLists();
-  renderWords();
-  renderExceptions();
-
-  document.getElementById('globalHighlightToggle').checked = globalHighlightEnabled;
-}
-
-function renderLists() {
-  listSelect.innerHTML = lists.map((list, index) =>
-    `<option value="${index}">${escapeHtml(list.name)}</option>`
-  ).join('');
-  listSelect.value = currentListIndex;
-  updateListForm();
-}
-
-function updateListForm() {
-  const list = lists[currentListIndex];
-  listName.value = list.name;
-  listBg.value = list.background;
-  listFg.value = list.foreground;
-  listActive.checked = list.active;
-}
-
-function renderWords() {
-  const list = lists[currentListIndex];
-
-  let filteredWords = list.words;
-  if (wordSearchQuery.trim()) {
-    const q = wordSearchQuery.trim().toLowerCase();
-    filteredWords = list.words.filter(w => w.wordStr.toLowerCase().includes(q));
-  }
-
-  const itemHeight = 32;
-  const containerHeight = wordList.clientHeight;
-  const scrollTop = wordList.scrollTop;
-  const startIndex = Math.floor(scrollTop / itemHeight);
-  const endIndex = Math.min(
-    startIndex + Math.ceil(containerHeight / itemHeight) + 2,
-    filteredWords.length
-  );
-
-  wordList.innerHTML = '';
-
-  const spacer = document.createElement('div');
-  spacer.style.position = 'relative';
-  spacer.style.height = `${filteredWords.length * itemHeight}px`;
-  spacer.style.width = '100%';
-
-  for (let i = startIndex; i < endIndex; i++) {
-    const w = filteredWords[i];
-    if (!w) continue;
-    const container = document.createElement('div');
-    container.style.height = `${itemHeight}px`;
-    container.style.position = 'absolute';
-    container.style.top = `${i * itemHeight}px`;
-    container.style.width = 'calc(100% - 8px)';
-    container.style.left = '4px';
-    container.style.right = '4px';
-    container.style.display = 'flex';
-    container.style.alignItems = 'center';
-    container.style.gap = '6px';
-    container.style.padding = '0 4px';
-    container.style.boxSizing = 'border-box';
-    container.style.background = 'var(--highlight-tag)';
-    container.style.border = '1px solid var(--highlight-tag-border)';
-
-    const realIndex = list.words.indexOf(w);
-
-    const cbSelect = document.createElement('input');
-    cbSelect.type = 'checkbox';
-    cbSelect.className = 'word-checkbox';
-    cbSelect.dataset.index = realIndex;
-    if (selectedCheckboxes.has(realIndex)) {
-      cbSelect.checked = true;
-    }
-
-    const inputWord = document.createElement('input');
-    inputWord.type = 'text';
-    inputWord.value = w.wordStr;
-    inputWord.dataset.wordEdit = realIndex;
-    inputWord.style.flexGrow = '1';
-    inputWord.style.minWidth = '0';
-    inputWord.style.padding = '4px 8px';
-    inputWord.style.borderRadius = '4px';
-    inputWord.style.border = '1px solid var(--input-border)';
-    inputWord.style.backgroundColor = 'var(--input-bg)';
-    inputWord.style.color = 'var(--text-color)';
-
-    const inputBg = document.createElement('input');
-    inputBg.type = 'color';
-    inputBg.value = w.background || list.background;
-    inputBg.dataset.bgEdit = realIndex;
-    inputBg.style.width = '24px';
-    inputBg.style.height = '24px';
-    inputBg.style.flexShrink = '0';
-
-    const inputFg = document.createElement('input');
-    inputFg.type = 'color';
-    inputFg.value = w.foreground || list.foreground;
-    inputFg.dataset.fgEdit = realIndex;
-    inputFg.style.width = '24px';
-    inputFg.style.height = '24px';
-    inputFg.style.flexShrink = '0';
-
-    const activeContainer = document.createElement('label');
-    activeContainer.className = 'word-active';
-    activeContainer.style.display = 'flex';
-    activeContainer.style.alignItems = 'center';
-    activeContainer.style.gap = '4px';
-    activeContainer.style.flexShrink = '0';
-
-    const cbActive = document.createElement('input');
-    cbActive.type = 'checkbox';
-    cbActive.checked = w.active !== false;
-    cbActive.dataset.activeEdit = realIndex;
-    cbActive.className = 'switch';
-
-    activeContainer.appendChild(cbActive);
-
-    container.appendChild(cbSelect);
-    container.appendChild(inputWord);
-    container.appendChild(inputBg);
-    container.appendChild(inputFg);
-    container.appendChild(activeContainer);
-
-    spacer.appendChild(container);
-  }
-
-  wordList.appendChild(spacer);
-
-  const wordCount = document.getElementById('wordCount');
-  if (wordCount) {
-    wordCount.textContent = filteredWords.length;
-  }
-}
-
-function updateExceptionButton() {
-  const toggleBtn = document.getElementById('toggleExceptionBtn');
-  const btnText = document.getElementById('exceptionBtnText');
-  
-  if (!toggleBtn || !btnText || !currentTabHost) return;
-  
-  const isException = exceptionsList.includes(currentTabHost);
-  
-  if (isException) {
-    btnText.textContent = chrome.i18n.getMessage('remove_exception') || 'Remove from Exceptions';
-    toggleBtn.className = 'danger';
-    toggleBtn.querySelector('i').className = 'fa-solid fa-check';
-  } else {
-    btnText.textContent = chrome.i18n.getMessage('add_exception') || 'Add to Exceptions';
-    toggleBtn.className = '';
-    toggleBtn.querySelector('i').className = 'fa-solid fa-ban';
-  }
-}
-
-function renderExceptions() {
-  const container = document.getElementById('exceptionsList');
-  if (!container) return;
-  
-  if (exceptionsList.length === 0) {
-    container.innerHTML = '<div class="exception-item">No exceptions</div>';
-    return;
-  }
-  
-  container.innerHTML = exceptionsList.map(domain => 
-    `<div class="exception-item">
-      <span class="exception-domain">${escapeHtml(domain)}</span>
-      <button class="exception-remove" data-domain="${escapeHtml(domain)}">${chrome.i18n.getMessage('remove')}</button>
-    </div>`
-  ).join('');
-}
-
-document.addEventListener('DOMContentLoaded', () => {
-  initializeSectionStates();
-  localizePage();
-  
-  // Add event listeners for collapse toggles
-  document.querySelectorAll('.collapse-toggle').forEach(button => {
-    button.addEventListener('click', (e) => {
-      e.stopPropagation();
-      const targetSection = button.getAttribute('data-target');
-      toggleSection(targetSection);
-    });
-  });
-  
-  // Also allow clicking section headers to toggle
-  document.querySelectorAll('.section-header').forEach(header => {
-    header.addEventListener('click', (e) => {
-      // Don't toggle if clicking on a button or input within the header
-      if (e.target.tagName === 'BUTTON' || e.target.tagName === 'INPUT' || e.target.closest('button')) {
-        return;
-      }
-      const section = header.closest('.section');
-      const sectionName = section.getAttribute('data-section');
-      if (sectionName) {
-        toggleSection(sectionName);
-      }
-    });
-  });
-
-  document.getElementById('selectAllBtn').onclick = () => {
-    const list = lists[currentListIndex];
-    list.words.forEach((_, index) => {
-      selectedCheckboxes.add(index);
-    });
-    renderWords();
-  };
-
-  document.getElementById('globalHighlightToggle').addEventListener('change', function () {
-    globalHighlightEnabled = this.checked;
-    updateGlobalToggleState();
-  });
-
-  wordList.addEventListener('change', e => {
-    if (e.target.type === 'checkbox') {
-      if (e.target.dataset.index != null) {
-        if (e.target.checked) {
-          selectedCheckboxes.add(+e.target.dataset.index);
-        } else {
-          selectedCheckboxes.delete(+e.target.dataset.index);
-        }
-        renderWords();
-      } else if (e.target.dataset.activeEdit != null) {
-        lists[currentListIndex].words[e.target.dataset.activeEdit].active = e.target.checked;
-        save();
-      }
-    }
-  });
-
-  let scrollTimeout;
-  wordList.addEventListener('scroll', () => {
-    if (scrollTimeout) {
-      return;
-    }
-    scrollTimeout = setTimeout(() => {
-      requestAnimationFrame(renderWords);
-      scrollTimeout = null;
-    }, 16); // ~60fps
-  });
-
-  listSelect.onchange = () => {
-    selectedCheckboxes.clear();
-    currentListIndex = +listSelect.value;
-    renderWords();
-    updateListForm();
-  };
-
-  document.getElementById('newListBtn').onclick = () => {
-    lists.push({
-      id: Date.now(),
-      name: chrome.i18n.getMessage('new_list_name'),
-      background: '#ffff00',
-      foreground: '#000000',
-      active: true,
-      words: []
-    });
-    currentListIndex = lists.length - 1;
-    save();
-  };
-
-  document.getElementById('deleteListBtn').onclick = () => {
-    if (confirm(chrome.i18n.getMessage('confirm_delete_list'))) {
-      lists.splice(currentListIndex, 1);
-      currentListIndex = Math.max(0, currentListIndex - 1);
-      save();
-    }
-  };
-
-  listName.oninput = () => { lists[currentListIndex].name = listName.value; save(); };
-  listBg.oninput = () => { lists[currentListIndex].background = listBg.value; save(); };
-  listFg.oninput = () => { lists[currentListIndex].foreground = listFg.value; save(); };
-  listActive.onchange = () => { lists[currentListIndex].active = listActive.checked; save(); };
-
-  document.getElementById('addWordsBtn').onclick = () => {
-    const words = bulkPaste.value.split(/\n+/).map(w => w.trim()).filter(Boolean);
-    const list = lists[currentListIndex];
-    for (const w of words) list.words.push({ wordStr: w, background: '', foreground: '', active: true });
-    bulkPaste.value = '';
-    save();
-  };
-
-  document.getElementById('deleteSelectedBtn').onclick = () => {
-    if (confirm(chrome.i18n.getMessage('confirm_delete_words'))) {
-      const list = lists[currentListIndex];
-      const toDelete = Array.from(selectedCheckboxes);
-      lists[currentListIndex].words = list.words.filter((_, i) => !toDelete.includes(i));
-      selectedCheckboxes.clear();
-      save();
-      renderWords();
-    }
-  };
-
-  document.getElementById('disableSelectedBtn').onclick = () => {
-    const list = lists[currentListIndex];
-    selectedCheckboxes.forEach(index => {
-      list.words[index].active = false;
-    });
-    save();
-    renderWords();
-  };
-
-  document.getElementById('enableSelectedBtn').onclick = () => {
-    const list = lists[currentListIndex];
-    selectedCheckboxes.forEach(index => {
-      list.words[index].active = true;
-    });
-    save();
-    renderWords();
-  };
-
-  wordList.addEventListener('input', e => {
-    const index = e.target.dataset.wordEdit ?? e.target.dataset.bgEdit ?? e.target.dataset.fgEdit;
-    if (index == null) return;
-
-    const word = lists[currentListIndex].words[index];
-    if (e.target.dataset.wordEdit != null) word.wordStr = e.target.value;
-    if (e.target.dataset.bgEdit != null) word.background = e.target.value;
-    if (e.target.dataset.fgEdit != null) word.foreground = e.target.value;
-
-    save();
-  });
-
-  const exportBtn = document.getElementById('exportBtn');
-  exportBtn.onclick = () => {
-    const exportData = {
-      lists: lists,
-      exceptionsList: exceptionsList
-    };
-    const blob = new Blob([JSON.stringify(exportData, null, 2)], { type: 'application/json' });
-    const url = URL.createObjectURL(blob);
-    const a = document.createElement('a');
-    a.href = url;
-    a.download = 'highlight-lists.json';
-    a.click();
-    URL.revokeObjectURL(url);
-  };
-
-  const importBtn = document.getElementById('importBtn');
-  importBtn.onclick = () => importInput.click();
-
-  importInput.onchange = e => {
-    const file = e.target.files[0];
-    if (!file) return;
-    const reader = new FileReader();
-    reader.onload = e => {
-      try {
-        const data = JSON.parse(e.target.result);
-        
-        if (Array.isArray(data)) {
-          // Old format - just lists
-          lists = data;
-        } else if (data && typeof data === 'object') {
-          // New format - object with lists and exceptions
-          if (Array.isArray(data.lists)) {
-            lists = data.lists;
-          }
-          if (Array.isArray(data.exceptionsList)) {
-            exceptionsList = data.exceptionsList;
-          }
-        }
-        
-        currentListIndex = 0;
-        updateExceptionButton();
-        renderExceptions();
-        save();
-      } catch (err) {
-        alert(chrome.i18n.getMessage('invalid_json_error:' + err.message));
-      }
-    };
-    reader.readAsText(file);
-  };
-
-  function localizePage() {
+function localizePage(): void {
  const elements = document.querySelectorAll('[data-i18n]');
  elements.forEach(element => {
-      const message = element.dataset.i18n;
+    const message = (element as HTMLElement).dataset.i18n!;
    const localizedText = chrome.i18n.getMessage(message);
    if (localizedText) {
-        if (element.tagName === 'INPUT' && element.hasAttribute('placeholder')) {
-          element.placeholder = localizedText;
+      if ((element.tagName === 'INPUT' || element.tagName === 'TEXTAREA') && (element as HTMLInputElement).hasAttribute('placeholder')) {
+        (element as HTMLInputElement).placeholder = localizedText;
      } else {
        element.textContent = localizedText;
      }
@@ -544,95 +15,17 @@ document.addEventListener('DOMContentLoaded', () => {
  });
 }

-  const toggle = document.getElementById('themeToggle');
-  const body = document.body;
-
-  const savedTheme = localStorage.getItem('theme');
-  if (savedTheme === 'light') {
-    body.classList.remove('dark');
-    body.classList.add('light');
-    toggle.checked = false;
-  } else {
-    body.classList.add('dark');
-    body.classList.remove('light');
-    toggle.checked = true;
+function displayVersion(): void {
+  const manifest = chrome.runtime.getManifest();
+  const versionElement = document.getElementById('version-number');
+  if (versionElement && manifest.version) {
+    versionElement.textContent = manifest.version;
+  }
 }

-  toggle.addEventListener('change', () => {
-    if (toggle.checked) {
-      body.classList.add('dark');
-      body.classList.remove('light');
-      localStorage.setItem('theme', 'dark');
-    } else {
-      body.classList.remove('dark');
-      body.classList.add('light');
-      localStorage.setItem('theme', 'light');
-    }
-  });
-
-  document.getElementById('deselectAllBtn').onclick = () => {
-    selectedCheckboxes.clear();
-    renderWords();
-  };
-
-  const wordSearch = document.getElementById('wordSearch');
-  wordSearch.addEventListener('input', (e) => {
-    wordSearchQuery = e.target.value;
-    renderWords();
-  });
-
-  matchCase.addEventListener('change', () => {
-    matchCaseEnabled = matchCase.checked;
-    save();
-  });
-  matchWhole.addEventListener('change', () => {
-    matchWholeEnabled = matchWhole.checked;
-    save();
-  });
-
-  document.getElementById('toggleExceptionBtn').addEventListener('click', () => {
-    if (!currentTabHost) return;
-    
-    const isException = exceptionsList.includes(currentTabHost);
-    
-    if (isException) {
-      exceptionsList = exceptionsList.filter(domain => domain !== currentTabHost);
-    } else {
-      exceptionsList.push(currentTabHost);
-    }
-    
-    updateExceptionButton();
-    renderExceptions();
-    save();
-  });
-
-  document.getElementById('manageExceptionsBtn').addEventListener('click', () => {
-    const panel = document.getElementById('exceptionsPanel');
-    if (panel.style.display === 'none') {
-      panel.style.display = 'block';
-    } else {
-      panel.style.display = 'none';
-    }
-  });
-
-  document.getElementById('clearExceptionsBtn').addEventListener('click', () => {
-    if (confirm(chrome.i18n.getMessage('confirm_clear_exceptions') || 'Clear all exceptions?')) {
-      exceptionsList = [];
-      updateExceptionButton();
-      renderExceptions();
-      save();
-    }
-  });
-
-  document.getElementById('exceptionsList').addEventListener('click', (e) => {
-    if (e.target.classList.contains('exception-remove')) {
-      const domain = e.target.dataset.domain;
-      exceptionsList = exceptionsList.filter(d => d !== domain);
-      updateExceptionButton();
-      renderExceptions();
-      save();
-    }
-  });
-
-  load();
+document.addEventListener('DOMContentLoaded', async () => {
+  localizePage();
+  displayVersion();
+  const controller = new PopupController();
+  await controller.initialize();
 });
--- a/src/services/MessageService.ts
+++ b/src/services/MessageService.ts
@@ -0,0 +1,33 @@
+import { MessageData } from '../types.js';
+
+export class MessageService {
+  static sendToAllTabs(message: MessageData): void {
+    chrome.tabs.query({}, (tabs) => {
+      tabs.forEach(tab => {
+        if (tab.id) {
+          chrome.tabs.sendMessage(tab.id, message).catch(() => {
+            // Ignore errors for tabs that can't receive messages
+          });
+        }
+      });
+    });
+  }
+
+  static sendToTab(tabId: number, message: MessageData): void {
+    chrome.tabs.sendMessage(tabId, message).catch(() => {
+      // Ignore errors for tabs that can't receive messages
+    });
+  }
+
+  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;
+  }
+}
--- a/src/services/StorageService.ts
+++ b/src/services/StorageService.ts
@@ -0,0 +1,25 @@
+import { StorageData, DEFAULT_STORAGE } from '../types.js';
+
+export class StorageService {
+  static async get<K extends keyof StorageData>(keys: K[]): Promise<Pick<StorageData, K>>;
+  static async get(): Promise<StorageData>;
+  static async get(keys?: (keyof StorageData)[]): Promise<any> {
+    const defaults = DEFAULT_STORAGE;
+    if (keys) {
+      const keyDefaults: any = {};
+      keys.forEach(key => {
+        keyDefaults[key] = defaults[key];
+      });
+      return chrome.storage.local.get(keyDefaults);
+    }
+    return chrome.storage.local.get(defaults);
+  }
+
+  static async set(data: Partial<StorageData>): Promise<void> {
+    return chrome.storage.local.set(data);
+  }
+
+  static async update<K extends keyof StorageData>(key: K, value: StorageData[K]): Promise<void> {
+    return this.set({ [key]: value } as Partial<StorageData>);
+  }
+}
--- a/src/types.ts
+++ b/src/types.ts
@@ -1,5 +1,3 @@
-// Type definitions for the Goose Highlighter extension
-
 export interface HighlightWord {
  wordStr: string;
  background: string;
@@ -30,15 +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;
-}
-
-export interface SectionStates {
-  [sectionName: string]: boolean;
+  highlights?: HighlightInfo[];
+  word?: string;
+  index?: number;
 }

 export interface ExportData {
@@ -46,22 +50,7 @@ export interface ExportData {
  exceptionsList: string[];
 }

-// DOM element selectors used in popup
-export interface PopupElements {
-  listSelect: HTMLSelectElement;
-  listName: HTMLInputElement;
-  listBg: HTMLInputElement;
-  listFg: HTMLInputElement;
-  listActive: HTMLInputElement;
-  bulkPaste: HTMLTextAreaElement;
-  wordList: HTMLDivElement;
-  importInput: HTMLInputElement;
-  matchCase: HTMLInputElement;
-  matchWhole: HTMLInputElement;
-}
-
-// Default storage values
-export const DEFAULT_STORAGE: Partial<StorageData> = {
+export const DEFAULT_STORAGE: StorageData = {
  lists: [],
  globalHighlightEnabled: true,
  matchCaseEnabled: false,
@@ -69,7 +58,8 @@ export const DEFAULT_STORAGE: Partial<StorageData> = {
  exceptionsList: []
 };

-// Constants
-export const WORD_ITEM_HEIGHT = 32;
-export const DEBOUNCE_DELAY = 300;
-export const SCROLL_THROTTLE = 16; // ~60fps
+export const CONSTANTS = {
+  WORD_ITEM_HEIGHT: 32,
+  DEBOUNCE_DELAY: 150,
+  SCROLL_THROTTLE: 16
+} as const;
--- a/src/types/css-highlights.d.ts
+++ b/src/types/css-highlights.d.ts
@@ -0,0 +1,27 @@
+// CSS Highlights API type declarations
+interface Highlight {
+  new(...ranges: Range[]): Highlight;
+  add(range: Range): void;
+  clear(): void;
+  delete(range: Range): boolean;
+  has(range: Range): boolean;
+  readonly size: number;
+}
+
+interface HighlightRegistry {
+  set(name: string, highlight: Highlight): void;
+  get(name: string): Highlight | undefined;
+  delete(name: string): boolean;
+  clear(): void;
+  has(name: string): boolean;
+  readonly size: number;
+}
+
+interface CSS {
+  highlights: HighlightRegistry;
+}
+
+declare var Highlight: {
+  prototype: Highlight;
+  new(...ranges: Range[]): Highlight;
+};
--- a/src/utils/DOMUtils.ts
+++ b/src/utils/DOMUtils.ts
@@ -0,0 +1,41 @@
+export class DOMUtils {
+  static escapeHtml(str: string): string {
+    const escapeMap: Record<string, string> = {
+      '&': '&amp;',
+      '<': '&lt;',
+      '>': '&gt;',
+      '"': '&quot;',
+      "'": '&#39;'
+    };
+    return str.replace(/[&<>"']/g, (match) => escapeMap[match]);
+  }
+
+  static escapeRegex(str: string): string {
+    return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+  }
+
+  static debounce<T extends (...args: any[]) => void>(
+    func: T, 
+    wait: number
+  ): (...args: Parameters<T>) => void {
+    let timeout: number;
+    return (...args: Parameters<T>) => {
+      clearTimeout(timeout);
+      timeout = window.setTimeout(() => func(...args), wait);
+    };
+  }
+
+  static throttle<T extends (...args: any[]) => void>(
+    func: T, 
+    limit: number
+  ): (...args: Parameters<T>) => void {
+    let inThrottle: boolean;
+    return (...args: Parameters<T>) => {
+      if (!inThrottle) {
+        func(...args);
+        inThrottle = true;
+        setTimeout(() => inThrottle = false, limit);
+      }
+    };
+  }
+}
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,7 +1,7 @@
 {
  "compilerOptions": {
    "target": "ES2022",
-    "module": "CommonJS",
+    "module": "ES2022",
    "lib": ["ES2022", "DOM"],
    "outDir": "./dist",
    "rootDir": "./src",
Author	SHA1	Message	Date
semantic-release-bot	3de4190ad7	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`))	2025-11-22 05:41:02 +03:00
Daniel Dada	86b143f5a0	chore: refactor badge handling and highlight rendering for textareas	2025-11-22 05:29:06 +03:00
Daniel Dada	5d7766d5fd	fix: update badge when textarea text changes	2025-11-22 05:19:46 +03:00
Daniel Dada	f800318e66	fix: do not highlight textareas. create badge with popup instead	2025-11-22 05:16:40 +03:00
semantic-release-bot	14ceafd04d	chore(release): 1.10.1 ## [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`](`f3c999ad19`)) * correct matches list buttons handling ([`f895327`](`f895327eb0`)) * go to textarea match ([`fc4ef86`](`fc4ef8655d`))	2025-11-20 22:47:21 +03:00
Daniel Dada	f895327eb0	fix: correct matches list buttons handling fix: pressing on the match list item triggers jump to the current match	2025-11-20 22:46:58 +03:00
Daniel Dada	fc4ef8655d	fix: go to textarea match	2025-11-20 22:35:21 +03:00
Daniel Dada	f3c999ad19	fix: add fake highlighting for textareas	2025-11-20 22:20:01 +03:00
semantic-release-bot	14f1b4b935	chore(release): 1.10.0 # [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`](`348d64f356`)) * made placeholder for textarea, added outline offset ([`4f32be0`](`4f32be0b93`)) ### Features * new tabbed layout ([`18e167c`](`18e167cb7f`)) * show all found words and allow jump to them (beta) ([`1a4c91f`](`1a4c91fd5e`))	2025-11-20 15:48:45 +03:00
Daniel Dada	1a4c91fd5e	feat: show all found words and allow jump to them (beta)	2025-11-20 15:48:28 +03:00
Daniel Dada	1c58357418	chore(i18n): rephrased hint	2025-11-20 14:25:36 +03:00
Daniel Dada	521b3295e6	nit: show spinner while user settings are loaded	2025-11-20 14:13:49 +03:00
Daniel Dada	348d64f356	fix: lighten debounce() usage, do not do full re-render on every change	2025-11-20 14:09:43 +03:00
Daniel Dada	dfdc1742ec	nit: add logo to header	2025-11-20 13:51:06 +03:00
Daniel Dada	18e167cb7f	feat: new tabbed layout	2025-11-20 13:45:42 +03:00
Daniel Dada	0990543aa9	chore(i18n): update missing translations	2025-11-19 16:15:21 +03:00
Daniel Dada	4f32be0b93	fix: made placeholder for textarea, added outline offset	2025-11-19 16:12:55 +03:00
Daniel Dada	1ba701737e	chore: add license	2025-11-19 10:02:59 +03:00
semantic-release-bot	d275a6fd0d	chore(release): 1.9.3 ## [1.9.3](https://github.com/obsqrbtz/goose-highlighter/compare/v1.9.2...v1.9.3) (2025-11-18) ### Bug Fixes * use CSS Custom Highlight API to avoid dom modifications (fixes [#1](https://github.com/obsqrbtz/goose-highlighter/issues/1)) ([`3f2bb60`](`3f2bb6080b`))	2025-11-19 01:26:16 +03:00
Daniel Dada	3f2bb6080b	fix: use CSS Custom Highlight API to avoid dom modifications (fixes #1 )	2025-11-19 01:25:55 +03:00
Daniel Dada	3da28a2ad7	chore: update deps	2025-11-18 20:58:59 +03:00
semantic-release-bot	4f575d9534	chore(release): 1.9.2 ## [1.9.2](https://github.com/obsqrbtz/goose-highlighter/compare/v1.9.1...v1.9.2) (2025-11-14) ### Bug Fixes * highlight: prevent creating extra <span>'s ([#1](https://github.com/obsqrbtz/goose-highlighter/issues/1)) ([`affddd3`](`affddd3dbc`))	2025-11-14 13:40:56 +03:00
Daniel Dada	affddd3dbc	fix(highlight): prevent creating extra <span>'s (#1 )	2025-11-14 13:40:43 +03:00
semantic-release-bot	c8334f9e68	chore(release): 1.9.1 ## [1.9.1](https://github.com/obsqrbtz/goose-highlighter/compare/v1.9.0...v1.9.1) (2025-11-05) ### Bug Fixes * remove halowen styling ([`172aa75`](`172aa7583b`))	2025-11-05 14:59:42 +03:00
Daniel Dada	172aa7583b	fix: remove halowen styling	2025-11-05 14:59:27 +03:00
semantic-release-bot	6d7d9ac151	chore(release): 1.9.0 # [1.9.0](https://github.com/obsqrbtz/goose-highlighter/compare/v1.8.5...v1.9.0) (2025-10-31) ### Features * haloween styling ([`5ef380e`](`5ef380e544`))	2025-10-31 11:17:28 +03:00
Daniel Dada	5ef380e544	feat: haloween styling	2025-10-31 11:17:08 +03:00
semantic-release-bot	c634f6bc8b	chore(release): 1.8.5 ## [1.8.5](https://github.com/obsqrbtz/goose-highlighter/compare/v1.8.4...v1.8.5) (2025-10-29) ### Bug Fixes * highlight colors when multiple list have different configurations ([`67577c8`](`67577c89cf`))	2025-10-29 12:30:37 +03:00
Daniel Dada	67577c89cf	fix: highlight colors when multiple list have different configurations	2025-10-29 12:29:55 +03:00
semantic-release-bot	326e585021	chore(release): 1.8.4 ## [1.8.4](https://github.com/obsqrbtz/goose-highlighter/compare/v1.8.3...v1.8.4) (2025-10-28) ### Bug Fixes * do not re-highlight when already processing highlights ([`8be53f3`](`8be53f3240`))	2025-10-28 15:32:14 +03:00
Daniel Dada	8be53f3240	fix: do not re-highlight when already processing highlights	2025-10-28 15:31:46 +03:00
Daniel Dada	f07617fa55	Merge branch 'main' of https://github.com/obsqrbtz/goose-highlighter	2025-10-09 16:18:53 +03:00
Daniel Dada	e79874922a	added logo	2025-10-09 16:18:36 +03:00
Daniel Dada	71216cbcd9	ci: update manifest in publish workflow	2025-10-08 17:54:06 +03:00
Daniel Dada	f292bd7149	nit: added footer with version and github.	2025-10-08 16:32:04 +03:00
Daniel Dada	584ced252f	ci: publish on version tag push	2025-10-08 16:26:32 +03:00
semantic-release-bot	ff5752da84	chore(release): 1.8.3 ## [1.8.3](https://github.com/obsqrbtz/goose-highlighter/compare/v1.8.2...v1.8.3) (2025-10-08) ### Bug Fixes * stop observing when highlightting is disabled ([`d7c8dbb`](`d7c8dbb5f0`))	2025-10-08 16:11:52 +03:00
Daniel Dada	d7c8dbb5f0	fix: stop observing when highlightting is disabled	2025-10-08 16:11:25 +03:00
semantic-release-bot	bc02d0fb77	chore(release): 1.8.2 ## [1.8.2](https://github.com/obsqrbtz/goose-highlighter/compare/v1.8.1...v1.8.2) (2025-10-08) ### Bug Fixes * do not call save() on all keypresses in textboxes ([`687d7c9`](`687d7c9e62`)) * do not save anything in list settings section until presses the apply button ([`0734bf3`](`0734bf3308`))	2025-10-08 14:33:46 +03:00
Daniel Dada	0734bf3308	fix: do not save anything in list settings section until presses the apply button	2025-10-08 14:33:28 +03:00
Daniel Dada	687d7c9e62	fix: do not call save() on all keypresses in textboxes	2025-10-08 14:11:08 +03:00
Daniel Dada	58d48be6e4	chore: refactor	2025-10-08 13:53:47 +03:00
Daniel Dada	00d2cc592a	ci: exclude scripts dir from release package	2025-10-08 11:42:37 +03:00
Daniel Dada	a6bc14ac76	docs: update readme	2025-10-08 11:34:33 +03:00