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))
fix: stop observing when highlightting is disabled
2026-04-09 04:29:09 +03:00 · 2025-10-08 16:11:52 +03:00 · 2025-10-08 16:11:25 +03:00 · 2025-10-08 14:33:46 +03:00 · 2025-10-08 14:33:28 +03:00 · 2025-10-08 14:11:08 +03:00
43 changed files with 3000 additions and 707 deletions
--- a/.github/workflows/publish-extension.yml
+++ b/.github/workflows/publish-extension.yml
@@ -16,13 +16,25 @@ jobs:
      - name: Checkout repository
        uses: actions/checkout@v4

+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+          cache: 'npm'
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Build extension
+        run: npm run build
+
      - name: Set version from tag
        id: version
        run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT

      - name: Create zip package
        run: |
-          zip -r goose-highlighter.zip . -x '*.git*' 'node_modules/*' 'versioning.md' '.releaserc.json' 'package.json' 'package-lock.json' 'README.md'
+          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
@@ -0,0 +1,103 @@
+name: Create GitHub Release
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  release:
+    name: Create Release with Extension Files
+    runs-on: ubuntu-latest
+    
+    permissions:
+      contents: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+          cache: 'npm'
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Build extension
+        run: npm run build
+
+      - name: Get version from tag
+        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 extension zip
+        run: |
+          zip -r goose-highlighter-${{ steps.version.outputs.VERSION }}.zip . \
+            -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'
+
+      - name: Install Chrome extension packaging tool
+        run: npm install -g crx3
+
+      - name: Generate private key for CRX
+        run: |
+          openssl genrsa -out key.pem 2048
+          
+      - name: Create CRX file
+        run: |
+          # Create a temporary directory for the extension
+          mkdir temp_extension
+          
+          # Copy all files except excluded ones to temp directory
+          rsync -av --exclude='.git*' --exclude='node_modules' --exclude='src' \
+                --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' \
+                --exclude='CHANGELOG.md' --exclude='PRIVACY.MD' \
+                --exclude='key.pem' --exclude='temp_extension' \
+                ./ temp_extension/
+          
+          # Create CRX file
+          crx3 temp_extension -o goose-highlighter-${{ steps.version.outputs.VERSION }}.crx -p key.pem
+          
+          # Clean up
+          rm -rf temp_extension key.pem
+
+      - name: Generate release notes
+        id: release_notes
+        run: |
+          if [ -f CHANGELOG.md ]; then
+            # Extract the latest version's changes from CHANGELOG.md
+            awk '/^## \[${{ steps.version.outputs.VERSION }}\]/{flag=1; next} /^## \[/{flag=0} flag' CHANGELOG.md > release_notes.txt
+            if [ -s release_notes.txt ]; then
+              echo "RELEASE_NOTES<<EOF" >> $GITHUB_OUTPUT
+              cat release_notes.txt >> $GITHUB_OUTPUT
+              echo "EOF" >> $GITHUB_OUTPUT
+            else
+              echo "RELEASE_NOTES=Release ${{ steps.version.outputs.VERSION }}" >> $GITHUB_OUTPUT
+            fi
+          else
+            echo "RELEASE_NOTES=Release ${{ steps.version.outputs.VERSION }}" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Create GitHub Release
+        uses: softprops/action-gh-release@v1
+        with:
+          tag_name: ${{ github.ref_name }}
+          name: Release ${{ steps.version.outputs.VERSION }}
+          body: ${{ steps.release_notes.outputs.RELEASE_NOTES }}
+          files: |
+            goose-highlighter-${{ steps.version.outputs.VERSION }}.zip
+            goose-highlighter-${{ steps.version.outputs.VERSION }}.crx
+          draft: false
+          prerelease: false
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,6 @@
 node_modules
+
+dist
+
+# Auto-generated files
+src/content-standalone.ts
--- a/.releaserc.json
+++ b/.releaserc.json
@@ -19,7 +19,7 @@
                    "manifest.json",
                    "CHANGELOG.md"
                ],
-                "message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
+                "message": "chore(release): ${nextRelease.version}\n\n${nextRelease.notes}"
            }
        ]
    ]
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,33 @@
+## [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)
+
+
+### Features
+
+* add collapsible sections ([a158a30](https://github.com/obsqrbtz/goose-highlighter/commit/a158a303b01416f81e69bb137b71d3369904b044))
+* add websites to exception list ([915add3](https://github.com/obsqrbtz/goose-highlighter/commit/915add3a4cdbff390a4d0f7d227a4ece5fa31072))
+
+## [1.7.2](https://github.com/obsqrbtz/goose-highlighter/compare/v1.7.1...v1.7.2) (2025-10-06)
+
+
+### Bug Fixes
+
+* do not create <mark> elements, just wrap found words in <span> and add .css styling ([6ba0d2e](https://github.com/obsqrbtz/goose-highlighter/commit/6ba0d2eb7c7346cdca3921a12d300a714439efa5))
+
 ## [1.7.1](https://github.com/obsqrbtz/goose-highlighter/compare/v1.7.0...v1.7.1) (2025-06-27)


--- a/README.md
+++ b/README.md
@@ -1,15 +1,58 @@
 # 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.
- **Import/Export:** Backup or share your highlight lists as JSON files.
+- **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
@@ -94,5 +94,29 @@
 },
  "options": { "message": "Optionen" },
  "match_case": { "message": "Groß-/Kleinschreibung beachten" },
-  "match_whole": { "message": "Ganzes Wort übereinstimmen" }
+  "match_whole": { "message": "Ganzes Wort übereinstimmen" },
+  "site_exceptions": {
+    "message": "Website-Ausnahmen"
+  },
+  "add_exception": {
+    "message": "Zu Ausnahmen hinzufügen"
+  },
+  "remove_exception": {
+    "message": "Aus Ausnahmen entfernen"
+  },
+  "manage_exceptions": {
+    "message": "Verwalten"
+  },
+  "exceptions_list": {
+    "message": "Ausnahme-Websites:"
+  },
+  "clear_all": {
+    "message": "Alle löschen"
+  },
+  "confirm_clear_exceptions": {
+    "message": "Möchten Sie wirklich alle Ausnahmen löschen?"
+  },
+  "remove": {
+    "message": "Entfernen"
+  }
 }
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -100,5 +100,29 @@
  },
  "match_whole": {
    "message": "Match Whole Word"
+  },
+  "site_exceptions": {
+    "message": "Site Exceptions"
+  },
+  "add_exception": {
+    "message": "Add to Exceptions"
+  },
+  "remove_exception": {
+    "message": "Remove from Exceptions"
+  },
+  "manage_exceptions": {
+    "message": "Manage"
+  },
+  "exceptions_list": {
+    "message": "Exception Sites:"
+  },
+  "clear_all": {
+    "message": "Clear All"
+  },
+  "confirm_clear_exceptions": {
+    "message": "Are you sure you want to clear all exceptions?"
+  },
+  "remove": {
+    "message": "Remove"
  }
 }
--- a/_locales/es/messages.json
+++ b/_locales/es/messages.json
@@ -100,5 +100,29 @@
  },
  "match_whole": {
    "message": "Coincidir palabra completa"
+  },
+  "site_exceptions": {
+    "message": "Excepciones de sitios"
+  },
+  "add_exception": {
+    "message": "Agregar a excepciones"
+  },
+  "remove_exception": {
+    "message": "Quitar de excepciones"
+  },
+  "manage_exceptions": {
+    "message": "Gestionar"
+  },
+  "exceptions_list": {
+    "message": "Sitios de excepción:"
+  },
+  "clear_all": {
+    "message": "Limpiar todo"
+  },
+  "confirm_clear_exceptions": {
+    "message": "¿Estás seguro de que deseas limpiar todas las excepciones?"
+  },
+  "remove": {
+    "message": "Eliminar"
  }
 }
--- a/_locales/fr/messages.json
+++ b/_locales/fr/messages.json
@@ -100,5 +100,29 @@
    },
    "match_whole": {
        "message": "Mot entier seulement"
+    },
+    "site_exceptions": {
+        "message": "Exceptions de sites"
+    },
+    "add_exception": {
+        "message": "Ajouter aux exceptions"
+    },
+    "remove_exception": {
+        "message": "Retirer des exceptions"
+    },
+    "manage_exceptions": {
+        "message": "Gérer"
+    },
+    "exceptions_list": {
+        "message": "Sites d'exception :"
+    },
+    "clear_all": {
+        "message": "Tout effacer"
+    },
+    "confirm_clear_exceptions": {
+        "message": "Êtes-vous sûr de vouloir effacer toutes les exceptions ?"
+    },
+    "remove": {
+        "message": "Supprimer"
    }
 }
--- a/_locales/hi/messages.json
+++ b/_locales/hi/messages.json
@@ -100,5 +100,29 @@
    },
    "match_whole": {
        "message": "पूरा शब्द मिलाएं"
+    },
+    "site_exceptions": {
+        "message": "साइट अपवाद"
+    },
+    "add_exception": {
+        "message": "अपवादों में जोड़ें"
+    },
+    "remove_exception": {
+        "message": "अपवादों से हटाएं"
+    },
+    "manage_exceptions": {
+        "message": "प्रबंधित करें"
+    },
+    "exceptions_list": {
+        "message": "अपवाद साइटें:"
+    },
+    "clear_all": {
+        "message": "सभी साफ करें"
+    },
+    "confirm_clear_exceptions": {
+        "message": "क्या आप वाकई सभी अपवादों को साफ करना चाहते हैं?"
+    },
+    "remove": {
+        "message": "हटाएं"
    }
 }
--- a/_locales/it/messages.json
+++ b/_locales/it/messages.json
@@ -100,5 +100,29 @@
    },
    "match_whole": {
        "message": "Solo parola intera"
+    },
+    "site_exceptions": {
+        "message": "Eccezioni siti"
+    },
+    "add_exception": {
+        "message": "Aggiungi alle eccezioni"
+    },
+    "remove_exception": {
+        "message": "Rimuovi dalle eccezioni"
+    },
+    "manage_exceptions": {
+        "message": "Gestisci"
+    },
+    "exceptions_list": {
+        "message": "Siti di eccezione:"
+    },
+    "clear_all": {
+        "message": "Cancella tutto"
+    },
+    "confirm_clear_exceptions": {
+        "message": "Sei sicuro di voler cancellare tutte le eccezioni?"
+    },
+    "remove": {
+        "message": "Rimuovi"
    }
 }
--- a/_locales/ja/messages.json
+++ b/_locales/ja/messages.json
@@ -100,5 +100,29 @@
    },
    "match_whole": {
        "message": "完全一致"
+    },
+    "site_exceptions": {
+        "message": "サイト例外"
+    },
+    "add_exception": {
+        "message": "例外に追加"
+    },
+    "remove_exception": {
+        "message": "例外から削除"
+    },
+    "manage_exceptions": {
+        "message": "管理"
+    },
+    "exceptions_list": {
+        "message": "例外サイト:"
+    },
+    "clear_all": {
+        "message": "すべてクリア"
+    },
+    "confirm_clear_exceptions": {
+        "message": "すべての例外をクリアしてもよろしいですか？"
+    },
+    "remove": {
+        "message": "削除"
    }
 }
--- a/_locales/ko/messages.json
+++ b/_locales/ko/messages.json
@@ -100,5 +100,29 @@
    },
    "match_whole": {
        "message": "전체 단어 일치"
+    },
+    "site_exceptions": {
+        "message": "사이트 예외"
+    },
+    "add_exception": {
+        "message": "예외에 추가"
+    },
+    "remove_exception": {
+        "message": "예외에서 제거"
+    },
+    "manage_exceptions": {
+        "message": "관리"
+    },
+    "exceptions_list": {
+        "message": "예외 사이트:"
+    },
+    "clear_all": {
+        "message": "모두 지우기"
+    },
+    "confirm_clear_exceptions": {
+        "message": "모든 예외를 지우시겠습니까?"
+    },
+    "remove": {
+        "message": "제거"
    }
 }
--- a/_locales/nl/messages.json
+++ b/_locales/nl/messages.json
@@ -100,5 +100,29 @@
  },
  "match_whole": {
    "message": "Alleen volledig woord"
+  },
+  "site_exceptions": {
+    "message": "Site-uitzonderingen"
+  },
+  "add_exception": {
+    "message": "Toevoegen aan uitzonderingen"
+  },
+  "remove_exception": {
+    "message": "Verwijderen uit uitzonderingen"
+  },
+  "manage_exceptions": {
+    "message": "Beheren"
+  },
+  "exceptions_list": {
+    "message": "Uitzondering sites:"
+  },
+  "clear_all": {
+    "message": "Alles wissen"
+  },
+  "confirm_clear_exceptions": {
+    "message": "Weet je zeker dat je alle uitzonderingen wilt wissen?"
+  },
+  "remove": {
+    "message": "Verwijderen"
  }
 }
--- a/_locales/pl/messages.json
+++ b/_locales/pl/messages.json
@@ -100,5 +100,29 @@
  },
  "match_whole": {
    "message": "Tylko całe słowo"
+  },
+  "site_exceptions": {
+    "message": "Wyjątki stron"
+  },
+  "add_exception": {
+    "message": "Dodaj do wyjątków"
+  },
+  "remove_exception": {
+    "message": "Usuń z wyjątków"
+  },
+  "manage_exceptions": {
+    "message": "Zarządzaj"
+  },
+  "exceptions_list": {
+    "message": "Strony wyjątków:"
+  },
+  "clear_all": {
+    "message": "Wyczyść wszystko"
+  },
+  "confirm_clear_exceptions": {
+    "message": "Czy na pewno chcesz wyczyścić wszystkie wyjątki?"
+  },
+  "remove": {
+    "message": "Usuń"
  }
 }
--- a/_locales/pt_BR/messages.json
+++ b/_locales/pt_BR/messages.json
@@ -94,5 +94,29 @@
 },
  "options": { "message": "Opções" },
  "match_case": { "message": "Diferenciar maiúsculas/minúsculas" },
-  "match_whole": { "message": "Palavra inteira" }
+  "match_whole": { "message": "Palavra inteira" },
+  "site_exceptions": {
+    "message": "Exceções de sites"
+  },
+  "add_exception": {
+    "message": "Adicionar às exceções"
+  },
+  "remove_exception": {
+    "message": "Remover das exceções"
+  },
+  "manage_exceptions": {
+    "message": "Gerenciar"
+  },
+  "exceptions_list": {
+    "message": "Sites de exceção:"
+  },
+  "clear_all": {
+    "message": "Limpar tudo"
+  },
+  "confirm_clear_exceptions": {
+    "message": "Tem certeza de que deseja limpar todas as exceções?"
+  },
+  "remove": {
+    "message": "Remover"
+  }
 }
--- a/_locales/ru/messages.json
+++ b/_locales/ru/messages.json
@@ -100,5 +100,29 @@
  },
  "match_whole": {
    "message": "Слово целиком"
+  },
+  "site_exceptions": {
+    "message": "Сайты-исключения"
+  },
+  "add_exception": {
+    "message": "Добавить в исключения"
+  },
+  "remove_exception": {
+    "message": "Удалить из исключений"
+  },
+  "manage_exceptions": {
+    "message": "Управление"
+  },
+  "exceptions_list": {
+    "message": "Сайты-исключения:"
+  },
+  "clear_all": {
+    "message": "Очистить все"
+  },
+  "confirm_clear_exceptions": {
+    "message": "Вы уверены, что хотите очистить все исключения?"
+  },
+  "remove": {
+    "message": "Удалить"
  }
 }
--- a/_locales/tr/messages.json
+++ b/_locales/tr/messages.json
@@ -100,5 +100,29 @@
  },
  "match_whole": {
    "message": "Tüm kelimeyle eşleş"
+  },
+  "site_exceptions": {
+    "message": "Site İstisnaları"
+  },
+  "add_exception": {
+    "message": "İstisnalara Ekle"
+  },
+  "remove_exception": {
+    "message": "İstisnalardan Çıkar"
+  },
+  "manage_exceptions": {
+    "message": "Yönet"
+  },
+  "exceptions_list": {
+    "message": "İstisna Siteleri:"
+  },
+  "clear_all": {
+    "message": "Hepsini Temizle"
+  },
+  "confirm_clear_exceptions": {
+    "message": "Tüm istisnaları temizlemek istediğinizden emin misiniz?"
+  },
+  "remove": {
+    "message": "Kaldır"
  }
 }
--- a/_locales/zh_CN/messages.json
+++ b/_locales/zh_CN/messages.json
@@ -100,5 +100,29 @@
  },
  "match_whole": {
    "message": "全词匹配"
+  },
+  "site_exceptions": {
+    "message": "网站例外"
+  },
+  "add_exception": {
+    "message": "添加到例外"
+  },
+  "remove_exception": {
+    "message": "从例外中移除"
+  },
+  "manage_exceptions": {
+    "message": "管理"
+  },
+  "exceptions_list": {
+    "message": "例外网站："
+  },
+  "clear_all": {
+    "message": "清除全部"
+  },
+  "confirm_clear_exceptions": {
+    "message": "您确定要清除所有例外吗？"
+  },
+  "remove": {
+    "message": "移除"
  }
 }
--- a/background.js
+++ b/background.js
@@ -1,10 +0,0 @@
-chrome.tabs.onUpdated.addListener((tabId, changeInfo, tab) => {
-    if (changeInfo.status === "complete" && /^https?:/.test(tab.url)) {
-        chrome.scripting.executeScript({
-            target: { tabId },
-            files: ["main.js"]
-        }).catch(err => {
-            console.warn("Injection failed:", err);
-        });
-    }
-});
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -0,0 +1,40 @@
+import globals from 'globals';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import js from '@eslint/js';
+import { FlatCompat } from '@eslint/eslintrc';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const compat = new FlatCompat({
+    baseDirectory: __dirname,
+    recommendedConfig: js.configs.recommended,
+    allConfig: js.configs.all
+});
+
+export default [...compat.extends('eslint:recommended'), {
+    languageOptions: {
+        globals: {
+            ...globals.browser,
+            ...globals.webextensions,
+            chrome: 'readonly',
+        },
+
+        ecmaVersion: 12,
+        sourceType: 'module',
+    },
+
+    rules: {
+        semi: ['error', 'always'],
+        quotes: ['error', 'single'],
+    },
+}, {
+    files: ['scripts/**/*.js'],
+    languageOptions: {
+        globals: {
+            ...globals.node,
+        },
+        ecmaVersion: 12,
+        sourceType: 'module',
+    },
+}];
--- a/main.js
+++ b/main.js
@@ -1,155 +0,0 @@
-let currentLists = [];
-let isGlobalHighlightEnabled = true;
-let matchCase = false;
-let matchWhole = false;
-
-function escapeRegex(s) {
-  return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
-
-function clearHighlights() {
-  // Remove all <mark> elements added by the highlighter
-  const marks = document.querySelectorAll('mark[data-gh]');
-  for (const mark of marks) {
-    // Replace the <mark> with its text content
-    const parent = mark.parentNode;
-    if (parent) {
-      parent.replaceChild(document.createTextNode(mark.textContent), mark);
-      parent.normalize(); // Merge adjacent text nodes
-    }
-  }
-}
-
-
-function processNodes() {
-  observer.disconnect();
-  clearHighlights();
-
-  // If global highlighting is disabled, skip processing
-  if (!isGlobalHighlightEnabled) {
-    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.nodeName === 'MARK') 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) {
-  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 word = wordMap.get(lookup) || { background: '#ffff00', foreground: '#000000' };
-        return `<mark data-gh style="background:${word.background};color:${word.foreground};padding:0 2px;">${match}</mark>`;
-      });
-
-      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();
-}
-
-// Debounce helper function
-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"], ({ lists, globalHighlightEnabled, matchCaseEnabled, matchWholeEnabled }) => {
-  if (Array.isArray(lists)) setListsAndUpdate(lists);
-  if (globalHighlightEnabled !== undefined) {
-    isGlobalHighlightEnabled = globalHighlightEnabled;
-  }
-  matchCase = !!matchCaseEnabled;
-  matchWhole = !!matchWholeEnabled;
-  processNodes();
-});
-
-// Listen for updates from the popup and re-apply highlights
-chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
-  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();
-  }
-});
-
-// 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);
--- a/manifest.json
+++ b/manifest.json
@@ -2,11 +2,12 @@
  "manifest_version": 3,
  "name": "__MSG_extension_name__",
  "description": "__MSG_extension_description__",
-  "version": "1.7.1",
+  "version": "1.8.3",
  "default_locale": "en",
  "permissions": [
    "scripting",
-    "storage"
+    "storage",
+    "tabs"
  ],
  "host_permissions": [
    "<all_urls>"
@@ -16,7 +17,8 @@
    "default_icon": "icons/icon128.png"
  },
  "background": {
-    "service_worker": "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
@@ -1,11 +1,21 @@
 {
  "devDependencies": {
+    "@eslint/css": "^0.9.0",
+    "@eslint/js": "^9.30.0",
    "@semantic-release/changelog": "^6.0.3",
    "@semantic-release/exec": "^7.1.0",
    "@semantic-release/git": "^10.0.1",
-    "semantic-release": "^24.2.5"
+    "@types/chrome": "^0.0.270",
+    "eslint": "^9.30.0",
+    "globals": "^16.2.0",
+    "semantic-release": "^24.2.5",
+    "typescript": "^5.6.0"
  },
  "scripts": {
-    "prepare": "node scripts/update-manifest-version.js"
+    "build": "node scripts/build-content-standalone.js && tsc",
+    "watch": "tsc --watch",
+    "clean": "rimraf dist",
+    "rebuild": "npm run clean && npm run build",
+    "prepare": "npm run build && node scripts/update-manifest-version.js"
  }
 }
--- a/popup/popup.css
+++ b/popup/popup.css
@@ -80,6 +80,7 @@ h1 {
  border-radius: var(--border-radius);
  padding: 14px;
  box-shadow: var(--shadow);
+  transition: all 0.2s ease;
 }

 .section-header {
@@ -87,6 +88,60 @@ h1 {
  justify-content: space-between;
  align-items: center;
  margin-bottom: 10px;
+  cursor: pointer;
+  padding-left: 8px;
+  padding-right: 8px;
+}
+
+.section-header:hover {
+  background: var(--highlight-tag);
+  border-radius: 6px;
+  transition: background 0.2s ease;
+}
+
+.collapse-toggle {
+  background: none !important;
+  border: none !important;
+  color: var(--text-color) !important;
+  padding: 4px !important;
+  margin: 0 !important;
+  cursor: pointer;
+  border-radius: 4px;
+  transition: all 0.2s ease;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 24px;
+  height: 24px;
+}
+
+.collapse-toggle:hover {
+  background: var(--button-hover) !important;
+  color: var(--accent) !important;
+}
+
+.collapse-toggle i {
+  transition: transform 0.2s ease;
+  font-size: 0.8em;
+}
+
+.section.collapsed .collapse-toggle i {
+  transform: rotate(180deg);
+}
+
+.section-content {
+  overflow: hidden;
+  max-height: 2000px;
+}
+
+.section.collapsed .section-content {
+  max-height: 0;
+  margin-bottom: 0;
+  padding-bottom: 0;
+}
+
+.section.collapsed .section-header {
+  margin-bottom: 0;
 }

 .section h2 {
@@ -96,6 +151,7 @@ h1 {
  display: flex;
  align-items: center;
  gap: 8px;
+  flex: 1;
 }

 input[type="text"],
@@ -506,3 +562,54 @@ body::-webkit-scrollbar-corner,
 #wordList::-webkit-scrollbar-corner {
  background: var(--scrollbar-bg);
 }
+
+/* Exception Panel Styles */
+.exceptions-panel {
+  margin-top: 10px;
+  padding: 12px;
+  border: 1px solid var(--input-border);
+  border-radius: var(--border-radius);
+  background: var(--input-bg);
+}
+
+.exceptions-list {
+  max-height: 120px;
+  overflow-y: auto;
+  margin: 8px 0;
+  border: 1px solid var(--input-border);
+  border-radius: 6px;
+  background: var(--section-bg);
+}
+
+.exception-item {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 8px 12px;
+  border-bottom: 1px solid var(--highlight-tag-border);
+  font-size: 12px;
+}
+
+.exception-item:last-child {
+  border-bottom: none;
+}
+
+.exception-domain {
+  flex: 1;
+  word-break: break-all;
+  margin-right: 8px;
+}
+
+.exception-remove {
+  background: var(--danger);
+  color: white;
+  border: none;
+  padding: 4px 8px;
+  border-radius: 4px;
+  cursor: pointer;
+  font-size: 10px;
+}
+
+.exception-remove:hover {
+  background: #d00030;
+}
--- a/popup/popup.html
+++ b/popup/popup.html
@@ -29,74 +29,127 @@
      </div>
    </div>

-    <div class="section">
+    <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>
+
+    <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>
-      <label for="listSelect" data-i18n="select_list">Select List:</label>
-      <select id="listSelect"></select>
-      <div class="button-row">
-        <button id="newListBtn"><i class="fa-solid fa-plus"></i> <span data-i18n="new_list">New</span></button>
-        <button id="deleteListBtn" class="danger"><i class="fa-solid fa-trash"></i> <span
-            data-i18n="delete_list">Delete</span></button>
-      </div>
-    </div>
-
-    <div class="section">
-      <h2><i class="fa-solid fa-gear"></i> <span data-i18n="list_settings">List Settings</span></h2>
-      <label><span data-i18n="list_name">List Name:</span> <input type="text" id="listName" /></label>
-      <div class="color-row">
-        <div class="color-label">
-          <span data-i18n="background">Background:</span>
-          <input type="color" id="listBg" />
-        </div>
-        <div class="color-label">
-          <span data-i18n="foreground">Foreground:</span>
-          <input type="color" id="listFg" />
+      <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">
+          <button id="newListBtn"><i class="fa-solid fa-plus"></i> <span data-i18n="new_list">New</span></button>
+          <button id="deleteListBtn" class="danger"><i class="fa-solid fa-trash"></i> <span
+              data-i18n="delete_list">Delete</span></button>
        </div>
      </div>
-      <label>
-        <span data-i18n="enable_highlight">Enable Highlighting</span>
-        <input type="checkbox" class="switch" id="listActive" />
-      </label>
    </div>

-    <div class="section">
-      <h2><i class="fa-solid fa-pen"></i> <span data-i18n="add_words">Add Words</span></h2>
-      <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 class="section">
-      <h2><i class="fa-solid fa-tags"></i> <span data-i18n="word_list">Word List</span>(<span id="wordCount">0</span>)
-      </h2>
-      <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>
-        <button id="enableSelectedBtn"><span data-i18n="enable_selected">Enable</span></button>
-        <button id="disableSelectedBtn"><span data-i18n="disable_selected">Disable</span></button>
-        <button id="deleteSelectedBtn" class="danger"><span data-i18n="delete_selected">Delete</span></button>
+    <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">
+        <label><span data-i18n="list_name">List Name:</span> <input type="text" id="listName" /></label>
+        <div class="color-row">
+          <div class="color-label">
+            <span data-i18n="background">Background:</span>
+            <input type="color" id="listBg" />
+          </div>
+          <div class="color-label">
+            <span data-i18n="foreground">Foreground:</span>
+            <input type="color" id="listFg" />
+          </div>
+        </div>
+        <label>
+          <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>
-      <input type="text" id="wordSearch" data-i18n="search_placeholder" placeholder="Search..." />
-      <div id="wordList"></div>
    </div>

-    <div class="section">
-      <h2><i class="fa-solid fa-sliders"></i> <span data-i18n="options">Options</span></h2>
-      <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>
+    <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="button-row">
-        <button id="importBtn"><i class="fa-solid fa-upload"></i> <span data-i18n="import_list">Import</span></button>
-        <input type="file" id="importInput" accept="application/json" hidden />
-        <button id="exportBtn"><i class="fa-solid fa-download"></i> <span data-i18n="export_list">Export</span></button>
+      <div class="section-content" id="addwords-content">
+        <textarea id="bulkPaste" data-i18n="paste_hint" placeholder="Paste words here..."></textarea>
+        <button id="addWordsBtn"><span data-i18n="apply_paste">Add Words</span></button>
+      </div>
+    </div>
+
+    <div class="section" data-section="wordlist">
+      <div class="section-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">
+        <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>
+          <button id="enableSelectedBtn"><span data-i18n="enable_selected">Enable</span></button>
+          <button id="disableSelectedBtn"><span data-i18n="disable_selected">Disable</span></button>
+          <button id="deleteSelectedBtn" class="danger"><span data-i18n="delete_selected">Delete</span></button>
+        </div>
+        <input type="text" id="wordSearch" data-i18n="search_placeholder" placeholder="Search..." />
+        <div id="wordList"></div>
+      </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>
+      <div class="section-content" id="options-content">
+        <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>
+        </div>
+        <div class="button-row">
+          <button id="importBtn"><i class="fa-solid fa-upload"></i> <span data-i18n="import_list">Import</span></button>
+          <input type="file" id="importInput" accept="application/json" hidden />
+          <button id="exportBtn"><i class="fa-solid fa-download"></i> <span data-i18n="export_list">Export</span></button>
+        </div>
      </div>
    </div>
  </div>

-  <script src="../storage.js"></script>
-  <script src="popup.js"></script>
+  <script type="module" src="../dist/popup/popup.js"></script>
 </body>

 </html>
--- a/popup/popup.js
+++ b/popup/popup.js
@@ -1,459 +0,0 @@
-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 saveTimeout;
-let selectedCheckboxes = new Set();
-let globalHighlightEnabled = true;
-let wordSearchQuery = "";
-let matchCaseEnabled = false;
-let matchWholeEnabled = false;
-
-function escapeHtml(str) {
-  return str.replace(/[&<>"']/g, function (m) {
-    return ({
-      '&': '&amp;',
-      '<': '&lt;',
-      '>': '&gt;',
-      '"': '&quot;',
-      "'": '&#39;'
-    })[m];
-  });
-}
-
-async function debouncedSave() {
-  clearTimeout(saveTimeout);
-  saveTimeout = setTimeout(async () => {
-    await chrome.storage.local.set({ lists });
-  }, 500);
-}
-
-async function save() {
-  await chrome.storage.local.set({
-    lists: lists,
-    globalHighlightEnabled: globalHighlightEnabled,
-    matchCaseEnabled,
-    matchWholeEnabled
-  });
-  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
-        });
-      }
-    }
-  });
-}
-
-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
-  });
-  lists = res.lists;
-  globalHighlightEnabled = res.globalHighlightEnabled !== false;
-  matchCaseEnabled = !!res.matchCaseEnabled;
-  matchWholeEnabled = !!res.matchWholeEnabled;
-  matchCase.checked = matchCaseEnabled;
-  matchWhole.checked = matchWholeEnabled;
-
-  if (!lists.length) {
-    lists.push({
-      id: Date.now(),
-      name: chrome.i18n.getMessage("default_list_name"),
-      background: "#ffff00",
-      foreground: "#000000",
-      active: true,
-      words: []
-    });
-  }
-  renderLists();
-  renderWords();
-
-  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;
-  }
-}
-
-document.addEventListener('DOMContentLoaded', () => {
-  localizePage();
-  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 blob = new Blob([JSON.stringify(lists, 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)) {
-          lists = data;
-          currentListIndex = 0;
-          save();
-        }
-      } catch (err) {
-        alert(chrome.i18n.getMessage("invalid_json_error"));
-      }
-    };
-    reader.readAsText(file);
-  };
-
-  function localizePage() {
-    const elements = document.querySelectorAll('[data-i18n]');
-    elements.forEach(element => {
-      const message = element.dataset.i18n;
-      const localizedText = chrome.i18n.getMessage(message);
-      if (localizedText) {
-        if (element.tagName === 'INPUT' && element.hasAttribute('placeholder')) {
-          element.placeholder = localizedText;
-        } else {
-          element.textContent = localizedText;
-        }
-      }
-    });
-  }
-
-  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;
-  }
-
-  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();
-  });
-
-  load();
-});
--- 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
@@ -1,13 +1,13 @@
-const fs = require("fs");
+const fs = require('fs');

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

-const manifest = JSON.parse(fs.readFileSync("manifest.json", "utf-8"));
+const manifest = JSON.parse(fs.readFileSync('manifest.json', 'utf-8'));
 manifest.version = version;
-fs.writeFileSync("manifest.json", JSON.stringify(manifest, null, 2));
+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
@@ -0,0 +1,36 @@
+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/content-standalone.js']
+                }).catch((err: unknown) => {
+                    console.warn('Injection failed:', err);
+                });
+            }
+        });
+    }
+
+    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,115 @@
+import { HighlightList, MessageData } from '../types.js';
+import { StorageService } from '../services/StorageService.js';
+import { MessageService } from '../services/MessageService.js';
+import { HighlightEngine } from './HighlightEngine.js';
+import { DOMUtils } from '../utils/DOMUtils.js';
+
+export class ContentScript {
+  private lists: HighlightList[] = [];
+  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.setupScrollHandler();
+    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) => {
+      switch (message.type) {
+        case 'WORD_LIST_UPDATED':
+          this.handleWordListUpdate();
+          break;
+        case 'GLOBAL_TOGGLE_UPDATED':
+          this.handleGlobalToggleUpdate(message.enabled!);
+          break;
+        case 'MATCH_OPTIONS_UPDATED':
+          this.handleMatchOptionsUpdate(message.matchCase!, message.matchWhole!);
+          break;
+        case 'EXCEPTIONS_LIST_UPDATED':
+          this.handleExceptionsUpdate();
+          break;
+      }
+    });
+  }
+
+  private setupScrollHandler(): void {
+    const debouncedProcess = DOMUtils.debounce(() => this.processHighlights(), 300);
+    window.addEventListener('scroll', debouncedProcess);
+  }
+
+  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;
+    }
+  }
+}
--- a/src/content/HighlightEngine.ts
+++ b/src/content/HighlightEngine.ts
@@ -0,0 +1,195 @@
+import { HighlightList, ActiveWord } from '../types.js';
+import { DOMUtils } from '../utils/DOMUtils.js';
+
+export class HighlightEngine {
+  private styleSheet: CSSStyleSheet | null = null;
+  private wordStyleMap = new Map<string, string>();
+  private observer: MutationObserver;
+
+  constructor(private onUpdate: () => void) {
+    this.observer = new MutationObserver(DOMUtils.debounce((mutations: MutationRecord[]) => {
+      const hasRelevantChanges = mutations.some((mutation: MutationRecord) => {
+        if (mutation.target instanceof Element && mutation.target.hasAttribute('data-gh')) {
+          return false;
+        }
+        const addedNodes = Array.from(mutation.addedNodes);
+        const removedNodes = Array.from(mutation.removedNodes);
+        const isOurChange = [...addedNodes, ...removedNodes].some(node => 
+          node instanceof Element && (node.hasAttribute('data-gh') || node.querySelector('[data-gh]'))
+        );
+        return !isOurChange;
+      });
+      
+      if (hasRelevantChanges) {
+        onUpdate();
+      }
+    }, 300));
+  }
+
+  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 updateWordStyles(activeWords: ActiveWord[]): void {
+    this.initializeStyleSheet();
+    
+    while (this.styleSheet!.cssRules.length > 0) {
+      this.styleSheet!.deleteRule(0);
+    }
+    
+    this.wordStyleMap.clear();
+    const uniqueStyles = new Map<string, string>();
+    
+    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; }`;
+        this.styleSheet!.insertRule(rule, this.styleSheet!.cssRules.length);
+      }
+      
+      const lookup = word.text;
+      this.wordStyleMap.set(lookup, uniqueStyles.get(styleKey)!);
+    }
+  }
+
+  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 && (node.parentNode as Element).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 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 {
+    this.observer.disconnect();
+    
+    this.clearHighlightsInternal();
+
+    const activeWords = this.extractActiveWords(lists);
+    if (activeWords.length === 0) {
+      this.startObserving();
+      return;
+    }
+
+    this.updateWordStyles(activeWords);
+    
+    const wordMap = new Map<string, ActiveWord>();
+    for (const word of activeWords) {
+      const key = matchCase ? word.text : word.text.toLowerCase();
+      wordMap.set(key, word);
+    }
+
+    const flags = matchCase ? 'gu' : 'giu';
+    let wordsPattern = Array.from(wordMap.keys()).map(DOMUtils.escapeRegex).join('|');
+    
+    if (matchWhole) {
+      wordsPattern = `(?:(?<!\\p{L})|^)(${wordsPattern})(?:(?!\\p{L})|$)`;
+    }
+    
+    try {
+      const pattern = new RegExp(`(${wordsPattern})`, flags);
+      const textNodes = this.getTextNodes();
+
+      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 = this.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);
+    }
+
+    this.startObserving();
+  }
+
+  private clearHighlightsInternal(): void {
+    const highlightedElements = document.querySelectorAll('[data-gh]');
+    highlightedElements.forEach(element => {
+      const parent = element.parentNode;
+      if (parent) {
+        parent.replaceChild(document.createTextNode(element.textContent || ''), element);
+        parent.normalize();
+      }
+    });
+    
+    if (this.styleSheet && this.styleSheet.cssRules.length > 0) {
+      while (this.styleSheet.cssRules.length > 0) {
+        this.styleSheet.deleteRule(0);
+      }
+    }
+  }
+
+  stopObserving(): void {
+    this.observer.disconnect();
+  }
+
+  private startObserving(): void {
+    this.observer.observe(document.body, {
+      childList: true,
+      subtree: true,
+      characterData: true,
+      // Don't observe attribute changes to avoid triggering on our own style changes
+      attributes: false
+    });
+  }
+
+  destroy(): void {
+    this.observer.disconnect();
+    this.clearHighlights();
+  }
+}
--- a/src/main.ts
+++ b/src/main.ts
@@ -0,0 +1,3 @@
+import { ContentScript } from './content/ContentScript.js';
+
+new ContentScript();
--- a/src/popup/PopupController.ts
+++ b/src/popup/PopupController.ts
@@ -0,0 +1,638 @@
+import { HighlightList, HighlightWord, ExportData } 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 sectionStates: Record<string, boolean> = {};
+
+  async initialize(): Promise<void> {
+    await this.loadData();
+    await this.getCurrentTab();
+    this.loadSectionStates();
+    this.initializeSectionStates();
+    this.setupEventListeners();
+    this.render();
+  }
+
+  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 loadSectionStates(): void {
+    const saved = localStorage.getItem('goose-highlighter-section-states');
+    if (saved) {
+      try {
+        this.sectionStates = JSON.parse(saved);
+      } catch {
+        this.sectionStates = {};
+      }
+    }
+  }
+
+  private saveSectionStates(): void {
+    localStorage.setItem('goose-highlighter-section-states', JSON.stringify(this.sectionStates));
+  }
+
+  private initializeSectionStates(): void {
+    Object.keys(this.sectionStates).forEach(sectionName => {
+      const section = document.querySelector(`[data-section="${sectionName}"]`);
+      if (section && this.sectionStates[sectionName]) {
+        section.classList.add('collapsed');
+      }
+    });
+  }
+
+  private setupEventListeners(): void {
+    this.setupSectionToggles();
+    this.setupListManagement();
+    this.setupWordManagement();
+    this.setupSettings();
+    this.setupExceptions();
+    this.setupImportExport();
+    this.setupTheme();
+  }
+
+  private setupSectionToggles(): void {
+    document.querySelectorAll('.collapse-toggle').forEach(button => {
+      button.addEventListener('click', (e) => {
+        e.stopPropagation();
+        const targetSection = (button as HTMLElement).getAttribute('data-target');
+        if (targetSection) this.toggleSection(targetSection);
+      });
+    });
+
+    document.querySelectorAll('.section-header').forEach(header => {
+      header.addEventListener('click', (e) => {
+        if ((e.target as HTMLElement).tagName === 'BUTTON' ||
+          (e.target as HTMLElement).tagName === 'INPUT' ||
+          (e.target as HTMLElement).closest('button')) {
+          return;
+        }
+        const section = (header as HTMLElement).closest('.section');
+        const sectionName = section?.getAttribute('data-section');
+        if (sectionName) this.toggleSection(sectionName);
+      });
+    });
+  }
+
+  private toggleSection(sectionName: string): void {
+    const section = document.querySelector(`[data-section="${sectionName}"]`);
+    if (!section) return;
+
+    const isCollapsed = section.classList.contains('collapsed');
+
+    if (isCollapsed) {
+      section.classList.remove('collapsed');
+      this.sectionStates[sectionName] = false;
+    } else {
+      section.classList.add('collapsed');
+      this.sectionStates[sectionName] = true;
+    }
+
+    this.saveSectionStates();
+  }
+
+  private setupListManagement(): void {
+    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') {
+        if (target.dataset.index != null) {
+          const index = +target.dataset.index;
+          if (target.checked) {
+            this.selectedCheckboxes.add(index);
+          } else {
+            this.selectedCheckboxes.delete(index);
+          }
+          this.renderWords();
+        } else if (target.dataset.activeEdit != null) {
+          const index = +target.dataset.activeEdit;
+          this.lists[this.currentListIndex].words[index].active = target.checked;
+          this.save();
+        }
+      }
+    });
+
+    wordList.addEventListener('input', (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 scrollTimeout: number;
+    wordList.addEventListener('scroll', () => {
+      if (scrollTimeout) return;
+      scrollTimeout = window.setTimeout(() => {
+        requestAnimationFrame(() => this.renderWords());
+        scrollTimeout = 0;
+      }, 16);
+    });
+  }
+
+  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', () => {
+      this.globalHighlightEnabled = globalToggle.checked;
+      this.updateGlobalToggleState();
+    });
+
+    matchCase.addEventListener('change', () => {
+      this.matchCaseEnabled = matchCase.checked;
+      this.save();
+    });
+
+    matchWhole.addEventListener('change', () => {
+      this.matchWholeEnabled = matchWhole.checked;
+      this.save();
+    });
+  }
+
+  private setupExceptions(): void {
+    document.getElementById('toggleExceptionBtn')?.addEventListener('click', () => {
+      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();
+      this.save();
+    });
+
+    document.getElementById('manageExceptionsBtn')?.addEventListener('click', () => {
+      const panel = document.getElementById('exceptionsPanel');
+      if (panel) {
+        const isVisible = panel.style.display !== 'none';
+        panel.style.display = isVisible ? 'none' : 'block';
+      }
+    });
+
+    document.getElementById('clearExceptionsBtn')?.addEventListener('click', () => {
+      if (confirm(chrome.i18n.getMessage('confirm_clear_exceptions') || 'Clear all exceptions?')) {
+        this.exceptionsList = [];
+        this.updateExceptionButton();
+        this.renderExceptions();
+        this.save();
+      }
+    });
+
+    document.getElementById('exceptionsList')?.addEventListener('click', (e) => {
+      const target = e.target as HTMLElement;
+      if (target.classList.contains('exception-remove')) {
+        const domain = target.dataset.domain!;
+        this.exceptionsList = this.exceptionsList.filter(d => d !== domain);
+        this.updateExceptionButton();
+        this.renderExceptions();
+        this.save();
+      }
+    });
+  }
+
+  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.render();
+    MessageService.sendToAllTabs({ type: 'WORD_LIST_UPDATED' });
+    MessageService.sendToAllTabs({
+      type: 'GLOBAL_TOGGLE_UPDATED',
+      enabled: this.globalHighlightEnabled
+    });
+    MessageService.sendToAllTabs({
+      type: 'MATCH_OPTIONS_UPDATED',
+      matchCase: this.matchCaseEnabled,
+      matchWhole: this.matchWholeEnabled
+    });
+    MessageService.sendToAllTabs({ type: 'EXCEPTIONS_LIST_UPDATED' });
+  }
+
+
+
+  private async updateGlobalToggleState(): Promise<void> {
+    await StorageService.update('globalHighlightEnabled', this.globalHighlightEnabled);
+    MessageService.sendToAllTabs({
+      type: 'GLOBAL_TOGGLE_UPDATED',
+      enabled: this.globalHighlightEnabled
+    });
+  }
+
+  private render(): void {
+    this.renderLists();
+    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 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 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.style.cssText = `
+      height: ${itemHeight}px;
+      position: absolute;
+      top: ${displayIndex * itemHeight}px;
+      width: calc(100% - 8px);
+      left: 4px;
+      right: 4px;
+      display: flex;
+      align-items: center;
+      gap: 6px;
+      padding: 0 4px;
+      box-sizing: border-box;
+      background: var(--highlight-tag);
+      border: 1px solid var(--highlight-tag-border);
+    `;
+
+    const list = this.lists[this.currentListIndex];
+
+    container.innerHTML = `
+      <input type="checkbox" class="word-checkbox" data-index="${realIndex}" ${this.selectedCheckboxes.has(realIndex) ? 'checked' : ''}>
+      <input type="text" value="${DOMUtils.escapeHtml(word.wordStr)}" data-word-edit="${realIndex}" style="flex-grow: 1; min-width: 0; padding: 4px 8px; border-radius: 4px; border: 1px solid var(--input-border); background-color: var(--input-bg); color: var(--text-color);">
+      <input type="color" value="${word.background || list.background}" data-bg-edit="${realIndex}" style="width: 24px; height: 24px; flex-shrink: 0;">
+      <input type="color" value="${word.foreground || list.foreground}" data-fg-edit="${realIndex}" style="width: 24px; height: 24px; flex-shrink: 0;">
+      <label class="word-active" style="display: flex; align-items: center; gap: 4px; flex-shrink: 0;">
+        <input type="checkbox" ${word.active !== false ? 'checked' : ''} data-active-edit="${realIndex}" class="switch">
+      </label>
+    `;
+
+    return container;
+  }
+
+  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-check';
+    } else {
+      btnText.textContent = chrome.i18n.getMessage('add_exception') || 'Add to Exceptions';
+      toggleBtn.className = '';
+      const icon = toggleBtn.querySelector('i');
+      if (icon) icon.className = 'fa-solid fa-ban';
+    }
+  }
+
+  private renderExceptions(): void {
+    const container = document.getElementById('exceptionsList');
+    if (!container) return;
+
+    if (this.exceptionsList.length === 0) {
+      container.innerHTML = '<div class="exception-item">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
@@ -0,0 +1,22 @@
+import { PopupController } from './PopupController.js';
+
+function localizePage(): void {
+  const elements = document.querySelectorAll('[data-i18n]');
+  elements.forEach(element => {
+    const message = (element as HTMLElement).dataset.i18n!;
+    const localizedText = chrome.i18n.getMessage(message);
+    if (localizedText) {
+      if (element.tagName === 'INPUT' && (element as HTMLInputElement).hasAttribute('placeholder')) {
+        (element as HTMLInputElement).placeholder = localizedText;
+      } else {
+        element.textContent = localizedText;
+      }
+    }
+  });
+}
+
+document.addEventListener('DOMContentLoaded', async () => {
+  localizePage();
+  const controller = new PopupController();
+  await controller.initialize();
+});
--- a/src/services/MessageService.ts
+++ b/src/services/MessageService.ts
@@ -0,0 +1,25 @@
+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) => void): void {
+    chrome.runtime.onMessage.addListener(callback);
+  }
+}
--- 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
@@ -0,0 +1,55 @@
+export interface HighlightWord {
+  wordStr: string;
+  background: string;
+  foreground: string;
+  active: boolean;
+}
+
+export interface HighlightList {
+  id: number;
+  name: string;
+  background: string;
+  foreground: string;
+  active: boolean;
+  words: HighlightWord[];
+}
+
+export interface StorageData {
+  lists: HighlightList[];
+  globalHighlightEnabled: boolean;
+  matchCaseEnabled: boolean;
+  matchWholeEnabled: boolean;
+  exceptionsList: string[];
+}
+
+export interface ActiveWord {
+  text: string;
+  background: string;
+  foreground: string;
+}
+
+export interface MessageData {
+  type: 'WORD_LIST_UPDATED' | 'GLOBAL_TOGGLE_UPDATED' | 'MATCH_OPTIONS_UPDATED' | 'EXCEPTIONS_LIST_UPDATED';
+  enabled?: boolean;
+  matchCase?: boolean;
+  matchWhole?: boolean;
+}
+
+export interface ExportData {
+  lists: HighlightList[];
+  exceptionsList: string[];
+}
+
+export const DEFAULT_STORAGE: StorageData = {
+  lists: [],
+  globalHighlightEnabled: true,
+  matchCaseEnabled: false,
+  matchWholeEnabled: false,
+  exceptionsList: []
+};
+
+export const CONSTANTS = {
+  WORD_ITEM_HEIGHT: 32,
+  DEBOUNCE_DELAY: 300,
+  SCROLL_THROTTLE: 16
+} as const;
--- 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/storage.js
+++ b/storage.js
@@ -1,8 +0,0 @@
-async function getLists() {
-    const { lists } = await chrome.storage.local.get("lists");
-    return lists || [];
-}
-
-async function saveLists(lists) {
-    await chrome.storage.local.set({ lists });
-}
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -0,0 +1,30 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "module": "ES2022",
+    "lib": ["ES2022", "DOM"],
+    "outDir": "./dist",
+    "rootDir": "./src",
+    "strict": true,
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "forceConsistentCasingInFileNames": true,
+    "moduleResolution": "node",
+    "resolveJsonModule": true,
+    "allowSyntheticDefaultImports": true,
+    "noEmitOnError": false,
+    "noImplicitAny": true,
+    "noImplicitReturns": true,
+    "noUnusedLocals": false,
+    "noUnusedParameters": false,
+    "exactOptionalPropertyTypes": false,
+    "types": ["chrome"]
+  },
+  "include": [
+    "src/**/*"
+  ],
+  "exclude": [
+    "node_modules",
+    "dist"
+  ]
+}
Author	SHA1	Message	Date
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
Daniel Dada	7d90f5d5bf	ci: fix release script	2025-10-08 11:21:47 +03:00
Daniel Dada	a68f2ddbe8	ci: test release action	2025-10-08 11:18:54 +03:00
Daniel Dada	2a1034aef4	fix (ci): keep update-manifest-versions script in vanilla js	2025-10-08 11:16:31 +03:00
Daniel Dada	1ec17cd83e	chore: migrated to typescript	2025-10-08 11:09:16 +03:00
Daniel Dada	b5386c706f	fixed eslint config	2025-10-08 10:32:59 +03:00
Daniel Dada	5ca83fce0f	fix `npm install`	2025-10-08 10:31:48 +03:00
semantic-release-bot	7e4f2b4ecf	chore(release): 1.8.0 # [1.8.0](https://github.com/obsqrbtz/goose-highlighter/compare/v1.7.2...v1.8.0) (2025-10-07) ### Features * add collapsible sections ([`a158a30`](`a158a303b0`)) * add websites to exception list ([`915add3`](`915add3a4c`))	2025-10-07 14:46:28 +03:00
Daniel Dada	a158a303b0	feat: add collapsible sections	2025-10-07 14:46:03 +03:00
Daniel Dada	915add3a4c	feat: add websites to exception list	2025-10-07 14:18:23 +03:00
semantic-release-bot	a1701a3504	chore(release): 1.7.2 ## [1.7.2](https://github.com/obsqrbtz/goose-highlighter/compare/v1.7.1...v1.7.2) (2025-10-06) ### Bug Fixes * do not create <mark> elements, just wrap found words in <span> and add .css styling ([`6ba0d2e`](`6ba0d2eb7c`))	2025-10-06 14:53:36 +03:00
Daniel Dada	6ba0d2eb7c	fix: do not create <mark> elements, just wrap found words in <span> and add .css styling	2025-10-06 14:53:24 +03:00
Daniel Dada	21a120e494	ci: corected auto commit message	2025-06-27 14:09:15 +03:00