From 36f19a29f59ffe9285f17e4f7e7f8948934dde42 Mon Sep 17 00:00:00 2001
From: Colton <70598503+C-Loftus@users.noreply.github.com>
Date: Sat, 6 Apr 2024 12:44:10 -0400
Subject: [PATCH 1/9] update state to be class based for mypy

---
 core/callbacks.py                   | 26 +++++++++++---------
 core/core-agnostic.py               | 17 +++++++------
 core/core-linux.py                  | 17 ++++++-------
 core/screenreader_ipc/ipc_schema.py |  2 --
 nvda/nvda.py                        | 38 ++++++++++++-----------------
 5 files changed, 47 insertions(+), 53 deletions(-)

diff --git a/core/callbacks.py b/core/callbacks.py
index 44a120b..2647e64 100644
--- a/core/callbacks.py
+++ b/core/callbacks.py
@@ -1,4 +1,10 @@
 from talon import scope, registry, ui, actions, settings, speech_system, app
+from typing import ClassVar, Optional
+
+
+class CallbackState:
+    last_mode: ClassVar[Optional[str]] = None
+    last_title: ClassVar[Optional[str]] = None
 
 
 def on_phrase(parsed_phrase):
@@ -42,19 +48,15 @@ def on_title_switch(win):
     # trime the title to 20 characters so super long addresses don't get read
     active_window_title = active_window_title[:20]
 
-    global last_title
-    if last_title == active_window_title:
+    if CallbackState.last_title == active_window_title:
         return
 
-    last_title = active_window_title
+    CallbackState.last_title = active_window_title
     actions.user.tts(f"{active_window_title}")
 
-
-last_mode = None
-
-
 def on_update_contexts():
-    global last_mode
+    last_mode = CallbackState.last_mode
+
     modes = scope.get("mode") or []
 
     MIXED = "command" in modes and "dictation" in modes
@@ -99,13 +101,13 @@ def on_update_contexts():
             actions.user.tts("Talon dictation mode")
 
     if SLEEP:
-        last_mode = "sleep"
+        CallbackState.last_mode = "sleep"
     elif MIXED:
-        last_mode = "mixed"
+        CallbackState.last_mode = "mixed"
     elif COMMAND:
-        last_mode = "command"
+        CallbackState.last_mode = "command"
     elif DICTATION:
-        last_mode = "dictation"
+        CallbackState.last_mode = "dictation"
 
 
 def on_ready():
diff --git a/core/core-agnostic.py b/core/core-agnostic.py
index 96643f9..955c526 100644
--- a/core/core-agnostic.py
+++ b/core/core-agnostic.py
@@ -3,15 +3,18 @@
 and are agnostic to the tts voice being used or the operating system
 """
 
-from typing import Optional, Callable
+from typing import Optional, Callable, ClassVar
 from talon import Module, actions, Context, settings, app
 
 mod = Module()
 ctx = Context()
 
+class AgnosticState():
+    speaker_cancel_callback: ClassVar[Optional[Callable]] = None
+
 
 # We want to get the settings from the talon file but then update
-# them locally here so we can change them globally via expose talon actions
+# them locally here so we can change them globally via exposed talon actions
 def initialize_settings():
     ctx.settings["user.echo_dictation"] = settings.get("user.echo_dictation", True)
     ctx.settings["user.echo_context"] = settings.get("user.echo_context", False)
@@ -31,21 +34,19 @@ def set_cancel_callback(callback: Callable):
         Sets the callback to call when the current speaker is cancelled. Only
         necessary to set if the tts is coming from a subprocess where we need to store a handle
         """
-        global speaker_cancel_callback
-        speaker_cancel_callback = callback
+        AgnosticState.speaker_cancel_callback = callback
 
     def cancel_current_speaker():
         """Cancels the current speaker"""
-        global speaker_cancel_callback
-        if not speaker_cancel_callback:
+        if not AgnosticState.speaker_cancel_callback:
             return
 
         try:
-            speaker_cancel_callback()
+            AgnosticState.speaker_cancel_callback()
         except Exception as e:
             print(e)
         finally:
-            speaker_cancel_callback = None
+            AgnosticState.speaker_cancel_callback = None
 
     def braille(text: str):
         """Output braille with the screenreader"""
diff --git a/core/core-linux.py b/core/core-linux.py
index ff92592..737ed5b 100644
--- a/core/core-linux.py
+++ b/core/core-linux.py
@@ -1,15 +1,15 @@
 from talon import Context, actions, settings
 import os
 import subprocess
-from typing import Literal
+from typing import Literal, ClassVar
 
 ctxLinux = Context()
 ctxLinux.matches = r"""
 os: linux
 """
 
-
-speaker: Literal["espeak", "piper"] = "espeak"
+class LinuxState():
+    speaker: ClassVar[Literal["espeak", "piper"]] = "espeak"
 
 
 @ctxLinux.action_class("user")
@@ -20,12 +20,11 @@ def toggle_reader():
 
     def switch_voice():
         """Switches the tts voice"""
-        global speaker
-        if speaker == "espeak":
-            speaker = "piper"
+        if LinuxState.speaker == "espeak":
+            LinuxState.speaker = "piper"
             actions.user.tts("Switched to piper")
         else:
-            speaker = "espeak"
+            LinuxState.speaker = "espeak"
             actions.user.tts("Switched to espeak")
 
     def tts(text: str, interrupt: bool = True):
@@ -33,13 +32,13 @@ def tts(text: str, interrupt: bool = True):
         if interrupt:
             actions.user.cancel_current_speaker()
 
-        match speaker:
+        match LinuxState.speaker:
             case "espeak":
                 actions.user.espeak(text)
             case "piper":
                 actions.user.piper(text)
             case _:
-                raise ValueError(f"Unknown speaker {speaker}")
+                raise ValueError(f"Unknown speaker {LinuxState.speaker}")
 
     def espeak(text: str):
         """Text to speech with a robotic/narrator voice"""
diff --git a/core/screenreader_ipc/ipc_schema.py b/core/screenreader_ipc/ipc_schema.py
index acad2f2..85d7b15 100644
--- a/core/screenreader_ipc/ipc_schema.py
+++ b/core/screenreader_ipc/ipc_schema.py
@@ -16,7 +16,6 @@
     "debug",
 ]
 
-
 class ServerSpec(TypedDict):
     address: str
     port: str
@@ -37,7 +36,6 @@ def generate_from(value: str):
                 return member
         raise KeyError(f"Invalid status result: {value}")
 
-
 class IPCServerResponse(TypedDict):
     processedCommands: List[str]
     returnedValues: List[Any]
diff --git a/nvda/nvda.py b/nvda/nvda.py
index 4098e85..4cef430 100644
--- a/nvda/nvda.py
+++ b/nvda/nvda.py
@@ -2,12 +2,18 @@
 import os
 import ctypes
 import time
+from typing import ClassVar
 
 mod = Module()
 ctx = Context()
 
 mod.tag("nvda_running", desc="If set, NVDA is running")
 
+class NVDAState():
+    # Check if we send the IPC command to NVDA at the start of the phrase
+    pre_phrase_sent: ClassVar[bool] = False
+    # Commands to re enable at the end of the phrase
+    reenable_commands: ClassVar[list[str]] = []
 
 @mod.scope
 def set_nvda_running_tag():
@@ -144,19 +150,11 @@ def switch_voice():
         """Switches the voice for the screen reader"""
         actions.user.tts("You must switch voice in NVDA manually")
 
-
-# Only send post:phrase callback if we sent a pre:phrase callback successfully
-pre_phrase_sent = False
-
-reenable_commands = []
-
-
 # By default the screen reader will allow you to press a key and interrupt the ph
 # rase however this does not work alongside typing given the fact that we are pres
 # sing keys. So we need to temporally disable it then re enable it at the end of
 # the phrase
 def disable_interrupt(_):
-    global pre_phrase_sent
     SLEEP_MODE = "sleep" in scope.get("mode")
     if (
         not actions.user.is_nvda_running()
@@ -178,8 +176,8 @@ def disable_interrupt(_):
         "disableSpeakTypedCharacters",
     ]
     results = actions.user.send_ipc_commands(commands)
-    global reenable_commands
-    reenable_commands = []
+
+    NVDAState.reenable_commands = []
     for command, value in results:
         match command:
             case (
@@ -189,38 +187,34 @@ def disable_interrupt(_):
                     | "getSpeakTypedCharacters"
                 ) as cmd
             ) if value:
-                reenable_commands.append(cmd.replace("get", "enable"))
+                NVDAState.reenable_commands.append(cmd.replace("get", "enable"))
 
-    pre_phrase_sent = True
+    NVDAState.pre_phrase_sent = True
 
 
 def enable_interrupt(_):
-    global pre_phrase_sent
     SLEEP_MODE = "sleep" in scope.get("mode")
     if (
         not actions.user.is_nvda_running()
         # If we are in sleep mode, we still send the interrupt
         # assuming the pre_phrase was sent, given the fact
         # we still want `talon sleep` to restore the setting at the end
-        or (SLEEP_MODE and not pre_phrase_sent)
+        or (SLEEP_MODE and not NVDAState.pre_phrase_sent)
         or not os.path.exists(SPEC_FILE)
     ):
         return
 
-    global reenable_commands
     # Can add more commands here if needed
     # We don't need to send disable commands since they are already disabled
     # at pre-phrase time
-    commands = reenable_commands
-
-    if len(commands) == 0:
+    if len(NVDAState.reenable_commands) == 0:
         return
 
-    #  this is kind of a hack since we don't know exactly when to re enable it
-    #  because we don't have a callback at the end of the last keypress
-    cron.after("400ms", lambda: actions.user.send_ipc_commands(commands))
+    # best way to do this because we don't have a callback at the end of the last keypress
+    cron.after("400ms", lambda: actions.user.send_ipc_commands(NVDAState.reenable_commands))
     # Reset the pre_phrase_sent flag to prevent another post:phrase callback during sleep mode
-    pre_phrase_sent = False
+    
+    NVDAState.pre_phrase_sent = False
 
 
 if os.name == "nt":

From 25b1c3658c2cc865ddfdf3008f355716dd632127 Mon Sep 17 00:00:00 2001
From: Colton <70598503+C-Loftus@users.noreply.github.com>
Date: Sat, 6 Apr 2024 12:45:41 -0400
Subject: [PATCH 2/9] precommit trigger


From 5d8157d3bf43709b9370bb02bea0bc39eaae6274 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Sat, 6 Apr 2024 16:45:55 +0000
Subject: [PATCH 3/9] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 .gitignore                                    |   2 +-
 .vscode/extensions.json                       |  12 +-
 .vscode/settings.json                         |  38 +++---
 .vscode/typings/__builtins__.pyi              |   8 +-
 .../chat-gpt-browser.talon                    |  24 ++--
 .../cursorless-sightless.talon                |   1 -
 application-integration/ms-edge-tts.talon     |   1 -
 core/callbacks.py                             |   4 +-
 core/core-agnostic.py                         |   8 +-
 core/core-linux.py                            |   8 +-
 core/core-mac.py                              |   3 +-
 core/core-windows.py                          |   5 +-
 core/overrides.py                             |   2 +-
 core/screenreader_ipc/ipc_client.py           |  33 +++--
 core/screenreader_ipc/ipc_schema.py           |   4 +-
 core/settings.py                              |   3 +-
 jaws/jaws.py                                  |   3 +-
 lib/HTMLbuilder.py                            |   6 +-
 lib/sound/sound.py                            |   3 +-
 lib/sound/soundEffects.py                     |   5 +-
 .../_template_addon_release.json              |  54 ++++----
 .../addon/globalPlugins/nvda-addon.py         |  15 ++-
 .../copy_to_scratchpad.ps1                    |   2 +-
 nvda/.addOn/sight-free-talon-server/readme.md |   2 -
 .../site_tools/gettexttool/__init__.py        |  58 ++++----
 nvda/.addOn/sight-free-talon-server/style.css |  58 ++++----
 nvda/debug-nvda.talon                         |   1 -
 nvda/nvda-parser.py                           |   5 +-
 nvda/nvda.py                                  |  26 ++--
 nvda/nvda.talon                               | 126 ++++++++++--------
 nvda/overrides.talon                          |   1 -
 orca/orca.py                                  |   3 +-
 orca/orca.talon                               |   1 -
 readme.md                                     |  15 +--
 sight-free-global.talon                       |   2 +-
 utils/access-focus.py                         |   2 +-
 utils/help.py                                 | 113 ++++++++--------
 utils/help.talon                              |   2 +-
 utils/log/log_checker.py                      |  63 ++++++---
 utils/utils.py                                |   7 +-
 utils/windows-utils.talon                     |   1 -
 voiceover/readme.md                           |   1 -
 voiceover/voiceover.py                        |   6 +-
 voiceover/voiceover_tts.applescript           |   6 +-
 44 files changed, 405 insertions(+), 338 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6ca5b0b..042e54c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,4 +16,4 @@ manifest.ini
 
 .ruff_cache/
 .mypy_cache/
-__pycache__/
\ No newline at end of file
+__pycache__/
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 468c28c..25a3054 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,7 +1,7 @@
 {
-    "recommendations": [
-        "ms-python.python",
-        "ms-python.vscode-pylance",
-        "charliermarsh.ruff"
-    ]
-}
\ No newline at end of file
+  "recommendations": [
+    "ms-python.python",
+    "ms-python.vscode-pylance",
+    "charliermarsh.ruff"
+  ]
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 197b3c9..53aa5f9 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,21 +1,21 @@
 {
-    // Extra paths for NVDA addon development with the python environment outside Talon
-    "editor.accessibilitySupport": "on",
-    "python.autoComplete.extraPaths": [
-        "~\\github\\nvda\\source",
-        "~\\github\\nvda\\miscDeps\\python"
-    ],
-    "python.analysis.stubPath": "${workspaceFolder}/.vscode/typings",
-    // Clone the NVDA repository to the github folder in your home directory to get typing support
-    "python.analysis.extraPaths": [
-        "~\\github\\nvda\\source",
-        "~\\github\\nvda\\miscDeps\\python"
-    ],
-    "[python]": {
-        "editor.formatOnSave": true,
-        "editor.codeActionsOnSave": {
-            "source.fixAll": "always"
-        },
-        "editor.defaultFormatter": "charliermarsh.ruff"
+  // Extra paths for NVDA addon development with the python environment outside Talon
+  "editor.accessibilitySupport": "on",
+  "python.autoComplete.extraPaths": [
+    "~\\github\\nvda\\source",
+    "~\\github\\nvda\\miscDeps\\python"
+  ],
+  "python.analysis.stubPath": "${workspaceFolder}/.vscode/typings",
+  // Clone the NVDA repository to the github folder in your home directory to get typing support
+  "python.analysis.extraPaths": [
+    "~\\github\\nvda\\source",
+    "~\\github\\nvda\\miscDeps\\python"
+  ],
+  "[python]": {
+    "editor.formatOnSave": true,
+    "editor.codeActionsOnSave": {
+      "source.fixAll": "always"
     },
-}
\ No newline at end of file
+    "editor.defaultFormatter": "charliermarsh.ruff"
+  }
+}
diff --git a/.vscode/typings/__builtins__.pyi b/.vscode/typings/__builtins__.pyi
index 88febec..48cbde4 100644
--- a/.vscode/typings/__builtins__.pyi
+++ b/.vscode/typings/__builtins__.pyi
@@ -1,6 +1,2 @@
-def _(msg: str) -> str:
-	...
-
-
-def pgettext(context: str, message: str) -> str:
-	...
+def _(msg: str) -> str: ...
+def pgettext(context: str, message: str) -> str: ...
diff --git a/application-integration/chat-gpt-browser.talon b/application-integration/chat-gpt-browser.talon
index 21aedfb..18e0762 100644
--- a/application-integration/chat-gpt-browser.talon
+++ b/application-integration/chat-gpt-browser.talon
@@ -1,12 +1,15 @@
 title: /https://chat.openai.com/
-
 -
-Open new chat:              key(ctrl-shift-o)
-Focus chat input:           key(shift-esc)
-Copy last code block:       key(ctrl-shift-;)
-Copy last response:         key(ctrl-shift-c)
+Open new chat:
+    key(ctrl-shift-o)
+Focus chat input:
+    key(shift-esc)
+Copy last code block:
+    key(ctrl-shift-;)
+Copy last response:
+    key(ctrl-shift-c)
 
-speak [last] ( response | output | chat ):
+speak [last] (response | output | chat):
     key(ctrl-shift-c)
     sleep(0.3)
     user.tts(clip.text())
@@ -16,6 +19,9 @@ speak last code [block]:
     sleep(0.3)
     user.tts(clip.text())
 
-Set custom instructions:    key(ctrl-shift-i)
-Toggle sidebar:             key(ctrl-shift-s)
-Delete chat:                key(ctrl-shift-delete)
+Set custom instructions:
+    key(ctrl-shift-i)
+Toggle sidebar:
+    key(ctrl-shift-s)
+Delete chat:
+    key(ctrl-shift-delete)
diff --git a/application-integration/cursorless-sightless.talon b/application-integration/cursorless-sightless.talon
index 6580111..0b9b93c 100644
--- a/application-integration/cursorless-sightless.talon
+++ b/application-integration/cursorless-sightless.talon
@@ -1,5 +1,4 @@
 tag: user.cursorless
-
 -
 speak <user.cursorless_target>:
     txt = user.cursorless_get_text(cursorless_target)
diff --git a/application-integration/ms-edge-tts.talon b/application-integration/ms-edge-tts.talon
index 88b50ad..d88f99a 100644
--- a/application-integration/ms-edge-tts.talon
+++ b/application-integration/ms-edge-tts.talon
@@ -2,7 +2,6 @@ os: windows
 and app.name: Microsoft Edge
 os: windows
 and app.exe: msedge.exe
-
 -
 # This file takes advantage of the functionality for more natural text to speech within Microsoft edge
 # as of 2023,  this functionality is not present on Linux
diff --git a/core/callbacks.py b/core/callbacks.py
index 2647e64..c412929 100644
--- a/core/callbacks.py
+++ b/core/callbacks.py
@@ -1,6 +1,7 @@
-from talon import scope, registry, ui, actions, settings, speech_system, app
 from typing import ClassVar, Optional
 
+from talon import actions, app, registry, scope, settings, speech_system, ui
+
 
 class CallbackState:
     last_mode: ClassVar[Optional[str]] = None
@@ -54,6 +55,7 @@ def on_title_switch(win):
     CallbackState.last_title = active_window_title
     actions.user.tts(f"{active_window_title}")
 
+
 def on_update_contexts():
     last_mode = CallbackState.last_mode
 
diff --git a/core/core-agnostic.py b/core/core-agnostic.py
index 955c526..2d12dc7 100644
--- a/core/core-agnostic.py
+++ b/core/core-agnostic.py
@@ -3,13 +3,15 @@
 and are agnostic to the tts voice being used or the operating system
 """
 
-from typing import Optional, Callable, ClassVar
-from talon import Module, actions, Context, settings, app
+from typing import Callable, ClassVar, Optional
+
+from talon import Context, Module, actions, app, settings
 
 mod = Module()
 ctx = Context()
 
-class AgnosticState():
+
+class AgnosticState:
     speaker_cancel_callback: ClassVar[Optional[Callable]] = None
 
 
diff --git a/core/core-linux.py b/core/core-linux.py
index 737ed5b..49b206c 100644
--- a/core/core-linux.py
+++ b/core/core-linux.py
@@ -1,14 +1,16 @@
-from talon import Context, actions, settings
 import os
 import subprocess
-from typing import Literal, ClassVar
+from typing import ClassVar, Literal
+
+from talon import Context, actions, settings
 
 ctxLinux = Context()
 ctxLinux.matches = r"""
 os: linux
 """
 
-class LinuxState():
+
+class LinuxState:
     speaker: ClassVar[Literal["espeak", "piper"]] = "espeak"
 
 
diff --git a/core/core-mac.py b/core/core-mac.py
index 70f5b13..d8ae531 100644
--- a/core/core-mac.py
+++ b/core/core-mac.py
@@ -1,6 +1,7 @@
-from talon import Context, actions, settings
 import subprocess
 
+from talon import Context, actions, settings
+
 ctxMac = Context()
 ctxMac.matches = r"""
 os: mac
diff --git a/core/core-windows.py b/core/core-windows.py
index a7db87b..692659e 100644
--- a/core/core-windows.py
+++ b/core/core-windows.py
@@ -1,6 +1,7 @@
-from talon import Context, settings, actions
-from collections import OrderedDict
 import os
+from collections import OrderedDict
+
+from talon import Context, actions, settings
 
 if os.name == "nt":
     import pywintypes
diff --git a/core/overrides.py b/core/overrides.py
index 9025e4b..04e832f 100644
--- a/core/overrides.py
+++ b/core/overrides.py
@@ -1,4 +1,4 @@
-from talon import actions, Context, settings, Module, app
+from talon import Context, Module, actions, app, settings
 
 ctx = Context()
 
diff --git a/core/screenreader_ipc/ipc_client.py b/core/screenreader_ipc/ipc_client.py
index c41ecdb..c975830 100644
--- a/core/screenreader_ipc/ipc_client.py
+++ b/core/screenreader_ipc/ipc_client.py
@@ -1,20 +1,21 @@
-from talon import Module, Context, actions, settings, cron
-import os
 import ipaddress
 import json
+import os
 import socket
 import threading
-from typing import Tuple, assert_never, Optional
+from typing import Optional, Tuple, assert_never
+
+from talon import Context, Module, actions, cron, settings
+
 from .ipc_schema import (
     IPC_COMMAND,
-    IPCServerResponse,
     IPCClientResponse,
+    IPCServerResponse,
+    ResponseBundle,
     ServerSpec,
     ServerStatusResult,
-    ResponseBundle,
 )
 
-
 mod = Module()
 lock = threading.Lock()
 
@@ -33,13 +34,11 @@ def handle_ipc_result(
 
     match client_response, server_response:
         case (
-            (
-                IPCClientResponse.NO_RESPONSE
-                | IPCClientResponse.TIMED_OUT
-                | IPCClientResponse.GENERAL_ERROR,
-                _,
-            ) as error
-        ):
+            IPCClientResponse.NO_RESPONSE
+            | IPCClientResponse.TIMED_OUT
+            | IPCClientResponse.GENERAL_ERROR,
+            _,
+        ) as error:
             raise RuntimeError(
                 f"Clientside {error=} communicating with screenreader extension"
             )
@@ -64,11 +63,9 @@ def handle_ipc_result(
                     "Invalid JSON payload sent from client to screenreader"
                 )
             case (
-                (
-                    ServerStatusResult.INTERNAL_SERVER_ERROR
-                    | ServerStatusResult.RUNTIME_ERROR
-                ) as error
-            ):
+                ServerStatusResult.INTERNAL_SERVER_ERROR
+                | ServerStatusResult.RUNTIME_ERROR
+            ) as error:
                 raise RuntimeError(f"{error} processing command '{cmd}'")
             case _:
                 assert_never((cmd, value, status))
diff --git a/core/screenreader_ipc/ipc_schema.py b/core/screenreader_ipc/ipc_schema.py
index 85d7b15..8e80df1 100644
--- a/core/screenreader_ipc/ipc_schema.py
+++ b/core/screenreader_ipc/ipc_schema.py
@@ -1,5 +1,5 @@
 import enum
-from typing import List, Literal, Any, TypedDict, Optional
+from typing import Any, List, Literal, Optional, TypedDict
 
 # Exhaustive list of commands that can be sent to the NVDA addon server
 
@@ -16,6 +16,7 @@
     "debug",
 ]
 
+
 class ServerSpec(TypedDict):
     address: str
     port: str
@@ -36,6 +37,7 @@ def generate_from(value: str):
                 return member
         raise KeyError(f"Invalid status result: {value}")
 
+
 class IPCServerResponse(TypedDict):
     processedCommands: List[str]
     returnedValues: List[Any]
diff --git a/core/settings.py b/core/settings.py
index 833da6e..b2e55df 100644
--- a/core/settings.py
+++ b/core/settings.py
@@ -1,6 +1,7 @@
-from talon import Module
 from typing import Literal
 
+from talon import Module
+
 mod = Module()
 
 mod.setting(
diff --git a/jaws/jaws.py b/jaws/jaws.py
index fe735e8..7667230 100644
--- a/jaws/jaws.py
+++ b/jaws/jaws.py
@@ -1,9 +1,10 @@
 # from __future__ import absolute_import
 # import pywintypes
 
-from talon import actions, Module, cron, Context
 import os
 
+from talon import Context, Module, actions, cron
+
 # class Jaws():
 #     """Supports the Jaws for Windows screen reader."""
 
diff --git a/lib/HTMLbuilder.py b/lib/HTMLbuilder.py
index 773bf99..8edd877 100644
--- a/lib/HTMLbuilder.py
+++ b/lib/HTMLbuilder.py
@@ -1,15 +1,15 @@
 # Talon's imgui gui library is not accessible to screen readers.
 # By using HTML we can create temporary web pages that are accessible to screen readers.
 
-import tempfile
-import webbrowser
 import enum
 import os
 import platform
+import tempfile
+import webbrowser
 
 STYLE = """
 <style>
-    body { 
+    body {
         background-color: #2E3440;
         margin: 0;
         padding: 0;
diff --git a/lib/sound/sound.py b/lib/sound/sound.py
index cfa1180..022a7f5 100644
--- a/lib/sound/sound.py
+++ b/lib/sound/sound.py
@@ -1,6 +1,7 @@
-from talon import Module, Context
 import os
 
+from talon import Context, Module
+
 if os.name == "nt":
     import winsound
 
diff --git a/lib/sound/soundEffects.py b/lib/sound/soundEffects.py
index 926dc2d..95db042 100644
--- a/lib/sound/soundEffects.py
+++ b/lib/sound/soundEffects.py
@@ -1,8 +1,9 @@
 import os
 import subprocess
-import time
 import threading
-from talon import Module, Context
+import time
+
+from talon import Context, Module
 
 if os.name == "nt":
     import winsound
diff --git a/nvda/.addOn/sight-free-talon-server/_template_addon_release.json b/nvda/.addOn/sight-free-talon-server/_template_addon_release.json
index c6d3a5f..a75f56e 100644
--- a/nvda/.addOn/sight-free-talon-server/_template_addon_release.json
+++ b/nvda/.addOn/sight-free-talon-server/_template_addon_release.json
@@ -1,29 +1,29 @@
 {
-	"addonId": "easyAddonTech.XYZ",
-	"addonVersionNumber": {
-		"major": 21,
-		"minor": 6,
-		"patch": 0
-	},
-	"addonVersionName": "21.06",
-	"displayName": "My addon",
-	"publisher": "easyAddonTech",
-	"description": "Makes doing XYZ easier",
-	"homepage": "https://github.com/nvaccess/addon-datastore",
-	"minNVDAVersion": {
-		"major": 2019,
-		"minor": 3,
-		"patch": 0
-	},
-	"lastTestedVersion": {
-		"major": 2020,
-		"minor": 4,
-		"patch": 0
-	},
-	"channel": "beta",
-	"URL": "https://github.com/nvaccess/addon-datastore/releases/download/v0.1.0/myAddon.nvda-addon",
-	"sha256": "69D84CA8899800A5575CE31798293CD4FEBAB1D734A07C2E51E56A28E0DF8C82",
-	"sourceURL": "https://github.com/nvaccess/addon-datastore/",
-	"license": "GPL v2",
-	"licenseURL": "https://github.com/nvaccess/addon-datastore/license.MD"
+  "addonId": "easyAddonTech.XYZ",
+  "addonVersionNumber": {
+    "major": 21,
+    "minor": 6,
+    "patch": 0
+  },
+  "addonVersionName": "21.06",
+  "displayName": "My addon",
+  "publisher": "easyAddonTech",
+  "description": "Makes doing XYZ easier",
+  "homepage": "https://github.com/nvaccess/addon-datastore",
+  "minNVDAVersion": {
+    "major": 2019,
+    "minor": 3,
+    "patch": 0
+  },
+  "lastTestedVersion": {
+    "major": 2020,
+    "minor": 4,
+    "patch": 0
+  },
+  "channel": "beta",
+  "URL": "https://github.com/nvaccess/addon-datastore/releases/download/v0.1.0/myAddon.nvda-addon",
+  "sha256": "69D84CA8899800A5575CE31798293CD4FEBAB1D734A07C2E51E56A28E0DF8C82",
+  "sourceURL": "https://github.com/nvaccess/addon-datastore/",
+  "license": "GPL v2",
+  "licenseURL": "https://github.com/nvaccess/addon-datastore/license.MD"
 }
diff --git a/nvda/.addOn/sight-free-talon-server/addon/globalPlugins/nvda-addon.py b/nvda/.addOn/sight-free-talon-server/addon/globalPlugins/nvda-addon.py
index c08d1a4..d5ea4d3 100644
--- a/nvda/.addOn/sight-free-talon-server/addon/globalPlugins/nvda-addon.py
+++ b/nvda/.addOn/sight-free-talon-server/addon/globalPlugins/nvda-addon.py
@@ -1,15 +1,16 @@
-import config
-import tones
-import globalPluginHandler
-import os
+import enum
 import json
+import os
 import socket
 import threading
-import globalVars
-import enum
 import time
-from datetime import datetime
 import traceback
+from datetime import datetime
+
+import config
+import globalPluginHandler
+import globalVars
+import tones
 
 # Exhaustive list of valid commands
 valid_commands = [
diff --git a/nvda/.addOn/sight-free-talon-server/copy_to_scratchpad.ps1 b/nvda/.addOn/sight-free-talon-server/copy_to_scratchpad.ps1
index a1e7876..4395c01 100644
--- a/nvda/.addOn/sight-free-talon-server/copy_to_scratchpad.ps1
+++ b/nvda/.addOn/sight-free-talon-server/copy_to_scratchpad.ps1
@@ -4,4 +4,4 @@ Set-Location $PSScriptRoot
 
 Copy-Item ".\addon\globalPlugins\nvda-addon.py" -Destination "$env:APPDATA\nvda\scratchpad\globalPlugins\sight-free-talon-server-tmp.py"
 
-Write-Host "Copied addon to $env:APPDATA\nvda\scratchpad\globalPlugins\sight-free-talon-server-tmp.py"
\ No newline at end of file
+Write-Host "Copied addon to $env:APPDATA\nvda\scratchpad\globalPlugins\sight-free-talon-server-tmp.py"
diff --git a/nvda/.addOn/sight-free-talon-server/readme.md b/nvda/.addOn/sight-free-talon-server/readme.md
index 265885d..2ac75c7 100644
--- a/nvda/.addOn/sight-free-talon-server/readme.md
+++ b/nvda/.addOn/sight-free-talon-server/readme.md
@@ -9,5 +9,3 @@ You do not need to install this addon to use NVDA alongside the general dictatio
 First install the sight-free-talon NVDA addon with one click like any other NVDA addon.
 
 Then you will need to install the client side of the addon, by cloning the sight-free-talon repo into your Talon user directory.
-
-
diff --git a/nvda/.addOn/sight-free-talon-server/site_scons/site_tools/gettexttool/__init__.py b/nvda/.addOn/sight-free-talon-server/site_scons/site_tools/gettexttool/__init__.py
index db9a009..85c85f4 100644
--- a/nvda/.addOn/sight-free-talon-server/site_scons/site_tools/gettexttool/__init__.py
+++ b/nvda/.addOn/sight-free-talon-server/site_scons/site_tools/gettexttool/__init__.py
@@ -15,41 +15,45 @@
 
 
 """
+
 from SCons.Action import Action
 
 
 def exists(env):
-	return True
+    return True
 
 
 XGETTEXT_COMMON_ARGS = (
-	"--msgid-bugs-address='$gettext_package_bugs_address' "
-	"--package-name='$gettext_package_name' "
-	"--package-version='$gettext_package_version' "
-	"--keyword=pgettext:1c,2 "
-	"-c -o $TARGET $SOURCES"
+    "--msgid-bugs-address='$gettext_package_bugs_address' "
+    "--package-name='$gettext_package_name' "
+    "--package-version='$gettext_package_version' "
+    "--keyword=pgettext:1c,2 "
+    "-c -o $TARGET $SOURCES"
 )
 
 
 def generate(env):
-	env.SetDefault(gettext_package_bugs_address="example@example.com")
-	env.SetDefault(gettext_package_name="")
-	env.SetDefault(gettext_package_version="")
-
-	env['BUILDERS']['gettextMoFile'] = env.Builder(
-		action=Action("msgfmt -o $TARGET $SOURCE", "Compiling translation $SOURCE"),
-		suffix=".mo",
-		src_suffix=".po"
-	)
-
-	env['BUILDERS']['gettextPotFile'] = env.Builder(
-		action=Action("xgettext " + XGETTEXT_COMMON_ARGS, "Generating pot file $TARGET"),
-		suffix=".pot")
-
-	env['BUILDERS']['gettextMergePotFile'] = env.Builder(
-		action=Action(
-			"xgettext " + "--omit-header --no-location " + XGETTEXT_COMMON_ARGS,
-			"Generating pot file $TARGET"
-		),
-		suffix=".pot"
-	)
+    env.SetDefault(gettext_package_bugs_address="example@example.com")
+    env.SetDefault(gettext_package_name="")
+    env.SetDefault(gettext_package_version="")
+
+    env["BUILDERS"]["gettextMoFile"] = env.Builder(
+        action=Action("msgfmt -o $TARGET $SOURCE", "Compiling translation $SOURCE"),
+        suffix=".mo",
+        src_suffix=".po",
+    )
+
+    env["BUILDERS"]["gettextPotFile"] = env.Builder(
+        action=Action(
+            "xgettext " + XGETTEXT_COMMON_ARGS, "Generating pot file $TARGET"
+        ),
+        suffix=".pot",
+    )
+
+    env["BUILDERS"]["gettextMergePotFile"] = env.Builder(
+        action=Action(
+            "xgettext " + "--omit-header --no-location " + XGETTEXT_COMMON_ARGS,
+            "Generating pot file $TARGET",
+        ),
+        suffix=".pot",
+    )
diff --git a/nvda/.addOn/sight-free-talon-server/style.css b/nvda/.addOn/sight-free-talon-server/style.css
index 90f99d1..7802a00 100644
--- a/nvda/.addOn/sight-free-talon-server/style.css
+++ b/nvda/.addOn/sight-free-talon-server/style.css
@@ -1,26 +1,34 @@
 @charset "utf-8";
-body { 
-font-family : Verdana, Arial, Helvetica, Sans-serif;
-line-height: 1.2em;
-} 
-h1, h2 {text-align: center}
-dt { 
-font-weight : bold; 
-float : left; 
-width: 10%;
-clear: left
-} 
-dd { 
-margin : 0 0 0.4em 0; 
-float : left;
-width: 90%;
-display: block;
-} 
-p { clear : both; 
-} 
-a { text-decoration : underline; 
-} 
-:active { 
-text-decoration : none; 
-}
-a:focus, a:hover {outline: solid}
+body {
+  font-family: Verdana, Arial, Helvetica, Sans-serif;
+  line-height: 1.2em;
+}
+h1,
+h2 {
+  text-align: center;
+}
+dt {
+  font-weight: bold;
+  float: left;
+  width: 10%;
+  clear: left;
+}
+dd {
+  margin: 0 0 0.4em 0;
+  float: left;
+  width: 90%;
+  display: block;
+}
+p {
+  clear: both;
+}
+a {
+  text-decoration: underline;
+}
+:active {
+  text-decoration: none;
+}
+a:focus,
+a:hover {
+  outline: solid;
+}
diff --git a/nvda/debug-nvda.talon b/nvda/debug-nvda.talon
index 79fdbe1..fe42b6e 100644
--- a/nvda/debug-nvda.talon
+++ b/nvda/debug-nvda.talon
@@ -1,5 +1,4 @@
 os: windows
-
 -
 
 test reader add on:
diff --git a/nvda/nvda-parser.py b/nvda/nvda-parser.py
index bd88ba0..5f081f8 100644
--- a/nvda/nvda-parser.py
+++ b/nvda/nvda-parser.py
@@ -1,6 +1,7 @@
-import os
 import configparser
-from talon import actions, Module, Context
+import os
+
+from talon import Context, Module, actions
 
 PATH = os.path.expanduser("~\\AppData\\Roaming\\nvda\\nvda.ini")
 
diff --git a/nvda/nvda.py b/nvda/nvda.py
index 4cef430..bcdd147 100644
--- a/nvda/nvda.py
+++ b/nvda/nvda.py
@@ -1,20 +1,23 @@
-from talon import actions, Module, settings, cron, Context, clip, speech_system, scope
-import os
 import ctypes
+import os
 import time
 from typing import ClassVar
 
+from talon import Context, Module, actions, clip, cron, scope, settings, speech_system
+
 mod = Module()
 ctx = Context()
 
 mod.tag("nvda_running", desc="If set, NVDA is running")
 
-class NVDAState():
+
+class NVDAState:
     # Check if we send the IPC command to NVDA at the start of the phrase
     pre_phrase_sent: ClassVar[bool] = False
     # Commands to re enable at the end of the phrase
     reenable_commands: ClassVar[list[str]] = []
 
+
 @mod.scope
 def set_nvda_running_tag():
     """Update tags based on if NVDA is running"""
@@ -150,6 +153,7 @@ def switch_voice():
         """Switches the voice for the screen reader"""
         actions.user.tts("You must switch voice in NVDA manually")
 
+
 # By default the screen reader will allow you to press a key and interrupt the ph
 # rase however this does not work alongside typing given the fact that we are pres
 # sing keys. So we need to temporally disable it then re enable it at the end of
@@ -181,12 +185,10 @@ def disable_interrupt(_):
     for command, value in results:
         match command:
             case (
-                (
-                    "getSpeechInterruptForCharacters"
-                    | "getSpeakTypedWords"
-                    | "getSpeakTypedCharacters"
-                ) as cmd
-            ) if value:
+                "getSpeechInterruptForCharacters"
+                | "getSpeakTypedWords"
+                | "getSpeakTypedCharacters"
+            ) as cmd if value:
                 NVDAState.reenable_commands.append(cmd.replace("get", "enable"))
 
     NVDAState.pre_phrase_sent = True
@@ -211,9 +213,11 @@ def enable_interrupt(_):
         return
 
     # best way to do this because we don't have a callback at the end of the last keypress
-    cron.after("400ms", lambda: actions.user.send_ipc_commands(NVDAState.reenable_commands))
+    cron.after(
+        "400ms", lambda: actions.user.send_ipc_commands(NVDAState.reenable_commands)
+    )
     # Reset the pre_phrase_sent flag to prevent another post:phrase callback during sleep mode
-    
+
     NVDAState.pre_phrase_sent = False
 
 
diff --git a/nvda/nvda.talon b/nvda/nvda.talon
index b472194..36cb206 100644
--- a/nvda/nvda.talon
+++ b/nvda/nvda.talon
@@ -2,7 +2,8 @@ tag: user.nvda_running
 os: windows
 -
 
-reader press <user.keys>:   user.with_nvda_mod_press(keys)
+reader press <user.keys>:
+    user.with_nvda_mod_press(keys)
 
 next heading:
     key(h)
@@ -10,22 +11,22 @@ previous heading:
     key(shift-h)
 
 previous option:
-    user.with_nvda_mod_press('ctrl-left')
+    user.with_nvda_mod_press("ctrl-left")
 
 # In the menu, this will go to the next option
 next option:
-    user.with_nvda_mod_press('ctrl-right')
+    user.with_nvda_mod_press("ctrl-right")
 
 up option:
-    user.with_nvda_mod_press('ctrl-up')
+    user.with_nvda_mod_press("ctrl-up")
 
 # In the menu, this will lower the value of the option
 down option:
-    user.with_nvda_mod_press('ctrl-down')
+    user.with_nvda_mod_press("ctrl-down")
 
 # reads everything from the current position down
 read below:
-    user.with_nvda_mod_press('down')
+    user.with_nvda_mod_press("down")
 
 # If the user is in the middle of an echoed text and this will posit otherwise it will resume
 pause speech:
@@ -35,13 +36,13 @@ stop speech:
     key(ctrl)
 
 speak line:
-    user.with_nvda_mod_press('up')
+    user.with_nvda_mod_press("up")
 
 mouse to navigator:
-    user.with_nvda_mod_press('shift-m')
+    user.with_nvda_mod_press("shift-m")
 
 navigator to mouse:
-    user.with_nvda_mod_press('shift-n')
+    user.with_nvda_mod_press("shift-n")
 
 next paragraph:
     key(ctrl-down)
@@ -50,66 +51,71 @@ previous paragraph:
     key(ctrl-up)
 
 change verbosity:
-    user.with_nvda_mod_press('p')
+    user.with_nvda_mod_press("p")
 
 speak title:
-    user.with_nvda_mod_press('t')
-
-next focusable item:        key(tab)
-next heading <number_small>: key("{number_small}")
-previous heading  <number_small>: key("shift-{number_small}")
-
-next landmark:              key(d)
-previous landmark:          key(shift-d)
+    user.with_nvda_mod_press("t")
+
+next focusable item:
+    key(tab)
+next heading <number_small>:
+    key("{number_small}")
+previous heading <number_small>:
+    key("shift-{number_small}")
+
+next landmark:
+    key(d)
+previous landmark:
+    key(shift-d)
 # toggle speech mode:
 
 open element list:
-    user.with_nvda_mod_press('f7')
+    user.with_nvda_mod_press("f7")
 
 toggle input help:
-    user.with_nvda_mod_press('1')
+    user.with_nvda_mod_press("1")
 
 speak typed words:
-    user.with_nvda_mod_press('3')
+    user.with_nvda_mod_press("3")
 
 speak typed characters:
-    user.with_nvda_mod_press('2')
+    user.with_nvda_mod_press("2")
 
 speak command keys:
-    user.with_nvda_mod_press('4')
+    user.with_nvda_mod_press("4")
 
 follow system focus:
-    user.with_nvda_mod_press('7')
+    user.with_nvda_mod_press("7")
 follow system caret:
-    user.with_nvda_mod_press('6')
+    user.with_nvda_mod_press("6")
 
 toggle mouse tracking:
-    user.with_nvda_mod_press('m')
+    user.with_nvda_mod_press("m")
 
 open reader setings:
-    user.with_nvda_mod_press('ctrl-g')
+    user.with_nvda_mod_press("ctrl-g")
 
 synthesizer settings:
-    user.with_nvda_mod_press('ctrl-s')
+    user.with_nvda_mod_press("ctrl-s")
 
 speak time:
-    user.with_nvda_mod_press('f12')
+    user.with_nvda_mod_press("f12")
 
 # Reporting Location and Other Information
 speak text formatting:
-    user.with_nvda_mod_press('f')
+    user.with_nvda_mod_press("f")
 
 speak link destination:
-    user.with_nvda_mod_press('k')
+    user.with_nvda_mod_press("k")
 
 speak window:
-    user.with_nvda_mod_press('b')
+    user.with_nvda_mod_press("b")
 
 speak focus:
-    user.with_nvda_mod_press('tab')
+    user.with_nvda_mod_press("tab")
 
 screen curtain:
-    user.with_nvda_mod_press('ctrl-escape')
+    user.with_nvda_mod_press("ctrl-escape")
 
 # sleep mode disables all NVDA commands and speech/braille
 # output for the current application. This is most useful in
@@ -119,29 +125,43 @@ screen curtain:
 toggle reader sleep:
     user.with_nvda_mod_press("shift-s")
 
-next table:                 key(T)
-next list:                  key(L)
-next list item:             key(I)
-next graphic:               key(G)
-next link:                  key(K)
-next unvisited link:        key(U)
-next visited link:          key(V)
-Next form field:            key(F)
-Next button:                key(B)
-
-toggle selection:           key(space)
-Next checkbox:              key(X)
-
-Next combo box:             key(C)
-
-Toggle selection:           key(up)
-Next radio button:          key(R)
+next table:
+    key(T)
+next list:
+    key(L)
+next list item:
+    key(I)
+next graphic:
+    key(G)
+next link:
+    key(K)
+next unvisited link:
+    key(U)
+next visited link:
+    key(V)
+Next form field:
+    key(F)
+Next button:
+    key(B)
+
+toggle selection:
+    key(space)
+Next checkbox:
+    key(X)
+
+Next combo box:
+    key(C)
+
+Toggle selection:
+    key(up)
+Next radio button:
+    key(R)
 
 braille display dialog:
-    user.with_nvda_mod_press('ctrl-a')
+    user.with_nvda_mod_press("ctrl-a")
 
 pass through next:
-    user.with_nvda_mod_press('f2')
+    user.with_nvda_mod_press("f2")
 
 restart reader:
     user.restart_nvda()
diff --git a/nvda/overrides.talon b/nvda/overrides.talon
index c174c2a..c8261f7 100644
--- a/nvda/overrides.talon
+++ b/nvda/overrides.talon
@@ -1,6 +1,5 @@
 tag: user.nvda_running
 and tag: browser
-
 -
 
 # NVDA requires a pass through to copy
diff --git a/orca/orca.py b/orca/orca.py
index bb968ec..ced085e 100644
--- a/orca/orca.py
+++ b/orca/orca.py
@@ -1,7 +1,8 @@
-from talon import actions, Module, settings, cron, Context
 import os
 import sys
 
+from talon import Context, Module, actions, cron, settings
+
 mod = Module()
 ctx = Context()
 
diff --git a/orca/orca.talon b/orca/orca.talon
index f4bdcd1..4056d7e 100644
--- a/orca/orca.talon
+++ b/orca/orca.talon
@@ -1,5 +1,4 @@
 os: linux
-
 -
 
 toggle reader:
diff --git a/readme.md b/readme.md
index e682cde..1fbc33f 100644
--- a/readme.md
+++ b/readme.md
@@ -1,8 +1,8 @@
 # Sight-Free-Talon
 
-**Non-visually control your entire computer with voice commands. Uses the cross-platform [Talon Voice](https://talon.wiki) dictation engine.**  
+**Non-visually control your entire computer with voice commands. Uses the cross-platform [Talon Voice](https://talon.wiki) dictation engine.**
 
-Intended to be universal for all abilities, but especially helpful for those with blindness, vision impairment, or eyestrain. 
+Intended to be universal for all abilities, but especially helpful for those with blindness, vision impairment, or eyestrain.
 
 Provides functionality to:
 
@@ -20,14 +20,13 @@ This repository integrates with:
 # Usage
 
 - Watch my demo video for a quick overview
-<a href="https://www.youtube.com/watch?v=i-XcpnVwvR0" title="Sight-free-talon overview video">
-    <img alt="Sight-free-talon overview video" src="https://github.com/C-Loftus/sight-free-talon/assets/70598503/1c33a46b-9595-4641-a6c1-0bc11b4ea90d" width="400">
-</a>
+  <a href="https://www.youtube.com/watch?v=i-XcpnVwvR0" title="Sight-free-talon overview video">
+  <img alt="Sight-free-talon overview video" src="https://github.com/C-Loftus/sight-free-talon/assets/70598503/1c33a46b-9595-4641-a6c1-0bc11b4ea90d" width="400">
+  </a>
 
 - [Official docs](https://colton.bio/sight-free-talon/) can be found on my website and are in active development
 - All voice commands are found in the `.talon` files in each subdirectory and are scoped to each corresponding application or context
 
-
 # Installing
 
 - Clone this repo into your Talon user directory.
@@ -38,7 +37,6 @@ _Note for sighted users_: Please clone the entire repository. Any functionality
 
 ## OS Specific Setup
 
-
 - Windows
 
   - Using NVDA:
@@ -46,8 +44,9 @@ _Note for sighted users_: Please clone the entire repository. Any functionality
     - If you do not want to install the addon, disable `Speech interrupt for typed characters` in NVDA settings to make sure typing text from Talon is not interrupted with every typed character.
 
 - Mac
+
   - No extra dependencies
- 
+
 - Linux
   - Install `spd-say` to play standard tts.
   - Install `piper` to use the `omnx` model for more natural speech
diff --git a/sight-free-global.talon b/sight-free-global.talon
index c8b0721..372974f 100644
--- a/sight-free-global.talon
+++ b/sight-free-global.talon
@@ -43,7 +43,7 @@ echo tab level:
     key(ctrl-c)
     sleep(0.1)
     level = user.indentation_level(clip.text())
-    user.tts('{level}')
+    user.tts("{level}")
 
 toggle [screen] reader:
     user.toggle_reader()
diff --git a/utils/access-focus.py b/utils/access-focus.py
index b93f7ea..7fe0e47 100644
--- a/utils/access-focus.py
+++ b/utils/access-focus.py
@@ -1,4 +1,4 @@
-from talon import Module, ui, Context, actions
+from talon import Context, Module, actions, ui
 from talon.windows import ax as ax
 
 mod = Module()
diff --git a/utils/help.py b/utils/help.py
index 0ee2174..54412b1 100644
--- a/utils/help.py
+++ b/utils/help.py
@@ -1,64 +1,67 @@
-from talon import registry, Module, actions
-from ..lib.HTMLbuilder import Builder
 import re
 
+from talon import Module, actions, registry
+
+from ..lib.HTMLbuilder import Builder
+
 mod = Module()
 
+
 def remove_wrapper(text: str):
-	if text.startswith("Context("):
-		text = text.replace("Context(", "", 1)  # Remove the first occurrence of "Context("
-		text = text.rstrip(")") 
-		return text
-	
-	regex = r"[^\"']+[\"']([^\"']+)[\"']"
-	match = re.search(regex, text)
-	return match.group(1) if match else text
+    if text.startswith("Context("):
+        text = text.replace(
+            "Context(", "", 1
+        )  # Remove the first occurrence of "Context("
+        text = text.rstrip(")")
+        return text
+
+    regex = r"[^\"']+[\"']([^\"']+)[\"']"
+    match = re.search(regex, text)
+    return match.group(1) if match else text
 
 
 @mod.action_class
 class Actions:
-	
-	def get_active_commands():
-		"""Returns a list of all commands"""
-		command_dict = {}
-		for ctx in registry.active_contexts():
-
-			phrases = [remove_wrapper(str(command.rule))
-			  for command in ctx.commands.values()]
-
-
-			code = [remove_wrapper(str(command.script)
-					   )
-					for command in 
-					ctx.commands.values()
-				]
-			
-			ctx_name = remove_wrapper(str(ctx)) 
-
-			command_dict[ctx_name] = {
-				"phrases": phrases,
-				# "line_numbers": line_numbers,
-				"code": code
-			}	
-		return command_dict
-
-	def open_command_list():
-		"""Opens the command list"""
-		commands_list = actions.user.get_active_commands()
-		builder = Builder()
-		builder.title("All Currently Active Talon Commands")
-		for ctx in commands_list:
-
-			phrases = commands_list[ctx]["phrases"]
-			# line_numbers = commands_list[ctx]["line_numbers"]
-			fns = commands_list[ctx]["code"]
-
-			if len(phrases) == 0:
-				continue
-
-			builder.h1(ctx)
-			builder.start_table(["Command Phrase", "Code"])  # Removed extra comma
-			for phrase, code in zip(phrases, fns):
-				builder.add_row([phrase, code])
-			builder.end_table()
-		builder.render()
+
+    def get_active_commands():
+        """Returns a list of all commands"""
+        command_dict = {}
+        for ctx in registry.active_contexts():
+
+            phrases = [
+                remove_wrapper(str(command.rule)) for command in ctx.commands.values()
+            ]
+
+            code = [
+                remove_wrapper(str(command.script)) for command in ctx.commands.values()
+            ]
+
+            ctx_name = remove_wrapper(str(ctx))
+
+            command_dict[ctx_name] = {
+                "phrases": phrases,
+                # "line_numbers": line_numbers,
+                "code": code,
+            }
+        return command_dict
+
+    def open_command_list():
+        """Opens the command list"""
+        commands_list = actions.user.get_active_commands()
+        builder = Builder()
+        builder.title("All Currently Active Talon Commands")
+        for ctx in commands_list:
+
+            phrases = commands_list[ctx]["phrases"]
+            # line_numbers = commands_list[ctx]["line_numbers"]
+            fns = commands_list[ctx]["code"]
+
+            if len(phrases) == 0:
+                continue
+
+            builder.h1(ctx)
+            builder.start_table(["Command Phrase", "Code"])  # Removed extra comma
+            for phrase, code in zip(phrases, fns):
+                builder.add_row([phrase, code])
+            builder.end_table()
+        builder.render()
diff --git a/utils/help.talon b/utils/help.talon
index e30efa9..cd5407b 100644
--- a/utils/help.talon
+++ b/utils/help.talon
@@ -1,2 +1,2 @@
 read active commands:
-	user.open_command_list()
+    user.open_command_list()
diff --git a/utils/log/log_checker.py b/utils/log/log_checker.py
index cac082d..24867ba 100644
--- a/utils/log/log_checker.py
+++ b/utils/log/log_checker.py
@@ -1,6 +1,10 @@
-import platform, os, subprocess, json
+import json
+import os
+import platform
+import subprocess
+
 try:
-    from talon import cron, actions, Module
+    from talon import Module, actions, cron
 except:
     pass
 
@@ -9,27 +13,40 @@
 arch, _ = platform.architecture()
 
 current_directory = os.path.dirname(os.path.abspath(__file__))
-bin_directory = os.path.join(current_directory, 'bin')
+bin_directory = os.path.join(current_directory, "bin")
 match os_type, arch:
-    case 'Linux', '64bit':
-        log_path = os.path.join(bin_directory, 'log_parser_linux_amd64')
-    case 'Linux', '32bit':
-        log_path = os.path.join(bin_directory, 'log_parser_linux_386')
-    case 'Windows', '64bit':
-        log_path = os.path.join(bin_directory, 'log_parser_windows_amd64.exe')
-    case 'Windows', '32bit':
-        log_path = os.path.join(bin_directory, 'log_parser_windows_386.exe')
-    case 'Darwin', '64bit':
-        log_path = os.path.join(bin_directory, 'log_parser_macos_amd64')
-    
-log_cache = dict.fromkeys(["last_io_line", "last_debug_line", "last_warning_line", 
-                       "first_error_line", "last_error_line"], 
-                    "")
+    case "Linux", "64bit":
+        log_path = os.path.join(bin_directory, "log_parser_linux_amd64")
+    case "Linux", "32bit":
+        log_path = os.path.join(bin_directory, "log_parser_linux_386")
+    case "Windows", "64bit":
+        log_path = os.path.join(bin_directory, "log_parser_windows_amd64.exe")
+    case "Windows", "32bit":
+        log_path = os.path.join(bin_directory, "log_parser_windows_386.exe")
+    case "Darwin", "64bit":
+        log_path = os.path.join(bin_directory, "log_parser_macos_amd64")
+
+log_cache = dict.fromkeys(
+    [
+        "last_io_line",
+        "last_debug_line",
+        "last_warning_line",
+        "first_error_line",
+        "last_error_line",
+    ],
+    "",
+)
 
 updated = False
 
+
 def get_log_updates() -> dict[str, str]:
-    output = subprocess.Popen(log_path, stdout=subprocess.PIPE, stderr=subprocess.PIPE, creationflags=subprocess.CREATE_NO_WINDOW)
+    output = subprocess.Popen(
+        log_path,
+        stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE,
+        creationflags=subprocess.CREATE_NO_WINDOW,
+    )
     stdout, _ = output.communicate()
     jsonOutput = json.loads(stdout)
     updated_values = {}
@@ -42,14 +59,15 @@ def get_log_updates() -> dict[str, str]:
             updated_values[key] = jsonOutput[key]
         log_cache[key] = jsonOutput[key]
     return updated_values
-    
+
+
 def updates_as_dict(updated_vals: dict[str, str]):
     key_to_label = {
         "last_io_line": "IO",
         "last_debug_line": "Debug",
         "last_warning_line": "Warning",
         "first_error_line": "Start Error",
-        "last_error_line": "Last Error"
+        "last_error_line": "Last Error",
     }
 
     output = {}
@@ -61,8 +79,9 @@ def updates_as_dict(updated_vals: dict[str, str]):
     return output
 
 
-
 mod = Module()
+
+
 @mod.action_class
 class Actions:
     def echo_last_error():
@@ -89,4 +108,4 @@ def echo_last_print():
 # updated_vals = get_log_updates()
 # output = updates_as_dict(updated_vals)
 #     # if updated:
-# actions.user.tts(json.dumps(output))
\ No newline at end of file
+# actions.user.tts(json.dumps(output))
diff --git a/utils/utils.py b/utils/utils.py
index 66e0e2c..fdbb487 100644
--- a/utils/utils.py
+++ b/utils/utils.py
@@ -1,10 +1,11 @@
-from talon import Module, actions, ui, Context, registry, scope
 import os
-from html.parser import HTMLParser
+import threading
 import urllib
+from html.parser import HTMLParser
+
+from talon import Context, Module, actions, registry, scope, ui
 
 from ..lib.HTMLbuilder import Builder
-import threading
 
 
 class VisibleTextParser(HTMLParser):
diff --git a/utils/windows-utils.talon b/utils/windows-utils.talon
index 8bdd8d5..b6f211e 100644
--- a/utils/windows-utils.talon
+++ b/utils/windows-utils.talon
@@ -1,5 +1,4 @@
 os: windows
-
 -
 
 # Copies text with OCR from the current window
diff --git a/voiceover/readme.md b/voiceover/readme.md
index bddd8e4..a1284de 100644
--- a/voiceover/readme.md
+++ b/voiceover/readme.md
@@ -2,7 +2,6 @@
 
 TODO
 
-
 ## Setup
 
 - Open VoiceOver Utility and check "Allow VoiceOver to be controller with AppleScript".
diff --git a/voiceover/voiceover.py b/voiceover/voiceover.py
index bd6100c..ab3990b 100644
--- a/voiceover/voiceover.py
+++ b/voiceover/voiceover.py
@@ -1,5 +1,7 @@
-from talon import Module, Context, actions, cron, settings
-import sys, os
+import os
+import sys
+
+from talon import Context, Module, actions, cron, settings
 
 mod = Module()
 ctx = Context()
diff --git a/voiceover/voiceover_tts.applescript b/voiceover/voiceover_tts.applescript
index f04b869..52d86fd 100644
--- a/voiceover/voiceover_tts.applescript
+++ b/voiceover/voiceover_tts.applescript
@@ -22,10 +22,10 @@ tell application "VoiceOver" to say (do shell script "date +\"%l:%M %p\"") using
 
 -- Set the text you want VoiceOver to speak----------------
 set textToSpeak to "Hello, this is a test."
-do shell script "say " & quoted form of textToSpeak 
+do shell script "say " & quoted form of textToSpeak
 
 ----------------
-tell application "VoiceOver" 
+tell application "VoiceOver"
     tell commander to perform command item chooser
 end tell
 
@@ -33,4 +33,4 @@ end tell
 ---
 tell application "VoiceOver"
     output "VoiceOver is now on"
-end tell
\ No newline at end of file
+end tell

From 13cc0bd03c799457b96c9169e4a763a2941359f0 Mon Sep 17 00:00:00 2001
From: Colton <70598503+C-Loftus@users.noreply.github.com>
Date: Sat, 6 Apr 2024 12:47:26 -0400
Subject: [PATCH 4/9] better comment

---
 core/callbacks.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/callbacks.py b/core/callbacks.py
index c412929..191e0df 100644
--- a/core/callbacks.py
+++ b/core/callbacks.py
@@ -18,6 +18,7 @@ def on_phrase(parsed_phrase):
             # Easier to just catch the exception
             try:
                 actions.user.cancel_current_speaker()
+            # Logging is handled individually by engine. Ignore here 
             except Exception:
                 pass
 

From 792e291cd21e5df4056be71b8f8864f1b45f7600 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Sat, 6 Apr 2024 16:47:55 +0000
Subject: [PATCH 5/9] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 core/callbacks.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/callbacks.py b/core/callbacks.py
index 191e0df..146c510 100644
--- a/core/callbacks.py
+++ b/core/callbacks.py
@@ -18,7 +18,7 @@ def on_phrase(parsed_phrase):
             # Easier to just catch the exception
             try:
                 actions.user.cancel_current_speaker()
-            # Logging is handled individually by engine. Ignore here 
+            # Logging is handled individually by engine. Ignore here
             except Exception:
                 pass
 

From bec18e919251f234c5b760653374e099b06a988a Mon Sep 17 00:00:00 2001
From: Colton <70598503+C-Loftus@users.noreply.github.com>
Date: Sat, 6 Apr 2024 12:48:38 -0400
Subject: [PATCH 6/9] clean up

---
 core/callbacks.py     | 9 +++++----
 core/core-agnostic.py | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/core/callbacks.py b/core/callbacks.py
index 146c510..6bc1bc2 100644
--- a/core/callbacks.py
+++ b/core/callbacks.py
@@ -5,6 +5,10 @@
 
 class CallbackState:
     last_mode: ClassVar[Optional[str]] = None
+    
+    # We have to keep track of the last title so we don't repeat it
+    # since sometimes Talon triggers a "title switch" when
+    # the title actually hasn't changed, i.e. when a text file is saved
     last_title: ClassVar[Optional[str]] = None
 
 
@@ -34,10 +38,7 @@ def on_app_switch(app):
     actions.user.echo_context()
 
 
-# We have to keep track of the last title so we don't repeat it
-# since sometimes Talon triggers a "title switch" when
-# the title actually hasn't changed, i.e. when a text file is saved
-last_title = None
+
 
 
 def on_title_switch(win):
diff --git a/core/core-agnostic.py b/core/core-agnostic.py
index 2d12dc7..bac01e1 100644
--- a/core/core-agnostic.py
+++ b/core/core-agnostic.py
@@ -12,6 +12,7 @@
 
 
 class AgnosticState:
+    # Store the handle for the subprocess that will cancel the current speaker
     speaker_cancel_callback: ClassVar[Optional[Callable]] = None
 
 
@@ -26,7 +27,6 @@ def initialize_settings():
 # initialize the settings only after the user settings have been loaded
 app.register("ready", initialize_settings)
 
-speaker_cancel_callback: Optional[Callable] = None
 
 
 @mod.action_class

From 8b1428cd01abe7ca97d29ed527faccee251720b7 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Sat, 6 Apr 2024 16:48:54 +0000
Subject: [PATCH 7/9] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 core/callbacks.py     | 5 +----
 core/core-agnostic.py | 1 -
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/core/callbacks.py b/core/callbacks.py
index 6bc1bc2..5887014 100644
--- a/core/callbacks.py
+++ b/core/callbacks.py
@@ -5,7 +5,7 @@
 
 class CallbackState:
     last_mode: ClassVar[Optional[str]] = None
-    
+
     # We have to keep track of the last title so we don't repeat it
     # since sometimes Talon triggers a "title switch" when
     # the title actually hasn't changed, i.e. when a text file is saved
@@ -38,9 +38,6 @@ def on_app_switch(app):
     actions.user.echo_context()
 
 
-
-
-
 def on_title_switch(win):
     if not actions.user.echo_context_enabled():
         return
diff --git a/core/core-agnostic.py b/core/core-agnostic.py
index bac01e1..01f4eea 100644
--- a/core/core-agnostic.py
+++ b/core/core-agnostic.py
@@ -28,7 +28,6 @@ def initialize_settings():
 app.register("ready", initialize_settings)
 
 
-
 @mod.action_class
 class Actions:
     def set_cancel_callback(callback: Callable):

From 38478f52e86d96352d93b5c50de33164c7f53ce4 Mon Sep 17 00:00:00 2001
From: Colton <70598503+C-Loftus@users.noreply.github.com>
Date: Sat, 6 Apr 2024 12:54:12 -0400
Subject: [PATCH 8/9] editor config for precommit

---
 .editorconfig  | 17 +++++++++++++++++
 pyproject.toml | 18 +++++++++++++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..a3d1750
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,17 @@
+# See https://EditorConfig.org
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_size = 4
+indent_style = space
+max_line_length = 88
+trim_trailing_whitespace = true
+
+[*.{md,yaml,yml}]
+indent_size = 2
+
+[Makefile]
+indent_style = tab
\ No newline at end of file
diff --git a/pyproject.toml b/pyproject.toml
index d956fdc..38c5d97 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -24,7 +24,6 @@ exclude = [
     "buck-out",
     "build",
     "dist",
-    "node_modules",
     "site-packages",
     "venv",
 ]
@@ -75,3 +74,20 @@ docstring-code-format = false
 # This only has an effect when the `docstring-code-format` setting is
 # enabled.
 docstring-code-line-length = "dynamic"
+
+
+[tool.black]
+target-version = ['py311']
+
+[tool.isort]
+profile = 'black'
+
+[tool.pyright]
+# Talon classes don't use self so ignore the associated errors
+reportSelfClsParameterName = false
+reportGeneralTypeIssues = false
+# Imgui functions return an object that can't be statically resolved
+reportFunctionMemberAccess = false
+# Talon can't be installed in CI so ignore source errors
+reportMissingModuleSource = false
+reportMissingImports = false

From 6eb1333f0bf74cc44876ce54059ab30d270b465e Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Sat, 6 Apr 2024 16:54:28 +0000
Subject: [PATCH 9/9] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 .editorconfig                                 |   2 +-
 .vscode/extensions.json                       |  10 +-
 .vscode/settings.json                         |  38 +--
 .../chat-gpt-browser.talon                    |  21 +-
 application-integration/ms-edge-tts.talon     |   3 +-
 .../models/en_US-amy-low.onnx.json            | 316 +++++++++---------
 .../_template_addon_release.json              |  54 +--
 nvda/.addOn/sight-free-talon-server/style.css |  30 +-
 nvda/debug-nvda.talon                         |   9 +-
 nvda/nvda.talon                               | 182 ++++------
 orca/orca.talon                               |   3 +-
 sight-free-global.talon                       |  27 +-
 utils/help.talon                              |   3 +-
 utils/log/log.talon                           |  12 +-
 utils/utils.talon                             |   9 +-
 utils/windows-utils.talon                     |   3 +-
 16 files changed, 318 insertions(+), 404 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index a3d1750..0d6fd5f 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -14,4 +14,4 @@ trim_trailing_whitespace = true
 indent_size = 2
 
 [Makefile]
-indent_style = tab
\ No newline at end of file
+indent_style = tab
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 25a3054..8ef0c5d 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,7 +1,7 @@
 {
-  "recommendations": [
-    "ms-python.python",
-    "ms-python.vscode-pylance",
-    "charliermarsh.ruff"
-  ]
+    "recommendations": [
+        "ms-python.python",
+        "ms-python.vscode-pylance",
+        "charliermarsh.ruff"
+    ]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 53aa5f9..c423e57 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,21 +1,21 @@
 {
-  // Extra paths for NVDA addon development with the python environment outside Talon
-  "editor.accessibilitySupport": "on",
-  "python.autoComplete.extraPaths": [
-    "~\\github\\nvda\\source",
-    "~\\github\\nvda\\miscDeps\\python"
-  ],
-  "python.analysis.stubPath": "${workspaceFolder}/.vscode/typings",
-  // Clone the NVDA repository to the github folder in your home directory to get typing support
-  "python.analysis.extraPaths": [
-    "~\\github\\nvda\\source",
-    "~\\github\\nvda\\miscDeps\\python"
-  ],
-  "[python]": {
-    "editor.formatOnSave": true,
-    "editor.codeActionsOnSave": {
-      "source.fixAll": "always"
-    },
-    "editor.defaultFormatter": "charliermarsh.ruff"
-  }
+    // Extra paths for NVDA addon development with the python environment outside Talon
+    "editor.accessibilitySupport": "on",
+    "python.autoComplete.extraPaths": [
+        "~\\github\\nvda\\source",
+        "~\\github\\nvda\\miscDeps\\python"
+    ],
+    "python.analysis.stubPath": "${workspaceFolder}/.vscode/typings",
+    // Clone the NVDA repository to the github folder in your home directory to get typing support
+    "python.analysis.extraPaths": [
+        "~\\github\\nvda\\source",
+        "~\\github\\nvda\\miscDeps\\python"
+    ],
+    "[python]": {
+        "editor.formatOnSave": true,
+        "editor.codeActionsOnSave": {
+            "source.fixAll": "always"
+        },
+        "editor.defaultFormatter": "charliermarsh.ruff"
+    }
 }
diff --git a/application-integration/chat-gpt-browser.talon b/application-integration/chat-gpt-browser.talon
index 18e0762..2ba4996 100644
--- a/application-integration/chat-gpt-browser.talon
+++ b/application-integration/chat-gpt-browser.talon
@@ -1,13 +1,9 @@
 title: /https://chat.openai.com/
 -
-Open new chat:
-    key(ctrl-shift-o)
-Focus chat input:
-    key(shift-esc)
-Copy last code block:
-    key(ctrl-shift-;)
-Copy last response:
-    key(ctrl-shift-c)
+Open new chat: key(ctrl-shift-o)
+Focus chat input: key(shift-esc)
+Copy last code block: key(ctrl-shift-;)
+Copy last response: key(ctrl-shift-c)
 
 speak [last] (response | output | chat):
     key(ctrl-shift-c)
@@ -19,9 +15,6 @@ speak last code [block]:
     sleep(0.3)
     user.tts(clip.text())
 
-Set custom instructions:
-    key(ctrl-shift-i)
-Toggle sidebar:
-    key(ctrl-shift-s)
-Delete chat:
-    key(ctrl-shift-delete)
+Set custom instructions: key(ctrl-shift-i)
+Toggle sidebar: key(ctrl-shift-s)
+Delete chat: key(ctrl-shift-delete)
diff --git a/application-integration/ms-edge-tts.talon b/application-integration/ms-edge-tts.talon
index d88f99a..42b9bed 100644
--- a/application-integration/ms-edge-tts.talon
+++ b/application-integration/ms-edge-tts.talon
@@ -11,8 +11,7 @@ read aloud:
     sleep(1)
     key(ctrl)
 
-toggle immersive reader:
-    key(f9)
+toggle immersive reader: key(f9)
 
 toggle immersive reader and read aloud:
     key(ctrl-shift-u)
diff --git a/core/additional_voices/models/en_US-amy-low.onnx.json b/core/additional_voices/models/en_US-amy-low.onnx.json
index 43cc67d..c60767d 100644
--- a/core/additional_voices/models/en_US-amy-low.onnx.json
+++ b/core/additional_voices/models/en_US-amy-low.onnx.json
@@ -1,160 +1,160 @@
 {
-  "audio": {
-    "sample_rate": 16000,
-    "quality": "low"
-  },
-  "espeak": {
-    "voice": "en-us"
-  },
-  "inference": {
-    "noise_scale": 0.667,
-    "length_scale": 1,
-    "noise_w": 0.8
-  },
-  "phoneme_map": {},
-  "phoneme_id_map": {
-    "_": [0],
-    "^": [1],
-    "$": [2],
-    " ": [3],
-    "!": [4],
-    "'": [5],
-    "(": [6],
-    ")": [7],
-    ",": [8],
-    "-": [9],
-    ".": [10],
-    ":": [11],
-    ";": [12],
-    "?": [13],
-    "a": [14],
-    "b": [15],
-    "c": [16],
-    "d": [17],
-    "e": [18],
-    "f": [19],
-    "h": [20],
-    "i": [21],
-    "j": [22],
-    "k": [23],
-    "l": [24],
-    "m": [25],
-    "n": [26],
-    "o": [27],
-    "p": [28],
-    "q": [29],
-    "r": [30],
-    "s": [31],
-    "t": [32],
-    "u": [33],
-    "v": [34],
-    "w": [35],
-    "x": [36],
-    "y": [37],
-    "z": [38],
-    "æ": [39],
-    "ç": [40],
-    "ð": [41],
-    "ø": [42],
-    "ħ": [43],
-    "ŋ": [44],
-    "œ": [45],
-    "ǀ": [46],
-    "ǁ": [47],
-    "ǂ": [48],
-    "ǃ": [49],
-    "ɐ": [50],
-    "ɑ": [51],
-    "ɒ": [52],
-    "ɓ": [53],
-    "ɔ": [54],
-    "ɕ": [55],
-    "ɖ": [56],
-    "ɗ": [57],
-    "ɘ": [58],
-    "ə": [59],
-    "ɚ": [60],
-    "ɛ": [61],
-    "ɜ": [62],
-    "ɞ": [63],
-    "ɟ": [64],
-    "ɠ": [65],
-    "ɡ": [66],
-    "ɢ": [67],
-    "ɣ": [68],
-    "ɤ": [69],
-    "ɥ": [70],
-    "ɦ": [71],
-    "ɧ": [72],
-    "ɨ": [73],
-    "ɪ": [74],
-    "ɫ": [75],
-    "ɬ": [76],
-    "ɭ": [77],
-    "ɮ": [78],
-    "ɯ": [79],
-    "ɰ": [80],
-    "ɱ": [81],
-    "ɲ": [82],
-    "ɳ": [83],
-    "ɴ": [84],
-    "ɵ": [85],
-    "ɶ": [86],
-    "ɸ": [87],
-    "ɹ": [88],
-    "ɺ": [89],
-    "ɻ": [90],
-    "ɽ": [91],
-    "ɾ": [92],
-    "ʀ": [93],
-    "ʁ": [94],
-    "ʂ": [95],
-    "ʃ": [96],
-    "ʄ": [97],
-    "ʈ": [98],
-    "ʉ": [99],
-    "ʊ": [100],
-    "ʋ": [101],
-    "ʌ": [102],
-    "ʍ": [103],
-    "ʎ": [104],
-    "ʏ": [105],
-    "ʐ": [106],
-    "ʑ": [107],
-    "ʒ": [108],
-    "ʔ": [109],
-    "ʕ": [110],
-    "ʘ": [111],
-    "ʙ": [112],
-    "ʛ": [113],
-    "ʜ": [114],
-    "ʝ": [115],
-    "ʟ": [116],
-    "ʡ": [117],
-    "ʢ": [118],
-    "ʲ": [119],
-    "ˈ": [120],
-    "ˌ": [121],
-    "ː": [122],
-    "ˑ": [123],
-    "˞": [124],
-    "β": [125],
-    "θ": [126],
-    "χ": [127],
-    "ᵻ": [128],
-    "ⱱ": [129]
-  },
-  "num_symbols": 130,
-  "num_speakers": 1,
-  "speaker_id_map": {},
-  "piper_version": "0.2.0",
-  "language": {
-    "code": "en_US",
-    "family": "en",
-    "region": "US",
-    "name_native": "English",
-    "name_english": "English",
-    "country_english": "United States"
-  },
-  "dataset": "amy"
+    "audio": {
+        "sample_rate": 16000,
+        "quality": "low"
+    },
+    "espeak": {
+        "voice": "en-us"
+    },
+    "inference": {
+        "noise_scale": 0.667,
+        "length_scale": 1,
+        "noise_w": 0.8
+    },
+    "phoneme_map": {},
+    "phoneme_id_map": {
+        "_": [0],
+        "^": [1],
+        "$": [2],
+        " ": [3],
+        "!": [4],
+        "'": [5],
+        "(": [6],
+        ")": [7],
+        ",": [8],
+        "-": [9],
+        ".": [10],
+        ":": [11],
+        ";": [12],
+        "?": [13],
+        "a": [14],
+        "b": [15],
+        "c": [16],
+        "d": [17],
+        "e": [18],
+        "f": [19],
+        "h": [20],
+        "i": [21],
+        "j": [22],
+        "k": [23],
+        "l": [24],
+        "m": [25],
+        "n": [26],
+        "o": [27],
+        "p": [28],
+        "q": [29],
+        "r": [30],
+        "s": [31],
+        "t": [32],
+        "u": [33],
+        "v": [34],
+        "w": [35],
+        "x": [36],
+        "y": [37],
+        "z": [38],
+        "æ": [39],
+        "ç": [40],
+        "ð": [41],
+        "ø": [42],
+        "ħ": [43],
+        "ŋ": [44],
+        "œ": [45],
+        "ǀ": [46],
+        "ǁ": [47],
+        "ǂ": [48],
+        "ǃ": [49],
+        "ɐ": [50],
+        "ɑ": [51],
+        "ɒ": [52],
+        "ɓ": [53],
+        "ɔ": [54],
+        "ɕ": [55],
+        "ɖ": [56],
+        "ɗ": [57],
+        "ɘ": [58],
+        "ə": [59],
+        "ɚ": [60],
+        "ɛ": [61],
+        "ɜ": [62],
+        "ɞ": [63],
+        "ɟ": [64],
+        "ɠ": [65],
+        "ɡ": [66],
+        "ɢ": [67],
+        "ɣ": [68],
+        "ɤ": [69],
+        "ɥ": [70],
+        "ɦ": [71],
+        "ɧ": [72],
+        "ɨ": [73],
+        "ɪ": [74],
+        "ɫ": [75],
+        "ɬ": [76],
+        "ɭ": [77],
+        "ɮ": [78],
+        "ɯ": [79],
+        "ɰ": [80],
+        "ɱ": [81],
+        "ɲ": [82],
+        "ɳ": [83],
+        "ɴ": [84],
+        "ɵ": [85],
+        "ɶ": [86],
+        "ɸ": [87],
+        "ɹ": [88],
+        "ɺ": [89],
+        "ɻ": [90],
+        "ɽ": [91],
+        "ɾ": [92],
+        "ʀ": [93],
+        "ʁ": [94],
+        "ʂ": [95],
+        "ʃ": [96],
+        "ʄ": [97],
+        "ʈ": [98],
+        "ʉ": [99],
+        "ʊ": [100],
+        "ʋ": [101],
+        "ʌ": [102],
+        "ʍ": [103],
+        "ʎ": [104],
+        "ʏ": [105],
+        "ʐ": [106],
+        "ʑ": [107],
+        "ʒ": [108],
+        "ʔ": [109],
+        "ʕ": [110],
+        "ʘ": [111],
+        "ʙ": [112],
+        "ʛ": [113],
+        "ʜ": [114],
+        "ʝ": [115],
+        "ʟ": [116],
+        "ʡ": [117],
+        "ʢ": [118],
+        "ʲ": [119],
+        "ˈ": [120],
+        "ˌ": [121],
+        "ː": [122],
+        "ˑ": [123],
+        "˞": [124],
+        "β": [125],
+        "θ": [126],
+        "χ": [127],
+        "ᵻ": [128],
+        "ⱱ": [129]
+    },
+    "num_symbols": 130,
+    "num_speakers": 1,
+    "speaker_id_map": {},
+    "piper_version": "0.2.0",
+    "language": {
+        "code": "en_US",
+        "family": "en",
+        "region": "US",
+        "name_native": "English",
+        "name_english": "English",
+        "country_english": "United States"
+    },
+    "dataset": "amy"
 }
diff --git a/nvda/.addOn/sight-free-talon-server/_template_addon_release.json b/nvda/.addOn/sight-free-talon-server/_template_addon_release.json
index a75f56e..780281b 100644
--- a/nvda/.addOn/sight-free-talon-server/_template_addon_release.json
+++ b/nvda/.addOn/sight-free-talon-server/_template_addon_release.json
@@ -1,29 +1,29 @@
 {
-  "addonId": "easyAddonTech.XYZ",
-  "addonVersionNumber": {
-    "major": 21,
-    "minor": 6,
-    "patch": 0
-  },
-  "addonVersionName": "21.06",
-  "displayName": "My addon",
-  "publisher": "easyAddonTech",
-  "description": "Makes doing XYZ easier",
-  "homepage": "https://github.com/nvaccess/addon-datastore",
-  "minNVDAVersion": {
-    "major": 2019,
-    "minor": 3,
-    "patch": 0
-  },
-  "lastTestedVersion": {
-    "major": 2020,
-    "minor": 4,
-    "patch": 0
-  },
-  "channel": "beta",
-  "URL": "https://github.com/nvaccess/addon-datastore/releases/download/v0.1.0/myAddon.nvda-addon",
-  "sha256": "69D84CA8899800A5575CE31798293CD4FEBAB1D734A07C2E51E56A28E0DF8C82",
-  "sourceURL": "https://github.com/nvaccess/addon-datastore/",
-  "license": "GPL v2",
-  "licenseURL": "https://github.com/nvaccess/addon-datastore/license.MD"
+    "addonId": "easyAddonTech.XYZ",
+    "addonVersionNumber": {
+        "major": 21,
+        "minor": 6,
+        "patch": 0
+    },
+    "addonVersionName": "21.06",
+    "displayName": "My addon",
+    "publisher": "easyAddonTech",
+    "description": "Makes doing XYZ easier",
+    "homepage": "https://github.com/nvaccess/addon-datastore",
+    "minNVDAVersion": {
+        "major": 2019,
+        "minor": 3,
+        "patch": 0
+    },
+    "lastTestedVersion": {
+        "major": 2020,
+        "minor": 4,
+        "patch": 0
+    },
+    "channel": "beta",
+    "URL": "https://github.com/nvaccess/addon-datastore/releases/download/v0.1.0/myAddon.nvda-addon",
+    "sha256": "69D84CA8899800A5575CE31798293CD4FEBAB1D734A07C2E51E56A28E0DF8C82",
+    "sourceURL": "https://github.com/nvaccess/addon-datastore/",
+    "license": "GPL v2",
+    "licenseURL": "https://github.com/nvaccess/addon-datastore/license.MD"
 }
diff --git a/nvda/.addOn/sight-free-talon-server/style.css b/nvda/.addOn/sight-free-talon-server/style.css
index 7802a00..1dd92e1 100644
--- a/nvda/.addOn/sight-free-talon-server/style.css
+++ b/nvda/.addOn/sight-free-talon-server/style.css
@@ -1,34 +1,34 @@
 @charset "utf-8";
 body {
-  font-family: Verdana, Arial, Helvetica, Sans-serif;
-  line-height: 1.2em;
+    font-family: Verdana, Arial, Helvetica, Sans-serif;
+    line-height: 1.2em;
 }
 h1,
 h2 {
-  text-align: center;
+    text-align: center;
 }
 dt {
-  font-weight: bold;
-  float: left;
-  width: 10%;
-  clear: left;
+    font-weight: bold;
+    float: left;
+    width: 10%;
+    clear: left;
 }
 dd {
-  margin: 0 0 0.4em 0;
-  float: left;
-  width: 90%;
-  display: block;
+    margin: 0 0 0.4em 0;
+    float: left;
+    width: 90%;
+    display: block;
 }
 p {
-  clear: both;
+    clear: both;
 }
 a {
-  text-decoration: underline;
+    text-decoration: underline;
 }
 :active {
-  text-decoration: none;
+    text-decoration: none;
 }
 a:focus,
 a:hover {
-  outline: solid;
+    outline: solid;
 }
diff --git a/nvda/debug-nvda.talon b/nvda/debug-nvda.talon
index fe42b6e..45222d7 100644
--- a/nvda/debug-nvda.talon
+++ b/nvda/debug-nvda.talon
@@ -1,11 +1,8 @@
 os: windows
 -
 
-test reader add on:
-    user.test_reader_addon()
+test reader add on: user.test_reader_addon()
 
-key(ctrl-shift-alt-g):
-    user.test_reader_addon()
+key(ctrl-shift-alt-g): user.test_reader_addon()
 
-test controller client:
-    user.test_controller_client()
+test controller client: user.test_controller_client()
diff --git a/nvda/nvda.talon b/nvda/nvda.talon
index 36cb206..7aa6070 100644
--- a/nvda/nvda.talon
+++ b/nvda/nvda.talon
@@ -2,166 +2,110 @@ tag: user.nvda_running
 os: windows
 -
 
-reader press <user.keys>:
-    user.with_nvda_mod_press(keys)
+reader press <user.keys>: user.with_nvda_mod_press(keys)
 
-next heading:
-    key(h)
-previous heading:
-    key(shift-h)
+next heading: key(h)
+previous heading: key(shift-h)
 
-previous option:
-    user.with_nvda_mod_press("ctrl-left")
+previous option: user.with_nvda_mod_press("ctrl-left")
 
 # In the menu, this will go to the next option
-next option:
-    user.with_nvda_mod_press("ctrl-right")
+next option: user.with_nvda_mod_press("ctrl-right")
 
-up option:
-    user.with_nvda_mod_press("ctrl-up")
+up option: user.with_nvda_mod_press("ctrl-up")
 
 # In the menu, this will lower the value of the option
-down option:
-    user.with_nvda_mod_press("ctrl-down")
+down option: user.with_nvda_mod_press("ctrl-down")
 
 # reads everything from the current position down
-read below:
-    user.with_nvda_mod_press("down")
+read below: user.with_nvda_mod_press("down")
 
 # If the user is in the middle of an echoed text and this will posit otherwise it will resume
-pause speech:
-    key(shift)
+pause speech: key(shift)
 
-stop speech:
-    key(ctrl)
+stop speech: key(ctrl)
 
-speak line:
-    user.with_nvda_mod_press("up")
+speak line: user.with_nvda_mod_press("up")
 
-mouse to navigator:
-    user.with_nvda_mod_press("shift-m")
+mouse to navigator: user.with_nvda_mod_press("shift-m")
 
-navigator to mouse:
-    user.with_nvda_mod_press("shift-n")
+navigator to mouse: user.with_nvda_mod_press("shift-n")
 
-next paragraph:
-    key(ctrl-down)
+next paragraph: key(ctrl-down)
 
-previous paragraph:
-    key(ctrl-up)
+previous paragraph: key(ctrl-up)
 
-change verbosity:
-    user.with_nvda_mod_press("p")
+change verbosity: user.with_nvda_mod_press("p")
 
-speak title:
-    user.with_nvda_mod_press("t")
+speak title: user.with_nvda_mod_press("t")
 
-next focusable item:
-    key(tab)
-next heading <number_small>:
-    key("{number_small}")
-previous heading <number_small>:
-    key("shift-{number_small}")
+next focusable item: key(tab)
+next heading <number_small>: key("{number_small}")
+previous heading <number_small>: key("shift-{number_small}")
 
-next landmark:
-    key(d)
-previous landmark:
-    key(shift-d)
+next landmark: key(d)
+previous landmark: key(shift-d)
 # toggle speech mode:
 
-open element list:
-    user.with_nvda_mod_press("f7")
+open element list: user.with_nvda_mod_press("f7")
 
-toggle input help:
-    user.with_nvda_mod_press("1")
+toggle input help: user.with_nvda_mod_press("1")
 
-speak typed words:
-    user.with_nvda_mod_press("3")
+speak typed words: user.with_nvda_mod_press("3")
 
-speak typed characters:
-    user.with_nvda_mod_press("2")
+speak typed characters: user.with_nvda_mod_press("2")
 
-speak command keys:
-    user.with_nvda_mod_press("4")
+speak command keys: user.with_nvda_mod_press("4")
 
-follow system focus:
-    user.with_nvda_mod_press("7")
-follow system caret:
-    user.with_nvda_mod_press("6")
+follow system focus: user.with_nvda_mod_press("7")
+follow system caret: user.with_nvda_mod_press("6")
 
-toggle mouse tracking:
-    user.with_nvda_mod_press("m")
+toggle mouse tracking: user.with_nvda_mod_press("m")
 
-open reader setings:
-    user.with_nvda_mod_press("ctrl-g")
+open reader setings: user.with_nvda_mod_press("ctrl-g")
 
-synthesizer settings:
-    user.with_nvda_mod_press("ctrl-s")
+synthesizer settings: user.with_nvda_mod_press("ctrl-s")
 
-speak time:
-    user.with_nvda_mod_press("f12")
+speak time: user.with_nvda_mod_press("f12")
 
 # Reporting Location and Other Information
-speak text formatting:
-    user.with_nvda_mod_press("f")
+speak text formatting: user.with_nvda_mod_press("f")
 
-speak link destination:
-    user.with_nvda_mod_press("k")
+speak link destination: user.with_nvda_mod_press("k")
 
-speak window:
-    user.with_nvda_mod_press("b")
+speak window: user.with_nvda_mod_press("b")
 
-speak focus:
-    user.with_nvda_mod_press("tab")
+speak focus: user.with_nvda_mod_press("tab")
 
-screen curtain:
-    user.with_nvda_mod_press("ctrl-escape")
+screen curtain: user.with_nvda_mod_press("ctrl-escape")
 
 # sleep mode disables all NVDA commands and speech/braille
 # output for the current application. This is most useful in
 # applications that provide their own speech or screen reading
 # features. Press this command again to disable sleep mode - note
 # that NVDA will only retain the Sleep Mode setting until it is restarted.
-toggle reader sleep:
-    user.with_nvda_mod_press("shift-s")
-
-next table:
-    key(T)
-next list:
-    key(L)
-next list item:
-    key(I)
-next graphic:
-    key(G)
-next link:
-    key(K)
-next unvisited link:
-    key(U)
-next visited link:
-    key(V)
-Next form field:
-    key(F)
-Next button:
-    key(B)
-
-toggle selection:
-    key(space)
-Next checkbox:
-    key(X)
-
-Next combo box:
-    key(C)
-
-Toggle selection:
-    key(up)
-Next radio button:
-    key(R)
-
-braille display dialog:
-    user.with_nvda_mod_press("ctrl-a")
-
-pass through next:
-    user.with_nvda_mod_press("f2")
-
-restart reader:
-    user.restart_nvda()
+toggle reader sleep: user.with_nvda_mod_press("shift-s")
+
+next table: key(T)
+next list: key(L)
+next list item: key(I)
+next graphic: key(G)
+next link: key(K)
+next unvisited link: key(U)
+next visited link: key(V)
+Next form field: key(F)
+Next button: key(B)
+
+toggle selection: key(space)
+Next checkbox: key(X)
+
+Next combo box: key(C)
+
+Toggle selection: key(up)
+Next radio button: key(R)
+
+braille display dialog: user.with_nvda_mod_press("ctrl-a")
+
+pass through next: user.with_nvda_mod_press("f2")
+
+restart reader: user.restart_nvda()
diff --git a/orca/orca.talon b/orca/orca.talon
index 4056d7e..22c118a 100644
--- a/orca/orca.talon
+++ b/orca/orca.talon
@@ -1,5 +1,4 @@
 os: linux
 -
 
-toggle reader:
-    user.toggle_reader()
+toggle reader: user.toggle_reader()
diff --git a/sight-free-global.talon b/sight-free-global.talon
index 372974f..eb5b6f4 100644
--- a/sight-free-global.talon
+++ b/sight-free-global.talon
@@ -3,8 +3,7 @@
 
 tag(): user.sightFreeTalonInstalled
 
-toggle echo:
-    user.toggle_echo()
+toggle echo: user.toggle_echo()
 
 # Echo and interrupt the current speaker
 echo this:
@@ -18,8 +17,7 @@ echo no interrupt:
     interrupt = false
     user.tts(clip.text(), interrupt)
 
-echo clipboard:
-    user.tts(clip.text())
+echo clipboard: user.tts(clip.text())
 
 echo line:
     edit.select_line()
@@ -27,15 +25,12 @@ echo line:
     sleep(0.1)
     user.tts(clip.text())
 
-echo context:
-    user.echo_context(true)
+echo context: user.echo_context(true)
 
-toggle echo context:
-    user.toggle_echo_context()
+toggle echo context: user.toggle_echo_context()
 
 # Toogles both echo on dictation and echo on context
-toggle echo all:
-    user.toggle_echo_all()
+toggle echo all: user.toggle_echo_all()
 
 echo tab level:
     key(ctrl-l)
@@ -45,14 +40,10 @@ echo tab level:
     level = user.indentation_level(clip.text())
     user.tts("{level}")
 
-toggle [screen] reader:
-    user.toggle_reader()
+toggle [screen] reader: user.toggle_reader()
 
-toggle (key | keypress) sound:
-    user.toggle_keypress_sound()
+toggle (key | keypress) sound: user.toggle_keypress_sound()
 
-(switch | change) voice:
-    user.switch_voice()
+(switch | change) voice: user.switch_voice()
 
-toggle braille:
-    user.toggle_braille()
+toggle braille: user.toggle_braille()
diff --git a/utils/help.talon b/utils/help.talon
index cd5407b..76be1c5 100644
--- a/utils/help.talon
+++ b/utils/help.talon
@@ -1,2 +1 @@
-read active commands:
-    user.open_command_list()
+read active commands: user.open_command_list()
diff --git a/utils/log/log.talon b/utils/log/log.talon
index 0a0439a..a4c13c2 100644
--- a/utils/log/log.talon
+++ b/utils/log/log.talon
@@ -1,11 +1,7 @@
-speak last error:
-    user.echo_last_error()
+speak last error: user.echo_last_error()
 
-speak last debug:
-    user.echo_last_debug()
+speak last debug: user.echo_last_debug()
 
-speak last print:
-    user.echo_last_print()
+speak last print: user.echo_last_print()
 
-speak last warning:
-    user.echo_last_warning()
+speak last warning: user.echo_last_warning()
diff --git a/utils/utils.talon b/utils/utils.talon
index a9bc5d3..8569053 100644
--- a/utils/utils.talon
+++ b/utils/utils.talon
@@ -1,11 +1,8 @@
-explore tags:
-    user.explore_tags()
+explore tags: user.explore_tags()
 
-explore settings:
-    user.explore_settings()
+explore settings: user.explore_settings()
 
-echo mode:
-    user.echo_mode()
+echo mode: user.echo_mode()
 
 echo website:
     key(ctrl-l)
diff --git a/utils/windows-utils.talon b/utils/windows-utils.talon
index b6f211e..47c2969 100644
--- a/utils/windows-utils.talon
+++ b/utils/windows-utils.talon
@@ -2,8 +2,7 @@ os: windows
 -
 
 # Copies text with OCR from the current window
-extract text:
-    user.extract_text()
+extract text: user.extract_text()
 
 reader running:
     res = user.is_nvda_running()