152 changed files with 782 additions and 5802 deletions
--- a/AGENTS.md
+++ b/AGENTS.md
@ -5,14 +5,12 @@ This file provides guidelines for codex agents contributing to the Sortana proje
 ## Repository Overview

 - `background.js`: Handles startup tasks and coordinates message passing within the extension.
- `modules/`: Contains reusable JavaScript modules such as `AiClassifier.js`,
-  `defaultParams.js` and `themeUtils.js`.
- `options/`: The options page HTML, JavaScript and bundled Bulma CSS (v1.0.3).
- `details.html` and `details.js`: View AI reasoning and clear cache for a message.
+- `modules/`: Holds reusable JavaScript modules for the extension.
+- `content/`: Scripts for modifying Thunderbird windows (e.g., the filter editor).
+- `options/`: The options page HTML and JavaScript.
 - `resources/`: Images and other static files.
- `prompt_templates/`: Prompt template files for the AI service (openai, qwen, mistral, harmony).
+- `prompt_templates/`: Prompt template files for the AI service.
 - `build-xpi.ps1`: PowerShell script to package the extension.
- `build-xpi.sh`: Bash script to package the extension.

 ## Coding Style

@ -29,14 +27,7 @@ This file provides guidelines for codex agents contributing to the Sortana proje

 ## Testing

-There are currently no automated tests for this project. If you add tests in the future, specify the commands to run them here. For now, verification must happen manually in Thunderbird. Do **not** run the `ps1` build script or the SVG processing script.
-
-## Endpoint Notes
-
-Sortana targets the `/v1/completions` API. The endpoint value stored in settings is a base URL; the full request URL is constructed by appending `/v1/completions` (adding a slash when needed) and defaulting to `https://` if no scheme is provided.
-The options page can query `/v1/models` from the same base URL to populate the Model dropdown; selecting **None** omits the `model` field from the request payload.
-Advanced options allow an optional API key plus `OpenAI-Organization` and `OpenAI-Project` headers; these headers are only sent when values are provided.
-Responses are expected to include a JSON object with `match` (or `matched`) plus a short `reason` string; the parser extracts the last JSON object in the response text and ignores any surrounding commentary.
+There are currently no automated tests for this project. If you add tests in the future, specify the commands to run them here. For now, verification must happen manually in Thunderbird.

 ## Documentation

@ -45,12 +36,11 @@ Additional documentation exists outside this repository.
 - Development guide: [Webextention-API for Thunderbird](https://webextension-api.thunderbird.net/en/stable/)
  - [Messages API](https://webextension-api.thunderbird.net/en/stable/messages.html)
  - [Message Tags API](https://webextension-api.thunderbird.net/en/stable/messages.tags.html)
-  - [messageDisplayAction API](https://webextension-api.thunderbird.net/en/stable/messageDisplayAction.html)
  - [Storage API](https://webextension-api.thunderbird.net/en/stable/storage.html)
 - Thunderbird Add-on Store Policies
  - [Third Party Library Usage](https://extensionworkshop.com/documentation/publish/third-party-library-usage/)
 - Third Party Libraries
-  - [Bulma.css v1.0.3](https://github.com/jgthms/bulma/blob/1.0.3/css/bulma.css)
+  - [Bulma.css](https://github.com/jgthms/bulma)
 - Issue tracker: [Thunderbird tracker on Bugzilla](https://bugzilla.mozilla.org/describecomponents.cgi?product=Thunderbird)


@ -68,16 +58,3 @@ base64 data should be replaced with placeholders showing the byte size. The
 final string should have the headers, a brief attachment section, then the plain
 text extracted from all text parts.

-### Cache Strategy
-
-`aiCache` persists classification results. Each key is the SHA‑256 hex of
-`"<message Message-ID>|<criterion>"` and maps to an object with `matched` and `reason`
-properties. Any legacy `aiReasonCache` data is merged into `aiCache` the first
-time the add-on loads after an update.
-
-### Icon Set Usage
-
-Toolbar and menu icons reside under `resources/img` and are provided in 16, 32
-and 64 pixel variants. When changing these icons, pass a dictionary mapping the
-sizes to the paths in `browserAction.setIcon` or `messageDisplayAction.setIcon`.
-Use `resources/svg2img.ps1` to regenerate PNGs from the SVG sources.
--- a/README.md
+++ b/README.md
@ -4,55 +4,36 @@

 Sortana is an experimental Thunderbird add-on that integrates an AI-powered filter rule. 
 It allows you to classify email messages by sending their contents to a configurable
-HTTP endpoint. Sortana uses the `/v1/completions` API; the options page stores a base
-URL and appends `/v1/completions` when sending requests. The endpoint should respond
-with JSON indicating whether the message meets a specified criterion, including a
-short reasoning summary.
-Responses are parsed by extracting the last JSON object in the response text and
-expecting a `match` (or `matched`) boolean plus a `reason` string.
+HTTP endpoint. The endpoint should respond with JSON indicating whether the
+message meets a specified criterion.

 ## Features

- **Configurable endpoint** – set the classification service base URL on the options page.
- **Model selection** – load available models from the endpoint and choose one (or omit the model field).
- **Optional OpenAI auth headers** – provide an API key plus optional organization/project headers when needed.
- **Prompt templates** – choose between OpenAI/ChatML, Qwen, Mistral, Harmony (gpt-oss), or provide your own custom template.
+- **AI classification rule** – adds the "AI classification" term with
+  `matches` and `doesn't match` operators.
+- **Configurable endpoint** – set the classification service URL on the options page.
+- **Prompt templates** – choose between several model formats or provide your own custom template.
 - **Custom system prompts** – tailor the instructions sent to the model for more precise results.
- **Persistent result caching** – classification results and reasoning are saved to disk so messages aren't re-evaluated across restarts.
+- **Filter editor integration** – patches Thunderbird's filter editor to accept
+  text criteria for AI classification.
+- **Persistent result caching** – classification results are saved to disk so messages aren't re-evaluated across restarts.
 - **Advanced parameters** – tune generation settings like temperature, top‑p and more from the options page.
- **Markdown conversion** – optionally convert HTML bodies to Markdown before sending them to the AI service.
 - **Debug logging** – optional colorized logs help troubleshoot interactions with the AI service.
- **Debug tab** – view the last request payload and a diff between the unaltered message text and the final prompt.
- **Light/Dark themes** – automatically match Thunderbird's appearance with optional manual override.
- **Automatic rules** – create rules that tag, move, copy, forward, reply, delete, archive, mark read/unread or flag/unflag messages based on AI classification. Rules can optionally apply only to unread messages and can ignore messages outside a chosen age range.
+- **Automatic rules** – create rules that tag or move new messages based on AI classification.
 - **Rule ordering** – drag rules to prioritize them and optionally stop processing after a match.
- **Rule enable/disable** – temporarily turn a rule off without removing it.
- **Account & folder filters** – limit rules to specific accounts or folders.
 - **Context menu** – apply AI rules from the message list or the message display action button.
- **Status icons** – toolbar icons show when classification is in progress and briefly display success states. If a failure occurs the icon turns red briefly before returning to normal.
- **Error notification** – failed classification displays a notification in Thunderbird.
- **Session error log** – the Errors tab (visible only when errors occur) shows errors recorded since the last add-on start.
- **View reasoning** – inspect why rules matched via the Details popup.
- **Cache management** – clear cached results from the context menu or options page.
- **Queue & timing stats** – monitor processing time on the Maintenance tab.
- **Packaging scripts** – `build-xpi.ps1` (PowerShell) or `build-xpi.sh` (bash) build an XPI ready for installation.
- **Maintenance tab** – view rule counts, cache entries and clear cached results from the options page.
-
-### Cache Storage
-
-Classification results are stored under the `aiCache` key in extension storage.
-Each entry maps a SHA‑256 hash of `"<message Message-ID>|<criterion>"` to an object
-containing `matched` and `reason` fields. Older installations with a separate
-`aiReasonCache` will be migrated automatically on startup.
+- **Status icons** – toolbar icons show when classification is in progress and briefly display success or error states.
+- **Packaging script** – `build-xpi.ps1` builds an XPI ready for installation.

 ## Architecture Overview

 Sortana is implemented entirely with standard WebExtension scripts—no custom experiment code is required:

- `background.js` loads saved settings, manages the classification queue and listens for new messages.
- `modules/AiClassifier.js` implements the classification logic and cache handling.
- `options/` contains the HTML and JavaScript for configuring the endpoint and rules.
- `details.html` / `details.js` present cached reasoning for a message.
+- `background.js` loads saved settings and listens for new messages.
+- `modules/ExpressionSearchFilter.jsm` implements the AI filter and performs the
+  HTTP request.
+- `options/` contains the HTML and JavaScript for configuring the endpoint and
+  rules.
 - `_locales/` holds localized strings used throughout the UI.

 ### Key Files
@ -60,44 +41,30 @@ Sortana is implemented entirely with standard WebExtension scripts—no custom e
 | Path                                    | Purpose                                        |
 | --------------------------------------- | ---------------------------------------------- |
 | `manifest.json`                         | Extension manifest and entry points.           |
-| `background.js`                         | Startup tasks and classification queue management. |
-| `modules/AiClassifier.js`               | Core classification logic and cache handling. |
+| `background.js`                         | Startup tasks and message handling.            |
+| `modules/ExpressionSearchFilter.jsm`    | Custom filter term and AI request logic.       |
 | `options/options.html` and `options.js` | Endpoint and rule configuration UI. |
-| `details.html` and `details.js`         | View stored reasoning for a message. |
-| `logger.js`                             | Colorized logging with optional debug mode. |
+| `logger.js` and `modules/logger.jsm`    | Colorized logging with optional debug mode.    |

 ## Building

 1. Ensure PowerShell is available (for Windows) or adapt the script for other
   environments.
-2. The Bulma stylesheet (v1.0.3) is already included as `options/bulma.css`.
-3. Run `powershell ./build-xpi.ps1` or `./build-xpi.sh` from the repository root.
-   The script reads the version from `manifest.json` and creates an XPI in the
-   `release` folder.
+2. Ensure the Bulma stylesheet (v1.0.4) is saved as `options/bulma.css`. You can
+   download it from <https://github.com/jgthms/bulma/blob/1.0.4/css/bulma.css>.
+3. Run `powershell ./build-xpi.ps1` from the repository root. The script reads
+   the version from `manifest.json` and creates an XPI in the `release` folder.
 4. Install the generated XPI in Thunderbird via the Add-ons Manager. During
   development you can also load the directory as a temporary add-on.
-5. To regenerate PNG icons from the SVG sources, run `resources/svg2img.ps1`.

 ## Usage

-1. Open the add-on's options and set the base URL of your classification service
-   (Sortana will append `/v1/completions`). Use the Model dropdown to load
-   `/v1/models` and select a model or choose **None** to omit the `model` field.
-   Advanced settings include optional API key, organization, and project headers
-   for OpenAI-hosted endpoints.
+1. Open the add-on's options and set the URL of your classification service.
 2. Use the **Classification Rules** section to add a criterion and optional
-   actions such as tagging, moving, copying, forwarding, replying,
-   deleting or archiving a message when it matches. Drag rules to
-   reorder them, check *Only apply to unread messages* to skip read mail,
-   set optional minimum or maximum message age limits, select the accounts or
- folders a rule should apply to. Use the
- slashed-circle/check button to disable or re-enable a rule. The small
- circle buttons for optional conditions show a filled dot when active, and
- check *Stop after match* to halt further processing. Forward and reply actions
-   open a compose window using the account that received the message.
+   actions such as tagging or moving a message when it matches. Drag rules to
+   reorder them and check *Stop after match* to halt further processing.
 3. Save your settings. New mail will be evaluated automatically using the
   configured rules.
-4. If the toolbar icon shows a red X, it will clear after a few seconds. Open the Errors tab in Options to review the latest failures.

 ### Example Filters

@ -125,7 +92,7 @@ Here are some useful and fun example criteria you can use in your filters. Filte
  For when you're ready to filter based on vibes.

 You can define as many filters as you'd like, each using a different prompt and
-triggering tags, moves, copies, deletes, archives, read/unread changes or flag updates based on the model's classification.
+triggering tags, moves, or actions based on the model's classification.

 ## Required Permissions

@ -133,33 +100,16 @@ Sortana requests the following Thunderbird permissions:

 - `storage` – store configuration and cached classification results.
 - `messagesRead` – read message contents for classification.
- `messagesMove` – move or copy messages when a rule specifies a target folder.
- - `messagesUpdate` – change message properties such as tags, junk status, read/unread state and flags.
+- `messagesMove` – move messages when a rule specifies a target folder.
+- `messagesUpdate` – change message properties such as tags and junk status.
 - `messagesTagsList` – retrieve existing message tags for rule actions.
- `accountsRead` – list accounts and folders for move or copy actions.
+- `accountsRead` – list accounts and folders for move actions.
 - `menus` – add context menu commands.
- `tabs` – open new tabs and query the active tab.
- `notifications` – display error notifications.
- `compose` – create reply and forward compose windows for matching rules.
-
-## Thunderbird Add-on Store Disclosures
-
-The [Third Party Library Usage](https://extensionworkshop.com/documentation/publish/third-party-library-usage/) policy
-requires disclosure of third party libraries that are included in the add-on. Even though
-the disclosure is only required for add-on review, they'll be listed here as well. Sortana
-uses the following third party libraries:
-
- [Bulma.css v1.0.3](https://github.com/jgthms/bulma/blob/1.0.3/css/bulma.css)
-  - MIT License
- [turndown v7.2.0](https://github.com/mixmark-io/turndown/tree/v7.2.0)
-  - MIT License
- [diff](https://github.com/google/diff-match-patch/blob/62f2e689f498f9c92dbc588c58750addec9b1654/javascript/diff_match_patch_uncompressed.js)
-  -  Apache-2.0 license

 ## License

 This project is licensed under the terms of the GNU General Public License
-version 3. See `LICENSE` for the full text. Third party libraries are licensed seperately.
+version 3. See `LICENSE` for the full text.

 ## Acknowledgments

@ -169,4 +119,3 @@ Sortana builds upon knowledge gained from open-source projects. In particular,
 how Thunderbird's WebExtension and experiment APIs can be extended. Their code
 provided invaluable guidance during development.

- Icons from [cc0-icons.jonh.eu](https://cc0-icons.jonh.eu/) are used under the CC0 license.
--- a/_locales/en-US/messages.json
+++ b/_locales/en-US/messages.json
@ -12,27 +12,7 @@
  "template.openai": { "message": "OpenAI / ChatML" },
  "template.qwen": { "message": "Qwen" },
  "template.mistral": { "message": "Mistral" },
-  "template.harmony": { "message": "Harmony (gpt-oss)" },
  "template.custom": { "message": "Custom" },
  "options.save": { "message": "Save" },
-  "options.debugLogging": { "message": "Enable debug logging" },
-  "options.htmlToMarkdown": { "message": "Convert HTML body to Markdown" },
-  "options.stripUrlParams": { "message": "Remove URL tracking parameters" },
-  "options.altTextImages": { "message": "Replace images with alt text" },
-  "options.collapseWhitespace": { "message": "Collapse long whitespace" },
-  "options.tokenReduction": { "message": "Aggressive token reduction" }
-  ,"action.read": { "message": "read" }
-  ,"action.flag": { "message": "flag" }
-    ,"action.copy": { "message": "copy" }
-    ,"action.delete": { "message": "delete" }
-  ,"action.archive": { "message": "archive" }
-  ,"action.forward": { "message": "forward" }
-  ,"action.reply": { "message": "reply" }
-  ,"param.markRead": { "message": "mark read" }
-  ,"param.markUnread": { "message": "mark unread" }
-  ,"param.flag": { "message": "flag" }
-  ,"param.unflag": { "message": "unflag" }
-  ,"param.address": { "message": "address" }
-  ,"param.replyAll": { "message": "reply all" }
-  ,"param.replySender": { "message": "reply sender" }
+  "options.debugLogging": { "message": "Enable debug logging" }
 }
--- a/ai-filter.sln
+++ b/ai-filter.sln
@ -9,8 +9,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		AGENTS.md = AGENTS.md
 		background.js = background.js
 		build-xpi.ps1 = build-xpi.ps1
-		details.html = details.html
-		details.js = details.js
 		LICENSE = LICENSE
 		logger.js = logger.js
 		manifest.json = manifest.json
@ -29,7 +27,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "options", "options", "{7372
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "modules", "modules", "{75ED3C1E-D3C7-4546-9F2E-AC85859DDF4B}"
 	ProjectSection(SolutionItems) = preProject
-		modules\AiClassifier.js = modules\AiClassifier.js
+		modules\ExpressionSearchFilter.jsm = modules\ExpressionSearchFilter.jsm
+		modules\logger.jsm = modules\logger.jsm
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_locales", "_locales", "{D446E5C6-BDDE-4091-BD1A-EC57170003CF}"
@ -39,50 +38,23 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "en-US", "en-US", "{8BEA7793
 		_locales\en-US\messages.json = _locales\en-US\messages.json
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "content", "content", "{028FDA4B-AC3E-4A0E-9291-978E213F9B78}"
+	ProjectSection(SolutionItems) = preProject
+		content\filterEditor.js = content\filterEditor.js
+	EndProjectSection
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "prompt_templates", "prompt_templates", "{86516D53-50D4-4FE2-9D8A-977A8F5EBDBD}"
 	ProjectSection(SolutionItems) = preProject
 		prompt_templates\mistral.txt = prompt_templates\mistral.txt
 		prompt_templates\openai.txt = prompt_templates\openai.txt
 		prompt_templates\qwen.txt = prompt_templates\qwen.txt
-		prompt_templates\harmony.txt = prompt_templates\harmony.txt
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "resources", "resources", "{68A87938-5C2B-49F5-8AAA-8A34FBBFD854}"
-	ProjectSection(SolutionItems) = preProject
-		resources\svg2img.ps1 = resources\svg2img.ps1
-	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "img", "img", "{F266602F-1755-4A95-A11B-6C90C701C5BF}"
 	ProjectSection(SolutionItems) = preProject
-		resources\img\average-16.png = resources\img\average-16.png
-		resources\img\average-32.png = resources\img\average-32.png
-		resources\img\average-64.png = resources\img\average-64.png
-		resources\img\check-16.png = resources\img\check-16.png
-		resources\img\check-32.png = resources\img\check-32.png
-		resources\img\check-64.png = resources\img\check-64.png
-		resources\img\circle-16.png = resources\img\circle-16.png
-		resources\img\circle-32.png = resources\img\circle-32.png
-		resources\img\circle-64.png = resources\img\circle-64.png
-		resources\img\circledots-16.png = resources\img\circledots-16.png
-		resources\img\circledots-32.png = resources\img\circledots-32.png
-		resources\img\circledots-64.png = resources\img\circledots-64.png
-		resources\img\clipboarddata-16.png = resources\img\clipboarddata-16.png
-		resources\img\clipboarddata-32.png = resources\img\clipboarddata-32.png
-		resources\img\clipboarddata-64.png = resources\img\clipboarddata-64.png
-		resources\img\download-16.png = resources\img\download-16.png
-		resources\img\download-32.png = resources\img\download-32.png
-		resources\img\download-64.png = resources\img\download-64.png
-		resources\img\eye-16.png = resources\img\eye-16.png
-		resources\img\eye-32.png = resources\img\eye-32.png
-		resources\img\eye-64.png = resources\img\eye-64.png
-		resources\img\flag-16.png = resources\img\flag-16.png
-		resources\img\flag-32.png = resources\img\flag-32.png
-		resources\img\flag-64.png = resources\img\flag-64.png
-		resources\img\full-logo-white.png = resources\img\full-logo-white.png
 		resources\img\full-logo.png = resources\img\full-logo.png
-		resources\img\gear-16.png = resources\img\gear-16.png
-		resources\img\gear-32.png = resources\img\gear-32.png
-		resources\img\gear-64.png = resources\img\gear-64.png
 		resources\img\logo.png = resources\img\logo.png
 		resources\img\logo128.png = resources\img\logo128.png
 		resources\img\logo16.png = resources\img\logo16.png
@ -90,45 +62,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "img", "img", "{F266602F-175
 		resources\img\logo48.png = resources\img\logo48.png
 		resources\img\logo64.png = resources\img\logo64.png
 		resources\img\logo96.png = resources\img\logo96.png
-		resources\img\reply-16.png = resources\img\reply-16.png
-		resources\img\reply-32.png = resources\img\reply-32.png
-		resources\img\reply-64.png = resources\img\reply-64.png
-		resources\img\settings-16.png = resources\img\settings-16.png
-		resources\img\settings-32.png = resources\img\settings-32.png
-		resources\img\settings-64.png = resources\img\settings-64.png
-		resources\img\trash-16.png = resources\img\trash-16.png
-		resources\img\trash-32.png = resources\img\trash-32.png
-		resources\img\trash-64.png = resources\img\trash-64.png
-		resources\img\upload-16.png = resources\img\upload-16.png
-		resources\img\upload-32.png = resources\img\upload-32.png
-		resources\img\upload-64.png = resources\img\upload-64.png
-		resources\img\x-16.png = resources\img\x-16.png
-		resources\img\x-32.png = resources\img\x-32.png
-		resources\img\x-64.png = resources\img\x-64.png
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "js", "js", "{21D2A42C-3F85-465C-9141-C106AFD92B68}"
-	ProjectSection(SolutionItems) = preProject
-		resources\js\diff_match_patch_uncompressed.js = resources\js\diff_match_patch_uncompressed.js
-		resources\js\turndown.js = resources\js\turndown.js
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "svg", "svg", "{D4E9C905-4884-488E-B763-5BD39049C1B1}"
-	ProjectSection(SolutionItems) = preProject
-		resources\svg\average.svg = resources\svg\average.svg
-		resources\svg\check.svg = resources\svg\check.svg
-		resources\svg\circle.svg = resources\svg\circle.svg
-		resources\svg\circledots.svg = resources\svg\circledots.svg
-		resources\svg\clipboarddata.svg = resources\svg\clipboarddata.svg
-		resources\svg\download.svg = resources\svg\download.svg
-		resources\svg\eye.svg = resources\svg\eye.svg
-		resources\svg\flag.svg = resources\svg\flag.svg
-		resources\svg\gear.svg = resources\svg\gear.svg
-		resources\svg\reply.svg = resources\svg\reply.svg
-		resources\svg\settings.svg = resources\svg\settings.svg
-		resources\svg\trash.svg = resources\svg\trash.svg
-		resources\svg\upload.svg = resources\svg\upload.svg
-		resources\svg\x.svg = resources\svg\x.svg
 	EndProjectSection
 EndProject
 Global
@ -140,10 +73,9 @@ Global
 		{75ED3C1E-D3C7-4546-9F2E-AC85859DDF4B} = {BCC6E6D2-343B-4C48-854D-5FE3BBC3CB70}
 		{D446E5C6-BDDE-4091-BD1A-EC57170003CF} = {BCC6E6D2-343B-4C48-854D-5FE3BBC3CB70}
 		{8BEA7793-3336-40ED-AB96-7FFB09FEB0F6} = {D446E5C6-BDDE-4091-BD1A-EC57170003CF}
+		{028FDA4B-AC3E-4A0E-9291-978E213F9B78} = {BCC6E6D2-343B-4C48-854D-5FE3BBC3CB70}
 		{86516D53-50D4-4FE2-9D8A-977A8F5EBDBD} = {BCC6E6D2-343B-4C48-854D-5FE3BBC3CB70}
 		{68A87938-5C2B-49F5-8AAA-8A34FBBFD854} = {BCC6E6D2-343B-4C48-854D-5FE3BBC3CB70}
 		{F266602F-1755-4A95-A11B-6C90C701C5BF} = {68A87938-5C2B-49F5-8AAA-8A34FBBFD854}
-		{21D2A42C-3F85-465C-9141-C106AFD92B68} = {68A87938-5C2B-49F5-8AAA-8A34FBBFD854}
-		{D4E9C905-4884-488E-B763-5BD39049C1B1} = {68A87938-5C2B-49F5-8AAA-8A34FBBFD854}
 	EndGlobalSection
 EndGlobal
--- a/background.js
+++ b/background.js
@ -19,67 +19,6 @@ let queue = Promise.resolve();
 let queuedCount = 0;
 let processing = false;
 let iconTimer = null;
-let errorTimer = null;
-let timingStats = { count: 0, mean: 0, m2: 0, total: 0, last: -1 };
-let currentStart = 0;
-let logGetTiming = true;
-let htmlToMarkdown = false;
-let stripUrlParams = false;
-let altTextImages = false;
-let collapseWhitespace = false;
-let tokenReduction = false;
-let maxTokens = 4096;
-let TurndownService = null;
-let userTheme = 'auto';
-let currentTheme = 'light';
-let detectSystemTheme;
-let errorPending = false;
-let errorLog = [];
-let showDebugTab = false;
-const ERROR_NOTIFICATION_ID = 'sortana-error';
-const ERROR_ICON_TIMEOUT = 4500;
-const MAX_ERROR_LOG = 50;
-
-function normalizeRules(rules) {
-    return Array.isArray(rules) ? rules.map(r => {
-        if (r.actions) {
-            if (!Array.isArray(r.accounts)) r.accounts = [];
-            if (!Array.isArray(r.folders)) r.folders = [];
-            r.enabled = r.enabled !== false;
-            return r;
-        }
-        const actions = [];
-        if (r.tag) actions.push({ type: 'tag', tagKey: r.tag });
-        if (r.moveTo) actions.push({ type: 'move', folder: r.moveTo });
-        if (r.copyTarget || r.copyTo) actions.push({ type: 'copy', copyTarget: r.copyTarget || r.copyTo });
-        const rule = { criterion: r.criterion, actions };
-        if (r.stopProcessing) rule.stopProcessing = true;
-        if (r.unreadOnly) rule.unreadOnly = true;
-        if (typeof r.minAgeDays === 'number') rule.minAgeDays = r.minAgeDays;
-        if (typeof r.maxAgeDays === 'number') rule.maxAgeDays = r.maxAgeDays;
-        if (Array.isArray(r.accounts)) rule.accounts = r.accounts;
-        if (Array.isArray(r.folders)) rule.folders = r.folders;
-        rule.enabled = r.enabled !== false;
-        return rule;
-    }) : [];
-}
-
-function iconPaths(name) {
-    return {
-        16: `resources/img/${name}-${currentTheme}-16.png`,
-        32: `resources/img/${name}-${currentTheme}-32.png`,
-        64: `resources/img/${name}-${currentTheme}-64.png`
-    };
-}
-
-
-const ICONS = {
-    logo: () => 'resources/img/logo.png',
-    circledots: () => iconPaths('circledots'),
-    circle: () => iconPaths('circle'),
-    average: () => iconPaths('average'),
-    error: () => iconPaths('x')
-};

 function setIcon(path) {
    if (browser.browserAction) {
@ -91,98 +30,31 @@ function setIcon(path) {
 }

 function updateActionIcon() {
-    let path = ICONS.logo();
-    if (errorPending) {
-        path = ICONS.error();
-    } else if (processing || queuedCount > 0) {
-        path = ICONS.circledots();
+    let path = "resources/img/logo32.png";
+    if (processing || queuedCount > 0) {
+        path = "resources/img/busy.png";
    }
    setIcon(path);
 }

-function showTransientIcon(factory, delay = 1500) {
-    if (errorPending) {
-        return;
-    }
+function showTransientIcon(path, delay = 1500) {
    clearTimeout(iconTimer);
-    const path = typeof factory === 'function' ? factory() : factory;
    setIcon(path);
    iconTimer = setTimeout(updateActionIcon, delay);
 }

-async function clearError() {
-    errorPending = false;
-    clearTimeout(errorTimer);
-    await browser.notifications.clear(ERROR_NOTIFICATION_ID);
-    updateActionIcon();
+async function sha256Hex(str) {
+    const buf = await crypto.subtle.digest('SHA-256', new TextEncoder().encode(str));
+    return Array.from(new Uint8Array(buf), b => b.toString(16).padStart(2, '0')).join('');
 }

-function recordError(context, err) {
-    let message = 'Unknown error';
-    let detail = '';
-    if (err instanceof Error) {
-        message = err.message;
-        detail = err.stack || '';
-    } else if (err && typeof err === 'object') {
-        message = typeof err.message === 'string' ? err.message : String(err || 'Unknown error');
-        detail = typeof err.detail === 'string' ? err.detail : '';
-    } else {
-        message = String(err || 'Unknown error');
-    }
-    errorLog.unshift({
-        time: Date.now(),
-        context,
-        message,
-        detail
-    });
-    if (errorLog.length > MAX_ERROR_LOG) {
-        errorLog.length = MAX_ERROR_LOG;
-    }
-    errorPending = true;
-    updateActionIcon();
-    clearTimeout(errorTimer);
-    errorTimer = setTimeout(() => {
-        errorPending = false;
-        updateActionIcon();
-    }, ERROR_ICON_TIMEOUT);
-    browser.runtime.sendMessage({ type: 'sortana:errorLogUpdated', count: errorLog.length }).catch(() => {});
-}
-
-function refreshMenuIcons() {
-    browser.menus.update('apply-ai-rules-list', { icons: iconPaths('eye') });
-    browser.menus.update('apply-ai-rules-display', { icons: iconPaths('eye') });
-    browser.menus.update('clear-ai-cache-list', { icons: iconPaths('trash') });
-    browser.menus.update('clear-ai-cache-display', { icons: iconPaths('trash') });
-    browser.menus.update('view-ai-reason-list', { icons: iconPaths('clipboarddata') });
-    browser.menus.update('view-ai-reason-display', { icons: iconPaths('clipboarddata') });
-}
-
-
 function byteSize(str) {
    return new TextEncoder().encode(str || "").length;
 }

 function replaceInlineBase64(text) {
-    return text.replace(/(?:data:[^;]+;base64,)?[A-Za-z0-9+/=\r\n]{100,}/g,
-        m => tokenReduction ? '__BASE64__' : `[base64: ${byteSize(m)} bytes]`);
-}
-
-function sanitizeString(text) {
-    let t = String(text);
-    if (tokenReduction) {
-        t = t.replace(/<!--.*?-->/gs, '')
-            .replace(/url\([^\)]*\)/gi, 'url(__IMG__)');
-    }
-    if (stripUrlParams) {
-        t = t.replace(/https?:\/\/[^\s)]+/g, m => {
-            const idx = m.indexOf('?');
-            return idx >= 0 ? m.slice(0, idx) : m;
-        });
-    }
-    if (collapseWhitespace) {
-        t = t.replace(/[\u200B-\u200D\u2060\s]{2,}/g, ' ').replace(/\n{3,}/g, '\n\n');
-    }
-    return t;
+    return text.replace(/[A-Za-z0-9+/]{100,}={0,2}/g,
+        m => `[base64: ${byteSize(m)} bytes]`);
 }

 function collectText(part, bodyParts, attachments) {
@ -199,206 +71,62 @@ function collectText(part, bodyParts, attachments) {
        attachments.push(`${name} (${ct}, ${part.size || byteSize(body)} bytes)`);
    } else if (ct.startsWith("text/html")) {
        const doc = new DOMParser().parseFromString(body, 'text/html');
-        if (tokenReduction) {
-            doc.querySelectorAll('script,style').forEach(el => el.remove());
-            const walker = doc.createTreeWalker(doc, NodeFilter.SHOW_COMMENT);
-            let node;
-            while ((node = walker.nextNode())) {
-                node.parentNode.removeChild(node);
-            }
-            doc.querySelectorAll('*').forEach(el => {
-                for (const attr of Array.from(el.attributes)) {
-                    if (!['href','src','alt'].includes(attr.name)) {
-                        el.removeAttribute(attr.name);
-                    }
-                }
-            });
-        }
-        doc.querySelectorAll('img').forEach(img => {
-            const alt = img.getAttribute('alt') || '';
-            const text = altTextImages ? alt : '__IMG__';
-            img.replaceWith(doc.createTextNode(text));
-        });
-        if (stripUrlParams) {
-            doc.querySelectorAll('[href]').forEach(a => {
-                const href = a.getAttribute('href');
-                if (href) a.setAttribute('href', href.split('?')[0]);
-            });
-            doc.querySelectorAll('[src]').forEach(e => {
-                const src = e.getAttribute('src');
-                if (src) e.setAttribute('src', src.split('?')[0]);
-            });
-        }
-        if (htmlToMarkdown && TurndownService) {
-            try {
-                const td = new TurndownService();
-                const md = sanitizeString(td.turndown(doc.body.innerHTML || body));
-                bodyParts.push(replaceInlineBase64(`[HTML Body converted to Markdown]\n${md}`));
-            } catch (e) {
-                bodyParts.push(replaceInlineBase64(sanitizeString(doc.body.textContent || "")));
-            }
+        bodyParts.push(replaceInlineBase64(doc.body.textContent || ""));
    } else {
-            bodyParts.push(replaceInlineBase64(sanitizeString(doc.body.textContent || "")));
-        }
-    } else {
-        bodyParts.push(replaceInlineBase64(sanitizeString(body)));
+        bodyParts.push(replaceInlineBase64(body));
    }
 }

-function collectRawText(part, bodyParts, attachments) {
-    if (part.parts && part.parts.length) {
-        for (const p of part.parts) collectRawText(p, bodyParts, attachments);
-        return;
-    }
-    const ct = (part.contentType || "text/plain").toLowerCase();
-    const cd = (part.headers?.["content-disposition"]?.[0] || "").toLowerCase();
-    const body = String(part.body || "");
-    if (cd.includes("attachment") || !ct.startsWith("text/")) {
-        const nameMatch = /filename\s*=\s*"?([^";]+)/i.exec(cd) || /name\s*=\s*"?([^";]+)/i.exec(part.headers?.["content-type"]?.[0] || "");
-        const name = nameMatch ? nameMatch[1] : "";
-        attachments.push(`${name} (${ct}, ${part.size || byteSize(body)} bytes)`);
-    } else if (ct.startsWith("text/html")) {
-        const doc = new DOMParser().parseFromString(body, 'text/html');
-        bodyParts.push(doc.body.textContent || "");
-    } else {
-        bodyParts.push(body);
-    }
-}
-
-function buildEmailText(full, applyTransforms = true) {
+function buildEmailText(full) {
    const bodyParts = [];
    const attachments = [];
-    const collect = applyTransforms ? collectText : collectRawText;
-    collect(full, bodyParts, attachments);
+    collectText(full, bodyParts, attachments);
    const headers = Object.entries(full.headers || {})
        .map(([k,v]) => `${k}: ${v.join(' ')}`)
        .join('\n');
-    const attachInfo = `Attachments: ${attachments.length}` +
-        (attachments.length ? "\n" + attachments.map(a => ` - ${a}`).join('\n') : "");
-    let combined = `${headers}\n${attachInfo}\n\n${bodyParts.join('\n')}`.trim();
-    if (applyTransforms && tokenReduction) {
-        const seen = new Set();
-        combined = combined.split('\n').filter(l => {
-            if (seen.has(l)) return false;
-            seen.add(l);
-            return true;
-        }).join('\n');
+    const attachInfo = `Attachments: ${attachments.length}` + (attachments.length ? "\n" + attachments.map(a => ` - ${a}`).join('\n') : "");
+    return `${headers}\n${attachInfo}\n\n${bodyParts.join('\n')}`.trim();
 }
-    return applyTransforms ? sanitizeString(combined) : combined;
+async function applyAiRules(idsInput) {
+    const ids = Array.isArray(idsInput) ? idsInput : [idsInput];
+    if (!ids.length) return queue;
+
+    if (!aiRules.length) {
+        const { aiRules: stored } = await storage.local.get("aiRules");
+        aiRules = Array.isArray(stored) ? stored.map(r => {
+            if (r.actions) return r;
+            const actions = [];
+            if (r.tag) actions.push({ type: 'tag', tagKey: r.tag });
+            if (r.moveTo) actions.push({ type: 'move', folder: r.moveTo });
+            const rule = { criterion: r.criterion, actions };
+            if (r.stopProcessing) rule.stopProcessing = true;
+            return rule;
+        }) : [];
    }

-function updateTimingStats(elapsed) {
-    const t = timingStats;
-    t.count += 1;
-    t.total += elapsed;
-    t.last = elapsed;
-    const delta = elapsed - t.mean;
-    t.mean += delta / t.count;
-    t.m2 += delta * (elapsed - t.mean);
-}
-
-async function getAllMessageIds(list) {
-    const ids = [];
-    if (!list) {
-        return ids;
-    }
-    let page = list;
-    ids.push(...(page.messages || []).map(m => m.id));
-    while (page.id) {
-        page = await messenger.messages.continueList(page.id);
-        ids.push(...(page.messages || []).map(m => m.id));
-    }
-    return ids;
-}
-
-async function processMessage(id) {
+    for (const msg of ids) {
+        const id = msg?.id ?? msg;
+        queuedCount++;
+        updateActionIcon();
+        queue = queue.then(async () => {
            processing = true;
-    currentStart = Date.now();
            queuedCount--;
            updateActionIcon();
            try {
                const full = await messenger.messages.getFull(id);
-        const originalText = buildEmailText(full, false);
-        let text = buildEmailText(full);
-        if (tokenReduction && maxTokens > 0) {
-            const limit = Math.floor(maxTokens * 0.9);
-            if (text.length > limit) {
-                text = text.slice(0, limit);
-            }
-        }
-        if (showDebugTab) {
-            await storage.local.set({ lastFullText: originalText, lastPromptText: text });
-        }
-        let hdr;
-        let currentTags = [];
-        let alreadyRead = false;
-        let identityId = null;
-        try {
-            hdr = await messenger.messages.get(id);
-            currentTags = Array.isArray(hdr.tags) ? [...hdr.tags] : [];
-            alreadyRead = hdr.read === true;
-            const ids = await messenger.identities.list(hdr.folder.accountId);
-            identityId = ids[0]?.id || null;
-        } catch (e) {
-            currentTags = [];
-            alreadyRead = false;
-            identityId = null;
-        }
+                const text = buildEmailText(full);

                for (const rule of aiRules) {
-            if (rule.enabled === false) {
-                continue;
-            }
-            if (hdr && Array.isArray(rule.accounts) && rule.accounts.length &&
-                !rule.accounts.includes(hdr.folder.accountId)) {
-                continue;
-            }
-            if (hdr && Array.isArray(rule.folders) && rule.folders.length &&
-                !rule.folders.includes(hdr.folder.path)) {
-                continue;
-            }
-            if (rule.unreadOnly && alreadyRead) {
-                continue;
-            }
-            if (hdr && (typeof rule.minAgeDays === 'number' || typeof rule.maxAgeDays === 'number')) {
-                const msgTime = new Date(hdr.date).getTime();
-                if (!isNaN(msgTime)) {
-                    const ageDays = (Date.now() - msgTime) / 86400000;
-                    if (typeof rule.minAgeDays === 'number' && ageDays < rule.minAgeDays) {
-                        continue;
-                    }
-                    if (typeof rule.maxAgeDays === 'number' && ageDays > rule.maxAgeDays) {
-                        continue;
-                    }
-                }
-            }
-            const cacheKey = await AiClassifier.buildCacheKey(id, rule.criterion);
+                    const cacheKey = await sha256Hex(`${id}|${rule.criterion}`);
                    const matched = await AiClassifier.classifyText(text, rule.criterion, cacheKey);
                    if (matched) {
                        for (const act of (rule.actions || [])) {
                            if (act.type === 'tag' && act.tagKey) {
-                        if (!currentTags.includes(act.tagKey)) {
-                            currentTags.push(act.tagKey);
-                            await messenger.messages.update(id, { tags: currentTags });
-                        }
+                                await messenger.messages.update(id, { tags: [act.tagKey] });
                            } else if (act.type === 'move' && act.folder) {
                                await messenger.messages.move([id], act.folder);
-                    } else if (act.type === 'copy' && act.copyTarget) {
-                        await messenger.messages.copy([id], act.copyTarget);
                            } else if (act.type === 'junk') {
                                await messenger.messages.update(id, { junk: !!act.junk });
-                    } else if (act.type === 'read') {
-                        await messenger.messages.update(id, { read: !!act.read });
-                    } else if (act.type === 'flag') {
-                        await messenger.messages.update(id, { flagged: !!act.flagged });
-                    } else if (act.type === 'delete') {
-                        await messenger.messages.delete([id]);
-                    } else if (act.type === 'archive') {
-                        await messenger.messages.archive([id]);
-                    } else if (act.type === 'forward' && act.address && identityId) {
-                        await browser.compose.beginForward(id, { to: [act.address], identityId });
-                    } else if (act.type === 'reply' && act.replyType && identityId) {
-                        await browser.compose.beginReply(id, { replyType: act.replyType, identityId });
                            }
                        }
                        if (rule.stopProcessing) {
@ -407,42 +135,14 @@ async function processMessage(id) {
                    }
                }
                processing = false;
-        const elapsed = Date.now() - currentStart;
-        currentStart = 0;
-        updateTimingStats(elapsed);
-        await storage.local.set({ classifyStats: timingStats });
-        showTransientIcon(ICONS.circle);
+                showTransientIcon("resources/img/done.png");
            } catch (e) {
                processing = false;
-        const elapsed = Date.now() - currentStart;
-        currentStart = 0;
-        updateTimingStats(elapsed);
-        await storage.local.set({ classifyStats: timingStats });
                logger.aiLog("failed to apply AI rules", { level: 'error' }, e);
-        recordError("Failed to apply AI rules", e);
-        browser.notifications.create(ERROR_NOTIFICATION_ID, {
-            type: 'basic',
-            iconUrl: browser.runtime.getURL('resources/img/logo.png'),
-            title: 'Sortana Error',
-            message: 'Failed to apply AI rules'
+                showTransientIcon("resources/img/error.png");
+            }
        });
    }
-}
-async function applyAiRules(idsInput) {
-    const ids = Array.isArray(idsInput) ? idsInput : [idsInput];
-    if (!ids.length) return queue;
-
-    if (!aiRules.length) {
-        const { aiRules: stored } = await storage.local.get("aiRules");
-        aiRules = normalizeRules(stored);
-    }
-
-    for (const msg of ids) {
-        const id = msg?.id ?? msg;
-        queuedCount++;
-        updateActionIcon();
-        queue = queue.then(() => processMessage(id));
-    }

    return queue;
 }
@ -453,219 +153,145 @@ async function clearCacheForMessages(idsInput) {

    if (!aiRules.length) {
        const { aiRules: stored } = await storage.local.get("aiRules");
-        aiRules = normalizeRules(stored);
+        aiRules = Array.isArray(stored) ? stored.map(r => {
+            if (r.actions) return r;
+            const actions = [];
+            if (r.tag) actions.push({ type: 'tag', tagKey: r.tag });
+            if (r.moveTo) actions.push({ type: 'move', folder: r.moveTo });
+            const rule = { criterion: r.criterion, actions };
+            if (r.stopProcessing) rule.stopProcessing = true;
+            return rule;
+        }) : [];
    }

    const keys = [];
    for (const msg of ids) {
        const id = msg?.id ?? msg;
        for (const rule of aiRules) {
-            const key = await AiClassifier.buildCacheKey(id, rule.criterion);
+            const key = await sha256Hex(`${id}|${rule.criterion}`);
            keys.push(key);
        }
    }
    if (keys.length) {
        await AiClassifier.removeCacheEntries(keys);
-        showTransientIcon(ICONS.circle);
+        showTransientIcon("resources/img/done.png");
    }
 }

 (async () => {
    logger = await import(browser.runtime.getURL("logger.js"));
-    ({ detectSystemTheme } = await import(browser.runtime.getURL('modules/themeUtils.js')));
    try {
        AiClassifier = await import(browser.runtime.getURL("modules/AiClassifier.js"));
        logger.aiLog("AiClassifier imported", {debug: true});
-        const td = await import(browser.runtime.getURL("resources/js/turndown.js"));
-        TurndownService = td.default || td.TurndownService;
    } catch (e) {
        console.error("failed to import AiClassifier", e);
        return;
    }

    try {
-        const store = await storage.local.get(["endpoint", "model", "apiKey", "openaiOrganization", "openaiProject", "templateName", "customTemplate", "customSystemPrompt", "aiParams", "debugLogging", "htmlToMarkdown", "stripUrlParams", "altTextImages", "collapseWhitespace", "tokenReduction", "aiRules", "theme", "showDebugTab"]);
+        const store = await storage.local.get(["endpoint", "templateName", "customTemplate", "customSystemPrompt", "aiParams", "debugLogging", "aiRules"]);
        logger.setDebug(store.debugLogging);
        await AiClassifier.setConfig(store);
-        userTheme = store.theme || 'auto';
-        currentTheme = userTheme === 'auto' ? await detectSystemTheme() : userTheme;
-        await AiClassifier.init();
-        htmlToMarkdown = store.htmlToMarkdown === true;
-        stripUrlParams = store.stripUrlParams === true;
-        altTextImages = store.altTextImages === true;
-        collapseWhitespace = store.collapseWhitespace === true;
-        tokenReduction = store.tokenReduction === true;
-        if (store.aiParams && typeof store.aiParams.max_tokens !== 'undefined') {
-            maxTokens = parseInt(store.aiParams.max_tokens) || maxTokens;
-        }
-        showDebugTab = store.showDebugTab === true;
-        const savedStats = await storage.local.get('classifyStats');
-        if (savedStats.classifyStats && typeof savedStats.classifyStats === 'object') {
-            Object.assign(timingStats, savedStats.classifyStats);
-        }
-        if (typeof timingStats.last !== 'number') {
-            timingStats.last = -1;
-        }
-        aiRules = normalizeRules(store.aiRules);
+        aiRules = Array.isArray(store.aiRules) ? store.aiRules.map(r => {
+            if (r.actions) return r;
+            const actions = [];
+            if (r.tag) actions.push({ type: 'tag', tagKey: r.tag });
+            if (r.moveTo) actions.push({ type: 'move', folder: r.moveTo });
+            const rule = { criterion: r.criterion, actions };
+            if (r.stopProcessing) rule.stopProcessing = true;
+            return rule;
+        }) : [];
        logger.aiLog("configuration loaded", {debug: true}, store);
        storage.onChanged.addListener(async changes => {
            if (changes.aiRules) {
                const newRules = changes.aiRules.newValue || [];
-                aiRules = normalizeRules(newRules);
+                aiRules = newRules.map(r => {
+                    if (r.actions) return r;
+                    const actions = [];
+                    if (r.tag) actions.push({ type: 'tag', tagKey: r.tag });
+                    if (r.moveTo) actions.push({ type: 'move', folder: r.moveTo });
+                    const rule = { criterion: r.criterion, actions };
+                    if (r.stopProcessing) rule.stopProcessing = true;
+                    return rule;
+                });
                logger.aiLog("aiRules updated from storage change", {debug: true}, aiRules);
            }
-            if (changes.endpoint || changes.model || changes.apiKey || changes.openaiOrganization || changes.openaiProject || changes.templateName || changes.customTemplate || changes.customSystemPrompt || changes.aiParams || changes.debugLogging) {
-                const config = {};
-                if (changes.endpoint) config.endpoint = changes.endpoint.newValue;
-                if (changes.model) config.model = changes.model.newValue;
-                if (changes.apiKey) config.apiKey = changes.apiKey.newValue;
-                if (changes.openaiOrganization) config.openaiOrganization = changes.openaiOrganization.newValue;
-                if (changes.openaiProject) config.openaiProject = changes.openaiProject.newValue;
-                if (changes.templateName) config.templateName = changes.templateName.newValue;
-                if (changes.customTemplate) config.customTemplate = changes.customTemplate.newValue;
-                if (changes.customSystemPrompt) config.customSystemPrompt = changes.customSystemPrompt.newValue;
-                if (changes.aiParams) {
-                    config.aiParams = changes.aiParams.newValue;
-                    if (changes.aiParams.newValue && typeof changes.aiParams.newValue.max_tokens !== 'undefined') {
-                        maxTokens = parseInt(changes.aiParams.newValue.max_tokens) || maxTokens;
-                    }
-                }
-                if (changes.debugLogging) {
-                    config.debugLogging = changes.debugLogging.newValue === true;
-                    logger.setDebug(config.debugLogging);
-                }
-                await AiClassifier.setConfig(config);
-                logger.aiLog("AiClassifier config updated from storage change", { debug: true }, config);
-            }
-            if (changes.htmlToMarkdown) {
-                htmlToMarkdown = changes.htmlToMarkdown.newValue === true;
-                logger.aiLog("htmlToMarkdown updated from storage change", { debug: true }, htmlToMarkdown);
-            }
-            if (changes.stripUrlParams) {
-                stripUrlParams = changes.stripUrlParams.newValue === true;
-                logger.aiLog("stripUrlParams updated from storage change", { debug: true }, stripUrlParams);
-            }
-            if (changes.altTextImages) {
-                altTextImages = changes.altTextImages.newValue === true;
-                logger.aiLog("altTextImages updated from storage change", { debug: true }, altTextImages);
-            }
-            if (changes.collapseWhitespace) {
-                collapseWhitespace = changes.collapseWhitespace.newValue === true;
-                logger.aiLog("collapseWhitespace updated from storage change", { debug: true }, collapseWhitespace);
-            }
-            if (changes.tokenReduction) {
-                tokenReduction = changes.tokenReduction.newValue === true;
-                logger.aiLog("tokenReduction updated from storage change", { debug: true }, tokenReduction);
-            }
-            if (changes.showDebugTab) {
-                showDebugTab = changes.showDebugTab.newValue === true;
-            }
-            if (changes.theme) {
-                userTheme = changes.theme.newValue || 'auto';
-                currentTheme = userTheme === 'auto' ? await detectSystemTheme() : userTheme;
-                updateActionIcon();
-                refreshMenuIcons();
-            }
        });
-
-        if (browser.theme?.onUpdated) {
-            browser.theme.onUpdated.addListener(async () => {
-                if (userTheme === 'auto') {
-                    const theme = await detectSystemTheme();
-                    if (theme !== currentTheme) {
-                        currentTheme = theme;
-                        updateActionIcon();
-                        refreshMenuIcons();
-                    }
-                }
-            });
-        }
    } catch (err) {
        logger.aiLog("failed to load config", {level: 'error'}, err);
    }

    logger.aiLog("background.js loaded – ready to classify", {debug: true});
-    updateActionIcon();
    if (browser.messageDisplayAction) {
-        browser.messageDisplayAction.setTitle({ title: "Details" });
+        browser.messageDisplayAction.setTitle({ title: "Classify" });
        if (browser.messageDisplayAction.setLabel) {
-            browser.messageDisplayAction.setLabel({ label: "Details" });
+            browser.messageDisplayAction.setLabel({ label: "Classify" });
+        }
+    }
+    if (browser.messageDisplayScripts?.registerScripts) {
+        try {
+            await browser.messageDisplayScripts.registerScripts([
+                { js: [browser.runtime.getURL("resources/clearCacheButton.js")] },
+                { js: [browser.runtime.getURL("resources/reasonButton.js")] }
+            ]);
+        } catch (e) {
+            logger.aiLog("failed to register message display script", { level: 'warn' }, e);
        }
-
    }

    browser.menus.create({
        id: "apply-ai-rules-list",
        title: "Apply AI Rules",
        contexts: ["message_list"],
-        icons: iconPaths('eye')
    });
    browser.menus.create({
        id: "apply-ai-rules-display",
        title: "Apply AI Rules",
        contexts: ["message_display_action"],
-        icons: iconPaths('eye')
    });
    browser.menus.create({
        id: "clear-ai-cache-list",
        title: "Clear AI Cache",
        contexts: ["message_list"],
-        icons: iconPaths('trash')
    });
    browser.menus.create({
        id: "clear-ai-cache-display",
        title: "Clear AI Cache",
        contexts: ["message_display_action"],
-        icons: iconPaths('trash')
    });
-    browser.menus.create({
-        id: "view-ai-reason-list",
-        title: "View Reasoning",
-        contexts: ["message_list"],
-        icons: iconPaths('clipboarddata')
-    });
-    browser.menus.create({
-        id: "view-ai-reason-display",
-        title: "View Reasoning",
-        contexts: ["message_display_action"],
-        icons: iconPaths('clipboarddata')
-    });
-    refreshMenuIcons();

-    browser.menus.onClicked.addListener(async (info, tab) => {
-        if (info.menuItemId === "apply-ai-rules-list" || info.menuItemId === "apply-ai-rules-display") {
-            let ids = info.messageId ? [info.messageId] : [];
-            if (info.selectedMessages) {
-                ids = await getAllMessageIds(info.selectedMessages);
+    if (browser.messageDisplayAction) {
+        browser.messageDisplayAction.onClicked.addListener(async (tab) => {
+            try {
+                const msgs = await browser.messageDisplay.getDisplayedMessages(tab.id);
+                const ids = msgs.map(m => m.id);
+                await applyAiRules(ids);
+            } catch (e) {
+                logger.aiLog("failed to apply AI rules from action", { level: 'error' }, e);
            }
+        });
+    }
+
+    browser.menus.onClicked.addListener(async info => {
+        if (info.menuItemId === "apply-ai-rules-list" || info.menuItemId === "apply-ai-rules-display") {
+            const ids = info.selectedMessages?.messages?.map(m => m.id) ||
+                         (info.messageId ? [info.messageId] : []);
            await applyAiRules(ids);
        } else if (info.menuItemId === "clear-ai-cache-list" || info.menuItemId === "clear-ai-cache-display") {
-            let ids = info.messageId ? [info.messageId] : [];
-            if (info.selectedMessages) {
-                ids = await getAllMessageIds(info.selectedMessages);
-            }
+            const ids = info.selectedMessages?.messages?.map(m => m.id) ||
+                         (info.messageId ? [info.messageId] : []);
            await clearCacheForMessages(ids);
-        } else if (info.menuItemId === "view-ai-reason-list" || info.menuItemId === "view-ai-reason-display") {
-            const [header] = await browser.messageDisplay.getDisplayedMessages(tab.id);
-            if (!header) { return; }
-
-            const url = `${browser.runtime.getURL("details.html")}?mid=${header.id}`;
-
-            await browser.tabs.create({ url });
        }
    });

    // Listen for messages from UI/devtools
    browser.runtime.onMessage.addListener(async (msg) => {
-        if ((msg?.type === "sortana:getTiming" && logGetTiming) || (msg?.type !== "sortana:getTiming")) {
-            logGetTiming = false;
        logger.aiLog("onMessage received", {debug: true}, msg);
-        }

-        if (msg?.type === "sortana:test") {
+    if (msg?.type === "aiFilter:test") {
        const { text = "", criterion = "" } = msg;
-            logger.aiLog("sortana:test – text", { debug: true }, text);
-            logger.aiLog("sortana:test – criterion", { debug: true }, criterion);
+        logger.aiLog("aiFilter:test – text", {debug: true}, text);
+        logger.aiLog("aiFilter:test – criterion", {debug: true}, criterion);

        try {
            logger.aiLog("Calling AiClassifier.classifyText()", {debug: true});
@ -680,7 +306,9 @@ async function clearCacheForMessages(idsInput) {
        }
    } else if (msg?.type === "sortana:clearCacheForDisplayed") {
        try {
-                const msgs = await browser.messageDisplay.getDisplayedMessages();
+            const tabs = await browser.tabs.query({ active: true, currentWindow: true });
+            const tabId = tabs[0]?.id;
+            const msgs = tabId ? await browser.messageDisplay.getDisplayedMessages(tabId) : [];
            const ids = msgs.map(m => m.id);
            await clearCacheForMessages(ids);
        } catch (e) {
@ -693,11 +321,19 @@ async function clearCacheForMessages(idsInput) {
            const subject = hdr?.subject || "";
            if (!aiRules.length) {
                const { aiRules: stored } = await storage.local.get("aiRules");
-                    aiRules = normalizeRules(stored);
+                aiRules = Array.isArray(stored) ? stored.map(r => {
+                    if (r.actions) return r;
+                    const actions = [];
+                    if (r.tag) actions.push({ type: 'tag', tagKey: r.tag });
+                    if (r.moveTo) actions.push({ type: 'move', folder: r.moveTo });
+                    const rule = { criterion: r.criterion, actions };
+                    if (r.stopProcessing) rule.stopProcessing = true;
+                    return rule;
+                }) : [];
            }
            const reasons = [];
            for (const rule of aiRules) {
-                    const key = await AiClassifier.buildCacheKey(id, rule.criterion);
+                const key = await sha256Hex(`${id}|${rule.criterion}`);
                const reason = AiClassifier.getReason(key);
                if (reason) {
                    reasons.push({ criterion: rule.criterion, reason });
@ -708,76 +344,6 @@ async function clearCacheForMessages(idsInput) {
            logger.aiLog("failed to collect reasons", { level: 'error' }, e);
            return { subject: '', reasons: [] };
        }
-        } else if (msg?.type === "sortana:getDetails") {
-            try {
-                const id = msg.id;
-                const hdr = await messenger.messages.get(id);
-                const subject = hdr?.subject || "";
-                if (!aiRules.length) {
-                    const { aiRules: stored } = await storage.local.get("aiRules");
-                    aiRules = normalizeRules(stored);
-                }
-                const results = [];
-                for (const rule of aiRules) {
-                    const key = await AiClassifier.buildCacheKey(id, rule.criterion);
-                    const matched = AiClassifier.getCachedResult(key);
-                    const reason = AiClassifier.getReason(key);
-                    if (matched !== null || reason) {
-                        results.push({ criterion: rule.criterion, matched, reason });
-                    }
-                }
-                return { subject, results };
-            } catch (e) {
-                logger.aiLog("failed to collect details", { level: 'error' }, e);
-                return { subject: '', results: [] };
-            }
-        } else if (msg?.type === "sortana:getDisplayedMessages") {
-            try {
-                const [tab] = await browser.tabs.query({ active: true, currentWindow: true });
-                const messages = await browser.messageDisplay.getDisplayedMessages(tab?.id);
-                const ids = messages.map(hdr => hdr.id);
-
-                return { ids };
-            } catch (e) {
-                logger.aiLog("failed to get displayed messages", { level: 'error' }, e);
-                return { messages: [] };
-            }
-        } else if (msg?.type === "sortana:clearCacheForMessage") {
-            try {
-                await clearCacheForMessages([msg.id]);
-                return { ok: true };
-            } catch (e) {
-                logger.aiLog("failed to clear cache for message", { level: 'error' }, e);
-                return { ok: false };
-            }
-        } else if (msg?.type === "sortana:resetTimingStats") {
-            const last = timingStats.last;
-            timingStats.count = 0;
-            timingStats.mean = 0;
-            timingStats.m2 = 0;
-            timingStats.total = 0;
-            timingStats.last = typeof last === 'number' ? last : -1;
-            await storage.local.set({ classifyStats: timingStats });
-            return { ok: true };
-        } else if (msg?.type === "sortana:getQueueCount") {
-            return { count: queuedCount + (processing ? 1 : 0) };
-        } else if (msg?.type === "sortana:getErrorLog") {
-            return { errors: errorLog.slice() };
-        } else if (msg?.type === "sortana:recordError") {
-            recordError(msg.context || "Sortana Error", { message: msg.message, detail: msg.detail });
-            return { ok: true };
-        } else if (msg?.type === "sortana:getTiming") {
-            const t = timingStats;
-            const std = t.count > 1 ? Math.sqrt(t.m2 / (t.count - 1)) : 0;
-            return {
-                count: queuedCount + (processing ? 1 : 0),
-                current: currentStart ? Date.now() - currentStart : -1,
-                last: t.last,
-                runs: t.count,
-                average: t.mean,
-                total: t.total,
-                stddev: std
-            };
    } else {
        logger.aiLog("Unknown message type, ignoring", {level: 'warn'}, msg?.type);
    }
@ -797,19 +363,6 @@ async function clearCacheForMessages(idsInput) {
 // Catch any unhandled rejections
 window.addEventListener("unhandledrejection", ev => {
    logger.aiLog("Unhandled promise rejection", {level: 'error'}, ev.reason);
-        recordError("Unhandled promise rejection", ev.reason);
-    });
-
-    browser.notifications.onClicked.addListener(id => {
-        if (id === ERROR_NOTIFICATION_ID) {
-            clearError();
-        }
-    });
-
-    browser.notifications.onButtonClicked.addListener((id) => {
-        if (id === ERROR_NOTIFICATION_ID) {
-            clearError();
-        }
 });

    browser.runtime.onInstalled.addListener(async ({ reason }) => {
--- a/build-xpi.ps1
+++ b/build-xpi.ps1
@ -26,7 +26,7 @@ if (-not $version) {
 }

 # 4) Define output names & clean up
-$xpiName = "sortana-$version.xpi"
+$xpiName = "ai-filter-$version.xpi"
 $zipPath = Join-Path $ReleaseDir "ai-filter-$version.zip"
 $xpiPath = Join-Path $ReleaseDir $xpiName

--- a/build-xpi.sh
+++ b/build-xpi.sh
@ -1,77 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-release_dir="$script_dir/release"
-manifest="$script_dir/manifest.json"
-
-if [[ ! -f "$manifest" ]]; then
-  echo "manifest.json not found at $manifest" >&2
-  exit 1
-fi
-
-if ! command -v zip >/dev/null 2>&1; then
-  echo "zip is required to build the XPI." >&2
-  exit 1
-fi
-
-if command -v jq >/dev/null 2>&1; then
-  version="$(jq -r '.version // empty' "$manifest")"
-else
-  if ! command -v python3 >/dev/null 2>&1; then
-    echo "python3 is required to read manifest.json without jq." >&2
-    exit 1
-  fi
-  version="$(python3 - <<'PY'
-import json
-import sys
-with open(sys.argv[1], 'r', encoding='utf-8') as f:
-    data = json.load(f)
-print(data.get('version', '') or '')
-PY
-"$manifest")"
-fi
-
-if [[ -z "$version" ]]; then
-  echo "No version found in manifest.json" >&2
-  exit 1
-fi
-
-mkdir -p "$release_dir"
-
-xpi_name="sortana-$version.xpi"
-zip_path="$release_dir/ai-filter-$version.zip"
-xpi_path="$release_dir/$xpi_name"
-
-rm -f "$zip_path" "$xpi_path"
-
-mapfile -d '' files < <(
-  find "$script_dir" -type f \
-    ! -name '*.sln' \
-    ! -name '*.ps1' \
-    ! -name '*.sh' \
-    ! -path "$release_dir/*" \
-    ! -path "$script_dir/.vs/*" \
-    ! -path "$script_dir/.git/*" \
-    -printf '%P\0'
-)
-
-if [[ ${#files[@]} -eq 0 ]]; then
-  echo "No files found to package." >&2
-  exit 0
-fi
-
-for rel in "${files[@]}"; do
-  full="$script_dir/$rel"
-  size=$(stat -c '%s' "$full")
-  echo "Zipping: $rel <- $full ($size bytes)"
-done
-
-(
-  cd "$script_dir"
-  printf '%s\n' "${files[@]}" | zip -q -9 -@ "$zip_path"
-)
-
-mv -f "$zip_path" "$xpi_path"
-
-echo "Built XPI at: $xpi_path"
--- a/details.js
+++ b/details.js
@ -1,75 +0,0 @@
-const aiLog = (await import(browser.runtime.getURL("logger.js"))).aiLog;
-const storage = (globalThis.messenger ?? browser).storage;
-const { detectSystemTheme } = await import(browser.runtime.getURL('modules/themeUtils.js'));
-const { theme } = await storage.local.get('theme');
-const mode = (theme || 'auto') === 'auto'
-  ? await detectSystemTheme()
-  : theme;
-document.documentElement.dataset.theme = mode;
-
-const qMid = parseInt(new URLSearchParams(location.search).get("mid"), 10);
-if (!isNaN(qMid)) {
-  loadMessage(qMid);
-} else {
-  const { ids } = await browser.runtime.sendMessage({
-    type: "sortana:getDisplayedMessages",
-  });
-  if (ids && ids[0]) {
-    loadMessage(ids[0]);
-  } else {
-      const tabs = await browser.tabs.query({ active: true, currentWindow: true });
-      const tabId = tabs[0]?.id;
-      const msgs = tabId ? await browser.messageDisplay.getDisplayedMessages(tabId) : [];
-      let id = msgs[0]?.id;
-      if (id) {
-          loadMessage(id);
-      }
-      else {
-          aiLog("Details popup: no displayed message found");
-      }
-  }
-}
-
-async function loadMessage(id) {
-  const storage = (globalThis.messenger ?? browser).storage;
-  const logMod = await import(browser.runtime.getURL('logger.js'));
-  const { debugLogging } = await storage.local.get('debugLogging');
-  logMod.setDebug(debugLogging === true);
-  const log = logMod.aiLog;
-
-  log('details page loaded', { debug: true });
-  try {
-    log('requesting message details', {}, id);
-    const { subject, results } = await browser.runtime.sendMessage({ type: 'sortana:getDetails', id });
-    log('received details', { debug: true }, { subject, results });
-    document.getElementById('subject').textContent = subject;
-    const container = document.getElementById('rules');
-    for (const r of results) {
-      log('rendering rule result', { debug: true }, r);
-      const article = document.createElement('article');
-      const color = r.matched === true ? 'is-success' : 'is-danger';
-      article.className = `message ${color} mb-4`;
-      const header = document.createElement('div');
-      header.className = 'message-header';
-      header.innerHTML = `<p>${r.criterion}</p>`;
-      const body = document.createElement('div');
-      body.className = 'message-body';
-      const status = document.createElement('p');
-      status.textContent = r.matched ? 'Matched' : 'Did not match';
-      const pre = document.createElement('pre');
-      pre.textContent = r.reason || '';
-      body.appendChild(status);
-      body.appendChild(pre);
-      article.appendChild(header);
-      article.appendChild(body);
-      container.appendChild(article);
-    }
-    document.getElementById('clear').addEventListener('click', async () => {
-      log('clearing cache for message', {}, id);
-      await browser.runtime.sendMessage({ type: 'sortana:clearCacheForMessage', id });
-      window.close();
-    });
-  } catch (e) {
-    log('failed to load details', { level: 'error' }, e);
-  }
-}
--- a/manifest.json
+++ b/manifest.json
@ -1,13 +1,13 @@
 {
  "manifest_version": 2,
  "name": "Sortana",
-  "version": "2.4.2",
+  "version": "2.0.0",
  "default_locale": "en-US",
  "applications": {
    "gecko": {
      "id": "ai-filter@jordanwages",
      "strict_min_version": "128.0",
-      "strict_max_version": "140.*"
+      "strict_max_version": "*"
    }
  },
  "icons": {
@ -22,10 +22,9 @@
    "default_icon": "resources/img/logo32.png"
  },
  "message_display_action": {
-    "default_icon": "resources/img/logo.png",
-    "default_title": "Details",
-    "default_label": "Details",
-    "default_popup": "details.html"
+    "default_icon": "resources/img/logo32.png",
+    "default_title": "Classify",
+    "default_label": "Classify"
  },
  "background": { "scripts": [ "background.js" ] },
  "options_ui": {
@ -39,11 +38,6 @@
    "messagesUpdate",
    "messagesTagsList",
    "accountsRead",
-      "menus",
-      "notifications",
-      "scripting",
-      "tabs",
-      "theme",
-      "compose"
+    "menus"
  ]
 }
--- a/modules/AiClassifier.js
+++ b/modules/AiClassifier.js
@ -1,6 +1,5 @@
 "use strict";
 import { aiLog, setDebug } from "../logger.js";
-import { DEFAULT_AI_PARAMS } from "./defaultParams.js";

 const storage = (globalThis.messenger ?? globalThis.browser).storage;

@ -15,9 +14,6 @@ try {
  Services = undefined;
 }

-const COMPLETIONS_PATH = "/v1/completions";
-const MODELS_PATH = "/v1/models";
-
 const SYSTEM_PREFIX = `You are an email-classification assistant.
 Read the email below and the classification criterion provided by the user.
 `;
@ -26,104 +22,35 @@ const DEFAULT_CUSTOM_SYSTEM_PROMPT = "Determine whether the email satisfies the

 const SYSTEM_SUFFIX = `
 Return ONLY a JSON object on a single line of the form:
-{"match": true, "reason": "<short explanation>"} - if the email satisfies the criterion
-{"match": false, "reason": "<short explanation>"} - otherwise
+{"match": true} - if the email satisfies the criterion
+{"match": false} - otherwise

 Do not add any other keys, text, or formatting.`;

-let gEndpointBase = "http://127.0.0.1:5000";
-let gEndpoint = buildEndpointUrl(gEndpointBase);
+let gEndpoint = "http://127.0.0.1:5000/v1/classify";
 let gTemplateName = "openai";
 let gCustomTemplate = "";
 let gCustomSystemPrompt = DEFAULT_CUSTOM_SYSTEM_PROMPT;
 let gTemplateText = "";

-let gAiParams = Object.assign({}, DEFAULT_AI_PARAMS);
-let gModel = "";
-let gApiKey = "";
-let gOpenaiOrganization = "";
-let gOpenaiProject = "";
+let gAiParams = {
+  max_tokens: 4096,
+  temperature: 0.6,
+  top_p: 0.95,
+  seed: -1,
+  repetition_penalty: 1.0,
+  top_k: 20,
+  min_p: 0,
+  presence_penalty: 0,
+  frequency_penalty: 0,
+  typical_p: 1,
+  tfs: 1,
+};

 let gCache = new Map();
 let gCacheLoaded = false;
-
-function normalizeEndpointBase(endpoint) {
-  if (typeof endpoint !== "string") {
-    return "";
-  }
-  let base = endpoint.trim();
-  if (!base) {
-    return "";
-  }
-  base = base.replace(/\/v1\/(completions|models)\/?$/i, "");
-  return base;
-}
-
-function buildEndpointUrl(endpointBase) {
-  const base = normalizeEndpointBase(endpointBase);
-  if (!base) {
-    return "";
-  }
-  const withScheme = /^https?:\/\//i.test(base) ? base : `https://${base}`;
-  const needsSlash = withScheme.endsWith("/");
-  const path = COMPLETIONS_PATH.replace(/^\//, "");
-  return `${withScheme}${needsSlash ? "" : "/"}${path}`;
-}
-
-function buildModelsUrl(endpointBase) {
-  const base = normalizeEndpointBase(endpointBase);
-  if (!base) {
-    return "";
-  }
-  const withScheme = /^https?:\/\//i.test(base) ? base : `https://${base}`;
-  const needsSlash = withScheme.endsWith("/");
-  const path = MODELS_PATH.replace(/^\//, "");
-  return `${withScheme}${needsSlash ? "" : "/"}${path}`;
-}
-
-function sha256HexSync(str) {
-  try {
-    const hasher = Cc["@mozilla.org/security/hash;1"].createInstance(Ci.nsICryptoHash);
-    hasher.init(Ci.nsICryptoHash.SHA256);
-    const data = new TextEncoder().encode(str);
-    hasher.update(data, data.length);
-    const binary = hasher.finish(false);
-    return Array.from(binary, c => ("0" + c.charCodeAt(0).toString(16)).slice(-2)).join("");
-  } catch (e) {
-    aiLog(`sha256HexSync failed`, { level: 'error' }, e);
-    return "";
-  }
-}
-
-async function sha256Hex(str) {
-  if (typeof crypto?.subtle?.digest === "function") {
-    const buf = await crypto.subtle.digest("SHA-256", new TextEncoder().encode(str));
-    return Array.from(new Uint8Array(buf), b => b.toString(16).padStart(2, "0")).join("");
-  }
-  return sha256HexSync(str);
-}
-
-async function resolveHeaderId(id) {
-  if (typeof id === "number" && typeof messenger?.messages?.get === "function") {
-    try {
-      const hdr = await messenger.messages.get(id);
-      if (hdr?.headerMessageId) {
-        return hdr.headerMessageId;
-      }
-    } catch (e) {
-      aiLog(`Failed to resolve headerMessageId for ${id}`, { level: 'warn' }, e);
-    }
-  }
-  return String(id);
-}
-
-async function buildCacheKey(id, criterion) {
-  const resolvedId = await resolveHeaderId(id);
-  if (Services) {
-    return sha256HexSync(`${resolvedId}|${criterion}`);
-  }
-  return sha256Hex(`${resolvedId}|${criterion}`);
-}
+let gReasonCache = new Map();
+let gReasonCacheLoaded = false;

 async function loadCache() {
  if (gCacheLoaded) {
@ -131,35 +58,32 @@ async function loadCache() {
  }
  aiLog(`[AiClassifier] Loading cache`, {debug: true});
  try {
-    const { aiCache, aiReasonCache } = await storage.local.get(["aiCache", "aiReasonCache"]);
+    const { aiCache } = await storage.local.get("aiCache");
    if (aiCache) {
      for (let [k, v] of Object.entries(aiCache)) {
-        if (v && typeof v === "object") {
-          gCache.set(k, { matched: v.matched ?? null, reason: v.reason || "" });
-        } else {
-          gCache.set(k, { matched: v, reason: "" });
-        }
+        aiLog(`[AiClassifier] ⮡ Loaded entry '${k}' → ${v}`, {debug: true});
+        gCache.set(k, v);
      }
      aiLog(`[AiClassifier] Loaded ${gCache.size} cache entries`, {debug: true});
    } else {
      aiLog(`[AiClassifier] Cache is empty`, {debug: true});
    }
-    if (aiReasonCache) {
-      aiLog(`[AiClassifier] Migrating ${Object.keys(aiReasonCache).length} reason entries`, {debug: true});
-      for (let [k, reason] of Object.entries(aiReasonCache)) {
-        let entry = gCache.get(k) || { matched: null, reason: "" };
-        entry.reason = reason;
-        gCache.set(k, entry);
-      }
-      await storage.local.remove("aiReasonCache");
-      await storage.local.set({ aiCache: Object.fromEntries(gCache) });
-    }
  } catch (e) {
    aiLog(`Failed to load cache`, {level: 'error'}, e);
  }
  gCacheLoaded = true;
 }

+function loadCacheSync() {
+  if (!gCacheLoaded) {
+    if (!Services?.tm?.spinEventLoopUntil) {
+      throw new Error("loadCacheSync requires Services");
+    }
+    let done = false;
+    loadCache().finally(() => { done = true; });
+    Services.tm.spinEventLoopUntil(() => done);
+  }
+}

 async function saveCache(updatedKey, updatedValue) {
  if (typeof updatedKey !== "undefined") {
@ -172,6 +96,49 @@ async function saveCache(updatedKey, updatedValue) {
  }
 }

+async function loadReasonCache() {
+  if (gReasonCacheLoaded) {
+    return;
+  }
+  aiLog(`[AiClassifier] Loading reason cache`, {debug: true});
+  try {
+    const { aiReasonCache } = await storage.local.get("aiReasonCache");
+    if (aiReasonCache) {
+      for (let [k, v] of Object.entries(aiReasonCache)) {
+        aiLog(`[AiClassifier] ⮡ Loaded reason '${k}'`, {debug: true});
+        gReasonCache.set(k, v);
+      }
+      aiLog(`[AiClassifier] Loaded ${gReasonCache.size} reason entries`, {debug: true});
+    } else {
+      aiLog(`[AiClassifier] Reason cache is empty`, {debug: true});
+    }
+  } catch (e) {
+    aiLog(`Failed to load reason cache`, {level: 'error'}, e);
+  }
+  gReasonCacheLoaded = true;
+}
+
+function loadReasonCacheSync() {
+  if (!gReasonCacheLoaded) {
+    if (!Services?.tm?.spinEventLoopUntil) {
+      throw new Error("loadReasonCacheSync requires Services");
+    }
+    let done = false;
+    loadReasonCache().finally(() => { done = true; });
+    Services.tm.spinEventLoopUntil(() => done);
+  }
+}
+
+async function saveReasonCache(updatedKey, updatedValue) {
+  if (typeof updatedKey !== "undefined") {
+    aiLog(`[AiClassifier] ⮡ Persisting reason '${updatedKey}'`, {debug: true});
+  }
+  try {
+    await storage.local.set({ aiReasonCache: Object.fromEntries(gReasonCache) });
+  } catch (e) {
+    aiLog(`Failed to save reason cache`, {level: 'error'}, e);
+  }
+}

 async function loadTemplate(name) {
  try {
@ -200,12 +167,8 @@ function loadTemplateSync(name) {
 }

 async function setConfig(config = {}) {
-  if (typeof config.endpoint === "string") {
-    const base = normalizeEndpointBase(config.endpoint);
-    if (base) {
-      gEndpointBase = base;
-    }
-    gEndpoint = buildEndpointUrl(gEndpointBase);
+  if (config.endpoint) {
+    gEndpoint = config.endpoint;
  }
  if (config.templateName) {
    gTemplateName = config.templateName;
@ -223,18 +186,6 @@ async function setConfig(config = {}) {
      }
    }
  }
-  if (typeof config.model === "string") {
-    gModel = config.model.trim();
-  }
-  if (typeof config.apiKey === "string") {
-    gApiKey = config.apiKey.trim();
-  }
-  if (typeof config.openaiOrganization === "string") {
-    gOpenaiOrganization = config.openaiOrganization.trim();
-  }
-  if (typeof config.openaiProject === "string") {
-    gOpenaiProject = config.openaiProject.trim();
-  }
  if (typeof config.debugLogging === "boolean") {
    setDebug(config.debugLogging);
  }
@ -245,28 +196,10 @@ async function setConfig(config = {}) {
  } else {
    gTemplateText = await loadTemplate(gTemplateName);
  }
-  if (!gEndpoint) {
-    gEndpoint = buildEndpointUrl(gEndpointBase);
-  }
-  aiLog(`[AiClassifier] Endpoint base set to ${gEndpointBase}`, {debug: true});
  aiLog(`[AiClassifier] Endpoint set to ${gEndpoint}`, {debug: true});
  aiLog(`[AiClassifier] Template set to ${gTemplateName}`, {debug: true});
 }

-function buildAuthHeaders() {
-  const headers = {};
-  if (gApiKey) {
-    headers.Authorization = `Bearer ${gApiKey}`;
-  }
-  if (gOpenaiOrganization) {
-    headers["OpenAI-Organization"] = gOpenaiOrganization;
-  }
-  if (gOpenaiProject) {
-    headers["OpenAI-Project"] = gOpenaiProject;
-  }
-  return headers;
-}
-
 function buildSystemPrompt() {
  return SYSTEM_PREFIX + (gCustomSystemPrompt || DEFAULT_CUSTOM_SYSTEM_PROMPT) + SYSTEM_SUFFIX;
 }
@ -284,139 +217,63 @@ function buildPrompt(body, criterion) {

 function getCachedResult(cacheKey) {
  if (!gCacheLoaded) {
+    if (Services?.tm?.spinEventLoopUntil) {
+      loadCacheSync();
+    } else {
+      // In non-privileged contexts we can't block, so bail out early.
      return null;
    }
+  }
  if (cacheKey && gCache.has(cacheKey)) {
    aiLog(`[AiClassifier] Cache hit for key: ${cacheKey}`, {debug: true});
-    const entry = gCache.get(cacheKey);
-    return entry?.matched ?? null;
+    return gCache.get(cacheKey);
  }
  return null;
 }

 function getReason(cacheKey) {
-  if (!gCacheLoaded) {
+  if (!gReasonCacheLoaded) {
+    if (Services?.tm?.spinEventLoopUntil) {
+      loadReasonCacheSync();
+    } else {
      return null;
    }
-  const entry = gCache.get(cacheKey);
-  return cacheKey && entry ? entry.reason || null : null;
+  }
+  return cacheKey ? gReasonCache.get(cacheKey) || null : null;
 }

 function buildPayload(text, criterion) {
  let payloadObj = Object.assign({
    prompt: buildPrompt(text, criterion)
  }, gAiParams);
-  if (gModel) {
-    payloadObj.model = gModel;
-  }
  return JSON.stringify(payloadObj);
 }

-function reportParseError(message, detail) {
-  try {
-    const runtime = (globalThis.browser ?? globalThis.messenger)?.runtime;
-    if (!runtime?.sendMessage) {
-      return;
-    }
-    runtime.sendMessage({
-      type: "sortana:recordError",
-      context: "AI response parsing",
-      message,
-      detail
-    }).catch(() => {});
-  } catch (e) {
-    aiLog("Failed to report parse error", { level: "warn" }, e);
-  }
-}
-
-function extractLastJsonObject(text) {
-  let last = null;
-  let start = -1;
-  let depth = 0;
-  let inString = false;
-  let escape = false;
-
-  for (let i = 0; i < text.length; i += 1) {
-    const ch = text[i];
-    if (inString) {
-      if (escape) {
-        escape = false;
-        continue;
-      }
-      if (ch === "\\") {
-        escape = true;
-        continue;
-      }
-      if (ch === "\"") {
-        inString = false;
-      }
-      continue;
-    }
-    if (ch === "\"") {
-      inString = true;
-      continue;
-    }
-    if (ch === "{") {
-      if (depth === 0) {
-        start = i;
-      }
-      depth += 1;
-      continue;
-    }
-    if (ch === "}" && depth > 0) {
-      depth -= 1;
-      if (depth === 0 && start !== -1) {
-        last = text.slice(start, i + 1);
-        start = -1;
-      }
-    }
-  }
-
-  return last;
-}
-
 function parseMatch(result) {
  const rawText = result.choices?.[0]?.text || "";
-  const candidate = extractLastJsonObject(rawText);
-  if (!candidate) {
-    reportParseError("No JSON object found in AI response.", rawText.slice(0, 800));
-    return { matched: false, reason: "" };
+  const thinkText = rawText.match(/<think>[\s\S]*?<\/think>/gi)?.join('') || '';
+  aiLog('[AiClassifier] ⮡ Reasoning:', {debug: true}, thinkText);
+  const cleanedText = rawText.replace(/<think>[\s\S]*?<\/think>/gi, "").trim();
+  aiLog('[AiClassifier] ⮡ Cleaned Response Text:', {debug: true}, cleanedText);
+  const obj = JSON.parse(cleanedText);
+  const matched = obj.matched === true || obj.match === true;
+  return { matched, reason: thinkText };
 }

-  let obj;
-  try {
-    obj = JSON.parse(candidate);
-  } catch (e) {
-    reportParseError("Failed to parse JSON from AI response.", candidate.slice(0, 800));
-    return { matched: false, reason: "" };
+function cacheResult(cacheKey, matched) {
+  if (cacheKey) {
+    aiLog(`[AiClassifier] Caching entry '${cacheKey}' → ${matched}`, {debug: true});
+    gCache.set(cacheKey, matched);
+    saveCache(cacheKey, matched);
+  }
 }

-  const matchValue = Object.prototype.hasOwnProperty.call(obj, "match") ? obj.match : obj.matched;
-  const matched = matchValue === true;
-  if (matchValue !== true && matchValue !== false) {
-    reportParseError("AI response missing valid match boolean.", candidate.slice(0, 800));
+function cacheReason(cacheKey, reason) {
+  if (cacheKey) {
+    aiLog(`[AiClassifier] Caching reason '${cacheKey}'`, {debug: true});
+    gReasonCache.set(cacheKey, reason);
+    saveReasonCache(cacheKey, reason);
  }
-
-  const reasonValue = obj.reason ?? obj.reasoning ?? obj.explaination;
-  const reason = typeof reasonValue === "string" ? reasonValue : "";
-
-  return { matched, reason };
-}
-
-function cacheEntry(cacheKey, matched, reason) {
-  if (!cacheKey) {
-    return;
-  }
-  aiLog(`[AiClassifier] Caching entry '${cacheKey}'`, {debug: true});
-  const entry = gCache.get(cacheKey) || { matched: null, reason: "" };
-  if (typeof matched === "boolean") {
-    entry.matched = matched;
-  }
-  if (typeof reason === "string") {
-    entry.reason = reason;
-  }
-  gCache.set(cacheKey, entry);
-  saveCache(cacheKey, entry);
 }

 async function removeCacheEntries(keys = []) {
@ -432,34 +289,70 @@ async function removeCacheEntries(keys = []) {
      removed = true;
      aiLog(`[AiClassifier] Removed cache entry '${key}'`, {debug: true});
    }
+    if (gReasonCache.delete(key)) {
+      removed = true;
+      aiLog(`[AiClassifier] Removed reason entry '${key}'`, {debug: true});
+    }
  }
  if (removed) {
    await saveCache();
+    await saveReasonCache();
  }
 }

-async function clearCache() {
-  if (!gCacheLoaded) {
-    await loadCache();
+function classifyTextSync(text, criterion, cacheKey = null) {
+  if (!Services?.tm?.spinEventLoopUntil) {
+    throw new Error("classifyTextSync requires Services");
  }
-  if (gCache.size > 0) {
-    gCache.clear();
-    await saveCache();
-    aiLog(`[AiClassifier] Cleared cache`, {debug: true});
-  }
-}
-
-async function getCacheSize() {
-  if (!gCacheLoaded) {
-    await loadCache();
-  }
-  return gCache.size;
-}
-
-
-async function classifyText(text, criterion, cacheKey = null) {
-  if (!gCacheLoaded) {
-    await loadCache();
+  if (!gReasonCacheLoaded) {
+    loadReasonCacheSync();
+  }
+  const cached = getCachedResult(cacheKey);
+  if (cached !== null) {
+    return cached;
+  }
+
+  const payload = buildPayload(text, criterion);
+
+  aiLog(`[AiClassifier] Sending classification request to ${gEndpoint}`, {debug: true});
+
+  let result;
+  let done = false;
+  (async () => {
+    try {
+      const response = await fetch(gEndpoint, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: payload,
+      });
+      if (response.ok) {
+        const json = await response.json();
+        aiLog(`[AiClassifier] Received response:`, {debug: true}, json);
+        result = parseMatch(json);
+        cacheResult(cacheKey, result.matched);
+        cacheReason(cacheKey, result.reason);
+        result = result.matched;
+      } else {
+        aiLog(`HTTP status ${response.status}`, {level: 'warn'});
+        result = false;
+      }
+    } catch (e) {
+      aiLog(`HTTP request failed`, {level: 'error'}, e);
+      result = false;
+    } finally {
+      done = true;
+    }
+  })();
+  Services.tm.spinEventLoopUntil(() => done);
+  return result;
+}
+
+async function classifyText(text, criterion, cacheKey = null) {
+  if (!gCacheLoaded) {
+    await loadCache();
+  }
+  if (!gReasonCacheLoaded) {
+    await loadReasonCache();
  }
  const cached = getCachedResult(cacheKey);
  if (cached !== null) {
@ -467,19 +360,13 @@ async function classifyText(text, criterion, cacheKey = null) {
  }

  const payload = buildPayload(text, criterion);
-  try {
-    await storage.local.set({ lastPayload: JSON.parse(payload) });
-  } catch (e) {
-    aiLog('failed to save last payload', { level: 'warn' }, e);
-  }

  aiLog(`[AiClassifier] Sending classification request to ${gEndpoint}`, {debug: true});
-  aiLog(`[AiClassifier] Classification request payload:`, { debug: true }, payload);

  try {
    const response = await fetch(gEndpoint, {
      method: "POST",
-      headers: { "Content-Type": "application/json", ...buildAuthHeaders() },
+      headers: { "Content-Type": "application/json" },
      body: payload,
    });

@ -491,7 +378,8 @@ async function classifyText(text, criterion, cacheKey = null) {
    const result = await response.json();
    aiLog(`[AiClassifier] Received response:`, {debug: true}, result);
    const parsed = parseMatch(result);
-    cacheEntry(cacheKey, parsed.matched, parsed.reason);
+    cacheResult(cacheKey, parsed.matched);
+    cacheReason(cacheKey, parsed.reason);
    return parsed.matched;
  } catch (e) {
    aiLog(`HTTP request failed`, {level: 'error'}, e);
@ -499,8 +387,4 @@ async function classifyText(text, criterion, cacheKey = null) {
  }
 }

-async function init() {
-  await loadCache();
-}
-
-export { buildEndpointUrl, buildModelsUrl, normalizeEndpointBase, classifyText, setConfig, removeCacheEntries, clearCache, getReason, getCachedResult, buildCacheKey, getCacheSize, init };
+export { classifyText, classifyTextSync, setConfig, removeCacheEntries, getReason };
--- a/modules/ExpressionSearchFilter.jsm
+++ b/modules/ExpressionSearchFilter.jsm
@ -0,0 +1,99 @@
+"use strict";
+var { ExtensionParent } = ChromeUtils.importESModule("resource://gre/modules/ExtensionParent.sys.mjs");
+var { MailServices }    = ChromeUtils.importESModule("resource:///modules/MailServices.sys.mjs");
+var { aiLog } = ChromeUtils.import("resource://aifilter/modules/logger.jsm");
+var AiClassifier    = ChromeUtils.importESModule("resource://aifilter/modules/AiClassifier.js");
+var { getPlainText }    = ChromeUtils.import("resource://aifilter/modules/messageUtils.jsm");
+
+function sha256Hex(str) {
+  const hasher = Cc["@mozilla.org/security/hash;1"].createInstance(Ci.nsICryptoHash);
+  hasher.init(Ci.nsICryptoHash.SHA256);
+  const data = new TextEncoder().encode(str);
+  hasher.update(data, data.length);
+  const binary = hasher.finish(false);
+  return Array.from(binary, c => ("0" + c.charCodeAt(0).toString(16)).slice(-2)).join("");
+}
+
+var EXPORTED_SYMBOLS = ["AIFilter", "ClassificationTerm"];
+
+class CustomerTermBase {
+  constructor(nameId, operators) {
+    // Lookup our extension instance using the ID from manifest.json
+    // so locale strings are resolved correctly.
+    this.extension = ExtensionParent.GlobalManager.getExtension("ai-filter@jordanwages");
+    this.id = "aifilter#" + nameId;
+    this.name = this.extension.localeData.localizeMessage(nameId);
+    this.operators = operators;
+
+    aiLog(`[ExpressionSearchFilter] Initialized term base "${this.id}"`, {debug: true});
+  }
+
+
+  getEnabled() {
+    aiLog(`[ExpressionSearchFilter] getEnabled() called on "${this.id}"`, {debug: true});
+    return true;
+  }
+
+  getAvailable() {
+    aiLog(`[ExpressionSearchFilter] getAvailable() called on "${this.id}"`, {debug: true});
+    return true;
+  }
+
+  getAvailableOperators() {
+    aiLog(`[ExpressionSearchFilter] getAvailableOperators() called on "${this.id}"`, {debug: true});
+    return this.operators;
+  }
+
+  getAvailableValues() {
+    aiLog(`[ExpressionSearchFilter] getAvailableValues() called on "${this.id}"`, {debug: true});
+    return null;
+  }
+
+  get attrib() {
+    aiLog(`[ExpressionSearchFilter] attrib getter called for "${this.id}"`, {debug: true});
+
+    //return Ci.nsMsgSearchAttrib.Custom;
+  }
+}
+
+
+class ClassificationTerm extends CustomerTermBase {
+  constructor() {
+    super("classification", [Ci.nsMsgSearchOp.Matches, Ci.nsMsgSearchOp.DoesntMatch]);
+    aiLog(`[ExpressionSearchFilter] ClassificationTerm constructed`, {debug: true});
+  }
+
+  needsBody() { return true; }
+
+  match(msgHdr, value, op) {
+    const opName = op === Ci.nsMsgSearchOp.Matches ? "matches" :
+                   op === Ci.nsMsgSearchOp.DoesntMatch ? "doesn't match" : `unknown (${op})`;
+    aiLog(`[ExpressionSearchFilter] Matching message ${msgHdr.messageId} using op "${opName}" and value "${value}"`, {debug: true});
+
+    let key = [msgHdr.messageId, op, value].map(sha256Hex).join("|");
+    let body = getPlainText(msgHdr);
+
+    let matched = AiClassifier.classifyTextSync(body, value, key);
+
+    if (op === Ci.nsMsgSearchOp.DoesntMatch) {
+      matched = !matched;
+      aiLog(`[ExpressionSearchFilter] Operator is "doesn't match" → inverting to ${matched}`, {debug: true});
+    }
+
+    aiLog(`[ExpressionSearchFilter] Final match result: ${matched}`, {debug: true});
+    return matched;
+  }
+}
+
+(function register() {
+  aiLog(`[ExpressionSearchFilter] Registering custom filter term...`, {debug: true});
+  let term = new ClassificationTerm();
+  if (!MailServices.filters.getCustomTerm(term.id)) {
+    MailServices.filters.addCustomTerm(term);
+    aiLog(`[ExpressionSearchFilter] Registered term: ${term.id}`, {debug: true});
+  } else {
+    aiLog(`[ExpressionSearchFilter] Term already registered: ${term.id}`, {debug: true});
+  }
+})();
+
+var AIFilter = { setConfig: AiClassifier.setConfig };
--- a/modules/defaultParams.js
+++ b/modules/defaultParams.js
@ -1,16 +0,0 @@
-"use strict";
-
-export const DEFAULT_AI_PARAMS = {
-  max_tokens: 4096,
-  temperature: 0.6,
-  top_p: 0.95,
-  seed: -1,
-  repetition_penalty: 1.0,
-  top_k: 20,
-  min_p: 0,
-  presence_penalty: 0,
-  frequency_penalty: 0,
-  typical_p: 1,
-  tfs: 1,
-};
-
--- a/modules/logger.jsm
+++ b/modules/logger.jsm
@ -0,0 +1,26 @@
+var EXPORTED_SYMBOLS = ['aiLog', 'setDebug'];
+let debugEnabled = false;
+
+function setDebug(value) {
+    debugEnabled = !!value;
+}
+
+function getCaller() {
+    try {
+        let stack = new Error().stack.split('\n');
+        if (stack.length >= 3) {
+            return stack[2].trim().replace(/^@?\s*\(?/,'').replace(/^at\s+/, '');
+        }
+    } catch (e) {}
+    return '';
+}
+
+function aiLog(message, opts = {}, ...args) {
+    const { level = 'log', debug = false } = opts;
+    if (debug && !debugEnabled) {
+        return;
+    }
+    const caller = getCaller();
+    const prefix = caller ? `[ai-filter][${caller}]` : '[ai-filter]';
+    console[level](`%c${prefix}`, 'color:#1c92d2;font-weight:bold', message, ...args);
+}
--- a/modules/messageUtils.jsm
+++ b/modules/messageUtils.jsm
@ -0,0 +1,89 @@
+"use strict";
+var { NetUtil }    = ChromeUtils.importESModule("resource://gre/modules/NetUtil.sys.mjs");
+var { MimeParser } = ChromeUtils.importESModule("resource:///modules/mimeParser.sys.mjs");
+var { aiLog }      = ChromeUtils.import("resource://aifilter/modules/logger.jsm");
+
+var EXPORTED_SYMBOLS = ["getPlainText"];
+
+function getPlainText(msgHdr) {
+  aiLog(`[ExpressionSearchFilter] Extracting plain text for message ID ${msgHdr.messageId}`, {debug: true});
+  let folder = msgHdr.folder;
+  if (!folder.getMsgInputStream) return "";
+  let reusable = {};
+  let stream = folder.getMsgInputStream(msgHdr, reusable);
+  let data = NetUtil.readInputStreamToString(stream, msgHdr.messageSize);
+  if (!reusable.value) stream.close();
+
+  let parser = Cc["@mozilla.org/parserutils;1"].getService(Ci.nsIParserUtils);
+
+  try {
+    let root = MimeParser.parseSync(data, {strformat: "unicode"});
+    let parts = [];
+
+    function pushPlaceholder(type, info, bytes) {
+      bytes = bytes || 0;
+      let prettyType = type.split("/")[1] || type;
+      parts.push(`[${info}: ${prettyType}, ${bytes} bytes]`);
+    }
+
+    function byteSizeFromBase64(str) {
+      let clean = str.replace(/[^A-Za-z0-9+/=]/g, "");
+      return Math.floor(clean.length * 3 / 4);
+    }
+
+    function replaceInlineBase64(text) {
+      return text.replace(/[A-Za-z0-9+/]{100,}={0,2}/g,
+        m => `[base64: ${byteSizeFromBase64(m)} bytes]`);
+    }
+
+    function walk(node) {
+      if (node.parts && node.parts.length) {
+        for (let child of node.parts) {
+          walk(child);
+        }
+        return;
+      }
+
+      let ct = (node.contentType || "text/plain").toLowerCase();
+      let cd = (node.headers?.["content-disposition"]?.[0] || "").toLowerCase();
+      let enc = (node.headers?.["content-transfer-encoding"]?.[0] || "").toLowerCase();
+      let bodyText = String(node.body || "");
+
+      if (cd.includes("attachment")) {
+        pushPlaceholder(ct, "binary attachment", byteSizeFromBase64(bodyText));
+      } else if (ct.startsWith("text/plain")) {
+        if (enc === "base64") {
+          parts.push(`[base64: ${byteSizeFromBase64(bodyText)} bytes]`);
+        } else {
+          parts.push(replaceInlineBase64(bodyText));
+        }
+      } else if (ct.startsWith("text/html")) {
+        if (enc === "base64") {
+          parts.push(`[base64: ${byteSizeFromBase64(bodyText)} bytes]`);
+        } else {
+          let txt = parser.convertToPlainText(bodyText,
+            Ci.nsIDocumentEncoder.OutputLFLineBreak |
+            Ci.nsIDocumentEncoder.OutputNoScriptContent |
+            Ci.nsIDocumentEncoder.OutputNoFramesContent |
+            Ci.nsIDocumentEncoder.OutputBodyOnly, 0);
+          parts.push(replaceInlineBase64(txt));
+        }
+      } else {
+        // Other single part types treated as attachments
+        pushPlaceholder(ct, "binary attachment", byteSizeFromBase64(bodyText));
+      }
+    }
+
+    walk(root);
+    return parts.join("\n");
+  } catch (e) {
+    // Fallback: convert entire raw message to text
+    aiLog(`Failed to parse MIME, falling back to raw conversion`, {level: 'warn'}, e);
+    return parser.convertToPlainText(data,
+      Ci.nsIDocumentEncoder.OutputLFLineBreak |
+      Ci.nsIDocumentEncoder.OutputNoScriptContent |
+      Ci.nsIDocumentEncoder.OutputNoFramesContent |
+      Ci.nsIDocumentEncoder.OutputBodyOnly, 0);
+  }
+}
+
--- a/modules/themeUtils.js
+++ b/modules/themeUtils.js
@ -1,20 +0,0 @@
-"use strict";
-
-export async function detectSystemTheme() {
-    try {
-        const t = await browser.theme.getCurrent();
-        const scheme = t?.properties?.color_scheme;
-        if (scheme === 'dark' || scheme === 'light') {
-            return scheme;
-        }
-        const color = t?.colors?.frame || t?.colors?.toolbar;
-        if (color && /^#/.test(color)) {
-            const r = parseInt(color.slice(1, 3), 16);
-            const g = parseInt(color.slice(3, 5), 16);
-            const b = parseInt(color.slice(5, 7), 16);
-            const lum = (0.299 * r + 0.587 * g + 0.114 * b) / 255;
-            return lum < 0.5 ? 'dark' : 'light';
-        }
-    } catch {}
-    return 'light';
-}
--- a/options/dataTransfer.js
+++ b/options/dataTransfer.js
@ -1,49 +0,0 @@
-"use strict";
-const storage = (globalThis.messenger ?? browser).storage;
-const KEY_GROUPS = {
-    settings: [
-        'endpoint',
-        'model',
-        'apiKey',
-        'openaiOrganization',
-        'openaiProject',
-        'templateName',
-        'customTemplate',
-        'customSystemPrompt',
-        'aiParams',
-        'debugLogging',
-        'htmlToMarkdown',
-        'stripUrlParams',
-        'altTextImages',
-        'collapseWhitespace'
-    ],
-    rules: ['aiRules'],
-    cache: ['aiCache']
-};
-
-function collectKeys(categories = Object.keys(KEY_GROUPS)) {
-    return categories.flatMap(cat => KEY_GROUPS[cat] || []);
-}
-
-export async function exportData(categories) {
-    const data = await storage.local.get(collectKeys(categories));
-    const blob = new Blob([JSON.stringify(data, null, 2)], { type: 'application/json' });
-    const url = URL.createObjectURL(blob);
-    const a = document.createElement('a');
-    a.href = url;
-    a.download = 'sortana-export.json';
-    document.body.appendChild(a);
-    a.click();
-    a.remove();
-    URL.revokeObjectURL(url);
-}
-
-export async function importData(file, categories) {
-    const text = await file.text();
-    const parsed = JSON.parse(text);
-    const data = {};
-    for (const key of collectKeys(categories)) {
-        if (key in parsed) data[key] = parsed[key];
-    }
-    await storage.local.set(data);
-}
--- a/options/options.html
+++ b/options/options.html
@ -31,65 +31,35 @@
        .tag {
            --bulma-tag-h: 318;
        }
-        #diff-display {
-            white-space: pre-wrap;
-            font-family: monospace;
-        }
    </style>
 </head>
 <body>
    <section class="section">
        <div class="container" id="options-container">
            <figure class="has-text-centered mb-4">
-                <img data-icon="full-logo" src="../resources/img/full-logo.png" alt="AI Filter Logo" style="max-height:40px;">
+                <img src="../resources/img/full-logo.png" alt="AI Filter Logo" style="max-height:40px;">
            </figure>

            <div class="level mb-4">
                <div class="level-left">
                    <div class="tabs" id="main-tabs">
                        <ul>
-                            <li class="is-active" data-tab="settings"><a><span class="icon is-small"><img data-icon="settings" data-size="16" src="../resources/img/settings-light-16.png" alt=""></span><span>Settings</span></a></li>
-                            <li data-tab="rules"><a><span class="icon is-small"><img data-icon="clipboarddata" data-size="16" src="../resources/img/clipboarddata-light-16.png" alt=""></span><span>Rules</span></a></li>
-                            <li data-tab="maintenance"><a><span class="icon is-small"><img data-icon="gear" data-size="16" src="../resources/img/gear-light-16.png" alt=""></span><span>Maintenance</span></a></li>
-                            <li id="errors-tab-button" class="is-hidden" data-tab="errors"><a><span class="icon is-small"><img data-icon="x" data-size="16" src="../resources/img/x-light-16.png" alt=""></span><span>Errors</span></a></li>
-                            <li id="debug-tab-button" class="is-hidden" data-tab="debug"><a><span class="icon is-small"><img data-icon="average" data-size="16" src="../resources/img/average-light-16.png" alt=""></span><span>Debug</span></a></li>
+                            <li class="is-active" data-tab="settings"><a>Settings</a></li>
+                            <li data-tab="rules"><a>Rules</a></li>
                        </ul>
                    </div>
                </div>
                <div class="level-right">
-                    <button class="button is-primary" id="save" disabled>
-                        <span class="icon is-small"><img data-icon="flag" data-size="16" src="../resources/img/flag-light-16.png" alt=""></span>
-                        <span>Save</span>
-                    </button>
+                    <button class="button is-primary" id="save" disabled>Save</button>
                </div>
            </div>

            <div id="settings-tab" class="tab-content">
-                <h2 class="title is-4">
-                    <span class="icon is-small"><img data-icon="settings" data-size="16" src="../resources/img/settings-light-16.png" alt=""></span>
-                    <span>Settings</span>
-                </h2>
                <div class="field">
                    <label class="label" for="endpoint">Endpoint</label>
                    <div class="control">
                        <input class="input" type="text" id="endpoint" placeholder="https://api.example.com">
                    </div>
-                    <p class="help" id="endpoint-preview"></p>
-                </div>
-
-                <div class="field">
-                    <label class="label" for="model-select">Model</label>
-                    <div class="field has-addons">
-                        <div class="control is-expanded">
-                            <div class="select is-fullwidth">
-                                <select id="model-select"></select>
-                            </div>
-                        </div>
-                        <div class="control">
-                            <button class="button" id="refresh-models" type="button">Refresh</button>
-                        </div>
-                    </div>
-                    <p class="help" id="model-help"></p>
                </div>

                <div class="field">
@ -116,92 +86,17 @@
                    </div>
                </div>

-                <div class="field">
-                    <label class="label" for="theme-select">Theme</label>
-                    <div class="control">
-                        <div class="select">
-                            <select id="theme-select">
-                                <option value="auto">Match Thunderbird</option>
-                                <option value="light">Light</option>
-                                <option value="dark">Dark</option>
-                            </select>
-                        </div>
-                    </div>
-                </div>
-
                <div class="buttons">
-                    <button class="button is-danger" id="reset-system">
-                        <span class="icon is-small"><img data-icon="reply" data-size="16" src="../resources/img/reply-light-16.png" alt=""></span>
-                        <span>Reset to default</span>
-                    </button>
-                    <button class="button" id="toggle-advanced" type="button">
-                        <span class="icon is-small"><img data-icon="gear" data-size="16" src="../resources/img/gear-light-16.png" alt=""></span>
-                        <span>Advanced</span>
-                    </button>
+                    <button class="button is-danger" id="reset-system">Reset to default</button>
+                    <button class="button" id="toggle-advanced" type="button">Advanced</button>
                </div>

                <div id="advanced-options" class="mt-4 is-hidden">
-                    <div class="field">
-                        <label class="label" for="api-key">API key</label>
-                        <div class="field has-addons">
-                            <div class="control is-expanded">
-                                <input class="input" type="password" id="api-key" placeholder="sk-...">
-                            </div>
-                            <div class="control">
-                                <button class="button" id="toggle-api-key" type="button">Show</button>
-                            </div>
-                        </div>
-                        <p class="help">Leave blank for unauthenticated endpoints.</p>
-                    </div>
-                    <div class="field">
-                        <label class="label" for="openai-organization">OpenAI Organization</label>
-                        <div class="control">
-                            <input class="input" type="text" id="openai-organization" placeholder="org-...">
-                        </div>
-                        <p class="help">Optional header for OpenAI-hosted endpoints.</p>
-                    </div>
-                    <div class="field">
-                        <label class="label" for="openai-project">OpenAI Project</label>
-                        <div class="control">
-                            <input class="input" type="text" id="openai-project" placeholder="proj_...">
-                        </div>
-                        <p class="help">Optional header for OpenAI-hosted endpoints.</p>
-                    </div>
                    <div class="field">
                        <label class="checkbox">
                            <input type="checkbox" id="debug-logging"> Enable debug logging
                        </label>
                    </div>
-                    <div class="field">
-                        <label class="checkbox">
-                            <input type="checkbox" id="html-to-markdown"> Convert HTML body to Markdown
-                        </label>
-                    </div>
-                    <div class="field">
-                        <label class="checkbox">
-                            <input type="checkbox" id="strip-url-params"> Remove URL tracking parameters
-                        </label>
-                    </div>
-                    <div class="field">
-                        <label class="checkbox">
-                            <input type="checkbox" id="alt-text-images"> Replace images with alt text
-                        </label>
-                    </div>
-                    <div class="field">
-                        <label class="checkbox">
-                            <input type="checkbox" id="collapse-whitespace"> Collapse long whitespace
-                        </label>
-                    </div>
-                    <div class="field">
-                        <label class="checkbox">
-                            <input type="checkbox" id="token-reduction"> Aggressive token reduction
-                        </label>
-                    </div>
-                    <div class="field">
-                        <label class="checkbox">
-                            <input type="checkbox" id="show-debug-tab"> Show debug information
-                        </label>
-                    </div>
                    <div class="field">
                        <label class="label" for="max_tokens">Max tokens</label>
                        <div class="control">
@ -272,110 +167,12 @@
            </div>

            <div id="rules-tab" class="tab-content is-hidden">
-                <h2 class="title is-4">
-                    <span class="icon is-small"><img data-icon="clipboarddata" data-size="16" src="../resources/img/clipboarddata-light-16.png" alt=""></span>
-                    <span>Classification Rules</span>
-                </h2>
+                <h2 class="title is-4">Classification Rules</h2>
                <div id="rules-container"></div>
                <button class="button is-link" id="add-rule" type="button">Add Rule</button>
            </div>
-
-            <div id="maintenance-tab" class="tab-content is-hidden">
-                <h2 class="title is-4">
-                    <span class="icon is-small"><img data-icon="gear" data-size="16" src="../resources/img/gear-light-16.png" alt=""></span>
-                    <span>Maintenance</span>
-                </h2>
-                <table class="table is-fullwidth">
-                    <tbody>
-                        <tr><th>Rule count</th><td id="rule-count"></td></tr>
-                        <tr><th>Cache entries</th><td id="cache-count"></td></tr>
-                        <tr><th>Queue items</th><td id="queue-count"></td></tr>
-                        <tr><th>Current run time</th><td id="current-time">--:--:--</td></tr>
-                        <tr><th>Last run time</th><td id="last-time">--:--:--</td></tr>
-                        <tr><th>Average run time</th><td id="average-time">--:--:--</td></tr>
-                        <tr><th>Total run time</th><td id="total-time">--:--:--</td></tr>
-                        <tr><th>Messages per hour</th><td id="per-hour">0</td></tr>
-                        <tr><th>Messages per day</th><td id="per-day">0</td></tr>
-                    </tbody>
-                </table>
-                <div class="buttons">
-                    <button class="button is-danger" id="clear-cache" type="button">
-                        <span class="icon is-small"><img data-icon="trash" data-size="16" src="../resources/img/trash-light-16.png" alt=""></span>
-                        <span>Clear Cache</span>
-                    </button>
-                    <button class="button is-warning" id="reset-timing" type="button">
-                        <span class="icon is-small"><img data-icon="average" data-size="16" src="../resources/img/average-light-16.png" alt=""></span>
-                        <span>Reset Timing Stats</span>
-                    </button>
-                </div>
-                <div class="field mt-4">
-                    <label class="label">Data categories</label>
-                    <div class="control">
-                        <label class="checkbox mr-3"><input class="transfer-category" type="checkbox" value="settings" checked> Settings</label>
-                        <label class="checkbox mr-3"><input class="transfer-category" type="checkbox" value="rules" checked> Rules</label>
-                        <label class="checkbox"><input class="transfer-category" type="checkbox" value="cache" checked> Cache</label>
-                    </div>
-                </div>
-                <div class="field is-grouped mt-4">
-                    <p class="control">
-                        <button class="button" id="export-data" type="button">
-                            <span class="icon is-small"><img data-icon="download" data-size="16" src="../resources/img/download-light-16.png" alt=""></span>
-                            <span>Export Data</span>
-                        </button>
-                    </p>
-                    <p class="control">
-                        <button class="button" id="import-data" type="button">
-                            <span class="icon is-small"><img data-icon="upload" data-size="16" src="../resources/img/upload-light-16.png" alt=""></span>
-                            <span>Import Data</span>
-                        </button>
-                        <input class="is-hidden" type="file" id="import-file" accept="application/json">
-                    </p>
-                </div>
-            </div>
-
-            <div id="errors-tab" class="tab-content is-hidden">
-                <h2 class="title is-4">
-                    <span class="icon is-small"><img data-icon="x" data-size="16" src="../resources/img/x-light-16.png" alt=""></span>
-                    <span>Session Errors</span>
-                </h2>
-                <div id="errors-empty" class="notification is-success is-light">
-                    No errors have been recorded since the last start.
-                </div>
-                <div id="errors-panel" class="is-hidden">
-                    <div class="box mb-4">
-                        <div class="level">
-                            <div class="level-left">
-                                <div>
-                                    <p class="title is-5 mb-1">Error Log</p>
-                                    <p class="subtitle is-6">Visible only for this session.</p>
-                                </div>
-                            </div>
-                            <div class="level-right">
-                                <span class="tag is-danger is-light" id="errors-count">0</span>
-                            </div>
-                        </div>
-                    </div>
-                    <div id="errors-list"></div>
-                </div>
-            </div>
-
-            <div id="debug-tab" class="tab-content is-hidden">
-                <h2 class="title is-4">
-                    <span class="icon is-small"><img data-icon="average" data-size="16" src="../resources/img/average-light-16.png" alt=""></span>
-                    <span>Debug</span>
-                </h2>
-                <pre id="payload-display"></pre>
-                <div id="diff-container" class="mt-4 is-hidden">
-                    <div class="is-flex is-align-items-center is-justify-content-space-between">
-                        <label class="label mb-0">Prompt diff</label>
-                        <span id="prompt-reduction" class="tag is-info is-light is-hidden">Prompt Token Reduction: 0%</span>
-                    </div>
-                    <div id="diff-display" class="box content is-family-monospace"></div>
-                </div>
-            </div>
        </div>
    </section>
-    <script src="../resources/js/diff_match_patch_uncompressed.js"></script>
    <script src="options.js"></script>
 </body>
 </html>
--- a/options/options.js
+++ b/options/options.js
@ -2,32 +2,14 @@ document.addEventListener('DOMContentLoaded', async () => {
    const storage = (globalThis.messenger ?? browser).storage;
    const logger = await import(browser.runtime.getURL('logger.js'));
    const AiClassifier = await import(browser.runtime.getURL('modules/AiClassifier.js'));
-    const dataTransfer = await import(browser.runtime.getURL('options/dataTransfer.js'));
-    const { detectSystemTheme } = await import(browser.runtime.getURL('modules/themeUtils.js'));
-    const { DEFAULT_AI_PARAMS } = await import(browser.runtime.getURL('modules/defaultParams.js'));
    const defaults = await storage.local.get([
        'endpoint',
        'templateName',
        'customTemplate',
        'customSystemPrompt',
-        'model',
-        'apiKey',
-        'openaiOrganization',
-        'openaiProject',
        'aiParams',
        'debugLogging',
-        'htmlToMarkdown',
-        'stripUrlParams',
-        'altTextImages',
-        'collapseWhitespace',
-        'tokenReduction',
-        'aiRules',
-        'aiCache',
-        'theme',
-        'showDebugTab',
-        'lastPayload',
-        'lastFullText',
-        'lastPromptText'
+        'aiRules'
    ]);
    const tabButtons = document.querySelectorAll('#main-tabs li');
    const tabs = document.querySelectorAll('.tab-content');
@ -49,165 +31,25 @@ document.addEventListener('DOMContentLoaded', async () => {
    document.addEventListener('input', markDirty, true);
    document.addEventListener('change', markDirty, true);
    logger.setDebug(defaults.debugLogging === true);
-
-    const themeSelect = document.getElementById('theme-select');
-    themeSelect.value = defaults.theme || 'auto';
-
-    function updateIcons(theme) {
-        document.querySelectorAll('img[data-icon]').forEach(img => {
-            const name = img.dataset.icon;
-            const size = img.dataset.size || 16;
-            if (name === 'full-logo') {
-                img.src = `../resources/img/full-logo${theme === 'dark' ? '-white' : ''}.png`;
-            } else {
-                img.src = `../resources/img/${name}-${theme}-${size}.png`;
-            }
-        });
-    }
-
-    async function applyTheme(setting) {
-        const mode = setting === 'auto' ? await detectSystemTheme() : setting;
-        document.documentElement.dataset.theme = mode;
-        updateIcons(mode);
-    }
-
-    await applyTheme(themeSelect.value);
-    const payloadDisplay = document.getElementById('payload-display');
-    const diffDisplay = document.getElementById('diff-display');
-    const diffContainer = document.getElementById('diff-container');
-    const promptReductionLabel = document.getElementById('prompt-reduction');
-
-    let lastFullText = defaults.lastFullText || '';
-    let lastPromptText = defaults.lastPromptText || '';
-    let lastPayload = defaults.lastPayload ? JSON.stringify(defaults.lastPayload, null, 2) : '';
-
-    if (lastPayload) {
-        payloadDisplay.textContent = lastPayload;
-    }
-    themeSelect.addEventListener('change', async () => {
-        markDirty();
-        await applyTheme(themeSelect.value);
-    });
-    const endpointInput = document.getElementById('endpoint');
-    const endpointPreview = document.getElementById('endpoint-preview');
-    const fallbackEndpoint = 'http://127.0.0.1:5000';
-    const storedEndpoint = defaults.endpoint || fallbackEndpoint;
-    const endpointBase = AiClassifier.normalizeEndpointBase(storedEndpoint) || storedEndpoint;
-    endpointInput.value = endpointBase;
-
-    function updateEndpointPreview() {
-        const resolved = AiClassifier.buildEndpointUrl(endpointInput.value);
-        endpointPreview.textContent = resolved
-            ? `Resolved endpoint: ${resolved}`
-            : 'Resolved endpoint: (invalid)';
-    }
-    endpointInput.addEventListener('input', updateEndpointPreview);
-    updateEndpointPreview();
-
-    const modelSelect = document.getElementById('model-select');
-    const refreshModelsBtn = document.getElementById('refresh-models');
-    const modelHelp = document.getElementById('model-help');
-    const storedModel = typeof defaults.model === 'string' ? defaults.model : '';
-
-    function setModelHelp(message = '', isError = false) {
-        if (!modelHelp) return;
-        modelHelp.textContent = message;
-        modelHelp.classList.toggle('is-danger', isError);
-    }
-
-    function populateModelOptions(models = [], selectedModel = '') {
-        if (!modelSelect) return;
-        const modelIds = Array.isArray(models) ? models.filter(Boolean) : [];
-        modelSelect.innerHTML = '';
-
-        const noneOpt = document.createElement('option');
-        noneOpt.value = '';
-        noneOpt.textContent = 'None (omit model)';
-        modelSelect.appendChild(noneOpt);
-
-        if (selectedModel && !modelIds.includes(selectedModel)) {
-            const storedOpt = document.createElement('option');
-            storedOpt.value = selectedModel;
-            storedOpt.textContent = `Stored: ${selectedModel}`;
-            modelSelect.appendChild(storedOpt);
-        }
-
-        for (const id of modelIds) {
-            const opt = document.createElement('option');
-            opt.value = id;
-            opt.textContent = id;
-            modelSelect.appendChild(opt);
-        }
-
-        const hasSelected = [...modelSelect.options].some(opt => opt.value === selectedModel);
-        modelSelect.value = hasSelected ? selectedModel : '';
-    }
-
-    function buildAuthHeaders() {
-        const headers = {};
-        const apiKey = apiKeyInput?.value.trim();
-        if (apiKey) {
-            headers.Authorization = `Bearer ${apiKey}`;
-        }
-        const organization = openaiOrgInput?.value.trim();
-        if (organization) {
-            headers["OpenAI-Organization"] = organization;
-        }
-        const project = openaiProjectInput?.value.trim();
-        if (project) {
-            headers["OpenAI-Project"] = project;
-        }
-        return headers;
-    }
-
-    async function fetchModels(preferredModel = '') {
-        if (!modelSelect || !refreshModelsBtn) return;
-        const modelsUrl = AiClassifier.buildModelsUrl(endpointInput.value);
-        if (!modelsUrl) {
-            setModelHelp('Set a valid endpoint to load models.', true);
-            populateModelOptions([], preferredModel || modelSelect.value);
-            return;
-        }
-
-        refreshModelsBtn.disabled = true;
-        setModelHelp('Loading models...');
-
-        try {
-            const response = await fetch(modelsUrl, { method: 'GET', headers: buildAuthHeaders() });
-            if (!response.ok) {
-                throw new Error(`HTTP ${response.status}`);
-            }
-            const data = await response.json();
-            let models = [];
-            if (Array.isArray(data?.data)) {
-                models = data.data.map(model => model?.id ?? model?.name ?? model?.model ?? '').filter(Boolean);
-            } else if (Array.isArray(data?.models)) {
-                models = data.models.map(model => model?.id ?? model?.name ?? model?.model ?? '').filter(Boolean);
-            } else if (Array.isArray(data)) {
-                models = data.map(model => model?.id ?? model?.name ?? model?.model ?? model).filter(Boolean);
-            }
-            models = [...new Set(models)];
-            populateModelOptions(models, preferredModel || modelSelect.value);
-            setModelHelp(models.length ? `Loaded ${models.length} model${models.length === 1 ? '' : 's'}.` : 'No models returned.');
-        } catch (e) {
-            logger.aiLog('[options] failed to load models', { level: 'warn' }, e);
-            setModelHelp('Failed to load models. Check the endpoint and network.', true);
-            populateModelOptions([], preferredModel || modelSelect.value);
-        } finally {
-            refreshModelsBtn.disabled = false;
-        }
-    }
-
-    populateModelOptions([], storedModel);
-    refreshModelsBtn?.addEventListener('click', () => {
-        fetchModels(modelSelect.value);
-    });
+    const DEFAULT_AI_PARAMS = {
+        max_tokens: 4096,
+        temperature: 0.6,
+        top_p: 0.95,
+        seed: -1,
+        repetition_penalty: 1.0,
+        top_k: 20,
+        min_p: 0,
+        presence_penalty: 0,
+        frequency_penalty: 0,
+        typical_p: 1,
+        tfs: 1
+    };
+    document.getElementById('endpoint').value = defaults.endpoint || 'http://127.0.0.1:5000/v1/classify';

    const templates = {
        openai: browser.i18n.getMessage('template.openai'),
        qwen: browser.i18n.getMessage('template.qwen'),
        mistral: browser.i18n.getMessage('template.mistral'),
-        harmony: browser.i18n.getMessage('template.harmony'),
        custom: browser.i18n.getMessage('template.custom')
    };
    const templateSelect = document.getElementById('template');
@ -235,179 +77,9 @@ document.addEventListener('DOMContentLoaded', async () => {
        advancedBox.classList.toggle('is-hidden');
    });

-    const apiKeyInput = document.getElementById('api-key');
-    const apiKeyToggle = document.getElementById('toggle-api-key');
-    const openaiOrgInput = document.getElementById('openai-organization');
-    const openaiProjectInput = document.getElementById('openai-project');
-    if (apiKeyInput) {
-        apiKeyInput.value = typeof defaults.apiKey === 'string' ? defaults.apiKey : '';
-    }
-    if (openaiOrgInput) {
-        openaiOrgInput.value = typeof defaults.openaiOrganization === 'string' ? defaults.openaiOrganization : '';
-    }
-    if (openaiProjectInput) {
-        openaiProjectInput.value = typeof defaults.openaiProject === 'string' ? defaults.openaiProject : '';
-    }
-    apiKeyToggle?.addEventListener('click', () => {
-        if (!apiKeyInput) return;
-        const show = apiKeyInput.type === 'password';
-        apiKeyInput.type = show ? 'text' : 'password';
-        apiKeyToggle.textContent = show ? 'Hide' : 'Show';
-    });
-
    const debugToggle = document.getElementById('debug-logging');
    debugToggle.checked = defaults.debugLogging === true;

-    const htmlToggle = document.getElementById('html-to-markdown');
-    htmlToggle.checked = defaults.htmlToMarkdown === true;
-
-    const stripUrlToggle = document.getElementById('strip-url-params');
-    stripUrlToggle.checked = defaults.stripUrlParams === true;
-
-    const altTextToggle = document.getElementById('alt-text-images');
-    altTextToggle.checked = defaults.altTextImages === true;
-
-    const collapseWhitespaceToggle = document.getElementById('collapse-whitespace');
-    collapseWhitespaceToggle.checked = defaults.collapseWhitespace === true;
-
-    const tokenReductionToggle = document.getElementById('token-reduction');
-    tokenReductionToggle.checked = defaults.tokenReduction === true;
-
-    function tokenSavingEnabled() {
-        return htmlToggle.checked
-            || stripUrlToggle.checked
-            || altTextToggle.checked
-            || collapseWhitespaceToggle.checked
-            || tokenReductionToggle.checked;
-    }
-
-    function updatePromptReductionLabel(hasDiff) {
-        if (!promptReductionLabel) return;
-        if (!hasDiff || !tokenSavingEnabled() || !lastFullText || !lastPromptText) {
-            promptReductionLabel.classList.add('is-hidden');
-            return;
-        }
-        const baseLength = lastFullText.length;
-        const promptLength = lastPromptText.length;
-        const percentSaved = baseLength > 0
-            ? Math.max(0, Math.round((1 - (promptLength / baseLength)) * 100))
-            : 0;
-        promptReductionLabel.textContent = `Prompt Token Reduction: ${percentSaved}%`;
-        promptReductionLabel.classList.remove('is-hidden');
-    }
-
-    function updateDiffDisplay() {
-        if (lastFullText && lastPromptText && diff_match_patch) {
-            const dmp = new diff_match_patch();
-            dmp.Diff_EditCost = 4;
-            const diffs = dmp.diff_main(lastFullText, lastPromptText);
-            dmp.diff_cleanupEfficiency(diffs);
-            const hasDiff = diffs.some(d => d[0] !== 0);
-            if (hasDiff) {
-                diffDisplay.innerHTML = dmp.diff_prettyHtml(diffs);
-                diffContainer.classList.remove('is-hidden');
-            } else {
-                diffDisplay.innerHTML = '';
-                diffContainer.classList.add('is-hidden');
-            }
-            updatePromptReductionLabel(hasDiff);
-        } else {
-            diffDisplay.innerHTML = '';
-            diffContainer.classList.add('is-hidden');
-            updatePromptReductionLabel(false);
-        }
-    }
-
-    const debugTabToggle = document.getElementById('show-debug-tab');
-    const debugTabBtn = document.getElementById('debug-tab-button');
-    const errorTabBtn = document.getElementById('errors-tab-button');
-    const errorsEmpty = document.getElementById('errors-empty');
-    const errorsPanel = document.getElementById('errors-panel');
-    const errorsList = document.getElementById('errors-list');
-    const errorsCount = document.getElementById('errors-count');
-    function updateDebugTab() {
-        const visible = debugTabToggle.checked;
-        debugTabBtn.classList.toggle('is-hidden', !visible);
-    }
-    debugTabToggle.checked = defaults.showDebugTab === true;
-    debugTabToggle.addEventListener('change', () => { updateDebugTab(); markDirty(); });
-    updateDebugTab();
-
-    function formatErrorTime(value) {
-        try {
-            return new Date(value).toLocaleString();
-        } catch (e) {
-            return '';
-        }
-    }
-
-    function renderErrors(entries = []) {
-        const hasErrors = entries.length > 0;
-        errorTabBtn.classList.toggle('is-hidden', !hasErrors);
-        errorsEmpty.classList.toggle('is-hidden', hasErrors);
-        errorsPanel.classList.toggle('is-hidden', !hasErrors);
-        errorsList.innerHTML = '';
-        errorsCount.textContent = String(entries.length);
-        if (!hasErrors) {
-            return;
-        }
-        entries.forEach(entry => {
-            const card = document.createElement('article');
-            card.className = 'message is-danger is-light mb-4';
-            const header = document.createElement('div');
-            header.className = 'message-header';
-            const title = document.createElement('p');
-            title.textContent = entry.context || 'Error';
-            const time = document.createElement('span');
-            time.className = 'is-size-7 has-text-weight-normal';
-            time.textContent = formatErrorTime(entry.time);
-            header.appendChild(title);
-            header.appendChild(time);
-            const body = document.createElement('div');
-            body.className = 'message-body';
-            const summary = document.createElement('p');
-            summary.className = 'mb-2';
-            summary.textContent = entry.message || 'Unknown error';
-            body.appendChild(summary);
-            if (entry.detail) {
-                const detail = document.createElement('pre');
-                detail.className = 'is-family-monospace is-size-7';
-                detail.textContent = entry.detail;
-                body.appendChild(detail);
-            }
-            card.appendChild(header);
-            card.appendChild(body);
-            errorsList.appendChild(card);
-        });
-    }
-
-    async function loadErrors() {
-        try {
-            const response = await browser.runtime.sendMessage({ type: 'sortana:getErrorLog' });
-            renderErrors(response?.errors || []);
-        } catch (e) {
-            renderErrors([]);
-        }
-    }
-
-    browser.runtime.onMessage.addListener((msg) => {
-        if (msg?.type === 'sortana:errorLogUpdated') {
-            loadErrors();
-        }
-    });
-
-    await loadErrors();
-
-    updateDiffDisplay();
-    await fetchModels(storedModel);
-
-    [htmlToggle, stripUrlToggle, altTextToggle, collapseWhitespaceToggle, tokenReductionToggle].forEach(toggle => {
-        toggle.addEventListener('change', () => {
-            updatePromptReductionLabel(!diffContainer.classList.contains('is-hidden'));
-        });
-    });
-
-
    const aiParams = Object.assign({}, DEFAULT_AI_PARAMS, defaults.aiParams || {});
    for (const [key, val] of Object.entries(aiParams)) {
        const el = document.getElementById(key);
@ -416,7 +88,6 @@ document.addEventListener('DOMContentLoaded', async () => {

    let tagList = [];
    let folderList = [];
-    let accountList = [];
    try {
        tagList = await messenger.messages.tags.list();
    } catch (e) {
@ -424,7 +95,6 @@ document.addEventListener('DOMContentLoaded', async () => {
    }
    try {
        const accounts = await messenger.accounts.list(true);
-        accountList = accounts.map(a => ({ id: a.id, name: a.name }));
        const collect = (f, prefix='') => {
            folderList.push({ id: f.id ?? f.path, name: prefix + f.name });
            (f.subFolders || []).forEach(sf => collect(sf, prefix + f.name + '/'));
@ -446,19 +116,6 @@ document.addEventListener('DOMContentLoaded', async () => {
    const rulesContainer = document.getElementById('rules-container');
    const addRuleBtn = document.getElementById('add-rule');

-    const ruleCountEl = document.getElementById('rule-count');
-    const cacheCountEl = document.getElementById('cache-count');
-    const queueCountEl = document.getElementById('queue-count');
-    const currentTimeEl = document.getElementById('current-time');
-    const lastTimeEl = document.getElementById('last-time');
-    const averageTimeEl = document.getElementById('average-time');
-    const totalTimeEl = document.getElementById('total-time');
-    const perHourEl = document.getElementById('per-hour');
-    const perDayEl = document.getElementById('per-day');
-    let timingLogged = false;
-    ruleCountEl.textContent = (defaults.aiRules || []).length;
-    cacheCountEl.textContent = defaults.aiCache ? Object.keys(defaults.aiCache).length : 0;
-
    function createActionRow(action = {type: 'tag'}) {
        const row = document.createElement('div');
        row.className = 'action-row field is-grouped mb-2';
@ -466,7 +123,7 @@ document.addEventListener('DOMContentLoaded', async () => {
        const typeWrapper = document.createElement('div');
        typeWrapper.className = 'select is-small mr-2';
        const typeSelect = document.createElement('select');
-        ['tag','move','copy','junk','read','flag','delete','archive','forward','reply'].forEach(t => {
+        ['tag','move','junk'].forEach(t => {
            const opt = document.createElement('option');
            opt.value = t;
            opt.textContent = t;
@ -493,7 +150,7 @@ document.addEventListener('DOMContentLoaded', async () => {
                sel.value = action.tagKey || '';
                wrap.appendChild(sel);
                paramSpan.appendChild(wrap);
-            } else if (typeSelect.value === 'move' || typeSelect.value === 'copy') {
+            } else if (typeSelect.value === 'move') {
                const wrap = document.createElement('div');
                wrap.className = 'select is-small';
                const sel = document.createElement('select');
@ -504,7 +161,7 @@ document.addEventListener('DOMContentLoaded', async () => {
                    opt.textContent = f.name;
                    sel.appendChild(opt);
                }
-                sel.value = action.folder || action.copyTarget || '';
+                sel.value = action.folder || '';
                wrap.appendChild(sel);
                paramSpan.appendChild(wrap);
            } else if (typeSelect.value === 'junk') {
@ -517,45 +174,6 @@ document.addEventListener('DOMContentLoaded', async () => {
                sel.value = String(action.junk ?? true);
                wrap.appendChild(sel);
                paramSpan.appendChild(wrap);
-            } else if (typeSelect.value === 'read') {
-                const wrap = document.createElement('div');
-                wrap.className = 'select is-small';
-                const sel = document.createElement('select');
-                sel.className = 'read-select';
-                sel.appendChild(new Option('mark read','true'));
-                sel.appendChild(new Option('mark unread','false'));
-                sel.value = String(action.read ?? true);
-                wrap.appendChild(sel);
-                paramSpan.appendChild(wrap);
-            } else if (typeSelect.value === 'flag') {
-                const wrap = document.createElement('div');
-                wrap.className = 'select is-small';
-                const sel = document.createElement('select');
-                sel.className = 'flag-select';
-                sel.appendChild(new Option('flag','true'));
-                sel.appendChild(new Option('unflag','false'));
-                sel.value = String(action.flagged ?? true);
-                wrap.appendChild(sel);
-                paramSpan.appendChild(wrap);
-            } else if (typeSelect.value === 'forward') {
-                const input = document.createElement('input');
-                input.type = 'text';
-                input.className = 'input is-small forward-input';
-                input.placeholder = 'address@example.com';
-                input.value = action.address || '';
-                paramSpan.appendChild(input);
-            } else if (typeSelect.value === 'reply') {
-                const wrap = document.createElement('div');
-                wrap.className = 'select is-small';
-                const sel = document.createElement('select');
-                sel.className = 'reply-select';
-                sel.appendChild(new Option('all','all'));
-                sel.appendChild(new Option('sender','sender'));
-                sel.value = action.replyType || 'all';
-                wrap.appendChild(sel);
-                paramSpan.appendChild(wrap);
-            } else if (typeSelect.value === 'delete' || typeSelect.value === 'archive') {
-                paramSpan.appendChild(document.createElement('span'));
            }
        }

@ -575,41 +193,7 @@ document.addEventListener('DOMContentLoaded', async () => {
        return row;
    }

-    function createConditionButton(label, sectionEl, checkbox, clearFn) {
-        const btn = document.createElement('button');
-        btn.type = 'button';
-        btn.className = 'button is-small is-light';
-        const icon = document.createElement('img');
-        icon.width = 16;
-        icon.height = 16;
-        icon.className = 'mr-1';
-        btn.appendChild(icon);
-        btn.append(label);
-
-        let active = checkbox ? checkbox.checked : sectionEl && !sectionEl.classList.contains('is-hidden');
-
-        function update() {
-            btn.classList.toggle('is-active', active);
-            icon.src = browser.runtime.getURL(`resources/svg/${active ? 'circledot' : 'circle'}.svg`);
-            if (sectionEl) sectionEl.classList.toggle('is-hidden', !active);
-            if (checkbox) checkbox.checked = active;
-            if (!active && typeof clearFn === 'function') {
-                clearFn();
-            }
-        }
-
-        btn.addEventListener('click', () => {
-            active = !active;
-            markDirty();
-            update();
-        });
-
-        update();
-        return btn;
-    }
-
    function renderRules(rules = []) {
-        ruleCountEl.textContent = rules.length;
        rulesContainer.innerHTML = '';
        for (const rule of rules) {
            const article = document.createElement('article');
@ -641,67 +225,13 @@ document.addEventListener('DOMContentLoaded', async () => {

            const header = document.createElement('div');
            header.className = 'message-header';
-
-            const leftWrap = document.createElement('div');
-            leftWrap.style.display = 'flex';
-            leftWrap.style.alignItems = 'center';
-            leftWrap.style.flexGrow = '1';
-
-            const statusSpan = document.createElement('span');
-            statusSpan.className = 'rule-status has-text-weight-semibold mr-2';
-
-            leftWrap.appendChild(statusSpan);
-            leftWrap.appendChild(critInput);
-            header.appendChild(leftWrap);
-
-            const btnWrap = document.createElement('div');
-            btnWrap.style.display = 'flex';
-            btnWrap.style.gap = '0.25em';
-
-            let enabled = rule.enabled !== false;
-
-            const toggleBtn = document.createElement('button');
-            toggleBtn.type = 'button';
-            toggleBtn.className = 'button is-small is-light rule-toggle';
-            const toggleIcon = document.createElement('img');
-            toggleIcon.width = 16;
-            toggleIcon.height = 16;
-            toggleBtn.appendChild(toggleIcon);
+            header.appendChild(critInput);

            const delBtn = document.createElement('button');
-            delBtn.type = 'button';
-            delBtn.className = 'button is-small is-danger is-light rule-delete';
-            const delIcon = document.createElement('img');
-            delIcon.src = browser.runtime.getURL('resources/svg/trash.svg');
-            delIcon.width = 16;
-            delIcon.height = 16;
-            delBtn.appendChild(delIcon);
-
-            function updateToggle() {
-                toggleIcon.src = browser.runtime.getURL(
-                    `resources/svg/${enabled ? 'circleslash' : 'check'}.svg`
-                );
-                statusSpan.textContent = enabled ? '' : '(Disabled)';
-                article.dataset.enabled = String(enabled);
-            }
-
-            toggleBtn.addEventListener('click', () => {
-                enabled = !enabled;
-                markDirty();
-                updateToggle();
-            });
-
-            delBtn.addEventListener('click', () => {
-                article.remove();
-                ruleCountEl.textContent = rulesContainer.querySelectorAll('.rule').length;
-                markDirty();
-            });
-
-            btnWrap.appendChild(toggleBtn);
-            btnWrap.appendChild(delBtn);
-            header.appendChild(btnWrap);
-
-            updateToggle();
+            delBtn.className = 'delete';
+            delBtn.setAttribute('aria-label', 'delete');
+            delBtn.addEventListener('click', () => article.remove());
+            header.appendChild(delBtn);

            const actionsContainer = document.createElement('div');
            actionsContainer.className = 'rule-actions mb-2';
@ -717,7 +247,7 @@ document.addEventListener('DOMContentLoaded', async () => {
            addAction.addEventListener('click', () => actionsContainer.appendChild(createActionRow()));

            const stopLabel = document.createElement('label');
-           stopLabel.className = 'checkbox mt-2 is-hidden';
+            stopLabel.className = 'checkbox mt-2';
            const stopCheck = document.createElement('input');
            stopCheck.type = 'checkbox';
            stopCheck.className = 'stop-processing';
@ -725,130 +255,11 @@ document.addEventListener('DOMContentLoaded', async () => {
            stopLabel.appendChild(stopCheck);
            stopLabel.append(' Stop after match');

-            const unreadLabel = document.createElement('label');
-            unreadLabel.className = 'checkbox mt-2 ml-4 is-hidden';
-            const unreadCheck = document.createElement('input');
-            unreadCheck.type = 'checkbox';
-            unreadCheck.className = 'unread-only';
-            unreadCheck.checked = rule.unreadOnly === true;
-            unreadLabel.appendChild(unreadCheck);
-            unreadLabel.append(' Only apply to unread messages');
-
-            const ageBox = document.createElement('div');
-            ageBox.className = 'field is-grouped mt-2 is-hidden';
-            const minInput = document.createElement('input');
-            minInput.type = 'number';
-            minInput.placeholder = 'Min days';
-            minInput.className = 'input is-small min-age mr-2';
-            minInput.style.width = '6em';
-            if (typeof rule.minAgeDays === 'number') minInput.value = rule.minAgeDays;
-            const maxInput = document.createElement('input');
-            maxInput.type = 'number';
-            maxInput.placeholder = 'Max days';
-            maxInput.className = 'input is-small max-age';
-            maxInput.style.width = '6em';
-            if (typeof rule.maxAgeDays === 'number') maxInput.value = rule.maxAgeDays;
-            ageBox.appendChild(minInput);
-            ageBox.appendChild(maxInput);
-
-            const acctBox = document.createElement('div');
-            acctBox.className = 'field mt-2 is-hidden';
-            const acctLabel = document.createElement('label');
-            acctLabel.className = 'label';
-            acctLabel.textContent = 'Accounts';
-            const acctControl = document.createElement('div');
-            const acctWrap = document.createElement('div');
-            acctWrap.className = 'select is-multiple is-small';
-            const acctSel = document.createElement('select');
-            acctSel.className = 'account-select';
-            acctSel.multiple = true;
-            acctSel.size = Math.min(accountList.length, 4) || 1;
-            for (const a of accountList) {
-                const opt = document.createElement('option');
-                opt.value = a.id;
-                opt.textContent = a.name;
-                if ((rule.accounts || []).includes(a.id)) opt.selected = true;
-                acctSel.appendChild(opt);
-            }
-            acctWrap.appendChild(acctSel);
-            acctControl.appendChild(acctWrap);
-            acctBox.appendChild(acctLabel);
-            acctBox.appendChild(acctControl);
-
-            const folderBox = document.createElement('div');
-            folderBox.className = 'field mt-2 is-hidden';
-            const folderLabel = document.createElement('label');
-            folderLabel.className = 'label';
-            folderLabel.textContent = 'Folders';
-            const folderControl = document.createElement('div');
-            const folderWrap = document.createElement('div');
-            folderWrap.className = 'select is-multiple is-small';
-            const folderSel = document.createElement('select');
-            folderSel.className = 'folder-filter-select';
-            folderSel.multiple = true;
-            folderSel.size = Math.min(folderList.length, 6) || 1;
-            for (const f of folderList) {
-                const opt = document.createElement('option');
-                opt.value = f.id;
-                opt.textContent = f.name;
-                if ((rule.folders || []).includes(f.id)) opt.selected = true;
-                folderSel.appendChild(opt);
-            }
-            folderWrap.appendChild(folderSel);
-            folderControl.appendChild(folderWrap);
-            folderBox.appendChild(folderLabel);
-            folderBox.appendChild(folderControl);
-
-            if (typeof rule.minAgeDays === 'number' || typeof rule.maxAgeDays === 'number') {
-                ageBox.classList.remove('is-hidden');
-            }
-            if ((rule.accounts || []).length) {
-                acctBox.classList.remove('is-hidden');
-            }
-            if ((rule.folders || []).length) {
-                folderBox.classList.remove('is-hidden');
-            }
-
-            const condButtons = document.createElement('div');
-            condButtons.className = 'field is-grouped is-grouped-multiline mb-2';
-
-            function addCond(btn) {
-                const p = document.createElement('p');
-                p.className = 'control';
-                p.appendChild(btn);
-                condButtons.appendChild(p);
-            }
-
-            addCond(createConditionButton('Stop', null, stopCheck, () => {
-                stopCheck.checked = false;
-            }));
-            addCond(createConditionButton('Unread', null, unreadCheck, () => {
-                unreadCheck.checked = false;
-            }));
-            addCond(createConditionButton('Age', ageBox, null, () => {
-                minInput.value = '';
-                maxInput.value = '';
-            }));
-            addCond(createConditionButton('Accounts', acctBox, null, () => {
-                for (const opt of acctSel.options) opt.selected = false;
-            }));
-            addCond(createConditionButton('Folders', folderBox, null, () => {
-                for (const opt of folderSel.options) opt.selected = false;
-            }));
-
            const body = document.createElement('div');
            body.className = 'message-body';
            body.appendChild(actionsContainer);
            body.appendChild(addAction);
-            const condDivider = document.createElement('hr');
-            condDivider.className = 'mt-3 mb-2';
-            body.appendChild(condDivider);
-            body.appendChild(condButtons);
            body.appendChild(stopLabel);
-            body.appendChild(unreadLabel);
-            body.appendChild(ageBox);
-            body.appendChild(acctBox);
-            body.appendChild(folderBox);

            article.appendChild(header);
            article.appendChild(body);
@ -868,185 +279,31 @@ document.addEventListener('DOMContentLoaded', async () => {
                if (type === 'move') {
                    return { type, folder: row.querySelector('.folder-select').value };
                }
-                if (type === 'copy') {
-                    return { type, copyTarget: row.querySelector('.folder-select').value };
-                }
                if (type === 'junk') {
                    return { type, junk: row.querySelector('.junk-select').value === 'true' };
                }
-                if (type === 'read') {
-                    return { type, read: row.querySelector('.read-select').value === 'true' };
-                }
-                if (type === 'flag') {
-                    return { type, flagged: row.querySelector('.flag-select').value === 'true' };
-                }
-                if (type === 'delete' || type === 'archive') {
-                    return { type };
-                }
                return { type };
            });
            const stopProcessing = ruleEl.querySelector('.stop-processing')?.checked;
-            const unreadOnly = ruleEl.querySelector('.unread-only')?.checked;
-            const enabled = ruleEl.dataset.enabled !== 'false';
-            const minAgeDays = parseFloat(ruleEl.querySelector('.min-age')?.value);
-            const maxAgeDays = parseFloat(ruleEl.querySelector('.max-age')?.value);
-            const accounts = [...(ruleEl.querySelector('.account-select')?.selectedOptions || [])].map(o => o.value);
-            const folders = [...(ruleEl.querySelector('.folder-filter-select')?.selectedOptions || [])].map(o => o.value);
-            const rule = { criterion, actions, enabled };
-            if (unreadOnly) rule.unreadOnly = true;
-            if (stopProcessing) rule.stopProcessing = true;
-            if (!isNaN(minAgeDays)) rule.minAgeDays = minAgeDays;
-            if (!isNaN(maxAgeDays)) rule.maxAgeDays = maxAgeDays;
-            if (accounts.length) rule.accounts = accounts;
-            if (folders.length) rule.folders = folders;
-            return rule;
+            return { criterion, actions, stopProcessing };
        });
-        data.push({ criterion: '', actions: [], unreadOnly: false, stopProcessing: false, enabled: true, accounts: [], folders: [] });
+        data.push({ criterion: '', actions: [], stopProcessing: false });
        renderRules(data);
    });

    renderRules((defaults.aiRules || []).map(r => {
-        if (r.actions) {
-            if (!Array.isArray(r.accounts)) r.accounts = [];
-            if (!Array.isArray(r.folders)) r.folders = [];
-            if (r.enabled !== false) r.enabled = true; else r.enabled = false;
-            return r;
-        }
+        if (r.actions) return r;
        const actions = [];
        if (r.tag) actions.push({ type: 'tag', tagKey: r.tag });
        if (r.moveTo) actions.push({ type: 'move', folder: r.moveTo });
-        if (r.copyTarget || r.copyTo) actions.push({ type: 'copy', copyTarget: r.copyTarget || r.copyTo });
        const rule = { criterion: r.criterion, actions };
        if (r.stopProcessing) rule.stopProcessing = true;
-        if (r.unreadOnly) rule.unreadOnly = true;
-        if (typeof r.minAgeDays === 'number') rule.minAgeDays = r.minAgeDays;
-        if (typeof r.maxAgeDays === 'number') rule.maxAgeDays = r.maxAgeDays;
-        if (Array.isArray(r.accounts)) rule.accounts = r.accounts;
-        if (Array.isArray(r.folders)) rule.folders = r.folders;
-        rule.enabled = r.enabled !== false;
        return rule;
    }));
-
-
-    function format(ms) {
-        if (ms < 0) return '--:--:--';
-        let totalSec = Math.floor(ms / 1000);
-        const sec = totalSec % 60;
-        totalSec = (totalSec - sec) / 60;
-        const min = totalSec % 60;
-        const hr = (totalSec - min) / 60;
-        return `${String(hr).padStart(2, '0')}:${String(min).padStart(2, '0')}:${String(sec).padStart(2, '0')}`;
-    }
-
-    async function refreshMaintenance() {
-        try {
-            const stats = await browser.runtime.sendMessage({ type: 'sortana:getTiming' });
-            queueCountEl.textContent = stats.count;
-            currentTimeEl.classList.remove('has-text-danger');
-            lastTimeEl.classList.remove('has-text-success','has-text-danger');
-            let arrow = '';
-            if (stats.last >= 0) {
-                if (stats.stddev > 0 && stats.last - stats.average > stats.stddev) {
-                    lastTimeEl.classList.add('has-text-danger');
-                    arrow = ' ▲';
-                } else if (stats.stddev > 0 && stats.average - stats.last > stats.stddev) {
-                    lastTimeEl.classList.add('has-text-success');
-                    arrow = ' ▼';
-                }
-                lastTimeEl.textContent = format(stats.last) + arrow;
-            } else {
-                lastTimeEl.textContent = '--:--:--';
-            }
-            if (stats.current >= 0) {
-                if (stats.stddev > 0 && stats.current - stats.average > stats.stddev) {
-                    currentTimeEl.classList.add('has-text-danger');
-                }
-                currentTimeEl.textContent = format(stats.current);
-            } else {
-                currentTimeEl.textContent = '--:--:--';
-            }
-            averageTimeEl.textContent = stats.runs > 0 ? format(stats.average) : '--:--:--';
-            totalTimeEl.textContent = format(stats.total);
-            const perHour = stats.average > 0 ? Math.round(3600000 / stats.average) : 0;
-            const perDay = stats.average > 0 ? Math.round(86400000 / stats.average) : 0;
-            perHourEl.textContent = perHour;
-            perDayEl.textContent = perDay;
-            if (!timingLogged) {
-                logger.aiLog('retrieved timing stats', {debug: true});
-                timingLogged = true;
-            }
-        } catch (e) {
-            queueCountEl.textContent = '?';
-            currentTimeEl.textContent = '--:--:--';
-            lastTimeEl.textContent = '--:--:--';
-            averageTimeEl.textContent = '--:--:--';
-            totalTimeEl.textContent = '--:--:--';
-            perHourEl.textContent = '0';
-            perDayEl.textContent = '0';
-        }
-
-        try {
-            const { aiCache } = await storage.local.get('aiCache');
-            cacheCountEl.textContent = aiCache ? Object.keys(aiCache).length : 0;
-        } catch {
-            cacheCountEl.textContent = '?';
-        }
-
-        try {
-            if (debugTabToggle.checked) {
-                const latest = await storage.local.get(['lastPayload', 'lastFullText', 'lastPromptText']);
-                const payloadStr = latest.lastPayload ? JSON.stringify(latest.lastPayload, null, 2) : '';
-                if (payloadStr !== lastPayload) {
-                    lastPayload = payloadStr;
-                    payloadDisplay.textContent = payloadStr;
-                }
-                if (latest.lastFullText !== lastFullText || latest.lastPromptText !== lastPromptText) {
-                    lastFullText = latest.lastFullText || '';
-                    lastPromptText = latest.lastPromptText || '';
-                    updateDiffDisplay();
-                }
-            }
-        } catch {}
-    }
-
-    refreshMaintenance();
-    setInterval(refreshMaintenance, 1000);
-
-    document.getElementById('clear-cache').addEventListener('click', async () => {
-        await AiClassifier.clearCache();
-        cacheCountEl.textContent = '0';
-    });
-
-    document.getElementById('reset-timing').addEventListener('click', async () => {
-        await browser.runtime.sendMessage({ type: 'sortana:resetTimingStats' });
-        await refreshMaintenance();
-    });
-
-    function selectedCategories() {
-        return [...document.querySelectorAll('.transfer-category:checked')].map(el => el.value);
-    }
-
-    document.getElementById('export-data').addEventListener('click', () => {
-        dataTransfer.exportData(selectedCategories());
-    });
-
-    const importInput = document.getElementById('import-file');
-    document.getElementById('import-data').addEventListener('click', () => importInput.click());
-    importInput.addEventListener('change', async () => {
-        if (importInput.files.length) {
-            await dataTransfer.importData(importInput.files[0], selectedCategories());
-            location.reload();
-        }
-    });
-
    initialized = true;

    document.getElementById('save').addEventListener('click', async () => {
-        const endpoint = endpointInput.value.trim();
-        const model = modelSelect?.value || '';
-        const apiKey = apiKeyInput?.value.trim() || '';
-        const openaiOrganization = openaiOrgInput?.value.trim() || '';
-        const openaiProject = openaiProjectInput?.value.trim() || '';
+        const endpoint = document.getElementById('endpoint').value;
        const templateName = templateSelect.value;
        const customTemplateText = customTemplate.value;
        const customSystemPrompt = systemBox.value;
@ -1059,7 +316,6 @@ document.addEventListener('DOMContentLoaded', async () => {
            }
        }
        const debugLogging = debugToggle.checked;
-        const htmlToMarkdown = htmlToggle.checked;
        const rules = [...rulesContainer.querySelectorAll('.rule')].map(ruleEl => {
            const criterion = ruleEl.querySelector('.criterion').value;
            const actions = [...ruleEl.querySelectorAll('.action-row')].map(row => {
@ -1070,52 +326,17 @@ document.addEventListener('DOMContentLoaded', async () => {
                if (type === 'move') {
                    return { type, folder: row.querySelector('.folder-select').value };
                }
-                if (type === 'copy') {
-                    return { type, copyTarget: row.querySelector('.folder-select').value };
-                }
                if (type === 'junk') {
                    return { type, junk: row.querySelector('.junk-select').value === 'true' };
                }
-                if (type === 'read') {
-                    return { type, read: row.querySelector('.read-select').value === 'true' };
-                }
-                if (type === 'flag') {
-                    return { type, flagged: row.querySelector('.flag-select').value === 'true' };
-                }
-                if (type === 'forward') {
-                    return { type, address: row.querySelector('.forward-input').value.trim() };
-                }
-                if (type === 'reply') {
-                    return { type, replyType: row.querySelector('.reply-select').value };
-                }
                return { type };
            });
            const stopProcessing = ruleEl.querySelector('.stop-processing')?.checked;
-            const unreadOnly = ruleEl.querySelector('.unread-only')?.checked;
-            const enabled = ruleEl.dataset.enabled !== 'false';
-            const minAgeDays = parseFloat(ruleEl.querySelector('.min-age')?.value);
-            const maxAgeDays = parseFloat(ruleEl.querySelector('.max-age')?.value);
-            const accounts = [...(ruleEl.querySelector('.account-select')?.selectedOptions || [])].map(o => o.value);
-            const folders = [...(ruleEl.querySelector('.folder-filter-select')?.selectedOptions || [])].map(o => o.value);
-            const rule = { criterion, actions, enabled };
-            if (unreadOnly) rule.unreadOnly = true;
-            if (stopProcessing) rule.stopProcessing = true;
-            if (!isNaN(minAgeDays)) rule.minAgeDays = minAgeDays;
-            if (!isNaN(maxAgeDays)) rule.maxAgeDays = maxAgeDays;
-            if (accounts.length) rule.accounts = accounts;
-            if (folders.length) rule.folders = folders;
-            return rule;
+            return { criterion, actions, stopProcessing };
        }).filter(r => r.criterion);
-        const stripUrlParams = stripUrlToggle.checked;
-        const altTextImages = altTextToggle.checked;
-        const collapseWhitespace = collapseWhitespaceToggle.checked;
-        const tokenReduction = tokenReductionToggle.checked;
-        const showDebugTab = debugTabToggle.checked;
-        const theme = themeSelect.value;
-        await storage.local.set({ endpoint, model, apiKey, openaiOrganization, openaiProject, templateName, customTemplate: customTemplateText, customSystemPrompt, aiParams: aiParamsSave, debugLogging, htmlToMarkdown, stripUrlParams, altTextImages, collapseWhitespace, tokenReduction, aiRules: rules, theme, showDebugTab });
-        await applyTheme(theme);
+        await storage.local.set({ endpoint, templateName, customTemplate: customTemplateText, customSystemPrompt, aiParams: aiParamsSave, debugLogging, aiRules: rules });
        try {
-            await AiClassifier.setConfig({ endpoint, model, apiKey, openaiOrganization, openaiProject, templateName, customTemplate: customTemplateText, customSystemPrompt, aiParams: aiParamsSave, debugLogging });
+            await AiClassifier.setConfig({ endpoint, templateName, customTemplate: customTemplateText, customSystemPrompt, aiParams: aiParamsSave, debugLogging });
            logger.setDebug(debugLogging);
        } catch (e) {
            logger.aiLog('[options] failed to apply config', {level: 'error'}, e);
--- a/prompt_templates/harmony.txt
+++ b/prompt_templates/harmony.txt
@ -1,21 +0,0 @@
-<|start|>system<|message|>You are ChatGPT, a large language model trained by OpenAI.
-Knowledge cutoff: 2024-06
-Current date: 2025-06-28
-
-Reasoning: medium
-
-# Valid channels: analysis, commentary, final. Channel must be included for every message.<|end|>
-<|start|>developer<|message|># Instructions
-
-{{system}}<|end|>
-<|start|>user<|message|>**Email Contents**
-```
-{{email}}
-```
-Classification Criterion: {{query}}
-Remember, return ONLY a JSON object on a single line of the form:
-{"match": true, "reason": "<short explanation>"} - if the email satisfies the criterion
-{"match": false, "reason": "<short explanation>"} - otherwise
-
-Do not add any other keys, text, or formatting.<|end|>
-<|start|>assistant
--- a/prompt_templates/mistral.txt
+++ b/prompt_templates/mistral.txt
@ -5,8 +5,8 @@ Email:

 Criterion: {{query}}
 Remember, return ONLY a JSON object on a single line of the form:
-{"match": true, "reason": "<short explanation>"} - if the email satisfies the criterion
-{"match": false, "reason": "<short explanation>"} - otherwise
+{"match": true} - if the email satisfies the criterion
+{"match": false} - otherwise

 Do not add any other keys, text, or formatting.
 [/INST]
--- a/prompt_templates/openai.txt
+++ b/prompt_templates/openai.txt
@ -7,8 +7,8 @@
 ```
 Classification Criterion: {{query}}
 Remember, return ONLY a JSON object on a single line of the form:
-{"match": true, "reason": "<short explanation>"} - if the email satisfies the criterion
-{"match": false, "reason": "<short explanation>"} - otherwise
+{"match": true} - if the email satisfies the criterion
+{"match": false} - otherwise

 Do not add any other keys, text, or formatting.<|im_end|>
 <|im_start|>assistant
--- a/prompt_templates/qwen.txt
+++ b/prompt_templates/qwen.txt
@ -7,8 +7,8 @@ Email:

 Criterion: {{query}}
 Remember, return ONLY a JSON object on a single line of the form:
-{"match": true, "reason": "<short explanation>"} - if the email satisfies the criterion
-{"match": false, "reason": "<short explanation>"} - otherwise
+{"match": true} - if the email satisfies the criterion
+{"match": false} - otherwise

 Do not add any other keys, text, or formatting.
 <|im_end|>
--- a/reasoning.html
+++ b/reasoning.html
@ -2,7 +2,7 @@
 <html lang="en">
 <head>
  <meta charset="UTF-8">
-  <title>AI Details</title>
+  <title>AI Reasoning</title>
  <link rel="stylesheet" href="options/bulma.css">
 </head>
 <body>
@ -10,11 +10,8 @@
    <div class="container">
      <h1 class="title" id="subject"></h1>
      <div id="rules"></div>
-      <div class="buttons mt-4">
-        <button class="button is-danger" id="clear">Clear Cache</button>
-      </div>
    </div>
  </section>
-  <script type="module" src="details.js"></script>
+  <script src="reasoning.js"></script>
 </body>
 </html>
--- a/reasoning.js
+++ b/reasoning.js
@ -0,0 +1,27 @@
+document.addEventListener('DOMContentLoaded', async () => {
+  const params = new URLSearchParams(location.search);
+  const id = parseInt(params.get('mid'), 10);
+  if (!id) return;
+  try {
+    const { subject, reasons } = await browser.runtime.sendMessage({ type: 'sortana:getReasons', id });
+    document.getElementById('subject').textContent = subject;
+    const container = document.getElementById('rules');
+    for (const r of reasons) {
+      const article = document.createElement('article');
+      article.className = 'message mb-4';
+      const header = document.createElement('div');
+      header.className = 'message-header';
+      header.innerHTML = `<p>${r.criterion}</p>`;
+      const body = document.createElement('div');
+      body.className = 'message-body';
+      const pre = document.createElement('pre');
+      pre.textContent = r.reason;
+      body.appendChild(pre);
+      article.appendChild(header);
+      article.appendChild(body);
+      container.appendChild(article);
+    }
+  } catch (e) {
+    console.error('failed to load reasons', e);
+  }
+});
--- a/resources/clearCacheButton.js
+++ b/resources/clearCacheButton.js
@ -0,0 +1,22 @@
+(function() {
+  function addButton() {
+    const toolbar = document.querySelector("#header-view-toolbar") ||
+                    document.querySelector("#mail-toolbox toolbar");
+    if (!toolbar || document.getElementById('sortana-clear-cache-button')) return;
+    const button = document.createXULElement ?
+          document.createXULElement('toolbarbutton') :
+          document.createElement('button');
+    button.id = 'sortana-clear-cache-button';
+    button.setAttribute('label', 'Clear Cache');
+    button.className = 'toolbarbutton-1';
+    button.addEventListener('command', () => {
+      browser.runtime.sendMessage({ type: 'sortana:clearCacheForDisplayed' });
+    });
+    toolbar.appendChild(button);
+  }
+  if (document.readyState === 'complete' || document.readyState === 'interactive') {
+    addButton();
+  } else {
+    document.addEventListener('DOMContentLoaded', addButton, { once: true });
+  }
+})();
--- a/resources/img/average-dark-16.png
+++ b/resources/img/average-dark-16.png
--- a/resources/img/average-dark-32.png
+++ b/resources/img/average-dark-32.png
--- a/resources/img/average-dark-64.png
+++ b/resources/img/average-dark-64.png
--- a/resources/img/average-light-16.png
+++ b/resources/img/average-light-16.png
--- a/resources/img/average-light-32.png
+++ b/resources/img/average-light-32.png
--- a/resources/img/average-light-64.png
+++ b/resources/img/average-light-64.png
--- a/resources/img/busy.png
+++ b/resources/img/busy.png
--- a/resources/img/check-dark-16.png
+++ b/resources/img/check-dark-16.png
--- a/resources/img/check-dark-32.png
+++ b/resources/img/check-dark-32.png
--- a/resources/img/check-dark-64.png
+++ b/resources/img/check-dark-64.png
--- a/resources/img/check-light-16.png
+++ b/resources/img/check-light-16.png
--- a/resources/img/check-light-32.png
+++ b/resources/img/check-light-32.png
--- a/resources/img/check-light-64.png
+++ b/resources/img/check-light-64.png
--- a/resources/img/circle-dark-16.png
+++ b/resources/img/circle-dark-16.png
--- a/resources/img/circle-dark-32.png
+++ b/resources/img/circle-dark-32.png
--- a/resources/img/circle-dark-64.png
+++ b/resources/img/circle-dark-64.png
--- a/resources/img/circle-light-16.png
+++ b/resources/img/circle-light-16.png
--- a/resources/img/circle-light-32.png
+++ b/resources/img/circle-light-32.png
--- a/resources/img/circle-light-64.png
+++ b/resources/img/circle-light-64.png
--- a/resources/img/circledot-dark-16.png
+++ b/resources/img/circledot-dark-16.png
--- a/resources/img/circledot-dark-32.png
+++ b/resources/img/circledot-dark-32.png
--- a/resources/img/circledot-dark-64.png
+++ b/resources/img/circledot-dark-64.png
--- a/resources/img/circledot-light-16.png
+++ b/resources/img/circledot-light-16.png
--- a/resources/img/circledot-light-32.png
+++ b/resources/img/circledot-light-32.png
--- a/resources/img/circledot-light-64.png
+++ b/resources/img/circledot-light-64.png
--- a/resources/img/circledots-dark-16.png
+++ b/resources/img/circledots-dark-16.png
--- a/resources/img/circledots-dark-32.png
+++ b/resources/img/circledots-dark-32.png
--- a/resources/img/circledots-dark-64.png
+++ b/resources/img/circledots-dark-64.png
--- a/resources/img/circledots-light-16.png
+++ b/resources/img/circledots-light-16.png
--- a/resources/img/circledots-light-32.png
+++ b/resources/img/circledots-light-32.png
--- a/resources/img/circledots-light-64.png
+++ b/resources/img/circledots-light-64.png
--- a/resources/img/circleslash-dark-16.png
+++ b/resources/img/circleslash-dark-16.png
--- a/resources/img/circleslash-dark-32.png
+++ b/resources/img/circleslash-dark-32.png
--- a/resources/img/circleslash-dark-64.png
+++ b/resources/img/circleslash-dark-64.png
--- a/resources/img/circleslash-light-16.png
+++ b/resources/img/circleslash-light-16.png
--- a/resources/img/circleslash-light-32.png
+++ b/resources/img/circleslash-light-32.png
--- a/resources/img/circleslash-light-64.png
+++ b/resources/img/circleslash-light-64.png
--- a/resources/img/clipboarddata-dark-16.png
+++ b/resources/img/clipboarddata-dark-16.png
--- a/resources/img/clipboarddata-dark-32.png
+++ b/resources/img/clipboarddata-dark-32.png
--- a/resources/img/clipboarddata-dark-64.png
+++ b/resources/img/clipboarddata-dark-64.png
--- a/resources/img/clipboarddata-light-16.png
+++ b/resources/img/clipboarddata-light-16.png
--- a/resources/img/clipboarddata-light-32.png
+++ b/resources/img/clipboarddata-light-32.png
--- a/resources/img/clipboarddata-light-64.png
+++ b/resources/img/clipboarddata-light-64.png
--- a/resources/img/done.png
+++ b/resources/img/done.png
--- a/resources/img/download-dark-16.png
+++ b/resources/img/download-dark-16.png
--- a/resources/img/download-dark-32.png
+++ b/resources/img/download-dark-32.png
--- a/resources/img/download-dark-64.png
+++ b/resources/img/download-dark-64.png
--- a/resources/img/download-light-16.png
+++ b/resources/img/download-light-16.png
--- a/resources/img/download-light-32.png
+++ b/resources/img/download-light-32.png
--- a/resources/img/download-light-64.png
+++ b/resources/img/download-light-64.png
--- a/resources/img/error.png
+++ b/resources/img/error.png
--- a/resources/img/eye-dark-16.png
+++ b/resources/img/eye-dark-16.png
--- a/resources/img/eye-dark-32.png
+++ b/resources/img/eye-dark-32.png
--- a/resources/img/eye-dark-64.png
+++ b/resources/img/eye-dark-64.png
--- a/resources/img/eye-light-16.png
+++ b/resources/img/eye-light-16.png
--- a/resources/img/eye-light-32.png
+++ b/resources/img/eye-light-32.png
--- a/resources/img/eye-light-64.png
+++ b/resources/img/eye-light-64.png
--- a/resources/img/flag-dark-16.png
+++ b/resources/img/flag-dark-16.png
--- a/resources/img/flag-dark-32.png
+++ b/resources/img/flag-dark-32.png
--- a/resources/img/flag-dark-64.png
+++ b/resources/img/flag-dark-64.png
--- a/resources/img/flag-light-16.png
+++ b/resources/img/flag-light-16.png
--- a/resources/img/flag-light-32.png
+++ b/resources/img/flag-light-32.png
--- a/resources/img/flag-light-64.png
+++ b/resources/img/flag-light-64.png
--- a/resources/img/gear-dark-16.png
+++ b/resources/img/gear-dark-16.png
--- a/resources/img/gear-dark-32.png
+++ b/resources/img/gear-dark-32.png
--- a/resources/img/gear-dark-64.png
+++ b/resources/img/gear-dark-64.png
--- a/resources/img/gear-light-16.png
+++ b/resources/img/gear-light-16.png
--- a/resources/img/gear-light-32.png
+++ b/resources/img/gear-light-32.png
--- a/resources/img/gear-light-64.png
+++ b/resources/img/gear-light-64.png
--- a/resources/img/plus-dark-16.png
+++ b/resources/img/plus-dark-16.png
--- a/resources/img/plus-dark-32.png
+++ b/resources/img/plus-dark-32.png
--- a/resources/img/plus-dark-64.png
+++ b/resources/img/plus-dark-64.png
--- a/resources/img/plus-light-16.png
+++ b/resources/img/plus-light-16.png
--- a/resources/img/plus-light-32.png
+++ b/resources/img/plus-light-32.png
--- a/resources/img/plus-light-64.png
+++ b/resources/img/plus-light-64.png
--- a/Show more
+++ b/Show more