diff --git a/config.json b/config.json
index cbe2bb65..6199ef06 100644
--- a/config.json
+++ b/config.json
@@ -104,6 +104,15 @@
 "notes.sidebar.visible": false,
 "notes.showSource": true,
 "searchpane.zoom" : 1.0,
-"switchLeftRight": false
+"switchLeftRight": false,
+"highlighting": true,
+"pdf.onOpen.autoFillTagsWithPDFsTags" : true,
+"pdf.onOpen.autoFillFieldsWithPDFName": [],
+"pdf.import.folders_to_search" : [],
+"notes.queue.priorityScaleFactor": 5,
+"notes.queue.missedNotesHandling": "remove-schedule",
+"notes.queue.scheduleDialogOnDoneUnscheduledNotes": false,
+"notes.queue.intervalSchedulesStartToday": true,
+"pdf.theme": "pdf_reader.css"
 
-}
\ No newline at end of file
+}
diff --git a/src/__init__.py b/src/__init__.py
index 4710e018..0969eb4e 100644
--- a/src/__init__.py
+++ b/src/__init__.py
@@ -35,11 +35,14 @@
 import time as t
 import webbrowser
 import functools
+import typing
+from typing import Dict, Any, List, Tuple, Optional, Callable
 import sys
 sys.path.insert(0, os.path.dirname(__file__))
 
 import utility.tags
 import utility.misc
+import state
 
 from .state import check_index, get_index, corpus_is_loaded, set_corpus, set_edit, get_edit
 from .index.indexing import build_index, get_notes_in_collection
@@ -54,26 +57,20 @@
 from .config import get_config_value_or_default
 from .command_parsing import expanded_on_bridge_cmd, toggleAddon, rerenderNote, rerender_info, add_note_to_index
 
-
-
-
 config = mw.addonManager.getConfig(__name__)
 
 def init_addon():
+    """ Executed once on Anki startup. """
     global origEditorContextMenuEvt
 
-    # wrap js -> py bridge to include the add-ons commands, see command_parsing.py
-    Editor.onBridgeCmd = wrap(Editor.onBridgeCmd, expanded_on_bridge_cmd, "around")
-    #todo: Find out if there is a better moment to start index creation
+    gui_hooks.webview_did_receive_js_message.append(expanded_on_bridge_cmd)
     
-    create_db_file_if_not_exists()
+    #todo: Find out if there is a better moment to start index creation
+    state.db_file_existed = create_db_file_if_not_exists()
 
     gui_hooks.profile_did_open.append(build_index)
     gui_hooks.profile_did_open.append(insert_scripts)
     gui_hooks.profile_did_open.append(recalculate_priority_queue)
-    #disabled for now, to be able to use Occlude Image in the context menu
-    #origEditorContextMenuEvt = EditorWebView.contextMenuEvent
-    #EditorWebView.contextMenuEvent = editorContextMenuEventWrapper
 
     if get_config_value_or_default("searchOnTagEntry", True):
         TagEdit.keyPressEvent = wrap(TagEdit.keyPressEvent, tag_edit_keypress, "around")
@@ -81,12 +78,15 @@ def init_addon():
     setup_tagedit_timer()
 
     # add new notes to search index when adding
-    AddCards.addNote = wrap(AddCards.addNote, add_note_and_update_index, "around")
+    gui_hooks.add_cards_did_add_note.append(add_note_to_index)
+
     # update notes in index when changed through the "Edit" button
     EditDialog.saveAndClose = wrap(EditDialog.saveAndClose, editor_save_with_index_update, "around")
 
     # shortcut to toggle add-on pane 
     gui_hooks.editor_did_init_shortcuts.append(add_hide_show_shortcut) 
+    # reset state after the add/edit dialog is opened
+    gui_hooks.editor_did_init_shortcuts.append(reset_state) 
 
     # add-on internal hooks
     setup_hooks()
@@ -97,24 +97,14 @@ def init_addon():
             document.addEventListener("keydown", function (e) {globalKeydown(e); }, false);
     </script>"""
     
-    typing_delay = max(500, config['delayWhileTyping'])
     #this inserts all the javascript functions in scripts.js into the editor webview
-    aqt.editor._html += getScriptPlatformSpecific(typing_delay)
+    aqt.editor._html += getScriptPlatformSpecific()
+
     #when a note is loaded (i.e. the add cards dialog is opened), we have to insert our html for the search ui
     gui_hooks.editor_did_load_note.append(on_load_note)
 
 
-
-
-def add_note_and_update_index(dialog, note, _old):
-    """
-        Wrapper around the note adding method, to update the index with the new created note.
-    """
-    res = _old(dialog, note)
-    add_note_to_index(note)
-    return res
-
-def editor_save_with_index_update(dialog, _old):
+def editor_save_with_index_update(dialog: EditDialog, _old: Callable):
     _old(dialog)
     # update index
     index = get_index()
@@ -126,7 +116,7 @@ def editor_save_with_index_update(dialog, _old):
         index.ui.edited[str(dialog.editor.note.id)] = t.time()
 
 
-def on_load_note(editor):
+def on_load_note(editor: Editor):
     """
     Executed everytime a note is created/loaded in the add cards dialog.
     Wraps the normal editor html in a flex layout to render a second column for the searching ui.
@@ -134,18 +124,26 @@ def on_load_note(editor):
 
     #only display in add cards dialog or in the review edit dialog (if enabled)
     if editor.addMode or (get_config_value_or_default("useInEdit", False) and isinstance(editor.parentWindow, EditCurrent)):
-        index = get_index()
 
-        zoom = get_config_value_or_default("searchpane.zoom", 1.0)
-        show_tag_info_on_hover = "true" if get_config_value_or_default("showTagInfoOnHover", True) and get_config_value_or_default("noteScale", 1.0) == 1.0 and zoom == 1.0 else "false"
+        index                   = get_index()
+        zoom                    = get_config_value_or_default("searchpane.zoom", 1.0)
+        typing_delay            = max(500, get_config_value_or_default('delayWhileTyping', 1000))
+        show_tag_info_on_hover  = "true" if get_config_value_or_default("showTagInfoOnHover", True) and get_config_value_or_default("noteScale", 1.0) == 1.0 and zoom == 1.0 else "false"
+
         editor.web.eval(f"""
-            var showTagInfoOnHover = {show_tag_info_on_hover}; 
-            tagHoverTimeout = {get_config_value_or_default("tagHoverDelayInMiliSec", 1000)};
+            var showTagInfoOnHover  = {show_tag_info_on_hover}; 
+            tagHoverTimeout         = {get_config_value_or_default("tagHoverDelayInMiliSec", 1000)};
+            var delayWhileTyping    = {typing_delay};
         """)
 
         def cb(was_already_rendered):
             if was_already_rendered:
                 return
+
+            if index is not None and index.ui is not None:
+                index.ui.set_editor(editor)
+                index.ui._loadPlotJsIfNotLoaded()
+
             if index is not None:
                 setup_ui_after_index_built(editor, index)
 
@@ -153,47 +151,36 @@ def cb(was_already_rendered):
 
             fillDeckSelect(editor)
             if index is not None and index.lastSearch is None:
-                printStartingInfo(editor)
+                print_starting_info(editor)
             if not corpus_is_loaded():
                 corpus = get_notes_in_collection()
                 set_corpus(corpus)
 
-            if index is not None and index.ui is not None:
-                index.ui.set_editor(editor)
-                index.ui._loadPlotJsIfNotLoaded()
-
-
         # render the right side (search area) of the editor
         # (the script checks if it has been rendered already)
         editor.web.evalWithCallback(right_side_html(index is not None), cb)
-        
       
 
     if get_edit() is None and editor is not None:
         set_edit(editor)
 
+def on_add_cards_init(add_cards: AddCards):
+    if get_index() is not None and add_cards.editor is not None:
+        get_index().ui.set_editor(add_cards.editor)
 
 
-def editorContextMenuEventWrapper(view, evt):
-    global contextEvt
-    win = aqt.mw.app.activeWindow()
-    if isinstance(win, Browser):
-        origEditorContextMenuEvt(view, evt)
-        return
-    contextEvt = evt
-    pos = evt.pos()
-    determineClickTarget(pos)
-    #origEditorContextMenuEvt(view, evt)
-
 def insert_scripts():
     """
         Expose the scripts on the internal web server.
         styles.css and pdf_reader.css are not included that way, because they 
         are processed ($<config value>$ placeholders are replaced) and inserted via <style> tags.
     """
-    addon_id = utility.misc.get_addon_id()
-    mw.addonManager.setWebExports(addon_id, ".*\\.(js|css|map|png|ttf)$")
-    port = mw.mediaServer.getPort()
+
+    addon_id    = utility.misc.get_addon_id()
+    pdf_theme   = get_config_value_or_default("pdf.theme", "pdf_reader.css")
+    port        = mw.mediaServer.getPort()
+
+    mw.addonManager.setWebExports(addon_id, ".*\\.(js|css|map|png|svg|ttf)$")
     aqt.editor._html += f"""
     <script>
         var script = document.createElement('script');
@@ -206,6 +193,11 @@ def insert_scripts():
         script.src = 'http://127.0.0.1:{port}/_addons/{addon_id}/web/pdfjs/pdf.min.js';
         document.body.appendChild(script);
 
+        script = document.createElement('script');
+        script.type = 'text/javascript';
+        script.src = 'http://127.0.0.1:{port}/_addons/{addon_id}/web/pdf_highlighting.js';
+        document.body.appendChild(script);
+
         script = document.createElement('script');
         script.type = 'text/javascript';
         script.src = 'http://127.0.0.1:{port}/_addons/{addon_id}/web/pdf_reader.js';
@@ -217,6 +209,13 @@ def insert_scripts():
         script.href = 'http://127.0.0.1:{port}/_addons/{addon_id}/web/pdfjs/textlayer.css';
         document.body.appendChild(script);
 
+        script = document.createElement('link');
+        script.type = 'text/css';
+        script.id ='siac-pdf-css';
+        script.rel = 'stylesheet';
+        script.href = 'http://127.0.0.1:{port}/_addons/{addon_id}/web/{pdf_theme}';
+        document.body.appendChild(script);
+
         var css = `@font-face {{
                         font-family: "Open Sans";
                         src: url("http://127.0.0.1:{port}/_addons/{addon_id}/web/font/OpenSans-Regular.ttf");
@@ -243,64 +242,38 @@ def insert_scripts():
     </script>
     """
 
-@requires_index_loaded
-def determineClickTarget(pos):
-    get_index().ui._editor.web.page().runJavaScript("sendClickedInformation(%s, %s)" % (pos.x(), pos.y()), addOptionsToContextMenu)
-
-
-def addOptionsToContextMenu(clickInfo):
-    index = get_index()
-
-    if clickInfo is not None and clickInfo.startswith("img "):
-        try:
-            src = clickInfo[4:]
-            m = QMenu(index.ui._editor.web)
-            a = m.addAction("Open Image in Browser")
-            a.triggered.connect(lambda: openImgInBrowser(src))
-            cpSubMenu = m.addMenu("Copy Image To Field...")
-            for key in index.ui._editor.note.keys():
-                cpSubMenu.addAction("Append to %s" % key).triggered.connect(functools.partial(appendImgToField, src, key))
-            m.popup(QCursor.pos())
-        except:
-            origEditorContextMenuEvt(index.ui._editor.web, contextEvt)
-    elif clickInfo is not None and clickInfo.startswith("note "):
-        try:
-            content = " ".join(clickInfo.split()[2:])
-            nid = int(clickInfo.split()[1])
-            m = QMenu(index.ui._editor.web)
-            a = m.addAction("Find Notes Added On The Same Day")
-            a.triggered.connect(lambda: getCreatedSameDay(index, index.ui._editor, nid))
-            m.popup(QCursor.pos())
-        except:
-            origEditorContextMenuEvt(index.ui._editor.web, contextEvt)
-
-    # elif clickInfo is not None and clickInfo.startswith("span "):
-    #     content = clickInfo.split()[1]
+def setup_hooks():
+    """ Todo: move more add-on code to hooks. """
 
-    else:
-        origEditorContextMenuEvt(index.ui._editor.web, contextEvt)
+    add_hook("user-note-created", lambda: get_index().ui.sidebar.refresh_tab(1))
+    add_hook("user-note-deleted", lambda: get_index().ui.sidebar.refresh_tab(1))
+    add_hook("user-note-deleted", lambda: recalculate_priority_queue())
+    add_hook("user-note-edited", lambda: get_index().ui.sidebar.refresh_tab(1))
+    add_hook("user-note-edited", lambda: get_index().ui.reading_modal.reload_bottom_bar())
+    add_hook("updated-schedule", lambda: get_index().ui.reading_modal.reload_bottom_bar())
+    add_hook("reading-modal-closed", lambda: get_index().ui.sidebar.refresh_tab(1))
 
 
-def setup_hooks():
-    add_hook("user-note-created", reload_note_sidebar)
-    add_hook("user-note-deleted", reload_note_sidebar)
-    add_hook("user-note-edited", reload_note_sidebar)
-    add_hook("user-note-edited", lambda: get_index().ui.reading_modal.reload_bottom_bar())
+def reset_state(shortcuts: List[Tuple], editor: Editor):
+    """ After the Add Card / Edit Current dialog is opened, some state variables need to be reset. """
+    
+    # might still be true if Create Note dialog was closed by closing its parent window, so reset it
+    state.note_editor_shown = False
 
+def add_hide_show_shortcut(shortcuts: List[Tuple], editor: Editor):
+    """ Register a shortcut to toggle the add-on pane. """
 
-def add_hide_show_shortcut(shortcuts, editor):
     if not "toggleShortcut" in config:
         return
     QShortcut(QKeySequence(config["toggleShortcut"]), editor.widget, activated=toggleAddon)
     QShortcut(QKeySequence("Ctrl+o"), editor.widget, activated=show_quick_open_pdf)
 
-def openImgInBrowser(url):
-    if len(url) > 0:
-        webbrowser.open(url)
-
 def show_quick_open_pdf():
-    ix = get_index()
-    dialog = QuickOpenPDF(ix.ui._editor.parentWindow)
+    """ Ctrl + O pressed -> show small dialog to quickly open a PDF. """
+
+    ix      = get_index()
+    dialog  = QuickOpenPDF(ix.ui._editor.parentWindow)
+
     if dialog.exec_():
         if dialog.chosen_id is not None and dialog.chosen_id > 0:
             def cb(can_load):
@@ -308,25 +281,6 @@ def cb(can_load):
                     ix.ui.reading_modal.display(dialog.chosen_id)
             ix.ui.js_with_cb("beforeNoteQuickOpen();", cb)
 
-def appendNoteToField(content, key):
-    if not check_index():
-        return
-    index = get_index()
-    note = index.ui._editor.note
-    note.fields[note._fieldOrd(key)] += content
-    note.flush()
-    index.ui._editor.loadNote()
-
-def appendImgToField(src, key):
-    if src is None or len(src) == 0:
-        return
-    index = get_index()
-    note = index.ui._editor.note
-    src = re.sub("https?://[0-9.]+:\\d+/", "", src)
-    note.fields[note._fieldOrd(key)] += "<img src='%s'/>" % src
-    note.flush()
-    index.ui._editor.loadNote()
-
 def setup_tagedit_timer():
     global tagEditTimer
     tagEditTimer = QTimer()
diff --git a/src/command_parsing.py b/src/command_parsing.py
index 136e5928..83eaff20 100644
--- a/src/command_parsing.py
+++ b/src/command_parsing.py
@@ -26,6 +26,8 @@
 import os
 import urllib.parse
 import json
+import typing
+from typing import List, Dict, Any, Optional, Tuple
 
 
 from .state import check_index, get_index, set_index, set_corpus
@@ -43,46 +45,54 @@
 from .dialogs.queue_picker import QueuePicker
 from .dialogs.quick_schedule import QuickScheduler
 from .dialogs.url_import import UrlImporter
+from .dialogs.zotero_import import ZoteroImporter
+from .dialogs.schedule_dialog import ScheduleDialog
 from .tag_find import findBySameTag, display_tag_info
 from .stats import calculateStats, findNotesWithLowestPerformance, findNotesWithHighestPerformance, getSortedByInterval
 from .models import SiacNote
 import utility.misc
 import utility.text
+import state
 
 
 config = mw.addonManager.getConfig(__name__)
 
-def expanded_on_bridge_cmd(self, cmd, _old):
+def expanded_on_bridge_cmd(handled: Tuple[bool, Any], cmd: str, self: Any) -> Tuple[bool, Any]:
     """
     Process the various commands coming from the ui -
     this includes users clicks on option checkboxes, on rendered results, on special searches, etc.
 
-    todo: needs some serious cleanup
+    Todo: needs some serious cleanup / splitting up.
+    Todo: maybe move cmd handling to components (reading_modal, sidebar, index)
     """
+    if not isinstance(self, aqt.editor.Editor):
+        return handled
     index = get_index()
     # just to make sure
     if index is not None and index.ui._editor is None:
         index.ui.set_editor(self)
 
+    # there has to be a more elegant way of processing the cmds than a giant if else...
+
     if cmd.startswith("siac-fld "):
         # keyup in fields -> search
         rerender_info(self, cmd[8:])
-    
+
     elif cmd.startswith("siac-page "):
         # page in results clicked
         index.ui.show_page(self, int(cmd.split()[1]))
-    
+
     elif cmd.startswith("siac-srch-db "):
         # bottom search input used
         if index.searchbar_mode == "Add-on":
             rerender_info(self, cmd[13:])
         else:
             rerender_info(self, cmd[13:], searchDB = True)
-    
-    elif cmd.startswith("fldSlctd ") and index is not None:
+
+    elif cmd.startswith("siac-fld-selected ") and index is not None:
         # selection in field or note
-        rerender_info(self, cmd[9:])
-    
+        rerender_info(self, cmd[18:])
+
     elif (cmd.startswith("siac-note-stats ")):
         # note "Info" button clicked
         setStats(cmd[16:], calculateStats(cmd[16:], index.ui.gridView))
@@ -98,6 +108,13 @@ def expanded_on_bridge_cmd(self, cmd, _old):
         # "Edit" clicked on a normal note
         openEditor(mw, int(cmd[15:]))
 
+    elif cmd.startswith("siac-eval "):
+        # direct eval, saves code
+        eval(cmd[10:])
+    elif cmd.startswith("siac-exec "):
+        # direct exec, saves code
+        exec(cmd[10:])
+
     elif cmd.startswith("siac-pin"):
         set_pinned(cmd[9:])
 
@@ -111,8 +128,8 @@ def expanded_on_bridge_cmd(self, cmd, _old):
         fillDeckSelect(self, expanded=True)
     elif cmd == "siac-fill-tag-select":
         fillTagSelect(expanded=True)
-    elif cmd.startswith("searchTag "):
-        rerender_info(self, cmd[10:].strip(), searchByTags=True)
+    elif cmd.startswith("siac-search-tag "):
+        rerender_info(self, cmd[16:].strip(), searchByTags=True)
 
     elif cmd.startswith("siac-tag-info "):
         #this renders the popup
@@ -124,8 +141,8 @@ def expanded_on_bridge_cmd(self, cmd, _old):
             index.ui.print_search_results(*index.ui.previous_calls[ix] + [True])
 
     elif cmd == "siac-rerender":
-        index.ui.try_rerender_last()      
-    
+        index.ui.try_rerender_last()
+
     elif cmd.startswith("siac-notification "):
         tooltip(cmd[18:])
 
@@ -138,7 +155,7 @@ def expanded_on_bridge_cmd(self, cmd, _old):
         cids = [int(cid) for cid in cmd.split()[2:]]
         mw.col.sched.unsuspendCards(cids)
         show_unsuspend_modal(nid)
-        
+
     elif cmd == "siac-show-pdfs":
         if check_index():
             stamp = setStamp()
@@ -153,12 +170,22 @@ def expanded_on_bridge_cmd(self, cmd, _old):
             stamp = setStamp()
             notes = get_all_unread_pdf_notes()
             index.ui.print_search_results(notes, stamp)
-    
+
     elif cmd == "siac-show-pdfs-in-progress":
         if check_index():
             stamp = setStamp()
             notes = get_in_progress_pdf_notes()
             index.ui.print_search_results(notes, stamp)
+    
+    elif cmd == "siac-show-due-today":
+        stamp = setStamp()
+        notes = get_notes_scheduled_for_today()
+        index.ui.print_search_results(notes, stamp)
+
+    elif cmd == "siac-show-last-done":
+        stamp = setStamp()
+        notes = get_last_done_notes()
+        index.ui.print_search_results(notes, stamp)
 
     elif cmd == "siac-pdf-last-read":
         stamp = setStamp()
@@ -173,7 +200,7 @@ def expanded_on_bridge_cmd(self, cmd, _old):
         sp_body = get_pdf_list_first_card()
         notes.insert(0, SiacNote((-1, "PDF Meta", sp_body, "", "Meta", -1, "", "", "", "", -1)))
         index.ui.print_search_results(notes, stamp)
-    
+
     elif cmd == "siac-pdf-find-invalid":
         stamp = setStamp()
         notes = get_invalid_pdfs()
@@ -186,14 +213,14 @@ def expanded_on_bridge_cmd(self, cmd, _old):
         note = get_note(nid)
         read_stats = get_read_stats(nid)
         index.ui.js("""
-            if (pdfLoading || noteLoading) {
+            if (pdfLoading || noteLoading || modalShown) {
                 hideQueueInfobox();
             } else {
                 document.getElementById('siac-pdf-bottom-tabs').style.visibility = "hidden";
                 document.getElementById('siac-queue-infobox').style.display = "block";
                 document.getElementById('siac-queue-infobox').innerHTML =`%s`;
             }
-        """ % get_queue_infobox(note, read_stats))
+        """ % index.ui.reading_modal.get_queue_infobox(note, read_stats))
 
     elif cmd.startswith("siac-pdf-selection "):
         stamp = setStamp()
@@ -250,13 +277,13 @@ def expanded_on_bridge_cmd(self, cmd, _old):
     elif cmd == "siac-url-dialog":
         dialog = UrlImporter(self.parentWindow)
         if dialog.exec_():
-            if dialog.chosen_url is not None and len(dialog.chosen_url) >= 0:
+            if dialog.chosen_url:
                 sched = dialog.queue_schedule
                 name = dialog.get_name()
                 path = config["pdfUrlImportSavePath"]
                 if path is None or len(path) == 0:
                     tooltip("""You have to set a save path for imported URLs first.
-                        <center>Config value: <i>pdfUrlImportSavePath</i></center> 
+                        <center>Config value: <i>pdfUrlImportSavePath</i></center>
                     """, period=4000)
                     return
                 path = utility.misc.get_pdf_save_full_path(path, name)
@@ -267,10 +294,27 @@ def expanded_on_bridge_cmd(self, cmd, _old):
                 create_note(title, "", path, "", "", "", sched)
             else:
                 pass
-        else:
-            pass
 
-    
+    elif cmd == "siac-zotero-import":
+        dialog = ZoteroImporter(self.parentWindow)
+        if dialog.exec_():
+            tooltip(f"Created {dialog.total_count} notes.")
+
+    elif cmd == "siac-schedule-dialog":
+        original_sched = index.ui.reading_modal.note.reminder
+        dialog = ScheduleDialog(index.ui.reading_modal.note, self.parentWindow)
+        if dialog.exec_():
+            schedule = dialog.schedule()
+            if schedule is not None and schedule != original_sched:
+                update_reminder(index.ui.reading_modal.note_id, schedule)
+                index.ui.reading_modal.note.reminder = schedule
+                if schedule == "":
+                    tooltip(f"Removed schedule.")
+                else:
+                    tooltip(f"Updated schedule.")
+                run_hooks("updated-schedule")
+
+
     elif cmd.startswith("siac-pdf-mark "):
         mark_type = int(cmd.split()[1])
         nid = int(cmd.split()[2])
@@ -288,29 +332,52 @@ def expanded_on_bridge_cmd(self, cmd, _old):
         sentences = [s for s in cmd.split("$$$")[4:] if len(s) > 0]
         generate_clozes(sentences, pdf_path, pdf_title, page)
 
+    elif cmd == "siac-reading-modal-tabs-left-browse":
+        # clicked on "Browse" in the tabs on the fields' side.
+        index.ui.reading_modal.show_browse_tab()
+
+    elif cmd == "siac-reading-modal-tabs-left-flds":
+        # clicked on "Fields" in the tabs on the fields' side.
+        index.ui.reading_modal.show_fields_tab()
+
+    elif cmd == "siac-reading-modal-tabs-left-pdfs":
+        # clicked on "Fields" in the tabs on the fields' side.
+        index.ui.reading_modal.show_pdfs_tab()
 
-    elif cmd.startswith("pSort "):
+    elif cmd.startswith("siac-pdf-left-tab-anki-search "):
+        # search input coming from the "Browse" tab in the pdf viewer
+        inp = " ".join(cmd.split(" ")[1:])
+        index.search(inp, ["-1"], only_user_notes = False, print_mode = "pdf.left")
+
+    elif cmd.startswith("siac-pdf-left-tab-pdf-search "):
+        # search input coming from the "PDFs" tab in the pdf viewer
+        inp = " ".join(cmd.split(" ")[1:])
+        if inp: 
+            notes = find_pdf_notes_by_title(inp)
+            index.ui.reading_modal.sidebar.print(notes)
+
+    elif cmd.startswith("siac-p-sort "):
         if check_index():
-            parseSortCommand(cmd[6:])
+            parseSortCommand(cmd[12:])
 
     elif cmd == "siac-model-dialog":
         display_model_dialog()
 
-    elif cmd.startswith("addedSameDay "):
+    elif cmd.startswith("siac-added-same-day "):
         if check_index():
-            getCreatedSameDay(index, self, int(cmd[13:]))
+            getCreatedSameDay(index, self, int(cmd[20:]))
 
-    elif cmd == "lastTiming":
+    elif cmd == "siac-last-timing":
         if index is not None and index.lastResDict is not None:
             show_timing_modal()
-    elif cmd.startswith("lastTiming "):
+    elif cmd.startswith("siac-last-timing "):
         render_time = int(cmd.split()[1])
         if index is not None and index.lastResDict is not None:
             show_timing_modal(render_time)
-    elif cmd.startswith("calInfo "):
+    elif cmd.startswith("siac-cal-info "):
         if check_index():
-            context_html = get_cal_info_context(int(cmd[8:]))
-            res = get_notes_added_on_day_of_year(int(cmd[8:]), min(index.limit, 100))
+            context_html = get_cal_info_context(int(cmd[14:]))
+            res = get_notes_added_on_day_of_year(int(cmd[14:]), min(index.limit, 100))
             index.ui.print_timeline_info(context_html, res)
 
     elif cmd == "siac_rebuild_index":
@@ -333,26 +400,42 @@ def expanded_on_bridge_cmd(self, cmd, _old):
     #
 
     elif cmd == "siac-create-note":
-        NoteEditor(self.parentWindow)
+        if not state.note_editor_shown:
+            NoteEditor(self.parentWindow)
 
     elif cmd.startswith("siac-create-note-add-only "):
-        nid = int(cmd.split()[1])
-        NoteEditor(self.parentWindow, add_only=True, read_note_id=nid)
+        if not state.note_editor_shown:
+            nid = int(cmd.split()[1])
+            NoteEditor(self.parentWindow, add_only=True, read_note_id=nid)
 
     elif cmd.startswith("siac-create-note-tag-prefill "):
-        tag = cmd.split()[1]
-        NoteEditor(self.parentWindow, add_only=False, read_note_id=None, tag_prefill = tag)
+        if not state.note_editor_shown:
+            tag = cmd.split()[1]
+            NoteEditor(self.parentWindow, add_only=False, read_note_id=None, tag_prefill = tag)
+
+    elif cmd.startswith("siac-create-note-source-prefill "):
+        source = " ".join(cmd.split()[1:])
+        existing = get_pdf_id_for_source(source)
+        if existing > 0:
+            index.ui.reading_modal.display(existing)
+        else:
+            if not state.note_editor_shown:
+                NoteEditor(self.parentWindow, add_only=False, read_note_id=None, tag_prefill = None, source_prefill=source)
+            else:
+                tooltip("Close the opened note dialog first!")
 
     elif cmd.startswith("siac-edit-user-note "):
-        id = int(cmd.split()[1])
-        if id > -1:
-            NoteEditor(self.parentWindow, id)
-    
+        if not state.note_editor_shown:
+            id = int(cmd.split()[1])
+            if id > -1:
+                NoteEditor(self.parentWindow, id)
+
     elif cmd.startswith("siac-edit-user-note-from-modal "):
-        id = int(cmd.split()[1])
-        read_note_id = int(cmd.split()[2])
-        if id > -1:
-            NoteEditor(self.parentWindow, note_id=id, add_only=False, read_note_id=read_note_id)
+        if not state.note_editor_shown:
+            id = int(cmd.split()[1])
+            read_note_id = int(cmd.split()[2])
+            if id > -1:
+                NoteEditor(self.parentWindow, note_id=id, add_only=False, read_note_id=read_note_id)
 
     elif cmd.startswith("siac-delete-user-note-modal "):
         nid = int(cmd.split()[1])
@@ -366,10 +449,24 @@ def expanded_on_bridge_cmd(self, cmd, _old):
             index.deleteNote(id)
         run_hooks("user-note-deleted")
         index.ui.js("""
-            $("#greyout").hide(); 
             $('#siac-del-modal').remove();
         """)
 
+    elif cmd == "siac-delete-current-user-note":
+        # delete the currently opened note in the reading modal
+        id = index.ui.reading_modal.note_id
+        delete_note(id)
+        if index is not None:
+            index.deleteNote(id)
+        run_hooks("user-note-deleted")
+        head = get_head_of_queue()
+        tooltip("Deleted note.")
+        if head is None or head < 0:
+            index.ui.js("""
+                onReadingModalClose();
+            """)
+        else:
+            index.ui.reading_modal.display(head)
 
     elif cmd.startswith("siac-read-user-note "):
         id = int(cmd.split()[1])
@@ -387,7 +484,7 @@ def expanded_on_bridge_cmd(self, cmd, _old):
         notes = get_queue_in_random_order()
         if check_index():
             index.ui.print_search_results(notes, stamp)
-    
+
     elif cmd == "siac-user-note-untagged":
         stamp = setStamp()
         notes = get_untagged_notes()
@@ -405,7 +502,7 @@ def expanded_on_bridge_cmd(self, cmd, _old):
         if check_index():
             notes = get_random(index.limit, index.pinned)
             index.ui.print_search_results(notes, stamp)
-    
+
     elif cmd.startswith("siac-user-note-search-tag "):
         stamp = setStamp()
         if check_index():
@@ -420,7 +517,7 @@ def expanded_on_bridge_cmd(self, cmd, _old):
             index.ui.reading_modal.display(picker.chosen_id)
         else:
             index.ui.reading_modal.reload_bottom_bar(nid)
-    
+
     elif cmd.startswith("siac-reload-reading-modal-bottom "):
         nid = int(cmd.split()[1])
         index.ui.reading_modal.reload_bottom_bar(nid)
@@ -443,86 +540,109 @@ def expanded_on_bridge_cmd(self, cmd, _old):
         update_note_text(id, text)
 
     elif cmd.startswith("siac-requeue "):
-        # queue btn pressed 
+        # priority slider released
         nid = int(cmd.split()[1])
-        queue_sched = int(cmd.split()[2])
-        inserted_index = update_priority_list(nid, queue_sched)
-        index.ui.reading_modal.update_bottom_bar_positions(nid, inserted_index[0], inserted_index[1])
-        tooltip(f"<center>Set priority to: <b>{dynamic_sched_to_str(queue_sched)}</b></center><center>Recalculated Priority Queue.</center>")
-
-    elif cmd.startswith("siac-requeue-tt "):
-        # queue btn pressed in tooltip
+        new_prio = int(cmd.split()[2])
+        note = get_note(nid)
+        if note.is_due_sometime() and note.schedule_type() == "td":
+            add_to_prio_log(nid, new_prio)
+            index.ui.reading_modal.display_schedule_dialog()
+        else:
+            if not note.is_due_sometime() and get_config_value_or_default("notes.queue.scheduleDialogOnDoneUnscheduledNotes", False):
+                add_to_prio_log(nid, new_prio)
+                # update_priority_list(nid, new_prio)
+                index.ui.reading_modal.show_schedule_change_modal(unscheduled=True)
+            else:
+                if note.is_due_sometime():
+                    update_reminder(nid, utility.date.get_new_reminder(note.schedule_type(), note.schedule_value()))
+                update_priority_list(nid, new_prio)
+                nid = get_head_of_queue()
+                index.ui.reading_modal.display(nid)
+                if new_prio == 0:
+                    tooltip(f"<center>Removed from Queue.</center>")
+                else:
+                    tooltip(f"<center>Set priority to: <b>{dynamic_sched_to_str(new_prio)}</b></center><center>Recalculated Priority Queue.</center>")
+
+
+    elif cmd.startswith("siac-update-prio "):
+        # prio slider in bottom bar released on value != 0
+        # not used atm
         nid = int(cmd.split()[1])
-        nid_displayed = cmd.split()[3]
-        queue_sched = int(cmd.split()[2])
-        inserted_index = update_priority_list(nid, queue_sched)
-        if nid_displayed != nid:
-            pos_displayed = get_position(nid_displayed)
-            index.ui.reading_modal.update_bottom_bar_positions(nid_displayed, pos_displayed, inserted_index[1])
+        new_prio = int(cmd.split()[2])
+        update_priority_without_timestamp(nid, new_prio)
+        # todo: find a better solution
+        recalculate_priority_queue()
+        index.ui.reading_modal.update_reading_bottom_bar(nid)
+        tooltip(f"<center>Set priority to: <b>{dynamic_sched_to_str(new_prio)}</b></center><center>Recalculated Priority Queue.</center>")
+
+    elif cmd.startswith("siac-remove-from-queue"):
+        update_priority_list(index.ui.reading_modal.note_id, 0)
+        nid = get_head_of_queue()
+        if nid is None or nid < 0:
+            index.ui.eval("onReadingModalClose();")
         else:
-            index.ui.reading_modal.update_bottom_bar_positions(nid, inserted_index[0], inserted_index[1])
-        tooltip(f"<center>Set priority to: <b>{dynamic_sched_to_str(queue_sched)}</b></center><center>Recalculated Priority Queue.</center>")
-        
+            index.ui.reading_modal.display(nid)
+        tooltip(f"<center>Removed from Queue.</center>")
 
-    elif cmd.startswith("siac-remove-from-queue "):
-        # called from the buttons on the left of the reading modal bottom bar 
-        nid = int(cmd.split()[1])
-        remove_from_priority_list(nid)
-        queue_readings_list = get_queue_head_display(nid)
-        index.ui.js("afterRemovedFromQueue();")
-        index.ui.js("$('#siac-queue-lbl').hide(); document.getElementById('siac-queue-lbl').innerHTML = 'Unqueued'; $('#siac-queue-lbl').fadeIn();$('#siac-queue-readings-list').replaceWith(`%s`)" % queue_readings_list)
-    
-    elif cmd.startswith("siac-remove-from-queue-tt "):
-        # called from the tooltip
-        nid = int(cmd.split()[1])
-        nid_displayed = cmd.split()[2]
-        ix = remove_from_priority_list(nid)
-        pos = get_position(nid_displayed)
-        queue_len = ix[1]
-        queue_readings_list = get_queue_head_display(nid)
-        if pos is None:
-            pos_js = """
-                document.getElementById('siac-queue-lbl').innerHTML = 'Unqueued';
-                $('.siac-queue-sched-btn:first').html('Unqueued');
-                """
-        else: 
-            pos_js = """
-                document.getElementById('siac-queue-lbl').innerHTML = 'Position: %s / %s';
-                $('.siac-queue-sched-btn:first').html('%s / %s');
-            """ % (pos + 1, queue_len, pos + 1, queue_len)
-        js = """
-        if ($('#siac-reading-modal-top-bar').data('nid') === '%s')  {
-            document.getElementById('siac-queue-lbl').innerHTML = 'Unqueued';
-             $('.siac-queue-sched-btn:first').html('Unqueued');
-        } else {
-            %s
-        }
-        $('#siac-queue-readings-list').replaceWith(`%s`)""" % (nid, pos_js, queue_readings_list)
-        index.ui.js(js)
+    elif cmd == "siac-on-reading-modal-close":
+        index.ui.reading_modal.note_id = None
+        run_hooks("reading-modal-closed")
 
     elif cmd == "siac-user-note-queue-read-random":
         rand_id = get_random_id_from_queue()
         if rand_id >= 0:
             index.ui.reading_modal.display(rand_id)
         else:
-            index.ui.js("ungreyoutBottom();noteLoading=false;pdfLoading=false;")
+            index.ui.js("ungreyoutBottom();noteLoading=false;pdfLoading=false;modalShown=false;")
             tooltip("Queue is Empty! Add some items first.", period=4000)
 
-
     elif cmd == "siac-user-note-queue-read-head":
         nid = get_head_of_queue()
-        if nid >= 0:
+        if nid is not None and nid >= 0:
             index.ui.reading_modal.display(nid)
         else:
-            index.ui.js("ungreyoutBottom();noteLoading=false;pdfLoading=false;")
             tooltip("Queue is Empty! Add some items first.", period=4000)
 
+    elif cmd == "siac-user-note-done":
+        note = index.ui.reading_modal.note
+        # if note is scheduled for today or some point in the future, show the schedule dialog,
+        # but only if type is 'td', i.e. the note was not scheduled for a regular interval.
+        if note.is_due_sometime() and note.schedule_type() == "td":
+            index.ui.reading_modal.display_schedule_dialog()
+        else:
+            nid = index.ui.reading_modal.note_id
+            prio = get_priority(nid)
+            if not note.is_due_sometime() and get_config_value_or_default("notes.queue.scheduleDialogOnDoneUnscheduledNotes", False):
+                add_to_prio_log(nid, prio)
+                index.ui.reading_modal.show_schedule_change_modal(unscheduled=True)
+            else:
+                if note.is_due_sometime():
+                    update_reminder(nid, utility.date.get_new_reminder(note.schedule_type(), note.schedule_value()))
+                update_priority_list(nid, prio)
+                nid = get_head_of_queue()
+                index.ui.reading_modal.display(nid)
+
+    elif cmd.startswith("siac-update-schedule "):
+        stype = cmd.split()[1]
+        svalue = cmd.split()[2]
+        new_reminder = utility.date.get_new_reminder(stype, svalue)
+        update_reminder(index.ui.reading_modal.note_id, new_reminder)
+        nid = index.ui.reading_modal.note_id
+        prio = get_priority(nid)
+        update_priority_list(nid, prio)
+        nid = get_head_of_queue()
+        if nid is not None and nid >= 0:
+            index.ui.reading_modal.display(nid)
+        else:
+            tooltip("Queue is Empty! Add some items first.", period=4000)
+
+
     elif cmd.startswith("siac-update-note-tags "):
         nid = int(cmd.split()[1])
         tags = " ".join(cmd.split()[2:])
         tags = utility.text.clean_tags(tags)
         update_note_tags(nid, tags)
-        reload_note_sidebar()
+        index.ui.sidebar.refresh()
 
     elif cmd == "siac-try-copy-text-note":
         # copy to new note button clicked in reading modal
@@ -533,7 +653,10 @@ def expanded_on_bridge_cmd(self, cmd, _old):
         if html is None or len(html) == 0:
             tooltip("Note text seems to be empty.")
         else:
-            NoteEditor(self.parentWindow, add_only=True, read_note_id=None, tag_prefill =note.tags, source_prefill=note.source, text_prefill=html, title_prefill = note.title, prio_prefill = prio)
+            if not state.note_editor_shown:
+                NoteEditor(self.parentWindow, add_only=True, read_note_id=None, tag_prefill =note.tags, source_prefill=note.source, text_prefill=html, title_prefill = note.title, prio_prefill = prio)
+            else:
+                tooltip("Close the opened note dialog first!")
 
     elif cmd.startswith("siac-scale "):
         factor = float(cmd.split()[1])
@@ -562,7 +685,7 @@ def expanded_on_bridge_cmd(self, cmd, _old):
         config["pdf.queue.hide"] = False
         write_config()
         index.ui.reading_modal.update_reading_bottom_bar(nid)
-    
+
     elif cmd.startswith("siac-hide-pdf-queue "):
         nid = int(cmd.split()[1])
         config["pdf.queue.hide"] = True
@@ -580,32 +703,6 @@ def expanded_on_bridge_cmd(self, cmd, _old):
             update_priority_list(nid, scheduler.queue_schedule)
             index.ui.reading_modal.reload_bottom_bar(nid)
 
-    elif cmd.startswith("siac-move-end-read-next "):
-        # quick schedule btn clicked when in manual schedule mode
-        nid = int(cmd.split()[1])
-        update_priority_list(nid, QueueSchedule.END.value)
-        nid = get_head_of_queue()
-        index.ui.reading_modal.display(nid)
-    
-    elif cmd.startswith("siac-reschedule-read-next "):
-        # quick schedule btn clicked when in dynamic schedule mode
-        nid = int(cmd.split()[1])
-        sched = int(cmd.split()[2])
-        # sched is 0 when "current" btn is clicked
-        if sched == 0:
-            sched = get_priority(nid)
-            if sched is None:
-                tooltip("Item has no priority yet.", period=3500)
-                return
-        try:
-            update_priority_list(nid, sched)
-            tooltip(f"""Note moved back in queue.<br>
-                    <center>Priority: <b>{dynamic_sched_to_str(sched)}</b></center>""")
-        except:
-            tooltip("Something went wrong during queue recalculation.")
-        nid = get_head_of_queue()
-        index.ui.reading_modal.display(nid)
-
     elif cmd.startswith("siac-left-side-width "):
         value = int(cmd.split()[1])
         if value > 70:
@@ -614,8 +711,8 @@ def expanded_on_bridge_cmd(self, cmd, _old):
         config["leftSideWidthInPercent"] = value
         right = 100 - value
         if check_index():
-            index.ui.js("""document.getElementById('leftSide').style.width = '%s%%'; 
-                        document.getElementById('siac-right-side').style.width = '%s%%'; 
+            index.ui.js("""document.getElementById('leftSide').style.width = '%s%%';
+                        document.getElementById('siac-right-side').style.width = '%s%%';
                         document.getElementById('siac-partition-slider').value = '%s';
                         if (pdfDisplayed) {pdfFitToPage();}""" % (value, right, value) )
         write_config()
@@ -629,32 +726,38 @@ def expanded_on_bridge_cmd(self, cmd, _old):
         nid = int(cmd.split()[1])
         tab = cmd.split()[2]
         index.ui.reading_modal.show_pdf_bottom_tab(nid, tab)
-    
+
     elif cmd == "siac-quick-schedule-fill":
         # when the quick schedule button in the reading modal is clicked and expanded
         nid = index.ui.reading_modal.note_id
         prio = get_priority(nid)
         if prio is None:
-            index.ui.js("$('#siac-quick-sched-btn .siac-btn-dark-smaller').last().hide();$('#siac-quick-sched-btn').toggleClass('expanded');")
+            index.ui.js(f"""$('#siac-quick-sched-btn .siac-btn-dark-smaller').last().hide();
+                        $('#siac-prio-slider-small').val(0);
+                        $('#siac-slider-small-lbl').html('0');
+                        $('#siac-quick-sched-btn').toggleClass('expanded');""")
         else:
-            index.ui.js(f"$('#siac-quick-sched-btn .siac-btn-dark-smaller').last().show().text('Current ({prio})');$('#siac-quick-sched-btn').toggleClass('expanded');")
+            index.ui.js(f"""$('#siac-quick-sched-btn .siac-btn-dark-smaller').last().show().text('Current ({prio})');
+                            $('#siac-prio-slider-small').val({prio});
+                            $('#siac-slider-small-lbl').html('{prio}');
+                            $('#siac-quick-sched-btn').toggleClass('expanded');""")
     #
     #   Synonyms
     #
 
-    elif cmd == "synonyms":
+    elif cmd == "siac-synonyms":
         if check_index():
             index.ui.showInModal(getSynonymEditor())
-    elif cmd.startswith("saveSynonyms "):
-        newSynonyms(cmd[13:])
+    elif cmd.startswith("siac-save-synonyms "):
+        newSynonyms(cmd[19:])
         index.ui.showInModal(getSynonymEditor())
         index.synonyms = loadSynonyms()
-    elif cmd.startswith("editSynonyms "):
-        editSynonymSet(cmd[13:])
+    elif cmd.startswith("siac-edit-synonyms "):
+        editSynonymSet(cmd[19:])
         index.ui.showInModal(getSynonymEditor())
         index.synonyms = loadSynonyms()
-    elif cmd.startswith("deleteSynonyms "):
-        deleteSynonymSet(cmd[15:])
+    elif cmd.startswith("siac-delete-synonyms "):
+        deleteSynonymSet(cmd[21:])
         index.ui.showInModal(getSynonymEditor())
         index.synonyms = loadSynonyms()
     elif cmd.startswith("siac-synset-search "):
@@ -662,13 +765,13 @@ def expanded_on_bridge_cmd(self, cmd, _old):
             index.ui.hideModal()
             default_search_with_decks(self, cmd.split()[1], ["-1"])
 
-    elif cmd == "styling":
-        showStylingModal(self)
+    elif cmd == "siac-styling":
+        show_settings_modal(self)
 
-    elif cmd.startswith("styling "):
-        update_styling(cmd[8:])
+    elif cmd.startswith("siac-styling "):
+        update_styling(cmd[13:])
 
-    elif cmd == "writeConfig":
+    elif cmd == "siac-write-config":
         write_config()
 
     elif cmd.startswith("siac-add-image "):
@@ -697,16 +800,15 @@ def expanded_on_bridge_cmd(self, cmd, _old):
         cloze_text = " ".join(cmd.split()[1:])
         index.ui.reading_modal.show_cloze_field_picker_modal(cloze_text)
 
-
     elif cmd.startswith("siac-url-srch "):
         search_term = cmd.split("$$$")[1]
         url = cmd.split("$$$")[2]
         if search_term == "":
             return
         if url is None or len(url) == 0:
-            return 
+            return
         url_enc = urllib.parse.quote_plus(search_term)
-        
+
         index.ui.reading_modal.show_iframe_overlay(url=url.replace("[QUERY]", url_enc))
 
     elif cmd == "siac-close-iframe":
@@ -717,17 +819,16 @@ def expanded_on_bridge_cmd(self, cmd, _old):
         if inp == "":
             return
         index.ui.reading_modal.show_web_search_tooltip(inp)
-    
+
     elif cmd.startswith("siac-timer-elapsed "):
         nid = int(cmd.split()[1])
         index.ui.reading_modal.show_timer_elapsed_popup(nid)
 
-
     #
     #  Index info modal
     #
 
-    elif cmd == "indexInfo":
+    elif cmd == "siac-index-info":
         if check_index():
             index.ui.showInModal(get_index_info())
 
@@ -744,6 +845,87 @@ def expanded_on_bridge_cmd(self, cmd, _old):
             res_and_html = similar_cards(cid, min_sim, 20)
             index.ui.show_in_modal_subpage(res_and_html[1])
 
+    elif cmd == "siac-pdf-sidebar-last-addon":
+        # last add-on notes button clicked in the pdf sidebar
+        notes = get_newest(get_config_value_or_default("pdfTooltipResultLimit", 50), [])
+        index.ui.reading_modal.sidebar.print(notes, "", [])
+
+    elif cmd == "siac-pdf-sidebar-last-anki":
+        # last anki notes button clicked in the pdf sidebar
+        notes = get_last_added_anki_notes(get_config_value_or_default("pdfTooltipResultLimit", 50))
+        index.ui.reading_modal.sidebar.print(notes, "", [])
+
+    elif cmd == "siac-pdf-sidebar-pdfs-in-progress":
+        # pdfs in progress button clicked in the pdf sidebar
+        notes = get_in_progress_pdf_notes()
+        index.ui.reading_modal.sidebar.print(notes)
+
+    elif cmd == "siac-pdf-sidebar-pdfs-unread":
+        # pdfs unread button clicked in the pdf sidebar
+        notes = get_all_unread_pdf_notes()
+        index.ui.reading_modal.sidebar.print(notes)
+
+
+    #
+    # highlights
+    #
+
+    elif cmd.startswith("siac-hl-clicked "):
+        # highlight btn clicked -> store current highlight color in reading modal
+        id = int(cmd.split()[1])
+        color = " ".join(cmd.split()[2:])
+        index.ui.reading_modal.highlight_color = color
+        index.ui.reading_modal.highlight_type = id
+
+    elif cmd.startswith("siac-pdf-page-loaded "):
+        # page loaded, so load highlights from db
+        page = int(cmd.split()[1])
+        index.ui.reading_modal.show_highlights_for_page(page)
+
+    elif cmd.startswith("siac-hl-new "):
+        # highlights created, save to db
+        # order is page group type [x0,y0,x1,y1]+ # text
+        page = int(cmd.split(" ")[1])
+        group = int(cmd.split(" ")[2])
+        type = int(cmd.split(" ")[3])
+        nid = index.ui.reading_modal.note_id
+        all = []
+        # [(nid,page,group,type,text,x0,y0,x1,y1)]
+        text = cmd[cmd.index("#") + 1:]
+        for ix, i in enumerate(cmd.split(" ")[4:]):
+            if i == "#":
+                break
+            if ix % 4 == 0:
+                x0 = float(i[:10])
+            elif ix % 4 == 1:
+                y0 = float(i[:10])
+            elif ix % 4 == 2:
+                x1 = float(i[:10])
+            else:
+                y1 = float(i[:10])
+                all.append((nid,page,group,type,text,x0,y0,x1,y1))
+        insert_highlights(all)
+        index.ui.reading_modal.show_highlights_for_page(page)
+
+    elif cmd.startswith("siac-hl-del "):
+        # delete highlight with given id
+        id = int(cmd.split()[1])
+        delete_highlight(id)
+
+    elif cmd.startswith("siac-hl-text-update-coords "):
+        # text comment was resized, so update coords in db
+        id = int(cmd.split()[1])
+        x0 = float(cmd.split()[2])
+        y0 = float(cmd.split()[3])
+        x1 = float(cmd.split()[4])
+        y1 = float(cmd.split()[5])
+        update_text_comment_coords(id, x0, y0, x1, y1)
+
+    elif cmd.startswith("siac-hl-text-update-text "):
+        # text comment content has changed, so update in db
+        id = int(cmd.split()[1])
+        text = " ".join(cmd.split(" ")[2:])
+        update_text_comment_text(id, text)
 
     #
     #   Checkboxes
@@ -752,6 +934,8 @@ def expanded_on_bridge_cmd(self, cmd, _old):
     elif (cmd.startswith("highlight ")):
         if check_index():
             index.highlighting = cmd[10:] == "on"
+            config["highlighting"] = cmd[10:] == "on"
+            mw.addonManager.writeConfig(__name__, config)
     elif cmd.startswith("searchWhileTyping "):
         config["searchOnTyping"] = cmd[18:] == "on"
         mw.addonManager.writeConfig(__name__, config)
@@ -821,14 +1005,30 @@ def expanded_on_bridge_cmd(self, cmd, _old):
 
     elif cmd == "siac-show-note-sidebar":
         config["notes.sidebar.visible"] = True
-        display_notes_sidebar(self)
+        index.ui.sidebar.display()
         mw.addonManager.writeConfig(__name__, config)
+
     elif cmd == "siac-hide-note-sidebar":
         config["notes.sidebar.visible"] = False
-        self.web.eval("$('#siac-notes-sidebar').remove(); $('#resultsWrapper').css('padding-left', 0);")
+        index.ui.sidebar.hide()
         mw.addonManager.writeConfig(__name__, config)
+
+    elif cmd == "siac-sidebar-show-notes-tab":
+        index.ui.sidebar.show_tab(index.ui.sidebar.ADDON_NOTES_TAB)
+    elif cmd == "siac-sidebar-show-import-tab":
+        index.ui.sidebar.show_tab(index.ui.sidebar.PDF_IMPORT_TAB)
+    elif cmd == "siac-sidebar-show-special-tab":
+        index.ui.sidebar.show_tab(index.ui.sidebar.SPECIAL_SEARCHES_TAB)
+
+
+
     else:
-        return _old(self, cmd)
+        return handled
+
+    # If we are here, else didn't return. So an (el)if did suceed, the
+    # action was done, so we can return message to state that the
+    # command is handled.
+    return (True, None)
 
 
 def parseSortCommand(cmd):
@@ -849,7 +1049,7 @@ def parseSortCommand(cmd):
     elif cmd == "remReviewed":
         index.ui.removeReviewed()
 
-def parse_predef_search_cmd(cmd, editor):
+def parse_predef_search_cmd(cmd: str, editor: aqt.editor.Editor):
     """
     Helper function to parse the various predefined searches (last added/longest text/...)
     """
@@ -896,6 +1096,11 @@ def parse_predef_search_cmd(cmd, editor):
         index.lastSearch = (None, decks, "randomUntagged")
         res = getRandomUntagged(decks, limit)
         index.ui.print_search_results(res, stamp)
+    elif searchtype == "lastUntagged":
+        stamp = setStamp()
+        index.lastSearch = (None, decks, "lastUntagged")
+        res = get_last_untagged(decks, limit)
+        index.ui.print_search_results(res, stamp)
     elif searchtype == "highestInterval":
         stamp = setStamp()
         index.lastSearch = (None, decks, "highestInterval", limit)
@@ -928,26 +1133,24 @@ def parse_predef_search_cmd(cmd, editor):
         index.ui.print_search_results(res, stamp)
 
 
-def setStamp():
+def setStamp() -> Optional[str]:
     """
     Generate a milisec stamp and give it to the index.
     The result of a search is not printed if it has a non-matching stamp.
     """
     if check_index():
-        index = get_index()
-        stamp = utility.misc.get_milisec_stamp()
+        index           = get_index()
+        stamp           = utility.misc.get_milisec_stamp()
         index.ui.latest = stamp
         return stamp
     return None
 
-def setStats(nid, stats):
-    """
-    Insert the statistics into the given card.
-    """
+def setStats(nid: int, stats: Tuple[Any, ...]):
+    """ Insert the statistics into the given card. """
     if check_index():
-        get_index().ui.showStats(stats[0], stats[1], stats[2], stats[3])
+        get_index().ui.show_stats(stats[0], stats[1], stats[2], stats[3])
 
-def rerender_info(editor, content="", searchDB = False, searchByTags = False):
+def rerender_info(editor: aqt.editor.Editor, content: str = "", searchDB: bool = False, searchByTags: bool = False):
     """
     Main function that is executed when a user has typed or manually entered a search.
     Args:
@@ -963,25 +1166,25 @@ def rerender_info(editor, content="", searchDB = False, searchByTags = False):
     if index is not None:
 
         if searchDB:
-            content = content[content.index('~ ') + 2:].strip()
+            content             = content[content.index('~ ') + 2:].strip()
             if len(content) == 0:
                 index.ui.empty_result("No results found for empty string")
                 return
-            index.lastSearch = (content, decks, "db")
-            searchRes = index.searchDB(content, decks)
+            index.lastSearch    = (content, decks, "db")
+            searchRes           = index.searchDB(content, decks)
 
         elif searchByTags:
-            stamp = utility.misc.get_milisec_stamp()
-            index.ui.latest = stamp
-            index.lastSearch = (content, ["-1"], "tags")
-            searchRes = findBySameTag(content, index.limit, [], index.pinned)
+            stamp               = utility.misc.get_milisec_stamp()
+            index.ui.latest     = stamp
+            index.lastSearch    = (content, ["-1"], "tags")
+            searchRes           = findBySameTag(content, index.limit, [], index.pinned)
 
         else:
             if len(content[content.index('~ ') + 2:]) > 2000:
                 index.ui.empty_result("Query was <b>too long</b>")
                 return
-            content = content[content.index('~ ') + 2:]
-            searchRes = index.search(content, decks)
+            content             = content[content.index('~ ') + 2:]
+            searchRes           = index.search(content, decks)
 
 
         if (searchDB or searchByTags) and editor is not None and editor.web is not None:
@@ -991,15 +1194,16 @@ def rerender_info(editor, content="", searchDB = False, searchByTags = False):
                 index.ui.empty_result("No results found")
 
 
-def rerenderNote(nid):
-    res = mw.col.db.execute("select distinct notes.id, flds, tags, did, mid from notes left join cards on notes.id = cards.nid where notes.id = %s" % nid).fetchone()
+def rerenderNote(nid: int):
+    res = mw.col.db.all("select distinct notes.id, flds, tags, did, mid from notes left join cards on notes.id = cards.nid where notes.id = %s" % nid)
     if res is not None and len(res) > 0:
+        res = res[0]
         index = get_index()
         if index is not None and index.ui is not None:
             index.ui.updateSingle(res)
 
 @requires_index_loaded
-def default_search_with_decks(editor, textRaw, decks):
+def default_search_with_decks(editor: aqt.editor.Editor, textRaw: Optional[str], decks: List[int]):
     """
     Uses the index to clean the input and find notes.
 
@@ -1021,10 +1225,9 @@ def default_search_with_decks(editor, textRaw, decks):
     searchRes = index.search(cleaned, decks)
 
 @requires_index_loaded
-def search_for_user_notes_only(editor, text):
-    """
-    Uses the index to clean the input and find user notes.
-    """
+def search_for_user_notes_only(editor: aqt.editor.Editor, text: str):
+    """ Uses the index to clean the input and find user notes. """
+
     if text is None:
         return
     index = get_index()
@@ -1035,26 +1238,17 @@ def search_for_user_notes_only(editor, text):
     if len(cleaned) == 0:
         index.ui.empty_result("Query was empty after cleaning.<br/><br/><b>Query:</b> <i>%s</i>" % utility.text.trim_if_longer_than(text, 100).replace("\u001f", ""))
         return
-    index.lastSearch = (cleaned, ["-1"], "user notes")
-    searchRes = index.search(cleaned, ["-1"], only_user_notes = True)
-
-
-
-def getCurrentContent(editor):
-    text = ""
-    for f in editor.note.fields:
-        text += f
-    return text
+    index.lastSearch    = (cleaned, ["-1"], "user notes")
+    searchRes           = index.search(cleaned, ["-1"], only_user_notes = True)
 
 @requires_index_loaded
-def add_note_to_index(note):
+def add_note_to_index(note: Note):
     get_index().addNote(note)
 
 @requires_index_loaded
-def add_tag(tag):
-    """
-    Insert the given tag in the tag field at bottom if not already there.
-    """
+def add_tag(tag: str):
+    """ Insert the given tag in the tag field at bottom if not already there. """
+
     index = get_index()
     if tag == "" or index is None or index.ui._editor is None:
         return
@@ -1066,7 +1260,7 @@ def add_tag(tag):
     index.ui._editor.saveTags()
 
 @requires_index_loaded
-def set_pinned(cmd):
+def set_pinned(cmd: str):
     """
     Update the pinned search results.
     This is important because they should not be contained in the search results.
@@ -1080,9 +1274,7 @@ def set_pinned(cmd):
     if index.logging:
         log("Updated pinned: " + str(index.pinned))
 
-
-
-def update_field_to_hide_in_results(mid, fldOrd, value):
+def update_field_to_hide_in_results(mid: int, fldOrd: int, value: bool):
     if not value:
         config["fieldsToHideInResults"][mid].remove(fldOrd)
         if len(config["fieldsToHideInResults"][mid]) == 0:
@@ -1097,7 +1289,7 @@ def update_field_to_hide_in_results(mid, fldOrd, value):
     mw.addonManager.writeConfig(__name__, config)
 
 
-def update_field_to_exclude(mid, fldOrd, value):
+def update_field_to_exclude(mid: int, fldOrd: int, value: bool):
     if not value:
         config["fieldsToExclude"][mid].remove(fldOrd)
         if len(config["fieldsToExclude"][mid]) == 0:
@@ -1110,7 +1302,7 @@ def update_field_to_exclude(mid, fldOrd, value):
     mw.addonManager.writeConfig(__name__, config)
 
 @requires_index_loaded
-def try_repeat_last_search(editor = None):
+def try_repeat_last_search(editor: Optional[aqt.editor.Editor] = None):
     """
     Sometimes it is useful if we can simply repeat the last search,
     e.g. the user has clicked another deck in the deck select.
@@ -1131,47 +1323,52 @@ def try_repeat_last_search(editor = None):
 def generate_clozes(sentences, pdf_path, pdf_title, page):
     try:
         # (optional) field that full path to pdf doc goes into
-        path_fld = config["pdf.clozegen.field.pdfpath"]
+        path_fld        = config["pdf.clozegen.field.pdfpath"]
         # (optional) field that title of pdf note goes into
-        note_title_fld = config["pdf.clozegen.field.pdftitle"]
+        note_title_fld  = config["pdf.clozegen.field.pdftitle"]
         # (optional) field that page of the pdf where the cloze was generated goes into
-        page_fld = config["pdf.clozegen.field.page"]
+        page_fld        = config["pdf.clozegen.field.page"]
 
         # name of cloze note type to use
-        model_name = config["pdf.clozegen.notetype"]
+        model_name      = config["pdf.clozegen.notetype"]
         # name of field that clozed text has to go into
-        fld_name = config["pdf.clozegen.field.clozedtext"]
+        fld_name        = config["pdf.clozegen.field.clozedtext"]
 
         # default cloze note type and fld
         if model_name is None or len(model_name) == 0:
-            model_name = "Cloze"
+            model_name  = "Cloze"
         if fld_name is None or len(fld_name) == 0:
-            fld_name = "Text"
-        
-        model = mw.col.models.byName(model_name)
-        index = get_index()
+            fld_name    = "Text"
+
+        model           = mw.col.models.byName(model_name)
+        index           = get_index()
         if model is None:
             tooltip("Could not resolve note model.", period=3000)
             return
-        deck_chooser = aqt.mw.app.activeWindow().deckChooser if hasattr(aqt.mw.app.activeWindow(), "deckChooser") else None
-        if deck_chooser is None: 
+        deck_chooser    = aqt.mw.app.activeWindow().deckChooser if hasattr(aqt.mw.app.activeWindow(), "deckChooser") else None
+        if deck_chooser is None:
             tooltip("Could not determine chosen deck.", period=3000)
             return
         did = deck_chooser.selectedId()
         if check_index():
-            tags = index.ui._editor.tags.text()
-            tags = mw.col.tags.canonify(mw.col.tags.split(tags))
+            tags        = index.ui._editor.tags.text()
+            tags        = mw.col.tags.canonify(mw.col.tags.split(tags))
         else:
-            tags = []
-        added = 0 
+            tags        = []
+
+        added           = 0
+
         for sentence in sentences:
             if not "{{c1::" in sentence or not "}}" in sentence:
                 continue
-            note = Note(mw.col, model)
+
+            note                = Note(mw.col, model)
             note.model()['did'] = did
-            note.tags = tags
+            note.tags           = tags
+
             if not fld_name in note:
                 return
+
             note[fld_name] = sentence
             if path_fld is not None and len(path_fld) > 0:
                 note[path_fld] = pdf_path
@@ -1180,13 +1377,14 @@ def generate_clozes(sentences, pdf_path, pdf_title, page):
             if page_fld is not None and len(page_fld) > 0:
                 note[page_fld] = page
 
-            a = mw.col.addNote(note)
+            a                   = mw.col.addNote(note)
             if a > 0:
                 add_note_to_index(note)
-            added += a
-        tags_str = " ".join(tags) if len(tags) > 0 else "<i>No tags</i>"
-        deck_name = mw.col.decks.get(did)["name"]
-        s = "" if added == 1 else "s"
+            added               += a
+
+        tags_str            = " ".join(tags) if len(tags) > 0 else "<i>No tags</i>"
+        deck_name           = mw.col.decks.get(did)["name"]
+        s                   = "" if added == 1 else "s"
         tooltip(f"""<center>Added {added} Cloze{s}.</center><br>
                   <center>Deck: <b>{deck_name}</b></center>
                   <center>Tags: <b>{tags_str}</b></center>""", period=3000)
@@ -1195,18 +1393,19 @@ def generate_clozes(sentences, pdf_path, pdf_title, page):
 
 @requires_index_loaded
 def get_index_info():
-    """
-    Returns the html that is rendered in the popup that appears on clicking the "info" button
-    """
-    index = get_index()
+    """ Returns the html that is rendered in the popup that appears on clicking the "info" button """
+
+    index           = get_index()
     excluded_fields = config["fieldsToExclude"]
-    field_c = 0
+    field_c         = 0
+
     for k,v in excluded_fields.items():
         field_c += len(v)
 
-    html = """
+    html            = """
             <table class="striped" style='width: 100%%; margin-bottom: 18px;'>
                <tr><td>Index Used:</td><td> <b>%s</b></td></tr>
+               <tr><td>SQLite Version</td><td> <b>%s</b></td></tr>
                <tr><td>Initialization:</td><td>  <b>%s s</b></td></tr>
                <tr><td>Index Size:</td><td>  <b>%s</b> notes</td></tr>
                <tr><td>Index is always rebuilt if smaller than:</td><td>  <b>%s</b> notes</td></tr>
@@ -1230,12 +1429,14 @@ def get_index_info():
                <tr><td>PDF: Page Right + Mark Page as Read</td><td>  <b>Ctrl+Shift+Space</b></td></tr>
                <tr><td>PDF: Page Left</td><td>  <b>Ctrl+Left / Ctrl+K</b></td></tr>
                <tr><td>New Note</td><td>  <b>Ctrl+Shift+N</b></td></tr>
-               <tr><td>Confirm New Note</td><td>  <b>Ctrl+Enter</b></td></tr>
+               <tr><td>Confirm new note</td><td>  <b>Ctrl+Enter</b></td></tr>
+               <tr><td>Confirm new note and keep open</td><td>  <b>Ctrl+Shift+Enter</b></td></tr>
                <tr><td>PDF: Quick Open</td><td>  <b>Ctrl+O</b></td></tr>
                <tr><td>PDF: Toggle Top & Bottom Bar</td><td>  <b>F11</b></td></tr>
              </table>
 
-            """ % (index.type, str(index.initializationTime), index.get_number_of_notes(), config["alwaysRebuildIndexIfSmallerThan"], len(index.stopWords),
+            """ % (index.type, sqlite3.sqlite_version,
+            str(index.initializationTime), index.get_number_of_notes(), config["alwaysRebuildIndexIfSmallerThan"], len(index.stopWords),
             "<span style='background: green; color: white;'>&nbsp;On&nbsp;</span>" if index.logging else "<span style='background: red; color: black;'>&nbsp;Off&nbsp;</span>",
             "<span style='background: green; color: white;'>&nbsp;On&nbsp;</span>" if config["renderImmediately"] else "<span style='background: red; color: black;'>&nbsp;Off&nbsp;</span>",
             "Search" if config["tagClickShouldSearch"] else "Add",
@@ -1250,18 +1451,18 @@ def get_index_info():
             ("%ssiac-notes.db" % config["addonNoteDBFolderPath"]) if config["addonNoteDBFolderPath"] is not None and len(config["addonNoteDBFolderPath"]) > 0 else utility.misc.get_user_files_folder_path() + "siac-notes.db"
             )
 
-
     return html
 
 @requires_index_loaded
 def show_timing_modal(render_time = None):
-    """
-    Builds the html and shows the modal which gives some info about the last executed search (timing, query after stopwords etc.)
-    """
-    index = get_index()
-    html = "<h4>Query (stopwords removed, checked SynSets):</h4><div style='width: 100%%; max-height: 200px; overflow-y: auto; margin-bottom: 10px;'><i>%s</i></div>" % index.lastResDict["query"]
+    """ Builds the html and shows the modal which gives some info about the last executed search (timing, query after stopwords etc.) """
+
+    index   = get_index()
+    html    = "<h4>Query (stopwords removed, checked SynSets):</h4><div style='width: 100%%; max-height: 200px; overflow-y: auto; margin-bottom: 10px;'><i>%s</i></div>" % index.lastResDict["query"]
+
     if "decks" in index.lastResDict:
         html += "<h4>Decks:</h4><div style='width: 100%%; max-height: 200px; overflow-y: auto; margin-bottom: 10px;'><i>%s</i></div>" % ", ".join([str(d) for d in index.lastResDict["decks"]])
+
     html += "<h4>Execution time:</h4><table style='width: 100%'>"
     html += "<tr><td>%s</td><td><b>%s</b> ms</td></tr>" % ("Removing Stopwords", index.lastResDict["time-stopwords"] if index.lastResDict["time-stopwords"] > 0 else "< 1")
     html += "<tr><td>%s</td><td><b>%s</b> ms</td></tr>" % ("Checking SynSets", index.lastResDict["time-synonyms"] if index.lastResDict["time-synonyms"] > 0 else "< 1")
@@ -1269,23 +1470,28 @@ def show_timing_modal(render_time = None):
     html += "<tr><td>%s</td><td><b>%s</b> ms</td></tr>" % ("Building HTML", index.lastResDict["time-html"] if index.lastResDict["time-html"] > 0 else "< 1")
     html += "<tr><td>%s</td><td><b>%s</b> ms</td></tr>" % ("Building HTML - Highlighting", index.lastResDict["time-html-highlighting"] if index.lastResDict["time-html-highlighting"] > 0 else "< 1")
     html += "<tr><td>%s</td><td><b>%s</b> ms</td></tr>" % ("Building HTML - Formatting SIAC Notes", index.lastResDict["time-html-build-user-note"] if index.lastResDict["time-html-build-user-note"] > 0 else "< 1")
+
     if render_time is not None:
         html += "<tr><td>%s</td><td><b>%s</b> ms</td></tr>" % ("Rendering", render_time)
+
     html += "</table>"
+
     index.ui.showInModal(html)
 
 @requires_index_loaded
 def update_styling(cmd):
-    index = get_index()
-    name = cmd.split()[0]
-    value = " ".join(cmd.split()[1:])
+
+    index   = get_index()
+    name    = cmd.split()[0]
+    value   = " ".join(cmd.split()[1:])
+
     if name == "default" and value == "day":
         config["styling"] = json.loads(default_styles())
         tooltip("Styling updated. Restart to apply changes.", period=4000)
     elif name == "default" and value == "night":
         config["styling"] = json.loads(default_night_mode_styles())
         tooltip("Styling updated. Restart to apply changes.", period=4000)
-   
+
     elif name == "searchpane.zoom":
         config[name] = float(value)
         index.ui.js("document.getElementById('siac-right-side').style.zoom = '%s'; showTagInfoOnHover = %s;" % (value, "false" if float(value) != 1.0 else "true"))
@@ -1296,8 +1502,8 @@ def update_styling(cmd):
 
     elif name == "hideSidebar":
         m = value == "true" or value == "on"
-        config["hideSidebar"] = m
-        index.ui.hideSidebar = m
+        config["hideSidebar"]   = m
+        index.ui.hideSidebar    = m
         index.ui.js("document.getElementById('searchInfo').classList.%s('hidden');"  % ("add" if m else "remove"))
 
     elif name == "removeDivsFromOutput":
@@ -1310,11 +1516,21 @@ def update_styling(cmd):
             value = value.replace("\\", "/")
             if not value.endswith("/"):
                 value += "/"
+            old_val = config["addonNoteDBFolderPath"]
             config["addonNoteDBFolderPath"] = value
+            if value != old_val:
+                write_config()
+                existed = create_db_file_if_not_exists()
+                if existed:
+                    ex = "Created no new file, because there was already a <i>siac-notes.db</i> in that location."
+                else:
+                    ex = "Created an empty file there."
+                tooltip(f"Updated path to note .db file to <b>{value}</b>.<br>{ex}<br>If you have existing notes, replace that new file with your old file.", period=9000)
+
 
     elif name == "leftSideWidthInPercent":
-        config[name] = int(value)
-        right = 100 - int(value)
+        config[name]    = int(value)
+        right           = 100 - int(value)
         if check_index():
             index.ui.js("document.getElementById('leftSide').style.width = '%s%%'; document.getElementById('siac-right-side').style.width = '%s%%';" % (value, right) )
 
@@ -1355,11 +1571,9 @@ def update_styling(cmd):
             if not value.endswith("/"):
                 value += "/"
             config["pdfUrlImportSavePath"] = value
-    
-    elif name == "notes.showSource":
+
+    elif name == "notes.showSource" or name == "useInEdit":
         config[name] = value == "true"
-    
-        
 
 
 @js
@@ -1367,11 +1581,16 @@ def write_config():
     mw.addonManager.writeConfig(__name__, config)
     return "$('.modal-close').unbind('click')"
 
+def update_config(key, value):
+    config[key] = value
+    mw.addonManager.writeConfig(__name__, config)
 
 @requires_index_loaded
 def after_index_rebuilt():
-    search_index = get_index()
-    editor = search_index.ui._editor
+
+    search_index    = get_index()
+    editor          = search_index.ui._editor
+
     editor.web.eval("""
         $('.freeze-icon').removeClass('frozen');
         siacState.isFrozen = false;
@@ -1383,4 +1602,3 @@ def after_index_rebuilt():
     """)
     fillDeckSelect(editor)
     setup_ui_after_index_built(editor, search_index)
-
diff --git a/src/config.py b/src/config.py
index 2b7a18ec..d80a1334 100644
--- a/src/config.py
+++ b/src/config.py
@@ -47,3 +47,8 @@ def get_config_value_or_default(key, default):
     except KeyError:
         return default
 
+
+def update_config(key, value):
+    config = _get_config(_get_cache_key())
+    config[key] = value
+    mw.addonManager.writeConfig(__name__, config)
diff --git a/src/debug_logging.py b/src/debug_logging.py
index 9f208e17..7ca4d9ab 100644
--- a/src/debug_logging.py
+++ b/src/debug_logging.py
@@ -44,40 +44,50 @@ def stop_watch(t_start):
     return time.time() * 1000 - t_start
 
 def persist_index_info(search_index):
+    """ Save some info on the search index in data.json, 
+    which can be used on next startup to determine if the index should be rebuilt. """
+
     if search_index is None:
         return
 
-    config = mw.addonManager.getConfig(__name__)
+    config                              = mw.addonManager.getConfig(__name__)
+    c_json                              = _get_data_file_content() 
+
+    if c_json is None:
+        c_json                          = { "index": {}, "notes": {} }
 
-    c_json = _get_data_file_content() 
-    c_json["index"]["timestamp"] = datetime.now().strftime("%d/%m/%Y %H:%M:%S")
-    c_json["index"]["type"] = search_index.type 
-    c_json["index"]["size"] = search_index.get_number_of_notes()
+    c_json["index"]["timestamp"]        = datetime.now().strftime("%d/%m/%Y %H:%M:%S")
+    c_json["index"]["type"]             = search_index.type 
+    c_json["index"]["size"]             = search_index.get_number_of_notes()
     # not used yet
-    c_json["index"]["lastInsertedId"] = -1
-    c_json["index"]["fieldsToExclude"] = search_index.creation_info["fields_to_exclude_original"]
-    c_json["index"]["decks"] = search_index.creation_info["decks"]
-    c_json["index"]["stopwordsSize"] = search_index.creation_info["stopwords_size"]
+    c_json["index"]["lastInsertedId"]   = -1
+    c_json["index"]["fieldsToExclude"]  = search_index.creation_info["fields_to_exclude_original"]
+    c_json["index"]["decks"]            = search_index.creation_info["decks"]
+    c_json["index"]["stopwordsSize"]    = search_index.creation_info["stopwords_size"]
     # not used yet
-    c_json["index"]["shouldRebuild"] = False
+    c_json["index"]["shouldRebuild"]    = False
 
     _write_to_data_file(c_json)
 
 
 def persist_notes_db_checked():
-    """
-        Update "notes" - "db_last_checked" with current timestamp
-    """
-    stamp = datetime.now().strftime('%Y-%m-%d-%H-%M-%S')
-    c_json = _get_data_file_content()
+    """ Update "notes" - "db_last_checked" with current timestamp. """
+
+    stamp                               = datetime.now().strftime('%Y-%m-%d-%H-%M-%S')
+    c_json                              = _get_data_file_content()
+
     if not "notes" in c_json:
         c_json["notes"] = {}
-    c_json["notes"]["db_last_checked"] = stamp
+
+    c_json["notes"]["db_last_checked"]  = stamp
+
     _write_to_data_file(c_json)
 
 
 def get_index_info():
-    c_json = _get_data_file_content() 
+    c_json = _get_data_file_content()
+    if c_json is None:
+        return None
     return c_json["index"]
 
 def get_notes_info():
@@ -88,17 +98,25 @@ def get_notes_info():
 
 def _get_data_file_content():
     dir = utility.misc.get_user_files_folder_path()
-    with open(dir + "data.json", "r") as json_file:
-        return json.load(json_file)
+    f = dir + "data.json"
+    if not utility.misc.file_exists(f):
+        return None
+    try:
+        with open(f, "r", encoding="utf-8") as json_file:
+            return json.load(json_file)
+    except:
+        # if it failed to read, probably for some encoding reason, create the file again
+        os.remove(f)
+        return None
 
 def _write_to_data_file(c_json):
-    dir = utility.misc.get_user_files_folder_path() + "data.json"
-    with open(dir, "w") as json_file:
+    f = utility.misc.get_user_files_folder_path() + "data.json"
+    with open(f, "w", encoding="utf-8") as json_file:
         json.dump(c_json, json_file, indent=2)
         
 def toggle_should_rebuild():
-    c_json = _get_data_file_content() 
-    c_json["index"]["shouldRebuild"] = not c_json["index"]["shouldRebuild"]
+    c_json                              = _get_data_file_content() 
+    c_json["index"]["shouldRebuild"]    = not c_json["index"]["shouldRebuild"]
     _write_to_data_file(c_json)
 
 
diff --git a/src/dialogs/components.py b/src/dialogs/components.py
new file mode 100644
index 00000000..e6d90c1e
--- /dev/null
+++ b/src/dialogs/components.py
@@ -0,0 +1,416 @@
+# anki-search-inside-add-card
+# Copyright (C) 2019 - 2020 Tom Z.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+from aqt.qt import *
+import aqt
+from ..notes import dynamic_sched_to_str
+from ..config import get_config_value_or_default, update_config
+from ..models import SiacNote
+
+from datetime import datetime, timedelta
+import utility.date
+
+class QtPrioritySlider(QWidget):
+
+
+    def __init__(self, prio_default, show_spec_sched=True, schedule=None):
+        QWidget.__init__(self)
+
+        self.prio_default       = prio_default
+        self.released_fn        = None
+        self.has_schedule       = schedule is not None and len(schedule.strip()) > 0
+        self.show_spec_sched    = show_spec_sched
+
+        box                     = QGroupBox("Priority and Scheduling" if self.show_spec_sched else "Priority")
+        vbox                    = QVBoxLayout()
+
+        self.slider             = QSlider(Qt.Horizontal)
+
+        if prio_default is not None and prio_default >= 0:
+            self.slider.setValue(prio_default)
+        else:
+            self.slider.setValue(0)
+        self.slider.setMinimum(0)
+        self.slider.setMaximum(100)
+        self.slider.setSingleStep(1)
+        vbox.addWidget(self.slider)
+
+        self.value_lbl          = QLabel(str(prio_default))
+        self.value_lbl.setAlignment(Qt.AlignCenter)
+        vbox.addWidget(self.value_lbl)
+
+        if show_spec_sched:
+            self.scheduler = QtScheduleComponent(schedule) 
+            vbox.addWidget(self.scheduler)
+
+        box.setLayout(vbox)
+
+        vbox_outer              = QVBoxLayout()
+        vbox_outer.addWidget(box)
+        self.setLayout(vbox_outer)
+    
+        self.update_lbl()
+        if show_spec_sched:
+            self.scheduler.edit_tab.sched_radio_clicked()
+        self.slider.valueChanged.connect(self.update_lbl)
+        self.slider.sliderReleased.connect(self.slider_released)
+
+    def value(self):
+        return self.slider.value()
+    
+    def has_changed_value(self):
+        return self.value() != self.prio_default
+
+    def schedule(self):
+        new = self.scheduler._get_schedule()
+        # None means no specific schedule given
+        if new is None:
+            return self.scheduler.initial_schedule
+        return new
+
+    def reset(self):
+        self.slider.setValue(0)
+        self.update_lbl()
+    
+    def set_released_fn(self, fn):
+        self.released_fn = fn
+    
+    def slider_released(self):
+        if self.released_fn:
+            self.released_fn(self.slider.value())
+
+    def update_lbl(self):
+        """
+        Called when slider is moved.
+        """
+        if self.slider.value() == 0:
+            self.value_lbl.setText("No Priority")
+            # If 0 priority, disable setting specific schedule
+            if self.show_spec_sched:
+                self.scheduler.priority_set_to_zero() 
+            self.slider.setStyleSheet("QSlider::handle:horizontal {background-color: #c62828; border-radius: 3px; }")
+        else:
+            self.value_lbl.setText(dynamic_sched_to_str(self.slider.value()).replace("(", "(<b>").replace(")", "</b>)"))
+            self.slider.setStyleSheet("QSlider::handle:horizontal {background-color: #2496dc; border-radius: 3px;}")
+            if self.show_spec_sched:
+                self.scheduler.priority_set_to_non_zero()
+
+            
+class QtScheduleComponent(QWidget):
+
+    def __init__(self, schedule):
+        QWidget.__init__(self)
+
+        self.initial_schedule   = schedule
+        self.has_schedule       = self.initial_schedule is not None and len(self.initial_schedule.strip()) > 0
+        self.setup_ui()
+            
+        
+    def setup_ui(self):
+
+        self.tabs           = QTabWidget()
+        self.edit_tab       = ScheduleEditTab(self)
+        self.settings_tab   = ScheduleSettingsTab()
+        
+        self.tabs.addTab(self.edit_tab, "Edit")
+        self.tabs.addTab(self.settings_tab, "Settings")
+
+        self.setLayout(QVBoxLayout())
+        self.layout().addWidget(self.tabs)
+
+    def _get_schedule(self):
+        return self.edit_tab._get_schedule()
+
+    def priority_set_to_zero(self):
+        if self.has_schedule:
+            self.edit_tab.remove_sched_rb.setChecked(True)
+            self.edit_tab.no_sched_rb.setEnabled(False)
+        else:
+            self.edit_tab.no_sched_rb.setChecked(True)
+
+        self.edit_tab.td_rb.setEnabled(False)
+        self.edit_tab.tpd_rb.setEnabled(False)
+        self.edit_tab.tpwd_rb.setEnabled(False)
+        self.edit_tab.sched_radio_clicked()
+
+    def priority_set_to_non_zero(self):
+        self.edit_tab.td_rb.setEnabled(True)
+        self.edit_tab.tpd_rb.setEnabled(True)
+        self.edit_tab.tpwd_rb.setEnabled(True)
+        self.edit_tab.no_sched_rb.setEnabled(True)
+
+        if self.has_schedule:
+            self.edit_tab.remove_sched_rb.setEnabled(True)
+
+class ScheduleSettingsTab(QWidget):
+    def __init__(self):
+        QWidget.__init__(self)
+        self.setLayout(QVBoxLayout())
+        
+        header          = QLabel("General scheduling settings")
+        header.setAlignment(Qt.AlignCenter)
+        self.layout().addWidget(header)
+
+        line            = QFrame()
+        line.setFrameShape(QFrame.HLine)
+        line.setFrameShadow(QFrame.Sunken)
+        self.layout().addWidget(line)
+
+        self.layout().addWidget(QLabel("How to deal with <b>missed schedules</b>?"))
+        self.missed_rb_1 = QRadioButton("Place in front of queue")
+        self.missed_rb_2 = QRadioButton("Remove schedule, keep in queue")
+        self.missed_rb_3 = QRadioButton("Reschedule based on previous schedule")
+        
+        self.layout().addWidget(self.missed_rb_1)
+        self.layout().addWidget(self.missed_rb_2)
+        self.layout().addWidget(self.missed_rb_3)
+
+        self.missed_rb_1.clicked.connect(self.missed_rb_clicked)
+        self.missed_rb_2.clicked.connect(self.missed_rb_clicked)
+        self.missed_rb_3.clicked.connect(self.missed_rb_clicked)
+
+        handling = get_config_value_or_default("notes.queue.missedNotesHandling", "remove-schedule")
+        if handling == "remove-schedule":
+            self.missed_rb_2.setChecked(True)
+        elif handling == "place-front":
+            self.missed_rb_1.setChecked(True)
+        elif handling == "new-schedule":
+            self.missed_rb_3.setChecked(True)
+        
+        self.layout().addWidget(QLabel("Changes for this setting will take effect after a restart."))
+        self.layout().addStretch()
+        
+        self.show_sched_cb = QCheckBox("Show schedule dialog after done with unsched. note")
+        self.layout().addWidget(self.show_sched_cb)
+        self.show_sched_cb.setChecked(get_config_value_or_default("notes.queue.scheduleDialogOnDoneUnscheduledNotes", False))
+        self.show_sched_cb.clicked.connect(self.show_sched_cb_clicked)
+
+        self.ivl_includes_today_cb = QCheckBox("Periodic schedules start on the current day")
+        self.layout().addWidget(self.ivl_includes_today_cb)
+        self.ivl_includes_today_cb.setChecked(get_config_value_or_default("notes.queue.intervalSchedulesStartToday", True))
+        self.ivl_includes_today_cb.clicked.connect(self.ivl_includes_today_cb_checked)
+
+
+
+    def show_sched_cb_clicked(self):
+        update_config("notes.queue.scheduleDialogOnDoneUnscheduledNotes", self.show_sched_cb.isChecked())
+    
+    def ivl_includes_today_cb_checked(self):
+        update_config("notes.queue.intervalSchedulesStartToday", self.ivl_includes_today_cb.isChecked())
+
+    def missed_rb_clicked(self):
+        if self.missed_rb_1.isChecked():
+            new_val = "place-front"
+        elif self.missed_rb_2.isChecked():
+            new_val = "remove-schedule"
+        else:
+            new_val = "new-schedule"
+        update_config("notes.queue.missedNotesHandling", new_val)
+        SiacNote.MISSED_NOTES = new_val
+
+
+class ScheduleEditTab(QWidget):
+
+    def __init__(self, parent):
+        QWidget.__init__(self)
+        self.parent = parent
+        self.vbox   = QVBoxLayout()
+        self.group  = QButtonGroup()
+        if self.parent.has_schedule:
+
+            s_rep_label         = QLabel(utility.date.schedule_verbose(self.parent.initial_schedule))
+            s_rep_label.setAlignment(Qt.AlignCenter)
+            self.vbox.addWidget(s_rep_label)
+
+            line                = QFrame()
+            line.setFrameShape(QFrame.HLine)
+            line.setFrameShadow(QFrame.Sunken)
+            self.vbox.addWidget(line)
+
+            self.no_sched_rb    = QRadioButton("Keep schedule")
+        else:
+            self.no_sched_rb = QRadioButton("No specific schedule")
+
+        self.no_sched_rb.setChecked(True)
+        self.td_rb      = QRadioButton("Show in ")
+        self.tpwd_rb    = QRadioButton("Show on weekday(s):")
+        self.tpd_rb     = QRadioButton("Show every ")
+        self.group.addButton(self.no_sched_rb, 0)
+        self.group.addButton(self.td_rb, 1)
+        self.group.addButton(self.tpwd_rb, 2)
+        self.group.addButton(self.tpd_rb, 3)
+        
+
+        for rb in [self.no_sched_rb, self.td_rb, self.tpwd_rb, self.tpd_rb]:
+            rb.clicked.connect(self.sched_radio_clicked)
+
+        self.vbox.addWidget(self.no_sched_rb)
+        if self.parent.has_schedule:
+            self.remove_sched_rb = QRadioButton("Remove schedule")
+            self.group.addButton(self.remove_sched_rb, 4)
+            self.vbox.addWidget(self.remove_sched_rb)
+
+        # time delta
+        hbox1 = QHBoxLayout()
+        self.td_inp = QDoubleSpinBox()
+        self.td_inp.setMinimum(1)
+        self.td_inp.setDecimals(0)
+        self.td_inp.setSuffix(" day(s)")
+
+        hbox1.addWidget(self.td_rb)
+        hbox11 = QHBoxLayout()
+        hbox11.addWidget(self.td_inp)
+
+        self.container1 = QWidget()
+        self.container1.setLayout(hbox11)
+        hbox1.addWidget(self.container1)
+        # self.vbox.addWidget(self.td_rb)
+        self.vbox.addLayout(hbox1)
+
+        # weekdays
+        hbox2 = QHBoxLayout()
+        self.container2 = QWidget()
+        self.container2.setLayout(hbox2)
+        self.mon_cb = QCheckBox("M")
+        self.tue_cb = QCheckBox("T")
+        self.wed_cb = QCheckBox("W")
+        self.thu_cb = QCheckBox("T")
+        self.fri_cb = QCheckBox("F")
+        self.sat_cb = QCheckBox("S")
+        self.sun_cb = QCheckBox("S")
+        hbox2.addWidget(self.mon_cb)
+        hbox2.addWidget(self.tue_cb)
+        hbox2.addWidget(self.wed_cb)
+        hbox2.addWidget(self.thu_cb)
+        hbox2.addWidget(self.fri_cb)
+        hbox2.addWidget(self.sat_cb)
+        hbox2.addWidget(self.sun_cb)
+        self.vbox.addWidget(self.tpwd_rb)
+        self.vbox.addWidget(self.container2)
+
+        # intervals in days
+        hbox3 = QHBoxLayout()
+        self.tpd_inp = QDoubleSpinBox()
+        self.tpd_inp.setMinimum(1)
+        self.tpd_inp.setDecimals(0)
+        self.tpd_inp.setSuffix(" day(s)")
+        # self.tpd_inp.setValidator(val)
+    
+        hbox3.addWidget(self.tpd_rb)
+        hbox33 = QHBoxLayout()
+        hbox33.addWidget(self.tpd_inp)
+        self.container3 = QWidget()
+        self.container3.setLayout(hbox33)
+        hbox3.addWidget(self.container3)
+        self.vbox.addLayout(hbox3)
+        self.setLayout(self.vbox)
+
+        if self.parent.has_schedule:
+            self.parse_schedule(self.parent.initial_schedule)
+            self._schedule = self.parent.initial_schedule
+
+    def sched_radio_clicked(self):
+        if self.no_sched_rb.isChecked() or (self.parent.has_schedule and self.remove_sched_rb.isChecked()):
+            self.container1.setEnabled(False)
+            self.container2.setEnabled(False)
+            self.container3.setEnabled(False)
+        elif self.td_rb.isChecked():
+            self.container1.setEnabled(True)
+            self.container2.setEnabled(False)
+            self.container3.setEnabled(False)
+        
+        elif self.tpd_rb.isChecked():
+            self.container1.setEnabled(False)
+            self.container2.setEnabled(False)
+            self.container3.setEnabled(True)
+
+        elif self.tpwd_rb.isChecked():
+            self.container1.setEnabled(False)
+            self.container2.setEnabled(True)
+            self.container3.setEnabled(False)
+
+    def parse_schedule(self, schedule):
+        created = schedule.split("|")[0]
+        due = schedule.split("|")[1]
+        stype = schedule.split("|")[2]
+
+        if stype.startswith("td:"):
+            self.td_inp.setValue(float(stype[3:]))
+        elif stype.startswith("wd:"):
+            for d in stype[3:]:
+                if d == "1": self.mon_cb.setChecked(True)
+                elif d == "2": self.tue_cb.setChecked(True)
+                elif d == "3": self.wed_cb.setChecked(True)
+                elif d == "4": self.thu_cb.setChecked(True)
+                elif d == "5": self.fri_cb.setChecked(True)
+                elif d == "6": self.sat_cb.setChecked(True)
+                elif d == "7": self.sun_cb.setChecked(True)
+        elif stype.startswith("id:"):
+            self.tpd_inp.setValue(float(stype[3:]))
+
+    def _get_schedule(self):
+        if self.no_sched_rb.isChecked():
+            return None
+        if self.parent.has_schedule and self.remove_sched_rb.isChecked():
+            return ""
+        now = datetime.now().strftime('%Y-%m-%d-%H-%M-%S')
+
+        # in x days
+        if self.td_rb.isChecked():
+            val = self.td_inp.value()
+            if val is None or int(val) <= 0:
+                return None
+            val = int(val)
+            due = (datetime.now() + timedelta(days=int(val))).strftime('%Y-%m-%d-%H-%M-%S')
+            return f"{now}|{due}|td:{val}"
+
+        # every x days
+        if self.tpd_rb.isChecked():
+            val = self.tpd_inp.value()
+            if val is None or int(val) <= 0:
+                return None
+            val = int(val)
+
+            if get_config_value_or_default("notes.queue.intervalSchedulesStartToday", True):
+                due = datetime.now().strftime('%Y-%m-%d-%H-%M-%S')
+            else:
+                due = (datetime.now() + timedelta(days=int(val))).strftime('%Y-%m-%d-%H-%M-%S')
+            return f"{now}|{due}|id:{val}"
+
+        # weekday checkboxes
+        if self.tpwd_rb.isChecked():
+            wds = ""
+            if self.mon_cb.isChecked(): wds += "1"
+            if self.tue_cb.isChecked(): wds += "2"
+            if self.wed_cb.isChecked(): wds += "3"
+            if self.thu_cb.isChecked(): wds += "4"
+            if self.fri_cb.isChecked(): wds += "5"
+            if self.sat_cb.isChecked(): wds += "6"
+            if self.sun_cb.isChecked(): wds += "7"
+            if len(wds) == 0:
+                return None
+
+            today = datetime.now().weekday()
+            if get_config_value_or_default("notes.queue.intervalSchedulesStartToday", True):
+                next = [int(d) for d in wds if int(d) >= today + 1]
+            else:
+                next = [int(d) for d in wds if int(d) > today + 1]
+            if len(next) > 0:
+                next_date = next[0]
+            else:
+                next_date = int(wds[0:1])
+            n = (next_date - 1 - today) % 7 
+            due = (datetime.now() + timedelta(days=n)).strftime('%Y-%m-%d-%H-%M-%S')
+            return f"{now}|{due}|wd:{wds}"
\ No newline at end of file
diff --git a/src/dialogs/editor.py b/src/dialogs/editor.py
index 364d3179..80f75999 100644
--- a/src/dialogs/editor.py
+++ b/src/dialogs/editor.py
@@ -33,29 +33,36 @@
 from ..config import get_config_value_or_default
 from ..web_import import import_webpage
 from .url_import import UrlImporter
+from .components import QtPrioritySlider
 from .url_input_dialog import URLInputDialog
 
 import utility.text
 import utility.misc
+import state
 
 def openEditor(mw, nid):
     note = mw.col.getNote(nid)
     dialog = EditDialog(mw, note)
 
 class EditDialog(QDialog):
+    """ Edit dialog for Anki notes. """
 
     def __init__(self, mw, note):
+
         QDialog.__init__(self, None, Qt.Window)
         mw.setupDialogGC(self)
-        self.mw = mw
-        self.form = aqt.forms.editcurrent.Ui_Dialog()
+
+        self.mw         = mw
+        self.form       = aqt.forms.editcurrent.Ui_Dialog()
+
         self.form.setupUi(self)
+        self.form.buttonBox.button(QDialogButtonBox.Close).setShortcut(QKeySequence("Ctrl+Return"))
+        self.editor     = aqt.editor.Editor(self.mw, self.form.fieldsArea, self)
+
         self.setWindowTitle(_("Edit Note"))
         self.setMinimumHeight(400)
         self.setMinimumWidth(500)
         self.resize(500, 850)
-        self.form.buttonBox.button(QDialogButtonBox.Close).setShortcut(QKeySequence("Ctrl+Return"))
-        self.editor = aqt.editor.Editor(self.mw, self.form.fieldsArea, self)
         self.editor.setNote(note, focusTo=0)
         addHook("reset", self.onReset)
         self.mw.requireReset()
@@ -96,21 +103,24 @@ def callback():
         self.editor.saveNow(callback)
 
 class NoteEditor(QDialog):
-    """
-    The editor window for non-anki notes.
-    Has a text field and a tag field.
-    """
+    """ The editor window for non-anki notes. """
+
     def __init__(self, parent, note_id = None, add_only = False, read_note_id = None, tag_prefill = None, source_prefill = None, text_prefill = None, title_prefill = None, prio_prefill = None):
 
-        self.note_id = note_id
-        self.note = None
-        self.add_only = add_only
-        self.read_note_id = read_note_id
-        self.tag_prefill = tag_prefill
+        QDialog.__init__(self, parent, Qt.WindowSystemMenuHint | Qt.WindowTitleHint | Qt.WindowCloseButtonHint | Qt.WindowMaximizeButtonHint | Qt.WindowMinimizeButtonHint)
+
+        self.mw             = aqt.mw
+        self.parent         = parent
+
+        self.note_id        = note_id
+        self.note           = None
+        self.add_only       = add_only
+        self.read_note_id   = read_note_id
+        self.tag_prefill    = tag_prefill
         self.source_prefill = source_prefill
-        self.text_prefill = text_prefill
-        self.title_prefill = title_prefill
-        self.prio_prefill = prio_prefill
+        self.text_prefill   = text_prefill
+        self.title_prefill  = title_prefill
+        self.prio_prefill   = prio_prefill
         try:
             self.dark_mode_used = utility.misc.dark_mode_is_used(mw.addonManager.getConfig(__name__))
         except Exception as err:
@@ -118,9 +128,6 @@ def __init__(self, parent, note_id = None, add_only = False, read_note_id = None
 
         if self.note_id is not None:
             self.note = get_note(note_id)
-        QDialog.__init__(self, parent, Qt.WindowSystemMenuHint | Qt.WindowTitleHint | Qt.WindowCloseButtonHint | Qt.WindowMaximizeButtonHint)
-        self.mw = aqt.mw
-        self.parent = parent
         #self.mw.setupDialogGC(self)
         #self.setWindowModality(Qt.WindowModal)
         #self.setAttribute(Qt.WA_DeleteOnClose)
@@ -128,15 +135,23 @@ def __init__(self, parent, note_id = None, add_only = False, read_note_id = None
 
     def setup_ui(self):
         
-         
+        # editing an existing note
         if self.note_id is not None:
             self.save = QPushButton("\u2714 Save")
             self.setWindowTitle('Edit Note')
             self.save.clicked.connect(self.on_update_clicked)
+            self.priority = get_priority(self.note_id)
+        # creating a new note
         else:
             self.save = QPushButton("\u2714 Create")
             self.setWindowTitle('New Note  (Ctrl/Cmd+Shift+N)')
             self.save.clicked.connect(self.on_create_clicked)
+            self.priority = 0
+        
+            self.save_and_stay = QPushButton(" \u2714 Create && Keep Open ")
+            self.save_and_stay.clicked.connect(self.on_create_and_keep_open_clicked)
+            self.save_and_stay.setShortcut("Ctrl+Shift+Return")
+
         self.save.setShortcut("Ctrl+Return")
         self.cancel = QPushButton("Cancel")
         self.cancel.clicked.connect(self.reject)
@@ -144,8 +159,6 @@ def setup_ui(self):
         self.priority_list = priority_list
 
         self.tabs = QTabWidget()
-        
-        
          
         self.create_tab = CreateTab(self)
         
@@ -200,10 +213,35 @@ def setup_ui(self):
         self.setStyleSheet(styles)
         self.create_tab.title.setFocus()
 
-        self.exec_()
+        # self.exec_()
+        state.note_editor_shown = True
+        self.show()
 
 
     def on_create_clicked(self):
+        
+        success = self._create_note()
+        if not success:
+            return
+        #aqt.dialogs.close("UserNoteEditor")
+        run_hooks("user-note-created")
+        self.reject()
+
+        # if reading modal is open, we might have to update the bottom bar
+        if self.read_note_id is not None:
+            get_index().ui.reading_modal.update_reading_bottom_bar(self.read_note_id)
+
+    def on_create_and_keep_open_clicked(self):
+        success = self._create_note()
+        if not success:
+            return
+        run_hooks("user-note-created")
+        if self.read_note_id is not None:
+            get_index().ui.reading_modal.update_reading_bottom_bar(self.read_note_id)
+
+        self._reset()
+
+    def _create_note(self):
         title = self.create_tab.title.text()
         title = utility.text.clean_user_note_title(title) 
         if self.create_tab.plain_text_cb.checkState() == Qt.Checked:
@@ -215,22 +253,29 @@ def on_create_clicked(self):
             else:
                 text = self.create_tab.text.toHtml()
 
-        source = self.create_tab.source.text()
-        tags = self.create_tab.tag.text()
-        queue_schedule = self.create_tab.queue_schedule
+        source              = self.create_tab.source.text()
+        tags                = self.create_tab.tag.text()
+        queue_schedule      = self.create_tab.slider.value()
+        specific_schedule   = self.create_tab.slider.schedule()
 
         # don't allow for completely empty fields
         if len(title.strip()) + len(text.strip()) == 0:
-            return
+            return False
 
-        create_note(title, text, source, tags, None, "", queue_schedule)
-        #aqt.dialogs.close("UserNoteEditor")
-        run_hooks("user-note-created")
-        self.reject()
+        create_note(title, text, source, tags, None, specific_schedule, queue_schedule)
+        return True
 
-        # if reading modal is open, we might have to update the bottom bar
-        if self.read_note_id is not None:
-            get_index().ui.reading_modal.update_reading_bottom_bar(self.read_note_id)
+    def _reset(self):
+        """
+            Called after a note is created with the save_and_stay button.
+            Clear the fields for the next note.
+        """
+        self.create_tab.title.setText("")
+        self.create_tab.text.setText("")
+        if self.create_tab.source.text().endswith(".pdf"):
+            self.create_tab.source.setText("")
+        self.create_tab.title.setFocus()
+        
 
     def on_update_clicked(self):
         title = self.create_tab.title.text()
@@ -243,10 +288,14 @@ def on_update_clicked(self):
                 text = ""
             else:
                 text = self.create_tab.text.toHtml()
-        source = self.create_tab.source.text()
-        tags = self.create_tab.tag.text()
-        queue_schedule = self.create_tab.queue_schedule
-        update_note(self.note_id, title, text, source, tags, "", queue_schedule)
+        source              = self.create_tab.source.text()
+        tags                = self.create_tab.tag.text()
+        priority            = self.create_tab.slider.value()
+        if not self.create_tab.slider.has_changed_value():
+            priority = -1
+        specific_schedule   = self.create_tab.slider.schedule()
+
+        update_note(self.note_id, title, text, source, tags, specific_schedule, priority)
         run_hooks("user-note-edited")
 
         self.reject()
@@ -254,49 +303,49 @@ def on_update_clicked(self):
     def reject(self):
         if not self.add_only:
             self.priority_tab.t_view.setModel(None)
+        state.note_editor_shown = False
         QDialog.reject(self)
 
     def accept(self):
+        state.note_editor_shown = False
         self.reject()
 
 class CreateTab(QWidget):
 
     def __init__(self, parent):
         QWidget.__init__(self)
-        self.queue_schedule = 0
-        self.parent = parent
-        tmap = get_all_tags_as_hierarchy(False)
-        self.tree = QTreeWidget()
+
+        self.queue_schedule     = 0
+        self.parent             = parent
+        self.tree               = QTreeWidget()
+        self.original_bg        = None
+        self.original_fg        = None
+        web_path                = utility.misc.get_web_folder_path()
+
         self.tree.setColumnCount(1)
         self.tree.setIconSize(QSize(0,0))
-        self.build_tree(tmap)
+        self.build_tree(get_all_tags_as_hierarchy(False))
         self.tree.itemClicked.connect(self.tree_item_clicked)
         self.tree.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
         self.tree.setMinimumHeight(150)
         self.tree.setMinimumWidth(220)
         self.tree.setHeaderHidden(True)
-        self.original_bg = None
-        self.original_fg = None
-        web_path = utility.misc.get_web_folder_path()
 
-        self.highlight_map = {
+        self.highlight_map      = {
             "ob": [0,0,0,232,151,0],
             "rw": [255, 255, 255, 209, 46, 50],
             "yb": [0,0,0,235, 239, 69],
             "bw": [255,255,255,2, 119,189],
             "gb": [255,255,255,34,177,76]
         }
-
          
-        recently_used_tags = get_recently_used_tags()
+        recently_used_tags      = get_recently_used_tags()
         
-        config = mw.addonManager.getConfig(__name__)
-        tag_bg = config["styling"]["general"]["tagBackgroundColor"]
-        tag_fg = config["styling"]["general"]["tagForegroundColor"]
-
-         
+        config                  = mw.addonManager.getConfig(__name__)
+        tag_bg                  = config["styling"]["general"]["tagBackgroundColor"]
+        tag_fg                  = config["styling"]["general"]["tagForegroundColor"]
 
-        self.recent_tbl = QWidget()
+        self.recent_tbl         = QWidget()
         self.recent_tbl.setObjectName("recentDisp")
         self.recent_tbl.setStyleSheet("background-color: transparent;")
         bs = f"""
@@ -315,109 +364,9 @@ def __init__(self, parent):
         self.recent_tbl.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Minimum)
         self.recent_tbl.setMaximumHeight(100)
 
-        self.queue_section = QGroupBox("Queue")
-        self.queue_section.setStyleSheet("background-color: transparent;")
-        ex_v = QVBoxLayout()
         queue_len = len(parent.priority_list)
-        if parent.note_id is None:
-            queue_lbl = QLabel("Add to Queue? (<b>%s</b> items)" % queue_len)
-        else:
-            #check if note has position (is in queue)
-            if not parent.note.is_in_queue():
-                queue_lbl = QLabel("<b>Not</b> in Queue (<b>%s</b> items)" % queue_len)
-            else:
-                queue_lbl = QLabel("Position: <b>%s</b> / <b>%s</b>" % (parent.note.position + 1, queue_len))
-
-        queue_lbl.setAlignment(Qt.AlignCenter)
-        ex_v.addWidget(queue_lbl, Qt.AlignCenter)
-        ex_v.addSpacing(5)
-
-        if parent.note_id is None:
-            self.q_lbl_1 = QPushButton(" Don't Add ")
-        else:
-            if not parent.note.is_in_queue():
-                self.q_lbl_1 = QPushButton(" Don't Add ")
-            else:
-                self.q_lbl_1 = QPushButton("Keep Priority")
-
-        if parent.dark_mode_used:
-            btn_style = "QPushButton { border: 2px solid lightgrey; padding: 3px; color: lightgrey; } QPushButton:hover { border: 2px solid #2496dc; color: black; }"
-            btn_style_active = "QPushButton { border: 2px solid #2496dc; padding: 3px; color: lightgrey; font-weight: bold; } QPushButton:hover { border: 2px solid #2496dc; color: black; }"
-        else:
-            btn_style = "QPushButton { border: 2px solid lightgrey; padding: 3px; color: grey; }"
-            btn_style_active = "QPushButton { border: 2px solid #2496dc; padding: 3px; color: black; font-weight: bold;}"
-
-       
-        self.q_lbl_1.setObjectName("q_1")
-        self.q_lbl_1.setFlat(True)
-        self.q_lbl_1.setStyleSheet(btn_style_active)
-        self.q_lbl_1.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
-        self.q_lbl_1.clicked.connect(lambda: self.queue_selected(0))
-        ex_v.addWidget(self.q_lbl_1)
-        ex_v.setAlignment(self.q_lbl_1, Qt.AlignCenter)
-
-        ex_v.addSpacing(5)
-        line_sep = QFrame()
-        line_sep.setFrameShape(QFrame.HLine)
-        line_sep.setFrameShadow(QFrame.Sunken)
-        ex_v.addWidget(line_sep)
-        ex_v.addSpacing(5)
-
-        lbl = QLabel("Priority")
-        lbl.setAlignment(Qt.AlignCenter)
-        ex_v.addWidget(lbl)
-
-        self.q_lbl_2 = QPushButton("5 - Very High")
-        self.q_lbl_2.setObjectName("q_2")
-        self.q_lbl_2.setMinimumWidth(220)
-        self.q_lbl_2.setFlat(True)
-        self.q_lbl_2.setStyleSheet(btn_style)
-        self.q_lbl_2.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
-        self.q_lbl_2.clicked.connect(lambda: self.queue_selected(5))
-        ex_v.addWidget(self.q_lbl_2)
-        ex_v.setAlignment(self.q_lbl_2, Qt.AlignCenter)
-
-        self.q_lbl_3 = QPushButton("4 - High")
-        self.q_lbl_3.setObjectName("q_3")
-        self.q_lbl_3.setMinimumWidth(185)
-        self.q_lbl_3.setFlat(True)
-        self.q_lbl_3.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
-        self.q_lbl_3.setStyleSheet(btn_style)
-        self.q_lbl_3.clicked.connect(lambda: self.queue_selected(4))
-        ex_v.addWidget(self.q_lbl_3)
-        ex_v.setAlignment(self.q_lbl_3, Qt.AlignCenter)
-
-        self.q_lbl_4 = QPushButton("3 - Medium")
-        self.q_lbl_4.setMinimumWidth(150)
-        self.q_lbl_4.setObjectName("q_4")
-        self.q_lbl_4.setFlat(True)
-        self.q_lbl_4.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
-        self.q_lbl_4.setStyleSheet(btn_style)
-        self.q_lbl_4.clicked.connect(lambda: self.queue_selected(3))
-        ex_v.addWidget(self.q_lbl_4)
-        ex_v.setAlignment(self.q_lbl_4, Qt.AlignCenter)
-
-        self.q_lbl_5 = QPushButton("2 - Low")
-        self.q_lbl_5.setMinimumWidth(115)
-        self.q_lbl_5.setObjectName("q_5")
-        self.q_lbl_5.setFlat(True)
-        self.q_lbl_5.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
-        self.q_lbl_5.setStyleSheet(btn_style)
-        self.q_lbl_5.clicked.connect(lambda: self.queue_selected(2))
-        ex_v.addWidget(self.q_lbl_5)
-        ex_v.setAlignment(self.q_lbl_5, Qt.AlignCenter)
-
-        self.q_lbl_6 = QPushButton("1 - Very Low")
-        self.q_lbl_6.setMinimumWidth(80)
-        self.q_lbl_6.setObjectName("q_6")
-        self.q_lbl_6.setFlat(True)
-        self.q_lbl_6.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
-        self.q_lbl_6.setStyleSheet(btn_style)
-        self.q_lbl_6.clicked.connect(lambda: self.queue_selected(1))
-        ex_v.addWidget(self.q_lbl_6)
-        ex_v.setAlignment(self.q_lbl_6, Qt.AlignCenter)
-
-        self.queue_section.setLayout(ex_v)
+        schedule = None if self.parent.note is None else self.parent.note.reminder
+        self.slider = QtPrioritySlider(self.parent.priority, schedule=schedule)
 
         self.layout = QHBoxLayout()
         vbox_left = QVBoxLayout()
@@ -456,12 +405,21 @@ def __init__(self, parent):
             qs.setWidget(self.recent_tbl)
             vbox_left.addWidget(qs)
 
-        vbox_left.addWidget(self.queue_section)
 
-        self.layout.addLayout(vbox_left, 7)
+        vbox_left.addWidget(self.slider)
+        self.left_pane = QWidget()
+        self.left_pane.setLayout(vbox_left)
+        self.layout.addWidget(self.left_pane, 7)
 
         hbox = QHBoxLayout()
+
+        self.toggle_btn = QPushButton("<")
+        self.toggle_btn.clicked.connect(self.toggle_left_pane)
+        hbox.addWidget(self.toggle_btn)
+
         hbox.addStretch(1)
+        if parent.note_id is None:
+            hbox.addWidget(parent.save_and_stay)
         hbox.addWidget(parent.save)
         hbox.addWidget(parent.cancel)
 
@@ -525,9 +483,6 @@ def __init__(self, parent):
         self.green_black = self.vtb.addAction(QIcon(web_path + "icons/icon-green-black.png"), "Highlight 5")
         self.green_black.triggered.connect(self.on_highlight_gb_clicked)
 
-        
-
-         
         bold =  self.tb.addAction("b")
         f = bold.font()
         f.setBold(True)
@@ -586,8 +541,6 @@ def __init__(self, parent):
                 QMenu:item:selected { background: #2496dc; color: white; }
             """)
         
-
-         
         header_a = clean_menu.addAction("Remove Headers")
         header_a.triggered.connect(self.on_remove_headers_clicked)
         header_a1 = clean_menu.addAction("Remove All Bold Formatting")
@@ -621,16 +574,16 @@ def __init__(self, parent):
         p_hb.addSpacing(35)
         vbox.addLayout(p_hb)
 
-        source_lbl = QLabel("Source")
-        self.source = QLineEdit()
-        source_hb = QHBoxLayout()
+        source_lbl          = QLabel("Source")
+        self.source         = QLineEdit()
+        source_hb           = QHBoxLayout()
         source_hb.addWidget(self.source)
         if self.parent.source_prefill is not None:
             self.source.setText(self.parent.source_prefill.replace("\\", "/"))
-        pdf_btn = QPushButton("PDF")
+        pdf_btn             = QPushButton("PDF")
         pdf_btn.clicked.connect(self.on_pdf_clicked)
         source_hb.addWidget(pdf_btn)
-        pdf_from_url_btn = QPushButton("PDF from Webpage")
+        pdf_from_url_btn    = QPushButton("PDF from Webpage")
         pdf_from_url_btn.clicked.connect(self.on_pdf_from_url_clicked)
         source_hb.addWidget(pdf_from_url_btn)
 
@@ -639,17 +592,6 @@ def __init__(self, parent):
 
         if self.parent.text_prefill is not None:
             self.text.setText(self.parent.text_prefill)
-        if self.parent.prio_prefill is not None:
-            if self.parent.prio_prefill == 1:
-                self.q_lbl_6.animateClick()
-            elif self.parent.prio_prefill == 2:
-                self.q_lbl_5.animateClick()
-            elif self.parent.prio_prefill == 3:
-                self.q_lbl_4.animateClick()
-            elif self.parent.prio_prefill == 4:
-                self.q_lbl_3.animateClick()
-            elif self.parent.prio_prefill == 5:
-                self.q_lbl_2.animateClick()
 
         btn_styles = """
         QPushButton#q_1 { padding-left: 20px; padding-right: 20px; }
@@ -690,8 +632,6 @@ def __init__(self, parent):
         # vbox.addStretch(1)
         tag_lbl2 = QLabel()
         tag_lbl2.setPixmap(tag_icn)
-
-        
          
         tag_hb2 = QHBoxLayout()
         tag_hb2.setAlignment(Qt.AlignLeft)
@@ -705,6 +645,7 @@ def __init__(self, parent):
             self.tag.setText(self.parent.tag_prefill)
 
         vbox.setAlignment(Qt.AlignTop)
+        vbox.addSpacing(10)
         vbox.addLayout(hbox)
         self.layout.addSpacing(5)
         self.layout.addLayout(vbox, 73)
@@ -762,16 +703,12 @@ def build_tree(self, tmap):
             ti.addChildren(self._add_to_tree(children, t + "::"))
             self.tree.addTopLevelItem(ti)
 
-    def queue_selected(self, queue_schedule):
-        self.queue_schedule = queue_schedule
-        lbls = [self.q_lbl_1, self.q_lbl_6, self.q_lbl_5, self.q_lbl_4, self.q_lbl_3, self.q_lbl_2]
-
-        for lbl in lbls:
-            if self.parent.dark_mode_used:
-                lbl.setStyleSheet("QPushButton { border: 2px solid lightgrey; padding: 3px; color: lightgrey; } QPushButton:hover { border: 2px solid #2496dc; color: black; }")
-            else:
-                lbl.setStyleSheet("border: 2px solid lightgrey; padding: 3px; color: grey; font-weight: normal;")
-            lbls[queue_schedule].setStyleSheet("border: 2px solid #2496dc; padding: 3px; font-weight: bold;")
+    def toggle_left_pane(self):
+        self.left_pane.setVisible(not self.left_pane.isVisible())
+        if self.left_pane.isVisible():
+            self.toggle_btn.setText("<")
+        else:
+            self.toggle_btn.setText(">")
 
     def on_pdf_clicked(self):
         fname = QFileDialog.getOpenFileName(self, 'Pick a PDF', '',"PDF (*.pdf)")
@@ -940,12 +877,14 @@ class PriorityTab(QWidget):
 
     def __init__(self, priority_list, parent):
         
-         
         QWidget.__init__(self)
-        self.parent = parent
-        model = self.get_model(priority_list)
-        self.t_view = QTableView()
-        html_delegate = HTMLDelegate()
+
+        self.parent     = parent
+        self.t_view     = QTableView()
+
+        html_delegate   = HTMLDelegate()
+        model           = self.get_model(priority_list)
+
         self.t_view.setItemDelegateForColumn(0, html_delegate)
         self.t_view.setItemDelegateForColumn(1, html_delegate)
         self.t_view.setModel(model)
@@ -954,14 +893,14 @@ def __init__(self, priority_list, parent):
 
         self.t_view.resizeColumnsToContents()
         self.t_view.setSelectionBehavior(QAbstractItemView.SelectRows)
-        self.t_view.setDragEnabled(True)
-        self.t_view.setDropIndicatorShown(True)
-        self.t_view.setAcceptDrops(True)
-        self.t_view.viewport().setAcceptDrops(True)
-        self.t_view.setDragDropOverwriteMode(False)
-
-        self.t_view.setDragDropMode(QAbstractItemView.InternalMove)
-        self.t_view.setDefaultDropAction(Qt.MoveAction)
+        # self.t_view.setDragEnabled(True)
+        # self.t_view.setDropIndicatorShown(True)
+        # self.t_view.setAcceptDrops(True)
+        # self.t_view.viewport().setAcceptDrops(True)
+        # self.t_view.setDragDropOverwriteMode(False)
+
+        # self.t_view.setDragDropMode(QAbstractItemView.InternalMove)
+        # self.t_view.setDefaultDropAction(Qt.MoveAction)
         if priority_list is not None and len(priority_list) > 0:
             self.t_view.horizontalHeader().setSectionResizeMode(0, QHeaderView.Stretch)
             self.t_view.horizontalHeader().setSectionResizeMode(1, QHeaderView.Stretch)
@@ -971,16 +910,16 @@ def __init__(self, priority_list, parent):
         self.t_view.setSelectionMode(QAbstractItemView.SingleSelection)
 
         self.vbox = QVBoxLayout()
-        lbl = QLabel("Drag & Drop to reorder.\n'Remove' will only remove the item from the queue, not delete it.")
+        lbl = QLabel("'Remove' will only remove the item from the queue, not delete it.")
         self.vbox.addWidget(lbl)
         self.vbox.addWidget(self.t_view)
 
-        bottom_box = QHBoxLayout()
-        self.shuffle_btn = QPushButton("Shuffle")
-        self.shuffle_btn.clicked.connect(self.on_shuffle_btn_clicked)
-        bottom_box.addWidget(self.shuffle_btn)
-        bottom_box.addStretch(1)
-        self.vbox.addLayout(bottom_box)
+        # bottom_box = QHBoxLayout()
+        # # self.shuffle_btn = QPushButton("Shuffle")
+        # # # self.shuffle_btn.clicked.connect(self.on_shuffle_btn_clicked)
+        # # bottom_box.addWidget(self.shuffle_btn)
+        # # bottom_box.addStretch(1)
+        # self.vbox.addLayout(bottom_box)
 
         self.setLayout(self.vbox)
         if parent.dark_mode_used:
@@ -1068,6 +1007,7 @@ def on_shuffle_btn_clicked(self):
         self.set_remove_btns(priority_list)
 
 class PriorityListModel(QStandardItemModel):
+
     def __init__(self, parent):
         super(PriorityListModel, self).__init__()
         self.parent = parent
@@ -1161,66 +1101,6 @@ def paint(self, painter, option, index):
     def sizeHint(self, option, index):
         return QSize(self.doc.idealWidth(), self.doc.size().height())
 
-class ExpandableSection(QWidget):
-    def __init__(self, title="", parent=None):
-        super(ExpandableSection, self).__init__(parent)
-
-        self.toggle_button = QToolButton( text=title, checkable=True, checked=False)
-        self.toggle_button.setStyleSheet("QToolButton { border: none; }")
-        self.toggle_button.setToolButtonStyle(Qt.ToolButtonTextBesideIcon)
-        self.toggle_button.setArrowType(Qt.RightArrow)
-        self.toggle_button.pressed.connect(self.on_pressed)
-
-        self.toggle_animation = QParallelAnimationGroup(self)
-
-        self.content_area = QScrollArea(maximumHeight=0, minimumHeight=0)
-        self.content_area.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed)
-        self.content_area.setFrameShape(QFrame.NoFrame)
-
-        lay = QVBoxLayout(self)
-        lay.setSpacing(0)
-        lay.setContentsMargins(0, 0, 0, 0)
-        lay.addWidget(self.toggle_button)
-        lay.addWidget(self.content_area)
-
-        self.toggle_animation.addAnimation( QPropertyAnimation(self, b"minimumHeight"))
-        self.toggle_animation.addAnimation( QPropertyAnimation(self, b"maximumHeight"))
-        self.toggle_animation.addAnimation( QPropertyAnimation(self.content_area, b"maximumHeight"))
-
-    @pyqtSlot()
-    def on_pressed(self):
-        checked = self.toggle_button.isChecked()
-        self.toggle_button.setArrowType(
-            Qt.DownArrow if not checked else Qt.RightArrow
-        )
-        self.toggle_animation.setDirection(
-            QAbstractAnimation.Forward
-            if not checked
-            else QAbstractAnimation.Backward
-        )
-        self.toggle_animation.start()
-
-    def setContentLayout(self, layout):
-        lay = self.content_area.layout()
-        del lay
-        self.content_area.setLayout(layout)
-        collapsed_height = (
-            self.sizeHint().height() - self.content_area.maximumHeight()
-        )
-        content_height = layout.sizeHint().height()
-        for i in range(self.toggle_animation.animationCount()):
-            animation = self.toggle_animation.animationAt(i)
-            animation.setDuration(500)
-            animation.setStartValue(collapsed_height)
-            animation.setEndValue(collapsed_height + content_height)
-
-        content_animation = self.toggle_animation.animationAt(
-            self.toggle_animation.animationCount() - 1
-        )
-        content_animation.setDuration(500)
-        content_animation.setStartValue(0)
-        content_animation.setEndValue(content_height)
-
 class FlowLayout(QLayout):
     def __init__(self, parent=None, margin=0, spacing=-1):
         super(FlowLayout, self).__init__(parent)
diff --git a/src/dialogs/queue_picker.py b/src/dialogs/queue_picker.py
index 11e24f8e..857beabf 100644
--- a/src/dialogs/queue_picker.py
+++ b/src/dialogs/queue_picker.py
@@ -21,26 +21,30 @@
 import random
 import os
 from .editor import NoteEditor
+from .components import QtPrioritySlider
 from ..notes import *
 from ..notes import _get_priority_list
 from ..internals import perf_time
 import utility.text
 import utility.misc
 import utility.tags
+import state
 
 class QueuePicker(QDialog):
-    """
-    Can be used to select a single note from the queue or to move pdf notes in/out of the queue.
-    """
+    """ Can be used to select a single note from the queue or to move pdf notes in/out of the queue. """
+
     def __init__(self, parent, note_list, note_list_right):
-        self.chosen_id = None 
         QDialog.__init__(self, parent, Qt.WindowSystemMenuHint | Qt.WindowTitleHint | Qt.WindowCloseButtonHint)
-        self.mw = aqt.mw
-        self.parent = parent
+
+        self.chosen_id  = None 
+        self.mw         = aqt.mw
+        self.parent     = parent
+
         try:
             self.dark_mode_used = utility.misc.dark_mode_is_used(aqt.mw.addonManager.getConfig(__name__))
         except:
             self.dark_mode_used = False
+
         self.setup_ui(note_list, note_list_right)
         self.setWindowTitle("Queue Manager")
         
@@ -308,30 +312,14 @@ def setup_ui(self):
         self.t_view_right = QListWidget()
         self.vbox_right.addWidget(self.t_view_right)
         self.vbox_right.setAlignment(Qt.AlignHCenter)
-        self.enq_lbl = QLabel("Add to Queue: ")
-        self.enq_1 = QPushButton("5")
-        self.enq_1.setMinimumWidth(15)
-        self.enq_1.clicked.connect(lambda: self.enqueue(5))
-        self.enq_2 = QPushButton("4")
-        self.enq_2.setMinimumWidth(15)
-        self.enq_2.clicked.connect(lambda: self.enqueue(4))
-        self.enq_3 = QPushButton("3")
-        self.enq_3.setMinimumWidth(15)
-        self.enq_3.clicked.connect(lambda: self.enqueue(3))
-        self.enq_4 = QPushButton("2")
-        self.enq_4.setMinimumWidth(15)
-        self.enq_4.clicked.connect(lambda: self.enqueue(2))
-        self.enq_5 = QPushButton("1")
-        self.enq_5.setMinimumWidth(15)
-        self.enq_5.clicked.connect(lambda: self.enqueue(1))
+        
+        lbl = QLabel("Drag slider to assign priority to selected item.")
+        lbl.setAlignment(Qt.AlignCenter)
+        self.vbox_right.addWidget(lbl)
+        self.slider = QtPrioritySlider(0, show_spec_sched=False)
+        self.slider.set_released_fn(self.enqueue)
         btn_hbox = QHBoxLayout()
-        btn_hbox.addWidget(self.enq_lbl)
-        btn_hbox.addWidget(self.enq_1)
-        btn_hbox.addWidget(self.enq_2)
-        btn_hbox.addWidget(self.enq_3)
-        btn_hbox.addWidget(self.enq_4)
-        btn_hbox.addWidget(self.enq_5)
-        btn_hbox.addStretch(1)
+        btn_hbox.addWidget(self.slider)
 
         self.vbox_right.addLayout(btn_hbox)
         self.setLayout(self.vbox_right)
@@ -364,6 +352,8 @@ def search_enter(self):
         self.fill_list(res)
 
     def enqueue(self, sched):
+        if sched == 0: 
+            return
         sels = self.t_view_right.selectedItems()
         if sels is None or len(sels) == 0:
             return
@@ -396,30 +386,14 @@ def setup_ui(self):
         self.t_view_right = QListWidget()
         self.vbox_right.addWidget(self.t_view_right)
         self.vbox_right.setAlignment(Qt.AlignHCenter)
-        self.enq_lbl = QLabel("Add to Queue: ")
-        self.enq_1 = QPushButton("5")
-        self.enq_1.setMinimumWidth(15)
-        self.enq_1.clicked.connect(lambda: self.enqueue(5))
-        self.enq_2 = QPushButton("4")
-        self.enq_2.setMinimumWidth(15)
-        self.enq_2.clicked.connect(lambda: self.enqueue(4))
-        self.enq_3 = QPushButton("3")
-        self.enq_3.setMinimumWidth(15)
-        self.enq_3.clicked.connect(lambda: self.enqueue(3))
-        self.enq_4 = QPushButton("2")
-        self.enq_4.setMinimumWidth(15)
-        self.enq_4.clicked.connect(lambda: self.enqueue(2))
-        self.enq_5 = QPushButton("1")
-        self.enq_5.setMinimumWidth(15)
-        self.enq_5.clicked.connect(lambda: self.enqueue(1))
+    
+        lbl = QLabel("Drag slider to assign priority to selected item.")
+        lbl.setAlignment(Qt.AlignCenter)
+        self.vbox_right.addWidget(lbl)
+        self.slider = QtPrioritySlider(0, show_spec_sched=False)
+        self.slider.set_released_fn(self.enqueue)
         btn_hbox = QHBoxLayout()
-        btn_hbox.addWidget(self.enq_lbl)
-        btn_hbox.addWidget(self.enq_1)
-        btn_hbox.addWidget(self.enq_2)
-        btn_hbox.addWidget(self.enq_3)
-        btn_hbox.addWidget(self.enq_4)
-        btn_hbox.addWidget(self.enq_5)
-        btn_hbox.addStretch(1)
+        btn_hbox.addWidget(self.slider)
 
         self.vbox_right.addLayout(btn_hbox)
         self.setLayout(self.vbox_right)
@@ -449,6 +423,8 @@ def search_enter(self):
         self.fill_list(res)
 
     def enqueue(self, sched):
+        if sched == 0: 
+            return
         sels = self.t_view_right.selectedItems()
         if sels is None or len(sels) == 0:
             return
@@ -574,11 +550,15 @@ def _add_to_tree(self, map, prefix):
 
     def add_pdf_note(self, item_clicked):
         full_path = item_clicked.data(Qt.UserRole)
-        e = NoteEditor(self.parent, add_only=True, source_prefill=full_path)
-        if self.path_displayed is not None:
-            self.load_folders_unused_pdfs(self.path_displayed) 
-            self.parent.refresh_queue_list()
-            self.parent.pdfs_tab.refresh()
+
+        if not state.note_editor_shown:
+            e = NoteEditor(self.parent, add_only=True, source_prefill=full_path)
+            if self.path_displayed is not None:
+                self.load_folders_unused_pdfs(self.path_displayed) 
+                self.parent.refresh_queue_list()
+                self.parent.pdfs_tab.refresh()
+        else:
+            tooltip("Close the opened Note dialog first!")
 
 class TagsTab(QWidget):
     
@@ -618,31 +598,14 @@ def setup_ui(self):
         self.empty_and_enqueue_all_btn.clicked.connect(self.empty_queue_and_enqueue_all)
         self.vbox_right.addWidget(self.enqueue_all_btn)
         self.vbox_right.addWidget(self.empty_and_enqueue_all_btn)
-        self.enq_lbl = QLabel("Add to Queue: ")
-        self.enq_1 = QPushButton("5")
-        self.enq_1.setMinimumWidth(15)
-        self.enq_1.clicked.connect(lambda: self.enqueue(5))
-        self.enq_2 = QPushButton("4")
-        self.enq_2.setMinimumWidth(15)
-        self.enq_2.clicked.connect(lambda: self.enqueue(4))
-        self.enq_3 = QPushButton("3")
-        self.enq_3.setMinimumWidth(15)
-        self.enq_3.clicked.connect(lambda: self.enqueue(3))
-        self.enq_4 = QPushButton("2")
-        self.enq_4.setMinimumWidth(15)
-        self.enq_4.clicked.connect(lambda: self.enqueue(2))
-        self.enq_5 = QPushButton("1")
-        self.enq_5.setMinimumWidth(15)
-        self.enq_5.clicked.connect(lambda: self.enqueue(1))
-        self.enq_5.adjustSize()
+     
+        plbl = QLabel("Drag slider to assign priority to selected item.")
+        plbl.setAlignment(Qt.AlignCenter)
+        self.vbox_right.addWidget(plbl)
+        self.slider = QtPrioritySlider(0, show_spec_sched=False)
+        self.slider.set_released_fn(self.enqueue)
         btn_hbox = QHBoxLayout()
-        btn_hbox.addWidget(self.enq_lbl)
-        btn_hbox.addWidget(self.enq_1)
-        btn_hbox.addWidget(self.enq_2)
-        btn_hbox.addWidget(self.enq_3)
-        btn_hbox.addWidget(self.enq_4)
-        btn_hbox.addWidget(self.enq_5)
-        btn_hbox.addStretch(1)
+        btn_hbox.addWidget(self.slider)
         self.vbox_right.addLayout(btn_hbox)
         # self.list.itemDoubleClicked.connect(self.add_pdf_note)
         self.tag_tree.itemClicked.connect(self.tree_item_clicked)
@@ -712,6 +675,8 @@ def refresh(self):
             self.load_tags_unused_notes(self.tag_displayed)
 
     def enqueue(self, sched):
+        if sched == 0: 
+            return
         sels = self.list.selectedItems()
         if sels is None or len(sels) == 0:
             return
diff --git a/src/dialogs/quick_schedule.py b/src/dialogs/quick_schedule.py
index cbf9bdc1..c8ca56dd 100644
--- a/src/dialogs/quick_schedule.py
+++ b/src/dialogs/quick_schedule.py
@@ -30,14 +30,17 @@
 
 class QuickScheduler(QDialog):
     """
+        Not used atm. Would need modification for new prio system.
         Used in the reading modal to quickly move the current note in the queue.
     """
     def __init__(self, parent, note_id):
-        self.queue_schedule = QueueSchedule.NOT_ADD
         QDialog.__init__(self, parent, Qt.WindowSystemMenuHint | Qt.WindowTitleHint | Qt.WindowCloseButtonHint)
-        self.mw = aqt.mw
-        self.note = get_note(note_id)
-        self.parent = parent
+
+        self.queue_schedule = 0
+        self.mw             = aqt.mw
+        self.note           = get_note(note_id)
+        self.parent         = parent
+
         self.setup_ui()
         self.setWindowTitle("Quick Schedule")
 
diff --git a/src/dialogs/schedule_dialog.py b/src/dialogs/schedule_dialog.py
new file mode 100644
index 00000000..26880c6f
--- /dev/null
+++ b/src/dialogs/schedule_dialog.py
@@ -0,0 +1,60 @@
+# anki-search-inside-add-card
+# Copyright (C) 2019 - 2020 Tom Z.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from .components import QtScheduleComponent
+
+from aqt.qt import *
+import aqt.editor
+import aqt
+import functools
+import re
+import random
+from ..notes import *
+from ..config import get_config_value_or_default
+import utility.text
+import utility.misc
+import utility.date
+
+class ScheduleDialog(QDialog):
+    """ Edit the schedule of a note. """
+
+    def __init__(self, note, parent):
+        QDialog.__init__(self, parent, Qt.WindowSystemMenuHint | Qt.WindowTitleHint | Qt.WindowCloseButtonHint)
+
+        self.mw     = aqt.mw
+        self.parent = parent
+        self.note   = note
+
+        self.setup_ui()
+        self.setWindowTitle("Edit Schedule")
+    
+    def setup_ui(self):
+        self.scheduler = QtScheduleComponent(self.note.reminder)
+
+        self.setLayout(QVBoxLayout())
+        self.layout().addWidget(self.scheduler)
+        accept = QPushButton("Save")
+        accept.clicked.connect(self.accept)
+        hbox = QHBoxLayout()
+        hbox.addStretch()
+        hbox.addWidget(accept)
+        self.layout().addLayout(hbox)
+        
+    def should_remove_schedule(self):
+        return self.scheduler._get_schedule() == ""
+
+    def schedule(self):
+        return self.scheduler._get_schedule()
diff --git a/src/dialogs/url_import.py b/src/dialogs/url_import.py
index 561cf88a..8bce1fcd 100644
--- a/src/dialogs/url_import.py
+++ b/src/dialogs/url_import.py
@@ -26,6 +26,7 @@
 
 from ..notes import *
 from ..config import get_config_value_or_default
+from .components import QtPrioritySlider
 import utility.text
 import utility.misc
 
@@ -34,13 +35,15 @@ class UrlImporter(QDialog):
         Used to generate a pdf file from an url.
     """
     def __init__(self, parent, show_schedule=True):
-        self.chosen_url = None
-        self._chosen_name = None
-        self.show_schedule = show_schedule
-        self.queue_schedule = QueueSchedule.NOT_ADD.value
         QDialog.__init__(self, parent, Qt.WindowSystemMenuHint | Qt.WindowTitleHint | Qt.WindowCloseButtonHint)
-        self.mw = aqt.mw
-        self.parent = parent
+
+        self.chosen_url     = None
+        self._chosen_name   = None
+        self.show_schedule  = show_schedule
+        self.queue_schedule = 0
+        self.mw             = aqt.mw
+        self.parent         = parent
+
         self.setup_ui()
         self.setWindowTitle("URL to PDF")
 
@@ -71,89 +74,9 @@ def setup_ui(self):
         self.vbox.addWidget(self.name)
        
         if self.show_schedule:
-            self.queue_section = QGroupBox("Queue")
-            ex_v = QVBoxLayout()
-            queue_lbl = QLabel("Add to Queue?")
-
-            queue_lbl.setAlignment(Qt.AlignCenter)
-            ex_v.addWidget(queue_lbl, Qt.AlignCenter)
-            ex_v.addSpacing(5)
-
-            self.q_lbl_1 = QPushButton(" Don't Add ")
-            self.q_lbl_1.setObjectName("q_1")
-            self.q_lbl_1.setFlat(True)
-            self.q_lbl_1.setStyleSheet(btn_style_active)
-            self.q_lbl_1.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
-            self.q_lbl_1.clicked.connect(lambda: self.queue_selected(0)) 
-
-            self.dark_mode_used = utility.misc.dark_mode_is_used(mw.addonManager.getConfig(__name__))
-            if self.dark_mode_used:
-                btn_style = "QPushButton { border: 2px solid lightgrey; padding: 3px; color: lightgrey; } QPushButton:hover { border: 2px solid #2496dc; color: black; }"
-                btn_style_active = "QPushButton { border: 2px solid #2496dc; padding: 3px; color: lightgrey; font-weight: bold; } QPushButton:hover { border: 2px solid #2496dc; color: black; }"
-            else:
-                btn_style = "QPushButton { border: 2px solid lightgrey; padding: 3px; color: grey; }"
-                btn_style_active = "QPushButton { border: 2px solid #2496dc; padding: 3px; color: black; font-weight: bold;}"
-        
-            lbl = QLabel("Priority")
-            lbl.setAlignment(Qt.AlignCenter)
-            ex_v.addWidget(lbl)
-
-            self.q_lbl_2 = QPushButton("5 - Very High")
-            self.q_lbl_2.setObjectName("q_2")
-            self.q_lbl_2.setMinimumWidth(220)
-            self.q_lbl_2.setFlat(True)
-            self.q_lbl_2.setStyleSheet(btn_style)
-            self.q_lbl_2.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
-            self.q_lbl_2.clicked.connect(lambda: self.queue_selected(5))
-            ex_v.addWidget(self.q_lbl_2)
-            ex_v.setAlignment(self.q_lbl_2, Qt.AlignCenter)
-
-
-            self.q_lbl_3 = QPushButton("4 - High")
-            self.q_lbl_3.setObjectName("q_3")
-            self.q_lbl_3.setMinimumWidth(185)
-            self.q_lbl_3.setFlat(True)
-            self.q_lbl_3.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
-            self.q_lbl_3.setStyleSheet(btn_style)
-            self.q_lbl_3.clicked.connect(lambda: self.queue_selected(4))
-            ex_v.addWidget(self.q_lbl_3)
-            ex_v.setAlignment(self.q_lbl_3, Qt.AlignCenter)
-
-
-            self.q_lbl_4 = QPushButton("3 - Medium")
-            self.q_lbl_4.setMinimumWidth(150)
-            self.q_lbl_4.setObjectName("q_4")
-            self.q_lbl_4.setFlat(True)
-            self.q_lbl_4.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
-            self.q_lbl_4.setStyleSheet(btn_style)
-            self.q_lbl_4.clicked.connect(lambda: self.queue_selected(3))
-            ex_v.addWidget(self.q_lbl_4)
-            ex_v.setAlignment(self.q_lbl_4, Qt.AlignCenter)
-
-
-            self.q_lbl_5 = QPushButton("2 - Low")
-            self.q_lbl_5.setMinimumWidth(115)
-            self.q_lbl_5.setObjectName("q_5")
-            self.q_lbl_5.setFlat(True)
-            self.q_lbl_5.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
-            self.q_lbl_5.setStyleSheet(btn_style)
-            self.q_lbl_5.clicked.connect(lambda: self.queue_selected(2))
-            ex_v.addWidget(self.q_lbl_5)
-            ex_v.setAlignment(self.q_lbl_5, Qt.AlignCenter)
-
-
-            self.q_lbl_6 = QPushButton("1 - Very Low")
-            self.q_lbl_6.setMinimumWidth(80)
-            self.q_lbl_6.setObjectName("q_6")
-            self.q_lbl_6.setFlat(True)
-            self.q_lbl_6.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
-            self.q_lbl_6.setStyleSheet(btn_style)
-            self.q_lbl_6.clicked.connect(lambda: self.queue_selected(1))
-            ex_v.addWidget(self.q_lbl_6)
-            ex_v.setAlignment(self.q_lbl_6, Qt.AlignCenter)
-
-            self.queue_section.setLayout(ex_v)
-            self.vbox.addWidget(self.queue_section)
+            
+            self.slider = QtPrioritySlider(0)
+            self.vbox.addWidget(self.slider)
 
         self.vbox.addSpacing(15)
 
@@ -170,17 +93,11 @@ def setup_ui(self):
 
         # only resize if queue is shown
         if self.show_schedule:
-            self.resize(350, 450)
+            self.resize(350, 350)
         self.setLayout(self.vbox)
-        btn_styles = """
-        QPushButton:hover#q_1,QPushButton:hover#q_2,QPushButton:hover#q_3,QPushButton:hover#q_4,QPushButton:hover#q_5,QPushButton:hover#q_6 { background-color: lightblue; }
-        """
         styles = """
-            %s
-            QPushButton#q_1,QPushButton#q_2,QPushButton#q_22,QPushButton#q_3,QPushButton#q_33,QPushButton#q_4,QPushButton#q_44,QPushButton#q_5,QPushButton#q_6 { border-radius: 5px; }
             QLineEdit { border-radius: 5px; border: 1px solid #717378;  padding: 2px;}
-
-        """ % btn_styles
+        """
         self.setStyleSheet(styles)
         
 
diff --git a/src/dialogs/url_input_dialog.py b/src/dialogs/url_input_dialog.py
index 66c77ca1..684b2681 100644
--- a/src/dialogs/url_input_dialog.py
+++ b/src/dialogs/url_input_dialog.py
@@ -27,13 +27,14 @@
 import utility.misc
 
 class URLInputDialog(QDialog):
-    """
-        Fetch a URL to load the page into the note text.
-    """
+    """ Fetch a URL to load the page into the note text. """
+
     def __init__(self, parent):
-        self.chosen_url = None
         QDialog.__init__(self, parent, Qt.WindowSystemMenuHint | Qt.WindowTitleHint | Qt.WindowCloseButtonHint)
-        self.parent = parent
+
+        self.chosen_url = None
+        self.parent     = parent
+
         self.setup_ui()
         self.setWindowTitle("URL Input")
 
diff --git a/src/dialogs/zotero_import.py b/src/dialogs/zotero_import.py
new file mode 100644
index 00000000..c4d64b44
--- /dev/null
+++ b/src/dialogs/zotero_import.py
@@ -0,0 +1,245 @@
+# anki-search-inside-add-card
+# Copyright (C) 2019 - 2020 Tom Z.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+from aqt.qt import *
+import aqt.editor
+import aqt
+import functools
+import re
+import random
+
+import csv
+
+from ..notes import *
+from ..config import get_config_value_or_default
+import utility.text
+import utility.misc
+from .components import QtPrioritySlider
+
+class ZoteroImporter(QDialog):
+    """ Create pdf notes from a Zotero exported CSV file. """
+
+    def __init__(self, parent):
+        QDialog.__init__(self, parent, Qt.WindowSystemMenuHint | Qt.WindowTitleHint | Qt.WindowCloseButtonHint)
+
+        self.queue_schedule = 0
+        self.mw             = aqt.mw
+        self.parent         = parent
+        self.total_count    = 0
+
+        self.setup_ui()
+        self.setWindowTitle("Zotero Import")
+
+    def setup_ui(self):
+
+        self.vbox = QVBoxLayout()
+
+        hbox = QHBoxLayout()
+        hbox.addWidget(QLabel("Zotero CSV export file:"))
+        self.file_path_disp = QLineEdit()
+        self.file_path_disp.setDisabled(True)
+        hbox.addWidget(self.file_path_disp)
+        pick_file_btn = QPushButton("Choose File")
+        pick_file_btn.clicked.connect(self.pick_file)
+        hbox.addWidget(pick_file_btn)
+
+        self.vbox.addLayout(hbox)
+
+        self.status = QLabel("")
+        self.vbox.addWidget(self.status)
+
+        self.vbox.addWidget(QLabel("Add the following tags to all generated notes:"))
+        self.tags = QLineEdit()
+        self.vbox.addWidget(self.tags)
+
+        self.oi_cb = QCheckBox("Add ISBN/ISSN/DOI to title if possible")
+        self.vbox.addWidget(self.oi_cb)
+
+        self.gb = QGroupBox("Duplicate file paths")
+        gb_vbox = QVBoxLayout()
+        self.dup_radio_1 = QRadioButton("Skip if duplicate")
+        self.dup_radio_1.setChecked(True)
+        self.dup_radio_2 = QRadioButton("Overwrite if duplicate")
+        gb_vbox.addWidget(self.dup_radio_1)
+        gb_vbox.addWidget(self.dup_radio_2)
+        self.gb.setLayout(gb_vbox)
+        self.vbox.addWidget(self.gb)
+
+        self.slider = QtPrioritySlider(0)
+        self.vbox.addWidget(self.slider)
+        self.vbox.addSpacing(15)
+
+        hbox_bot = QHBoxLayout()
+        self.accept_btn = QPushButton("Import")
+        self.accept_btn.setDisabled(True)
+        self.accept_btn.setShortcut("Ctrl+Return")
+        self.accept_btn.clicked.connect(self.accept_clicked)
+
+        self.reject_btn = QPushButton("Cancel")
+        self.reject_btn.clicked.connect(self.reject)
+        hbox_bot.addWidget(self.accept_btn)
+        hbox_bot.addWidget(self.reject_btn)
+        self.vbox.addLayout(hbox_bot)
+
+        self.resize(350, 350)
+        self.setLayout(self.vbox)
+        btn_styles = """
+        QPushButton:hover#q_1,QPushButton:hover#q_2,QPushButton:hover#q_3,QPushButton:hover#q_4,QPushButton:hover#q_5,QPushButton:hover#q_6 { background-color: lightblue; }
+        """
+        styles = """
+            %s
+            QPushButton#q_1,QPushButton#q_2,QPushButton#q_22,QPushButton#q_3,QPushButton#q_33,QPushButton#q_4,QPushButton#q_44,QPushButton#q_5,QPushButton#q_6 { border-radius: 5px; }
+            QLineEdit { border-radius: 5px; border: 1px solid #717378;  padding: 2px;}
+
+        """ % btn_styles
+        self.setStyleSheet(styles)
+        
+    def accept_clicked(self):
+        csv_path = self.file_path_disp.text()
+        assert(csv_path is not None and len(csv_path.strip()) > 0)
+        self.status.setText("Importing ...")
+        self.read_csv()
+        self.accept()
+
+
+    def pick_file(self):
+        fname = QFileDialog.getOpenFileName(self, 'Pick a Zotero export file', '',"CSV files (*.csv)")
+        if fname is not None and len(fname[0].strip()) > 0:
+            self.file_path_disp.setText(fname[0])
+            self.scan_csv()
+            self.accept_btn.setDisabled(False)
+        else:
+            if len(self.file_path_disp.text().strip()) == 0:
+                self.accept_btn.setDisabled(True)
+
+    def get_name(self):
+        if self._chosen_name is None or len(self._chosen_name) == 0:
+            name = utility.text.strip_url(self.chosen_url)
+            name = utility.text.clean_file_name(name) 
+            return name
+        name = utility.text.clean_file_name(self._chosen_name)
+        return name
+
+    def scan_csv(self):
+        total_count = 0
+        with open(self.file_path_disp.text(), newline='', encoding="utf-8") as zotero_csv:
+            csvreader = csv.DictReader(zotero_csv, delimiter=',')
+                
+            for zot_entry in csvreader:
+                attachment_string = zot_entry["File Attachments"]
+                attachment_array = re.split(";", attachment_string)
+                total_count += sum([1 for att in attachment_array if att.strip().endswith(".pdf")])
+            if total_count > 0:
+                self.status.setText(f"Found {total_count} PDF attachments in the CSV.")
+                self.status.setStyleSheet('color: #2496dc')
+            else:
+                self.status.setText(f"Found no PDF attachments in the CSV.")
+                self.status.setStyleSheet('color: red')
+                       
+
+    def read_csv(self):
+
+        def append_to_string(originalstring, appendstring, prefix, suffix):
+            if appendstring:
+                return f"{originalstring} {prefix} {appendstring} {suffix}"
+            else:
+                return originalstring
+
+        tags = self.tags.text()
+        prio = self.slider.value()
+        schedule = ""
+        if prio is not None and prio > 0:
+            schedule = self.slider.schedule()
+        add_oi_to_title = self.oi_cb.isChecked()
+        with open(self.file_path_disp.text(), newline='', encoding="utf-8") as zotero_csv:
+            # initialize the csv reader module
+            csvreader = csv.DictReader(zotero_csv, delimiter=',')
+            # loop through the entries of the exported list
+            for zot_entry in csvreader:
+                # get out attachments
+                attachment_string   = zot_entry["File Attachments"]
+                attachment_array    = re.split(";", attachment_string)
+
+                # lets loop through our attachments, and if we got a PDF be happy :)
+                for attachment in attachment_array:
+                    #search for PDFs
+                    if re.match(".*?.pdf", attachment):                       
+
+                        id = get_pdf_id_for_source(attachment.strip())
+                        if id >= 0:
+                            if self.dup_radio_2.isChecked():
+                                delete_note(id)
+                            else:
+                                continue
+
+                         # now that we have a pdf, let's get all the info
+                        entry_title            = zot_entry["Title"]
+                        entry_publicationyear  = zot_entry["Publication Year"]
+                        entry_authors          = zot_entry["Author"]
+                        entry_publicationtitle = zot_entry["Publication Title"]
+                        entry_isbn             = zot_entry["ISBN"]
+                        entry_issn             = zot_entry["ISSN"]
+                        entry_doi              = zot_entry["DOI"]
+                        entry_url              = zot_entry["Url"]
+                        entry_pages            = zot_entry["Pages"]
+                        entry_issue            = zot_entry["Issue"]
+                        entry_volume           = zot_entry["Volume"]
+                        entry_edition          = zot_entry["Edition"]
+                        entry_publisher        = zot_entry["Publisher"]
+                        entry_mantags          = zot_entry["Manual Tags"]
+                        entry_autotags         = zot_entry["Automatic Tags"]
+
+                        # make strings ready for add-on
+                        # start with the title of the note
+                        note_title = entry_title
+
+                        # add ISBN/ISSN/DOI to title if possible, but only if specified in settings
+                        if add_oi_to_title:
+                            note_title = append_to_string(note_title, entry_isbn, " - ", "")
+                            note_title = append_to_string(note_title, entry_issn, " - ", "")
+                            note_title = append_to_string(note_title, entry_doi, " - ", "")
+
+                        # let's generate a note text with all that data we might or might not have
+                        note_text = note_title + "<br>"
+
+                        # lets add author and so on:
+                        note_text = append_to_string(note_text, entry_authors, "<b>Authors:</b>", "<br>")
+                        note_text = append_to_string(note_text, entry_publicationyear, "<b>Year:</b>", "<br>")
+                        note_text = append_to_string(note_text, entry_publicationtitle, "<b>Journal:</b>", "<br>")
+                        note_text = append_to_string(note_text, entry_pages, "<b>Pages:</b>", "<br>")
+                        note_text = append_to_string(note_text, entry_issue, "<b>Issue:</b>", "<br>")
+                        note_text = append_to_string(note_text, entry_volume, "<b>Volume:</b>", "<br>")
+                        note_text = append_to_string(note_text, entry_edition, "<b>Edition:</b>", "<br>")
+                        note_text = append_to_string(note_text, entry_publisher, "<b>Publisher:</b>", "<br>")
+                        note_text = append_to_string(note_text, entry_url, "<b>Url:</b>", "<br>")
+
+                        # add tags as keywords
+                        if (entry_mantags or entry_autotags): note_text = note_text + "<br><b>Keywords:</b><br>"
+                        note_text = append_to_string(note_text, entry_mantags, "<b>Manual Tags:</b><br>", "<br><br>")
+                        note_text = append_to_string(note_text, entry_autotags, "<b>Auto Tags:</b><br>", "<br><br>")
+
+                        create_note(note_title, note_text, attachment, tags, None, schedule, prio)
+                        self.total_count += 1
+
+
+
+
+
+
+
+
+
diff --git a/src/feeds.py b/src/feeds.py
index 8124b671..6655b420 100644
--- a/src/feeds.py
+++ b/src/feeds.py
@@ -18,6 +18,9 @@
 from bs4 import BeautifulSoup
 import re
 
+"""
+Not used atm.
+"""
 
 class FeedMessage:
 
diff --git a/src/hooks.py b/src/hooks.py
index f338cfb0..55fab8cb 100644
--- a/src/hooks.py
+++ b/src/hooks.py
@@ -14,9 +14,12 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-hooks = dict()
+import typing
+from typing import Callable, Dict
 
-def add_hook(name, fn):
+hooks: Dict[str, Callable] = dict()
+
+def add_hook(name: str, fn: Callable):
     name = name.lower()
     if name in hooks:
         hooks[name].append(fn)
@@ -24,7 +27,7 @@ def add_hook(name, fn):
         hooks[name] = [fn]
 
 
-def run_hooks(name):
+def run_hooks(name: str):
     name = name.lower()
     if name in hooks:
         for fn in hooks[name]:
diff --git a/src/index/fts_index.py b/src/index/fts_index.py
index 6538d899..7521cb6d 100644
--- a/src/index/fts_index.py
+++ b/src/index/fts_index.py
@@ -35,35 +35,38 @@ class FTSIndex:
 
     def __init__(self, corpus, index_up_to_date):
 
-        self.limit = 20
-        self.pinned = []
-        self.highlighting = True
-        self.dir = utility.misc.get_user_files_folder_path()
-        self.stopWords = []
-        # mid : [fld_ord]
-        self.fields_to_exclude = {}
+        self.limit              = 20
+        self.pinned             = []
+        self.highlighting       = True
+        self.dir                = utility.misc.get_user_files_folder_path()
+        self.stopWords          = []
+        self.fields_to_exclude  = {}
+
         # stores values useful to determine whether the index has to be rebuilt on restart or not
-        self.creation_info = {}
-        self.threadPool = QThreadPool()
-        self.ui = Output()
+        self.creation_info      = {}
+
+        self.threadPool         = QThreadPool()
+        self.ui                 = Output()
 
-        config = mw.addonManager.getConfig(__name__)
+        config                  = mw.addonManager.getConfig(__name__)
         try:
-            self.stopWords = set(config['stopwords'])
+            self.stopWords      = set(config['stopwords'])
         except KeyError:
-            self.stopWords = []
-        self.creation_info["stopwords_size"] = len(self.stopWords)
-        self.creation_info["decks"] = config["decks"]
-        self.porter = config["usePorterStemmer"]
+            self.stopWords      = []
+
+        self.creation_info["stopwords_size"]    = len(self.stopWords)
+        self.creation_info["decks"]             = config["decks"]
+        self.porter                             = config["usePorterStemmer"]
         #exclude fields
         try:
-            self.fields_to_exclude = config['fieldsToExclude']
-            self.creation_info["fields_to_exclude_original"] = self.fields_to_exclude
+            self.fields_to_exclude                              = config['fieldsToExclude']
+            self.creation_info["fields_to_exclude_original"]    = self.fields_to_exclude
         except KeyError:
-            self.fields_to_exclude = {}
-        self.ui.fields_to_exclude = self.fields_to_exclude
+            self.fields_to_exclude                              = {}
 
+        self.ui.fields_to_exclude               = self.fields_to_exclude
         self.creation_info["index_was_rebuilt"] = not index_up_to_date
+
         if not index_up_to_date:
             if self.porter:
                 sql = "create virtual table notes using fts%s(nid, text, tags, did, source, mid, refs, tokenize=porter)"
@@ -113,24 +116,34 @@ def _check_fts_version(self, logging):
 
 
     def _cleanText(self, corpus):
-        filtered = list()
-        text = ""
+        """ Prepare notes for indexing (cut stopwords, remove fields, remove special characters). """
+
+        filtered    = list()
+        text        = ""
+
         for row in corpus:
             text = row[1]
+
             #if the notes model id is in our filter dict, that means we want to exclude some field(s)
             if row[4] in self.fields_to_exclude:
                 text = utility.text.remove_fields(text, self.fields_to_exclude[row[4]])
+
             text = utility.text.clean(text, self.stopWords)
             filtered.append((row[0], text, row[2], row[3], row[1], row[4], row[5]))
+
         return filtered
 
     def removeStopwords(self, text):
+
         cleaned = ""
+
         for token in text.split(" "):
             if token.lower() not in self.stopWords:
                 cleaned += token + " "
+
         if len(cleaned) > 0:
             return cleaned[:-1]
+
         return ""
 
 
@@ -141,30 +154,35 @@ def search(self, text, decks, only_user_notes = False, print_mode = "default"):
         text - string to search, typically fields content
         decks - list of deck ids, if -1 is contained, all decks are searched
         """
-        worker = Worker(self.searchProc, text, decks, only_user_notes, print_mode)
-        worker.stamp = utility.misc.get_milisec_stamp()
-        self.ui.latest = worker.stamp
+        worker          = Worker(self.searchProc, text, decks, only_user_notes, print_mode)
+        worker.stamp    = utility.misc.get_milisec_stamp()
+        self.ui.latest  = worker.stamp
+
         if print_mode == "default":
             worker.signals.result.connect(self.printOutput)
         elif print_mode == "pdf":
             worker.signals.result.connect(self.print_pdf)
+        elif print_mode == "pdf.left":
+            worker.signals.result.connect(self.print_pdf_left)
 
         worker.signals.tooltip.connect(self.ui.show_tooltip)
         self.threadPool.start(worker)
 
 
     def searchProc(self, text, decks, only_user_notes, print_mode):
-        resDict = {}
-        start = time.time()
-        orig = text
-        text = self.clean(text)
-        resDict["time-stopwords"] = int((time.time() - start) * 1000)
+        resDict                     = {}
+        start                       = time.time()
+        orig                        = text
+        text                        = self.clean(text)
+        resDict["time-stopwords"]   = int((time.time() - start) * 1000)
+        self.lastSearch             = (text, decks, "default")
+
         if self.logging:
             log("\nFTS index - Received query: " + text)
             log("Decks (arg): " + str(decks))
             log("Self.pinned: " + str(self.pinned))
             log("Self.limit: " +str(self.limit))
-        self.lastSearch = (text, decks, "default")
+
 
         if len(text) == 0:
             if print_mode == "default":
@@ -175,18 +193,20 @@ def searchProc(self, text, decks, only_user_notes, print_mode):
             elif print_mode == "pdf":
                 return None
 
-        start = time.time()
-        text = utility.text.expand_by_synonyms(text, self.synonyms)
-        resDict["time-synonyms"] = int((time.time() - start) * 1000)
-        resDict["query"] = text
+        start                       = time.time()
+        text                        = utility.text.expand_by_synonyms(text, self.synonyms)
+        resDict["time-synonyms"]    = int((time.time() - start) * 1000)
+        resDict["query"]            = text
+
         if utility.text.text_too_small(text):
             if self.logging:
                 log("Returning - Text was < 2 chars: " + text)
             return { "results" : [] }
 
-        tokens = text.split(" ")
+        tokens                      = text.split(" ")
         if len(tokens) > 10:
-            tokens = set(tokens)
+            tokens                  = set(tokens)
+
         if self.type == "SQLite FTS5":
             query = u" OR ".join(["tags:" + s.strip().replace("OR", "or") for s in tokens if not utility.text.text_too_small(s) ])
             query += " OR " + " OR ".join(["text:" + s.strip().replace("OR", "or") for s in tokens if not utility.text.text_too_small(s) ])
@@ -197,13 +217,16 @@ def searchProc(self, text, decks, only_user_notes, print_mode):
                 log("Returning. Query was: " + query)
             return { "results" : [] }
 
-        c = 0
-        resDict["decks"] = decks
-        allDecks = "-1" in decks
+        c                           = 0
+        resDict["decks"]            = decks
+        allDecks                    = "-1" in decks
+
         decks.append("-1")
-        rList = list()
-        user_note_filter = "AND mid='-1'" if only_user_notes else ""
-        conn = sqlite3.connect(self.dir + "search-data.db")
+
+        rList                       = list()
+        user_note_filter            = "AND mid='-1'" if only_user_notes else ""
+        conn                        = sqlite3.connect(self.dir + "search-data.db")
+
         if self.type == "SQLite FTS5":
             dbStr = "select nid, text, tags, did, source, bm25(notes) as score, mid, refs from notes where notes match '%s' %s order by score" %(query, user_note_filter)
 
@@ -212,18 +235,17 @@ def searchProc(self, text, decks, only_user_notes, print_mode):
             dbStr = "select nid, text, tags, did, source, simple_rank(matchinfo(notes)) as score, mid, refs from notes where text match '%s' %s order by score desc" %(query, user_note_filter)
 
         try:
-            start = time.time()
-            res = conn.execute(dbStr).fetchall()
-            resDict["time-query"] = int((time.time() - start) * 1000)
+            start                   = time.time()
+            res                     = conn.execute(dbStr).fetchall()
+            resDict["time-query"]   = int((time.time() - start) * 1000)
         except Exception as e:
             if self.logging:
                 log("Executing db query threw exception: " + str(e))
-            res = []
+            res                     = []
         if self.logging:
             log("dbStr was: " + dbStr)
             log("Result length of db query: " + str(len(res)))
 
-
         resDict["highlighting"] = self.highlighting
         # if self.type == "SQLite FTS5":
         for r in res:
@@ -242,8 +264,10 @@ def searchProc(self, text, decks, only_user_notes, print_mode):
         if self.logging:
             log("Query was: " + query)
             log("Result length (after removing pinned and unselected decks): " + str(len(rList)))
-        resDict["results"] = rList[:min(self.limit, len(rList))]
-        self.lastResDict = resDict
+
+        resDict["results"]          = rList[:min(self.limit, len(rList))]
+        self.lastResDict            = resDict
+
         return resDict
 
     def printOutput(self, result, stamp):
@@ -258,6 +282,9 @@ def printOutput(self, result, stamp):
 
 
     def print_pdf(self, result, stamp):
+        """
+            Results printed in the tooltip in the pdf modal.
+        """
         query_set = None
         if self.lastResDict is not None and "query" in self.lastResDict and self.lastResDict["query"] is not None:
             query_set =  set(utility.text.replace_accents_with_vowels(s).lower() for s in self.lastResDict["query"].split(" "))
@@ -266,15 +293,27 @@ def print_pdf(self, result, stamp):
         else:
             self.ui.print_pdf_search_results([], stamp, self.lastSearch[0])
 
+    def print_pdf_left(self, result, stamp):
+        """
+            Results printed on the fields pane when the pdf modal is opened.
+        """
+        query_set = None
+
+        if self.lastResDict is not None and "query" in self.lastResDict and self.lastResDict["query"] is not None:
+            query_set =  set(utility.text.replace_accents_with_vowels(s).lower() for s in self.lastResDict["query"].split(" "))
+        if result is not None:
+            self.ui.reading_modal.sidebar.print(result["results"], stamp, query_set)
+        else:
+            self.ui.reading_modal.sidebar.print([], stamp, self.lastSearch[0])
 
     def searchDB(self, text, decks):
         """
         Used for searches in the search mask,
         doesn't use the index, instead use the traditional anki search 
         """
-        stamp = utility.misc.get_milisec_stamp()
-        self.ui.latest = stamp
-        found = self.finder.findNotes(text)
+        stamp           = utility.misc.get_milisec_stamp()
+        self.ui.latest  = stamp
+        found           = mw.col.find_notes(text)
 
         if len (found) > 0:
             if not "-1" in decks:
@@ -284,9 +323,9 @@ def searchDB(self, text, decks):
             #query db with found ids
             foundQ = "(%s)" % ",".join([str(f) for f in found])
             if deckQ:
-                res = mw.col.db.execute("select distinct notes.id, flds, tags, did, notes.mid from notes left join cards on notes.id = cards.nid where nid in %s and did in %s" %(foundQ, deckQ)).fetchall()
+                res = mw.col.db.all("select distinct notes.id, flds, tags, did, notes.mid from notes left join cards on notes.id = cards.nid where nid in %s and did in %s" %(foundQ, deckQ))
             else:
-                res = mw.col.db.execute("select distinct notes.id, flds, tags, did, notes.mid from notes left join cards on notes.id = cards.nid where nid in %s" %(foundQ)).fetchall()
+                res = mw.col.db.all("select distinct notes.id, flds, tags, did, notes.mid from notes left join cards on notes.id = cards.nid where nid in %s" %(foundQ))
             rList = []
             for r in res:
                 #pinned items should not appear in the results
@@ -331,10 +370,10 @@ def addNote(self, note):
         content = " \u001f ".join(note.fields)
         tags = " ".join(note.tags)
         #did = note.model()['did']
-        did = mw.col.db.execute("select distinct did from notes left join cards on notes.id = cards.nid where nid = %s" % note.id).fetchone()
+        did = mw.col.db.all("select distinct did from notes left join cards on notes.id = cards.nid where nid = %s" % note.id)
         if did is None or len(did) == 0:
             return
-        did = did[0]
+        did = did[0][0]
         if str(note.mid) in self.fields_to_exclude:
             content = utility.text.remove_fields(content, self.fields_to_exclude[str(note.mid)])
         conn = sqlite3.connect(self.dir + "search-data.db")
@@ -368,34 +407,35 @@ def _parseMatchInfo(buf):
     return [struct.unpack('@I', buf[i:i+4])[0] for i in range(0, bufsize, 4)]
 
 def simple_rank(rawMatchInfo):
-    """
-    Based on https://github.com/saaj/sqlite-fts-python/blob/master/sqlitefts/ranking.py
-    """
-    match_info = _parseMatchInfo(rawMatchInfo)
-    score = 0.0
-    p, c = match_info[:2]
+    """ Based on https://github.com/saaj/sqlite-fts-python/blob/master/sqlitefts/ranking.py """
+
+    match_info  = _parseMatchInfo(rawMatchInfo)
+    score       = 0.0
+    p, c        = match_info[:2]
+
     for phrase_num in range(p):
         phrase_info_idx = 2 + (phrase_num * c * 3)
         for col_num in range(c):
             col_idx = phrase_info_idx + (col_num * 3)
-            x1, x2 = match_info[col_idx:col_idx + 2]
+            x1, x2  = match_info[col_idx:col_idx + 2]
             if x1 > 0:
                 score += float(x1) / x2
+
     return score
 
 
 def bm25(rawMatchInfo):
-    match_info = _parseMatchInfo(rawMatchInfo)
-    K = 0.5
-    B = 0.75
-    score = 0.0
-
-    P_O, C_O, N_O, A_O = range(4)
-    term_count = match_info[P_O]
-    col_count = match_info[C_O]
-    total_docs = match_info[N_O]
-    L_O = A_O + col_count
-    X_O = L_O + col_count
+    match_info          = _parseMatchInfo(rawMatchInfo)
+    K                   = 0.5
+    B                   = 0.75
+    score               = 0.0
+
+    P_O, C_O, N_O, A_O  = range(4)
+    term_count          = match_info[P_O]
+    col_count           = match_info[C_O]
+    total_docs          = match_info[N_O]
+    L_O                 = A_O + col_count
+    X_O                 = L_O + col_count
 
     weights = [1] * col_count
     #collect number of different matched terms
@@ -442,16 +482,13 @@ class Worker(QRunnable):
 
     def __init__(self, fn, *args):
         super(Worker, self).__init__()
-        self.fn = fn
-        self.args = args
-        self.signals = WorkerSignals()
+
+        self.fn         = fn
+        self.args       = args
+        self.signals    = WorkerSignals()
 
     @pyqtSlot()
     def run(self):
-        '''
-        Initialise the runner function with passed args, kwargs.
-        '''
-
         try:
             result = self.fn(*self.args)
         except:
@@ -466,8 +503,8 @@ def run(self):
 
 class WorkerSignals(QObject):
 
-    finished = pyqtSignal()
-    error = pyqtSignal(tuple)
-    result = pyqtSignal(object, object)
-    progress = pyqtSignal(int)
-    tooltip = pyqtSignal(str)
+    finished    = pyqtSignal()
+    error       = pyqtSignal(tuple)
+    result      = pyqtSignal(object, object)
+    progress    = pyqtSignal(int)
+    tooltip     = pyqtSignal(str)
diff --git a/src/index/indexing.py b/src/index/indexing.py
index d5abdac6..a39b6d5f 100644
--- a/src/index/indexing.py
+++ b/src/index/indexing.py
@@ -15,17 +15,16 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from aqt import mw
+from aqt.utils import showInfo
 from aqt.qt import *
-from anki.find import Finder
 import aqt
 import time
 import os
 import sqlite3
 
-
 from ..state import get_index, set_index, set_corpus, get_corpus, corpus_is_loaded, get_edit
 from ..debug_logging import *
-from ..web.web import showSearchResultArea, printStartingInfo, fillDeckSelect, setup_ui_after_index_built
+from ..web.web import show_search_result_area, print_starting_info, fillDeckSelect, setup_ui_after_index_built
 from ..web.html import loadSynonyms
 from .fts_index import FTSIndex
 from ..notes import get_all_notes
@@ -33,28 +32,30 @@
 
 
 def get_notes_in_collection():
-    """
-    Reads the collection and builds a list of tuples (note id, note fields as string, note tags, deck id, model id)
-    """
-    config = mw.addonManager.getConfig(__name__)
-    deckList = config['decks']
-    deckStr = ""
+    """ Reads the collection and builds a list of tuples (note id, note fields as string, note tags, deck id, model id) """
+
+    config              = mw.addonManager.getConfig(__name__)
+    deckList            = config['decks']
+    deckStr             = ""
+
     for d in list(mw.col.decks.decks.values()):
         if d['name'] in deckList:
             deckStr += str(d['id']) + ","
+
     if len(deckStr) > 0:
-        deckStr = "(%s)" % (deckStr[:-1])
+        deckStr         = "(%s)" % (deckStr[:-1])
 
     if deckStr:
-        oList = mw.col.db.execute("select distinct notes.id, flds, tags, did, mid from notes left join cards on notes.id = cards.nid where did in %s" %(deckStr))
+        oList           = mw.col.db.all("select distinct notes.id, flds, tags, did, mid from notes left join cards on notes.id = cards.nid where did in %s" %(deckStr))
     else:
-        oList = mw.col.db.execute("select distinct notes.id, flds, tags, did, mid from notes left join cards on notes.id = cards.nid")
+        oList           = mw.col.db.all("select distinct notes.id, flds, tags, did, mid from notes left join cards on notes.id = cards.nid")
 
-    index_notes = list()
+    index_notes         = list()
 
     #load addon notes
-    other_notes = get_all_notes()
-    other_notes_id_map = dict()
+    other_notes         = get_all_notes()
+    other_notes_id_map  = dict()
+
     for (id, title, text, source, tags, nid, created, modified, reminder, _, _) in other_notes:
 
         if nid in other_notes_id_map:
@@ -73,15 +74,19 @@ def get_notes_in_collection():
     return index_notes
 
 def build_index(force_rebuild = False, execute_after_end = None):
+
     config = mw.addonManager.getConfig(__name__)
     if get_index() is None:
         if not corpus_is_loaded():
             corpus = get_notes_in_collection()
             set_corpus(corpus)
+
         #check if we have to rebuild the index
         index_already_there = not force_rebuild and not _should_rebuild()
+
         #build index in background to prevent ui from freezing
-        p = ProcessRunnable(_build_index, index_already_there)
+        p                   = ProcessRunnable(_build_index, index_already_there)
+
         if execute_after_end is not None:
             p.after_end = execute_after_end
         p.start()
@@ -92,30 +97,31 @@ def _build_index(index_up_to_date):
     Builds the index. Result is stored in global var index.
     The index.type is either "Whoosh"/"SQLite FTS3"/"SQLite FTS4"/"SQLite FTS5"
     """
-    start = time.time()
-    config = mw.addonManager.getConfig(__name__)
+    start                               = time.time()
+    config                              = mw.addonManager.getConfig(__name__)
     
-    corpus = get_corpus()
+    corpus                              = get_corpus()
   
-    index = FTSIndex(corpus, index_up_to_date)
-    end = time.time()
-    initializationTime = round(end - start)
+    index                               = FTSIndex(corpus, index_up_to_date)
+    end                                 = time.time()
+    initializationTime                  = round(end - start)
  
-    index.finder = Finder(mw.col)
-    index.ui.stopwords = index.stopWords
-    index.ui.remove_divs = config["removeDivsFromOutput"]
-    index.ui.gridView = config["gridView"]
-    index.ui.scale = config["noteScale"]
-    index.ui.fields_to_hide_in_results = config["fieldsToHideInResults"]
-    index.selectedDecks = ["-1"]
-    index.lastSearch = None
-    index.lastResDict = None
-    index.topToggled = True
-    index.ui.edited = {}
-    index.initializationTime = initializationTime
-    index.synonyms = loadSynonyms()
-    index.logging = config["logging"]
-    index.searchbar_mode = "Add-on"
+    index.ui.stopwords                  = index.stopWords
+    index.ui.remove_divs                = config["removeDivsFromOutput"]
+    index.ui.gridView                   = config["gridView"]
+    index.ui.scale                      = config["noteScale"]
+    index.ui.fields_to_hide_in_results  = config["fieldsToHideInResults"]
+    index.selectedDecks                 = ["-1"]
+    index.lastSearch                    = None
+    index.lastResDict                   = None
+    index.topToggled                    = True
+    index.highlighting                  = config["highlighting"]
+    index.ui.edited                     = {}
+    index.initializationTime            = initializationTime
+    index.synonyms                      = loadSynonyms()
+    index.logging                       = config["logging"]
+    index.searchbar_mode                = "Add-on"
+
     try:
         limit = config['numberOfResults']
         if limit <= 0:
@@ -124,49 +130,44 @@ def _build_index(index_up_to_date):
             limit = 5000
     except KeyError:
         limit = 500
-    index.limit = limit
+    index.limit                         = limit
 
     try:
-        showRetentionScores = config["showRetentionScores"]
+        showRetentionScores             = config["showRetentionScores"]
     except KeyError:
-        showRetentionScores = True
-    index.ui.showRetentionScores = showRetentionScores
+        showRetentionScores             = True
+    index.ui.showRetentionScores        = showRetentionScores
+
     try:
-        hideSidebar = config["hideSidebar"]
+        hideSidebar                     = config["hideSidebar"]
     except KeyError:
-        hideSidebar = False
-    index.ui.hideSidebar = hideSidebar
+        hideSidebar                     = False
+    index.ui.hideSidebar                = hideSidebar
 
     if index.logging:
         log("\n--------------------\nInitialized index:")
         log("""Type: %s\n# Stopwords: %s \n# Synonyms: %s \nLimit: %s \n""" % (index.type, len(index.stopWords), len(index.synonyms), limit))
 
-    editor = aqt.mw.app.activeWindow().editor if hasattr(aqt.mw.app.activeWindow(), "editor") else None
+    editor                              = aqt.mw.app.activeWindow().editor if hasattr(aqt.mw.app.activeWindow(), "editor") else None
     if editor is not None and editor.addMode:
         index.ui.set_editor(editor)
+
     set_index(index)
-    editor = editor if editor is not None else get_edit()
+    set_corpus(None)
+    editor                              = editor if editor is not None else get_edit()
     setup_ui_after_index_built(editor, index)
-    # showSearchResultArea(editor, initializationTime=initializationTime)
     fillDeckSelect(editor)
-    printStartingInfo(editor)
+    print_starting_info(editor)
 
 
 def _should_rebuild():
-    """
-    Check if the index has to be rebuilt.
-    """
-
-    info = get_index_info()
-    corpus = get_corpus()
-    config = mw.addonManager.getConfig(__name__)
+    """ Check if the index should be rebuilt. """
 
-    # if the index type changed, rebuild
-    # 23-01-19: Whoosh support removed 
-    #useFTS = config["useFTS"]
-    useFTS = True
-    if (info["type"] == "Whoosh" and useFTS) or (info["type"] != "Whoosh" and not useFTS):
-         return True
+    info    = get_index_info()
+    if info is None:
+        return True
+    corpus  = get_corpus()
+    config  = mw.addonManager.getConfig(__name__)
 
     # not used atm, so always false
     if info["shouldRebuild"]:
@@ -174,22 +175,17 @@ def _should_rebuild():
         return True
 
     #if db file / index dir is not existing, rebuild
-    if useFTS:
-        file_path = utility.misc.get_user_files_folder_path()  + "search-data.db"
-        if not os.path.isfile(file_path):
-            return True
-        try:
-            conn = sqlite3.connect(file_path)
-            row = conn.cursor().execute("SELECT * FROM notes_content ORDER BY id ASC LIMIT 1").fetchone()
-            conn.close()
-            if row is not None and len(row) != 8:
-                return True
-        except:
-            return True
-    else:
-        file_path = utility.misc.get_whoosh_index_folder_path()
-        if not os.path.exists(file_path):
+    file_path = utility.misc.get_user_files_folder_path()  + "search-data.db"
+    if not os.path.isfile(file_path):
+        return True
+    try:
+        conn    = sqlite3.connect(file_path)
+        row     = conn.cursor().execute("SELECT * FROM notes_content ORDER BY id ASC LIMIT 1").fetchone()
+        conn.close()
+        if row is not None and len(row) != 8:
             return True
+    except:
+        return True
 
     if info["size"] != len(corpus):
         return True
@@ -218,6 +214,7 @@ def _should_rebuild():
                 if field_name not in info["fieldsToExclude"][model_name]:
                     return True
 
+    # if stopwords changed, rebuild
     if len(set(config["stopwords"])) != info["stopwordsSize"]:
         return True
 
@@ -225,14 +222,13 @@ def _should_rebuild():
 
 
 class ProcessRunnable(QRunnable):
-    """
-    Only used to build the index in background atm.
-    """
+    """ Only used to build the index in background atm. """
+
     def __init__(self, target, *args):
         QRunnable.__init__(self)
-        self.t = target
-        self.args = args
-        self.after_end = None
+        self.t          = target
+        self.args       = args
+        self.after_end  = None
 
     def run(self):
         self.t(*self.args)
diff --git a/src/index/whoosh_index.py b/src/index/whoosh_index.py
index 01e09a8d..61830661 100644
--- a/src/index/whoosh_index.py
+++ b/src/index/whoosh_index.py
@@ -19,7 +19,6 @@
 from anki.hooks import runHook, addHook, wrap
 import aqt
 import aqt.webview
-from anki.find import Finder
 import aqt.editor
 from aqt.editor import Editor
 import aqt.stats
@@ -49,7 +48,8 @@
 
 class WhooshSearchIndex:
     """
-    Wraps the whoosh index object, provides method to query.
+    NOT USED ANYMORE!
+    Wraps the whoosh index object, provides methods to query.
     """
     def __init__(self, corpus, searchingDisabled, index_up_to_date):
         self.initializationTime = 0
@@ -192,7 +192,7 @@ def searchDB(self, text, decks):
         stamp = utility.misc.get_milisec_stamp()
         self.output.latest = stamp
 
-        found = self.finder.findNotes(text)
+        found = mw.col.find_notes(text)
         
         if len (found) > 0:
             if not "-1" in decks:
@@ -202,9 +202,9 @@ def searchDB(self, text, decks):
             #query db with found ids
             foundQ = "(%s)" % ",".join([str(f) for f in found])
             if deckQ:
-                res = mw.col.db.execute("select distinct notes.id, flds, tags, did, notes.mid from notes left join cards on notes.id = cards.nid where nid in %s and did in %s" %(foundQ, deckQ)).fetchall()
+                res = mw.col.db.all("select distinct notes.id, flds, tags, did, notes.mid from notes left join cards on notes.id = cards.nid where nid in %s and did in %s" %(foundQ, deckQ))
             else:
-                res = mw.col.db.execute("select distinct notes.id, flds, tags, did, notes.mid from notes left join cards on notes.id = cards.nid where nid in %s" %(foundQ)).fetchall()
+                res = mw.col.db.all("select distinct notes.id, flds, tags, did, notes.mid from notes left join cards on notes.id = cards.nid where nid in %s" %(foundQ))
             rList = []
             for r in res:
                 #pinned items should not appear in the results
@@ -255,7 +255,7 @@ def addNote(self, note):
         
         content = " \u001f ".join(note.fields)
         tags = " ".join(note.tags)
-        did = mw.col.db.execute("select distinct did from notes left join cards on notes.id = cards.nid where nid = %s" % note.id).fetchone()
+        did = mw.col.db.all("select distinct did from notes left join cards on notes.id = cards.nid where nid = %s" % note.id)
         if did is None or len(did) == 0:
             return
         did = did[0]
@@ -298,7 +298,7 @@ def updateNote(self, note):
         c = writer.delete_by_term("nid", str(note.id))
         content = " \u001f ".join(note.fields)
         tags = " ".join(note.tags)
-        did = mw.col.db.execute("select distinct did from notes left join cards on notes.id = cards.nid where nid = %s" % note.id).fetchone()
+        did = mw.col.db.all("select distinct did from notes left join cards on notes.id = cards.nid where nid = %s" % note.id)
         if did is None or len(did) == 0:
             return
         did = did[0]
diff --git a/src/internals.py b/src/internals.py
index 95fd7c93..c181c226 100644
--- a/src/internals.py
+++ b/src/internals.py
@@ -17,38 +17,40 @@
 import time
 from aqt import mw
 from .state import get_index, check_index
+import typing
+from typing import Callable
 
+def perf_time(fn: Callable) -> Callable:
+    """ Decorator to measure function execution time. """
 
-def perf_time(fn):
-    """
-        Decorator to measure function execution time.
-    """
     def _perf_wrapper(*args, **kwargs):
-        start = time.time() * 1000
-        res = fn(*args, **kwargs)
+        start   = time.time() * 1000
+        res     = fn(*args, **kwargs)
         print(f"{fn.__name__}: {time.time() * 1000 - start}")
         return res
+
     return _perf_wrapper
 
-def js(fn):
-    """
-        Decorator to execute the returned javascript of a function.
-    """
+def js(fn: Callable) -> Callable:
+    """ Decorator to execute the returned javascript of a function. """
+
     def _eval_js_dec(*args, **kwargs):
         ix = get_index()
         if ix is not None and ix.ui is not None and ix.ui._editor is not None and ix.ui._editor.web is not None:
             ix.ui.js(fn(*args, **kwargs))
         else:
-            if mw.app.activeWindow() is not None:
-                mw.app.activeWindow().editor.web.eval(fn(*args, **kwargs))
+            w = mw.app.activeWindow()
+            if w is not None and hasattr(w, "editor"):
+                w.editor.web.eval(fn(*args, **kwargs))
+
     return _eval_js_dec
 
-def requires_index_loaded(fn):
-    """
-        Decorator to only enter a function if the index has been loaded.
-    """
+def requires_index_loaded(fn: Callable) -> Callable:
+    """ Decorator to only enter a function if the index has been loaded. """
+
     def _check_ix(*args, **kwargs):
         if not check_index():
             return
         return fn(*args, **kwargs)
+
     return _check_ix
\ No newline at end of file
diff --git a/src/models.py b/src/models.py
index 27bf1344..987eb519 100644
--- a/src/models.py
+++ b/src/models.py
@@ -16,12 +16,17 @@
 
 import utility.text
 import html
+import typing
+from typing import Tuple, List, Any, Optional
+
+from datetime import datetime, timedelta
 from .web_import import import_webpage
 from .config import get_config_value_or_default
 
+
 class Printable():
     
-    def get_content(self):
+    def get_content(self) -> str:
         """
         Should return the "body" of the note, e.g. the 'source' field in case of index notes and the 
         'text' field in case of SiacNote.
@@ -30,73 +35,121 @@ def get_content(self):
 
 class SiacNote(Printable):
 
-    note_type = "user"
-
-    def __init__(self, props):
-        self.id = props[0]
-        self.title = props[1]
-        self.text = props[2]
-        self.source = props[3]
-        self.tags = props[4]
-        self.nid = props[5]
-        self.created = props[6]
-        self.modified = props[7]
-        self.reminder = props[8]
-        self.lastscheduled = props[9]
-        self.position = props[10]
-
-        self.mid = -1
+    note_type       = "user"
+    MISSED_NOTES    = get_config_value_or_default("notes.queue.missedNotesHandling", "remove-schedule")
+
+    def __init__(self, props: Tuple[Any, ...]):
+        self.id             : int = props[0]
+        self.title          : str = props[1]
+        self.text           : str = props[2]
+        self.source         : str = props[3]
+        self.tags           : str = props[4]
+        self.nid            : int = props[5]
+        self.created        : str = props[6]
+        self.modified       : str = props[7]
+        self.reminder       : str = props[8]
+        self.lastscheduled  : str = props[9]
+        self.position       : int = props[10]
+
+        self.mid            : int = -1
     
     @staticmethod
-    def from_index(index_props):
-        id = index_props[0]
+    def from_index(index_props: Tuple[Any, ...]) -> 'SiacNote':
+
+        id      = index_props[0]
         # if the note was stored in the index, its title, text, and source fields are collapsed into a single field, separated by \u001f
-        text = index_props[4]
-        title = text.split("\u001f")[0]
-        body = text.split("\u001f")[1]
-        src = text.split("\u001f")[2]
+        text    = index_props[4]
+        title   = text.split("\u001f")[0]
+        body    = text.split("\u001f")[1]
+        src     = text.split("\u001f")[2]
+
         return SiacNote((id, title, body, src, index_props[2], -1, "", "", "", "", -1))
 
-    def get_content(self):
+    def get_content(self) -> str:
         return self._build_non_anki_note_html()
 
-    def is_pdf(self):
+    def is_pdf(self) -> bool:
         return self.source is not None and self.source.strip().lower().endswith(".pdf")
     
-    def is_feed(self):
+    def is_feed(self) -> bool:
         return self.source is not None and self.source.strip().lower().startswith("feed:")
     
-    def is_in_queue(self):
+    def is_in_queue(self) -> bool:
         return self.position is not None and self.position >= 0
 
-    def get_title(self):
+    def get_title(self) -> str:
         if self.title is None or len(self.title.strip()) == 0:
             return "Untitled"
         return self.title
+    
+    def get_containing_folder(self) -> Optional[str]:
+        if not self.is_pdf():
+            return None
+        source = self.source[:self.source.rindex("/")]
+        return source
+
+    def is_due_today(self) -> bool:
+        if self.reminder is None or len(self.reminder.strip()) == 0 or not "|" in self.reminder:
+            return False
+        dt = datetime.strptime(self.reminder.split("|")[1], '%Y-%m-%d-%H-%M-%S')
+        return dt.date() == datetime.today().date()
+    
+    def is_scheduled(self) -> bool:
+        if self.reminder is None or len(self.reminder.strip()) == 0 or not "|" in self.reminder:
+            return False
+        if SiacNote.MISSED_NOTES != "place-front":
+            return self.is_due_today()
+        return self.is_or_was_due()
+
+    def is_or_was_due(self) -> bool:
+        if self.reminder is None or len(self.reminder.strip()) == 0 or not "|" in self.reminder:
+            return False
+        dt = datetime.strptime(self.reminder.split("|")[1], '%Y-%m-%d-%H-%M-%S')
+        return dt.date() <= datetime.today().date()
+    
+    def is_due_sometime(self) -> bool:
+        if self.reminder is None or len(self.reminder.strip()) == 0 or not "|" in self.reminder:
+            return False
+        return True
+    
+    def current_due_date(self) -> Optional[datetime]:
+        if not self.is_due_sometime():
+            return None
+        return datetime.strptime(self.reminder.split("|")[1], '%Y-%m-%d-%H-%M-%S')
 
+    def due_days_delta(self) -> int:
+        return (datetime.now().date() - self.current_due_date().date()).days
+        
+    def schedule_type(self) -> str:
+        return self.reminder.split("|")[2][:2]
+    
+    def schedule_value(self) -> str:
+        return self.reminder.split("|")[2][3:]
 
-    def _build_non_anki_note_html(self):
+    def _build_non_anki_note_html(self) -> str:
         """
         User's notes should be displayed in a way to visually distinguish between title, text and source.
         Also, text might need to be cut if is too long to reduce time needed for highlighting, extracting keywords, and rendering.
         """
-        src = self.source
-        title = html.escape(self.title)
-        body = self.text
+        src     = self.source
+        title   = html.escape(self.title)
+        body    = self.text
         #trim very long texts:
         if len(body) > 3000:
             #there might be unclosed tags now, but parsing would be too much overhead, so simply remove div, a and span tags
             #there might be still problems with <p style='...'>
-            body = body[:3000]
-            body = utility.text.remove_tags(body, ["div", "span", "a"])
-            last_open_bracket = body.rfind("<")
+            body                = body[:3000]
+            body                = utility.text.remove_tags(body, ["div", "span", "a"])
+            last_open_bracket   = body.rfind("<")
+
             if last_open_bracket >= len(body) - 500 or body.rfind(" ") < len(body) - 500:
                 last_close_bracket = body.rfind(">")
                 if last_close_bracket < last_open_bracket:
                     body = body[:last_open_bracket]
+
             body += "<br></ul></b></i></em></span></p></a></p><p style='text-align: center; user-select: none;'><b>(Text was cut - too long to display)</b></p>"
         
-        title = "%s<b>%s</b>%s" % ("<span class='siac-pdf-icon'></span>" if self.is_pdf() else "", title if len(title) > 0 else "Unnamed Note", "<hr style='margin-bottom: 5px; border-top: dotted 2px;'>" if len(body.strip()) > 0 else "")
+        title   = "%s<b>%s</b>%s" % ("<span class='siac-pdf-icon'></span>" if self.is_pdf() else "", title if len(title) > 0 else "Unnamed Note", "<hr style='margin-bottom: 5px; border-top: dotted 2px;'>" if len(body.strip()) > 0 else "")
 
         # add the source, separated by a line
         if src is not None and len(src) > 0 and get_config_value_or_default("notes.showSource", True):
@@ -110,23 +163,24 @@ def _build_non_anki_note_html(self):
 
 class IndexNote(Printable):
 
-    note_type = "index"
+    note_type: str = "index"
 
-    def __init__(self, props):
-        self.id = props[0]
-        self.text = props[1]
-        self.tags = props[2]
-        self.did = props[3]
+    def __init__(self, props: Tuple[Any, ...]):
+        self.id     = props[0]
+        self.text   = props[1]
+        self.tags   = props[2]
+        self.did    = props[3]
         self.source = props[4]
-        self.rank = props[5]
-        self.mid = props[6]
-        self.refs = props[7]
+        self.rank   = props[5]
+        self.mid    = props[6]
+        self.refs   = props[7]
 
 
-    def get_content(self):
+    def get_content(self) -> str:
         return self.source
 
 class NoteRelations():
-    def __init__(self, related_by_title, related_by_tags):
-        self.related_by_title = related_by_title
-        self.related_by_tags = related_by_tags
\ No newline at end of file
+    def __init__(self, related_by_title: List[SiacNote], related_by_tags: List[SiacNote], related_by_folder: List[SiacNote]):
+        self.related_by_title   = related_by_title
+        self.related_by_tags    = related_by_tags
+        self.related_by_folder  = related_by_folder
\ No newline at end of file
diff --git a/src/notes.py b/src/notes.py
index 15b0ca9f..fad8a14e 100644
--- a/src/notes.py
+++ b/src/notes.py
@@ -15,7 +15,10 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
+import glob
 import sqlite3
+import typing
+from typing import Optional, Tuple, List, Dict, Set, Any
 from enum import Enum, unique
 from datetime import datetime, time, date, timedelta
 from aqt import mw
@@ -36,19 +39,18 @@
 import utility.misc
 import utility.tags
 import utility.text
+import utility.date
 
-db_path = None
+db_path: Optional[str] = None
 
+# How many times more important is a priority 100 item than a priority 1 item?
+PRIORITY_SCALE_FACTOR: int = get_config_value_or_default("notes.queue.priorityScaleFactor", 5)
 
-@unique
-class QueueSchedule(Enum):
-    NOT_ADD = 0
-    VERY_LOW_PRIO = 1
-    LOW_PRIO = 2
-    AVERAGE_PRIO = 3
-    HIGH_PRIO = 4
-    VERY_HIGH_PRIO = 5
-
+# if a note was scheduled for some time point in the past, but not done, 
+# 1. schedule can be removed ('remove-schedule'), 
+# 2. note can be placed in front of the queue ('place-front') or
+# 3. note can be scheduled again from the missed due date on ('new-schedule')
+MISSED_NOTES_HANDLING: str = get_config_value_or_default("notes.queue.missedNotesHandling", "remove-schedule")
 
 @unique
 class PDFMark(Enum):
@@ -59,8 +61,9 @@ class PDFMark(Enum):
     BOOKMARK = 5
 
 
-def create_db_file_if_not_exists():
+def create_db_file_if_not_exists() -> bool:
     file_path = _get_db_path()
+    existed = False
     if not os.path.isfile(file_path):
         conn = sqlite3.connect(file_path)
 
@@ -82,11 +85,13 @@ def create_db_file_if_not_exists():
         """
         conn.execute(creation_sql)
     else:
+        existed = True
         conn = sqlite3.connect(file_path)
     
-    info_from_data_json = get_notes_info()
-    if info_from_data_json is not None and "db_last_checked" in info_from_data_json and len(info_from_data_json["db_last_checked"]) > 0:
-        return
+    # disable for now
+    # info_from_data_json = get_notes_info()
+    # if info_from_data_json is not None and "db_last_checked" in info_from_data_json and len(info_from_data_json["db_last_checked"]) > 0:
+    #     return
    
     conn.execute("""
         create table if not exists read
@@ -119,23 +124,22 @@ def create_db_file_if_not_exists():
             created TEXT
         ); 
     """)
-
-    # temporary, drop fk
-    if not _table_exists("_queue_prio_log_old"):
-        conn.executescript("""
-        PRAGMA foreign_keys=off;
-        ALTER TABLE queue_prio_log RENAME TO _queue_prio_log_old;
-        CREATE TABLE queue_prio_log
+    conn.execute("""
+        create table if not exists highlights 
         (
             nid INTEGER,
-            prio INTEGER,
-            type TEXT,
+            page INTEGER,
+            type INTEGER,
+            grouping INTEGER,
+            x0 REAL,
+            y0 REAL,
+            x1 REAL,
+            y1 REAL,
+            text TEXT,
+            data TEXT,
             created TEXT
-        );
-        INSERT INTO queue_prio_log SELECT * FROM _queue_prio_log_old;
-        PRAGMA foreign_keys=on; 
-        
-        """)
+        ); 
+    """)
 
     conn.execute("CREATE INDEX if not exists read_nid ON read (nid);")
     conn.execute("CREATE INDEX if not exists mark_nid ON marks (nid);")
@@ -144,10 +148,11 @@ def create_db_file_if_not_exists():
     conn.close()
 
     # store a timestamp in /user_files/data.json to check next time, so we don't have to do this on every startup
-    persist_notes_db_checked()
+    # persist_notes_db_checked()
+    return existed
 
 
-def create_note(title, text, source, tags, nid, reminder, queue_schedule):
+def create_note(title: str, text: str, source: str, tags: str, nid: int, reminder: str, queue_schedule: Optional[int]):
 
     #clean the text
     text = utility.text.clean_user_note_text(text)
@@ -163,24 +168,48 @@ def create_note(title, text, source, tags, nid, reminder, queue_schedule):
 
     conn = _get_connection()
     id = conn.execute("""insert into notes (title, text, source, tags, nid, created, modified, reminder, lastscheduled, position)
-                values (?,?,?,?,?,datetime('now', 'localtime'),""," ","", NULL)""", (title, text, source, tags, nid)).lastrowid
+                values (?,?,?,?,?,datetime('now', 'localtime'),"",?,"", NULL)""", (title, text, source, tags, nid, reminder)).lastrowid
     conn.commit()
     conn.close()
-    if queue_schedule != QueueSchedule.NOT_ADD:
+    if queue_schedule != 0:
         update_priority_list(id, queue_schedule)
     index = get_index()
     if index is not None:
         index.add_user_note((id, title, text, source, tags, nid, ""))
 
-def remove_from_priority_list(nid_to_remove):
-    return update_priority_list(nid_to_remove, QueueSchedule.NOT_ADD.value)
+def remove_from_priority_list(nid_to_remove: int) -> Tuple[int, int]:
+    """ Sets the position field of the given note to null and recalculates queue. """
+    return update_priority_list(nid_to_remove, 0)
 
 
-def update_priority_list(nid_to_update, schedule):
+def update_priority_without_timestamp(nid_to_update: int, new_prio: int):
+    """
+    Updates the priority for the given note, without adding a new entry in 
+    queue_prio_log, if there is already one.
+    This is useful to simply change the priority of a note in the queue without having it moved 
+    at the end of the queue, which would happen if a new entry would be created (time delta would be 0 or very small).
+    """
+    conn = _get_connection()
+    res = conn.execute(f"select rowid from queue_prio_log where nid = {nid_to_update} order by created desc limit 1").fetchone()
+    if res is None or len(res) == 0:
+        created = _date_now_str()
+        conn.execute(f"insert into queue_prio_log (nid, prio, type, created) values ({nid_to_update}, {new_prio}, '', '{created}')")
+    else:
+        conn.execute(f"update queue_prio_log set prio = {new_prio} where rowid = {res[0]}")
+    conn.commit()
+    conn.close()
+
+def add_to_prio_log(nid: int, prio: int):
+    created = _date_now_str()
+    conn = _get_connection()
+    conn.execute(f"insert into queue_prio_log (nid, prio, type, created) values ({nid}, {prio}, '', '{created}')")
+    conn.commit()
+    conn.close()
+
+def update_priority_list(nid_to_update: int, schedule: int) -> Tuple[int, int]:
     """
     Call this after a note has been added or updated. 
-    Will read the current priority queue and update it, depending 
-    on what schedule mode is active.
+    Will read the current priority queue and update it.
     Will also insert the given priority in queue_prio_log.
     """
     # priority log entries that have to be inserted in the log
@@ -195,11 +224,11 @@ def update_priority_list(nid_to_update, schedule):
     scores = []
     nid_was_included = False
     now = datetime.now()
-    for nid, last_prio, last_prio_creation, current_position in current:
+    for nid, last_prio, last_prio_creation, current_position, rem in current:
         # last prio might be null, because of legacy queue system
         if last_prio is None:
             # lazy solution: set to average priority
-            last_prio = 3
+            last_prio = 50
             now += timedelta(seconds=1)
             ds = now.strftime('%Y-%m-%d-%H-%M-%S')
             last_prio_creation = ds
@@ -207,12 +236,11 @@ def update_priority_list(nid_to_update, schedule):
             
         # assert(current_position >= 0)
         
-        
         if nid == nid_to_update:
             nid_was_included = True
             # initial score is 0 (delta_days is 0), but the note will climb up the queue faster if it has a high prio
             score = 0
-            if schedule == QueueSchedule.NOT_ADD.value:
+            if schedule == 0:
                 # if not in queue, remove from log
                 to_remove_from_log.append(nid)
             else:
@@ -220,23 +248,32 @@ def update_priority_list(nid_to_update, schedule):
                 ds = now.strftime('%Y-%m-%d-%H-%M-%S')
                 if not nid in [x[0] for x in to_update_in_log]:
                     to_update_in_log.append((nid, ds, schedule))
-                scores.append((nid, ds, last_prio, score))
+                scores.append((nid, ds, last_prio, score, rem))
         else:
             days_delta = max(0, (datetime.now() - _dt_from_date_str(last_prio_creation)).total_seconds() / 86400.0)
             # assert(days_delta >= 0)
             # assert(days_delta < 10000)
-            score = days_delta * last_prio
-            scores.append((nid, last_prio_creation, last_prio, score))
+            score = _calc_score(last_prio, days_delta)
+            scores.append((nid, last_prio_creation, last_prio, score, rem))
     # note to be updated doesn't have to be in the results, it might not have been in the queue before
     if not nid_was_included:
-        if schedule == QueueSchedule.NOT_ADD.value:
+        if schedule == 0:
             to_remove_from_log.append(nid_to_update)
         else:
             now += timedelta(seconds=1)
             ds = now.strftime('%Y-%m-%d-%H-%M-%S')
-            scores.append((nid_to_update, ds, schedule, 0))
+            reminder = get_reminder(nid_to_update)
+            scores.append((nid_to_update, ds, schedule, 0, reminder))
             to_update_in_log.append((nid_to_update, ds, schedule))
-    final_list = sorted(scores, key=lambda x: x[3], reverse=True)
+    sorted_by_scores = sorted(scores, key=lambda x: x[3], reverse=True)
+    final_list = [s for s in sorted_by_scores if s[4] is None or len(s[4].strip()) == 0 or not _specific_schedule_is_due_today(s[4])]
+    due_today = [s for s in sorted_by_scores if s[4] is not None and len(s[4].strip()) > 0 and _specific_schedule_is_due_today(s[4])]
+    if len(due_today) > 0:
+        due_today = sorted(due_today, key=lambda x : x[3], reverse=True)
+        final_list = due_today + final_list
+
+    # now account for specific schedules
+    
     
     # assert(len(scores) == 0 or len(final_list)  >0)
     # for s in scores:
@@ -258,6 +295,7 @@ def update_priority_list(nid_to_update, schedule):
             index = ix
     for nid in to_remove_from_log:
         c.execute(f"delete from queue_prio_log where nid = {nid};")
+        c.execute(f"update notes set reminder = '' where nid = {nid};")
     for nid, created, prio in to_update_in_log:
         c.execute(f"insert into queue_prio_log (nid, prio, created) values ({nid}, {prio}, '{created}');")
     c.execute("commit")
@@ -265,7 +303,36 @@ def update_priority_list(nid_to_update, schedule):
     #return new position (0-based), and length of queue, some functions need that to update the ui
     return (index, len(final_list))
     
-def get_priority(nid):
+
+def _specific_schedule_is_due_today(sched_str: str) -> bool:
+    if not "|" in sched_str:
+        return False
+    dt = _dt_from_date_str(sched_str.split("|")[1])
+    if MISSED_NOTES_HANDLING != "place-front":
+        return dt.date() == datetime.today().date()
+    return dt.date() <= datetime.today().date()
+
+def _specific_schedule_was_due_before_today(sched_str: str) -> bool:
+    if not "|" in sched_str:
+        return False
+    dt = _dt_from_date_str(sched_str.split("|")[1])
+    return dt.date() < datetime.today().date()
+        
+        
+
+def _calc_score(priority: int, days_delta: float) -> float:
+    prio_factor = 1 + ((priority - 1)/99) * (PRIORITY_SCALE_FACTOR - 1)
+    return days_delta * prio_factor
+
+def get_reminder(nid: int) -> str:
+    conn = _get_connection()
+    res = conn.execute(f"select reminder from notes where id = {nid} limit 1").fetchone()
+    if res is None:
+        return None
+    conn.close()
+    return res[0]
+
+def get_priority(nid: int) -> int:
     conn = _get_connection()
     res = conn.execute(f"select prio from queue_prio_log where nid = {nid} order by created desc limit 1").fetchone()
     if res is None:
@@ -273,7 +340,8 @@ def get_priority(nid):
     conn.close()
     return res[0]
 
-def get_priority_as_str(nid):
+def get_priority_as_str(nid: int) -> str:
+    """ Get a str representation of the priority of the given note, e.g. 'Very high' """
     conn = _get_connection()
     res = conn.execute(f"select prio from queue_prio_log where nid = {nid} order by created desc limit 1").fetchone()
     conn.close()
@@ -281,63 +349,129 @@ def get_priority_as_str(nid):
         return "No priority yet"
     return dynamic_sched_to_str(res[0])
 
-def dynamic_sched_to_str(sched):
-    if sched == QueueSchedule.VERY_HIGH_PRIO.value:
-        return "Very high (5)"
-    if sched == QueueSchedule.HIGH_PRIO.value:
-        return "High (4)"
-    if sched == QueueSchedule.AVERAGE_PRIO.value:
-        return "Medium (3)"
-    if sched == QueueSchedule.LOW_PRIO.value:
-        return "Low (2)"
-    if sched == QueueSchedule.VERY_LOW_PRIO.value:
-        return "Very low (1)"
+def dynamic_sched_to_str(sched: int) -> str:
+    """ Get a str representation of the given priority value, e.g. 'Very high' """
+    if sched >= 85 :
+        return f"Very high ({sched})"
+    if sched >= 70:
+        return f"High ({sched})"
+    if sched >= 30:
+        return f"Medium ({sched})"
+    if sched >= 15:
+        return f"Low ({sched})"
+    if sched >= 1:
+        return f"Very low ({sched})"
+    return "Not in Queue (0)"
+
+def update_reminder(nid: int, rem: str):
+    conn = _get_connection()
+    sql = "update notes set reminder=?, modified=datetime('now', 'localtime') where id=? "
+    conn.execute(sql, (rem, nid))
+    conn.commit()
+    conn.close()
         
 def recalculate_priority_queue():
     """
-        If schedule mode dynamic, calculate the priority queue again, without writing anything to the 
+        Calculate the priority queue again, without writing anything to the 
         priority log. Has to be done at least once on startup to incorporate the changed difference in days.
     """
-    current = _get_priority_list_with_last_prios()
-    scores = []
-    to_update_in_log = []
-    now = datetime.now()
-    for nid, last_prio, last_prio_creation, current_position in current:
-        # last prio might be null, because of legacy queue system
-        if last_prio is None:
-            # lazy solution: set to average priority
-            last_prio = 3
-            now += timedelta(seconds=1)
-            ds = now.strftime('%Y-%m-%d-%H-%M-%S')
-            last_prio_creation = ds
-            to_update_in_log.append((nid, ds, last_prio))
+    for i in range(0,2):
+        current = _get_priority_list_with_last_prios()
+        scores = []
+        to_update_in_log = []
+        to_remove_schedules = []
+        to_reschedule = []
+        now = datetime.now()
+        for nid, last_prio, last_prio_creation, current_position, reminder in current:
+            # last prio might be null, because of legacy queue system
+            if last_prio is None:
+                # lazy solution: set to average priority
+                last_prio = 50
+                now += timedelta(seconds=1)
+                ds = now.strftime('%Y-%m-%d-%H-%M-%S')
+                last_prio_creation = ds
+                to_update_in_log.append((nid, ds, last_prio))
+                
+            # assert(current_position >= 0)
+            days_delta = max(0, (datetime.now() - _dt_from_date_str(last_prio_creation)).total_seconds() / 86400.0)
             
-        # assert(current_position >= 0)
-        days_delta = max(0, (datetime.now() - _dt_from_date_str(last_prio_creation)).total_seconds() / 86400.0)
+            # assert(days_delta >= 0)
+            # assert(days_delta < 10000)
+            score = _calc_score(last_prio, days_delta)
+            scores.append((nid, last_prio_creation, last_prio, score, reminder))
+        sorted_by_scores = sorted(scores, key=lambda x: x[3], reverse=True)
+        final_list = [s for s in sorted_by_scores if s[4] is None or len(s[4].strip()) == 0 or not _specific_schedule_is_due_today(s[4])]
+        due_today = [s for s in sorted_by_scores if s[4] is not None and len(s[4].strip()) > 0 and _specific_schedule_is_due_today(s[4])]
+        if len(due_today) > 0:
+            due_today = sorted(due_today, key=lambda x : x[3], reverse=True)
+            final_list = due_today + final_list
         
-        # assert(days_delta >= 0)
-        # assert(days_delta < 10000)
-        score = days_delta * last_prio
-        scores.append((nid, last_prio_creation, last_prio, score))
-    final_list = sorted(scores, key=lambda x: x[3], reverse=True)
-    
-    # assert(len(scores) == 0 or len(final_list)  >0)
-    # for s in scores:
-        # assert(s[3] >= 0)
-        # assert(s[1] is not None and len(s[1]) > 0)
-    # assert(len(final_list) == len(set([f[0] for f in final_list])))
+        if MISSED_NOTES_HANDLING != "place-front":
+            for f in final_list:
+                if f[4] is None or len(f[4].strip()) == 0:
+                    continue
+                if _specific_schedule_was_due_before_today(f[4]):
+                    n = SiacNote([None for i in range(12)])
+                    n.reminder = f[4]
+                    if MISSED_NOTES_HANDLING == "remove-schedule" and n.schedule_type() == "td":
+                        to_remove_schedules.append(f[0])
+                    elif MISSED_NOTES_HANDLING == "new-schedule" or (n.schedule_type() == "wd" or n.schedule_type() == "id"):
+                        delta = n.due_days_delta()
+                        now = _date_now_str()
+                        if n.schedule_type() == "td":
+                            # show again in n days
+                            days_delta = int(n.reminder.split("|")[2][3:])
+                            next_date_due = datetime.now() + timedelta(days=days_delta)
+                            new_reminder = f"{now}|{utility.date.dt_to_stamp(next_date_due)}|td:{days_delta}"
+
+                        elif n.schedule_type() == "wd":
+                            # show again on next weekday instance
+                            wd_part = n.reminder.split("|")[2]
+                            weekdays_due = [int(d) for d in wd_part[3:]]
+                            next_date_due = utility.date.next_instance_of_weekdays(weekdays_due)
+                            new_reminder = f"{now}|{utility.date.dt_to_stamp(next_date_due)}|{wd_part}"
+                        elif n.schedule_type() == "id":
+                            # show again according to interval
+                            days_delta = int(n.reminder.split("|")[2][3:])
+                            next_date_due = datetime.now() + timedelta(days=days_delta)
+                            new_reminder = f"{now}|{utility.date.dt_to_stamp(next_date_due)}|id:{days_delta}"
+                        to_reschedule.append((f[0], new_reminder))
+        
+        # assert(len(scores) == 0 or len(final_list)  >0)
+        # for s in scores:
+            # assert(s[3] >= 0)
+            # assert(s[1] is not None and len(s[1]) > 0)
+        # assert(len(final_list) == len(set([f[0] for f in final_list])))
+        conn = _get_connection()
+        c = conn.cursor()
+        c.execute(f"update notes set position = NULL where position is not NULL;")
+        for ix, f in enumerate(final_list):
+            c.execute(f"update notes set position = {ix} where id = {f[0]};")
+        for nid, created, prio in to_update_in_log:
+            c.execute(f"insert into queue_prio_log (nid, prio, created) values ({nid}, {prio}, '{created}');")
+        for nid in to_remove_schedules:
+            c.execute(f"update notes set reminder = '' where id = {nid};")
+        for nid, new_rem in to_reschedule:
+            c.execute(f"update notes set reminder = '{new_rem}' where id = {nid};")
+        conn.commit()
+        conn.close()
+
+
+def get_notes_scheduled_for_today() -> List[SiacNote]:
+    today_dt = _date_now_str()[:4] + _date_now_str()[5:7] + _date_now_str()[8:10]
     conn = _get_connection()
-    c = conn.cursor()
-    c.execute(f"update notes set position = NULL where position is not NULL;")
-    for ix, f in enumerate(final_list):
-        c.execute(f"update notes set position = {ix} where id = {f[0]};")
-    for nid, created, prio in to_update_in_log:
-        c.execute(f"insert into queue_prio_log (nid, prio, created) values ({nid}, {prio}, '{created}');")
-    conn.commit()
+    res = conn.execute(f"select * from notes where position is not null and reminder like '%|%' and cast((substr(reminder, 21, 4) || substr(reminder, 26,2) || substr(reminder, 29,2)) as integer) <= {today_dt}").fetchall()
     conn.close()
+    return _to_notes(res)
 
+def get_last_done_notes() -> List[SiacNote]:
+    conn = _get_connection()
+    res = conn.execute("select notes.* from (select distinct nid from queue_prio_log group by nid order by max(created) desc) as p join notes on p.nid = notes.id").fetchall()
+    conn.close()
+    return _to_notes(res)
 
-def mark_page_as_read(nid, page, pages_total):
+
+def mark_page_as_read(nid: int, page: int, pages_total: int):
     now = _date_now_str()
     conn = _get_connection()
     conn.execute("insert or ignore into read (page, nid) values (%s, %s)" % (page, nid))
@@ -345,13 +479,13 @@ def mark_page_as_read(nid, page, pages_total):
     conn.commit()
     conn.close()
 
-def mark_page_as_unread(nid, page):
+def mark_page_as_unread(nid: int, page: int):
     conn = _get_connection()
     conn.execute("delete from read where nid = %s and page = %s" % (nid, page))
     conn.commit()
     conn.close()
 
-def mark_range_as_read(nid, start, end, pages_total):
+def mark_range_as_read(nid: int, start: int, end: int, pages_total: int):
     now = _date_now_str()
     conn = _get_connection()
     res = conn.execute(f"select page from read where nid={nid} and page > -1").fetchall()
@@ -364,7 +498,7 @@ def mark_range_as_read(nid, start, end, pages_total):
     conn.commit()
     conn.close()
 
-def create_pdf_mark(nid, page, pages_total, mark_type):
+def create_pdf_mark(nid: int, page: int, pages_total: int, mark_type: int):
     now = _date_now_str()
     conn = _get_connection()
     conn.execute("delete from marks where nid = %s and page = %s and marktype = %s" % (nid, page, mark_type))
@@ -372,7 +506,7 @@ def create_pdf_mark(nid, page, pages_total, mark_type):
     conn.commit()
     conn.close()
 
-def toggle_pdf_mark(nid, page, pages_total, mark_type):
+def toggle_pdf_mark(nid: int, page: int, pages_total: int, mark_type: int) -> List[Tuple[Any, ...]]:
     conn = _get_connection()
     if conn.execute("select nid from marks where nid = %s and page = %s and marktype = %s" % (nid, page, mark_type)).fetchone() is not None:
         conn.execute("delete from marks where nid = %s and page = %s and marktype = %s" % (nid, page, mark_type))
@@ -384,19 +518,19 @@ def toggle_pdf_mark(nid, page, pages_total, mark_type):
     conn.close()
     return res 
 
-def delete_pdf_mark(nid, page, mark_type):
+def delete_pdf_mark(nid: int, page: int, mark_type: int):
     conn = _get_connection()
     conn.execute("delete from marks where nid = %s and page %s and marktype = %s" % (nid, page, mark_type))
     conn.commit()
     conn.close()
 
-def get_pdf_marks(nid):
+def get_pdf_marks(nid: int) -> List[Tuple[Any, ...]]:
     conn = _get_connection()
     res = conn.execute("select * from marks where nid = %s" % nid).fetchall()
     conn.close()
     return res
 
-def get_pdfs_by_sources(sources):
+def get_pdfs_by_sources(sources: List[str]) -> List[str]:
     """
     Takes a list of (full) paths, and gives back those for whom a pdf note exists with the given path.
     """
@@ -406,7 +540,16 @@ def get_pdfs_by_sources(sources):
     conn.close()
     return [r[0] for r in res]
 
-def get_unqueued_notes_for_tag(tag):
+def get_pdf_id_for_source(source: str) -> int:
+    """
+    Takes a source and returns the id of the first note with the given source, if existing, else -1
+    """
+    conn = _get_connection()
+    res = conn.execute(f"select id from notes where source = ?", (source,)).fetchone()
+    conn.close()
+    return -1 if res is None or len(res) == 0 else res[0]
+
+def get_unqueued_notes_for_tag(tag: str) -> List[SiacNote]:
     if len(tag.strip()) == 0:
         return []
     query = ""
@@ -420,7 +563,8 @@ def get_unqueued_notes_for_tag(tag):
     res = conn.execute("select * from notes where (%s) and position is null order by id desc" %(query)).fetchall()
     return _to_notes(res)
 
-def get_read_pages(nid):
+def get_read_pages(nid: int) -> List[int]:
+    """ Get read pages for the given note as list. """
     conn = _get_connection()
     res = conn.execute("select page from read where nid = %s and page > -1 order by created asc" % nid).fetchall()
     conn.close()
@@ -428,7 +572,7 @@ def get_read_pages(nid):
         return []
     return [r[0] for r in res]
 
-def get_note_tree_data():
+def get_note_tree_data() -> Dict[str, List[Tuple[int, str]]]:
     """
         Fills a map with the data for the QTreeWidget in the Create dialog.
     """
@@ -457,25 +601,26 @@ def get_note_tree_data():
             n_map[str(diff_in_days) + " days ago"].append((id, utility.text.trim_if_longer_than(title, 100)))
     return n_map
 
-def get_all_notes():
+def get_all_notes() -> List[Tuple[Any, ...]]:
+    """ Fetch all add-on notes, used in indexing. """
     conn = _get_connection()
     res = list(conn.execute("select * from notes"))
     conn.close()
     return res
 
-def get_untagged_notes():
+def get_untagged_notes() -> List[SiacNote]:
     conn = _get_connection()
     res = list(conn.execute("select * from notes where tags is null or trim(tags) = ''"))
     conn.close()
     return _to_notes(res)
 
-def get_note(id):
+def get_note(id: int) -> SiacNote:
     conn = _get_connection()
     res = conn.execute("select * from notes where id=" + str(id)).fetchone()
     conn.close()
     return _to_notes([res])[0]
 
-def get_random_id_from_queue():
+def get_random_id_from_queue() -> int:
     conn = _get_connection()
     res = conn.execute("select id from notes where position >= 0 order by random() limit 1").fetchone()
     conn.close()
@@ -483,7 +628,7 @@ def get_random_id_from_queue():
         return -1
     return res[0]
 
-def get_head_of_queue():
+def get_head_of_queue() -> int:
     conn = _get_connection()
     res = conn.execute("select id from notes where position >= 0 order by position asc limit 1").fetchone()
     conn.close()
@@ -491,7 +636,7 @@ def get_head_of_queue():
         return -1
     return res[0]
 
-def update_note_text(id, text):
+def update_note_text(id: int, text: str):
     conn = _get_connection()
     sql = """
         update notes set text=?, modified=datetime('now', 'localtime') where id=?
@@ -505,7 +650,7 @@ def update_note_text(id, text):
     if index is not None:
         index.update_user_note((id, note[0], text, note[1], note[2], -1, ""))
 
-def update_note_tags(id, tags):
+def update_note_tags(id: int, tags: str):
     if not tags.endswith(" "):
         tags += " "
     if not tags.startswith(" "):
@@ -520,24 +665,24 @@ def update_note_tags(id, tags):
     if index is not None:
         index.update_user_note((id, note[0], note[3], note[1], tags, -1, ""))
 
-def update_note(id, title, text, source, tags, reminder, queue_schedule):
+def update_note(id: int, title: str, text: str, source: str, tags: str, reminder: str, priority: int):
 
     text = utility.text.clean_user_note_text(text)
     tags = " %s " % tags.strip()
     mod = _date_now_str()
-    sql = f"update notes set title=?, text=?, source=?, tags=?, modified='{mod}' where id=?"
+    sql = f"update notes set title=?, text=?, source=?, tags=?, modified='{mod}', reminder=? where id=?"
     conn = _get_connection()
-    conn.execute(sql, (title, text, source, tags, id))
+    conn.execute(sql, (title, text, source, tags, reminder, id))
     conn.commit()
     conn.close()
-    # if schedule is NOT_ADD/keep priority, don't recalc queue
-    if queue_schedule != QueueSchedule.NOT_ADD.value:
-        update_priority_list(id, queue_schedule)
+    # a prio of -1 means unchanged, so don't update
+    if priority != -1:
+        update_priority_list(id, priority)
     index = get_index()
     if index is not None:
         index.update_user_note((id, title, text, source, tags, -1, ""))
 
-def get_read_stats(nid):
+def get_read_stats(nid: int) -> Tuple[Any, ...]:
     conn = _get_connection()
     res = conn.execute("select count(*), max(created), pagestotal from read where page > -1 and nid = %s" % nid).fetchall()
     res = res[0]
@@ -548,8 +693,53 @@ def get_read_stats(nid):
     conn.close()
     return res
 
+#
+# highlights / annotation
+#
+
+def insert_highlights(highlights: List[Tuple[Any, ...]]):
+    """
+        [(nid,page,group,type,text,x0,y0,x1,y1)]
+    """
+    dt = _date_now_str()
+    highlights = [h + (dt,) for h in highlights]
+    conn = _get_connection()
+
+    res = conn.executemany("insert into highlights(nid, page, grouping, type, text, x0, y0, x1, y1, created) values (?,?,?,?,?,?,?,?,?,?)", highlights)
+    conn.commit()
+    conn.close()
+
+def delete_highlight(id: int):
+    conn = _get_connection()
+    conn.execute(f"delete from highlights where rowid = {id}")
+    conn.commit()
+    conn.close()
+
+def get_highlights(nid: int, page: int) -> List[Tuple[Any, ...]]:
+    conn = _get_connection()
+    res = conn.execute(f"select rowid, * from highlights where nid = {nid} and page = {page}").fetchall()
+    conn.close()
+    return res
+
+def update_text_comment_coords(id: int, x0: float, y0: float, x1: float, y1: float):
+    conn = _get_connection()
+    conn.execute(f"update highlights set x0 = {x0}, y0 = {y0}, x1 = {x1}, y1 = {y1} where rowid = {id}")
+    conn.commit()
+    conn.close()
+
+def update_text_comment_text(id: int, text: str):
+    conn = _get_connection()
+    conn.execute("update highlights set text = ? where rowid = ?", (text, id))
+    conn.commit()
+    conn.close()
+
+
+#
+# end highlights
+#
+
 
-def get_all_tags():
+def get_all_tags() -> Set[str]:
     """
         Returns a set containing all tags (str) that appear in the user's notes.
     """
@@ -586,11 +776,11 @@ def find_by_tag(tag_str, to_output_list=True):
         return res
     return _to_notes(res, pinned)
 
-def find_by_text(text):
+def find_by_text(text: str):
     index = get_index()
     index.search(text, [])
 
-def find_notes(text):
+def find_notes(text: str) -> List[SiacNote]:
     q = ""
     for token in text.lower().split():
         if len(token) > 1:
@@ -603,7 +793,7 @@ def find_notes(text):
     conn.close()
     return _to_notes(res)
 
-def find_pdf_notes_by_title(text):
+def find_pdf_notes_by_title(text: str) -> List[SiacNote]:
     q = ""
     for token in text.lower().split():
         if len(token) > 0:
@@ -617,7 +807,7 @@ def find_pdf_notes_by_title(text):
     conn.close()
     return _to_notes(res)
 
-def find_unqueued_pdf_notes(text):
+def find_unqueued_pdf_notes(text: str) -> Optional[List[SiacNote]]:
     q = ""
     for token in text.lower().split():
         if len(token) > 0:
@@ -631,7 +821,7 @@ def find_unqueued_pdf_notes(text):
     conn.close()
     return _to_notes(res)
 
-def find_unqueued_non_pdf_notes(text):
+def find_unqueued_non_pdf_notes(text: str) -> Optional[List[SiacNote]]:
     q = ""
     for token in text.lower().split():
         if len(token) > 0:
@@ -645,7 +835,7 @@ def find_unqueued_non_pdf_notes(text):
     conn.close()
     return _to_notes(res)
 
-def get_most_used_pdf_folders():
+def get_most_used_pdf_folders() -> List[str]:
     sql = """
         select replace(source, replace(source, rtrim(source, replace(source, '/', '')), ''), '') from notes where lower(source) like '%.pdf' 
         group by replace(source, replace(source, rtrim(source, replace(source, '/', '')), ''), '') order by count(*) desc limit 50
@@ -655,7 +845,7 @@ def get_most_used_pdf_folders():
     conn.close()
     return [r[0] for r in res]
 
-def get_position(nid):
+def get_position(nid: int) -> Optional[int]:
     conn = _get_connection()
     res = conn.execute("select position from notes where id = %s" % nid).fetchone()
     conn.close()
@@ -663,19 +853,20 @@ def get_position(nid):
         return None 
     return res[0]
 
-def delete_note(id):
-    update_priority_list(id, QueueSchedule.NOT_ADD.value)
+def delete_note(id: int):
+    update_priority_list(id, 0)
     # s = time.time() * 1000
     conn = _get_connection()
     conn.executescript(f"""delete from read where nid ={id};
                             delete from marks where nid ={id};
                             delete from notes where id={id};
                             delete from queue_prio_log where nid={id}; 
+                            delete from highlights where nid={id};
                             """)
     conn.commit()
     conn.close()
 
-def get_read_today_count():
+def get_read_today_count() -> int:
     now = datetime.today().strftime('%Y-%m-%d')
     conn = _get_connection()
     c = conn.execute("select count(*) from read where page > -1 and created like '%s%%'" % now).fetchone()
@@ -684,24 +875,24 @@ def get_read_today_count():
         return 0
     return c[0]
 
-def get_avg_pages_read(delta_days):
+def get_avg_pages_read(delta_days: int) -> float:
     dt = date.today() - timedelta(delta_days)
     stamp = dt.strftime('%Y-%m-%d')
     conn = _get_connection()
     c = conn.execute("select count(*) from read where page > -1 and created >= '%s'" % stamp).fetchone()
     conn.close()
     if c is None:
-        return 0
+        return 0.0
     return float("{0:.1f}".format(c[0] / delta_days))
 
 
-def get_queue_count():
+def get_queue_count() -> int:
     conn = _get_connection()
     c = conn.execute("select count(*) from notes where position is not null and position >= 0").fetchone()
     conn.close()
     return c
 
-def get_invalid_pdfs():
+def get_invalid_pdfs() -> List[SiacNote]:
     conn = _get_connection()
     res = conn.execute("select * from notes where lower(source) like '%.pdf'").fetchall()
     conn.close()
@@ -713,7 +904,7 @@ def get_invalid_pdfs():
         c += 1
     return _to_notes(filtered) 
 
-def get_recently_used_tags():
+def get_recently_used_tags() -> List[str]:
     """
         Returns a [str] of max 10 tags, ordered by their usage desc.
     """
@@ -721,7 +912,7 @@ def get_recently_used_tags():
     ordered = [i[0] for i in list(sorted(counts.items(), key=lambda item: item[1], reverse = True))][:10]
     return ordered
 
-def get_recently_used_tags_with_counts():
+def get_recently_used_tags_with_counts() -> Dict[str, int]:
     """
         Returns a {str, int} of max 10 tags, ordered by their usage desc.
     """
@@ -729,7 +920,7 @@ def get_recently_used_tags_with_counts():
     ordered = dict(sorted(counts.items(), key=lambda item: item[1], reverse = True))
     return ordered
 
-def _get_recently_used_tags_counts(limit):
+def _get_recently_used_tags_counts(limit: int) -> Dict[str, int]:
     conn = _get_connection()
     res = conn.execute("select tags from notes where tags is not null order by id desc limit %s" % limit).fetchall()
     conn.close()
@@ -745,7 +936,7 @@ def _get_recently_used_tags_counts(limit):
                 counts[tag] = 1
     return counts
 
-def _get_priority_list(nid_to_exclude = None):
+def _get_priority_list(nid_to_exclude: int = None) -> List[SiacNote]:
     if nid_to_exclude is not None:
         sql = """
             select * from notes where position >= 0 and id != %s order by position asc
@@ -759,19 +950,18 @@ def _get_priority_list(nid_to_exclude = None):
     conn.close()
     return _to_notes(res)
 
-def _get_priority_list_with_last_prios():
+def _get_priority_list_with_last_prios() -> List[Tuple[Any, ...]]:
     """
-        Used when in dynamic queue scheduling mode.
-        Returns (nid, last prio, last prio creation, current position)
+        Returns (nid, last prio, last prio creation, current position, schedule)
     """
-    sql = """ select notes.id, prios.prio, prios.created, notes.position from notes left join (select distinct nid, prio, max(created) as created, type from queue_prio_log group by nid) as prios on prios.nid = notes.id where notes.position >= 0 order by position asc """
+    sql = """ select notes.id, prios.prio, prios.created, notes.position, notes.reminder from notes left join (select distinct nid, prio, max(created) as created, type from queue_prio_log group by nid) as prios on prios.nid = notes.id where notes.position >= 0 order by position asc """
     conn = _get_connection()
     res = conn.execute(sql).fetchall()
     conn.close()
     return res
 
 
-def get_priority_list():
+def get_priority_list() -> List[SiacNote]:
     """
         Returns all notes that have a position set.
         Result is in the form that Output.print_search_results wants.
@@ -784,7 +974,7 @@ def get_priority_list():
     conn.close()
     return _to_notes(res)
 
-def get_newest(limit, pinned):
+def get_newest(limit: int, pinned: List[int]) -> List[SiacNote]:
     """
         Returns newest user notes ordered by created date desc.
         Result is in the form that Output.print_search_results wants.
@@ -797,19 +987,19 @@ def get_newest(limit, pinned):
     conn.close()
     return _to_notes(res, pinned)
 
-def get_random(limit, pinned):
+def get_random(limit: int, pinned: List[int]) -> List[SiacNote]:
     conn = _get_connection()
     res = conn.execute("select * from notes order by random() limit %s" % limit).fetchall()
     conn.close()
     return _to_notes(res, pinned)
 
-def get_queue_in_random_order():
+def get_queue_in_random_order() -> List[SiacNote]:
     conn = _get_connection()
     res = conn.execute("select * from notes where position is not null order by random()").fetchall()
     conn.close()
     return _to_notes(res)
 
-def set_priority_list(ids):
+def set_priority_list(ids: List[int]):
     ulist = list()
     for ix,id in enumerate(ids):
         ulist.append((ix, id))
@@ -825,22 +1015,7 @@ def empty_priority_list():
     conn.commit()
     conn.close()
 
-def _get_db_path():
-    global db_path
-    if db_path is not None:
-        return db_path
-    file_path = mw.addonManager.getConfig(__name__)["addonNoteDBFolderPath"]
-    if file_path is None or len(file_path) == 0:
-        file_path = utility.misc.get_user_files_folder_path()
-    file_path += "siac-notes.db"
-    db_path = file_path
-    return file_path
-
-def _get_connection():
-    file_path = _get_db_path()
-    return sqlite3.connect(file_path)
-
-def get_all_tags_as_hierarchy(include_anki_tags):
+def get_all_tags_as_hierarchy(include_anki_tags: bool) -> Dict:
     tags = None
     if include_anki_tags:
         tags = mw.col.tags.all()
@@ -851,50 +1026,50 @@ def get_all_tags_as_hierarchy(include_anki_tags):
     return utility.tags.to_tag_hierarchy(tags)
 
 
-def get_all_pdf_notes():
+def get_all_pdf_notes() -> List[SiacNote]:
     conn = _get_connection()
     res = conn.execute("select * from notes where lower(source) like '%.pdf'").fetchall()
     conn.close()
     return _to_notes(res)
 
-def get_all_unread_pdf_notes():
+def get_all_unread_pdf_notes() -> List[SiacNote]:
     conn = _get_connection()
     res = conn.execute("select * from notes where lower(source) like '%.pdf' and id not in (select distinct nid from read where page >= 0) order by created desc").fetchall()
     conn.close()
     return _to_notes(res)
 
-def get_in_progress_pdf_notes():
+def get_in_progress_pdf_notes() -> List[SiacNote]:
     conn = _get_connection()
     res = conn.execute("select * from notes where lower(source) like '%.pdf' and id in (select nid from (select nid, pagestotal, max(created) from read where page > -1  group by nid having count(nid) < pagestotal)) order by created desc").fetchall()
     conn.close()
     return _to_notes(res)
 
 
-def get_pdf_notes_last_added_first():
+def get_pdf_notes_last_added_first() -> List[SiacNote]:
     conn = _get_connection()
     res = conn.execute("select * from notes where lower(source) like '%.pdf' order by id desc").fetchall()
     conn.close()
     return _to_notes(res)
 
-def get_pdf_notes_last_read_first():
+def get_pdf_notes_last_read_first() -> List[SiacNote]:
     conn = _get_connection()
     res = conn.execute("select notes.id,notes.title,notes.text,notes.source,notes.tags,notes.nid,notes.created,notes.modified,notes.reminder,notes.lastscheduled,notes.position from notes join read on notes.id == read.nid where lower(notes.source) like '%.pdf' group by notes.id order by max(read.created) desc").fetchall()
     conn.close()
     return _to_notes(res)
 
-def get_pdf_notes_not_in_queue():
+def get_pdf_notes_not_in_queue() -> List[SiacNote]:
     conn = _get_connection()
     res = conn.execute("select * from notes where lower(source) like '%.pdf' and position is null order by id desc").fetchall()
     conn.close()
     return _to_notes(res)
 
-def get_non_pdf_notes_not_in_queue():
+def get_non_pdf_notes_not_in_queue() -> List[SiacNote]:
     conn = _get_connection()
     res = conn.execute("select * from notes where not lower(source) like '%.pdf' and position is null order by id desc").fetchall()
     conn.close()
     return _to_notes(res)
 
-def get_pdf_quick_open_suggestions():
+def get_pdf_quick_open_suggestions() -> List[SiacNote]:
     conn = _get_connection()
     last_added = conn.execute("select * from notes where lower(source) like '%.pdf' order by id desc limit 8").fetchall()
     last_read = conn.execute("select notes.id,notes.title,notes.text,notes.source,notes.tags,notes.nid,notes.created,notes.modified,notes.reminder,notes.lastscheduled,notes.position from notes join read on notes.id == read.nid where lower(notes.source) like '%.pdf' group by notes.id order by max(read.created) desc limit 8").fetchall()
@@ -912,7 +1087,7 @@ def get_pdf_quick_open_suggestions():
             break 
     return _to_notes(res)
 
-def get_pdf_info(nids):
+def get_pdf_info(nids: List[int]) -> List[Tuple[int, int, int]]:
     sql = "select nid, pagestotal, count(*), max(created) from read where nid in (%s) and page > -1 group by nid" % (",".join([str(n) for n in nids]))
     conn = _get_connection()
     res = conn.execute(sql).fetchall()
@@ -922,14 +1097,20 @@ def get_pdf_info(nids):
         ilist.append([r[0], r[2], r[1]])
     return ilist
 
-def get_related_notes(id):
-    note = get_note(id)
-    title = note.title
+def get_related_notes(id: int) -> NoteRelations:
+    """ Find note suggestions for the given note. """
+
+    note    = get_note(id)
+    title   = note.title
+
     if title is not None and len(title.strip()) > 1:
         related_by_title = find_notes(title)
     else:
         related_by_title = []
-    related_by_tags = []
+
+    related_by_tags     = []
+    related_by_folder   = []
+
     if note.tags is not None and len(note.tags.strip()) > 0:
         tags = note.tags.strip().split(" ")
         tags = sorted(tags, key=lambda x: x.count("::"), reverse=True)
@@ -944,12 +1125,20 @@ def get_related_notes(id):
                     related_by_tags += res
                 if len(related_by_tags) >= 10:
                     break
+        conn.close()
         related_by_tags = _to_notes(related_by_tags)
+
+    if note.is_pdf() and note.get_containing_folder():
+        conn    = _get_connection()
+        res     = conn.execute(f"select * from notes where id != {id} and source glob '{note.get_containing_folder()}[^/]*' order by created desc limit 5").fetchall()
         conn.close()
-    return NoteRelations(related_by_title, related_by_tags)
+        if res:
+            related_by_folder += res
+            related_by_folder = _to_notes(related_by_folder)
 
+    return NoteRelations(related_by_title, related_by_tags, related_by_folder)
 
-def mark_all_pages_as_read(nid, num_pages):
+def mark_all_pages_as_read(nid: int, num_pages: int):
     now = _date_now_str()
     conn = _get_connection()
     existing = [r[0] for r in conn.execute("select page from read where page > -1 and nid = %s" % nid).fetchall()]
@@ -958,7 +1147,7 @@ def mark_all_pages_as_read(nid, num_pages):
     conn.commit()
     conn.close()
 
-def mark_as_read_up_to(nid, page, num_pages):
+def mark_as_read_up_to(nid: int, page: int, num_pages: int):
     now = _date_now_str()
     conn = _get_connection()
     existing = [r[0] for r in conn.execute("select page from read where page > -1 and nid = %s" % nid).fetchall()]
@@ -967,13 +1156,13 @@ def mark_as_read_up_to(nid, page, num_pages):
     conn.commit()
     conn.close()
 
-def mark_all_pages_as_unread(nid):
+def mark_all_pages_as_unread(nid: int):
     conn = _get_connection()
     conn.execute("delete from read where nid = %s and page > -1" % nid)
     conn.commit()
     conn.close()
 
-def insert_pages_total(nid, pages_total):
+def insert_pages_total(nid: int, pages_total: int):
     """
         Inserts a special page entry (page = -1), that is used to save the number of pages even if no page has been read yet.
     """
@@ -984,29 +1173,49 @@ def insert_pages_total(nid, pages_total):
     conn.commit()
     conn.close()
 
-def _to_notes(db_list, pinned=[]):
+
+#
+# helpers
+#
+
+def _get_connection() -> sqlite3.Connection:
+    file_path = _get_db_path()
+    return sqlite3.connect(file_path)
+
+def _get_db_path() -> str:
+    global db_path
+    if db_path is not None:
+        return db_path
+    file_path = mw.addonManager.getConfig(__name__)["addonNoteDBFolderPath"]
+    if file_path is None or len(file_path) == 0:
+        file_path = utility.misc.get_user_files_folder_path()
+    file_path += "siac-notes.db"
+    file_path.strip()
+    db_path = file_path
+    return file_path
+
+def _to_notes(db_list: List[Tuple[Any, ...]], pinned: List[int] = []) -> List[SiacNote]:
     notes = list()
     for tup in db_list:
         if not str([tup[0]]) in pinned:
             notes.append(SiacNote(tup))
     return notes
 
-def _date_now_str():
-    return datetime.today().strftime('%Y-%m-%d-%H-%M-%S')
+def _date_now_str() -> str:
+    return datetime.now().strftime('%Y-%m-%d-%H-%M-%S')
 
-def _dt_from_date_str(dtst):
+def _dt_from_date_str(dtst) -> datetime:
     return datetime.strptime(dtst, '%Y-%m-%d-%H-%M-%S')
 
-def _table_exists(name):
+def _table_exists(name) -> bool:
     conn = _get_connection()
     res = conn.execute(f"SELECT count(name) FROM sqlite_master WHERE type='table' AND name='{name}'").fetchone()
     conn.close()
     if res[0]==1:
         return True
     return False
-    
 
-def _convert_manual_prio_to_dynamic(prio):
+def _convert_manual_prio_to_dynamic(prio: int) -> int:
     if prio == 2 or prio == 7:
         return 5
     if prio == 3:
diff --git a/src/output.py b/src/output.py
index dc00598b..ecf4099b 100644
--- a/src/output.py
+++ b/src/output.py
@@ -29,15 +29,19 @@
     from .state import get_index
     from .notes import get_pdf_info
     from .special_searches import get_suspended
-    from .reading_modal import ReadingModal
+    from .web.reading_modal import ReadingModal
+    from .web.sidebar import Sidebar
     from .config import get_config_value_or_default
+    from .web.note_templates import *
 except:
     from debug_logging import log
     from stats import getRetentions
     from state import get_index
     from notes import get_pdf_info
     from special_searches import get_suspended
-    from reading_modal import ReadingModal
+    from web.reading_modal import ReadingModal
+    from web.sidebar import Sidebar
+    from web.note_templates import *
     from config import get_config_value_or_default
 
 import utility.tags
@@ -45,105 +49,41 @@
 import utility.misc
 
 class Output:
+    """
+        Component which is mainly responsible for rendering search results.
+    """
 
     def __init__(self):
 
         #
-        # components
+        # Components
         #
-        self._editor = None
-        self.reading_modal = ReadingModal()
+        self._editor                = None
+        self.reading_modal          = ReadingModal()
+        self.sidebar                = Sidebar()
        
-        # todo: move to text utils
-        self.SEP_RE = re.compile(r'(?:\u001f){2,}|(?:\u001f[\s\r\n]+\u001f)')
-        self.SEP_END = re.compile(r'</div>\u001f$')
-        self.SOUND_TAG = re.compile(r'sound[a-zA-Z0-9]*mp')
-        self.IO_REPLACE = re.compile('<img src="[^"]+(-\d+-Q|-\d+-A|-(<mark>)?oa(</mark>)?-[OA]|-(<mark>)?ao(</mark>)?-[OA])\.svg" ?/?>(</img>)?')
-        self.IMG_FLD =  re.compile('\\|</span> ?(<img[^>]+/?>)( ?<span class=\'fldSep\'>|$)')
-        self.wordToken = re.compile(u"[a-zA-Z0-9À-ÖØ-öø-ÿāōūēīȳǒǎǐě\u3040-\u30ff\u3400-\u4dbf\u4e00-\u9fff\uf900-\ufaff\uff66-\uff9f]", re.I | re.U)
+        # Todo: move to text utils
+        self.EXCLUDE_KEYWORDS       = re.compile(r'(?:sound|mp3|c[0-9]+)')
        
         #
-        # state
+        # State
         #
-        self.latest = -1
-        self.gridView = False
-        self.stopwords = []
-        self.plotjsLoaded = False
-        self.showRetentionScores = True
-        self.lastResults = None
-        self.hideSidebar = False
-        self.uiVisible = True
+        self.latest                 = -1
+        self.gridView               = False
+        self.stopwords              = []
+        self.plotjsLoaded           = False
+        self.showRetentionScores    = True
+        self.lastResults            = None
+        self.hideSidebar            = False
+        self.uiVisible              = True
+
         # saved to display the same time taken when clicking on a page other than 1
-        self.last_took = None
-        self.last_had_timing_info = False
+        self.last_took              = None
+        self.last_had_timing_info   = False
         #determines the zoom factor of rendered notes
-        self.scale = 1.0
+        self.scale                  = 1.0
         #cache previous calls
-        self.previous_calls = []
-
-
-        #
-        # html templates for search results
-        #
-
-        self.noteTemplate = """<div class='cardWrapper {grid_class}' id='nWr-{counter}'>
-                            <div class='topLeftWr'>
-                                <div id='cW-{nid}' class='rankingLbl' onclick="expandRankingLbl(this)">{counter}<div class='rankingLblAddInfo'>{creation}</div><div class='editedStamp'>{edited}</div></div>
-                                {ret}
-                            </div>
-                            <div id='btnBar-{nid}' class='btnBar' onmouseLeave='pinMouseLeave(this)' onmouseenter='pinMouseEnter(this)'>
-                                <div class='editLbl' onclick='edit({nid})'>Edit</div>
-                                <div class='srchLbl' onclick='searchCard(this)'><div class='siac-search-icn'></div></div>
-                                <div id='pin-{nid}' class='pinLbl unselected' onclick='pinCard(this, {nid})'><span>&#128204;</span></div>
-                                <div class='floatLbl' onclick='addFloatingNote({nid})'>&#10063;</div>
-                                <div id='rem-{nid}' class='remLbl' onclick='removeNote({nid})'><span>&times;</span></div>
-                            </div>
-                            <div class='cardR' onmouseup='getSelectionText()' onmouseenter='cardMouseEnter(this, {nid})' onmouseleave='cardMouseLeave(this, {nid})' id='{nid}' data-nid='{nid}'>{text}</div>
-                            <div id='tags-{nid}'  style='position: absolute; bottom: 0px; right: 0px;'>{tags}</div>
-                            <div class='cardLeftBot' onclick='expandCard({nid}, this)'>&nbsp;INFO&nbsp;</div>
-                        </div>"""
-
-        self.noteTemplateSimple = """<div class='cardWrapper' style="display: block;">
-                            <div class='topLeftWr'>
-                                <div class='rankingLbl'>{counter}<div class='rankingLblAddInfo'>{creation}</div><div class='editedStamp'>{edited}</div></div>
-                                {ret}
-                            </div>
-                            <div class='btnBar' id='btnBarSmp-{nid}' onmouseLeave='pinMouseLeave(this)' onmouseenter='pinMouseEnter(this)'>
-                                <div class='editLbl' onclick='edit({nid})'>Edit</div>
-                            </div>
-                            <div class='cardR' onmouseup='{mouseup}'  onmouseenter='cardMouseEnter(this, {nid}, "simple")' onmouseleave='cardMouseLeave(this, {nid}, "simple")'>{text}</div>
-                            <div style='position: absolute; bottom: 0px; right: 0px;'>{tags}</div>
-                            <div class='cardLeftBot' onclick='expandCard({nid}, this)'>&nbsp;INFO&nbsp;</div>
-                        </div>"""
-
-        self.noteTemplateUserNoteSimple = """<div class='cardWrapper' style="display: block;">
-                            <div class='topLeftWr'>
-                                <div class='rankingLbl'>{counter}<div class='rankingLblAddInfo'>{creation}</div><div class='editedStamp'>{edited}</div></div>
-                            </div>
-                            <div class='btnBar' id='btnBarSmp-{nid}' onmouseLeave='pinMouseLeave(this)' onmouseenter='pinMouseEnter(this)'>
-                                <div class='editLbl' onclick='pycmd("siac-edit-user-note {nid}")'>Edit</div>
-                            </div>
-                            <div class='cardR' onmouseup='{mouseup}'  onmouseenter='cardMouseEnter(this, {nid}, "simple")' onmouseleave='cardMouseLeave(this, {nid}, "simple")'>{text}</div>
-                            <div style='position: absolute; bottom: 0px; right: 0px;'>{tags}</div>
-                            <div class='cardLeftBot' style='display: none' onclick=''></div>
-                        </div>"""
-
-        self.noteTemplateUserNote = """<div class='cardWrapper siac-user-note {pdf_class} {grid_class}' id='nWr-{counter}'>
-                            <div class='topLeftWr'>
-                                <div id='cW-{nid}' class='rankingLbl'>{counter} &nbsp;SIAC<div class='rankingLblAddInfo'>{creation}</div><div class='editedStamp'>{edited}</div></div>
-                            </div>
-                            <div id='btnBar-{nid}' class='btnBar' onmouseLeave='pinMouseLeave(this)' onmouseenter='pinMouseEnter(this)'>
-                                <div class='deleteLbl' onclick='pycmd("siac-delete-user-note-modal {nid}"); '><div class='siac-trash-icn'></div></div>
-                                <div class='editLbl' onclick='pycmd("siac-edit-user-note {nid}")'>Edit</div>
-                                <div class='srchLbl' onclick='searchCard(this)'><div class='siac-search-icn'></div></div>
-                                <div id='pin-{nid}' class='pinLbl unselected' onclick='pinCard(this, {nid})'><span>&#128204;</span></div>
-                                <div class='floatLbl' onclick='addFloatingNote({nid})'>&#10063;</div>
-                                <div id='rem-{nid}' class='remLbl' onclick='removeNote({nid})'><span>&times;</span></div>
-                            </div>
-                            <div class='cardR siac-user-note' onmouseup='{mouseup}' onmouseenter='cardMouseEnter(this, {nid})' onmouseleave='cardMouseLeave(this, {nid})' id='{nid}' data-nid='{nid}'>{text}</div>
-                            <div id='tags-{nid}'  style='position: absolute; bottom: 0px; right: 0px;'>{tags}</div>
-                            <div class='cardLeftBot' onclick='pycmd("siac-read-user-note {nid}")'><div class='siac-read-icn'></div>{progress}</div>
-                        </div>"""
+        self.previous_calls         = []
 
 
     def set_editor(self, editor):
@@ -152,7 +92,8 @@ def set_editor(self, editor):
             All included children should have a ref to the instance too.
         """
         self._editor = editor
-        self.reading_modal.editor = editor
+        self.reading_modal.set_editor(editor)
+        self.sidebar.set_editor(editor)
 
     def show_page(self, editor, page):
         """
@@ -171,56 +112,59 @@ def print_search_results(self, notes, stamp, editor=None, logging=False, printTi
         This is the html that gets rendered in the search results div.
         This will always print the first page.
         """
+
         if logging:
             log("Entering print_search_results")
             log("Length (searchResults): " + str(len(notes)))
+
         if stamp is not None:
             if stamp != self.latest:
                 return
-        if not is_cached and not len(notes) == 0:
+
+        if not is_cached and len(notes) > 0:
             self.previous_calls.append([notes, None, editor, logging, printTimingInfo, page, query_set, is_queue])
             if len(self.previous_calls) > 11:
                 self.previous_calls.pop(0)
 
-        html = ""
-        allText = ""
-        tags = []
-        epochTime = int(time.time() * 1000)
-        timeDiffString = ""
-        newNote = ""
-        lastNote = ""
-        self.last_had_timing_info = printTimingInfo
+        html                        = ""
+        allText                     = ""
+        tags                        = []
+        epochTime                   = int(time.time() * 1000)
+        timeDiffString              = ""
+        newNote                     = ""
+        lastNote                    = ""
+        ret = 0
+        self.last_had_timing_info   = printTimingInfo
 
         if notes is not None and len(notes) > 0:
-            self.lastResults = notes
-            self.last_query_set = query_set
+            self.lastResults        = notes
+            self.last_query_set     = query_set
 
-        searchResults = notes[(page- 1) * 50: page * 50]
-        nids = [r.id for r in searchResults]
+        searchResults               = notes[(page- 1) * 50: page * 50]
+        nids                        = [r.id for r in searchResults]
 
         if self.showRetentionScores:
-            retsByNid = getRetentions(nids)
-        ret = 0
+            retsByNid               = getRetentions(nids)
 
         # various time stamps to collect information about rendering performance
-        start = time.time()
-        highlight_start = None
-        build_user_note_start = None
+        start                       = time.time()
+        highlight_start             = None
+        build_user_note_start       = None
 
-        highlight_total = 0.0
-        build_user_note_total = 0.0
+        highlight_total             = 0.0
+        build_user_note_total       = 0.0
 
-        remaining_to_highlight = {}
-        highlight_boundary = 15 if self.gridView else 10
+        remaining_to_highlight      = {}
+        highlight_boundary          = 15 if self.gridView else 10
 
         # for better performance, collect all notes that are .pdfs, and
         # query their reading progress after they have been rendered
-        pdfs = []
+        pdfs                        = []
 
-        check_for_suspended = []
+        check_for_suspended         = []
 
         for counter, res in enumerate(searchResults):
-            nid = res.id
+            nid     = res.id
             counter += (page - 1)* 50
             try:
                 timeDiffString = self._getTimeDifferenceString(nid, epochTime)
@@ -243,42 +187,42 @@ def print_search_results(self, notes, stamp, editor=None, logging=False, printTi
             #non-anki notes should be displayed differently, we distinguish between title, text and source here
             #confusing: 'source' on notes from the index means the original note content (without stopwords removed etc.),
             #on SiacNotes, it means the source field.
-            build_user_note_start = time.time()
-            text = res.get_content()
-            progress = ""
-            pdf_class = ""
+            build_user_note_start   = time.time()
+            text                    = res.get_content()
+            progress                = ""
+            pdf_class               = ""
             if res.note_type == "user" and res.is_pdf():
                 pdfs.append(nid)
-                p_html = "<div class='siac-prog-sq'></div>" * 10
-                progress = f"<div id='ptmp-{nid}' class='siac-prog-tmp'>{p_html} <span>&nbsp;0 / ?</span></div>"
-                pdf_class = "pdf"
+                p_html              = "<div class='siac-prog-sq'></div>" * 10
+                progress            = f"<div id='ptmp-{nid}' class='siac-prog-tmp'>{p_html} <span>&nbsp;0 / ?</span></div>"
+                pdf_class           = "pdf"
             elif res.note_type == "index" and res.did > 0:
                 check_for_suspended.append(res.id)
 
-            build_user_note_total += time.time() - build_user_note_start
+            build_user_note_total   += time.time() - build_user_note_start
 
             # hide fields that should not be shown
             if str(res.mid) in self.fields_to_hide_in_results:
-                text = "\u001f".join([spl for i, spl in enumerate(text.split("\u001f")) if i not in self.fields_to_hide_in_results[str(res.mid)]])
+                text                = "\u001f".join([spl for i, spl in enumerate(text.split("\u001f")) if i not in self.fields_to_hide_in_results[str(res.mid)]])
 
             #remove double fields separators
-            text = self._cleanFieldSeparators(text).replace("\\", "\\\\")
+            text                    = utility.text.cleanFieldSeparators(text).replace("\\", "\\\\")
 
             #try to remove image occlusion fields
-            text = self.try_hide_image_occlusion(text)
+            text                    = utility.text.try_hide_image_occlusion(text)
 
             #try to put fields that consist of a single image in their own line
-            text = self.IMG_FLD.sub("|</span><br/>\\1<br/>\\2", text)
+            text                    = utility.text.newline_before_images(text)
 
             #remove <div> tags if set in config
             if self.remove_divs and res.note_type != "user":
-                text = utility.text.remove_divs(text, " ")
+                text                = utility.text.remove_divs(text, " ")
 
             #highlight
-            highlight_start = time.time()
+            highlight_start         = time.time()
             if query_set is not None:
                 if counter - (page -1) * 50 < highlight_boundary:
-                    text = self._mark_highlights(text, query_set)
+                    text            = utility.text.mark_highlights(text, query_set)
                 else:
                     remaining_to_highlight[nid] = ""
             highlight_total += time.time() - highlight_start
@@ -303,7 +247,7 @@ def print_search_results(self, notes, stamp, editor=None, logging=False, printTi
 
             # use either the template for addon's notes or the normal
             if res.note_type == "user":
-                newNote = self.noteTemplateUserNote.format(
+                newNote = noteTemplateUserNote.format(
                     grid_class=gridclass, 
                     counter=counter+1, 
                     nid=nid, 
@@ -311,13 +255,13 @@ def print_search_results(self, notes, stamp, editor=None, logging=False, printTi
                     edited="" if str(nid) not in self.edited else "&nbsp;&#128336; " + self._buildEditedInfo(self.edited[str(nid)]),
                     mouseup= "getSelectionText()" if not is_queue else "",
                     text=text, 
-                    tags=self.build_tag_string(res.tags),
+                    tags=utility.tags.build_tag_string(res.tags, self.gridView),
                     queue=": Q-%s&nbsp;" % (res.position + 1) if res.is_in_queue() else "",
                     progress=progress,
                     pdf_class=pdf_class,
                     ret=retInfo)
             else:
-                newNote = self.noteTemplate.format(
+                newNote = noteTemplate.format(
                     grid_class=gridclass, 
                     counter=counter+1, 
                     nid=nid, 
@@ -325,7 +269,7 @@ def print_search_results(self, notes, stamp, editor=None, logging=False, printTi
                     edited="" if str(nid) not in self.edited else "&nbsp;&#128336; " + self._buildEditedInfo(self.edited[str(nid)]),
                     mouseup= "getSelectionText()" if not is_queue else "",
                     text=text, 
-                    tags=self.build_tag_string(res.tags), 
+                    tags=utility.tags.build_tag_string(res.tags, self.gridView), 
                     ret=retInfo)
          
             html = f"{html}{newNote}"
@@ -352,7 +296,7 @@ def print_search_results(self, notes, stamp, editor=None, logging=False, printTi
 
         if not self.hideSidebar:
             infoMap = {
-                "Took" :  "<b>%s</b> ms %s" % (took, "&nbsp;<b style='cursor: pointer' onclick='pycmd(`lastTiming`)'>&#9432;</b>" if printTimingInfo else ""),
+                "Took" :  "<b>%s</b> ms %s" % (took, "&nbsp;<b style='cursor: pointer' onclick='pycmd(`siac-last-timing`)'>&#9432;</b>" if printTimingInfo else ""),
                 "Found" :  "<b>%s</b> notes" % (len(notes) if len(notes) > 0 else "<span style='color: red;'>0</span>")
             }
             info = self.build_info_table(infoMap, tags, allText)
@@ -366,7 +310,7 @@ def print_search_results(self, notes, stamp, editor=None, logging=False, printTi
         if len(remaining_to_highlight) > 0:
             cmd = ""
             for nid,text in remaining_to_highlight.items():
-                cmd = ''.join((cmd, "document.getElementById('%s').innerHTML = `%s`;" % (nid, self._mark_highlights(text, query_set))))
+                cmd = ''.join((cmd, "document.getElementById('%s').innerHTML = `%s`;" % (nid, utility.text.mark_highlights(text, query_set))))
             self._js(cmd, editor)
         
         if len(check_for_suspended) > 0:
@@ -411,51 +355,15 @@ def js_with_cb(self, js, cb):
         self._editor.web.evalWithCallback(js, cb)
 
     def _js(self, js, editor):
-        """
-            Try to eval the given js, prefer if editor ref is given (through cmd parsing).
-        """
+        """ Try to eval the given js, prefer if editor ref is given (through cmd parsing). """
         if editor is None or editor.web is None:
             if self._editor is not None and self._editor.web is not None:
                 self._editor.web.eval(js)
         else:
             editor.web.eval(js)
 
-    def build_tag_string(self, tags, hover = True, maxLength = -1, maxCount = -1):
-        """
-        Builds the html for the tags that are displayed at the bottom right of each rendered search result.
-        """
-        html = ""
-        tags_split = tags.split()
-        tm = self.getTagMap(tags_split)
-        totalLength = sum([len(k) for k,v in tm.items()])
-        if maxLength == -1:
-            maxLength = 40 if not self.gridView else 30
-        if maxCount == -1:
-            maxCount = 3 if not self.gridView else 2
-        if len(tm) <= maxCount or totalLength < maxLength:
-            hover = "onmouseenter='tagMouseEnter(this)' onmouseleave='tagMouseLeave(this)'" if hover else ""
-            for t, s in tm.items():
-                stamp = "siac-tg-" + utility.text.get_stamp()
-                if len(s) > 0:
-                    tagData = " ".join(self.iterateTagmap({t : s}, ""))
-                    if len(s) == 1 and tagData.count("::") < 2 and not t in tags_split:
-                        html = f"{html}<div class='tagLbl' data-stamp='{stamp}' data-tags='{tagData}' data-name='{tagData.split(' ')[1]}' {hover} onclick='tagClick(this);'>{utility.text.trim_if_longer_than(tagData.split(' ')[1], maxLength)}</div>"
-                    else:
-                        html = f"{html}<div class='tagLbl' data-stamp='{stamp}' data-tags='{tagData}' data-name='{tagData}' {hover} onclick='tagClick(this);'>{utility.text.trim_if_longer_than(t, maxLength)} (+{len(s)})</div>" 
-                else:
-                    html = f"{html}<div class='tagLbl' data-stamp='{stamp}' {hover} data-name='{t}' onclick='tagClick(this);'>{utility.text.trim_if_longer_than(t, maxLength)}</div>"
-        else:
-            stamp = "siac-tg-" + utility.text.get_stamp()
-            tagData = " ".join(self.iterateTagmap(tm, ""))
-            html = f"{html}<div class='tagLbl' data-stamp='{stamp}' data-tags='{tagData}' data-name='{tagData}' onclick='tagClick(this);'>{len(tm)} tags ...</div>" 
-
-        return html
-
-
     def sortByDate(self, mode):
-        """
-            Rerenders the last search results, but sorted by creation date.
-        """
+        """ Rerenders the last search results, but sorted by creation date. """
         if self.lastResults is None:
             return
         stamp = utility.misc.get_milisec_stamp()
@@ -499,7 +407,7 @@ def removeUnreviewed(self):
         for r in self.lastResults:
             nids.append(str(r.id))
         nidStr =  "(%s)" % ",".join(nids)
-        unreviewed = [r[0] for r in mw.col.db.execute("select nid from cards where nid in %s and reps = 0" % nidStr).fetchall()]
+        unreviewed = [r[0] for r in mw.col.db.all("select nid from cards where nid in %s and reps = 0" % nidStr)]
         for r in self.lastResults:
             if int(r.id) not in unreviewed:
                 filtered.append(r)
@@ -508,17 +416,21 @@ def removeUnreviewed(self):
     def removeReviewed(self):
         if self.lastResults is None:
             return
-        stamp = utility.misc.get_milisec_stamp()
+
+        stamp       = utility.misc.get_milisec_stamp()
         self.latest = stamp
-        filtered = []
-        nids = []
+        filtered    = []
+        nids        = []
+
         for r in self.lastResults:
             nids.append(str(r.id))
-        nidStr =  "(%s)" % ",".join(nids)
-        reviewed = [r[0] for r in mw.col.db.execute("select nid from cards where nid in %s and reps > 0" % nidStr).fetchall()]
+        nidStr      = "(%s)" % ",".join(nids)
+        reviewed    = [r[0] for r in mw.col.db.all("select nid from cards where nid in %s and reps > 0" % nidStr)]
+
         for r in self.lastResults:
             if int(r.id) not in reviewed:
                 filtered.append(r)
+
         self.print_search_results(filtered, stamp)
 
    
@@ -536,8 +448,8 @@ def _getTimeDifferenceString(self, nid, now):
         """
             Helper function that builds the string that is displayed when clicking on the result number of a note.
         """
-        diffInMinutes = (now - int(nid)) / 1000 / 60
-        diffInDays = diffInMinutes / 60 / 24
+        diffInMinutes   = (now - int(nid)) / 1000 / 60
+        diffInDays      = diffInMinutes / 60 / 24
 
         if diffInDays < 1:
             if diffInMinutes < 2:
@@ -555,16 +467,20 @@ def _getTimeDifferenceString(self, nid, now):
 
 
     def build_info_table(self, infoMap, tags, allText):
-        infoStr = "<table>"
+        """ Right hand side of the result pane, shows some information about the current results (tags, keywords, time taken). """
+
+        infoStr             = "<table>"
+
         for key, value in infoMap.items():
-            infoStr =f"{infoStr}<tr><td>{key}</td><td id='info-{key}'>{value}</td></tr>"
-        infoStr = f"{infoStr}</table><div class='searchInfoTagSep'><span class='tag-symbol'>&#9750;</span>&nbsp;Tags:</div><div id='tagContainer'>"
-        tagStr = ""
+            infoStr         = f"{infoStr}<tr><td>{key}</td><td id='info-{key}'>{value}</td></tr>"
+
+        infoStr             = f"{infoStr}</table><div class='searchInfoTagSep'><span class='tag-symbol'>&#9750;</span>&nbsp;Tags:</div><div id='tagContainer'>"
+        tagStr              = ""
         if len(tags) == 0:
-            infoStr += "No tags in the results."
+            infoStr         += "No tags in the results."
             infoMap["Tags"] = "No tags in the results."
         else:
-            for key, value in self.getTagMap(tags).items():
+            for key, value in utility.tags.to_tag_hierarchy(tags).items():
                 stamp = f"siac-tg-{utility.text.get_stamp()}"
                 if len(value)  == 0:
                     tagStr = f"{tagStr}<span class='tagLbl' data-stamp='{stamp}' data-name='{key}' onclick='tagClick(this);' onmouseenter='tagMouseEnter(this)' onmouseleave='tagMouseLeave(this)'>{utility.text.trim_if_longer_than(key, 19)}</span>"
@@ -578,63 +494,57 @@ def build_info_table(self, infoMap, tags, allText):
             infoStr += tagStr
             infoMap["Tags"] = tagStr
 
-        infoStr = f"{infoStr}</div><div class='searchInfoTagSep bottom' >Keywords:</div><div id='keywordContainer'>"
-        mostCommonWords = self._most_common_words(allText)
-        infoStr = f"{infoStr}{mostCommonWords}</div>"
+        infoStr             = f"{infoStr}</div><div class='searchInfoTagSep bottom' >Keywords:</div><div id='keywordContainer'>"
+        mostCommonWords     = self._most_common_words(allText)
+        infoStr             = f"{infoStr}{mostCommonWords}</div>"
         infoMap["Keywords"] = mostCommonWords
+
         return (infoStr, infoMap)
     
 
-    def _cleanFieldSeparators(self, text):
-        text = self.SEP_RE.sub("\u001f", text)
-        if text.endswith("\u001f"):
-            text = text[:-1]
-        text = text.replace("\u001f", "<span class='fldSep'>|</span>")
-        return text
-
-    def try_hide_image_occlusion(self, text):
-        """
-        Image occlusion cards take up too much space, so we try to hide all images except for the first.
-        """
-        if not text.count("<img ") > 1:
-            return text
-        text = self.IO_REPLACE.sub("(IO - image hidden)", text)
-        return text
-
 
     def _most_common_words(self, text):
-        """
-        Returns the html that is displayed in the right sidebar containing the clickable keywords.
-        """
+        """ Returns the html that is displayed in the right sidebar containing the clickable keywords. """
+
         if text is None or len(text) == 0:
             return "No keywords for empty result."
-        text = utility.text.clean(text, self.stopwords)
-        counts = {}
+
+        text            = utility.text.clean(text, self.stopwords)
+        counts          = {}
         for token in text.split():
-            if token == "" or len(token) == 1 or self.SOUND_TAG.match(token):
+            if token == "" or len(token) == 1 or self.EXCLUDE_KEYWORDS.match(token):
                 continue
             if token.lower() in counts:
                 counts[token.lower()][1] += 1
             else:
                 counts[token.lower()] = [token, 1]
-        sortedCounts = sorted(counts.items(), key=lambda kv: kv[1][1], reverse=True)
-        html = ""
+
+        sortedCounts    = sorted(counts.items(), key=lambda kv: kv[1][1], reverse=True)
+        html            = ""
+
         for entry in sortedCounts[:15]:
-            html = "%s<a class='keyword' href='#' onclick='event.preventDefault(); searchFor($(this).text())'>%s</a>, " % (html, entry[1][0])
+            k       = utility.text.trim_if_longer_than(entry[1][0], 25)
+            kd      = entry[1][0].replace("'", "")
+            html    = f"{html}<a class='keyword' href='#' data-keyword='{kd}' onclick='event.preventDefault(); searchFor($(this).data(\"keyword\"));'>{k}</a>, "
+
         if len(html) == 0:
             return "No keywords for empty result."
+
         return html[:-2]
 
     def get_result_html_simple(self, db_list, tag_hover = True, search_on_selection = True):
-        html = ""
-        epochTime = int(time.time() * 1000)
-        timeDiffString = ""
-        newNote = ""
-        lastNote = ""
-        nids = [r.id for r in db_list]
+
+        html            = ""
+        epochTime       = int(time.time() * 1000)
+        timeDiffString  = ""
+        newNote         = ""
+        lastNote        = ""
+        ret             = 0
+        nids            = [r.id for r in db_list]
+
         if self.showRetentionScores:
-            retsByNid = getRetentions(nids)
-        ret = 0
+            retsByNid   = getRetentions(nids)
+
         for counter, res in enumerate(db_list):
             try:
                 timeDiffString = self._getTimeDifferenceString(res[3], epochTime)
@@ -663,25 +573,27 @@ def get_result_html_simple(self, db_list, tag_hover = True, search_on_selection
             if self.remove_divs and res.note_type != "user":
                 text = utility.text.remove_divs(text)
 
-            text = self._cleanFieldSeparators(text).replace("\\", "\\\\").replace("`", "\\`").replace("$", "&#36;")
-            text = self.try_hide_image_occlusion(text)
+            text        = utility.text.cleanFieldSeparators(text).replace("\\", "\\\\").replace("`", "\\`").replace("$", "&#36;")
+            text        = utility.text.try_hide_image_occlusion(text)
             #try to put fields that consist of a single image in their own line
-            text = self.IMG_FLD.sub("|</span><br/>\\1<br/>\\2", text)
-            template = self.noteTemplateSimple if res.note_type == "index" else self.noteTemplateUserNoteSimple
-            newNote = template.format(
+            text        = utility.text.newline_before_images(text)
+            template    = noteTemplateSimple if res.note_type == "index" else noteTemplateUserNoteSimple
+            newNote     = template.format(
                 counter=counter+1, 
                 nid=res.id, 
                 edited="" if str(res.id) not in self.edited else "&nbsp;&#128336; " + self._buildEditedInfo(self.edited[str(res.id)]),
                 mouseup="getSelectionText()" if search_on_selection else "",
                 text=text, 
                 ret=retInfo,
-                tags=self.build_tag_string(res.tags, tag_hover, maxLength = 25, maxCount = 2),
+                tags=utility.tags.build_tag_string(res.tags, tag_hover, maxLength = 25, maxCount = 2),
                 creation="&nbsp;&#128336; " + timeDiffString)
-            html += newNote
+            html        += newNote
+
         return html
 
 
     def print_timeline_info(self, context_html, db_list):
+
         html = self.get_result_html_simple(db_list, tag_hover= False)
 
         if len(html) == 0:
@@ -689,8 +601,9 @@ def print_timeline_info(self, context_html, db_list):
         else:
             html = """
                 %s
-                <div id='cal-info-notes' style='overflow-y: auto; overflow-x: hidden; height: 190px; margin: 10px 0 5px 0; padding-left: 4px; padding-right: 8px;'>%s</div>
+                <div id='cal-jinfo-notes' style='overflow-y: auto; overflow-x: hidden; height: 190px; margin: 10px 0 5px 0; padding-left: 4px; padding-right: 8px;'>%s</div>
             """ % (context_html, html)
+
         self._editor.web.eval("document.getElementById('cal-info').innerHTML = `%s`;" % html)
 
 
@@ -724,13 +637,13 @@ def _loadPlotJsIfNotLoaded(self):
 
     def show_search_modal(self, on_enter_attr, header):
         self._editor.web.eval("""
-        document.getElementById('siac-search-modal').style.display = 'block';
-        document.getElementById('siac-search-modal-header').innerHTML = `%s`;
-        document.getElementById('siac-search-modal-inp').setAttribute('onkeyup', '%s');
-        document.getElementById('siac-search-modal-inp').focus();
+            document.getElementById('siac-search-modal').style.display = 'block';
+            document.getElementById('siac-search-modal-header').innerHTML = `%s`;
+            document.getElementById('siac-search-modal-inp').setAttribute('onkeyup', '%s');
+            document.getElementById('siac-search-modal-inp').focus();
         """ % (header,on_enter_attr))
 
-    def showStats(self, text, reviewPlotData, ivlPlotData, timePlotData):
+    def show_stats(self, text, reviewPlotData, ivlPlotData, timePlotData):
 
         self._loadPlotJsIfNotLoaded()
 
@@ -838,8 +751,8 @@ def printTagHierarchy(self, tags):
         self.js(cmd)
 
     def buildTagHierarchy(self, tags):
-        tmap = self.getTagMap(tags)
-        config = mw.addonManager.getConfig(__name__)
+        tmap    = utility.tags.to_tag_hierarchy(tags)
+        config  = mw.addonManager.getConfig(__name__)
         def iterateMap(tmap, prefix, start=False):
             if start:
                 html = "<ul class='tag-list outer'>"
@@ -885,18 +798,19 @@ def updateSingle(self, note):
         """
         if self._editor is None or self._editor.web is None:
             return
-        tags = note[2]
-        tagStr =  self.build_tag_string(tags)
-        nid = note[0]
-        text = note[1]
+
+        tags    = note[2]
+        tagStr  = utility.tags.build_tag_string(tags, self.gridView)
+        nid     = note[0]
+        text    = note[1]
 
         # hide fields that should not be shown
         if len(note) > 4 and str(note[4]) in self.fields_to_hide_in_results:
             text = "\u001f".join([spl for i, spl in enumerate(text.split("\u001f")) if i not in self.fields_to_hide_in_results[str(note[4])]])
 
-        text = self._cleanFieldSeparators(text).replace("\\", "\\\\").replace("`", "\\`").replace("$", "&#36;")
-        text = self.try_hide_image_occlusion(text)
-        text = self.IMG_FLD.sub("|</span><br/>\\1<br/>\\2", text)
+        text    = utility.text.cleanFieldSeparators(text).replace("\\", "\\\\").replace("`", "\\`").replace("$", "&#36;")
+        text    = utility.text.try_hide_image_occlusion(text)
+        text    = utility.text.newline_before_images(text)
 
         #find rendered note and replace text and tags
         self._editor.web.eval("""
@@ -912,57 +826,6 @@ def updateSingle(self, note):
             }} 
         """)
         
-
-    def _mark_highlights(self, text, querySet):
-
-        currentWord = ""
-        currentWordNormalized = ""
-        textMarked = ""
-        lastIsMarked = False
-        # c = 0
-        for char in text:
-            # c += 1
-            if self.wordToken.match(char):
-                currentWordNormalized = ''.join((currentWordNormalized, utility.text.ascii_fold_char(char).lower()))
-                # currentWordNormalized = ''.join((currentWordNormalized, char.lower()))
-                if utility.text.is_chinese_char(char) and str(char) in querySet:
-                    currentWord = ''.join((currentWord, "<MARK>%s</MARK>" % char))
-                else:
-                    currentWord = ''.join((currentWord, char))
-
-            else:
-                #we have reached a word boundary
-                #check if word is empty
-                if currentWord == "":
-                    textMarked = ''.join((textMarked, char))
-                else:
-                    #if the word before the word boundary is in the query, we want to highlight it
-                    if currentWordNormalized in querySet:
-                        #we check if the word before has been marked too, if so, we want to enclose both, the current word and
-                        # the word before in the same <mark></mark> tag (looks better)
-                        if lastIsMarked and not "\u001f" in textMarked[textMarked.rfind("<MARK>"):]:
-                        # if lastIsMarked:
-                            closing_index = textMarked.rfind("</MARK>")
-                            textMarked = ''.join((textMarked[0: closing_index], textMarked[closing_index + 7 :]))
-                            textMarked = ''.join((textMarked, currentWord, "</MARK>", char))
-                        else:
-                            textMarked = ''.join((textMarked, "<MARK>", currentWord, "</MARK>", char))
-                            # c += 13
-                        lastIsMarked = True
-                    #if the word is not in the query, we simply append it unhighlighted
-                    else:
-                        textMarked = ''.join((textMarked, currentWord, char))
-                        lastIsMarked = False
-                    currentWord = ""
-                    currentWordNormalized = ""
-        if currentWord != "":
-            if currentWord != "MARK" and currentWordNormalized in querySet:
-                textMarked = ''.join((textMarked, "<MARK>", currentWord, "</MARK>"))
-            else:
-                textMarked = ''.join((textMarked, currentWord))
-
-        return textMarked
-
     def show_tooltip(self, text):
         if mw.addonManager.getConfig(__name__)["hideSidebar"]:
             tooltip("Query was empty after cleaning.")
@@ -980,9 +843,9 @@ def print_pdf_search_results(self, results, stamp, query_set):
                 }
         """
         if results is not None and len(results) > 0:
-            limit = get_config_value_or_default("pdfTooltipResultLimit", 50)
-            html = self.get_result_html_simple(results[:limit], False, False)
-            qhtml = """
+            limit   = get_config_value_or_default("pdfTooltipResultLimit", 50)
+            html    = self.get_result_html_simple(results[:limit], False, False)
+            qhtml   = """
                 <div id='siac-tooltip-center' onclick='centerTooltip();'></div>
                 <div class='siac-search-icn-dark' id='siac-tt-web-btn' onclick='pycmd("siac-show-web-search-tooltip " + $("#siac-pdf-tooltip").data("selection"));'></div>
                     <span id='siac-cloze-btn' onclick='sendClozes();'>Generate Clozes</span>
diff --git a/src/reading_modal.py b/src/reading_modal.py
deleted file mode 100644
index 66a9e8de..00000000
--- a/src/reading_modal.py
+++ /dev/null
@@ -1,534 +0,0 @@
-# anki-search-inside-add-card
-# Copyright (C) 2019 - 2020 Tom Z.
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-import platform
-import os
-import json
-import re
-import datetime
-import time
-import sys
-from aqt import mw
-from aqt.utils import showInfo
-
-import utility.tags
-import utility.text
-import utility.misc
-
-try:
-    from .tag_find import get_most_active_tags
-    from .state import get_index, check_index, set_deck_map
-    from .notes import get_note, _get_priority_list, get_all_tags, get_read_pages, get_pdf_marks, insert_pages_total, get_read_today_count, mark_range_as_read
-    from .web.html import *
-    from .internals import js, requires_index_loaded, perf_time
-    from .config import get_config_value_or_default
-    from .web_import import import_webpage
-except:
-    from tag_find import get_most_active_tags
-    from state import get_index, check_index, set_deck_map
-    from notes import get_note, _get_priority_list, get_all_tags, get_read_pages, get_pdf_marks, insert_pages_total, get_read_today_count
-    from web.html import *
-    from internals import js, requires_index_loaded, perf_time
-    from config import get_config_value_or_default
-    from web_import import import_webpage
-
-class ReadingModal:
-
-    def __init__(self):
-        self.note_id = None
-        self.note = None
-        self.editor = None
-
-    def reset(self):
-        self.note_id = None
-        self.note = None
-
-    @requires_index_loaded
-    def display(self, note_id):
-
-        index = get_index()
-        note = get_note(note_id)
-
-        self.note_id = note_id
-        self.note = note
-
-        html = get_reading_modal_html(note)
-        index.ui.show_in_large_modal(html)
-        # if source is a pdf file path, try to display it
-        if note.is_pdf():
-            if utility.misc.file_exists(note.source):
-                self._display_pdf(note.source.strip(), note_id)
-            else:
-                message = "Could not load the given PDF.<br>Are you sure the path is correct?"
-                self.notification(message)
-
-    @js
-    def show_width_picker(self):
-        html = """
-            <div class='w-100 siac-orange-hover' onclick='pycmd("siac-left-side-width 10")'><b>10 - 90</b></div>
-            <div class='w-100 siac-orange-hover' onclick='pycmd("siac-left-side-width 15")'><b>15 - 85</b></div>
-            <div class='w-100 siac-orange-hover' onclick='pycmd("siac-left-side-width 25")'><b>25 - 75</b></div>
-            <div class='w-100 siac-orange-hover' onclick='pycmd("siac-left-side-width 33")'><b>33 - 67</b></div>
-            <div class='w-100 siac-orange-hover' onclick='pycmd("siac-left-side-width 40")'><b>40 - 60</b></div>
-            <div class='w-100 siac-orange-hover' onclick='pycmd("siac-left-side-width 50")'><b>50 - 50</b></div>
-            <div class='w-100 siac-orange-hover' onclick='pycmd("siac-left-side-width 60")'><b>60 - 40</b></div>
-            <div class='w-100 siac-orange-hover' onclick='pycmd("siac-left-side-width 67")'><b>67 - 33</b></div>
-        """
-
-        modal = """
-            <div class="siac-modal-small dark" contenteditable="false" style="text-align:center; color: lightgrey;">
-                <b>Fields - Add-on</b>
-                    <br><br>
-                <div style="max-height: 200px; overflow-y: auto; overflow-x: hidden;">%s</div>
-                    <br><br>
-                <div class="siac-btn siac-btn-dark" onclick="$(this.parentNode).remove();">Close</div>
-            </div> 
-        """ % html
-        return "$('#siac-reading-modal-center').append(`%s`)" % modal
-
-    @js
-    def display_read_range_input(self, note_id, num_pages):
-        on_confirm= """ if (document.getElementById('siac-range-input-min').value && document.getElementById('siac-range-input-max').value) {
-        pycmd('siac-user-note-mark-range %s ' + document.getElementById('siac-range-input-min').value 
-                + ' ' + document.getElementById('siac-range-input-max').value 
-                + ' ' + pdfDisplayed.numPages
-                + ' ' + pdfDisplayedCurrentPage);
-        }
-        """ % note_id
-        modal = f""" <div class="siac-modal-small dark" contenteditable="false" style="text-align:center; color: lightgrey;">
-                            Input a range of pages to mark as read (end incl.)<br><br>
-                            <input id='siac-range-input-min' style='width: 60px; background: #222; color: lightgrey; border-radius: 4px;' type='number' min='1' max='{num_pages}'/> &nbsp;-&nbsp; <input id='siac-range-input-max' style='width: 60px;background: #222; color: lightgrey; border-radius: 4px;' type='number' min='1' max='{num_pages}'/>
-                            <br/> <br/>
-                            <div class="siac-btn siac-btn-dark" onclick="{on_confirm} $(this.parentNode).remove();">&nbsp; Ok &nbsp;</div>
-                            &nbsp;
-                            <div class="siac-btn siac-btn-dark" onclick="$(this.parentNode).remove();">Cancel</div>
-                        </div> """
-        return "$('#siac-pdf-tooltip').hide();$('.siac-modal-small').remove(); $('#siac-reading-modal-center').append('%s');" % modal.replace("\n", "").replace("'", "\\'")
-
-
-    @js
-    def reload_bottom_bar(self, note_id=None):
-        """
-            Called after queue picker dialog has been closed without opening a new note.
-        """
-        if note_id is not None:
-
-            note = get_note(note_id)
-            html = get_reading_modal_bottom_bar(note)
-            html = html.replace("`", "\\`")
-            return "$('#siac-reading-modal-bottom-bar').replaceWith(`%s`); updatePdfDisplayedMarks();" % html
-        
-        else:
-            return """if (document.getElementById('siac-reading-modal').style.display !== 'none' && document.getElementById('siac-reading-modal-top-bar')) { 
-                        pycmd('siac-reload-reading-modal-bottom '+ $('#siac-reading-modal-top-bar').data('nid')); 
-                    }"""
-    
-
-    def _display_pdf(self, full_path, note_id):
-        base64pdf = utility.misc.pdf_to_base64(full_path)
-        blen = len(base64pdf)
-
-        #pages read are stored in js array [int]
-        pages_read = get_read_pages(note_id)        
-        pages_read_js = "" if len(pages_read) == 0 else ",".join([str(p) for p in pages_read])
-        
-        #marks are stored in two js maps, one with pages as keys, one with mark types (ints) as keys
-        marks = get_pdf_marks(note_id)
-        js_maps = utility.misc.marks_to_js_map(marks)
-        marks_js = "pdfDisplayedMarks = %s; pdfDisplayedMarksTable = %s;" % (js_maps[0], js_maps[1]) 
-        
-        # pages read are ordered by date, so take last
-        last_page_read = pages_read[-1] if len(pages_read) > 0 else 1
-
-        addon_id = utility.misc.get_addon_id()
-        port = mw.mediaServer.getPort()
-
-        init_code = """
-            pdfLoading = true;
-            var bstr = atob(b64);
-            var n = bstr.length;
-            var arr = new Uint8Array(n);
-            while(n--){ 
-                arr[n] = bstr.charCodeAt(n);
-            }
-            var file = new File([arr], "placeholder.pdf", {type : "application/pdf" });
-            var fileReader = new FileReader();
-            pagesRead = [%s];
-            %s
-            var loadFn = function(retry) {
-                if (retry > 4) {
-                    $('#siac-pdf-loader-wrapper').remove();
-                    document.getElementById('siac-pdf-top').style.overflowY = 'auto';
-                    $('#siac-timer-popup').html(`<br><center>PDF.js could not be loaded from CDN.</center><br>`).show();
-                    pdfDisplayed = null;
-                    ungreyoutBottom();
-                    fileReader = null;
-                    pdfLoading = false;
-                    noteLoading = false;
-                    return;
-                }
-                if (typeof(pdfjsLib) === 'undefined') {
-                    window.setTimeout(() => { loadFn(retry + 1);}, 800);
-                    document.getElementById('siac-loader-text').innerHTML = `PDF.js was not loaded. Retrying (${retry+1} / 5)`;
-                    return;
-                }
-                if (!pdfjsLib.GlobalWorkerOptions.workerSrc) {
-                    pdfjsLib.GlobalWorkerOptions.workerSrc = 'http://127.0.0.1:%s/_addons/%s/web/pdfjs/pdf.worker.min.js';
-                }
-                var canvas = document.getElementById("siac-pdf-canvas");
-                var typedarray = new Uint8Array(fileReader.result);
-                var loadingTask = pdfjsLib.getDocument(typedarray, {nativeImageDecoderSupport: 'display'});
-                loadingTask.promise.catch(function(error) {
-                        $('#siac-pdf-loader-wrapper').remove();
-                        document.getElementById('siac-pdf-top').style.overflowY = 'auto';
-
-                        $('#siac-timer-popup').html(`<br><center>Could not load PDF - seems to be invalid.</center><br>`).show();
-                        pdfDisplayed = null;
-                        ungreyoutBottom();
-                        fileReader = null;
-                        pdfLoading = false;
-                        noteLoading = false;
-                });
-                loadingTask.promise.then(function(pdf) {
-                        pdfDisplayed = pdf;
-                        pdfDisplayedCurrentPage = %s;
-                        $('#siac-pdf-loader-wrapper').remove();
-                        document.getElementById('siac-pdf-top').style.overflowY = 'auto';
-
-                        if (pagesRead.length === pdf.numPages) {
-                            pdfDisplayedCurrentPage = 1;
-                            queueRenderPage(1, true, true, true);
-                        } else {
-                            queueRenderPage(pdfDisplayedCurrentPage, true, true, true);
-                        }
-                        updatePdfProgressBar();
-                        if (pagesRead.length === 0) { pycmd('siac-insert-pages-total %s ' + pdf.numPages); }
-                        fileReader = null;
-                });
-            };
-            fileReader.onload = (e) => { loadFn(0); };
-
-            fileReader.readAsArrayBuffer(file);
-            b64 = ""; arr = null; bstr = null; file = null;
-        """ % (pages_read_js, marks_js, port, addon_id, last_page_read, note_id)
-        #send large files in multiple packets
-        page = self.editor.web.page()
-        chunk_size = 10000000
-        if blen > chunk_size:
-            page.runJavaScript(f"var b64 = `{base64pdf[0: chunk_size]}`;")
-            sent = chunk_size
-            while sent < blen:
-                page.runJavaScript(f"b64 += `{base64pdf[sent: min(blen,sent + chunk_size)]}`;")
-                sent += min(blen - sent, chunk_size)
-            page.runJavaScript(init_code)
-        else:
-            page.runJavaScript("""
-                var b64 = `%s`;
-                    %s
-            """ % (base64pdf, init_code))
-
-
-
-    @js
-    def show_img_field_picker_modal(self, img_src):
-        """
-            Called after an image has been selected from a PDF, should display all fields that are currently in the editor,
-            let the user pick one, and on picking, insert the img into the field.
-        """
-        # if Image Occlusion add-on is there and enabled, add a button to directly open the IO dialog
-        io = ""
-        if hasattr(self.editor, 'onImgOccButton') and mw.addonManager.isEnabled("1374772155"):
-            io = f"<div class='siac-btn siac-btn-dark' style='margin-right: 9px;' onclick='pycmd(`siac-cutout-io {img_src}`); $(this.parentNode).remove();'>Image Occlusion</div>" 
-        modal = """ <div class="siac-modal-small dark" style="text-align:center;"><b>Append to:</b><br><br><div style="max-height: 200px; overflow-y: auto; overflow-x: hidden;">%s</div><br><br>%s<div class="siac-btn siac-btn-dark" onclick="$(this.parentNode).remove(); pycmd('siac-remove-snap-image %s')">Cancel</div></div> """
-        flds = ""
-        for i, f in enumerate(self.editor.note.model()['flds']):
-            # trigger note update
-            fld_update_js = "pycmd(`blur:%s:${currentNoteId}:${$(`.field:eq(%s)`).html()}`);" % (i,i)
-            flds += """<span class="siac-field-picker-opt" onclick="$(`.field`).get(%s).innerHTML += `<img src='%s'/>`; $(this.parentNode.parentNode).remove(); %s">%s</span><br>""" % (i, img_src, fld_update_js, f["name"])
-        modal = modal % (flds, io, img_src)
-        return "$('#siac-reading-modal-center').append('%s');" % modal.replace("'", "\\'")
-
-    @js
-    def show_cloze_field_picker_modal(self, cloze_text):
-        """
-        Shows a modal that lists all fields of the current note.
-        When a field is selected, the cloze text is appended to that field.
-        """
-        cloze_text = cloze_text.replace("`", "").replace("\n", "")
-        modal = """ <div class="siac-modal-small dark" style="text-align:center;">
-                        <b>Append to:</b><br><br>
-                        <div style="max-height: 200px; overflow-y: auto; overflow-x: hidden;">%s</div><br><br>
-                        <div class="siac-btn siac-btn-dark" onclick="$(this.parentNode).remove();">Cancel</div>
-                    </div> """
-        flds = ""
-        for i, f in enumerate(self.editor.note.model()['flds']):
-            flds += """<span class="siac-field-picker-opt" onclick="appendToField({0}, `{1}`);  $(this.parentNode.parentNode).remove();">{2}</span><br>""".format(i, cloze_text, f["name"])
-        modal = modal % (flds)
-        return "$('#siac-pdf-tooltip').hide(); $('#siac-reading-modal-center').append('%s');" % modal.replace("\n", "").replace("'", "\\'")
-
-    @js
-    def show_iframe_overlay(self, url=None):
-        js = """
-            if (pdfDisplayed) {
-                document.getElementById('siac-pdf-top').style.display = "none";
-            } else {
-                document.getElementById('siac-text-top-wr').style.display = "none";
-            }
-            document.getElementById('siac-iframe').style.display = "block";
-            document.getElementById('siac-close-iframe-btn').style.display = "block";
-            iframeIsDisplayed = true;
-        """
-        if url is not None:
-            js += """
-                document.getElementById('siac-iframe').src = `%s`;
-            """ % url
-        return js
-
-    @js
-    def hide_iframe_overlay(self):
-        js = """
-            document.getElementById('siac-iframe').src = "";
-            document.getElementById('siac-iframe').style.display = "none";
-            document.getElementById('siac-close-iframe-btn').style.display = "none";
-            if (pdfDisplayed) {
-                document.getElementById('siac-pdf-top').style.display = "block";
-            } else {
-                document.getElementById('siac-text-top-wr').style.display = "block";
-            }
-            iframeIsDisplayed = false;
-        """
-        return js
-
-    @js
-    def show_web_search_tooltip(self, inp):
-        inp = utility.text.remove_special_chars(inp)
-        inp = inp.strip()
-        if len(inp) == 0:
-            return
-        search_sources = ""
-        config = mw.addonManager.getConfig(__name__)
-        urls = config["searchUrls"]
-        if urls is not None and len(urls) > 0:
-            for url in urls:
-                if "[QUERY]" in url:
-                    name = os.path.dirname(url)
-                    search_sources += """<div class="siac-url-ch" onclick='pycmd("siac-url-srch $$$" + document.getElementById("siac-tt-ws-inp").value + "$$$%s"); $(this.parentNode.parentNode).remove();'>%s</div>""" % (url, name)
-
-        modal = """ <div class="siac-modal-small dark" style="text-align:center;">
-                        <input style="width: 100%%; border-radius: 3px; padding-left: 4px; box-sizing: border-box; background: #2f2f31; color: white; border-color: white;" id="siac-tt-ws-inp" value="%s"></input> 
-                        <br/>
-                        <div style="max-height: 200px; overflow-y: auto; overflow-x: hidden; cursor: pointer; margin-top: 15px;">%s</div><br><br>
-                        <div class="siac-btn siac-btn-dark" onclick="$(this.parentNode).remove();">Cancel</div>
-                    </div> """% (inp, search_sources)
-        
-        js = """
-        $('#siac-iframe-btn').removeClass('expanded'); 
-        $('#siac-pdf-tooltip').hide(); 
-        $('#siac-reading-modal-center').append('%s');
-        """ % modal.replace("\n", "").replace("'", "\\'")
-        return js
-
-    @js
-    def update_reading_bottom_bar(self, nid):
-        queue = _get_priority_list()
-        pos_lbl = ""
-        if queue is not None and len(queue) > 0:
-            try:
-                pos = next(i for i,v in enumerate(queue) if v.id == nid)
-            except:
-                pos = -1
-            pos_lbl = "Priority: " + get_priority_as_str(nid)
-            pos_lbl_btn = "In Queue" if pos >= 0 else "Unqueued"
-        else:
-            pos_lbl = "Unqueued"
-            pos_lbl_btn = "<b>Unqueued</b>"
-
-        qd = get_queue_head_display(nid, queue)
-        return """
-            document.getElementById('siac-queue-lbl').innerHTML = '%s';
-            $('#siac-queue-lbl').fadeIn('slow');
-            $('.siac-queue-sched-btn:first').html('%s');
-            $('#siac-queue-readings-list').replaceWith(`%s`);
-            """ % (pos_lbl, pos_lbl_btn, qd)
-
-    @js
-    def show_pdf_bottom_tab(self, note_id, tab):
-        tab_js = "$('.siac-clickable-anchor.tab').removeClass('active');"
-        if tab == "marks":
-            return f"""{tab_js}
-            $('.siac-clickable-anchor.tab').eq(0).addClass('active');
-            document.getElementById('siac-pdf-bottom-tab').innerHTML =`<div id='siac-marks-display' onclick='markClicked(event);'></div>`;
-            updatePdfDisplayedMarks()"""
-        if tab == "info":
-            html = get_note_info_html(note_id)
-            html = html.replace("`", "&#96;")
-            return f"""{tab_js}
-            $('.siac-clickable-anchor.tab').eq(2).addClass('active');
-            document.getElementById('siac-pdf-bottom-tab').innerHTML =`{html}`;"""
-        if tab == "related":
-            html = get_related_notes_html(note_id)
-            html = html.replace("`", "&#96;")
-            return f"""{tab_js}
-            $('.siac-clickable-anchor.tab').eq(1).addClass('active');
-            document.getElementById('siac-pdf-bottom-tab').innerHTML =`{html}`;"""
-
-
-    @js
-    def mark_range(self, start, end, pages_total, current_page):
-        if start <= 0:
-            start = 1
-        if end > pages_total:
-            end = pages_total
-        if end <= start or start >= pages_total:
-            return
-        mark_range_as_read(self.note_id, start, end, pages_total)
-        pages_read = get_read_pages(self.note_id)
-        js = "" if len(pages_read) == 0 else ",".join([str(p) for p in pages_read])
-        js = f"pagesRead = [{js}];"
-        if current_page >= start and current_page <= end:
-            js += "pdfShowPageReadMark();"
-        return f"{js}updatePdfProgressBar();"
-
-    @js
-    def display_cloze_modal(self, editor, selection, extracted):
-        s_html = "<table style='margin-top: 5px; font-size: 15px;'>"
-        sentences = [s for s in extracted if len(s) < 300 and len(s.strip()) > 0]
-        if len(sentences) == 0:
-            for s in extracted:
-                if len(s) >= 300:
-                    f = utility.text.try_find_sentence(s, selection)
-                    if f is not None and len(f) < 300:
-                        sentences.append(f)
-
-        if len(sentences) > 0 and sentences != [""]:
-            selection = re.sub("  +", " ", selection).strip()
-            for sentence in sentences:
-                sentence = re.sub("  +", " ", sentence).strip()
-                sentence = sentence.replace(selection, " <span style='color: lightblue;'>{{c1::%s}}</span> " % selection)
-
-                # needs cleaning
-                sentence = sentence.replace("  ", " ").replace("</span> ,", "</span>,")
-                sentence = re.sub(" ([\"“”\\[(]) <span", " \\1<span", sentence)
-                sentence = re.sub("</span> ([\"”\\]):])", "</span>\\1", sentence)
-                sentence = re.sub("</span> -([^ \\d])", "</span>-\\1", sentence)
-                sentence = re.sub("(\\S)- <span ", "\\1-<span ", sentence)
-                sentence = re.sub(r"([^\\d ])- ([^\d])", r"\1\2", sentence)
-                sentence = re.sub(" [\"“”], [\"“”] ?", "\", \"", sentence)
-                sentence = re.sub(" [\"“”], ", "\", ", sentence)
-                sentence = re.sub(": [\"“”] ", ": \"", sentence)
-                sentence = sentence.replace("[ ", "[")
-                sentence = sentence.replace(" ]", "]")
-                sentence = re.sub(" ([,;:.]) ", r"\1 ", sentence)
-                sentence = re.sub(r"\( (.) \)", r"(\1)", sentence)
-                sentence = re.sub(" ([?!.])$", r"\1", sentence)
-                sentence = re.sub("^[:.?!,;)] ", "", sentence)
-                sentence = re.sub("^\\d+ ?[:\\-.,;] ([A-ZÖÄÜ])", r"\1", sentence)
-
-                sentence = re.sub(" ([\"“”])([?!.])$", r"\1\2", sentence)
-                
-                s_html += "<tr class='siac-cl-row'><td><div contenteditable style='color: darkorange;'>%s</div></td><td><input type='checkbox' checked/></td></tr>" % (sentence.replace("`", "&#96;"))
-            s_html += "</table>"
-            btn_html = """document.getElementById('siac-pdf-tooltip-bottom').innerHTML = `
-                                <div style='margin-top: 8px;'>
-                                <div class='siac-btn siac-btn-dark' onclick='pycmd("siac-fld-cloze " +$(".siac-cl-row div").first().text());' style='margin-right: 15px;'>Send to Field</div>
-                                <div class='siac-btn siac-btn-dark' onclick='generateClozes();'>Generate</div>
-                                </div>
-                    `;"""
-
-        else:
-            s_html = "<br><center>Sorry, could not extract any sentences.</center>" 
-            btn_html = ""
-        
-        return """
-                document.getElementById('siac-pdf-tooltip-results-area').innerHTML = `%s`;
-                document.getElementById('siac-pdf-tooltip-top').innerHTML = `Found <b>%s</b> sentence(s) around selection: <br/><span style='color: lightgrey;'>(Click inside to edit, <i>Ctrl+Shift+C</i> to add new Clozes)</span>`;
-                document.getElementById('siac-pdf-tooltip-searchbar').style.display = "none";
-                %s
-                """ % (s_html, len(sentences), btn_html)
-
-    @js
-    def notification(self, html, on_ok=None):
-        if on_ok is None:
-            on_ok = ""
-        modal = f""" <div class="siac-modal-small dark" contenteditable="false" style="text-align:center; color: lightgrey;">
-                        {html}
-                        <br/> <br/>
-                        <div class="siac-btn siac-btn-dark" onclick="$(this.parentNode).remove(); {on_ok}">&nbsp; Ok &nbsp;</div>
-                    </div> """
-        return "$('#siac-pdf-tooltip').hide();$('.siac-modal-small').remove(); $('#siac-reading-modal-center').append('%s');" % modal.replace("\n", "").replace("'", "\\'")
-
-    @js
-    def update_bottom_bar_positions(self, nid, new_index, queue_len):
-        queue_readings_list = get_queue_head_display(nid).replace("`", "\\`")
-        priority_str = get_priority_as_str(nid)
-        return f"""
-            document.getElementById('siac-queue-lbl').innerHTML = 'Priority: {priority_str}';
-            $('#siac-queue-lbl').fadeIn('slow');
-            $('.siac-queue-sched-btn:first').html('In Queue');
-            $('#siac-queue-readings-list').replaceWith(`{queue_readings_list}`);
-        """
-
-    @js
-    def show_timer_elapsed_popup(self, nid):
-        """
-            Shows the little popup that is displayed when the timer in the reading modal finished.
-        """
-        read_today_count = get_read_today_count()
-        added_today_count = utility.misc.count_cards_added_today()
-        html = """
-        <div style='margin: 0 0 10px 0;'>
-            <div style='text-align: center; vertical-align: middle; line-height: 50px; font-weight: bold; font-size: 40px; color: #2496dc;'>
-                &#10711;
-            </div>
-            <div style='text-align: center; vertical-align: middle; line-height: 50px; font-weight: bold; font-size: 20px;'>
-                Time is up!
-            </div>
-        </div>
-        <div style='margin: 10px 0 25px 0; text-align: center; color: lightgrey;'>
-            Read <b>%s</b> %s today.<br>
-            Added <b>%s</b> %s today.
-        </div>
-        <div style='text-align: center;'>
-            <div class='siac-btn siac-btn-dark' style='margin: 0 5px 0 5px;' onclick='this.parentNode.parentNode.style.display="none"; startTimer(5);'>&nbsp;Start 5m&nbsp;</div>
-            <div class='siac-btn siac-btn-dark' style='margin: 0 5px 0 5px; width: 50px;' onclick='this.parentNode.parentNode.style.display="none";'>Ok</div>
-            <div class='siac-btn siac-btn-dark' style='margin: 0 5px 0 5px;' onclick='this.parentNode.parentNode.style.display="none"; startTimer(15);'>&nbsp;Start 15m&nbsp;</div>
-        </div>
-        """ % (read_today_count, "page" if read_today_count == 1 else "pages", added_today_count, "card" if added_today_count == 1 else "cards")
-        return "$('#siac-timer-popup').html(`%s`); $('#siac-timer-popup').show();" % html
-
-
-    @js
-    def jump_to_last_read_page(self, nid):
-        return """
-            if (pagesRead && pagesRead.length) {
-                pdfDisplayedCurrentPage = Math.max(...pagesRead);
-                rerenderPDFPage(pdfDisplayedCurrentPage, false, true);
-            }
-        """
-    @js
-    def jump_to_first_unread_page(self, nid):
-        return """
-            if (pdfDisplayed) {
-                for (var i = 1; i < pdfDisplayed.numPages + 1; i++) {
-                if (!pagesRead || pagesRead.indexOf(i) === -1) {
-                    pdfDisplayedCurrentPage = i;
-                    rerenderPDFPage(pdfDisplayedCurrentPage, false, true);
-                    break;
-                } 
-                }
-            }
-        """
\ No newline at end of file
diff --git a/src/special_searches.py b/src/special_searches.py
index d526f97f..a613709e 100644
--- a/src/special_searches.py
+++ b/src/special_searches.py
@@ -26,6 +26,12 @@
     from state import check_index
     from models import SiacNote, IndexNote
 
+
+"""
+Various functions to retrieve (Anki) notes based on special search criteria.
+Todo: add typing annotation
+"""
+
 def get_notes_added_on_day_of_year(day_of_year : int, limit: int):
     
     day_now = datetime.datetime.now().timetuple().tm_yday
@@ -34,7 +40,7 @@ def get_notes_added_on_day_of_year(day_of_year : int, limit: int):
     date_then = date_year_begin + datetime.timedelta(day_of_year)
     nid_midnight = int(date_then.timestamp() * 1000)
     nid_next_midnight = nid_midnight + 24 * 60 * 60 * 1000
-    res = mw.col.db.execute("select distinct notes.id, flds, tags, did, mid from notes left join cards on notes.id = cards.nid where nid > %s and nid < %s order by nid asc" % (nid_midnight, nid_next_midnight)).fetchall()
+    res = mw.col.db.all("select distinct notes.id, flds, tags, did, mid from notes left join cards on notes.id = cards.nid where nid > %s and nid < %s order by nid asc limit 200" % (nid_midnight, nid_next_midnight))
     return to_notes(res)
 
 
@@ -47,7 +53,7 @@ def get_cal_info_context(day_of_year : int):
     date_then_str = time.strftime('%a, %d %B, %Y', time.localtime((nid_midnight + 1000) / 1000))
     nid_midnight_three_days_before = nid_midnight - 3 * oneday
     nid_midnight_three_days_after = nid_midnight + 4 * oneday
-    res = mw.col.db.execute("select distinct notes.id from notes where id > %s and id < %s order by id asc" % (nid_midnight_three_days_before, nid_midnight_three_days_after)).fetchall()
+    res = mw.col.db.all("select distinct notes.id from notes where id > %s and id < %s order by id asc" % (nid_midnight_three_days_before, nid_midnight_three_days_after))
     context = [0, 0, 0, 0, 0, 0, 0]
     for nid in res:
         context[int((nid[0] - nid_midnight_three_days_before) / oneday)] += 1
@@ -61,7 +67,7 @@ def get_cal_info_context(day_of_year : int):
             color = "cal-one"
         else: 
             color = ""
-        html_content += """<div class='cal-block-week %s %s' data-index='%s' onclick='pycmd("calInfo %s")'>%s</div>""" % (color, "cal-lg" if i == 3 else "", day_of_year - (3 - i),day_of_year - (3 - i), cnt)
+        html_content += """<div class='cal-block-week %s %s' data-index='%s' onclick='pycmd("siac-cal-info %s")'>%s</div>""" % (color, "cal-lg" if i == 3 else "", day_of_year - (3 - i),day_of_year - (3 - i), cnt)
     html = """
     
     <div style='text-align: center; margin-bottom: 4px;'>
@@ -69,7 +75,6 @@ def get_cal_info_context(day_of_year : int):
     </div>
     <div style='width: 100%%; text-align: center;'>%s</div>""" % (date_then_str, html_content)    
 
-
     return html
 
 
@@ -81,7 +86,7 @@ def getCreatedSameDay(index, editor, nid):
         nidMinusOneDay = nid - (24 * 60 * 60 * 1000)
         nidPlusOneDay = nid + (24 * 60 * 60 * 1000)
 
-        res = mw.col.db.execute("select distinct notes.id, flds, tags, did, mid from notes left join cards on notes.id = cards.nid where nid > %s and nid < %s order by nid desc" %(nidMinusOneDay, nidPlusOneDay)).fetchall()
+        res = mw.col.db.all("select distinct notes.id, flds, tags, did, mid from notes left join cards on notes.id = cards.nid where nid > %s and nid < %s order by nid desc" %(nidMinusOneDay, nidPlusOneDay))
 
         dayOfNote = int(time.strftime("%d", time.localtime(nid/1000)))
         rList = []
@@ -118,15 +123,21 @@ def getRandomNotes(index, decks):
 
     limit = index.limit
     if deckQ:
-        res = mw.col.db.execute("select distinct notes.id, flds, tags, did, mid from notes left join cards on notes.id = cards.nid where did in %s and notes.id in (select id from notes order by random() limit %s)" % (deckQ, limit)).fetchall()
+        res = mw.col.db.all("select distinct notes.id, flds, tags, did, mid from notes left join cards on notes.id = cards.nid where did in %s and notes.id in (select id from notes order by random() limit %s)" % (deckQ, limit))
     else:
-        res = mw.col.db.execute("select distinct notes.id, flds, tags, did, mid from notes left join cards on notes.id = cards.nid where notes.id in (select id from notes order by random() limit %s)" % (limit)).fetchall()
+        res = mw.col.db.all("select distinct notes.id, flds, tags, did, mid from notes left join cards on notes.id = cards.nid where notes.id in (select id from notes order by random() limit %s)" % (limit))
     res = to_notes(res)
     if len(res) > 0:
         random.shuffle(res)
 
     return { "result" : res, "stamp" : stamp }
 
+def get_last_added_anki_notes(limit):
+    """
+        Get notes ordered by their nid descending, no decks or pinned notes excluded.
+    """
+    res = mw.col.db.all("select distinct notes.id, flds, tags, did, mid from notes left join cards on notes.id = cards.nid order by nid desc limit %s" % limit)
+    return to_notes(res)
 
 def getCreatedNotesOrderedByDate(index, editor, decks, limit, sortOrder):
     stamp = utility.misc.get_milisec_stamp()
@@ -141,9 +152,9 @@ def getCreatedNotesOrderedByDate(index, editor, decks, limit, sortOrder):
     else:
         deckQ = ""
     if len(deckQ) > 0:
-        res = mw.col.db.execute("select distinct notes.id, flds, tags, did, mid from notes left join cards on notes.id = cards.nid where did in %s order by nid %s limit %s" %(deckQ, sortOrder, limit)).fetchall()
+        res = mw.col.db.all("select distinct notes.id, flds, tags, did, mid from notes left join cards on notes.id = cards.nid where did in %s order by nid %s limit %s" %(deckQ, sortOrder, limit))
     else:
-        res = mw.col.db.execute("select distinct notes.id, flds, tags, did, mid from notes left join cards on notes.id = cards.nid order by nid %s limit %s" % (sortOrder, limit)).fetchall()
+        res = mw.col.db.all("select distinct notes.id, flds, tags, did, mid from notes left join cards on notes.id = cards.nid order by nid %s limit %s" % (sortOrder, limit))
     rList = []
     for r in res:
         #pinned items should not appear in the results
@@ -168,7 +179,7 @@ def getLastReviewed(decks, limit):
         cmd = "with cr as (select cards.nid, cards.id, cards.did, revlog.id as rid from revlog join cards on cards.id = revlog.cid) select distinct notes.id, flds, tags, cr.did, notes.mid from notes join cr on notes.id = cr.nid where cr.did in %s order by cr.rid desc limit %s" % (deckQ, limit)
     else:
         cmd = "with cr as (select cards.nid, cards.id, cards.did, revlog.id as rid from revlog join cards on cards.id = revlog.cid) select distinct notes.id, flds, tags, cr.did, notes.mid from notes join cr on notes.id = cr.nid order by cr.rid desc limit %s" % limit
-    res = mw.col.db.execute(cmd).fetchall()
+    res = mw.col.db.all(cmd)
     return to_notes(res)
 
 def getLastLapses(decks, limit):
@@ -181,7 +192,7 @@ def getLastLapses(decks, limit):
         cmd = "with cr as (select cards.nid, cards.id, cards.did, revlog.id as rid, revlog.ease from revlog join cards on cards.id = revlog.cid) select distinct notes.id, flds, tags, cr.did, notes.mid from notes join cr on notes.id = cr.nid where cr.ease = 1 and cr.did in %s order by cr.rid desc limit %s" % (deckQ, limit)
     else:
         cmd = "with cr as (select cards.nid, cards.id, cards.did, revlog.id as rid, revlog.ease from revlog join cards on cards.id = revlog.cid) select distinct notes.id, flds, tags, cr.did, notes.mid from notes join cr on notes.id = cr.nid where cr.ease = 1 order by cr.rid desc limit %s" % limit
-    res = mw.col.db.execute(cmd).fetchall()
+    res = mw.col.db.all(cmd)
     return to_notes(res)
 
 def getRandomUntagged(decks, limit):
@@ -190,11 +201,21 @@ def getRandomUntagged(decks, limit):
     else:
         deckQ = ""
     if deckQ:
-        res = mw.col.db.execute("select distinct notes.id, flds, tags, did, mid from notes left join cards on notes.id = cards.nid where did in %s and (tags is null or tags = '') order by random() limit %s" % (deckQ, limit)).fetchall()
+        res = mw.col.db.all("select distinct notes.id, flds, tags, did, mid from notes left join cards on notes.id = cards.nid where did in %s and (tags is null or tags = '') order by random() limit %s" % (deckQ, limit))
     else:
-        res = mw.col.db.execute("select distinct notes.id, flds, tags, did, mid from notes left join cards on notes.id = cards.nid where tags is null or tags = '' order by random() limit %s" % limit).fetchall()
+        res = mw.col.db.all("select distinct notes.id, flds, tags, did, mid from notes left join cards on notes.id = cards.nid where tags is null or tags = '' order by random() limit %s" % limit)
     return to_notes(res) 
     
+def get_last_untagged(decks, limit):
+    if not "-1" in decks:
+        deckQ =  "(%s)" % ",".join(decks)
+    else:
+        deckQ = ""
+    if deckQ:
+        res = mw.col.db.all("select distinct notes.id, flds, tags, did, mid from notes left join cards on notes.id = cards.nid where did in %s and (tags is null or tags = '') order by notes.id desc limit %s" % (deckQ, limit))
+    else:
+        res = mw.col.db.all("select distinct notes.id, flds, tags, did, mid from notes left join cards on notes.id = cards.nid where tags is null or tags = '' order by notes.id desc limit %s" % limit)
+    return to_notes(res) 
 
 def findNotesWithLongestText(decks, limit, pinned):
     if not "-1" in decks and len(decks) > 0:
@@ -204,9 +225,9 @@ def findNotesWithLongestText(decks, limit, pinned):
     if pinned is None:
         pinned = []
     if len(deckQ) > 0:
-        res = mw.col.db.execute("select distinct notes.id, flds, tags, did, mid from notes left join cards on notes.id = cards.nid where did in %s order by length(replace(trim(flds), '\u001f', '')) desc limit %s" %(deckQ, limit)).fetchall()
+        res = mw.col.db.all("select distinct notes.id, flds, tags, did, mid from notes left join cards on notes.id = cards.nid where did in %s order by length(replace(trim(flds), '\u001f', '')) desc limit %s" %(deckQ, limit))
     else:
-        res = mw.col.db.execute("select distinct notes.id, flds, tags, did, mid from notes left join cards on notes.id = cards.nid order by length(replace(trim(flds), '\u001f', '')) desc limit %s" % (limit )).fetchall()
+        res = mw.col.db.all("select distinct notes.id, flds, tags, did, mid from notes left join cards on notes.id = cards.nid order by length(replace(trim(flds), '\u001f', '')) desc limit %s" % (limit ))
     rList = []
     for r in res:
         #pinned items should not appear in the results
@@ -224,7 +245,7 @@ def getByTimeTaken(decks, limit, mode):
         cmd = "with cr as (select cards.nid, cards.id, cards.did, revlog.time, revlog.id as rid, revlog.ease from revlog join cards on cards.id = revlog.cid) select distinct notes.id, flds, tags, cr.did, notes.mid, avg(cr.time) as timeavg from notes join cr on notes.id = cr.nid where cr.ease = 1 and cr.did in %s group by cr.nid order by timeavg %s limit %s" % (deckQ, mode, limit)
     else:
         cmd = "with cr as (select cards.nid, cards.id, cards.did, revlog.time, revlog.id as rid, revlog.ease from revlog join cards on cards.id = revlog.cid) select distinct notes.id, flds, tags, cr.did, notes.mid, avg(cr.time) as timeavg from notes join cr on notes.id = cr.nid where cr.ease = 1 group by cr.nid order by timeavg %s limit %s" % (mode, limit)
-    res = mw.col.db.execute(cmd).fetchall()
+    res = mw.col.db.all(cmd)
     rList = []
     for r in res:
         #rList.append((r[1], r[2], r[3], r[0], 1, r[4], ""))
@@ -242,9 +263,9 @@ def getLastModifiedNotes(index, editor, decks, limit):
     else:
         deckQ = ""
     if len(deckQ) > 0:
-        res = mw.col.db.execute("select distinct notes.id, flds, tags, did, notes.mid, notes.mod from notes left join cards on notes.id = cards.nid where did in %s order by notes.mod desc limit %s" %(deckQ, limit)).fetchall()
+        res = mw.col.db.all("select distinct notes.id, flds, tags, did, notes.mid, notes.mod from notes left join cards on notes.id = cards.nid where did in %s order by notes.mod desc limit %s" %(deckQ, limit))
     else:
-        res = mw.col.db.execute("select distinct notes.id, flds, tags, did, notes.mid, notes.mod from notes left join cards on notes.id = cards.nid order by notes.mod desc limit %s" % (limit)).fetchall()
+        res = mw.col.db.all("select distinct notes.id, flds, tags, did, notes.mid, notes.mod from notes left join cards on notes.id = cards.nid order by notes.mod desc limit %s" % (limit))
     rList = []
     for r in res:
         if not str(r[0]) in index.pinned:
@@ -258,12 +279,12 @@ def getLastModifiedNotes(index, editor, decks, limit):
 
 
 def _find_cards_with_one_more_rep(cid: int):
-    reps = mw.col.db.execute("select count(*) from revlog where (type = 1 or type = 2) and cid = %s" % cid).fetchone()[0]
+    reps = mw.col.db.all("select count(*) from revlog where (type = 1 or type = 2) and cid = %s" % cid)[0]
 
     cards_ivls = []
     others = {}
     query = "select ro.id, ro.cid, ro.ease, ro.ivl, ro.factor, ro.time, ro.type from revlog ro join (select cid, count(*) from revlog where type = 1 or type = 2 group by cid having count(*) > %s or cid = %s) ri on ro.cid = ri.cid where type = 1 or type = 2" % (reps, cid)
-    res = mw.col.db.execute(query).fetchall()
+    res = mw.col.db.all(query)
     for r in res:
         if r[1] == cid:
             cards_ivls.append(r[3])
@@ -461,7 +482,7 @@ def find_cards_with_similar_rep_history(cid : int):
     return [avg_similarity_steps_results] 
 
 def get_suspended(nids):
-    res = mw.col.db.execute("select distinct nid from cards where nid in (%s) and queue = -1" % ",".join([str(nid) for nid in nids])).fetchall()
+    res = mw.col.db.all("select distinct nid from cards where nid in (%s) and queue = -1" % ",".join([str(nid) for nid in nids]))
     res = [r[0] for r in res]
     return res
 
diff --git a/src/state.py b/src/state.py
index de6d95f6..d16d5723 100644
--- a/src/state.py
+++ b/src/state.py
@@ -15,42 +15,54 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from aqt import mw
+import typing
+from typing import List, Tuple, Any, Optional, Dict
+from aqt.editor import Editor
 
-search_index = None
-contextEvt = None
-corpus = None
-deck_map = None
-edit = None
+# set after create_db_file_if_not_exists has been called
+db_file_existed: Optional[bool] = None
 
-old_on_bridge = None
+#
+# Globals
+#
+search_index        : "FTSIndex"                        = None
+note_editor_shown   : bool                              = False
+contextEvt          : Any                               = None
+corpus              : Optional[List[Tuple[Any, ...]]]   = None
+deck_map            : Optional[Dict[str, int]]          = None
+edit                : Optional[Editor]                  = None
 
-def check_index():
-    return search_index is not None and search_index.ui is not None and search_index.ui._editor is not None and search_index.ui._editor.web is not None
+def check_index() -> bool:
+    """ Returns True if index and ui are ready to use. """
+    return (search_index is not None 
+            and search_index.ui is not None 
+            and search_index.ui._editor is not None 
+            and search_index.ui._editor.web is not None)
 
-def set_index(index):
+def set_index(index: "FTSIndex"):
     global search_index
     search_index = index
 
-def get_index():
+def get_index() -> "FTSIndex":
     return search_index
 
-def corpus_is_loaded():
+def corpus_is_loaded() -> bool:
     return corpus is not None
 
-def set_corpus(c):
+def set_corpus(c: List[Tuple[Any, ...]]):
     global corpus
     corpus = c
 
-def get_corpus():
+def get_corpus() -> Optional[List[Tuple[Any, ...]]]:
     return corpus
 
-def set_edit(e):
+def set_edit(e: Editor):
     global edit
     edit = e
 
-def get_edit():
+def get_edit() -> Editor:
     return edit
 
-def set_deck_map(dm):
+def set_deck_map(dm: Dict[str, int]):
     global deck_map
     deck_map = dm
diff --git a/src/stats.py b/src/stats.py
index dc441403..ff1efee5 100644
--- a/src/stats.py
+++ b/src/stats.py
@@ -31,13 +31,18 @@
 import time
 import json
 
+"""
+Various statistics functions.
+Mainly used for the information displayed when clicking on "INFO" on a note or for some of the predefined searches.
+Todo: Add typing annotation
+"""
 
 def findNotesWithLowestPerformance(decks, limit, pinned, retOnly=False):
     #avgRetAndTime = getAvgTrueRetentionAndTime()
-    scores = _calcScores(decks, limit, retOnly)
-    scores = sorted(scores.items(), key=lambda x: x[1][0], reverse=False)
-    rList = []
-    c = 0
+    scores  = _calcScores(decks, limit, retOnly)
+    scores  = sorted(scores.items(), key=lambda x: x[1][0], reverse=False)
+    rList   = []
+    c       = 0
     for r in scores:
         if str(r[1][1][0]) not in pinned:
             rList.append(IndexNote((r[1][1][0], r[1][1][2], r[1][1][3], r[1][1][4], r[1][1][2], -1, r[1][1][5], "", -1)))
@@ -46,12 +51,11 @@ def findNotesWithLowestPerformance(decks, limit, pinned, retOnly=False):
                 break
     return rList
 
-
 def findNotesWithHighestPerformance(decks, limit, pinned, retOnly=False):
-    scores = _calcScores(decks, limit, retOnly)
-    scores = sorted(scores.items(), key=lambda x: x[1][0], reverse=True)
-    rList = []
-    c = 0
+    scores  = _calcScores(decks, limit, retOnly)
+    scores  = sorted(scores.items(), key=lambda x: x[1][0], reverse=True)
+    rList   = []
+    c       = 0
     for r in scores:
         if str(r[1][1][0]) not in pinned:
             rList.append(IndexNote((r[1][1][0], r[1][1][2], r[1][1][3], r[1][1][4], r[1][1][2], -1, r[1][1][5], "", -1)))
@@ -60,18 +64,17 @@ def findNotesWithHighestPerformance(decks, limit, pinned, retOnly=False):
                 break
     return rList
 
-
 def getSortedByInterval(decks, limit, pinned, sortOrder):
     if not "-1" in decks:
         deckQ = "(%s)" % ",".join(decks)
     else:
         deckQ = ""
     if deckQ:
-        res = mw.col.db.execute("select notes.id, flds, tags, did, cards.nid, notes.mid FROM cards left join notes on cards.nid = notes.id where did in %s and reps > 0 group by cards.nid order by ivl %s limit %s" % (
-            deckQ, sortOrder, limit)).fetchall()
+        res = mw.col.db.all("select notes.id, flds, tags, did, cards.nid, notes.mid FROM cards left join notes on cards.nid = notes.id where did in %s and reps > 0 group by cards.nid order by ivl %s limit %s" % (
+            deckQ, sortOrder, limit))
     else:
-        res = mw.col.db.execute("select notes.id, flds, tags, did, cards.nid, notes.mid FROM cards left join notes on cards.nid = notes.id where reps > 0 group by cards.nid order by ivl %s limit %s" % (
-            sortOrder, limit)).fetchall()
+        res = mw.col.db.all("select notes.id, flds, tags, did, cards.nid, notes.mid FROM cards left join notes on cards.nid = notes.id where reps > 0 group by cards.nid order by ivl %s limit %s" % (
+        sortOrder, limit))
     rList = []
     for r in res:
         if not str(r[0]) in pinned:
@@ -79,18 +82,17 @@ def getSortedByInterval(decks, limit, pinned, sortOrder):
            rList.append(IndexNote((r[0], r[1], r[2], r[3], r[1], -1, r[4], "")))
     return rList
 
-
 def _calcScores(decks, limit, retOnly):
     if not "-1" in decks:
         deckQ = "(%s)" % ",".join(decks)
     else:
         deckQ = ""
     if deckQ:
-        notes = mw.col.db.execute(
-            "select notes.id, cards.id, flds, tags, did, notes.mid from cards left join notes on cards.nid = notes.id where did in %s order by notes.id" % deckQ).fetchall()
+        notes = mw.col.db.all(
+            "select notes.id, cards.id, flds, tags, did, notes.mid from cards left join notes on cards.nid = notes.id where did in %s order by notes.id" % deckQ)
     else:
-        notes = mw.col.db.execute(
-            "select notes.id, cards.id, flds, tags, did, notes.mid from cards left join notes on cards.nid = notes.id order by notes.id ").fetchall()
+        notes = mw.col.db.all(
+            "select notes.id, cards.id, flds, tags, did, notes.mid from cards left join notes on cards.nid = notes.id order by notes.id ")
     scores = dict()
     cardsByNotes = dict()
     for note in notes:
@@ -107,34 +109,35 @@ def _calcScores(decks, limit, retOnly):
                 scores[k] = (score[0], v[0])
     return scores
 
-
 def getAvgTrueRetention(nids):
-    query = "select id from cards where nid in %s" % (
-        "(%s)" % ",".join([str(nid) for nid in nids]))
-    cids = mw.col.db.execute(query).fetchall()
-    cids = [c[0] for c in cids]
-    tret = _getScore(cids, True)
+
+    query   = "select id from cards where nid in %s" % ("(%s)" % ",".join([str(nid) for nid in nids]))
+    cids    = mw.col.db.all(query)
+    cids    = [c[0] for c in cids]
+    tret    = _getScore(cids, True)
+
     return tret
 
 
 def getTrueRetentionOverTime(nids):
+
     query = "select id from cards where nid in %s" % (
         "(%s)" % ",".join([str(nid) for nid in nids]))
-    cids = mw.col.db.execute(query).fetchall()
+    cids = mw.col.db.all(query)
     cids = [c[0] for c in cids]
-    return _getTrueRetentionOverTime(cids)
 
+    return _getTrueRetentionOverTime(cids)
 
 def getRetentions(nids):
     # for testing
     if mw is None:
         return dict()
-    passedById = dict()
-    failedById = dict()
-    retsByNid = {}
-    query = "select a.nid, ease from revlog join (select notes.id as nid, cards.id as cid from notes join cards on notes.id = cards.nid where notes.id in (%s)) as a on revlog.cid = a.cid where revlog.type = 1"
-    query = query % ",".join([str(n) for n in nids])
-    res = list(mw.col.db.execute(query).fetchall())
+    passedById  = dict()
+    failedById  = dict()
+    retsByNid   = {}
+    query       = "select a.nid, ease from revlog join (select notes.id as nid, cards.id as cid from notes join cards on notes.id = cards.nid where notes.id in (%s)) as a on revlog.cid = a.cid where revlog.type = 1"
+    query       = query % ",".join([str(n) for n in nids])
+    res         = list(mw.col.db.all(query))
 
     for r in res:
         if r[0] is None:
@@ -147,19 +150,21 @@ def getRetentions(nids):
             passedById[r[0]] += 1
         else:
             failedById[r[0]] += 1
+
     for k, v in passedById.items():
         retsByNid[k] = round(100 * v / (v + failedById[k]), 0)
-    return retsByNid
 
+    return retsByNid
 
 def getAvgTrueRetentionAndTime():
-    eases = mw.col.db.all("select ease, time from revlog where type = 1")
+    eases       = mw.col.db.all("select ease, time from revlog where type = 1")
     if not eases:
         return 0
-    cnt = 0
-    passed = 0
-    failed = 0
-    timeTaken = 0
+    cnt         = 0
+    passed      = 0
+    failed      = 0
+    timeTaken   = 0
+
     for ease, taken in eases:
         cnt += 1
         if ease != 1:
@@ -167,16 +172,15 @@ def getAvgTrueRetentionAndTime():
         else:
             failed += 1
         timeTaken += taken / 1000.0
-    retention = 100 * passed / (passed + failed) if cnt > 0 else 0
-    retention = round(retention, 2)
-    return (round(retention, 1), round(timeTaken / cnt, 1))
 
+    retention   = 100 * passed / (passed + failed) if cnt > 0 else 0
+    retention   = round(retention, 2)
+
+    return (round(retention, 1), round(timeTaken / cnt, 1))
 
 def calcAbsDiffInPercent(i1, i2):
     return round(i1 - i2, 2)
   
-
-
 def _getTrueRetentionOverTime(cards):
     if not cards:
         return None
@@ -218,25 +222,25 @@ def _getTrueRetentionOverTime(cards):
         return None
     return retentionsOverTime
 
-
 def _getScore(cards, onlyRet=False):
     if not cards:
         return None
-    cStr = "("
+
+    cStr        = "("
     for c in cards:
-        cStr += str(c) + ", "
-    cStr = cStr[:-2] + ")"
+        cStr    += str(c) + ", "
+    cStr        = cStr[:-2] + ")"
 
-    entries = mw.col.db.all(
-        "select cid, ease, time, type from revlog where cid in %s" % (cStr))
+    entries     = mw.col.db.all("select cid, ease, time, type from revlog where cid in %s" % (cStr))
     if not entries:
         return None
-    cnt = 0
-    passed = 0
-    failed = 0
+
+    cnt         = 0
+    passed      = 0
+    failed      = 0
     goodAndEasy = 0
-    hard = 0
-    timeTaken = 0
+    hard        = 0
+    timeTaken   = 0
     for (cid, ease, taken, ty) in reversed(entries):
         # only look for reviews
         if ty != 1:
@@ -261,7 +265,6 @@ def _getScore(cards, onlyRet=False):
     avgTime = round(timeTaken / cnt, 1)
     return _calcPerformanceScore(retention, avgTime, goodAndEasy, hard)
 
-
 def calculateStats(nid, gridView):
 
     tables = {
@@ -272,12 +275,12 @@ def calculateStats(nid, gridView):
     infoTable = {}
     infoTable["Note ID"] = nid
 
-    note = mw.col.getNote(nid)
-    model = mw.col.models.get(note.mid)
-    templates = mw.col.findTemplates(note)
+    note        = mw.col.getNote(nid)
+    model       = mw.col.models.get(note.mid)
+    templates   = mw.col.findTemplates(note)
 
     try:
-        infoTable["Created Date"] = time.strftime("%Y-%m-%d", time.localtime(int(nid)/1000)) + " &nbsp;&nbsp;<a class='keyword' href='#' style='float: right;' onclick='pycmd(\"addedSameDay %s\"); $(\"#a-modal\").hide(); return false;'>Added Same Day</a>" % nid
+        infoTable["Created Date"] = time.strftime("%Y-%m-%d", time.localtime(int(nid)/1000)) + " &nbsp;&nbsp;<a class='keyword' href='#' style='float: right;' onclick='pycmd(\"siac-added-same-day %s\"); $(\"#a-modal\").hide(); return false;'>Added Same Day</a>" % nid
         infoTable["Last Modified"] = time.strftime(
             "%Y-%m-%d", time.localtime(note.mod))
     except:
@@ -287,27 +290,30 @@ def calculateStats(nid, gridView):
     
 
     # get card ids for note
-    cards = mw.col.db.all("select * from cards where nid = %s" % (nid))
+    cards               = mw.col.db.all("select * from cards where nid = %s" % (nid))
     if not cards:
         infoTable["Result"] = "No cards found"
         tables["Note"].append(infoTable)
         return _buildTable(tables)
-    cardOrdById = {}
-    cardTypeById = {}
-    cardEaseFactorById = {}
-    cardQueueById = {}
-    decks = set()
-    cStr = "("
+
+    cardOrdById         = {}
+    cardTypeById        = {}
+    cardEaseFactorById  = {}
+    cardQueueById       = {}
+    decks               = set()
+    cStr                = "("
+
     for c in cards:
         d = mw.col.decks.get(c[2])["name"]
         if not d in decks:
             decks.add(d)
-        cStr += str(c[0]) + ", "
-        cardOrdById[c[0]] = c[3]
-        cardTypeById[c[0]] = _cardTypeStr(c[6])
-        cardEaseFactorById[c[0]] = int(c[10] / 10)
-        cardQueueById[c[0]] = c[7]
-    cStr = cStr[:-2] + ")"
+        cStr                        += str(c[0]) + ", "
+        cardOrdById[c[0]]           = c[3]
+        cardTypeById[c[0]]          = _cardTypeStr(c[6])
+        cardEaseFactorById[c[0]]    = int(c[10] / 10)
+        cardQueueById[c[0]]         = c[7]
+
+    cStr                = cStr[:-2] + ")"
 
     if len(decks) > 0:
         infoTable["Deck(s)"] = ", ".join(decks)
@@ -330,24 +336,25 @@ def calculateStats(nid, gridView):
                 hasReview = True
                 break
 
-    reviewPlotData = {}
-    ivlPlotData = {}
-    timePlotData = {}
-    similar_res_by_cid = {}
+    reviewPlotData      = {}
+    ivlPlotData         = {}
+    timePlotData        = {}
+    similar_res_by_cid  = {}
 
     if not entries or not hasReview:
         infoTable["Result"] = "No cards have been reviewed yet for this note"
         tables["Note"].append(infoTable)
     else:
-        cnt = 0
-        passed = 0
-        failed = 0
-        easy = 0
-        goodAndEasy = 0
-        good = 0
-        hard = 0
-        timeTaken = 0
-        intervalsByCid = {}
+        cnt             = 0
+        passed          = 0
+        failed          = 0
+        easy            = 0
+        goodAndEasy     = 0
+        good            = 0
+        hard            = 0
+        timeTaken       = 0
+        intervalsByCid  = {}
+
         for (stamp, cid, ease, ivl, taken, ty) in entries:
             # only look for reviews
             if ty != 1:
@@ -381,49 +388,51 @@ def calculateStats(nid, gridView):
 
             timeTaken += taken / 1000.0
 
-        retention = 100 * passed / (passed + failed) if cnt > 0 else 0
-        retention = round(retention, 1)
-        avgTime = round(timeTaken / cnt, 1) if cnt > 0 else 0
-        score = _calcPerformanceScore(
-            retention, avgTime, goodAndEasy, hard) if cnt > 0 else (0, 0, 0, 0)
+        retention               = 100 * passed / (passed + failed) if cnt > 0 else 0
+        retention               = round(retention, 1)
+        avgTime                 = round(timeTaken / cnt, 1) if cnt > 0 else 0
+        score                   = _calcPerformanceScore(retention, avgTime, goodAndEasy, hard) if cnt > 0 else (0, 0, 0, 0)
         
         tables["Note"].append(infoTable)
-        infoTable = {}
-
-
+        infoTable               = {}
 
         infoTable["Cards Found"] = len(cards)
         tables["Cards"].append(infoTable)
 
-
         for k, v in cardNameById.items():
-            infoTable = {}
-            label = ""
+            infoTable   = {}
+            label       = ""
+
             if cardQueueById[k] == -1:
                 label = "<span style='background: orange; color: black;'>Suspended</span>"
             elif cardQueueById[k] == 0:
                 label = "<span style='background: orange; color: black;'>NEW</span>"
             elif cardQueueById[k] == 1:
                 label = "<span style='background: orange; color: black;'>LEARNING</span>"
+
             infoTable["<b>%s</b>  &nbsp;(%s):" % (v, k)] = label
+
             if k in intervalsByCid:
                 infoTable[_get_revlog_graph(k)] = ""
                 infoTable["Interval"] = "%s %s" % (
                     abs(intervalsByCid[k]), "Days" if intervalsByCid[k] > 0 else "Seconds")
+
             if k in cardEaseFactorById:
                 infoTable["Ease"] = str(cardEaseFactorById[k]) + " %"
+
             if k in cardTypeById:
                 infoTable["Type"] = cardTypeById[k]
+
             tables["Cards"].append(infoTable)
             # similar_res = find_cards_with_similar_rep_history(int(k))
             # similar_res_by_cid[int(k)] = similar_res
 
-        infoTable = {}
-        infoTable["<b>Reviews (Cards from this note)</b>"] = cnt
-        infoTable["&nbsp;&nbsp;&nbsp; <span style='color: red'>Failed</span>"] = failed
-        infoTable["&nbsp;&nbsp;&nbsp; <span style='color: black'>Hard</span>"] = hard
-        infoTable["&nbsp;&nbsp;&nbsp; <span style='color: green'>Good</span>"] = good
-        infoTable["&nbsp;&nbsp;&nbsp; <span style='color: blue'>Easy</span>"] = easy
+        infoTable                                                               = {}
+        infoTable["<b>Reviews (Cards from this note)</b>"]                      = cnt
+        infoTable["&nbsp;&nbsp;&nbsp; <span style='color: red'>Failed</span>"]  = failed
+        infoTable["&nbsp;&nbsp;&nbsp; <span style='color: black'>Hard</span>"]  = hard
+        infoTable["&nbsp;&nbsp;&nbsp; <span style='color: green'>Good</span>"]  = good
+        infoTable["&nbsp;&nbsp;&nbsp; <span style='color: blue'>Easy</span>"]   = easy
         tables["Stats"].append(infoTable)
 
         if cnt > 0:
@@ -441,22 +450,23 @@ def calculateStats(nid, gridView):
             
             tables["Stats"].append(infoTable)
 
-            infoTable = {}
+            infoTable                                       = {}
             infoTable["<b>Average Time (Reviews Only)</b>"] = ""
-            infoTable["Cards from this note"] = str(avgTime) + " seconds"
-            infoTable["Collection"] = str(avgRetAndTime[1]) + " seconds"
-            diff = calcAbsDiffInPercent(avgTime, avgRetAndTime[1])
+            infoTable["Cards from this note"]               = str(avgTime) + " seconds"
+            infoTable["Collection"]                         = str(avgRetAndTime[1]) + " seconds"
+            diff                                            = calcAbsDiffInPercent(avgTime, avgRetAndTime[1])
+
             if diff > 0:
-                infoTable["Difference"] = f"{diff} seconds <span style='color: red'>slower</span>"
+                infoTable["Difference"]                     = f"{diff} seconds <span style='color: red'>slower</span>"
             elif diff < 0:
-                infoTable["Difference"] = f"{abs(diff)} seconds <span style='color: green'>faster</span>"
+                infoTable["Difference"]                     = f"{abs(diff)} seconds <span style='color: green'>faster</span>"
         
             tables["Stats"].append(infoTable)
 
-        infoTable = {}
-        infoTable["Retention Score"] = score[2]
-        infoTable["Time Score"] = score[1]
-        infoTable["Rating Score"] = score[3]
+        infoTable                       = {}
+        infoTable["Retention Score"]    = score[2]
+        infoTable["Time Score"]         = score[1]
+        infoTable["Rating Score"]       = score[3]
         infoTable["<b>Performance</b>"] = score[0]
         tables["Stats"].append(infoTable)
 
@@ -471,13 +481,13 @@ def _build_similarity_table(similar_res_by_cid, card_ivl_by_id):
     html = """
             <br/>
             <h3 class='full-width' style='text-align: center;'>Similar Cards</h3>
-            Cards whose review history is similar to the given card one's. Similarity is measured among the interval steps (only in reviews) 
-            that a card went through. If our card has an interval of 95 days at the 4th review, and another card has 90 days at the 4th review, 
-            the similarity at this step is <br/>
-            (95 / 100) * 90 = 85.5 %.<br/> 
-            Similarities at each interval step are summed up and averaged to get the total similarity.
-            <br/>
-            <br/>
+                Cards whose review history is similar to the given card one's. Similarity is measured among the interval steps (only in reviews) 
+                that a card went through. If our card has an interval of 95 days at the 4th review, and another card has 90 days at the 4th review, 
+                the similarity at this step is <br/>
+                (95 / 100) * 90 = 85.5 %.<br/> 
+                Similarities at each interval step are summed up and averaged to get the total similarity.
+                <br/>
+                <br/>
             <b>Sample:</b> Cards, whose review history is as close as possible to the given card.<br/>
             <b>Estimated Success Chance:</b> All cards in the given sample must have at least one more review than our card. Success chance is then <i>Number of Successful Next Reviews</i> / <i>Sample Size</i><br/>
             <b>Average Interval:</b> Average Interval in the sample at our cards current step.<br/>
@@ -518,8 +528,6 @@ def _build_similarity_table(similar_res_by_cid, card_ivl_by_id):
         html += "</tbody></table>"
     return html
 
-
-
 def _get_ivl_diff_str(ivl_base, ivl_cmp):
     diff = ivl_cmp - ivl_base
     if diff < 0:
@@ -600,20 +608,31 @@ def _buildTable(tables, reviewPlotData, ivlPlotData, timePlotData, namesByCid):
                     str(c) + "' style='width: %s; height: %s; margin-left: auto; margin-right: auto; margin-top: 5px; margin-bottom: 55px;'></div></div>" % (graphWidth, graphHeight)
     return s
 
+def retention_stats_for_tag(true_ret_over_time, graph_div_id, graph_div_lbl_id):
+    """
+    Assumes that the tag info box ('#siac-tag-info-box') is already rendered.
+    The box contains a div that is the placeholder for the retention graph.
+    """
+    if true_ret_over_time is None or len(true_ret_over_time) < 2:
+        cmd = "$('#%s,#%s').hide();" % (graph_div_id, graph_div_lbl_id)
+    else:
+        options = """
+                    {  series: { 
+                            lines: { show: true, fillColor: "#2496dc" }, 
+                    }, 
+                    label: "True Retention", 
+                    yaxis: { max: 100, min: 0
+                    } , 
+                    colors: ["#2496dc"] 
+                    }
+                """
+        raw_data = [[i,t] for i, t in enumerate(true_ret_over_time)]
+        cmd = "if ($.plot) { $.plot($('#%s'), [ %s ],  %s); }" % (graph_div_id, json.dumps(raw_data), options)
+    return cmd
 
-def _cardTypeStr(typeNumber):
-    if typeNumber == 0:
-        return "new"
-    if typeNumber == 1:
-        return "learning"
-    if typeNumber == 2:
-        return "due"
-    if typeNumber == 3:
-        return "filtered"
-    return "?"
 
 def _get_revlog_graph(cid):
-    entries = mw.col.db.execute("select * from revlog where cid = %s and (type = 1 or type = 2)" % cid).fetchall()
+    entries = mw.col.db.all("select * from revlog where cid = %s and (type = 1 or type = 2)" % cid)
     html = "<div class='full-width'>%s</div>"
     blocks = ""
     for _,_,_,ease,ivl,_,_,_,type in entries:
@@ -628,38 +647,29 @@ def _get_revlog_graph(cid):
 def _calcPerformanceScore(retention, time, goodAndEasy, hard):
     if goodAndEasy == 0 and hard == 0:
         return (0, 0, 0, 0)
+
     # retention is counted higher, numbers are somewhat arbitrary
-    score = 0
+    score       = 0
     retentionSc = 2 * retention * (1 - ((100 - retention) / 100))
-    score += retentionSc
-    timeSc = 100.0 - time / 3.0 * 10.0
+    score       += retentionSc
+    timeSc      = 100.0 - time / 3.0 * 10.0
     if timeSc < 0:
-        timeSc = 0
-    score += timeSc
-    ratingSc = (goodAndEasy / (goodAndEasy + hard)) * 100
-    score += ratingSc
-    score = round(score * 100.0 / 400.0, 1)
+        timeSc  = 0
+    score       += timeSc
+    ratingSc    = (goodAndEasy / (goodAndEasy + hard)) * 100
+    score       += ratingSc
+    score       = round(score * 100.0 / 400.0, 1)
+
     return (int(score), int(timeSc), int(retentionSc * 100.0 / 200.0), int(ratingSc))
 
 
-def retention_stats_for_tag(true_ret_over_time, graph_div_id, graph_div_lbl_id):
-    """
-    Assumes that the tag info box ('#siac-tag-info-box') is already rendered.
-    The box contains a div that is the placeholder for the retention graph.
-    """
-    if true_ret_over_time is None or len(true_ret_over_time) < 2:
-        cmd = "$('#%s,#%s').hide();" % (graph_div_id, graph_div_lbl_id)
-    else:
-        options = """
-                    {  series: { 
-                            lines: { show: true, fillColor: "#2496dc" }, 
-                    }, 
-                    label: "True Retention", 
-                    yaxis: { max: 100, min: 0
-                    } , 
-                    colors: ["#2496dc"] 
-                    }
-                """
-        raw_data = [[i,t] for i, t in enumerate(true_ret_over_time)]
-        cmd = "if ($.plot) { $.plot($('#%s'), [ %s ],  %s); }" % (graph_div_id, json.dumps(raw_data), options)
-    return cmd
\ No newline at end of file
+def _cardTypeStr(typeNumber):
+    if typeNumber == 0:
+        return "new"
+    if typeNumber == 1:
+        return "learning"
+    if typeNumber == 2:
+        return "due"
+    if typeNumber == 3:
+        return "filtered"
+    return "?"
\ No newline at end of file
diff --git a/src/tag_find.py b/src/tag_find.py
index 8f2452aa..18849c80 100644
--- a/src/tag_find.py
+++ b/src/tag_find.py
@@ -37,16 +37,20 @@ def findBySameTag(tagStr, limit, decks, pinned):
         deckQ =  "(%s)" % ",".join(decks)
     else:
         deckQ = ""
+
     if deckQ:
-        res = mw.col.db.execute("select distinct notes.id, flds, tags, did, mid from notes left join cards on notes.id = cards.nid %s and did in %s" %(query, deckQ)).fetchall()
+        res = mw.col.db.all("select distinct notes.id, flds, tags, did, mid from notes left join cards on notes.id = cards.nid %s and did in %s" %(query, deckQ))
     else:
-        res = mw.col.db.execute("select distinct notes.id, flds, tags, did, mid from notes left join cards on notes.id = cards.nid %s" %(query)).fetchall()
+        res = mw.col.db.all("select distinct notes.id, flds, tags, did, mid from notes left join cards on notes.id = cards.nid %s" %(query))
+
     rList = []
     rList.extend(find_by_tag(tagStr))
+
     for r in res:
         #pinned items should not appear in the results
         if not str(r[0]) in pinned:
             rList.append(IndexNote((r[0], r[1], r[2], r[3], r[1], -1, r[4], "")))
+
     return { "result" : rList[:limit]}
 
 def display_tag_info(editor, stamp, tag, index):
@@ -62,8 +66,8 @@ def display_tag_info(editor, stamp, tag, index):
             if tag.lower() in synsetNorm:
                 tag += " " + " ".join(synset)
                 break
-    searchRes = findBySameTag(tag, 30000, [], [])
-    tagsfound = _extract_tags(searchRes["result"], tag)
+    searchRes               = findBySameTag(tag, 30000, [], [])
+    tagsfound               = _extract_tags(searchRes["result"], tag)
 
     if len(tagsfound) <= 2 and "::" in tag:
         for s in tag.split("::"):
@@ -72,12 +76,12 @@ def display_tag_info(editor, stamp, tag, index):
             if len(tagsfound) > 0:
                 break
 
-    sortedCounts = sorted(tagsfound.items(), key=lambda kv: kv[1], reverse=True)
-    time_stamp_for_graph = utility.text.get_stamp()
-    
-    window = mw.app.activeWindow()
-    should_hide_left_side = window is not None and window.width() < 1000
-    html = ""
+    sortedCounts            = sorted(tagsfound.items(), key=lambda kv: kv[1], reverse=True)
+    time_stamp_for_graph    = utility.text.get_stamp()
+    window                  = mw.app.activeWindow()
+    should_hide_left_side   = window is not None and window.width() < 1000
+    html                    = ""
+
     if should_hide_left_side:
         html = """
                 <span id='siac-tag-graph-lbl-%s'>Retention for this Topic / Reviews</span>
@@ -122,7 +126,9 @@ def display_tag_info(editor, stamp, tag, index):
                     else:
                         tagsfound[s] = 1
         sortedCounts = sorted(tagsfound.items(), key=lambda kv: kv[1], reverse=True)
+
     total_length = 0
+
     for k in sortedCounts[:10]:
         if should_hide_left_side:
             tags += "<div data-stamp='siac-tg-%s' class='tagLbl smallMarginBottom' data-name='%s' onclick='tagClick(this); event.stopPropagation();'>%s</div>" % (utility.text.get_stamp(), k[0], utility.text.trim_if_longer_than(k[0], 40))
@@ -135,41 +141,41 @@ def display_tag_info(editor, stamp, tag, index):
     if len(tags) == 0:
         tags = "Could not find any related tags. Related tags are determined by looking for tags that appear on the same notes as the given tag."
 
-
     nids = [r.id for r in searchRes["result"]]
     tret = getAvgTrueRetention(nids)
+
     if tret is not None:
-        color = utility.misc._retToColor(tret)    
-        tret = "<span style='background: %s; color: black;'>&nbsp;%s&nbsp;</span>" % (color, tret)
+        color   = utility.misc._retToColor(tret)    
+        tret    = "<span style='background: %s; color: black;'>&nbsp;%s&nbsp;</span>" % (color, tret)
 
     if not should_hide_left_side:
-        sorted_db_list = sorted(searchRes["result"], key=lambda x: x.id, reverse=True)
-        note_html = index.ui.get_result_html_simple(sorted_db_list[:100])
-        enlarge_note_area_height = "max-height: 320px" if total_length > 120 and tret is not None else ""
-        tag_name = tag
+        sorted_db_list              = sorted(searchRes["result"], key=lambda x: x.id, reverse=True)
+        note_html                   = index.ui.get_result_html_simple(sorted_db_list[:100])
+        enlarge_note_area_height    = "max-height: 320px" if total_length > 120 and tret is not None else ""
+        tag_name                    = tag
+
         if " " in tag_name:
-            base = tag_name.split()[0]
-            tag_name = utility.text.trim_if_longer_than(base, 25) + " (+%s)" % len(tag_name.split()[1:])
+            base                    = tag_name.split()[0]
+            tag_name                = utility.text.trim_if_longer_than(base, 25) + " (+%s)" % len(tag_name.split()[1:])
         else:
-            tag_name = utility.text.trim_if_longer_than(tag_name, 28)
+            tag_name                = utility.text.trim_if_longer_than(tag_name, 28)
 
-        html = html % (tag_name, enlarge_note_area_height, stamp, note_html, time_stamp_for_graph, time_stamp_for_graph, tret if tret is not None else "Not enough Reviews", len(searchRes["result"]), tags)
+        html                        = html % (tag_name, enlarge_note_area_height, stamp, note_html, time_stamp_for_graph, time_stamp_for_graph, tret if tret is not None else "Not enough Reviews", len(searchRes["result"]), tags)
 
     else:
-        html = html % (time_stamp_for_graph, time_stamp_for_graph, tret if tret is not None else "Not enough Reviews", len(searchRes["result"]), tags)
+        html    = html % (time_stamp_for_graph, time_stamp_for_graph, tret if tret is not None else "Not enough Reviews", len(searchRes["result"]), tags)
 
     index.ui._loadPlotJsIfNotLoaded()
 
-    ret_data = getTrueRetentionOverTime(nids)
-    graph_js = retention_stats_for_tag(ret_data, "siac-tag-graph-" + time_stamp_for_graph, "siac-tag-graph-lbl-" + time_stamp_for_graph)
+    ret_data    = getTrueRetentionOverTime(nids)
+    graph_js    = retention_stats_for_tag(ret_data, "siac-tag-graph-" + time_stamp_for_graph, "siac-tag-graph-lbl-" + time_stamp_for_graph)
    
-    id_for_box = "siac-tag-info-box-" + stamp
-    params = {          "stamp": stamp,
+    id_for_box  = "siac-tag-info-box-" + stamp
+    params      = {      "stamp": stamp,
                          "id" : id_for_box, 
                          "html" : html,
                          "graph_js": graph_js,
                          "should_be_small": "siac-tag-info-box-small" if should_hide_left_side else ""
-
                      }
     # we have to adjust the 'top' css property if the element has the class '.siac-tag-info-box-inverted'
     # we can only do this after the content has been rendered since we have to know the actual height.
@@ -203,11 +209,12 @@ def get_most_active_tags(max_count):
     Looks into the 100 last edited/created notes.
     Returns an ordered list of max max_count items.
     """
-    res = mw.col.db.execute("select tags from notes order by mod desc limit 100").fetchall()
+    res = mw.col.db.all("select tags from notes order by mod desc limit 100")
     if res is None or len(res) == 0:
         return []
-    counts = dict()
-    tag = ""
+
+    counts  = dict()
+    tag     = ""
     for r in res:
         spl = r[0].split()
         for t in spl:
@@ -220,7 +227,9 @@ def get_most_active_tags(max_count):
                 counts[tag] += 1
             else:
                 counts[tag] = 1
+
     user_tags = get_recently_used_tags_with_counts() 
+
     for t, c in user_tags.items():
         if "::" in t:
             tag = t.split("::")[0]
@@ -231,6 +240,7 @@ def get_most_active_tags(max_count):
         else:
             counts[tag] = c
     ordered = [i[0] for i in list(sorted(counts.items(), key=lambda item: item[1], reverse = True))][:max_count]
+
     return ordered
 
             
diff --git a/src/utility/date.py b/src/utility/date.py
new file mode 100644
index 00000000..b9066eba
--- /dev/null
+++ b/src/utility/date.py
@@ -0,0 +1,85 @@
+import typing
+from typing import List, Optional
+from datetime import datetime, timedelta
+import calendar
+
+def next_instance_of_weekdays(wd: List[int]) -> datetime:
+    """
+        Monday = 1, ...
+        Today is excluded.
+    """
+    today = datetime.today()
+    while True:
+        today = today + timedelta(days=1)
+        weekday = today.weekday() + 1
+        if weekday in wd:
+            return today
+    
+def weekday_name(wd: int) -> str:
+    return list(calendar.day_name)[wd - 1]
+
+def weekday_name_abbr(wd: int) -> str:
+    return list(calendar.day_abbr)[wd - 1]
+
+def date_today_stamp() -> str:
+    return datetime.today().strftime('%Y-%m-%d-%H-%M-%S')
+
+def date_now_stamp() -> str:
+    return datetime.now().strftime('%Y-%m-%d-%H-%M-%S')
+
+def dt_to_stamp(dt : datetime) -> str:
+    return dt.strftime('%Y-%m-%d-%H-%M-%S')
+
+def dt_from_stamp(stamp: str) -> datetime:
+    return datetime.strptime(stamp, '%Y-%m-%d-%H-%M-%S')
+
+def get_last_schedule_date(schedule: str) -> Optional[datetime]:
+    if len(schedule.split("|")[0]) == 0:
+        return None
+    return dt_from_stamp(schedule.split("|")[0])
+
+def schedule_verbose(sched: str) -> str:
+    """ Returns a natural language representation of the given schedule string. """
+
+    created     = sched.split("|")[0]
+    due         = sched.split("|")[1]
+    stype       = sched.split("|")[2][0:2]
+    stype_val   = sched.split("|")[2][3:]
+
+    if stype == "wd":
+        days = ", ".join([weekday_name_abbr(int(c)) for c in stype_val])
+        return f"This note is scheduled for every {days}."
+
+    if stype == "id":
+        if stype_val == "2":
+            return f"This note is scheduled for every second day."
+        if stype_val == "1":
+            return f"This note is scheduled to appear everyday."
+        return f"This note is scheduled to appear every {stype_val} days."
+
+    if stype == "td":
+        delta_days = (datetime.now().date() - dt_from_stamp(created).date()).days
+        if delta_days == 0:
+            return f"This note was scheduled today to appear in {stype_val} day(s)."
+        if delta_days == 1:
+            return f"This note was scheduled yesterday to appear in {stype_val} day(s)."
+        return f"This note was scheduled {delta_days} days ago to appear in {stype_val} day(s)."
+
+
+def get_new_reminder(stype: str, svalue: str) -> str:
+    now = date_now_stamp()
+    if stype == "td":
+        # show again in n days
+        next_date_due = datetime.now() + timedelta(days=int(svalue))
+        return f"{now}|{dt_to_stamp(next_date_due)}|td:{svalue}"
+    elif stype == "wd":
+        # show again on next weekday instance
+        weekdays_due = [int(d) for d in svalue]
+        next_date_due = next_instance_of_weekdays(weekdays_due)
+        return f"{now}|{dt_to_stamp(next_date_due)}|wd:{svalue}"
+    elif stype == "id":
+        # show again according to interval
+        next_date_due = datetime.now() + timedelta(days=int(svalue))
+        return f"{now}|{dt_to_stamp(next_date_due)}|id:{svalue}"
+        
+
diff --git a/src/utility/misc.py b/src/utility/misc.py
index af5e68c4..d706f974 100644
--- a/src/utility/misc.py
+++ b/src/utility/misc.py
@@ -213,6 +213,9 @@ def img_src(img_name):
     port = mw.mediaServer.getPort()
     return f"http://127.0.0.1:{port}/_addons/{get_addon_id()}/web/icons/{img_name}"
 
+def img_src_base_path():
+    port = mw.mediaServer.getPort()
+    return f"http://127.0.0.1:{port}/_addons/{get_addon_id()}/web/icons/"
 
 def url_to_pdf(url, output_path, cb_after_finish = None):
     """
@@ -259,15 +262,47 @@ def get_pdf_save_full_path(path, pdfname):
     path = os.path.join(path, pdfname + ".pdf")
     return path
 
-def find_pdf_files_in_dir(dir):
+def find_pdf_files_in_dir(dir, cut_path=True):
     try:
         if not os.path.exists(dir):
             return []
-        res = glob(os.path.join(dir, "*.pdf"))
-        res = [r[max(r.rindex("\\"),r.rindex("/"))+1:] for r in res]
+        res = [f.path for f in os.scandir(dir) if f.name.endswith(".pdf")]
+        if cut_path:
+            res = [r[max(r.rfind("\\"),r.rfind("/"))+1:] for r in res]
         return res
-    except:
+    except Exception as e:
+        print(e)
+        return []
+
+def find_pdf_files_in_dir_recursive(directory, cut_path=True):
+    directory = directory.replace("\\", "/")
+    if not directory.endswith("/"):
+        directory += "/"
+
+    if not os.path.exists(directory):
         return []
+    def _find_rec(dir, cut_path):
+        try:
+            dir = dir.replace("\\", "/")
+            if not dir.endswith("/"):
+                dir += "/"
+            res = [f.path for f in os.scandir(dir) if f.name.endswith(".pdf")]
+            if cut_path:
+                res = [r[max(r.rfind("\\"),r.rfind("/"))+1:] for r in res]
+            sub_dirs = subdirs_fullpath(dir)
+            for sub_dir in sub_dirs:
+                res += _find_rec(sub_dir, cut_path)
+            return res
+        except Exception as e:
+            print(e)
+            return []
+
+    result = _find_rec(directory, cut_path)
+
+    return result
+
+def subdirs_fullpath(path):
+    return [entry.path for entry in os.scandir(path) if entry.is_dir()]
 
 def _retToColor(retention):
     if retention < (100 / 7.0):
@@ -282,4 +317,6 @@ def _retToColor(retention):
         return "#cbff00"
     if retention < (100 / 7.0) * 6:
         return "#7fff00"
-    return "#32ff00"
\ No newline at end of file
+    return "#32ff00"
+
+
diff --git a/src/utility/tags.py b/src/utility/tags.py
index cd8a7782..48288955 100644
--- a/src/utility/tags.py
+++ b/src/utility/tags.py
@@ -14,6 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import utility.text
+
 
 def to_tag_hierarchy(tags, sep="::"):
     tmap = {}
@@ -38,6 +40,22 @@ def iterateTagmap(tmap, prefix):
                 res.append(prefix + key)
     return res
 
+def flatten_map(map, sep):
+    changed = True
+
+    while changed:
+        changed = False
+        updated = dict()
+        for key, value in map.items():
+            if len(value) == 1:
+                changed = True
+                new_key = key + sep + next(iter(value))
+                updated[new_key] = value[next(iter(value))]
+            else:
+                updated[key] = value
+        map = updated
+    return map
+
 
 def _add_to_tag_list(tmap, name, sep="::"):
     """
@@ -50,4 +68,36 @@ def _add_to_tag_list(tmap, name, sep="::"):
             found = found.setdefault(names[i], {})
         if not d in found:
             found.update({d : {}}) 
-    return tmap
\ No newline at end of file
+    return tmap
+
+
+def build_tag_string(tags, gridView, hover = True, maxLength = -1, maxCount = -1):
+    """
+    Builds the html for the tags that are displayed at the bottom right of each rendered search result.
+    """
+    html = ""
+    tags_split = tags.split()
+    tm = to_tag_hierarchy(tags_split)
+    totalLength = sum([len(k) for k,v in tm.items()])
+    if maxLength == -1:
+        maxLength = 40 if not gridView else 30
+    if maxCount == -1:
+        maxCount = 3 if not gridView else 2
+    if len(tm) <= maxCount or totalLength < maxLength:
+        hover = "onmouseenter='tagMouseEnter(this)' onmouseleave='tagMouseLeave(this)'" if hover else ""
+        for t, s in tm.items():
+            stamp = "siac-tg-" + utility.text.get_stamp()
+            if len(s) > 0:
+                tagData = " ".join(iterateTagmap({t : s}, ""))
+                if len(s) == 1 and tagData.count("::") < 2 and not t in tags_split:
+                    html = f"{html}<div class='tagLbl' data-stamp='{stamp}' data-tags='{tagData}' data-name='{tagData.split(' ')[1]}' {hover} onclick='tagClick(this);'>{utility.text.trim_if_longer_than(tagData.split(' ')[1], maxLength)}</div>"
+                else:
+                    html = f"{html}<div class='tagLbl' data-stamp='{stamp}' data-tags='{tagData}' data-name='{tagData}' {hover} onclick='tagClick(this);'>{utility.text.trim_if_longer_than(t, maxLength)} (+{len(s)})</div>" 
+            else:
+                html = f"{html}<div class='tagLbl' data-stamp='{stamp}' {hover} data-name='{t}' onclick='tagClick(this);'>{utility.text.trim_if_longer_than(t, maxLength)}</div>"
+    else:
+        stamp = "siac-tg-" + utility.text.get_stamp()
+        tagData = " ".join(iterateTagmap(tm, ""))
+        html = f"{html}<div class='tagLbl' data-stamp='{stamp}' data-tags='{tagData}' data-name='{tagData}' onclick='tagClick(this);'>{len(tm)} tags ...</div>" 
+
+    return html
\ No newline at end of file
diff --git a/src/utility/text.py b/src/utility/text.py
index 61300ceb..f978e77f 100644
--- a/src/utility/text.py
+++ b/src/utility/text.py
@@ -20,24 +20,34 @@
 import time
 import random
 
-cleanWordReg = re.compile(u"^[^a-zA-Z0-9À-ÖØ-öø-ÿāōūēīȳǒǎǐě\u3040-\u30ff\u3400-\u4dbf\u4e00-\u9fff\uf900-\ufaff\uff66-\uff9f]*(\S+?)[^a-zA-Z0-9À-ÖØ-öø-ÿāōūēīȳǒǎǐě\u3040-\u30ff\u3400-\u4dbf\u4e00-\u9fff\uf900-\ufaff\uff66-\uff9f]*$", re.I |re.U)    
-ignoreReg = re.compile(u"^[^a-zA-Z0-9À-ÖØ-öø-ÿǒāōūēīȳǒǎǐě\u3040-\u30ff\u3400-\u4dbf\u4e00-\u9fff\uf900-\ufaff\uff66-\uff9f]+$", re.I | re.U)
-nonWordReg = re.compile(u"[^a-zA-Z0-9À-ÖØ-öø-ÿāōūēīȳǒǎǐě\u3040-\u30ff\u3400-\u4dbf\u4e00-\u9fff\uf900-\ufaff\uff66-\uff9f]", re.I | re.U) 
-tagReg = re.compile(r'<[^>]+>|&nbsp;', flags = re.I)
-spaceReg = re.compile('\s{2,}')
-normalChar = re.compile(u"[a-z0-9öäü\u3040-\u30ff\u3400-\u4dbf\u4e00-\u9fff\uf900-\ufaff\uff66-\uff9f]", re.I | re.U) 
-chineseChar = re.compile(u"[\u3040-\u30ff\u3400-\u4dbf\u4e00-\u9fff\uf900-\ufaff\uff66-\uff9f]", re.U)
-non_weird_char = re.compile(u"[.;,-:_+*#?!\"'a-z0-9À-ÖØ-öø-ÿāōūēīȳǒǎǐě]", re.I | re.U)
+cleanWordReg    = re.compile(u"^[^a-zA-Z0-9À-ÖØ-öø-ÿāōūēīȳǒǎǐě\u3040-\u30ff\u3400-\u4dbf\u4e00-\u9fff\uf900-\ufaff\uff66-\uff9f\u3131-\uD79D]*(\S+?)[^a-zA-Z0-9À-ÖØ-öø-ÿāōūēīȳǒǎǐě\u3040-\u30ff\u3400-\u4dbf\u4e00-\u9fff\uf900-\ufaff\uff66-\uff9f\u3131-\uD79D]*$", re.I |re.U)    
+ignoreReg       = re.compile(u"^[^a-zA-Z0-9À-ÖØ-öø-ÿǒāōūēīȳǒǎǐě\u3040-\u30ff\u3400-\u4dbf\u4e00-\u9fff\uf900-\ufaff\uff66-\uff9f\u3131-\uD79D]+$", re.I | re.U)
+nonWordReg      = re.compile(u"[^a-zA-Z0-9À-ÖØ-öø-ÿāōūēīȳǒǎǐě\u3040-\u30ff\u3400-\u4dbf\u4e00-\u9fff\uf900-\ufaff\uff66-\uff9f\u3131-\uD79D]", re.I | re.U) 
+wordToken       = re.compile(u"[a-zA-Z0-9À-ÖØ-öø-ÿāōūēīȳǒǎǐě\u3040-\u30ff\u3400-\u4dbf\u4e00-\u9fff\uf900-\ufaff\uff66-\uff9f\u3131-\uD79D]", re.I | re.U)
+
+# used to merge multiple field separator signs into singles 
+SEP_RE          = re.compile(r'(?:\u001f){2,}|(?:\u001f[\s\r\n]+\u001f)')
+# used to hide IO fields
+IO_REPLACE      = re.compile('<img src="[^"]+(-\d+-Q|-\d+-A|-(<mark>)?oa(</mark>)?-[OA]|-(<mark>)?ao(</mark>)?-[OA])\.svg" ?/?>(</img>)?')
+# move images in own line
+IMG_FLD         = re.compile('\\|</span> ?(<img[^>]+/?>)( ?<span class=\'fldSep\'>|$)')
+
+tagReg          = re.compile(r'<[^>]+>|&nbsp;', flags = re.I)
+spaceReg        = re.compile('\s{2,}')
+normalChar      = re.compile(u"[a-z0-9öäü\u3040-\u30ff\u3400-\u4dbf\u4e00-\u9fff\uf900-\ufaff\uff66-\uff9f\u3131-\uD79D]", re.I | re.U) 
+asianChar       = re.compile(u"[\u3040-\u30ff\u3400-\u4dbf\u4e00-\u9fff\uf900-\ufaff\uff66-\uff9f\u3131-\uD79D]", re.U)
 
 def clean(text, stopWords):
-    filtered = ""
-    text = text.replace("\r\n", " ").replace("\n", " ")
-    text = text.replace("\t", " ")
-    text = text.replace("\u001f", " ")
-    text = tagReg.sub(" ", text)
-    text = nonWordReg.sub(" ", text)
-    text = spaceReg.sub(" ", text)
-    stopWords = [s.lower() for s in stopWords]
+
+    filtered    = ""
+    text        = text.replace("\r\n", " ").replace("\n", " ")
+    text        = text.replace("\t", " ")
+    text        = text.replace("\u001f", " ")
+    text        = tagReg.sub(" ", text)
+    text        = nonWordReg.sub(" ", text)
+    text        = spaceReg.sub(" ", text)
+    stopWords   = [s.lower() for s in stopWords]
+
     for token in tokenize(text):
         #this will prevent indexing / searching for base64 data urls
         if len(token) > 200:
@@ -45,9 +55,10 @@ def clean(text, stopWords):
         if ignoreReg.match(token) is not None:
             continue
         cleaned = cleanWordReg.sub(r'\1', token.strip())
-        if (len(cleaned) <= 1 and not chineseChar.search(cleaned)) or cleaned.lower() in stopWords:
+        if (len(cleaned) <= 1 and not asianChar.search(cleaned)) or cleaned.lower() in stopWords:
             continue
         filtered += cleaned + " "
+
     if len(filtered) > 0:
         return filtered[:-1]
     return ""
@@ -94,7 +105,7 @@ def tokenize(text):
     result = []
     spl = text.split(" ")
     for token in spl:
-        if re.search(u'[\u3040-\u30ff\u3400-\u4dbf\u4e00-\u9fff\uf900-\ufaff\uff66-\uff9f]', token):
+        if re.search(u'[\u3040-\u30ff\u3400-\u4dbf\u4e00-\u9fff\uf900-\ufaff\uff66-\uff9f\u3131-\uD79D]', token):
             for char in token:
                 result.append(str(char))
         else:
@@ -106,12 +117,13 @@ def text_too_small(text):
         return False
     if len(text) == 0:
         return True
-    if chineseChar.search(text):
+    if asianChar.search(text):
         return False
     return True
 
-def is_chinese_char(char):
-    return chineseChar.match(char)
+def is_asian_char(char):
+    """ Supported atm: chinese, japanese, korean """
+    return asianChar.match(char)
 
 
 def ascii_fold_char(char):
@@ -272,6 +284,24 @@ def clean_user_note_title(title):
     title = title.replace("\t", "")
     return title
 
+def cleanFieldSeparators(text):
+    text = SEP_RE.sub("\u001f", text)
+    if text.endswith("\u001f"):
+        text = text[:-1]
+    text = text.replace("\u001f", "<span class='fldSep'>|</span>")
+    return text
+
+def newline_before_images(text):
+    return IMG_FLD.sub("|</span><br/>\\1<br/>\\2", text)
+
+def try_hide_image_occlusion(text):
+    """
+    Image occlusion cards take up too much space, so we try to hide all images except for the first.
+    """
+    if not text.count("<img ") > 1:
+        return text
+    text = IO_REPLACE.sub("(IO - image hidden)", text)
+    return text
 
 def clean_file_name(name):
     name = re.sub("[^a-zA-Z0-9]", "-", name)
@@ -284,19 +314,23 @@ def remove_special_chars(text):
 def try_find_sentence(text, selection):
     if not selection in text:
         return None
-    selection = re.sub("  +", " ", selection).strip()
-    text = re.sub("  +", " ", text).strip()
-    last = text.rindex(selection)
-    pre = text[:last]
+
+    selection   = re.sub("  +", " ", selection).strip()
+    text        = re.sub("  +", " ", text).strip()
+    last        = text.rindex(selection)
+    pre         = text[:last]
     
     def _try_find_closing(text):
         found = False
-        for c in [".", "!", "?", "•", ":", "=", "#", "-", "§", "Ø", "*"]:
+        for c in ["\\.\\B", "!", "\\?", "•", ":", "=", "#", "-", "§", "Ø", "\\*"]:
             try:
-                if text.rindex(c) >= 0 and text.rindex(c) < len(text) -1:
-                    text = text[text.rindex(c) + 1:]
-                    found = True
-                    break
+                found = [(i.start()) for i in re.finditer(c,text)]
+                if len(found) > 0:
+                    last_index = found[-1]
+                    if last_index < len(text) - 1:
+                        text = text[last_index + 1]
+                        found = True
+                        break
             except:
                 continue
         if not found: 
@@ -306,13 +340,14 @@ def _try_find_closing(text):
         return text
     
     
-    pre = _try_find_closing(pre)
+    pre         = _try_find_closing(pre)
     if pre is None:
         return None
-    after = text[last:]
-    after = _try_find_closing(after[::-1])
+    after       = text[last:]
+    after       = _try_find_closing(after[::-1])
     if after is None: 
         return None
+
     return pre + after[::-1] + "."
 
    
@@ -321,4 +356,57 @@ def clean_tags(tags):
         return ""
     
     tags = re.sub("[`'\"]", "", tags)
-    return tags
\ No newline at end of file
+    return tags
+
+
+def mark_highlights(text, querySet):
+
+    currentWord             = ""
+    currentWordNormalized   = ""
+    textMarked              = ""
+    lastIsMarked            = False
+    # c = 0
+    for char in text:
+        # c += 1
+        if wordToken.match(char):
+            currentWordNormalized = ''.join((currentWordNormalized, ascii_fold_char(char).lower()))
+            # currentWordNormalized = ''.join((currentWordNormalized, char.lower()))
+            if is_asian_char(char) and str(char) in querySet:
+                currentWord = ''.join((currentWord, "<MARK>%s</MARK>" % char))
+            else:
+                currentWord = ''.join((currentWord, char))
+
+        else:
+            #we have reached a word boundary
+            #check if word is empty
+            if currentWord == "":
+                textMarked = ''.join((textMarked, char))
+            else:
+                #if the word before the word boundary is in the query, we want to highlight it
+                if currentWordNormalized in querySet:
+                    #we check if the word before has been marked too, if so, we want to enclose both, the current word and
+                    # the word before in the same <mark></mark> tag (looks better)
+                    if lastIsMarked and not "\u001f" in textMarked[textMarked.rfind("<MARK>"):]:
+                    # if lastIsMarked:
+                        closing_index   = textMarked.rfind("</MARK>")
+                        textMarked      = ''.join((textMarked[0: closing_index], textMarked[closing_index + 7 :]))
+                        textMarked      = ''.join((textMarked, currentWord, "</MARK>", char))
+                    else:
+                        textMarked      = ''.join((textMarked, "<MARK>", currentWord, "</MARK>", char))
+                        # c += 13
+                    lastIsMarked = True
+                #if the word is not in the query, we simply append it unhighlighted
+                else:
+                    textMarked      = ''.join((textMarked, currentWord, char))
+                    lastIsMarked    = False
+
+                currentWord             = ""
+                currentWordNormalized   = ""
+
+    if currentWord != "":
+        if currentWord != "MARK" and currentWordNormalized in querySet:
+            textMarked = ''.join((textMarked, "<MARK>", currentWord, "</MARK>"))
+        else:
+            textMarked = ''.join((textMarked, currentWord))
+
+    return textMarked
\ No newline at end of file
diff --git a/src/web/html.py b/src/web/html.py
index e1d100dd..5f7903b0 100644
--- a/src/web/html.py
+++ b/src/web/html.py
@@ -1,6 +1,5 @@
 # anki-search-inside-add-card
 # Copyright (C) 2019 - 2020 Tom Z.
-
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -23,10 +22,9 @@
 import io
 from aqt import mw
 from aqt.utils import showInfo
-import html as ihtml
 
 from ..state import get_index, check_index
-from ..notes import get_note, _get_priority_list, get_avg_pages_read, get_all_tags, get_related_notes, get_priority_as_str
+from ..notes import  get_note, _get_priority_list, get_avg_pages_read, get_all_tags, get_related_notes, get_priority, dynamic_sched_to_str
 from ..feeds import read
 from ..internals import perf_time
 from ..config import get_config_value_or_default as conf_or_def
@@ -46,7 +44,7 @@ def getSynonymEditor():
     </div>
     <br/>
     <span>Input a set of terms, separated by ',' and hit enter.</span>
-    <input type='text' id='synonymInput' onkeyup='synInputKeyup(event, this)'/>
+    <input type='text' id='siac-syn-inp' onkeyup='synInputKeyup(event, this)'/>
     """
     synonyms = loadSynonyms()
     st = ""
@@ -56,13 +54,13 @@ def getSynonymEditor():
                         <div contenteditable='true' onkeydown='synonymSetKeydown(event, this, %s)'>%s</div>
                     </td>
                     <td style='text-align: right; height: 20px;'>
-                        <div class='siac-btn-smaller' onclick='pycmd(\"deleteSynonyms %s\")'>Del</div>
+                        <div class='siac-btn-smaller' onclick='pycmd(\"siac-delete-synonyms %s\")'>Del</div>
                         <div class='siac-btn-smaller' style='margin-left: 4px;' onclick='searchSynset(this)'>Search</div>
                     </td>
                 </tr>""" % (c, ", ".join(sList), c)
     if not synonyms:
         return """No synonyms defined yet. Input a set of terms, separated by ',' and hit enter.<br/><br/>
-        <input type='text' id='synonymInput' onkeyup='synInputKeyup(event, this)'/>
+        <input type='text' id='siac-syn-inp' onkeyup='synInputKeyup(event, this)'/>
         """
     return synonymEditor % st
 
@@ -150,13 +148,11 @@ def right_side_html(indexIsLoaded = False):
         insert_code = """
             $(toInsert).insertAfter('#leftSide');   
         """
-
+  
     return """
-
         //check if ui has been rendered already
         (() => { 
         if (!$('#outerWr').length) {
-
         $(`#fields`).wrap(`<div class='siac-col' id='leftSide' style='flex-grow: 1; width: %s%%;'></div>`);
         document.getElementById('topbutsleft').innerHTML += "<button id='switchBtn' onclick='showSearchPaneOnLeftSide()'>&#10149; Search</button>";
         let toInsert = `
@@ -208,7 +204,7 @@ def right_side_html(indexIsLoaded = False):
                         </div>
                     </div>
                     <div class='flexCol right' style="position: relative; padding-bottom: 7px; padding-right: 0px; white-space: nowrap;">
-                            <div id='siac-timetable-icn' class='siac-btn-small' onclick='$(this).toggleClass("expanded")' onmouseleave='$(this).removeClass("expanded")' style='position: relative; display:inline-block; margin-right: 6px;' onmouseenter='pycmd("siac-user-note-update-btns")' onclick='pycmd("siac-create-note");'>&nbsp;&nbsp; &#9998; Notes &nbsp;&nbsp;
+                            <div id='siac-timetable-icn' class='siac-btn-small' onclick='$(this).toggleClass("expanded")' onmouseleave='$(this).removeClass("expanded")' style='position: relative; display:inline-block; margin-right: 6px;' onmouseenter='pycmd("siac-user-note-update-btns")' onclick='pycmd("siac-create-note");'>&nbsp;&nbsp;&nbsp; &#9998; Notes &nbsp;&nbsp;&nbsp;
                                 <div class='siac-btn-small-dropdown click'>
                                         <div class='siac-dropdown-item' style='width: 100%%;' onclick='pycmd("siac-create-note"); event.stopPropagation();'>&nbsp;<b>Create</b></div>
                                         <div class='siac-dropdown-item' style='width: 100%%;' onclick='pycmd("siac-user-note-newest"); event.stopPropagation();'>&nbsp;Newest</div>
@@ -219,6 +215,7 @@ def right_side_html(indexIsLoaded = False):
                                         <div class='siac-dropdown-item' style='width: 100%%;' onclick='pycmd("siac-user-note-queue-read-head"); event.stopPropagation();'>&nbsp;<b>Read Next</b></div>
                                         <div class='siac-dropdown-item' style='width: 100%%;' onclick='pycmd("siac-user-note-queue-read-random"); event.stopPropagation();'>&nbsp;Read [Rnd]</div>
                                         <div class='siac-dropdown-item' style='width: 100%%;' onclick='pycmd("siac-url-dialog"); event.stopPropagation();'>&nbsp;Url to PDF</div>
+                                        <div class='siac-dropdown-item' style='width: 100%%;' onclick='pycmd("siac-zotero-import"); event.stopPropagation();'>&nbsp;Zotero Imp.</div>
                                         <div class='siac-dropdown-item' style='width: 100%%;' onclick='pycmd("siac-user-note-queue-random"); event.stopPropagation();'>&nbsp;List [Rnd]</div>
                                 </div>
                             </div>
@@ -253,9 +250,9 @@ def right_side_html(indexIsLoaded = False):
                                                 <br>
                                                 <span>Menus</span>
                                                 <hr>
-                                                <div class='siac-dropdown-item' style='width: 100%%;' onclick='pycmd("indexInfo");'>&nbsp;Info</div>
-                                                <div class='siac-dropdown-item' style='width: 100%%;' onclick='pycmd("synonyms");'>&nbsp;Synonyms</div>
-                                                <div class='siac-dropdown-item' style='width: 100%%;' onclick='pycmd("styling");'>&nbsp;Settings</div>
+                                                <div class='siac-dropdown-item' style='width: 100%%;' onclick='pycmd("siac-index-info");'>&nbsp;Info</div>
+                                                <div class='siac-dropdown-item' style='width: 100%%;' onclick='pycmd("siac-synonyms");'>&nbsp;Synonyms</div>
+                                                <div class='siac-dropdown-item' style='width: 100%%;' onclick='pycmd("siac-styling");'>&nbsp;Settings</div>
                                                 <div class='siac-dropdown-item' style='width: 100%%;' onclick='$("#a-modal").hide(); pycmd("siac_rebuild_index")'>&nbsp;Rebuild Index</div>
                                         </div>
                             </div>
@@ -371,7 +368,7 @@ def right_side_html(indexIsLoaded = False):
            var there = true;
         }
         
-        $('.field').on('keyup', fieldKeypress);
+        $('.field').off('siac').on('keyup.siac', fieldKeypress);
         $('.field').attr('onmouseup', 'getSelectionText()');
         window.$fields = $('.field');
         window.$searchInfo = $('#searchInfo');
@@ -379,7 +376,6 @@ def right_side_html(indexIsLoaded = False):
         window.addEventListener('resize', onWindowResize, true);
         $('.cal-block-outer').on('mouseenter', function(event) { calBlockMouseEnter(event, this);});
         $('.cal-block-outer').on('click', function(event) { displayCalInfo(this);});
-
         return there; 
         
         })();
@@ -397,53 +393,6 @@ def right_side_html(indexIsLoaded = False):
     insert_code
     )
 
-def get_notes_sidebar_html():
-    """
-        Returns the html for the sidebar that is displayed when clicking on the notes button.
-    """
-    tags = get_all_tags()
-    tmap = utility.tags.to_tag_hierarchy(tags)
-
-    def iterateMap(tmap, prefix, start=False):
-        if start:
-            html = "<ul class='deck-sub-list outer'>"
-        else:
-            html = "<ul class='deck-sub-list'>"
-        for key, value in tmap.items():
-            full = prefix + "::" + key if prefix else key
-            html += "<li class='deck-list-item' onclick=\"event.stopPropagation(); pycmd('siac-user-note-search-tag %s')\"><div class='list-item-inner'><b class='exp'>%s</b> %s <span class='siac-tl-plus' onclick='pycmd(\"siac-create-note-tag-prefill %s\") '><b>NEW</b></span></div>%s</li>" % (full, "[+]" if value else "", utility.text.trim_if_longer_than(key, 35), full, iterateMap(value, full, False))
-        html += "</ul>"
-        return html
-
-    tag_html = iterateMap(tmap, "", True)
-    html = """
-        <div id='siac-notes-sidebar'>
-            <div style='display: flex; flex-direction: column; height: 100%%;'>
-                <div style='flex: 0 1 auto;'>
-                    <div class='siac-notes-sidebar-item blue-hover' onclick='pycmd("siac-user-note-newest");'>Newest</div>
-                    <div class='siac-notes-sidebar-item blue-hover' onclick='pycmd("siac-show-pdfs")'>PDFs</div>
-                    <div class='siac-notes-sidebar-item blue-hover' onclick='pycmd("siac-show-pdfs-unread")'>PDFs - Unread</div>
-                    <div class='siac-notes-sidebar-item blue-hover' onclick='pycmd("siac-show-pdfs-in-progress")'>PDFs - In Progress</div>
-                    <div class='siac-notes-sidebar-item blue-hover' onclick='pycmd("siac-user-note-untagged")'>Untagged</div>
-                    <div class='siac-notes-sidebar-item blue-hover' onclick='pycmd("siac-user-note-random");'>Random</div>
-                    <input type='text' class='siac-sidebar-inp' style='width: calc(100%% - 35px); box-sizing: border-box; border-radius: 4px; padding-left: 4px; margin-top: 10px;' onkeyup='searchForUserNote(event, this);'/>
-                    <span class='siac-search-icn' style='width: 16px; height: 16px; background-size: 16px 16px;'></span>
-                    <div class='w-100' style='margin-top: 20px;'><b>Tags (%s)</b>
-                        <b class='siac-tags-exp-icon' style='margin-right: 15px; padding: 0 2px 0 2px;' onclick='noteSidebarCollapseAll();'>&#x25B2;</b>
-                        <b class='siac-tags-exp-icon' style='margin-right: 5px; padding: 0 2px 0 2px;' onclick='noteSidebarExpandAll();'>&#x25BC;</b>
-                    </div>
-                    <hr style='margin-right: 15px;'/>
-                </div>
-                <div style='flex: 1 1 auto; padding-right: 5px; margin-right: 5px; margin-bottom: 5px; overflow-y: auto;'>
-                    %s
-                </div>
-            </div>
-
-        </div>
-
-    """ % (len(tmap) if tmap is not None else 0, tag_html)
-    return html
-
 
 def get_model_dialog_html():
     """
@@ -489,558 +438,6 @@ def get_model_dialog_html():
     html += "</div></div>"
     return html
 
-def get_reading_modal_html(note):
-    """
-        Main function to render the reading modal and its contents.
-    """
-    index = get_index()
-
-    note_id = note.id
-    text = note.text
-    tags = note.tags
-    created_dt = datetime.datetime.strptime(note.created, '%Y-%m-%d %H:%M:%S')
-    diff = datetime.datetime.now() - created_dt
-
-    queue = _get_priority_list()
-    queue_len = len(queue)
-
-    time_str = "Added %s ago." % utility.misc.date_diff_to_string(diff)
-    # height: calc(90% - 170px); max-height: calc(100% - 260px)
-    if check_index():
-
-        title = note.get_title()
-        title = utility.text.trim_if_longer_than(title, 70)
-        title = ihtml.escape(title)
-        source = note.source.strip() if note.source is not None and len(note.source.strip()) > 0 else "Empty"
-        source_icn = ""
-        schedule_btns = get_schedule_btns(note_id)
-
-        html = """
-            <script>destroyTinyMCE();</script>
-            <div style='width: 100%; display: flex; flex-direction: column;'>
-                    <div id='siac-reading-modal-top-btns'>
-                        <div class='siac-btn siac-btn-dark' style='font-size: 8px;' onclick='switchLeftRight();'>&#8596;</div>
-                        <div class='siac-btn siac-btn-dark' style='font-size: 8px;' onclick='toggleReadingModalFullscreen();'> <div class='siac-fullscreen-icn'></div> </div>
-                        <div class='siac-btn siac-btn-dark' style='font-size: 8px;' onclick='pycmd("siac-left-side-width");'> / </div>
-                        <div class='siac-btn siac-btn-dark' onclick='toggleReadingModalBars();'>&#x2195;</div>
-                        <div class='siac-btn siac-btn-dark' style='padding-left: 7px; padding-right: 7px;' onclick='onReadingModalClose({note_id});'>&times;</div>
-                    </div>
-                    <div id='siac-pdf-tooltip' onclick='event.stopPropagation();' onkeyup='event.stopPropagation();'>
-                        <div id='siac-pdf-tooltip-top'></div>
-                        <div id='siac-pdf-tooltip-results-area' onkeyup="pdfTooltipClozeKeyup(event);"></div>
-                        <div id='siac-pdf-tooltip-bottom'></div>
-                        <input id='siac-pdf-tooltip-searchbar' onkeyup='if (event.keyCode === 13) {{pycmd("siac-pdf-tooltip-search " + this.value);}}'></input>
-                    </div>
-                    <div id='siac-reading-modal-top-bar' data-nid='{note_id}' style='min-height: 77px; width: 100%; flex: 0 0 77px; display: flex; flex-wrap: nowrap; border-bottom: 2px solid darkorange; margin-bottom: 5px; white-space: nowrap;'>
-                        <div style='flex: 1 1; overflow: hidden;'>
-                            <h2 style='margin: 0 0 5px 0; white-space: nowrap; overflow: hidden; vertical-align:middle;'>{title}</h2>
-                            <h4 style='whitespace: nowrap; margin: 5px 0 8px 0; color: lightgrey;'>Source: <i>{source}</i></h4>
-                            <div id='siac-prog-bar-wr'></div>
-                        </div>
-                        <div style='flex: 0 0; min-width: 130px; padding: 0 120px 0 10px;'>
-                            <span class='siac-timer-btn' onclick='resetTimer(this)'>5</span><span class='siac-timer-btn' onclick='resetTimer(this)'>10</span><span class='siac-timer-btn' onclick='resetTimer(this)'>15</span><span class='siac-timer-btn' onclick='resetTimer(this)'>25</span><span class='siac-timer-btn active' onclick='resetTimer(this)'>30</span><br>
-                            <span id='siac-reading-modal-timer'>30 : 00</span><br>
-                            <span class='siac-timer-btn' onclick='resetTimer(this)'>45</span><span class='siac-timer-btn' onclick='resetTimer(this)'>60</span><span class='siac-timer-btn' onclick='resetTimer(this)'>90</span><span id='siac-timer-play-btn' class='inactive' onclick='toggleTimer(this);'>Start</span>
-                        </div>
-                    </div>
-                    <div id='siac-reading-modal-center' style='flex: 1 1 auto; overflow-y: {overflow}; font-size: 13px; padding: 0 20px 0 24px; position: relative; display: flex; flex-direction: column;' >
-                        {text}
-                    </div>
-                    <div id='siac-reading-modal-bottom-bar' style='flex: 0 0 auto; position: relative; width: 100%; border-top: 2px solid darkorange; margin-top: 5px; padding: 2px 0 0 5px; overflow: hidden; user-select: none;'>
-                        <div style='width: 100%; height: calc(100% - 5px); display: inline-block; padding-top: 5px; white-space: nowrap;'>
-                            <div style='padding: 5px; display: inline-block; vertical-align: top;'><div class='siac-queue-sched-btn active' onclick='toggleQueue();'>{queue_info_short}</div></div>
-                            {schedule_btns}
-                            <div id='siac-queue-actions' style='display: inline-block; height: 90px; vertical-align: top; margin-left: 20px; margin-top: 3px; user-select: none; z-index: 1;'>
-                                <span style='vertical-align: top;' id='siac-queue-lbl'>{queue_info}</span><br>
-                                <span style='margin-top: 5px; color: lightgrey;'>{time_str}</span> <br>
-                                <div style='margin: 7px 0 4px 0; display: inline-block;'>Read Next: <span class='siac-queue-picker-icn' onclick='if (pdfLoading||noteLoading||pdfSearchOngoing) {{return;}}pycmd("siac-user-note-queue-picker {note_id}")'>\u2630</span></div><br>
-                                <a onclick='if (!pdfLoading) {{ noteLoading = true; greyoutBottom(); destroyPDF(); pycmd("siac-user-note-queue-read-head");}}' class='siac-clickable-anchor' style='font-size: 16px; font-weight: bold;'>First In Queue</a><br>
-                                <a onclick='if (!pdfLoading) {{ noteLoading = true; greyoutBottom(); destroyPDF(); pycmd("siac-user-note-queue-read-random");}}' class='siac-clickable-anchor'>Random In Queue</a>
-                            </div>
-                            {queue_readings_list}
-                            <div id='siac-queue-infobox-wrapper'>
-                                <div id='siac-queue-infobox' onmouseleave='leaveQueueItem();'></div>
-                            </div>
-                            <div id='siac-pdf-bottom-tabs' style='display: inline-block; vertical-align: top; margin-left: 16px; user-select: none;'>
-                                <a class='siac-clickable-anchor tab active' onclick='pycmd("siac-pdf-show-bottom-tab {note_id} marks")' style='margin-right: 10px;'>Marks</a>
-                                <a class='siac-clickable-anchor tab' onclick='pycmd("siac-pdf-show-bottom-tab {note_id} related")' style='margin-right: 10px;'>Related</a>
-                                <a class='siac-clickable-anchor tab' onclick='pycmd("siac-pdf-show-bottom-tab {note_id} info")'>Info</a> <br>
-                                <div id='siac-pdf-bottom-tab'>
-                                    <div id='siac-marks-display' onclick='markClicked(event);'></div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div id='siac-timer-popup'>
-                    </div>
-            </div>
-            <script>
-            destroyPDF();
-            if (readingTimer != null)  {{
-                 $('#siac-timer-play-btn').html('Pause').removeClass('inactive');
-            }} else if (remainingSeconds !== 1800) {{
-                document.getElementById("siac-reading-modal-timer").innerHTML = Math.floor(remainingSeconds / 60) + " : " + (remainingSeconds % 60 < 10 ? "0" + remainingSeconds % 60 : remainingSeconds % 60);
-            }}
-            if (pdfFullscreen) {{
-                activateReadingModalFullscreen();
-            }} else if (pdfBarsHidden) {{
-                pdfBarsHidden = false;
-                toggleReadingModalBars();
-            }}
-            iframeIsDisplayed = false;
-            noteLoading = false;
-            </script>
-        """
-
-        #check if it is a pdf or feed
-        overflow = "auto"
-        if note.is_pdf() and utility.misc.file_exists(source):
-            editable = False
-            overflow = "hidden" 
-            text = get_pdf_viewer_html(note_id, source, note.get_title())
-            if "/" in source:
-                source = source[source.rindex("/") +1:]
-        elif note.is_feed():
-            text = get_feed_html(note_id, source)
-            editable = False
-        else:
-            editable = len(text) < 100000
-            text = get_text_note_html(text, note_id, editable)
-        
-       
-        queue_info = "Priority: %s" % (get_priority_as_str(note_id)) if note.is_in_queue() else "Unqueued."
-        queue_info_short = "In Queue" if note.is_in_queue() else "Unqueued"
-
-        queue_readings_list = get_queue_head_display(note_id, queue, editable)
-
-        params = dict(note_id = note_id, title = title, source = source, time_str = time_str, text = text, queue_info = queue_info, queue_info_short = queue_info_short, schedule_btns=schedule_btns, queue_readings_list = queue_readings_list, overflow=overflow)
-        html = html.format_map(params)
-        return html
-    return ""
-
-
-def get_text_note_html(text, nid, editable):
-    """
-        Returns the html which is wrapped around the text of user notes inside the reading modal.
-        This function is used if the note is a regular, text-only note, if the note is a pdf note, 
-        get_pdf_viewer_html is used instead.
-    """
-    dir = utility.misc.get_web_folder_path()
-    search_sources = ""
-    config = mw.addonManager.getConfig(__name__)
-    urls = config["searchUrls"]
-    if urls is not None and len(urls) > 0:
-        search_sources = iframe_dialog(urls)
-    is_content_editable = "true" if editable else "false"
-    quick_sched = quick_sched_btn(nid)
-    # editable_notification = "<span style='margin-left: 30px; color: grey;'>(i) Note content too long to edit here.</span>" if not editable else ""
-    html = """
-        <div id='siac-iframe-btn' style='top: 5px; left: 0px;' class='siac-btn siac-btn-dark' onclick='$(this).toggleClass("expanded")'>W
-            <div style='margin-left: 5px; margin-top: 4px; color: lightgrey; width: calc(100% - 40px); text-align: center; color: grey;'>Note: Not all sites allow embedding!</div>
-            <div style='padding: 0 15px 10px 15px; margin-top: 10px; max-height: 500px; overflow-y: auto; box-sizing: border-box; width: 100%;'>
-                <input onclick="event.stopPropagation();" onkeyup="if (event.keyCode === 13) {{ pdfUrlSearch(this.value); this.value = ''; }}"></input> 
-                <br/>
-               {search_sources}
-            </div>
-        </div>
-        {quick_sched_btn}
-        <div id='siac-close-iframe-btn' class='siac-btn siac-btn-dark' onclick='pycmd("siac-close-iframe")'>&times; &nbsp;Close Web</div>
-        <div id='siac-text-top-wr' style='height: calc(100% - 42px);'>
-            <div id='siac-text-top'>
-                {text}
-            </div>
-        </div>
-        <iframe id='siac-iframe' sandbox='allow-scripts' style='height: calc(100% - 47px);'></iframe>
-        <div class="siac-reading-modal-button-bar-wrapper">
-            <div style='position: absolute; left: 0; z-index: 1; user-select: none;'>
-                <div class='siac-btn siac-btn-dark' style="margin-left: -20px;" onclick='toggleReadingModalBars();'>&#x2195;</div>
-                <div class='siac-btn siac-btn-dark' id='siac-rd-note-btn' onclick='pycmd("siac-create-note-add-only {nid}")' style='margin-left: 5px;'><b>&#9998; Note</b></div>
-                <div class='siac-btn siac-btn-dark' id='siac-extract-text-btn' onclick='tryExtractTextFromTextNote()' style='margin-left: 5px;'><b>Copy to new Note</b></div>
-                <div class='siac-btn siac-btn-dark' onclick='saveTextNote({nid}, remove=false)' style='margin-left: 5px;'><b>&nbsp; Save &nbsp;</b></div>
-                <span id='siac-text-note-status' style='margin-left: 30px; color: grey;'></span>
-            </div>
-        </div>
-        <div id='siac-pdf-br-notify'>
-        </div>
-        <script>
-            {tiny_mce} 
-        </script>
-    """.format_map(dict(text = text, nid = nid, search_sources=search_sources, quick_sched_btn=quick_sched, tiny_mce=tiny_mce_init_code()))
-    return html
-
-def quick_sched_btn(nid):
-
-    return f"""
-        <div class='siac-btn siac-btn-dark' id='siac-quick-sched-btn' onclick='onQuickSchedBtnClicked(this);'><div class='siac-read-icn siac-read-icn-light'></div>
-            <div class='expanded-hidden white-hover' style='margin: 0 0 0 6px; color: lightgrey; text-align: center;'>
-                <div class='siac-btn siac-btn-dark-smaller' onclick='pycmd("siac-reschedule-read-next {nid} 5");'><b>5</b></div>
-                <div class='siac-btn siac-btn-dark-smaller' onclick='pycmd("siac-reschedule-read-next {nid} 4");'><b>4</b></div>
-                <div class='siac-btn siac-btn-dark-smaller' onclick='pycmd("siac-reschedule-read-next {nid} 3");'><b>3</b></div>
-                <div class='siac-btn siac-btn-dark-smaller' onclick='pycmd("siac-reschedule-read-next {nid} 2");'><b>2</b></div>
-                <div class='siac-btn siac-btn-dark-smaller' onclick='pycmd("siac-reschedule-read-next {nid} 1");'><b>1</b></div>
-                <div class='siac-btn siac-btn-dark-smaller' onclick='pycmd("siac-reschedule-read-next {nid} 0");'><b>Current</b></div>
-            </div>
-        </div>
-    """
-
-def get_feed_html(nid, source):
-    #extract feed url
-    try:
-        feed_url = source[source.index(":") +1:].strip()
-    except:
-        return "<center>Could not load feed. Please check the URL.</center>"
-    res = read(feed_url)
-    dir = utility.misc.get_web_folder_path()
-    search_sources = ""
-    config = mw.addonManager.getConfig(__name__)
-    urls = config["searchUrls"]
-    if urls is not None and len(urls) > 0:
-        search_sources = iframe_dialog(urls)
-    text = ""
-    templ = """
-        <div class='siac-feed-item' >
-            <div><span class='siac-blue-outset'>%s</span> &nbsp;<a href="%s" class='siac-ul-a'>%s</a></div>
-            <div><i>%s</i> <span style='margin-left: 15px;'>%s</span></div> 
-            <div style='margin: 15px;'>%s</div>
-        </div>
-    """
-    for ix, message in enumerate(res[:25]):
-        if len(message.categories) > 0:
-            if len(message.categories) == 1:
-                cats = f"<span class='blue-underline'>{message.categories[0]}</span>"
-            else:
-                cats = "<span class='blue-underline'>" + "</span> &nbsp;<span class='blue-underline'>".join(message.categories) + "</span>"
-        else:
-            cats = ""
-        text = ''.join((text, templ % (ix + 1, message.link, message.title, message.date, cats, message.text)))
-    html = """
-        <div id='siac-iframe-btn' style='top: 5px; left: 0px;' class='siac-btn siac-btn-dark' onclick='$(this).toggleClass("expanded")'>W
-            <div style='margin-left: 5px; margin-top: 4px; color: lightgrey; width: calc(100% - 40px); text-align: center; color: grey;'>Note: Not all sites allow embedding!</div>
-            <div style='padding: 0 15px 10px 15px; margin-top: 10px; max-height: 500px; overflow-y: auto; box-sizing: border-box; width: 100%;'>
-                <input onclick="event.stopPropagation();" onkeyup="if (event.keyCode === 13) {{ pdfUrlSearch(this.value); this.value = ''; }}"></input> 
-                <br/>
-               {search_sources}
-            </div>
-        </div>
-        <div id='siac-close-iframe-btn' class='siac-btn siac-btn-dark' onclick='pycmd("siac-close-iframe")'>&times; &nbsp;Close Web</div>
-        <div id='siac-text-top' contenteditable='false' onmouseup='nonPDFKeyup();' onclick='if (!window.getSelection().toString().length) {{$("#siac-pdf-tooltip").hide();}}'>
-            {text}
-        </div>
-        <iframe id='siac-iframe' sandbox='allow-scripts' style='height: calc(100% - 47px);'></iframe>
-        <div class="siac-reading-modal-button-bar-wrapper">
-            <div style='position: absolute; left: 0; z-index: 1; user-select: none;'>
-                <div class='siac-btn siac-btn-dark' style="margin-left: -20px;" onclick='toggleReadingModalBars();'>&#x2195;</div>
-                <div class='siac-btn siac-btn-dark' id='siac-rd-note-btn' onclick='pycmd("siac-create-note-add-only {nid}")' style='margin-left: 5px;'><b>&#9998; Note</b></div>
-            </div>
-        </div>
-        <script>
-            if (pdfTooltipEnabled) {{
-                $('#siac-pdf-tooltip-toggle').addClass('active');
-            }} else {{
-                $('#siac-pdf-tooltip-toggle').removeClass('active');
-            }}
-            ungreyoutBottom();
-        </script>
-    """.format_map(dict(text = text, nid = nid, search_sources=search_sources))
-    return html
-
-
-def get_reading_modal_bottom_bar(note):
-    """
-        Returns only the html for the bottom bar, useful if the currently displayed pdf should not be reloaded, but the queue display has to be refreshed.
-    """
-    index = get_index()
-    text = note.text
-    note_id = note.id
-    source = note.source
-    created_dt = datetime.datetime.strptime(note.created, '%Y-%m-%d %H:%M:%S')
-    diff = datetime.datetime.now() - created_dt
-    queue = _get_priority_list()
-    queue_len = len(queue)
-    schedule_btns = get_schedule_btns(note_id)
-
-    time_str = "Added %s ago." % utility.misc.date_diff_to_string(diff)
-       
-    html = """
-            <div id='siac-reading-modal-bottom-bar' style='width: 100%; flex: 0 0 auto; position: relative; border-top: 2px solid darkorange; margin-top: 5px; padding: 2px 0 0 5px; overflow: hidden; user-select: none;'>
-                <div style='width: 100%; height: calc(100% - 5px); display: inline-block; padding-top: 5px; white-space: nowrap; display: relative;'>
-
-                    <div style='padding: 5px; display: inline-block; vertical-align: top;'><div class='siac-queue-sched-btn active' onclick='toggleQueue();'>{queue_info_short}</div></div>
-                    {schedule_btns} 
-                    <div  id='siac-queue-actions'  style='display: inline-block; height: 90px; vertical-align: top; margin-left: 20px; margin-top: 3px; user-select: none; z-index: 1;'>
-                        <span style='vertical-align: top;' id='siac-queue-lbl'>{queue_info}</span><br>
-                        <span style='margin-top: 5px; color: lightgrey;'>{time_str}</span> <br>
-                        <div style='margin: 7px 0 4px 0; display: inline-block;'>Read Next: <span class='siac-queue-picker-icn' onclick='if (pdfLoading||noteLoading||pdfSearchOngoing) {{return;}}pycmd("siac-user-note-queue-picker {note_id}")'>\u2630</span></div><br>
-                        <a onclick='noteLoading = true; greyoutBottom(); pycmd("siac-user-note-queue-read-head")' class='siac-clickable-anchor' style='font-size: 16px; font-weight: bold;'>First In Queue</a><br>
-                        <a onclick='noteLoading = true; greyoutBottom(); pycmd("siac-user-note-queue-read-random")' class='siac-clickable-anchor'>Random In Queue</a>
-                    </div>
-                    {queue_readings_list}
-                    <div id='siac-queue-infobox-wrapper'>
-                        <div id='siac-queue-infobox' onmouseleave='leaveQueueItem();'></div>
-                    </div>
-                    <div id='siac-pdf-bottom-tabs' style='display: inline-block; vertical-align: top; margin-left: 16px; user-select: none;'>
-                        <a class='siac-clickable-anchor tab active' onclick='pycmd("siac-pdf-show-bottom-tab {note_id} marks")' style='margin-right: 10px;'>Marks</a>
-                        <a class='siac-clickable-anchor tab' onclick='pycmd("siac-pdf-show-bottom-tab {note_id} related")' style='margin-right: 10px;'>Related</a>
-                        <a class='siac-clickable-anchor tab' onclick='pycmd("siac-pdf-show-bottom-tab {note_id} info")'>Info</a> <br>
-                        <div id='siac-pdf-bottom-tab'>
-                            <div id='siac-marks-display' onclick='markClicked(event);'></div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-    """
-    editable = not note.is_feed() and not note.is_pdf() and len(text) < 50000
-    queue_info = "Priority: %s" % (get_priority_as_str(note_id)) if note.is_in_queue() else "Unqueued."
-    queue_info_short = "In Queue" if note.is_in_queue() else "Unqueued"
-   
-    queue_readings_list = get_queue_head_display(note_id, queue, editable)
-
-    params = dict(note_id = note_id, time_str = time_str, queue_info = queue_info, queue_info_short = queue_info_short, queue_readings_list = queue_readings_list, schedule_btns=schedule_btns )
-    html = html.format_map(params)
-    return html
-
-def get_queue_head_display(note_id, queue = None, should_save = False):
-    """
-    This returns the html for the little list at the bottom of the reading modal which shows the first 5 items in the queue.
-    """
-    if queue is None:
-        queue = _get_priority_list()
-    if queue is None or len(queue) == 0:
-        return "<div id='siac-queue-readings-list' style='display: inline-block; height: 90px; vertical-align: top; margin-left: 20px; user-select: none;'></div>"
-
-    note = get_note(note_id)
-    if not note.is_pdf() and not note.is_feed():
-        should_save = True
-
-    hide = config = mw.addonManager.getConfig(__name__)["pdf.queue.hide"]
-    queue_head_readings = ""
-    for ix, queue_item in enumerate(queue):
-        should_greyout = "greyedout" if queue_item.id == int(note_id) else ""
-        if not hide or queue_item.id == int(note_id) :
-            qi_title = utility.text.trim_if_longer_than(queue_item.get_title(), 40) 
-            qi_title = ihtml.escape(qi_title)
-        else:
-            qi_title = re.sub("[^ ]", "?",queue_item.get_title())
-
-        hover_actions = "onmouseenter='showQueueInfobox(this, %s);' onmouseleave='leaveQueueItem(this);'" % (queue_item.id) if not hide else ""
-        #if the note is a pdf or feed, show a loader
-        pdf_or_feed = queue_item.is_feed() or queue_item.is_pdf()
-        should_show_loader = 'document.getElementById("siac-reading-modal-center").innerHTML = ""; showLoader(\"siac-reading-modal-center\", \"Loading Note...\");' if pdf_or_feed else ""
-        queue_head_readings +=  "<a onclick='if (!pdfLoading) {%s  destroyPDF(); noteLoading = true; greyoutBottom(); pycmd(\"siac-read-user-note %s\"); hideQueueInfobox();}' class='siac-clickable-anchor %s' style='font-size: 12px; font-weight: bold;' %s >%s. %s</a><br>" % (should_show_loader, queue_item.id, should_greyout, hover_actions, queue_item.position + 1, qi_title)
-        if ix > 3:
-            break
-
-    if hide:
-        hide_btn = """<div style='display: inline-block; margin-left: 12px; color: grey;' class='blue-hover' onclick='unhideQueue(%s)'>(Show Items)</div>""" % note_id
-    else:
-        hide_btn = """<div style='display: inline-block; margin-left: 12px; color: grey;' class='blue-hover' onclick='hideQueue(%s)'>(Hide Items)</div>""" % note_id
-    html = """
-     <div id='siac-queue-readings-list' style='display: inline-block; height: 90px; vertical-align: top; margin-left: 20px; user-select: none;'>
-          <div style='margin: 0px 0 3px 0; display: inline-block; color: lightgrey;'>Queue Head:</div>%s<br>
-            %s
-     </div>
-    """ % (hide_btn, queue_head_readings)
-    return html
-
-def get_schedule_btns(note_id):
-    """
-        Returns the html for the buttons that allow to quickly reschedule the current item in the reading modal.
-    """
-  
-    return f"""
-    <div id='siac-queue-sched-wrapper'>
-        <div class='siac-queue-sched-btn siac-prio-5' onclick='queueSchedBtnClicked(this); pycmd("siac-requeue {note_id} 5")'>5</div>
-        <div class='siac-queue-sched-btn siac-prio-4' onclick='queueSchedBtnClicked(this); pycmd("siac-requeue {note_id} 4")'>4</div>
-        <div class='siac-queue-sched-btn siac-prio-3' onclick='queueSchedBtnClicked(this); pycmd("siac-requeue {note_id} 3")'>3</div>
-        <div class='siac-queue-sched-btn siac-prio-2' onclick='queueSchedBtnClicked(this); pycmd("siac-requeue {note_id} 2")'>2</div>
-        <div class='siac-queue-sched-btn siac-prio-1' onclick='queueSchedBtnClicked(this); pycmd("siac-requeue {note_id} 1")'>1</div>
-        <div style='display: inline-block; height: 94px; margin: 0 10px 0 10px; border-left: 2px solid lightgrey; border-style: dotted; border-width: 0 0 0 2px;'></div>
-        <div class='siac-queue-sched-btn' style='margin-left: 10px;' onclick='pycmd("siac-remove-from-queue {note_id}")'>&times; Remove</div>
-    </div>
-    """
-
-
-def get_related_notes_html(note_id):
-    r = get_related_notes(note_id)
-    note = get_note(note_id)
-    html = "" 
-    ids = set()
-    res = []
-    if r.related_by_tags is not None:
-        for r1 in r.related_by_tags:
-            res.append(r1) 
-            ids.add(r1.id)
-            if len(r.related_by_title) > 0:
-                i = r.related_by_title.pop(0)
-                if not i.id in ids:
-                    res.append(i)
-            if len(res) > 20:
-                break
-    if len(res) < 20 and len(r.related_by_title) > 0:
-        for r2 in r.related_by_title:
-            if not r2.id in ids:
-                res.append(r2)
-                if len(res) >= 20:
-                    break
-    for rel in res[:20]:
-        if rel.id == note_id:
-            continue
-        title = utility.text.trim_if_longer_than(rel.get_title(), 100)
-        pdf_or_feed = rel.is_pdf() or rel.is_feed()
-        should_show_loader = 'document.getElementById("siac-reading-modal-center").innerHTML = ""; showLoader(\"siac-reading-modal-center\", \"Loading Note...\");' if pdf_or_feed else ""
-        html = f"{html}<div class='siac-related-notes-item' onclick='if (!pdfLoading) {{ {should_show_loader}  destroyPDF(); noteLoading = true; greyoutBottom(); pycmd(\"siac-read-user-note {rel.id}\"); }}'>{title}</div>"
-    return html
-
-def get_note_info_html(note_id):
-    """
-        Returns the html that is displayed in the "Info" tab in the bottom bar of the reading modal.
-    """
-    note = get_note(note_id)
-    created = note.created
-    tags = note.tags
-    if tags.startswith(" "):
-        tags = tags[1:]
-    html = f"""
-        <table style='color: grey; min-width: 190px;'>
-            <tr><td>ID</td><td><b>{note.id}</b></td></tr>
-            <tr><td>Created</td><td><b>{created}</b></td></tr>
-        </table>
-        <br>
-        <label style='color: grey;'>Tags:</label>
-        <input type='text' style='width: 210px; background: #2f2f31; margin-left: 4px; padding-left: 4px; border: 1px solid grey; border-radius: 4px; color: lightgrey;' onfocusout='pycmd("siac-update-note-tags {note.id} " + this.value)' value='{tags}'></input>
-    """
-    return html
-
-def iframe_dialog(urls):
-    search_sources = "<table style='margin: 10px 0 10px 0; cursor: pointer; box-sizing: border-box; width: 100%;' onclick='event.stopPropagation();'>"
-    ix = 0
-    direct_links = ""
-    for url in urls:
-        name = os.path.dirname(url)
-        if "[QUERY]" in url:
-            search_sources += "<tr><td><label for='%s'>%s</label></td><td><input type='radio' name='url-radio' id='%s' data-url='%s' %s/></td></tr>" % ("url-rd-%d" % ix, name, "url-rd-%d" % ix, url, "checked" if ix == 0 else "")
-            ix += 1
-        else:
-            direct_links += """<div class="siac-url-ch" onclick='event.stopPropagation(); $("#siac-iframe-btn").removeClass("expanded"); pycmd("siac-url-srch $$$dummy$$$%s");'>%s</div>""" % (url, name)
-
-    search_sources += "</table>"
-    if len(direct_links) > 0:
-        search_sources += "<div style='margin-bottom: 5px;'>Direct Links:</div>"
-        search_sources += direct_links
-    return search_sources
-
-
-
-def get_pdf_viewer_html(nid, source, title):
-    
-    dir = utility.misc.get_web_folder_path()
-    search_sources = ""
-    config = mw.addonManager.getConfig(__name__)
-    urls = config["searchUrls"]
-    if urls is not None and len(urls) > 0:
-        search_sources = iframe_dialog(urls)
-
-    marks_img_src = utility.misc.img_src("mark-star-24px.png")
-    marks_grey_img_src = utility.misc.img_src("mark-star-lightgrey-24px.png")
-    pdf_search_img_src = utility.misc.img_src("magnify-24px.png")
-    quick_sched = quick_sched_btn(nid)
-
-    html = """
-        <div id='siac-pdf-overlay'>PAGE READ</div>
-        <div id='siac-pdf-overlay-top'>
-            <div id='siac-pdf-mark-btn' class='siac-btn siac-btn-dark' onclick='$(this).toggleClass("expanded")'><img src='{marks_img_src}' style='width: 17px; height: 17px; margin: 0;'/>
-                <div style='margin-left: 7px;'>
-                    <div class='siac-mark-btn-inner siac-mark-btn-inner-1' onclick='pycmd("siac-pdf-mark 1 {nid} " + pdfDisplayedCurrentPage + " " + pdfDisplayed.numPages)'>Revisit</div>
-                    <div class='siac-mark-btn-inner siac-mark-btn-inner-2' onclick='pycmd("siac-pdf-mark 2 {nid} " + pdfDisplayedCurrentPage + " " + pdfDisplayed.numPages)'>Hard</div>
-                    <div class='siac-mark-btn-inner siac-mark-btn-inner-3' onclick='pycmd("siac-pdf-mark 3 {nid} " + pdfDisplayedCurrentPage + " " + pdfDisplayed.numPages)'>More Info</div>
-                    <div class='siac-mark-btn-inner siac-mark-btn-inner-4' onclick='pycmd("siac-pdf-mark 4 {nid} " + pdfDisplayedCurrentPage + " " + pdfDisplayed.numPages)'>More Cards</div>
-                    <div class='siac-mark-btn-inner siac-mark-btn-inner-5' onclick='pycmd("siac-pdf-mark 5 {nid} " + pdfDisplayedCurrentPage + " " + pdfDisplayed.numPages)'>Bookmark</div>
-                </div> 
-            </div>
-            <div style='display: inline-block; vertical-align: top;' id='siac-pdf-overlay-top-lbl-wrap'></div>
-        </div>
-        <div id='siac-iframe-btn' class='siac-btn siac-btn-dark' onclick='$(this).toggleClass("expanded")'>W
-            <div style='margin-left: 5px; margin-top: 4px; color: lightgrey; width: calc(100% - 40px); text-align: center;'>Note: Not all Websites allow Embedding!</div>
-            <div style='padding: 0 15px 10px 15px; margin-top: 10px; max-height: 500px; overflow-y: auto; box-sizing: border-box; width: 100%;'>
-                <input onclick="event.stopPropagation();" onkeyup="if (event.keyCode === 13) {{ pdfUrlSearch(this.value); this.value = ''; }}"></input> 
-                <br/>
-               {search_sources}
-            </div>
-        </div>
-        <div class='siac-btn siac-btn-dark' id='siac-pdf-search-btn' onclick='$(this).toggleClass("expanded"); onPDFSearchBtnClicked(this);'><img src='{pdf_search_img_src}' style='width: 16px; height: 16px;'/>
-            <div id='siac-pdf-search-btn-inner' class='expanded-hidden white-hover' style='margin: 0 2px 0 5px; color: lightgrey; text-align: center;'>
-                <input style='width: 200px; border:none; background-color: #2f2f31; color: lightgrey; padding-left: 2px;' onclick='event.stopPropagation();' onkeyup='onPDFSearchInput(this.value, event);'/>
-                <div class='siac-btn siac-btn-dark' onclick='event.stopPropagation(); showPDFBottomRightNotification("Searching..."); nextPDFSearchResult(dir="left");'><b>&lt;</b></div>
-                <div class='siac-btn siac-btn-dark' onclick='event.stopPropagation(); showPDFBottomRightNotification("Searching..."); nextPDFSearchResult(dir="right");'><b>&gt;</b></div>
-            </div>
-        </div>
-        <div class='siac-btn siac-btn-dark' id='siac-mark-jump-btn' onclick='$(this).toggleClass("expanded"); onMarkBtnClicked(this);'><img src='{marks_grey_img_src}' style='width: 16px; height: 16px;'/>
-            <div id='siac-mark-jump-btn-inner' class='expanded-hidden white-hover' style='margin: 0 2px 0 5px; color: lightgrey; text-align: center;'></div>
-        </div>
-        {quick_sched_btn} 
-        <div id='siac-close-iframe-btn' class='siac-btn siac-btn-dark' onclick='pycmd("siac-close-iframe")'>&times; &nbsp;Close Web</div>
-        <div id='siac-pdf-top' data-pdfpath="{pdf_path}" data-pdftitle="{pdf_title}" data-pdfid="{nid}" onwheel='pdfMouseWheel(event);' style='overflow-y: hidden;'>
-            <div id='siac-pdf-loader-wrapper' style='display: flex; justify-content: center; align-items: center; height: 100%;'>
-                <div class='siac-pdf-loader' style=''>
-                    <div> <div class='signal' style='margin-left: auto; margin-right: auto;'></div><br/><div id='siac-loader-text'>Loading PDF</div></div>
-                </div>
-            </div>
-            <canvas id="siac-pdf-canvas" style='z-index: 99999; display:inline-block;'></canvas>
-            <div id="text-layer" onmouseup='pdfKeyup();' onclick='if (!window.getSelection().toString().length) {{$("#siac-pdf-tooltip").hide();}}' class="textLayer"></div>
-        </div>
-        <iframe id='siac-iframe' sandbox='allow-scripts'></iframe>
-        <div class='siac-reading-modal-button-bar-wrapper' style="">
-            <div style='position: absolute; left: 0; z-index: 1; user-select: none;'>
-                <div class='siac-btn siac-btn-dark' style="margin-left: -20px;" onclick='toggleReadingModalBars();'>&#x2195;</div>
-                <div class='siac-btn siac-btn-dark' style="margin-left: 2px; width: 18px;" onclick='pdfScaleChange("down");'>-</div>
-                <div class='siac-btn siac-btn-dark' style="width: 22px;" onclick='pdfFitToPage()'>&#8596;</div>
-                <div class='siac-btn siac-btn-dark' style="width: 18px;" onclick='pdfScaleChange("up");'>+</div>
-                <div class='siac-btn siac-btn-dark' onclick='initImageSelection()' style='margin-left: 5px;'><b>&#9986;</b></div>
-                <div class='siac-btn siac-btn-dark active' id='siac-pdf-tooltip-toggle' onclick='togglePDFSelect(this)' style='margin-left: 5px;'><div class='siac-search-icn-dark'></div></div>
-                <div class='siac-btn siac-btn-dark' id='siac-rd-note-btn' onclick='pycmd("siac-create-note-add-only {nid}")' style='margin-left: 5px;'><b>&#9998; Note</b></div>
-            </div>
-            <div style='user-select:none; display: inline-block; position:relative; z-index: 2; padding: 0 5px 0 5px; background: #2f2f31;'>
-                <div class='siac-btn siac-btn-dark' onclick='pdfPageLeft();'><b>&lt;</b></div>
-                <span style='display: inline-block; text-align: center; width: 70px; user-select: none;' id='siac-pdf-page-lbl'>Loading...</span>
-                <div class='siac-btn siac-btn-dark' onclick='pdfPageRight();'><b>&gt;</b></div>
-            </div>
-
-            <div style='position: absolute; right: 0; display: inline-block; user-select: none;'>
-                <div id="siac-pdf-night-btn" class='siac-btn siac-btn-dark' style='margin-right: 10px; width: 50px;' onclick='togglePDFNightMode(this);'>Day</div>
-                <div id="siac-pdf-read-btn" class='siac-btn' style='margin-right: 7px; width: 65px;' onclick='togglePageRead({nid});'>\u2713&nbsp; Read</div>
-                <div style='position: relative; display: inline-block; width: 30px; margin-right: 7px;'>
-                    <div id='siac-pdf-more-btn' class='siac-btn siac-btn-dark' onclick='$(this).toggleClass("expanded")'  onmouseleave='$(this).removeClass("expanded")' style='width: calc(100% - 14px)'>...
-                        <div class='siac-btn-small-dropdown-inverted click'>
-                            <div class='siac-dropdown-inverted-item' onclick='pycmd("siac-jump-last-read {nid}"); event.stopPropagation();'><b>Jump to Last Read Page</b></div>
-                            <div class='siac-dropdown-inverted-item' onclick='pycmd("siac-jump-first-unread {nid}"); event.stopPropagation();'><b>Jump to First Unread Page</b></div>
-                            <hr>
-                            <div class='siac-dropdown-inverted-item' onclick='pycmd("siac-mark-read-up-to {nid} " + pdfDisplayedCurrentPage + " " + pdfDisplayed.numPages); markReadUpToCurrent(); pdfShowPageReadMark();updatePdfProgressBar();event.stopPropagation();'><b>Mark Read up to current Pg.</b></div>
-                            <div class='siac-dropdown-inverted-item' onclick='pycmd("siac-display-range-input {nid} " + pdfDisplayed.numPages); event.stopPropagation();'><b>Mark Range ...</b></div>
-                            <div class='siac-dropdown-inverted-item' onclick='pycmd("siac-mark-all-unread {nid}"); pagesRead = []; pdfHidePageReadMark(); updatePdfProgressBar();event.stopPropagation();'><b>Mark all as Unread</b></div>
-                            <div class='siac-dropdown-inverted-item' onclick='pycmd("siac-mark-all-read {nid} " + pdfDisplayed.numPages); pagesRead = Array.from(Array(pdfDisplayed.numPages).keys()).map(x => ++x); pdfShowPageReadMark(); updatePdfProgressBar();event.stopPropagation();'>
-                                <b>Mark all as Read</b>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <input id="siac-pdf-page-inp" style="width: 50px;margin-right: 5px;" value="1" type="number" min="1" onkeyup="pdfJumpToPage(event, this);"></input>
-            </div>
-        </div>
-        <div id='siac-pdf-br-notify'>
-        </div>
-        <script>
-            greyoutBottom();
-            document.getElementById('siac-pdf-night-btn').innerHTML = pdfColorMode;
-            if (pdfTooltipEnabled) {{
-                $('#siac-pdf-tooltip-toggle').addClass('active');
-            }} else {{
-                $('#siac-pdf-tooltip-toggle').removeClass('active');
-            }}
-        </script>
-    """.format_map(dict(nid = nid, pdf_title = title, pdf_path = source, quick_sched_btn=quick_sched, search_sources=search_sources, marks_img_src=marks_img_src, marks_grey_img_src=marks_grey_img_src, pdf_search_img_src=pdf_search_img_src))
-    return html
-
-
 def getCalendarHtml():
     html = """<div id='cal-row' style="width: 100%%; height: 8px;" onmouseleave='calMouseLeave()'>%s</div> """
     #get notes created since the beginning of the year
@@ -1049,7 +446,7 @@ def getCalendarHtml():
     nid_now = int(time.time()* 1000)
     nid_minus_day_of_year = int(date_year_begin.timestamp() * 1000)
 
-    res = mw.col.db.execute("select distinct notes.id, flds, tags, did, mid from notes left join cards on notes.id = cards.nid where nid > %s and nid < %s order by nid asc" %(nid_minus_day_of_year, nid_now)).fetchall()
+    res = mw.col.db.all("select distinct notes.id, flds, tags, did, mid from notes left join cards on notes.id = cards.nid where nid > %s and nid < %s order by nid asc" %(nid_minus_day_of_year, nid_now))
 
     counts = []
     c = 1
@@ -1088,76 +485,25 @@ def getCalendarHtml():
     html = html % html_content
     return html
 
-
-def pdf_prog_bar(read, read_total):
-    if read is not None and read_total is not None:
-        perc = int(read * 10.0 / read_total)
-        perc_100 =  int(read * 100.0 / read_total)
-        prog_bar = str(perc_100) + " % &nbsp;"
-        for x in range(0, 10):
-            if x < perc:
-                prog_bar = f"{prog_bar}<div class='siac-prog-sq-filled'></div>"
-            else:
-                prog_bar = f"{prog_bar}<div class='siac-prog-sq'></div>"
-        return prog_bar
-    else:
-        return ""
-
 def get_note_delete_confirm_modal_html(nid):
     note = get_note(nid)
     creation_date = note.created
     title = utility.text.trim_if_longer_than(note.get_title(), 100) 
     return """
-       <div class='siac-modal-small' id='siac-del-modal'>
+
+    <div id='siac-del-modal' style='position: absolute; left: 0; right: 0; top: 0; bottom: 0; z-index: 5; height: 100%%; text-align: center; background: rgba(0,0,0,0.4); display:flex; align-items: center; justify-content: center; border-radius: 5px;'>
+       <div class='siac-modal-small'>
             <p style='text-align: center; font-size: 14px;'><b>Delete the following note?</b></p>
             <hr class='siac-modal-sep'/>
             <br>
             <div style='text-align: center; font-size: 14px; margin-bottom: 4px;'><b>%s</b></div>
             <div style='text-align: center; font-size: 14px;'><i>%s</i></div>
             <br><br>
-            <div style='text-align: center;'><div class='siac-btn' onclick='removeNote(%s);deleteNote(%s);' style='margin-right: 10px;'><div class='siac-trash-icn'></div>&nbsp;Delete&nbsp;</div><div class='siac-btn' onclick='$(this.parentNode.parentNode).remove(); $("#greyout").hide();'>&nbsp;Cancel&nbsp;</div></div>
+            <div style='text-align: center;'><div class='siac-btn' onclick='removeNote(%s);deleteNote(%s);' style='margin-right: 10px;'><div class='siac-trash-icn'></div>&nbsp;Delete&nbsp;</div><div class='siac-btn' onclick='$(this.parentNode.parentNode.parentNode).remove(); $("#greyout").hide();'>&nbsp;Cancel&nbsp;</div></div>
        </div>
-
-
+    </div>
     """ % (title, creation_date, nid, nid)
 
-def get_queue_infobox(note, read_stats):
-    """
-        Returns the html that is displayed in the tooltip which appears when hovering over an item in the queue head.
-    """
-    diff = datetime.datetime.now() - datetime.datetime.strptime(note.created, '%Y-%m-%d %H:%M:%S')
-    time_str = "Created %s ago." % utility.misc.date_diff_to_string(diff)
-    # pagestotal might be None (it is only available if at least one page has been read)
-    if read_stats[2] is not None:
-        prog_bar = pdf_prog_bar(read_stats[0], read_stats[2])
-        pages_read = "<div style='width: 100%%; margin-top: 3px; font-weight: bold; text-align: center; font-size: 20px;'>%s / %s</div>" % (read_stats[0], read_stats[2])
-    else:
-        text_len = f"{len(note.text.split())} Words" if note.text is not None else "Empty"
-        prog_bar = ""
-        pages_read = f"<div style='width: 100%; margin-top: 7px; font-weight: bold; text-align: center; font-size: 16px;'>Text Note, {text_len}</div>"
-
-    html = """
-        <div style='box-sizing: border-box; width: 100%; height: 100%; padding: 10px; display: inline-block; position: relative; vertical-align: top;'>
-            <div style='width: 100%; text-align:center; white-space: nowrap; overflow: hidden; font-weight: bold; vertical-align: top; text-overflow: ellipsis;'>{title}</div>
-            <div style='width: 100%; text-align:center; white-space: nowrap; overflow: hidden; color: lightgrey;vertical-align: top;'>{time_str}</div>
-            {pages_read}
-            <div style='width: calc(100%); padding: 5px 0 10px 0; text-align: center;'>
-                <div style='display: inline-block; vertical-align: bottom;'>
-                    {prog_bar}
-                </div>
-            </div>
-        </div>
-      
-    """.format_map(dict(title = note.get_title(), pages_read=pages_read, time_str= time_str, prog_bar= prog_bar, nid = note.id))
-
-    # todo: include again?
-    #   <div style='width: 50px; height: 100%; padding: 2px 5px 2px 0; display: inline-block;'>
-    #         <div class='siac-queue-sched-btn-tt' onclick='hideQueueInfobox(); pycmd("siac-requeue-tt {nid} 2 "+ $("#siac-reading-modal-top-bar").data("nid"))'>Start</div>
-    #         <div class='siac-queue-sched-btn-tt' onclick='hideQueueInfobox(); pycmd("siac-requeue-tt {nid} 5 "+ $("#siac-reading-modal-top-bar").data("nid"))'>End</div>
-    #         <div class='siac-queue-sched-btn-tt' onclick='hideQueueInfobox(); pycmd("siac-requeue-tt {nid} 6 "+ $("#siac-reading-modal-top-bar").data("nid"))'>Random</div>
-    #         <div class='siac-queue-sched-btn-tt' onclick='hideQueueInfobox(); pycmd("siac-remove-from-queue-tt {nid} " + $("#siac-reading-modal-top-bar").data("nid"))'>Remove</div>
-    #     </div>
-    return html
 
 def stylingModal(config):
     html = """
@@ -1169,84 +515,93 @@ def stylingModal(config):
             <fieldset>
             <span><mark>Important:</mark> Modify this value to scale the whole search pane. Useful e.g. when working on a small screen.</span>
                 <table style="width: 100%%">
-                    <tr><td><b>Zoom</b></td><td style='text-align: right;'><input placeholder="" type="number" step="0.1" style='width: 60px;' onchange="pycmd('styling searchpane.zoom ' + this.value)" value="%s"/></td></tr>
+                    <tr><td><b>Zoom</b></td><td style='text-align: right;'><input placeholder="" type="number" step="0.1" style='width: 60px;' onchange="pycmd('siac-styling searchpane.zoom ' + this.value)" value="%s"/></td></tr>
                 </table>
             </fieldset>
             <br/>
             <fieldset>
                 <span>Controls whether the results are faded in or not.</span>
                 <table style="width: 100%%">
-                    <tr><td><b>Render Immediately</b></td><td style='text-align: right;'><input type="checkbox" onclick="pycmd('styling renderImmediately ' + this.checked)" %s/></td></tr>
+                    <tr><td><b>Render Immediately</b></td><td style='text-align: right;'><input type="checkbox" onclick="pycmd('siac-styling renderImmediately ' + this.checked)" %s/></td></tr>
                 </table>
             </fieldset>
             <br/>
             <fieldset>
                 <span>This controls how the window is split into search pane and field input. A value of 40 means the left side will take 40%% and the right side will take 60%%.</span>
                 <table style="width: 100%%">
-                    <tr><td><b>Left Side Width</b></td><td style='text-align: right;'><input placeholder="Value in px" type="number" min="0" max="100" style='width: 60px;' onchange="pycmd('styling leftSideWidthInPercent ' + this.value)" value="%s"/> %%</td></tr>
+                    <tr><td><b>Left Side Width</b></td><td style='text-align: right;'><input placeholder="Value in px" type="number" min="0" max="100" style='width: 60px;' onchange="pycmd('siac-styling leftSideWidthInPercent ' + this.value)" value="%s"/> %%</td></tr>
                 </table>
             </fieldset>
              <br/>
             <fieldset>
                 <span>This controls whether the sidebar (containing the tags and found keywords) is visible or not.</span>
                 <table style="width: 100%%">
-                    <tr><td><b>Hide Sidebar</b></td><td style='text-align: right;'><input type="checkbox" onclick="pycmd('styling hideSidebar ' + this.checked)" %s/></tr>
+                    <tr><td><b>Hide Sidebar</b></td><td style='text-align: right;'><input type="checkbox" onclick="pycmd('siac-styling hideSidebar ' + this.checked)" %s/></tr>
                 </table>
             </fieldset>
              <br/>
               <fieldset>
                 <span>This controls whether the timeline row (added notes over the year) is visible or not.</span>
                 <table style="width: 100%%">
-                    <tr><td><b>Show Timeline</b></td><td style='text-align: right;'><input type="checkbox" onclick="pycmd('styling showTimeline ' + this.checked)" %s/></tr>
+                    <tr><td><b>Show Timeline</b></td><td style='text-align: right;'><input type="checkbox" onclick="pycmd('siac-styling showTimeline ' + this.checked)" %s/></tr>
                 </table>
             </fieldset>
             <br/>
               <fieldset>
                 <span>This controls whether the small info box will be shown when a tag is hovered over with the mouse. Currently only works with the default scaling.</span>
                 <table style="width: 100%%">
-                    <tr><td><b>Show Tag Info on Hover</b></td><td style='text-align: right;'><input type="checkbox" onclick="pycmd('styling showTagInfoOnHover ' + this.checked)" %s/></tr>
+                    <tr><td><b>Show Tag Info on Hover</b></td><td style='text-align: right;'><input type="checkbox" onclick="pycmd('siac-styling showTagInfoOnHover ' + this.checked)" %s/></tr>
                 </table>
             </fieldset>
             <br/>
             <fieldset>
                 <span>This controls how long you have to hover over a tag until the info box is shown. Allowed values are 0 (not recommended) to 10000.</span>
                 <table style="width: 100%%">
-                    <tr><td><b>Tag Hover Delay in Miliseconds</b></td><td style='text-align: right;'><input placeholder="Value in ms" type="number" min="0" max="10000" style='width: 60px;' onchange="pycmd('styling tagHoverDelayInMiliSec ' + this.value)" value="%s"/></tr>
+                    <tr><td><b>Tag Hover Delay in Miliseconds</b></td><td style='text-align: right;'><input placeholder="Value in ms" type="number" min="0" max="10000" style='width: 60px;' onchange="pycmd('siac-styling tagHoverDelayInMiliSec ' + this.value)" value="%s"/></tr>
                 </table>
             </fieldset>
             <br/>
             <fieldset>
                 <span>If the number of notes that would go into the index (only notes from the included decks are counted) is lower than this value the index should always be rebuilt.</span>
                 <table style="width: 100%%">
-                    <tr><td><b>Always Rebuild Index If Smaller Than</b></td><td style='text-align: right;'><input placeholder="Value in ms" type="number" min="0" max="100000" style='width: 60px;' onchange="pycmd('styling alwaysRebuildIndexIfSmallerThan ' + this.value)" value="%s"/></tr>
+                    <tr><td><b>Always Rebuild Index If Smaller Than</b></td><td style='text-align: right;'><input placeholder="Value in ms" type="number" min="0" max="100000" style='width: 60px;' onchange="pycmd('siac-styling alwaysRebuildIndexIfSmallerThan ' + this.value)" value="%s"/></tr>
                 </table>
             </fieldset>
             <br/>
             <fieldset>
                 <span>If you have problems with the display of search results (e.g. notes nested into each other), most likely, your note's html contains at least one unmatched opening/closing &lt;div&gt; tag. If set to true, this setting will remove all div tags from the note html before displaying.</span>
                 <table style="width: 100%%">
-                    <tr><td><b>Remove &lt;div&gt; Tags from Output</b></td><td style='text-align: right;'><input type="checkbox" onclick="pycmd('styling removeDivsFromOutput ' + this.checked)" %s/></tr>
+                    <tr><td><b>Remove &lt;div&gt; Tags from Output</b></td><td style='text-align: right;'><input type="checkbox" onclick="pycmd('siac-styling removeDivsFromOutput ' + this.checked)" %s/></tr>
                 </table>
             </fieldset>
             <br/>
             <fieldset>
-                <span>This is the absolute path to the folder where the addon should store its notes. If not present already, the addon will create a file named "siac-notes.db" in that folder. If empty, user_files will be used.</span>
+                <span>This is the absolute path to the folder where the addon should store its notes. If not present already, the addon will create a file named <i>siac-notes.db</i> in that folder. If empty, user_files will be used.
+                <br>If you have existing data, after changing this value, you should close Anki, copy your existing <i>siac-notes.db</i> to that new location, and then start again.
+                </span>
                 <table style="width: 100%%">
-                    <tr><td><b>Addon Note DB Folder Path</b></td><td style='text-align: right;'><input type="text" onfocusout="pycmd('styling addonNoteDBFolderPath ' + this.value)" value="%s"/></tr>
+                    <tr><td><b>Addon Note DB Folder Path</b></td><td style='text-align: right;'><input type="text"  style='min-width: 250px;' onfocusout="pycmd('siac-styling addonNoteDBFolderPath ' + this.value)" value="%s"/></tr>
                 </table>
             </fieldset>
             <br/>
             <fieldset>
                 <span>This is the location where PDFs generated from URLs will be saved. This needs to be set for the URL import to work.</span>
                 <table style="width: 100%%">
-                    <tr><td><b>PDF Url-Import Save Path</b></td><td style='text-align: right;'><input type="text" onfocusout="pycmd('styling pdfUrlImportSavePath ' + this.value)" value="%s"/></tr>
+                    <tr><td><b>PDF Url-Import Save Path</b></td><td style='text-align: right;'><input type="text" style='min-width: 250px;' onfocusout="pycmd('siac-styling pdfUrlImportSavePath ' + this.value)" value="%s"/></tr>
                 </table>
             </fieldset>
             <br/>
             <fieldset>
                 <span>This controls if the addon's notes shall be displayed with their source field (on the bottom: "Source: ..."), or not.</span>
                 <table style="width: 100%%">
-                    <tr><td><b>Notes - Show Source</b></td><td style='text-align: right;'><input type="checkbox" onclick="pycmd('styling notes.showSource ' + this.checked)" %s/></tr>
+                    <tr><td><b>Notes - Show Source</b></td><td style='text-align: right;'><input type="checkbox" onclick="pycmd('siac-styling notes.showSource ' + this.checked)" %s/></tr>
+                </table>
+            </fieldset>
+            <br/>
+            <fieldset>
+                <span>This controls if the add-on is displayed in the edit dialog ("Edit Current" from the reviewer) too.</span>
+                <table style="width: 100%%">
+                    <tr><td><b>Use in Edit</b></td><td style='text-align: right;'><input type="checkbox" onclick="pycmd('siac-styling useInEdit ' + this.checked)" %s/></tr>
                 </table>
             </fieldset>
             <br/>
@@ -1263,7 +618,8 @@ def stylingModal(config):
                        "checked='true'" if config["removeDivsFromOutput"] else "",
                        config["addonNoteDBFolderPath"],
                        config["pdfUrlImportSavePath"],
-                       "checked='true'" if config["notes.showSource"] else ""
+                       "checked='true'" if config["notes.showSource"] else "",
+                       "checked='true'" if config["useInEdit"] else ""
                         )
     html += """
     <br/> <br/>
@@ -1271,12 +627,12 @@ def stylingModal(config):
     <br/> <br/>
     If you want to use the add-on with Anki's <b>built-in night mode</b> the <b>night mode</b> add-on, you have to adapt the styling section.
     <br/> <br/>
-    <b>Sample night mode color scheme:</b> <div class='siac-btn' style='margin-left: 15px;' onclick='pycmd("styling default night");'>Apply</div><br/><br/>
+    <b>Sample night mode color scheme:</b> <div class='siac-btn' style='margin-left: 15px;' onclick='pycmd("siac-styling default night");'>Apply</div><br/><br/>
     <div style='width: 100%%; overflow-y: auto; max-height: 150px; opacity: 0.7;'>
     "styling": %s,
     </div>
     <br/> <br/>
-    <b>Default color scheme:</b><div class='siac-btn' style='margin-left: 15px;' onclick='pycmd("styling default day")'>Apply</div><br/><br/>
+    <b>Default color scheme:</b><div class='siac-btn' style='margin-left: 15px;' onclick='pycmd("siac-styling default day")'>Apply</div><br/><br/>
     <div style='width: 100%%; overflow-y: auto; max-height: 150px; opacity: 0.7;'>
     "styling": %s,
     </div>
@@ -1355,12 +711,12 @@ def default_night_mode_styles():
             "selectBackgroundColor": "#2f2f31",
             "selectForegroundColor": "white",
             "timelineBoxBackgroundColor": "#2b2b30",
-            "timelineBoxBorderColor": "DarkOrange"
+            "timelineBoxBorderColor": "darkorange"
         },
         "general": {
             "buttonBackgroundColor": "#2f2f31",
             "buttonBorderColor": "grey",
-            "buttonForegroundColor": "beige",
+            "buttonForegroundColor": "lightgrey",
             "fieldSeparatorColor": "white",
             "highlightBackgroundColor": "SpringGreen",
             "highlightForegroundColor": "Black",
@@ -1370,16 +726,16 @@ def default_night_mode_styles():
             "noteFontSize": 12,
             "noteForegroundColor": "beige",
             "noteHoverBorderColor": "#62C9C3",
-            "rankingLabelBackgroundColor": "DarkOrange",
+            "rankingLabelBackgroundColor": "darkorange",
             "rankingLabelForegroundColor": "Black",
-            "tagBackgroundColor": "DarkOrange",
+            "tagBackgroundColor": "darkorange",
             "tagFontSize": 12,
             "tagForegroundColor": "Black",
-            "windowColumnSeparatorColor": "DarkOrange"
+            "windowColumnSeparatorColor": "darkorange"
         },
         "modal": {
             "modalBackgroundColor": "#2f2f31",
-            "modalBorderColor": "DarkOrange",
+            "modalBorderColor": "darkorange",
             "modalForegroundColor": "beige",
             "stripedTableBackgroundColor": "#2b2b30"
         },
@@ -1391,7 +747,7 @@ def default_night_mode_styles():
             "deckSelectCheckmarkColor": "LawnGreen",
             "deckSelectFontSize": 11,
             "deckSelectForegroundColor": "beige",
-            "deckSelectHoverBackgroundColor": "DarkOrange",
+            "deckSelectHoverBackgroundColor": "darkorange",
             "deckSelectHoverForegroundColor": "Black"
         }
     }
@@ -1419,7 +775,7 @@ def get_unsuspend_modal(nid):
     """
         Returns the html content for the modal that is opened when clicking on a SUSPENDED label.
     """
-    cards = mw.col.db.execute(f"select id, ivl, queue, ord from cards where nid = {nid}").fetchall()
+    cards = mw.col.db.all(f"select id, ivl, queue, ord from cards where nid = {nid}")
     note = mw.col.getNote(nid)
     templates = mw.col.findTemplates(note)
     cards_html = ""
@@ -1488,31 +844,19 @@ def pdf_svg(w, h):
 </svg>
     """ % (w, h)
 
+def clock_svg(greyout):
+    greyout = "grey" if greyout else ""
+    return f"""
+<svg  class='siac-sched-icn {greyout}'  width="12" height="12" xmlns="http://www.w3.org/2000/svg">
+ <g>
+  <rect fill="none" id="canvas_background" height="14" width="14" y="-1" x="-1"/>
+ </g>
+ <g>
+  <ellipse stroke="#000" ry="4.97339" rx="4.88163" id="svg_2" cy="5.91646" cx="6.192696" fill="none"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_3" y2="6.338556" x2="6.009176" y1="2.961789" x1="6.009176" fill-opacity="null" stroke-opacity="null" stroke="#000" fill="none"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_4" y2="6.522076" x2="9.606167" y1="6.55878" x1="6.04588" fill-opacity="null" stroke-opacity="null" stroke="#000" fill="none"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_5" y2="6.999228" x2="5.788952" y1="6.37526" x1="6.009176" fill-opacity="null" stroke-opacity="null" stroke="#000" fill="none"/>
+ </g>
+</svg>
+    """
 
-def tiny_mce_init_code():
-    return """
-        tinymce.init({
-            selector: '#siac-text-top',
-            plugins: 'preview paste importcss searchreplace autolink directionality code visualblocks visualchars link codesample table charmap hr nonbreaking toc insertdatetime advlist lists wordcount imagetools textpattern noneditable charmap quickbars',
-            menubar: 'edit view insert format tools table',
-            toolbar: 'undo redo | bold italic underline strikethrough | fontselect fontsizeselect formatselect | alignleft aligncenter alignright alignjustify | outdent indent |  numlist bullist | forecolor backcolor removeformat | charmap | codesample | ltr rtl',
-            toolbar_sticky: true,
-            contextmenu: false,
-            resize: false,
-            statusbar: false,
-            skin: "oxide-dark",
-            content_css: "dark",
-            importcss_append: true,
-            quickbars_selection_toolbar: 'bold italic | quicklink h2 h3 blockquote quickimage quicktable',
-            noneditable_noneditable_class: "mceNonEditable",
-            toolbar_drawer: 'sliding',
-            setup: function (ed) {
-                ed.on('init', function(args) {
-                    setTimeout(function() { $('.tox-notification__dismiss').first().trigger('click'); }, 200);
-                    $('#siac-text-top_ifr').contents().find('body').css({
-                            background: '#2f2f31'
-                    });
-                });
-            }
-        });
-    """
\ No newline at end of file
diff --git a/src/web/note_templates.py b/src/web/note_templates.py
new file mode 100644
index 00000000..c616dfe6
--- /dev/null
+++ b/src/web/note_templates.py
@@ -0,0 +1,78 @@
+# anki-search-inside-add-card
+# Copyright (C) 2019 - 2020 Tom Z.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""
+HTML templates for search results.
+"""
+
+noteTemplate = """<div class='cardWrapper {grid_class}' id='nWr-{counter}'>
+                    <div class='topLeftWr'>
+                        <div id='cW-{nid}' class='rankingLbl' onclick="expandRankingLbl(this)">{counter}<div class='rankingLblAddInfo'>{creation}</div><div class='editedStamp'>{edited}</div></div>
+                        {ret}
+                    </div>
+                    <div id='btnBar-{nid}' class='btnBar' onmouseLeave='pinMouseLeave(this)' onmouseenter='pinMouseEnter(this)'>
+                        <div class='editLbl' onclick='edit({nid})'>Edit</div>
+                        <div class='srchLbl' onclick='searchCard(this)'><div class='siac-search-icn'></div></div>
+                        <div id='pin-{nid}' class='pinLbl unselected' onclick='pinCard(this, {nid})'><span>&#128204;</span></div>
+                        <div class='floatLbl' onclick='addFloatingNote({nid})'>&#10063;</div>
+                        <div id='rem-{nid}' class='remLbl' onclick='removeNote({nid})'><span>&times;</span></div>
+                    </div>
+                    <div class='cardR' onmouseup='getSelectionText()' onmouseenter='cardMouseEnter(this, {nid})' onmouseleave='cardMouseLeave(this, {nid})' id='{nid}' data-nid='{nid}'>{text}</div>
+                    <div id='tags-{nid}'  style='position: absolute; bottom: 0px; right: 0px;'>{tags}</div>
+                    <div class='cardLeftBot' onclick='expandCard({nid}, this)'>&nbsp;INFO&nbsp;</div>
+                </div>"""
+
+noteTemplateSimple = """<div class='cardWrapper' style="display: block;">
+                    <div class='topLeftWr'>
+                        <div class='rankingLbl'>{counter}<div class='rankingLblAddInfo'>{creation}</div><div class='editedStamp'>{edited}</div></div>
+                        {ret}
+                    </div>
+                    <div class='btnBar' id='btnBarSmp-{nid}' onmouseLeave='pinMouseLeave(this)' onmouseenter='pinMouseEnter(this)'>
+                        <div class='editLbl' onclick='edit({nid})'>Edit</div>
+                    </div>
+                    <div class='cardR' onmouseup='{mouseup}'  onmouseenter='cardMouseEnter(this, {nid}, "simple")' onmouseleave='cardMouseLeave(this, {nid}, "simple")'>{text}</div>
+                    <div style='position: absolute; bottom: 0px; right: 0px;'>{tags}</div>
+                    <div class='cardLeftBot' onclick='expandCard({nid}, this)'>&nbsp;INFO&nbsp;</div>
+                </div>"""
+
+noteTemplateUserNoteSimple = """<div class='cardWrapper' style="display: block;">
+                    <div class='topLeftWr'>
+                        <div class='rankingLbl'>{counter}<div class='rankingLblAddInfo'>{creation}</div><div class='editedStamp'>{edited}</div></div>
+                    </div>
+                    <div class='btnBar' id='btnBarSmp-{nid}' onmouseLeave='pinMouseLeave(this)' onmouseenter='pinMouseEnter(this)'>
+                        <div class='editLbl' onclick='pycmd("siac-edit-user-note {nid}")'>Edit</div>
+                    </div>
+                    <div class='cardR' onmouseup='{mouseup}'  onmouseenter='cardMouseEnter(this, {nid}, "simple")' onmouseleave='cardMouseLeave(this, {nid}, "simple")'>{text}</div>
+                    <div style='position: absolute; bottom: 0px; right: 0px;'>{tags}</div>
+                    <div class='cardLeftBot' style='display: none' onclick=''></div>
+                </div>"""
+
+noteTemplateUserNote = """<div class='cardWrapper siac-user-note {pdf_class} {grid_class}' id='nWr-{counter}'>
+                    <div class='topLeftWr'>
+                        <div id='cW-{nid}' class='rankingLbl'>{counter} &nbsp;SIAC<div class='rankingLblAddInfo'>{creation}</div><div class='editedStamp'>{edited}</div></div>
+                    </div>
+                    <div id='btnBar-{nid}' class='btnBar' onmouseLeave='pinMouseLeave(this)' onmouseenter='pinMouseEnter(this)'>
+                        <div class='deleteLbl' onclick='pycmd("siac-delete-user-note-modal {nid}"); '><div class='siac-trash-icn'></div></div>
+                        <div class='editLbl' onclick='pycmd("siac-edit-user-note {nid}")'>Edit</div>
+                        <div class='srchLbl' onclick='searchCard(this)'><div class='siac-search-icn'></div></div>
+                        <div id='pin-{nid}' class='pinLbl unselected' onclick='pinCard(this, {nid})'><span>&#128204;</span></div>
+                        <div class='floatLbl' onclick='addFloatingNote({nid})'>&#10063;</div>
+                        <div id='rem-{nid}' class='remLbl' onclick='removeNote({nid})'><span>&times;</span></div>
+                    </div>
+                    <div class='cardR siac-user-note' onmouseup='{mouseup}' onmouseenter='cardMouseEnter(this, {nid})' onmouseleave='cardMouseLeave(this, {nid})' id='{nid}' data-nid='{nid}'>{text}</div>
+                    <div id='tags-{nid}'  style='position: absolute; bottom: 0px; right: 0px;'>{tags}</div>
+                    <div class='cardLeftBot' onclick='pycmd("siac-read-user-note {nid}")'><div class='siac-read-icn'></div>{progress}</div>
+                </div>"""
diff --git a/src/web/reading_modal.py b/src/web/reading_modal.py
new file mode 100644
index 00000000..7e75dcb7
--- /dev/null
+++ b/src/web/reading_modal.py
@@ -0,0 +1,1835 @@
+# anki-search-inside-add-card
+# Copyright (C) 2019 - 2020 Tom Z.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+import platform
+import os
+import json
+import re
+import time
+from datetime import datetime as dt
+import sys
+import typing
+from typing import List, Optional, Tuple, Any
+import aqt
+import uuid
+import html as ihtml
+from aqt import mw
+from aqt.editor import Editor
+from aqt.utils import showInfo, tooltip
+
+import utility.tags
+import utility.text
+import utility.misc
+import utility.date
+
+from ..tag_find import get_most_active_tags
+from ..state import get_index, check_index, set_deck_map
+from ..notes import *
+from ..notes import _get_priority_list
+from ..models import SiacNote, IndexNote, Printable
+from .html import *
+from .note_templates import *
+from ..internals import js, requires_index_loaded, perf_time
+from ..config import get_config_value_or_default
+from ..web_import import import_webpage
+from ..stats import getRetentions
+
+
+class ReadingModal:
+    """ Used to display text and PDF notes. """
+
+    def __init__(self):
+        self.note_id            : Optional[int]         = None
+        self.note               : Optional[SiacNote]    = None
+        self._editor            : Optional[Editor]      = None
+
+        self.highlight_color    : str                   = "#e65100"
+        self.highlight_type     : int                   = 1
+
+        self.sidebar            : ReadingModalSidebar   = ReadingModalSidebar()
+
+    def set_editor(self, editor):
+        self._editor            = editor
+        self.sidebar.set_editor(editor)
+
+    def reset(self):
+        self.note_id            = None
+        self.note               = None
+
+    @requires_index_loaded
+    def display(self, note_id: int):
+
+        index                   = get_index()
+        note                    = get_note(note_id)
+
+        self.note_id            = note_id
+        self.note               = note
+
+        html                    = self.html()
+
+        index.ui.show_in_large_modal(html)
+
+        # wrap fields in tabs
+        index.ui.js("""
+            $(document.body).addClass('siac-reading-modal-displayed');
+            if (!document.getElementById('siac-reading-modal-tabs-left')) {
+                $('#siac-left-tab-browse,#siac-left-tab-pdfs,#siac-reading-modal-tabs-left').remove();
+                document.getElementById('leftSide').innerHTML += `
+                    <div id='siac-reading-modal-tabs-left'>
+                        <div class='siac-btn siac-btn-dark active' onclick='modalTabsLeftClicked("flds", this);'>Fields</div>
+                        <div class='siac-btn siac-btn-dark' onclick='modalTabsLeftClicked("browse", this);'>Browse</div>
+                        <div class='siac-btn siac-btn-dark' onclick='modalTabsLeftClicked("pdfs", this);'>PDFs</div>
+                    </div>
+                `;
+            }
+        """)
+
+        # if source is a pdf file path, try to display it
+        if note.is_pdf():
+            if utility.misc.file_exists(note.source):
+                self._display_pdf(note.source.strip(), note_id)
+            else:
+                message = "Could not load the given PDF.<br>Are you sure the path is correct?"
+                self.notification(message)
+
+        # auto fill tag entry if pdf has tags and config option is set
+        if note.tags is not None and len(note.tags.strip()) > 0 and get_config_value_or_default("pdf.onOpen.autoFillTagsWithPDFsTags", True):
+            self._editor.tags.setText(" ".join(mw.col.tags.canonify(mw.col.tags.split(note.tags))))
+
+        # auto fill user defined fields
+        fields_to_prefill = get_config_value_or_default("pdf.onOpen.autoFillFieldsWithPDFName", [])
+        if len(fields_to_prefill) > 0:
+            for f in fields_to_prefill:
+                title = note.get_title().replace("`", "&#96;")
+                if f in self._editor.note:
+                    i = self._editor.note._fieldOrd(f)
+                    self._editor.web.eval(f"$('.field').eq({i}).text(`{title}`);")
+
+    def display_head_of_queue(self):
+        recalculate_priority_queue()
+        nid = get_head_of_queue()
+        if nid is not None and nid >= 0:
+            self.display(nid)
+        else:
+            tooltip("Queue is empty.")
+
+    @js
+    def show_width_picker(self):
+        html = """
+            <div class='w-100 siac-rm-main-color-hover' onclick='pycmd("siac-left-side-width 10")'><b>10 - 90</b></div>
+            <div class='w-100 siac-rm-main-color-hover' onclick='pycmd("siac-left-side-width 15")'><b>15 - 85</b></div>
+            <div class='w-100 siac-rm-main-color-hover' onclick='pycmd("siac-left-side-width 25")'><b>25 - 75</b></div>
+            <div class='w-100 siac-rm-main-color-hover' onclick='pycmd("siac-left-side-width 33")'><b>33 - 67</b></div>
+            <div class='w-100 siac-rm-main-color-hover' onclick='pycmd("siac-left-side-width 40")'><b>40 - 60</b></div>
+            <div class='w-100 siac-rm-main-color-hover' onclick='pycmd("siac-left-side-width 50")'><b>50 - 50</b></div>
+            <div class='w-100 siac-rm-main-color-hover' onclick='pycmd("siac-left-side-width 60")'><b>60 - 40</b></div>
+            <div class='w-100 siac-rm-main-color-hover' onclick='pycmd("siac-left-side-width 67")'><b>67 - 33</b></div>
+        """
+
+        modal = """
+            <div class="siac-modal-small dark" contenteditable="false" style="text-align:center; color: lightgrey;">
+                <b>Width (%%)</b><br>
+                <b>Fields - Add-on</b>
+                    <br><br>
+                <div style="max-height: 200px; overflow-y: auto; overflow-x: hidden;">%s</div>
+                    <br><br>
+                <div class="siac-btn siac-btn-dark" onclick="$(this.parentNode).remove();">Close</div>
+            </div>
+        """ % html
+        return "$('#siac-reading-modal-center').append(`%s`)" % modal
+
+    @js
+    def display_read_range_input(self, note_id: int, num_pages: int):
+        on_confirm= """ if (document.getElementById('siac-range-input-min').value && document.getElementById('siac-range-input-max').value) {
+        pycmd('siac-user-note-mark-range %s ' + document.getElementById('siac-range-input-min').value
+                + ' ' + document.getElementById('siac-range-input-max').value
+                + ' ' + pdfDisplayed.numPages
+                + ' ' + pdfDisplayedCurrentPage);
+        }
+        """ % note_id
+        modal = f""" <div class="siac-modal-small dark" contenteditable="false" style="text-align:center; color: lightgrey;">
+                            Input a range of pages to mark as read (end incl.)<br><br>
+                            <input id='siac-range-input-min' style='width: 60px; background: #222; color: lightgrey; border-radius: 4px;' type='number' min='1' max='{num_pages}'/> &nbsp;-&nbsp; <input id='siac-range-input-max' style='width: 60px;background: #222; color: lightgrey; border-radius: 4px;' type='number' min='1' max='{num_pages}'/>
+                            <br/> <br/>
+                            <div class="siac-btn siac-btn-dark" onclick="{on_confirm} $(this.parentNode).remove();">&nbsp; Ok &nbsp;</div>
+                            &nbsp;
+                            <div class="siac-btn siac-btn-dark" onclick="$(this.parentNode).remove();">Cancel</div>
+                        </div> """
+        return "$('#siac-pdf-tooltip').hide();$('.siac-modal-small').remove(); $('#siac-reading-modal-center').append('%s');" % modal.replace("\n", "").replace("'", "\\'")
+
+
+    @js
+    def reload_bottom_bar(self, note_id: int = None):
+        """
+            Called after queue picker dialog has been closed without opening a new note.
+        """
+        if note_id is not None:
+
+            note = get_note(note_id)
+            html = self.bottom_bar(note)
+            html = html.replace("`", "\\`")
+            return "$('#siac-reading-modal-bottom-bar').replaceWith(`%s`); updatePdfDisplayedMarks();" % html
+
+        else:
+            return """if (document.getElementById('siac-reading-modal').style.display !== 'none' && document.getElementById('siac-reading-modal-top-bar')) {
+                        pycmd('siac-reload-reading-modal-bottom '+ $('#siac-reading-modal-top-bar').data('nid'));
+                    }"""
+
+
+    def _display_pdf(self, full_path: str, note_id: int):
+        base64pdf = utility.misc.pdf_to_base64(full_path)
+        blen = len(base64pdf)
+
+        #pages read are stored in js array [int]
+        pages_read = get_read_pages(note_id)
+        pages_read_js = "" if len(pages_read) == 0 else ",".join([str(p) for p in pages_read])
+
+        #marks are stored in two js maps, one with pages as keys, one with mark types (ints) as keys
+        marks = get_pdf_marks(note_id)
+        js_maps = utility.misc.marks_to_js_map(marks)
+        marks_js = "pdfDisplayedMarks = %s; pdfDisplayedMarksTable = %s;" % (js_maps[0], js_maps[1])
+
+        # pages read are ordered by date, so take last
+        last_page_read = pages_read[-1] if len(pages_read) > 0 else 1
+
+        title = utility.text.trim_if_longer_than(self.note.get_title(), 50).replace('"', "")
+        addon_id = utility.misc.get_addon_id()
+        port = mw.mediaServer.getPort()
+
+        init_code = """
+            pdfLoading = true;
+            var bstr = atob(b64);
+            var n = bstr.length;
+            var arr = new Uint8Array(n);
+            while(n--){
+                arr[n] = bstr.charCodeAt(n);
+            }
+            var file = new File([arr], "placeholder.pdf", {type : "application/pdf" });
+            var fileReader = new FileReader();
+            pagesRead = [%s];
+            %s
+            var loadFn = function(retry) {
+                if (retry > 4) {
+                    $('#siac-pdf-loader-wrapper').remove();
+                    document.getElementById('siac-pdf-top').style.overflowY = 'auto';
+                    $('#siac-timer-popup').html(`<br><center>PDF.js could not be loaded from CDN.</center><br>`).show();
+                    pdfDisplayed = null;
+                    ungreyoutBottom();
+                    fileReader = null;
+                    pdfLoading = false;
+                    noteLoading = false;
+                    return;
+                }
+                if (typeof(pdfjsLib) === 'undefined') {
+                    window.setTimeout(() => { loadFn(retry + 1);}, 800);
+                    document.getElementById('siac-loader-text').innerHTML = `PDF.js was not loaded. Retrying (${retry+1} / 5)`;
+                    return;
+                }
+                if (!pdfjsLib.GlobalWorkerOptions.workerSrc) {
+                    pdfjsLib.GlobalWorkerOptions.workerSrc = 'http://127.0.0.1:%s/_addons/%s/web/pdfjs/pdf.worker.min.js';
+                }
+                var canvas = document.getElementById("siac-pdf-canvas");
+                var typedarray = new Uint8Array(fileReader.result);
+                var loadingTask = pdfjsLib.getDocument(typedarray, {nativeImageDecoderSupport: 'display'});
+                loadingTask.promise.catch(function(error) {
+                        console.log(error);
+                        $('#siac-pdf-loader-wrapper').remove();
+                        document.getElementById('siac-pdf-top').style.overflowY = 'auto';
+
+                        $('#siac-timer-popup').html(`<br><center>Could not load PDF - seems to be invalid.</center><br>`).show();
+                        pdfDisplayed = null;
+                        ungreyoutBottom();
+                        fileReader = null;
+                        pdfLoading = false;
+                        noteLoading = false;
+                });
+                loadingTask.promise.then(function(pdf) {
+                        pdfDisplayed = pdf;
+                        pdfDisplayedCurrentPage = %s;
+                        pdfHighDPIWasUsed = false;
+                        $('#siac-pdf-loader-wrapper').remove();
+                        document.getElementById('siac-pdf-top').style.overflowY = 'auto';
+
+                        if (pagesRead.length === pdf.numPages) {
+                            pdfDisplayedCurrentPage = 1;
+                            queueRenderPage(1, true, true, true);
+                        } else {
+                            queueRenderPage(pdfDisplayedCurrentPage, true, true, true);
+                        }
+                        updatePdfProgressBar();
+                        if (pdfBarsHidden) {
+                            showPDFBottomRightNotification("%s", 4000);
+                        }
+                        if (pagesRead.length === 0) { pycmd('siac-insert-pages-total %s ' + pdf.numPages); }
+                        fileReader = null;
+                });
+            };
+            fileReader.onload = (e) => { loadFn(0); };
+
+            fileReader.readAsArrayBuffer(file);
+            b64 = ""; arr = null; bstr = null; file = null;
+        """ % (pages_read_js, marks_js, port, addon_id, last_page_read, title, note_id)
+        #send large files in multiple packets
+        page = self._editor.web.page()
+        chunk_size = 10000000
+        if blen > chunk_size:
+            page.runJavaScript(f"var b64 = `{base64pdf[0: chunk_size]}`;")
+            sent = chunk_size
+            while sent < blen:
+                page.runJavaScript(f"b64 += `{base64pdf[sent: min(blen,sent + chunk_size)]}`;")
+                sent += min(blen - sent, chunk_size)
+            page.runJavaScript(init_code)
+        else:
+            page.runJavaScript("""
+                var b64 = `%s`;
+                    %s
+            """ % (base64pdf, init_code))
+
+    def show_fields_tab(self):
+        self.sidebar.show_fields_tab()
+
+    def show_browse_tab(self):
+        self.sidebar.show_browse_tab()
+
+    def show_pdfs_tab(self):
+        self.sidebar.show_pdfs_tab()
+
+    def html(self) -> str:
+        """ Builds the html which has to be inserted into the webview to display the reading modal. """
+
+        index       = get_index()
+        note        = self.note
+        note_id     = self.note_id
+        text        = note.text
+        tags        = note.tags
+        created_dt  = datetime.datetime.strptime(note.created, '%Y-%m-%d %H:%M:%S')
+        diff        = datetime.datetime.now() - created_dt
+        queue       = _get_priority_list()
+        queue_len   = len(queue)
+        time_str    = "Added %s ago." % utility.misc.date_diff_to_string(diff)
+
+        if check_index():
+
+            title           = note.get_title()
+            title           = utility.text.trim_if_longer_than(title, 70)
+            title           = ihtml.escape(title)
+            source          = note.source.strip() if note.source is not None and len(note.source.strip()) > 0 else "Empty"
+            source_icn      = ""
+            priority        = get_priority(note_id)
+            schedule_btns   = self.schedule_btns(priority)
+            img_folder      = utility.misc.img_src_base_path()
+
+            if note.is_in_queue():
+                queue_btn_text      = "Done!"
+                queue_btn_action    = "siac-user-note-done"
+                active              = "active" if note.is_due_sometime() else ""
+                schedule_dialog_btn = f"""<span id='siac-schedule-dialog-btn' class='siac-queue-picker-icn {active}' onclick='pycmd("siac-schedule-dialog")'>{clock_svg(False)}</span>"""
+            else:
+                queue_btn_text      = "First in Queue"
+                queue_btn_action    = "siac-user-note-queue-read-head"
+                schedule_dialog_btn = ""
+
+            html = """
+                <script>destroyTinyMCE();</script>
+                <div style='width: 100%; display: flex; flex-direction: column;'>
+                        <div id='siac-reading-modal-top-btns'>
+                            <div class='siac-btn siac-btn-dark' style='background-image: url("{img_folder}switch_layout.png");' onclick='switchLeftRight();'></div>
+                            <div class='siac-btn siac-btn-dark' style='background-image: url("{img_folder}fullscreen.png");' onclick='toggleReadingModalFullscreen();'></div>
+                            <div class='siac-btn siac-btn-dark' style='background-image: url("{img_folder}partition.png");' onclick='pycmd("siac-left-side-width");'></div>
+                            <div class='siac-btn siac-btn-dark' style='background-image: url("{img_folder}toggle_bars.png");' onclick='toggleReadingModalBars();'></div>
+                            <div class='siac-btn siac-btn-dark' style='background-image: url("{img_folder}close.png");' onclick='onReadingModalClose({note_id});'></div>
+                        </div>
+                    
+                        <div id='siac-pdf-tooltip' onclick='event.stopPropagation();' onkeyup='event.stopPropagation();'>
+                            <div id='siac-pdf-tooltip-top'></div>
+                            <div id='siac-pdf-tooltip-results-area' onkeyup="pdfTooltipClozeKeyup(event);"></div>
+                            <div id='siac-pdf-tooltip-bottom'></div>
+                            <input id='siac-pdf-tooltip-searchbar' onkeyup='if (event.keyCode === 13) {{pycmd("siac-pdf-tooltip-search " + this.value);}}'></input>
+                        </div>
+                        <div id='siac-reading-modal-top-bar' data-nid='{note_id}' style=''>
+                            <div style='flex: 1 1; overflow: hidden;'>
+                                <h2 style='margin: 0 0 5px 0; white-space: nowrap; overflow: hidden; vertical-align:middle;'>{title}</h2>
+                                <h4 style='whitespace: nowrap; margin: 5px 0 8px 0; color: lightgrey;'>Source: <i>{source}</i></h4>
+                                <div id='siac-prog-bar-wr'></div>
+                            </div>
+                            <div style='flex: 0 0; min-width: 130px; padding: 0 120px 0 10px;'>
+                                <span class='siac-timer-btn' onclick='resetTimer(this)'>5</span><span class='siac-timer-btn' onclick='resetTimer(this)'>10</span><span class='siac-timer-btn' onclick='resetTimer(this)'>15</span><span class='siac-timer-btn' onclick='resetTimer(this)'>25</span><span class='siac-timer-btn active' onclick='resetTimer(this)'>30</span><br>
+                                <span id='siac-reading-modal-timer'>30 : 00</span><br>
+                                <span class='siac-timer-btn' onclick='resetTimer(this)'>45</span><span class='siac-timer-btn' onclick='resetTimer(this)'>60</span><span class='siac-timer-btn' onclick='resetTimer(this)'>90</span><span id='siac-timer-play-btn' class='inactive' onclick='toggleTimer(this);'>Start</span>
+                            
+                            </div>
+                            <div id='siac-reading-modal-change-theme'>
+                                <a onclick='pycmd("siac-eval index.ui.reading_modal.show_theme_dialog()")'>Change Theme</a>
+                            </div>
+                            
+                        </div>
+                        <div id='siac-reading-modal-center' style='flex: 1 1 auto; overflow-y: {overflow}; font-size: 13px; padding: 0 20px 0 24px; position: relative; display: flex; flex-direction: column;' >
+                            <div id='siac-rm-greyout'></div>
+                            {text}
+                        </div>
+                        <div id='siac-reading-modal-bottom-bar'>
+                            <div style='width: 100%; height: calc(100% - 5px); display: inline-block; padding-top: 5px; white-space: nowrap;'>
+                                <div style='padding: 5px; display: inline-block; vertical-align: top;'><div class='siac-queue-sched-btn active' onclick='toggleQueue();'>{queue_info_short}</div></div>
+                                {schedule_btns}
+                                <div id='siac-queue-actions' style='display: inline-block; height: 90px; vertical-align: top; margin-left: 20px; margin-top: 3px; user-select: none; z-index: 1;'>
+                                    <span style='vertical-align: top;' id='siac-queue-lbl'>{queue_info}</span><br>
+                                    <span style='margin-top: 5px; color: lightgrey;'>{time_str}</span> <br>
+                                    <div style='margin: 7px 0 4px 0; display: inline-block;'>Actions: <span class='siac-queue-picker-icn' onclick='if (pdfLoading||noteLoading||pdfSearchOngoing) {{return;}}pycmd("siac-user-note-queue-picker {note_id}")'>\u2630</span>{schedule_dialog_btn}</div><br>
+                                    <a onclick='if (!pdfLoading && !modalShown) {{ noteLoading = true; greyoutBottom(); destroyPDF(); pycmd("{queue_btn_action}");}}' class='siac-clickable-anchor' style='font-size: 16px; font-weight: bold;' id='siac-first-in-queue-btn'>{queue_btn_text}</a><br>
+                                    <a onclick='if (!pdfLoading && !modalShown) {{ noteLoading = true; greyoutBottom(); destroyPDF(); pycmd("siac-user-note-queue-read-random");}}' class='siac-clickable-anchor'>Random</a><span style='color: grey; user-select: none;'>&nbsp;|&nbsp;</span>
+                                    <a onclick='if (!pdfLoading && !modalShown) {{ modalShown = true; greyoutBottom(); pycmd("siac-eval index.ui.reading_modal.show_remove_dialog()");}}' class='siac-clickable-anchor'>Remove</a>
+                                </div>
+                                {queue_readings_list}
+                                <div id='siac-queue-infobox-wrapper'>
+                                    <div id='siac-queue-infobox' onmouseleave='leaveQueueItem();'></div>
+                                </div>
+                                <div id='siac-pdf-bottom-tabs' style='display: inline-block; vertical-align: top; margin-left: 16px; user-select: none;'>
+                                    <a class='siac-clickable-anchor tab active' onclick='pycmd("siac-pdf-show-bottom-tab {note_id} marks")' style='margin-right: 10px;'>Marks</a>
+                                    <a class='siac-clickable-anchor tab' onclick='pycmd("siac-pdf-show-bottom-tab {note_id} related")' style='margin-right: 10px;'>Related</a>
+                                    <a class='siac-clickable-anchor tab' onclick='pycmd("siac-pdf-show-bottom-tab {note_id} info")'>Info</a> <br>
+                                    <div id='siac-pdf-bottom-tab'>
+                                        <div id='siac-marks-display' onclick='markClicked(event);'></div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div id='siac-timer-popup'>
+                        </div>
+                </div>
+                <script>
+                destroyPDF();
+                if (readingTimer != null)  {{
+                    $('#siac-timer-play-btn').html('Pause').removeClass('inactive');
+                }} else if (remainingSeconds !== 1800) {{
+                    document.getElementById("siac-reading-modal-timer").innerHTML = Math.floor(remainingSeconds / 60) + " : " + (remainingSeconds % 60 < 10 ? "0" + remainingSeconds % 60 : remainingSeconds % 60);
+                }}
+                if (pdfFullscreen) {{
+                    activateReadingModalFullscreen();
+                }} else if (pdfBarsHidden) {{
+                    pdfBarsHidden = false;
+                    toggleReadingModalBars();
+                }}
+                iframeIsDisplayed = false;
+                noteLoading = false;
+                modalShown = false;
+                </script>
+            """
+
+            #check if it is a pdf or feed
+            overflow = "auto"
+            if note.is_pdf() and utility.misc.file_exists(source):
+                editable    = False
+                overflow    = "hidden" 
+                text        = self.pdf_viewer_html(source, note.get_title(), priority)
+                if "/" in source:
+                    source  = source[source.rindex("/") +1:]
+            elif note.is_feed():
+                text        = self.get_feed_html(note_id, source)
+                editable    = False
+            else:
+                editable    = len(text) < 100000
+                text        = self.text_note_html(editable, priority)
+            
+        
+            queue_info          = "Priority: %s" % (dynamic_sched_to_str(priority)) if note.is_in_queue() else "Unqueued."
+            queue_info_short    = f"Priority" if note.is_in_queue() else "Unqueued"
+            queue_readings_list = self.get_queue_head_display(queue, editable)
+
+            params              = dict(note_id = note_id, title = title, source = source, time_str = time_str, img_folder = img_folder, queue_btn_text = queue_btn_text, queue_btn_action = queue_btn_action, text = text, queue_info = queue_info, 
+            queue_info_short    = queue_info_short, schedule_btns=schedule_btns, queue_readings_list = queue_readings_list, overflow=overflow, schedule_dialog_btn=schedule_dialog_btn)
+            html                = html.format_map(params)
+
+            return html
+        return ""
+
+
+    def text_note_html(self, editable: bool, priority: int) -> str:
+        """
+            Returns the html which is wrapped around the text of user notes inside the reading modal.
+            This function is used if the note is a regular, text-only note, if the note is a pdf note, 
+            pdf_viewer_html is used instead.
+        """
+
+        nid                     = self.note_id
+        dir                     = utility.misc.get_web_folder_path()
+        text                    = self.note.text
+        search_sources          = ""
+        config                  = mw.addonManager.getConfig(__name__)
+        urls                    = config["searchUrls"]
+
+        if urls is not None and len(urls) > 0:
+            search_sources = self.iframe_dialog(urls)
+
+        is_content_editable     = "true" if editable else "false"
+        title                   = utility.text.trim_if_longer_than(self.note.get_title(), 50).replace('"', "")
+        quick_sched             = self.quick_sched_btn(priority)
+
+        html                    = """
+            <div id='siac-iframe-btn' style='top: 5px; left: 0px;' class='siac-btn siac-btn-dark' onclick='$(this).toggleClass("expanded")'>W
+                <div style='margin-left: 5px; margin-top: 4px; color: lightgrey; width: calc(100% - 40px); text-align: center; color: grey;'>Note: Not all sites allow embedding!</div>
+                <div style='padding: 0 15px 10px 15px; margin-top: 10px; max-height: 500px; overflow-y: auto; box-sizing: border-box; width: 100%;'>
+                    <input onclick="event.stopPropagation();" onkeyup="if (event.keyCode === 13) {{ pdfUrlSearch(this.value); this.value = ''; }}"></input> 
+                    <br/>
+                {search_sources}
+                </div>
+            </div>
+            {quick_sched_btn}
+            <div id='siac-close-iframe-btn' class='siac-btn siac-btn-dark' onclick='pycmd("siac-close-iframe")'>&times; &nbsp;Close Web</div>
+            <div id='siac-text-top-wr' style='height: calc(100% - 42px);'>
+                <div id='siac-text-top'>
+                    {text}
+                </div>
+            </div>
+            <iframe id='siac-iframe' sandbox='allow-scripts' style='height: calc(100% - 47px);'></iframe>
+            <div class="siac-reading-modal-button-bar-wrapper">
+                <div style='position: absolute; left: 0; z-index: 1; user-select: none;'>
+                    <div class='siac-btn siac-btn-dark' style="margin-left: -20px;" onclick='toggleReadingModalBars();'>&#x2195;</div>
+                    <div class='siac-btn siac-btn-dark' id='siac-rd-note-btn' onclick='pycmd("siac-create-note-add-only {nid}")' style='margin-left: 5px;'><b>&#9998; Note</b></div>
+                    <div class='siac-btn siac-btn-dark' id='siac-extract-text-btn' onclick='tryExtractTextFromTextNote()' style='margin-left: 5px;'><b>Copy to new Note</b></div>
+                    <div class='siac-btn siac-btn-dark' onclick='saveTextNote({nid}, remove=false)' style='margin-left: 5px;'><b>&nbsp; Save &nbsp;</b></div>
+                    <span id='siac-text-note-status' style='margin-left: 30px; color: grey;'></span>
+                </div>
+            </div>
+            <div id='siac-pdf-br-notify'>
+            </div>
+            <script>
+                if (pdfBarsHidden) {{
+                    showPDFBottomRightNotification("{title}", 4000);
+                }}
+                pdfDisplayedMarks = null;
+                pdfDisplayedMarksTable = null;
+                {tiny_mce} 
+            </script>
+        """.format_map(dict(text = text, nid = nid, search_sources=search_sources, quick_sched_btn=quick_sched, title=title, tiny_mce=self.tiny_mce_init_code()))
+        return html
+
+    def quick_sched_btn(self, priority: int) -> str:
+        """ The button at the left side of the pdf/note pane, which allows to quickly mark as done and/or update the priority. """
+
+        nid         = self.note_id
+        value       = 0 if priority is None or priority < 0 else priority
+
+        if value == 0: 
+            current_btn = ""
+        else:
+            current_btn = f"""<div class='siac-btn siac-btn-dark-smaller' onclick='pycmd("siac-user-note-done");'><b>Current</b></div>"""
+        return f"""
+            <div class='siac-btn siac-btn-dark' id='siac-quick-sched-btn' onclick='onQuickSchedBtnClicked(this);'><div class='siac-read-icn siac-read-icn-light'></div>
+                <div class='expanded-hidden white-hover' style='margin: 0 0 0 6px; color: lightgrey; text-align: center;'>
+                    <input id='siac-prio-slider-small' type='range' class='siac-prio-slider-small' max='100' min='0' value='{value}' oninput='schedSmallChange(this)' onchange='schedSmallChanged(this, {nid})'/>
+                    <span id='siac-slider-small-lbl' style='margin: 0 5px 0 5px;'>{value}</span>
+                    {current_btn}
+                </div>
+            </div>
+        """
+
+    def get_feed_html(self, nid, source):
+        """ Not used currently. """
+
+        #extract feed url
+        try:
+            feed_url    = source[source.index(":") +1:].strip()
+        except:
+            return "<center>Could not load feed. Please check the URL.</center>"
+        res             = read(feed_url)
+        dir             = utility.misc.get_web_folder_path()
+        search_sources  = ""
+        config          = mw.addonManager.getConfig(__name__)
+        urls            = config["searchUrls"]
+        if urls is not None and len(urls) > 0:
+            search_sources = self.iframe_dialog(urls)
+        text            = ""
+        templ           = """
+                <div class='siac-feed-item'>
+                    <div><span class='siac-blue-outset'>%s</span> &nbsp;<a href="%s" class='siac-ul-a'>%s</a></div>
+                    <div><i>%s</i> <span style='margin-left: 15px;'>%s</span></div> 
+                    <div style='margin: 15px;'>%s</div>
+                </div> """
+
+        for ix, message in enumerate(res[:25]):
+            if len(message.categories) > 0:
+                if len(message.categories) == 1:
+                    cats = f"<span class='blue-underline'>{message.categories[0]}</span>"
+                else:
+                    cats = "<span class='blue-underline'>" + "</span> &nbsp;<span class='blue-underline'>".join(message.categories) + "</span>"
+            else:
+                cats = ""
+            text = ''.join((text, templ % (ix + 1, message.link, message.title, message.date, cats, message.text)))
+        html = """
+            <div id='siac-iframe-btn' style='top: 5px; left: 0px;' class='siac-btn siac-btn-dark' onclick='$(this).toggleClass("expanded")'>W
+                <div style='margin-left: 5px; margin-top: 4px; color: lightgrey; width: calc(100% - 40px); text-align: center; color: grey;'>Note: Not all sites allow embedding!</div>
+                <div style='padding: 0 15px 10px 15px; margin-top: 10px; max-height: 500px; overflow-y: auto; box-sizing: border-box; width: 100%;'>
+                    <input onclick="event.stopPropagation();" onkeyup="if (event.keyCode === 13) {{ pdfUrlSearch(this.value); this.value = ''; }}"></input> 
+                    <br/>
+                {search_sources}
+                </div>
+            </div>
+            <div id='siac-close-iframe-btn' class='siac-btn siac-btn-dark' onclick='pycmd("siac-close-iframe")'>&times; &nbsp;Close Web</div>
+            <div id='siac-text-top' contenteditable='false' onmouseup='nonPDFKeyup();' onclick='if (!window.getSelection().toString().length) {{$("#siac-pdf-tooltip").hide();}}'>
+                {text}
+            </div>
+            <iframe id='siac-iframe' sandbox='allow-scripts' style='height: calc(100% - 47px);'></iframe>
+            <div class="siac-reading-modal-button-bar-wrapper">
+                <div style='position: absolute; left: 0; z-index: 1; user-select: none;'>
+                    <div class='siac-btn siac-btn-dark' style="margin-left: -20px;" onclick='toggleReadingModalBars();'>&#x2195;</div>
+                    <div class='siac-btn siac-btn-dark' id='siac-rd-note-btn' onclick='pycmd("siac-create-note-add-only {nid}")' style='margin-left: 5px;'><b>&#9998; Note</b></div>
+                </div>
+            </div>
+            <script>
+                if (pdfTooltipEnabled) {{
+                    $('#siac-pdf-tooltip-toggle').addClass('active');
+                }} else {{
+                    $('#siac-pdf-tooltip-toggle').removeClass('active');
+                }}
+                ungreyoutBottom();
+            </script>
+        """.format_map(dict(text = text, nid = nid, search_sources=search_sources))
+        return html
+
+
+    def bottom_bar(self, note):
+        """ Returns only the html for the bottom bar, useful if the currently displayed pdf should not be reloaded, but the queue display has to be refreshed. """
+
+        index           = get_index()
+        text            = note.text
+        note_id         = note.id
+        source          = note.source
+        created_dt      = datetime.datetime.strptime(note.created, '%Y-%m-%d %H:%M:%S')
+        diff            = datetime.datetime.now() - created_dt
+        queue           = _get_priority_list()
+        queue_len       = len(queue)
+        priority        = get_priority(note_id)
+        schedule_btns   = self.schedule_btns(priority)
+        time_str        = "Added %s ago." % utility.misc.date_diff_to_string(diff)
+
+        if note.is_in_queue():
+            queue_btn_text      = "Done!"
+            queue_btn_action    = "siac-user-note-done"
+            active              = "active" if note.is_due_sometime() else ""
+            schedule_dialog_btn = f"""<span id='siac-schedule-dialog-btn' class='siac-queue-picker-icn {active}' onclick='pycmd("siac-schedule-dialog")'>{clock_svg(False)}</span>"""
+        else:
+            queue_btn_text      = "First in Queue"
+            queue_btn_action    = "siac-user-note-queue-read-head"
+            schedule_dialog_btn = ""
+
+        html = """
+                <div id='siac-reading-modal-bottom-bar' style=''>
+                    <div style='width: 100%; height: calc(100% - 5px); display: inline-block; padding-top: 5px; white-space: nowrap; display: relative;'>
+
+                        <div style='padding: 5px; display: inline-block; vertical-align: top;'><div class='siac-queue-sched-btn active' onclick='toggleQueue();'>{queue_info_short}</div></div>
+                        {schedule_btns} 
+                        <div  id='siac-queue-actions'  style='display: inline-block; height: 90px; vertical-align: top; margin-left: 20px; margin-top: 3px; user-select: none; z-index: 1;'>
+                            <span style='vertical-align: top;' id='siac-queue-lbl'>{queue_info}</span><br>
+                            <span style='margin-top: 5px; color: lightgrey;'>{time_str}</span> <br>
+                            <div style='margin: 7px 0 4px 0; display: inline-block;'>Actions: <span class='siac-queue-picker-icn' onclick='if (pdfLoading||noteLoading||pdfSearchOngoing) {{return;}}pycmd("siac-user-note-queue-picker {note_id}")'>\u2630</span>{schedule_dialog_btn}</div><br>
+                            <a onclick='if (!pdfLoading && !modalShown) {{ noteLoading = true; greyoutBottom(); pycmd("{queue_btn_action}") }}' class='siac-clickable-anchor' style='font-size: 16px; font-weight: bold;' id='siac-first-in-queue-btn'>{queue_btn_text}</a><br>
+                            <a onclick='if (!pdfLoading && !modalShown) {{ noteLoading = true; greyoutBottom(); pycmd("siac-user-note-queue-read-random") }}' class='siac-clickable-anchor'>Random</a><span style='color: grey; user-select: none;'>&nbsp;|&nbsp;</span>
+                            <a onclick='if (!pdfLoading && !modalShown) {{ modalShown = true; greyoutBottom(); pycmd("siac-eval index.ui.reading_modal.show_remove_dialog()");}}' class='siac-clickable-anchor'>Remove</a>
+                        </div>
+                        {queue_readings_list}
+                        <div id='siac-queue-infobox-wrapper'>
+                            <div id='siac-queue-infobox' onmouseleave='leaveQueueItem();'></div>
+                        </div>
+                        <div id='siac-pdf-bottom-tabs' style='display: inline-block; vertical-align: top; margin-left: 16px; user-select: none;'>
+                            <a class='siac-clickable-anchor tab active' onclick='pycmd("siac-pdf-show-bottom-tab {note_id} marks")' style='margin-right: 10px;'>Marks</a>
+                            <a class='siac-clickable-anchor tab' onclick='pycmd("siac-pdf-show-bottom-tab {note_id} related")' style='margin-right: 10px;'>Related</a>
+                            <a class='siac-clickable-anchor tab' onclick='pycmd("siac-pdf-show-bottom-tab {note_id} info")'>Info</a> <br>
+                            <div id='siac-pdf-bottom-tab'>
+                                <div id='siac-marks-display' onclick='markClicked(event);'></div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+        """
+
+        editable            = not note.is_feed() and not note.is_pdf() and len(text) < 50000
+        queue_info          = "Priority: %s" % (dynamic_sched_to_str(priority)) if note.is_in_queue() else "Unqueued."
+        # queue_info_short = f"Queue [{note.position + 1}]" if note.is_in_queue() else "Unqueued"
+        queue_info_short    = f"Priority" if note.is_in_queue() else "Unqueued"
+        queue_readings_list = self.get_queue_head_display(queue, editable)
+
+        params              = dict(note_id = note_id, time_str = time_str, queue_btn_text = queue_btn_text, queue_btn_action = queue_btn_action, queue_info = queue_info, queue_info_short = queue_info_short, 
+        queue_readings_list = queue_readings_list, schedule_btns=schedule_btns, schedule_dialog_btn=schedule_dialog_btn )
+
+        html                = html.format_map(params)
+
+        return html
+
+    def get_queue_head_display(self, queue: Optional[List[SiacNote]] = None, should_save: bool = False) -> str:
+        """ This returns the html for the little list at the bottom of the reading modal which shows the first 5 items in the queue. """
+
+        if queue is None:
+            queue = _get_priority_list()
+        if queue is None or len(queue) == 0:
+            return "<div id='siac-queue-readings-list' style='display: inline-block; height: 90px; vertical-align: top; margin-left: 20px; user-select: none;'></div>"
+
+        note_id             = self.note_id
+        note                = self.note
+
+        if not note.is_pdf() and not note.is_feed():
+            should_save     = True
+
+        config              = mw.addonManager.getConfig(__name__)
+        hide                = config["pdf.queue.hide"]
+        queue_head_readings = ""
+
+        for ix, queue_item in enumerate(queue):
+
+            should_greyout = "greyedout" if queue_item.id == int(note_id) else ""
+            if not hide or queue_item.id == int(note_id) :
+                qi_title = utility.text.trim_if_longer_than(queue_item.get_title(), 40) 
+                qi_title = ihtml.escape(qi_title)
+            else:
+                qi_title = utility.text.trim_if_longer_than(re.sub("[^ ]", "?",queue_item.get_title()), 40)
+
+            hover_actions       = "onmouseenter='showQueueInfobox(this, %s);' onmouseleave='leaveQueueItem(this);'" % (queue_item.id) if not hide else ""
+            #if the note is a pdf or feed, show a loader on click
+            pdf_or_feed         = queue_item.is_feed() or queue_item.is_pdf()
+            clock               = clock_svg(len(should_greyout) > 0) if queue_item.is_scheduled() else ""
+            should_show_loader  = 'document.getElementById("siac-reading-modal-center").innerHTML = ""; showLoader(\"siac-reading-modal-center\", \"Loading Note...\");' if pdf_or_feed else ""
+            queue_head_readings +=  "<a onclick='if (!pdfLoading && !modalShown) {%s  destroyPDF(); noteLoading = true; greyoutBottom(); pycmd(\"siac-read-user-note %s\"); hideQueueInfobox();}' class='siac-clickable-anchor %s' style='font-size: 12px; font-weight: bold;' %s >%s.%s %s</a><br>" % (should_show_loader, queue_item.id, should_greyout, hover_actions, queue_item.position + 1, clock, qi_title)
+            if ix > 3:
+                break
+
+        if hide:
+            hide_btn = """<div style='display: inline-block; margin-left: 12px; color: grey;' class='blue-hover' onclick='unhideQueue(%s)'>(Show Items)</div>""" % note_id
+        else:
+            hide_btn = """<div style='display: inline-block; margin-left: 12px; color: grey;' class='blue-hover' onclick='hideQueue(%s)'>(Hide Items)</div>""" % note_id
+
+        html = """
+        <div id='siac-queue-readings-list' style='display: inline-block; height: 90px; vertical-align: top; margin-left: 20px; user-select: none;'>
+            <div style='margin: 0px 0 3px 0; display: inline-block; color: lightgrey;'>Queue Head:</div>%s<br>
+                %s
+        </div>
+        """ % (hide_btn, queue_head_readings)
+
+        return html
+
+    def schedule_btns(self, priority: int) -> str:
+        """ Returns the html for the buttons that allow to quickly reschedule the current item in the reading modal. """
+
+        note_id         = self.note_id
+        priority        = 0 if priority is None else priority
+        prio_verbose    = dynamic_sched_to_str(priority).replace("(", "(<b>").replace(")", "</b>)")
+
+        return f"""
+        <div id='siac-queue-sched-wrapper'>
+            <div class='w-100' style='text-align: center; color: lightgrey;'>
+                Release to mark as <b>done.</b><br>
+                <input type="range" min="0" max="100" value="{priority}" oninput='schedChange(this)' onchange='schedChanged(this, {note_id})' class='siac-prio-slider' style='margin-top: 12px;'/>
+            </div>
+            <div class='w-100' style='text-align: center; padding-top: 10px;'>
+                <span style='font-size: 21px;' id='siac-sched-prio-val'>{prio_verbose}</span><br>
+                <span style='font-size: 12px; color: grey;' id='siac-sched-prio-lbl'></span>
+            </div>
+        </div>
+        """
+
+    def pdf_viewer_html(self, source: str, title: str, priority: int) -> str:
+        """ Returns the center area of the reading modal. Use this if the displayed note is a pdf. """
+        
+        nid                 = self.note_id
+        dir                 = utility.misc.get_web_folder_path()
+        config              = mw.addonManager.getConfig(__name__)
+        urls                = config["searchUrls"]
+        search_sources      = self.iframe_dialog(urls) if urls else ""
+        marks_img_src       = utility.misc.img_src("mark-star-24px.png")
+        marks_grey_img_src  = utility.misc.img_src("mark-star-lightgrey-24px.png")
+        pdf_search_img_src  = utility.misc.img_src("magnify-24px.png")
+        quick_sched         = self.quick_sched_btn(priority)
+
+        html = """
+            <div id='siac-pdf-overlay'>PAGE READ</div>
+            <div id='siac-pdf-overlay-top'>
+                <div id='siac-pdf-mark-btn' class='siac-btn siac-btn-dark' onclick='$(this).toggleClass("expanded")'><img src='{marks_img_src}' style='width: 17px; height: 17px; margin: 0;'/>
+                    <div style='margin-left: 7px;'>
+                        <div class='siac-mark-btn-inner siac-mark-btn-inner-1' onclick='pycmd("siac-pdf-mark 1 {nid} " + pdfDisplayedCurrentPage + " " + pdfDisplayed.numPages)'>Revisit</div>
+                        <div class='siac-mark-btn-inner siac-mark-btn-inner-2' onclick='pycmd("siac-pdf-mark 2 {nid} " + pdfDisplayedCurrentPage + " " + pdfDisplayed.numPages)'>Hard</div>
+                        <div class='siac-mark-btn-inner siac-mark-btn-inner-3' onclick='pycmd("siac-pdf-mark 3 {nid} " + pdfDisplayedCurrentPage + " " + pdfDisplayed.numPages)'>More Info</div>
+                        <div class='siac-mark-btn-inner siac-mark-btn-inner-4' onclick='pycmd("siac-pdf-mark 4 {nid} " + pdfDisplayedCurrentPage + " " + pdfDisplayed.numPages)'>More Cards</div>
+                        <div class='siac-mark-btn-inner siac-mark-btn-inner-5' onclick='pycmd("siac-pdf-mark 5 {nid} " + pdfDisplayedCurrentPage + " " + pdfDisplayed.numPages)'>Bookmark</div>
+                    </div> 
+                </div>
+                <div style='display: inline-block; vertical-align: top;' id='siac-pdf-overlay-top-lbl-wrap'></div>
+            </div>
+            <div id='siac-iframe-btn' class='siac-btn siac-btn-dark' onclick='$(this).toggleClass("expanded")'>W
+                <div style='margin-left: 5px; margin-top: 4px; color: lightgrey; width: calc(100% - 40px); text-align: center;'>Note: Not all sites allow embedding!</div>
+                <div style='padding: 0 15px 10px 15px; margin-top: 10px; max-height: 500px; overflow-y: auto; box-sizing: border-box; width: 100%;'>
+                    <input onclick="event.stopPropagation();" onkeyup="if (event.keyCode === 13) {{ pdfUrlSearch(this.value); this.value = ''; }}"></input> 
+                    <br/>
+                {search_sources}
+                </div>
+            </div>
+            <div style='position: absolute; left: 0; bottom: 150px; text-align: center;'>
+                <div style='color: lightgrey; border-color: grey; text-align:center;' data-id="0" onclick="Highlighting.onColorBtn(this)" class='siac-pdf-color-btn'>A</div>
+                <br>
+                <div style='background: #e65100;' data-id="1" data-color="#e65100" onclick="Highlighting.onColorBtn(this)" class='siac-pdf-color-btn'></div>
+                <div style='background: #558b2f;' data-id="2" data-color="#558b2f" onclick="Highlighting.onColorBtn(this)" class='siac-pdf-color-btn'></div>
+                <div style='background: #2196f3;' data-id="3" data-color="#2196f3" onclick="Highlighting.onColorBtn(this)" class='siac-pdf-color-btn'></div>
+                <div style='background: #ffee58;' data-id="4" data-color="#ffee58" onclick="Highlighting.onColorBtn(this)" class='siac-pdf-color-btn'></div>
+                <div style='background: #ab47bc;' data-id="5" data-color="#ab47bc" onclick="Highlighting.onColorBtn(this)" class='siac-pdf-color-btn'></div>
+                <br> 
+                <div style='background: #e65100;' data-id="6" data-color="#e65100" onclick="Highlighting.onColorBtn(this)" class='siac-pdf-ul-btn'></div>
+                <div style='background: #558b2f;' data-id="7" data-color="#558b2f" onclick="Highlighting.onColorBtn(this)" class='siac-pdf-ul-btn'></div>
+                <div style='background: #2196f3;' data-id="8" data-color="#2196f3" onclick="Highlighting.onColorBtn(this)" class='siac-pdf-ul-btn'></div>
+            </div>
+
+            <div class='siac-btn siac-btn-dark' id='siac-pdf-search-btn' onclick='$(this).toggleClass("expanded"); onPDFSearchBtnClicked(this);'><img src='{pdf_search_img_src}' style='width: 16px; height: 16px;'/>
+                <div id='siac-pdf-search-btn-inner' class='expanded-hidden white-hover' style='margin: 0 2px 0 5px; color: lightgrey; text-align: center;'>
+                    <input style='width: 200px; border:none; background-color: #2f2f31; color: lightgrey; padding-left: 2px;' onclick='event.stopPropagation();' onkeyup='onPDFSearchInput(this.value, event);'/>
+                    <div class='siac-btn siac-btn-dark' onclick='event.stopPropagation(); showPDFBottomRightNotification("Searching..."); nextPDFSearchResult(dir="left");'><b>&lt;</b></div>
+                    <div class='siac-btn siac-btn-dark' onclick='event.stopPropagation(); showPDFBottomRightNotification("Searching..."); nextPDFSearchResult(dir="right");'><b>&gt;</b></div>
+                </div>
+            </div>
+            <div class='siac-btn siac-btn-dark' id='siac-mark-jump-btn' onclick='$(this).toggleClass("expanded"); onMarkBtnClicked(this);'><img src='{marks_grey_img_src}' style='width: 16px; height: 16px;'/>
+                <div id='siac-mark-jump-btn-inner' class='expanded-hidden white-hover' style='margin: 0 2px 0 5px; color: lightgrey; text-align: center;'></div>
+            </div>
+            {quick_sched_btn} 
+            <div id='siac-close-iframe-btn' class='siac-btn siac-btn-dark' onclick='pycmd("siac-close-iframe")'>&times; &nbsp;Close Web</div>
+            <div id='siac-pdf-top' data-pdfpath="{pdf_path}" data-pdftitle="{pdf_title}" data-pdfid="{nid}" onwheel='pdfMouseWheel(event);' style='overflow-y: hidden;'>
+                <div id='siac-pdf-loader-wrapper' style='display: flex; justify-content: center; align-items: center; height: 100%;'>
+                    <div class='siac-pdf-loader' style=''>
+                        <div> <div class='signal' style='margin-left: auto; margin-right: auto;'></div><br/><div id='siac-loader-text'>Loading PDF</div></div>
+                    </div>
+                </div>
+                <canvas id="siac-pdf-canvas" style='z-index: 99999; display:inline-block;'></canvas>
+                <div id="text-layer"  onmouseup='pdfKeyup(event);' onkeyup='pdfTextLayerMetaKey = false;' onclick='textlayerClicked(event, this);' class="textLayer"></div>
+            </div>
+            <iframe id='siac-iframe' sandbox='allow-scripts'></iframe>
+            <div class='siac-reading-modal-button-bar-wrapper' style="">
+                <div style='position: absolute; left: 0; z-index: 1; user-select: none;'>
+                    <div class='siac-btn siac-btn-dark' style="margin-left: -20px;" onclick='toggleReadingModalBars();'>&#x2195;</div>
+                    <div class='siac-btn siac-btn-dark' style="margin-left: 2px; width: 18px;" onclick='pdfScaleChange("down");'>-</div>
+                    <div class='siac-btn siac-btn-dark' style="width: 22px;" onclick='pdfFitToPage()'>&#8596;</div>
+                    <div class='siac-btn siac-btn-dark' style="width: 18px;" onclick='pdfScaleChange("up");'>+</div>
+                    <div class='siac-btn siac-btn-dark' onclick='initImageSelection()' style='margin-left: 5px;'><b>&#9986;</b></div>
+                    <div class='siac-btn siac-btn-dark active' id='siac-pdf-tooltip-toggle' onclick='togglePDFSelect(this)' style='margin-left: 5px;'><div class='siac-search-icn-dark'></div></div>
+                    <div class='siac-btn siac-btn-dark' id='siac-rd-note-btn' onclick='pycmd("siac-create-note-add-only {nid}")' style='margin-left: 5px;'><b>&#9998; Note</b></div>
+                </div>
+                <div style='user-select:none; display: inline-block; position:relative; z-index: 2; padding: 0 5px 0 5px; background: #2f2f31;'>
+                    <div class='siac-btn siac-btn-dark' onclick='pdfPageLeft();'><b>&lt;</b></div>
+                    <span style='display: inline-block; text-align: center; width: 78px; user-select: none;' id='siac-pdf-page-lbl'>Loading...</span>
+                    <div class='siac-btn siac-btn-dark' onclick='pdfPageRight();'><b>&gt;</b></div>
+                </div>
+
+                <div style='position: absolute; right: 0; display: inline-block; user-select: none;'>
+                    <div id="siac-pdf-night-btn" class='siac-btn siac-btn-dark' style='margin-right: 10px; width: 50px;' onclick='togglePDFNightMode(this);'>Day</div>
+                    <div id="siac-pdf-read-btn" class='siac-btn' style='margin-right: 7px; width: 65px;' onclick='togglePageRead({nid});'>\u2713&nbsp; Read</div>
+                    <div style='position: relative; display: inline-block; width: 30px; margin-right: 7px;'>
+                        <div id='siac-pdf-more-btn' class='siac-btn siac-btn-dark' onclick='$(this).toggleClass("expanded")'  onmouseleave='$(this).removeClass("expanded")' style='width: calc(100% - 14px)'>...
+                            <div class='siac-btn-small-dropdown-inverted click'>
+                                <div class='siac-dropdown-inverted-item' onclick='pycmd("siac-jump-last-read {nid}"); event.stopPropagation();'><b>Jump to Last Read Page</b></div>
+                                <div class='siac-dropdown-inverted-item' onclick='pycmd("siac-jump-first-unread {nid}"); event.stopPropagation();'><b>Jump to First Unread Page</b></div>
+                                <hr>
+                                <div class='siac-dropdown-inverted-item' onclick='pycmd("siac-mark-read-up-to {nid} " + pdfDisplayedCurrentPage + " " + pdfDisplayed.numPages); markReadUpToCurrent(); pdfShowPageReadMark();updatePdfProgressBar();event.stopPropagation();'><b>Mark Read up to current Pg.</b></div>
+                                <div class='siac-dropdown-inverted-item' onclick='pycmd("siac-display-range-input {nid} " + pdfDisplayed.numPages); event.stopPropagation();'><b>Mark Range ...</b></div>
+                                <div class='siac-dropdown-inverted-item' onclick='pycmd("siac-mark-all-unread {nid}"); pagesRead = []; pdfHidePageReadMark(); updatePdfProgressBar();event.stopPropagation();'><b>Mark all as Unread</b></div>
+                                <div class='siac-dropdown-inverted-item' onclick='pycmd("siac-mark-all-read {nid} " + pdfDisplayed.numPages); pagesRead = Array.from(Array(pdfDisplayed.numPages).keys()).map(x => ++x); pdfShowPageReadMark(); updatePdfProgressBar();event.stopPropagation();'>
+                                    <b>Mark all as Read</b>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <input id="siac-pdf-page-inp" style="width: 50px;margin-right: 5px;" value="1" type="number" min="1" onkeyup="pdfJumpToPage(event, this);"></input>
+                </div>
+            </div>
+            <div id='siac-pdf-br-notify'>
+            </div>
+            <script>
+                greyoutBottom();
+                document.getElementById('siac-pdf-night-btn').innerHTML = pdfColorMode;
+                if (pdfTooltipEnabled) {{
+                    $('#siac-pdf-tooltip-toggle').addClass('active');
+                }} else {{
+                    $('#siac-pdf-tooltip-toggle').removeClass('active');
+                }}
+                $('.siac-pdf-color-btn[data-id=' + Highlighting.colorSelected.id + ']').addClass('active');
+                $('.siac-pdf-ul-btn[data-id=' + Highlighting.colorSelected.id + ']').addClass('active');
+            </script>
+        """.format_map(dict(nid = nid, pdf_title = title, pdf_path = source, quick_sched_btn=quick_sched, search_sources=search_sources, marks_img_src=marks_img_src, 
+        marks_grey_img_src=marks_grey_img_src, pdf_search_img_src=pdf_search_img_src))
+
+        return html
+
+    def tiny_mce_init_code(self) -> str:
+        """ Code that should be executed when a text note is opened. """
+
+        return """
+            tinymce.init({
+                selector: '#siac-text-top',
+                plugins: 'preview paste importcss searchreplace autolink directionality code visualblocks visualchars link codesample table charmap hr nonbreaking toc insertdatetime advlist lists wordcount imagetools textpattern noneditable charmap quickbars',
+                menubar: 'edit view insert format tools table',
+                toolbar: 'undo redo | bold italic underline strikethrough | fontselect fontsizeselect formatselect | alignleft aligncenter alignright alignjustify | outdent indent |  numlist bullist | forecolor backcolor removeformat | charmap | codesample | ltr rtl',
+                toolbar_sticky: true,
+                contextmenu: false,
+                resize: false,
+                statusbar: false,
+                skin: "oxide-dark",
+                content_css: "dark",
+                importcss_append: true,
+                quickbars_selection_toolbar: 'bold italic | quicklink h2 h3 blockquote quickimage quicktable',
+                noneditable_noneditable_class: "mceNonEditable",
+                toolbar_drawer: 'sliding',
+                setup: function (ed) {
+                    ed.on('init', function(args) {
+                        setTimeout(function() { $('.tox-notification__dismiss').first().trigger('click'); }, 200);
+                        $('#siac-text-top_ifr').contents().find('body').css({
+                                background: '#2f2f31'
+                        });
+                    });
+                }
+            });
+        """
+
+
+    def get_note_info_html(self) -> str:
+        """ Returns the html that is displayed in the "Info" tab in the bottom bar of the reading modal. """
+
+        note    = self.note
+        created = note.created
+        tags    = note.tags
+
+        if note.reminder is None or len(note.reminder.strip()) == 0:
+            schedule = "No Schedule"
+        else:
+            schedule = utility.date.schedule_verbose(note.reminder)
+
+        if tags.startswith(" "):
+            tags = tags[1:]
+
+        html = f"""
+            <table style='color: grey; min-width: 190px;'>
+                <tr><td>ID</td><td><b>{note.id}</b></td></tr>
+                <tr><td>Created</td><td><b>{created}</b></td></tr>
+                <tr><td>Schedule</td><td><b>{schedule}</b></td></tr>
+                <tr><td>Tags</td><td>
+                    <input type='text' style='width: 210px; background: #2f2f31; margin-left: 4px; padding-left: 4px; border: 1px solid grey; border-radius: 4px; color: lightgrey;' onfocusout='pycmd("siac-update-note-tags {note.id} " + this.value)' value='{tags}'></input>
+                </td></tr>
+            </table>
+        """
+        return html
+
+    def iframe_dialog(self, urls: List[str]) -> str:
+        """ HTML for the button on the top left of the center pane, which allows to search for text in an iframe. """
+
+        search_sources  = "<table style='margin: 10px 0 10px 0; cursor: pointer; box-sizing: border-box; width: 100%;' onclick='event.stopPropagation();'>"
+        ix              = 0
+        direct_links    = ""
+
+        for url in urls:
+            name = os.path.dirname(url)
+            if "[QUERY]" in url:
+                search_sources += "<tr><td><label for='%s'>%s</label></td><td><input type='radio' name='url-radio' id='%s' data-url='%s' %s/></td></tr>" % ("url-rd-%d" % ix, name, "url-rd-%d" % ix, url, "checked" if ix == 0 else "")
+                ix += 1
+            else:
+                direct_links += """<div class="siac-url-ch" onclick='event.stopPropagation(); $("#siac-iframe-btn").removeClass("expanded"); pycmd("siac-url-srch $$$dummy$$$%s");'>%s</div>""" % (url, name)
+
+        search_sources += "</table>"
+        if len(direct_links) > 0:
+            search_sources += "<div style='margin-bottom: 5px;'>Direct Links:</div>"
+            search_sources += direct_links
+
+        return search_sources
+
+    @js
+    def display_schedule_dialog(self):
+        """ Called when the currently opened note has a schedule and after it is finished reading. """
+
+        delta = self.note.due_days_delta() if self.note.is_due_sometime() else 0
+
+        if delta == 0:
+            header = "This note was scheduled for <b>today</b>."
+        elif delta == 1:
+            header = "This note was scheduled for <b>yesterday</b>, but not marked as done."
+        elif delta  == -1:
+            header = "This note is due <b>tomorrow</b>."
+        elif delta < -1:
+            header = f"This note is due in <b>{abs(delta)}</b> days."
+        else:
+            header = f"This note was due <b>{delta}</b> days ago, but not marked as done."
+
+        header +="<br>How do you want to proceed?"
+        options = ""
+      
+        if delta < 0:
+            options += """
+                    <label class='blue-hover' for='siac-rb-1'>
+                        <input id='siac-rb-1' type='radio' name='sched' data-pycmd="1" checked>
+                        <span>Keep that Schedule</span>
+                    </label><br>
+            """
+        else:
+            if self.note.schedule_type() == "td":
+                days_delta = int(self.note.reminder.split("|")[2][3:])
+                s = "s" if days_delta > 1 else ""
+                options += f"""
+                    <label class='blue-hover' for='siac-rb-1'>
+                        <input id='siac-rb-1' type='radio' name='sched' data-pycmd="1" checked>
+                        <span>Show again in <b>{days_delta}</b> day{s}</span>
+                    </label><br>
+                """
+            elif self.note.schedule_type() == "wd":
+                weekdays_due    = [int(d) for d in self.note.reminder.split("|")[2][3:]]
+                next_date_due   = utility.date.next_instance_of_weekdays(weekdays_due)
+                weekday_name    = utility.date.weekday_name(next_date_due.weekday() + 1)
+                options += f"""
+                    <label class='blue-hover' for='siac-rb-1'>
+                        <input id='siac-rb-1' type='radio' name='sched' data-pycmd="1" checked>
+                        <span>Show again next <b>{weekday_name}</b></span>
+                    </label><br>
+                """
+            elif self.note.schedule_type() == "id":
+                days_delta = int(self.note.reminder.split("|")[2][3:])
+                s = "s" if days_delta > 1 else ""
+                options += f"""
+                    <label class='blue-hover' for='siac-rb-1'>
+                        <input id='siac-rb-1' type='radio' name='sched' data-pycmd="1" checked>
+                        <span>Show again in <b>{days_delta}</b> day{s}</span>
+                    </label><br>
+                """
+
+        options += """
+                <label class='blue-hover' for='siac-rb-2'>
+                    <input id='siac-rb-2' type='radio' name='sched' data-pycmd="2">
+                    <span>Rem. Schedule, but keep in Queue</span>
+                </label><br>
+                <label class='blue-hover' for='siac-rb-3'>
+                    <input id='siac-rb-3' type='radio' name='sched' data-pycmd="3">
+                    <span>Remove from Queue</span>
+                </label><br>
+            """
+
+        modal = f"""
+            <div id='siac-schedule-dialog' class="siac-modal-small dark" style="text-align:center;">
+                {header}
+
+                <div class='siac-pdf-main-color-border-bottom siac-pdf-main-color-border-top' style='text-align: left; user-select: none; cursor: pointer; margin: 10px 0 10px 0; padding: 15px;'>
+                  {options}
+
+                </div>
+                <div style='text-align: left;'>
+                    <a class='siac-clickable-anchor' onclick='pycmd("siac-eval index.ui.reading_modal.show_schedule_change_modal()")'>Change Scheduling</a>
+                    <div class='siac-btn siac-btn-dark' style='float: right;' onclick='scheduleDialogQuickAction()'>Ok</div>
+                </div>
+
+            </div>
+        """
+        return """modalShown=true;
+            $('#siac-rm-greyout').show();
+            if (document.getElementById('siac-schedule-dialog')) {
+                $('#siac-schedule-dialog').replaceWith(`%s`);
+            } else {
+                $('#siac-reading-modal-center').append(`%s`);
+            }
+            """ % (modal, modal)
+
+
+    @js
+    def show_remove_dialog(self):
+        """ Shows a dialog to either remove the current note from the queue or to delete it altogether. """
+
+        title   = utility.text.trim_if_longer_than(self.note.get_title(), 40).replace("`", "")
+        rem_cl  = "checked" if self.note.position is not None and self.note.position >= 0 else "disabled"
+        del_cl  = "checked" if self.note.position is None or self.note.position < 0 else ""
+
+        modal   = f"""
+            <div id='siac-schedule-dialog' class="siac-modal-small dark" style="text-align:center;">
+                Remove / delete this note?<br><br>
+                {title}
+
+                <div class='siac-pdf-main-color-border-bottom siac-pdf-main-color-border-top' style='text-align: left; user-select: none; cursor: pointer; margin: 10px 0 10px 0; padding: 15px;'>
+                    <label class='blue-hover' for='siac-rb-1'>
+                        <input id='siac-rb-1' type='radio' {rem_cl} name='del' data-pycmd="1">
+                        <span>Remove from Queue</span>
+                    </label><br>
+                    <label class='blue-hover' for='siac-rb-2'>
+                        <input id='siac-rb-2' type='radio' {del_cl} name='del' data-pycmd="2">
+                        <span>Delete Note</span>
+                    </label><br>
+
+                </div>
+                <div style='text-align: right;'>
+                    <div class='siac-btn siac-btn-dark' style='margin-right: 10px;' onclick='$(this.parentNode.parentNode).remove(); modalShown = false; ungreyoutBottom(); $("#siac-rm-greyout").hide();'>Cancel</div>
+                    <div class='siac-btn siac-btn-dark' onclick='removeDialogOk()'>Ok</div>
+                </div>
+
+            </div>
+        """
+        return """modalShown=true;
+            $('#siac-timer-popup').hide();
+            $('#siac-rm-greyout').show();
+            $('#siac-reading-modal-center').append(`%s`);
+            """ % (modal)
+
+    @js
+    def show_schedule_change_modal(self, unscheduled: bool = False):
+        """ Show a modal that allows to change the schedule of the current note. """
+
+        title = "Set a new Schedule" if not unscheduled else "This note had no schedule before."
+        if not unscheduled:
+            back_btn = """<a class='siac-clickable-anchor' onclick='pycmd("siac-eval index.ui.reading_modal.display_schedule_dialog()")'>Back</a>"""
+        else:
+            back_btn = """<a class='siac-clickable-anchor' onclick='pycmd("siac-eval index.ui.reading_modal.display_head_of_queue()")'>Proceed without scheduling</a>"""
+
+        body = f"""
+                {title}
+                <div class='siac-pdf-main-color-border-bottom siac-pdf-main-color-border-top' style='text-align: left; user-select: none; cursor: pointer; margin: 10px 0 10px 0; padding: 15px;'>
+
+                    <label class='blue-hover' for='siac-rb-4'>
+                        <input id='siac-rb-4' type='radio' data-pycmd='4' checked name='sched'>
+                        <span>Show again in [n] days:</span>
+                    </label><br>
+                    <div class='w-100' style='margin: 10px 0 10px 0;'>
+                        <input id='siac-sched-td-inp' type='number' min='1' style='width: 70px; color: lightgrey; border: 2px outset #b2b2a0; background: transparent;'/>
+                        <div class='siac-btn siac-btn-dark' style='margin-left: 15px;' onclick='document.getElementById("siac-sched-td-inp").value = 1;'>Tomorrow</div>
+                        <div class='siac-btn siac-btn-dark' style='margin-left: 5px;' onclick='document.getElementById("siac-sched-td-inp").value = 7;'>In 7 Days</div>
+                    </div>
+                    <label class='blue-hover' for='siac-rb-5'>
+                        <input id='siac-rb-5' type='radio'  data-pycmd='5' name='sched'>
+                        <span>Show on Weekday(s):</span>
+                    </label><br>
+                    <div class='w-100' style='margin: 10px 0 10px 0;' id='siac-sched-wd'>
+                        <label><input type='checkbox' style='vertical-align: middle;'/>M</label>
+                        <label style='margin: 0 0 0 4px;'><input style='vertical-align: middle;' type='checkbox'/>T</label>
+                        <label style='margin: 0 0 0 4px;'><input style='vertical-align: middle;' type='checkbox'/>W</label>
+                        <label style='margin: 0 0 0 4px;'><input style='vertical-align: middle;' type='checkbox'/>T</label>
+                        <label style='margin: 0 0 0 4px;'><input style='vertical-align: middle;' type='checkbox'/>F</label>
+                        <label style='margin: 0 0 0 4px;'><input style='vertical-align: middle;' type='checkbox'/>S</label>
+                        <label style='margin: 0 0 0 4px;'><input style='vertical-align: middle;' type='checkbox'/>S</label>
+                    </div>
+
+                    <label class='blue-hover' for='siac-rb-6'>
+                        <input id='siac-rb-6' type='radio'  data-pycmd='6' name='sched'>
+                        <span>Show every [n]th Day</span>
+                    </label><br>
+                    <div class='w-100' style='margin: 10px 0 10px 0;'>
+                        <input id='siac-sched-id-inp' type='number' min='1' style='width: 70px; color: lightgrey; border: 2px outset #b2b2a0; background: transparent;'/>
+                    </div>
+
+                </div>
+                <div style='text-align: left;'>
+                    {back_btn}
+                    <div class='siac-btn siac-btn-dark' style='float: right;' onclick='updateSchedule()'>Set Schedule</div>
+                </div>
+        """
+        return f"""
+            if (document.getElementById('siac-schedule-dialog')) {{
+                document.getElementById("siac-schedule-dialog").innerHTML = `{body}`;
+            }} else {{
+                $('#siac-reading-modal-center').append(`<div id='siac-schedule-dialog' class="siac-modal-small dark" style="text-align:center;">{body}</div>`);
+            }}
+        """
+
+    def schedule_note(self, option: int):
+        """ Will update the schedule of the note according to the chosen option. 
+            This function is called after an option in the dialog of display_schedule_dialog() has been selected. """
+
+        delta       = self.note.due_days_delta()
+        now         = utility.date.date_now_stamp()
+        new_prio    = get_priority(self.note_id)
+
+        if option == 1:
+            if delta < 0:
+                # keep schedule & requeue
+                new_reminder = self.note.reminder
+            else:
+                if self.note.schedule_type() == "td":
+                    # show again in n days
+                    days_delta      = int(self.note.reminder.split("|")[2][3:])
+                    next_date_due   = dt.now() + timedelta(days=days_delta)
+                    new_reminder    = f"{now}|{utility.date.dt_to_stamp(next_date_due)}|td:{days_delta}"
+
+                elif self.note.schedule_type() == "wd":
+                    # show again on next weekday instance
+                    wd_part         = self.note.reminder.split("|")[2]
+                    weekdays_due    = [int(d) for d in wd_part[3:]]
+                    next_date_due   = utility.date.next_instance_of_weekdays(weekdays_due)
+                    new_reminder    = f"{now}|{utility.date.dt_to_stamp(next_date_due)}|{wd_part}"
+                elif self.note.schedule_type() == "id":
+                    # show again according to interval
+                    days_delta      = int(self.note.reminder.split("|")[2][3:])
+                    next_date_due   = dt.now() + timedelta(days=days_delta)
+                    new_reminder    = f"{now}|{utility.date.dt_to_stamp(next_date_due)}|id:{days_delta}"
+        elif option == 2:
+            #remove schedule & requeue
+            new_reminder    = ""
+        elif option == 3:
+            # remove entirely from queue
+            new_reminder    = ""
+            new_prio        = 0
+
+        update_reminder(self.note_id, new_reminder)
+        update_priority_list(self.note_id, new_prio)
+        nid = get_head_of_queue()
+        if nid is not None and nid >= 0:
+            self.display(nid)
+        else:
+            self._editor.web.eval("""
+                onReadingModalClose();
+            """)
+
+    @js
+    def show_theme_dialog(self):
+        """ Display a modal to change the main color of the reader. """
+
+        modal = f"""
+            <div id='siac-schedule-dialog' class="siac-modal-small dark" style="text-align:center;">
+                Change the main color of the reader.<br><br>
+                <div style='user-select: none;'>
+                    <a class='siac-clickable-anchor' onclick='setPdfTheme("pdf_reader.css")'>Orange</a><br>
+                    <a class='siac-clickable-anchor' onclick='setPdfTheme("pdf_reader_lightblue.css")'>Lightblue</a><br>
+                    <a class='siac-clickable-anchor' onclick='setPdfTheme("pdf_reader_khaki.css")'>Khaki</a><br>
+                    <a class='siac-clickable-anchor' onclick='setPdfTheme("pdf_reader_darkseagreen.css")'>Darkseagreen</a><br>
+                    <a class='siac-clickable-anchor' onclick='setPdfTheme("pdf_reader_tan.css")'>Tan</a><br>
+                    <a class='siac-clickable-anchor' onclick='setPdfTheme("pdf_reader_lightgreen.css")'>Lightgreen</a><br>
+                    <a class='siac-clickable-anchor' onclick='setPdfTheme("pdf_reader_lightsalmon.css")'>Lightsalmon</a><br>
+                    <a class='siac-clickable-anchor' onclick='setPdfTheme("pdf_reader_yellow.css")'>Yellow</a><br>
+                    <a class='siac-clickable-anchor' onclick='setPdfTheme("pdf_reader_crimson.css")'>Crimson</a><br>
+                    <a class='siac-clickable-anchor' onclick='setPdfTheme("pdf_reader_steelblue.css")'>Steelblue</a><br>
+                </div>
+                <br>
+                <div style='text-align: right;'>
+                    <div class='siac-btn siac-btn-dark' style='margin-right: 10px;' onclick='$(this.parentNode.parentNode).remove(); modalShown = false; ungreyoutBottom(); $("#siac-rm-greyout").hide();'>Ok</div>
+                </div>
+
+            </div>
+        """
+        return """modalShown=true;
+            $('#siac-timer-popup').hide();
+            $('#siac-rm-greyout').show();
+            $('#siac-reading-modal-center').append(`%s`);
+            """ % (modal)
+
+    @js
+    def show_img_field_picker_modal(self, img_src: str):
+        """
+            Called after an image has been selected from a PDF, should display all fields that are currently in the editor,
+            let the user pick one, and on picking, insert the img into the field.
+        """
+
+        # if Image Occlusion add-on is there and enabled, add a button to directly open the IO dialog
+        io      = ""
+        if hasattr(self._editor, 'onImgOccButton') and mw.addonManager.isEnabled("1374772155"):
+            io  = f"<div class='siac-btn siac-btn-dark' style='margin-right: 9px;' onclick='pycmd(`siac-cutout-io {img_src}`); $(this.parentNode).remove();'>Image Occlusion</div>"
+        modal   = """ <div class="siac-modal-small dark" style="text-align:center;"><b>Append to:</b><br><br><div style="max-height: 200px; overflow-y: auto; overflow-x: hidden;">%s</div><br><br>%s<div class="siac-btn siac-btn-dark" onclick="$(this.parentNode).remove(); pycmd('siac-remove-snap-image %s')">Cancel</div></div> """
+        flds    = ""
+        for i, f in enumerate(self._editor.note.model()['flds']):
+            # trigger note update
+            fld_update_js = "pycmd(`blur:%s:${currentNoteId}:${$(`.field:eq(%s)`).html()}`);" % (i,i)
+            flds += """<span class="siac-field-picker-opt" onclick="$(`.field`).get(%s).innerHTML += `<img src='%s'/>`; $(this.parentNode.parentNode).remove(); %s">%s</span><br>""" % (i, img_src, fld_update_js, f["name"])
+        modal = modal % (flds, io, img_src)
+        return "$('#siac-reading-modal-center').append('%s');" % modal.replace("'", "\\'")
+
+    @js
+    def show_cloze_field_picker_modal(self, cloze_text: str):
+        """
+        Shows a modal that lists all fields of the current note.
+        When a field is selected, the cloze text is appended to that field.
+        """
+
+        cloze_text  = cloze_text.replace("`", "").replace("\n", "")
+        modal       = """ <div class="siac-modal-small dark" style="text-align:center;">
+                        <b>Append to:</b><br><br>
+                        <div style="max-height: 200px; overflow-y: auto; overflow-x: hidden;">%s</div><br><br>
+                        <div class="siac-btn siac-btn-dark" onclick="$(this.parentNode).remove();">Cancel</div>
+                    </div> """
+        flds        = ""
+
+        for i, f in enumerate(self._editor.note.model()['flds']):
+            flds += """<span class="siac-field-picker-opt" onclick="appendToField({0}, `{1}`);  $(this.parentNode.parentNode).remove();">{2}</span><br>""".format(i, cloze_text, f["name"])
+        modal       = modal % (flds)
+
+        return "$('#siac-pdf-tooltip').hide(); $('#siac-reading-modal-center').append('%s');" % modal.replace("\n", "").replace("'", "\\'")
+
+    @js
+    def show_iframe_overlay(self, url: Optional[str] = None):
+        js = """
+            if (pdfDisplayed) {
+                document.getElementById('siac-pdf-top').style.display = "none";
+            } else {
+                document.getElementById('siac-text-top-wr').style.display = "none";
+            }
+            document.getElementById('siac-iframe').style.display = "block";
+            document.getElementById('siac-close-iframe-btn').style.display = "block";
+            iframeIsDisplayed = true;
+        """
+        if url is not None:
+            js += """
+                document.getElementById('siac-iframe').src = `%s`;
+            """ % url
+        return js
+
+    @js
+    def hide_iframe_overlay(self):
+        js = """
+            document.getElementById('siac-iframe').src = "";
+            document.getElementById('siac-iframe').style.display = "none";
+            document.getElementById('siac-close-iframe-btn').style.display = "none";
+            if (pdfDisplayed) {
+                document.getElementById('siac-pdf-top').style.display = "block";
+            } else {
+                document.getElementById('siac-text-top-wr').style.display = "block";
+            }
+            iframeIsDisplayed = false;
+        """
+        return js
+
+    @js
+    def show_web_search_tooltip(self, inp: str):
+        """ Context: Text was selected in a pdf, magnifying glass was clicked in the tooltip. """
+
+        inp             = utility.text.remove_special_chars(inp)
+        inp             = inp.strip()
+        if len(inp) == 0:
+            return
+        search_sources  = ""
+        config          = mw.addonManager.getConfig(__name__)
+        urls            = config["searchUrls"]
+
+        if urls is not None and len(urls) > 0:
+            for url in urls:
+                if "[QUERY]" in url:
+                    name = os.path.dirname(url)
+                    search_sources += """<div class="siac-url-ch" onclick='pycmd("siac-url-srch $$$" + document.getElementById("siac-tt-ws-inp").value + "$$$%s"); $(this.parentNode.parentNode).remove();'>%s</div>""" % (url, name)
+
+        modal = """ <div class="siac-modal-small dark" style="text-align:center;">
+                        <input style="width: 100%%; border-radius: 3px; padding-left: 4px; box-sizing: border-box; background: #2f2f31; color: white; border-color: white;" id="siac-tt-ws-inp" value="%s"></input>
+                        <br/>
+                        <div style="max-height: 200px; overflow-y: auto; overflow-x: hidden; cursor: pointer; margin-top: 15px;">%s</div><br><br>
+                        <div class="siac-btn siac-btn-dark" onclick="$(this.parentNode).remove();">Cancel</div>
+                    </div> """  % (inp, search_sources)
+
+        js = """
+        $('#siac-iframe-btn').removeClass('expanded');
+        $('#siac-pdf-tooltip').hide();
+        $('#siac-reading-modal-center').append('%s');
+        """ % modal.replace("\n", "").replace("'", "\\'")
+        return js
+
+    @js
+    def update_reading_bottom_bar(self, nid: int):
+        """ Refresh the bottom bar. """
+
+        queue   = _get_priority_list()
+        pos_lbl = ""
+        if queue is not None and len(queue) > 0:
+            try:
+                pos = next(i for i,v in enumerate(queue) if v.id == nid)
+            except:
+                pos = -1
+            pos_lbl     = "Priority: " + get_priority_as_str(nid)
+            pos_lbl_btn = f"Priority" if pos >= 0 else "Unqueued"
+        else:
+            pos_lbl     = "Unqueued"
+            pos_lbl_btn = "<b>Unqueued</b>"
+
+        qd = self.get_queue_head_display(queue)
+        return """
+            document.getElementById('siac-queue-lbl').innerHTML = '%s';
+            $('#siac-queue-lbl').fadeIn('slow');
+            $('.siac-queue-sched-btn:first').html('%s');
+            $('#siac-queue-readings-list').replaceWith(`%s`);
+            """ % (pos_lbl, pos_lbl_btn, qd)
+
+    @js
+    def show_pdf_bottom_tab(self, note_id: int, tab: str):
+        """ Context: Clicked on a tab (Marks / Related / Info) in the bottom bar. """
+
+        tab_js = "$('.siac-clickable-anchor.tab').removeClass('active');"
+        if tab == "marks":
+            return f"""{tab_js}
+            $('.siac-clickable-anchor.tab').eq(0).addClass('active');
+            document.getElementById('siac-pdf-bottom-tab').innerHTML =`<div id='siac-marks-display' onclick='markClicked(event);'></div>`;
+            updatePdfDisplayedMarks()"""
+        if tab == "info":
+            html = self.get_note_info_html()
+            html = html.replace("`", "&#96;")
+            return f"""{tab_js}
+            $('.siac-clickable-anchor.tab').eq(2).addClass('active');
+            document.getElementById('siac-pdf-bottom-tab').innerHTML =`{html}`;"""
+        if tab == "related":
+            html = self.get_related_notes_html()
+            html = html.replace("`", "&#96;")
+            return f"""{tab_js}
+            $('.siac-clickable-anchor.tab').eq(1).addClass('active');
+            document.getElementById('siac-pdf-bottom-tab').innerHTML =`{html}`;"""
+
+    def get_related_notes_html(self) -> str:
+        """ Context: Clicked on 'Related' tab in the bottom bar. """
+
+        note_id = self.note_id
+        r       = get_related_notes(note_id)
+        note    = get_note(note_id)
+        html    = "" 
+        ids     = set()
+        res     = []
+
+        if r.related_by_tags:
+            for r1 in r.related_by_tags:
+                res.append(r1) 
+                ids.add(r1.id)
+                if len(r.related_by_title) > 0:
+                    i = r.related_by_title.pop(0)
+                    if not i.id in ids:
+                        res.append(i)
+                if len(res) > 20:
+                    break
+        if len(res) < 20 and len(r.related_by_title) > 0:
+            for r2 in r.related_by_title:
+                if not r2.id in ids:
+                    res.append(r2)
+                    if len(res) >= 20:
+                        break
+        
+        if len(res) < 20 and len(r.related_by_folder) > 0:
+            for r3 in r.related_by_folder:
+                if not r3.id in ids:
+                    res.append(r3)
+                    if len(res) >= 20:
+                        break
+
+        for rel in res[:20]:
+            if rel.id == note_id:
+                continue
+            title               = utility.text.trim_if_longer_than(rel.get_title(), 70)
+            pdf_or_feed         = rel.is_pdf() or rel.is_feed()
+            should_show_loader  = 'document.getElementById("siac-reading-modal-center").innerHTML = ""; showLoader(\"siac-reading-modal-center\", \"Loading Note...\");' if pdf_or_feed else ""
+            html                = f"{html}<div class='siac-related-notes-item' onclick='if (!pdfLoading) {{ {should_show_loader}  destroyPDF(); noteLoading = true; greyoutBottom(); pycmd(\"siac-read-user-note {rel.id}\"); }}'>{title}</div>"
+        return html
+
+
+    def get_queue_infobox(self, note: SiacNote, read_stats: Tuple[Any, ...]) -> str:
+        """ Returns the html that is displayed in the tooltip which appears when hovering over an item in the queue head. """
+
+        diff        = datetime.datetime.now() - datetime.datetime.strptime(note.created, '%Y-%m-%d %H:%M:%S')
+        time_str    = "Created %s ago." % utility.misc.date_diff_to_string(diff)
+
+        # pagestotal might be None (it is only available if at least one page has been read)
+        if read_stats[2] is not None:
+            prog_bar    = self.pdf_prog_bar(read_stats[0], read_stats[2])
+            pages_read  = "<div style='width: 100%%; margin-top: 3px; font-weight: bold; text-align: center; font-size: 20px;'>%s / %s</div>" % (read_stats[0], read_stats[2])
+        else:
+            text_len    = f"{len(note.text.split())} Words" if note.text is not None else "Empty"
+            prog_bar    = ""
+            pages_read  = f"<div style='width: 100%; margin-top: 7px; font-weight: bold; text-align: center; font-size: 16px;'>Text Note, {text_len}</div>"
+
+        html = """
+            <div style='box-sizing: border-box; width: 100%; height: 100%; padding: 10px; display: inline-block; position: relative; vertical-align: top;'>
+                <div style='width: 100%; text-align:center; white-space: nowrap; overflow: hidden; font-weight: bold; vertical-align: top; text-overflow: ellipsis;'>{title}</div>
+                <div style='width: 100%; text-align:center; white-space: nowrap; overflow: hidden; color: lightgrey;vertical-align: top;'>{time_str}</div>
+                {pages_read}
+                <div style='width: calc(100%); padding: 5px 0 10px 0; text-align: center;'>
+                    <div style='display: inline-block; vertical-align: bottom;'>
+                        {prog_bar}
+                    </div>
+                </div>
+            </div>
+        
+        """.format_map(dict(title = note.get_title(), pages_read=pages_read, time_str= time_str, prog_bar= prog_bar, nid = note.id))
+        return html
+    
+    
+    def pdf_prog_bar(self, read: Optional[int], read_total: Optional[int]) -> str:
+        """ HTML for the progress bar in the top bar of the reader. """
+
+        if read is not None and read_total is not None:
+            perc        = int(read * 10.0 / read_total)
+            perc_100    = int(read * 100.0 / read_total)
+            prog_bar    = str(perc_100) + " % &nbsp;"
+
+            for x in range(0, 10):
+                if x < perc:
+                    prog_bar = f"{prog_bar}<div class='siac-prog-sq-filled'></div>"
+                else:
+                    prog_bar = f"{prog_bar}<div class='siac-prog-sq'></div>"
+            return prog_bar
+        else:
+            return ""
+
+    @js
+    def mark_range(self, start: int, end: int, pages_total: int, current_page: int):
+        if start <= 0:
+            start = 1
+        if end > pages_total:
+            end = pages_total
+        if end <= start or start >= pages_total:
+            return
+
+        mark_range_as_read(self.note_id, start, end, pages_total)
+
+        pages_read  = get_read_pages(self.note_id)
+        js          = "" if len(pages_read) == 0 else ",".join([str(p) for p in pages_read])
+        js          = f"pagesRead = [{js}];"
+
+        if current_page >= start and current_page <= end:
+            js += "pdfShowPageReadMark();"
+
+        return f"{js}updatePdfProgressBar();"
+
+    @js
+    def display_cloze_modal(self, editor: Editor, selection: str, extracted: List[str]):
+        s_html = "<table style='margin-top: 5px; font-size: 15px;'>"
+        sentences = [s for s in extracted if len(s) < 300 and len(s.strip()) > 0]
+        if len(sentences) == 0:
+            for s in extracted:
+                if len(s) >= 300:
+                    f = utility.text.try_find_sentence(s, selection)
+                    if f is not None and len(f) < 300:
+                        sentences.append(f)
+
+        if len(sentences) > 0 and sentences != [""]:
+            selection = re.sub("  +", " ", selection).strip()
+            for sentence in sentences:
+                sentence = re.sub("  +", " ", sentence).strip()
+                sentence = sentence.replace(selection, " <span style='color: lightblue;'>{{c1::%s}}</span> " % selection)
+
+                # needs cleaning
+                sentence = sentence.replace("  ", " ").replace("</span> ,", "</span>,")
+                sentence = re.sub(" ([\"“”\\[(]) <span", " \\1<span", sentence)
+                sentence = re.sub("</span> ([\"”\\]):])", "</span>\\1", sentence)
+                sentence = re.sub("</span> -([^ \\d])", "</span>-\\1", sentence)
+                sentence = re.sub("(\\S)- <span ", "\\1-<span ", sentence)
+                sentence = re.sub(r"([^\\d ])- ([^\d])", r"\1\2", sentence)
+                sentence = re.sub(" [\"“”], [\"“”] ?", "\", \"", sentence)
+                sentence = re.sub(" [\"“”], ", "\", ", sentence)
+                sentence = re.sub(": [\"“”] ", ": \"", sentence)
+                sentence = sentence.replace("[ ", "[")
+                sentence = sentence.replace(" ]", "]")
+                sentence = re.sub(" ([,;:.]) ", r"\1 ", sentence)
+                sentence = re.sub(r"\( (.) \)", r"(\1)", sentence)
+                sentence = re.sub(" ([?!.])$", r"\1", sentence)
+                sentence = re.sub("^[:.?!,;)] ", "", sentence)
+                sentence = re.sub("^\\d+ ?[:\\-.,;] ([A-ZÖÄÜ])", r"\1", sentence)
+
+                sentence = re.sub(" ([\"“”])([?!.])$", r"\1\2", sentence)
+
+                s_html += "<tr class='siac-cl-row'><td><div contenteditable class='siac-pdf-main-color'>%s</div></td><td><input type='checkbox' checked/></td></tr>" % (sentence.replace("`", "&#96;"))
+            s_html += "</table>"
+            btn_html = """document.getElementById('siac-pdf-tooltip-bottom').innerHTML = `
+                                <div style='margin-top: 8px;'>
+                                <div class='siac-btn siac-btn-dark' onclick='pycmd("siac-fld-cloze " +$(".siac-cl-row div").first().text());' style='margin-right: 15px;'>Send to Field</div>
+                                <div class='siac-btn siac-btn-dark' onclick='generateClozes();'>Generate</div>
+                                </div>
+                    `;"""
+
+        else:
+            s_html = "<br><center>Sorry, could not extract any sentences.</center>"
+            btn_html = ""
+
+        return """
+                document.getElementById('siac-pdf-tooltip-results-area').innerHTML = `%s`;
+                document.getElementById('siac-pdf-tooltip-top').innerHTML = `Found <b>%s</b> sentence(s) around selection: <br/><span style='color: lightgrey;'>(Click inside to edit, <i>Ctrl+Shift+C</i> to add new Clozes)</span>`;
+                document.getElementById('siac-pdf-tooltip-searchbar').style.display = "none";
+                %s
+                """ % (s_html, len(sentences), btn_html)
+
+    @js
+    def notification(self, html: str, on_ok: Optional[str] = None):
+        if on_ok is None:
+            on_ok = ""
+        modal = f""" <div class="siac-modal-small dark" contenteditable="false" style="text-align:center; color: lightgrey;">
+                        {html}
+                        <br/> <br/>
+                        <div class="siac-btn siac-btn-dark" onclick="$(this.parentNode).remove(); $('#siac-rm-greyout').hide(); {on_ok}">&nbsp; Ok &nbsp;</div>
+                    </div> """
+        return """$('#siac-pdf-tooltip').hide();
+                $('.siac-modal-small').remove();
+                $('#siac-rm-greyout').show();
+                $('#siac-reading-modal-center').append('%s');""" % modal.replace("\n", "").replace("'", "\\'")
+
+    @js
+    def update_bottom_bar_positions(self, nid: int, new_index: int, queue_len: int):
+        queue_readings_list = self.get_queue_head_display(nid).replace("`", "\\`")
+        priority_str = get_priority_as_str(nid)
+        return f"""
+            document.getElementById('siac-queue-lbl').innerHTML = 'Priority: {priority_str}';
+            $('#siac-queue-lbl').fadeIn('slow');
+            $('.siac-queue-sched-btn:first').html('Priority');
+            $('#siac-queue-readings-list').replaceWith(`{queue_readings_list}`);
+        """
+
+    @js
+    def show_timer_elapsed_popup(self, nid: int):
+        """
+            Shows the little popup that is displayed when the timer in the reading modal finished.
+        """
+        read_today_count    = get_read_today_count()
+        added_today_count   = utility.misc.count_cards_added_today()
+        html = """
+        <div style='margin: 0 0 10px 0;'>
+            <div style='text-align: center; vertical-align: middle; line-height: 50px; font-weight: bold; font-size: 40px; color: #2496dc;'>
+                &#10711;
+            </div>
+            <div style='text-align: center; vertical-align: middle; line-height: 50px; font-weight: bold; font-size: 20px;'>
+                Time is up!
+            </div>
+        </div>
+        <div style='margin: 10px 0 25px 0; text-align: center; color: lightgrey;'>
+            Read <b>%s</b> %s today.<br>
+            Added <b>%s</b> %s today.
+        </div>
+        <div style='text-align: center; margin-bottom: 8px;'>
+            Start:
+        </div>
+        <div style='text-align: center;'>
+            <div class='siac-btn siac-btn-dark' style='margin: 0 5px 0 5px;' onclick='this.parentNode.parentNode.style.display="none"; startTimer(5);'>&nbsp;5m&nbsp;</div>
+            <div class='siac-btn siac-btn-dark' style='margin: 0 5px 0 5px;' onclick='this.parentNode.parentNode.style.display="none"; startTimer(15);'>&nbsp;15m&nbsp;</div>
+            <div class='siac-btn siac-btn-dark' style='margin: 0 5px 0 5px;' onclick='this.parentNode.parentNode.style.display="none"; startTimer(30);'>&nbsp;30m&nbsp;</div>
+            <div class='siac-btn siac-btn-dark' style='margin: 0 5px 0 5px;' onclick='this.parentNode.parentNode.style.display="none"; startTimer(60);'>&nbsp;60m&nbsp;</div>
+        </div>
+        <div style='text-align: center; margin-top: 20px;'>
+            <div class='siac-btn siac-btn-dark' onclick='this.parentNode.parentNode.style.display="none";'>Don't Start</div>
+        </div>
+        """ % (read_today_count, "page" if read_today_count == 1 else "pages", added_today_count, "card" if added_today_count == 1 else "cards")
+        return "$('#siac-timer-popup').html(`%s`); $('#siac-timer-popup').show();" % html
+
+
+    @js
+    def jump_to_last_read_page(self, nid: int):
+        return """
+            if (pagesRead && pagesRead.length) {
+                pdfDisplayedCurrentPage = Math.max(...pagesRead);
+                rerenderPDFPage(pdfDisplayedCurrentPage, false, true);
+            }
+        """
+    @js
+    def jump_to_first_unread_page(self, nid: int):
+        return """
+            if (pdfDisplayed) {
+                for (var i = 1; i < pdfDisplayed.numPages + 1; i++) {
+                    if (!pagesRead || pagesRead.indexOf(i) === -1) {
+                        pdfDisplayedCurrentPage = i;
+                        rerenderPDFPage(pdfDisplayedCurrentPage, false, true);
+                        break;
+                    }
+                }
+            }
+        """
+
+    #
+    # highlights
+    #
+
+    def show_highlights_for_page(self, page: int):
+        highlights = get_highlights(self.note_id, page)
+        if highlights is not None and len(highlights) > 0:
+            js = ""
+            for rowid, nid, page, type, grouping, x0, y0, x1, y1, text, data, created in highlights:
+                text = text.replace("`", "")
+                js = f"{js},[{x0},{y0},{x1},{y1},{type},{rowid}, `{text}`]"
+            js = js[1:]
+            self._editor.web.eval("Highlighting.current = [%s]; Highlighting.displayHighlights();" % js)
+
+
+
+class ReadingModalSidebar():
+
+    def __init__(self):
+
+        self._editor                    : Editor                = None
+        self.tab_displayed              : str                   = "fields"
+
+        # cache last results to display when the tab is reopened
+        self.browse_tab_last_results    : Optional[Tuple[Any, ...]]  = None
+        self.pdfs_tab_last_results      : Optional[Tuple[Any, ...]]  = None
+
+        #
+        # Pagination
+        #
+        self.page                       : int                   = 1
+        self.last_results               : Optional[Tuple[Any, ...]]  = None
+        self.page_size                  :int                    = 100
+
+    def set_editor(self, editor: Editor):
+        self._editor = editor
+
+
+    def print(self, results: List[IndexNote], stamp: str = "", query_set: List[str] = []):
+        self.last_results   = results
+        self.last_stamp     = stamp
+        self.last_query_set = query_set
+        self.show_page(1)
+
+    def show_page(self, page: int):
+        self.page = page
+        if self.last_results is not None:
+            to_print = self.last_results[(page- 1) * self.page_size: page * self.page_size]
+            if self.tab_displayed == "browse":
+                self.browse_tab_last_results = (self.last_results, self.last_stamp, self.last_query_set)
+                self._print_sidebar_search_results(to_print, self.last_stamp, self.last_query_set)
+            elif self.tab_displayed == "pdfs":
+                self.pdfs_tab_last_results = self.last_results
+                self._print_sidebar_results_title_only(to_print)
+
+
+    def show_fields_tab(self):
+        if self.tab_displayed == "fields":
+            return
+        self.tab_displayed = "fields"
+        self._editor.web.eval("""
+            $('#siac-left-tab-browse,#siac-left-tab-pdfs').remove();
+            document.getElementById("fields").style.display = 'block';
+        """)
+
+
+    def show_browse_tab(self):
+        if self.tab_displayed == "browse":
+            return
+        self.tab_displayed = "browse"
+        self._editor.web.eval(f"""
+            document.getElementById("fields").style.display = 'none';
+            $('#siac-left-tab-browse,#siac-left-tab-pdfs').remove();
+            $(`
+                <div id='siac-left-tab-browse' style='display: flex; flex-direction: column;'>
+                    <div class='siac-pdf-main-color-border-bottom' style='flex: 0 auto; padding: 5px 0 5px 0; user-select: none;'>
+                        <strong style='color: grey;'>Last: </strong>
+                        <strong class='blue-hover' style='color: grey; margin-left: 10px;' onclick='pycmd("siac-pdf-sidebar-last-addon")'>Add-on</strong>
+                        <strong class='blue-hover' style='color: grey; margin-left: 10px;' onclick='pycmd("siac-pdf-sidebar-last-anki")'>Anki</strong>
+                    </div>
+                    <div id='siac-left-tab-browse-results' style='flex: 1 1 auto; overflow-y: auto; padding: 0 5px 0 0; margin: 10px 0 5px 0;'>
+                    </div>
+                    <div style='flex: 0 auto; padding: 5px 0 5px 0;'>
+                        <input type='text' style='width: 100%; box-sizing: border-box;' onkeyup='pdfLeftTabAnkiSearchKeyup(this.value, event);'/>
+                    </div>
+                </div>
+            `).insertBefore('#siac-reading-modal-tabs-left');
+        """)
+        if self.browse_tab_last_results is not None:
+            self.print(self.browse_tab_last_results[0], self.browse_tab_last_results[1], self.browse_tab_last_results[2])
+        else:
+            self._editor.web.eval("pycmd('siac-pdf-sidebar-last-anki')")
+
+    def show_pdfs_tab(self):
+        if self.tab_displayed == "pdfs":
+            return
+        self.tab_displayed = "pdfs"
+        self._editor.web.eval(f"""
+            document.getElementById("fields").style.display = 'none';
+            $('#siac-left-tab-browse,#siac-left-tab-pdfs').remove();
+            $(`
+                <div id='siac-left-tab-pdfs' style='display: flex; flex-direction: column;'>
+                    <div class='siac-pdf-main-color-border-bottom' style='flex: 0 auto; padding: 5px 0 5px 0; user-select: none;'>
+                        <strong class='blue-hover' style='color: grey; margin-left: 10px;' onclick='pycmd("siac-pdf-sidebar-pdfs-in-progress")'>In Progress</strong>
+                        <strong class='blue-hover' style='color: grey; margin-left: 10px;' onclick='pycmd("siac-pdf-sidebar-pdfs-unread")'>Unread</strong>
+                    </div>
+                    <div id='siac-left-tab-browse-results' style='flex: 1 1 auto; overflow-y: auto; padding: 0 5px 0 0; margin: 10px 0 5px 0;'>
+                    </div>
+                    <div style='flex: 0 auto; padding: 5px 0 5px 0;'>
+                        <input type='text' style='width: 100%; box-sizing: border-box;' onkeyup='pdfLeftTabPdfSearchKeyup(this.value, event);'/>
+                    </div>
+                </div>
+            `).insertBefore('#siac-reading-modal-tabs-left');
+        """)
+        if self.pdfs_tab_last_results is not None:
+            self.print(self.pdfs_tab_last_results)
+        else:
+            self._editor.web.eval("pycmd('siac-pdf-sidebar-pdfs-in-progress')")
+
+
+    def _print_sidebar_search_results(self, results: List[Printable], stamp: str, query_set: List[str]):
+        """
+            Print the results of the browse tab.
+        """
+        if results:
+            limit   = get_config_value_or_default("pdfTooltipResultLimit", 50)
+            html    = self._sidebar_search_results(results[:limit], query_set)
+            self._editor.web.eval("""
+                document.getElementById('siac-left-tab-browse-results').innerHTML = `%s`;
+                document.getElementById('siac-left-tab-browse-results').scrollTop = 0;
+            """ % html)
+        else:
+            if not query_set:
+                message = "Query was empty after cleaning."
+            else:
+                message = "Nothing found for query: <br/><br/><i>%s</i>" % (utility.text.trim_if_longer_than(" ".join(query_set), 200))
+
+            self._editor.web.eval("""
+                document.getElementById('siac-left-tab-browse-results').innerHTML = `%s`;
+            """ % message)
+
+    def _print_sidebar_results_title_only(self, results: List[SiacNote]):
+        """ Print the results of the pdfs tab. """
+
+        if not results:
+            return
+        html    = ""
+        limit   = get_config_value_or_default("pdfTooltipResultLimit", 50)
+
+        for note in results[:limit]:
+            should_show_loader = 'document.getElementById("siac-reading-modal-center").innerHTML = ""; showLoader(\"siac-reading-modal-center\", \"Loading Note...\");' if note.is_pdf() else ""
+            html = f"{html}<div class='siac-note-title-only' onclick='if (!pdfLoading) {{{should_show_loader}  destroyPDF(); noteLoading = true; greyoutBottom(); pycmd(\"siac-read-user-note {note.id}\"); hideQueueInfobox();}}'>{note.get_title()}</div>"
+
+        html    = html.replace("`", "\\`")
+
+        self._editor.web.eval(f"document.getElementById('siac-left-tab-browse-results').innerHTML = `{html}`;")
+
+
+
+    def _sidebar_search_results(self, db_list: List[IndexNote], query_set: List[str]) -> str:
+        html                        = ""
+        epochTime                   = int(time.time() * 1000)
+        timeDiffString              = ""
+        newNote                     = ""
+        lastNote                    = ""
+        nids                        = [r.id for r in db_list]
+        show_ret                    = get_config_value_or_default("showRetentionScores", True)
+        fields_to_hide_in_results   = get_config_value_or_default("fieldsToHideInResults", {})
+        remove_divs                 = get_config_value_or_default("removeDivsFromOutput", False)
+        if show_ret:
+            retsByNid               = getRetentions(nids)
+        ret                         = 0
+        highlighting                = get_config_value_or_default("highlighting", True)
+
+        for counter, res in enumerate(db_list):
+            ret = retsByNid[int(res.id)] if show_ret and int(res.id) in retsByNid else None
+            if ret is not None:
+                retMark = "background: %s; color: black;" % (utility.misc._retToColor(ret))
+                retInfo = """<div class='retMark' style='%s'>%s</div>
+                                """ % (retMark, int(ret))
+            else:
+                retInfo = ""
+
+            lastNote    = newNote
+            text        = res.get_content()
+
+            # hide fields that should not be shown
+            if str(res.mid) in fields_to_hide_in_results:
+                text = "\u001f".join([spl for i, spl in enumerate(text.split("\u001f")) if i not in fields_to_hide_in_results[str(res.mid)]])
+
+            #remove <div> tags if set in config
+            if remove_divs and res.note_type != "user":
+                text = utility.text.remove_divs(text)
+
+            if highlighting and query_set is not None:
+                text = utility.text.mark_highlights(text, query_set)
+
+            text        = utility.text.cleanFieldSeparators(text).replace("\\", "\\\\").replace("`", "\\`").replace("$", "&#36;")
+            text        = utility.text.try_hide_image_occlusion(text)
+            #try to put fields that consist of a single image in their own line
+            text        = utility.text.newline_before_images(text)
+            template    = noteTemplateSimple if res.note_type == "index" else noteTemplateUserNoteSimple
+            newNote     = template.format(
+                counter=counter+1,
+                nid=res.id,
+                edited="",
+                mouseup="",
+                text=text,
+                ret=retInfo,
+                tags=utility.tags.build_tag_string(res.tags, False, False, maxLength = 25, maxCount = 2),
+                creation="")
+            html += newNote
+        return html
diff --git a/src/web/sidebar.py b/src/web/sidebar.py
new file mode 100644
index 00000000..f818d2d2
--- /dev/null
+++ b/src/web/sidebar.py
@@ -0,0 +1,265 @@
+import typing
+from typing import List, Optional, Tuple, Any
+from aqt.editor import Editor
+from anki.utils import isMac, isLin
+
+
+from ..notes import get_note, _get_priority_list, get_avg_pages_read, get_all_tags, get_related_notes, get_priority_as_str, get_notes_scheduled_for_today
+from ..config import get_config_value_or_default as conf_or_def
+import utility.misc
+import utility.tags
+import utility.text
+
+class Sidebar:
+    """ The toggle-able sidebar that is displayed left of the results. """
+
+    def __init__(self):
+
+        self.ADDON_NOTES_TAB        : int       = 1
+        self.PDF_IMPORT_TAB         : int       = 2
+        self.SPECIAL_SEARCHES_TAB   : int       = 3
+
+        self.tab                    : int       = self.ADDON_NOTES_TAB
+        self._editor                : Editor    = None
+
+    def set_editor(self, editor: Editor):
+        self._editor = editor
+
+    def _html(self) -> str:
+
+        tab_displayed_name = self._tab_displayed_name()
+
+        if self.tab == self.ADDON_NOTES_TAB:
+            tags = get_all_tags()
+            tmap = utility.tags.to_tag_hierarchy(tags)
+
+            def iterateMap(tmap, prefix, start=False):
+                if start:
+                    html = "<ul class='deck-sub-list outer'>"
+                else:
+                    html = "<ul class='deck-sub-list'>"
+                for key, value in tmap.items():
+                    full = prefix + "::" + key if prefix else key
+                    html += "<li class='deck-list-item' onclick=\"event.stopPropagation(); pycmd('siac-user-note-search-tag %s')\"><div class='list-item-inner'><b class='exp'>%s</b> %s <span class='siac-tl-plus' onclick='pycmd(\"siac-create-note-tag-prefill %s\") '><b>NEW</b></span></div>%s</li>" % (full, "[+]" if value else "", utility.text.trim_if_longer_than(key, 35), full, iterateMap(value, full, False))
+                html += "</ul>"
+                return html
+
+            tag_html            = iterateMap(tmap, "", True)
+            tag_len             = len(tmap) if tmap is not None else 0
+
+            # check if there are any notes scheduled for today
+            scheduled_for_today = get_notes_scheduled_for_today()
+            if scheduled_for_today is not None and len(scheduled_for_today) > 0:
+                sched_today_menu_item = f"""<div class='siac-notes-sidebar-item blue-hover' onclick='pycmd("siac-show-due-today")'>Due today ({len(scheduled_for_today)})</div>"""
+            else:
+                sched_today_menu_item = ""
+
+            tab_html = f"""
+                    <div style='flex: 0 1 auto; margin-top: 10px;'>
+                        <div class='siac-notes-sidebar-item blue-hover' onclick='pycmd("siac-user-note-newest");'>Newest</div>
+                        <div class='siac-notes-sidebar-item blue-hover' onclick='pycmd("siac-show-pdfs")'>PDFs</div>
+                        <div class='siac-notes-sidebar-item blue-hover' onclick='pycmd("siac-show-pdfs-unread")'>PDFs - Unread</div>
+                        <div class='siac-notes-sidebar-item blue-hover' onclick='pycmd("siac-show-pdfs-in-progress")'>PDFs - In Progress</div>
+                      <!--  <div class='siac-notes-sidebar-item blue-hover' onclick='pycmd("siac-show-last-done")'>Last Done</div>-->
+                        {sched_today_menu_item}
+                        <div class='siac-notes-sidebar-item blue-hover' onclick='pycmd("siac-user-note-untagged")'>Untagged</div>
+                        <div class='siac-notes-sidebar-item blue-hover' onclick='pycmd("siac-user-note-random");'>Random</div>
+                        <input type='text' class='siac-sidebar-inp' style='width: calc(100% - 35px); box-sizing: border-box; border-radius: 4px; padding-left: 4px; margin-top: 10px;' onkeyup='searchForUserNote(event, this);'/>
+                        <span class='siac-search-icn' style='width: 16px; height: 16px; background-size: 16px 16px;'></span>
+                        <div class='w-100' style='margin-top: 20px;'><b>Tags ({tag_len})</b>
+                            <b class='siac-tags-exp-icon' style='margin-right: 15px; padding: 0 2px 0 2px;' onclick='noteSidebarCollapseAll();'>&#x25B2;</b>
+                            <b class='siac-tags-exp-icon' style='margin-right: 5px; padding: 0 2px 0 2px;' onclick='noteSidebarExpandAll();'>&#x25BC;</b>
+                        </div>
+                        <hr style='margin-right: 15px;'/>
+                    </div>
+                    <div style='flex: 1 1 auto; padding-right: 5px; margin-right: 5px; margin-bottom: 5px; overflow-y: auto;'>
+                        {tag_html}
+                    </div>
+
+            """
+        elif self.tab == self.PDF_IMPORT_TAB:
+
+            folders_to_search = conf_or_def("pdf.import.folders_to_search", [])
+            exp = ""
+            if len(folders_to_search) == 0:
+                folders = """
+                    <center style='margin-top: 100px;'>
+                        <strong>
+                            To browse local folders for pdfs, add some entries to the config option
+                            "pdf.import.folders_to_search", e.g. <br><br>
+                            "pdf.import.folders_to_search" : ["Some/Path/Documents/Uni", "Some/Path/Documents/Unsorted"] <br><br>
+                            
+                            The given folders (including their subfolders!) will be scanned for *.pdf files.
+                            Don't use too large folders here, because they are searched everytime the tab is opened so you might see a delay then. 
+                        </strong>
+                    </center>
+                """
+            else:
+                cleaned = []
+                for f in folders_to_search:
+                    if len(f.strip()) == 0:
+                        continue
+                    cleaned.append(f.replace("\\", "/"))
+                if len(cleaned) == 0:
+                    folders = """
+                    <center style='margin-top: 100px;'>
+                        <strong>
+                            Could not find any pdf files in the specified folders.
+                        </strong>
+                    </center>
+                    """
+                else:
+                    files = []
+                    for f in cleaned:
+                        files += utility.misc.find_pdf_files_in_dir_recursive(f, cut_path=False)
+                    
+                    map = utility.tags.to_tag_hierarchy(files, sep="/")
+                    map = utility.tags.flatten_map(map, "/")
+                    def iterateMap(tmap, prefix, start=False):
+                        if start:
+                            html = "<ul class='deck-sub-list outer'>"
+                        else:
+                            html = "<ul class='deck-sub-list'>"
+                        for key, value in tmap.items():
+                            full        = prefix + "/" + key if prefix else key
+                            if isMac or isLin and not full.startswith("/"):
+                                full = f"/{full}"
+                            click       = f"pycmd(\"siac-create-note-source-prefill {full}\")" if full.endswith(".pdf") else ""
+                            exp         = "[+]" if value else ""
+                            should_bold = "style='font-weight: bold;'" if value else ""
+                            html        = f"{html}<li class='deck-list-item' onclick='event.stopPropagation(); {click}'><div class='list-item-inner' {should_bold}><b class='exp'>{exp}</b> {utility.text.trim_if_longer_than(key, 35)}</div>{iterateMap(value, full, False)}</li>"
+                        html += "</ul>"
+                        return html
+                    folders = iterateMap(map, "", True)
+                    folders = f"""<div style='margin-top: 15px;'>
+                        {folders} 
+                    </div>"""
+                    exp = f"""
+                        <div style='flex: 0 1 auto; padding-right: 5px; margin-right: 5px; margin-bottom: 5px;'>
+                            <div class='w-100' style='margin-top: 20px;'><b>PDFs in Folders</b>
+                                <b class='siac-tags-exp-icon' style='margin-right: 15px; padding: 0 2px 0 2px;' onclick='noteSidebarCollapseAll();'>&#x25B2;</b>
+                                <b class='siac-tags-exp-icon' style='margin-right: 5px; padding: 0 2px 0 2px;' onclick='noteSidebarExpandAll();'>&#x25BC;</b>
+                            </div>
+                        </div>
+                    """
+
+            tab_html = f"""
+                {exp}
+                <div style='flex: 1 1 auto; padding-right: 5px; margin-right: 5px; margin-bottom: 5px; overflow-y: auto;'>
+                    {folders}
+                </div>
+            """
+
+        elif self.tab == self.SPECIAL_SEARCHES_TAB:
+
+            tab_html = f"""
+                    <div style='flex: 1 1 auto; margin-top: 15px; margin-right: 10px; overflow-y: auto; overflow-x: hidden;'>
+                        <div class='siac-notes-sidebar-item blue-hover' onclick='predefSearchFromSidebar("lastAdded")'>Last Added</div>
+                        <div class='siac-notes-sidebar-item blue-hover' onclick='predefSearchFromSidebar("firstAdded")'>First Added</div>
+                        <div class='siac-notes-sidebar-item blue-hover' onclick='predefSearchFromSidebar("lastModified")'>Last Modified</div>
+                        <div class='siac-notes-sidebar-item blue-hover' onclick='predefSearchFromSidebar("lastReviewed")'>Last Reviewed</div>
+                        <div class='siac-notes-sidebar-item blue-hover' onclick='predefSearchFromSidebar("lastLapses")'>Last Lapses</div>
+                        <br><br>
+
+                        <div class='siac-notes-sidebar-item blue-hover' onclick='predefSearchFromSidebar("highestPerf")'>Best Performance</div>
+                        <div class='siac-notes-sidebar-item blue-hover' onclick='predefSearchFromSidebar("lowestPerf")'>Worst Performance</div>
+                        <div class='siac-notes-sidebar-item blue-hover' onclick='predefSearchFromSidebar("lowestRet")'>Worst Pass Rate</div>
+                        <div class='siac-notes-sidebar-item blue-hover' onclick='predefSearchFromSidebar("highestRet")'>Best Pass Rate</div>
+                        <div class='siac-notes-sidebar-item blue-hover' onclick='predefSearchFromSidebar("longestTime")'>Time Taken (desc.)</div>
+                        <div class='siac-notes-sidebar-item blue-hover' onclick='predefSearchFromSidebar("shortestTime")'>Time Taken (asc.)</div>
+                        <br><br>
+
+                        <div class='siac-notes-sidebar-item blue-hover' onclick='predefSearchFromSidebar("longestText")'>Longest HTML</div>
+                        <div class='siac-notes-sidebar-item blue-hover' onclick='predefSearchFromSidebar("randomUntagged")'>Random Untagged</div>
+                        <div class='siac-notes-sidebar-item blue-hover' onclick='predefSearchFromSidebar("lastUntagged")'>Newest Untagged</div>
+                        <div class='siac-notes-sidebar-item blue-hover' onclick='predefSearchFromSidebar("highestInterval")'>Highest Interval</div>
+                        <div class='siac-notes-sidebar-item blue-hover' onclick='predefSearchFromSidebar("lowestInterval")'>Lowest Interval</div>
+                    </div>
+            """
+
+        html = f"""
+            <div id='siac-notes-sidebar'>
+                <div style='display: flex; flex-direction: column; height: 100%;'>
+                    <div style='flex: 0 1 auto; padding-right: 10px;'>
+                        <div class='siac-btn-small' style='position: relative; float: right; display: inline-block; min-width: 90px;' onclick='$(this).toggleClass("expanded")' onmouseleave='$(this).removeClass("expanded")'>
+                            <div id='siac-sidebar-selected' class='blue-hover'>{tab_displayed_name}</div>
+                            <div class='siac-btn-small-dropdown click' style='text-align: center; z-index: 3;' onclick='event.stopPropagation();'>
+                                <div class='blue-hover w-100' style='margin: 2px 0 2px 0;' onclick='pycmd("siac-sidebar-show-notes-tab")'>
+                                    <b>Add-on Notes</b>
+                                </div>
+                                <div class='blue-hover w-100' style='margin: 2px 0 2px 0;' onclick='pycmd("siac-sidebar-show-special-tab")'>
+                                    <b>Anki Notes</b><br>
+                                </div>
+                                <div class='blue-hover w-100' style='margin: 2px 0 2px 0;' onclick='pycmd("siac-sidebar-show-import-tab")'>
+                                    <b>PDF Import</b><br>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    {tab_html}
+                </div>
+
+            </div>
+
+        """
+        return html
+
+    def display(self):
+        html = self._html()
+        self._editor.web.eval("""
+        if (!document.getElementById('siac-notes-sidebar')) {
+            document.getElementById('resultsWrapper').insertAdjacentHTML("afterbegin", `%s`); 
+            $('#siac-notes-sidebar .exp').click(function(e) {
+                e.stopPropagation();
+                let icn = $(this);
+                if (icn.text()) {
+                    if (icn.text() === '[+]')
+                        icn.text('[-]');
+                    else
+                        icn.text('[+]');
+                }
+                $(this).parent().parent().children('ul').toggle();
+            });
+        }
+        """ % html)
+
+    def hide(self):
+        self._editor.web.eval("$('#siac-notes-sidebar').remove(); $('#resultsWrapper').css('padding-left', 0);")
+
+    def refresh_tab(self, tab: int):
+        if self.tab == tab:
+            self.refresh()
+
+    def refresh(self):
+        html = self._html()
+        self._editor.web.eval("""
+            if (document.getElementById('siac-notes-sidebar')) {
+                $('#siac-notes-sidebar').remove();
+                document.getElementById('resultsWrapper').insertAdjacentHTML("afterbegin", `%s`); 
+                $('#siac-notes-sidebar .exp').click(function(e) {
+                e.stopPropagation();
+                let icn = $(this);
+                if (icn.text()) {
+                    if (icn.text() === '[+]')
+                        icn.text('[-]');
+                    else
+                        icn.text('[+]');
+                }
+                $(this).parent().parent().children('ul').toggle();
+                });
+            }
+        """ % html)
+    
+
+    def show_tab(self, tab: int):
+        self.tab = tab
+        self.refresh()
+
+
+    def _tab_displayed_name(self) -> str:
+        if self.tab == self.PDF_IMPORT_TAB:
+            return "PDF Import"
+        elif self.tab == self.ADDON_NOTES_TAB:
+            return "Add-on Notes"
+        elif self.tab == self.SPECIAL_SEARCHES_TAB:
+            return "Anki Notes"
\ No newline at end of file
diff --git a/src/web/web.py b/src/web/web.py
index e19feecc..28c73062 100644
--- a/src/web/web.py
+++ b/src/web/web.py
@@ -28,6 +28,8 @@
 import utility.tags
 import utility.text
 import utility.misc
+import state
+
 
 from ..tag_find import get_most_active_tags
 from ..state import get_index, check_index, set_deck_map
@@ -41,7 +43,7 @@ def toggleAddon():
     return "toggleAddon();"
 
 
-def getScriptPlatformSpecific(delayWhileTyping):
+def getScriptPlatformSpecific():
     """
         Returns the css and js used by the add-on in <style>/<script> tags. 
         Some placeholders in the scripts.js file and in the styles.css file are replaced 
@@ -66,9 +68,8 @@ def getScriptPlatformSpecific(delayWhileTyping):
         script = f.read()
     with open(dir + "styles.css") as f:
         css = f.read().replace("%", "%%")
-    with open(dir + "pdf_reader.css") as f:
-        css += f.read().replace("%", "%%")
-    script = script.replace("$del$", str(delayWhileTyping))
+    # with open(dir + "pdf_reader.css") as f:
+    #     css += f.read().replace("%", "%%")
 
     deckSelectFontSize = get_config_value_or_default(["styling", "topBar", "deckSelectFontSize"], 11)
     noteFontSize = get_config_value_or_default(["styling", "general", "noteFontSize"], 12)
@@ -189,7 +190,7 @@ def setup_ui_after_index_built(editor, index, init_time=None):
     if editor is None:
         return
     config = mw.addonManager.getConfig(__name__)
-    showSearchResultArea(editor, init_time)
+    show_search_result_area(editor, init_time)
     #restore previous settings
     cmd = ""
     if not index.highlighting:
@@ -201,7 +202,7 @@ def setup_ui_after_index_built(editor, index, init_time=None):
     if not index.topToggled:
         cmd += "hideTop();"
     if index.ui is not None and not index.ui.uiVisible:
-        cmd += "$('#siac-right-side').addClass('addon-hidden')"
+        cmd += "$('#siac-right-side').addClass('addon-hidden');"
     if config["gridView"]:
         cmd += "activateGridView();" 
     editor.web.eval(cmd)
@@ -209,13 +210,13 @@ def setup_ui_after_index_built(editor, index, init_time=None):
         #plot.js is already loaded if a note was just added, so this is a lazy solution for now
         index.ui.plotjsLoaded = False
     if config["notes.sidebar.visible"]:
-        display_notes_sidebar(editor)
+        index.ui.set_editor(editor)
+        index.ui.sidebar.display()
         
 
-def showSearchResultArea(editor=None, initializationTime=0):
-    """
-    Toggle between the loader and search result area when the index has finished building.
-    """
+def show_search_result_area(editor=None, initializationTime=0):
+    """ Toggle between the loader and search result area when the index has finished building. """
+
     js = """
         if (document.getElementById('searchResults')) {
             document.getElementById('searchResults').style.display = 'block';
@@ -223,6 +224,7 @@ def showSearchResultArea(editor=None, initializationTime=0):
         if (document.getElementById('loader')) {
             document.getElementById('loader').style.display = 'none';
         }"""
+
     if check_index():
         get_index().ui.js(js)
     elif editor is not None and editor.web is not None:
@@ -230,15 +232,16 @@ def showSearchResultArea(editor=None, initializationTime=0):
 
 
 
-def printStartingInfo(editor):
-    """
-        Displays the information that is visible after the first start of the add-on.
-    """
+def print_starting_info(editor):
+    """ Displays the information that is visible after the first start of the add-on. """
+
     if editor is None or editor.web is None:
         return
-    config = mw.addonManager.getConfig(__name__)
-    index = get_index()
-    html = "<h3>Search is <span style='color: green'>ready</span>. (%s)</h3>" %  index.type if index is not None else "?"
+
+    config  = mw.addonManager.getConfig(__name__)
+    index   = get_index()
+    html    = "<h3>Search is <span style='color: green'>ready</span>. (%s)</h3>" %  index.type if index is not None else "?"
+
     if index is not None:
         html += "Initalized in <b>%s</b> s." % index.initializationTime
         if not index.creation_info["index_was_rebuilt"]:
@@ -253,88 +256,55 @@ def printStartingInfo(editor):
         html += "<br/>Retention is <b>%s</b> in the results." % ("shown" if config["showRetentionScores"] else "not shown")
         html += "<br/>Window split is <b>%s / %s</b>." % (config["leftSideWidthInPercent"], 100 - int(config["leftSideWidthInPercent"]))
         html += "<br/>Shortcut is <b>%s</b>." % (config["toggleShortcut"])
+    
+    if not state.db_file_existed:
+        html += "<br><br><b><i>siac-notes.db</i> was not existing, created a new one.</b>"
 
     if index is None or index.ui is None:
         html += "<br/><b>Seems like something went wrong while building the index. Try to close the dialog and reopen it. If the problem persists, contact the addon author.</b>"
 
 
-    editor.web.eval("document.getElementById('searchResults').innerHTML = `<div id='startInfo'>%s</div>`;" % html)
+    editor.web.eval("""document.getElementById('searchResults').innerHTML = `
+            <div id='startInfo'>
+                %s
+            </div>`;""" % html)
 
 @requires_index_loaded
 def display_model_dialog():
-    """
-        Called after clicking on "Set Fields" in the settings modal.
-    """
+    """ Called after clicking on "Set Fields" in the settings modal. """
+
     if check_index():
         html = get_model_dialog_html()
         get_index().ui.show_in_modal_subpage(html)
 
+@js
+def show_settings_modal(editor):
+    """ Display the Settings modal. """
 
+    config  = mw.addonManager.getConfig(__name__)
+    html    = stylingModal(config)
+    index   = get_index()
 
-@js
-def showStylingModal(editor):
-    config = mw.addonManager.getConfig(__name__)
-    html = stylingModal(config)
-    index = get_index()
     index.ui.showInModal(html)
-    return "$('.modal-close').on('click', function() {pycmd(`writeConfig`) })"
+    return "$('.modal-close').on('click', function() {pycmd(`siac-write-config`) })"
 
 @js
 def show_unsuspend_modal(nid):
-    html = get_unsuspend_modal(nid)
-    index = get_index()
+    """ Display the modal to unsuspend cards of a note. """
+
+    html    = get_unsuspend_modal(nid)
+    index   = get_index()
+
     index.ui.showInModal(html)
     return "$('.modal-close').on('click', function() {pycmd(`siac-rerender`);$('.modal-close').off('click'); })"
 
 
 @js
 def display_note_del_confirm_modal(editor, nid):
-    html = get_note_delete_confirm_modal_html(nid)
-    return "$('#greyout').show();$('#searchResults').append(`%s`);" % html
+    """ Display the modal that asks to confirm a (add-on) note deletion. """
 
-
-
-@js
-def display_notes_sidebar(editor):
-    html = get_notes_sidebar_html()
-    return """
-    if (!document.getElementById('siac-notes-sidebar')) {
-        document.getElementById('resultsWrapper').insertAdjacentHTML("afterbegin", `%s`); 
-        $('#siac-notes-sidebar .exp').click(function(e) {
-            e.stopPropagation();
-            let icn = $(this);
-            if (icn.text()) {
-                if (icn.text() === '[+]')
-                    icn.text('[-]');
-                else
-                    icn.text('[+]');
-            }
-            $(this).parent().parent().children('ul').toggle();
-        });
-    }
-    """ % html
-
-@js
-def reload_note_sidebar():
-    html = get_notes_sidebar_html()
-    return """
-        if (document.getElementById('siac-notes-sidebar')) {
-            $('#siac-notes-sidebar').remove();
-            document.getElementById('resultsWrapper').insertAdjacentHTML("afterbegin", `%s`); 
-            $('#siac-notes-sidebar .exp').click(function(e) {
-            e.stopPropagation();
-            let icn = $(this);
-            if (icn.text()) {
-                if (icn.text() === '[+]')
-                    icn.text('[-]');
-                else
-                    icn.text('[+]');
-            }
-            $(this).parent().parent().children('ul').toggle();
-            });
-        }
-    """ % html
-    
+    html = get_note_delete_confirm_modal_html(nid)
+    return "$('#searchResults').scrollTop(0).append(`%s`);" % html
    
 
 def fillTagSelect(editor = None, expanded = False) :
@@ -342,21 +312,21 @@ def fillTagSelect(editor = None, expanded = False) :
     Builds the html for the "browse tags" mode in the deck select.
     Also renders the html.
     """
-    tags = mw.col.tags.all()
-    user_note_tags = get_all_tags()
+    tags            = mw.col.tags.all()
+    user_note_tags  = get_all_tags()
     tags.extend(user_note_tags)
-    tags = set(tags)
-    tmap = utility.tags.to_tag_hierarchy(tags)
+    tags            = set(tags)
+    tmap            = utility.tags.to_tag_hierarchy(tags)
 
-    most_active = get_most_active_tags(5)
+    most_active     = get_most_active_tags(5)
     most_active_map = dict()
+
     for t in most_active:
         if t in tmap:
             most_active_map[t] = tmap[t]
         else:
             most_active_map[t] = {}
 
-
     def iterateMap(tmap, prefix, start=False):
         if start:
             html = "<ul class='deck-sub-list outer'>"
@@ -364,17 +334,17 @@ def iterateMap(tmap, prefix, start=False):
             html = "<ul class='deck-sub-list'>"
         for key, value in tmap.items():
             full = prefix + "::" + key if prefix else key
-            html += "<li class='deck-list-item' onclick=\"event.stopPropagation(); pycmd('searchTag %s')\"><div class='list-item-inner'><b class='exp'>%s</b> %s <span class='check'>&#10004;</span></div>%s</li>" % (full, "[+]" if value else "", utility.text.trim_if_longer_than(key, 35), iterateMap(value, full, False))
+            html += "<li class='deck-list-item' onclick=\"event.stopPropagation(); pycmd('siac-search-tag %s')\"><div class='list-item-inner'><b class='exp'>%s</b> %s <span class='check'>&#10004;</span></div>%s</li>" % (full, "[+]" if value else "", utility.text.trim_if_longer_than(key, 35), iterateMap(value, full, False))
         html += "</ul>"
         return html
 
-    most_active_html = iterateMap(most_active_map, "", True)
-    html = iterateMap(tmap, "", True)
+    most_active_html    = iterateMap(most_active_map, "", True)
+    html                = iterateMap(tmap, "", True)
 
     # the dropdown should only be expanded on user click, not on initial render
-    expanded_js = """$('#siac-switch-deck-btn').addClass("expanded");""" if expanded else ""
+    expanded_js         = """$('#siac-switch-deck-btn').addClass("expanded");""" if expanded else ""
 
-    cmd = """
+    cmd                 = """
     document.getElementById('deck-sel-info-lbl').style.display = 'none';
     document.getElementById('deckSelQuickWrapper').style.display = '%s';
     document.getElementById('deckSelQuick').innerHTML = `%s`;
@@ -399,14 +369,12 @@ def iterateMap(tmap, prefix, start=False):
         get_index().ui.js(cmd)
 
 def fillDeckSelect(editor = None, expanded= False):
-    """
-    Fill the selection with user's decks
-    """
+    """ Fill the selection with user's decks """
 
-    deckMap = dict()
-    config = mw.addonManager.getConfig(__name__)
-    deckList = config['decks']
-    index = get_index()
+    deckMap     = dict()
+    config      = mw.addonManager.getConfig(__name__)
+    deckList    = config['decks']
+    index       = get_index()
     if editor is None:
         if index is not None and index.ui is not None and index.ui._editor is not None:
             editor = index.ui._editor
@@ -420,11 +388,11 @@ def fillDeckSelect(editor = None, expanded= False):
            continue
        deckMap[d['name']] = d['id']
     set_deck_map(deckMap)
-    dmap = {}
+    dmap        = {}
     for name, id in deckMap.items():
         dmap = addToDecklist(dmap, id, name)
 
-    dmap = dict(sorted(dmap.items(), key=lambda item: item[0].lower()))
+    dmap        = dict(sorted(dmap.items(), key=lambda item: item[0].lower()))
     def iterateMap(dmap, prefix, start=False):
         decks = index.selectedDecks if index is not None else []
         if start:
@@ -437,10 +405,10 @@ def iterateMap(dmap, prefix, start=False):
         html += "</ul>"
         return html
 
-    html = iterateMap(dmap, "", True)
+    html        = iterateMap(dmap, "", True)
     expanded_js = """$('#siac-switch-deck-btn').addClass("expanded");""" if expanded else ""
 
-    cmd = """
+    cmd         = """
     document.getElementById('deck-sel-info-lbl').style.display = 'block';
     document.getElementById('deckSelQuickWrapper').style.display = 'none';
     document.getElementById('deckSel').innerHTML = `%s`;
@@ -471,23 +439,3 @@ def addToDecklist(dmap, id, name):
         if not d in found:
             found.update({d : {}})
     return dmap
-
-@js
-def show_notification(html):
-
-    return """
-        $('.siac-notification').remove();
-        let target = $('#siac-reading-modal').is(':visible') ? "#reading-modal" : "#siac-right-side";
-        $(target).append(`
-            <div class='siac-notification'>
-                %s
-            </div> 
-         `);
-
-        window.setTimeout(function() {
-            $('.siac-notification').fadeOut(5000);
-            $('.siac-notification').remove();
-         }, 5000);
-    
-    
-    """ % html
\ No newline at end of file
diff --git a/src/web_import.py b/src/web_import.py
index e5b27248..85ce6180 100644
--- a/src/web_import.py
+++ b/src/web_import.py
@@ -16,19 +16,24 @@
 
 
 import urllib.request
+import typing
 from bs4 import BeautifulSoup, Comment
 from requests import get
 
 
-def _fetch(url):
-    html = ""
-    req = urllib.request.Request(url, headers={'User-Agent': 'Mozilla/5.0'}) 
+def _fetch(url: str) -> BeautifulSoup:
+    html    = ""
+    req     = urllib.request.Request(url, headers={'User-Agent': 'Mozilla/5.0'}) 
+
     with urllib.request.urlopen(req) as response:
         html = response.read()
-    page = BeautifulSoup(html, "html.parser")
+
+    page    = BeautifulSoup(html, "html.parser")
+
     for ignored_tag in ["script", "img", "input", "button", "style", "font", "iframe", "object", "embed"]:
         for tag in page.find_all(ignored_tag):
             tag.decompose()
+
     for tag in page.find_all(recursive=True):
         for attribute in ["class", "id", "name", "style", "role", "lang", "dir", "href", "src"]:
             del tag[attribute]
@@ -38,9 +43,10 @@ def _fetch(url):
 
     for node in page.find_all(text=lambda s: isinstance(s, Comment)):
         node.extract()
+
     return page
 
-def import_webpage(url):
+def import_webpage(url: str) -> str:
     if url is None or len(url.strip()) == 0:
         return None
     try:
diff --git a/user_files/data.json b/user_files/data.json
index 29b3e1c7..ac00ea3f 100644
--- a/user_files/data.json
+++ b/user_files/data.json
@@ -1,7 +1,7 @@
 {
   "index": {
-    "timestamp": "14/03/2020 07:16:18",
-    "size": 11081,
+    "timestamp": "02/04/2020 08:58:06",
+    "size": 11124,
     "decks": [],
     "shouldRebuild": false,
     "lastInsertedId": -1,
@@ -11,6 +11,6 @@
   },
   "synsets": [],
   "notes": {
-    "db_last_checked": "2020-03-14-07-03-05"
+    "db_last_checked": "2020-04-04-17-07-52"
   }
 }
\ No newline at end of file
diff --git a/web/gen_pdf_reader_alt_css.sh b/web/gen_pdf_reader_alt_css.sh
new file mode 100644
index 00000000..b7e84bab
--- /dev/null
+++ b/web/gen_pdf_reader_alt_css.sh
@@ -0,0 +1,64 @@
+#!/bin/bash
+
+# lightblue theme
+rm -f 'pdf_reader_lightblue.css'
+cp 'pdf_reader.css' 'pdf_reader_lightblue.css'
+# replace styles
+sed -i 's/darkorange/#41b3a3/' 'pdf_reader_lightblue.css' 
+sed -i 's/orange/#85cdca/' 'pdf_reader_lightblue.css' 
+
+# khaki theme
+rm -f 'pdf_reader_khaki.css'
+cp 'pdf_reader.css' 'pdf_reader_khaki.css'
+# replace styles
+sed -i 's/darkorange/#f6d198/' 'pdf_reader_khaki.css' 
+sed -i 's/orange/#f6d198/' 'pdf_reader_khaki.css' 
+
+# tan theme
+rm -f 'pdf_reader_tan.css'
+cp 'pdf_reader.css' 'pdf_reader_tan.css'
+# replace styles
+sed -i 's/darkorange/#cfb495/' 'pdf_reader_tan.css' 
+sed -i 's/orange/#cfb495/' 'pdf_reader_tan.css' 
+
+# darkseagreen theme
+rm -f 'pdf_reader_darkseagreen.css'
+cp 'pdf_reader.css' 'pdf_reader_darkseagreen.css'
+# replace styles
+sed -i 's/darkorange/#9dab86/' 'pdf_reader_darkseagreen.css' 
+sed -i 's/orange/#9dab86/' 'pdf_reader_darkseagreen.css' 
+
+# lightgreen theme
+rm -f 'pdf_reader_lightgreen.css'
+cp 'pdf_reader.css' 'pdf_reader_lightgreen.css'
+# replace styles
+sed -i 's/darkorange/#9dab86/' 'pdf_reader_lightgreen.css' 
+sed -i 's/orange/#9dab86/' 'pdf_reader_lightgreen.css' 
+
+# lightsalmon theme
+rm -f 'pdf_reader_lightsalmon.css'
+cp 'pdf_reader.css' 'pdf_reader_lightsalmon.css'
+# replace styles
+sed -i 's/darkorange/#ffb385/' 'pdf_reader_lightsalmon.css' 
+sed -i 's/orange/#ffb385/' 'pdf_reader_lightsalmon.css' 
+
+# yellow theme
+rm -f 'pdf_reader_yellow.css'
+cp 'pdf_reader.css' 'pdf_reader_yellow.css'
+# replace styles
+sed -i 's/darkorange/#ffd868/' 'pdf_reader_yellow.css' 
+sed -i 's/orange/#ffd868/' 'pdf_reader_yellow.css' 
+
+# crimson theme
+rm -f 'pdf_reader_crimson.css'
+cp 'pdf_reader.css' 'pdf_reader_crimson.css'
+# replace styles
+sed -i 's/darkorange/#c72c41/' 'pdf_reader_crimson.css' 
+sed -i 's/orange/#c72c41/' 'pdf_reader_crimson.css' 
+
+# steelblue theme
+rm -f 'pdf_reader_steelblue.css'
+cp 'pdf_reader.css' 'pdf_reader_steelblue.css'
+# replace styles
+sed -i 's/darkorange/#2496dc/' 'pdf_reader_steelblue.css' 
+sed -i 's/orange/#2496dc/' 'pdf_reader_steelblue.css' 
\ No newline at end of file
diff --git a/web/icons/close.png b/web/icons/close.png
new file mode 100644
index 00000000..52affe74
Binary files /dev/null and b/web/icons/close.png differ
diff --git a/web/icons/fullscreen.png b/web/icons/fullscreen.png
new file mode 100644
index 00000000..375c2f89
Binary files /dev/null and b/web/icons/fullscreen.png differ
diff --git a/web/icons/partition.png b/web/icons/partition.png
new file mode 100644
index 00000000..fd6d73bb
Binary files /dev/null and b/web/icons/partition.png differ
diff --git a/web/icons/switch_layout.png b/web/icons/switch_layout.png
new file mode 100644
index 00000000..c2429e98
Binary files /dev/null and b/web/icons/switch_layout.png differ
diff --git a/web/icons/toggle_bars.png b/web/icons/toggle_bars.png
new file mode 100644
index 00000000..59e11dc6
Binary files /dev/null and b/web/icons/toggle_bars.png differ
diff --git a/web/pdf_highlighting.js b/web/pdf_highlighting.js
new file mode 100644
index 00000000..dba54c32
--- /dev/null
+++ b/web/pdf_highlighting.js
@@ -0,0 +1,310 @@
+var Highlighting = {
+
+    /**
+     * state
+     */
+    colorSelected: { id: 1, color: "red" },
+    current: [],
+
+
+
+    /**
+     * Main entry point, called after keyup in text layer with ctrl pressed.
+     */
+    highlight: function () {
+        let s = window.getSelection();
+        let r = s.getRangeAt(0);
+        $('#text-layer > span').css("height", "auto");
+        let clientRects = r.getClientRects();
+        if (clientRects.length > 100) {
+            showPDFBottomRightNotification("Selection too long to highlight.", true);
+            return;
+        }
+        let rects = this._fuseOverlappingClientRects(clientRects);
+        let rectCanvas = document.getElementById("text-layer").getBoundingClientRect();
+        let offset = document.getElementById('text-layer').offsetLeft;
+        //page group type [x,y,w,h]+ # text
+        let cmd = pdfDisplayedCurrentPage + " -1 " + this.colorSelected.id + " ";
+        rects.forEach((r) => {
+            let x = r.x - rectCanvas.x;
+            let y = r.y - rectCanvas.y;
+            let conv = pdfDisplayedViewPort.convertToPdfPoint(x, y + 3);
+
+            cmd += conv[0] + " " + conv[1] + " ";
+            conv = pdfDisplayedViewPort.convertToPdfPoint(x + r.w, y + r.h + 3);
+            cmd += conv[0] + " " + conv[1] + " ";
+            // text layer spans seem to be shifted to the top by some pixels, so add a small offset to the highlight div
+            this._createHighlightDiv(x + offset, y + 3, r.w, r.h, this.colorSelected.id);
+
+        });
+        cmd += "# " + s.toString();
+        s.removeAllRanges();
+        pycmd("siac-hl-new " + cmd);
+        $('#text-layer > span').css("height", "100px");
+    },
+    insertText: function (event) {
+        let rectCanvas = document.getElementById("text-layer").getBoundingClientRect();
+        let offset = document.getElementById('text-layer').offsetLeft;
+
+        let x = event.clientX - rectCanvas.x;
+        let y = event.clientY - rectCanvas.y;
+        this._createHighlightDiv(x + offset, y, 100, 20, this.colorSelected.id, "");
+        let cmd = pdfDisplayedCurrentPage + " -1 0 ";
+        let conv = pdfDisplayedViewPort.convertToPdfPoint(x, y);
+        cmd += conv[0] + " " + conv[1] + " ";
+        conv = pdfDisplayedViewPort.convertToPdfPoint(x + 100, y + 20);
+        cmd += conv[0] + " " + conv[1] + " #";
+        pycmd("siac-hl-new " + cmd);
+    },
+
+    displayHighlights: function () {
+        this._removeAllHighlights();
+        let canvas = document.getElementById("siac-pdf-canvas");
+        this.current.forEach((r) => {
+            let x0 = r[0];
+            let y0 = r[1];
+            let x1 = r[2];
+            let y1 = r[3];
+            let t = r[4];
+            let id = r[5];
+            let text = r[6];
+            let bounds = pdfDisplayedViewPort.convertToViewportRectangle([x0, y0, x1, y1]);
+            let x = Math.min(bounds[0], bounds[2]);
+            x += canvas.offsetLeft;
+            let y = Math.min(bounds[1], bounds[3]);
+            let w = Math.abs(bounds[0] - bounds[2]);
+            let h = Math.abs(bounds[1] - bounds[3]);
+            this._createHighlightDiv(x, y, w, h, t, id, text);
+
+        });
+    },
+
+    _removeAllHighlights: function () {
+        let all = document.getElementsByClassName('siac-hl');
+        while (all[0]) {
+            all[0].parentNode.removeChild(all[0]);
+        }
+    },
+
+    _colorById: function (t) {
+        switch (t) {
+            case 0: return "white";
+            case 1: return "#e65100";
+            case 2: return "#558b2f";
+            case 3: return "#2196f3";
+            case 4: return "#ffee58";
+            case 5: return "#ab47bc";
+            case 6: return "#e65100";
+            case 7: return "#558b2f";
+            case 8: return "#2196f3";
+        }
+    },
+
+
+    /**
+     *  getClientRects returns many overlapping rects for the text layer, so we try to fuse them together 
+     */
+    _fuseOverlappingClientRects: function (domRectList) {
+        let fused = true;
+        let x, y, w, h = 0;
+        let clientRects = [];
+        for (var n = 0; n < domRectList.length; n++) {
+            clientRects.push({ x: domRectList[n].x, y: domRectList[n].y, w: domRectList[n].width, h: domRectList[n].height })
+        }
+        if (clientRects.length === 1) {
+            return clientRects;
+        }
+        while (fused) {
+            fused = false;
+            let out = [];
+            let i1 = 0;
+            for (var i0 = 0; i0 < clientRects.length; i0++) {
+                if (fused && i1 === i0) {
+                    continue;
+                }
+                x = clientRects[i0].x;
+                y = clientRects[i0].y;
+                w = clientRects[i0].w;
+                h = clientRects[i0].h;
+
+                if (!fused) {
+                    for (i1 = 0; i1 < clientRects.length; i1++) {
+                        if (i1 === i0) { continue; }
+
+                        // lots of room for improvement, some cases can probably get unified
+                        if (clientRects[i1].x === x && clientRects[i1].y === y && clientRects[i1].w === w && clientRects[i1].h !== h) {
+                            h = Math.max(clientRects[i1].h, h);
+                            fused = true;
+                        } else if (clientRects[i1].x === x && clientRects[i1].y === y && clientRects[i1].w !== w && clientRects[i1].h === h) {
+                            w = Math.max(clientRects[i1].w, w);
+                            fused = true;
+                        } else if (clientRects[i1].x === x && clientRects[i1].y !== y && clientRects[i1].w === w && clientRects[i1].h === h) {
+                            y = Math.min(y, clientRects[i1].y);
+                            fused = true;
+                        } else if (clientRects[i1].x !== x && clientRects[i1].y === y && clientRects[i1].w === w && clientRects[i1].h === h) {
+                            x = Math.min(x, clientRects[i1].x);
+                            fused = true;
+                        }
+
+                        else if (clientRects[i1].x !== x && clientRects[i1].y === y && clientRects[i1].w === w && clientRects[i1].h !== h && Math.abs(clientRects[i1].h - h) < 100) {
+                            x = Math.min(x, clientRects[i1].x);
+                            h = Math.max(clientRects[i1].h, h);
+                            fused = true;
+                        } else if (clientRects[i1].x !== x && clientRects[i1].y === y && clientRects[i1].h === h) {
+                            if (clientRects[i1].x < x) {
+                                w = x + w - clientRects[i1].x;
+                                x = clientRects[i1].x;
+                            } else {
+                                w = (clientRects[i1].x + clientRects[i1].w) - x;
+                            }
+                            fused = true;
+                        } else if (clientRects[i1].x === x && clientRects[i1].w === w) {
+                            h = Math.max(clientRects[i1].h, h, Math.max(y + h, clientRects[i1].y + clientRects[i1].h) - Math.min(clientRects[i1].y, y));
+                            y = Math.min(clientRects[i1].y, y);
+                            fused = true;
+                        } else if (clientRects[i1].y > y && clientRects[i1].y + clientRects[i1].h < y + h) {
+                            w = Math.max(clientRects[i1].w, w, clientRects[i1].x + clientRects[i1].w - Math.min(clientRects[i1].x, x), x + w - Math.min(clientRects[i1].x, x));
+                            x = Math.min(clientRects[i1].x, x);
+                            fused = true;
+                        }
+
+                        if (fused) {
+                            if (i1 < i0) {
+                                out.splice(i1, 1);
+                            }
+                            break;
+                        }
+                    }
+                }
+                // console.assert(x >= 0 && y >= 0 && w >= 0 && h >= 0, "neg value");
+                if (out.indexOf({ x, y, w, h }) === -1) {
+                    out.push({ x, y, w, h });
+                }
+            }
+            if (fused && clientRects.length === out.length) {
+                console.log("something went terribly wrong");
+                return clientRects;
+            }
+            clientRects = Array.from(out);
+        }
+        return clientRects;
+    },
+    /**
+     * Button at the side of the pdf pane clicked.
+     * Switches selected highlighting tool.
+     */
+    onColorBtn: function (elem) {
+        this.colorSelected = { id: Number($(elem).data("id")), color: $(elem).data("color") };
+        $('.siac-pdf-color-btn,.siac-pdf-ul-btn').removeClass("active");
+        $(elem).addClass("active");
+        pycmd("siac-hl-clicked " + this.colorSelected.id + " " + this.colorSelected.color);
+        if (this.colorSelected.id > 0) {
+            showPDFBottomRightNotification("CTRL + select to highlight", true);
+        } else {
+            showPDFBottomRightNotification("CTRL + click to insert text", true);
+        }
+    },
+
+    /**
+     * Mouse up in text comment, should check if width has changed (element was resized by dragging), if yes,
+     * update db entry. 
+     */
+    onTextMouseUp: function(event, el) {
+        if (!el.dataset.id) {
+            return;
+        }
+        if (el.clientWidth != el.dataset.ow || el.clientHeight != el.dataset.oh) {
+            el.dataset.ow = el.clientWidth;
+            el.dataset.oh = el.clientHeight;
+
+            let rectCanvas = document.getElementById("text-layer").getBoundingClientRect();
+            let x0 = el.offsetLeft - document.getElementById("siac-pdf-canvas").offsetLeft;
+            let y0 = el.offsetTop ;
+            let x1 = x0 + el.clientWidth; 
+            let y1 = y0 + el.clientHeight; 
+
+            let conv = pdfDisplayedViewPort.convertToPdfPoint(x0, y0);
+            x0 = conv[0];
+            y0 = conv[1];
+            conv = pdfDisplayedViewPort.convertToPdfPoint(x1, y1);
+            x1 = conv[0];
+            y1 = conv[1];
+
+            pycmd(`siac-hl-text-update-coords ${el.dataset.id} ${x0} ${y0} ${x1} ${y1}`);
+        }
+    },
+
+    /**
+     * Text comment loses focus, so save changed content to db. 
+     */
+    onTextBlur: function(el) {
+        if (!el.dataset.id) {
+            return;
+        }
+        pycmd("siac-hl-text-update-text " + el.dataset.id + " " + $(el).val());
+    },
+
+    onTextKeyup: function(el) {
+        $(el).height(1); 
+        $(el).height($(el).prop('scrollHeight') + 1);
+        this.onTextMouseUp(null, el);
+    },
+
+    /**
+     * Clicked on a highlight marker 
+     */
+    hlClick: function (event, el) {
+        if (!el.dataset.id) {
+            return;
+        }
+        if (event.ctrlKey || event.metaKey) {
+            $(el).remove();
+            pycmd("siac-hl-del " + el.dataset.id);
+        }
+    },
+    /**
+     *  create the actual div that will be the highlight and append it to the dom
+     */
+    _createHighlightDiv: function (x, y, w, h, t, id = -1, text = "") {
+
+        let el;
+        //regular highlight
+        if (t > 0) {
+            el = document.createElement("div");
+            el.className = "siac-hl" + (t === 0 ? " siac-text-hl" : "");
+            el.style.height = h + "px";
+            el.style.width = w + "px";
+            el.style.top = y + "px";
+            el.style.left = x + "px";
+            if (id !== -1) {
+                el.dataset.id = id;
+            }
+            el.setAttribute("onclick", "Highlighting.hlClick(event, this);");
+            if (t >= 6)
+                el.style.borderBottom = "3px solid " + this._colorById(t);
+            else
+                el.style.background = this._colorById(t);
+        }
+        // text highlight 
+        else {
+            el = document.createElement("textarea");
+            el.className = "siac-hl siac-text-hl";
+            el.style.height = h + "px";
+            el.style.width = w + "px";
+            el.style.top = y + "px";
+            el.style.left = x + "px";
+            if (id !== -1) {
+                el.dataset.id = id;
+            }
+            el.value = text;
+            el.setAttribute("onclick", "Highlighting.hlClick(event, this);");
+            el.style.background = this._colorById(t);
+            el.setAttribute("onmouseup", "Highlighting.onTextMouseUp(event, this);");
+            el.setAttribute("onblur", "Highlighting.onTextBlur(this);");
+            el.setAttribute("onkeyup", "Highlighting.onTextKeyup(this);");
+        }
+
+        document.getElementById("siac-pdf-top").appendChild(el);
+        return el;
+    }
+};
\ No newline at end of file
diff --git a/web/pdf_reader.css b/web/pdf_reader.css
index 74423393..576dc54f 100644
--- a/web/pdf_reader.css
+++ b/web/pdf_reader.css
@@ -1,3 +1,6 @@
+body.siac-reading-modal-displayed #siac-right-side {
+    border-left: 2px solid darkorange;
+}
 #siac-reading-modal {
     display: none;
     position: absolute;
@@ -14,6 +17,7 @@
     border-radius: 5px;
     overflow: hidden;
 }
+
 #siac-reading-modal a:not(.siac-disabled) {
     color: darkorange !important;
 }
@@ -23,6 +27,19 @@
 .siac-clickable-anchor.tab.active {
     text-decoration: underline;
 }
+.siac-pdf-main-color {
+    color: darkorange;
+}
+.siac-rm-main-color-hover:hover {
+    color: darkorange;
+    cursor: pointer;
+}
+.siac-modal-small.dark, #siac-reading-modal .siac-modal-small {
+    border: 3px outset darkorange;
+    background: #2f2f31;
+    color: white;
+}
+
 #siac-cloze-btn {
     margin-bottom: 7px;
     text-align: center;
@@ -34,6 +51,32 @@
     transform: scale(1.03);
     filter: brightness(1.4);
 }
+.siac-btn-small-dropdown-inverted {
+    display: none;
+    position: absolute;
+    color: white;
+    background-color: #2f2f31;
+    width: 200px;
+    padding: 0px 4px 0px 4px;
+    height: 135px;
+    top: -114px;
+    left: -181px;
+    border: 2px outset darkorange; 
+    z-index: 5;
+    transition: all 0.3s;
+}
+.siac-dropdown-inverted-item {
+    margin: 3px 0 2px 0;
+    text-align: left;
+    width: 100%;
+    color: darkorange;
+    text-align: center;
+    height: 16px;
+    font-size: 13px !important;
+}
+.siac-dropdown-inverted-item:hover {
+    filter: brightness(1.4);
+}
 #siac-tt-web-btn {
     color:darkorange;
     cursor:pointer;
@@ -67,7 +110,7 @@
     position: absolute;
     bottom: 35px;
     right: 0; left: 0;
-    z-index: 2;
+    z-index: 4;
     user-select: none;
     background-color: #43a047;
     border-radius: 7px;
@@ -134,6 +177,7 @@
     padding: 4px 6px 4px 6px;
     background: #2f2f31;
     color: white;
+    z-index: 4;
     user-select: none;
 }
 .siac-pdf-mark-lbl > b:hover {
@@ -145,7 +189,7 @@
     top: 4px;
     left: 0px;
     width: 100%;
-    z-index: 2;
+    z-index: 4;
 }
 #siac-pdf-top {
     width: 100%; 
@@ -171,11 +215,20 @@
     display: none;
 }
 #siac-iframe-btn {
-    z-index: 2;
     position: absolute;
     left: 0px;
     top: 50px;
 }
+#siac-schedule-dialog-btn {
+    margin-left: 8px;
+}
+#siac-schedule-dialog-btn > svg {
+    vertical-align: middle;
+    margin-bottom: 2px;
+}
+#siac-schedule-dialog-btn.active > svg {
+    filter: brightness(1.4);
+}
 #siac-close-iframe-btn {
     z-index: 4;
     position: absolute;
@@ -204,7 +257,7 @@
 }
 #siac-quick-sched-btn, #siac-mark-jump-btn, #siac-pdf-search-btn {
     position: absolute;
-    z-index: 2;
+    z-index: 4;
     left: 0;
 }
 #siac-quick-sched-btn {
@@ -277,7 +330,6 @@
     background-color: #2f2f31;
 	color: white;
     padding: 9px;
-    max-width: $pdfTooltipMaxWidth$px;
 	border-radius: 5px;
     border: 4px outset darkorange;
     transition: all 0.5s;
@@ -305,7 +357,6 @@
     width: calc(100% - 18px);
 	padding-right: 8px;
     padding-left: 3px;
-    max-height: $pdfTooltipMaxHeight$px;
 }
 #siac-pdf-tooltip-bottom {
     text-align: center;
@@ -345,6 +396,16 @@
     background: #2f2f31;
     color: beige;
 }
+#siac-reading-modal-bottom-bar {
+    width: 100%; 
+    flex: 0 0 auto; 
+    position: relative; 
+    border-top: 2px solid darkorange; 
+    margin-top: 5px; 
+    padding: 2px 0 0 5px; 
+    overflow: hidden; 
+    user-select: none;
+}
 #siac-pdf-bottom-tab {
     display: inline-block;
     max-height: 89px;
@@ -407,7 +468,7 @@
     top: 7px; right: 25px;
     text-align: center;
     vertical-align: middle;
-    z-index: 3;
+    z-index: 6;
 }
 #siac-reading-modal-top-btns div:hover {
     color: white;
@@ -426,6 +487,15 @@
 #siac-reading-modal-top-btns div:hover span {
     border-color: white;
 }
+#siac-reading-modal-change-theme {
+    position: absolute;
+    right: 0;
+    bottom: 4px;
+    cursor: pointer;    
+}
+#siac-reading-modal-change-theme > a {
+    color:lightgrey !important;
+}
 .siac-queue-picker-icn {
     margin-left: 25px; cursor: pointer; font-weight: bold; color: darkorange;
     display: inline-block;
@@ -476,21 +546,6 @@
     vertical-align: top;
     margin: 40px 5px 0px 5px;
 }
-.siac-queue-sched-btn-tt {
-    font-size: 10px;
-    padding: 1px 3px 1px 3px;
-    border: 2px outset #2496dc;
-    color: lightgrey;
-    user-select: none;
-    cursor: pointer;
-    text-align: center;
-    border-radius: 3px;
-    margin: 5px 0 5px 0;
-}
-.siac-queue-sched-btn-tt:hover {
-    border-color: white;
-    color: white;
-}
 .siac-queue-sched-btn:hover, .siac-queue-sched-btn-hor:hover {
     color: white;
     border-color: white;
@@ -519,9 +574,21 @@
     display: inline-block;
     border: 1px solid transparent;
 }
-.siac-clickable-anchor.siac-disabled,.siac-queue-picker-icn.siac-disabled,.siac-page-mark-link.siac-disabled {
+.siac-clickable-anchor.siac-disabled,.siac-queue-picker-icn.siac-disabled,.siac-page-mark-link.siac-disabled,.siac-queue-sched-btn.siac-disabled {
     color: grey !important;
 }
+.siac-sched-icn.siac-disabled {
+    opacity: 0.3;
+}
+.siac-sched-icn line, .siac-sched-icn ellipse {
+    stroke: darkorange !important;
+}
+.siac-sched-icn.grey line, .siac-sched-icn.grey ellipse {
+    stroke: lightgrey !important;
+}
+.siac-queue-sched-btn.siac-disabled {
+    border-color: grey !important;
+}
 .siac-clickable-anchor:not(.siac-disabled):hover {
     transform: scale(1.02);
     filter: brightness(140%);
@@ -598,7 +665,7 @@
     transform: translate(-50%, -50%);
     padding: 15px;
     width: 300px;
-    border: 4px outset $modalBorderColor$;
+    border: 4px outset darkorange;
     border-radius: 5px;
     display: none;
 }
@@ -624,7 +691,7 @@
     color: white;
 }
 .tox-tinymce-aux {
-    z-index: 2147483638 !important!;
+    z-index: 2147483638 !important;
 }
 .tox .tox-menu {
     z-index: 2147483638 !important;
@@ -634,4 +701,163 @@
 }
 .siac-pdf-mark-lbl {
     font-weight: bold;
+}
+.siac-note-title-only {
+    font-weight: bold;
+    overflow: ellipsis;
+    user-select: none;
+    cursor: pointer;
+}
+body.night_mode .siac-note-title-only {
+    color: lightgrey;
+}
+.siac-note-title-only:hover {
+    filter: brightness(1.4);
+}
+#siac-reading-modal-tabs-left {
+    font-family: 'Open Sans', sans-serif;
+    margin: 10px 5px 0 5px;
+    padding: 10px 15px 5px 0;
+    border-top: 2px solid;
+    margin-top: 10px;
+    border-top: 2px solid darkorange;
+}
+#siac-reading-modal-tabs-left .siac-btn {
+    color: #b2b2a0;
+    border-color: #b2b2a0;
+    margin-left: 4px;
+}
+#siac-reading-modal-tabs-left .siac-btn.active {
+    color: #61c3ff !important;
+    border-color: #2496dc !important;
+}
+.siac-pdf-main-color-border-bottom {
+    border-bottom: 2px solid darkorange;
+}
+.siac-pdf-main-color-border-top {
+    border-top: 2px solid darkorange;
+}
+#siac-left-tab-browse,#siac-left-tab-pdfs {
+    font-family: 'Open Sans', sans-serif;
+    flex: 1 1 auto;
+    width: 100%;
+    box-sizing: border-box;
+    padding: 0 10px 0 10px;
+    overflow: hidden;
+}
+#siac-left-tab-browse input,#siac-left-tab-pdfs input {
+    border-radius: 4px;
+    padding-left: 3px;
+}       
+body.nightMode #siac-left-tab-browse input, body.nightMode #siac-left-tab-pdfs input {
+    background: #333333;
+    color: lightgrey;
+}
+.siac-pdf-color-btn {
+    height: 18px; 
+    width: 18px; 
+    border-radius: 4px;
+    margin-bottom: 4px;
+    border: 2px solid transparent;
+    cursor: pointer;
+}
+.siac-pdf-color-btn.active,.siac-pdf-ul-btn.active {
+    border-color: white !important;
+}
+.siac-hl {
+    position: absolute;
+    mix-blend-mode: multiply !important;
+    z-index: 2;
+    border-radius: 7px;
+}
+.siac-text-hl {
+    mix-blend-mode: normal !important;
+    z-index: 3;
+    border: 3px outset #2496dc;
+    font-family: 'Open Sans', sans-serif;
+    white-space: pre-wrap;
+    outline: none;
+}
+#siac-pdf-top.siac-pdf-night .siac-text-hl {
+    /* color: lightgrey; */
+    background: beige !important;
+    border-color: #44fdb0 !important;
+}
+.siac-pdf-ul-btn {
+    height: 5px; 
+    width: 18px; 
+    border: 2px solid transparent;
+    margin-bottom: 4px;
+    border-radius: 4px;
+    cursor: pointer;
+}
+#siac-reading-modal-top-btns > div {
+    height: 24px;
+    width: 24px;
+    box-sizing: border-box;
+    background-size: 17px 17px;
+    padding: 0 !important;
+    background-repeat: no-repeat;
+    background-position: center;
+}
+#siac-reading-modal-top-bar {
+    min-height: 77px; 
+    width: 100%; 
+    flex: 0 0 77px; 
+    display: flex; 
+    flex-wrap: nowrap; 
+    border-bottom: 2px solid darkorange; 
+    margin-bottom: 5px; 
+    white-space: nowrap;
+    position: relative;
+}
+#siac-rm-greyout {
+    position: absolute;
+    display: none;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    opacity: 0.4;
+    background-color: black;
+    z-index: 5;
+}
+.siac-prio-slider, .siac-prio-slider-small {
+    width: 250px;
+    -webkit-appearance: none; 
+    appearance: none;
+    background: #d3d3d3; 
+    outline: none;
+    opacity: 0.7; 
+    transition: opacity .2s;
+    height: 10px;
+    border-radius: 3px;
+}
+.siac-prio-slider-small {
+    width: 150px;
+    height: 8px;
+}
+.siac-prio-slider:hover, .siac-prio-slider-small:hover {
+    opacity: 1;
+  }
+  .siac-prio-slider::-webkit-slider-thumb, .siac-prio-slider-small::-webkit-slider-thumb {
+    -webkit-appearance: none;
+    appearance: none;
+    width: 15px;
+    height: 20px;
+    background: #2496dc;
+    cursor: pointer;
+    border-radius: 3px;
+  }
+  .siac-prio-slider::-webkit-slider-thumb:hover, .siac-prio-slider-small::-webkit-slider-thumb:hover {
+      filter: brightness(1.4);
+  }
+label input:checked ~ span {
+    font-weight: bold;
+}
+body.siac-left-right-switched #siac-right-side {
+    border-right: 2px solid darkorange;
+}
+#siac-right-side {
+    border-left: 2px solid darkorange;
 }
\ No newline at end of file
diff --git a/web/pdf_reader.js b/web/pdf_reader.js
index 41289044..7ff4d4cd 100644
--- a/web/pdf_reader.js
+++ b/web/pdf_reader.js
@@ -16,13 +16,16 @@
 
 
 
-var pdfImgSel = { canvas : null, context : null, startX : null, endX : null, startY : null, endY : null, cvsOffLeft : null, cvsOffTop : null, mouseIsDown : false, canvasDispl : null};
+var pdfImgSel = { canvas: null, context: null, startX: null, endX: null, startY: null, endY: null, cvsOffLeft: null, cvsOffTop: null, mouseIsDown: false, canvasDispl: null };
 var remainingSeconds = 30 * 60;
 var readingTimer;
+var pdfTextLayerMetaKey = false;
 var pdfDisplayed;
+var pdfDisplayedViewPort;
 var pdfPageRendering = false;
 var pdfDisplayedCurrentPage;
 var pdfDisplayedScale = 2.0;
+var pdfHighDPIWasUsed = false;
 var pdfColorMode = "Day";
 var pageNumPending = null;
 var pagesRead = [];
@@ -31,15 +34,16 @@ var pdfDisplayedMarksTable = null;
 var timestamp;
 var noteLoading = false;
 var pdfLoading = false;
+var modalShown = false;
 var pdfTooltipEnabled = true;
 var iframeIsDisplayed = false;
 var pdfFullscreen = false;
 var pdfBarsHidden = false;
 var pdfSearchOngoing = false;
 var pdfCurrentSearch = {
-    query : null,
-    lastStart : null,
-    lastEnd : null,
+    query: null,
+    lastStart: null,
+    lastEnd: null,
     breakOnNext: null
 };
 
@@ -49,7 +53,7 @@ function pdfImgMouseUp(event) {
         pdfImgSel.mouseIsDown = false;
         drawSquare();
         var pdfC = document.getElementById("siac-pdf-canvas");
-        cropSelection(pdfC, pdfImgSel.startX, pdfImgSel.startY, pdfImgSel.endX - pdfImgSel.startX , pdfImgSel.endY - pdfImgSel.startY, insertImage);
+        cropSelection(pdfC, pdfImgSel.startX, pdfImgSel.startY, pdfImgSel.endX - pdfImgSel.startX, pdfImgSel.endY - pdfImgSel.startY, insertImage);
         $(pdfImgSel.canvas).remove();
         $('#text-layer').show();
     }
@@ -59,11 +63,11 @@ function cropSelection(canvasSrc, offsetX, offsetY, width, height, callback) {
     let tctx = temp.getContext('2d');
     temp.width = width;
     temp.height = height;
-    tctx.drawImage(canvasSrc, offsetX, offsetY, width, height, 0, 0, temp.width, temp.height);
+    tctx.drawImage(canvasSrc, offsetX * window.devicePixelRatio, offsetY * window.devicePixelRatio, width * window.devicePixelRatio, height * window.devicePixelRatio, 0, 0, temp.width, temp.height);
     callback(temp.toDataURL());
 }
 function insertImage(data) {
-   pycmd("siac-add-image 1 " + data.replace("image/png", ""));
+    pycmd("siac-add-image 1 " + data.replace("image/png", ""));
 }
 function pdfImgMouseDown(event) {
     pdfImgSel.canvasDispl = document.getElementById("siac-pdf-canvas").offsetLeft;
@@ -71,7 +75,7 @@ function pdfImgMouseDown(event) {
     pdfImgSel.cvsOffLeft = $(pdfImgSel.canvas).offset().left;
     pdfImgSel.cvsOffTop = $(pdfImgSel.canvas).offset().top;
     pdfImgSel.startX = pdfImgSel.endX = event.clientX - pdfImgSel.cvsOffLeft;
-    pdfImgSel.startY = pdfImgSel.endY = event.clientY- pdfImgSel.cvsOffTop;
+    pdfImgSel.startY = pdfImgSel.endY = event.clientY - pdfImgSel.cvsOffTop;
     drawSquare();
 }
 function initImageSelection() {
@@ -79,18 +83,18 @@ function initImageSelection() {
         $(pdfImgSel.canvas).remove();
         $('#text-layer').show();
         return;
-    } 
+    }
     $('#text-layer').hide();
     pdfImgSel.canvas = document.getElementById("siac-pdf-canvas");
     var lCanvasOverlay = document.createElement("canvas");
     pdfImgSel.canvas.parentNode.insertBefore(lCanvasOverlay, pdfImgSel.canvas.nextSibling);
-    $(lCanvasOverlay).css({"width": pdfImgSel.canvas.width + "px", "height" : pdfImgSel.canvas.height + "px", "top": "0", "left": document.getElementById('text-layer').style.left, "position" : "absolute", "z-index": 999999, "opacity": 0.3, "cursor": "crosshair"});
+    $(lCanvasOverlay).css({ "width": (pdfImgSel.canvas.width / window.devicePixelRatio) + "px", "height": (pdfImgSel.canvas.height / window.devicePixelRatio) + "px", "top": "0", "left": document.getElementById('text-layer').style.left, "position": "absolute", "z-index": 999999, "opacity": 0.3, "cursor": "crosshair" });
     lCanvasOverlay.setAttribute('width', pdfImgSel.canvas.width);
     lCanvasOverlay.setAttribute('height', pdfImgSel.canvas.height);
     pdfImgSel.context = lCanvasOverlay.getContext("2d");
-    lCanvasOverlay.addEventListener("mousedown", function(e) {pdfImgMouseDown(e); }, false);
-    lCanvasOverlay.addEventListener("mouseup", function(e) {pdfImgMouseUp(e); }, false);
-    lCanvasOverlay.addEventListener("mousemove", function(e) {pdfImgMouseXY(e); }, false);
+    lCanvasOverlay.addEventListener("mousedown", function (e) { pdfImgMouseDown(e); }, false);
+    lCanvasOverlay.addEventListener("mouseup", function (e) { pdfImgMouseUp(e); }, false);
+    lCanvasOverlay.addEventListener("mousemove", function (e) { pdfImgMouseXY(e); }, false);
     pdfImgSel.canvas = lCanvasOverlay;
 }
 function pdfImgMouseXY(event) {
@@ -102,7 +106,7 @@ function pdfImgMouseXY(event) {
 }
 function drawSquare() {
     pdfImgSel.context.clearRect(0, 0, pdfImgSel.context.canvas.width, pdfImgSel.context.canvas.height);
-    pdfImgSel.context.fillRect(pdfImgSel.startX, pdfImgSel.startY, Math.abs(pdfImgSel.startX - pdfImgSel.endX), Math.abs(pdfImgSel.startY - pdfImgSel.endY));
+    pdfImgSel.context.fillRect(pdfImgSel.startX * window.devicePixelRatio, pdfImgSel.startY * window.devicePixelRatio, Math.abs(pdfImgSel.startX - pdfImgSel.endX) * window.devicePixelRatio, Math.abs(pdfImgSel.startY - pdfImgSel.endY) * window.devicePixelRatio);
     pdfImgSel.context.fillStyle = "yellow";
     pdfImgSel.context.fill();
 }
@@ -111,33 +115,39 @@ function pdfFitToPage() {
         rerenderPDFPage(pdfDisplayedCurrentPage, false, true);
     }
 }
-function queueRenderPage(num, shouldScrollUp=true, fitToPage=false, isInitial=false, query='') {
+function queueRenderPage(num, shouldScrollUp = true, fitToPage = false, isInitial = false, query = '', fetchHighlights = true) {
     if (pdfPageRendering) {
         pageNumPending = num;
     } else {
-        rerenderPDFPage(num, shouldScrollUp, fitToPage, isInitial, query);
+        rerenderPDFPage(num, shouldScrollUp, fitToPage, isInitial, query, fetchHighlights);
     }
 }
-function rerenderPDFPage(num, shouldScrollUp= true, fitToPage=false, isInitial=false, query='') {
+function rerenderPDFPage(num, shouldScrollUp = true, fitToPage = false, isInitial = false, query = '', fetchHighlights = true) {
     if (!pdfDisplayed || iframeIsDisplayed) {
         return;
     }
     document.getElementById("siac-pdf-tooltip").style.display = "none";
     document.getElementById("siac-pdf-page-lbl").innerHTML = `${pdfDisplayedCurrentPage} / ${pdfDisplayed.numPages}`;
+    Highlighting._removeAllHighlights();
     pdfLoading = true;
     pdfDisplayed.getPage(num)
-       .then(function(page) {
+        .then(function (page) {
             updatePdfDisplayedMarks();
             pdfPageRendering = true;
             var lPage = page;
             var canvas = document.getElementById("siac-pdf-canvas");
-	        if (fitToPage) {
-                var viewport = page.getViewport({scale : 1.0});
+            if (fitToPage) {
+                var viewport = page.getViewport({ scale: 1.0 });
                 pdfDisplayedScale = (canvas.parentNode.clientWidth - 23) / viewport.width;
             }
-            var viewport = page.getViewport({scale : pdfDisplayedScale});
-            canvas.height = viewport.height;
-            canvas.width = viewport.width;
+            var viewport = page.getViewport({ scale: pdfDisplayedScale });
+            canvas.height = viewport.height * window.devicePixelRatio;
+            canvas.width = viewport.width * window.devicePixelRatio;
+            if (window.devicePixelRatio !== 1 || pdfHighDPIWasUsed) {
+                pdfHighDPIWasUsed = true;
+                canvas.style.height = viewport.height + "px";
+                canvas.style.width = viewport.width + "px";
+            }
             if (pdfColorMode !== "Day")
                 canvas.style.display = "none";
             var ctx = canvas.getContext('2d');
@@ -146,8 +156,9 @@ function rerenderPDFPage(num, shouldScrollUp= true, fitToPage=false, isInitial=f
             var renderTask = page.render({
                 canvasContext: ctx,
                 viewport: viewport,
-                continueCallback: function(cont) {
-                    if(timestamp != pageTimestamp) {
+                transform: window.devicePixelRatio !== 1 ? [window.devicePixelRatio, 0, 0, window.devicePixelRatio, 0, 0] : null,
+                continueCallback: function (cont) {
+                    if (timestamp != pageTimestamp) {
                         return;
                     }
                     cont();
@@ -163,75 +174,75 @@ function rerenderPDFPage(num, shouldScrollUp= true, fitToPage=false, isInitial=f
                         invertCanvas(ctx);
                     }
                 }
-                return lPage.getTextContent({ normalizeWhitespace: true, disableCombineTextItems: false});
-            }).then(function(textContent) {
-                   $("#text-layer").css({ height: canvas.height , width: canvas.width, left: canvas.offsetLeft  }).html('');
-                   pdfjsLib.renderTextLayer({
-                       textContent: textContent,
-                       container: document.getElementById("text-layer"),
-                       viewport: viewport,
-                       textDivs: []
-                   });
-                    if (query) {
-                        highlightPDFText(query);
-                    } else {
-                        resetSearch();
-                    }
-                   pdfLoading = false;
-                   if (isInitial || query) {
-                       ungreyoutBottom();
-                   }
-               });
-           if (shouldScrollUp)  {
-               canvas.parentElement.scrollTop = 0;
-           }
-	    if (pagesRead.indexOf(num) !== -1) {
-            document.getElementById('siac-pdf-overlay').style.display = 'block';
-            document.getElementById('siac-pdf-read-btn').innerHTML = '&times; Unread';
-	    } else {
-            document.getElementById('siac-pdf-overlay').style.display = 'none';
-            document.getElementById('siac-pdf-read-btn').innerHTML = '\u2713&nbsp; Read';
-	    }
+                return lPage.getTextContent({ normalizeWhitespace: true, disableCombineTextItems: false });
+            }).then(function (textContent) {
+                $("#text-layer").css({ height: canvas.height / window.devicePixelRatio, width: canvas.width / window.devicePixelRatio, left: canvas.offsetLeft }).html('');
+                pdfjsLib.renderTextLayer({
+                    textContent: textContent,
+                    container: document.getElementById("text-layer"),
+                    viewport: viewport,
+                    textDivs: []
+                });
+                if (query) {
+                    highlightPDFText(query);
+                } else {
+                    resetSearch();
+                }
+                pdfLoading = false;
+                if (isInitial || query) {
+                    ungreyoutBottom();
+                }
+                pdfDisplayedViewPort = viewport;
+                if (fetchHighlights) {
+                    pycmd("siac-pdf-page-loaded " + pdfDisplayedCurrentPage);
+                } else {
+                    displayHighlights();
+                }
+            });
+            if (shouldScrollUp) {
+                canvas.parentElement.scrollTop = 0;
+            }
+            if (pagesRead.indexOf(num) !== -1) {
+                document.getElementById('siac-pdf-overlay').style.display = 'block';
+                document.getElementById('siac-pdf-read-btn').innerHTML = '&times; Unread';
+            } else {
+                document.getElementById('siac-pdf-overlay').style.display = 'none';
+                document.getElementById('siac-pdf-read-btn').innerHTML = '\u2713&nbsp; Read';
+            }
         });
 }
 function invertCanvas(ctx) {
-    var imgData = ctx.getImageData(0,0, ctx.canvas.width, ctx.canvas.height);
+    var imgData = ctx.getImageData(0, 0, ctx.canvas.width, ctx.canvas.height);
     var data = imgData.data;
     var mapped;
-    if (pdfColorMode === "Sand") {
-        for (var i = 0; i < data.length; i += 4) {
-            mapped = pxToSandScheme(data[i], data[i + 1], data[i + 2]) ;
-            data[i]     = mapped.r;  
-            data[i + 1] = mapped.g;
-            data[i + 2] = mapped.b;
-        }
-    } else {
-        for (var i = 0; i < data.length; i += 4) {
-            if (data[i] >= 250 && data[i +1] >= 250 && data[i+2] >= 250) {
-                data[i] = 47; data[i+1] = 47; data[i+2] = 49;
-            } else {
-                data[i]     = 255 - data[i];  
-                data[i + 1] = 255 - data[i + 1];
-                data[i + 2] = 255 - data[i + 2];
-            }
-        }
-    }
-    ctx.putImageData(imgData, 0, 0);  
+    var fn;
+    switch (pdfColorMode) {
+        case "Sand": fn = pxToSandScheme; break;
+        case "Night": fn = pxToNightScheme; break;
+        case "Peach": fn = pxToPeachScheme; break;
+    }
+    for (var i = 0; i < data.length; i += 4) {
+        mapped = fn(data[i], data[i + 1], data[i + 2]);
+        data[i] = mapped.r;
+        data[i + 1] = mapped.g;
+        data[i + 2] = mapped.b;
+    }
+    ctx.putImageData(imgData, 0, 0);
     ctx.canvas.style.display = "inline-block";
 }
 
 function togglePageRead(nid) {
 
-	if (pagesRead.indexOf(pdfDisplayedCurrentPage) === -1) {
+    if (pagesRead.indexOf(pdfDisplayedCurrentPage) === -1) {
         document.getElementById('siac-pdf-overlay').style.display = 'block';
         document.getElementById('siac-pdf-read-btn').innerHTML = '&times; Unread';
-		pycmd("siac-pdf-page-read " + nid + " " + pdfDisplayedCurrentPage + " " + pdfDisplayed.numPages);
-		if (pagesRead.length) { pagesRead.push(pdfDisplayedCurrentPage); } else { pagesRead = [pdfDisplayedCurrentPage]; }
-	} else {
+        pycmd("siac-pdf-page-read " + nid + " " + pdfDisplayedCurrentPage + " " + pdfDisplayed.numPages);
+        if (pagesRead.length) { pagesRead.push(pdfDisplayedCurrentPage); } else { pagesRead = [pdfDisplayedCurrentPage]; }
+    } else {
         document.getElementById('siac-pdf-overlay').style.display = 'none';
         document.getElementById('siac-pdf-read-btn').innerHTML = '\u2713&nbsp; Read';
-		pycmd("siac-pdf-page-unread " + nid + " " + pdfDisplayedCurrentPage + " " + pdfDisplayed.numPages);
-		pagesRead.splice(pagesRead.indexOf(pdfDisplayedCurrentPage), 1);
+        pycmd("siac-pdf-page-unread " + nid + " " + pdfDisplayedCurrentPage + " " + pdfDisplayed.numPages);
+        pagesRead.splice(pagesRead.indexOf(pdfDisplayedCurrentPage), 1);
     }
     updatePdfProgressBar();
 }
@@ -248,10 +259,10 @@ function updatePdfProgressBar() {
     document.getElementById("siac-prog-bar-wr").innerHTML = html;
 }
 function pdfHidePageReadMark() {
-    document.getElementById("siac-pdf-overlay").style.display = "none";document.getElementById("siac-pdf-read-btn").innerHTML = "\u2713&nbsp; Read";
+    document.getElementById("siac-pdf-overlay").style.display = "none"; document.getElementById("siac-pdf-read-btn").innerHTML = "\u2713&nbsp; Read";
 }
 function pdfShowPageReadMark() {
-    document.getElementById("siac-pdf-overlay").style.display = "block";document.getElementById("siac-pdf-read-btn").innerHTML = "&times; Unread";
+    document.getElementById("siac-pdf-overlay").style.display = "block"; document.getElementById("siac-pdf-read-btn").innerHTML = "&times; Unread";
 }
 function pdfJumpToPage(e, inp) {
     if (e.keyCode !== 13) {
@@ -269,7 +280,7 @@ function pdfScaleChange(mode) {
         pdfDisplayedScale -= 0.1;
         pdfDisplayedScale = Math.max(0.1, pdfDisplayedScale);
     }
-    queueRenderPage(pdfDisplayedCurrentPage, shouldScrollUp=false);
+    queueRenderPage(pdfDisplayedCurrentPage, shouldScrollUp = false, fetchHighlights = false);
 }
 
 function pdfPageRight() {
@@ -278,7 +289,7 @@ function pdfPageRight() {
     }
     if (pdfDisplayedCurrentPage < pdfDisplayed.numPages) {
         pdfDisplayedCurrentPage++;
-    queueRenderPage(pdfDisplayedCurrentPage);
+        queueRenderPage(pdfDisplayedCurrentPage);
     }
 }
 function pdfPageLeft() {
@@ -293,15 +304,15 @@ function pdfPageLeft() {
 function markReadUpToCurrent() {
     for (var i = 0; i < pdfDisplayedCurrentPage; i++) {
         if (pagesRead.indexOf(i + 1) === -1) {
-            pagesRead.push(i +1);
+            pagesRead.push(i + 1);
         }
     }
 }
-function saveTextNote(nid, remove=true) {
+function saveTextNote(nid, remove = true) {
     let html = "";
     try {
         html = tinymce.activeEditor.getContent();
-    } catch(e) {
+    } catch (e) {
         pycmd("siac-notification Could not save text note for some reason.");
         return;
     } finally {
@@ -309,24 +320,27 @@ function saveTextNote(nid, remove=true) {
             tinymce.remove();
         }
     }
-    showPDFBottomRightNotification("Note Saved.", 4000);
+    showPDFBottomRightNotification("&nbsp;Note saved.&nbsp;", 4000);
     pycmd("siac-update-note-text " + nid + " " + html);
 }
 function destroyTinyMCE() {
     if (tinymce) {
         try {
             tinymce.remove();
-        } catch(e) {}
+        } catch (e) { }
     }
 }
 
 function toggleQueue() {
+    if (noteLoading || pdfLoading || modalShown) {
+        return;
+    }
     let $wr = $("#siac-queue-sched-wrapper");
     if ($wr.hasClass('active')) {
-        $wr.css( { "max-width" : "0px" , "overflow": "hidden"});
+        $wr.css({ "max-width": "0px", "overflow": "hidden" });
         $('.siac-queue-sched-btn:first').addClass("active");
     } else {
-        $wr.css({ "max-width": "500px", "overflow": "visible"});
+        $wr.css({ "max-width": "500px", "overflow": "visible" });
         $('.siac-queue-sched-btn:first').removeClass("active");
     }
     $wr.toggleClass('active');
@@ -339,13 +353,12 @@ function queueSchedBtnClicked(btn_el) {
 }
 function afterRemovedFromQueue() {
     toggleQueue();
-    $('.siac-queue-sched-btn').removeClass("active");
     $('.siac-queue-sched-btn').first().addClass("active").html('Unqueued');
 }
 function _startTimer(elementToUpdateId) {
-    if (readingTimer) {clearInterval(readingTimer); }
-    readingTimer = setInterval(function() {
-        remainingSeconds --;
+    if (readingTimer) { clearInterval(readingTimer); }
+    readingTimer = setInterval(function () {
+        remainingSeconds--;
         document.getElementById(elementToUpdateId).innerHTML = Math.floor(remainingSeconds / 60) + " : " + (remainingSeconds % 60 < 10 ? "0" + remainingSeconds % 60 : remainingSeconds % 60);
         if (remainingSeconds <= 0) {
             clearInterval(readingTimer);
@@ -387,34 +400,34 @@ function onPDFSearchBtnClicked(elem) {
     }
 }
 function onPDFSearchInput(value, event) {
-    if (event.keyCode === 13 && value && value.length) {
+    if (event.keyCode === 13 && value && value.trim().length) {
         showPDFBottomRightNotification("Searching ...");
-        if (value.toLowerCase() !== pdfCurrentSearch.query)  {
+        if (value.toLowerCase() !== pdfCurrentSearch.query) {
             pdfCurrentSearch.lastStart = null;
             pdfCurrentSearch.lastEnd = null;
             pdfCurrentSearch.query = value.toLowerCase();
         }
-        setTimeout(function() {
+        setTimeout(function () {
             nextPDFSearchResult();
         }, 10);
     }
 }
 
-async function getContents(s=1, n=10000) {
-    var countPromises = []; 
+async function getContents(s = 1, n = 10000) {
+    var countPromises = [];
     for (var j = s; j <= pdfDisplayed.numPages && j <= s + n; j++) {
         var page = pdfDisplayed.getPage(j);
-            countPromises.push(page.then(function(page) { 
+        countPromises.push(page.then(function (page) {
             var n = page.pageIndex + 1;
             var txt = "";
             var textContent = page.getTextContent();
-            return textContent.then(function(page){ 
-            for(var i=0;i<page.items.length;i++){
-                txt += " "+ page.items[i].str;
-            }
-               return { page: n, text: txt.toLowerCase()}; 
-           });
-       }));
+            return textContent.then(function (page) {
+                for (var i = 0; i < page.items.length; i++) {
+                    txt += " " + page.items[i].str;
+                }
+                return { page: n, text: txt.toLowerCase() };
+            });
+        }));
     }
     return Promise.all(countPromises).then(function (counts) {
         return counts;
@@ -424,7 +437,7 @@ function resetSearch() {
     pdfCurrentSearch.lastStart = null;
     pdfCurrentSearch.lastEnd = null;
 }
-async function nextPDFSearchResult(dir="right") {
+async function nextPDFSearchResult(dir = "right") {
     if (pdfSearchOngoing) {
         return;
     }
@@ -432,7 +445,7 @@ async function nextPDFSearchResult(dir="right") {
     if (pdfCurrentSearch.query === null) {
         pdfCurrentSearch.query = value;
     } else {
-        if (value !== pdfCurrentSearch.query || (pdfDisplayedCurrentPage !== pdfCurrentSearch.lastStart && pdfCurrentSearch.lastStart === pdfCurrentSearch.lastEnd))  {
+        if (value !== pdfCurrentSearch.query || (pdfDisplayedCurrentPage !== pdfCurrentSearch.lastStart && pdfCurrentSearch.lastStart === pdfCurrentSearch.lastEnd)) {
             pdfCurrentSearch.lastStart = null;
             pdfCurrentSearch.lastEnd = null;
             pdfCurrentSearch.query = value;
@@ -444,7 +457,7 @@ async function nextPDFSearchResult(dir="right") {
     pdfCurrentSearch.breakOnNext = false;
     pdfSearchOngoing = true;
     greyoutBottom();
-    
+
     var shouldBreak = false;
     var found = false;
     var spl = pdfCurrentSearch.query.toLowerCase().split(" ");
@@ -470,7 +483,7 @@ async function nextPDFSearchResult(dir="right") {
                         showPDFBottomRightNotification("Text found on page " + pdfPagesContents[n].page, true);
                     }
                     pdfDisplayedCurrentPage = pdfPagesContents[n].page;
-                    queueRenderPage(pdfDisplayedCurrentPage, true, false, false, pdfCurrentSearch.query); 
+                    queueRenderPage(pdfDisplayedCurrentPage, true, false, false, pdfCurrentSearch.query);
                     pdfCurrentSearch.lastStart = pdfDisplayedCurrentPage;
                     pdfCurrentSearch.lastEnd = pdfDisplayedCurrentPage;
                     shouldBreak = true;
@@ -479,16 +492,16 @@ async function nextPDFSearchResult(dir="right") {
                 }
             }
         }
-        if (it >  Math.round(pdfDisplayed.numPages / 25.0) + 2) {
+        if (it > Math.round(pdfDisplayed.numPages / 25.0) + 2) {
             showPDFBottomRightNotification("Search aborted, took too long.", true);
             break;
         }
     } while (!shouldBreak);
-    
+
     if (!found) {
         showPDFBottomRightNotification("Text was not found.", true);
         ungreyoutBottom();
-    } 
+    }
     pdfSearchOngoing = false;
 
 }
@@ -503,44 +516,44 @@ function getNextPagesToSearchIn(dir) {
     let ivl = 25;
     let s = -1;
     let n = ivl;
-  
+
     if (dir === "left") {
         // button or enter just pressed
-        if  (lastStart === null) {
+        if (lastStart === null) {
             s = Math.max(pdfDisplayedCurrentPage - ivl, 1);
             n = Math.min(ivl, pdfDisplayedCurrentPage - s);
-        }  
+        }
         // last search block was up to first page, so start at the end
         else if (lastStart === 1) {
             s = Math.max(pdfDisplayed.numPages - ivl, 1);
-        } 
+        }
         // page rendered with highlighted search results 
         else if (lastEnd === lastStart && lastEnd !== 1 && pdfDisplayed.numPages > 1) {
-            s =  Math.max(lastStart - ivl - 1, 1);
+            s = Math.max(lastStart - ivl - 1, 1);
             if (s === 1)
                 n = Math.max(0, Math.min(ivl, pdfDisplayedCurrentPage - 3));
-            else 
+            else
                 n = Math.min(ivl, pdfDisplayedCurrentPage - s - 1);
         }
         // else
         else {
             s = Math.max(lastStart - ivl, 1);
             if (s === 1)
-                n = Math.max(0, lastStart- 2);
+                n = Math.max(0, lastStart - 2);
         }
         // went from end of pdf to search start again, so stop
         if (lastStart !== null && lastStart > pdfDisplayedCurrentPage && s <= pdfDisplayedCurrentPage) {
             s = pdfDisplayedCurrentPage;
             pdfCurrentSearch.breakOnNext = true;
-        } 
+        }
         // 1 page, so range to look at should be 1 and stop after
         else if (pdfDisplayed.numPages === 1) {
             n = 0;
             pdfCurrentSearch.breakOnNext = true;
         }
-      
+
     } else {
-        if  (lastStart === null) {
+        if (lastStart === null) {
             s = pdfDisplayedCurrentPage;
             n = Math.min(pdfDisplayed.numPages - s, ivl);
         }
@@ -554,34 +567,34 @@ function getNextPagesToSearchIn(dir) {
         if (lastEnd !== null && lastEnd < pdfDisplayedCurrentPage && s + ivl >= pdfDisplayedCurrentPage) {
             n = pdfDisplayedCurrentPage - s;
             pdfCurrentSearch.breakOnNext = true;
-        } else if (lastEnd !== null && lastEnd === pdfDisplayed.numPages && 1 + ivl >=pdfDisplayedCurrentPage) {
+        } else if (lastEnd !== null && lastEnd === pdfDisplayed.numPages && 1 + ivl >= pdfDisplayedCurrentPage) {
             n = pdfDisplayedCurrentPage - s;
             pdfCurrentSearch.breakOnNext = true;
         }
-        
+
         else if (pdfDisplayed.numPages === 1) {
             n = 0;
             pdfCurrentSearch.breakOnNext = true;
         }
-    } 
+    }
     if (s === 1 && pdfDisplayed.numPages <= n) {
         pdfCurrentSearch.breakOnNext = true;
     }
     pdfCurrentSearch.lastStart = s;
     pdfCurrentSearch.lastEnd = Math.min(pdfDisplayed.numPages, s + n);
     // showPDFBottomRightNotification(`Searching pages ${s} - ${Math.min(s + n, pdfDisplayed.numPages)}`);
-    return {s , n};
+    return { s, n };
 }
-function highlightPDFText(query, n=0) {
+function highlightPDFText(query, n = 0) {
     var tlEls = document.getElementById('text-layer').querySelectorAll('span');
     if (tlEls.length === 0) {
-        if (n < 3) 
-            setTimeout(function() {highlightPDFText(query, n+1);}, 200);
+        if (n < 3)
+            setTimeout(function () { highlightPDFText(query, n + 1); }, 200);
         return;
     }
     let spl = query.toLowerCase().split(" ");
     for (var i = 0; i < spl.length; i++) {
-        for (var t = 0; t < tlEls.length; t++){
+        for (var t = 0; t < tlEls.length; t++) {
             if (tlEls[t].innerHTML.toLowerCase().indexOf(spl[i]) !== -1) {
                 var regEx = new RegExp(escapeRegExp(spl[i]), "ig");
                 tlEls[t].innerHTML = tlEls[t].innerHTML.replace(regEx, "<span class='tl-highlight'>$&</span>");
@@ -591,14 +604,14 @@ function highlightPDFText(query, n=0) {
     document.getElementById("siac-pdf-top").scrollTop = Math.max(0, $('#text-layer .tl-highlight').first()[0].parentElement.offsetTop - 50);
 }
 function escapeRegExp(string) {
-    return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); 
-  }
+    return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
 function resetTimer(elem) {
     clearInterval(readingTimer);
     readingTimer = null;
     $('.siac-timer-btn').removeClass('active');
     $(elem).addClass('active');
-    remainingSeconds =  Number(elem.innerHTML) * 60;
+    remainingSeconds = Number(elem.innerHTML) * 60;
     document.getElementById("siac-reading-modal-timer").innerHTML = Math.floor(remainingSeconds / 60) + " : " + (remainingSeconds % 60 < 10 ? "0" + remainingSeconds % 60 : remainingSeconds % 60);
     $('#siac-timer-play-btn').addClass("inactive").html("Start");
 }
@@ -610,15 +623,13 @@ function startTimer(mins) {
         }
     });
 }
-function pdfMouseWheel(event)  {
-    if(!event.ctrlKey) { return; }
-    if (event.deltaY < 0)
-    {
+function pdfMouseWheel(event) {
+    if (!event.ctrlKey) { return; }
+    if (event.deltaY < 0) {
         pdfScaleChange("up");
     }
-    else if (event.deltaY > 0)
-    {
-       pdfScaleChange("down");
+    else if (event.deltaY > 0) {
+        pdfScaleChange("down");
     }
 }
 function showPDFBottomRightNotification(html, fadeout = false) {
@@ -636,53 +647,95 @@ function removePDFBottomRightNotification() {
 }
 function swapReadingModal() {
     let modal = document.getElementById("siac-reading-modal");
-    if (modal.parentNode.id === "siac-right-side")  {
-	document.getElementById("leftSide").appendChild(modal);
+    if (modal.parentNode.id === "siac-right-side") {
+        document.getElementById("leftSide").appendChild(modal);
     } else {
-	document.getElementById("siac-right-side").appendChild(modal);
+        document.getElementById("siac-right-side").appendChild(modal);
     }
 }
 function togglePDFNightMode(elem) {
     if (pdfColorMode === "Day") {
         pdfColorMode = "Night";
-
     } else if (pdfColorMode === "Night") {
         pdfColorMode = "Sand";
+    } else if (pdfColorMode === "Sand") {
+        pdfColorMode = "Peach";
     } else {
         pdfColorMode = "Day";
     }
     elem.innerHTML = pdfColorMode;
     rerenderPDFPage(pdfDisplayedCurrentPage, false);
+    $('#siac-pdf-top').removeClass("siac-pdf-sand siac-pdf-night siac-pdf-peach siac-pdf-day").addClass("siac-pdf-" + pdfColorMode.toLowerCase());
 }
-function pdfKeyup() {
-	if (pdfTooltipEnabled && window.getSelection().toString().length) {
+
+
+/**
+ *  executed after keyup in the pdf pane
+ */
+function pdfKeyup(e) {
+    // selected text, no ctrl key -> show tooltip if enabled 
+    if (!e.ctrlKey && !e.metaKey && pdfTooltipEnabled && windowHasSelection()) {
         $('#text-layer .tl-highlight').remove();
-		let s = window.getSelection();
+        let s = window.getSelection();
         let r = s.getRangeAt(0);
         let text = s.toString();
         if (text === " " || text.length > 500) { return; }
+        // spans in textlayer have a max height to prevent selection jumping, but here we have to temporarily 
+        // disable it, to get the actual bounding client rect
+        $('#text-layer > span').css("height", "auto");
         let nodesInSel = nodesInSelection(r);
         let sentences = getSentencesAroundSelection(r, nodesInSel, text);
         if (nodesInSel.length > 1) {
             text = joinTextLayerNodeTexts(nodesInSel, text);
         }
-		let rect = r.getBoundingClientRect();
-		let prect = document.getElementById("siac-reading-modal").getBoundingClientRect();
+        let rect = r.getBoundingClientRect();
+        let prect = document.getElementById("siac-reading-modal").getBoundingClientRect();
         document.getElementById('siac-pdf-tooltip-results-area').innerHTML = 'Searching...';
         document.getElementById('siac-pdf-tooltip-searchbar').value = "";
-        let left =  rect.left - prect.left;
+        let left = rect.left - prect.left;
         if (prect.width - left < 250) {
             left -= 200;
         }
-        $('#siac-pdf-tooltip').css({'top': (rect.top - prect.top + rect.height) + "px", 'left':left + "px" }).show();
+        $('#siac-pdf-tooltip').css({ 'top': (rect.top - prect.top + rect.height) + "px", 'left': left + "px" }).show();
         pycmd("siac-pdf-selection " + text);
         $('#siac-pdf-tooltip').data("sentences", sentences);
         $('#siac-pdf-tooltip').data("selection", text);
-	}
+        // limit height again to prevent selection jumping
+        $('#text-layer > span').css("height", "200px");
+    } else if ((e.ctrlKey || e.metaKey) && Highlighting.colorSelected.id > 0 && windowHasSelection()) {
+        // selected text, ctrl key pressed -> highlight 
+        Highlighting.highlight();
+        pdfTextLayerMetaKey = false;
+    } else if ((e.ctrlKey || e.metaKey) && Highlighting.colorSelected.id === 0 && !windowHasSelection()) {
+        // clicked with ctrl, text insert btn is active -> insert text area at coordinates
+        Highlighting.insertText(e);
+    }
+
+
 }
+
+
+
+// clicked on the text layer, should
+// 1. hide the tooltip if present
+// 2. trigger the click on a highlight if it is below the textlayer at the given coords
+function textlayerClicked(event, el) {
+    if (!event.ctrlKey && !windowHasSelection()) {
+        $("#siac-pdf-tooltip").hide();
+        if (el.style.pointerEvents !== "none") {
+            el.style.pointerEvents = "none";
+            let e = $.Event("click");
+            e.ctrlKey = true;
+            $(document.elementFromPoint(event.clientX, event.clientY)).trigger(e);
+            el.style.pointerEvents = "auto";
+        }
+    }
+}
+
+
 function joinTextLayerNodeTexts(nodes, text) {
     let total = "";
-    for (var i = 0; i <nodes.length; i++) {
+    for (var i = 0; i < nodes.length; i++) {
         if (nodes[i].innerHTML === text) {
             return text;
         }
@@ -731,7 +784,7 @@ function getSentencesAroundSelection(range, nodesInSel, selection) {
         text = nodesInSel[0].innerHTML;
         height = nodesInSel[0].clientHeight;
     } else {
-        for (var i = 0; i< nodesInSel.length; i++) {
+        for (var i = 0; i < nodesInSel.length; i++) {
             text += nodesInSel[i].innerHTML + " ";
             height = nodesInSel[i].clientHeight;
         }
@@ -742,19 +795,19 @@ function getSentencesAroundSelection(range, nodesInSel, selection) {
     if (!currentNode) {
         extracted.push(text);
     }
-    while(currentNode) {
+    while (currentNode) {
         if (Math.abs(currentNode.clientHeight - height) > 3 || lastOffsetTop - currentNode.offsetTop > height * 1.5) {
             extracted.push(text);
             break;
-        } 
+        }
         lastOffsetTop = currentNode.offsetTop;
-        text = (currentNode.innerHTML + " " + text).replace(/  +/g, " ").trim();        
+        text = (currentNode.innerHTML + " " + text).replace(/  +/g, " ").trim();
         let ext = extractPrev(text, extracted, selection);
         extracted = ext[1];
         if (ext[0]) {
             break;
         }
-        currentNode = currentNode.previousSibling; 
+        currentNode = currentNode.previousSibling;
         if (!currentNode) {
             extracted.push(text);
             break;
@@ -767,14 +820,14 @@ function getSentencesAroundSelection(range, nodesInSel, selection) {
         if (!currentNode) {
             extractedFinal.push(text);
         }
-        while(currentNode) {
-            text = (text + " " + currentNode.innerHTML).replace(/  +/g, " ").trim();        
+        while (currentNode) {
+            text = (text + " " + currentNode.innerHTML).replace(/  +/g, " ").trim();
             let ext = extractNext(text, extractedFinal, selection);
             extractedFinal = ext[1];
             if (ext[0]) {
                 break;
             }
-            currentNode = currentNode.nextSibling; 
+            currentNode = currentNode.nextSibling;
             if (!currentNode) {
                 extractedFinal.push(text);
                 break;
@@ -791,9 +844,9 @@ function sendClozes() {
 }
 function generateClozes() {
     let cmd = "";
-    $('.siac-cl-row').each(function(i, elem) {
-        if($(elem.children[1].children[0]).is(":checked")) {
-           cmd += "$$$" + $(elem.children[0].children[0]).text();
+    $('.siac-cl-row').each(function (i, elem) {
+        if ($(elem.children[1].children[0]).is(":checked")) {
+            cmd += "$$$" + $(elem.children[0].children[0]).text();
         }
     });
     let pdfPath = $('#siac-pdf-top').data("pdfpath");
@@ -803,9 +856,9 @@ function generateClozes() {
 }
 
 function extractPrev(text, extracted, selection) {
-    text = text.substring(0, text.lastIndexOf(selection)+ selection.length) + text.substring(text.lastIndexOf(selection) + selection.length).replace(/\./g, "$DOT$");
+    text = text.substring(0, text.lastIndexOf(selection) + selection.length) + text.substring(text.lastIndexOf(selection) + selection.length).replace(/\./g, "$DOT$");
     let matches = text.match(/.*[^.\d][.!?]"? (.+)/);
-    if (!matches || matches[1].indexOf(selection) === -1 ) {
+    if (!matches || matches[1].indexOf(selection) === -1) {
         return [false, extracted];
     }
     let ext = matches[1].replace(/\$DOT\$/g, ".");
@@ -828,39 +881,53 @@ function extractNext(text, extracted, selection) {
     }
     return [true, extracted];
 }
-function pxToSandScheme(red, green, blue){
-    if (red > 210 && green > 210 && blue > 210) {return {r:241,g:206,b:147}; }
-    if (red <  35 && green < 35 && blue < 35) {return {r:0,g:0,b:0}; }
-    var p = [{r:241,g:206,b:147},{r:0,g:0,b:0},{r:146,g:146,b:146},{r:64,g:64,b:64},{r:129,g:125,b:113},{r:204,g:0,b:0},{r:0,g:102,b:151}]
-    var color, diffR, diffG, diffB, diff, chosen;
-    var distance= 25000;
-    for (var i=0; i < p.length; i++) {
-        color = p[i];
-        diffR = (color.r - red);
-        diffG = (color.g - green);
-        diffB = (color.b - blue);
-        diff = Math.sqrt(diffR * diffR + diffG * diffG + diffB * diffB);
-        if( diff < distance) { 
-            distance = diff; 
-            chosen = p[i]; 
-        }
+function pxToSandScheme(red, green, blue) {
+    if (red > 240 && green > 240 && blue > 240) { return { r: 241, g: 206, b: 147 }; }
+    if (Math.abs(red - green) < 15 && Math.abs(red - blue) < 15) {
+        red = Math.max(0, red - 40);
+        green = Math.max(0, green - 40);
+        blue = Math.max(0, blue - 40);
+        return { r: red, g: green, b: blue };
+    }
+    if (red < 100 && green < 100 && blue < 100) { return { r: 0, g: 0, b: 0 }; }
+    return { r: red, g: green, b: blue };
+}
+function pxToPeachScheme(red, green, blue) {
+    if (red > 240 && green > 240 && blue > 240) { return { r: 237, g: 209, b: 176 }; }
+    if (Math.abs(red - green) < 15 && Math.abs(red - blue) < 15) {
+        red = Math.max(0, red - 40);
+        green = Math.max(0, green - 40);
+        blue = Math.max(0, blue - 40);
+        return { r: red, g: green, b: blue };
+    }
+    if (red < 100 && green < 100 && blue < 100) { return { r: 0, g: 0, b: 0 }; }
+    return { r: red, g: green, b: blue };
+}
+function pxToNightScheme(red, green, blue) {
+    if (red >= 160 && green >= 160 && blue >= 160) {
+        red = 17; green = 36; blue = 53;
+    } else {
+        red = red ^ 255;
+        green = green ^ 255;
+        blue = blue ^ 255;
     }
-    return chosen;
+    return { r: red, g: green, b: blue };
 }
+
 function updatePdfDisplayedMarks() {
     if (pdfDisplayedMarks == null) {
         return;
     }
     let html = "";
-    $('.siac-mark-btn-inner').removeClass('active'); 
+    $('.siac-mark-btn-inner').removeClass('active');
     if (pdfDisplayedCurrentPage in pdfDisplayedMarks) {
         for (var i = 0; i < pdfDisplayedMarks[pdfDisplayedCurrentPage].length; i++) {
-            switch(pdfDisplayedMarks[pdfDisplayedCurrentPage][i]) {
+            switch (pdfDisplayedMarks[pdfDisplayedCurrentPage][i]) {
                 case 1: html += "<div class='siac-pdf-mark-lbl'>Revisit &nbsp;<b onclick='$(\".siac-mark-btn-inner-1\").trigger(\"click\");'>&times</b></div>"; $('.siac-mark-btn-inner-1').first().addClass('active'); break;
-                case 2: html += "<div class='siac-pdf-mark-lbl'>Hard &nbsp;<b onclick='$(\".siac-mark-btn-inner-2\").trigger(\"click\");'>&times</b></div>";  $('.siac-mark-btn-inner-2').first().addClass('active'); break;
-                case 3: html += "<div class='siac-pdf-mark-lbl'>More Info &nbsp;<b onclick='$(\".siac-mark-btn-inner-3\").trigger(\"click\");'>&times</b></div>";  $('.siac-mark-btn-inner-3').first().addClass('active'); break;
-                case 4: html += "<div class='siac-pdf-mark-lbl'>More Cards &nbsp;<b onclick='$(\".siac-mark-btn-inner-4\").trigger(\"click\");'>&times</b></div>"; $('.siac-mark-btn-inner-4').first().addClass('active');  break;
-                case 5: html += "<div class='siac-pdf-mark-lbl'>Bookmark &nbsp;<b onclick='$(\".siac-mark-btn-inner-5\").trigger(\"click\");'>&times</b></div>";  $('.siac-mark-btn-inner-5').first().addClass('active'); break;
+                case 2: html += "<div class='siac-pdf-mark-lbl'>Hard &nbsp;<b onclick='$(\".siac-mark-btn-inner-2\").trigger(\"click\");'>&times</b></div>"; $('.siac-mark-btn-inner-2').first().addClass('active'); break;
+                case 3: html += "<div class='siac-pdf-mark-lbl'>More Info &nbsp;<b onclick='$(\".siac-mark-btn-inner-3\").trigger(\"click\");'>&times</b></div>"; $('.siac-mark-btn-inner-3').first().addClass('active'); break;
+                case 4: html += "<div class='siac-pdf-mark-lbl'>More Cards &nbsp;<b onclick='$(\".siac-mark-btn-inner-4\").trigger(\"click\");'>&times</b></div>"; $('.siac-mark-btn-inner-4').first().addClass('active'); break;
+                case 5: html += "<div class='siac-pdf-mark-lbl'>Bookmark &nbsp;<b onclick='$(\".siac-mark-btn-inner-5\").trigger(\"click\");'>&times</b></div>"; $('.siac-mark-btn-inner-5').first().addClass('active'); break;
             }
         }
     }
@@ -868,27 +935,28 @@ function updatePdfDisplayedMarks() {
     let w2 = document.getElementById("siac-queue-actions").offsetWidth;
     let w = document.getElementById("siac-reading-modal-bottom-bar").clientWidth - w1 - w2 - 100;
     var tableHtml = "";
-    Object.keys(pdfDisplayedMarksTable).forEach(function(key) {
+    Object.keys(pdfDisplayedMarksTable).forEach(function (key) {
         let name = "";
-        switch(key) {
+        switch (key) {
             case "1": name = "Revisit"; break;
             case "2": name = "Hard"; break;
             case "3": name = "More Info"; break;
             case "4": name = "More Cards"; break;
             case "5": name = "Bookmark"; break;
-        } 
+        }
         let pages = "";
-     
+
         for (var i = 0; i < pdfDisplayedMarksTable[key].length; i++) {
             pages += "<span class='siac-page-mark-link'>" + pdfDisplayedMarksTable[key][i] + "</span>, ";
         }
-        pages = pages.length > 0 ? pages.substring(0, pages.length -2) : pages;
+        pages = pages.length > 0 ? pages.substring(0, pages.length - 2) : pages;
         tableHtml += `<tr style='color: grey;'><td><b>${name}</b></td><td>${pages}</td></tr>`;
     });
     if (tableHtml.length) {
         tableHtml = `<table style='user-select: none; table-layout: fixed; max-width: ${w}px;'>` + tableHtml + "</table>";
     }
-    document.getElementById("siac-pdf-overlay-top-lbl-wrap").innerHTML = html;
+    if (document.getElementById("siac-pdf-overlay-top-lbl-wrap"))
+        document.getElementById("siac-pdf-overlay-top-lbl-wrap").innerHTML = html;
     if (document.getElementById("siac-marks-display")) { document.getElementById("siac-marks-display").innerHTML = tableHtml; }
     onMarkBtnClicked(document.getElementById("siac-mark-jump-btn"));
 
@@ -909,7 +977,7 @@ function pdfViewerKeyup(event) {
         pdfPageRight();
     } else if (event.ctrlKey && event.keyCode === 74) {
         pdfPageRight();
-    } else if (event.ctrlKey && (event.keyCode === 37 ||event.keyCode === 75)) {
+    } else if (event.ctrlKey && (event.keyCode === 37 || event.keyCode === 75)) {
         pdfPageLeft();
     } else if (event.keyCode === 122) {
         toggleReadingModalBars();
@@ -925,7 +993,7 @@ function pdfTooltipClozeKeyup(event) {
             let c_text = document.getElementById("siac-pdf-tooltip-results-area").innerHTML;
             for (var i = 1; i < 20; i++) {
                 if (c_text.indexOf("{{c" + i + "::") === -1) {
-                    c_text = c_text.split(text).join("<span style='color: lightblue;'>{{c"+ i + "::" + text + "}}</span>");
+                    c_text = c_text.split(text).join("<span style='color: lightblue;'>{{c" + i + "::" + text + "}}</span>");
                     document.getElementById("siac-pdf-tooltip-results-area").innerHTML = c_text;
                     break;
                 }
@@ -970,19 +1038,19 @@ function jumpToNextMark() {
     queueRenderPage(pdfDisplayedCurrentPage, true, false, false);
 }
 function bringPDFIntoView() {
-    if ($('#siac-right-side').hasClass("addon-hidden") ||$('#switchBtn').is(":visible")) {
+    if ($('#siac-right-side').hasClass("addon-hidden") || $('#switchBtn').is(":visible")) {
         toggleAddon();
     }
 }
 function beforeNoteQuickOpen() {
-    if (noteLoading || pdfLoading) {
+    if (noteLoading || pdfLoading || modalShown) {
         return false;
     }
     if (pdfDisplayed) {
         noteLoading = true;
-        greyoutBottom(); 
-        destroyPDF(); 
-    } 
+        greyoutBottom();
+        destroyPDF();
+    }
     bringPDFIntoView();
     return true;
 }
@@ -1000,46 +1068,48 @@ function destroyPDF() {
     pdfDisplayed = null;
 }
 function pdfUrlSearch(input) {
-    if (!input.length) {return; }
+    if (!input.length) { return; }
     let url = "";
     $("#siac-iframe-btn tr").each(function () {
         if ($(this.children[1].children[0]).is(":checked")) {
             url = $(this.children[1].children[0]).data("url");
         }
     });
-    pycmd('siac-url-srch $$$' + input + '$$$' + url); 
+    pycmd('siac-url-srch $$$' + input + '$$$' + url);
     $('#siac-iframe-btn').removeClass('expanded');
 }
 function showQueueInfobox(elem, nid) {
-    if (pdfLoading || noteLoading) {return;}
+    if (pdfLoading || noteLoading || modalShown) { return; }
     pycmd('siac-queue-info ' + nid);
     document.documentElement.style.setProperty('--ttop', (elem.offsetTop) + 'px');
-    if (pdfLoading || noteLoading) {return;}
-   
+    if (pdfLoading || noteLoading || modalShown) { return; }
+
 }
 function leaveQueueItem(elem) {
-    window.setTimeout(function() {
+    window.setTimeout(function () {
         if (!$('#siac-queue-infobox').is(":hover") && !$('#siac-queue-readings-list .siac-clickable-anchor:hover').length) {
-           hideQueueInfobox();
+            hideQueueInfobox();
         }
     }, 400);
 }
 function hideQueueInfobox() {
-    document.getElementById("siac-queue-infobox").style.display = "none";
-    document.getElementById("siac-pdf-bottom-tabs").style.visibility = "visible";
+    if (document.getElementById("siac-queue-infobox")) {
+        document.getElementById("siac-queue-infobox").style.display = "none";
+        document.getElementById("siac-pdf-bottom-tabs").style.visibility = "visible";
+    }
 }
 function greyoutBottom() {
-    $('#siac-reading-modal-bottom-bar .siac-clickable-anchor,#siac-reading-modal-bottom-bar .siac-queue-picker-icn,#siac-reading-modal-bottom-bar .blue-hover, .siac-page-mark-link').addClass("siac-disabled");
+    $('#siac-reading-modal-bottom-bar .siac-clickable-anchor,.siac-queue-sched-btn,#siac-reading-modal-bottom-bar .siac-queue-picker-icn,#siac-reading-modal-bottom-bar .blue-hover, .siac-page-mark-link,.siac-sched-icn').addClass("siac-disabled");
 }
 function ungreyoutBottom() {
-    $('#siac-reading-modal-bottom-bar .siac-clickable-anchor,#siac-reading-modal-bottom-bar .siac-queue-picker-icn, #siac-reading-modal-bottom-bar .blue-hover, .siac-page-mark-link').removeClass("siac-disabled");
+    $('#siac-reading-modal-bottom-bar .siac-clickable-anchor,.siac-queue-sched-btn,#siac-reading-modal-bottom-bar .siac-queue-picker-icn, #siac-reading-modal-bottom-bar .blue-hover, .siac-page-mark-link,.siac-sched-icn').removeClass("siac-disabled");
 }
 function unhideQueue(nid) {
-    if(pdfLoading||noteLoading){return;}
+    if (pdfLoading || noteLoading || modalShown) { return; }
     pycmd("siac-unhide-pdf-queue " + nid);
 }
 function hideQueue(nid) {
-    if(pdfLoading||noteLoading){return;}
+    if (pdfLoading || noteLoading || modalShown) { return; }
     pycmd("siac-hide-pdf-queue " + nid);
 }
 function toggleReadingModalBars() {
@@ -1060,13 +1130,13 @@ function toggleReadingModalFullscreen() {
         $(document.body).removeClass("siac-fullscreen-show-fields").addClass("siac-fullscreen-show-right");
         if (pdfDisplayed) {
             pdfFitToPage();
-        } 
+        }
         pdfBarsHidden = false;
         toggleReadingModalBars();
         pycmd("siac-notification Press toggle shortcut (default Ctrl+F) to switch.");
 
     } else {
-        
+
         $(document.body).removeClass("siac-fullscreen-show-fields").removeClass("siac-fullscreen-show-right");
         if ($('#switchBtn').is(":visible")) {
             $('#outerWr').addClass("onesided");
@@ -1074,7 +1144,7 @@ function toggleReadingModalFullscreen() {
         onWindowResize();
         if (pdfDisplayed) {
             pdfFitToPage();
-        } 
+        }
     }
 
 }
@@ -1083,20 +1153,122 @@ function activateReadingModalFullscreen() {
     pdfBarsHidden = true;
     toggleReadingModalFullscreen();
 }
-function onReadingModalClose(nid) {
+function onReadingModalClose() {
     if (pdfLoading) {
         return;
     }
-    $(document.body).removeClass("siac-fullscreen-show-fields").removeClass("siac-fullscreen-show-right");
-    $("#siac-reading-modal").hide(); 
+    $(document.body).removeClass("siac-fullscreen-show-fields").removeClass("siac-fullscreen-show-right").removeClass('siac-reading-modal-displayed');
+    $('#siac-left-tab-browse,#siac-left-tab-pdfs,#siac-reading-modal-tabs-left').remove();
+    $('#fields').show();
+    $("#siac-reading-modal").hide();
     document.getElementById('resultsArea').style.display = 'block';
     document.getElementById('bottomContainer').style.display = 'block';
     document.getElementById('topContainer').style.display = 'flex';
-    destroyPDF(); 
+    destroyPDF();
     document.getElementById("siac-reading-modal-center").innerHTML = "";
     onWindowResize();
+    window.$fields = $('.field');
+    if (siacState.searchOnTyping) {
+        setSearchOnTyping(true);
+    }
+    pycmd("siac-on-reading-modal-close")
 }
 function tryExtractTextFromTextNote() {
-    saveTextNote($('#siac-reading-modal-top-bar').data('nid'), remove=false);        
+    saveTextNote($('#siac-reading-modal-top-bar').data('nid'), remove = false);
     pycmd("siac-try-copy-text-note");
 }
+
+function pdfLeftTabAnkiSearchKeyup(value, event) {
+    if (event.keyCode !== 13) {
+        return;
+    }
+    if (value && value.trim().length > 0) {
+        pycmd("siac-pdf-left-tab-anki-search " + value);
+    }
+}
+function pdfLeftTabPdfSearchKeyup(value, event) {
+    if (event.keyCode !== 13) {
+        return;
+    }
+    if (value && value.trim().length > 0) {
+        pycmd("siac-pdf-left-tab-pdf-search " + value);
+    }
+}
+function modalTabsLeftClicked(tab, elem) {
+    $('#siac-reading-modal-tabs-left .siac-btn').removeClass("active");
+    $(elem).addClass("active");
+    pycmd("siac-reading-modal-tabs-left-" + tab);
+}
+
+function setPdfTheme(theme) {
+    let style_tag = document.getElementById("siac-pdf-css");
+    style_tag.href = style_tag.href.substring(0, style_tag.href.lastIndexOf("/") + 1) + theme;
+    pycmd("siac-eval update_config('pdf.theme', '" + theme + "')");
+}
+
+function schedChange(slider) {
+    document.getElementById('siac-sched-prio-val').innerHTML = prioVerbose(slider.value);
+}
+function prioVerbose(prio) {
+    if (prio >= 85)
+        return `Very high (<b>${prio}</b>)`;
+    if (prio >= 70)
+        return `High (<b>${prio}</b>)`;
+    if (prio >= 30)
+        return `Medium (<b>${prio}</b>)`;
+    if (prio >= 15)
+        return `Low (<b>${prio}</b>)`;
+    if (prio >= 1)
+        return `Very low (<b>${prio}</b>)`;
+    return "Remove from Queue (<b>0</b>)";
+}
+function schedChanged(slider, nid) {
+    $('#siac-quick-sched-btn').removeClass('expanded');
+    pycmd("siac-requeue " + nid + " " + slider.value);
+}
+function schedSmallChanged(slider, nid) {
+    pycmd("siac-requeue " + nid + " " + slider.value);
+}
+function schedSmallChange(slider) {
+    document.getElementById('siac-slider-small-lbl').innerHTML = slider.value;
+}
+
+function scheduleDialogQuickAction() {
+    let cmd = $("input[name=sched]:checked").data("pycmd");
+    pycmd(`siac-eval index.ui.reading_modal.schedule_note(${cmd})`);
+}
+function removeDialogOk() {
+    if ($("input[name=del]:checked").data("pycmd") == "1") {
+        pycmd("siac-remove-from-queue");
+    } else {
+        pycmd("siac-delete-current-user-note");
+    }
+}
+function updateSchedule() {
+    let checked = $("input[name=sched]:checked").data("pycmd");
+    if (checked == "4") {
+        let td = document.getElementById("siac-sched-td-inp").value;
+        if (!td) { pycmd('siac-notification Value is empty!'); return; }
+        pycmd("siac-update-schedule td " + td);
+    } else if (checked == "5") {
+        let w = '';
+        $('#siac-sched-wd input').each(function (ix) {
+            if ($(this).is(":checked")) {
+                w += (ix + 1).toString();
+            }
+        });
+        if (!w.length) { pycmd('siac-notification Value is empty!'); return; }
+        pycmd("siac-update-schedule wd " + w);
+    } else {
+        let id = document.getElementById("siac-sched-id-inp").value;
+        if (!id) { pycmd('siac-notification Value is empty!'); return; }
+        pycmd("siac-update-schedule id " + id);
+    }
+}
+//
+// helpers
+//
+
+function windowHasSelection() {
+    return window.getSelection().toString().length;
+}
\ No newline at end of file
diff --git a/web/pdf_reader_crimson.css b/web/pdf_reader_crimson.css
new file mode 100644
index 00000000..8f973173
--- /dev/null
+++ b/web/pdf_reader_crimson.css
@@ -0,0 +1,863 @@
+body.siac-reading-modal-displayed #siac-right-side {
+    border-left: 2px solid #c72c41;
+}
+#siac-reading-modal {
+    display: none;
+    position: absolute;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    right: 0;
+    background-color: #2f2f31;
+    color: white;
+    padding: 12px;
+    padding-bottom: 6px;
+    font-size: 12px;
+    z-index: 7;
+    border-radius: 5px;
+    overflow: hidden;
+}
+
+#siac-reading-modal a:not(.siac-disabled) {
+    color: #c72c41 !important;
+}
+#siac-reading-modal a.greyedout, #siac-reading-modal a.active {
+    color: lightgray !important;
+}
+.siac-clickable-anchor.tab.active {
+    text-decoration: underline;
+}
+.siac-pdf-main-color {
+    color: #c72c41;
+}
+.siac-rm-main-color-hover:hover {
+    color: #c72c41;
+    cursor: pointer;
+}
+.siac-modal-small.dark, #siac-reading-modal .siac-modal-small {
+    border: 3px outset #c72c41;
+    background: #2f2f31;
+    color: white;
+}
+
+#siac-cloze-btn {
+    margin-bottom: 7px;
+    text-align: center;
+    color:#c72c41;
+    cursor:pointer;
+    user-select: none;
+}
+#siac-cloze-btn:hover {
+    transform: scale(1.03);
+    filter: brightness(1.4);
+}
+.siac-btn-small-dropdown-inverted {
+    display: none;
+    position: absolute;
+    color: white;
+    background-color: #2f2f31;
+    width: 200px;
+    padding: 0px 4px 0px 4px;
+    height: 135px;
+    top: -114px;
+    left: -181px;
+    border: 2px outset #c72c41; 
+    z-index: 5;
+    transition: all 0.3s;
+}
+.siac-dropdown-inverted-item {
+    margin: 3px 0 2px 0;
+    text-align: left;
+    width: 100%;
+    color: #c72c41;
+    text-align: center;
+    height: 16px;
+    font-size: 13px !important;
+}
+.siac-dropdown-inverted-item:hover {
+    filter: brightness(1.4);
+}
+#siac-tt-web-btn {
+    color:#c72c41;
+    cursor:pointer;
+    position: absolute;
+    top: 5px;
+    right: 5px;
+    height: 20px;
+    width: 20px;
+    background-position: center;
+    background-repeat: no-repeat;
+    background-size: 20px 20px;
+}
+#siac-tt-web-btn:hover {
+    transform: scale(1.03);
+    filter: brightness(1.4);
+}
+#siac-pdf-br-notify {
+    display: none; 
+    position: absolute; 
+    z-index: 4; 
+    bottom: 50px; 
+    right: 45px; 
+    border: 3px outset #c72c41; 
+    border-radius: 3px; 
+    color: lightgrey; 
+    background: #2f2f31; 
+    padding: 15px;
+}
+#siac-pdf-overlay {
+    display: none;
+    position: absolute;
+    bottom: 35px;
+    right: 0; left: 0;
+    z-index: 4;
+    user-select: none;
+    background-color: #43a047;
+    border-radius: 7px;
+    border: 4px outset green;
+    padding: 2px 4px 4px 4px;
+    width: 200px;
+    text-align: center;
+    color: white;
+    margin-left: auto;
+    margin-right: auto;
+}
+#siac-pdf-mark-btn {
+    padding: 4px 3px 5px 4px;
+    z-index: 3;
+    border: 3px outset #2496dc;
+    border-radius: 3px;
+    margin-right: 14px;
+    display: inline-block;
+    max-width: 30px;
+    transition: all 0.4s;
+    overflow: hidden;
+    white-space: nowrap;
+}
+#siac-pdf-mark-btn:hover {
+    border-color: #67c3fc;
+}
+#siac-pdf-mark-btn:hover img {
+    filter: brightness(1.4);
+}
+#siac-pdf-mark-btn > div {
+    display: none;
+}
+#siac-pdf-mark-btn.expanded > div{
+    display: inline-block;
+}
+#siac-pdf-mark-btn.expanded {
+    max-width: 400px;
+}
+#siac-pdf-mark-btn.expanded img {
+    float: left;
+    margin-top: 2px !important;
+}
+.siac-mark-btn-inner {
+    display: inline-block;
+    border: 2px outset grey;
+    border-radius: 3px;
+    margin-left: 5px;
+    font-size: 11px !important;
+    padding: 1px 4px 1px 4px;
+    cursor: pointer;
+}
+.siac-mark-btn-inner.active {
+    border-color: #2496dc;
+}
+.siac-mark-btn-inner:hover {
+    border-color: #43b7ff;
+}
+.siac-pdf-mark-lbl,#siac-iframe-btn {
+    display: inline-block;
+    margin-right: 10px;
+    font-size: 13px;
+    border: 3px outset #2496dc;
+    border-radius: 4px;
+    padding: 4px 6px 4px 6px;
+    background: #2f2f31;
+    color: white;
+    z-index: 4;
+    user-select: none;
+}
+.siac-pdf-mark-lbl > b:hover {
+    color: #c72c41;
+    cursor: pointer;
+}
+#siac-pdf-overlay-top {
+    position: absolute;
+    top: 4px;
+    left: 0px;
+    width: 100%;
+    z-index: 4;
+}
+#siac-pdf-top {
+    width: 100%; 
+    flex: 1 1 auto;
+    position:relative; 
+    height: calc(100% - 90px); 
+    overflow-y: auto; 
+    text-align: center;
+    margin-top: 20px;
+}
+#siac-text-top-wr {
+    flex: 1 1 auto;
+    margin-top: 20px;
+}
+#siac-text-top {
+    text-align: left;
+    padding: 10px;
+
+}
+#siac-iframe {
+    width: 100%;
+    flex: 1 1 auto;
+    display: none;
+}
+#siac-iframe-btn {
+    position: absolute;
+    left: 0px;
+    top: 50px;
+}
+#siac-schedule-dialog-btn {
+    margin-left: 8px;
+}
+#siac-schedule-dialog-btn > svg {
+    vertical-align: middle;
+    margin-bottom: 2px;
+}
+#siac-schedule-dialog-btn.active > svg {
+    filter: brightness(1.4);
+}
+#siac-close-iframe-btn {
+    z-index: 4;
+    position: absolute;
+    right: 0px;
+    top: 5px;
+    display: none;
+    font-size: 13px;
+    border: 3px outset #2496dc;
+    border-radius: 4px;
+    padding: 4px 6px 4px 6px;
+    background: #2f2f31;
+    color: white;
+    user-select: none;
+}
+#siac-close-iframe-btn:hover {
+    border-color: #67c3fc;
+}
+#siac-iframe-btn:hover {
+    border-color: #67c3fc;
+}
+#siac-iframe-btn > div {
+    display: none;
+}
+#siac-iframe-btn.expanded > div {
+    display: inline-block;
+}
+#siac-quick-sched-btn, #siac-mark-jump-btn, #siac-pdf-search-btn {
+    position: absolute;
+    z-index: 4;
+    left: 0;
+}
+#siac-quick-sched-btn {
+    bottom: 43px;
+    padding: 2px 3px 2px 3px;
+}
+#siac-mark-jump-btn {
+    bottom: 76px;
+    padding: 4px 3px 4px 3px;
+}
+#siac-pdf-search-btn {
+    bottom: 111px;
+    padding: 4px 3px 4px 3px;
+}
+#siac-quick-sched-btn > .expanded-hidden, #siac-mark-jump-btn > .expanded-hidden, #siac-pdf-search-btn > .expanded-hidden {
+    display: none;
+    vertical-align: middle;
+}
+#siac-quick-sched-btn .siac-read-icn {
+    margin: 0;
+    vertical-align: middle;
+}
+#siac-quick-sched-btn.expanded > .expanded-hidden, #siac-mark-jump-btn.expanded > .expanded-hidden, #siac-pdf-search-btn.expanded > .expanded-hidden {
+    display: inline-block;
+}
+#siac-mark-jump-btn:hover img, #siac-pdf-search-btn:hover img {
+    filter: brightness(1.4);
+}
+#siac-mark-jump-btn.expanded img, #siac-pdf-search-btn.expanded img {
+    float: left;
+    margin-top: 2px;
+}
+#siac-pdf-search-btn.expanded img { 
+    margin-top: 5px;
+}
+#siac-pdf-search-btn-inner input:focus {
+    outline-width: 0;
+}
+#siac-iframe-btn input {
+    width: 100%;
+    background: #2f2f31;
+    color: white;
+    border-color: white;
+    border-radius: 3px;
+    padding-left: 4px;
+    vertical-align: top;
+    box-sizing: border-box;
+}
+#siac-iframe-btn input:focus {
+    outline: none;
+}
+#siac-iframe-btn.expanded {
+    max-width: 400px;
+}
+#siac-iframe-btn label:hover {
+    color: #c72c41;
+    cursor: pointer;
+}
+.siac-url-ch {
+   color: #c72c41; 
+   margin-bottom: 4px;
+}
+.siac-url-ch:hover {
+    filter: brightness(1.4);
+}
+#siac-pdf-tooltip {
+	position: absolute;
+	display: none;
+	z-index: 999;
+    background-color: #2f2f31;
+	color: white;
+    padding: 9px;
+	border-radius: 5px;
+    border: 4px outset #c72c41;
+    transition: all 0.5s;
+}
+
+#siac-pdf-read-btn,#siac-pdf-more-btn {
+    border-radius: 4px;
+    border: 3px outset #43a047;
+    padding: 1px 5px 1px 5px;
+    background-color: #2f2f31;
+    color: beige;
+}
+#siac-pdf-read-btn:hover,#siac-pdf-more-btn:hover {
+    color: white;
+    border: 3px outset #69B36C;
+    background-color: #2f3030;
+}
+#siac-pdf-night-btn {
+    padding-left: 4px;
+    padding-right: 4px;
+}
+#siac-pdf-tooltip-results-area {
+	overflow-y: auto;
+    overflow-x: hidden;
+    width: calc(100% - 18px);
+	padding-right: 8px;
+    padding-left: 3px;
+}
+#siac-pdf-tooltip-bottom {
+    text-align: center;
+}
+#siac-tooltip-center {
+    position: absolute;
+    top: 7px;
+    left: 7px;
+    cursor: pointer;
+    display: inline-block;
+    color: #c72c41;
+    border: 3px solid #c72c41;
+    border-radius: 2px;
+    width: 9px;
+    height: 9px;
+}
+#siac-pdf-tooltip-top {
+    text-align: center;
+}
+#siac-tooltip-center:hover {
+    filter: brightness(1.4);
+}
+#siac-pdf-tooltip-searchbar {
+    width: calc(100% - 14px);
+    margin-top: 15px;
+    margin-bottom: 5px;
+    border-radius: 4px;
+    background-color: #2f2f31;
+    color: white;
+    border-color: white;
+    padding-left: 4px;
+}
+#siac-pdf-tooltip-searchbar:focus {
+    outline: none;
+}
+#siac-pdf-page-inp {
+    background: #2f2f31;
+    color: beige;
+}
+#siac-reading-modal-bottom-bar {
+    width: 100%; 
+    flex: 0 0 auto; 
+    position: relative; 
+    border-top: 2px solid #c72c41; 
+    margin-top: 5px; 
+    padding: 2px 0 0 5px; 
+    overflow: hidden; 
+    user-select: none;
+}
+#siac-pdf-bottom-tab {
+    display: inline-block;
+    max-height: 89px;
+    overflow: hidden;
+    overflow-y: auto;
+    vertical-align: top;
+    margin-top: 4px;
+    padding: 0 5px 0 0;
+    box-sizing: border-box;
+}
+.siac-reading-modal-button-bar-wrapper {
+    flex: 0 0 30px; 
+    width: 100%; 
+    text-align: center; 
+    margin-top: 15px; 
+    position: relative; 
+}
+#siac-marks-display {
+    vertical-align: top;
+    height: 100%;
+}
+.siac-related-notes-item {
+    color: grey;
+    cursor: pointer;
+}
+.siac-related-notes-item:hover {
+    color: lightgrey;
+}
+#siac-marks-display::-webkit-scrollbar {
+    display: none;
+}
+#siac-marks-display td:nth-child(2) {
+    word-wrap: break-word; 
+    white-space: normal;
+    padding-left: 5px;
+}
+.siac-page-mark-link {
+    display: inline-block;
+    cursor: pointer;
+    color: #c72c41;
+    font-weight: bold;
+}
+.siac-page-mark-link:hover {
+    filter: brightness(1.4);
+}
+.siac-field-picker-opt {
+    display: inline-block;
+    font-size: 15px;
+    line-height: 18px;;
+    color: #c72c41;
+    cursor: pointer;
+    user-select: none;
+}
+.siac-field-picker-opt:hover {
+    filter: brightness(1.4);
+    transform: scale(1.04);
+}
+#siac-reading-modal-top-btns {
+    position: absolute;
+    top: 7px; right: 25px;
+    text-align: center;
+    vertical-align: middle;
+    z-index: 6;
+}
+#siac-reading-modal-top-btns div:hover {
+    color: white;
+}
+#siac-reading-modal-top-btns siac-btn {
+    line-height: 13px;
+}
+#siac-reading-modal-top-btns span {
+    border: 1px solid lightgrey; 
+    height: 11px; 
+    width: 4px;
+    margin: 0;
+    vertical-align: middle;
+    display: inline-block;
+}
+#siac-reading-modal-top-btns div:hover span {
+    border-color: white;
+}
+#siac-reading-modal-change-theme {
+    position: absolute;
+    right: 0;
+    bottom: 4px;
+    cursor: pointer;    
+}
+#siac-reading-modal-change-theme > a {
+    color:lightgrey !important;
+}
+.siac-queue-picker-icn {
+    margin-left: 25px; cursor: pointer; font-weight: bold; color: #c72c41;
+    display: inline-block;
+}
+.siac-queue-picker-icn:not(.siac-disabled):hover {
+    transform: scale(1.4);
+    filter: brightness(140%);
+}
+#siac-queue-sched-wrapper {
+    padding: 5px 0 0 0;
+    max-width: 0px;
+    overflow: hidden;
+    display: inline-block;
+    transition: max-width 0.6s;
+    transform: translateZ(0);
+}
+.siac-queue-sched-btn, .siac-queue-sched-btn-hor {
+    display: inline-block;
+    font-size: 13px;
+    padding: 2px;
+    border: 2px solid #2496dc;;
+    color: lightblue;
+    user-select: none;
+    cursor: pointer;
+    text-align: center;
+    border-radius: 4px;
+}
+.siac-queue-sched-btn {
+    writing-mode: vertical-lr;
+    height: 90px;
+}
+.siac-queue-sched-btn.siac-prio-5 {
+    height: 80px;
+}
+.siac-queue-sched-btn.siac-prio-4 {
+    height: 70px;
+}
+.siac-queue-sched-btn.siac-prio-3 {
+    height: 60px;
+}
+.siac-queue-sched-btn.siac-prio-2 {
+    height: 50px;
+}
+.siac-queue-sched-btn.siac-prio-1 {
+    height: 40px;
+}
+.siac-queue-sched-btn-hor {
+    vertical-align: top;
+    margin: 40px 5px 0px 5px;
+}
+.siac-queue-sched-btn:hover, .siac-queue-sched-btn-hor:hover {
+    color: white;
+    border-color: white;
+    transform: scale(1.04);
+}
+.siac-queue-sched-btn.active, .siac-queue-sched-btn-hor.active {
+    color: white;
+    border-color: #c72c41;
+}
+.siac-queue-sched-btn.active:hover, .siac-queue-sched-btn-hor.active:hover {
+   filter: brightness(140%);
+}
+
+.siac-queue-sched-hor-sep {
+    display: inline-block;
+    height: 50px;
+    width: 20px;
+    margin: 0 10px 0 10px;
+    border-top: 2px solid lightgrey;
+    border-style: dotted;
+    border-width: 2px 0 0 0;
+}
+.siac-clickable-anchor {
+    cursor: pointer;
+    background-color: inherit !important;
+    display: inline-block;
+    border: 1px solid transparent;
+}
+.siac-clickable-anchor.siac-disabled,.siac-queue-picker-icn.siac-disabled,.siac-page-mark-link.siac-disabled,.siac-queue-sched-btn.siac-disabled {
+    color: grey !important;
+}
+.siac-sched-icn.siac-disabled {
+    opacity: 0.3;
+}
+.siac-sched-icn line, .siac-sched-icn ellipse {
+    stroke: #c72c41 !important;
+}
+.siac-sched-icn.grey line, .siac-sched-icn.grey ellipse {
+    stroke: lightgrey !important;
+}
+.siac-queue-sched-btn.siac-disabled {
+    border-color: grey !important;
+}
+.siac-clickable-anchor:not(.siac-disabled):hover {
+    transform: scale(1.02);
+    filter: brightness(140%);
+}
+#siac-queue-infobox-wrapper {
+    position: relative;
+    display: inline-block;
+    vertical-align: top;
+    margin-left: 14px;
+}
+#siac-queue-infobox {
+    position: absolute;
+    top: 0;
+    left: 0;
+    display: none;
+    width: 300px;
+    height: 102px;
+    border: 3px outset #c72c41;
+}
+#siac-queue-infobox:after {
+    content: " ";
+    position: absolute;
+    right: 100%;
+    top: var(--ttop);
+    margin-top: -11px;
+    border-width: 11px;
+    border-style: solid;
+    border-color: transparent #c72c41 transparent transparent;
+    transition: all ease 0.2s;
+}
+#siac-reading-modal-timer {
+    font-size: 30px;
+    user-select: none;
+    font-weight: bold;
+    line-height: 1em;
+}
+.siac-timer-btn {
+    cursor: pointer;
+    margin-right: 5px;
+    font-size: 11px;
+    line-height: 1em;
+    display: inline-block;
+}
+.siac-timer-btn:hover {
+    transform: scale(1.2);
+    user-select: none;
+}
+.siac-timer-btn.active {
+    color: #c72c41;
+    font-weight: bold;
+}
+#siac-timer-play-btn {
+    font-size: 19px;
+    line-height: 19px;
+    cursor: pointer;
+    user-select: none;
+    display: inline-block;
+}
+#siac-timer-play-btn:hover {
+    transform: scale(1.05);
+}
+#siac-reading-modal-center img {
+    display: block;
+    margin-left: auto !important;
+    margin-right: auto !important;
+}
+#siac-timer-popup {
+    z-index: 9999999;
+    background: #2f2f31;
+    color: white;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    padding: 15px;
+    width: 300px;
+    border: 4px outset #c72c41;
+    border-radius: 5px;
+    display: none;
+}
+#siac-pdf-top::-webkit-scrollbar:horizontal {
+    height: 10px !important;
+}
+#siac-pdf-top::-webkit-scrollbar, #siac-pdf-bottom-tab::-webkit-scrollbar,#siac-pdf-tooltip-results-area::-webkit-scrollbar, body.nightMode ::-webkit-scrollbar {
+    width: 10px !important;
+    background: #313d45 !important;
+    border-radius: 4px !important;
+}
+ #siac-pdf-top::-webkit-scrollbar-thumb, body.nightMode ::-webkit-scrollbar-thumb,#siac-pdf-tooltip-results-area::-webkit-scrollbar-thumb, #siac-pdf-bottom-tab::-webkit-scrollbar-thumb {
+    background: #515d71 !important;
+    border-radius: 4px !important;
+} 
+.siac-pdf-loader {
+    width: 250px; 
+    padding: 15px; 
+    position: relative; 
+    text-align: center;
+    border: 3px outset #c72c41;
+    background: #2f2f31;
+    color: white;
+}
+.tox-tinymce-aux {
+    z-index: 2147483638 !important;
+}
+.tox .tox-menu {
+    z-index: 2147483638 !important;
+}
+#siac-text-top-wr > div {
+    height: 100% !important;
+}
+.siac-pdf-mark-lbl {
+    font-weight: bold;
+}
+.siac-note-title-only {
+    font-weight: bold;
+    overflow: ellipsis;
+    user-select: none;
+    cursor: pointer;
+}
+body.night_mode .siac-note-title-only {
+    color: lightgrey;
+}
+.siac-note-title-only:hover {
+    filter: brightness(1.4);
+}
+#siac-reading-modal-tabs-left {
+    font-family: 'Open Sans', sans-serif;
+    margin: 10px 5px 0 5px;
+    padding: 10px 15px 5px 0;
+    border-top: 2px solid;
+    margin-top: 10px;
+    border-top: 2px solid #c72c41;
+}
+#siac-reading-modal-tabs-left .siac-btn {
+    color: #b2b2a0;
+    border-color: #b2b2a0;
+    margin-left: 4px;
+}
+#siac-reading-modal-tabs-left .siac-btn.active {
+    color: #61c3ff !important;
+    border-color: #2496dc !important;
+}
+.siac-pdf-main-color-border-bottom {
+    border-bottom: 2px solid #c72c41;
+}
+.siac-pdf-main-color-border-top {
+    border-top: 2px solid #c72c41;
+}
+#siac-left-tab-browse,#siac-left-tab-pdfs {
+    font-family: 'Open Sans', sans-serif;
+    flex: 1 1 auto;
+    width: 100%;
+    box-sizing: border-box;
+    padding: 0 10px 0 10px;
+    overflow: hidden;
+}
+#siac-left-tab-browse input,#siac-left-tab-pdfs input {
+    border-radius: 4px;
+    padding-left: 3px;
+}       
+body.nightMode #siac-left-tab-browse input, body.nightMode #siac-left-tab-pdfs input {
+    background: #333333;
+    color: lightgrey;
+}
+.siac-pdf-color-btn {
+    height: 18px; 
+    width: 18px; 
+    border-radius: 4px;
+    margin-bottom: 4px;
+    border: 2px solid transparent;
+    cursor: pointer;
+}
+.siac-pdf-color-btn.active,.siac-pdf-ul-btn.active {
+    border-color: white !important;
+}
+.siac-hl {
+    position: absolute;
+    mix-blend-mode: multiply !important;
+    z-index: 2;
+    border-radius: 7px;
+}
+.siac-text-hl {
+    mix-blend-mode: normal !important;
+    z-index: 3;
+    border: 3px outset #2496dc;
+    font-family: 'Open Sans', sans-serif;
+    white-space: pre-wrap;
+    outline: none;
+}
+#siac-pdf-top.siac-pdf-night .siac-text-hl {
+    /* color: lightgrey; */
+    background: beige !important;
+    border-color: #44fdb0 !important;
+}
+.siac-pdf-ul-btn {
+    height: 5px; 
+    width: 18px; 
+    border: 2px solid transparent;
+    margin-bottom: 4px;
+    border-radius: 4px;
+    cursor: pointer;
+}
+#siac-reading-modal-top-btns > div {
+    height: 24px;
+    width: 24px;
+    box-sizing: border-box;
+    background-size: 17px 17px;
+    padding: 0 !important;
+    background-repeat: no-repeat;
+    background-position: center;
+}
+#siac-reading-modal-top-bar {
+    min-height: 77px; 
+    width: 100%; 
+    flex: 0 0 77px; 
+    display: flex; 
+    flex-wrap: nowrap; 
+    border-bottom: 2px solid #c72c41; 
+    margin-bottom: 5px; 
+    white-space: nowrap;
+    position: relative;
+}
+#siac-rm-greyout {
+    position: absolute;
+    display: none;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    opacity: 0.4;
+    background-color: black;
+    z-index: 5;
+}
+.siac-prio-slider, .siac-prio-slider-small {
+    width: 250px;
+    -webkit-appearance: none; 
+    appearance: none;
+    background: #d3d3d3; 
+    outline: none;
+    opacity: 0.7; 
+    transition: opacity .2s;
+    height: 10px;
+    border-radius: 3px;
+}
+.siac-prio-slider-small {
+    width: 150px;
+    height: 8px;
+}
+.siac-prio-slider:hover, .siac-prio-slider-small:hover {
+    opacity: 1;
+  }
+  .siac-prio-slider::-webkit-slider-thumb, .siac-prio-slider-small::-webkit-slider-thumb {
+    -webkit-appearance: none;
+    appearance: none;
+    width: 15px;
+    height: 20px;
+    background: #2496dc;
+    cursor: pointer;
+    border-radius: 3px;
+  }
+  .siac-prio-slider::-webkit-slider-thumb:hover, .siac-prio-slider-small::-webkit-slider-thumb:hover {
+      filter: brightness(1.4);
+  }
+label input:checked ~ span {
+    font-weight: bold;
+}
+body.siac-left-right-switched #siac-right-side {
+    border-right: 2px solid #c72c41;
+}
+#siac-right-side {
+    border-left: 2px solid #c72c41;
+}
\ No newline at end of file
diff --git a/web/pdf_reader_darkseagreen.css b/web/pdf_reader_darkseagreen.css
new file mode 100644
index 00000000..e1355454
--- /dev/null
+++ b/web/pdf_reader_darkseagreen.css
@@ -0,0 +1,863 @@
+body.siac-reading-modal-displayed #siac-right-side {
+    border-left: 2px solid #9dab86;
+}
+#siac-reading-modal {
+    display: none;
+    position: absolute;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    right: 0;
+    background-color: #2f2f31;
+    color: white;
+    padding: 12px;
+    padding-bottom: 6px;
+    font-size: 12px;
+    z-index: 7;
+    border-radius: 5px;
+    overflow: hidden;
+}
+
+#siac-reading-modal a:not(.siac-disabled) {
+    color: #9dab86 !important;
+}
+#siac-reading-modal a.greyedout, #siac-reading-modal a.active {
+    color: lightgray !important;
+}
+.siac-clickable-anchor.tab.active {
+    text-decoration: underline;
+}
+.siac-pdf-main-color {
+    color: #9dab86;
+}
+.siac-rm-main-color-hover:hover {
+    color: #9dab86;
+    cursor: pointer;
+}
+.siac-modal-small.dark, #siac-reading-modal .siac-modal-small {
+    border: 3px outset #9dab86;
+    background: #2f2f31;
+    color: white;
+}
+
+#siac-cloze-btn {
+    margin-bottom: 7px;
+    text-align: center;
+    color:#9dab86;
+    cursor:pointer;
+    user-select: none;
+}
+#siac-cloze-btn:hover {
+    transform: scale(1.03);
+    filter: brightness(1.4);
+}
+.siac-btn-small-dropdown-inverted {
+    display: none;
+    position: absolute;
+    color: white;
+    background-color: #2f2f31;
+    width: 200px;
+    padding: 0px 4px 0px 4px;
+    height: 135px;
+    top: -114px;
+    left: -181px;
+    border: 2px outset #9dab86; 
+    z-index: 5;
+    transition: all 0.3s;
+}
+.siac-dropdown-inverted-item {
+    margin: 3px 0 2px 0;
+    text-align: left;
+    width: 100%;
+    color: #9dab86;
+    text-align: center;
+    height: 16px;
+    font-size: 13px !important;
+}
+.siac-dropdown-inverted-item:hover {
+    filter: brightness(1.4);
+}
+#siac-tt-web-btn {
+    color:#9dab86;
+    cursor:pointer;
+    position: absolute;
+    top: 5px;
+    right: 5px;
+    height: 20px;
+    width: 20px;
+    background-position: center;
+    background-repeat: no-repeat;
+    background-size: 20px 20px;
+}
+#siac-tt-web-btn:hover {
+    transform: scale(1.03);
+    filter: brightness(1.4);
+}
+#siac-pdf-br-notify {
+    display: none; 
+    position: absolute; 
+    z-index: 4; 
+    bottom: 50px; 
+    right: 45px; 
+    border: 3px outset #9dab86; 
+    border-radius: 3px; 
+    color: lightgrey; 
+    background: #2f2f31; 
+    padding: 15px;
+}
+#siac-pdf-overlay {
+    display: none;
+    position: absolute;
+    bottom: 35px;
+    right: 0; left: 0;
+    z-index: 4;
+    user-select: none;
+    background-color: #43a047;
+    border-radius: 7px;
+    border: 4px outset green;
+    padding: 2px 4px 4px 4px;
+    width: 200px;
+    text-align: center;
+    color: white;
+    margin-left: auto;
+    margin-right: auto;
+}
+#siac-pdf-mark-btn {
+    padding: 4px 3px 5px 4px;
+    z-index: 3;
+    border: 3px outset #2496dc;
+    border-radius: 3px;
+    margin-right: 14px;
+    display: inline-block;
+    max-width: 30px;
+    transition: all 0.4s;
+    overflow: hidden;
+    white-space: nowrap;
+}
+#siac-pdf-mark-btn:hover {
+    border-color: #67c3fc;
+}
+#siac-pdf-mark-btn:hover img {
+    filter: brightness(1.4);
+}
+#siac-pdf-mark-btn > div {
+    display: none;
+}
+#siac-pdf-mark-btn.expanded > div{
+    display: inline-block;
+}
+#siac-pdf-mark-btn.expanded {
+    max-width: 400px;
+}
+#siac-pdf-mark-btn.expanded img {
+    float: left;
+    margin-top: 2px !important;
+}
+.siac-mark-btn-inner {
+    display: inline-block;
+    border: 2px outset grey;
+    border-radius: 3px;
+    margin-left: 5px;
+    font-size: 11px !important;
+    padding: 1px 4px 1px 4px;
+    cursor: pointer;
+}
+.siac-mark-btn-inner.active {
+    border-color: #2496dc;
+}
+.siac-mark-btn-inner:hover {
+    border-color: #43b7ff;
+}
+.siac-pdf-mark-lbl,#siac-iframe-btn {
+    display: inline-block;
+    margin-right: 10px;
+    font-size: 13px;
+    border: 3px outset #2496dc;
+    border-radius: 4px;
+    padding: 4px 6px 4px 6px;
+    background: #2f2f31;
+    color: white;
+    z-index: 4;
+    user-select: none;
+}
+.siac-pdf-mark-lbl > b:hover {
+    color: #9dab86;
+    cursor: pointer;
+}
+#siac-pdf-overlay-top {
+    position: absolute;
+    top: 4px;
+    left: 0px;
+    width: 100%;
+    z-index: 4;
+}
+#siac-pdf-top {
+    width: 100%; 
+    flex: 1 1 auto;
+    position:relative; 
+    height: calc(100% - 90px); 
+    overflow-y: auto; 
+    text-align: center;
+    margin-top: 20px;
+}
+#siac-text-top-wr {
+    flex: 1 1 auto;
+    margin-top: 20px;
+}
+#siac-text-top {
+    text-align: left;
+    padding: 10px;
+
+}
+#siac-iframe {
+    width: 100%;
+    flex: 1 1 auto;
+    display: none;
+}
+#siac-iframe-btn {
+    position: absolute;
+    left: 0px;
+    top: 50px;
+}
+#siac-schedule-dialog-btn {
+    margin-left: 8px;
+}
+#siac-schedule-dialog-btn > svg {
+    vertical-align: middle;
+    margin-bottom: 2px;
+}
+#siac-schedule-dialog-btn.active > svg {
+    filter: brightness(1.4);
+}
+#siac-close-iframe-btn {
+    z-index: 4;
+    position: absolute;
+    right: 0px;
+    top: 5px;
+    display: none;
+    font-size: 13px;
+    border: 3px outset #2496dc;
+    border-radius: 4px;
+    padding: 4px 6px 4px 6px;
+    background: #2f2f31;
+    color: white;
+    user-select: none;
+}
+#siac-close-iframe-btn:hover {
+    border-color: #67c3fc;
+}
+#siac-iframe-btn:hover {
+    border-color: #67c3fc;
+}
+#siac-iframe-btn > div {
+    display: none;
+}
+#siac-iframe-btn.expanded > div {
+    display: inline-block;
+}
+#siac-quick-sched-btn, #siac-mark-jump-btn, #siac-pdf-search-btn {
+    position: absolute;
+    z-index: 4;
+    left: 0;
+}
+#siac-quick-sched-btn {
+    bottom: 43px;
+    padding: 2px 3px 2px 3px;
+}
+#siac-mark-jump-btn {
+    bottom: 76px;
+    padding: 4px 3px 4px 3px;
+}
+#siac-pdf-search-btn {
+    bottom: 111px;
+    padding: 4px 3px 4px 3px;
+}
+#siac-quick-sched-btn > .expanded-hidden, #siac-mark-jump-btn > .expanded-hidden, #siac-pdf-search-btn > .expanded-hidden {
+    display: none;
+    vertical-align: middle;
+}
+#siac-quick-sched-btn .siac-read-icn {
+    margin: 0;
+    vertical-align: middle;
+}
+#siac-quick-sched-btn.expanded > .expanded-hidden, #siac-mark-jump-btn.expanded > .expanded-hidden, #siac-pdf-search-btn.expanded > .expanded-hidden {
+    display: inline-block;
+}
+#siac-mark-jump-btn:hover img, #siac-pdf-search-btn:hover img {
+    filter: brightness(1.4);
+}
+#siac-mark-jump-btn.expanded img, #siac-pdf-search-btn.expanded img {
+    float: left;
+    margin-top: 2px;
+}
+#siac-pdf-search-btn.expanded img { 
+    margin-top: 5px;
+}
+#siac-pdf-search-btn-inner input:focus {
+    outline-width: 0;
+}
+#siac-iframe-btn input {
+    width: 100%;
+    background: #2f2f31;
+    color: white;
+    border-color: white;
+    border-radius: 3px;
+    padding-left: 4px;
+    vertical-align: top;
+    box-sizing: border-box;
+}
+#siac-iframe-btn input:focus {
+    outline: none;
+}
+#siac-iframe-btn.expanded {
+    max-width: 400px;
+}
+#siac-iframe-btn label:hover {
+    color: #9dab86;
+    cursor: pointer;
+}
+.siac-url-ch {
+   color: #9dab86; 
+   margin-bottom: 4px;
+}
+.siac-url-ch:hover {
+    filter: brightness(1.4);
+}
+#siac-pdf-tooltip {
+	position: absolute;
+	display: none;
+	z-index: 999;
+    background-color: #2f2f31;
+	color: white;
+    padding: 9px;
+	border-radius: 5px;
+    border: 4px outset #9dab86;
+    transition: all 0.5s;
+}
+
+#siac-pdf-read-btn,#siac-pdf-more-btn {
+    border-radius: 4px;
+    border: 3px outset #43a047;
+    padding: 1px 5px 1px 5px;
+    background-color: #2f2f31;
+    color: beige;
+}
+#siac-pdf-read-btn:hover,#siac-pdf-more-btn:hover {
+    color: white;
+    border: 3px outset #69B36C;
+    background-color: #2f3030;
+}
+#siac-pdf-night-btn {
+    padding-left: 4px;
+    padding-right: 4px;
+}
+#siac-pdf-tooltip-results-area {
+	overflow-y: auto;
+    overflow-x: hidden;
+    width: calc(100% - 18px);
+	padding-right: 8px;
+    padding-left: 3px;
+}
+#siac-pdf-tooltip-bottom {
+    text-align: center;
+}
+#siac-tooltip-center {
+    position: absolute;
+    top: 7px;
+    left: 7px;
+    cursor: pointer;
+    display: inline-block;
+    color: #9dab86;
+    border: 3px solid #9dab86;
+    border-radius: 2px;
+    width: 9px;
+    height: 9px;
+}
+#siac-pdf-tooltip-top {
+    text-align: center;
+}
+#siac-tooltip-center:hover {
+    filter: brightness(1.4);
+}
+#siac-pdf-tooltip-searchbar {
+    width: calc(100% - 14px);
+    margin-top: 15px;
+    margin-bottom: 5px;
+    border-radius: 4px;
+    background-color: #2f2f31;
+    color: white;
+    border-color: white;
+    padding-left: 4px;
+}
+#siac-pdf-tooltip-searchbar:focus {
+    outline: none;
+}
+#siac-pdf-page-inp {
+    background: #2f2f31;
+    color: beige;
+}
+#siac-reading-modal-bottom-bar {
+    width: 100%; 
+    flex: 0 0 auto; 
+    position: relative; 
+    border-top: 2px solid #9dab86; 
+    margin-top: 5px; 
+    padding: 2px 0 0 5px; 
+    overflow: hidden; 
+    user-select: none;
+}
+#siac-pdf-bottom-tab {
+    display: inline-block;
+    max-height: 89px;
+    overflow: hidden;
+    overflow-y: auto;
+    vertical-align: top;
+    margin-top: 4px;
+    padding: 0 5px 0 0;
+    box-sizing: border-box;
+}
+.siac-reading-modal-button-bar-wrapper {
+    flex: 0 0 30px; 
+    width: 100%; 
+    text-align: center; 
+    margin-top: 15px; 
+    position: relative; 
+}
+#siac-marks-display {
+    vertical-align: top;
+    height: 100%;
+}
+.siac-related-notes-item {
+    color: grey;
+    cursor: pointer;
+}
+.siac-related-notes-item:hover {
+    color: lightgrey;
+}
+#siac-marks-display::-webkit-scrollbar {
+    display: none;
+}
+#siac-marks-display td:nth-child(2) {
+    word-wrap: break-word; 
+    white-space: normal;
+    padding-left: 5px;
+}
+.siac-page-mark-link {
+    display: inline-block;
+    cursor: pointer;
+    color: #9dab86;
+    font-weight: bold;
+}
+.siac-page-mark-link:hover {
+    filter: brightness(1.4);
+}
+.siac-field-picker-opt {
+    display: inline-block;
+    font-size: 15px;
+    line-height: 18px;;
+    color: #9dab86;
+    cursor: pointer;
+    user-select: none;
+}
+.siac-field-picker-opt:hover {
+    filter: brightness(1.4);
+    transform: scale(1.04);
+}
+#siac-reading-modal-top-btns {
+    position: absolute;
+    top: 7px; right: 25px;
+    text-align: center;
+    vertical-align: middle;
+    z-index: 6;
+}
+#siac-reading-modal-top-btns div:hover {
+    color: white;
+}
+#siac-reading-modal-top-btns siac-btn {
+    line-height: 13px;
+}
+#siac-reading-modal-top-btns span {
+    border: 1px solid lightgrey; 
+    height: 11px; 
+    width: 4px;
+    margin: 0;
+    vertical-align: middle;
+    display: inline-block;
+}
+#siac-reading-modal-top-btns div:hover span {
+    border-color: white;
+}
+#siac-reading-modal-change-theme {
+    position: absolute;
+    right: 0;
+    bottom: 4px;
+    cursor: pointer;    
+}
+#siac-reading-modal-change-theme > a {
+    color:lightgrey !important;
+}
+.siac-queue-picker-icn {
+    margin-left: 25px; cursor: pointer; font-weight: bold; color: #9dab86;
+    display: inline-block;
+}
+.siac-queue-picker-icn:not(.siac-disabled):hover {
+    transform: scale(1.4);
+    filter: brightness(140%);
+}
+#siac-queue-sched-wrapper {
+    padding: 5px 0 0 0;
+    max-width: 0px;
+    overflow: hidden;
+    display: inline-block;
+    transition: max-width 0.6s;
+    transform: translateZ(0);
+}
+.siac-queue-sched-btn, .siac-queue-sched-btn-hor {
+    display: inline-block;
+    font-size: 13px;
+    padding: 2px;
+    border: 2px solid #2496dc;;
+    color: lightblue;
+    user-select: none;
+    cursor: pointer;
+    text-align: center;
+    border-radius: 4px;
+}
+.siac-queue-sched-btn {
+    writing-mode: vertical-lr;
+    height: 90px;
+}
+.siac-queue-sched-btn.siac-prio-5 {
+    height: 80px;
+}
+.siac-queue-sched-btn.siac-prio-4 {
+    height: 70px;
+}
+.siac-queue-sched-btn.siac-prio-3 {
+    height: 60px;
+}
+.siac-queue-sched-btn.siac-prio-2 {
+    height: 50px;
+}
+.siac-queue-sched-btn.siac-prio-1 {
+    height: 40px;
+}
+.siac-queue-sched-btn-hor {
+    vertical-align: top;
+    margin: 40px 5px 0px 5px;
+}
+.siac-queue-sched-btn:hover, .siac-queue-sched-btn-hor:hover {
+    color: white;
+    border-color: white;
+    transform: scale(1.04);
+}
+.siac-queue-sched-btn.active, .siac-queue-sched-btn-hor.active {
+    color: white;
+    border-color: #9dab86;
+}
+.siac-queue-sched-btn.active:hover, .siac-queue-sched-btn-hor.active:hover {
+   filter: brightness(140%);
+}
+
+.siac-queue-sched-hor-sep {
+    display: inline-block;
+    height: 50px;
+    width: 20px;
+    margin: 0 10px 0 10px;
+    border-top: 2px solid lightgrey;
+    border-style: dotted;
+    border-width: 2px 0 0 0;
+}
+.siac-clickable-anchor {
+    cursor: pointer;
+    background-color: inherit !important;
+    display: inline-block;
+    border: 1px solid transparent;
+}
+.siac-clickable-anchor.siac-disabled,.siac-queue-picker-icn.siac-disabled,.siac-page-mark-link.siac-disabled,.siac-queue-sched-btn.siac-disabled {
+    color: grey !important;
+}
+.siac-sched-icn.siac-disabled {
+    opacity: 0.3;
+}
+.siac-sched-icn line, .siac-sched-icn ellipse {
+    stroke: #9dab86 !important;
+}
+.siac-sched-icn.grey line, .siac-sched-icn.grey ellipse {
+    stroke: lightgrey !important;
+}
+.siac-queue-sched-btn.siac-disabled {
+    border-color: grey !important;
+}
+.siac-clickable-anchor:not(.siac-disabled):hover {
+    transform: scale(1.02);
+    filter: brightness(140%);
+}
+#siac-queue-infobox-wrapper {
+    position: relative;
+    display: inline-block;
+    vertical-align: top;
+    margin-left: 14px;
+}
+#siac-queue-infobox {
+    position: absolute;
+    top: 0;
+    left: 0;
+    display: none;
+    width: 300px;
+    height: 102px;
+    border: 3px outset #9dab86;
+}
+#siac-queue-infobox:after {
+    content: " ";
+    position: absolute;
+    right: 100%;
+    top: var(--ttop);
+    margin-top: -11px;
+    border-width: 11px;
+    border-style: solid;
+    border-color: transparent #9dab86 transparent transparent;
+    transition: all ease 0.2s;
+}
+#siac-reading-modal-timer {
+    font-size: 30px;
+    user-select: none;
+    font-weight: bold;
+    line-height: 1em;
+}
+.siac-timer-btn {
+    cursor: pointer;
+    margin-right: 5px;
+    font-size: 11px;
+    line-height: 1em;
+    display: inline-block;
+}
+.siac-timer-btn:hover {
+    transform: scale(1.2);
+    user-select: none;
+}
+.siac-timer-btn.active {
+    color: #9dab86;
+    font-weight: bold;
+}
+#siac-timer-play-btn {
+    font-size: 19px;
+    line-height: 19px;
+    cursor: pointer;
+    user-select: none;
+    display: inline-block;
+}
+#siac-timer-play-btn:hover {
+    transform: scale(1.05);
+}
+#siac-reading-modal-center img {
+    display: block;
+    margin-left: auto !important;
+    margin-right: auto !important;
+}
+#siac-timer-popup {
+    z-index: 9999999;
+    background: #2f2f31;
+    color: white;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    padding: 15px;
+    width: 300px;
+    border: 4px outset #9dab86;
+    border-radius: 5px;
+    display: none;
+}
+#siac-pdf-top::-webkit-scrollbar:horizontal {
+    height: 10px !important;
+}
+#siac-pdf-top::-webkit-scrollbar, #siac-pdf-bottom-tab::-webkit-scrollbar,#siac-pdf-tooltip-results-area::-webkit-scrollbar, body.nightMode ::-webkit-scrollbar {
+    width: 10px !important;
+    background: #313d45 !important;
+    border-radius: 4px !important;
+}
+ #siac-pdf-top::-webkit-scrollbar-thumb, body.nightMode ::-webkit-scrollbar-thumb,#siac-pdf-tooltip-results-area::-webkit-scrollbar-thumb, #siac-pdf-bottom-tab::-webkit-scrollbar-thumb {
+    background: #515d71 !important;
+    border-radius: 4px !important;
+} 
+.siac-pdf-loader {
+    width: 250px; 
+    padding: 15px; 
+    position: relative; 
+    text-align: center;
+    border: 3px outset #9dab86;
+    background: #2f2f31;
+    color: white;
+}
+.tox-tinymce-aux {
+    z-index: 2147483638 !important;
+}
+.tox .tox-menu {
+    z-index: 2147483638 !important;
+}
+#siac-text-top-wr > div {
+    height: 100% !important;
+}
+.siac-pdf-mark-lbl {
+    font-weight: bold;
+}
+.siac-note-title-only {
+    font-weight: bold;
+    overflow: ellipsis;
+    user-select: none;
+    cursor: pointer;
+}
+body.night_mode .siac-note-title-only {
+    color: lightgrey;
+}
+.siac-note-title-only:hover {
+    filter: brightness(1.4);
+}
+#siac-reading-modal-tabs-left {
+    font-family: 'Open Sans', sans-serif;
+    margin: 10px 5px 0 5px;
+    padding: 10px 15px 5px 0;
+    border-top: 2px solid;
+    margin-top: 10px;
+    border-top: 2px solid #9dab86;
+}
+#siac-reading-modal-tabs-left .siac-btn {
+    color: #b2b2a0;
+    border-color: #b2b2a0;
+    margin-left: 4px;
+}
+#siac-reading-modal-tabs-left .siac-btn.active {
+    color: #61c3ff !important;
+    border-color: #2496dc !important;
+}
+.siac-pdf-main-color-border-bottom {
+    border-bottom: 2px solid #9dab86;
+}
+.siac-pdf-main-color-border-top {
+    border-top: 2px solid #9dab86;
+}
+#siac-left-tab-browse,#siac-left-tab-pdfs {
+    font-family: 'Open Sans', sans-serif;
+    flex: 1 1 auto;
+    width: 100%;
+    box-sizing: border-box;
+    padding: 0 10px 0 10px;
+    overflow: hidden;
+}
+#siac-left-tab-browse input,#siac-left-tab-pdfs input {
+    border-radius: 4px;
+    padding-left: 3px;
+}       
+body.nightMode #siac-left-tab-browse input, body.nightMode #siac-left-tab-pdfs input {
+    background: #333333;
+    color: lightgrey;
+}
+.siac-pdf-color-btn {
+    height: 18px; 
+    width: 18px; 
+    border-radius: 4px;
+    margin-bottom: 4px;
+    border: 2px solid transparent;
+    cursor: pointer;
+}
+.siac-pdf-color-btn.active,.siac-pdf-ul-btn.active {
+    border-color: white !important;
+}
+.siac-hl {
+    position: absolute;
+    mix-blend-mode: multiply !important;
+    z-index: 2;
+    border-radius: 7px;
+}
+.siac-text-hl {
+    mix-blend-mode: normal !important;
+    z-index: 3;
+    border: 3px outset #2496dc;
+    font-family: 'Open Sans', sans-serif;
+    white-space: pre-wrap;
+    outline: none;
+}
+#siac-pdf-top.siac-pdf-night .siac-text-hl {
+    /* color: lightgrey; */
+    background: beige !important;
+    border-color: #44fdb0 !important;
+}
+.siac-pdf-ul-btn {
+    height: 5px; 
+    width: 18px; 
+    border: 2px solid transparent;
+    margin-bottom: 4px;
+    border-radius: 4px;
+    cursor: pointer;
+}
+#siac-reading-modal-top-btns > div {
+    height: 24px;
+    width: 24px;
+    box-sizing: border-box;
+    background-size: 17px 17px;
+    padding: 0 !important;
+    background-repeat: no-repeat;
+    background-position: center;
+}
+#siac-reading-modal-top-bar {
+    min-height: 77px; 
+    width: 100%; 
+    flex: 0 0 77px; 
+    display: flex; 
+    flex-wrap: nowrap; 
+    border-bottom: 2px solid #9dab86; 
+    margin-bottom: 5px; 
+    white-space: nowrap;
+    position: relative;
+}
+#siac-rm-greyout {
+    position: absolute;
+    display: none;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    opacity: 0.4;
+    background-color: black;
+    z-index: 5;
+}
+.siac-prio-slider, .siac-prio-slider-small {
+    width: 250px;
+    -webkit-appearance: none; 
+    appearance: none;
+    background: #d3d3d3; 
+    outline: none;
+    opacity: 0.7; 
+    transition: opacity .2s;
+    height: 10px;
+    border-radius: 3px;
+}
+.siac-prio-slider-small {
+    width: 150px;
+    height: 8px;
+}
+.siac-prio-slider:hover, .siac-prio-slider-small:hover {
+    opacity: 1;
+  }
+  .siac-prio-slider::-webkit-slider-thumb, .siac-prio-slider-small::-webkit-slider-thumb {
+    -webkit-appearance: none;
+    appearance: none;
+    width: 15px;
+    height: 20px;
+    background: #2496dc;
+    cursor: pointer;
+    border-radius: 3px;
+  }
+  .siac-prio-slider::-webkit-slider-thumb:hover, .siac-prio-slider-small::-webkit-slider-thumb:hover {
+      filter: brightness(1.4);
+  }
+label input:checked ~ span {
+    font-weight: bold;
+}
+body.siac-left-right-switched #siac-right-side {
+    border-right: 2px solid #9dab86;
+}
+#siac-right-side {
+    border-left: 2px solid #9dab86;
+}
\ No newline at end of file
diff --git a/web/pdf_reader_khaki.css b/web/pdf_reader_khaki.css
new file mode 100644
index 00000000..f4e0b9ee
--- /dev/null
+++ b/web/pdf_reader_khaki.css
@@ -0,0 +1,863 @@
+body.siac-reading-modal-displayed #siac-right-side {
+    border-left: 2px solid #f6d198;
+}
+#siac-reading-modal {
+    display: none;
+    position: absolute;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    right: 0;
+    background-color: #2f2f31;
+    color: white;
+    padding: 12px;
+    padding-bottom: 6px;
+    font-size: 12px;
+    z-index: 7;
+    border-radius: 5px;
+    overflow: hidden;
+}
+
+#siac-reading-modal a:not(.siac-disabled) {
+    color: #f6d198 !important;
+}
+#siac-reading-modal a.greyedout, #siac-reading-modal a.active {
+    color: lightgray !important;
+}
+.siac-clickable-anchor.tab.active {
+    text-decoration: underline;
+}
+.siac-pdf-main-color {
+    color: #f6d198;
+}
+.siac-rm-main-color-hover:hover {
+    color: #f6d198;
+    cursor: pointer;
+}
+.siac-modal-small.dark, #siac-reading-modal .siac-modal-small {
+    border: 3px outset #f6d198;
+    background: #2f2f31;
+    color: white;
+}
+
+#siac-cloze-btn {
+    margin-bottom: 7px;
+    text-align: center;
+    color:#f6d198;
+    cursor:pointer;
+    user-select: none;
+}
+#siac-cloze-btn:hover {
+    transform: scale(1.03);
+    filter: brightness(1.4);
+}
+.siac-btn-small-dropdown-inverted {
+    display: none;
+    position: absolute;
+    color: white;
+    background-color: #2f2f31;
+    width: 200px;
+    padding: 0px 4px 0px 4px;
+    height: 135px;
+    top: -114px;
+    left: -181px;
+    border: 2px outset #f6d198; 
+    z-index: 5;
+    transition: all 0.3s;
+}
+.siac-dropdown-inverted-item {
+    margin: 3px 0 2px 0;
+    text-align: left;
+    width: 100%;
+    color: #f6d198;
+    text-align: center;
+    height: 16px;
+    font-size: 13px !important;
+}
+.siac-dropdown-inverted-item:hover {
+    filter: brightness(1.4);
+}
+#siac-tt-web-btn {
+    color:#f6d198;
+    cursor:pointer;
+    position: absolute;
+    top: 5px;
+    right: 5px;
+    height: 20px;
+    width: 20px;
+    background-position: center;
+    background-repeat: no-repeat;
+    background-size: 20px 20px;
+}
+#siac-tt-web-btn:hover {
+    transform: scale(1.03);
+    filter: brightness(1.4);
+}
+#siac-pdf-br-notify {
+    display: none; 
+    position: absolute; 
+    z-index: 4; 
+    bottom: 50px; 
+    right: 45px; 
+    border: 3px outset #f6d198; 
+    border-radius: 3px; 
+    color: lightgrey; 
+    background: #2f2f31; 
+    padding: 15px;
+}
+#siac-pdf-overlay {
+    display: none;
+    position: absolute;
+    bottom: 35px;
+    right: 0; left: 0;
+    z-index: 4;
+    user-select: none;
+    background-color: #43a047;
+    border-radius: 7px;
+    border: 4px outset green;
+    padding: 2px 4px 4px 4px;
+    width: 200px;
+    text-align: center;
+    color: white;
+    margin-left: auto;
+    margin-right: auto;
+}
+#siac-pdf-mark-btn {
+    padding: 4px 3px 5px 4px;
+    z-index: 3;
+    border: 3px outset #2496dc;
+    border-radius: 3px;
+    margin-right: 14px;
+    display: inline-block;
+    max-width: 30px;
+    transition: all 0.4s;
+    overflow: hidden;
+    white-space: nowrap;
+}
+#siac-pdf-mark-btn:hover {
+    border-color: #67c3fc;
+}
+#siac-pdf-mark-btn:hover img {
+    filter: brightness(1.4);
+}
+#siac-pdf-mark-btn > div {
+    display: none;
+}
+#siac-pdf-mark-btn.expanded > div{
+    display: inline-block;
+}
+#siac-pdf-mark-btn.expanded {
+    max-width: 400px;
+}
+#siac-pdf-mark-btn.expanded img {
+    float: left;
+    margin-top: 2px !important;
+}
+.siac-mark-btn-inner {
+    display: inline-block;
+    border: 2px outset grey;
+    border-radius: 3px;
+    margin-left: 5px;
+    font-size: 11px !important;
+    padding: 1px 4px 1px 4px;
+    cursor: pointer;
+}
+.siac-mark-btn-inner.active {
+    border-color: #2496dc;
+}
+.siac-mark-btn-inner:hover {
+    border-color: #43b7ff;
+}
+.siac-pdf-mark-lbl,#siac-iframe-btn {
+    display: inline-block;
+    margin-right: 10px;
+    font-size: 13px;
+    border: 3px outset #2496dc;
+    border-radius: 4px;
+    padding: 4px 6px 4px 6px;
+    background: #2f2f31;
+    color: white;
+    z-index: 4;
+    user-select: none;
+}
+.siac-pdf-mark-lbl > b:hover {
+    color: #f6d198;
+    cursor: pointer;
+}
+#siac-pdf-overlay-top {
+    position: absolute;
+    top: 4px;
+    left: 0px;
+    width: 100%;
+    z-index: 4;
+}
+#siac-pdf-top {
+    width: 100%; 
+    flex: 1 1 auto;
+    position:relative; 
+    height: calc(100% - 90px); 
+    overflow-y: auto; 
+    text-align: center;
+    margin-top: 20px;
+}
+#siac-text-top-wr {
+    flex: 1 1 auto;
+    margin-top: 20px;
+}
+#siac-text-top {
+    text-align: left;
+    padding: 10px;
+
+}
+#siac-iframe {
+    width: 100%;
+    flex: 1 1 auto;
+    display: none;
+}
+#siac-iframe-btn {
+    position: absolute;
+    left: 0px;
+    top: 50px;
+}
+#siac-schedule-dialog-btn {
+    margin-left: 8px;
+}
+#siac-schedule-dialog-btn > svg {
+    vertical-align: middle;
+    margin-bottom: 2px;
+}
+#siac-schedule-dialog-btn.active > svg {
+    filter: brightness(1.4);
+}
+#siac-close-iframe-btn {
+    z-index: 4;
+    position: absolute;
+    right: 0px;
+    top: 5px;
+    display: none;
+    font-size: 13px;
+    border: 3px outset #2496dc;
+    border-radius: 4px;
+    padding: 4px 6px 4px 6px;
+    background: #2f2f31;
+    color: white;
+    user-select: none;
+}
+#siac-close-iframe-btn:hover {
+    border-color: #67c3fc;
+}
+#siac-iframe-btn:hover {
+    border-color: #67c3fc;
+}
+#siac-iframe-btn > div {
+    display: none;
+}
+#siac-iframe-btn.expanded > div {
+    display: inline-block;
+}
+#siac-quick-sched-btn, #siac-mark-jump-btn, #siac-pdf-search-btn {
+    position: absolute;
+    z-index: 4;
+    left: 0;
+}
+#siac-quick-sched-btn {
+    bottom: 43px;
+    padding: 2px 3px 2px 3px;
+}
+#siac-mark-jump-btn {
+    bottom: 76px;
+    padding: 4px 3px 4px 3px;
+}
+#siac-pdf-search-btn {
+    bottom: 111px;
+    padding: 4px 3px 4px 3px;
+}
+#siac-quick-sched-btn > .expanded-hidden, #siac-mark-jump-btn > .expanded-hidden, #siac-pdf-search-btn > .expanded-hidden {
+    display: none;
+    vertical-align: middle;
+}
+#siac-quick-sched-btn .siac-read-icn {
+    margin: 0;
+    vertical-align: middle;
+}
+#siac-quick-sched-btn.expanded > .expanded-hidden, #siac-mark-jump-btn.expanded > .expanded-hidden, #siac-pdf-search-btn.expanded > .expanded-hidden {
+    display: inline-block;
+}
+#siac-mark-jump-btn:hover img, #siac-pdf-search-btn:hover img {
+    filter: brightness(1.4);
+}
+#siac-mark-jump-btn.expanded img, #siac-pdf-search-btn.expanded img {
+    float: left;
+    margin-top: 2px;
+}
+#siac-pdf-search-btn.expanded img { 
+    margin-top: 5px;
+}
+#siac-pdf-search-btn-inner input:focus {
+    outline-width: 0;
+}
+#siac-iframe-btn input {
+    width: 100%;
+    background: #2f2f31;
+    color: white;
+    border-color: white;
+    border-radius: 3px;
+    padding-left: 4px;
+    vertical-align: top;
+    box-sizing: border-box;
+}
+#siac-iframe-btn input:focus {
+    outline: none;
+}
+#siac-iframe-btn.expanded {
+    max-width: 400px;
+}
+#siac-iframe-btn label:hover {
+    color: #f6d198;
+    cursor: pointer;
+}
+.siac-url-ch {
+   color: #f6d198; 
+   margin-bottom: 4px;
+}
+.siac-url-ch:hover {
+    filter: brightness(1.4);
+}
+#siac-pdf-tooltip {
+	position: absolute;
+	display: none;
+	z-index: 999;
+    background-color: #2f2f31;
+	color: white;
+    padding: 9px;
+	border-radius: 5px;
+    border: 4px outset #f6d198;
+    transition: all 0.5s;
+}
+
+#siac-pdf-read-btn,#siac-pdf-more-btn {
+    border-radius: 4px;
+    border: 3px outset #43a047;
+    padding: 1px 5px 1px 5px;
+    background-color: #2f2f31;
+    color: beige;
+}
+#siac-pdf-read-btn:hover,#siac-pdf-more-btn:hover {
+    color: white;
+    border: 3px outset #69B36C;
+    background-color: #2f3030;
+}
+#siac-pdf-night-btn {
+    padding-left: 4px;
+    padding-right: 4px;
+}
+#siac-pdf-tooltip-results-area {
+	overflow-y: auto;
+    overflow-x: hidden;
+    width: calc(100% - 18px);
+	padding-right: 8px;
+    padding-left: 3px;
+}
+#siac-pdf-tooltip-bottom {
+    text-align: center;
+}
+#siac-tooltip-center {
+    position: absolute;
+    top: 7px;
+    left: 7px;
+    cursor: pointer;
+    display: inline-block;
+    color: #f6d198;
+    border: 3px solid #f6d198;
+    border-radius: 2px;
+    width: 9px;
+    height: 9px;
+}
+#siac-pdf-tooltip-top {
+    text-align: center;
+}
+#siac-tooltip-center:hover {
+    filter: brightness(1.4);
+}
+#siac-pdf-tooltip-searchbar {
+    width: calc(100% - 14px);
+    margin-top: 15px;
+    margin-bottom: 5px;
+    border-radius: 4px;
+    background-color: #2f2f31;
+    color: white;
+    border-color: white;
+    padding-left: 4px;
+}
+#siac-pdf-tooltip-searchbar:focus {
+    outline: none;
+}
+#siac-pdf-page-inp {
+    background: #2f2f31;
+    color: beige;
+}
+#siac-reading-modal-bottom-bar {
+    width: 100%; 
+    flex: 0 0 auto; 
+    position: relative; 
+    border-top: 2px solid #f6d198; 
+    margin-top: 5px; 
+    padding: 2px 0 0 5px; 
+    overflow: hidden; 
+    user-select: none;
+}
+#siac-pdf-bottom-tab {
+    display: inline-block;
+    max-height: 89px;
+    overflow: hidden;
+    overflow-y: auto;
+    vertical-align: top;
+    margin-top: 4px;
+    padding: 0 5px 0 0;
+    box-sizing: border-box;
+}
+.siac-reading-modal-button-bar-wrapper {
+    flex: 0 0 30px; 
+    width: 100%; 
+    text-align: center; 
+    margin-top: 15px; 
+    position: relative; 
+}
+#siac-marks-display {
+    vertical-align: top;
+    height: 100%;
+}
+.siac-related-notes-item {
+    color: grey;
+    cursor: pointer;
+}
+.siac-related-notes-item:hover {
+    color: lightgrey;
+}
+#siac-marks-display::-webkit-scrollbar {
+    display: none;
+}
+#siac-marks-display td:nth-child(2) {
+    word-wrap: break-word; 
+    white-space: normal;
+    padding-left: 5px;
+}
+.siac-page-mark-link {
+    display: inline-block;
+    cursor: pointer;
+    color: #f6d198;
+    font-weight: bold;
+}
+.siac-page-mark-link:hover {
+    filter: brightness(1.4);
+}
+.siac-field-picker-opt {
+    display: inline-block;
+    font-size: 15px;
+    line-height: 18px;;
+    color: #f6d198;
+    cursor: pointer;
+    user-select: none;
+}
+.siac-field-picker-opt:hover {
+    filter: brightness(1.4);
+    transform: scale(1.04);
+}
+#siac-reading-modal-top-btns {
+    position: absolute;
+    top: 7px; right: 25px;
+    text-align: center;
+    vertical-align: middle;
+    z-index: 6;
+}
+#siac-reading-modal-top-btns div:hover {
+    color: white;
+}
+#siac-reading-modal-top-btns siac-btn {
+    line-height: 13px;
+}
+#siac-reading-modal-top-btns span {
+    border: 1px solid lightgrey; 
+    height: 11px; 
+    width: 4px;
+    margin: 0;
+    vertical-align: middle;
+    display: inline-block;
+}
+#siac-reading-modal-top-btns div:hover span {
+    border-color: white;
+}
+#siac-reading-modal-change-theme {
+    position: absolute;
+    right: 0;
+    bottom: 4px;
+    cursor: pointer;    
+}
+#siac-reading-modal-change-theme > a {
+    color:lightgrey !important;
+}
+.siac-queue-picker-icn {
+    margin-left: 25px; cursor: pointer; font-weight: bold; color: #f6d198;
+    display: inline-block;
+}
+.siac-queue-picker-icn:not(.siac-disabled):hover {
+    transform: scale(1.4);
+    filter: brightness(140%);
+}
+#siac-queue-sched-wrapper {
+    padding: 5px 0 0 0;
+    max-width: 0px;
+    overflow: hidden;
+    display: inline-block;
+    transition: max-width 0.6s;
+    transform: translateZ(0);
+}
+.siac-queue-sched-btn, .siac-queue-sched-btn-hor {
+    display: inline-block;
+    font-size: 13px;
+    padding: 2px;
+    border: 2px solid #2496dc;;
+    color: lightblue;
+    user-select: none;
+    cursor: pointer;
+    text-align: center;
+    border-radius: 4px;
+}
+.siac-queue-sched-btn {
+    writing-mode: vertical-lr;
+    height: 90px;
+}
+.siac-queue-sched-btn.siac-prio-5 {
+    height: 80px;
+}
+.siac-queue-sched-btn.siac-prio-4 {
+    height: 70px;
+}
+.siac-queue-sched-btn.siac-prio-3 {
+    height: 60px;
+}
+.siac-queue-sched-btn.siac-prio-2 {
+    height: 50px;
+}
+.siac-queue-sched-btn.siac-prio-1 {
+    height: 40px;
+}
+.siac-queue-sched-btn-hor {
+    vertical-align: top;
+    margin: 40px 5px 0px 5px;
+}
+.siac-queue-sched-btn:hover, .siac-queue-sched-btn-hor:hover {
+    color: white;
+    border-color: white;
+    transform: scale(1.04);
+}
+.siac-queue-sched-btn.active, .siac-queue-sched-btn-hor.active {
+    color: white;
+    border-color: #f6d198;
+}
+.siac-queue-sched-btn.active:hover, .siac-queue-sched-btn-hor.active:hover {
+   filter: brightness(140%);
+}
+
+.siac-queue-sched-hor-sep {
+    display: inline-block;
+    height: 50px;
+    width: 20px;
+    margin: 0 10px 0 10px;
+    border-top: 2px solid lightgrey;
+    border-style: dotted;
+    border-width: 2px 0 0 0;
+}
+.siac-clickable-anchor {
+    cursor: pointer;
+    background-color: inherit !important;
+    display: inline-block;
+    border: 1px solid transparent;
+}
+.siac-clickable-anchor.siac-disabled,.siac-queue-picker-icn.siac-disabled,.siac-page-mark-link.siac-disabled,.siac-queue-sched-btn.siac-disabled {
+    color: grey !important;
+}
+.siac-sched-icn.siac-disabled {
+    opacity: 0.3;
+}
+.siac-sched-icn line, .siac-sched-icn ellipse {
+    stroke: #f6d198 !important;
+}
+.siac-sched-icn.grey line, .siac-sched-icn.grey ellipse {
+    stroke: lightgrey !important;
+}
+.siac-queue-sched-btn.siac-disabled {
+    border-color: grey !important;
+}
+.siac-clickable-anchor:not(.siac-disabled):hover {
+    transform: scale(1.02);
+    filter: brightness(140%);
+}
+#siac-queue-infobox-wrapper {
+    position: relative;
+    display: inline-block;
+    vertical-align: top;
+    margin-left: 14px;
+}
+#siac-queue-infobox {
+    position: absolute;
+    top: 0;
+    left: 0;
+    display: none;
+    width: 300px;
+    height: 102px;
+    border: 3px outset #f6d198;
+}
+#siac-queue-infobox:after {
+    content: " ";
+    position: absolute;
+    right: 100%;
+    top: var(--ttop);
+    margin-top: -11px;
+    border-width: 11px;
+    border-style: solid;
+    border-color: transparent #f6d198 transparent transparent;
+    transition: all ease 0.2s;
+}
+#siac-reading-modal-timer {
+    font-size: 30px;
+    user-select: none;
+    font-weight: bold;
+    line-height: 1em;
+}
+.siac-timer-btn {
+    cursor: pointer;
+    margin-right: 5px;
+    font-size: 11px;
+    line-height: 1em;
+    display: inline-block;
+}
+.siac-timer-btn:hover {
+    transform: scale(1.2);
+    user-select: none;
+}
+.siac-timer-btn.active {
+    color: #f6d198;
+    font-weight: bold;
+}
+#siac-timer-play-btn {
+    font-size: 19px;
+    line-height: 19px;
+    cursor: pointer;
+    user-select: none;
+    display: inline-block;
+}
+#siac-timer-play-btn:hover {
+    transform: scale(1.05);
+}
+#siac-reading-modal-center img {
+    display: block;
+    margin-left: auto !important;
+    margin-right: auto !important;
+}
+#siac-timer-popup {
+    z-index: 9999999;
+    background: #2f2f31;
+    color: white;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    padding: 15px;
+    width: 300px;
+    border: 4px outset #f6d198;
+    border-radius: 5px;
+    display: none;
+}
+#siac-pdf-top::-webkit-scrollbar:horizontal {
+    height: 10px !important;
+}
+#siac-pdf-top::-webkit-scrollbar, #siac-pdf-bottom-tab::-webkit-scrollbar,#siac-pdf-tooltip-results-area::-webkit-scrollbar, body.nightMode ::-webkit-scrollbar {
+    width: 10px !important;
+    background: #313d45 !important;
+    border-radius: 4px !important;
+}
+ #siac-pdf-top::-webkit-scrollbar-thumb, body.nightMode ::-webkit-scrollbar-thumb,#siac-pdf-tooltip-results-area::-webkit-scrollbar-thumb, #siac-pdf-bottom-tab::-webkit-scrollbar-thumb {
+    background: #515d71 !important;
+    border-radius: 4px !important;
+} 
+.siac-pdf-loader {
+    width: 250px; 
+    padding: 15px; 
+    position: relative; 
+    text-align: center;
+    border: 3px outset #f6d198;
+    background: #2f2f31;
+    color: white;
+}
+.tox-tinymce-aux {
+    z-index: 2147483638 !important;
+}
+.tox .tox-menu {
+    z-index: 2147483638 !important;
+}
+#siac-text-top-wr > div {
+    height: 100% !important;
+}
+.siac-pdf-mark-lbl {
+    font-weight: bold;
+}
+.siac-note-title-only {
+    font-weight: bold;
+    overflow: ellipsis;
+    user-select: none;
+    cursor: pointer;
+}
+body.night_mode .siac-note-title-only {
+    color: lightgrey;
+}
+.siac-note-title-only:hover {
+    filter: brightness(1.4);
+}
+#siac-reading-modal-tabs-left {
+    font-family: 'Open Sans', sans-serif;
+    margin: 10px 5px 0 5px;
+    padding: 10px 15px 5px 0;
+    border-top: 2px solid;
+    margin-top: 10px;
+    border-top: 2px solid #f6d198;
+}
+#siac-reading-modal-tabs-left .siac-btn {
+    color: #b2b2a0;
+    border-color: #b2b2a0;
+    margin-left: 4px;
+}
+#siac-reading-modal-tabs-left .siac-btn.active {
+    color: #61c3ff !important;
+    border-color: #2496dc !important;
+}
+.siac-pdf-main-color-border-bottom {
+    border-bottom: 2px solid #f6d198;
+}
+.siac-pdf-main-color-border-top {
+    border-top: 2px solid #f6d198;
+}
+#siac-left-tab-browse,#siac-left-tab-pdfs {
+    font-family: 'Open Sans', sans-serif;
+    flex: 1 1 auto;
+    width: 100%;
+    box-sizing: border-box;
+    padding: 0 10px 0 10px;
+    overflow: hidden;
+}
+#siac-left-tab-browse input,#siac-left-tab-pdfs input {
+    border-radius: 4px;
+    padding-left: 3px;
+}       
+body.nightMode #siac-left-tab-browse input, body.nightMode #siac-left-tab-pdfs input {
+    background: #333333;
+    color: lightgrey;
+}
+.siac-pdf-color-btn {
+    height: 18px; 
+    width: 18px; 
+    border-radius: 4px;
+    margin-bottom: 4px;
+    border: 2px solid transparent;
+    cursor: pointer;
+}
+.siac-pdf-color-btn.active,.siac-pdf-ul-btn.active {
+    border-color: white !important;
+}
+.siac-hl {
+    position: absolute;
+    mix-blend-mode: multiply !important;
+    z-index: 2;
+    border-radius: 7px;
+}
+.siac-text-hl {
+    mix-blend-mode: normal !important;
+    z-index: 3;
+    border: 3px outset #2496dc;
+    font-family: 'Open Sans', sans-serif;
+    white-space: pre-wrap;
+    outline: none;
+}
+#siac-pdf-top.siac-pdf-night .siac-text-hl {
+    /* color: lightgrey; */
+    background: beige !important;
+    border-color: #44fdb0 !important;
+}
+.siac-pdf-ul-btn {
+    height: 5px; 
+    width: 18px; 
+    border: 2px solid transparent;
+    margin-bottom: 4px;
+    border-radius: 4px;
+    cursor: pointer;
+}
+#siac-reading-modal-top-btns > div {
+    height: 24px;
+    width: 24px;
+    box-sizing: border-box;
+    background-size: 17px 17px;
+    padding: 0 !important;
+    background-repeat: no-repeat;
+    background-position: center;
+}
+#siac-reading-modal-top-bar {
+    min-height: 77px; 
+    width: 100%; 
+    flex: 0 0 77px; 
+    display: flex; 
+    flex-wrap: nowrap; 
+    border-bottom: 2px solid #f6d198; 
+    margin-bottom: 5px; 
+    white-space: nowrap;
+    position: relative;
+}
+#siac-rm-greyout {
+    position: absolute;
+    display: none;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    opacity: 0.4;
+    background-color: black;
+    z-index: 5;
+}
+.siac-prio-slider, .siac-prio-slider-small {
+    width: 250px;
+    -webkit-appearance: none; 
+    appearance: none;
+    background: #d3d3d3; 
+    outline: none;
+    opacity: 0.7; 
+    transition: opacity .2s;
+    height: 10px;
+    border-radius: 3px;
+}
+.siac-prio-slider-small {
+    width: 150px;
+    height: 8px;
+}
+.siac-prio-slider:hover, .siac-prio-slider-small:hover {
+    opacity: 1;
+  }
+  .siac-prio-slider::-webkit-slider-thumb, .siac-prio-slider-small::-webkit-slider-thumb {
+    -webkit-appearance: none;
+    appearance: none;
+    width: 15px;
+    height: 20px;
+    background: #2496dc;
+    cursor: pointer;
+    border-radius: 3px;
+  }
+  .siac-prio-slider::-webkit-slider-thumb:hover, .siac-prio-slider-small::-webkit-slider-thumb:hover {
+      filter: brightness(1.4);
+  }
+label input:checked ~ span {
+    font-weight: bold;
+}
+body.siac-left-right-switched #siac-right-side {
+    border-right: 2px solid #f6d198;
+}
+#siac-right-side {
+    border-left: 2px solid #f6d198;
+}
\ No newline at end of file
diff --git a/web/pdf_reader_lightblue.css b/web/pdf_reader_lightblue.css
new file mode 100644
index 00000000..06323cc7
--- /dev/null
+++ b/web/pdf_reader_lightblue.css
@@ -0,0 +1,863 @@
+body.siac-reading-modal-displayed #siac-right-side {
+    border-left: 2px solid #41b3a3;
+}
+#siac-reading-modal {
+    display: none;
+    position: absolute;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    right: 0;
+    background-color: #2f2f31;
+    color: white;
+    padding: 12px;
+    padding-bottom: 6px;
+    font-size: 12px;
+    z-index: 7;
+    border-radius: 5px;
+    overflow: hidden;
+}
+
+#siac-reading-modal a:not(.siac-disabled) {
+    color: #41b3a3 !important;
+}
+#siac-reading-modal a.greyedout, #siac-reading-modal a.active {
+    color: lightgray !important;
+}
+.siac-clickable-anchor.tab.active {
+    text-decoration: underline;
+}
+.siac-pdf-main-color {
+    color: #41b3a3;
+}
+.siac-rm-main-color-hover:hover {
+    color: #41b3a3;
+    cursor: pointer;
+}
+.siac-modal-small.dark, #siac-reading-modal .siac-modal-small {
+    border: 3px outset #41b3a3;
+    background: #2f2f31;
+    color: white;
+}
+
+#siac-cloze-btn {
+    margin-bottom: 7px;
+    text-align: center;
+    color:#41b3a3;
+    cursor:pointer;
+    user-select: none;
+}
+#siac-cloze-btn:hover {
+    transform: scale(1.03);
+    filter: brightness(1.4);
+}
+.siac-btn-small-dropdown-inverted {
+    display: none;
+    position: absolute;
+    color: white;
+    background-color: #2f2f31;
+    width: 200px;
+    padding: 0px 4px 0px 4px;
+    height: 135px;
+    top: -114px;
+    left: -181px;
+    border: 2px outset #41b3a3; 
+    z-index: 5;
+    transition: all 0.3s;
+}
+.siac-dropdown-inverted-item {
+    margin: 3px 0 2px 0;
+    text-align: left;
+    width: 100%;
+    color: #41b3a3;
+    text-align: center;
+    height: 16px;
+    font-size: 13px !important;
+}
+.siac-dropdown-inverted-item:hover {
+    filter: brightness(1.4);
+}
+#siac-tt-web-btn {
+    color:#41b3a3;
+    cursor:pointer;
+    position: absolute;
+    top: 5px;
+    right: 5px;
+    height: 20px;
+    width: 20px;
+    background-position: center;
+    background-repeat: no-repeat;
+    background-size: 20px 20px;
+}
+#siac-tt-web-btn:hover {
+    transform: scale(1.03);
+    filter: brightness(1.4);
+}
+#siac-pdf-br-notify {
+    display: none; 
+    position: absolute; 
+    z-index: 4; 
+    bottom: 50px; 
+    right: 45px; 
+    border: 3px outset #41b3a3; 
+    border-radius: 3px; 
+    color: lightgrey; 
+    background: #2f2f31; 
+    padding: 15px;
+}
+#siac-pdf-overlay {
+    display: none;
+    position: absolute;
+    bottom: 35px;
+    right: 0; left: 0;
+    z-index: 4;
+    user-select: none;
+    background-color: #43a047;
+    border-radius: 7px;
+    border: 4px outset green;
+    padding: 2px 4px 4px 4px;
+    width: 200px;
+    text-align: center;
+    color: white;
+    margin-left: auto;
+    margin-right: auto;
+}
+#siac-pdf-mark-btn {
+    padding: 4px 3px 5px 4px;
+    z-index: 3;
+    border: 3px outset #2496dc;
+    border-radius: 3px;
+    margin-right: 14px;
+    display: inline-block;
+    max-width: 30px;
+    transition: all 0.4s;
+    overflow: hidden;
+    white-space: nowrap;
+}
+#siac-pdf-mark-btn:hover {
+    border-color: #67c3fc;
+}
+#siac-pdf-mark-btn:hover img {
+    filter: brightness(1.4);
+}
+#siac-pdf-mark-btn > div {
+    display: none;
+}
+#siac-pdf-mark-btn.expanded > div{
+    display: inline-block;
+}
+#siac-pdf-mark-btn.expanded {
+    max-width: 400px;
+}
+#siac-pdf-mark-btn.expanded img {
+    float: left;
+    margin-top: 2px !important;
+}
+.siac-mark-btn-inner {
+    display: inline-block;
+    border: 2px outset grey;
+    border-radius: 3px;
+    margin-left: 5px;
+    font-size: 11px !important;
+    padding: 1px 4px 1px 4px;
+    cursor: pointer;
+}
+.siac-mark-btn-inner.active {
+    border-color: #2496dc;
+}
+.siac-mark-btn-inner:hover {
+    border-color: #43b7ff;
+}
+.siac-pdf-mark-lbl,#siac-iframe-btn {
+    display: inline-block;
+    margin-right: 10px;
+    font-size: 13px;
+    border: 3px outset #2496dc;
+    border-radius: 4px;
+    padding: 4px 6px 4px 6px;
+    background: #2f2f31;
+    color: white;
+    z-index: 4;
+    user-select: none;
+}
+.siac-pdf-mark-lbl > b:hover {
+    color: #41b3a3;
+    cursor: pointer;
+}
+#siac-pdf-overlay-top {
+    position: absolute;
+    top: 4px;
+    left: 0px;
+    width: 100%;
+    z-index: 4;
+}
+#siac-pdf-top {
+    width: 100%; 
+    flex: 1 1 auto;
+    position:relative; 
+    height: calc(100% - 90px); 
+    overflow-y: auto; 
+    text-align: center;
+    margin-top: 20px;
+}
+#siac-text-top-wr {
+    flex: 1 1 auto;
+    margin-top: 20px;
+}
+#siac-text-top {
+    text-align: left;
+    padding: 10px;
+
+}
+#siac-iframe {
+    width: 100%;
+    flex: 1 1 auto;
+    display: none;
+}
+#siac-iframe-btn {
+    position: absolute;
+    left: 0px;
+    top: 50px;
+}
+#siac-schedule-dialog-btn {
+    margin-left: 8px;
+}
+#siac-schedule-dialog-btn > svg {
+    vertical-align: middle;
+    margin-bottom: 2px;
+}
+#siac-schedule-dialog-btn.active > svg {
+    filter: brightness(1.4);
+}
+#siac-close-iframe-btn {
+    z-index: 4;
+    position: absolute;
+    right: 0px;
+    top: 5px;
+    display: none;
+    font-size: 13px;
+    border: 3px outset #2496dc;
+    border-radius: 4px;
+    padding: 4px 6px 4px 6px;
+    background: #2f2f31;
+    color: white;
+    user-select: none;
+}
+#siac-close-iframe-btn:hover {
+    border-color: #67c3fc;
+}
+#siac-iframe-btn:hover {
+    border-color: #67c3fc;
+}
+#siac-iframe-btn > div {
+    display: none;
+}
+#siac-iframe-btn.expanded > div {
+    display: inline-block;
+}
+#siac-quick-sched-btn, #siac-mark-jump-btn, #siac-pdf-search-btn {
+    position: absolute;
+    z-index: 4;
+    left: 0;
+}
+#siac-quick-sched-btn {
+    bottom: 43px;
+    padding: 2px 3px 2px 3px;
+}
+#siac-mark-jump-btn {
+    bottom: 76px;
+    padding: 4px 3px 4px 3px;
+}
+#siac-pdf-search-btn {
+    bottom: 111px;
+    padding: 4px 3px 4px 3px;
+}
+#siac-quick-sched-btn > .expanded-hidden, #siac-mark-jump-btn > .expanded-hidden, #siac-pdf-search-btn > .expanded-hidden {
+    display: none;
+    vertical-align: middle;
+}
+#siac-quick-sched-btn .siac-read-icn {
+    margin: 0;
+    vertical-align: middle;
+}
+#siac-quick-sched-btn.expanded > .expanded-hidden, #siac-mark-jump-btn.expanded > .expanded-hidden, #siac-pdf-search-btn.expanded > .expanded-hidden {
+    display: inline-block;
+}
+#siac-mark-jump-btn:hover img, #siac-pdf-search-btn:hover img {
+    filter: brightness(1.4);
+}
+#siac-mark-jump-btn.expanded img, #siac-pdf-search-btn.expanded img {
+    float: left;
+    margin-top: 2px;
+}
+#siac-pdf-search-btn.expanded img { 
+    margin-top: 5px;
+}
+#siac-pdf-search-btn-inner input:focus {
+    outline-width: 0;
+}
+#siac-iframe-btn input {
+    width: 100%;
+    background: #2f2f31;
+    color: white;
+    border-color: white;
+    border-radius: 3px;
+    padding-left: 4px;
+    vertical-align: top;
+    box-sizing: border-box;
+}
+#siac-iframe-btn input:focus {
+    outline: none;
+}
+#siac-iframe-btn.expanded {
+    max-width: 400px;
+}
+#siac-iframe-btn label:hover {
+    color: #41b3a3;
+    cursor: pointer;
+}
+.siac-url-ch {
+   color: #85cdca; 
+   margin-bottom: 4px;
+}
+.siac-url-ch:hover {
+    filter: brightness(1.4);
+}
+#siac-pdf-tooltip {
+	position: absolute;
+	display: none;
+	z-index: 999;
+    background-color: #2f2f31;
+	color: white;
+    padding: 9px;
+	border-radius: 5px;
+    border: 4px outset #41b3a3;
+    transition: all 0.5s;
+}
+
+#siac-pdf-read-btn,#siac-pdf-more-btn {
+    border-radius: 4px;
+    border: 3px outset #43a047;
+    padding: 1px 5px 1px 5px;
+    background-color: #2f2f31;
+    color: beige;
+}
+#siac-pdf-read-btn:hover,#siac-pdf-more-btn:hover {
+    color: white;
+    border: 3px outset #69B36C;
+    background-color: #2f3030;
+}
+#siac-pdf-night-btn {
+    padding-left: 4px;
+    padding-right: 4px;
+}
+#siac-pdf-tooltip-results-area {
+	overflow-y: auto;
+    overflow-x: hidden;
+    width: calc(100% - 18px);
+	padding-right: 8px;
+    padding-left: 3px;
+}
+#siac-pdf-tooltip-bottom {
+    text-align: center;
+}
+#siac-tooltip-center {
+    position: absolute;
+    top: 7px;
+    left: 7px;
+    cursor: pointer;
+    display: inline-block;
+    color: #41b3a3;
+    border: 3px solid #41b3a3;
+    border-radius: 2px;
+    width: 9px;
+    height: 9px;
+}
+#siac-pdf-tooltip-top {
+    text-align: center;
+}
+#siac-tooltip-center:hover {
+    filter: brightness(1.4);
+}
+#siac-pdf-tooltip-searchbar {
+    width: calc(100% - 14px);
+    margin-top: 15px;
+    margin-bottom: 5px;
+    border-radius: 4px;
+    background-color: #2f2f31;
+    color: white;
+    border-color: white;
+    padding-left: 4px;
+}
+#siac-pdf-tooltip-searchbar:focus {
+    outline: none;
+}
+#siac-pdf-page-inp {
+    background: #2f2f31;
+    color: beige;
+}
+#siac-reading-modal-bottom-bar {
+    width: 100%; 
+    flex: 0 0 auto; 
+    position: relative; 
+    border-top: 2px solid #41b3a3; 
+    margin-top: 5px; 
+    padding: 2px 0 0 5px; 
+    overflow: hidden; 
+    user-select: none;
+}
+#siac-pdf-bottom-tab {
+    display: inline-block;
+    max-height: 89px;
+    overflow: hidden;
+    overflow-y: auto;
+    vertical-align: top;
+    margin-top: 4px;
+    padding: 0 5px 0 0;
+    box-sizing: border-box;
+}
+.siac-reading-modal-button-bar-wrapper {
+    flex: 0 0 30px; 
+    width: 100%; 
+    text-align: center; 
+    margin-top: 15px; 
+    position: relative; 
+}
+#siac-marks-display {
+    vertical-align: top;
+    height: 100%;
+}
+.siac-related-notes-item {
+    color: grey;
+    cursor: pointer;
+}
+.siac-related-notes-item:hover {
+    color: lightgrey;
+}
+#siac-marks-display::-webkit-scrollbar {
+    display: none;
+}
+#siac-marks-display td:nth-child(2) {
+    word-wrap: break-word; 
+    white-space: normal;
+    padding-left: 5px;
+}
+.siac-page-mark-link {
+    display: inline-block;
+    cursor: pointer;
+    color: #41b3a3;
+    font-weight: bold;
+}
+.siac-page-mark-link:hover {
+    filter: brightness(1.4);
+}
+.siac-field-picker-opt {
+    display: inline-block;
+    font-size: 15px;
+    line-height: 18px;;
+    color: #41b3a3;
+    cursor: pointer;
+    user-select: none;
+}
+.siac-field-picker-opt:hover {
+    filter: brightness(1.4);
+    transform: scale(1.04);
+}
+#siac-reading-modal-top-btns {
+    position: absolute;
+    top: 7px; right: 25px;
+    text-align: center;
+    vertical-align: middle;
+    z-index: 6;
+}
+#siac-reading-modal-top-btns div:hover {
+    color: white;
+}
+#siac-reading-modal-top-btns siac-btn {
+    line-height: 13px;
+}
+#siac-reading-modal-top-btns span {
+    border: 1px solid lightgrey; 
+    height: 11px; 
+    width: 4px;
+    margin: 0;
+    vertical-align: middle;
+    display: inline-block;
+}
+#siac-reading-modal-top-btns div:hover span {
+    border-color: white;
+}
+#siac-reading-modal-change-theme {
+    position: absolute;
+    right: 0;
+    bottom: 4px;
+    cursor: pointer;    
+}
+#siac-reading-modal-change-theme > a {
+    color:lightgrey !important;
+}
+.siac-queue-picker-icn {
+    margin-left: 25px; cursor: pointer; font-weight: bold; color: #41b3a3;
+    display: inline-block;
+}
+.siac-queue-picker-icn:not(.siac-disabled):hover {
+    transform: scale(1.4);
+    filter: brightness(140%);
+}
+#siac-queue-sched-wrapper {
+    padding: 5px 0 0 0;
+    max-width: 0px;
+    overflow: hidden;
+    display: inline-block;
+    transition: max-width 0.6s;
+    transform: translateZ(0);
+}
+.siac-queue-sched-btn, .siac-queue-sched-btn-hor {
+    display: inline-block;
+    font-size: 13px;
+    padding: 2px;
+    border: 2px solid #2496dc;;
+    color: lightblue;
+    user-select: none;
+    cursor: pointer;
+    text-align: center;
+    border-radius: 4px;
+}
+.siac-queue-sched-btn {
+    writing-mode: vertical-lr;
+    height: 90px;
+}
+.siac-queue-sched-btn.siac-prio-5 {
+    height: 80px;
+}
+.siac-queue-sched-btn.siac-prio-4 {
+    height: 70px;
+}
+.siac-queue-sched-btn.siac-prio-3 {
+    height: 60px;
+}
+.siac-queue-sched-btn.siac-prio-2 {
+    height: 50px;
+}
+.siac-queue-sched-btn.siac-prio-1 {
+    height: 40px;
+}
+.siac-queue-sched-btn-hor {
+    vertical-align: top;
+    margin: 40px 5px 0px 5px;
+}
+.siac-queue-sched-btn:hover, .siac-queue-sched-btn-hor:hover {
+    color: white;
+    border-color: white;
+    transform: scale(1.04);
+}
+.siac-queue-sched-btn.active, .siac-queue-sched-btn-hor.active {
+    color: white;
+    border-color: #41b3a3;
+}
+.siac-queue-sched-btn.active:hover, .siac-queue-sched-btn-hor.active:hover {
+   filter: brightness(140%);
+}
+
+.siac-queue-sched-hor-sep {
+    display: inline-block;
+    height: 50px;
+    width: 20px;
+    margin: 0 10px 0 10px;
+    border-top: 2px solid lightgrey;
+    border-style: dotted;
+    border-width: 2px 0 0 0;
+}
+.siac-clickable-anchor {
+    cursor: pointer;
+    background-color: inherit !important;
+    display: inline-block;
+    border: 1px solid transparent;
+}
+.siac-clickable-anchor.siac-disabled,.siac-queue-picker-icn.siac-disabled,.siac-page-mark-link.siac-disabled,.siac-queue-sched-btn.siac-disabled {
+    color: grey !important;
+}
+.siac-sched-icn.siac-disabled {
+    opacity: 0.3;
+}
+.siac-sched-icn line, .siac-sched-icn ellipse {
+    stroke: #41b3a3 !important;
+}
+.siac-sched-icn.grey line, .siac-sched-icn.grey ellipse {
+    stroke: lightgrey !important;
+}
+.siac-queue-sched-btn.siac-disabled {
+    border-color: grey !important;
+}
+.siac-clickable-anchor:not(.siac-disabled):hover {
+    transform: scale(1.02);
+    filter: brightness(140%);
+}
+#siac-queue-infobox-wrapper {
+    position: relative;
+    display: inline-block;
+    vertical-align: top;
+    margin-left: 14px;
+}
+#siac-queue-infobox {
+    position: absolute;
+    top: 0;
+    left: 0;
+    display: none;
+    width: 300px;
+    height: 102px;
+    border: 3px outset #41b3a3;
+}
+#siac-queue-infobox:after {
+    content: " ";
+    position: absolute;
+    right: 100%;
+    top: var(--ttop);
+    margin-top: -11px;
+    border-width: 11px;
+    border-style: solid;
+    border-color: transparent #41b3a3 transparent transparent;
+    transition: all ease 0.2s;
+}
+#siac-reading-modal-timer {
+    font-size: 30px;
+    user-select: none;
+    font-weight: bold;
+    line-height: 1em;
+}
+.siac-timer-btn {
+    cursor: pointer;
+    margin-right: 5px;
+    font-size: 11px;
+    line-height: 1em;
+    display: inline-block;
+}
+.siac-timer-btn:hover {
+    transform: scale(1.2);
+    user-select: none;
+}
+.siac-timer-btn.active {
+    color: #41b3a3;
+    font-weight: bold;
+}
+#siac-timer-play-btn {
+    font-size: 19px;
+    line-height: 19px;
+    cursor: pointer;
+    user-select: none;
+    display: inline-block;
+}
+#siac-timer-play-btn:hover {
+    transform: scale(1.05);
+}
+#siac-reading-modal-center img {
+    display: block;
+    margin-left: auto !important;
+    margin-right: auto !important;
+}
+#siac-timer-popup {
+    z-index: 9999999;
+    background: #2f2f31;
+    color: white;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    padding: 15px;
+    width: 300px;
+    border: 4px outset #41b3a3;
+    border-radius: 5px;
+    display: none;
+}
+#siac-pdf-top::-webkit-scrollbar:horizontal {
+    height: 10px !important;
+}
+#siac-pdf-top::-webkit-scrollbar, #siac-pdf-bottom-tab::-webkit-scrollbar,#siac-pdf-tooltip-results-area::-webkit-scrollbar, body.nightMode ::-webkit-scrollbar {
+    width: 10px !important;
+    background: #313d45 !important;
+    border-radius: 4px !important;
+}
+ #siac-pdf-top::-webkit-scrollbar-thumb, body.nightMode ::-webkit-scrollbar-thumb,#siac-pdf-tooltip-results-area::-webkit-scrollbar-thumb, #siac-pdf-bottom-tab::-webkit-scrollbar-thumb {
+    background: #515d71 !important;
+    border-radius: 4px !important;
+} 
+.siac-pdf-loader {
+    width: 250px; 
+    padding: 15px; 
+    position: relative; 
+    text-align: center;
+    border: 3px outset #41b3a3;
+    background: #2f2f31;
+    color: white;
+}
+.tox-tinymce-aux {
+    z-index: 2147483638 !important;
+}
+.tox .tox-menu {
+    z-index: 2147483638 !important;
+}
+#siac-text-top-wr > div {
+    height: 100% !important;
+}
+.siac-pdf-mark-lbl {
+    font-weight: bold;
+}
+.siac-note-title-only {
+    font-weight: bold;
+    overflow: ellipsis;
+    user-select: none;
+    cursor: pointer;
+}
+body.night_mode .siac-note-title-only {
+    color: lightgrey;
+}
+.siac-note-title-only:hover {
+    filter: brightness(1.4);
+}
+#siac-reading-modal-tabs-left {
+    font-family: 'Open Sans', sans-serif;
+    margin: 10px 5px 0 5px;
+    padding: 10px 15px 5px 0;
+    border-top: 2px solid;
+    margin-top: 10px;
+    border-top: 2px solid #41b3a3;
+}
+#siac-reading-modal-tabs-left .siac-btn {
+    color: #b2b2a0;
+    border-color: #b2b2a0;
+    margin-left: 4px;
+}
+#siac-reading-modal-tabs-left .siac-btn.active {
+    color: #61c3ff !important;
+    border-color: #2496dc !important;
+}
+.siac-pdf-main-color-border-bottom {
+    border-bottom: 2px solid #41b3a3;
+}
+.siac-pdf-main-color-border-top {
+    border-top: 2px solid #41b3a3;
+}
+#siac-left-tab-browse,#siac-left-tab-pdfs {
+    font-family: 'Open Sans', sans-serif;
+    flex: 1 1 auto;
+    width: 100%;
+    box-sizing: border-box;
+    padding: 0 10px 0 10px;
+    overflow: hidden;
+}
+#siac-left-tab-browse input,#siac-left-tab-pdfs input {
+    border-radius: 4px;
+    padding-left: 3px;
+}       
+body.nightMode #siac-left-tab-browse input, body.nightMode #siac-left-tab-pdfs input {
+    background: #333333;
+    color: lightgrey;
+}
+.siac-pdf-color-btn {
+    height: 18px; 
+    width: 18px; 
+    border-radius: 4px;
+    margin-bottom: 4px;
+    border: 2px solid transparent;
+    cursor: pointer;
+}
+.siac-pdf-color-btn.active,.siac-pdf-ul-btn.active {
+    border-color: white !important;
+}
+.siac-hl {
+    position: absolute;
+    mix-blend-mode: multiply !important;
+    z-index: 2;
+    border-radius: 7px;
+}
+.siac-text-hl {
+    mix-blend-mode: normal !important;
+    z-index: 3;
+    border: 3px outset #2496dc;
+    font-family: 'Open Sans', sans-serif;
+    white-space: pre-wrap;
+    outline: none;
+}
+#siac-pdf-top.siac-pdf-night .siac-text-hl {
+    /* color: lightgrey; */
+    background: beige !important;
+    border-color: #44fdb0 !important;
+}
+.siac-pdf-ul-btn {
+    height: 5px; 
+    width: 18px; 
+    border: 2px solid transparent;
+    margin-bottom: 4px;
+    border-radius: 4px;
+    cursor: pointer;
+}
+#siac-reading-modal-top-btns > div {
+    height: 24px;
+    width: 24px;
+    box-sizing: border-box;
+    background-size: 17px 17px;
+    padding: 0 !important;
+    background-repeat: no-repeat;
+    background-position: center;
+}
+#siac-reading-modal-top-bar {
+    min-height: 77px; 
+    width: 100%; 
+    flex: 0 0 77px; 
+    display: flex; 
+    flex-wrap: nowrap; 
+    border-bottom: 2px solid #41b3a3; 
+    margin-bottom: 5px; 
+    white-space: nowrap;
+    position: relative;
+}
+#siac-rm-greyout {
+    position: absolute;
+    display: none;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    opacity: 0.4;
+    background-color: black;
+    z-index: 5;
+}
+.siac-prio-slider, .siac-prio-slider-small {
+    width: 250px;
+    -webkit-appearance: none; 
+    appearance: none;
+    background: #d3d3d3; 
+    outline: none;
+    opacity: 0.7; 
+    transition: opacity .2s;
+    height: 10px;
+    border-radius: 3px;
+}
+.siac-prio-slider-small {
+    width: 150px;
+    height: 8px;
+}
+.siac-prio-slider:hover, .siac-prio-slider-small:hover {
+    opacity: 1;
+  }
+  .siac-prio-slider::-webkit-slider-thumb, .siac-prio-slider-small::-webkit-slider-thumb {
+    -webkit-appearance: none;
+    appearance: none;
+    width: 15px;
+    height: 20px;
+    background: #2496dc;
+    cursor: pointer;
+    border-radius: 3px;
+  }
+  .siac-prio-slider::-webkit-slider-thumb:hover, .siac-prio-slider-small::-webkit-slider-thumb:hover {
+      filter: brightness(1.4);
+  }
+label input:checked ~ span {
+    font-weight: bold;
+}
+body.siac-left-right-switched #siac-right-side {
+    border-right: 2px solid #41b3a3;
+}
+#siac-right-side {
+    border-left: 2px solid #41b3a3;
+}
\ No newline at end of file
diff --git a/web/pdf_reader_lightgreen.css b/web/pdf_reader_lightgreen.css
new file mode 100644
index 00000000..e1355454
--- /dev/null
+++ b/web/pdf_reader_lightgreen.css
@@ -0,0 +1,863 @@
+body.siac-reading-modal-displayed #siac-right-side {
+    border-left: 2px solid #9dab86;
+}
+#siac-reading-modal {
+    display: none;
+    position: absolute;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    right: 0;
+    background-color: #2f2f31;
+    color: white;
+    padding: 12px;
+    padding-bottom: 6px;
+    font-size: 12px;
+    z-index: 7;
+    border-radius: 5px;
+    overflow: hidden;
+}
+
+#siac-reading-modal a:not(.siac-disabled) {
+    color: #9dab86 !important;
+}
+#siac-reading-modal a.greyedout, #siac-reading-modal a.active {
+    color: lightgray !important;
+}
+.siac-clickable-anchor.tab.active {
+    text-decoration: underline;
+}
+.siac-pdf-main-color {
+    color: #9dab86;
+}
+.siac-rm-main-color-hover:hover {
+    color: #9dab86;
+    cursor: pointer;
+}
+.siac-modal-small.dark, #siac-reading-modal .siac-modal-small {
+    border: 3px outset #9dab86;
+    background: #2f2f31;
+    color: white;
+}
+
+#siac-cloze-btn {
+    margin-bottom: 7px;
+    text-align: center;
+    color:#9dab86;
+    cursor:pointer;
+    user-select: none;
+}
+#siac-cloze-btn:hover {
+    transform: scale(1.03);
+    filter: brightness(1.4);
+}
+.siac-btn-small-dropdown-inverted {
+    display: none;
+    position: absolute;
+    color: white;
+    background-color: #2f2f31;
+    width: 200px;
+    padding: 0px 4px 0px 4px;
+    height: 135px;
+    top: -114px;
+    left: -181px;
+    border: 2px outset #9dab86; 
+    z-index: 5;
+    transition: all 0.3s;
+}
+.siac-dropdown-inverted-item {
+    margin: 3px 0 2px 0;
+    text-align: left;
+    width: 100%;
+    color: #9dab86;
+    text-align: center;
+    height: 16px;
+    font-size: 13px !important;
+}
+.siac-dropdown-inverted-item:hover {
+    filter: brightness(1.4);
+}
+#siac-tt-web-btn {
+    color:#9dab86;
+    cursor:pointer;
+    position: absolute;
+    top: 5px;
+    right: 5px;
+    height: 20px;
+    width: 20px;
+    background-position: center;
+    background-repeat: no-repeat;
+    background-size: 20px 20px;
+}
+#siac-tt-web-btn:hover {
+    transform: scale(1.03);
+    filter: brightness(1.4);
+}
+#siac-pdf-br-notify {
+    display: none; 
+    position: absolute; 
+    z-index: 4; 
+    bottom: 50px; 
+    right: 45px; 
+    border: 3px outset #9dab86; 
+    border-radius: 3px; 
+    color: lightgrey; 
+    background: #2f2f31; 
+    padding: 15px;
+}
+#siac-pdf-overlay {
+    display: none;
+    position: absolute;
+    bottom: 35px;
+    right: 0; left: 0;
+    z-index: 4;
+    user-select: none;
+    background-color: #43a047;
+    border-radius: 7px;
+    border: 4px outset green;
+    padding: 2px 4px 4px 4px;
+    width: 200px;
+    text-align: center;
+    color: white;
+    margin-left: auto;
+    margin-right: auto;
+}
+#siac-pdf-mark-btn {
+    padding: 4px 3px 5px 4px;
+    z-index: 3;
+    border: 3px outset #2496dc;
+    border-radius: 3px;
+    margin-right: 14px;
+    display: inline-block;
+    max-width: 30px;
+    transition: all 0.4s;
+    overflow: hidden;
+    white-space: nowrap;
+}
+#siac-pdf-mark-btn:hover {
+    border-color: #67c3fc;
+}
+#siac-pdf-mark-btn:hover img {
+    filter: brightness(1.4);
+}
+#siac-pdf-mark-btn > div {
+    display: none;
+}
+#siac-pdf-mark-btn.expanded > div{
+    display: inline-block;
+}
+#siac-pdf-mark-btn.expanded {
+    max-width: 400px;
+}
+#siac-pdf-mark-btn.expanded img {
+    float: left;
+    margin-top: 2px !important;
+}
+.siac-mark-btn-inner {
+    display: inline-block;
+    border: 2px outset grey;
+    border-radius: 3px;
+    margin-left: 5px;
+    font-size: 11px !important;
+    padding: 1px 4px 1px 4px;
+    cursor: pointer;
+}
+.siac-mark-btn-inner.active {
+    border-color: #2496dc;
+}
+.siac-mark-btn-inner:hover {
+    border-color: #43b7ff;
+}
+.siac-pdf-mark-lbl,#siac-iframe-btn {
+    display: inline-block;
+    margin-right: 10px;
+    font-size: 13px;
+    border: 3px outset #2496dc;
+    border-radius: 4px;
+    padding: 4px 6px 4px 6px;
+    background: #2f2f31;
+    color: white;
+    z-index: 4;
+    user-select: none;
+}
+.siac-pdf-mark-lbl > b:hover {
+    color: #9dab86;
+    cursor: pointer;
+}
+#siac-pdf-overlay-top {
+    position: absolute;
+    top: 4px;
+    left: 0px;
+    width: 100%;
+    z-index: 4;
+}
+#siac-pdf-top {
+    width: 100%; 
+    flex: 1 1 auto;
+    position:relative; 
+    height: calc(100% - 90px); 
+    overflow-y: auto; 
+    text-align: center;
+    margin-top: 20px;
+}
+#siac-text-top-wr {
+    flex: 1 1 auto;
+    margin-top: 20px;
+}
+#siac-text-top {
+    text-align: left;
+    padding: 10px;
+
+}
+#siac-iframe {
+    width: 100%;
+    flex: 1 1 auto;
+    display: none;
+}
+#siac-iframe-btn {
+    position: absolute;
+    left: 0px;
+    top: 50px;
+}
+#siac-schedule-dialog-btn {
+    margin-left: 8px;
+}
+#siac-schedule-dialog-btn > svg {
+    vertical-align: middle;
+    margin-bottom: 2px;
+}
+#siac-schedule-dialog-btn.active > svg {
+    filter: brightness(1.4);
+}
+#siac-close-iframe-btn {
+    z-index: 4;
+    position: absolute;
+    right: 0px;
+    top: 5px;
+    display: none;
+    font-size: 13px;
+    border: 3px outset #2496dc;
+    border-radius: 4px;
+    padding: 4px 6px 4px 6px;
+    background: #2f2f31;
+    color: white;
+    user-select: none;
+}
+#siac-close-iframe-btn:hover {
+    border-color: #67c3fc;
+}
+#siac-iframe-btn:hover {
+    border-color: #67c3fc;
+}
+#siac-iframe-btn > div {
+    display: none;
+}
+#siac-iframe-btn.expanded > div {
+    display: inline-block;
+}
+#siac-quick-sched-btn, #siac-mark-jump-btn, #siac-pdf-search-btn {
+    position: absolute;
+    z-index: 4;
+    left: 0;
+}
+#siac-quick-sched-btn {
+    bottom: 43px;
+    padding: 2px 3px 2px 3px;
+}
+#siac-mark-jump-btn {
+    bottom: 76px;
+    padding: 4px 3px 4px 3px;
+}
+#siac-pdf-search-btn {
+    bottom: 111px;
+    padding: 4px 3px 4px 3px;
+}
+#siac-quick-sched-btn > .expanded-hidden, #siac-mark-jump-btn > .expanded-hidden, #siac-pdf-search-btn > .expanded-hidden {
+    display: none;
+    vertical-align: middle;
+}
+#siac-quick-sched-btn .siac-read-icn {
+    margin: 0;
+    vertical-align: middle;
+}
+#siac-quick-sched-btn.expanded > .expanded-hidden, #siac-mark-jump-btn.expanded > .expanded-hidden, #siac-pdf-search-btn.expanded > .expanded-hidden {
+    display: inline-block;
+}
+#siac-mark-jump-btn:hover img, #siac-pdf-search-btn:hover img {
+    filter: brightness(1.4);
+}
+#siac-mark-jump-btn.expanded img, #siac-pdf-search-btn.expanded img {
+    float: left;
+    margin-top: 2px;
+}
+#siac-pdf-search-btn.expanded img { 
+    margin-top: 5px;
+}
+#siac-pdf-search-btn-inner input:focus {
+    outline-width: 0;
+}
+#siac-iframe-btn input {
+    width: 100%;
+    background: #2f2f31;
+    color: white;
+    border-color: white;
+    border-radius: 3px;
+    padding-left: 4px;
+    vertical-align: top;
+    box-sizing: border-box;
+}
+#siac-iframe-btn input:focus {
+    outline: none;
+}
+#siac-iframe-btn.expanded {
+    max-width: 400px;
+}
+#siac-iframe-btn label:hover {
+    color: #9dab86;
+    cursor: pointer;
+}
+.siac-url-ch {
+   color: #9dab86; 
+   margin-bottom: 4px;
+}
+.siac-url-ch:hover {
+    filter: brightness(1.4);
+}
+#siac-pdf-tooltip {
+	position: absolute;
+	display: none;
+	z-index: 999;
+    background-color: #2f2f31;
+	color: white;
+    padding: 9px;
+	border-radius: 5px;
+    border: 4px outset #9dab86;
+    transition: all 0.5s;
+}
+
+#siac-pdf-read-btn,#siac-pdf-more-btn {
+    border-radius: 4px;
+    border: 3px outset #43a047;
+    padding: 1px 5px 1px 5px;
+    background-color: #2f2f31;
+    color: beige;
+}
+#siac-pdf-read-btn:hover,#siac-pdf-more-btn:hover {
+    color: white;
+    border: 3px outset #69B36C;
+    background-color: #2f3030;
+}
+#siac-pdf-night-btn {
+    padding-left: 4px;
+    padding-right: 4px;
+}
+#siac-pdf-tooltip-results-area {
+	overflow-y: auto;
+    overflow-x: hidden;
+    width: calc(100% - 18px);
+	padding-right: 8px;
+    padding-left: 3px;
+}
+#siac-pdf-tooltip-bottom {
+    text-align: center;
+}
+#siac-tooltip-center {
+    position: absolute;
+    top: 7px;
+    left: 7px;
+    cursor: pointer;
+    display: inline-block;
+    color: #9dab86;
+    border: 3px solid #9dab86;
+    border-radius: 2px;
+    width: 9px;
+    height: 9px;
+}
+#siac-pdf-tooltip-top {
+    text-align: center;
+}
+#siac-tooltip-center:hover {
+    filter: brightness(1.4);
+}
+#siac-pdf-tooltip-searchbar {
+    width: calc(100% - 14px);
+    margin-top: 15px;
+    margin-bottom: 5px;
+    border-radius: 4px;
+    background-color: #2f2f31;
+    color: white;
+    border-color: white;
+    padding-left: 4px;
+}
+#siac-pdf-tooltip-searchbar:focus {
+    outline: none;
+}
+#siac-pdf-page-inp {
+    background: #2f2f31;
+    color: beige;
+}
+#siac-reading-modal-bottom-bar {
+    width: 100%; 
+    flex: 0 0 auto; 
+    position: relative; 
+    border-top: 2px solid #9dab86; 
+    margin-top: 5px; 
+    padding: 2px 0 0 5px; 
+    overflow: hidden; 
+    user-select: none;
+}
+#siac-pdf-bottom-tab {
+    display: inline-block;
+    max-height: 89px;
+    overflow: hidden;
+    overflow-y: auto;
+    vertical-align: top;
+    margin-top: 4px;
+    padding: 0 5px 0 0;
+    box-sizing: border-box;
+}
+.siac-reading-modal-button-bar-wrapper {
+    flex: 0 0 30px; 
+    width: 100%; 
+    text-align: center; 
+    margin-top: 15px; 
+    position: relative; 
+}
+#siac-marks-display {
+    vertical-align: top;
+    height: 100%;
+}
+.siac-related-notes-item {
+    color: grey;
+    cursor: pointer;
+}
+.siac-related-notes-item:hover {
+    color: lightgrey;
+}
+#siac-marks-display::-webkit-scrollbar {
+    display: none;
+}
+#siac-marks-display td:nth-child(2) {
+    word-wrap: break-word; 
+    white-space: normal;
+    padding-left: 5px;
+}
+.siac-page-mark-link {
+    display: inline-block;
+    cursor: pointer;
+    color: #9dab86;
+    font-weight: bold;
+}
+.siac-page-mark-link:hover {
+    filter: brightness(1.4);
+}
+.siac-field-picker-opt {
+    display: inline-block;
+    font-size: 15px;
+    line-height: 18px;;
+    color: #9dab86;
+    cursor: pointer;
+    user-select: none;
+}
+.siac-field-picker-opt:hover {
+    filter: brightness(1.4);
+    transform: scale(1.04);
+}
+#siac-reading-modal-top-btns {
+    position: absolute;
+    top: 7px; right: 25px;
+    text-align: center;
+    vertical-align: middle;
+    z-index: 6;
+}
+#siac-reading-modal-top-btns div:hover {
+    color: white;
+}
+#siac-reading-modal-top-btns siac-btn {
+    line-height: 13px;
+}
+#siac-reading-modal-top-btns span {
+    border: 1px solid lightgrey; 
+    height: 11px; 
+    width: 4px;
+    margin: 0;
+    vertical-align: middle;
+    display: inline-block;
+}
+#siac-reading-modal-top-btns div:hover span {
+    border-color: white;
+}
+#siac-reading-modal-change-theme {
+    position: absolute;
+    right: 0;
+    bottom: 4px;
+    cursor: pointer;    
+}
+#siac-reading-modal-change-theme > a {
+    color:lightgrey !important;
+}
+.siac-queue-picker-icn {
+    margin-left: 25px; cursor: pointer; font-weight: bold; color: #9dab86;
+    display: inline-block;
+}
+.siac-queue-picker-icn:not(.siac-disabled):hover {
+    transform: scale(1.4);
+    filter: brightness(140%);
+}
+#siac-queue-sched-wrapper {
+    padding: 5px 0 0 0;
+    max-width: 0px;
+    overflow: hidden;
+    display: inline-block;
+    transition: max-width 0.6s;
+    transform: translateZ(0);
+}
+.siac-queue-sched-btn, .siac-queue-sched-btn-hor {
+    display: inline-block;
+    font-size: 13px;
+    padding: 2px;
+    border: 2px solid #2496dc;;
+    color: lightblue;
+    user-select: none;
+    cursor: pointer;
+    text-align: center;
+    border-radius: 4px;
+}
+.siac-queue-sched-btn {
+    writing-mode: vertical-lr;
+    height: 90px;
+}
+.siac-queue-sched-btn.siac-prio-5 {
+    height: 80px;
+}
+.siac-queue-sched-btn.siac-prio-4 {
+    height: 70px;
+}
+.siac-queue-sched-btn.siac-prio-3 {
+    height: 60px;
+}
+.siac-queue-sched-btn.siac-prio-2 {
+    height: 50px;
+}
+.siac-queue-sched-btn.siac-prio-1 {
+    height: 40px;
+}
+.siac-queue-sched-btn-hor {
+    vertical-align: top;
+    margin: 40px 5px 0px 5px;
+}
+.siac-queue-sched-btn:hover, .siac-queue-sched-btn-hor:hover {
+    color: white;
+    border-color: white;
+    transform: scale(1.04);
+}
+.siac-queue-sched-btn.active, .siac-queue-sched-btn-hor.active {
+    color: white;
+    border-color: #9dab86;
+}
+.siac-queue-sched-btn.active:hover, .siac-queue-sched-btn-hor.active:hover {
+   filter: brightness(140%);
+}
+
+.siac-queue-sched-hor-sep {
+    display: inline-block;
+    height: 50px;
+    width: 20px;
+    margin: 0 10px 0 10px;
+    border-top: 2px solid lightgrey;
+    border-style: dotted;
+    border-width: 2px 0 0 0;
+}
+.siac-clickable-anchor {
+    cursor: pointer;
+    background-color: inherit !important;
+    display: inline-block;
+    border: 1px solid transparent;
+}
+.siac-clickable-anchor.siac-disabled,.siac-queue-picker-icn.siac-disabled,.siac-page-mark-link.siac-disabled,.siac-queue-sched-btn.siac-disabled {
+    color: grey !important;
+}
+.siac-sched-icn.siac-disabled {
+    opacity: 0.3;
+}
+.siac-sched-icn line, .siac-sched-icn ellipse {
+    stroke: #9dab86 !important;
+}
+.siac-sched-icn.grey line, .siac-sched-icn.grey ellipse {
+    stroke: lightgrey !important;
+}
+.siac-queue-sched-btn.siac-disabled {
+    border-color: grey !important;
+}
+.siac-clickable-anchor:not(.siac-disabled):hover {
+    transform: scale(1.02);
+    filter: brightness(140%);
+}
+#siac-queue-infobox-wrapper {
+    position: relative;
+    display: inline-block;
+    vertical-align: top;
+    margin-left: 14px;
+}
+#siac-queue-infobox {
+    position: absolute;
+    top: 0;
+    left: 0;
+    display: none;
+    width: 300px;
+    height: 102px;
+    border: 3px outset #9dab86;
+}
+#siac-queue-infobox:after {
+    content: " ";
+    position: absolute;
+    right: 100%;
+    top: var(--ttop);
+    margin-top: -11px;
+    border-width: 11px;
+    border-style: solid;
+    border-color: transparent #9dab86 transparent transparent;
+    transition: all ease 0.2s;
+}
+#siac-reading-modal-timer {
+    font-size: 30px;
+    user-select: none;
+    font-weight: bold;
+    line-height: 1em;
+}
+.siac-timer-btn {
+    cursor: pointer;
+    margin-right: 5px;
+    font-size: 11px;
+    line-height: 1em;
+    display: inline-block;
+}
+.siac-timer-btn:hover {
+    transform: scale(1.2);
+    user-select: none;
+}
+.siac-timer-btn.active {
+    color: #9dab86;
+    font-weight: bold;
+}
+#siac-timer-play-btn {
+    font-size: 19px;
+    line-height: 19px;
+    cursor: pointer;
+    user-select: none;
+    display: inline-block;
+}
+#siac-timer-play-btn:hover {
+    transform: scale(1.05);
+}
+#siac-reading-modal-center img {
+    display: block;
+    margin-left: auto !important;
+    margin-right: auto !important;
+}
+#siac-timer-popup {
+    z-index: 9999999;
+    background: #2f2f31;
+    color: white;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    padding: 15px;
+    width: 300px;
+    border: 4px outset #9dab86;
+    border-radius: 5px;
+    display: none;
+}
+#siac-pdf-top::-webkit-scrollbar:horizontal {
+    height: 10px !important;
+}
+#siac-pdf-top::-webkit-scrollbar, #siac-pdf-bottom-tab::-webkit-scrollbar,#siac-pdf-tooltip-results-area::-webkit-scrollbar, body.nightMode ::-webkit-scrollbar {
+    width: 10px !important;
+    background: #313d45 !important;
+    border-radius: 4px !important;
+}
+ #siac-pdf-top::-webkit-scrollbar-thumb, body.nightMode ::-webkit-scrollbar-thumb,#siac-pdf-tooltip-results-area::-webkit-scrollbar-thumb, #siac-pdf-bottom-tab::-webkit-scrollbar-thumb {
+    background: #515d71 !important;
+    border-radius: 4px !important;
+} 
+.siac-pdf-loader {
+    width: 250px; 
+    padding: 15px; 
+    position: relative; 
+    text-align: center;
+    border: 3px outset #9dab86;
+    background: #2f2f31;
+    color: white;
+}
+.tox-tinymce-aux {
+    z-index: 2147483638 !important;
+}
+.tox .tox-menu {
+    z-index: 2147483638 !important;
+}
+#siac-text-top-wr > div {
+    height: 100% !important;
+}
+.siac-pdf-mark-lbl {
+    font-weight: bold;
+}
+.siac-note-title-only {
+    font-weight: bold;
+    overflow: ellipsis;
+    user-select: none;
+    cursor: pointer;
+}
+body.night_mode .siac-note-title-only {
+    color: lightgrey;
+}
+.siac-note-title-only:hover {
+    filter: brightness(1.4);
+}
+#siac-reading-modal-tabs-left {
+    font-family: 'Open Sans', sans-serif;
+    margin: 10px 5px 0 5px;
+    padding: 10px 15px 5px 0;
+    border-top: 2px solid;
+    margin-top: 10px;
+    border-top: 2px solid #9dab86;
+}
+#siac-reading-modal-tabs-left .siac-btn {
+    color: #b2b2a0;
+    border-color: #b2b2a0;
+    margin-left: 4px;
+}
+#siac-reading-modal-tabs-left .siac-btn.active {
+    color: #61c3ff !important;
+    border-color: #2496dc !important;
+}
+.siac-pdf-main-color-border-bottom {
+    border-bottom: 2px solid #9dab86;
+}
+.siac-pdf-main-color-border-top {
+    border-top: 2px solid #9dab86;
+}
+#siac-left-tab-browse,#siac-left-tab-pdfs {
+    font-family: 'Open Sans', sans-serif;
+    flex: 1 1 auto;
+    width: 100%;
+    box-sizing: border-box;
+    padding: 0 10px 0 10px;
+    overflow: hidden;
+}
+#siac-left-tab-browse input,#siac-left-tab-pdfs input {
+    border-radius: 4px;
+    padding-left: 3px;
+}       
+body.nightMode #siac-left-tab-browse input, body.nightMode #siac-left-tab-pdfs input {
+    background: #333333;
+    color: lightgrey;
+}
+.siac-pdf-color-btn {
+    height: 18px; 
+    width: 18px; 
+    border-radius: 4px;
+    margin-bottom: 4px;
+    border: 2px solid transparent;
+    cursor: pointer;
+}
+.siac-pdf-color-btn.active,.siac-pdf-ul-btn.active {
+    border-color: white !important;
+}
+.siac-hl {
+    position: absolute;
+    mix-blend-mode: multiply !important;
+    z-index: 2;
+    border-radius: 7px;
+}
+.siac-text-hl {
+    mix-blend-mode: normal !important;
+    z-index: 3;
+    border: 3px outset #2496dc;
+    font-family: 'Open Sans', sans-serif;
+    white-space: pre-wrap;
+    outline: none;
+}
+#siac-pdf-top.siac-pdf-night .siac-text-hl {
+    /* color: lightgrey; */
+    background: beige !important;
+    border-color: #44fdb0 !important;
+}
+.siac-pdf-ul-btn {
+    height: 5px; 
+    width: 18px; 
+    border: 2px solid transparent;
+    margin-bottom: 4px;
+    border-radius: 4px;
+    cursor: pointer;
+}
+#siac-reading-modal-top-btns > div {
+    height: 24px;
+    width: 24px;
+    box-sizing: border-box;
+    background-size: 17px 17px;
+    padding: 0 !important;
+    background-repeat: no-repeat;
+    background-position: center;
+}
+#siac-reading-modal-top-bar {
+    min-height: 77px; 
+    width: 100%; 
+    flex: 0 0 77px; 
+    display: flex; 
+    flex-wrap: nowrap; 
+    border-bottom: 2px solid #9dab86; 
+    margin-bottom: 5px; 
+    white-space: nowrap;
+    position: relative;
+}
+#siac-rm-greyout {
+    position: absolute;
+    display: none;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    opacity: 0.4;
+    background-color: black;
+    z-index: 5;
+}
+.siac-prio-slider, .siac-prio-slider-small {
+    width: 250px;
+    -webkit-appearance: none; 
+    appearance: none;
+    background: #d3d3d3; 
+    outline: none;
+    opacity: 0.7; 
+    transition: opacity .2s;
+    height: 10px;
+    border-radius: 3px;
+}
+.siac-prio-slider-small {
+    width: 150px;
+    height: 8px;
+}
+.siac-prio-slider:hover, .siac-prio-slider-small:hover {
+    opacity: 1;
+  }
+  .siac-prio-slider::-webkit-slider-thumb, .siac-prio-slider-small::-webkit-slider-thumb {
+    -webkit-appearance: none;
+    appearance: none;
+    width: 15px;
+    height: 20px;
+    background: #2496dc;
+    cursor: pointer;
+    border-radius: 3px;
+  }
+  .siac-prio-slider::-webkit-slider-thumb:hover, .siac-prio-slider-small::-webkit-slider-thumb:hover {
+      filter: brightness(1.4);
+  }
+label input:checked ~ span {
+    font-weight: bold;
+}
+body.siac-left-right-switched #siac-right-side {
+    border-right: 2px solid #9dab86;
+}
+#siac-right-side {
+    border-left: 2px solid #9dab86;
+}
\ No newline at end of file
diff --git a/web/pdf_reader_lightsalmon.css b/web/pdf_reader_lightsalmon.css
new file mode 100644
index 00000000..d1b633c6
--- /dev/null
+++ b/web/pdf_reader_lightsalmon.css
@@ -0,0 +1,863 @@
+body.siac-reading-modal-displayed #siac-right-side {
+    border-left: 2px solid #ffb385;
+}
+#siac-reading-modal {
+    display: none;
+    position: absolute;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    right: 0;
+    background-color: #2f2f31;
+    color: white;
+    padding: 12px;
+    padding-bottom: 6px;
+    font-size: 12px;
+    z-index: 7;
+    border-radius: 5px;
+    overflow: hidden;
+}
+
+#siac-reading-modal a:not(.siac-disabled) {
+    color: #ffb385 !important;
+}
+#siac-reading-modal a.greyedout, #siac-reading-modal a.active {
+    color: lightgray !important;
+}
+.siac-clickable-anchor.tab.active {
+    text-decoration: underline;
+}
+.siac-pdf-main-color {
+    color: #ffb385;
+}
+.siac-rm-main-color-hover:hover {
+    color: #ffb385;
+    cursor: pointer;
+}
+.siac-modal-small.dark, #siac-reading-modal .siac-modal-small {
+    border: 3px outset #ffb385;
+    background: #2f2f31;
+    color: white;
+}
+
+#siac-cloze-btn {
+    margin-bottom: 7px;
+    text-align: center;
+    color:#ffb385;
+    cursor:pointer;
+    user-select: none;
+}
+#siac-cloze-btn:hover {
+    transform: scale(1.03);
+    filter: brightness(1.4);
+}
+.siac-btn-small-dropdown-inverted {
+    display: none;
+    position: absolute;
+    color: white;
+    background-color: #2f2f31;
+    width: 200px;
+    padding: 0px 4px 0px 4px;
+    height: 135px;
+    top: -114px;
+    left: -181px;
+    border: 2px outset #ffb385; 
+    z-index: 5;
+    transition: all 0.3s;
+}
+.siac-dropdown-inverted-item {
+    margin: 3px 0 2px 0;
+    text-align: left;
+    width: 100%;
+    color: #ffb385;
+    text-align: center;
+    height: 16px;
+    font-size: 13px !important;
+}
+.siac-dropdown-inverted-item:hover {
+    filter: brightness(1.4);
+}
+#siac-tt-web-btn {
+    color:#ffb385;
+    cursor:pointer;
+    position: absolute;
+    top: 5px;
+    right: 5px;
+    height: 20px;
+    width: 20px;
+    background-position: center;
+    background-repeat: no-repeat;
+    background-size: 20px 20px;
+}
+#siac-tt-web-btn:hover {
+    transform: scale(1.03);
+    filter: brightness(1.4);
+}
+#siac-pdf-br-notify {
+    display: none; 
+    position: absolute; 
+    z-index: 4; 
+    bottom: 50px; 
+    right: 45px; 
+    border: 3px outset #ffb385; 
+    border-radius: 3px; 
+    color: lightgrey; 
+    background: #2f2f31; 
+    padding: 15px;
+}
+#siac-pdf-overlay {
+    display: none;
+    position: absolute;
+    bottom: 35px;
+    right: 0; left: 0;
+    z-index: 4;
+    user-select: none;
+    background-color: #43a047;
+    border-radius: 7px;
+    border: 4px outset green;
+    padding: 2px 4px 4px 4px;
+    width: 200px;
+    text-align: center;
+    color: white;
+    margin-left: auto;
+    margin-right: auto;
+}
+#siac-pdf-mark-btn {
+    padding: 4px 3px 5px 4px;
+    z-index: 3;
+    border: 3px outset #2496dc;
+    border-radius: 3px;
+    margin-right: 14px;
+    display: inline-block;
+    max-width: 30px;
+    transition: all 0.4s;
+    overflow: hidden;
+    white-space: nowrap;
+}
+#siac-pdf-mark-btn:hover {
+    border-color: #67c3fc;
+}
+#siac-pdf-mark-btn:hover img {
+    filter: brightness(1.4);
+}
+#siac-pdf-mark-btn > div {
+    display: none;
+}
+#siac-pdf-mark-btn.expanded > div{
+    display: inline-block;
+}
+#siac-pdf-mark-btn.expanded {
+    max-width: 400px;
+}
+#siac-pdf-mark-btn.expanded img {
+    float: left;
+    margin-top: 2px !important;
+}
+.siac-mark-btn-inner {
+    display: inline-block;
+    border: 2px outset grey;
+    border-radius: 3px;
+    margin-left: 5px;
+    font-size: 11px !important;
+    padding: 1px 4px 1px 4px;
+    cursor: pointer;
+}
+.siac-mark-btn-inner.active {
+    border-color: #2496dc;
+}
+.siac-mark-btn-inner:hover {
+    border-color: #43b7ff;
+}
+.siac-pdf-mark-lbl,#siac-iframe-btn {
+    display: inline-block;
+    margin-right: 10px;
+    font-size: 13px;
+    border: 3px outset #2496dc;
+    border-radius: 4px;
+    padding: 4px 6px 4px 6px;
+    background: #2f2f31;
+    color: white;
+    z-index: 4;
+    user-select: none;
+}
+.siac-pdf-mark-lbl > b:hover {
+    color: #ffb385;
+    cursor: pointer;
+}
+#siac-pdf-overlay-top {
+    position: absolute;
+    top: 4px;
+    left: 0px;
+    width: 100%;
+    z-index: 4;
+}
+#siac-pdf-top {
+    width: 100%; 
+    flex: 1 1 auto;
+    position:relative; 
+    height: calc(100% - 90px); 
+    overflow-y: auto; 
+    text-align: center;
+    margin-top: 20px;
+}
+#siac-text-top-wr {
+    flex: 1 1 auto;
+    margin-top: 20px;
+}
+#siac-text-top {
+    text-align: left;
+    padding: 10px;
+
+}
+#siac-iframe {
+    width: 100%;
+    flex: 1 1 auto;
+    display: none;
+}
+#siac-iframe-btn {
+    position: absolute;
+    left: 0px;
+    top: 50px;
+}
+#siac-schedule-dialog-btn {
+    margin-left: 8px;
+}
+#siac-schedule-dialog-btn > svg {
+    vertical-align: middle;
+    margin-bottom: 2px;
+}
+#siac-schedule-dialog-btn.active > svg {
+    filter: brightness(1.4);
+}
+#siac-close-iframe-btn {
+    z-index: 4;
+    position: absolute;
+    right: 0px;
+    top: 5px;
+    display: none;
+    font-size: 13px;
+    border: 3px outset #2496dc;
+    border-radius: 4px;
+    padding: 4px 6px 4px 6px;
+    background: #2f2f31;
+    color: white;
+    user-select: none;
+}
+#siac-close-iframe-btn:hover {
+    border-color: #67c3fc;
+}
+#siac-iframe-btn:hover {
+    border-color: #67c3fc;
+}
+#siac-iframe-btn > div {
+    display: none;
+}
+#siac-iframe-btn.expanded > div {
+    display: inline-block;
+}
+#siac-quick-sched-btn, #siac-mark-jump-btn, #siac-pdf-search-btn {
+    position: absolute;
+    z-index: 4;
+    left: 0;
+}
+#siac-quick-sched-btn {
+    bottom: 43px;
+    padding: 2px 3px 2px 3px;
+}
+#siac-mark-jump-btn {
+    bottom: 76px;
+    padding: 4px 3px 4px 3px;
+}
+#siac-pdf-search-btn {
+    bottom: 111px;
+    padding: 4px 3px 4px 3px;
+}
+#siac-quick-sched-btn > .expanded-hidden, #siac-mark-jump-btn > .expanded-hidden, #siac-pdf-search-btn > .expanded-hidden {
+    display: none;
+    vertical-align: middle;
+}
+#siac-quick-sched-btn .siac-read-icn {
+    margin: 0;
+    vertical-align: middle;
+}
+#siac-quick-sched-btn.expanded > .expanded-hidden, #siac-mark-jump-btn.expanded > .expanded-hidden, #siac-pdf-search-btn.expanded > .expanded-hidden {
+    display: inline-block;
+}
+#siac-mark-jump-btn:hover img, #siac-pdf-search-btn:hover img {
+    filter: brightness(1.4);
+}
+#siac-mark-jump-btn.expanded img, #siac-pdf-search-btn.expanded img {
+    float: left;
+    margin-top: 2px;
+}
+#siac-pdf-search-btn.expanded img { 
+    margin-top: 5px;
+}
+#siac-pdf-search-btn-inner input:focus {
+    outline-width: 0;
+}
+#siac-iframe-btn input {
+    width: 100%;
+    background: #2f2f31;
+    color: white;
+    border-color: white;
+    border-radius: 3px;
+    padding-left: 4px;
+    vertical-align: top;
+    box-sizing: border-box;
+}
+#siac-iframe-btn input:focus {
+    outline: none;
+}
+#siac-iframe-btn.expanded {
+    max-width: 400px;
+}
+#siac-iframe-btn label:hover {
+    color: #ffb385;
+    cursor: pointer;
+}
+.siac-url-ch {
+   color: #ffb385; 
+   margin-bottom: 4px;
+}
+.siac-url-ch:hover {
+    filter: brightness(1.4);
+}
+#siac-pdf-tooltip {
+	position: absolute;
+	display: none;
+	z-index: 999;
+    background-color: #2f2f31;
+	color: white;
+    padding: 9px;
+	border-radius: 5px;
+    border: 4px outset #ffb385;
+    transition: all 0.5s;
+}
+
+#siac-pdf-read-btn,#siac-pdf-more-btn {
+    border-radius: 4px;
+    border: 3px outset #43a047;
+    padding: 1px 5px 1px 5px;
+    background-color: #2f2f31;
+    color: beige;
+}
+#siac-pdf-read-btn:hover,#siac-pdf-more-btn:hover {
+    color: white;
+    border: 3px outset #69B36C;
+    background-color: #2f3030;
+}
+#siac-pdf-night-btn {
+    padding-left: 4px;
+    padding-right: 4px;
+}
+#siac-pdf-tooltip-results-area {
+	overflow-y: auto;
+    overflow-x: hidden;
+    width: calc(100% - 18px);
+	padding-right: 8px;
+    padding-left: 3px;
+}
+#siac-pdf-tooltip-bottom {
+    text-align: center;
+}
+#siac-tooltip-center {
+    position: absolute;
+    top: 7px;
+    left: 7px;
+    cursor: pointer;
+    display: inline-block;
+    color: #ffb385;
+    border: 3px solid #ffb385;
+    border-radius: 2px;
+    width: 9px;
+    height: 9px;
+}
+#siac-pdf-tooltip-top {
+    text-align: center;
+}
+#siac-tooltip-center:hover {
+    filter: brightness(1.4);
+}
+#siac-pdf-tooltip-searchbar {
+    width: calc(100% - 14px);
+    margin-top: 15px;
+    margin-bottom: 5px;
+    border-radius: 4px;
+    background-color: #2f2f31;
+    color: white;
+    border-color: white;
+    padding-left: 4px;
+}
+#siac-pdf-tooltip-searchbar:focus {
+    outline: none;
+}
+#siac-pdf-page-inp {
+    background: #2f2f31;
+    color: beige;
+}
+#siac-reading-modal-bottom-bar {
+    width: 100%; 
+    flex: 0 0 auto; 
+    position: relative; 
+    border-top: 2px solid #ffb385; 
+    margin-top: 5px; 
+    padding: 2px 0 0 5px; 
+    overflow: hidden; 
+    user-select: none;
+}
+#siac-pdf-bottom-tab {
+    display: inline-block;
+    max-height: 89px;
+    overflow: hidden;
+    overflow-y: auto;
+    vertical-align: top;
+    margin-top: 4px;
+    padding: 0 5px 0 0;
+    box-sizing: border-box;
+}
+.siac-reading-modal-button-bar-wrapper {
+    flex: 0 0 30px; 
+    width: 100%; 
+    text-align: center; 
+    margin-top: 15px; 
+    position: relative; 
+}
+#siac-marks-display {
+    vertical-align: top;
+    height: 100%;
+}
+.siac-related-notes-item {
+    color: grey;
+    cursor: pointer;
+}
+.siac-related-notes-item:hover {
+    color: lightgrey;
+}
+#siac-marks-display::-webkit-scrollbar {
+    display: none;
+}
+#siac-marks-display td:nth-child(2) {
+    word-wrap: break-word; 
+    white-space: normal;
+    padding-left: 5px;
+}
+.siac-page-mark-link {
+    display: inline-block;
+    cursor: pointer;
+    color: #ffb385;
+    font-weight: bold;
+}
+.siac-page-mark-link:hover {
+    filter: brightness(1.4);
+}
+.siac-field-picker-opt {
+    display: inline-block;
+    font-size: 15px;
+    line-height: 18px;;
+    color: #ffb385;
+    cursor: pointer;
+    user-select: none;
+}
+.siac-field-picker-opt:hover {
+    filter: brightness(1.4);
+    transform: scale(1.04);
+}
+#siac-reading-modal-top-btns {
+    position: absolute;
+    top: 7px; right: 25px;
+    text-align: center;
+    vertical-align: middle;
+    z-index: 6;
+}
+#siac-reading-modal-top-btns div:hover {
+    color: white;
+}
+#siac-reading-modal-top-btns siac-btn {
+    line-height: 13px;
+}
+#siac-reading-modal-top-btns span {
+    border: 1px solid lightgrey; 
+    height: 11px; 
+    width: 4px;
+    margin: 0;
+    vertical-align: middle;
+    display: inline-block;
+}
+#siac-reading-modal-top-btns div:hover span {
+    border-color: white;
+}
+#siac-reading-modal-change-theme {
+    position: absolute;
+    right: 0;
+    bottom: 4px;
+    cursor: pointer;    
+}
+#siac-reading-modal-change-theme > a {
+    color:lightgrey !important;
+}
+.siac-queue-picker-icn {
+    margin-left: 25px; cursor: pointer; font-weight: bold; color: #ffb385;
+    display: inline-block;
+}
+.siac-queue-picker-icn:not(.siac-disabled):hover {
+    transform: scale(1.4);
+    filter: brightness(140%);
+}
+#siac-queue-sched-wrapper {
+    padding: 5px 0 0 0;
+    max-width: 0px;
+    overflow: hidden;
+    display: inline-block;
+    transition: max-width 0.6s;
+    transform: translateZ(0);
+}
+.siac-queue-sched-btn, .siac-queue-sched-btn-hor {
+    display: inline-block;
+    font-size: 13px;
+    padding: 2px;
+    border: 2px solid #2496dc;;
+    color: lightblue;
+    user-select: none;
+    cursor: pointer;
+    text-align: center;
+    border-radius: 4px;
+}
+.siac-queue-sched-btn {
+    writing-mode: vertical-lr;
+    height: 90px;
+}
+.siac-queue-sched-btn.siac-prio-5 {
+    height: 80px;
+}
+.siac-queue-sched-btn.siac-prio-4 {
+    height: 70px;
+}
+.siac-queue-sched-btn.siac-prio-3 {
+    height: 60px;
+}
+.siac-queue-sched-btn.siac-prio-2 {
+    height: 50px;
+}
+.siac-queue-sched-btn.siac-prio-1 {
+    height: 40px;
+}
+.siac-queue-sched-btn-hor {
+    vertical-align: top;
+    margin: 40px 5px 0px 5px;
+}
+.siac-queue-sched-btn:hover, .siac-queue-sched-btn-hor:hover {
+    color: white;
+    border-color: white;
+    transform: scale(1.04);
+}
+.siac-queue-sched-btn.active, .siac-queue-sched-btn-hor.active {
+    color: white;
+    border-color: #ffb385;
+}
+.siac-queue-sched-btn.active:hover, .siac-queue-sched-btn-hor.active:hover {
+   filter: brightness(140%);
+}
+
+.siac-queue-sched-hor-sep {
+    display: inline-block;
+    height: 50px;
+    width: 20px;
+    margin: 0 10px 0 10px;
+    border-top: 2px solid lightgrey;
+    border-style: dotted;
+    border-width: 2px 0 0 0;
+}
+.siac-clickable-anchor {
+    cursor: pointer;
+    background-color: inherit !important;
+    display: inline-block;
+    border: 1px solid transparent;
+}
+.siac-clickable-anchor.siac-disabled,.siac-queue-picker-icn.siac-disabled,.siac-page-mark-link.siac-disabled,.siac-queue-sched-btn.siac-disabled {
+    color: grey !important;
+}
+.siac-sched-icn.siac-disabled {
+    opacity: 0.3;
+}
+.siac-sched-icn line, .siac-sched-icn ellipse {
+    stroke: #ffb385 !important;
+}
+.siac-sched-icn.grey line, .siac-sched-icn.grey ellipse {
+    stroke: lightgrey !important;
+}
+.siac-queue-sched-btn.siac-disabled {
+    border-color: grey !important;
+}
+.siac-clickable-anchor:not(.siac-disabled):hover {
+    transform: scale(1.02);
+    filter: brightness(140%);
+}
+#siac-queue-infobox-wrapper {
+    position: relative;
+    display: inline-block;
+    vertical-align: top;
+    margin-left: 14px;
+}
+#siac-queue-infobox {
+    position: absolute;
+    top: 0;
+    left: 0;
+    display: none;
+    width: 300px;
+    height: 102px;
+    border: 3px outset #ffb385;
+}
+#siac-queue-infobox:after {
+    content: " ";
+    position: absolute;
+    right: 100%;
+    top: var(--ttop);
+    margin-top: -11px;
+    border-width: 11px;
+    border-style: solid;
+    border-color: transparent #ffb385 transparent transparent;
+    transition: all ease 0.2s;
+}
+#siac-reading-modal-timer {
+    font-size: 30px;
+    user-select: none;
+    font-weight: bold;
+    line-height: 1em;
+}
+.siac-timer-btn {
+    cursor: pointer;
+    margin-right: 5px;
+    font-size: 11px;
+    line-height: 1em;
+    display: inline-block;
+}
+.siac-timer-btn:hover {
+    transform: scale(1.2);
+    user-select: none;
+}
+.siac-timer-btn.active {
+    color: #ffb385;
+    font-weight: bold;
+}
+#siac-timer-play-btn {
+    font-size: 19px;
+    line-height: 19px;
+    cursor: pointer;
+    user-select: none;
+    display: inline-block;
+}
+#siac-timer-play-btn:hover {
+    transform: scale(1.05);
+}
+#siac-reading-modal-center img {
+    display: block;
+    margin-left: auto !important;
+    margin-right: auto !important;
+}
+#siac-timer-popup {
+    z-index: 9999999;
+    background: #2f2f31;
+    color: white;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    padding: 15px;
+    width: 300px;
+    border: 4px outset #ffb385;
+    border-radius: 5px;
+    display: none;
+}
+#siac-pdf-top::-webkit-scrollbar:horizontal {
+    height: 10px !important;
+}
+#siac-pdf-top::-webkit-scrollbar, #siac-pdf-bottom-tab::-webkit-scrollbar,#siac-pdf-tooltip-results-area::-webkit-scrollbar, body.nightMode ::-webkit-scrollbar {
+    width: 10px !important;
+    background: #313d45 !important;
+    border-radius: 4px !important;
+}
+ #siac-pdf-top::-webkit-scrollbar-thumb, body.nightMode ::-webkit-scrollbar-thumb,#siac-pdf-tooltip-results-area::-webkit-scrollbar-thumb, #siac-pdf-bottom-tab::-webkit-scrollbar-thumb {
+    background: #515d71 !important;
+    border-radius: 4px !important;
+} 
+.siac-pdf-loader {
+    width: 250px; 
+    padding: 15px; 
+    position: relative; 
+    text-align: center;
+    border: 3px outset #ffb385;
+    background: #2f2f31;
+    color: white;
+}
+.tox-tinymce-aux {
+    z-index: 2147483638 !important;
+}
+.tox .tox-menu {
+    z-index: 2147483638 !important;
+}
+#siac-text-top-wr > div {
+    height: 100% !important;
+}
+.siac-pdf-mark-lbl {
+    font-weight: bold;
+}
+.siac-note-title-only {
+    font-weight: bold;
+    overflow: ellipsis;
+    user-select: none;
+    cursor: pointer;
+}
+body.night_mode .siac-note-title-only {
+    color: lightgrey;
+}
+.siac-note-title-only:hover {
+    filter: brightness(1.4);
+}
+#siac-reading-modal-tabs-left {
+    font-family: 'Open Sans', sans-serif;
+    margin: 10px 5px 0 5px;
+    padding: 10px 15px 5px 0;
+    border-top: 2px solid;
+    margin-top: 10px;
+    border-top: 2px solid #ffb385;
+}
+#siac-reading-modal-tabs-left .siac-btn {
+    color: #b2b2a0;
+    border-color: #b2b2a0;
+    margin-left: 4px;
+}
+#siac-reading-modal-tabs-left .siac-btn.active {
+    color: #61c3ff !important;
+    border-color: #2496dc !important;
+}
+.siac-pdf-main-color-border-bottom {
+    border-bottom: 2px solid #ffb385;
+}
+.siac-pdf-main-color-border-top {
+    border-top: 2px solid #ffb385;
+}
+#siac-left-tab-browse,#siac-left-tab-pdfs {
+    font-family: 'Open Sans', sans-serif;
+    flex: 1 1 auto;
+    width: 100%;
+    box-sizing: border-box;
+    padding: 0 10px 0 10px;
+    overflow: hidden;
+}
+#siac-left-tab-browse input,#siac-left-tab-pdfs input {
+    border-radius: 4px;
+    padding-left: 3px;
+}       
+body.nightMode #siac-left-tab-browse input, body.nightMode #siac-left-tab-pdfs input {
+    background: #333333;
+    color: lightgrey;
+}
+.siac-pdf-color-btn {
+    height: 18px; 
+    width: 18px; 
+    border-radius: 4px;
+    margin-bottom: 4px;
+    border: 2px solid transparent;
+    cursor: pointer;
+}
+.siac-pdf-color-btn.active,.siac-pdf-ul-btn.active {
+    border-color: white !important;
+}
+.siac-hl {
+    position: absolute;
+    mix-blend-mode: multiply !important;
+    z-index: 2;
+    border-radius: 7px;
+}
+.siac-text-hl {
+    mix-blend-mode: normal !important;
+    z-index: 3;
+    border: 3px outset #2496dc;
+    font-family: 'Open Sans', sans-serif;
+    white-space: pre-wrap;
+    outline: none;
+}
+#siac-pdf-top.siac-pdf-night .siac-text-hl {
+    /* color: lightgrey; */
+    background: beige !important;
+    border-color: #44fdb0 !important;
+}
+.siac-pdf-ul-btn {
+    height: 5px; 
+    width: 18px; 
+    border: 2px solid transparent;
+    margin-bottom: 4px;
+    border-radius: 4px;
+    cursor: pointer;
+}
+#siac-reading-modal-top-btns > div {
+    height: 24px;
+    width: 24px;
+    box-sizing: border-box;
+    background-size: 17px 17px;
+    padding: 0 !important;
+    background-repeat: no-repeat;
+    background-position: center;
+}
+#siac-reading-modal-top-bar {
+    min-height: 77px; 
+    width: 100%; 
+    flex: 0 0 77px; 
+    display: flex; 
+    flex-wrap: nowrap; 
+    border-bottom: 2px solid #ffb385; 
+    margin-bottom: 5px; 
+    white-space: nowrap;
+    position: relative;
+}
+#siac-rm-greyout {
+    position: absolute;
+    display: none;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    opacity: 0.4;
+    background-color: black;
+    z-index: 5;
+}
+.siac-prio-slider, .siac-prio-slider-small {
+    width: 250px;
+    -webkit-appearance: none; 
+    appearance: none;
+    background: #d3d3d3; 
+    outline: none;
+    opacity: 0.7; 
+    transition: opacity .2s;
+    height: 10px;
+    border-radius: 3px;
+}
+.siac-prio-slider-small {
+    width: 150px;
+    height: 8px;
+}
+.siac-prio-slider:hover, .siac-prio-slider-small:hover {
+    opacity: 1;
+  }
+  .siac-prio-slider::-webkit-slider-thumb, .siac-prio-slider-small::-webkit-slider-thumb {
+    -webkit-appearance: none;
+    appearance: none;
+    width: 15px;
+    height: 20px;
+    background: #2496dc;
+    cursor: pointer;
+    border-radius: 3px;
+  }
+  .siac-prio-slider::-webkit-slider-thumb:hover, .siac-prio-slider-small::-webkit-slider-thumb:hover {
+      filter: brightness(1.4);
+  }
+label input:checked ~ span {
+    font-weight: bold;
+}
+body.siac-left-right-switched #siac-right-side {
+    border-right: 2px solid #ffb385;
+}
+#siac-right-side {
+    border-left: 2px solid #ffb385;
+}
\ No newline at end of file
diff --git a/web/pdf_reader_steelblue.css b/web/pdf_reader_steelblue.css
new file mode 100644
index 00000000..f697bd61
--- /dev/null
+++ b/web/pdf_reader_steelblue.css
@@ -0,0 +1,863 @@
+body.siac-reading-modal-displayed #siac-right-side {
+    border-left: 2px solid #2496dc;
+}
+#siac-reading-modal {
+    display: none;
+    position: absolute;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    right: 0;
+    background-color: #2f2f31;
+    color: white;
+    padding: 12px;
+    padding-bottom: 6px;
+    font-size: 12px;
+    z-index: 7;
+    border-radius: 5px;
+    overflow: hidden;
+}
+
+#siac-reading-modal a:not(.siac-disabled) {
+    color: #2496dc !important;
+}
+#siac-reading-modal a.greyedout, #siac-reading-modal a.active {
+    color: lightgray !important;
+}
+.siac-clickable-anchor.tab.active {
+    text-decoration: underline;
+}
+.siac-pdf-main-color {
+    color: #2496dc;
+}
+.siac-rm-main-color-hover:hover {
+    color: #2496dc;
+    cursor: pointer;
+}
+.siac-modal-small.dark, #siac-reading-modal .siac-modal-small {
+    border: 3px outset #2496dc;
+    background: #2f2f31;
+    color: white;
+}
+
+#siac-cloze-btn {
+    margin-bottom: 7px;
+    text-align: center;
+    color:#2496dc;
+    cursor:pointer;
+    user-select: none;
+}
+#siac-cloze-btn:hover {
+    transform: scale(1.03);
+    filter: brightness(1.4);
+}
+.siac-btn-small-dropdown-inverted {
+    display: none;
+    position: absolute;
+    color: white;
+    background-color: #2f2f31;
+    width: 200px;
+    padding: 0px 4px 0px 4px;
+    height: 135px;
+    top: -114px;
+    left: -181px;
+    border: 2px outset #2496dc; 
+    z-index: 5;
+    transition: all 0.3s;
+}
+.siac-dropdown-inverted-item {
+    margin: 3px 0 2px 0;
+    text-align: left;
+    width: 100%;
+    color: #2496dc;
+    text-align: center;
+    height: 16px;
+    font-size: 13px !important;
+}
+.siac-dropdown-inverted-item:hover {
+    filter: brightness(1.4);
+}
+#siac-tt-web-btn {
+    color:#2496dc;
+    cursor:pointer;
+    position: absolute;
+    top: 5px;
+    right: 5px;
+    height: 20px;
+    width: 20px;
+    background-position: center;
+    background-repeat: no-repeat;
+    background-size: 20px 20px;
+}
+#siac-tt-web-btn:hover {
+    transform: scale(1.03);
+    filter: brightness(1.4);
+}
+#siac-pdf-br-notify {
+    display: none; 
+    position: absolute; 
+    z-index: 4; 
+    bottom: 50px; 
+    right: 45px; 
+    border: 3px outset #2496dc; 
+    border-radius: 3px; 
+    color: lightgrey; 
+    background: #2f2f31; 
+    padding: 15px;
+}
+#siac-pdf-overlay {
+    display: none;
+    position: absolute;
+    bottom: 35px;
+    right: 0; left: 0;
+    z-index: 4;
+    user-select: none;
+    background-color: #43a047;
+    border-radius: 7px;
+    border: 4px outset green;
+    padding: 2px 4px 4px 4px;
+    width: 200px;
+    text-align: center;
+    color: white;
+    margin-left: auto;
+    margin-right: auto;
+}
+#siac-pdf-mark-btn {
+    padding: 4px 3px 5px 4px;
+    z-index: 3;
+    border: 3px outset #2496dc;
+    border-radius: 3px;
+    margin-right: 14px;
+    display: inline-block;
+    max-width: 30px;
+    transition: all 0.4s;
+    overflow: hidden;
+    white-space: nowrap;
+}
+#siac-pdf-mark-btn:hover {
+    border-color: #67c3fc;
+}
+#siac-pdf-mark-btn:hover img {
+    filter: brightness(1.4);
+}
+#siac-pdf-mark-btn > div {
+    display: none;
+}
+#siac-pdf-mark-btn.expanded > div{
+    display: inline-block;
+}
+#siac-pdf-mark-btn.expanded {
+    max-width: 400px;
+}
+#siac-pdf-mark-btn.expanded img {
+    float: left;
+    margin-top: 2px !important;
+}
+.siac-mark-btn-inner {
+    display: inline-block;
+    border: 2px outset grey;
+    border-radius: 3px;
+    margin-left: 5px;
+    font-size: 11px !important;
+    padding: 1px 4px 1px 4px;
+    cursor: pointer;
+}
+.siac-mark-btn-inner.active {
+    border-color: #2496dc;
+}
+.siac-mark-btn-inner:hover {
+    border-color: #43b7ff;
+}
+.siac-pdf-mark-lbl,#siac-iframe-btn {
+    display: inline-block;
+    margin-right: 10px;
+    font-size: 13px;
+    border: 3px outset #2496dc;
+    border-radius: 4px;
+    padding: 4px 6px 4px 6px;
+    background: #2f2f31;
+    color: white;
+    z-index: 4;
+    user-select: none;
+}
+.siac-pdf-mark-lbl > b:hover {
+    color: #2496dc;
+    cursor: pointer;
+}
+#siac-pdf-overlay-top {
+    position: absolute;
+    top: 4px;
+    left: 0px;
+    width: 100%;
+    z-index: 4;
+}
+#siac-pdf-top {
+    width: 100%; 
+    flex: 1 1 auto;
+    position:relative; 
+    height: calc(100% - 90px); 
+    overflow-y: auto; 
+    text-align: center;
+    margin-top: 20px;
+}
+#siac-text-top-wr {
+    flex: 1 1 auto;
+    margin-top: 20px;
+}
+#siac-text-top {
+    text-align: left;
+    padding: 10px;
+
+}
+#siac-iframe {
+    width: 100%;
+    flex: 1 1 auto;
+    display: none;
+}
+#siac-iframe-btn {
+    position: absolute;
+    left: 0px;
+    top: 50px;
+}
+#siac-schedule-dialog-btn {
+    margin-left: 8px;
+}
+#siac-schedule-dialog-btn > svg {
+    vertical-align: middle;
+    margin-bottom: 2px;
+}
+#siac-schedule-dialog-btn.active > svg {
+    filter: brightness(1.4);
+}
+#siac-close-iframe-btn {
+    z-index: 4;
+    position: absolute;
+    right: 0px;
+    top: 5px;
+    display: none;
+    font-size: 13px;
+    border: 3px outset #2496dc;
+    border-radius: 4px;
+    padding: 4px 6px 4px 6px;
+    background: #2f2f31;
+    color: white;
+    user-select: none;
+}
+#siac-close-iframe-btn:hover {
+    border-color: #67c3fc;
+}
+#siac-iframe-btn:hover {
+    border-color: #67c3fc;
+}
+#siac-iframe-btn > div {
+    display: none;
+}
+#siac-iframe-btn.expanded > div {
+    display: inline-block;
+}
+#siac-quick-sched-btn, #siac-mark-jump-btn, #siac-pdf-search-btn {
+    position: absolute;
+    z-index: 4;
+    left: 0;
+}
+#siac-quick-sched-btn {
+    bottom: 43px;
+    padding: 2px 3px 2px 3px;
+}
+#siac-mark-jump-btn {
+    bottom: 76px;
+    padding: 4px 3px 4px 3px;
+}
+#siac-pdf-search-btn {
+    bottom: 111px;
+    padding: 4px 3px 4px 3px;
+}
+#siac-quick-sched-btn > .expanded-hidden, #siac-mark-jump-btn > .expanded-hidden, #siac-pdf-search-btn > .expanded-hidden {
+    display: none;
+    vertical-align: middle;
+}
+#siac-quick-sched-btn .siac-read-icn {
+    margin: 0;
+    vertical-align: middle;
+}
+#siac-quick-sched-btn.expanded > .expanded-hidden, #siac-mark-jump-btn.expanded > .expanded-hidden, #siac-pdf-search-btn.expanded > .expanded-hidden {
+    display: inline-block;
+}
+#siac-mark-jump-btn:hover img, #siac-pdf-search-btn:hover img {
+    filter: brightness(1.4);
+}
+#siac-mark-jump-btn.expanded img, #siac-pdf-search-btn.expanded img {
+    float: left;
+    margin-top: 2px;
+}
+#siac-pdf-search-btn.expanded img { 
+    margin-top: 5px;
+}
+#siac-pdf-search-btn-inner input:focus {
+    outline-width: 0;
+}
+#siac-iframe-btn input {
+    width: 100%;
+    background: #2f2f31;
+    color: white;
+    border-color: white;
+    border-radius: 3px;
+    padding-left: 4px;
+    vertical-align: top;
+    box-sizing: border-box;
+}
+#siac-iframe-btn input:focus {
+    outline: none;
+}
+#siac-iframe-btn.expanded {
+    max-width: 400px;
+}
+#siac-iframe-btn label:hover {
+    color: #2496dc;
+    cursor: pointer;
+}
+.siac-url-ch {
+   color: #2496dc; 
+   margin-bottom: 4px;
+}
+.siac-url-ch:hover {
+    filter: brightness(1.4);
+}
+#siac-pdf-tooltip {
+	position: absolute;
+	display: none;
+	z-index: 999;
+    background-color: #2f2f31;
+	color: white;
+    padding: 9px;
+	border-radius: 5px;
+    border: 4px outset #2496dc;
+    transition: all 0.5s;
+}
+
+#siac-pdf-read-btn,#siac-pdf-more-btn {
+    border-radius: 4px;
+    border: 3px outset #43a047;
+    padding: 1px 5px 1px 5px;
+    background-color: #2f2f31;
+    color: beige;
+}
+#siac-pdf-read-btn:hover,#siac-pdf-more-btn:hover {
+    color: white;
+    border: 3px outset #69B36C;
+    background-color: #2f3030;
+}
+#siac-pdf-night-btn {
+    padding-left: 4px;
+    padding-right: 4px;
+}
+#siac-pdf-tooltip-results-area {
+	overflow-y: auto;
+    overflow-x: hidden;
+    width: calc(100% - 18px);
+	padding-right: 8px;
+    padding-left: 3px;
+}
+#siac-pdf-tooltip-bottom {
+    text-align: center;
+}
+#siac-tooltip-center {
+    position: absolute;
+    top: 7px;
+    left: 7px;
+    cursor: pointer;
+    display: inline-block;
+    color: #2496dc;
+    border: 3px solid #2496dc;
+    border-radius: 2px;
+    width: 9px;
+    height: 9px;
+}
+#siac-pdf-tooltip-top {
+    text-align: center;
+}
+#siac-tooltip-center:hover {
+    filter: brightness(1.4);
+}
+#siac-pdf-tooltip-searchbar {
+    width: calc(100% - 14px);
+    margin-top: 15px;
+    margin-bottom: 5px;
+    border-radius: 4px;
+    background-color: #2f2f31;
+    color: white;
+    border-color: white;
+    padding-left: 4px;
+}
+#siac-pdf-tooltip-searchbar:focus {
+    outline: none;
+}
+#siac-pdf-page-inp {
+    background: #2f2f31;
+    color: beige;
+}
+#siac-reading-modal-bottom-bar {
+    width: 100%; 
+    flex: 0 0 auto; 
+    position: relative; 
+    border-top: 2px solid #2496dc; 
+    margin-top: 5px; 
+    padding: 2px 0 0 5px; 
+    overflow: hidden; 
+    user-select: none;
+}
+#siac-pdf-bottom-tab {
+    display: inline-block;
+    max-height: 89px;
+    overflow: hidden;
+    overflow-y: auto;
+    vertical-align: top;
+    margin-top: 4px;
+    padding: 0 5px 0 0;
+    box-sizing: border-box;
+}
+.siac-reading-modal-button-bar-wrapper {
+    flex: 0 0 30px; 
+    width: 100%; 
+    text-align: center; 
+    margin-top: 15px; 
+    position: relative; 
+}
+#siac-marks-display {
+    vertical-align: top;
+    height: 100%;
+}
+.siac-related-notes-item {
+    color: grey;
+    cursor: pointer;
+}
+.siac-related-notes-item:hover {
+    color: lightgrey;
+}
+#siac-marks-display::-webkit-scrollbar {
+    display: none;
+}
+#siac-marks-display td:nth-child(2) {
+    word-wrap: break-word; 
+    white-space: normal;
+    padding-left: 5px;
+}
+.siac-page-mark-link {
+    display: inline-block;
+    cursor: pointer;
+    color: #2496dc;
+    font-weight: bold;
+}
+.siac-page-mark-link:hover {
+    filter: brightness(1.4);
+}
+.siac-field-picker-opt {
+    display: inline-block;
+    font-size: 15px;
+    line-height: 18px;;
+    color: #2496dc;
+    cursor: pointer;
+    user-select: none;
+}
+.siac-field-picker-opt:hover {
+    filter: brightness(1.4);
+    transform: scale(1.04);
+}
+#siac-reading-modal-top-btns {
+    position: absolute;
+    top: 7px; right: 25px;
+    text-align: center;
+    vertical-align: middle;
+    z-index: 6;
+}
+#siac-reading-modal-top-btns div:hover {
+    color: white;
+}
+#siac-reading-modal-top-btns siac-btn {
+    line-height: 13px;
+}
+#siac-reading-modal-top-btns span {
+    border: 1px solid lightgrey; 
+    height: 11px; 
+    width: 4px;
+    margin: 0;
+    vertical-align: middle;
+    display: inline-block;
+}
+#siac-reading-modal-top-btns div:hover span {
+    border-color: white;
+}
+#siac-reading-modal-change-theme {
+    position: absolute;
+    right: 0;
+    bottom: 4px;
+    cursor: pointer;    
+}
+#siac-reading-modal-change-theme > a {
+    color:lightgrey !important;
+}
+.siac-queue-picker-icn {
+    margin-left: 25px; cursor: pointer; font-weight: bold; color: #2496dc;
+    display: inline-block;
+}
+.siac-queue-picker-icn:not(.siac-disabled):hover {
+    transform: scale(1.4);
+    filter: brightness(140%);
+}
+#siac-queue-sched-wrapper {
+    padding: 5px 0 0 0;
+    max-width: 0px;
+    overflow: hidden;
+    display: inline-block;
+    transition: max-width 0.6s;
+    transform: translateZ(0);
+}
+.siac-queue-sched-btn, .siac-queue-sched-btn-hor {
+    display: inline-block;
+    font-size: 13px;
+    padding: 2px;
+    border: 2px solid #2496dc;;
+    color: lightblue;
+    user-select: none;
+    cursor: pointer;
+    text-align: center;
+    border-radius: 4px;
+}
+.siac-queue-sched-btn {
+    writing-mode: vertical-lr;
+    height: 90px;
+}
+.siac-queue-sched-btn.siac-prio-5 {
+    height: 80px;
+}
+.siac-queue-sched-btn.siac-prio-4 {
+    height: 70px;
+}
+.siac-queue-sched-btn.siac-prio-3 {
+    height: 60px;
+}
+.siac-queue-sched-btn.siac-prio-2 {
+    height: 50px;
+}
+.siac-queue-sched-btn.siac-prio-1 {
+    height: 40px;
+}
+.siac-queue-sched-btn-hor {
+    vertical-align: top;
+    margin: 40px 5px 0px 5px;
+}
+.siac-queue-sched-btn:hover, .siac-queue-sched-btn-hor:hover {
+    color: white;
+    border-color: white;
+    transform: scale(1.04);
+}
+.siac-queue-sched-btn.active, .siac-queue-sched-btn-hor.active {
+    color: white;
+    border-color: #2496dc;
+}
+.siac-queue-sched-btn.active:hover, .siac-queue-sched-btn-hor.active:hover {
+   filter: brightness(140%);
+}
+
+.siac-queue-sched-hor-sep {
+    display: inline-block;
+    height: 50px;
+    width: 20px;
+    margin: 0 10px 0 10px;
+    border-top: 2px solid lightgrey;
+    border-style: dotted;
+    border-width: 2px 0 0 0;
+}
+.siac-clickable-anchor {
+    cursor: pointer;
+    background-color: inherit !important;
+    display: inline-block;
+    border: 1px solid transparent;
+}
+.siac-clickable-anchor.siac-disabled,.siac-queue-picker-icn.siac-disabled,.siac-page-mark-link.siac-disabled,.siac-queue-sched-btn.siac-disabled {
+    color: grey !important;
+}
+.siac-sched-icn.siac-disabled {
+    opacity: 0.3;
+}
+.siac-sched-icn line, .siac-sched-icn ellipse {
+    stroke: #2496dc !important;
+}
+.siac-sched-icn.grey line, .siac-sched-icn.grey ellipse {
+    stroke: lightgrey !important;
+}
+.siac-queue-sched-btn.siac-disabled {
+    border-color: grey !important;
+}
+.siac-clickable-anchor:not(.siac-disabled):hover {
+    transform: scale(1.02);
+    filter: brightness(140%);
+}
+#siac-queue-infobox-wrapper {
+    position: relative;
+    display: inline-block;
+    vertical-align: top;
+    margin-left: 14px;
+}
+#siac-queue-infobox {
+    position: absolute;
+    top: 0;
+    left: 0;
+    display: none;
+    width: 300px;
+    height: 102px;
+    border: 3px outset #2496dc;
+}
+#siac-queue-infobox:after {
+    content: " ";
+    position: absolute;
+    right: 100%;
+    top: var(--ttop);
+    margin-top: -11px;
+    border-width: 11px;
+    border-style: solid;
+    border-color: transparent #2496dc transparent transparent;
+    transition: all ease 0.2s;
+}
+#siac-reading-modal-timer {
+    font-size: 30px;
+    user-select: none;
+    font-weight: bold;
+    line-height: 1em;
+}
+.siac-timer-btn {
+    cursor: pointer;
+    margin-right: 5px;
+    font-size: 11px;
+    line-height: 1em;
+    display: inline-block;
+}
+.siac-timer-btn:hover {
+    transform: scale(1.2);
+    user-select: none;
+}
+.siac-timer-btn.active {
+    color: #2496dc;
+    font-weight: bold;
+}
+#siac-timer-play-btn {
+    font-size: 19px;
+    line-height: 19px;
+    cursor: pointer;
+    user-select: none;
+    display: inline-block;
+}
+#siac-timer-play-btn:hover {
+    transform: scale(1.05);
+}
+#siac-reading-modal-center img {
+    display: block;
+    margin-left: auto !important;
+    margin-right: auto !important;
+}
+#siac-timer-popup {
+    z-index: 9999999;
+    background: #2f2f31;
+    color: white;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    padding: 15px;
+    width: 300px;
+    border: 4px outset #2496dc;
+    border-radius: 5px;
+    display: none;
+}
+#siac-pdf-top::-webkit-scrollbar:horizontal {
+    height: 10px !important;
+}
+#siac-pdf-top::-webkit-scrollbar, #siac-pdf-bottom-tab::-webkit-scrollbar,#siac-pdf-tooltip-results-area::-webkit-scrollbar, body.nightMode ::-webkit-scrollbar {
+    width: 10px !important;
+    background: #313d45 !important;
+    border-radius: 4px !important;
+}
+ #siac-pdf-top::-webkit-scrollbar-thumb, body.nightMode ::-webkit-scrollbar-thumb,#siac-pdf-tooltip-results-area::-webkit-scrollbar-thumb, #siac-pdf-bottom-tab::-webkit-scrollbar-thumb {
+    background: #515d71 !important;
+    border-radius: 4px !important;
+} 
+.siac-pdf-loader {
+    width: 250px; 
+    padding: 15px; 
+    position: relative; 
+    text-align: center;
+    border: 3px outset #2496dc;
+    background: #2f2f31;
+    color: white;
+}
+.tox-tinymce-aux {
+    z-index: 2147483638 !important;
+}
+.tox .tox-menu {
+    z-index: 2147483638 !important;
+}
+#siac-text-top-wr > div {
+    height: 100% !important;
+}
+.siac-pdf-mark-lbl {
+    font-weight: bold;
+}
+.siac-note-title-only {
+    font-weight: bold;
+    overflow: ellipsis;
+    user-select: none;
+    cursor: pointer;
+}
+body.night_mode .siac-note-title-only {
+    color: lightgrey;
+}
+.siac-note-title-only:hover {
+    filter: brightness(1.4);
+}
+#siac-reading-modal-tabs-left {
+    font-family: 'Open Sans', sans-serif;
+    margin: 10px 5px 0 5px;
+    padding: 10px 15px 5px 0;
+    border-top: 2px solid;
+    margin-top: 10px;
+    border-top: 2px solid #2496dc;
+}
+#siac-reading-modal-tabs-left .siac-btn {
+    color: #b2b2a0;
+    border-color: #b2b2a0;
+    margin-left: 4px;
+}
+#siac-reading-modal-tabs-left .siac-btn.active {
+    color: #61c3ff !important;
+    border-color: #2496dc !important;
+}
+.siac-pdf-main-color-border-bottom {
+    border-bottom: 2px solid #2496dc;
+}
+.siac-pdf-main-color-border-top {
+    border-top: 2px solid #2496dc;
+}
+#siac-left-tab-browse,#siac-left-tab-pdfs {
+    font-family: 'Open Sans', sans-serif;
+    flex: 1 1 auto;
+    width: 100%;
+    box-sizing: border-box;
+    padding: 0 10px 0 10px;
+    overflow: hidden;
+}
+#siac-left-tab-browse input,#siac-left-tab-pdfs input {
+    border-radius: 4px;
+    padding-left: 3px;
+}       
+body.nightMode #siac-left-tab-browse input, body.nightMode #siac-left-tab-pdfs input {
+    background: #333333;
+    color: lightgrey;
+}
+.siac-pdf-color-btn {
+    height: 18px; 
+    width: 18px; 
+    border-radius: 4px;
+    margin-bottom: 4px;
+    border: 2px solid transparent;
+    cursor: pointer;
+}
+.siac-pdf-color-btn.active,.siac-pdf-ul-btn.active {
+    border-color: white !important;
+}
+.siac-hl {
+    position: absolute;
+    mix-blend-mode: multiply !important;
+    z-index: 2;
+    border-radius: 7px;
+}
+.siac-text-hl {
+    mix-blend-mode: normal !important;
+    z-index: 3;
+    border: 3px outset #2496dc;
+    font-family: 'Open Sans', sans-serif;
+    white-space: pre-wrap;
+    outline: none;
+}
+#siac-pdf-top.siac-pdf-night .siac-text-hl {
+    /* color: lightgrey; */
+    background: beige !important;
+    border-color: #44fdb0 !important;
+}
+.siac-pdf-ul-btn {
+    height: 5px; 
+    width: 18px; 
+    border: 2px solid transparent;
+    margin-bottom: 4px;
+    border-radius: 4px;
+    cursor: pointer;
+}
+#siac-reading-modal-top-btns > div {
+    height: 24px;
+    width: 24px;
+    box-sizing: border-box;
+    background-size: 17px 17px;
+    padding: 0 !important;
+    background-repeat: no-repeat;
+    background-position: center;
+}
+#siac-reading-modal-top-bar {
+    min-height: 77px; 
+    width: 100%; 
+    flex: 0 0 77px; 
+    display: flex; 
+    flex-wrap: nowrap; 
+    border-bottom: 2px solid #2496dc; 
+    margin-bottom: 5px; 
+    white-space: nowrap;
+    position: relative;
+}
+#siac-rm-greyout {
+    position: absolute;
+    display: none;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    opacity: 0.4;
+    background-color: black;
+    z-index: 5;
+}
+.siac-prio-slider, .siac-prio-slider-small {
+    width: 250px;
+    -webkit-appearance: none; 
+    appearance: none;
+    background: #d3d3d3; 
+    outline: none;
+    opacity: 0.7; 
+    transition: opacity .2s;
+    height: 10px;
+    border-radius: 3px;
+}
+.siac-prio-slider-small {
+    width: 150px;
+    height: 8px;
+}
+.siac-prio-slider:hover, .siac-prio-slider-small:hover {
+    opacity: 1;
+  }
+  .siac-prio-slider::-webkit-slider-thumb, .siac-prio-slider-small::-webkit-slider-thumb {
+    -webkit-appearance: none;
+    appearance: none;
+    width: 15px;
+    height: 20px;
+    background: #2496dc;
+    cursor: pointer;
+    border-radius: 3px;
+  }
+  .siac-prio-slider::-webkit-slider-thumb:hover, .siac-prio-slider-small::-webkit-slider-thumb:hover {
+      filter: brightness(1.4);
+  }
+label input:checked ~ span {
+    font-weight: bold;
+}
+body.siac-left-right-switched #siac-right-side {
+    border-right: 2px solid #2496dc;
+}
+#siac-right-side {
+    border-left: 2px solid #2496dc;
+}
\ No newline at end of file
diff --git a/web/pdf_reader_tan.css b/web/pdf_reader_tan.css
new file mode 100644
index 00000000..da09a1a4
--- /dev/null
+++ b/web/pdf_reader_tan.css
@@ -0,0 +1,863 @@
+body.siac-reading-modal-displayed #siac-right-side {
+    border-left: 2px solid #cfb495;
+}
+#siac-reading-modal {
+    display: none;
+    position: absolute;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    right: 0;
+    background-color: #2f2f31;
+    color: white;
+    padding: 12px;
+    padding-bottom: 6px;
+    font-size: 12px;
+    z-index: 7;
+    border-radius: 5px;
+    overflow: hidden;
+}
+
+#siac-reading-modal a:not(.siac-disabled) {
+    color: #cfb495 !important;
+}
+#siac-reading-modal a.greyedout, #siac-reading-modal a.active {
+    color: lightgray !important;
+}
+.siac-clickable-anchor.tab.active {
+    text-decoration: underline;
+}
+.siac-pdf-main-color {
+    color: #cfb495;
+}
+.siac-rm-main-color-hover:hover {
+    color: #cfb495;
+    cursor: pointer;
+}
+.siac-modal-small.dark, #siac-reading-modal .siac-modal-small {
+    border: 3px outset #cfb495;
+    background: #2f2f31;
+    color: white;
+}
+
+#siac-cloze-btn {
+    margin-bottom: 7px;
+    text-align: center;
+    color:#cfb495;
+    cursor:pointer;
+    user-select: none;
+}
+#siac-cloze-btn:hover {
+    transform: scale(1.03);
+    filter: brightness(1.4);
+}
+.siac-btn-small-dropdown-inverted {
+    display: none;
+    position: absolute;
+    color: white;
+    background-color: #2f2f31;
+    width: 200px;
+    padding: 0px 4px 0px 4px;
+    height: 135px;
+    top: -114px;
+    left: -181px;
+    border: 2px outset #cfb495; 
+    z-index: 5;
+    transition: all 0.3s;
+}
+.siac-dropdown-inverted-item {
+    margin: 3px 0 2px 0;
+    text-align: left;
+    width: 100%;
+    color: #cfb495;
+    text-align: center;
+    height: 16px;
+    font-size: 13px !important;
+}
+.siac-dropdown-inverted-item:hover {
+    filter: brightness(1.4);
+}
+#siac-tt-web-btn {
+    color:#cfb495;
+    cursor:pointer;
+    position: absolute;
+    top: 5px;
+    right: 5px;
+    height: 20px;
+    width: 20px;
+    background-position: center;
+    background-repeat: no-repeat;
+    background-size: 20px 20px;
+}
+#siac-tt-web-btn:hover {
+    transform: scale(1.03);
+    filter: brightness(1.4);
+}
+#siac-pdf-br-notify {
+    display: none; 
+    position: absolute; 
+    z-index: 4; 
+    bottom: 50px; 
+    right: 45px; 
+    border: 3px outset #cfb495; 
+    border-radius: 3px; 
+    color: lightgrey; 
+    background: #2f2f31; 
+    padding: 15px;
+}
+#siac-pdf-overlay {
+    display: none;
+    position: absolute;
+    bottom: 35px;
+    right: 0; left: 0;
+    z-index: 4;
+    user-select: none;
+    background-color: #43a047;
+    border-radius: 7px;
+    border: 4px outset green;
+    padding: 2px 4px 4px 4px;
+    width: 200px;
+    text-align: center;
+    color: white;
+    margin-left: auto;
+    margin-right: auto;
+}
+#siac-pdf-mark-btn {
+    padding: 4px 3px 5px 4px;
+    z-index: 3;
+    border: 3px outset #2496dc;
+    border-radius: 3px;
+    margin-right: 14px;
+    display: inline-block;
+    max-width: 30px;
+    transition: all 0.4s;
+    overflow: hidden;
+    white-space: nowrap;
+}
+#siac-pdf-mark-btn:hover {
+    border-color: #67c3fc;
+}
+#siac-pdf-mark-btn:hover img {
+    filter: brightness(1.4);
+}
+#siac-pdf-mark-btn > div {
+    display: none;
+}
+#siac-pdf-mark-btn.expanded > div{
+    display: inline-block;
+}
+#siac-pdf-mark-btn.expanded {
+    max-width: 400px;
+}
+#siac-pdf-mark-btn.expanded img {
+    float: left;
+    margin-top: 2px !important;
+}
+.siac-mark-btn-inner {
+    display: inline-block;
+    border: 2px outset grey;
+    border-radius: 3px;
+    margin-left: 5px;
+    font-size: 11px !important;
+    padding: 1px 4px 1px 4px;
+    cursor: pointer;
+}
+.siac-mark-btn-inner.active {
+    border-color: #2496dc;
+}
+.siac-mark-btn-inner:hover {
+    border-color: #43b7ff;
+}
+.siac-pdf-mark-lbl,#siac-iframe-btn {
+    display: inline-block;
+    margin-right: 10px;
+    font-size: 13px;
+    border: 3px outset #2496dc;
+    border-radius: 4px;
+    padding: 4px 6px 4px 6px;
+    background: #2f2f31;
+    color: white;
+    z-index: 4;
+    user-select: none;
+}
+.siac-pdf-mark-lbl > b:hover {
+    color: #cfb495;
+    cursor: pointer;
+}
+#siac-pdf-overlay-top {
+    position: absolute;
+    top: 4px;
+    left: 0px;
+    width: 100%;
+    z-index: 4;
+}
+#siac-pdf-top {
+    width: 100%; 
+    flex: 1 1 auto;
+    position:relative; 
+    height: calc(100% - 90px); 
+    overflow-y: auto; 
+    text-align: center;
+    margin-top: 20px;
+}
+#siac-text-top-wr {
+    flex: 1 1 auto;
+    margin-top: 20px;
+}
+#siac-text-top {
+    text-align: left;
+    padding: 10px;
+
+}
+#siac-iframe {
+    width: 100%;
+    flex: 1 1 auto;
+    display: none;
+}
+#siac-iframe-btn {
+    position: absolute;
+    left: 0px;
+    top: 50px;
+}
+#siac-schedule-dialog-btn {
+    margin-left: 8px;
+}
+#siac-schedule-dialog-btn > svg {
+    vertical-align: middle;
+    margin-bottom: 2px;
+}
+#siac-schedule-dialog-btn.active > svg {
+    filter: brightness(1.4);
+}
+#siac-close-iframe-btn {
+    z-index: 4;
+    position: absolute;
+    right: 0px;
+    top: 5px;
+    display: none;
+    font-size: 13px;
+    border: 3px outset #2496dc;
+    border-radius: 4px;
+    padding: 4px 6px 4px 6px;
+    background: #2f2f31;
+    color: white;
+    user-select: none;
+}
+#siac-close-iframe-btn:hover {
+    border-color: #67c3fc;
+}
+#siac-iframe-btn:hover {
+    border-color: #67c3fc;
+}
+#siac-iframe-btn > div {
+    display: none;
+}
+#siac-iframe-btn.expanded > div {
+    display: inline-block;
+}
+#siac-quick-sched-btn, #siac-mark-jump-btn, #siac-pdf-search-btn {
+    position: absolute;
+    z-index: 4;
+    left: 0;
+}
+#siac-quick-sched-btn {
+    bottom: 43px;
+    padding: 2px 3px 2px 3px;
+}
+#siac-mark-jump-btn {
+    bottom: 76px;
+    padding: 4px 3px 4px 3px;
+}
+#siac-pdf-search-btn {
+    bottom: 111px;
+    padding: 4px 3px 4px 3px;
+}
+#siac-quick-sched-btn > .expanded-hidden, #siac-mark-jump-btn > .expanded-hidden, #siac-pdf-search-btn > .expanded-hidden {
+    display: none;
+    vertical-align: middle;
+}
+#siac-quick-sched-btn .siac-read-icn {
+    margin: 0;
+    vertical-align: middle;
+}
+#siac-quick-sched-btn.expanded > .expanded-hidden, #siac-mark-jump-btn.expanded > .expanded-hidden, #siac-pdf-search-btn.expanded > .expanded-hidden {
+    display: inline-block;
+}
+#siac-mark-jump-btn:hover img, #siac-pdf-search-btn:hover img {
+    filter: brightness(1.4);
+}
+#siac-mark-jump-btn.expanded img, #siac-pdf-search-btn.expanded img {
+    float: left;
+    margin-top: 2px;
+}
+#siac-pdf-search-btn.expanded img { 
+    margin-top: 5px;
+}
+#siac-pdf-search-btn-inner input:focus {
+    outline-width: 0;
+}
+#siac-iframe-btn input {
+    width: 100%;
+    background: #2f2f31;
+    color: white;
+    border-color: white;
+    border-radius: 3px;
+    padding-left: 4px;
+    vertical-align: top;
+    box-sizing: border-box;
+}
+#siac-iframe-btn input:focus {
+    outline: none;
+}
+#siac-iframe-btn.expanded {
+    max-width: 400px;
+}
+#siac-iframe-btn label:hover {
+    color: #cfb495;
+    cursor: pointer;
+}
+.siac-url-ch {
+   color: #cfb495; 
+   margin-bottom: 4px;
+}
+.siac-url-ch:hover {
+    filter: brightness(1.4);
+}
+#siac-pdf-tooltip {
+	position: absolute;
+	display: none;
+	z-index: 999;
+    background-color: #2f2f31;
+	color: white;
+    padding: 9px;
+	border-radius: 5px;
+    border: 4px outset #cfb495;
+    transition: all 0.5s;
+}
+
+#siac-pdf-read-btn,#siac-pdf-more-btn {
+    border-radius: 4px;
+    border: 3px outset #43a047;
+    padding: 1px 5px 1px 5px;
+    background-color: #2f2f31;
+    color: beige;
+}
+#siac-pdf-read-btn:hover,#siac-pdf-more-btn:hover {
+    color: white;
+    border: 3px outset #69B36C;
+    background-color: #2f3030;
+}
+#siac-pdf-night-btn {
+    padding-left: 4px;
+    padding-right: 4px;
+}
+#siac-pdf-tooltip-results-area {
+	overflow-y: auto;
+    overflow-x: hidden;
+    width: calc(100% - 18px);
+	padding-right: 8px;
+    padding-left: 3px;
+}
+#siac-pdf-tooltip-bottom {
+    text-align: center;
+}
+#siac-tooltip-center {
+    position: absolute;
+    top: 7px;
+    left: 7px;
+    cursor: pointer;
+    display: inline-block;
+    color: #cfb495;
+    border: 3px solid #cfb495;
+    border-radius: 2px;
+    width: 9px;
+    height: 9px;
+}
+#siac-pdf-tooltip-top {
+    text-align: center;
+}
+#siac-tooltip-center:hover {
+    filter: brightness(1.4);
+}
+#siac-pdf-tooltip-searchbar {
+    width: calc(100% - 14px);
+    margin-top: 15px;
+    margin-bottom: 5px;
+    border-radius: 4px;
+    background-color: #2f2f31;
+    color: white;
+    border-color: white;
+    padding-left: 4px;
+}
+#siac-pdf-tooltip-searchbar:focus {
+    outline: none;
+}
+#siac-pdf-page-inp {
+    background: #2f2f31;
+    color: beige;
+}
+#siac-reading-modal-bottom-bar {
+    width: 100%; 
+    flex: 0 0 auto; 
+    position: relative; 
+    border-top: 2px solid #cfb495; 
+    margin-top: 5px; 
+    padding: 2px 0 0 5px; 
+    overflow: hidden; 
+    user-select: none;
+}
+#siac-pdf-bottom-tab {
+    display: inline-block;
+    max-height: 89px;
+    overflow: hidden;
+    overflow-y: auto;
+    vertical-align: top;
+    margin-top: 4px;
+    padding: 0 5px 0 0;
+    box-sizing: border-box;
+}
+.siac-reading-modal-button-bar-wrapper {
+    flex: 0 0 30px; 
+    width: 100%; 
+    text-align: center; 
+    margin-top: 15px; 
+    position: relative; 
+}
+#siac-marks-display {
+    vertical-align: top;
+    height: 100%;
+}
+.siac-related-notes-item {
+    color: grey;
+    cursor: pointer;
+}
+.siac-related-notes-item:hover {
+    color: lightgrey;
+}
+#siac-marks-display::-webkit-scrollbar {
+    display: none;
+}
+#siac-marks-display td:nth-child(2) {
+    word-wrap: break-word; 
+    white-space: normal;
+    padding-left: 5px;
+}
+.siac-page-mark-link {
+    display: inline-block;
+    cursor: pointer;
+    color: #cfb495;
+    font-weight: bold;
+}
+.siac-page-mark-link:hover {
+    filter: brightness(1.4);
+}
+.siac-field-picker-opt {
+    display: inline-block;
+    font-size: 15px;
+    line-height: 18px;;
+    color: #cfb495;
+    cursor: pointer;
+    user-select: none;
+}
+.siac-field-picker-opt:hover {
+    filter: brightness(1.4);
+    transform: scale(1.04);
+}
+#siac-reading-modal-top-btns {
+    position: absolute;
+    top: 7px; right: 25px;
+    text-align: center;
+    vertical-align: middle;
+    z-index: 6;
+}
+#siac-reading-modal-top-btns div:hover {
+    color: white;
+}
+#siac-reading-modal-top-btns siac-btn {
+    line-height: 13px;
+}
+#siac-reading-modal-top-btns span {
+    border: 1px solid lightgrey; 
+    height: 11px; 
+    width: 4px;
+    margin: 0;
+    vertical-align: middle;
+    display: inline-block;
+}
+#siac-reading-modal-top-btns div:hover span {
+    border-color: white;
+}
+#siac-reading-modal-change-theme {
+    position: absolute;
+    right: 0;
+    bottom: 4px;
+    cursor: pointer;    
+}
+#siac-reading-modal-change-theme > a {
+    color:lightgrey !important;
+}
+.siac-queue-picker-icn {
+    margin-left: 25px; cursor: pointer; font-weight: bold; color: #cfb495;
+    display: inline-block;
+}
+.siac-queue-picker-icn:not(.siac-disabled):hover {
+    transform: scale(1.4);
+    filter: brightness(140%);
+}
+#siac-queue-sched-wrapper {
+    padding: 5px 0 0 0;
+    max-width: 0px;
+    overflow: hidden;
+    display: inline-block;
+    transition: max-width 0.6s;
+    transform: translateZ(0);
+}
+.siac-queue-sched-btn, .siac-queue-sched-btn-hor {
+    display: inline-block;
+    font-size: 13px;
+    padding: 2px;
+    border: 2px solid #2496dc;;
+    color: lightblue;
+    user-select: none;
+    cursor: pointer;
+    text-align: center;
+    border-radius: 4px;
+}
+.siac-queue-sched-btn {
+    writing-mode: vertical-lr;
+    height: 90px;
+}
+.siac-queue-sched-btn.siac-prio-5 {
+    height: 80px;
+}
+.siac-queue-sched-btn.siac-prio-4 {
+    height: 70px;
+}
+.siac-queue-sched-btn.siac-prio-3 {
+    height: 60px;
+}
+.siac-queue-sched-btn.siac-prio-2 {
+    height: 50px;
+}
+.siac-queue-sched-btn.siac-prio-1 {
+    height: 40px;
+}
+.siac-queue-sched-btn-hor {
+    vertical-align: top;
+    margin: 40px 5px 0px 5px;
+}
+.siac-queue-sched-btn:hover, .siac-queue-sched-btn-hor:hover {
+    color: white;
+    border-color: white;
+    transform: scale(1.04);
+}
+.siac-queue-sched-btn.active, .siac-queue-sched-btn-hor.active {
+    color: white;
+    border-color: #cfb495;
+}
+.siac-queue-sched-btn.active:hover, .siac-queue-sched-btn-hor.active:hover {
+   filter: brightness(140%);
+}
+
+.siac-queue-sched-hor-sep {
+    display: inline-block;
+    height: 50px;
+    width: 20px;
+    margin: 0 10px 0 10px;
+    border-top: 2px solid lightgrey;
+    border-style: dotted;
+    border-width: 2px 0 0 0;
+}
+.siac-clickable-anchor {
+    cursor: pointer;
+    background-color: inherit !important;
+    display: inline-block;
+    border: 1px solid transparent;
+}
+.siac-clickable-anchor.siac-disabled,.siac-queue-picker-icn.siac-disabled,.siac-page-mark-link.siac-disabled,.siac-queue-sched-btn.siac-disabled {
+    color: grey !important;
+}
+.siac-sched-icn.siac-disabled {
+    opacity: 0.3;
+}
+.siac-sched-icn line, .siac-sched-icn ellipse {
+    stroke: #cfb495 !important;
+}
+.siac-sched-icn.grey line, .siac-sched-icn.grey ellipse {
+    stroke: lightgrey !important;
+}
+.siac-queue-sched-btn.siac-disabled {
+    border-color: grey !important;
+}
+.siac-clickable-anchor:not(.siac-disabled):hover {
+    transform: scale(1.02);
+    filter: brightness(140%);
+}
+#siac-queue-infobox-wrapper {
+    position: relative;
+    display: inline-block;
+    vertical-align: top;
+    margin-left: 14px;
+}
+#siac-queue-infobox {
+    position: absolute;
+    top: 0;
+    left: 0;
+    display: none;
+    width: 300px;
+    height: 102px;
+    border: 3px outset #cfb495;
+}
+#siac-queue-infobox:after {
+    content: " ";
+    position: absolute;
+    right: 100%;
+    top: var(--ttop);
+    margin-top: -11px;
+    border-width: 11px;
+    border-style: solid;
+    border-color: transparent #cfb495 transparent transparent;
+    transition: all ease 0.2s;
+}
+#siac-reading-modal-timer {
+    font-size: 30px;
+    user-select: none;
+    font-weight: bold;
+    line-height: 1em;
+}
+.siac-timer-btn {
+    cursor: pointer;
+    margin-right: 5px;
+    font-size: 11px;
+    line-height: 1em;
+    display: inline-block;
+}
+.siac-timer-btn:hover {
+    transform: scale(1.2);
+    user-select: none;
+}
+.siac-timer-btn.active {
+    color: #cfb495;
+    font-weight: bold;
+}
+#siac-timer-play-btn {
+    font-size: 19px;
+    line-height: 19px;
+    cursor: pointer;
+    user-select: none;
+    display: inline-block;
+}
+#siac-timer-play-btn:hover {
+    transform: scale(1.05);
+}
+#siac-reading-modal-center img {
+    display: block;
+    margin-left: auto !important;
+    margin-right: auto !important;
+}
+#siac-timer-popup {
+    z-index: 9999999;
+    background: #2f2f31;
+    color: white;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    padding: 15px;
+    width: 300px;
+    border: 4px outset #cfb495;
+    border-radius: 5px;
+    display: none;
+}
+#siac-pdf-top::-webkit-scrollbar:horizontal {
+    height: 10px !important;
+}
+#siac-pdf-top::-webkit-scrollbar, #siac-pdf-bottom-tab::-webkit-scrollbar,#siac-pdf-tooltip-results-area::-webkit-scrollbar, body.nightMode ::-webkit-scrollbar {
+    width: 10px !important;
+    background: #313d45 !important;
+    border-radius: 4px !important;
+}
+ #siac-pdf-top::-webkit-scrollbar-thumb, body.nightMode ::-webkit-scrollbar-thumb,#siac-pdf-tooltip-results-area::-webkit-scrollbar-thumb, #siac-pdf-bottom-tab::-webkit-scrollbar-thumb {
+    background: #515d71 !important;
+    border-radius: 4px !important;
+} 
+.siac-pdf-loader {
+    width: 250px; 
+    padding: 15px; 
+    position: relative; 
+    text-align: center;
+    border: 3px outset #cfb495;
+    background: #2f2f31;
+    color: white;
+}
+.tox-tinymce-aux {
+    z-index: 2147483638 !important;
+}
+.tox .tox-menu {
+    z-index: 2147483638 !important;
+}
+#siac-text-top-wr > div {
+    height: 100% !important;
+}
+.siac-pdf-mark-lbl {
+    font-weight: bold;
+}
+.siac-note-title-only {
+    font-weight: bold;
+    overflow: ellipsis;
+    user-select: none;
+    cursor: pointer;
+}
+body.night_mode .siac-note-title-only {
+    color: lightgrey;
+}
+.siac-note-title-only:hover {
+    filter: brightness(1.4);
+}
+#siac-reading-modal-tabs-left {
+    font-family: 'Open Sans', sans-serif;
+    margin: 10px 5px 0 5px;
+    padding: 10px 15px 5px 0;
+    border-top: 2px solid;
+    margin-top: 10px;
+    border-top: 2px solid #cfb495;
+}
+#siac-reading-modal-tabs-left .siac-btn {
+    color: #b2b2a0;
+    border-color: #b2b2a0;
+    margin-left: 4px;
+}
+#siac-reading-modal-tabs-left .siac-btn.active {
+    color: #61c3ff !important;
+    border-color: #2496dc !important;
+}
+.siac-pdf-main-color-border-bottom {
+    border-bottom: 2px solid #cfb495;
+}
+.siac-pdf-main-color-border-top {
+    border-top: 2px solid #cfb495;
+}
+#siac-left-tab-browse,#siac-left-tab-pdfs {
+    font-family: 'Open Sans', sans-serif;
+    flex: 1 1 auto;
+    width: 100%;
+    box-sizing: border-box;
+    padding: 0 10px 0 10px;
+    overflow: hidden;
+}
+#siac-left-tab-browse input,#siac-left-tab-pdfs input {
+    border-radius: 4px;
+    padding-left: 3px;
+}       
+body.nightMode #siac-left-tab-browse input, body.nightMode #siac-left-tab-pdfs input {
+    background: #333333;
+    color: lightgrey;
+}
+.siac-pdf-color-btn {
+    height: 18px; 
+    width: 18px; 
+    border-radius: 4px;
+    margin-bottom: 4px;
+    border: 2px solid transparent;
+    cursor: pointer;
+}
+.siac-pdf-color-btn.active,.siac-pdf-ul-btn.active {
+    border-color: white !important;
+}
+.siac-hl {
+    position: absolute;
+    mix-blend-mode: multiply !important;
+    z-index: 2;
+    border-radius: 7px;
+}
+.siac-text-hl {
+    mix-blend-mode: normal !important;
+    z-index: 3;
+    border: 3px outset #2496dc;
+    font-family: 'Open Sans', sans-serif;
+    white-space: pre-wrap;
+    outline: none;
+}
+#siac-pdf-top.siac-pdf-night .siac-text-hl {
+    /* color: lightgrey; */
+    background: beige !important;
+    border-color: #44fdb0 !important;
+}
+.siac-pdf-ul-btn {
+    height: 5px; 
+    width: 18px; 
+    border: 2px solid transparent;
+    margin-bottom: 4px;
+    border-radius: 4px;
+    cursor: pointer;
+}
+#siac-reading-modal-top-btns > div {
+    height: 24px;
+    width: 24px;
+    box-sizing: border-box;
+    background-size: 17px 17px;
+    padding: 0 !important;
+    background-repeat: no-repeat;
+    background-position: center;
+}
+#siac-reading-modal-top-bar {
+    min-height: 77px; 
+    width: 100%; 
+    flex: 0 0 77px; 
+    display: flex; 
+    flex-wrap: nowrap; 
+    border-bottom: 2px solid #cfb495; 
+    margin-bottom: 5px; 
+    white-space: nowrap;
+    position: relative;
+}
+#siac-rm-greyout {
+    position: absolute;
+    display: none;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    opacity: 0.4;
+    background-color: black;
+    z-index: 5;
+}
+.siac-prio-slider, .siac-prio-slider-small {
+    width: 250px;
+    -webkit-appearance: none; 
+    appearance: none;
+    background: #d3d3d3; 
+    outline: none;
+    opacity: 0.7; 
+    transition: opacity .2s;
+    height: 10px;
+    border-radius: 3px;
+}
+.siac-prio-slider-small {
+    width: 150px;
+    height: 8px;
+}
+.siac-prio-slider:hover, .siac-prio-slider-small:hover {
+    opacity: 1;
+  }
+  .siac-prio-slider::-webkit-slider-thumb, .siac-prio-slider-small::-webkit-slider-thumb {
+    -webkit-appearance: none;
+    appearance: none;
+    width: 15px;
+    height: 20px;
+    background: #2496dc;
+    cursor: pointer;
+    border-radius: 3px;
+  }
+  .siac-prio-slider::-webkit-slider-thumb:hover, .siac-prio-slider-small::-webkit-slider-thumb:hover {
+      filter: brightness(1.4);
+  }
+label input:checked ~ span {
+    font-weight: bold;
+}
+body.siac-left-right-switched #siac-right-side {
+    border-right: 2px solid #cfb495;
+}
+#siac-right-side {
+    border-left: 2px solid #cfb495;
+}
\ No newline at end of file
diff --git a/web/pdf_reader_yellow.css b/web/pdf_reader_yellow.css
new file mode 100644
index 00000000..476ffa3c
--- /dev/null
+++ b/web/pdf_reader_yellow.css
@@ -0,0 +1,863 @@
+body.siac-reading-modal-displayed #siac-right-side {
+    border-left: 2px solid #ffd868;
+}
+#siac-reading-modal {
+    display: none;
+    position: absolute;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    right: 0;
+    background-color: #2f2f31;
+    color: white;
+    padding: 12px;
+    padding-bottom: 6px;
+    font-size: 12px;
+    z-index: 7;
+    border-radius: 5px;
+    overflow: hidden;
+}
+
+#siac-reading-modal a:not(.siac-disabled) {
+    color: #ffd868 !important;
+}
+#siac-reading-modal a.greyedout, #siac-reading-modal a.active {
+    color: lightgray !important;
+}
+.siac-clickable-anchor.tab.active {
+    text-decoration: underline;
+}
+.siac-pdf-main-color {
+    color: #ffd868;
+}
+.siac-rm-main-color-hover:hover {
+    color: #ffd868;
+    cursor: pointer;
+}
+.siac-modal-small.dark, #siac-reading-modal .siac-modal-small {
+    border: 3px outset #ffd868;
+    background: #2f2f31;
+    color: white;
+}
+
+#siac-cloze-btn {
+    margin-bottom: 7px;
+    text-align: center;
+    color:#ffd868;
+    cursor:pointer;
+    user-select: none;
+}
+#siac-cloze-btn:hover {
+    transform: scale(1.03);
+    filter: brightness(1.4);
+}
+.siac-btn-small-dropdown-inverted {
+    display: none;
+    position: absolute;
+    color: white;
+    background-color: #2f2f31;
+    width: 200px;
+    padding: 0px 4px 0px 4px;
+    height: 135px;
+    top: -114px;
+    left: -181px;
+    border: 2px outset #ffd868; 
+    z-index: 5;
+    transition: all 0.3s;
+}
+.siac-dropdown-inverted-item {
+    margin: 3px 0 2px 0;
+    text-align: left;
+    width: 100%;
+    color: #ffd868;
+    text-align: center;
+    height: 16px;
+    font-size: 13px !important;
+}
+.siac-dropdown-inverted-item:hover {
+    filter: brightness(1.4);
+}
+#siac-tt-web-btn {
+    color:#ffd868;
+    cursor:pointer;
+    position: absolute;
+    top: 5px;
+    right: 5px;
+    height: 20px;
+    width: 20px;
+    background-position: center;
+    background-repeat: no-repeat;
+    background-size: 20px 20px;
+}
+#siac-tt-web-btn:hover {
+    transform: scale(1.03);
+    filter: brightness(1.4);
+}
+#siac-pdf-br-notify {
+    display: none; 
+    position: absolute; 
+    z-index: 4; 
+    bottom: 50px; 
+    right: 45px; 
+    border: 3px outset #ffd868; 
+    border-radius: 3px; 
+    color: lightgrey; 
+    background: #2f2f31; 
+    padding: 15px;
+}
+#siac-pdf-overlay {
+    display: none;
+    position: absolute;
+    bottom: 35px;
+    right: 0; left: 0;
+    z-index: 4;
+    user-select: none;
+    background-color: #43a047;
+    border-radius: 7px;
+    border: 4px outset green;
+    padding: 2px 4px 4px 4px;
+    width: 200px;
+    text-align: center;
+    color: white;
+    margin-left: auto;
+    margin-right: auto;
+}
+#siac-pdf-mark-btn {
+    padding: 4px 3px 5px 4px;
+    z-index: 3;
+    border: 3px outset #2496dc;
+    border-radius: 3px;
+    margin-right: 14px;
+    display: inline-block;
+    max-width: 30px;
+    transition: all 0.4s;
+    overflow: hidden;
+    white-space: nowrap;
+}
+#siac-pdf-mark-btn:hover {
+    border-color: #67c3fc;
+}
+#siac-pdf-mark-btn:hover img {
+    filter: brightness(1.4);
+}
+#siac-pdf-mark-btn > div {
+    display: none;
+}
+#siac-pdf-mark-btn.expanded > div{
+    display: inline-block;
+}
+#siac-pdf-mark-btn.expanded {
+    max-width: 400px;
+}
+#siac-pdf-mark-btn.expanded img {
+    float: left;
+    margin-top: 2px !important;
+}
+.siac-mark-btn-inner {
+    display: inline-block;
+    border: 2px outset grey;
+    border-radius: 3px;
+    margin-left: 5px;
+    font-size: 11px !important;
+    padding: 1px 4px 1px 4px;
+    cursor: pointer;
+}
+.siac-mark-btn-inner.active {
+    border-color: #2496dc;
+}
+.siac-mark-btn-inner:hover {
+    border-color: #43b7ff;
+}
+.siac-pdf-mark-lbl,#siac-iframe-btn {
+    display: inline-block;
+    margin-right: 10px;
+    font-size: 13px;
+    border: 3px outset #2496dc;
+    border-radius: 4px;
+    padding: 4px 6px 4px 6px;
+    background: #2f2f31;
+    color: white;
+    z-index: 4;
+    user-select: none;
+}
+.siac-pdf-mark-lbl > b:hover {
+    color: #ffd868;
+    cursor: pointer;
+}
+#siac-pdf-overlay-top {
+    position: absolute;
+    top: 4px;
+    left: 0px;
+    width: 100%;
+    z-index: 4;
+}
+#siac-pdf-top {
+    width: 100%; 
+    flex: 1 1 auto;
+    position:relative; 
+    height: calc(100% - 90px); 
+    overflow-y: auto; 
+    text-align: center;
+    margin-top: 20px;
+}
+#siac-text-top-wr {
+    flex: 1 1 auto;
+    margin-top: 20px;
+}
+#siac-text-top {
+    text-align: left;
+    padding: 10px;
+
+}
+#siac-iframe {
+    width: 100%;
+    flex: 1 1 auto;
+    display: none;
+}
+#siac-iframe-btn {
+    position: absolute;
+    left: 0px;
+    top: 50px;
+}
+#siac-schedule-dialog-btn {
+    margin-left: 8px;
+}
+#siac-schedule-dialog-btn > svg {
+    vertical-align: middle;
+    margin-bottom: 2px;
+}
+#siac-schedule-dialog-btn.active > svg {
+    filter: brightness(1.4);
+}
+#siac-close-iframe-btn {
+    z-index: 4;
+    position: absolute;
+    right: 0px;
+    top: 5px;
+    display: none;
+    font-size: 13px;
+    border: 3px outset #2496dc;
+    border-radius: 4px;
+    padding: 4px 6px 4px 6px;
+    background: #2f2f31;
+    color: white;
+    user-select: none;
+}
+#siac-close-iframe-btn:hover {
+    border-color: #67c3fc;
+}
+#siac-iframe-btn:hover {
+    border-color: #67c3fc;
+}
+#siac-iframe-btn > div {
+    display: none;
+}
+#siac-iframe-btn.expanded > div {
+    display: inline-block;
+}
+#siac-quick-sched-btn, #siac-mark-jump-btn, #siac-pdf-search-btn {
+    position: absolute;
+    z-index: 4;
+    left: 0;
+}
+#siac-quick-sched-btn {
+    bottom: 43px;
+    padding: 2px 3px 2px 3px;
+}
+#siac-mark-jump-btn {
+    bottom: 76px;
+    padding: 4px 3px 4px 3px;
+}
+#siac-pdf-search-btn {
+    bottom: 111px;
+    padding: 4px 3px 4px 3px;
+}
+#siac-quick-sched-btn > .expanded-hidden, #siac-mark-jump-btn > .expanded-hidden, #siac-pdf-search-btn > .expanded-hidden {
+    display: none;
+    vertical-align: middle;
+}
+#siac-quick-sched-btn .siac-read-icn {
+    margin: 0;
+    vertical-align: middle;
+}
+#siac-quick-sched-btn.expanded > .expanded-hidden, #siac-mark-jump-btn.expanded > .expanded-hidden, #siac-pdf-search-btn.expanded > .expanded-hidden {
+    display: inline-block;
+}
+#siac-mark-jump-btn:hover img, #siac-pdf-search-btn:hover img {
+    filter: brightness(1.4);
+}
+#siac-mark-jump-btn.expanded img, #siac-pdf-search-btn.expanded img {
+    float: left;
+    margin-top: 2px;
+}
+#siac-pdf-search-btn.expanded img { 
+    margin-top: 5px;
+}
+#siac-pdf-search-btn-inner input:focus {
+    outline-width: 0;
+}
+#siac-iframe-btn input {
+    width: 100%;
+    background: #2f2f31;
+    color: white;
+    border-color: white;
+    border-radius: 3px;
+    padding-left: 4px;
+    vertical-align: top;
+    box-sizing: border-box;
+}
+#siac-iframe-btn input:focus {
+    outline: none;
+}
+#siac-iframe-btn.expanded {
+    max-width: 400px;
+}
+#siac-iframe-btn label:hover {
+    color: #ffd868;
+    cursor: pointer;
+}
+.siac-url-ch {
+   color: #ffd868; 
+   margin-bottom: 4px;
+}
+.siac-url-ch:hover {
+    filter: brightness(1.4);
+}
+#siac-pdf-tooltip {
+	position: absolute;
+	display: none;
+	z-index: 999;
+    background-color: #2f2f31;
+	color: white;
+    padding: 9px;
+	border-radius: 5px;
+    border: 4px outset #ffd868;
+    transition: all 0.5s;
+}
+
+#siac-pdf-read-btn,#siac-pdf-more-btn {
+    border-radius: 4px;
+    border: 3px outset #43a047;
+    padding: 1px 5px 1px 5px;
+    background-color: #2f2f31;
+    color: beige;
+}
+#siac-pdf-read-btn:hover,#siac-pdf-more-btn:hover {
+    color: white;
+    border: 3px outset #69B36C;
+    background-color: #2f3030;
+}
+#siac-pdf-night-btn {
+    padding-left: 4px;
+    padding-right: 4px;
+}
+#siac-pdf-tooltip-results-area {
+	overflow-y: auto;
+    overflow-x: hidden;
+    width: calc(100% - 18px);
+	padding-right: 8px;
+    padding-left: 3px;
+}
+#siac-pdf-tooltip-bottom {
+    text-align: center;
+}
+#siac-tooltip-center {
+    position: absolute;
+    top: 7px;
+    left: 7px;
+    cursor: pointer;
+    display: inline-block;
+    color: #ffd868;
+    border: 3px solid #ffd868;
+    border-radius: 2px;
+    width: 9px;
+    height: 9px;
+}
+#siac-pdf-tooltip-top {
+    text-align: center;
+}
+#siac-tooltip-center:hover {
+    filter: brightness(1.4);
+}
+#siac-pdf-tooltip-searchbar {
+    width: calc(100% - 14px);
+    margin-top: 15px;
+    margin-bottom: 5px;
+    border-radius: 4px;
+    background-color: #2f2f31;
+    color: white;
+    border-color: white;
+    padding-left: 4px;
+}
+#siac-pdf-tooltip-searchbar:focus {
+    outline: none;
+}
+#siac-pdf-page-inp {
+    background: #2f2f31;
+    color: beige;
+}
+#siac-reading-modal-bottom-bar {
+    width: 100%; 
+    flex: 0 0 auto; 
+    position: relative; 
+    border-top: 2px solid #ffd868; 
+    margin-top: 5px; 
+    padding: 2px 0 0 5px; 
+    overflow: hidden; 
+    user-select: none;
+}
+#siac-pdf-bottom-tab {
+    display: inline-block;
+    max-height: 89px;
+    overflow: hidden;
+    overflow-y: auto;
+    vertical-align: top;
+    margin-top: 4px;
+    padding: 0 5px 0 0;
+    box-sizing: border-box;
+}
+.siac-reading-modal-button-bar-wrapper {
+    flex: 0 0 30px; 
+    width: 100%; 
+    text-align: center; 
+    margin-top: 15px; 
+    position: relative; 
+}
+#siac-marks-display {
+    vertical-align: top;
+    height: 100%;
+}
+.siac-related-notes-item {
+    color: grey;
+    cursor: pointer;
+}
+.siac-related-notes-item:hover {
+    color: lightgrey;
+}
+#siac-marks-display::-webkit-scrollbar {
+    display: none;
+}
+#siac-marks-display td:nth-child(2) {
+    word-wrap: break-word; 
+    white-space: normal;
+    padding-left: 5px;
+}
+.siac-page-mark-link {
+    display: inline-block;
+    cursor: pointer;
+    color: #ffd868;
+    font-weight: bold;
+}
+.siac-page-mark-link:hover {
+    filter: brightness(1.4);
+}
+.siac-field-picker-opt {
+    display: inline-block;
+    font-size: 15px;
+    line-height: 18px;;
+    color: #ffd868;
+    cursor: pointer;
+    user-select: none;
+}
+.siac-field-picker-opt:hover {
+    filter: brightness(1.4);
+    transform: scale(1.04);
+}
+#siac-reading-modal-top-btns {
+    position: absolute;
+    top: 7px; right: 25px;
+    text-align: center;
+    vertical-align: middle;
+    z-index: 6;
+}
+#siac-reading-modal-top-btns div:hover {
+    color: white;
+}
+#siac-reading-modal-top-btns siac-btn {
+    line-height: 13px;
+}
+#siac-reading-modal-top-btns span {
+    border: 1px solid lightgrey; 
+    height: 11px; 
+    width: 4px;
+    margin: 0;
+    vertical-align: middle;
+    display: inline-block;
+}
+#siac-reading-modal-top-btns div:hover span {
+    border-color: white;
+}
+#siac-reading-modal-change-theme {
+    position: absolute;
+    right: 0;
+    bottom: 4px;
+    cursor: pointer;    
+}
+#siac-reading-modal-change-theme > a {
+    color:lightgrey !important;
+}
+.siac-queue-picker-icn {
+    margin-left: 25px; cursor: pointer; font-weight: bold; color: #ffd868;
+    display: inline-block;
+}
+.siac-queue-picker-icn:not(.siac-disabled):hover {
+    transform: scale(1.4);
+    filter: brightness(140%);
+}
+#siac-queue-sched-wrapper {
+    padding: 5px 0 0 0;
+    max-width: 0px;
+    overflow: hidden;
+    display: inline-block;
+    transition: max-width 0.6s;
+    transform: translateZ(0);
+}
+.siac-queue-sched-btn, .siac-queue-sched-btn-hor {
+    display: inline-block;
+    font-size: 13px;
+    padding: 2px;
+    border: 2px solid #2496dc;;
+    color: lightblue;
+    user-select: none;
+    cursor: pointer;
+    text-align: center;
+    border-radius: 4px;
+}
+.siac-queue-sched-btn {
+    writing-mode: vertical-lr;
+    height: 90px;
+}
+.siac-queue-sched-btn.siac-prio-5 {
+    height: 80px;
+}
+.siac-queue-sched-btn.siac-prio-4 {
+    height: 70px;
+}
+.siac-queue-sched-btn.siac-prio-3 {
+    height: 60px;
+}
+.siac-queue-sched-btn.siac-prio-2 {
+    height: 50px;
+}
+.siac-queue-sched-btn.siac-prio-1 {
+    height: 40px;
+}
+.siac-queue-sched-btn-hor {
+    vertical-align: top;
+    margin: 40px 5px 0px 5px;
+}
+.siac-queue-sched-btn:hover, .siac-queue-sched-btn-hor:hover {
+    color: white;
+    border-color: white;
+    transform: scale(1.04);
+}
+.siac-queue-sched-btn.active, .siac-queue-sched-btn-hor.active {
+    color: white;
+    border-color: #ffd868;
+}
+.siac-queue-sched-btn.active:hover, .siac-queue-sched-btn-hor.active:hover {
+   filter: brightness(140%);
+}
+
+.siac-queue-sched-hor-sep {
+    display: inline-block;
+    height: 50px;
+    width: 20px;
+    margin: 0 10px 0 10px;
+    border-top: 2px solid lightgrey;
+    border-style: dotted;
+    border-width: 2px 0 0 0;
+}
+.siac-clickable-anchor {
+    cursor: pointer;
+    background-color: inherit !important;
+    display: inline-block;
+    border: 1px solid transparent;
+}
+.siac-clickable-anchor.siac-disabled,.siac-queue-picker-icn.siac-disabled,.siac-page-mark-link.siac-disabled,.siac-queue-sched-btn.siac-disabled {
+    color: grey !important;
+}
+.siac-sched-icn.siac-disabled {
+    opacity: 0.3;
+}
+.siac-sched-icn line, .siac-sched-icn ellipse {
+    stroke: #ffd868 !important;
+}
+.siac-sched-icn.grey line, .siac-sched-icn.grey ellipse {
+    stroke: lightgrey !important;
+}
+.siac-queue-sched-btn.siac-disabled {
+    border-color: grey !important;
+}
+.siac-clickable-anchor:not(.siac-disabled):hover {
+    transform: scale(1.02);
+    filter: brightness(140%);
+}
+#siac-queue-infobox-wrapper {
+    position: relative;
+    display: inline-block;
+    vertical-align: top;
+    margin-left: 14px;
+}
+#siac-queue-infobox {
+    position: absolute;
+    top: 0;
+    left: 0;
+    display: none;
+    width: 300px;
+    height: 102px;
+    border: 3px outset #ffd868;
+}
+#siac-queue-infobox:after {
+    content: " ";
+    position: absolute;
+    right: 100%;
+    top: var(--ttop);
+    margin-top: -11px;
+    border-width: 11px;
+    border-style: solid;
+    border-color: transparent #ffd868 transparent transparent;
+    transition: all ease 0.2s;
+}
+#siac-reading-modal-timer {
+    font-size: 30px;
+    user-select: none;
+    font-weight: bold;
+    line-height: 1em;
+}
+.siac-timer-btn {
+    cursor: pointer;
+    margin-right: 5px;
+    font-size: 11px;
+    line-height: 1em;
+    display: inline-block;
+}
+.siac-timer-btn:hover {
+    transform: scale(1.2);
+    user-select: none;
+}
+.siac-timer-btn.active {
+    color: #ffd868;
+    font-weight: bold;
+}
+#siac-timer-play-btn {
+    font-size: 19px;
+    line-height: 19px;
+    cursor: pointer;
+    user-select: none;
+    display: inline-block;
+}
+#siac-timer-play-btn:hover {
+    transform: scale(1.05);
+}
+#siac-reading-modal-center img {
+    display: block;
+    margin-left: auto !important;
+    margin-right: auto !important;
+}
+#siac-timer-popup {
+    z-index: 9999999;
+    background: #2f2f31;
+    color: white;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    padding: 15px;
+    width: 300px;
+    border: 4px outset #ffd868;
+    border-radius: 5px;
+    display: none;
+}
+#siac-pdf-top::-webkit-scrollbar:horizontal {
+    height: 10px !important;
+}
+#siac-pdf-top::-webkit-scrollbar, #siac-pdf-bottom-tab::-webkit-scrollbar,#siac-pdf-tooltip-results-area::-webkit-scrollbar, body.nightMode ::-webkit-scrollbar {
+    width: 10px !important;
+    background: #313d45 !important;
+    border-radius: 4px !important;
+}
+ #siac-pdf-top::-webkit-scrollbar-thumb, body.nightMode ::-webkit-scrollbar-thumb,#siac-pdf-tooltip-results-area::-webkit-scrollbar-thumb, #siac-pdf-bottom-tab::-webkit-scrollbar-thumb {
+    background: #515d71 !important;
+    border-radius: 4px !important;
+} 
+.siac-pdf-loader {
+    width: 250px; 
+    padding: 15px; 
+    position: relative; 
+    text-align: center;
+    border: 3px outset #ffd868;
+    background: #2f2f31;
+    color: white;
+}
+.tox-tinymce-aux {
+    z-index: 2147483638 !important;
+}
+.tox .tox-menu {
+    z-index: 2147483638 !important;
+}
+#siac-text-top-wr > div {
+    height: 100% !important;
+}
+.siac-pdf-mark-lbl {
+    font-weight: bold;
+}
+.siac-note-title-only {
+    font-weight: bold;
+    overflow: ellipsis;
+    user-select: none;
+    cursor: pointer;
+}
+body.night_mode .siac-note-title-only {
+    color: lightgrey;
+}
+.siac-note-title-only:hover {
+    filter: brightness(1.4);
+}
+#siac-reading-modal-tabs-left {
+    font-family: 'Open Sans', sans-serif;
+    margin: 10px 5px 0 5px;
+    padding: 10px 15px 5px 0;
+    border-top: 2px solid;
+    margin-top: 10px;
+    border-top: 2px solid #ffd868;
+}
+#siac-reading-modal-tabs-left .siac-btn {
+    color: #b2b2a0;
+    border-color: #b2b2a0;
+    margin-left: 4px;
+}
+#siac-reading-modal-tabs-left .siac-btn.active {
+    color: #61c3ff !important;
+    border-color: #2496dc !important;
+}
+.siac-pdf-main-color-border-bottom {
+    border-bottom: 2px solid #ffd868;
+}
+.siac-pdf-main-color-border-top {
+    border-top: 2px solid #ffd868;
+}
+#siac-left-tab-browse,#siac-left-tab-pdfs {
+    font-family: 'Open Sans', sans-serif;
+    flex: 1 1 auto;
+    width: 100%;
+    box-sizing: border-box;
+    padding: 0 10px 0 10px;
+    overflow: hidden;
+}
+#siac-left-tab-browse input,#siac-left-tab-pdfs input {
+    border-radius: 4px;
+    padding-left: 3px;
+}       
+body.nightMode #siac-left-tab-browse input, body.nightMode #siac-left-tab-pdfs input {
+    background: #333333;
+    color: lightgrey;
+}
+.siac-pdf-color-btn {
+    height: 18px; 
+    width: 18px; 
+    border-radius: 4px;
+    margin-bottom: 4px;
+    border: 2px solid transparent;
+    cursor: pointer;
+}
+.siac-pdf-color-btn.active,.siac-pdf-ul-btn.active {
+    border-color: white !important;
+}
+.siac-hl {
+    position: absolute;
+    mix-blend-mode: multiply !important;
+    z-index: 2;
+    border-radius: 7px;
+}
+.siac-text-hl {
+    mix-blend-mode: normal !important;
+    z-index: 3;
+    border: 3px outset #2496dc;
+    font-family: 'Open Sans', sans-serif;
+    white-space: pre-wrap;
+    outline: none;
+}
+#siac-pdf-top.siac-pdf-night .siac-text-hl {
+    /* color: lightgrey; */
+    background: beige !important;
+    border-color: #44fdb0 !important;
+}
+.siac-pdf-ul-btn {
+    height: 5px; 
+    width: 18px; 
+    border: 2px solid transparent;
+    margin-bottom: 4px;
+    border-radius: 4px;
+    cursor: pointer;
+}
+#siac-reading-modal-top-btns > div {
+    height: 24px;
+    width: 24px;
+    box-sizing: border-box;
+    background-size: 17px 17px;
+    padding: 0 !important;
+    background-repeat: no-repeat;
+    background-position: center;
+}
+#siac-reading-modal-top-bar {
+    min-height: 77px; 
+    width: 100%; 
+    flex: 0 0 77px; 
+    display: flex; 
+    flex-wrap: nowrap; 
+    border-bottom: 2px solid #ffd868; 
+    margin-bottom: 5px; 
+    white-space: nowrap;
+    position: relative;
+}
+#siac-rm-greyout {
+    position: absolute;
+    display: none;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    opacity: 0.4;
+    background-color: black;
+    z-index: 5;
+}
+.siac-prio-slider, .siac-prio-slider-small {
+    width: 250px;
+    -webkit-appearance: none; 
+    appearance: none;
+    background: #d3d3d3; 
+    outline: none;
+    opacity: 0.7; 
+    transition: opacity .2s;
+    height: 10px;
+    border-radius: 3px;
+}
+.siac-prio-slider-small {
+    width: 150px;
+    height: 8px;
+}
+.siac-prio-slider:hover, .siac-prio-slider-small:hover {
+    opacity: 1;
+  }
+  .siac-prio-slider::-webkit-slider-thumb, .siac-prio-slider-small::-webkit-slider-thumb {
+    -webkit-appearance: none;
+    appearance: none;
+    width: 15px;
+    height: 20px;
+    background: #2496dc;
+    cursor: pointer;
+    border-radius: 3px;
+  }
+  .siac-prio-slider::-webkit-slider-thumb:hover, .siac-prio-slider-small::-webkit-slider-thumb:hover {
+      filter: brightness(1.4);
+  }
+label input:checked ~ span {
+    font-weight: bold;
+}
+body.siac-left-right-switched #siac-right-side {
+    border-right: 2px solid #ffd868;
+}
+#siac-right-side {
+    border-left: 2px solid #ffd868;
+}
\ No newline at end of file
diff --git a/web/pdfjs/textlayer.css b/web/pdfjs/textlayer.css
index 6d706a47..25e2f437 100644
--- a/web/pdfjs/textlayer.css
+++ b/web/pdfjs/textlayer.css
@@ -5,22 +5,23 @@
      right: 0;
      bottom: 0;
      overflow: hidden;
-     opacity: 0.2;
+     opacity: 0.3;
      line-height: 1.0;
+     z-index: 3;
  }
 .textLayer > span {
     color: transparent;
     position: absolute;
     white-space: pre;
+    z-index: 3;
     cursor: text;
     transform-origin: 0% 0%;
   }
-.textLayer > div {height:200px;}
+.textLayer > span {height:200px;}
   .textLayer .highlight {
     margin: -1px;
     padding: 1px;
     background-color: rgb(180, 0, 170);
-    /* background-color: yellow; */
     border-radius: 4px;
   }
 
diff --git a/web/scripts.js b/web/scripts.js
index e2d87b97..f8d49e3a 100644
--- a/web/scripts.js
+++ b/web/scripts.js
@@ -91,7 +91,7 @@ function selectDeckWithId(did) {
     updateSelectedDecks();
 }
 function fixRetMarkWidth(elem) {
-    if (elem.parentElement.getElementsByClassName("retMark").length > 0 && elem.parentElement.getElementsByClassName("retMark")[0].style.maxWidth.length == 0)
+    if (elem && elem.parentElement.getElementsByClassName("retMark").length > 0 && elem.parentElement.getElementsByClassName("retMark")[0].style.maxWidth.length == 0)
         elem.parentElement.getElementsByClassName("retMark")[0].style.maxWidth = elem.offsetWidth + "px";
 }
 function expandRankingLbl(elem) {
@@ -275,7 +275,7 @@ function getSelectionText() {
     }
     if (text.length > 0 && text != "&nbsp;") {
         showLoading("Selection");
-        pycmd('fldSlctd ' + siacState.selectedDecks.toString() + ' ~ ' + text);
+        pycmd('siac-fld-selected ' + siacState.selectedDecks.toString() + ' ~ ' + text);
     }
 }
 function searchForUserNote(event, elem) {
@@ -318,7 +318,7 @@ function onWindowResize() {
         document.getElementById("outerWr").style.height = `calc(100vh - ${offsetTop}px)`;
 
     if (!$('#switchBtn').is(":visible")) {
-        $('#leftSide').show();
+        $('#leftSide').css("display", "flex");
         $('#outerWr').css('display', 'flex').removeClass('onesided');
         document.getElementById('switchBtn').innerHTML = "&#10149; Search";
     }
@@ -374,12 +374,12 @@ function deleteNote(id) {
 
 function synInputKeyup(event, elem) {
     if (event.keyCode == 13 && elem.value)
-        pycmd("saveSynonyms " + elem.value);
+        pycmd("siac-save-synonyms " + elem.value);
 }
 
 function synonymSetKeydown(event, elem, index) {
     if (event.keyCode == 13 && elem.innerHTML.length) {
-        pycmd("editSynonyms " + index + " " + elem.innerHTML);
+        pycmd("siac-edit-synonyms " + index + " " + elem.innerHTML);
         event.preventDefault();
         $(elem).blur();
     }
@@ -407,9 +407,9 @@ function updateFieldToHideInResult(checkbox, mid, fldOrd) {
 function setSearchOnTyping(active) {
     siacState.searchOnTyping = active;
     if (!active)
-        $('.field').off('keyup', fieldKeypress);
+        $('.field').off('keyup.siac', fieldKeypress);
     else {
-        $('.field').on('keyup', fieldKeypress);
+        $('.field').on('keyup.siac', fieldKeypress);
         sendContent();
     }
     sendSearchOnTyping();
@@ -421,14 +421,14 @@ function sendSearchOnSelection() {
     pycmd("searchOnSelection " + (siacState.searchOnSelection ? "on" : "off"));
 }
 function fieldKeypress(event) {
-    if (event.keyCode != 13 && event.keyCode != 9 && event.keyCode != 32 && event.keyCode != 91 && !(event.keyCode >= 37 && event.keyCode <= 40) && !event.ctrlKey) {
+    if (event.keyCode != 13 && event.keyCode != 9 && event.keyCode != 91 && !(event.keyCode >= 37 && event.keyCode <= 40) && !event.ctrlKey) {
         if (siacState.timeout) {
             clearTimeout(siacState.timeout);
             siacState.timeout = null;
         }
         siacState.timeout = setTimeout(function () {
             sendContent(event);
-        }, $del$);
+        }, delayWhileTyping);
     }
 }
 function searchMaskKeypress(event) {
@@ -479,7 +479,7 @@ function clearSearchResults() {
         document.getElementById("greyout").style.display = "none";
     } catch(e) {}
 
-    $('.siac-tag-info-box').remove();
+    $('.siac-tag-info-box,#siac-results-loader-wrapper').remove();
     $('.tagLbl').css("z-index", "999");
 }
 
@@ -519,7 +519,7 @@ function setSearchResults(html, infoStr, infoMap, page = 1, pageMax = 1, total =
         if (stamp > -1 && document.getElementById("info-took")) {
             if (printTiming) {
                 let took = new Date().getTime() - stamp;
-                document.getElementById("info-Took").innerHTML = `<b>${took}</b> ms &nbsp;<b style='cursor: pointer' onclick='pycmd("lastTiming ${new Date().getTime() - rStart}")'>&#9432;</b>`;
+                document.getElementById("info-Took").innerHTML = `<b>${took}</b> ms &nbsp;<b style='cursor: pointer' onclick='pycmd("siac-last-timing ${new Date().getTime() - rStart}")'>&#9432;</b>`;
             } else {
                 document.getElementById("info-Took").innerHTML = `<b>${new Date().getTime() - stamp}</b> ms`;
             }
@@ -531,7 +531,7 @@ function setSearchResults(html, infoStr, infoMap, page = 1, pageMax = 1, total =
         if (stamp > -1 && document.getElementById("info-took")) {
             if (printTiming) {
                 let took = new Date().getTime() - stamp;
-                document.getElementById("info-Took").innerHTML = `<b>${took}</b> ms &nbsp;<b style='cursor: pointer' onclick='pycmd("lastTiming ${new Date().getTime() - rStart}")'>&#9432;</b>`;
+                document.getElementById("info-Took").innerHTML = `<b>${took}</b> ms &nbsp;<b style='cursor: pointer' onclick='pycmd("siac-last-timing ${new Date().getTime() - rStart}")'>&#9432;</b>`;
             } else {
                 document.getElementById("info-Took").innerHTML = `<b>${new Date().getTime() - stamp}</b> ms`;
             }
@@ -564,7 +564,7 @@ function displayPagination(page, pageMax, total, resultsFound, cacheSize) {
     if (cacheSize !== -1) {
         let c_html = "";
         if (cacheSize > 1) {
-            c_html += "<div style='display: inline;'>Last Results: &nbsp;</div>"
+            c_html += `<div onclick='pycmd("siac-rerender ${cacheSize - 2}")' style='display: inline; cursor: pointer;'>Last Results: &nbsp;</div>`;
             for (var i = 0; i < cacheSize - 1; i++) {
                 c_html += `<span onclick='pycmd("siac-rerender ${cacheSize - i - 2}")'>${i+1}</span>`;
             }
@@ -668,19 +668,29 @@ function activateGridView() {
         $('#gridCb').prop("checked", true);
     }, 400);
 }
+function predefSearchFromSidebar(type) {
+    showSearchLoader();
+    setTimeout(function() {
+        let decks = siacState.selectedDecks.toString();
+        pycmd('predefSearch ' + type + ' 200 ' + decks);
+    }, 110);
 
+}
 function predefSearch() {
-    let e = document.getElementById("predefSearchSelect");
-    let search = e.options[e.selectedIndex].value;
-    let c = document.getElementById("predefSearchNumberSel");
-    let count = c.options[c.selectedIndex].value;
-    let decks = siacState.selectedDecks.toString();
-    pycmd("predefSearch " + search + " " + count + " " + decks);
+    showSearchLoader();
+    setTimeout(function() {
+        let e = document.getElementById("predefSearchSelect");
+        let search = e.options[e.selectedIndex].value;
+        let c = document.getElementById("predefSearchNumberSel");
+        let count = c.options[c.selectedIndex].value;
+        let decks = siacState.selectedDecks.toString();
+        pycmd("predefSearch " + search + " " + count + " " + decks);
+    }, 110);
 }
 function sort() {
     let e = document.getElementById("sortSelect");
     let sort = e.options[e.selectedIndex].value;
-    pycmd("pSort " + sort);
+    pycmd("siac-p-sort " + sort);
 
 }
 function addFloatingNote(nid) {
@@ -816,7 +826,7 @@ function displayCalInfo(elem) {
     }
     $('#cal-info').css("left", offsetLeft + "px").css("top", (offset.top - 275) + "px");
     document.getElementById('cal-info').style.display = "block";
-    pycmd("calInfo " + $(elem.children[0]).data("index"));
+    pycmd("siac-cal-info " + $(elem.children[0]).data("index"));
 }
 
 function calMouseLeave() {
@@ -857,11 +867,26 @@ function hideModalSubpage() {
 function showLoader(target, text, voffset) {
     voffset = voffset ? voffset : 0;
     $('#' + target).append(`
-    <div id='siac-loader-modal' class='siac-modal-small' contenteditable=false style='position: relative; text-align: center; margin-top: ${voffset}px;'>
+    <div id='siac-loader-modal' class='siac-modal-small' contenteditable=false style='position-relative; text-align: center; margin-top: ${voffset}px;'>
         <div> <div class='signal' style='margin-left: auto; margin-right: auto;'></div><br/><div id='siac-loader-text'>${text}</div></div>
     </div>
     `);
 }
+function showSearchLoader(text) {
+    if (document.getElementById('siac-results-loader-wrapper')) {
+        return;
+    }
+    text = text ? text : "Computing ...";
+    let sr = document.getElementById("searchResults");
+    sr.scrollTop = 0;
+    sr.style.overflowY = 'hidden';
+    sr.innerHTML += `
+    <div id='siac-results-loader-wrapper' style='position: absolute; left: 0; right: 0; top: 0; bottom: 0; z-index: 5; height: 100%%; text-align: center; background: rgba(0,0,0,0.4); display:flex; align-items: center; justify-content: center; border-radius: 5px;'>
+        <div class='siac-search-loader' style='display: inline-block; vertical-align: middle;'>
+            <b>${text}</b>
+        </div>
+    </div>`;
+}
 
 function toggleSearchbarMode(elem) {
 	if (elem.innerHTML === "Mode: Browser") {
@@ -874,6 +899,12 @@ function toggleSearchbarMode(elem) {
 }
 
 function globalKeydown(e) {
+    // if (e.keyCode === 65 && event.button) {
+    //     pdfTextLayerMetaKey = true;
+    // } else {
+    //     setTimeout(function() { pdfTextLayerMetaKey = false;}, 100);
+    //     pdfTextLayerMetaKey = false;
+    // }
     if ((window.navigator.platform.match("Mac") ? e.metaKey : e.ctrlKey) && e.shiftKey && e.keyCode === 78) {
         e.preventDefault();
         if ($('#siac-rd-note-btn').length) {
@@ -881,11 +912,7 @@ function globalKeydown(e) {
         } else {
             pycmd('siac-create-note');
         }
-    } else if ((window.navigator.platform.match("Mac") ? e.metaKey : e.ctrlKey) && e.shiftKey && e.keyCode === 83 && $('#siac-reading-modal-top-bar').is(":visible")) {
-       // pycmd("siac-quick-schedule " + $('#siac-reading-modal-top-bar').data('nid'));
-    }
-    
-    
+    } 
     else if (pdfDisplayed && !$('.field').is(':focus')) {
         pdfViewerKeyup(e);
     }
diff --git a/web/styles.css b/web/styles.css
index c299175b..aa6fd113 100644
--- a/web/styles.css
+++ b/web/styles.css
@@ -122,6 +122,14 @@
     font-size: 20px;
     color: #2496dc;
 }
+.siac-search-loader {
+    width: 250px; 
+    padding: 15px; 
+    text-align: center;
+    border: 3px outset $modalBorderColor$;
+    background: $modalBackgroundColor$;
+    color: $modalForegroundColor$;
+}
 #searchResults {
     display: none;
     height: calc(100% - 15px);
@@ -129,6 +137,7 @@
     padding: 10px 10px 5px 10px;
     overflow-x: hidden;
     max-width: 100%;
+    position: relative;
     flex: 1 1 auto;
 }
 .editedStamp {
@@ -231,7 +240,7 @@
     flex-wrap: nowrap;
     height: 30px;
 }
-#siac-right-side mark {
+#siac-right-side mark, #siac-left-tab-browse mark {
     background-color: $highlightBackgroundColor$;
     color: $highlightForegroundColor$;
     border-radius: 4px;
@@ -257,10 +266,7 @@
 .tagLbl:hover {
     filter: brightness(150%);
 }
-.siac-orange-hover:hover {
-    color: darkorange;
-    cursor: pointer;
-}
+
 #tagContainer .tagLbl {
     float: left;
     margin-bottom: 5px;
@@ -819,13 +825,19 @@ table.striped tr:nth-child(even) {
     border: 2px outset #b2b2a0;
     border-radius: 3px;
 }
+body:not(.nightMode) #leftSide .siac-btn-dark {
+    color: $buttonForegroundColor$;
+    background: $buttonBackgroundColor$;
+    border: 1px solid  $buttonBorderColor$;
+}
+
 .siac-btn-dark-smaller {
     font-size: 10px !important;
 }
 .siac-btn:hover {
     color: #2496dc;
 }
-.siac-btn-dark:hover {
+.siac-btn-dark:hover, .siac-btn-dark-smaller:hover {
     color: white;
     border-color: white;
 }
@@ -837,7 +849,7 @@ table.striped tr:nth-child(even) {
     border: 1px solid  $buttonBorderColor$;
     cursor: pointer;
     user-select: none;
-    font-size: 11px !important;
+    font-size: 12px !important;
     outline: none;
     box-shadow: 2px 2px 2px 1px rgba(0, 0, 0, 0.3);
 }
@@ -862,28 +874,15 @@ table.striped tr:nth-child(even) {
     width: calc(100% - 8px);
     margin-left: -5px;
     padding: 0px 4px 0px 4px;
-    font-size: 11px !important;
+    font-size: 12px !important;
     border: 1px solid  $buttonBorderColor$;
     border-top: 0px solid white;
     z-index: 5;
     transition: max-height 0.3s;
 }
-.siac-btn-small-dropdown-inverted {
-    display: none;
-    position: absolute;
-    color: white;
-    background-color: #2f2f31;
-    width: 200px;
-    padding: 0px 4px 0px 4px;
-    height: 135px;
-    top: -114px;
-    left: -181px;
-    border: 2px outset darkorange; 
-    z-index: 5;
-    transition: all 0.3s;
-}
+
 .siac-btn-small:hover .siac-btn-small-dropdown.hover,.siac-btn-small.expanded .siac-btn-small-dropdown.click {
-    max-height: 320px;
+    max-height: 340px;
     border-top: 1px solid $buttonBorderColor$;
 }
 .siac-btn-dark.expanded .siac-btn-small-dropdown-inverted.click {
@@ -893,18 +892,7 @@ table.striped tr:nth-child(even) {
     margin: 3px 0 2px 0;
     text-align: left;
 }
-.siac-dropdown-inverted-item {
-    margin: 3px 0 2px 0;
-    text-align: left;
-    width: 100%;
-    color: darkorange;
-    text-align: center;
-    height: 16px;
-    font-size: 13px !important;
-}
-.siac-dropdown-inverted-item:hover {
-    filter: brightness(1.4);
-}
+
 .siac-btn-small-dropdown .siac-dropdown-item:hover {
     color: #2496dc;
     transform: scale(1.04);
@@ -955,7 +943,6 @@ width: 48%; display: inline-block; text-align: center;
     color: #2496dc;
 }
 #siac-right-side {
-    border-left: 2px solid $windowColumnSeparatorColor$;
     padding: 0px 20px 4px 20px;
     margin-left: 8px;
     position: relative;
@@ -988,11 +975,12 @@ select {
 #modal-content > fieldset {
     font-size: 1.9em;
 }
-#synonymInput {
-    width: 97%;
+#siac-syn-inp {
+    width: 100%;
     margin-top: 5px;
     background: $modalBackgroundColor$;
     color: $modalForegroundColor$;
+    border-radius: 5px;
 }
 #synTable tr td:first-child {
     max-width: 150px;
@@ -1184,6 +1172,7 @@ span.tag-symbol {
     cursor:pointer;
     width: 17px;
     height: 17px;
+    font-size: 9px;
     background: white;
     margin-right: 3px; margin-left: 3px;
     text-align: center;
@@ -1304,19 +1293,6 @@ span.tag-symbol {
     color: white;
 }
 
-.siac-notification {
-    position: absolute;
-    right: 15px;
-    bottom: 15px;
-    padding: 20px;
-    background: #2f2f31;
-    color: beige;
-    border: 3px outset darkorange;
-    border-radius: 4px;
-    z-index: 1000000000;
-    width: 200px;
-    
-}
 .siac-tag-info-box {
     position: absolute;
     z-index: 9999;
@@ -1347,7 +1323,7 @@ span.tag-symbol {
 .siac-tag-info-box-left .cardR {
     user-select: text;
 }
-.siac-tag-info-box-left .editLbl {
+.siac-tag-info-box-left .editLbl, #siac-left-tab-browse .editLbl {
     border-right: 2px solid $noteBorderColor$;
     border-radius: 4px;
 }
@@ -1455,8 +1431,6 @@ span.tag-symbol {
     text-align: center;
     margin-bottom: 4px;
 }
-
-
 #outerWr.onesided {
     display: flex !important;
 }
@@ -1469,7 +1443,12 @@ span.tag-symbol {
 #outerWr.onesided .reading-modal-close-icn {
     right: 27px;
 }
-
+#siac-pdf-tooltip {
+    max-width: $pdfTooltipMaxWidth$px;
+}
+#siac-pdf-tooltip-results-area {
+    max-height: $pdfTooltipMaxHeight$px;
+}
 .siac-modal-small {
     z-index: 9999999;
     background: $modalBackgroundColor$;
@@ -1479,16 +1458,10 @@ span.tag-symbol {
     left: 50%;
     transform: translate(-50%, -50%);
     padding: 15px;
-    width: 250px;
+    width: 280px;
     border: 2px solid $modalBorderColor$;
     text-align: center;
 }
-.siac-modal-small.dark, #siac-reading-modal .siac-modal-small {
-    border: 3px outset darkorange;
-    background: #2f2f31;
-    color: white;
-}
-
 hr.siac-modal-sep {
     border-color: $modalBorderColor$;
 }
@@ -1526,7 +1499,10 @@ hr.siac-modal-sep {
     font-weight: bold; 
     text-decoration: none;
 }
-
+#siac-sidebar-selected {
+    text-align: center;
+    font-weight: bold;
+}
 @media (max-width: 1000px) , (max-height: 500px) {
     #siac-right-side {
         display: none;
@@ -1600,8 +1576,7 @@ body.siac-fullscreen-show-right #outerWr {
     height: calc(100vh - 3px) !important;
 }
 body.siac-left-right-switched #siac-right-side {
-    border-right: 2px solid $windowColumnSeparatorColor$;
-    border-left: 0px solid white;
+    border-left: 0px solid white !important;
     padding-left: 0px;
     padding-right: 10px;
 }
@@ -1609,6 +1584,18 @@ body.siac-left-right-switched #fields {
     padding-right: 0px;
     padding-left: 8px
 }
+body.siac-reading-modal-displayed #leftSide {
+    display: flex;
+    flex-direction: column;
+}
+body.siac-reading-modal-displayed #fields {
+    flex: 1 1 auto;
+    height: auto !important;
+}
+body.siac-reading-modal-displayed #siac-reading-modal-tabs-left {
+    flex: 0 0 auto;
+}
+
 @media (max-width: 600px) {
     #sortCol {
         display: none;