Attempt retry

BEtter messages
Provide more information on PageUnloadable
2025-11-13 13:06:10 +00:00 · 2022-12-16 17:29:16 +01:00 · 2022-12-16 17:04:12 +01:00 · 2022-12-15 09:13:09 +01:00 · 2022-12-14 19:06:49 +01:00 · 2022-12-14 15:08:34 +01:00
62 changed files with 2420 additions and 879 deletions
--- a/5
+++ b/5
@@ -1,7 +1,7 @@
 # pip dependencies install stage
 FROM python:3.8-slim as builder
-# rustc compiler would be needed on ARM type devices but theres an issue with some deps not building..
+# See `cryptography` pin comment in requirements.txt
 ARG CRYPTOGRAPHY_DONT_BUILD_RUST=1
 RUN apt-get update && apt-get install -y --no-install-recommends \
@@ -31,8 +31,7 @@ RUN pip install --target=/dependencies playwright~=1.27.1 \
 # Final image stage
 FROM python:3.8-slim
-# Actual packages needed at runtime, usually due to the notification (apprise) backend
+# See `cryptography` pin comment in requirements.txt
 # rustc compiler would be needed on ARM type devices but theres an issue with some deps not building..
 ARG CRYPTOGRAPHY_DONT_BUILD_RUST=1
 # Re #93, #73, excluding rustc (adds another 430Mb~)
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,9 +1,10 @@
 recursive-include changedetectionio/api *
-recursive-include changedetectionio/templates *
+recursive-include changedetectionio/blueprint *
 recursive-include changedetectionio/static *
 recursive-include changedetectionio/model *
 recursive-include changedetectionio/tests *
 recursive-include changedetectionio/res *
 recursive-include changedetectionio/static *
 recursive-include changedetectionio/templates *
 recursive-include changedetectionio/tests *
 prune changedetectionio/static/package-lock.json
 prune changedetectionio/static/styles/node_modules
 prune changedetectionio/static/styles/package-lock.json
--- a/README.md
+++ b/README.md
@@ -159,7 +159,7 @@ Just some examples
 <img src="https://raw.githubusercontent.com/dgtlmoon/changedetection.io/master/docs/screenshot-notifications.png" style="max-width:100%;" alt="Self-hosted web page change monitoring notifications"  title="Self-hosted web page change monitoring notifications"  />
-Now you can also customise your notification content!
+Now you can also customise your notification content and use <a target="_new" href="https://jinja.palletsprojects.com/en/3.0.x/templates/">Jinja2 templating</a> for their title and body!
 ## JSON API Monitoring
@@ -187,11 +187,29 @@ When you enable a `json:` or `jq:` filter, you can even automatically extract an
 <html>
 ...
 <script type="application/ld+json">
-  {"@context":"http://schema.org","@type":"Product","name":"Nan Optipro Stage 1 Baby Formula  800g","price": 23.50 }
+
 {
   "@context":"http://schema.org/",
   "@type":"Product",
   "offers":{
      "@type":"Offer",
      "availability":"http://schema.org/InStock",
      "price":"3949.99",
      "priceCurrency":"USD",
      "url":"https://www.newegg.com/p/3D5-000D-001T1"
   },
   "description":"Cobratype King Cobra Hero Desktop Gaming PC",
   "name":"Cobratype King Cobra Hero Desktop Gaming PC",
   "sku":"3D5-000D-001T1",
   "itemCondition":"NewCondition"
 }
 </script>
 ```  
-`json:$.price` or `jq:.price` would give `23.50`, or you can extract the whole structure
+`json:$..price` or `jq:..price` would give `3949.99`, or you can extract the whole structure (use a JSONpath test website to validate with)
 The application also supports notifying you that it can follow this information automatically
 ## Proxy Configuration
--- a/changedetectionio/init.py
+++ b/changedetectionio/init.py
@@ -10,6 +10,7 @@ import threading
 import time
 import timeago
 from changedetectionio import queuedWatchMetaData
 from copy import deepcopy
 from distutils.util import strtobool
 from feedgen.feed import FeedGenerator
@@ -35,7 +36,7 @@ from flask_wtf import CSRFProtect
 from changedetectionio import html_tools
 from changedetectionio.api import api_v1
-__version__ = '0.39.22.1'
+__version__ = '0.40.0.2'
 datastore = None
@@ -95,6 +96,12 @@ def init_app_secret(datastore_path):
    return secret
@app.template_global()
 def get_darkmode_state():
    css_dark_mode = request.cookies.get('css_dark_mode', 'false')
    return 'true' if css_dark_mode and strtobool(css_dark_mode) else 'false'
 # We use the whole watch object from the store/JSON so we can see if there's some related status in terms of a thread
 # running or something similar.
@app.template_filter('format_last_checked_time')
@@ -202,8 +209,6 @@ def changedetection_app(config=None, datastore_o=None):
    watch_api.add_resource(api_v1.SystemInfo, '/api/v1/systeminfo',
                           resource_class_kwargs={'datastore': datastore, 'update_q': update_q})
    # Setup cors headers to allow all domains
    # https://flask-cors.readthedocs.io/en/latest/
    #    CORS(app)
@@ -400,7 +405,6 @@ def changedetection_app(config=None, datastore_o=None):
                sorted_watches.append(watch)
        existing_tags = datastore.get_all_tags()
        form = forms.quickWatchForm(request.form)
        output = render_template("watch-overview.html",
                                 form=form,
@@ -412,7 +416,7 @@ def changedetection_app(config=None, datastore_o=None):
                                 # Don't link to hosting when we're on the hosting environment
                                 hosted_sticky=os.getenv("SALTED_PASS", False) == False,
                                 guid=datastore.data['app_guid'],
-                                 queued_uuids=[uuid for p,uuid in update_q.queue])
+                                 queued_uuids=[q_uuid.item['uuid'] for q_uuid in update_q.queue])
        if session.get('share-link'):
@@ -592,25 +596,16 @@ def changedetection_app(config=None, datastore_o=None):
                    using_default_check_time = False
                    break
-            # Use the default if its the same as system wide
+            # Use the default if it's the same as system-wide.
            if form.fetch_backend.data == datastore.data['settings']['application']['fetch_backend']:
                extra_update_obj['fetch_backend'] = None
             # Ignore text
            form_ignore_text = form.ignore_text.data
            datastore.data['watching'][uuid]['ignore_text'] = form_ignore_text
            # Reset the previous_md5 so we process a new snapshot including stripping ignore text.
            if form_ignore_text:
                if len(datastore.data['watching'][uuid].history):
                    extra_update_obj['previous_md5'] = get_current_checksum_include_ignore_text(uuid=uuid)
            # Reset the previous_md5 so we process a new snapshot including stripping ignore text.
            if form.include_filters.data != datastore.data['watching'][uuid].get('include_filters', []):
                if len(datastore.data['watching'][uuid].history):
                    extra_update_obj['previous_md5'] = get_current_checksum_include_ignore_text(uuid=uuid)
            # Be sure proxy value is None
            if datastore.proxy_list is not None and form.data['proxy'] == '':
                extra_update_obj['proxy'] = None
@@ -628,7 +623,7 @@ def changedetection_app(config=None, datastore_o=None):
            datastore.needs_write_urgent = True
            # Queue the watch for immediate recheck, with a higher priority
-            update_q.put((1, uuid))
+            update_q.put(queuedWatchMetaData.PrioritizedItem(priority=1, item={'uuid': uuid, 'skip_when_checksum_same': False}))
            # Diff page [edit] link should go back to diff page
            if request.args.get("next") and request.args.get("next") == 'diff':
@@ -769,7 +764,7 @@ def changedetection_app(config=None, datastore_o=None):
                importer = import_url_list()
                importer.run(data=request.values.get('urls'), flash=flash, datastore=datastore)
                for uuid in importer.new_uuids:
-                    update_q.put((1, uuid))
+                    update_q.put(queuedWatchMetaData.PrioritizedItem(priority=1, item={'uuid': uuid, 'skip_when_checksum_same': True}))
                if len(importer.remaining_data) == 0:
                    return redirect(url_for('index'))
@@ -782,7 +777,7 @@ def changedetection_app(config=None, datastore_o=None):
                d_importer = import_distill_io_json()
                d_importer.run(data=request.values.get('distill-io'), flash=flash, datastore=datastore)
                for uuid in d_importer.new_uuids:
-                    update_q.put((1, uuid))
+                    update_q.put(queuedWatchMetaData.PrioritizedItem(priority=1, item={'uuid': uuid, 'skip_when_checksum_same': True}))
@@ -804,10 +799,12 @@ def changedetection_app(config=None, datastore_o=None):
        return redirect(url_for('index'))
-    @app.route("/diff/<string:uuid>", methods=['GET'])
+    @app.route("/diff/<string:uuid>", methods=['GET', 'POST'])
    @login_required
    def diff_history_page(uuid):
        from changedetectionio import forms
        # More for testing, possible to return the first/only
        if uuid == 'first':
            uuid = list(datastore.data['watching'].keys()).pop()
@@ -819,6 +816,28 @@ def changedetection_app(config=None, datastore_o=None):
            flash("No history found for the specified link, bad link?", "error")
            return redirect(url_for('index'))
        # For submission of requesting an extract
        extract_form = forms.extractDataForm(request.form)
        if request.method == 'POST':
            if not extract_form.validate():
                flash("An error occurred, please see below.", "error")
            else:
                extract_regex = request.form.get('extract_regex').strip()
                output = watch.extract_regex_from_all_history(extract_regex)
                if output:
                    watch_dir = os.path.join(datastore_o.datastore_path, uuid)
                    response = make_response(send_from_directory(directory=watch_dir, path=output, as_attachment=True))
                    response.headers['Content-type'] = 'text/csv'
                    response.headers['Cache-Control'] = 'no-cache, no-store, must-revalidate'
                    response.headers['Pragma'] = 'no-cache'
                    response.headers['Expires'] = 0
                    return response
                flash('Nothing matches that RegEx', 'error')
                redirect(url_for('diff_history_page', uuid=uuid)+'#extract')
        history = watch.history
        dates = list(history.keys())
@@ -861,22 +880,23 @@ def changedetection_app(config=None, datastore_o=None):
                    watch.get('fetch_backend', None) is None and system_uses_webdriver) else False
        output = render_template("diff.html",
                                 watch_a=watch,
                                 newest=newest_version_file_contents,
                                 previous=previous_version_file_contents,
                                 extra_stylesheets=extra_stylesheets,
                                 versions=dates[:-1], # All except current/last
                                 uuid=uuid,
                                 newest_version_timestamp=dates[-1],
                                 current_previous_version=str(previous_version),
                                 current_diff_url=watch['url'],
                                 current_previous_version=str(previous_version),
                                 extra_stylesheets=extra_stylesheets,
                                 extra_title=" - Diff - {}".format(watch['title'] if watch['title'] else watch['url']),
-                                 left_sticky=True,
+                                 extract_form=extract_form,
                                 screenshot=screenshot_url,
                                 is_html_webdriver=is_html_webdriver,
                                 last_error=watch['last_error'],
                                 last_error_screenshot=watch.get_error_snapshot(),
                                 last_error_text=watch.get_error_text(),
-                                 last_error_screenshot=watch.get_error_snapshot()
+                                 left_sticky=True,
                                 newest=newest_version_file_contents,
                                 newest_version_timestamp=dates[-1],
                                 previous=previous_version_file_contents,
                                 screenshot=screenshot_url,
                                 uuid=uuid,
                                 versions=dates[:-1], # All except current/last
                                 watch_a=watch
                                 )
        return output
@@ -980,10 +1000,6 @@ def changedetection_app(config=None, datastore_o=None):
        return output
    @app.route("/favicon.ico", methods=['GET'])
    def favicon():
        return send_from_directory("static/images", path="favicon.ico")
    # We're good but backups are even better!
    @app.route("/backup", methods=['GET'])
    @login_required
@@ -1126,7 +1142,7 @@ def changedetection_app(config=None, datastore_o=None):
        if not add_paused and new_uuid:
            # Straight into the queue.
-            update_q.put((1, new_uuid))
+            update_q.put(queuedWatchMetaData.PrioritizedItem(priority=1, item={'uuid': new_uuid}))
            flash("Watch added.")
        if add_paused:
@@ -1163,7 +1179,7 @@ def changedetection_app(config=None, datastore_o=None):
            uuid = list(datastore.data['watching'].keys()).pop()
        new_uuid = datastore.clone(uuid)
-        update_q.put((5, new_uuid))
+        update_q.put(queuedWatchMetaData.PrioritizedItem(priority=5, item={'uuid': new_uuid, 'skip_when_checksum_same': True}))
        flash('Cloned.')
        return redirect(url_for('index'))
@@ -1171,7 +1187,7 @@ def changedetection_app(config=None, datastore_o=None):
    @app.route("/api/checknow", methods=['GET'])
    @login_required
    def form_watch_checknow():
-
+        # Forced recheck will skip the 'skip if content is the same' rule (, 'reprocess_existing_data': True})))
        tag = request.args.get('tag')
        uuid = request.args.get('uuid')
        i = 0
@@ -1180,11 +1196,9 @@ def changedetection_app(config=None, datastore_o=None):
        for t in running_update_threads:
            running_uuids.append(t.current_uuid)
        # @todo check thread is running and skip
        if uuid:
            if uuid not in running_uuids:
-                update_q.put((1, uuid))
+                update_q.put(queuedWatchMetaData.PrioritizedItem(priority=1, item={'uuid': uuid, 'skip_when_checksum_same': False}))
            i = 1
        elif tag != None:
@@ -1192,14 +1206,14 @@ def changedetection_app(config=None, datastore_o=None):
            for watch_uuid, watch in datastore.data['watching'].items():
                if (tag != None and tag in watch['tag']):
                    if watch_uuid not in running_uuids and not datastore.data['watching'][watch_uuid]['paused']:
-                        update_q.put((1, watch_uuid))
+                        update_q.put(queuedWatchMetaData.PrioritizedItem(priority=1, item={'uuid': watch_uuid, 'skip_when_checksum_same': False}))
                        i += 1
        else:
            # No tag, no uuid, add everything.
            for watch_uuid, watch in datastore.data['watching'].items():
                if watch_uuid not in running_uuids and not datastore.data['watching'][watch_uuid]['paused']:
-                    update_q.put((1, watch_uuid))
+                    update_q.put(queuedWatchMetaData.PrioritizedItem(priority=1, item={'uuid': watch_uuid, 'skip_when_checksum_same': False}))
                    i += 1
        flash("{} watches are queued for rechecking.".format(i))
        return redirect(url_for('index', tag=tag))
@@ -1318,6 +1332,10 @@ def changedetection_app(config=None, datastore_o=None):
    import changedetectionio.blueprint.browser_steps as browser_steps
    app.register_blueprint(browser_steps.construct_blueprint(datastore), url_prefix='/browser-steps')
    import changedetectionio.blueprint.price_data_follower as price_data_follower
    app.register_blueprint(price_data_follower.construct_blueprint(datastore, update_q), url_prefix='/price_data_follower')
    # @todo handle ctrl break
    ticker_thread = threading.Thread(target=ticker_thread_check_time_launch_checks).start()
    threading.Thread(target=notification_runner).start()
@@ -1463,7 +1481,7 @@ def ticker_thread_check_time_launch_checks():
            seconds_since_last_recheck = now - watch['last_checked']
            if seconds_since_last_recheck >= (threshold + watch.jitter_seconds) and seconds_since_last_recheck >= recheck_time_minimum_seconds:
-                if not uuid in running_uuids and uuid not in [q_uuid for p,q_uuid in update_q.queue]:
+                if not uuid in running_uuids and uuid not in [q_uuid.item['uuid'] for q_uuid in update_q.queue]:
                    # Proxies can be set to have a limit on seconds between which they can be called
                    watch_proxy = datastore.get_preferred_proxy_for_watch(uuid=uuid)
@@ -1494,8 +1512,9 @@ def ticker_thread_check_time_launch_checks():
                            priority,
                            watch.jitter_seconds,
                            now - watch['last_checked']))
                    # Into the queue with you
-                    update_q.put((priority, uuid))
+                    update_q.put(queuedWatchMetaData.PrioritizedItem(priority=priority, item={'uuid': uuid, 'skip_when_checksum_same': True}))
                    # Reset for next time
                    watch.jitter_seconds = 0
--- a/changedetectionio/api/api_v1.py
+++ b/changedetectionio/api/api_v1.py
@@ -1,3 +1,4 @@
 from changedetectionio import queuedWatchMetaData
 from flask_restful import abort, Resource
 from flask import request, make_response
 import validators
@@ -24,7 +25,7 @@ class Watch(Resource):
            abort(404, message='No watch exists with the UUID of {}'.format(uuid))
        if request.args.get('recheck'):
-            self.update_q.put((1, uuid))
+            self.update_q.put(queuedWatchMetaData.PrioritizedItem(priority=1, item={'uuid': uuid, 'skip_when_checksum_same': True}))
            return "OK", 200
        # Return without history, get that via another API call
@@ -100,7 +101,7 @@ class CreateWatch(Resource):
        extras = {'title': json_data['title'].strip()} if json_data.get('title') else {}
        new_uuid = self.datastore.add_watch(url=json_data['url'].strip(), tag=tag, extras=extras)
-        self.update_q.put((1, new_uuid))
+        self.update_q.put(queuedWatchMetaData.PrioritizedItem(priority=1, item={'uuid': new_uuid, 'skip_when_checksum_same': True}))
        return {'uuid': new_uuid}, 201
    # Return concise list of available watches and some very basic info
@@ -118,7 +119,7 @@ class CreateWatch(Resource):
        if request.args.get('recheck_all'):
            for uuid in self.datastore.data['watching'].keys():
-                self.update_q.put((1, uuid))
+                self.update_q.put(queuedWatchMetaData.PrioritizedItem(priority=1, item={'uuid': uuid, 'skip_when_checksum_same': True}))
            return {'status': "OK"}, 200
        return list, 200
--- a/changedetectionio/blueprint/browser_steps/init.py
+++ b/changedetectionio/blueprint/browser_steps/init.py
@@ -45,18 +45,18 @@ def cleanup_playwright_session():
    global browsersteps_playwright_browser_interface_start_time
    browsersteps_live_ui_o = {}
    browsersteps_playwright_browser_interface = None
    browsersteps_playwright_browser_interface_browser = None
    browsersteps_playwright_browser_interface_end_time = None
    browsersteps_playwright_browser_interface_start_time = None
    print("Cleaning up old playwright session because time was up, calling .goodbye()")
    print("Cleaning up old playwright session because time was up, calling .goodbye()")
    try:
        browsersteps_playwright_browser_interface_context.goodbye()
    except Exception as e:
        print ("Got exception in shutdown, probably OK")
        print (str(e))
    browsersteps_playwright_browser_interface = None
    browsersteps_playwright_browser_interface_context = None
    print ("Cleaning up old playwright session because time was up - done")
--- a/changedetectionio/blueprint/browser_steps/browser_steps.py
+++ b/changedetectionio/blueprint/browser_steps/browser_steps.py
@@ -75,15 +75,13 @@ class steppable_browser_interface():
    def action_goto_url(self, url, optional_value):
        # self.page.set_viewport_size({"width": 1280, "height": 5000})
        now = time.time()
-        response = self.page.goto(url, timeout=0, wait_until='domcontentloaded')
+        response = self.page.goto(url, timeout=0, wait_until='commit')
        print("Time to goto URL", time.time() - now)
        # Wait_until = commit
        # - `'commit'` - consider operation to be finished when network response is received and the document started loading.
        # Better to not use any smarts from Playwright and just wait an arbitrary number of seconds
        # This seemed to solve nearly all 'TimeoutErrors'
-        extra_wait = int(os.getenv("WEBDRIVER_DELAY_BEFORE_CONTENT_READY", 5))
+        print("Time to goto URL ", time.time() - now)
        self.page.wait_for_timeout(extra_wait * 1000)
    def action_click_element_containing_text(self, selector=None, value=''):
        if not len(value.strip()):
--- a/changedetectionio/blueprint/price_data_follower/init.py
+++ b/changedetectionio/blueprint/price_data_follower/init.py
@@ -0,0 +1,33 @@
 from distutils.util import strtobool
 from flask import Blueprint, flash, redirect, url_for
 from flask_login import login_required
 from changedetectionio.store import ChangeDetectionStore
 from changedetectionio import queuedWatchMetaData
 from queue import PriorityQueue
 PRICE_DATA_TRACK_ACCEPT = 'accepted'
 PRICE_DATA_TRACK_REJECT = 'rejected'
 def construct_blueprint(datastore: ChangeDetectionStore, update_q: PriorityQueue):
    price_data_follower_blueprint = Blueprint('price_data_follower', __name__)
    @login_required
    @price_data_follower_blueprint.route("/<string:uuid>/accept", methods=['GET'])
    def accept(uuid):
        datastore.data['watching'][uuid]['track_ldjson_price_data'] = PRICE_DATA_TRACK_ACCEPT
        update_q.put(queuedWatchMetaData.PrioritizedItem(priority=1, item={'uuid': uuid, 'skip_when_checksum_same': False}))
        return redirect(url_for("form_watch_checknow", uuid=uuid))
    @login_required
    @price_data_follower_blueprint.route("/<string:uuid>/reject", methods=['GET'])
    def reject(uuid):
        datastore.data['watching'][uuid]['track_ldjson_price_data'] = PRICE_DATA_TRACK_REJECT
        return redirect(url_for("index"))
    return price_data_follower_blueprint
--- a/changedetectionio/content_fetcher.py
+++ b/changedetectionio/content_fetcher.py
@@ -23,6 +23,9 @@ class Non200ErrorCodeReceived(Exception):
            self.page_text = html_tools.html_to_text(page_html)
        return
 class checksumFromPreviousCheckWasTheSame(Exception):
    def __init__(self):
        return
 class JSActionExceptions(Exception):
    def __init__(self, status_code, url, screenshot, message=''):
@@ -39,7 +42,7 @@ class BrowserStepsStepTimout(Exception):
 class PageUnloadable(Exception):
-    def __init__(self, status_code, url, screenshot=False, message=False):
+    def __init__(self, status_code, url, message, screenshot=False):
        # Set this so we can use it in other parts of the app
        self.status_code = status_code
        self.url = url
@@ -286,6 +289,8 @@ class base_html_playwright(Fetcher):
                proxy=self.proxy,
                # This is needed to enable JavaScript execution on GitHub and others
                bypass_csp=True,
                # Can't think why we need the service workers for our use case?
                service_workers='block',
                # Should never be needed
                accept_downloads=False
            )
@@ -294,24 +299,34 @@ class base_html_playwright(Fetcher):
            if len(request_headers):
                context.set_extra_http_headers(request_headers)
            try:
                self.page.set_default_navigation_timeout(90000)
                self.page.set_default_timeout(90000)
                # Listen for all console events and handle errors
                self.page.on("console", lambda msg: print(f"Playwright console: Watch URL: {url} {msg.type}: {msg.text} {msg.args}"))
-                # Bug - never set viewport size BEFORE page.goto
+            # Goto page
-
+            try:
                # Waits for the next navigation. Using Python context manager
                # prevents a race condition between clicking and waiting for a navigation.
                with self.page.expect_navigation():
                    response = self.page.goto(url, wait_until='load')
                # Wait_until = commit
                # - `'commit'` - consider operation to be finished when network response is received and the document started loading.
                # Better to not use any smarts from Playwright and just wait an arbitrary number of seconds
                # This seemed to solve nearly all 'TimeoutErrors'
                response = self.page.goto(url, wait_until='commit')
            except playwright._impl._api_types.Error as e:
                # Retry once - https://github.com/browserless/chrome/issues/2485
                # Sometimes errors related to invalid cert's and other can be random
                print ("Content Fetcher > retrying request got error - ", str(e))
                time.sleep(1)
                response = self.page.goto(url, wait_until='commit')
            except Exception as e:
                print ("Content Fetcher > Other exception when page.goto", str(e))
                context.close()
                browser.close()
                raise PageUnloadable(url=url, status_code=None, message=str(e))
            # Execute any browser steps
            try:
                extra_wait = int(os.getenv("WEBDRIVER_DELAY_BEFORE_CONTENT_READY", 5)) + self.render_extract_delay
                self.page.wait_for_timeout(extra_wait * 1000)
@@ -324,17 +339,15 @@ class base_html_playwright(Fetcher):
                # This can be ok, we will try to grab what we could retrieve
                pass
            except Exception as e:
-                print ("other exception when page.goto")
+                print ("Content Fetcher > Other exception when executing custom JS code", str(e))
                print (str(e))
                context.close()
                browser.close()
-                raise PageUnloadable(url=url, status_code=None)
+                raise PageUnloadable(url=url, status_code=None, message=str(e))
            if response is None:
                context.close()
                browser.close()
-                print ("response object was none")
+                print ("Content Fetcher > Response object was none")
                raise EmptyReply(url=url, status_code=None)
            # Bug 2(?) Set the viewport size AFTER loading the page
@@ -353,7 +366,7 @@ class base_html_playwright(Fetcher):
            if len(self.page.content().strip()) == 0:
                context.close()
                browser.close()
-                print ("Content was empty")
+                print ("Content Fetcher > Content was empty")
                raise EmptyReply(url=url, status_code=None)
            # Bug 2(?) Set the viewport size AFTER loading the page
@@ -498,7 +511,7 @@ class base_html_webdriver(Fetcher):
            try:
                self.driver.quit()
            except Exception as e:
-                print("Exception in chrome shutdown/quit" + str(e))
+                print("Content Fetcher > Exception in chrome shutdown/quit" + str(e))
 # "html_requests" is listed as the default fetcher in store.py!
--- a/changedetectionio/fetch_site_status.py
+++ b/changedetectionio/fetch_site_status.py
@@ -1,11 +1,13 @@
 import hashlib
 import json
 import logging
 import os
 import re
 import time
 import urllib3
 from changedetectionio import content_fetcher, html_tools
 from changedetectionio.blueprint.price_data_follower import PRICE_DATA_TRACK_ACCEPT, PRICE_DATA_TRACK_REJECT
 from copy import deepcopy
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
@@ -38,8 +40,7 @@ class perform_site_check():
        return regex
-    def run(self, uuid):
+    def run(self, uuid, skip_when_checksum_same=True):
        from copy import deepcopy
        changed_detected = False
        screenshot = False  # as bytes
        stripped_text_from_html = ""
@@ -122,6 +123,14 @@ class perform_site_check():
        self.screenshot = fetcher.screenshot
        self.xpath_data = fetcher.xpath_data
        # Watches added automatically in the queue manager will skip if its the same checksum as the previous run
        # Saves a lot of CPU
        update_obj['previous_md5_before_filters'] = hashlib.md5(fetcher.content.encode('utf-8')).hexdigest()
        if skip_when_checksum_same:
            if update_obj['previous_md5_before_filters'] == watch.get('previous_md5_before_filters'):
                raise content_fetcher.checksumFromPreviousCheckWasTheSame()
        # Fetching complete, now filters
        # @todo move to class / maybe inside of fetcher abstract base?
@@ -140,7 +149,7 @@ class perform_site_check():
            is_html = False
            is_json = False
-        include_filters_rule = watch.get('include_filters', [])
+        include_filters_rule = deepcopy(watch.get('include_filters', []))
        # include_filters_rule = watch['include_filters']
        subtractive_selectors = watch.get(
            "subtractive_selectors", []
@@ -148,6 +157,10 @@ class perform_site_check():
            "global_subtractive_selectors", []
        )
        # Inject a virtual LD+JSON price tracker rule
        if watch.get('track_ldjson_price_data', '') == PRICE_DATA_TRACK_ACCEPT:
            include_filters_rule.append(html_tools.LD_JSON_PRODUCT_OFFER_SELECTOR)
        has_filter_rule = include_filters_rule and len("".join(include_filters_rule).strip())
        has_subtractive_selectors = subtractive_selectors and len(subtractive_selectors[0].strip())
@@ -155,6 +168,14 @@ class perform_site_check():
            include_filters_rule.append("json:$")
            has_filter_rule = True
        if is_json:
            # Sort the JSON so we dont get false alerts when the content is just re-ordered
            try:
                fetcher.content = json.dumps(json.loads(fetcher.content), sort_keys=True)
            except Exception as e:
                # Might have just been a snippet, or otherwise bad JSON, continue
                pass
        if has_filter_rule:
            json_filter_prefixes = ['json:', 'jq:']
            for filter in include_filters_rule:
@@ -162,6 +183,8 @@ class perform_site_check():
                    stripped_text_from_html += html_tools.extract_json_as_string(content=fetcher.content, json_filter=filter)
                    is_html = False
        if is_html or is_source:
            # CSS Filter, extract the HTML that matches and feed that into the existing inscriptis::get_text
@@ -173,9 +196,13 @@ class perform_site_check():
                # Don't run get_text or xpath/css filters on plaintext
                stripped_text_from_html = html_content
            else:
                # Does it have some ld+json price data? used for easier monitoring
                update_obj['has_ldjson_price_data'] = html_tools.has_ldjson_product_info(fetcher.content)
                # Then we assume HTML
                if has_filter_rule:
                    html_content = ""
                    for filter_rule in include_filters_rule:
                        # For HTML/XML we offer xpath as an option, just start a regular xPath "/.."
                        if filter_rule[0] == '/' or filter_rule.startswith('xpath:'):
--- a/changedetectionio/forms.py
+++ b/changedetectionio/forms.py
@@ -193,7 +193,7 @@ class ValidateAppRiseServers(object):
                message = field.gettext('\'%s\' is not a valid AppRise URL.' % (server_url))
                raise ValidationError(message)
-class ValidateTokensList(object):
+class ValidateJinja2Template(object):
    """
    Validates that a {token} is from a valid set
    """
@@ -202,14 +202,27 @@ class ValidateTokensList(object):
    def __call__(self, form, field):
        from changedetectionio import notification
-        regex = re.compile('{.*?}')
+
-        for p in re.findall(regex, field.data):
+        from jinja2 import Environment, BaseLoader, TemplateSyntaxError
-            if not p.strip('{}') in notification.valid_tokens:
+        from jinja2.meta import find_undeclared_variables
-                message = field.gettext('Token \'%s\' is not a valid token.')
+
-                raise ValidationError(message % (p))
+
-            
+        try:
            jinja2_env = Environment(loader=BaseLoader)
            jinja2_env.globals.update(notification.valid_tokens)
            rendered = jinja2_env.from_string(field.data).render()
        except TemplateSyntaxError as e:
            raise ValidationError(f"This is not a valid Jinja2 template: {e}") from e
        ast = jinja2_env.parse(field.data)
        undefined = ", ".join(find_undeclared_variables(ast))
        if undefined:
            raise ValidationError(
                f"The following tokens used in the notification are not valid: {undefined}"
            )
 class validateURL(object):
-    
+
    """
       Flask wtform validators wont work with basic auth
    """
@@ -225,6 +238,7 @@ class validateURL(object):
            message = field.gettext('\'%s\' is not a valid URL.' % (field.data.strip()))
            raise ValidationError(message)
 class ValidateListRegex(object):
    """
    Validates that anything that looks like a regex passes as a regex
@@ -333,11 +347,11 @@ class quickWatchForm(Form):
 # Common to a single watch and the global settings
 class commonSettingsForm(Form):
-    notification_urls = StringListField('Notification URL list', validators=[validators.Optional(), ValidateAppRiseServers()])
+    notification_urls = StringListField('Notification URL List', validators=[validators.Optional(), ValidateAppRiseServers()])
-    notification_title = StringField('Notification title', validators=[validators.Optional(), ValidateTokensList()])
+    notification_title = StringField('Notification Title', default='ChangeDetection.io Notification - {{ watch_url }}', validators=[validators.Optional(), ValidateJinja2Template()])
-    notification_body = TextAreaField('Notification body', validators=[validators.Optional(), ValidateTokensList()])
+    notification_body = TextAreaField('Notification Body', default='{{ watch_url }} had a change.', validators=[validators.Optional(), ValidateJinja2Template()])
    notification_format = SelectField('Notification format', choices=valid_notification_formats.keys())
-    fetch_backend = RadioField(u'Fetch method', choices=content_fetcher.available_fetchers(), validators=[ValidateContentFetcherIsReady()])
+    fetch_backend = RadioField(u'Fetch Method', choices=content_fetcher.available_fetchers(), validators=[ValidateContentFetcherIsReady()])
    extract_title_as_title = BooleanField('Extract <title> from document and use as watch title', default=False)
    webdriver_delay = IntegerField('Wait seconds before extracting text', validators=[validators.Optional(), validators.NumberRange(min=1,
                                                                                                                                    message="Should contain one or more seconds")])
@@ -448,3 +462,8 @@ class globalSettingsForm(Form):
    requests = FormField(globalSettingsRequestForm)
    application = FormField(globalSettingsApplicationForm)
    save_button = SubmitField('Save', render_kw={"class": "pure-button pure-button-primary"})
 class extractDataForm(Form):
    extract_regex = StringField('RegEx to extract', validators=[validators.Length(min=1, message="Needs a RegEx")])
    extract_submit_button = SubmitField('Extract as CSV', render_kw={"class": "pure-button pure-button-primary"})
--- a/changedetectionio/html_tools.py
+++ b/changedetectionio/html_tools.py
@@ -10,6 +10,10 @@ import re
 # HTML added to be sure each result matching a filter (.example) gets converted to a new line by Inscriptis
 TEXT_FILTER_LIST_LINE_SUFFIX = "<br/>"
 # 'price' , 'lowPrice', 'highPrice' are usually under here
 # all of those may or may not appear on different websites
 LD_JSON_PRODUCT_OFFER_SELECTOR = "json:$..offers"
 class JSONNotFound(ValueError):
    def __init__(self, msg):
        ValueError.__init__(self, msg)
@@ -127,8 +131,10 @@ def _get_stripped_text_from_json_match(match):
    return stripped_text_from_html
-def extract_json_as_string(content, json_filter):
+# content - json
-
+# json_filter - ie json:$..price
 # ensure_is_ldjson_info_type - str "product", optional, "@type == product" (I dont know how to do that as a json selector)
 def extract_json_as_string(content, json_filter, ensure_is_ldjson_info_type=None):
    stripped_text_from_html = False
    # Try to parse/filter out the JSON, if we get some parser error, then maybe it's embedded <script type=ldjson>
@@ -139,7 +145,12 @@ def extract_json_as_string(content, json_filter):
        # Foreach <script json></script> blob.. just return the first that matches json_filter
        s = []
        soup = BeautifulSoup(content, 'html.parser')
-        bs_result = soup.findAll('script')
+
        if ensure_is_ldjson_info_type:
            bs_result = soup.findAll('script', {"type": "application/ld+json"})
        else:
            bs_result = soup.findAll('script')
        if not bs_result:
            raise JSONNotFound("No parsable JSON found in this document")
@@ -156,7 +167,14 @@ def extract_json_as_string(content, json_filter):
                continue
            else:
                stripped_text_from_html = _parse_json(json_data, json_filter)
-                if stripped_text_from_html:
+                if ensure_is_ldjson_info_type:
                    # Could sometimes be list, string or something else random
                    if isinstance(json_data, dict):
                        # If it has LD JSON 'key' @type, and @type is 'product', and something was found for the search
                        # (Some sites have multiple of the same ld+json @type='product', but some have the review part, some have the 'price' part)
                        if json_data.get('@type', False) and json_data.get('@type','').lower() == ensure_is_ldjson_info_type.lower() and stripped_text_from_html:
                            break
                elif stripped_text_from_html:
                    break
    if not stripped_text_from_html:
@@ -243,6 +261,18 @@ def html_to_text(html_content: str, render_anchor_tag_content=False) -> str:
    return text_content
 # Does LD+JSON exist with a @type=='product' and a .price set anywhere?
 def has_ldjson_product_info(content):
    try:
        pricing_data = extract_json_as_string(content=content, json_filter=LD_JSON_PRODUCT_OFFER_SELECTOR, ensure_is_ldjson_info_type="product")
    except JSONNotFound as e:
        # Totally fine
        return False
    x=bool(pricing_data)
    return x
 def workarounds_for_obfuscations(content):
    """
    Some sites are using sneaky tactics to make prices and other information un-renderable by Inscriptis
--- a/changedetectionio/model/App.py
+++ b/changedetectionio/model/App.py
@@ -27,6 +27,7 @@ class model(dict):
                    'base_url' : None,
                    'extract_title_as_title': False,
                    'empty_pages_are_a_change': False,
                    'css_dark_mode': False,
                    'fetch_backend': getenv("DEFAULT_FETCH_BACKEND", "html_requests"),
                    'filter_failure_notification_threshold_attempts': _FILTER_FAILURE_THRESHOLD_ATTEMPTS_DEFAULT,
                    'global_ignore_text': [], # List of text to ignore when calculating the comparison checksum
--- a/changedetectionio/model/Watch.py
+++ b/changedetectionio/model/Watch.py
@@ -14,49 +14,52 @@ from changedetectionio.notification import (
 class model(dict):
    __newest_history_key = None
-    __history_n=0
+    __history_n = 0
    __base_config = {
-            #'history': {},  # Dict of timestamp and output stripped filename (removed)
+        # 'history': {},  # Dict of timestamp and output stripped filename (removed)
-            #'newest_history_key': 0, (removed, taken from history.txt index)
+        # 'newest_history_key': 0, (removed, taken from history.txt index)
-            'body': None,
+        'body': None,
-            'check_unique_lines': False, # On change-detected, compare against all history if its something new
+        'check_unique_lines': False,  # On change-detected, compare against all history if its something new
-            'check_count': 0,
+        'check_count': 0,
-            'consecutive_filter_failures': 0, # Every time the CSS/xPath filter cannot be located, reset when all is fine.
+        'consecutive_filter_failures': 0,  # Every time the CSS/xPath filter cannot be located, reset when all is fine.
-            'extract_text': [],  # Extract text by regex after filters
+        'extract_text': [],  # Extract text by regex after filters
-            'extract_title_as_title': False,
+        'extract_title_as_title': False,
-            'fetch_backend': None,
+        'fetch_backend': None,
-            'filter_failure_notification_send': strtobool(os.getenv('FILTER_FAILURE_NOTIFICATION_SEND_DEFAULT', 'True')),
+        'filter_failure_notification_send': strtobool(os.getenv('FILTER_FAILURE_NOTIFICATION_SEND_DEFAULT', 'True')),
-            'headers': {},  # Extra headers to send
+        'has_ldjson_price_data': None,
-            'ignore_text': [],  # List of text to ignore when calculating the comparison checksum
+        'track_ldjson_price_data': None,
-            'include_filters': [],
+        'headers': {},  # Extra headers to send
-            'last_checked': 0,
+        'ignore_text': [],  # List of text to ignore when calculating the comparison checksum
-            'last_error': False,
+        'include_filters': [],
-            'last_viewed': 0,  # history key value of the last viewed via the [diff] link
+        'last_checked': 0,
-            'method': 'GET',
+        'last_error': False,
-             # Custom notification content
+        'last_viewed': 0,  # history key value of the last viewed via the [diff] link
-            'notification_body': None,
+        'method': 'GET',
-            'notification_format': default_notification_format_for_watch,
+        # Custom notification content
-            'notification_muted': False,
+        'notification_body': None,
-            'notification_title': None,
+        'notification_format': default_notification_format_for_watch,
-            'notification_screenshot': False, # Include the latest screenshot if available and supported by the apprise URL
+        'notification_muted': False,
-            'notification_urls': [],  # List of URLs to add to the notification Queue (Usually AppRise)
+        'notification_title': None,
-            'paused': False,
+        'notification_screenshot': False,  # Include the latest screenshot if available and supported by the apprise URL
-            'previous_md5': False,
+        'notification_urls': [],  # List of URLs to add to the notification Queue (Usually AppRise)
-            'proxy': None, # Preferred proxy connection
+        'paused': False,
-            'subtractive_selectors': [],
+        'previous_md5': False,
-            'tag': None,
+        'previous_md5_before_filters': False,  # Used for skipping changedetection entirely
-            'text_should_not_be_present': [], # Text that should not present
+        'proxy': None,  # Preferred proxy connection
-            # Re #110, so then if this is set to None, we know to use the default value instead
+        'subtractive_selectors': [],
-            # Requires setting to None on submit if it's the same as the default
+        'tag': None,
-            # Should be all None by default, so we use the system default in this case.
+        'text_should_not_be_present': [],  # Text that should not present
-            'time_between_check': {'weeks': None, 'days': None, 'hours': None, 'minutes': None, 'seconds': None},
+        # Re #110, so then if this is set to None, we know to use the default value instead
-            'title': None,
+        # Requires setting to None on submit if it's the same as the default
-            'trigger_text': [],  # List of text or regex to wait for until a change is detected
+        # Should be all None by default, so we use the system default in this case.
-            'url': None,
+        'time_between_check': {'weeks': None, 'days': None, 'hours': None, 'minutes': None, 'seconds': None},
-            'uuid': str(uuid.uuid4()),
+        'title': None,
-            'webdriver_delay': None,
+        'trigger_text': [],  # List of text or regex to wait for until a change is detected
-            'webdriver_js_execute_code': None, # Run before change-detection
+        'url': None,
-        }
+        'uuid': str(uuid.uuid4()),
        'webdriver_delay': None,
        'webdriver_js_execute_code': None,  # Run before change-detection
    }
    jitter_seconds = 0
    def __init__(self, *arg, **kw):
@@ -318,3 +321,47 @@ class model(dict):
        if os.path.isfile(fname):
            return fname
        return False
    def extract_regex_from_all_history(self, regex):
        import csv
        import re
        import datetime
        csv_output_filename = False
        csv_writer = False
        f = None
        # self.history will be keyed with the full path
        for k, fname in self.history.items():
            if os.path.isfile(fname):
                with open(fname, "r") as f:
                    contents = f.read()
                    res = re.findall(regex, contents, re.MULTILINE)
                    if res:
                        if not csv_writer:
                            # A file on the disk can be transferred much faster via flask than a string reply
                            csv_output_filename = 'report.csv'
                            f = open(os.path.join(self.watch_data_dir, csv_output_filename), 'w')
                            # @todo some headers in the future
                            #fieldnames = ['Epoch seconds', 'Date']
                            csv_writer = csv.writer(f,
                                                    delimiter=',',
                                                    quotechar='"',
                                                    quoting=csv.QUOTE_MINIMAL,
                                                    #fieldnames=fieldnames
                                                    )
                            csv_writer.writerow(['Epoch seconds', 'Date'])
                            # csv_writer.writeheader()
                        date_str = datetime.datetime.fromtimestamp(int(k)).strftime('%Y-%m-%d %H:%M:%S')
                        for r in res:
                            row = [k, date_str]
                            if isinstance(r, str):
                                row.append(r)
                            else:
                                row+=r
                            csv_writer.writerow(row)
        if f:
            f.close()
        return csv_output_filename
--- a/changedetectionio/notification.py
+++ b/changedetectionio/notification.py
@@ -1,5 +1,7 @@
 import apprise
 from jinja2 import Environment, BaseLoader
 from apprise import NotifyFormat
 import json
 valid_tokens = {
    'base_url': '',
@@ -16,8 +18,8 @@ valid_tokens = {
 default_notification_format_for_watch = 'System default'
 default_notification_format = 'Text'
-default_notification_body = '{watch_url} had a change.\n---\n{diff}\n---\n'
+default_notification_body = '{{watch_url}} had a change.\n---\n{{diff}}\n---\n'
-default_notification_title = 'ChangeDetection.io Notification - {watch_url}'
+default_notification_title = 'ChangeDetection.io Notification - {{watch_url}}'
 valid_notification_formats = {
    'Text': NotifyFormat.TEXT,
@@ -27,25 +29,67 @@ valid_notification_formats = {
    default_notification_format_for_watch: default_notification_format_for_watch
 }
-def process_notification(n_object, datastore):
+# include the decorator
 from apprise.decorators import notify
-    # Get the notification body from datastore
+@notify(on="delete")
-    n_body = n_object.get('notification_body', default_notification_body)
+@notify(on="deletes")
-    n_title = n_object.get('notification_title', default_notification_title)
+@notify(on="get")
-    n_format = valid_notification_formats.get(
+@notify(on="gets")
-        n_object['notification_format'],
+@notify(on="post")
-        valid_notification_formats[default_notification_format],
+@notify(on="posts")
-    )
+@notify(on="put")
@notify(on="puts")
 def apprise_custom_api_call_wrapper(body, title, notify_type, *args, **kwargs):
    import requests
    url = kwargs['meta'].get('url')
    if url.startswith('post'):
        r = requests.post
    elif url.startswith('get'):
        r = requests.get
    elif url.startswith('put'):
        r = requests.put
    elif url.startswith('delete'):
        r = requests.delete
    url = url.replace('post://', 'http://')
    url = url.replace('posts://', 'https://')
    url = url.replace('put://', 'http://')
    url = url.replace('puts://', 'https://')
    url = url.replace('get://', 'http://')
    url = url.replace('gets://', 'https://')
    url = url.replace('put://', 'http://')
    url = url.replace('puts://', 'https://')
    url = url.replace('delete://', 'http://')
    url = url.replace('deletes://', 'https://')
    # Try to auto-guess if it's JSON
    headers = {}
    try:
        json.loads(body)
        headers = {'Content-Type': 'application/json; charset=utf-8'}
    except ValueError as e:
        pass
    r(url, headers=headers, data=body)
 def process_notification(n_object, datastore):
    # Insert variables into the notification content
    notification_parameters = create_notification_parameters(n_object, datastore)
-    for n_k in notification_parameters:
+    # Get the notification body from datastore
-        token = '{' + n_k + '}'
+    jinja2_env = Environment(loader=BaseLoader)
-        val = notification_parameters[n_k]
+    n_body = jinja2_env.from_string(n_object.get('notification_body', default_notification_body)).render(**notification_parameters)
-        n_title = n_title.replace(token, val)
+    n_title = jinja2_env.from_string(n_object.get('notification_title', default_notification_title)).render(**notification_parameters)
-        n_body = n_body.replace(token, val)
+    n_format = valid_notification_formats.get(
-
+        n_object['notification_format'],
        valid_notification_formats[default_notification_format],
    )
    # https://github.com/caronc/apprise/wiki/Development_LogCapture
    # Anything higher than or equal to WARNING (which covers things like Connection errors)
    # raise it as an exception
@@ -53,6 +97,7 @@ def process_notification(n_object, datastore):
    sent_objs=[]
    from .apprise_asset import asset
    for url in n_object['notification_urls']:
        url = jinja2_env.from_string(url).render(**notification_parameters)
        apobj = apprise.Apprise(debug=True, asset=asset)
        url = url.strip()
        if len(url):
@@ -66,7 +111,12 @@ def process_notification(n_object, datastore):
                # So if no avatar_url is specified, add one so it can be correctly calculated into the total payload
                k = '?' if not '?' in url else '&'
-                if not 'avatar_url' in url and not url.startswith('mail'):
+                if not 'avatar_url' in url \
                        and not url.startswith('mail') \
                        and not url.startswith('post') \
                        and not url.startswith('get') \
                        and not url.startswith('delete') \
                        and not url.startswith('put'):
                    url += k + 'avatar_url=https://raw.githubusercontent.com/dgtlmoon/changedetection.io/master/changedetectionio/static/images/avatar-256x256.png'
                if url.startswith('tgram://'):
@@ -144,7 +194,7 @@ def create_notification_parameters(n_object, datastore):
    watch_url = n_object['watch_url']
-    # Re #148 - Some people have just {base_url} in the body or title, but this may break some notification services
+    # Re #148 - Some people have just {{ base_url }} in the body or title, but this may break some notification services
    #           like 'Join', so it's always best to atleast set something obvious so that they are not broken.
    if base_url == '':
        base_url = "<base-url-env-var-not-set>"
--- a/changedetectionio/queuedWatchMetaData.py
+++ b/changedetectionio/queuedWatchMetaData.py
@@ -0,0 +1,10 @@
 from dataclasses import dataclass, field
 from typing import Any
 # So that we can queue some metadata in `item`
 # https://docs.python.org/3/library/queue.html#queue.PriorityQueue
 #
@dataclass(order=True)
 class PrioritizedItem:
    priority: int
    item: Any=field(compare=False)
--- a/changedetectionio/res/xpath_element_scraper.js
+++ b/changedetectionio/res/xpath_element_scraper.js
@@ -81,6 +81,14 @@ var bbox;
 for (var i = 0; i < elements.length; i++) {
    bbox = elements[i].getBoundingClientRect();
    // Exclude items that are not interactable or visible
    if(elements[i].style.opacity === "0") {
        continue
    }
    if(elements[i].style.display === "none" || elements[i].style.pointerEvents === "none" ) {
        continue
    }
    // Forget really small ones
    if (bbox['width'] < 10 && bbox['height'] < 10) {
        continue;
@@ -166,10 +174,23 @@ if (include_filters.length) {
        }
        if (q) {
-            bbox = q.getBoundingClientRect();
+            // #1231 - IN the case XPath attribute filter is applied, we will have to traverse up and find the element.
-            console.log("xpath_element_scraper: Got filter element, scroll from top was "+scroll_y)
+            if (q.hasOwnProperty('getBoundingClientRect')) {
-        } else {
+                bbox = q.getBoundingClientRect();
-            console.log("xpath_element_scraper: filter element "+f+" was not found");
+                console.log("xpath_element_scraper: Got filter element, scroll from top was " + scroll_y)
            } else {
                try {
                    // Try and see we can find its ownerElement
                    bbox = q.ownerElement.getBoundingClientRect();
                    console.log("xpath_element_scraper: Got filter by ownerElement element, scroll from top was " + scroll_y)
                } catch (e) {
                    console.log("xpath_element_scraper: error looking up ownerElement")
                }
            }
        }
        if(!q) {
            console.log("xpath_element_scraper: filter element " + f + " was not found");
        }
        if (bbox && bbox['width'] > 0 && bbox['height'] > 0) {
--- a/changedetectionio/static/images/bell-off.svg
+++ b/changedetectionio/static/images/bell-off.svg
@@ -1,42 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
+<svg width="15" height="16.363636" viewBox="0 0 15 16.363636" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
-   width="15"
+  <path d="m 14.318182,11.762045 v 1.1925 H 5.4102273 L 11.849318,7.1140909 C 12.234545,9.1561364 12.54,11.181818 14.318182,11.762045 Z m -6.7984093,4.601591 c 1.0759091,0 2.0256823,-0.955909 2.0256823,-2.045454 H 5.4545455 c 0,1.089545 0.9879545,2.045454 2.0652272,2.045454 z M 15,2.8622727 0.9177273,15.636136 0,14.627045 l 1.8443182,-1.6725 h -1.1625 v -1.1925 C 4.0070455,10.677273 2.1784091,4.5388636 5.3611364,2.6897727 5.8009091,2.4347727 6.0709091,1.9609091 6.0702273,1.4488636 v -0.00205 C 6.0702273,0.64772727 6.7104545,0 7.5,0 8.2895455,0 8.9297727,0.64772727 8.9297727,1.4468182 v 0.00205 C 8.9290909,1.9602319 9.199773,2.4354591 9.638864,2.6897773 10.364318,3.111141 10.827273,3.7568228 11.1525,4.5129591 L 14.085682,1.8531818 Z M 6.8181818,1.3636364 C 6.8181818,1.74 7.1236364,2.0454545 7.5,2.0454545 7.8763636,2.0454545 8.1818182,1.74 8.1818182,1.3636364 8.1818182,0.98795455 7.8763636,0.68181818 7.5,0.68181818 c -0.3763636,0 -0.6818182,0.30613637 -0.6818182,0.68181822 z" id="path2" style="fill:#f8321b;stroke-width:0.681818;fill-opacity:1"/>
   height="16.363636"
   viewBox="0 0 15 16.363636"
   version="1.1"
   id="svg4"
   sodipodi:docname="bell-off.svg"
   inkscape:version="1.1.1 (1:1.1+202109281949+c3084ef5ed)"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:svg="http://www.w3.org/2000/svg">
  <sodipodi:namedview
     id="namedview5"
     pagecolor="#ffffff"
     bordercolor="#666666"
     borderopacity="1.0"
     inkscape:pageshadow="2"
     inkscape:pageopacity="0.0"
     inkscape:pagecheckerboard="0"
     showgrid="false"
     fit-margin-top="0"
     fit-margin-left="0"
     fit-margin-right="0"
     fit-margin-bottom="0"
     inkscape:zoom="28.416667"
     inkscape:cx="-0.59824046"
     inkscape:cy="12"
     inkscape:window-width="1554"
     inkscape:window-height="896"
     inkscape:window-x="2095"
     inkscape:window-y="107"
     inkscape:window-maximized="0"
     inkscape:current-layer="svg4" />
  <defs
     id="defs8" />
  <path
     d="m 14.318182,11.762045 v 1.1925 H 5.4102273 L 11.849318,7.1140909 C 12.234545,9.1561364 12.54,11.181818 14.318182,11.762045 Z m -6.7984093,4.601591 c 1.0759091,0 2.0256823,-0.955909 2.0256823,-2.045454 H 5.4545455 c 0,1.089545 0.9879545,2.045454 2.0652272,2.045454 z M 15,2.8622727 0.9177273,15.636136 0,14.627045 l 1.8443182,-1.6725 h -1.1625 v -1.1925 C 4.0070455,10.677273 2.1784091,4.5388636 5.3611364,2.6897727 5.8009091,2.4347727 6.0709091,1.9609091 6.0702273,1.4488636 v -0.00205 C 6.0702273,0.64772727 6.7104545,0 7.5,0 8.2895455,0 8.9297727,0.64772727 8.9297727,1.4468182 v 0.00205 C 8.9290909,1.9602319 9.199773,2.4354591 9.638864,2.6897773 10.364318,3.111141 10.827273,3.7568228 11.1525,4.5129591 L 14.085682,1.8531818 Z M 6.8181818,1.3636364 C 6.8181818,1.74 7.1236364,2.0454545 7.5,2.0454545 7.8763636,2.0454545 8.1818182,1.74 8.1818182,1.3636364 8.1818182,0.98795455 7.8763636,0.68181818 7.5,0.68181818 c -0.3763636,0 -0.6818182,0.30613637 -0.6818182,0.68181822 z"
     id="path2"
     style="fill:#f8321b;stroke-width:0.681818;fill-opacity:1" />
 </svg>
--- a/changedetectionio/static/images/price-tag-icon.svg
+++ b/changedetectionio/static/images/price-tag-icon.svg
@@ -0,0 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="83.39" height="89.648" enable-background="new 0 0 122.406 122.881" version="1.1" viewBox="0 0 83.39 89.648" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><g transform="translate(5e-4 -33.234)"><path d="m44.239 42.946-39.111 39.896 34.908 34.91 39.09-39.876-1.149-34.931zm-0.91791 42.273c0.979-0.979 1.507-1.99 1.577-3.027 0.077-1.043-0.248-2.424-0.967-4.135-0.725-1.717-1.348-3.346-1.87-4.885s-0.814-3.014-0.897-4.432c-0.07-1.42 0.134-2.768 0.624-4.045 0.477-1.279 1.348-2.545 2.607-3.804 2.099-2.099 4.535-3.123 7.314-3.065 2.773 0.063 5.457 1.158 8.04 3.294l2.881 3.034c1.946 2.607 2.799 5.33 2.557 8.166-0.235 2.83-1.532 5.426-3.893 7.785l-6.296-6.297c1.291-1.291 2.035-2.531 2.238-3.727 0.191-1.197-0.165-2.252-1.081-3.168-0.821-0.82-1.717-1.195-2.69-1.139-0.967 0.064-1.908 0.547-2.817 1.457-0.922 0.922-1.393 1.914-1.412 2.977s0.306 2.416 0.973 4.064c0.661 1.652 1.24 3.25 1.736 4.801 0.496 1.553 0.782 3.035 0.858 4.445 0.076 1.426-0.127 2.787-0.591 4.104-0.477 1.316-1.336 2.596-2.588 3.848-2.125 2.125-4.522 3.186-7.212 3.18s-5.311-1.063-7.855-3.16l-3.747 3.746-2.964-2.965 3.766-3.764c-2.423-2.996-3.568-5.998-3.447-9.02 0.127-3.014 1.476-5.813 4.045-8.383l6.278 6.277c-1.412 1.412-2.175 2.799-2.277 4.16-0.108 1.367 0.414 2.627 1.571 3.783 0.839 0.84 1.755 1.26 2.741 1.242 0.985-0.017 1.92-0.47 2.798-1.347zm21.127-46.435h17.457c-0.0269 2.2368 0.69936 16.025 0.69936 16.025l0.785 23.858c0.019 0.609-0.221 1.164-0.619 1.564l5e-3 4e-3 -41.236 42.022c-0.82213 0.8378-2.175 0.83-3.004 0l-37.913-37.91c-0.83-0.83-0.83-2.176 0-3.006l41.236-42.021c0.39287-0.42671 1.502-0.53568 1.502-0.53568zm18.011 11.59c-59.392-29.687-29.696-14.843 0 0z"/></g></svg>
--- a/changedetectionio/static/images/spread.svg
+++ b/changedetectionio/static/images/spread.svg
@@ -1,46 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
+<svg width="18" height="19.92" viewBox="0 0 18 19.92" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
-   width="18"
+  <path d="M -3,-2 H 21 V 22 H -3 Z" fill="none" id="path2"/>
-   height="19.92"
+  <path d="m 15,14.08 c -0.76,0 -1.44,0.3 -1.96,0.77 L 5.91,10.7 C 5.96,10.47 6,10.24 6,10 6,9.76 5.96,9.53 5.91,9.3 L 12.96,5.19 C 13.5,5.69 14.21,6 15,6 16.66,6 18,4.66 18,3 18,1.34 16.66,0 15,0 c -1.66,0 -3,1.34 -3,3 0,0.24 0.04,0.47 0.09,0.7 L 5.04,7.81 C 4.5,7.31 3.79,7 3,7 1.34,7 0,8.34 0,10 c 0,1.66 1.34,3 3,3 0.79,0 1.5,-0.31 2.04,-0.81 l 7.12,4.16 c -0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92 0,-1.61 -1.31,-2.92 -2.92,-2.92 z" id="path4" style="fill:#0078e7;fill-opacity:1"/>
   viewBox="0 0 18 19.92"
   version="1.1"
   id="svg6"
   sodipodi:docname="spread.svg"
   inkscape:version="1.1.1 (1:1.1+202109281949+c3084ef5ed)"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:svg="http://www.w3.org/2000/svg">
  <defs
     id="defs10" />
  <sodipodi:namedview
     id="namedview8"
     pagecolor="#ffffff"
     bordercolor="#666666"
     borderopacity="1.0"
     inkscape:pageshadow="2"
     inkscape:pageopacity="0.0"
     inkscape:pagecheckerboard="0"
     showgrid="false"
     fit-margin-top="0"
     fit-margin-left="0"
     fit-margin-right="0"
     fit-margin-bottom="0"
     inkscape:zoom="28.416667"
     inkscape:cx="9.0087975"
     inkscape:cy="9.9941348"
     inkscape:window-width="1920"
     inkscape:window-height="1056"
     inkscape:window-x="1920"
     inkscape:window-y="0"
     inkscape:window-maximized="1"
     inkscape:current-layer="svg6" />
  <path
     d="M -3,-2 H 21 V 22 H -3 Z"
     fill="none"
     id="path2" />
  <path
     d="m 15,14.08 c -0.76,0 -1.44,0.3 -1.96,0.77 L 5.91,10.7 C 5.96,10.47 6,10.24 6,10 6,9.76 5.96,9.53 5.91,9.3 L 12.96,5.19 C 13.5,5.69 14.21,6 15,6 16.66,6 18,4.66 18,3 18,1.34 16.66,0 15,0 c -1.66,0 -3,1.34 -3,3 0,0.24 0.04,0.47 0.09,0.7 L 5.04,7.81 C 4.5,7.31 3.79,7 3,7 1.34,7 0,8.34 0,10 c 0,1.66 1.34,3 3,3 0.79,0 1.5,-0.31 2.04,-0.81 l 7.12,4.16 c -0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92 0,-1.61 -1.31,-2.92 -2.92,-2.92 z"
     id="path4"
     style="fill:#0078e7;fill-opacity:1" />
 </svg>
--- a/changedetectionio/static/js/diff-overview.js
+++ b/changedetectionio/static/js/diff-overview.js
@@ -13,6 +13,8 @@ $(document).ready(function () {
        } else if (hash_name === '#error-screenshot') {
            $("img#error-screenshot-img").attr('src', error_screenshot_url);
            $("#settings").hide();
        } else if (hash_name === '#extract') {
            $("#settings").hide();
        }
--- a/changedetectionio/static/js/diff-render.js
+++ b/changedetectionio/static/js/diff-render.js
@@ -1,112 +1,110 @@
-var a = document.getElementById('a');
+var a = document.getElementById("a");
-var b = document.getElementById('b');
+var b = document.getElementById("b");
-var result = document.getElementById('result');
+var result = document.getElementById("result");
 function changed() {
-    // https://github.com/kpdecker/jsdiff/issues/389
+  // https://github.com/kpdecker/jsdiff/issues/389
-    // I would love to use `{ignoreWhitespace: true}` here but it breaks the formatting
+  // I would love to use `{ignoreWhitespace: true}` here but it breaks the formatting
-    options = {ignoreWhitespace: document.getElementById('ignoreWhitespace').checked};
+  options = {
    ignoreWhitespace: document.getElementById("ignoreWhitespace").checked,
  };
-    var diff = Diff[window.diffType](a.textContent, b.textContent, options);
+  var diff = Diff[window.diffType](a.textContent, b.textContent, options);
-    var fragment = document.createDocumentFragment();
+  var fragment = document.createDocumentFragment();
-    for (var i = 0; i < diff.length; i++) {
+  for (var i = 0; i < diff.length; i++) {
-
+    if (diff[i].added && diff[i + 1] && diff[i + 1].removed) {
-        if (diff[i].added && diff[i + 1] && diff[i + 1].removed) {
+      var swap = diff[i];
-            var swap = diff[i];
+      diff[i] = diff[i + 1];
-            diff[i] = diff[i + 1];
+      diff[i + 1] = swap;
            diff[i + 1] = swap;
        }
        var node;
        if (diff[i].removed) {
            node = document.createElement('del');
            node.classList.add("change");
            node.appendChild(document.createTextNode(diff[i].value));
        } else if (diff[i].added) {
            node = document.createElement('ins');
            node.classList.add("change");
            node.appendChild(document.createTextNode(diff[i].value));
        } else {
            node = document.createTextNode(diff[i].value);
        }
        fragment.appendChild(node);
    }
-    result.textContent = '';
+    var node;
-    result.appendChild(fragment);
+    if (diff[i].removed) {
      node = document.createElement("del");
      node.classList.add("change");
      const wrapper = node.appendChild(document.createElement("span"));
      wrapper.appendChild(document.createTextNode(diff[i].value));
    } else if (diff[i].added) {
      node = document.createElement("ins");
      node.classList.add("change");
      const wrapper = node.appendChild(document.createElement("span"));
      wrapper.appendChild(document.createTextNode(diff[i].value));
    } else {
      node = document.createTextNode(diff[i].value);
    }
    fragment.appendChild(node);
  }
-    // Jump at start
+  result.textContent = "";
-    inputs.current = 0;
+  result.appendChild(fragment);
-    next_diff();
+
  // Jump at start
  inputs.current = 0;
  next_diff();
 }
 window.onload = function () {
-
+  /* Convert what is options from UTC time.time() to local browser time */
-
+  var diffList = document.getElementById("diff-version");
-    /* Convert what is options from UTC time.time() to local browser time */
+  if (typeof diffList != "undefined" && diffList != null) {
-    var diffList = document.getElementById("diff-version");
+    for (var option of diffList.options) {
-    if (typeof (diffList) != 'undefined' && diffList != null) {
+      var dateObject = new Date(option.value * 1000);
-        for (var option of diffList.options) {
+      option.label = dateObject.toLocaleString();
            var dateObject = new Date(option.value * 1000);
            option.label = dateObject.toLocaleString();
        }
    }
  }
-    /* Set current version date as local time in the browser also */
+  /* Set current version date as local time in the browser also */
-    var current_v = document.getElementById("current-v-date");
+  var current_v = document.getElementById("current-v-date");
-    var dateObject = new Date(newest_version_timestamp*1000);
+  var dateObject = new Date(newest_version_timestamp * 1000);
-    current_v.innerHTML = dateObject.toLocaleString();
+  current_v.innerHTML = dateObject.toLocaleString();
-    onDiffTypeChange(document.querySelector('#settings [name="diff_type"]:checked'));
+  onDiffTypeChange(
-    changed();
+    document.querySelector('#settings [name="diff_type"]:checked'),
  );
  changed();
 };
-a.onpaste = a.onchange =
+a.onpaste = a.onchange = b.onpaste = b.onchange = changed;
    b.onpaste = b.onchange = changed;
-if ('oninput' in a) {
+if ("oninput" in a) {
-    a.oninput = b.oninput = changed;
+  a.oninput = b.oninput = changed;
 } else {
-    a.onkeyup = b.onkeyup = changed;
+  a.onkeyup = b.onkeyup = changed;
 }
 function onDiffTypeChange(radio) {
-    window.diffType = radio.value;
+  window.diffType = radio.value;
-// Not necessary
+  // Not necessary
-//	document.title = "Diff " + radio.value.slice(4);
+  //	document.title = "Diff " + radio.value.slice(4);
 }
-var radio = document.getElementsByName('diff_type');
+var radio = document.getElementsByName("diff_type");
 for (var i = 0; i < radio.length; i++) {
-    radio[i].onchange = function (e) {
+  radio[i].onchange = function (e) {
-        onDiffTypeChange(e.target);
+    onDiffTypeChange(e.target);
        changed();
    }
 }
 document.getElementById('ignoreWhitespace').onchange = function (e) {
    changed();
  };
 }
 document.getElementById("ignoreWhitespace").onchange = function (e) {
  changed();
 };
-var inputs = document.getElementsByClassName('change');
+var inputs = document.getElementsByClassName("change");
 inputs.current = 0;
 function next_diff() {
  var element = inputs[inputs.current];
  var headerOffset = 80;
  var elementPosition = element.getBoundingClientRect().top;
  var offsetPosition = elementPosition - headerOffset + window.scrollY;
-    var element = inputs[inputs.current];
+  window.scrollTo({
-    var headerOffset = 80;
+    top: offsetPosition,
-    var elementPosition = element.getBoundingClientRect().top;
+    behavior: "smooth",
-    var offsetPosition = elementPosition - headerOffset + window.scrollY;
+  });
-    window.scrollTo({
+  inputs.current++;
-        top: offsetPosition,
+  if (inputs.current >= inputs.length) {
-        behavior: "smooth"
+    inputs.current = 0;
-    });
+  }
    inputs.current++;
    if (inputs.current >= inputs.length) {
        inputs.current = 0;
    }
 }
--- a/changedetectionio/static/js/toggle-theme.js
+++ b/changedetectionio/static/js/toggle-theme.js
@@ -0,0 +1,24 @@
 /**
 * @file
 * Toggles theme between light and dark mode.
 */
 $(document).ready(function () {
  const button = document.getElementsByClassName("toggle-theme")[0];
  button.onclick = () => {
    const htmlElement = document.getElementsByTagName("html");
    const isDarkMode = htmlElement[0].dataset.darkmode === "true";
    htmlElement[0].dataset.darkmode = !isDarkMode;
    if (isDarkMode) {
      button.classList.remove("dark");
      setCookieValue(false);
    } else {
      button.classList.add("dark");
      setCookieValue(true);
    }
  };
  const setCookieValue = (value) => {
    document.cookie = `css_dark_mode=${value};max-age=31536000;path=/`
  }
 });
--- a/changedetectionio/static/styles/diff.css
+++ b/changedetectionio/static/styles/diff.css
@@ -1,10 +1,148 @@
 /**
 * CSS custom properties (aka variables).
 */
 :root {
  --color-white: #fff;
  --color-grey-50: #111;
  --color-grey-100: #262626;
  --color-grey-200: #333;
  --color-grey-300: #444;
  --color-grey-325: #555;
  --color-grey-350: #565d64;
  --color-grey-400: #666;
  --color-grey-500: #777;
  --color-grey-600: #999;
  --color-grey-700: #cbcbcb;
  --color-grey-750: #ddd;
  --color-grey-800: #e0e0e0;
  --color-grey-850: #eee;
  --color-grey-900: #f2f2f2;
  --color-black: #000;
  --color-dark-red: #a00;
  --color-light-red: #dd0000;
  --color-background-page: var(--color-grey-100);
  --color-background-gradient-first: #5ad8f7;
  --color-background-gradient-second: #2f50af;
  --color-background-gradient-third: #9150bf;
  --color-background: var(--color-white);
  --color-text: var(--color-grey-200);
  --color-link: #1b98f8;
  --color-menu-accent: #ed5900;
  --color-background-code: var(--color-grey-850);
  --color-error: var(--color-dark-red);
  --color-error-input: #ffebeb;
  --color-error-list: var(--color-light-red);
  --color-table-background: var(--color-background);
  --color-table-stripe: var(--color-grey-900);
  --color-text-tab: var(--color-white);
  --color-background-tab: rgba(255, 255, 255, 0.2);
  --color-background-tab-hover: rgba(255, 255, 255, 0.5);
  --color-text-tab-active: #222;
  --color-api-key: #0078e7;
  --color-background-button-primary: #0078e7;
  --color-background-button-green: #42dd53;
  --color-background-button-red: #dd4242;
  --color-background-button-success: rgb(28, 184, 65);
  --color-background-button-error: rgb(202, 60, 60);
  --color-text-button-error: var(--color-white);
  --color-background-button-warning: rgb(202, 60, 60);
  --color-text-button-warning: var(--color-white);
  --color-background-button-secondary: rgb(66, 184, 221);
  --color-background-button-cancel: rgb(200, 200, 200);
  --color-text-button: var(--color-white);
  --color-background-button-tag: rgb(99, 99, 99);
  --color-background-snapshot-age: #dfdfdf;
  --color-error-text-snapshot-age: var(--color-white);
  --color-error-background-snapshot-age: #ff0000;
  --color-background-button-tag-active: #9c9c9c;
  --color-text-messages: var(--color-white);
  --color-background-messages-message: rgba(255, 255, 255, .2);
  --color-background-messages-error: rgba(255, 1, 1, .5);
  --color-background-messages-notice: rgba(255, 255, 255, .5);
  --color-border-notification: #ccc;
  --color-background-checkbox-operations: rgba(0, 0, 0, 0.05);
  --color-warning: #ff3300;
  --color-border-warning: var(--color-warning);
  --color-text-legend: var(--color-white);
  --color-link-new-version: #e07171;
  --color-last-checked: #bbb;
  --color-text-footer: #444;
  --color-border-watch-table-cell: #eee;
  --color-text-watch-tag-list: #e70069;
  --color-background-new-watch-form: rgba(0, 0, 0, 0.05);
  --color-background-new-watch-input: var(--color-white);
  --color-text-new-watch-input: var(--color-text);
  --color-border-input: var(--color-grey-500);
  --color-shadow-input: var(--color-grey-400);
  --color-background-input: var(--color-white);
  --color-text-input: var(--color-text);
  --color-text-input-description: var(--color-grey-500);
  --color-text-input-placeholder: var(--color-grey-600);
  --color-background-table-thead: var(--color-grey-800);
  --color-border-table-cell: var(--color-grey-700);
  --color-text-menu-heading: var(--color-grey-350);
  --color-text-menu-link: var(--color-grey-500);
  --color-background-menu-link-hover: var(--color-grey-850);
  --color-text-menu-link-hover: var(--color-grey-300);
  --color-shadow-jump: var(--color-grey-500);
  --color-icon-github: var(--color-black);
  --color-icon-github-hover: var(--color-grey-300);
  --color-watch-table-error: var(--color-dark-red);
  --color-watch-table-row-text: var(--color-grey-100); }
 html[data-darkmode="true"] {
  --color-link: #59bdfb;
  --color-text: var(--color-white);
  --color-background-gradient-first: #3f90a5;
  --color-background-gradient-second: #1e316c;
  --color-background-gradient-third: #4d2c64;
  --color-background-new-watch-input: var(--color-grey-100);
  --color-text-new-watch-input: var(--color-text);
  --color-background-table-thead: var(--color-grey-200);
  --color-table-background: var(--color-grey-300);
  --color-table-stripe: var(--color-grey-325);
  --color-background: var(--color-grey-300);
  --color-text-menu-heading: var(--color-grey-850);
  --color-text-menu-link: var(--color-grey-800);
  --color-border-table-cell: var(--color-grey-400);
  --color-text-tab-active: var(--color-text);
  --color-border-input: var(--color-grey-400);
  --color-shadow-input: var(--color-grey-50);
  --color-background-input: var(--color-grey-350);
  --color-text-input-description: var(--color-grey-600);
  --color-text-input-placeholder: var(--color-grey-600);
  --color-text-watch-tag-list: #fa3e92;
  --color-background-code: var(--color-grey-200);
  --color-background-tab: rgba(0, 0, 0, 0.2);
  --color-background-tab-hover: rgba(0, 0, 0, 0.5);
  --color-background-snapshot-age: var(--color-grey-200);
  --color-shadow-jump: var(--color-grey-200);
  --color-icon-github: var(--color-white);
  --color-icon-github-hover: var(--color-grey-700);
  --color-watch-table-error: var(--color-light-red);
  --color-watch-table-row-text: var(--color-grey-800); }
  html[data-darkmode="true"] .icon-spread {
    filter: hue-rotate(-10deg) brightness(1.5); }
  html[data-darkmode="true"] .watch-table .title-col a[target="_blank"]::after,
  html[data-darkmode="true"] .watch-table .current-diff-url::after {
    filter: invert(0.5) hue-rotate(10deg) brightness(2); }
  html[data-darkmode="true"] .watch-table .watch-controls .state-off img {
    opacity: 0.3; }
  html[data-darkmode="true"] .watch-table .watch-controls .state-on img {
    opacity: 1.0; }
  html[data-darkmode="true"] .watch-table .unviewed {
    color: #fff; }
    html[data-darkmode="true"] .watch-table .unviewed.error {
      color: var(--color-watch-table-error); }
 #diff-ui {
-  background: #fff;
+  background: var(--color-background);
  padding: 2em;
  margin-left: 1em;
  margin-right: 1em;
-  border-radius: 5px;
+  border-radius: 5px; }
-  font-size: 11px; }
+  #diff-ui #text {
    font-size: 11px; }
  #diff-ui table {
    table-layout: fixed;
    width: 100%; }
@@ -45,6 +183,10 @@ ins {
    margin-left: 1em;
    display: inline-block;
    font-weight: normal; }
  #settings del {
    padding: 0.5em; }
  #settings ins {
    padding: 0.5em; }
 .source {
  position: absolute;
--- a/changedetectionio/static/styles/diff.scss
+++ b/changedetectionio/static/styles/diff.scss
@@ -1,96 +0,0 @@
 #diff-ui {
    background: #fff;
    padding: 2em;
    margin-left: 1em;
    margin-right: 1em;
    border-radius: 5px;
    font-size: 11px;
    table {
        table-layout: fixed;
        width: 100%;
    }
    td {
        padding: 3px 4px;
        border: 1px solid transparent;
        vertical-align: top;
        font: 1em monospace;
        text-align: left;
    }
    pre {
            white-space: pre-wrap;
    }
 }
 h1 {
 	display: inline;
 	font-size: 100%;
 }
 del {
 	text-decoration: none;
 	color: #b30000;
 	background: #fadad7;
 }
 ins {
 	background: #eaf2c2;
 	color: #406619;
 	text-decoration: none;
 }
 #result {
 	white-space: pre-wrap;
 }
 #settings {
    background: rgba(0,0,0,.05);
    padding: 1em;
    border-radius: 10px;
    margin-bottom: 1em;
    color: #fff;
    font-size: 80%;
    label {
 	    margin-left: 1em;
 	    display: inline-block;
 	    font-weight: normal;
    }
 }
 .source {
 	position: absolute;
 	right: 1%;
 	top: .2em;
 }
@-moz-document url-prefix() {
 	body {
 		height: 99%; /* Hide scroll bar in Firefox */
 	}
 }
 td#diff-col div {
    text-align: justify;
    white-space: pre-wrap;
 }
 .ignored {
    background-color: #ccc;
   /*  border: #0d91fa 1px solid; */
    opacity: 0.7;
 }
 .triggered {
    background-color: #1b98f8;
 }
 /* ignored and triggered? make it obvious error */
 .ignored.triggered {
  background-color: #ff0000;
 }
 .tab-pane-inner#screenshot {
  text-align: center;
  img {
    max-width: 99%;
  }
 }
--- a/changedetectionio/static/styles/package.json
+++ b/changedetectionio/static/styles/package.json
@@ -4,7 +4,8 @@
  "description": "",
  "main": "index.js",
  "scripts": {
-    "build": "node-sass styles.scss -o .;node-sass diff.scss -o ."
+    "watch": "node-sass -w scss -o .",
    "build": "node-sass scss -o ."
  },
  "author": "",
  "license": "ISC",
--- a/changedetectionio/static/styles/scss/diff.scss
+++ b/changedetectionio/static/styles/scss/diff.scss
@@ -0,0 +1,121 @@
@import "parts/_variables.scss";
 #diff-ui {
  background: var(--color-background);
  padding: 2em;
  margin-left: 1em;
  margin-right: 1em;
  border-radius: 5px;
  // The first tab 'text' diff
  #text {
    font-size: 11px;
  }
  table {
    table-layout: fixed;
    width: 100%;
  }
  td {
    padding: 3px 4px;
    border: 1px solid transparent;
    vertical-align: top;
    font: 1em monospace;
    text-align: left;
  }
  pre {
    white-space: pre-wrap;
  }
 }
 h1 {
  display: inline;
  font-size: 100%;
 }
 del {
  text-decoration: none;
  color: #b30000;
  background: #fadad7;
 }
 ins {
  background: #eaf2c2;
  color: #406619;
  text-decoration: none;
 }
 #result {
  white-space: pre-wrap;
  .change {
    span {}
  }
 }
 #settings {
  background: rgba(0, 0, 0, .05);
  padding: 1em;
  border-radius: 10px;
  margin-bottom: 1em;
  color: #fff;
  font-size: 80%;
  label {
    margin-left: 1em;
    display: inline-block;
    font-weight: normal;
  }
  del {
    padding: 0.5em;
  }
  ins {
    padding: 0.5em;
  }
 }
 .source {
  position: absolute;
  right: 1%;
  top: .2em;
 }
@-moz-document url-prefix() {
  body {
    height: 99%;
    /* Hide scroll bar in Firefox */
  }
 }
 td#diff-col div {
  text-align: justify;
  white-space: pre-wrap;
 }
 .ignored {
  background-color: #ccc;
  /*  border: #0d91fa 1px solid; */
  opacity: 0.7;
 }
 .triggered {
  background-color: #1b98f8;
 }
 /* ignored and triggered? make it obvious error */
 .ignored.triggered {
  background-color: #ff0000;
 }
 .tab-pane-inner#screenshot {
  text-align: center;
  img {
    max-width: 99%;
  }
 }
--- a/changedetectionio/static/styles/scss/parts/_arrows.scss
+++ b/changedetectionio/static/styles/scss/parts/_arrows.scss
--- a/changedetectionio/static/styles/scss/parts/_browser-steps.scss
+++ b/changedetectionio/static/styles/scss/parts/_browser-steps.scss
@@ -90,5 +90,6 @@
    &:hover {
      cursor: pointer;
    }
    color: var(--color-grey-400);
  }
 }
--- a/changedetectionio/static/styles/scss/parts/_spinners.scss
+++ b/changedetectionio/static/styles/scss/parts/_spinners.scss
--- a/changedetectionio/static/styles/scss/parts/_variables.scss
+++ b/changedetectionio/static/styles/scss/parts/_variables.scss
@@ -0,0 +1,175 @@
 /**
 * CSS custom properties (aka variables).
 */
 :root {
  --color-white: #fff;
  --color-grey-50: #111;
  --color-grey-100: #262626;
  --color-grey-200: #333;
  --color-grey-300: #444;
  --color-grey-325: #555;
  --color-grey-350: #565d64;
  --color-grey-400: #666;
  --color-grey-500: #777;
  --color-grey-600: #999;
  --color-grey-700: #cbcbcb;
  --color-grey-750: #ddd;
  --color-grey-800: #e0e0e0;
  --color-grey-850: #eee;
  --color-grey-900: #f2f2f2;
  --color-black: #000;
  --color-dark-red: #a00;
  --color-light-red: #dd0000;
  --color-background-page: var(--color-grey-100);
  --color-background-gradient-first: #5ad8f7;
  --color-background-gradient-second: #2f50af;
  --color-background-gradient-third: #9150bf;
  --color-background: var(--color-white);
  --color-text: var(--color-grey-200);
  --color-link: #1b98f8;
  --color-menu-accent: #ed5900;
  --color-background-code: var(--color-grey-850);
  --color-error: var(--color-dark-red);
  --color-error-input: #ffebeb;
  --color-error-list: var(--color-light-red);
  --color-table-background: var(--color-background);
  --color-table-stripe: var(--color-grey-900);
  --color-text-tab: var(--color-white);
  --color-background-tab: rgba(255, 255, 255, 0.2);
  --color-background-tab-hover: rgba(255, 255, 255, 0.5);
  --color-text-tab-active: #222;
  --color-api-key: #0078e7;
  --color-background-button-primary: #0078e7;
  --color-background-button-green: #42dd53;
  --color-background-button-red: #dd4242;
  --color-background-button-success: rgb(28, 184, 65);
  --color-background-button-error: rgb(202, 60, 60);
  --color-text-button-error: var(--color-white);
  --color-background-button-warning: rgb(202, 60, 60);
  --color-text-button-warning: var(--color-white);
  --color-background-button-secondary: rgb(66, 184, 221);
  --color-background-button-cancel: rgb(200, 200, 200);
  --color-text-button: var(--color-white);
  --color-background-button-tag: rgb(99, 99, 99);
  --color-background-snapshot-age: #dfdfdf;
  --color-error-text-snapshot-age: var(--color-white);
  --color-error-background-snapshot-age: #ff0000;
  --color-background-button-tag-active: #9c9c9c;
  --color-text-messages: var(--color-white);
  --color-background-messages-message: rgba(255, 255, 255, .2);
  --color-background-messages-error: rgba(255, 1, 1, .5);
  --color-background-messages-notice: rgba(255, 255, 255, .5);
  --color-border-notification: #ccc;
  --color-background-checkbox-operations: rgba(0, 0, 0, 0.05);
  --color-warning: #ff3300;
  --color-border-warning: var(--color-warning);
  --color-text-legend: var(--color-white);
  --color-link-new-version: #e07171;
  --color-last-checked: #bbb;
  --color-text-footer: #444;
  --color-border-watch-table-cell: #eee;
  --color-text-watch-tag-list: #e70069;
  --color-background-new-watch-form: rgba(0, 0, 0, 0.05);
  --color-background-new-watch-input: var(--color-white);
  --color-text-new-watch-input: var(--color-text);
  --color-border-input: var(--color-grey-500);
  --color-shadow-input: var(--color-grey-400);
  --color-background-input: var(--color-white);
  --color-text-input: var(--color-text);
  --color-text-input-description: var(--color-grey-500);
  --color-text-input-placeholder: var(--color-grey-600);
  --color-background-table-thead: var(--color-grey-800);
  --color-border-table-cell: var(--color-grey-700);
  --color-text-menu-heading: var(--color-grey-350);
  --color-text-menu-link: var(--color-grey-500);
  --color-background-menu-link-hover: var(--color-grey-850);
  --color-text-menu-link-hover: var(--color-grey-300);
  --color-shadow-jump: var(--color-grey-500);
  --color-icon-github: var(--color-black);
  --color-icon-github-hover: var(--color-grey-300);
  --color-watch-table-error: var(--color-dark-red);
  --color-watch-table-row-text: var(--color-grey-100);
 }
 html[data-darkmode="true"] {
  --color-link: #59bdfb;
  --color-text: var(--color-white);
  --color-background-gradient-first: #3f90a5;
  --color-background-gradient-second: #1e316c;
  --color-background-gradient-third: #4d2c64;
  --color-background-new-watch-input: var(--color-grey-100);
  --color-text-new-watch-input: var(--color-text);
  --color-background-table-thead: var(--color-grey-200);
  --color-table-background: var(--color-grey-300);
  --color-table-stripe: var(--color-grey-325);
  --color-background: var(--color-grey-300);
  --color-text-menu-heading: var(--color-grey-850);
  --color-text-menu-link: var(--color-grey-800);
  --color-border-table-cell: var(--color-grey-400);
  --color-text-tab-active: var(--color-text);
  --color-border-input: var(--color-grey-400);
  --color-shadow-input: var(--color-grey-50);
  --color-background-input: var(--color-grey-350);
  --color-text-input-description: var(--color-grey-600);
  --color-text-input-placeholder: var(--color-grey-600);
  --color-text-watch-tag-list: #fa3e92;
  --color-background-code: var(--color-grey-200);
  --color-background-tab: rgba(0, 0, 0, 0.2);
  --color-background-tab-hover: rgba(0, 0, 0, 0.5);
  --color-background-snapshot-age: var(--color-grey-200);
  --color-shadow-jump: var(--color-grey-200);
  --color-icon-github: var(--color-white);
  --color-icon-github-hover: var(--color-grey-700);
  --color-watch-table-error: var(--color-light-red);
  --color-watch-table-row-text: var(--color-grey-800);
  .icon-spread {
    filter: hue-rotate(-10deg) brightness(1.5);
  }
  .watch-table {
    .title-col a[target="_blank"]::after,
    .current-diff-url::after {
      filter: invert(.5) hue-rotate(10deg) brightness(2);
    }
    .watch-controls {
      .state-off {
        img {
          opacity: 0.3;
        }
      }
      .state-on {
        img {
          opacity: 1.0;
        }
      }
    }
    .unviewed {
      color: #fff;
      &.error {
        color: var(--color-watch-table-error);
      }
    }
  }
 }
--- a/changedetectionio/static/styles/scss/styles.scss
+++ b/changedetectionio/static/styles/scss/styles.scss
@@ -1,42 +1,107 @@
 /*
 * -- BASE STYLES --
 * Most of these are inherited from Base, but I want to change a few.
 nvm use v14.18.1 && npm install && npm run build
 * or npm run watch
 */
-@import "parts/spinners";
+@import "parts/_variables";
-@import "parts/browser-steps";
+@import "parts/_spinners";
-@import "parts/_arrows.scss";
+@import "parts/_browser-steps";
@import "parts/_arrows";
 body {
-  color: #333;
+  color: var(--color-text);
-  background: #262626;
+  background: var(--color-background-page);
 }
 .visually-hidden {
  clip: rect(0 0 0 0);
  clip-path: inset(50%);
  height: 1px;
  overflow: hidden;
  position: absolute;
  white-space: nowrap;
  width: 1px;
 }
 .pure-table-even {
-  background: #fff;
+  background: var(--color-background);
 }
 /* Some styles from https://css-tricks.com/ */
 a {
  text-decoration: none;
-  color: #1b98f8;
+  color: var(--color-link);
 }
 a.github-link {
-  color: #fff;
+  color: var(--color-icon-github);
  margin: 0 1rem 0 0.5rem;
  svg {
    fill: currentColor;
  }
  &:hover {
    color: var(--color-icon-github-hover);
  }
 }
 button.toggle-theme {
  width: 4rem;
  background: transparent;
  border: none;
  cursor: pointer;
  color: var(--color-icon-github);
  &:hover {
    color: var(--color-icon-github-hover);
  }
  svg {
    fill: currentColor;
  }
  .icon-light {
    display: block;
  }
  .icon-dark {
    display: none;
  }
  &.dark {
    .icon-light {
      display: none;
    }
    .icon-dark {
      display: block;
    }
  }
 }
 .pure-menu-horizontal {
-  background: #fff;
+  background: var(--color-background);
  padding: 5px;
  display: flex;
  justify-content: space-between;
-  border-bottom: 2px solid #ed5900;
+  border-bottom: 2px solid var(--color-menu-accent);
  align-items: center;
 }
 .pure-menu-heading {
  color: var(--color-text-menu-heading);
 }
 .pure-menu-link {
  color: var(--color-text-menu-link);
  &:hover {
    background-color: var(--color-background-menu-link-hover);
    color: var(--color-text-menu-link-hover);
  }
 }
 section.content {
  padding-top: 5em;
  padding-bottom: 1em;
@@ -47,7 +112,8 @@ section.content {
 }
 code {
-  background: #eee;
+  background: var(--color-background-code);
  color: var(--color-text);
 }
 /* table related */
@@ -55,30 +121,36 @@ code {
  width: 100%;
  font-size: 80%;
-  tr.unviewed {
+  tr {
-    font-weight: bold;
+    &.unviewed {
      font-weight: bold;
    }
    &.error {
      color: var(--color-watch-table-error);
    }
    color: var(--color-watch-table-row-text);
  }
  .error {
    color: #a00;
  }
  td {
    white-space: nowrap;
    &.title-col {
      word-break: break-all;
      white-space: normal;
    }
  }
  td.title-col {
    word-break: break-all;
    white-space: normal;
  }
  th {
    white-space: nowrap;
    a {
      font-weight: normal;
      &.active {
        font-weight: bolder;
      }
      &.inactive {
        .arrow {
          display: none;
@@ -87,14 +159,15 @@ code {
    }
  }
-  .title-col a[target="_blank"]::after, .current-diff-url::after {
+  .title-col a[target="_blank"]::after,
  .current-diff-url::after {
    content: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAQElEQVR42qXKwQkAIAxDUUdxtO6/RBQkQZvSi8I/pL4BoGw/XPkh4XigPmsUgh0626AjRsgxHTkUThsG2T/sIlzdTsp52kSS1wAAAABJRU5ErkJggg==);
    margin: 0 3px 0 5px;
  }
 }
 .watch-tag-list {
-  color: #e70069;
+  color: var(--color-text-watch-tag-list);
  white-space: nowrap;
 }
@@ -126,10 +199,11 @@ code {
 body:after {
  content: "";
-  background: linear-gradient(130deg, #5ad8f7, #2f50af 41.07%, #9150bf 84.05%);
+  background: linear-gradient(130deg, var(--color-background-gradient-first), var(--color-background-gradient-second) 41.07%, var(--color-background-gradient-third) 84.05%);
 }
-body:after, body:before {
+body:after,
 body:before {
  display: block;
  height: 650px;
  position: absolute;
@@ -149,7 +223,8 @@ body::before {
  background-size: cover
 }
-body:after, body:before {
+body:after,
 body:before {
  -webkit-clip-path: polygon(100% 0, 0 0, 0 77.5%, 1% 77.4%, 2% 77.1%, 3% 76.6%, 4% 75.9%, 5% 75.05%, 6% 74.05%, 7% 72.95%, 8% 71.75%, 9% 70.55%, 10% 69.3%, 11% 68.05%, 12% 66.9%, 13% 65.8%, 14% 64.8%, 15% 64%, 16% 63.35%, 17% 62.85%, 18% 62.6%, 19% 62.5%, 20% 62.65%, 21% 63%, 22% 63.5%, 23% 64.2%, 24% 65.1%, 25% 66.1%, 26% 67.2%, 27% 68.4%, 28% 69.65%, 29% 70.9%, 30% 72.15%, 31% 73.3%, 32% 74.35%, 33% 75.3%, 34% 76.1%, 35% 76.75%, 36% 77.2%, 37% 77.45%, 38% 77.5%, 39% 77.3%, 40% 76.95%, 41% 76.4%, 42% 75.65%, 43% 74.75%, 44% 73.75%, 45% 72.6%, 46% 71.4%, 47% 70.15%, 48% 68.9%, 49% 67.7%, 50% 66.55%, 51% 65.5%, 52% 64.55%, 53% 63.75%, 54% 63.15%, 55% 62.75%, 56% 62.55%, 57% 62.5%, 58% 62.7%, 59% 63.1%, 60% 63.7%, 61% 64.45%, 62% 65.4%, 63% 66.45%, 64% 67.6%, 65% 68.8%, 66% 70.05%, 67% 71.3%, 68% 72.5%, 69% 73.6%, 70% 74.65%, 71% 75.55%, 72% 76.35%, 73% 76.9%, 74% 77.3%, 75% 77.5%, 76% 77.45%, 77% 77.25%, 78% 76.8%, 79% 76.2%, 80% 75.4%, 81% 74.45%, 82% 73.4%, 83% 72.25%, 84% 71.05%, 85% 69.8%, 86% 68.55%, 87% 67.35%, 88% 66.2%, 89% 65.2%, 90% 64.3%, 91% 63.55%, 92% 63%, 93% 62.65%, 94% 62.5%, 95% 62.55%, 96% 62.8%, 97% 63.3%, 98% 63.9%, 99% 64.75%, 100% 65.7%);
  clip-path: polygon(100% 0, 0 0, 0 77.5%, 1% 77.4%, 2% 77.1%, 3% 76.6%, 4% 75.9%, 5% 75.05%, 6% 74.05%, 7% 72.95%, 8% 71.75%, 9% 70.55%, 10% 69.3%, 11% 68.05%, 12% 66.9%, 13% 65.8%, 14% 64.8%, 15% 64%, 16% 63.35%, 17% 62.85%, 18% 62.6%, 19% 62.5%, 20% 62.65%, 21% 63%, 22% 63.5%, 23% 64.2%, 24% 65.1%, 25% 66.1%, 26% 67.2%, 27% 68.4%, 28% 69.65%, 29% 70.9%, 30% 72.15%, 31% 73.3%, 32% 74.35%, 33% 75.3%, 34% 76.1%, 35% 76.75%, 36% 77.2%, 37% 77.45%, 38% 77.5%, 39% 77.3%, 40% 76.95%, 41% 76.4%, 42% 75.65%, 43% 74.75%, 44% 73.75%, 45% 72.6%, 46% 71.4%, 47% 70.15%, 48% 68.9%, 49% 67.7%, 50% 66.55%, 51% 65.5%, 52% 64.55%, 53% 63.75%, 54% 63.15%, 55% 62.75%, 56% 62.55%, 57% 62.5%, 58% 62.7%, 59% 63.1%, 60% 63.7%, 61% 64.45%, 62% 65.4%, 63% 66.45%, 64% 67.6%, 65% 68.8%, 66% 70.05%, 67% 71.3%, 68% 72.5%, 69% 73.6%, 70% 74.65%, 71% 75.55%, 72% 76.35%, 73% 76.9%, 74% 77.3%, 75% 77.5%, 76% 77.45%, 77% 77.25%, 78% 76.8%, 79% 76.2%, 80% 75.4%, 81% 74.45%, 82% 73.4%, 83% 72.25%, 84% 71.05%, 85% 69.8%, 86% 68.55%, 87% 67.35%, 88% 66.2%, 89% 65.2%, 90% 64.3%, 91% 63.55%, 92% 63%, 93% 62.65%, 94% 62.5%, 95% 62.55%, 96% 62.8%, 97% 63.3%, 98% 63.9%, 99% 64.75%, 100% 65.7%)
 }
@@ -165,51 +240,57 @@ body:after, body:before {
  display: block;
 }
 .pure-button-primary,
 a.pure-button-primary,
 .pure-button-selected,
 a.pure-button-selected {
  background-color: var(--color-background-button-primary);
 }
 .button-secondary {
-  color: white;
+  color: var(--color-text-button);
  border-radius: 4px;
  text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
 }
 .button-success {
-  background: rgb(28, 184, 65);
+  background: var(--color-background-button-success);
  /* this is a green */
 }
 .button-tag {
-  background: rgb(99, 99, 99);
+  background: var(--color-background-button-tag);
-  color: #fff;
+  color: var(--color-text-button);
  font-size: 65%;
  border-bottom-left-radius: initial;
  border-bottom-right-radius: initial;
  &.active {
-    background: #9c9c9c;
+    background: var(--color-background-button-tag-active);
    font-weight: bold;
  }
 }
 .button-error {
-  background: rgb(202, 60, 60);
+  background: var(--color-background-button-error);
-  /* this is a maroon */
+  color: var(--color-text-button-error);
 }
 .button-warning {
-  background: rgb(223, 117, 20);
+  background: var(--color-background-button-warning);
-  /* this is an orange */
+  color: var(--color-text-button-warning);
 }
 .button-secondary {
-  background: rgb(66, 184, 221);
+  background: var(--color-background-button-secondary);
  /* this is a light blue */
 }
 .button-cancel {
-  background: rgb(200, 200, 200);
+  background: var(--color-background-button-cancel);
-  /* this is a green */
+}
 #save_button {
  margin-right: 1rem;
 }
 .messages {
@@ -217,50 +298,62 @@ body:after, body:before {
    list-style: none;
    padding: 1em;
    border-radius: 10px;
-    color: #fff;
+    color: var(--color-text-messages);
    font-weight: bold;
    &.message {
-      background: rgba(255, 255, 255, .2);
+      background: var(--color-background-messages-message);
    }
    &.error {
-      background: rgba(255, 1, 1, .5);
+      background: var(--color-background-messages-error);
    }
    &.notice {
-      background: rgba(255, 255, 255, .5);
+      background: var(--color-background-messages-notice);
    }
  }
  &.with-share-link {
-    > *:hover {
+    >*:hover {
      cursor: pointer;
    }
  }
 }
 .notifications-wrapper {
  padding: 0.5rem 0 1rem 0;
 }
 label {
 &:hover {
   cursor: pointer;
 }  
 }
 #notification-customisation {
-  border: 1px solid #ccc;
+  border: 1px solid var(--color-border-notification);
  padding: 0.5rem;
  border-radius: 5px;
 }
 #notification-error-log {
-  border: 1px solid #ccc;
+  border: 1px solid var(--color-border-notification);
  padding: 1rem;
  border-radius: 5px;
  overflow-wrap: break-word;
 }
 #token-table {
-  &.pure-table td, &.pure-table th {
+
  &.pure-table td,
  &.pure-table th {
    font-size: 80%;
  }
 }
 #new-watch-form {
-  background: rgba(0, 0, 0, .05);
+  background: var(--color-background-new-watch-form);
  padding: 1em;
  border-radius: 10px;
  margin-bottom: 1em;
@@ -270,19 +363,25 @@ body:after, body:before {
    margin-bottom: 5px;
  }
  input:not(.pure-button) {
    background-color: var(--color-background-new-watch-input);
    color: var(--color-text-new-watch-input);
  }
  .label {
    display: none;
  }
  legend {
-    color: #fff;
+    color: var(--color-text-legend);
    font-weight: bold;
  }
  #watch-add-wrapper-zone {
-    > div {
+    >div {
      display: inline-block;
    }
    @media only screen and (max-width: 760px) {
      #url {
        width: 100%;
@@ -300,15 +399,15 @@ body:after, body:before {
  position: fixed;
  left: 0px;
  top: 120px;
-  background: #fff;
+  background: var(--color-background);
  padding: 10px;
  border-top-right-radius: 5px;
  border-bottom-right-radius: 5px;
-  box-shadow: 5px 0 5px -2px #888;
+  box-shadow: 1px 1px 4px var(--color-shadow-jump);
  a {
-    color: #1b98f8;
+    color: var(--color-link);
-    cursor: grabbing;
+    cursor: pointer;
    -moz-user-select: none;
    -webkit-user-select: none;
    -ms-user-select: none;
@@ -319,8 +418,8 @@ body:after, body:before {
 footer {
  padding: 10px;
-  background: #fff;
+  background: var(--color-background);
-  color: #444;
+  color: var(--color-text-footer);
  text-align: center;
 }
@@ -343,7 +442,7 @@ footer {
  position: absolute;
  top: 60px;
  font-size: 65%;
-  background: #fff;
+  background: var(--color-background);
  padding: 10px;
  &#left-sticky {
@@ -362,10 +461,12 @@ footer {
 }
 #new-version-text a {
-  color: #e07171;
+  color: var(--color-link-new-version);
 }
 .watch-controls {
  color: #f8321b;
  .state-on {
    img {
      opacity: 0.8;
@@ -383,7 +484,6 @@ footer {
      opacity: 0.8;
    }
  }
 }
 .monospaced-textarea {
@@ -392,7 +492,8 @@ footer {
    font-family: monospace;
    white-space: pre;
    overflow-wrap: normal;
-    overflow-x: scroll;
+    // No scrollbars until needed.
    overflow-x: auto;
  }
 }
@@ -407,7 +508,9 @@ footer {
    }
  }
-  .pure-control-group, .pure-group, .pure-controls {
+  .pure-control-group,
  .pure-group,
  .pure-controls {
    padding-bottom: 1em;
    div {
@@ -415,28 +518,32 @@ footer {
    }
    .checkbox {
-      > * {
+      >* {
        display: inline;
        vertical-align: middle;
      }
-      > label {
+      >label {
        padding-left: 5px;
      }
    }
    legend {
      color: var(--color-text-legend);
    }
  }
  /* The input fields with errors */
  .error {
    input {
-      background-color: #ffebeb;
+      background-color: var(--color-error-input);
    }
  }
  /* The list of errors */
  ul.errors {
    padding: .5em .6em;
-    border: 1px solid #dd0000;
+    border: 1px solid var(--color-error-list);
    border-radius: 4px;
    vertical-align: middle;
    -webkit-box-sizing: border-box;
@@ -444,7 +551,7 @@ footer {
    li {
      margin-left: 1em;
-      color: #dd0000;
+      color: var(--color-error-list);
    }
  }
@@ -462,7 +569,7 @@ footer {
      list-style: none;
      li {
-        > * {
+        >* {
          display: inline-block;
        }
      }
@@ -471,21 +578,25 @@ footer {
 }
-@media only screen and (max-width: 760px), (min-device-width: 768px) and (max-device-width: 1024px) {
+@media only screen and (max-width: 760px),
 (min-device-width: 768px) and (max-device-width: 1024px) {
  .box {
    max-width: 95%
  }
  .edit-form {
    padding: 0.5em;
    margin: 0;
  }
  #nav-menu {
    overflow-x: scroll;
  }
 }
-@media only screen and (max-width: 760px), (min-device-width: 768px) and (max-device-width: 800px) {
+@media only screen and (max-width: 760px),
 (min-device-width: 768px) and (max-device-width: 800px) {
  div.sticky-tab#hosted-sticky {
    top: 60px;
@@ -514,24 +625,29 @@ footer {
  and also iPads specifically.
  */
  .watch-table {
    /* Force table to not be like tables anymore */
-    thead, tbody, th, td, tr {
+    thead,
    tbody,
    th,
    td,
    tr {
      display: block;
    }
    .last-checked {
-      > span {
+      >span {
        vertical-align: middle;
      }
    }
    .last-checked::before {
-      color: #555;
+      color: var(--color-last-checked);
      content: "Last Checked ";
    }
    .last-changed::before {
-      color: #555;
+      color: var(--color-last-checked);
      content: "Last Changed ";
    }
@@ -547,15 +663,17 @@ footer {
      left: -9999px;
    }
-    .pure-table td, .pure-table th {
+    .pure-table td,
    .pure-table th {
      border: none;
    }
    td {
      /* Behave  like a "row" */
      border: none;
-      border-bottom: 1px solid #eee;
+      border-bottom: 1px solid var(--color-border-watch-table-cell);
      vertical-align: middle;
      &:before {
        /* Top/left values mimic padding */
        top: 6px;
@@ -568,11 +686,11 @@ footer {
    &.pure-table-striped {
      tr {
-        background-color: #fff;
+        background-color: var(--color-table-background);
      }
      tr:nth-child(2n-1) {
-        background-color: #eee;
+        background-color: var(--color-table-stripe);
      }
      tr:nth-child(2n-1) td {
@@ -583,12 +701,66 @@ footer {
  }
 }
 .pure-table {
  border-color: var(--color-border-table-cell);
  thead {
    background-color: var(--color-background-table-thead);
    color: var(--color-text);
  }
  td,
  th {
    border-left-color: var(--color-border-table-cell);
  }
 }
 .pure-table-striped {
  tr:nth-child(2n-1) {
    td {
      background-color: var(--color-table-stripe);
    }
  }
 }
 .pure-form input[type=color],
 .pure-form input[type=date],
 .pure-form input[type=datetime-local],
 .pure-form input[type=datetime],
 .pure-form input[type=email],
 .pure-form input[type=month],
 .pure-form input[type=number],
 .pure-form input[type=password],
 .pure-form input[type=search],
 .pure-form input[type=tel],
 .pure-form input[type=text],
 .pure-form input[type=time],
 .pure-form input[type=url],
 .pure-form input[type=week],
 .pure-form select,
 .pure-form textarea {
  border: var(--color-border-input);
  box-shadow: inset 0 1px 3px var(--color-shadow-input);
  background-color: var(--color-background-input);
  color: var(--color-text-input);
  &:active {
    background-color: var(--color-background-input);
  }
 }
 input::placeholder,
 textarea::placeholder {
  color: var(--color-text-input-placeholder);
 }
 /** Desktop vs mobile input field strategy
 - We dont use 'size' with <input> because `size` is too unreliable to override, and will often push-out
 - Rely always on width in CSS
 */
@media only screen and (min-width: 761px) {
  /* m-d is medium-desktop */
  .m-d {
    min-width: 80%;
@@ -605,16 +777,23 @@ footer {
    li {
      margin-right: 3px;
      display: inline-block;
-      color: #fff;
+      color: var(--color-text-tab);
      border-top-left-radius: 5px;
      border-top-right-radius: 5px;
-      background-color: rgba(255, 255, 255, 0.2);
+      background-color: var(--color-background-tab);
-      &.active, :target {
+      &:not(.active) {
-        background-color: #fff;
+        &:hover {
          background-color: var(--color-background-tab-hover);
        }
      }
      &.active,
      :target {
        background-color: var(--color-background);
        a {
-          color: #222;
+          color: var(--color-text-tab-active);
          font-weight: bold;
        }
      }
@@ -622,22 +801,24 @@ footer {
      a {
        display: block;
        padding: 0.8em;
-        color: #fff;
+        color: var(--color-text-tab);
      }
    }
  }
 }
 $form-edge-padding: 20px;
 .pure-form-stacked {
-  > div:first-child {
+  >div:first-child {
    display: block;
  }
 }
 .login-form {
  .inner {
-    background: #fff;;
+    background: var(--color-background);
    ;
    padding: $form-edge-padding;
    border-radius: 5px;
  }
@@ -667,11 +848,13 @@ $form-edge-padding: 20px;
 #selector-header {
  padding-bottom: 1em;
 }
 body.full-width {
  .edit-form {
    width: 95%;
  }
 }
 .edit-form {
  min-width: 70%;
  /* so it cant overflow */
@@ -682,17 +865,21 @@ body.full-width {
  }
  .inner {
-    background: #fff;;
+    background: var(--color-background);
    padding: $form-edge-padding;
  }
  #actions {
    display: block;
-    background: #fff;
+    background: var(--color-background);
  }
  .pure-form-message-inline {
    padding-left: 0;
    color: var(--color-text-input-description);
    code {
      font-size: .875em;
    }
  }
 }
@@ -716,14 +903,15 @@ ul {
  height: 100%;
  overflow-y: scroll;
  position: relative;
  //width: 100%;
-  > img {
+  >img {
    position: absolute;
    z-index: 4;
    max-width: 100%;
  }
-  > canvas {
+  >canvas {
    position: relative;
    z-index: 5;
    max-width: 100%;
@@ -751,54 +939,61 @@ ul {
 }
 #api-key-copy {
-  color: #0078e7;
+  color: var(--color-api-key);
 }
 .button-green {
-  background-color: #42dd53;
+  background-color: var(--color-background-button-green);
 }
 .button-red {
-  background-color: #dd4242;
+  background-color: var(--color-background-button-red);
 }
 .noselect {
-  -webkit-touch-callout: none; /* iOS Safari */
+  -webkit-touch-callout: none;
-  -webkit-user-select: none; /* Safari */
+  /* iOS Safari */
-  -moz-user-select: none; /* Old versions of Firefox */
+  -webkit-user-select: none;
-  -ms-user-select: none; /* Internet Explorer/Edge */
+  /* Safari */
  -moz-user-select: none;
  /* Old versions of Firefox */
  -ms-user-select: none;
  /* Internet Explorer/Edge */
  user-select: none;
  /* Non-prefixed version, currently
-                                   supported by Chrome, Edge, Opera and Firefox */
+    supported by Chrome, Edge, Opera and Firefox */
 }
 .snapshot-age {
  padding: 4px;
-  background-color: #dfdfdf;
+  margin: 0.5rem 0;
  background-color: var(--color-background-snapshot-age);
  border-radius: 3px;
  font-weight: bold;
  margin-bottom: 4px;
  &.error {
-    background-color: #ff0000;
+    background-color: var(--color-error-background-snapshot-age);
-    color: #fff;
+    color: var(--color-error-text-snapshot-age);
  }
 }
 #checkbox-operations {
-  background: rgba(0, 0, 0, 0.05);
+  background: var(--color-background-checkbox-operations);
  padding: 1em;
  border-radius: 10px;
  margin-bottom: 1em;
  display: none;
 }
 .checkbox-uuid {
-  > * {
+  >* {
    vertical-align: middle;
  }
 }
 .inline-warning {
-  > span {
+  >span {
    display: inline-block;
    vertical-align: middle;
  }
@@ -809,8 +1004,35 @@ ul {
    vertical-align: middle;
  }
-  border: 1px solid #ff3300;
+  border: 1px solid var(--color-border-warning);
  padding: 0.5rem;
  border-radius: 5px;
-  color: #ff3300;
+  color: var(--color-warning);
 }
 /* automatic price following helpers */
 .tracking-ldjson-price-data {
  background-color: var(--color-background-button-green);
  color: #000;
  padding: 3px;
  border-radius: 3px;
  white-space: nowrap;
 }
 .ldjson-price-track-offer {
  a.pure-button {
    border-radius: 3px;
    padding: 3px;
    background-color: var(--color-background-button-green);
  }
  font-weight: bold;
  font-style: italic;
 }
 .price-follow-tag-icon {
  display: inline-block;
  height: 0.8rem;
  vertical-align: middle;
 }
--- a/changedetectionio/static/styles/styles.css
+++ b/changedetectionio/static/styles/styles.css
@@ -1,9 +1,143 @@
 /*
 * -- BASE STYLES --
 * Most of these are inherited from Base, but I want to change a few.
 nvm use v14.18.1 && npm install && npm run build
 * or npm run watch
 */
 /**
 * CSS custom properties (aka variables).
 */
 :root {
  --color-white: #fff;
  --color-grey-50: #111;
  --color-grey-100: #262626;
  --color-grey-200: #333;
  --color-grey-300: #444;
  --color-grey-325: #555;
  --color-grey-350: #565d64;
  --color-grey-400: #666;
  --color-grey-500: #777;
  --color-grey-600: #999;
  --color-grey-700: #cbcbcb;
  --color-grey-750: #ddd;
  --color-grey-800: #e0e0e0;
  --color-grey-850: #eee;
  --color-grey-900: #f2f2f2;
  --color-black: #000;
  --color-dark-red: #a00;
  --color-light-red: #dd0000;
  --color-background-page: var(--color-grey-100);
  --color-background-gradient-first: #5ad8f7;
  --color-background-gradient-second: #2f50af;
  --color-background-gradient-third: #9150bf;
  --color-background: var(--color-white);
  --color-text: var(--color-grey-200);
  --color-link: #1b98f8;
  --color-menu-accent: #ed5900;
  --color-background-code: var(--color-grey-850);
  --color-error: var(--color-dark-red);
  --color-error-input: #ffebeb;
  --color-error-list: var(--color-light-red);
  --color-table-background: var(--color-background);
  --color-table-stripe: var(--color-grey-900);
  --color-text-tab: var(--color-white);
  --color-background-tab: rgba(255, 255, 255, 0.2);
  --color-background-tab-hover: rgba(255, 255, 255, 0.5);
  --color-text-tab-active: #222;
  --color-api-key: #0078e7;
  --color-background-button-primary: #0078e7;
  --color-background-button-green: #42dd53;
  --color-background-button-red: #dd4242;
  --color-background-button-success: rgb(28, 184, 65);
  --color-background-button-error: rgb(202, 60, 60);
  --color-text-button-error: var(--color-white);
  --color-background-button-warning: rgb(202, 60, 60);
  --color-text-button-warning: var(--color-white);
  --color-background-button-secondary: rgb(66, 184, 221);
  --color-background-button-cancel: rgb(200, 200, 200);
  --color-text-button: var(--color-white);
  --color-background-button-tag: rgb(99, 99, 99);
  --color-background-snapshot-age: #dfdfdf;
  --color-error-text-snapshot-age: var(--color-white);
  --color-error-background-snapshot-age: #ff0000;
  --color-background-button-tag-active: #9c9c9c;
  --color-text-messages: var(--color-white);
  --color-background-messages-message: rgba(255, 255, 255, .2);
  --color-background-messages-error: rgba(255, 1, 1, .5);
  --color-background-messages-notice: rgba(255, 255, 255, .5);
  --color-border-notification: #ccc;
  --color-background-checkbox-operations: rgba(0, 0, 0, 0.05);
  --color-warning: #ff3300;
  --color-border-warning: var(--color-warning);
  --color-text-legend: var(--color-white);
  --color-link-new-version: #e07171;
  --color-last-checked: #bbb;
  --color-text-footer: #444;
  --color-border-watch-table-cell: #eee;
  --color-text-watch-tag-list: #e70069;
  --color-background-new-watch-form: rgba(0, 0, 0, 0.05);
  --color-background-new-watch-input: var(--color-white);
  --color-text-new-watch-input: var(--color-text);
  --color-border-input: var(--color-grey-500);
  --color-shadow-input: var(--color-grey-400);
  --color-background-input: var(--color-white);
  --color-text-input: var(--color-text);
  --color-text-input-description: var(--color-grey-500);
  --color-text-input-placeholder: var(--color-grey-600);
  --color-background-table-thead: var(--color-grey-800);
  --color-border-table-cell: var(--color-grey-700);
  --color-text-menu-heading: var(--color-grey-350);
  --color-text-menu-link: var(--color-grey-500);
  --color-background-menu-link-hover: var(--color-grey-850);
  --color-text-menu-link-hover: var(--color-grey-300);
  --color-shadow-jump: var(--color-grey-500);
  --color-icon-github: var(--color-black);
  --color-icon-github-hover: var(--color-grey-300);
  --color-watch-table-error: var(--color-dark-red);
  --color-watch-table-row-text: var(--color-grey-100); }
 html[data-darkmode="true"] {
  --color-link: #59bdfb;
  --color-text: var(--color-white);
  --color-background-gradient-first: #3f90a5;
  --color-background-gradient-second: #1e316c;
  --color-background-gradient-third: #4d2c64;
  --color-background-new-watch-input: var(--color-grey-100);
  --color-text-new-watch-input: var(--color-text);
  --color-background-table-thead: var(--color-grey-200);
  --color-table-background: var(--color-grey-300);
  --color-table-stripe: var(--color-grey-325);
  --color-background: var(--color-grey-300);
  --color-text-menu-heading: var(--color-grey-850);
  --color-text-menu-link: var(--color-grey-800);
  --color-border-table-cell: var(--color-grey-400);
  --color-text-tab-active: var(--color-text);
  --color-border-input: var(--color-grey-400);
  --color-shadow-input: var(--color-grey-50);
  --color-background-input: var(--color-grey-350);
  --color-text-input-description: var(--color-grey-600);
  --color-text-input-placeholder: var(--color-grey-600);
  --color-text-watch-tag-list: #fa3e92;
  --color-background-code: var(--color-grey-200);
  --color-background-tab: rgba(0, 0, 0, 0.2);
  --color-background-tab-hover: rgba(0, 0, 0, 0.5);
  --color-background-snapshot-age: var(--color-grey-200);
  --color-shadow-jump: var(--color-grey-200);
  --color-icon-github: var(--color-white);
  --color-icon-github-hover: var(--color-grey-700);
  --color-watch-table-error: var(--color-light-red);
  --color-watch-table-row-text: var(--color-grey-800); }
  html[data-darkmode="true"] .icon-spread {
    filter: hue-rotate(-10deg) brightness(1.5); }
  html[data-darkmode="true"] .watch-table .title-col a[target="_blank"]::after,
  html[data-darkmode="true"] .watch-table .current-diff-url::after {
    filter: invert(0.5) hue-rotate(10deg) brightness(2); }
  html[data-darkmode="true"] .watch-table .watch-controls .state-off img {
    opacity: 0.3; }
  html[data-darkmode="true"] .watch-table .watch-controls .state-on img {
    opacity: 1.0; }
  html[data-darkmode="true"] .watch-table .unviewed {
    color: #fff; }
    html[data-darkmode="true"] .watch-table .unviewed.error {
      color: var(--color-watch-table-error); }
 /* spinner */
 .spinner,
 .spinner:after {
@@ -105,8 +239,10 @@ nvm use v14.18.1 && npm install && npm run build
    width: 80px;
    height: 80px;
    font-size: 3px; }
-  #browsersteps-selector-wrapper #browsersteps-click-start:hover {
+  #browsersteps-selector-wrapper #browsersteps-click-start {
-    cursor: pointer; }
+    color: var(--color-grey-400); }
    #browsersteps-selector-wrapper #browsersteps-click-start:hover {
      cursor: pointer; }
 .arrow {
  border: solid #1b98f8;
@@ -127,28 +263,70 @@ nvm use v14.18.1 && npm install && npm run build
    -webkit-transform: rotate(45deg); }
 body {
-  color: #333;
+  color: var(--color-text);
-  background: #262626; }
+  background: var(--color-background-page); }
 .visually-hidden {
  clip: rect(0 0 0 0);
  clip-path: inset(50%);
  height: 1px;
  overflow: hidden;
  position: absolute;
  white-space: nowrap;
  width: 1px; }
 .pure-table-even {
-  background: #fff; }
+  background: var(--color-background); }
 /* Some styles from https://css-tricks.com/ */
 a {
  text-decoration: none;
-  color: #1b98f8; }
+  color: var(--color-link); }
 a.github-link {
-  color: #fff; }
+  color: var(--color-icon-github);
  margin: 0 1rem 0 0.5rem; }
  a.github-link svg {
    fill: currentColor; }
  a.github-link:hover {
    color: var(--color-icon-github-hover); }
 button.toggle-theme {
  width: 4rem;
  background: transparent;
  border: none;
  cursor: pointer;
  color: var(--color-icon-github); }
  button.toggle-theme:hover {
    color: var(--color-icon-github-hover); }
  button.toggle-theme svg {
    fill: currentColor; }
  button.toggle-theme .icon-light {
    display: block; }
  button.toggle-theme .icon-dark {
    display: none; }
  button.toggle-theme.dark .icon-light {
    display: none; }
  button.toggle-theme.dark .icon-dark {
    display: block; }
 .pure-menu-horizontal {
-  background: #fff;
+  background: var(--color-background);
  padding: 5px;
  display: flex;
  justify-content: space-between;
-  border-bottom: 2px solid #ed5900;
+  border-bottom: 2px solid var(--color-menu-accent);
  align-items: center; }
 .pure-menu-heading {
  color: var(--color-text-menu-heading); }
 .pure-menu-link {
  color: var(--color-text-menu-link); }
  .pure-menu-link:hover {
    background-color: var(--color-background-menu-link-hover);
    color: var(--color-text-menu-link-hover); }
 section.content {
  padding-top: 5em;
  padding-bottom: 1em;
@@ -158,21 +336,24 @@ section.content {
  justify-content: center; }
 code {
-  background: #eee; }
+  background: var(--color-background-code);
  color: var(--color-text); }
 /* table related */
 .watch-table {
  width: 100%;
  font-size: 80%; }
-  .watch-table tr.unviewed {
+  .watch-table tr {
-    font-weight: bold; }
+    color: var(--color-watch-table-row-text); }
-  .watch-table .error {
+    .watch-table tr.unviewed {
-    color: #a00; }
+      font-weight: bold; }
    .watch-table tr.error {
      color: var(--color-watch-table-error); }
  .watch-table td {
    white-space: nowrap; }
-  .watch-table td.title-col {
+    .watch-table td.title-col {
-    word-break: break-all;
+      word-break: break-all;
-    white-space: normal; }
+      white-space: normal; }
  .watch-table th {
    white-space: nowrap; }
    .watch-table th a {
@@ -181,12 +362,13 @@ code {
        font-weight: bolder; }
      .watch-table th a.inactive .arrow {
        display: none; }
-  .watch-table .title-col a[target="_blank"]::after, .watch-table .current-diff-url::after {
+  .watch-table .title-col a[target="_blank"]::after,
  .watch-table .current-diff-url::after {
    content: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAQElEQVR42qXKwQkAIAxDUUdxtO6/RBQkQZvSi8I/pL4BoGw/XPkh4XigPmsUgh0626AjRsgxHTkUThsG2T/sIlzdTsp52kSS1wAAAABJRU5ErkJggg==);
    margin: 0 3px 0 5px; }
 .watch-tag-list {
-  color: #e70069;
+  color: var(--color-text-watch-tag-list);
  white-space: nowrap; }
 .box {
@@ -209,9 +391,10 @@ code {
 body:after {
  content: "";
-  background: linear-gradient(130deg, #5ad8f7, #2f50af 41.07%, #9150bf 84.05%); }
+  background: linear-gradient(130deg, var(--color-background-gradient-first), var(--color-background-gradient-second) 41.07%, var(--color-background-gradient-third) 84.05%); }
-body:after, body:before {
+body:after,
 body:before {
  display: block;
  height: 650px;
  position: absolute;
@@ -227,7 +410,8 @@ body::before {
  content: "";
  background-size: cover; }
-body:after, body:before {
+body:after,
 body:before {
  -webkit-clip-path: polygon(100% 0, 0 0, 0 77.5%, 1% 77.4%, 2% 77.1%, 3% 76.6%, 4% 75.9%, 5% 75.05%, 6% 74.05%, 7% 72.95%, 8% 71.75%, 9% 70.55%, 10% 69.3%, 11% 68.05%, 12% 66.9%, 13% 65.8%, 14% 64.8%, 15% 64%, 16% 63.35%, 17% 62.85%, 18% 62.6%, 19% 62.5%, 20% 62.65%, 21% 63%, 22% 63.5%, 23% 64.2%, 24% 65.1%, 25% 66.1%, 26% 67.2%, 27% 68.4%, 28% 69.65%, 29% 70.9%, 30% 72.15%, 31% 73.3%, 32% 74.35%, 33% 75.3%, 34% 76.1%, 35% 76.75%, 36% 77.2%, 37% 77.45%, 38% 77.5%, 39% 77.3%, 40% 76.95%, 41% 76.4%, 42% 75.65%, 43% 74.75%, 44% 73.75%, 45% 72.6%, 46% 71.4%, 47% 70.15%, 48% 68.9%, 49% 67.7%, 50% 66.55%, 51% 65.5%, 52% 64.55%, 53% 63.75%, 54% 63.15%, 55% 62.75%, 56% 62.55%, 57% 62.5%, 58% 62.7%, 59% 63.1%, 60% 63.7%, 61% 64.45%, 62% 65.4%, 63% 66.45%, 64% 67.6%, 65% 68.8%, 66% 70.05%, 67% 71.3%, 68% 72.5%, 69% 73.6%, 70% 74.65%, 71% 75.55%, 72% 76.35%, 73% 76.9%, 74% 77.3%, 75% 77.5%, 76% 77.45%, 77% 77.25%, 78% 76.8%, 79% 76.2%, 80% 75.4%, 81% 74.45%, 82% 73.4%, 83% 72.25%, 84% 71.05%, 85% 69.8%, 86% 68.55%, 87% 67.35%, 88% 66.2%, 89% 65.2%, 90% 64.3%, 91% 63.55%, 92% 63%, 93% 62.65%, 94% 62.5%, 95% 62.55%, 96% 62.8%, 97% 63.3%, 98% 63.9%, 99% 64.75%, 100% 65.7%);
  clip-path: polygon(100% 0, 0 0, 0 77.5%, 1% 77.4%, 2% 77.1%, 3% 76.6%, 4% 75.9%, 5% 75.05%, 6% 74.05%, 7% 72.95%, 8% 71.75%, 9% 70.55%, 10% 69.3%, 11% 68.05%, 12% 66.9%, 13% 65.8%, 14% 64.8%, 15% 64%, 16% 63.35%, 17% 62.85%, 18% 62.6%, 19% 62.5%, 20% 62.65%, 21% 63%, 22% 63.5%, 23% 64.2%, 24% 65.1%, 25% 66.1%, 26% 67.2%, 27% 68.4%, 28% 69.65%, 29% 70.9%, 30% 72.15%, 31% 73.3%, 32% 74.35%, 33% 75.3%, 34% 76.1%, 35% 76.75%, 36% 77.2%, 37% 77.45%, 38% 77.5%, 39% 77.3%, 40% 76.95%, 41% 76.4%, 42% 75.65%, 43% 74.75%, 44% 73.75%, 45% 72.6%, 46% 71.4%, 47% 70.15%, 48% 68.9%, 49% 67.7%, 50% 66.55%, 51% 65.5%, 52% 64.55%, 53% 63.75%, 54% 63.15%, 55% 62.75%, 56% 62.55%, 57% 62.5%, 58% 62.7%, 59% 63.1%, 60% 63.7%, 61% 64.45%, 62% 65.4%, 63% 66.45%, 64% 67.6%, 65% 68.8%, 66% 70.05%, 67% 71.3%, 68% 72.5%, 69% 73.6%, 70% 74.65%, 71% 75.55%, 72% 76.35%, 73% 76.9%, 74% 77.3%, 75% 77.5%, 76% 77.45%, 77% 77.25%, 78% 76.8%, 79% 76.2%, 80% 75.4%, 81% 74.45%, 82% 73.4%, 83% 72.25%, 84% 71.05%, 85% 69.8%, 86% 68.55%, 87% 67.35%, 88% 66.2%, 89% 65.2%, 90% 64.3%, 91% 63.55%, 92% 63%, 93% 62.65%, 94% 62.5%, 95% 62.55%, 96% 62.8%, 97% 63.3%, 98% 63.9%, 99% 64.75%, 100% 65.7%); }
@@ -240,83 +424,99 @@ body:after, body:before {
  max-width: 400px;
  display: block; }
 .pure-button-primary,
 a.pure-button-primary,
 .pure-button-selected,
 a.pure-button-selected {
  background-color: var(--color-background-button-primary); }
 .button-secondary {
-  color: white;
+  color: var(--color-text-button);
  border-radius: 4px;
  text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); }
 .button-success {
-  background: #1cb841;
+  background: var(--color-background-button-success); }
  /* this is a green */ }
 .button-tag {
-  background: #636363;
+  background: var(--color-background-button-tag);
-  color: #fff;
+  color: var(--color-text-button);
  font-size: 65%;
  border-bottom-left-radius: initial;
  border-bottom-right-radius: initial; }
  .button-tag.active {
-    background: #9c9c9c;
+    background: var(--color-background-button-tag-active);
    font-weight: bold; }
 .button-error {
-  background: #ca3c3c;
+  background: var(--color-background-button-error);
-  /* this is a maroon */ }
+  color: var(--color-text-button-error); }
 .button-warning {
-  background: #df7514;
+  background: var(--color-background-button-warning);
-  /* this is an orange */ }
+  color: var(--color-text-button-warning); }
 .button-secondary {
-  background: #42b8dd;
+  background: var(--color-background-button-secondary); }
  /* this is a light blue */ }
 .button-cancel {
-  background: #c8c8c8;
+  background: var(--color-background-button-cancel); }
-  /* this is a green */ }
+
 #save_button {
  margin-right: 1rem; }
 .messages li {
  list-style: none;
  padding: 1em;
  border-radius: 10px;
-  color: #fff;
+  color: var(--color-text-messages);
  font-weight: bold; }
  .messages li.message {
-    background: rgba(255, 255, 255, 0.2); }
+    background: var(--color-background-messages-message); }
  .messages li.error {
-    background: rgba(255, 1, 1, 0.5); }
+    background: var(--color-background-messages-error); }
  .messages li.notice {
-    background: rgba(255, 255, 255, 0.5); }
+    background: var(--color-background-messages-notice); }
 .messages.with-share-link > *:hover {
  cursor: pointer; }
 .notifications-wrapper {
  padding: 0.5rem 0 1rem 0; }
 label:hover {
  cursor: pointer; }
 #notification-customisation {
-  border: 1px solid #ccc;
+  border: 1px solid var(--color-border-notification);
  padding: 0.5rem;
  border-radius: 5px; }
 #notification-error-log {
-  border: 1px solid #ccc;
+  border: 1px solid var(--color-border-notification);
  padding: 1rem;
  border-radius: 5px;
  overflow-wrap: break-word; }
-#token-table.pure-table td, #token-table.pure-table th {
+#token-table.pure-table td,
 #token-table.pure-table th {
  font-size: 80%; }
 #new-watch-form {
-  background: rgba(0, 0, 0, 0.05);
+  background: var(--color-background-new-watch-form);
  padding: 1em;
  border-radius: 10px;
  margin-bottom: 1em; }
  #new-watch-form input {
    display: inline-block;
    margin-bottom: 5px; }
  #new-watch-form input:not(.pure-button) {
    background-color: var(--color-background-new-watch-input);
    color: var(--color-text-new-watch-input); }
  #new-watch-form .label {
    display: none; }
  #new-watch-form legend {
-    color: #fff;
+    color: var(--color-text-legend);
    font-weight: bold; }
  #new-watch-form #watch-add-wrapper-zone > div {
    display: inline-block; }
@@ -331,14 +531,14 @@ body:after, body:before {
  position: fixed;
  left: 0px;
  top: 120px;
-  background: #fff;
+  background: var(--color-background);
  padding: 10px;
  border-top-right-radius: 5px;
  border-bottom-right-radius: 5px;
-  box-shadow: 5px 0 5px -2px #888; }
+  box-shadow: 1px 1px 4px var(--color-shadow-jump); }
  #diff-jump a {
-    color: #1b98f8;
+    color: var(--color-link);
-    cursor: grabbing;
+    cursor: pointer;
    -moz-user-select: none;
    -webkit-user-select: none;
    -ms-user-select: none;
@@ -347,8 +547,8 @@ body:after, body:before {
 footer {
  padding: 10px;
-  background: #fff;
+  background: var(--color-background);
-  color: #444;
+  color: var(--color-text-footer);
  text-align: center; }
 #feed-icon {
@@ -367,7 +567,7 @@ footer {
  position: absolute;
  top: 60px;
  font-size: 65%;
-  background: #fff;
+  background: var(--color-background);
  padding: 10px; }
  .sticky-tab#left-sticky {
    left: 0px; }
@@ -379,9 +579,10 @@ footer {
    font-weight: bold; }
 #new-version-text a {
-  color: #e07171; }
+  color: var(--color-link-new-version); }
 .watch-controls {
  color: #f8321b;
  /* default */ }
  .watch-controls .state-on img {
    opacity: 0.8; }
@@ -396,7 +597,7 @@ footer {
  font-family: monospace;
  white-space: pre;
  overflow-wrap: normal;
-  overflow-x: scroll; }
+  overflow-x: auto; }
 .pure-form {
  /* The input fields with errors */
@@ -406,27 +607,39 @@ footer {
    .pure-form fieldset ul {
      padding-bottom: 0px;
      margin-bottom: 0px; }
-  .pure-form .pure-control-group, .pure-form .pure-group, .pure-form .pure-controls {
+  .pure-form .pure-control-group,
  .pure-form .pure-group,
  .pure-form .pure-controls {
    padding-bottom: 1em; }
-    .pure-form .pure-control-group div, .pure-form .pure-group div, .pure-form .pure-controls div {
+    .pure-form .pure-control-group div,
    .pure-form .pure-group div,
    .pure-form .pure-controls div {
      margin: 0px; }
-    .pure-form .pure-control-group .checkbox > *, .pure-form .pure-group .checkbox > *, .pure-form .pure-controls .checkbox > * {
+    .pure-form .pure-control-group .checkbox > *,
    .pure-form .pure-group .checkbox > *,
    .pure-form .pure-controls .checkbox > * {
      display: inline;
      vertical-align: middle; }
-    .pure-form .pure-control-group .checkbox > label, .pure-form .pure-group .checkbox > label, .pure-form .pure-controls .checkbox > label {
+    .pure-form .pure-control-group .checkbox > label,
    .pure-form .pure-group .checkbox > label,
    .pure-form .pure-controls .checkbox > label {
      padding-left: 5px; }
    .pure-form .pure-control-group legend,
    .pure-form .pure-group legend,
    .pure-form .pure-controls legend {
      color: var(--color-text-legend); }
  .pure-form .error input {
-    background-color: #ffebeb; }
+    background-color: var(--color-error-input); }
  .pure-form ul.errors {
    padding: .5em .6em;
-    border: 1px solid #dd0000;
+    border: 1px solid var(--color-error-list);
    border-radius: 4px;
    vertical-align: middle;
    -webkit-box-sizing: border-box;
    box-sizing: border-box; }
    .pure-form ul.errors li {
      margin-left: 1em;
-      color: #dd0000; }
+      color: var(--color-error-list); }
  .pure-form label {
    font-weight: bold; }
  .pure-form textarea {
@@ -468,15 +681,19 @@ footer {
    /* Force table to not be like tables anymore */
    /* Force table to not be like tables anymore */
    /* Hide table headers (but not display: none;, for accessibility) */ }
-    .watch-table thead, .watch-table tbody, .watch-table th, .watch-table td, .watch-table tr {
+    .watch-table thead,
    .watch-table tbody,
    .watch-table th,
    .watch-table td,
    .watch-table tr {
      display: block; }
    .watch-table .last-checked > span {
      vertical-align: middle; }
    .watch-table .last-checked::before {
-      color: #555;
+      color: var(--color-last-checked);
      content: "Last Checked "; }
    .watch-table .last-changed::before {
-      color: #555;
+      color: var(--color-last-checked);
      content: "Last Changed "; }
    .watch-table td.inline {
      display: inline-block; }
@@ -484,12 +701,13 @@ footer {
      position: absolute;
      top: -9999px;
      left: -9999px; }
-    .watch-table .pure-table td, .watch-table .pure-table th {
+    .watch-table .pure-table td,
    .watch-table .pure-table th {
      border: none; }
    .watch-table td {
      /* Behave  like a "row" */
      border: none;
-      border-bottom: 1px solid #eee;
+      border-bottom: 1px solid var(--color-border-watch-table-cell);
      vertical-align: middle; }
      .watch-table td:before {
        /* Top/left values mimic padding */
@@ -499,12 +717,66 @@ footer {
        padding-right: 10px;
        white-space: nowrap; }
    .watch-table.pure-table-striped tr {
-      background-color: #fff; }
+      background-color: var(--color-table-background); }
    .watch-table.pure-table-striped tr:nth-child(2n-1) {
-      background-color: #eee; }
+      background-color: var(--color-table-stripe); }
    .watch-table.pure-table-striped tr:nth-child(2n-1) td {
      background-color: inherit; } }
 .pure-table {
  border-color: var(--color-border-table-cell); }
  .pure-table thead {
    background-color: var(--color-background-table-thead);
    color: var(--color-text); }
  .pure-table td,
  .pure-table th {
    border-left-color: var(--color-border-table-cell); }
 .pure-table-striped tr:nth-child(2n-1) td {
  background-color: var(--color-table-stripe); }
 .pure-form input[type=color],
 .pure-form input[type=date],
 .pure-form input[type=datetime-local],
 .pure-form input[type=datetime],
 .pure-form input[type=email],
 .pure-form input[type=month],
 .pure-form input[type=number],
 .pure-form input[type=password],
 .pure-form input[type=search],
 .pure-form input[type=tel],
 .pure-form input[type=text],
 .pure-form input[type=time],
 .pure-form input[type=url],
 .pure-form input[type=week],
 .pure-form select,
 .pure-form textarea {
  border: var(--color-border-input);
  box-shadow: inset 0 1px 3px var(--color-shadow-input);
  background-color: var(--color-background-input);
  color: var(--color-text-input); }
  .pure-form input[type=color]:active,
  .pure-form input[type=date]:active,
  .pure-form input[type=datetime-local]:active,
  .pure-form input[type=datetime]:active,
  .pure-form input[type=email]:active,
  .pure-form input[type=month]:active,
  .pure-form input[type=number]:active,
  .pure-form input[type=password]:active,
  .pure-form input[type=search]:active,
  .pure-form input[type=tel]:active,
  .pure-form input[type=text]:active,
  .pure-form input[type=time]:active,
  .pure-form input[type=url]:active,
  .pure-form input[type=week]:active,
  .pure-form select:active,
  .pure-form textarea:active {
    background-color: var(--color-background-input); }
 input::placeholder,
 textarea::placeholder {
  color: var(--color-text-input-placeholder); }
 /** Desktop vs mobile input field strategy
 - We dont use 'size' with <input> because `size` is too unreliable to override, and will often push-out
 - Rely always on width in CSS
@@ -521,25 +793,29 @@ footer {
  .tabs ul li {
    margin-right: 3px;
    display: inline-block;
-    color: #fff;
+    color: var(--color-text-tab);
    border-top-left-radius: 5px;
    border-top-right-radius: 5px;
-    background-color: rgba(255, 255, 255, 0.2); }
+    background-color: var(--color-background-tab); }
-    .tabs ul li.active, .tabs ul li :target {
+    .tabs ul li:not(.active):hover {
-      background-color: #fff; }
+      background-color: var(--color-background-tab-hover); }
-      .tabs ul li.active a, .tabs ul li :target a {
+    .tabs ul li.active,
-        color: #222;
+    .tabs ul li :target {
      background-color: var(--color-background); }
      .tabs ul li.active a,
      .tabs ul li :target a {
        color: var(--color-text-tab-active);
        font-weight: bold; }
    .tabs ul li a {
      display: block;
      padding: 0.8em;
-      color: #fff; }
+      color: var(--color-text-tab); }
 .pure-form-stacked > div:first-child {
  display: block; }
 .login-form .inner {
-  background: #fff;
+  background: var(--color-background);
  padding: 20px;
  border-radius: 5px; }
@@ -569,13 +845,16 @@ body.full-width .edit-form {
  .edit-form .box-wrap {
    position: relative; }
  .edit-form .inner {
-    background: #fff;
+    background: var(--color-background);
    padding: 20px; }
  .edit-form #actions {
    display: block;
-    background: #fff; }
+    background: var(--color-background); }
  .edit-form .pure-form-message-inline {
-    padding-left: 0; }
+    padding-left: 0;
    color: var(--color-text-input-description); }
    .edit-form .pure-form-message-inline code {
      font-size: .875em; }
 ul {
  padding-left: 1em;
@@ -612,13 +891,13 @@ ul {
  cursor: pointer; }
 #api-key-copy {
-  color: #0078e7; }
+  color: var(--color-api-key); }
 .button-green {
-  background-color: #42dd53; }
+  background-color: var(--color-background-button-green); }
 .button-red {
-  background-color: #dd4242; }
+  background-color: var(--color-background-button-red); }
 .noselect {
  -webkit-touch-callout: none;
@@ -631,20 +910,21 @@ ul {
  /* Internet Explorer/Edge */
  user-select: none;
  /* Non-prefixed version, currently
-                                   supported by Chrome, Edge, Opera and Firefox */ }
+    supported by Chrome, Edge, Opera and Firefox */ }
 .snapshot-age {
  padding: 4px;
-  background-color: #dfdfdf;
+  margin: 0.5rem 0;
  background-color: var(--color-background-snapshot-age);
  border-radius: 3px;
  font-weight: bold;
  margin-bottom: 4px; }
  .snapshot-age.error {
-    background-color: #ff0000;
+    background-color: var(--color-error-background-snapshot-age);
-    color: #fff; }
+    color: var(--color-error-text-snapshot-age); }
 #checkbox-operations {
-  background: rgba(0, 0, 0, 0.05);
+  background: var(--color-background-checkbox-operations);
  padding: 1em;
  border-radius: 10px;
  margin-bottom: 1em;
@@ -654,10 +934,10 @@ ul {
  vertical-align: middle; }
 .inline-warning {
-  border: 1px solid #ff3300;
+  border: 1px solid var(--color-border-warning);
  padding: 0.5rem;
  border-radius: 5px;
-  color: #ff3300; }
+  color: var(--color-warning); }
  .inline-warning > span {
    display: inline-block;
    vertical-align: middle; }
@@ -665,3 +945,24 @@ ul {
    display: inline;
    height: 26px;
    vertical-align: middle; }
 /* automatic price following helpers */
 .tracking-ldjson-price-data {
  background-color: var(--color-background-button-green);
  color: #000;
  padding: 3px;
  border-radius: 3px;
  white-space: nowrap; }
 .ldjson-price-track-offer {
  font-weight: bold;
  font-style: italic; }
  .ldjson-price-track-offer a.pure-button {
    border-radius: 3px;
    padding: 3px;
    background-color: var(--color-background-button-green); }
 .price-follow-tag-icon {
  display: inline-block;
  height: 0.8rem;
  vertical-align: middle; }
--- a/changedetectionio/store.py
+++ b/changedetectionio/store.py
@@ -250,12 +250,15 @@ class ChangeDetectionStore:
    def clear_watch_history(self, uuid):
        import pathlib
-        self.__data['watching'][uuid].update(
+        self.__data['watching'][uuid].update({
-            {'last_checked': 0,
+                'last_checked': 0,
-             'last_viewed': 0,
+                'has_ldjson_price_data': None,
-             'previous_md5': False,
+                'last_error': False,
-             'last_notification_error': False,
+                'last_notification_error': False,
-             'last_error': False})
+                'last_viewed': 0,
                'previous_md5': False,
                'track_ldjson_price_data': None,
            })
        # JSON Data, Screenshots, Textfiles (history index and snapshots), HTML in the future etc
        for item in pathlib.Path(os.path.join(self.datastore_path, uuid)).rglob("*.*"):
@@ -289,6 +292,7 @@ class ChangeDetectionStore:
                # List of permissible attributes we accept from the wild internet
                for k in [
                    'body',
                    'browser_steps',
                    'css_filter',
                    'extract_text',
                    'extract_title_as_title',
@@ -620,4 +624,44 @@ class ChangeDetectionStore:
                    watch['include_filters'] = [existing_filter]
            except:
                continue
-        return
+        return
    # Convert old static notification tokens to jinja2 tokens
    def update_9(self):
        # Each watch
        import re
        # only { } not {{ or }}
        r = r'(?<!{){(?!{)(\w+)(?<!})}(?!})'
        for uuid, watch in self.data['watching'].items():
            try:
                n_body = watch.get('notification_body', '')
                if n_body:
                    watch['notification_body'] = re.sub(r, r'{{\1}}', n_body)
                n_title = watch.get('notification_title')
                if n_title:
                    watch['notification_title'] = re.sub(r, r'{{\1}}', n_title)
                n_urls = watch.get('notification_urls')
                if n_urls:
                    for i, url in enumerate(n_urls):
                        watch['notification_urls'][i] = re.sub(r, r'{{\1}}', url)
            except:
                continue
        # System wide
        n_body = self.data['settings']['application'].get('notification_body')
        if n_body:
            self.data['settings']['application']['notification_body'] = re.sub(r, r'{{\1}}', n_body)
        n_title = self.data['settings']['application'].get('notification_title')
        if n_body:
            self.data['settings']['application']['notification_title'] = re.sub(r, r'{{\1}}', n_title)
        n_urls =  self.data['settings']['application'].get('notification_urls')
        if n_urls:
            for i, url in enumerate(n_urls):
                self.data['settings']['application']['notification_urls'][i] = re.sub(r, r'{{\1}}', url)
        return
--- a/changedetectionio/templates/_common_fields.jinja
+++ b/changedetectionio/templates/_common_fields.jinja
@@ -16,14 +16,16 @@
                                <li><code>discord://</code> only supports a maximum <strong>2,000 characters</strong> of notification text, including the title.</li>
                                <li><code>tgram://</code> bots cant send messages to other bots, so you should specify chat ID of non-bot user.</li>
                                <li><code>tgram://</code> only supports very limited HTML and can fail when extra tags are sent, <a href="https://core.telegram.org/bots/api#html-style">read more here</a> (or use plaintext/markdown format)</li>
                                <li><code>gets://</code>, <code>posts://</code>, <code>puts://</code>, <code>deletes://</code> for direct API calls (or omit the "<code>s</code>" for non-SSL ie <code>get://</code>)</li>
                              </ul>
                            </div>
-                            <br/>
+                            <div class="notifications-wrapper">
-                            <a id="send-test-notification" class="pure-button button-secondary button-xsmall" style="font-size: 70%">Send test notification</a>
+                              <a id="send-test-notification" class="pure-button button-secondary button-xsmall" style="font-size: 70%">Send test notification</a>
-{% if emailprefix %}
+                            {% if emailprefix %}
-                            <a id="add-email-helper" class="pure-button button-secondary button-xsmall" style="font-size: 70%">Add email</a>
+                              <a id="add-email-helper" class="pure-button button-secondary button-xsmall" style="font-size: 70%">Add email</a>
-{% endif %}
+                            {% endif %}
-                            <a href="{{url_for('notification_logs')}}" class="pure-button button-secondary button-xsmall" style="font-size: 70%">Notification debug logs</a>
+                              <a href="{{url_for('notification_logs')}}" class="pure-button button-secondary button-xsmall" style="font-size: 70%">Notification debug logs</a>
                            </div>
                        </div>
                        <div id="notification-customisation" class="pure-control-group">
                            <div class="pure-control-group">
@@ -40,8 +42,9 @@
                                <span class="pure-form-message-inline">Format for all notifications</span>
                            </div>
                            <div class="pure-controls">
-                            <span class="pure-form-message-inline">
+                            <p class="pure-form-message-inline">
-                                These tokens can be used in the notification body and title to customise the notification text.
+                                You can use <a target="_new" href="https://jinja.palletsprojects.com/en/3.0.x/templates/">Jinja2</a> templating in the notification title, body and URL.
                            </p>
                                <table class="pure-table" id="token-table">
                                    <thead>
@@ -52,52 +55,49 @@
                                    </thead>
                                    <tbody>
                                    <tr>
-                                        <td><code>{base_url}</code></td>
+                                        <td><code>{{ '{{ base_url }}' }}</code></td>
                                        <td>The URL of the changedetection.io instance you are running.</td>
                                    </tr>
                                    <tr>
-                                        <td><code>{watch_url}</code></td>
+                                        <td><code>{{ '{{ watch_url }}' }}</code></td>
                                        <td>The URL being watched.</td>
                                    </tr>
                                    <tr>
-                                        <td><code>{watch_uuid}</code></td>
+                                        <td><code>{{ '{{ watch_uuid }}' }}</code></td>
                                        <td>The UUID of the watch.</td>
                                    </tr>
                                    <tr>
-                                        <td><code>{watch_title}</code></td>
+                                        <td><code>{{ '{{ watch_title }}' }}</code></td>
                                        <td>The title of the watch.</td>
                                    </tr>
                                    <tr>
-                                        <td><code>{watch_tag}</code></td>
+                                        <td><code>{{ '{{ watch_tag }}' }}</code></td>
-                                        <td>The tag of the watch.</td>
+                                        <td>The watch label / tag</td>
                                    </tr>
                                    <tr>
-                                        <td><code>{preview_url}</code></td>
+                                        <td><code>{{ '{{ preview_url }}' }}</code></td>
                                        <td>The URL of the preview page generated by changedetection.io.</td>
                                    </tr>
                                    <tr>
-                                        <td><code>{diff}</code></td>
+                                        <td><code>{{ '{{ diff_url }}' }}</code></td>
                                        <td>The diff output - differences only</td>
                                    </tr>
                                    <tr>
-                                        <td><code>{diff_full}</code></td>
+                                        <td><code>{{ '{{ diff_full }}' }}</code></td>
                                        <td>The diff output - full difference output</td>
                                    </tr>
                                    <tr>
-                                        <td><code>{diff_url}</code></td>
+                                        <td><code>{{ '{{ current_snapshot }}' }}</code></td>
                                        <td>The URL of the diff page generated by changedetection.io.</td>
                                    </tr>
                                    <tr>
                                        <td><code>{current_snapshot}</code></td>
                                        <td>The current snapshot value, useful when combined with JSON or CSS filters
                                        </td>
                                    </tr>
                                    </tbody>
                                </table>
-                                <br/>
+                                <div class="pure-form-message-inline">
-                                URLs generated by changedetection.io (such as <code>{diff_url}</code>) require the <code>BASE_URL</code> environment variable set.<br/>
+                                    <br>
-                                Your <code>BASE_URL</code> var is currently "{{settings_application['current_base_url']}}"
+                                    URLs generated by changedetection.io (such as <code>{{ '{{ diff_url }}' }}</code>) require the <code>BASE_URL</code> environment variable set.<br/>
-                            </span>
+                                    Your <code>BASE_URL</code> var is currently "{{settings_application['current_base_url']}}"
                                </div>
                            </div>
                        </div>
 {% endmacro %}
--- a/changedetectionio/templates/base.html
+++ b/changedetectionio/templates/base.html
@@ -1,121 +1,152 @@
-<!doctype html>
+<!DOCTYPE html>
-<html lang="en">
+<html lang="en" data-darkmode="{{ get_darkmode_state() }}">
-<head>
+
-    <meta charset="utf-8">
+  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta charset="utf-8"/>
-    <meta name="description" content="Self hosted website change detection.">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
    <meta name="description" content="Self hosted website change detection."/>
    <title>Change Detection{{extra_title}}</title>
-    <link rel="alternate" type="application/rss+xml" title="Changedetection.io » Feed{% if active_tag %}- {{active_tag}}{% endif %}" href="{{ url_for('rss', tag=active_tag , token=app_rss_token)}}" />
+    <link rel="alternate" type="application/rss+xml" title="Changedetection.io » Feed{% if active_tag %}- {{active_tag}}{% endif %}" href="{{ url_for('rss', tag=active_tag , token=app_rss_token)}}"/>
-    <link rel="stylesheet" href="{{url_for('static_content', group='styles', filename='pure-min.css')}}">
+    <link rel="stylesheet" href="{{url_for('static_content', group='styles', filename='pure-min.css')}}"/>
-    <link rel="stylesheet" href="{{url_for('static_content', group='styles', filename='styles.css')}}">
+    <link rel="stylesheet" href="{{url_for('static_content', group='styles', filename='styles.css')}}"/>
    {% if extra_stylesheets %}
-        {% for m in extra_stylesheets %}
+      {% for m in extra_stylesheets %}
-        <link rel="stylesheet" href="{{ m }}?ver=1000">
+        <link rel="stylesheet" href="{{ m }}?ver=1000"/>
-        {% endfor %}
+      {% endfor %}
    {% endif %}
-    <link rel="apple-touch-icon" sizes="180x180" href="{{url_for('static_content', group='favicons', filename='apple-touch-icon.png')}}">
+    <link rel="apple-touch-icon" sizes="180x180" href="{{url_for('static_content', group='favicons', filename='apple-touch-icon.png')}}"/>
-    <link rel="icon" type="image/png" sizes="32x32" href="{{url_for('static_content', group='favicons', filename='favicon-32x32.png')}}">
+    <link rel="icon" type="image/png" sizes="32x32" href="{{url_for('static_content', group='favicons', filename='favicon-32x32.png')}}"/>
-    <link rel="icon" type="image/png" sizes="16x16" href="{{url_for('static_content', group='favicons', filename='favicon-16x16.png')}}">
+    <link rel="icon" type="image/png" sizes="16x16" href="{{url_for('static_content', group='favicons', filename='favicon-16x16.png')}}"/>
-    <link rel="manifest" href="{{url_for('static_content', group='favicons', filename='site.webmanifest')}}">
+    <link rel="manifest" href="{{url_for('static_content', group='favicons', filename='site.webmanifest')}}"/>
-    <link rel="mask-icon" href="{{url_for('static_content', group='favicons', filename='safari-pinned-tab.svg')}}" color="#5bbad5">
+    <link rel="mask-icon" href="{{url_for('static_content', group='favicons', filename='safari-pinned-tab.svg')}}" color="#5bbad5"/>
-    <link rel="shortcut icon" href="{{url_for('static_content', group='favicons', filename='favicon.ico')}}">
+    <link rel="shortcut icon" href="{{url_for('static_content', group='favicons', filename='favicon.ico')}}"/>
-    <meta name="msapplication-TileColor" content="#da532c">
+    <meta name="msapplication-TileColor" content="#da532c"/>
-    <meta name="msapplication-config" content="favicons/browserconfig.xml">
+    <meta name="msapplication-config" content="favicons/browserconfig.xml"/>
-    <meta name="theme-color" content="#ffffff">
+    <meta name="theme-color" content="#ffffff"/>
    <style>
-    body::before {
+      body::before {
-        background-image: url({{url_for('static_content', group='images', filename='gradient-border.png')}});
+        background-image: url({{url_for('static_content', group='images', filename='gradient-border.png') }});
-    }
+      }
    </style>
    <script type="text/javascript" src="{{url_for('static_content', group='js', filename='jquery-3.6.0.min.js')}}"></script>
  </head>
-</head>
+  <body>
-
+    <div class="header">
-<body>
+      <div class="home-menu pure-menu pure-menu-horizontal pure-menu-fixed" id="nav-menu">
 <div class="header">
    <div class="home-menu pure-menu pure-menu-horizontal pure-menu-fixed" id="nav-menu">
        {% if has_password and not current_user.is_authenticated %}
-            <a class="pure-menu-heading" href="https://github.com/dgtlmoon/changedetection.io" rel="noopener"><strong>Change</strong>Detection.io</a>
+          <a class="pure-menu-heading" href="https://github.com/dgtlmoon/changedetection.io" rel="noopener">
            <strong>Change</strong>Detection.io</a>
        {% else %}
-            <a class="pure-menu-heading" href="{{url_for('index')}}"><strong>Change</strong>Detection.io</a>
+          <a class="pure-menu-heading" href="{{url_for('index')}}">
            <strong>Change</strong>Detection.io</a>
        {% endif %}
        {% if current_diff_url %}
-        <a class=current-diff-url href="{{ current_diff_url }}"><span style="max-width: 30%; overflow: hidden;">{{ current_diff_url }}</span></a>
+          <a class="current-diff-url" href="{{ current_diff_url }}">
            <span style="max-width: 30%; overflow: hidden">{{ current_diff_url }}</span></a>
        {% else %}
-        {% if new_version_available and not (has_password and not current_user.is_authenticated) %}
+          {% if new_version_available and not(has_password and not current_user.is_authenticated) %}
-        <span id="new-version-text" class="pure-menu-heading"><a href="https://github.com/dgtlmoon/changedetection.io">A new version is available</a></span>
+            <span id="new-version-text" class="pure-menu-heading">
-        {% endif %}
+              <a href="https://github.com/dgtlmoon/changedetection.io">A new version is available</a>
            </span>
          {% endif %}
        {% endif %}
-        <ul class="pure-menu-list"  id="top-right-menu">
+        <ul class="pure-menu-list" id="top-right-menu">
-        {% if current_user.is_authenticated or not has_password %}
+          {% if current_user.is_authenticated or not has_password %}
-            {% if not current_diff_url %}
+            {% if not
-            <li class="pure-menu-item">
+            current_diff_url %}
              <li class="pure-menu-item">
                <a href="{{ url_for('settings_page')}}" class="pure-menu-link">SETTINGS</a>
-            </li>
+              </li>
-            <li class="pure-menu-item">
+              <li class="pure-menu-item">
                <a href="{{ url_for('import_page')}}" class="pure-menu-link">IMPORT</a>
-            </li>
+              </li>
-            <li class="pure-menu-item">
+              <li class="pure-menu-item">
                <a href="{{ url_for('get_backup')}}" class="pure-menu-link">BACKUP</a>
-            </li>
+              </li>
            {% else %}
-            <li class="pure-menu-item">
+              <li class="pure-menu-item">
                <a href="{{ url_for('edit_page', uuid=uuid, next='diff') }}" class="pure-menu-link">EDIT</a>
-            </li>
+              </li>
            {% endif %}
-        {% else %}
+          {% else %}
            <li class="pure-menu-item">
-                <a class="pure-menu-link" href="https://github.com/dgtlmoon/changedetection.io">Website Change Detection and Notification.</a>
+              <a class="pure-menu-link" href="https://github.com/dgtlmoon/changedetection.io">Website Change Detection and Notification.</a>
            </li>
-        {% endif %}
+          {% endif %}
-
+          {% if current_user.is_authenticated %}
-        {% if current_user.is_authenticated %}
+            <li class="pure-menu-item">
-            <li class="pure-menu-item"><a href="{{url_for('logout')}}" class="pure-menu-link">LOG OUT</a></li>
+              <a href="{{url_for('logout')}}" class="pure-menu-link">LOG OUT</a>
-        {% endif %}
+            </li>
-            <li class="pure-menu-item"><a class="github-link" href="https://github.com/dgtlmoon/changedetection.io">
+          {% endif %}
-                <svg class="octicon octicon-mark-github v-align-middle" height="32" viewBox="0 0 16 16"
+          <li class="pure-menu-item">
-                     version="1.1"
+            {% if dark_mode %}
-                     width="32" aria-hidden="true">
+            {% set darkClass = 'dark' %}
-                    <path fill-rule="evenodd"
+            {% endif %}
-                          d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0016 8c0-4.42-3.58-8-8-8z"></path>
+            <button class="toggle-theme {{darkClass}}" type="button" title="Toggle Light/Dark Mode">
-                </svg>
+              <span class="visually-hidden">Toggle light/dark mode</span>
-            </a></li>
+              <span class="icon-light">
                {% include "svgs/light-mode-toggle-icon.svg" %}
              </span>
              <span class="icon-dark">
                {% include "svgs/dark-mode-toggle-icon.svg" %}
              </span>
            </button>
          </li>
          <li class="pure-menu-item">
            <a class="github-link" href="https://github.com/dgtlmoon/changedetection.io">
              {% include "svgs/github.svg" %}
            </a>
          </li>
        </ul>
      </div>
    </div>
-</div>
+    {% if hosted_sticky %}
-{% if hosted_sticky %}<div class="sticky-tab" id="hosted-sticky"><a href="https://lemonade.changedetection.io/start?ref={{guid}}">Let us host your instance!</a></div>{% endif %}
+      <div class="sticky-tab" id="hosted-sticky">
-{% if left_sticky %}<div class="sticky-tab" id="left-sticky"><a href="{{url_for('preview_page', uuid=uuid)}}">Show current snapshot</a></div> {% endif %}
+        <a href="https://lemonade.changedetection.io/start?ref={{guid}}">Let us host your instance!</a>
-{% if right_sticky %}<div class="sticky-tab" id="right-sticky">{{ right_sticky }}</div> {% endif %}
+      </div>
-<section class="content">
+    {% endif %}
-    <header>
+    {% if left_sticky %}
      <div class="sticky-tab" id="left-sticky">
        <a href="{{url_for('preview_page', uuid=uuid)}}">Show current snapshot</a>
      </div>
    {% endif %}
    {% if right_sticky %}
      <div class="sticky-tab" id="right-sticky">{{ right_sticky }}</div>
    {% endif %}
    <section class="content">
      <header>
        {% block header %}{% endblock %}
-    </header>
+      </header>
-    {% with messages = get_flashed_messages(with_categories=true) %}
+      {% with messages = get_flashed_messages(with_categories = true) %}
-      {% if messages %}
+      {% if
-        <ul class=messages>
+      messages %}
-        {% for category, message in messages %}
+        <ul class="messages">
-          <li class="{{ category }}">{{ message }}</li>
+          {% for category, message in messages %}
-        {% endfor %}
+            <li class="{{ category }}">{{ message }}</li>
          {% endfor %}
        </ul>
      {% endif %}
-    {% endwith %}
+      {% endwith %}
-
+      {% if session['share-link'] %}
    {% if session['share-link'] %}
        <ul class="messages with-share-link">
-          <li class="message">Share this link: <span id="share-link">{{ session['share-link'] }}</span> <img style="height: 1em;display:inline-block;" src="{{url_for('static_content', group='images', filename='copy.svg')}}" /></li>
+          <li class="message">
            Share this link:
            <span id="share-link">{{ session['share-link'] }}</span>
            <img style="height: 1em; display: inline-block" src="{{url_for('static_content', group='images', filename='copy.svg')}}"/>
          </li>
        </ul>
-    {% endif %}
+      {% endif %}
      {% block content %}{% endblock %}
    </section>
    <script
      type="text/javascript"
      src="{{url_for('static_content', group='js', filename='toggle-theme.js')}}"
      defer></script>
  </body>
    {% block content %}
    {% endblock %}
 </section>
 </body>
 </html>
--- a/changedetectionio/templates/clear_all_history.html
+++ b/changedetectionio/templates/clear_all_history.html
@@ -1,32 +1,49 @@
-{% extends 'base.html' %}
+{% extends 'base.html' %} {% block content %}
 {% block content %}
 <div class="edit-form">
-    <div class="box-wrap inner">
+  <div class="box-wrap inner">
-    <form class="pure-form pure-form-stacked" action="{{url_for('clear_all_history')}}" method="POST">
+    <form
-        <input type="hidden" name="csrf_token" value="{{ csrf_token() }}"/>
+      class="pure-form pure-form-stacked"
-        <fieldset>
+      action="{{url_for('clear_all_history')}}"
-            <div class="pure-control-group">
+      method="POST"
-                This will remove version history (snapshots) for ALL watches, but keep your list of URLs! <br/>
+    >
-                You may like to use the <strong>BACKUP</strong> link first.<br/>
+      <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
-            </div>
+      <fieldset>
-            <br/>
+        <div class="pure-control-group">
-            <div class="pure-control-group">
+          This will remove version history (snapshots) for ALL watches, but keep
-                <label for="confirmtext">Confirmation text</label>
+          your list of URLs! <br />
-                <input type="text" id="confirmtext" required="" name="confirmtext" value="" size="10"/>
+          You may like to use the <strong>BACKUP</strong> link first.<br />
-                <span class="pure-form-message-inline">Type in the word <strong>clear</strong> to confirm that you understand.</span>
+        </div>
-            </div>
+        <br />
-            <br/>
+        <div class="pure-control-group">
-            <div class="pure-control-group">
+          <label for="confirmtext">Confirmation text</label>
-                <button type="submit" class="pure-button pure-button-primary">Clear History!</button>
+          <input
-            </div>
+            type="text"
-            <br/>
+            id="confirmtext"
-            <div class="pure-control-group">
+            required=""
-                <a href="{{url_for('index')}}" class="pure-button button-small button-cancel">Cancel</a>
+            name="confirmtext"
-            </div>
+            value=""
-        </fieldset>
+            size="10"
          />
          <span class="pure-form-message-inline"
            >Type in the word <strong>clear</strong> to confirm that you
            understand.</span
          >
        </div>
        <br />
        <div class="pure-control-group">
          <button type="submit" class="pure-button pure-button-primary">
            Clear History!
          </button>
        </div>
        <br />
        <div class="pure-control-group">
          <a href="{{url_for('index')}}" class="pure-button button-cancel"
            >Cancel</a
          >
        </div>
      </fieldset>
    </form>
-    </div>
+  </div>
 </div>
 {% endblock %}
--- a/changedetectionio/templates/diff.html
+++ b/changedetectionio/templates/diff.html
@@ -1,5 +1,5 @@
 {% extends 'base.html' %}
-
+{% from '_helpers.jinja' import render_field, render_checkbox_field, render_button %}
 {% block content %}
 <script>
    const screenshot_url="{{url_for('static_content', group='screenshot', filename=uuid)}}";
@@ -58,6 +58,7 @@
        {% if last_error_screenshot %}<li class="tab" id="error-screenshot-tab"><a href="#error-screenshot">Error Screenshot</a></li> {% endif %}
        <li class="tab" id=""><a href="#text">Text</a></li>
        <li class="tab" id="screenshot-tab"><a href="#screenshot">Screenshot</a></li>
        <li class="tab" id="extract-tab"><a href="#extract">Extract Data</a></li>
    </ul>
 </div>
@@ -108,6 +109,37 @@
           <strong>Screenshot requires Playwright/WebDriver enabled</strong>
         {% endif %}
     </div>
    <div class="tab-pane-inner" id="extract">
        <form id="extract-data-form" class="pure-form pure-form-stacked edit-form"
              action="{{ url_for('diff_history_page', uuid=uuid) }}#extract"
              method="POST">
            <input type="hidden" name="csrf_token" value="{{ csrf_token() }}"/>
            <p>This tool will extract text data from all of the watch history.</p>
            <div class="pure-control-group">
                {{ render_field(extract_form.extract_regex) }}
                <span class="pure-form-message-inline">
                    A <strong>RegEx</strong> is a pattern that identifies exactly which part inside of the text that you want to extract.<br/>
                    <p>
                        For example, to extract only the numbers from text &dash;</br>
                        <strong>Raw text</strong>: <code>Temperature <span style="color: red">5.5</span>°C in Sydney</code></br>
                        <strong>RegEx to extract:</strong> <code>Temperature <span style="color: red">([0-9\.]+)</span></code><br/>
                    </p>
                    <p>
                        <a href="https://RegExr.com/">Be sure to test your RegEx here.</a>
                    </p>
                    <p>
                        Each RegEx group bracket <code>()</code> will be in its own column, the first column value is always the date.
                    </p>
                </span>
            </div>
            <div class="pure-control-group">
                {{ render_button(extract_form.extract_submit_button) }}
            </div>
        </form>
    </div>
 </div>
 <script>
--- a/changedetectionio/templates/edit.html
+++ b/changedetectionio/templates/edit.html
@@ -244,6 +244,7 @@ xpath://body/div/span[contains(@class, 'example-class')]",
                          <span class="pure-form-message-inline"><strong>Note!: //text() function does not work where the &lt;element&gt; contains &lt;![CDATA[]]&gt;</strong></span><br/>
                        {% endif %}
                        <span class="pure-form-message-inline">One rule per line, <i>any</i> rules that matches will be used.<br/>
                    <ul>
                        <li>CSS - Limit text to this CSS rule, only text matching this CSS rule is included.</li>
                        <li>JSON - Limit text to this JSON rule, using either <a href="https://pypi.org/project/jsonpath-ng/" target="new">JSONPath</a> or <a href="https://stedolan.github.io/jq/" target="new">jq</a> (if installed).
--- a/changedetectionio/templates/settings.html
+++ b/changedetectionio/templates/settings.html
@@ -60,7 +60,7 @@
                        {{ render_field(form.application.form.base_url, placeholder="http://yoursite.com:5000/",
                        class="m-d") }}
                        <span class="pure-form-message-inline">
-                            Base URL used for the <code>{base_url}</code> token in notifications and RSS links.<br/>Default value is the ENV var 'BASE_URL' (Currently "{{settings_application['current_base_url']}}"),
+                            Base URL used for the <code>{{ '{{ base_url }}' }}</code> token in notifications and RSS links.<br/>Default value is the ENV var 'BASE_URL' (Currently "{{settings_application['current_base_url']}}"),
                            <a href="https://github.com/dgtlmoon/changedetection.io/wiki/Configurable-BASE_URL-setting">read more here</a>.
                        </span>
                    </div>
--- a/changedetectionio/templates/svgs/dark-mode-toggle-icon.svg
+++ b/changedetectionio/templates/svgs/dark-mode-toggle-icon.svg
@@ -0,0 +1 @@
 <svg xmlns="http://www.w3.org/2000/svg" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" image-rendering="optimizeQuality" fill-rule="evenodd" clip-rule="evenodd" viewBox="0 0 512 262.86"><path fill-rule="nonzero" d="M316.78 16.55h-205.9c-30.5 0-58.22 12.48-78.31 32.57C12.47 69.21 0 96.93 0 127.44c0 30.5 12.47 58.22 32.57 78.31 20.09 20.1 47.81 32.57 78.31 32.57h193.25c21.54 15.43 47.9 24.54 76.26 24.54h.18c36.14 0 69.02-14.79 92.83-38.6 23.8-23.81 38.6-56.67 38.6-92.83 0-36.15-14.78-69.03-38.63-92.8C449.53 14.8 416.67 0 380.57 0h-.18c-23.02 0-44.72 6.02-63.61 16.55zm70.62 97.17.43.09c.82-3.45 2.83-6.19 6.04-8.16 3.2-1.98 6.53-2.57 10.01-1.75l.1-.43c-3.47-.82-6.2-2.83-8.17-6.03-1.98-3.22-2.57-6.55-1.75-10.01l-.43-.1c-.82 3.47-2.83 6.2-6.03 8.18-3.21 1.98-6.55 2.56-10.02 1.74l-.1.43c3.47.82 6.2 2.84 8.18 6.04 1.99 3.19 2.56 6.52 1.74 10zm36.87 16.77.53.12c1.02-4.35 3.55-7.78 7.58-10.26 4.02-2.49 8.2-3.22 12.56-2.19l.13-.53c-4.35-1.03-7.78-3.55-10.26-7.59-2.49-4.03-3.22-8.22-2.2-12.56l-.53-.12c-1.02 4.35-3.55 7.77-7.58 10.26-4.02 2.49-8.21 3.22-12.56 2.19l-.13.53c4.36 1.03 7.78 3.55 10.26 7.58 2.49 4.02 3.22 8.22 2.2 12.57zm-38.79-61.01c-15.69 7.67-26.98 23.26-28.29 41.93-1.96 27.88 19.05 52.06 46.92 54.02 13.23.93 25.64-3.32 35.22-11.02 4.75-3.82 9.66-.45 7.59 4.36-11.33 26.42-38.45 44.04-68.74 41.91-38.29-2.69-67.14-35.91-64.45-74.19C316.3 89.8 347.05 61.67 383.44 62c6.71.06 8.13 4.5 2.04 7.48zm-5.09-53.95h.18c63.75 0 115.91 52.15 115.91 115.9 0 63.75-52.23 115.91-115.91 115.91h-.18c-63.68 0-115.91-52.16-115.91-115.91s52.16-115.9 115.91-115.9z"/></svg>
--- a/changedetectionio/templates/svgs/github.svg
+++ b/changedetectionio/templates/svgs/github.svg
@@ -0,0 +1,3 @@
 <svg class="octicon octicon-mark-github v-align-middle" height="32" viewbox="0 0 16 16" version="1.1" width="32" aria-hidden="true">
  <path fill-rule="evenodd" d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0016 8c0-4.42-3.58-8-8-8z"></path>
 </svg>
--- a/changedetectionio/templates/svgs/light-mode-toggle-icon.svg
+++ b/changedetectionio/templates/svgs/light-mode-toggle-icon.svg
@@ -0,0 +1 @@
 <svg xmlns="http://www.w3.org/2000/svg" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" image-rendering="optimizeQuality" fill-rule="evenodd" clip-rule="evenodd" viewBox="0 0 512 256.04"><path d="M128.02 0h.18c22.03 0 42.83 5.66 61 15.6h210.38c30.89 0 59 12.65 79.38 33.04C499.35 68.99 512 97.1 512 128.02c0 30.92-12.66 59.03-33.02 79.4l-.42.38c-20.34 20.15-48.29 32.64-78.98 32.64H189.24c-18.17 9.93-38.98 15.6-61.04 15.6h-.18c-35.2 0-67.22-14.41-90.42-37.6C14.41 195.25 0 163.24 0 128.02s14.4-67.24 37.59-90.43l.91-.83C61.65 14.05 93.29 0 128.02 0zm-5.95 54.42c0-1.95.8-3.73 2.08-5 2.74-2.77 7.27-2.76 10.02-.01l.14.16a7.042 7.042 0 0 1 1.94 4.85v12.95c0 1.95-.8 3.73-2.08 5.01-2.75 2.75-7.27 2.75-10.02 0a7.084 7.084 0 0 1-2.08-5.01V54.42zm6.05 31.17c11.72 0 22.32 4.75 30 12.43 7.67 7.68 12.43 18.29 12.43 30 0 11.72-4.75 22.32-12.43 30s-18.28 12.43-30 12.43c-11.72 0-22.32-4.75-30.01-12.43-7.67-7.68-12.43-18.28-12.43-30 0-11.72 4.76-22.32 12.43-30 7.69-7.67 18.3-12.43 30.01-12.43zm-56.33-5.34a7.114 7.114 0 0 1-2.07-5.01c0-3.9 3.18-7.09 7.09-7.09 1.81 0 3.62.69 5 2.07l9.16 9.16a7.065 7.065 0 0 1 2.08 5.01c0 1.8-.7 3.62-2.08 5.01a7.057 7.057 0 0 1-5.01 2.08c-1.8 0-3.61-.7-5-2.07l-9.17-9.16zm-17.28 53.81c-1.95 0-3.73-.8-5-2.08-2.77-2.74-2.76-7.27-.01-10.01l.15-.14a7.04 7.04 0 0 1 4.86-1.94h12.94a7.082 7.082 0 0 1 7.09 7.09c0 1.95-.8 3.73-2.07 5.01a7.099 7.099 0 0 1-5.02 2.07H54.51zm25.82 50.28a7.049 7.049 0 0 1-5 2.07c-3.91 0-7.09-3.16-7.09-7.08 0-1.81.68-3.62 2.07-5.01l9.31-9.29a7.02 7.02 0 0 1 4.86-1.94 7.09 7.09 0 0 1 7.09 7.09c0 1.79-.69 3.6-2.08 4.99l-9.16 9.17zm53.82 17.29c0 1.94-.8 3.73-2.08 5-2.74 2.76-7.27 2.75-10.02 0l-.13-.15a7.033 7.033 0 0 1-1.94-4.85v-12.95c0-1.96.8-3.73 2.07-5.01 2.76-2.75 7.27-2.75 10.03 0a7.1 7.1 0 0 1 2.07 5.01v12.95zm50.28-25.83a7.055 7.055 0 0 1 2.07 5.01c0 3.89-3.18 7.09-7.08 7.09-1.81 0-3.63-.69-5.01-2.07l-9.16-9.16a7.095 7.095 0 0 1-2.07-5.02c0-3.9 3.18-7.09 7.08-7.09 1.8 0 3.61.7 5 2.08l9.17 9.16zm17.29-53.82c1.93 0 3.73.81 5 2.08 2.76 2.75 2.75 7.27 0 10.02l-.15.14a7.098 7.098 0 0 1-4.85 1.94h-12.95c-1.96 0-3.74-.8-5.01-2.08-2.76-2.75-2.76-7.27 0-10.02a7.049 7.049 0 0 1 5.01-2.08h12.95zM175.89 71.7a7.074 7.074 0 0 1 5-2.07c3.9 0 7.1 3.19 7.1 7.09 0 1.81-.69 3.62-2.07 5l-9.32 9.31a7.12 7.12 0 0 1-4.86 1.93c-3.91 0-7.09-3.18-7.09-7.09 0-1.8.7-3.61 2.08-5l9.16-9.17zm34.17-41.87c2.96 2.47 5.81 5.07 8.53 7.8 23.22 23.15 37.63 55.17 37.63 90.39s-14.42 67.23-37.6 90.42a130.2 130.2 0 0 1-8.5 7.77h189.46c26.83 0 51.24-10.91 69.02-28.5l.32-.35c17.79-17.79 28.85-42.35 28.85-69.34 0-26.99-11.06-51.55-28.85-69.35-17.77-17.8-42.33-28.84-69.34-28.84H210.06zm-82.04-14.71h.18c62.09 0 112.89 50.81 112.89 112.9 0 62.1-50.86 112.9-112.89 112.9h-.18c-62.03 0-112.9-50.8-112.9-112.9 0-62.09 50.81-112.9 112.9-112.9z"/></svg>
--- a/changedetectionio/templates/watch-overview.html
+++ b/changedetectionio/templates/watch-overview.html
@@ -14,7 +14,7 @@
            <div id="watch-add-wrapper-zone">
                <div>
                    {{ render_simple_field(form.url, placeholder="https://...", required=true) }}
-                    {{ render_simple_field(form.tag, value=active_tag if active_tag else '', placeholder="watch group") }}
+                    {{ render_simple_field(form.tag, value=active_tag if active_tag else '', placeholder="watch label / tag") }}
                </div>
                <div>
                    {{ render_simple_field(form.watch_submit_button, title="Watch this URL!" ) }}
@@ -80,17 +80,17 @@
                <td class="inline checkbox-uuid" ><input name="uuids"  type="checkbox" value="{{ watch.uuid}} "/> <span>{{ loop.index }}</span></td>
                <td class="inline watch-controls">
                    {% if not watch.paused %}
-                    <a class="state-off" href="{{url_for('index', op='pause', uuid=watch.uuid, tag=active_tag)}}"><img src="{{url_for('static_content', group='images', filename='pause.svg')}}" alt="Pause checks" title="Pause checks"/></a>
+                    <a class="state-off" href="{{url_for('index', op='pause', uuid=watch.uuid, tag=active_tag)}}"><img src="{{url_for('static_content', group='images', filename='pause.svg')}}" alt="Pause checks" title="Pause checks" class="icon icon-pause"/></a>
                    {% else %}
-                    <a class="state-on" href="{{url_for('index', op='pause', uuid=watch.uuid, tag=active_tag)}}"><img src="{{url_for('static_content', group='images', filename='play.svg')}}" alt="UnPause checks" title="UnPause checks"/></a>
+                    <a class="state-on" href="{{url_for('index', op='pause', uuid=watch.uuid, tag=active_tag)}}"><img src="{{url_for('static_content', group='images', filename='play.svg')}}" alt="UnPause checks" title="UnPause checks" class="icon icon-unpause"/></a>
                    {% endif %}
-                    <a class="state-{{'on' if watch.notification_muted}}" href="{{url_for('index', op='mute', uuid=watch.uuid, tag=active_tag)}}"><img src="{{url_for('static_content', group='images', filename='bell-off.svg')}}" alt="Mute notifications" title="Mute notifications"/></a>
+                    <a class="link-mute state-{{'on' if watch.notification_muted else 'off'}}" href="{{url_for('index', op='mute', uuid=watch.uuid, tag=active_tag)}}"><img src="{{url_for('static_content', group='images', filename='bell-off.svg')}}" alt="Mute notifications" title="Mute notifications" class="icon icon-mute"/></a>
                </td>
                <td class="title-col inline">{{watch.title if watch.title is not none and watch.title|length > 0 else watch.url}}
                    <a class="external" target="_blank" rel="noopener" href="{{ watch.link.replace('source:','') }}"></a>
-                    <a href="{{url_for('form_share_put_watch', uuid=watch.uuid)}}"><img style="height: 1em;display:inline-block;" src="{{url_for('static_content', group='images', filename='spread.svg')}}" /></a>
+                    <a class="link-spread" href="{{url_for('form_share_put_watch', uuid=watch.uuid)}}"><img style="height: 1em;display:inline-block;" src="{{url_for('static_content', group='images', filename='spread.svg')}}" class="icon icon-spread" title="Create a link to share watch config with others" /></a>
-                    {%if watch.fetch_backend == "html_webdriver" %}<img style="height: 1em; display:inline-block;" src="{{url_for('static_content', group='images', filename='Google-Chrome-icon.png')}}" />{% endif %}
+                    {%if watch.fetch_backend == "html_webdriver" %}<img style="height: 1em; display:inline-block;" src="{{url_for('static_content', group='images', filename='Google-Chrome-icon.png')}}" title="Using a chrome browser" />{% endif %}
                    {% if watch.last_error is defined and watch.last_error != False %}
                    <div class="fetch-error">{{ watch.last_error }}</div>
@@ -98,6 +98,12 @@
                    {% if watch.last_notification_error is defined and watch.last_notification_error != False %}
                    <div class="fetch-error notification-error"><a href="{{url_for('notification_logs')}}">{{ watch.last_notification_error }}</a></div>
                    {% endif %}
                    {% if watch['has_ldjson_price_data'] and not watch['track_ldjson_price_data']  %}
                    <div class="ldjson-price-track-offer">Embedded price data detected, follow only price data? <a href="{{url_for('price_data_follower.accept', uuid=watch.uuid)}}" class="pure-button button-xsmall">Yes</a> <a href="{{url_for('price_data_follower.reject', uuid=watch.uuid)}}" class="">No</a></div>
                    {% endif %}
                    {% if watch['track_ldjson_price_data'] == 'accepted' %}
                    <span class="tracking-ldjson-price-data" title="Automatically following embedded price information"><img src="{{url_for('static_content', group='images', filename='price-tag-icon.svg')}}"  class="price-follow-tag-icon"/> Price</span>
                    {% endif %}
                    {% if not active_tag %}
                    <span class="watch-tag-list">{{ watch.tag}}</span>
                    {% endif %}
@@ -111,13 +117,13 @@
                </td>
                <td>
                    <a {% if watch.uuid in queued_uuids %}disabled="true"{% endif %} href="{{ url_for('form_watch_checknow', uuid=watch.uuid, tag=request.args.get('tag')) }}"
-                       class="recheck pure-button button-small pure-button-primary">{% if watch.uuid in queued_uuids %}Queued{% else %}Recheck{% endif %}</a>
+                       class="recheck pure-button pure-button-primary">{% if watch.uuid in queued_uuids %}Queued{% else %}Recheck{% endif %}</a>
-                    <a href="{{ url_for('edit_page', uuid=watch.uuid)}}" class="pure-button button-small pure-button-primary">Edit</a>
+                    <a href="{{ url_for('edit_page', uuid=watch.uuid)}}" class="pure-button pure-button-primary">Edit</a>
                    {% if watch.history_n >= 2 %}
-                    <a href="{{ url_for('diff_history_page', uuid=watch.uuid) }}" target="{{watch.uuid}}" class="pure-button button-small pure-button-primary diff-link">Diff</a>
+                    <a href="{{ url_for('diff_history_page', uuid=watch.uuid) }}" target="{{watch.uuid}}" class="pure-button pure-button-primary diff-link">Diff</a>
                    {% else %}
                        {% if watch.history_n == 1 or (watch.history_n ==0 and watch.error_text_ctime )%}
-                            <a href="{{ url_for('preview_page', uuid=watch.uuid)}}" target="{{watch.uuid}}" class="pure-button button-small pure-button-primary">Preview</a>
+                            <a href="{{ url_for('preview_page', uuid=watch.uuid)}}" target="{{watch.uuid}}" class="pure-button pure-button-primary">Preview</a>
                        {% endif %}
                    {% endif %}
                </td>
--- a/changedetectionio/tests/test_automatic_follow_ldjson_price.py
+++ b/changedetectionio/tests/test_automatic_follow_ldjson_price.py
@@ -0,0 +1,146 @@
 #!/usr/bin/python3
 import time
 from flask import url_for
 from .util import live_server_setup, extract_UUID_from_client, extract_api_key_from_UI
 def set_response_with_ldjson():
    test_return_data = """<html>
       <body>
     Some initial text</br>
     <p>Which is across multiple lines</p>
     </br>
     So let's see what happens.  </br>
     <div class="sametext">Some text thats the same</div>
     <div class="changetext">Some text that will change</div>
     <script type="application/ld+json">
        {
           "@context":"https://schema.org/",
           "@type":"Product",
           "@id":"https://www.some-virtual-phone-shop.com/celular-iphone-14/p",
           "name":"Celular Iphone 14 Pro Max 256Gb E Sim A16 Bionic",
           "brand":{
              "@type":"Brand",
              "name":"APPLE"
           },
           "image":"https://www.some-virtual-phone-shop.com/15509426/image.jpg",
           "description":"You dont need it",
           "mpn":"111111",
           "sku":"22222",
           "offers":{
              "@type":"AggregateOffer",
              "lowPrice":8097000,
              "highPrice":8099900,
              "priceCurrency":"COP",
              "offers":[
                 {
                    "@type":"Offer",
                    "price":8097000,
                    "priceCurrency":"COP",
                    "availability":"http://schema.org/InStock",
                    "sku":"102375961",
                    "itemCondition":"http://schema.org/NewCondition",
                    "seller":{
                       "@type":"Organization",
                       "name":"ajax"
                    }
                 }
              ],
              "offerCount":1
           }
        }
       </script>
     </body>
     </html>
 """
    with open("test-datastore/endpoint-content.txt", "w") as f:
        f.write(test_return_data)
    return None
 def set_response_without_ldjson():
    test_return_data = """<html>
       <body>
     Some initial text</br>
     <p>Which is across multiple lines</p>
     </br>
     So let's see what happens.  </br>
     <div class="sametext">Some text thats the same</div>
     <div class="changetext">Some text that will change</div>     
     </body>
     </html>
 """
    with open("test-datastore/endpoint-content.txt", "w") as f:
        f.write(test_return_data)
    return None
 # actually only really used by the distll.io importer, but could be handy too
 def test_check_ldjson_price_autodetect(client, live_server):
    live_server_setup(live_server)
    # Give the endpoint time to spin up
    time.sleep(1)
    set_response_with_ldjson()
    # Add our URL to the import page
    test_url = url_for('test_endpoint', _external=True)
    res = client.post(
        url_for("import_page"),
        data={"urls": test_url},
        follow_redirects=True
    )
    assert b"1 Imported" in res.data
    time.sleep(3)
    # Should get a notice that it's available
    res = client.get(url_for("index"))
    assert b'ldjson-price-track-offer' in res.data
    # Accept it
    uuid = extract_UUID_from_client(client)
    client.get(url_for('price_data_follower.accept', uuid=uuid, follow_redirects=True))
    time.sleep(2)
    # Trigger a check
    client.get(url_for("form_watch_checknow"), follow_redirects=True)
    time.sleep(2)
    # Offer should be gone
    res = client.get(url_for("index"))
    assert b'Embedded price data' not in res.data
    assert b'tracking-ldjson-price-data' in res.data
    # and last snapshop (via API) should be just the price
    api_key = extract_api_key_from_UI(client)
    res = client.get(
        url_for("watchsinglehistory", uuid=uuid, timestamp='latest'),
        headers={'x-api-key': api_key},
    )
    # Should see this (dont know where the whitespace came from)
    assert b'"highPrice": 8099900' in res.data
    # And not this cause its not the ld-json
    assert b"So let's see what happens" not in res.data
    client.get(url_for("form_delete", uuid="all"), follow_redirects=True)
    ##########################################################################################
    # And we shouldnt see the offer
    set_response_without_ldjson()
    # Add our URL to the import page
    test_url = url_for('test_endpoint', _external=True)
    res = client.post(
        url_for("import_page"),
        data={"urls": test_url},
        follow_redirects=True
    )
    assert b"1 Imported" in res.data
    time.sleep(3)
    res = client.get(url_for("index"))
    assert b'ldjson-price-track-offer' not in res.data
    ##########################################################################################
    client.get(url_for("form_delete", uuid="all"), follow_redirects=True)
--- a/changedetectionio/tests/test_element_removal.py
+++ b/changedetectionio/tests/test_element_removal.py
@@ -121,7 +121,7 @@ def test_element_removal_full(client, live_server):
        url_for("import_page"), data={"urls": test_url}, follow_redirects=True
    )
    assert b"1 Imported" in res.data
-
+    time.sleep(1)
    # Goto the edit page, add the filter data
    # Not sure why \r needs to be added - absent of the #changetext this is not necessary
    subtractive_selectors_data = "header\r\nfooter\r\nnav\r\n#changetext"
--- a/changedetectionio/tests/test_encoding.py
+++ b/changedetectionio/tests/test_encoding.py
@@ -38,9 +38,6 @@ def test_check_encoding_detection(client, live_server):
        follow_redirects=True
    )
    # Trigger a check
    client.get(url_for("form_watch_checknow"), follow_redirects=True)
    # Give the thread time to pick it up
    time.sleep(2)
--- a/changedetectionio/tests/test_errorhandling.py
+++ b/changedetectionio/tests/test_errorhandling.py
@@ -77,7 +77,8 @@ def test_DNS_errors(client, live_server):
    time.sleep(3)
    res = client.get(url_for("index"))
-    assert b'Name or service not known' in res.data
+    found_name_resolution_error = b"Temporary failure in name resolution" in res.data or b"Name or service not known" in res.data
    assert found_name_resolution_error
    # Should always record that we tried
    assert bytes("just now".encode('utf-8')) in res.data
--- a/changedetectionio/tests/test_extract_csv.py
+++ b/changedetectionio/tests/test_extract_csv.py
@@ -0,0 +1,70 @@
 #!/usr/bin/python3
 import time
 from flask import url_for
 from urllib.request import urlopen
 from .util import set_original_response, set_modified_response, live_server_setup, wait_for_all_checks
 sleep_time_for_fetch_thread = 3
 def test_check_extract_text_from_diff(client, live_server):
    import time
    with open("test-datastore/endpoint-content.txt", "w") as f:
        f.write("Now it's {} seconds since epoch, time flies!".format(str(time.time())))
    live_server_setup(live_server)
    # Add our URL to the import page
    res = client.post(
        url_for("import_page"),
        data={"urls": url_for('test_endpoint', _external=True)},
        follow_redirects=True
    )
    assert b"1 Imported" in res.data
    time.sleep(1)
    # Load in 5 different numbers/changes
    last_date=""
    for n in range(5):
        # Give the thread time to pick it up
        print("Bumping snapshot and checking.. ", n)
        last_date = str(time.time())
        with open("test-datastore/endpoint-content.txt", "w") as f:
            f.write("Now it's {} seconds since epoch, time flies!".format(last_date))
        client.get(url_for("form_watch_checknow"), follow_redirects=True)
        wait_for_all_checks(client)
    res = client.post(
        url_for("diff_history_page", uuid="first"),
        data={"extract_regex": "Now it's ([0-9\.]+)",
              "extract_submit_button": "Extract as CSV"},
        follow_redirects=False
    )
    assert b'Nothing matches that RegEx' not in res.data
    assert res.content_type == 'text/csv'
    # Read the csv reply as stringio
    from io import StringIO
    import csv
    f = StringIO(res.data.decode('utf-8'))
    reader = csv.reader(f, delimiter=',')
    output=[]
    for row in reader:
        output.append(row)
    assert output[0][0] == 'Epoch seconds'
    # Header line + 1 origin/first + 5 changes
    assert(len(output) == 7)
    # We expect to find the last bumped date in the changes in the last field of the spreadsheet
    assert(output[6][2] == last_date)
    # And nothing else, only that group () of the decimal and .
    assert "time flies" not in output[6][2]
--- a/changedetectionio/tests/test_filter_exist_changes.py
+++ b/changedetectionio/tests/test_filter_exist_changes.py
@@ -73,17 +73,17 @@ def test_filter_doesnt_exist_then_exists_should_get_notification(client, live_se
    # Just a regular notification setting, this will be used by the special 'filter not found' notification
    notification_form_data = {"notification_urls": notification_url,
-                              "notification_title": "New ChangeDetection.io Notification - {watch_url}",
+                              "notification_title": "New ChangeDetection.io Notification - {{watch_url}}",
-                              "notification_body": "BASE URL: {base_url}\n"
+                              "notification_body": "BASE URL: {{base_url}}\n"
-                                                   "Watch URL: {watch_url}\n"
+                                                   "Watch URL: {{watch_url}}\n"
-                                                   "Watch UUID: {watch_uuid}\n"
+                                                   "Watch UUID: {{watch_uuid}}\n"
-                                                   "Watch title: {watch_title}\n"
+                                                   "Watch title: {{watch_title}}\n"
-                                                   "Watch tag: {watch_tag}\n"
+                                                   "Watch tag: {{watch_tag}}\n"
-                                                   "Preview: {preview_url}\n"
+                                                   "Preview: {{preview_url}}\n"
-                                                   "Diff URL: {diff_url}\n"
+                                                   "Diff URL: {{diff_url}}\n"
-                                                   "Snapshot: {current_snapshot}\n"
+                                                   "Snapshot: {{current_snapshot}}\n"
-                                                   "Diff: {diff}\n"
+                                                   "Diff: {{diff}}\n"
-                                                   "Diff Full: {diff_full}\n"
+                                                   "Diff Full: {{diff_full}}\n"
                                                   ":-)",
                              "notification_format": "Text"}
--- a/changedetectionio/tests/test_filter_failure_notification.py
+++ b/changedetectionio/tests/test_filter_failure_notification.py
@@ -56,17 +56,17 @@ def run_filter_test(client, content_filter):
    # Just a regular notification setting, this will be used by the special 'filter not found' notification
    notification_form_data = {"notification_urls": notification_url,
-                              "notification_title": "New ChangeDetection.io Notification - {watch_url}",
+                              "notification_title": "New ChangeDetection.io Notification - {{watch_url}}",
-                              "notification_body": "BASE URL: {base_url}\n"
+                              "notification_body": "BASE URL: {{base_url}}\n"
-                                                   "Watch URL: {watch_url}\n"
+                                                   "Watch URL: {{watch_url}}\n"
-                                                   "Watch UUID: {watch_uuid}\n"
+                                                   "Watch UUID: {{watch_uuid}}\n"
-                                                   "Watch title: {watch_title}\n"
+                                                   "Watch title: {{watch_title}}\n"
-                                                   "Watch tag: {watch_tag}\n"
+                                                   "Watch tag: {{watch_tag}}\n"
-                                                   "Preview: {preview_url}\n"
+                                                   "Preview: {{preview_url}}\n"
-                                                   "Diff URL: {diff_url}\n"
+                                                   "Diff URL: {{diff_url}}\n"
-                                                   "Snapshot: {current_snapshot}\n"
+                                                   "Snapshot: {{current_snapshot}}\n"
-                                                   "Diff: {diff}\n"
+                                                   "Diff: {{diff}}\n"
-                                                   "Diff Full: {diff_full}\n"
+                                                   "Diff Full: {{diff_full}}\n"
                                                   ":-)",
                              "notification_format": "Text"}
@@ -84,6 +84,7 @@ def run_filter_test(client, content_filter):
        data=notification_form_data,
        follow_redirects=True
    )
    assert b"Updated watch." in res.data
    time.sleep(3)
--- a/changedetectionio/tests/test_ignore_text.py
+++ b/changedetectionio/tests/test_ignore_text.py
@@ -101,9 +101,6 @@ def test_check_ignore_text_functionality(client, live_server):
    )
    assert b"1 Imported" in res.data
    # Trigger a check
    client.get(url_for("form_watch_checknow"), follow_redirects=True)
    # Give the thread time to pick it up
    time.sleep(sleep_time_for_fetch_thread)
@@ -199,9 +196,6 @@ def test_check_global_ignore_text_functionality(client, live_server):
    )
    assert b"1 Imported" in res.data
    # Trigger a check
    client.get(url_for("form_watch_checknow"), follow_redirects=True)
    # Give the thread time to pick it up
    time.sleep(sleep_time_for_fetch_thread)
--- a/changedetectionio/tests/test_ignorestatuscode.py
+++ b/changedetectionio/tests/test_ignorestatuscode.py
@@ -69,8 +69,6 @@ def test_normal_page_check_works_with_ignore_status_code(client, live_server):
    assert b"1 Imported" in res.data
    time.sleep(sleep_time_for_fetch_thread)
    # Trigger a check
    client.get(url_for("form_watch_checknow"), follow_redirects=True)
    set_some_changed_response()
    time.sleep(sleep_time_for_fetch_thread)
@@ -104,9 +102,6 @@ def test_403_page_check_works_with_ignore_status_code(client, live_server):
    )
    assert b"1 Imported" in res.data
    # Trigger a check
    client.get(url_for("form_watch_checknow"), follow_redirects=True)
    # Give the thread time to pick it up
    time.sleep(sleep_time_for_fetch_thread)
@@ -119,11 +114,9 @@ def test_403_page_check_works_with_ignore_status_code(client, live_server):
    )
    assert b"Updated watch." in res.data
    # Trigger a check
    client.get(url_for("form_watch_checknow"), follow_redirects=True)
    # Give the thread time to pick it up
    time.sleep(sleep_time_for_fetch_thread)
    #  Make a change
    set_some_changed_response()
--- a/changedetectionio/tests/test_jsonpath_jq_selector.py
+++ b/changedetectionio/tests/test_jsonpath_jq_selector.py
@@ -394,6 +394,48 @@ def check_json_ext_filter(json_filter, client, live_server):
    res = client.get(url_for("form_delete", uuid="all"), follow_redirects=True)
    assert b'Deleted' in res.data
 def test_ignore_json_order(client, live_server):
    # A change in order shouldn't trigger a notification
    with open("test-datastore/endpoint-content.txt", "w") as f:
        f.write('{"hello" : 123, "world": 123}')
    # Add our URL to the import page
    test_url = url_for('test_endpoint', content_type="application/json", _external=True)
    res = client.post(
        url_for("import_page"),
        data={"urls": test_url},
        follow_redirects=True
    )
    assert b"1 Imported" in res.data
    time.sleep(2)
    with open("test-datastore/endpoint-content.txt", "w") as f:
        f.write('{"world" : 123, "hello": 123}')
    # Trigger a check
    client.get(url_for("form_watch_checknow"), follow_redirects=True)
    time.sleep(2)
    res = client.get(url_for("index"))
    assert b'unviewed' not in res.data
    # Just to be sure it still works
    with open("test-datastore/endpoint-content.txt", "w") as f:
        f.write('{"world" : 123, "hello": 124}')
    # Trigger a check
    client.get(url_for("form_watch_checknow"), follow_redirects=True)
    time.sleep(2)
    res = client.get(url_for("index"))
    assert b'unviewed' in res.data
    res = client.get(url_for("form_delete", uuid="all"), follow_redirects=True)
    assert b'Deleted' in res.data
 def test_check_jsonpath_ext_filter(client, live_server):
    check_json_ext_filter('json:$[?(@.status==Sold)]', client, live_server)
--- a/changedetectionio/tests/test_notification.py
+++ b/changedetectionio/tests/test_notification.py
@@ -90,17 +90,17 @@ def test_check_notification(client, live_server):
    print (">>>> Notification URL: "+notification_url)
    notification_form_data = {"notification_urls": notification_url,
-                              "notification_title": "New ChangeDetection.io Notification - {watch_url}",
+                              "notification_title": "New ChangeDetection.io Notification - {{watch_url}}",
-                              "notification_body": "BASE URL: {base_url}\n"
+                              "notification_body": "BASE URL: {{base_url}}\n"
-                                                   "Watch URL: {watch_url}\n"
+                                                   "Watch URL: {{watch_url}}\n"
-                                                   "Watch UUID: {watch_uuid}\n"
+                                                   "Watch UUID: {{watch_uuid}}\n"
-                                                   "Watch title: {watch_title}\n"
+                                                   "Watch title: {{watch_title}}\n"
-                                                   "Watch tag: {watch_tag}\n"
+                                                   "Watch tag: {{watch_tag}}\n"
-                                                   "Preview: {preview_url}\n"
+                                                   "Preview: {{preview_url}}\n"
-                                                   "Diff URL: {diff_url}\n"
+                                                   "Diff URL: {{diff_url}}\n"
-                                                   "Snapshot: {current_snapshot}\n"
+                                                   "Snapshot: {{current_snapshot}}\n"
-                                                   "Diff: {diff}\n"
+                                                   "Diff: {{diff}}\n"
-                                                   "Diff Full: {diff_full}\n"
+                                                   "Diff Full: {{diff_full}}\n"
                                                   ":-)",
                              "notification_screenshot": True,
                              "notification_format": "Text"}
@@ -179,7 +179,6 @@ def test_check_notification(client, live_server):
        logging.debug(">>> Skipping BASE_URL check")
    # This should insert the {current_snapshot}
    set_more_modified_response()
    client.get(url_for("form_watch_checknow"), follow_redirects=True)
@@ -237,10 +236,10 @@ def test_check_notification(client, live_server):
        follow_redirects=True
    )
 def test_notification_validation(client, live_server):
-    #live_server_setup(live_server)
+
-    time.sleep(3)
+    time.sleep(1)
    # re #242 - when you edited an existing new entry, it would not correctly show the notification settings
    # Add our URL to the import page
    test_url = url_for('test_endpoint', _external=True)
@@ -268,21 +267,6 @@ def test_notification_validation(client, live_server):
 #    )
 #    assert b"Notification Body and Title is required when a Notification URL is used" in res.data
    # Now adding a wrong token should give us an error
    res = client.post(
        url_for("settings_page"),
        data={"application-notification_title": "New ChangeDetection.io Notification - {watch_url}",
              "application-notification_body": "Rubbish: {rubbish}\n",
              "application-notification_format": "Text",
              "application-notification_urls": "json://localhost/foobar",
              "requests-time_between_check-minutes": 180,
              "fetch_backend": "html_requests"
              },
        follow_redirects=True
    )
    assert bytes("is not a valid token".encode('utf-8')) in res.data
    # cleanup for the next
    client.get(
        url_for("form_delete", uuid="all"),
@@ -290,3 +274,58 @@ def test_notification_validation(client, live_server):
    )
 def test_notification_custom_endpoint_and_jinja2(client, live_server):
    time.sleep(1)
    # test_endpoint - that sends the contents of a file
    # test_notification_endpoint - that takes a POST and writes it to file (test-datastore/notification.txt)
    # CUSTOM JSON BODY CHECK for POST://
    set_original_response()
    test_notification_url = url_for('test_notification_endpoint', _external=True).replace('http://', 'post://')+"?xxx={{ watch_url }}"
    res = client.post(
        url_for("settings_page"),
        data={"application-notification_title": "New ChangeDetection.io Notification - {{ watch_url }}",
              "application-notification_body": '{ "url" : "{{ watch_url }}", "secret": 444 }',
              # https://github.com/caronc/apprise/wiki/Notify_Custom_JSON#get-parameter-manipulation
              "application-notification_urls": test_notification_url,
              "application-minutes_between_check": 180,
              "application-fetch_backend": "html_requests"
              },
        follow_redirects=True
    )
    assert b'Settings updated' in res.data
    # Add a watch and trigger a HTTP POST
    test_url = url_for('test_endpoint', _external=True)
    res = client.post(
        url_for("form_quick_watch_add"),
        data={"url": test_url, "tag": 'nice one'},
        follow_redirects=True
    )
    assert b"Watch added" in res.data
    time.sleep(2)
    set_modified_response()
    client.get(url_for("form_watch_checknow"), follow_redirects=True)
    time.sleep(2)
    with open("test-datastore/notification.txt", 'r') as f:
        x=f.read()
        j = json.loads(x)
        assert j['url'].startswith('http://localhost')
        assert j['secret'] == 444
    # URL check, this will always be converted to lowercase
    assert os.path.isfile("test-datastore/notification-url.txt")
    with open("test-datastore/notification-url.txt", 'r') as f:
        notification_url = f.read()
        assert 'xxx=http' in notification_url
    os.unlink("test-datastore/notification-url.txt")
--- a/changedetectionio/tests/test_notification_errors.py
+++ b/changedetectionio/tests/test_notification_errors.py
@@ -11,23 +11,23 @@ def test_check_notification_error_handling(client, live_server):
    set_original_response()
    # Give the endpoint time to spin up
-    time.sleep(3)
+    time.sleep(2)
-    # use a different URL so that it doesnt interfere with the actual check until we are ready
+    # Set a URL and fetch it, then set a notification URL which is going to give errors
    test_url = url_for('test_endpoint', _external=True)
    res = client.post(
        url_for("form_quick_watch_add"),
-        data={"url": "https://changedetection.io/CHANGELOG.txt", "tag": ''},
+        data={"url": test_url, "tag": ''},
        follow_redirects=True
    )
    assert b"Watch added" in res.data
-    time.sleep(10)
+    time.sleep(2)
    set_modified_response()
    # Check we capture the failure, we can just use trigger_check = y here
    res = client.post(
        url_for("edit_page", uuid="first"),
-        data={"notification_urls": "jsons://broken-url.changedetection.io/test",
+        data={"notification_urls": "jsons://broken-url-xxxxxxxx123/test",
              "notification_title": "xxx",
              "notification_body": "xxxxx",
              "notification_format": "Text",
@@ -36,15 +36,14 @@ def test_check_notification_error_handling(client, live_server):
              "title": "",
              "headers": "",
              "time_between_check-minutes": "180",
-              "fetch_backend": "html_requests",
+              "fetch_backend": "html_requests"},
              "trigger_check": "y"},
        follow_redirects=True
    )
    assert b"Updated watch." in res.data
    found=False
    for i in range(1, 10):
-        time.sleep(1)
+
        logging.debug("Fetching watch overview....")
        res = client.get(
            url_for("index"))
@@ -53,6 +52,7 @@ def test_check_notification_error_handling(client, live_server):
            found=True
            break
        time.sleep(1)
    assert found
@@ -60,7 +60,7 @@ def test_check_notification_error_handling(client, live_server):
    # The error should show in the notification logs
    res = client.get(
        url_for("notification_logs"))
-    assert bytes("Name or service not known".encode('utf-8')) in res.data
+    found_name_resolution_error = b"Temporary failure in name resolution" in res.data or b"Name or service not known" in res.data
    assert found_name_resolution_error
-
+    client.get(url_for("form_delete", uuid="all"), follow_redirects=True)
    # And it should be listed on the watch overview
--- a/changedetectionio/tests/test_request.py
+++ b/changedetectionio/tests/test_request.py
@@ -20,6 +20,8 @@ def test_headers_in_request(client, live_server):
    )
    assert b"1 Imported" in res.data
    time.sleep(1)
    res = client.post(
        url_for("import_page"),
        data={"urls": test_url},
@@ -174,6 +176,7 @@ def test_method_in_request(client, live_server):
    )
    assert b"1 Imported" in res.data
    time.sleep(2)
    res = client.post(
        url_for("import_page"),
        data={"urls": test_url},
@@ -181,6 +184,8 @@ def test_method_in_request(client, live_server):
    )
    assert b"1 Imported" in res.data
    time.sleep(2)
    # Attempt to add a method which is not valid
    res = client.post(
        url_for("edit_page", uuid="first"),
@@ -206,7 +211,7 @@ def test_method_in_request(client, live_server):
    assert b"Updated watch." in res.data
    # Give the thread time to pick up the first version
-    time.sleep(5)
+    time.sleep(2)
    # The service should echo back the request verb
    res = client.get(
@@ -217,7 +222,7 @@ def test_method_in_request(client, live_server):
    # The test call service will return the verb as the body
    assert b"PATCH" in res.data
-    time.sleep(5)
+    time.sleep(2)
    watches_with_method = 0
    with open('test-datastore/url-watches.json') as f:
--- a/changedetectionio/tests/util.py
+++ b/changedetectionio/tests/util.py
@@ -149,6 +149,9 @@ def live_server_setup(live_server):
            if data != None:
                f.write(data)
        with open("test-datastore/notification-url.txt", "w") as f:
            f.write(request.url)
        print("\n>> Test notification endpoint was hit.\n", data)
        return "Text was set"
--- a/changedetectionio/update_worker.py
+++ b/changedetectionio/update_worker.py
@@ -4,6 +4,7 @@ import queue
 import time
 from changedetectionio import content_fetcher
 from changedetectionio import queuedWatchMetaData
 from changedetectionio.fetch_site_status import FilterNotFoundInResponse
 # A single update worker
@@ -157,11 +158,12 @@ class update_worker(threading.Thread):
        while not self.app.config.exit.is_set():
            try:
-                priority, uuid = self.q.get(block=False)
+                queued_item_data = self.q.get(block=False)
            except queue.Empty:
                pass
            else:
                uuid = queued_item_data.item.get('uuid')
                self.current_uuid = uuid
                if uuid in list(self.datastore.data['watching'].keys()):
@@ -171,11 +173,11 @@ class update_worker(threading.Thread):
                    update_obj= {}
                    xpath_data = False
                    process_changedetection_results = True
-                    print("> Processing UUID {} Priority {} URL {}".format(uuid, priority, self.datastore.data['watching'][uuid]['url']))
+                    print("> Processing UUID {} Priority {} URL {}".format(uuid, queued_item_data.priority, self.datastore.data['watching'][uuid]['url']))
                    now = time.time()
                    try:
-                        changed_detected, update_obj, contents = update_handler.run(uuid)
+                        changed_detected, update_obj, contents = update_handler.run(uuid, skip_when_checksum_same=queued_item_data.item.get('skip_when_checksum_same'))
                        # Re #342
                        # In Python 3, all strings are sequences of Unicode characters. There is a bytes type that holds raw bytes.
                        # We then convert/.decode('utf-8') for the notification etc
@@ -241,6 +243,10 @@ class update_worker(threading.Thread):
                        process_changedetection_results = True
                    except content_fetcher.checksumFromPreviousCheckWasTheSame as e:
                        # Yes fine, so nothing todo
                        pass
                    except content_fetcher.BrowserStepsStepTimout as e:
                        if not self.datastore.data['watching'].get(uuid):
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -57,6 +57,12 @@ services:
     # Used for fetching pages via WebDriver+Chrome where you need Javascript support.
     # Now working on arm64 (needs testing on rPi - tested on Oracle ARM instance)
     # replace image with seleniarm/standalone-chromium:4.0.0-20211213
     # If WEBDRIVER or PLAYWRIGHT are enabled, changedetection container depends on that
     # and must wait before starting (substitute "browser-chrome" with "playwright-chrome" if last one is used)
 #    depends_on:
 #        browser-chrome:
 #            condition: service_started
 #    browser-chrome:
 #        hostname: browser-chrome
--- a/requirements.txt
+++ b/requirements.txt
@@ -29,8 +29,9 @@ apprise~=1.2.0
 # apprise mqtt https://github.com/dgtlmoon/changedetection.io/issues/315
 paho-mqtt
-# Pinned version of cryptography otherwise
+# This mainly affects some ARM builds, which unlike the other builds ignores "ARG CRYPTOGRAPHY_DONT_BUILD_RUST=1"
-# ERROR: Could not build wheels for cryptography which use PEP 517 and cannot be installed directly
+# so without this pinning, the newer versions on ARM will forcefully try to build rust, which results in "rust compiler not found"
 # (introduced once apprise became a dep)
 cryptography~=3.4
 # Used for CSS filtering
--- a/runtime.txt
+++ b/runtime.txt
@@ -1 +1 @@
-python-3.8.12
+python-3.9.15
Author	SHA1	Message	Date
dgtlmoon	6788796788	Attempt retry BEtter messages	2022-12-16 17:29:16 +01:00
dgtlmoon	efafc9bef8	Provide more information on PageUnloadable	2022-12-16 17:04:12 +01:00
dgtlmoon	b7a2501d64	Fetching - Always sort the key order of JSON content for less false alerts (May cause an alert on upgrade, but will be better going forwards) #1219	2022-12-15 09:13:09 +01:00
dgtlmoon	e970fef991	Fetcher + VisualSelector - xPath filter with attribute filter was breaking the element finder	2022-12-14 19:06:49 +01:00
dgtlmoon	b76148a0f4	Fetcher - CPU usage - Skip processing if the previous checksum and the just fetched one was the same (#925 )	2022-12-14 15:08:34 +01:00
dgtlmoon	93cc30437f	Playwright+BrowserSteps - Fetch changes - Fetch simply after page starts rendering + delay seconds, disable service workers	2022-12-14 12:16:04 +01:00
dgtlmoon	6562d6e0d4	Improve ARM/rust build comment	2022-12-13 12:28:20 +01:00
dgtlmoon	6c217cc3b6	README.md - Improving JSONPath example for LD+JSON product data	2022-12-11 11:14:52 +01:00
dgtlmoon	f30cdf0674	0.40.0.2	2022-12-08 22:36:59 +01:00
dgtlmoon	14da0646a7	Price follower - Dont scan for ldjson data when 'no' was clicked on the suggestion (#1207 )	2022-12-08 22:35:37 +01:00
dgtlmoon	b413cdecc7	Adding missing parts for pip build Re #1206	2022-12-08 21:54:55 +01:00
dgtlmoon	7bf52d9275	0.40.0	2022-12-08 20:09:42 +01:00
dgtlmoon	09e6624afd	VisualSelector - Exclude items that are not interactable or visible	2022-12-08 20:08:41 +01:00
dgtlmoon	b58fd995b5	Automatically offer to track LD+JSON product price data (#1204 )	2022-12-08 19:28:20 +01:00
dgtlmoon	f7bb8a0afa	UI - favicon callback no longer needed	2022-12-07 12:14:36 +01:00
dgtlmoon	3e333496c1	Test cleanups (#1196 )	2022-12-07 12:03:28 +01:00
Amro Hendawi	ee776a9627	Update runtime.txt (#1198 )	2022-12-07 00:17:58 +01:00
dgtlmoon	65db4d68e3	Dark mode - HTML template tidy up (#1197 )	2022-12-06 23:50:49 +01:00
dgtlmoon	74d93d10c3	UI - watch tags also known as watch tag / label	2022-12-06 23:16:22 +01:00
dgtlmoon	37aef0530a	Notification templates - bug in update, was updating the main system instead of the watch notification_title incorrectly	2022-12-06 18:29:09 +01:00
dgtlmoon	f86763dc7a	Extract data - minor improvement to example	2022-12-06 10:53:23 +01:00
dgtlmoon	13c25f9b92	Darkmode - Pause/Mute notification colour fix, re #1195	2022-12-06 10:49:24 +01:00
dgtlmoon	265f622e75	Notification - Support for standard API calls post:// posts:// get:// gets:// delete:// deletes:// put:// puts:// (#1194 )	2022-12-05 20:49:08 +01:00
dgtlmoon	c12db2b725	Notifications - tokens/jinja2 templating (#1184 )	2022-12-05 19:58:43 +01:00
dgtlmoon	a048e4a02d	Dark mode - more colour fixes	2022-12-05 19:10:36 +01:00
dgtlmoon	69662ff91c	Test improvement - improving notification error network test	2022-12-05 17:45:30 +01:00
dgtlmoon	fc94c57d7f	Extract text as CSV - Extra validation (#1192 )	2022-12-05 16:36:00 +01:00
dgtlmoon	7b94ba6f23	Dark mode - make watch list easier to read when theres 'unviewed' entries	2022-12-05 15:13:47 +01:00
dgtlmoon	2345b6b558	New feature - Simple extract data by regex from all historical watch text into CSV (#1191 )	2022-12-05 14:48:03 +01:00
dgtlmoon	b8d5a12ad0	UI - Cursor over labels should be pointer	2022-12-05 10:42:48 +01:00
dgtlmoon	9e67a572c5	Dark mode - Make watches with errors easier to read	2022-12-05 09:53:53 +01:00
dgtlmoon	378d7b7362	Dark mode - cookie path should be all site	2022-12-04 20:54:15 +01:00
dgtlmoon	d1d4045c49	Tweaks - adding hover/title to dark mode button	2022-12-04 18:53:56 +01:00
dgtlmoon	77409eeb3a	UI - Dark Mode (#1187 )	2022-12-04 16:39:25 +01:00
peppetemp	87726e0bb2	docker-compose - Add playwright/selenium container dependencies example (#1178 )	2022-12-02 16:13:59 +01:00
dgtlmoon	72222158e9	BrowserSteps - Can be shared by the watch share link	2022-12-02 09:36:13 +01:00
dgtlmoon	1814924c19	Merge branch 'master' of github.com:dgtlmoon/changedetection.io	2022-12-01 23:48:04 +01:00
dgtlmoon	8aae4197d7	UI - Make tabs hoverable	2022-12-01 23:47:51 +01:00
dgtlmoon	3a8a41a3ff	Favicon multiplatform and path fix/update (#1176 )	2022-12-01 23:29:53 +01:00
dgtlmoon	64caeea491	BrowserSteps - Cleanup interface on shutdown	2022-12-01 23:28:20 +01:00
		`@@ -0,0 +1,2 @@`
							`<?xml version="1.0" encoding="UTF-8"?>`
							<svg width="83.39" height="89.648" enable-background="new 0 0 122.406 122.881" version="1.1" viewBox="0 0 83.39 89.648" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><g transform="translate(5e-4 -33.234)"><path d="m44.239 42.946-39.111 39.896 34.908 34.91 39.09-39.876-1.149-34.931zm-0.91791 42.273c0.979-0.979 1.507-1.99 1.577-3.027 0.077-1.043-0.248-2.424-0.967-4.135-0.725-1.717-1.348-3.346-1.87-4.885s-0.814-3.014-0.897-4.432c-0.07-1.42 0.134-2.768 0.624-4.045 0.477-1.279 1.348-2.545 2.607-3.804 2.099-2.099 4.535-3.123 7.314-3.065 2.773 0.063 5.457 1.158 8.04 3.294l2.881 3.034c1.946 2.607 2.799 5.33 2.557 8.166-0.235 2.83-1.532 5.426-3.893 7.785l-6.296-6.297c1.291-1.291 2.035-2.531 2.238-3.727 0.191-1.197-0.165-2.252-1.081-3.168-0.821-0.82-1.717-1.195-2.69-1.139-0.967 0.064-1.908 0.547-2.817 1.457-0.922 0.922-1.393 1.914-1.412 2.977s0.306 2.416 0.973 4.064c0.661 1.652 1.24 3.25 1.736 4.801 0.496 1.553 0.782 3.035 0.858 4.445 0.076 1.426-0.127 2.787-0.591 4.104-0.477 1.316-1.336 2.596-2.588 3.848-2.125 2.125-4.522 3.186-7.212 3.18s-5.311-1.063-7.855-3.16l-3.747 3.746-2.964-2.965 3.766-3.764c-2.423-2.996-3.568-5.998-3.447-9.02 0.127-3.014 1.476-5.813 4.045-8.383l6.278 6.277c-1.412 1.412-2.175 2.799-2.277 4.16-0.108 1.367 0.414 2.627 1.571 3.783 0.839 0.84 1.755 1.26 2.741 1.242 0.985-0.017 1.92-0.47 2.798-1.347zm21.127-46.435h17.457c-0.0269 2.2368 0.69936 16.025 0.69936 16.025l0.785 23.858c0.019 0.609-0.221 1.164-0.619 1.564l5e-3 4e-3 -41.236 42.022c-0.82213 0.8378-2.175 0.83-3.004 0l-37.913-37.91c-0.83-0.83-0.83-2.176 0-3.006l41.236-42.021c0.39287-0.42671 1.502-0.53568 1.502-0.53568zm18.011 11.59c-59.392-29.687-29.696-14.843 0 0z"/></g></svg>
		`@@ -0,0 +1 @@`
							<svg xmlns="http://www.w3.org/2000/svg" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" image-rendering="optimizeQuality" fill-rule="evenodd" clip-rule="evenodd" viewBox="0 0 512 262.86"><path fill-rule="nonzero" d="M316.78 16.55h-205.9c-30.5 0-58.22 12.48-78.31 32.57C12.47 69.21 0 96.93 0 127.44c0 30.5 12.47 58.22 32.57 78.31 20.09 20.1 47.81 32.57 78.31 32.57h193.25c21.54 15.43 47.9 24.54 76.26 24.54h.18c36.14 0 69.02-14.79 92.83-38.6 23.8-23.81 38.6-56.67 38.6-92.83 0-36.15-14.78-69.03-38.63-92.8C449.53 14.8 416.67 0 380.57 0h-.18c-23.02 0-44.72 6.02-63.61 16.55zm70.62 97.17.43.09c.82-3.45 2.83-6.19 6.04-8.16 3.2-1.98 6.53-2.57 10.01-1.75l.1-.43c-3.47-.82-6.2-2.83-8.17-6.03-1.98-3.22-2.57-6.55-1.75-10.01l-.43-.1c-.82 3.47-2.83 6.2-6.03 8.18-3.21 1.98-6.55 2.56-10.02 1.74l-.1.43c3.47.82 6.2 2.84 8.18 6.04 1.99 3.19 2.56 6.52 1.74 10zm36.87 16.77.53.12c1.02-4.35 3.55-7.78 7.58-10.26 4.02-2.49 8.2-3.22 12.56-2.19l.13-.53c-4.35-1.03-7.78-3.55-10.26-7.59-2.49-4.03-3.22-8.22-2.2-12.56l-.53-.12c-1.02 4.35-3.55 7.77-7.58 10.26-4.02 2.49-8.21 3.22-12.56 2.19l-.13.53c4.36 1.03 7.78 3.55 10.26 7.58 2.49 4.02 3.22 8.22 2.2 12.57zm-38.79-61.01c-15.69 7.67-26.98 23.26-28.29 41.93-1.96 27.88 19.05 52.06 46.92 54.02 13.23.93 25.64-3.32 35.22-11.02 4.75-3.82 9.66-.45 7.59 4.36-11.33 26.42-38.45 44.04-68.74 41.91-38.29-2.69-67.14-35.91-64.45-74.19C316.3 89.8 347.05 61.67 383.44 62c6.71.06 8.13 4.5 2.04 7.48zm-5.09-53.95h.18c63.75 0 115.91 52.15 115.91 115.9 0 63.75-52.23 115.91-115.91 115.91h-.18c-63.68 0-115.91-52.16-115.91-115.91s52.16-115.9 115.91-115.9z"/></svg>