seleniumbase 4.24.11__py3-none-any.whl → 4.33.15__py3-none-any.whl

seleniumbase/console_scripts/run.py

@@ -41,87 +41,89 @@ sbase grid-node start --hub=127.0.0.1
 import colorama
 import sys
 import time
+from contextlib import suppress
 from seleniumbase.config import settings
 from seleniumbase.fixtures import constants
 from seleniumbase.fixtures import shared_utils
 
-if shared_utils.is_windows() and hasattr(colorama, "just_fix_windows_console"):
-    colorama.just_fix_windows_console()
-else:
-    colorama.init(autoreset=True)
-
-
-def show_usage():
-    show_basic_usage()
-    sc = ""
-    sc += '    Type "sbase help [COMMAND]" for specific command info.\n'
-    sc += '    For info on all commands, type: "seleniumbase --help".\n'
-    sc += '    Use "pytest" for running tests.\n'
-    if "linux" not in sys.platform:
-        c1 = colorama.Fore.BLUE + colorama.Back.LIGHTCYAN_EX
-        c2 = colorama.Fore.BLUE + colorama.Back.LIGHTGREEN_EX
-        c3 = colorama.Fore.BLUE + colorama.Back.LIGHTYELLOW_EX
-        c4 = colorama.Fore.MAGENTA + colorama.Back.LIGHTYELLOW_EX
-        cr = colorama.Style.RESET_ALL
-        sc = sc.replace("seleniumbase", c1 + "selenium" + c2 + "base" + cr)
-        sc = sc.replace("sbase", c1 + "s" + c2 + "base" + cr)
-        sc = sc.replace("pytest", c3 + "pytest" + cr)
-        sc = sc.replace("--help", c4 + "--help" + cr)
-        sc = sc.replace("help", c4 + "help" + cr)
-    print(sc)
-
 
 def show_basic_usage():
     from seleniumbase.console_scripts import logo_helper
 
     seleniumbase_logo = logo_helper.get_seleniumbase_logo()
     print(seleniumbase_logo)
+    time.sleep(0.035)
     print("")
-    time.sleep(0.28)  # Enough time to see the logo
+    time.sleep(0.031)
     show_package_location()
+    time.sleep(0.031)
     show_version_info()
+    time.sleep(0.031)
     print("")
-    time.sleep(0.62)  # Enough time to see the version
+    time.sleep(0.555)  # Enough time to see the logo & version
     sc = ""
-    sc += ' * USAGE: "seleniumbase [COMMAND] [PARAMETERS]"\n'
-    sc += ' *    OR:        "sbase [COMMAND] [PARAMETERS]"\n'
-    sc += "\n"
-    sc += "COMMANDS:\n"
-    sc += "      get / install    [DRIVER] [OPTIONS]\n"
-    sc += "      methods          (List common Python methods)\n"
-    sc += "      options          (List common pytest options)\n"
-    sc += "      behave-options   (List common behave options)\n"
-    sc += "      gui / commander  [OPTIONAL PATH or TEST FILE]\n"
-    sc += "      behave-gui       (SBase Commander for Behave)\n"
-    sc += "      caseplans        [OPTIONAL PATH or TEST FILE]\n"
-    sc += "      mkdir            [DIRECTORY] [OPTIONS]\n"
-    sc += "      mkfile           [FILE.py] [OPTIONS]\n"
-    sc += "      mkrec / codegen  [FILE.py] [OPTIONS]\n"
-    sc += "      recorder         (Open Recorder Desktop App.)\n"
-    sc += "      record           (If args: mkrec. Else: App.)\n"
-    sc += "      mkpres           [FILE.py] [LANG]\n"
-    sc += "      mkchart          [FILE.py] [LANG]\n"
-    sc += "      print            [FILE] [OPTIONS]\n"
-    sc += "      translate        [SB_FILE.py] [LANG] [ACTION]\n"
-    sc += "      convert          [WEBDRIVER_UNITTEST_FILE.py]\n"
-    sc += "      extract-objects  [SB_FILE.py]\n"
-    sc += "      inject-objects   [SB_FILE.py] [OPTIONS]\n"
-    sc += "      objectify        [SB_FILE.py] [OPTIONS]\n"
-    sc += "      revert-objects   [SB_FILE.py] [OPTIONS]\n"
-    sc += "      encrypt / obfuscate\n"
-    sc += "      decrypt / unobfuscate\n"
-    sc += "      proxy            (Start a basic proxy server)\n"
-    sc += "      download server  (Get Selenium Grid JAR file)\n"
-    sc += "      grid-hub         [start|stop] [OPTIONS]\n"
-    sc += "      grid-node        [start|stop] --hub=[HOST/IP]\n"
-    sc += ' * (EXAMPLE: "sbase get chromedriver") *\n'
+    sc += "╭──────────────────────────────────────────────────╮\n"
+    sc += '│  * USAGE: "seleniumbase [COMMAND] [PARAMETERS]"  │\n'
+    sc += '│  *    OR:        "sbase [COMMAND] [PARAMETERS]"  │\n'
+    sc += "│                                                  │\n"
+    sc += "│ COMMANDS:        PARAMETERS / DESCRIPTIONS:      │\n"
+    sc += "│    get / install    [DRIVER_NAME] [OPTIONS]      │\n"
+    sc += "│    methods          (List common Python methods) │\n"
+    sc += "│    options          (List common pytest options) │\n"
+    sc += "│    behave-options   (List common behave options) │\n"
+    sc += "│    gui / commander  [OPTIONAL PATH or TEST FILE] │\n"
+    sc += "│    behave-gui       (SBase Commander for Behave) │\n"
+    sc += "│    caseplans        [OPTIONAL PATH or TEST FILE] │\n"
+    sc += "│    mkdir            [DIRECTORY] [OPTIONS]        │\n"
+    sc += "│    mkfile           [FILE.py] [OPTIONS]          │\n"
+    sc += "│    mkrec / codegen  [FILE.py] [OPTIONS]          │\n"
+    sc += "│    recorder         (Open Recorder Desktop App.) │\n"
+    sc += "│    record           (If args: mkrec. Else: App.) │\n"
+    sc += "│    mkpres           [FILE.py] [LANG]             │\n"
+    sc += "│    mkchart          [FILE.py] [LANG]             │\n"
+    sc += "│    print            [FILE] [OPTIONS]             │\n"
+    sc += "│    translate        [SB_FILE.py] [LANG] [ACTION] │\n"
+    sc += "│    convert          [WEBDRIVER_UNITTEST_FILE.py] │\n"
+    sc += "│    extract-objects  [SB_FILE.py]                 │\n"
+    sc += "│    inject-objects   [SB_FILE.py] [OPTIONS]       │\n"
+    sc += "│    objectify        [SB_FILE.py] [OPTIONS]       │\n"
+    sc += "│    revert-objects   [SB_FILE.py] [OPTIONS]       │\n"
+    sc += "│    encrypt / obfuscate                           │\n"
+    sc += "│    decrypt / unobfuscate                         │\n"
+    sc += "│    proxy            (Start a basic proxy server) │\n"
+    sc += "│    download server  (Get Selenium Grid JAR file) │\n"
+    sc += "│    grid-hub         [start|stop] [OPTIONS]       │\n"
+    sc += "│    grid-node        [start|stop] --hub=[HOST/IP] │\n"
+    sc += "│                                                  │\n"
+    sc += '│ *  EXAMPLE => "sbase get chromedriver stable"    │\n'
+    sc += '│ *  For command info => "sbase help [COMMAND]"    │\n'
+    sc += '│ *  For info on all commands => "sbase --help"    │\n'
+    sc += "╰──────────────────────────────────────────────────╯"
     sc += ""
+    bordered_sc = sc
     if "linux" not in sys.platform:
         c1 = colorama.Fore.BLUE + colorama.Back.LIGHTCYAN_EX
         c2 = colorama.Fore.BLUE + colorama.Back.LIGHTGREEN_EX
+        c3 = colorama.Fore.BLUE + colorama.Back.LIGHTYELLOW_EX
+        c4 = colorama.Fore.MAGENTA + colorama.Back.LIGHTYELLOW_EX
         cr = colorama.Style.RESET_ALL
         sc = sc.replace("seleniumbase", c1 + "selenium" + c2 + "base" + cr)
         sc = sc.replace("sbase", c1 + "s" + c2 + "base" + cr)
+        sc = sc.replace("[COMMAND]", c3 + "[COMMAND]" + cr)
+        sc = sc.replace("--help", c4 + "--help" + cr)
+        sc = sc.replace("help", c4 + "help" + cr)
+    with suppress(Exception):
+        print(sc)
+        return
+    sc = bordered_sc.replace("╮\n", "")
+    sc = sc.replace("╭", "").replace("╮", "").replace("│", "")
+    sc = sc.replace("╰", "").replace("╯", "").replace("─", "")
+    if "linux" not in sys.platform:
+        sc = sc.replace("seleniumbase", c1 + "selenium" + c2 + "base" + cr)
+        sc = sc.replace("sbase", c1 + "s" + c2 + "base" + cr)
+        sc = sc.replace("[COMMAND]", c3 + "[COMMAND]" + cr)
+        sc = sc.replace("--help", c4 + "--help" + cr)
+        sc = sc.replace("help", c4 + "help" + cr)
     print(sc)
 
 
@@ -133,33 +135,33 @@ def show_install_usage():
     print(sc)
     print("")
     print("  Usage:")
-    print("           seleniumbase install [DRIVER_NAME] [OPTIONS]")
-    print("           OR: seleniumbase get [DRIVER_NAME] [OPTIONS]")
-    print("           OR:    sbase install [DRIVER_NAME] [OPTIONS]")
-    print("           OR:        sbase get [DRIVER_NAME] [OPTIONS]")
-    print("                 (Drivers: chromedriver, geckodriver, edgedriver")
-    print("                           iedriver, uc_driver)")
+    print("     seleniumbase install [DRIVER_NAME] [OPTIONS]")
+    print("     OR: seleniumbase get [DRIVER_NAME] [OPTIONS]")
+    print("     OR:    sbase install [DRIVER_NAME] [OPTIONS]")
+    print("     OR:        sbase get [DRIVER_NAME] [OPTIONS]")
+    print("         (Drivers: chromedriver, geckodriver,")
+    print("                   edgedriver, iedriver, uc_driver)")
     print("  Options:")
-    print("           VERSION         Specify the version to download.")
-    print("                           Tries to detect the needed version.")
-    print("                           If using chromedriver or edgedriver,")
-    print("                           you can use the major version integer.")
+    print("     VERSION    Specify the version to download.")
+    print("                Tries to detect the needed version.")
+    print("                If using chromedriver or edgedriver,")
+    print("                you can use the major version integer.")
     print()
-    print("           -p OR --path    Also copy the driver to /usr/local/bin")
+    print("     -p / --path    Also copy driver to /usr/local/bin")
     print("  Examples:")
-    print("           sbase get chromedriver")
-    print("           sbase get geckodriver")
-    print("           sbase get edgedriver")
-    print("           sbase get chromedriver 114")
-    print("           sbase get chromedriver 114.0.5735.90")
-    print("           sbase get chromedriver stable")
-    print("           sbase get chromedriver beta")
-    print("           sbase get chromedriver -p")
+    print("     sbase get chromedriver")
+    print("     sbase get geckodriver")
+    print("     sbase get edgedriver")
+    print("     sbase get chromedriver 114")
+    print("     sbase get chromedriver 114.0.5735.90")
+    print("     sbase get chromedriver stable")
+    print("     sbase get chromedriver beta")
+    print("     sbase get chromedriver -p")
     print("  Output:")
-    print("           Downloads the webdriver to seleniumbase/drivers/")
-    print("           (chromedriver is required for Chrome automation)")
-    print("           (geckodriver is required for Firefox automation)")
-    print("           (edgedriver is required for MS__Edge automation)")
+    print("     Downloads the webdriver to seleniumbase/drivers/")
+    print("     (chromedriver is required for Chrome automation)")
+    print("     (geckodriver is required for Firefox automation)")
+    print("     (edgedriver is required for MS__Edge automation)")
     print("")
 
 
@@ -171,18 +173,18 @@ def show_commander_usage():
     print(sc)
     print("")
     print("  Usage:")
-    print("           seleniumbase commander [OPTIONAL PATH or TEST FILE]")
-    print("           OR:    sbase commander [OPTIONAL PATH or TEST FILE]")
-    print("           OR:   seleniumbase gui [OPTIONAL PATH or TEST FILE]")
-    print("           OR:          sbase gui [OPTIONAL PATH or TEST FILE]")
+    print("     seleniumbase commander [OPTIONAL PATH or TEST FILE]")
+    print("     OR:    sbase commander [OPTIONAL PATH or TEST FILE]")
+    print("     OR:   seleniumbase gui [OPTIONAL PATH or TEST FILE]")
+    print("     OR:          sbase gui [OPTIONAL PATH or TEST FILE]")
     print("  Examples:")
-    print("           sbase gui")
-    print("           sbase gui -k agent")
-    print("           sbase gui -m marker2")
-    print("           sbase gui test_suite.py")
-    print("           sbase gui offline_examples/")
+    print("     sbase gui")
+    print("     sbase gui -k agent")
+    print("     sbase gui -m marker2")
+    print("     sbase gui test_suite.py")
+    print("     sbase gui offline_examples/")
     print("  Output:")
-    print("           Launches SeleniumBase Commander | GUI for pytest.")
+    print("     Launches SeleniumBase Commander | GUI for pytest.")
     print("")
 
 
@@ -194,16 +196,16 @@ def show_behave_gui_usage():
     print(sc)
     print("")
     print("  Usage:")
-    print("           seleniumbase behave-gui [OPTIONAL PATH or TEST FILE]")
-    print("           seleniumbase gui-behave [OPTIONAL PATH or TEST FILE]")
-    print("           OR:    sbase behave-gui [OPTIONAL PATH or TEST FILE]")
-    print("           OR:    sbase gui-behave [OPTIONAL PATH or TEST FILE]")
+    print("     seleniumbase behave-gui [OPTIONAL PATH or TEST FILE]")
+    print("     seleniumbase gui-behave [OPTIONAL PATH or TEST FILE]")
+    print("     OR:    sbase behave-gui [OPTIONAL PATH or TEST FILE]")
+    print("     OR:    sbase gui-behave [OPTIONAL PATH or TEST FILE]")
     print("  Examples:")
-    print("           sbase behave-gui")
-    print("           sbase behave-gui features/")
-    print("           sbase behave-gui features/calculator.feature")
+    print("     sbase behave-gui")
+    print("     sbase behave-gui features/")
+    print("     sbase behave-gui features/calculator.feature")
     print("  Output:")
-    print("           Launches SeleniumBase Commander | GUI for Behave.")
+    print("     Launches SeleniumBase Commander | GUI for Behave.")
     print("")
 
 
@@ -215,16 +217,16 @@ def show_caseplans_usage():
     print(sc)
     print("")
     print("  Usage:")
-    print("           seleniumbase caseplans [OPTIONAL PATH or TEST FILE]")
-    print("           OR:    sbase caseplans [OPTIONAL PATH or TEST FILE]")
+    print("     seleniumbase caseplans [OPTIONAL PATH or TEST FILE]")
+    print("     OR:    sbase caseplans [OPTIONAL PATH or TEST FILE]")
     print("  Examples:")
-    print("           sbase caseplans")
-    print("           sbase caseplans -k agent")
-    print("           sbase caseplans -m marker2")
-    print("           sbase caseplans test_suite.py")
-    print("           sbase caseplans offline_examples/")
+    print("     sbase caseplans")
+    print("     sbase caseplans -k agent")
+    print("     sbase caseplans -m marker2")
+    print("     sbase caseplans test_suite.py")
+    print("     sbase caseplans offline_examples/")
     print("  Output:")
-    print("           Launches the SeleniumBase Case Plans Generator.")
+    print("     Launches the SeleniumBase Case Plans Generator.")
     print("")
 
 
@@ -236,18 +238,18 @@ def show_mkdir_usage():
     print(sc)
     print("")
     print("  Usage:")
-    print("           seleniumbase mkdir [DIRECTORY] [OPTIONS]")
-    print("           OR:    sbase mkdir [DIRECTORY] [OPTIONS]")
+    print("     seleniumbase mkdir [DIRECTORY] [OPTIONS]")
+    print("     OR:    sbase mkdir [DIRECTORY] [OPTIONS]")
     print("  Example:")
-    print("           sbase mkdir ui_tests")
+    print("     sbase mkdir ui_tests")
     print("  Options:")
-    print("           -b / --basic  (Only config files. No tests added.)")
+    print("     -b / --basic  (Only config files. No tests added.)")
     print("  Output:")
-    print("           Creates a new folder for running SBase scripts.")
-    print("           The new folder contains default config files,")
-    print("           sample tests for helping new users get started,")
-    print("           and Python boilerplates for setting up customized")
-    print("           test frameworks.")
+    print("     Creates a new folder for running SBase scripts.")
+    print("     The new folder contains default config files,")
+    print("     sample tests for helping new users get started,")
+    print("     and Python boilerplates for setting up customized")
+    print("     test frameworks.")
     print("")
 
 
@@ -259,36 +261,38 @@ def show_mkfile_usage():
     print(sc)
     print("")
     print("  Usage:")
-    print("           seleniumbase mkfile [FILE.py] [OPTIONS]")
-    print("           OR:    sbase mkfile [FILE.py] [OPTIONS]")
+    print("     seleniumbase mkfile [FILE.py] [OPTIONS]")
+    print("     OR:    sbase mkfile [FILE.py] [OPTIONS]")
     print("  Example:")
-    print("           sbase mkfile new_test.py")
+    print("     sbase mkfile new_test.py")
     print("  Options:")
-    print("           -b / --basic  (Basic boilerplate / single-line test)")
-    print("           -r / --rec  (adds Pdb+ breakpoint for Recorder Mode)")
-    print("           --url=URL  (makes the test start on a specific page)")
+    print("     --uc  (UC Mode boilerplate using SB context manager)")
+    print("     -b / --basic  (Basic boilerplate / single-line test)")
+    print("     -r / --rec  (Adds Pdb+ breakpoint for Recorder Mode)")
+    print("     --url=URL  (Makes the test start on a specific page)")
     print("  Language Options:")
-    print("           --en / --English    |    --zh / --Chinese")
-    print("           --nl / --Dutch      |    --fr / --French")
-    print("           --it / --Italian    |    --ja / --Japanese")
-    print("           --ko / --Korean     |    --pt / --Portuguese")
-    print("           --ru / --Russian    |    --es / --Spanish")
+    print("     --en / --English    |    --zh / --Chinese")
+    print("     --nl / --Dutch      |    --fr / --French")
+    print("     --it / --Italian    |    --ja / --Japanese")
+    print("     --ko / --Korean     |    --pt / --Portuguese")
+    print("     --ru / --Russian    |    --es / --Spanish")
     print("  Syntax Formats:")
-    print("           --bc / --basecase       (BaseCase class inheritance)")
-    print("           --pf / --pytest-fixture          (sb pytest fixture)")
-    print("           --cf / --class-fixture   (class + sb pytest fixture)")
-    print("           --cm / --context-manager        (SB context manager)")
-    print("           --dc / --driver-context      (DriverContext manager)")
-    print("           --dm / --driver-manager             (Driver manager)")
+    print("     --bc / --basecase       (BaseCase class inheritance)")
+    print("     --pf / --pytest-fixture          (sb pytest fixture)")
+    print("     --cf / --class-fixture   (class + sb pytest fixture)")
+    print("     --cm / --context-manager        (SB context manager)")
+    print("     --dc / --driver-context      (DriverContext manager)")
+    print("     --dm / --driver-manager             (Driver manager)")
     print("  Output:")
-    print("           Creates a new SBase test file with boilerplate code.")
-    print("           If the file already exists, an error is raised.")
-    print("           By default, uses English with BaseCase inheritance,")
-    print("           and creates a boilerplate with common SeleniumBase")
-    print('           methods: "open", "type", "click", "assert_element",')
-    print('           and "assert_text". If using the basic boilerplate')
-    print('           option, only the "open" method is included. Only the')
-    print("           BaseCase format supports Languages or Recorder Mode.")
+    print("     Creates a new SBase test file with boilerplate code.")
+    print("     If the file already exists, an error is raised.")
+    print("     By default, uses English with BaseCase inheritance,")
+    print("     and creates a boilerplate with common SeleniumBase")
+    print('     methods: "open", "type", "click", "assert_element",')
+    print('     and "assert_text". If using the basic boilerplate')
+    print('     option, only the "open" method is included. Only the')
+    print("     BaseCase format supports Languages or Recorder Mode.")
+    print("     UC Mode automatically uses English with SB() format.")
     print("")
 
 
@@ -300,21 +304,22 @@ def show_mkrec_usage():
     print(sc)
     print("")
     print("  Usage:")
-    print("           seleniumbase mkrec [FILE.py] [OPTIONS]")
-    print("           OR:    sbase mkrec [FILE.py] [OPTIONS]")
+    print("     seleniumbase mkrec [FILE.py] [OPTIONS]")
+    print("     OR:    sbase mkrec [FILE.py] [OPTIONS]")
     print("  Examples:")
-    print("           sbase mkrec new_test.py")
-    print("           sbase mkrec new_test.py --url=wikipedia.org")
+    print("     sbase mkrec new_test.py")
+    print("     sbase mkrec new_test.py --url=wikipedia.org")
     print("  Options:")
-    print("           --url=URL  (Sets the initial start page URL.)")
-    print("           --edge  (Use Edge browser instead of Chrome.)")
-    print("           --gui / --headed  (Use headed mode on Linux.)")
-    print("           --uc / --undetected  (Use undetectable mode.)")
-    print("           --overwrite  (Overwrite file when it exists.)")
-    print("           --behave  (Also output Behave/Gherkin files.)")
+    print("     --url=URL  (Sets the initial start page URL.)")
+    print("     --edge  (Use Edge browser instead of Chrome.)")
+    print("     --gui / --headed  (Use headed mode on Linux.)")
+    print("     --uc / --undetected  (Use undetectable mode.)")
+    print("     --ee  (Use SHIFT + ESC to end the recording.)")
+    print("     --overwrite  (Overwrite file when it exists.)")
+    print("     --behave  (Also output Behave/Gherkin files.)")
     print("  Output:")
-    print("           Creates a new SeleniumBase test using the Recorder.")
-    print("           If the filename already exists, an error is raised.")
+    print("     Creates a new SeleniumBase test using the Recorder.")
+    print("     If the filename already exists, an error is raised.")
     print("")
 
 
@@ -326,21 +331,22 @@ def show_codegen_usage():
     print(sc)
     print("")
     print("  Usage:")
-    print("           seleniumbase codegen [FILE.py] [OPTIONS]")
-    print("           OR:    sbase codegen [FILE.py] [OPTIONS]")
+    print("     seleniumbase codegen [FILE.py] [OPTIONS]")
+    print("     OR:    sbase codegen [FILE.py] [OPTIONS]")
     print("  Examples:")
-    print("           sbase codegen new_test.py")
-    print("           sbase codegen new_test.py --url=wikipedia.org")
+    print("     sbase codegen new_test.py")
+    print("     sbase codegen new_test.py --url=wikipedia.org")
     print("  Options:")
-    print("           --url=URL  (Sets the initial start page URL.)")
-    print("           --edge  (Use Edge browser instead of Chrome.)")
-    print("           --gui / --headed  (Use headed mode on Linux.)")
-    print("           --uc / --undetected  (Use undetectable mode.)")
-    print("           --overwrite  (Overwrite file when it exists.)")
-    print("           --behave  (Also output Behave/Gherkin files.)")
+    print("     --url=URL  (Sets the initial start page URL.)")
+    print("     --edge  (Use Edge browser instead of Chrome.)")
+    print("     --gui / --headed  (Use headed mode on Linux.)")
+    print("     --uc / --undetected  (Use undetectable mode.)")
+    print("     --ee  (Use SHIFT + ESC to end the recording.)")
+    print("     --overwrite  (Overwrite file when it exists.)")
+    print("     --behave  (Also output Behave/Gherkin files.)")
     print("  Output:")
-    print("           Creates a new SeleniumBase test using the Recorder.")
-    print("           If the filename already exists, an error is raised.")
+    print("     Creates a new SeleniumBase test using the Recorder.")
+    print("     If the filename already exists, an error is raised.")
     print("")
 
 
@@ -352,13 +358,13 @@ def show_recorder_usage():
     print(sc)
     print("")
     print("  Usage:")
-    print("           seleniumbase recorder [OPTIONS]")
-    print("           OR:    sbase recorder [OPTIONS]")
+    print("     seleniumbase recorder [OPTIONS]")
+    print("     OR:    sbase recorder [OPTIONS]")
     print("  Options:")
-    print("           --uc / --undetected  (Use undetectable mode.)")
-    print("           --behave  (Also output Behave/Gherkin files.)")
+    print("     --uc / --undetected  (Use undetectable mode.)")
+    print("     --behave  (Also output Behave/Gherkin files.)")
     print("  Output:")
-    print("           Launches the SeleniumBase Recorder Desktop App.")
+    print("     Launches the SeleniumBase Recorder Desktop App.")
     print("")
 
 
@@ -370,22 +376,22 @@ def show_mkpres_usage():
     print(sc)
     print("")
     print("  Usage:")
-    print("           seleniumbase mkpres [FILE.py] [LANG]")
-    print("           OR:    sbase mkpres [FILE.py] [LANG]")
+    print("     seleniumbase mkpres [FILE.py] [LANG]")
+    print("     OR:    sbase mkpres [FILE.py] [LANG]")
     print("  Example:")
-    print("           sbase mkpres new_presentation.py --en")
+    print("     sbase mkpres new_presentation.py --en")
     print("  Language Options:")
-    print("           --en / --English    |    --zh / --Chinese")
-    print("           --nl / --Dutch      |    --fr / --French")
-    print("           --it / --Italian    |    --ja / --Japanese")
-    print("           --ko / --Korean     |    --pt / --Portuguese")
-    print("           --ru / --Russian    |    --es / --Spanish")
+    print("     --en / --English    |    --zh / --Chinese")
+    print("     --nl / --Dutch      |    --fr / --French")
+    print("     --it / --Italian    |    --ja / --Japanese")
+    print("     --ko / --Korean     |    --pt / --Portuguese")
+    print("     --ru / --Russian    |    --es / --Spanish")
     print("  Output:")
-    print("           Creates a new presentation with 3 example slides.")
-    print("           If the file already exists, an error is raised.")
-    print("           By default, the slides are written in English,")
-    print('           and use "serif" theme with "slide" transition.')
-    print("           The slides can be used as a basic boilerplate.")
+    print("     Creates a new presentation with 3 example slides.")
+    print("     If the file already exists, an error is raised.")
+    print("     By default, the slides are written in English,")
+    print('     and use "serif" theme with "slide" transition.')
+    print("     The slides can be used as a basic boilerplate.")
     print("")
 
 
@@ -397,22 +403,22 @@ def show_mkchart_usage():
     print(sc)
     print("")
     print("  Usage:")
-    print("           seleniumbase mkchart [FILE.py] [LANG]")
-    print("           OR:    sbase mkchart [FILE.py] [LANG]")
+    print("     seleniumbase mkchart [FILE.py] [LANG]")
+    print("     OR:    sbase mkchart [FILE.py] [LANG]")
     print("  Example:")
-    print("           sbase mkchart new_chart.py --en")
+    print("     sbase mkchart new_chart.py --en")
     print("  Language Options:")
-    print("           --en / --English    |    --zh / --Chinese")
-    print("           --nl / --Dutch      |    --fr / --French")
-    print("           --it / --Italian    |    --ja / --Japanese")
-    print("           --ko / --Korean     |    --pt / --Portuguese")
-    print("           --ru / --Russian    |    --es / --Spanish")
+    print("     --en / --English    |    --zh / --Chinese")
+    print("     --nl / --Dutch      |    --fr / --French")
+    print("     --it / --Italian    |    --ja / --Japanese")
+    print("     --ko / --Korean     |    --pt / --Portuguese")
+    print("     --ru / --Russian    |    --es / --Spanish")
     print("  Output:")
-    print("           Creates a new SeleniumBase chart presentation.")
-    print("           If the file already exists, an error is raised.")
-    print("           By default, the slides are written in English,")
-    print('           and use a "sky" theme with "slide" transition.')
-    print("           The chart can be used as a basic boilerplate.")
+    print("     Creates a new SeleniumBase chart presentation.")
+    print("     If the file already exists, an error is raised.")
+    print("     By default, the slides are written in English,")
+    print('     and use a "sky" theme with "slide" transition.')
+    print("     The chart can be used as a basic boilerplate.")
     print("")
 
 
@@ -424,13 +430,13 @@ def show_convert_usage():
     print(sc)
     print("")
     print("  Usage:")
-    print("           seleniumbase convert [WEBDRIVER_UNITTEST_FILE.py]")
-    print("           OR:    sbase convert [WEBDRIVER_UNITTEST_FILE.py]")
+    print("     seleniumbase convert [WEBDRIVER_UNITTEST_FILE.py]")
+    print("     OR:    sbase convert [WEBDRIVER_UNITTEST_FILE.py]")
     print("  Output:")
-    print("           Converts a Selenium IDE exported WebDriver unittest")
-    print("           file into a SeleniumBase file. Adds _SB to the new")
-    print("           file name while keeping the original file intact.")
-    print("           (Works with Katalon Recorder Selenium scripts.)")
+    print("     Converts a Selenium IDE exported WebDriver unittest")
+    print("     file into a SeleniumBase file. Adds _SB to the new")
+    print("     file name while keeping the original file intact.")
+    print("     (Works with Katalon Recorder Selenium scripts.)")
     print("")
 
 
@@ -442,13 +448,13 @@ def show_print_usage():
     print(sc)
     print("")
     print("  Usage:")
-    print("           seleniumbase print [FILE] [OPTIONS]")
-    print("           OR:    sbase print [FILE] [OPTIONS]")
+    print("     seleniumbase print [FILE] [OPTIONS]")
+    print("     OR:    sbase print [FILE] [OPTIONS]")
     print("  Options:")
-    print("           -n   (Add line Numbers to the rows)")
+    print("     -n   (Add line Numbers to the rows)")
     print("  Output:")
-    print("           Prints the code/text of any file")
-    print("           with syntax-highlighting.")
+    print("     Prints the code/text of any file")
+    print("     with syntax-highlighting.")
     print("")
 
 
@@ -460,30 +466,30 @@ def show_translate_usage():
     print(sc)
     print("")
     print("  Usage:")
-    print("           seleniumbase translate [SB_FILE.py] [LANG] [ACTION]")
-    print("           OR:    sbase translate [SB_FILE.py] [LANG] [ACTION]")
+    print("     seleniumbase translate [SB_FILE.py] [LANG] [ACTION]")
+    print("     OR:    sbase translate [SB_FILE.py] [LANG] [ACTION]")
     print("  Languages:")
-    print("           --en / --English    |    --zh / --Chinese")
-    print("           --nl / --Dutch      |    --fr / --French")
-    print("           --it / --Italian    |    --ja / --Japanese")
-    print("           --ko / --Korean     |    --pt / --Portuguese")
-    print("           --ru / --Russian    |    --es / --Spanish")
+    print("     --en / --English    |    --zh / --Chinese")
+    print("     --nl / --Dutch      |    --fr / --French")
+    print("     --it / --Italian    |    --ja / --Japanese")
+    print("     --ko / --Korean     |    --pt / --Portuguese")
+    print("     --ru / --Russian    |    --es / --Spanish")
     print("  Actions:")
-    print("           -p / --print  (Print translation output to the screen)")
-    print("           -o / --overwrite  (Overwrite the file being translated)")
-    print("           -c / --copy  (Copy the translation to a new .py file)")
+    print("     -p / --print  (Print translation output to the screen)")
+    print("     -o / --overwrite  (Overwrite the file being translated)")
+    print("     -c / --copy  (Copy the translation to a new .py file)")
     print("  Options:")
-    print("           -n  (include line Numbers when using the Print action)")
+    print("     -n  (include line Numbers when using the Print action)")
     print("  Output:")
-    print("           Translates a SeleniumBase Python file into the language")
-    print('           specified. Method calls and "import" lines get swapped.')
-    print("           Both a language and an action must be specified.")
-    print('           The "-p" action can be paired with one other action.')
-    print('           When running with "-c" (or "--copy"), the new file name')
-    print("           will be the original name appended with an underscore")
-    print("           plus the 2-letter language code of the new language.")
-    print('           (Example: Translating "test_1.py" into Japanese with')
-    print('            "-c" will create a new file called "test_1_ja.py".)')
+    print("     Translates a SeleniumBase Python file into the language")
+    print('     specified. Method calls and "import" lines get swapped.')
+    print("     Both a language and an action must be specified.")
+    print('     The "-p" action can be paired with one other action.')
+    print('     When running with "-c" (or "--copy"), the new file name')
+    print("     will be the original name appended with an underscore")
+    print("     plus the 2-letter language code of the new language.")
+    print('     (Example: Translating "test_1.py" into Japanese with')
+    print('      "-c" will create a new file called "test_1_ja.py".)')
     print("")
 
 
@@ -495,12 +501,12 @@ def show_extract_objects_usage():
     print(sc)
     print("")
     print("  Usage:")
-    print("           seleniumbase extract-objects [SB_FILE.py]")
-    print("           OR:    sbase extract-objects [SB_FILE.py]")
+    print("     seleniumbase extract-objects [SB_FILE.py]")
+    print("     OR:    sbase extract-objects [SB_FILE.py]")
     print("  Output:")
-    print("           Creates page objects based on selectors found in a")
-    print("           seleniumbase Python file and saves those objects to the")
-    print('           "page_objects.py" file in the same folder as the tests.')
+    print("     Creates page objects based on selectors found in a")
+    print("     seleniumbase Python file and saves those objects to the")
+    print('     "page_objects.py" file in the same folder as the tests.')
     print("")
 
 
@@ -512,15 +518,15 @@ def show_inject_objects_usage():
     print(sc)
     print("")
     print("  Usage:")
-    print("           seleniumbase inject-objects [SB_FILE.py] [OPTIONS]")
-    print("           OR:    sbase inject-objects [SB_FILE.py] [OPTIONS]")
+    print("     seleniumbase inject-objects [SB_FILE.py] [OPTIONS]")
+    print("     OR:    sbase inject-objects [SB_FILE.py] [OPTIONS]")
     print("  Options:")
-    print("           -c, --comments  (Add object selectors to the comments.)")
-    print("                           (Default: No added comments.)")
+    print("     -c, --comments  (Add object selectors to the comments.)")
+    print("                     (Default: No added comments.)")
     print("  Output:")
-    print('           Takes the page objects found in the "page_objects.py"')
-    print("           file and uses those to replace matching selectors in")
-    print("           the selected seleniumbase Python file.")
+    print('     Takes the page objects found in the "page_objects.py"')
+    print("     file and uses those to replace matching selectors in")
+    print("     the selected seleniumbase Python file.")
     print("")
 
 
@@ -532,18 +538,18 @@ def show_objectify_usage():
     print(sc)
     print("")
     print("  Usage:")
-    print("           seleniumbase objectify [SB_FILE.py] [OPTIONS]")
-    print("           OR:    sbase objectify [SB_FILE.py] [OPTIONS]")
+    print("     seleniumbase objectify [SB_FILE.py] [OPTIONS]")
+    print("     OR:    sbase objectify [SB_FILE.py] [OPTIONS]")
     print("  Options:")
-    print("           -c, --comments  (Add object selectors to the comments.)")
-    print("                           (Default: No added comments.)")
+    print("     -c, --comments  (Add object selectors to the comments.)")
+    print("                     (Default: No added comments.)")
     print("  Output:")
-    print("           A modified version of the file where the selectors")
-    print("           have been replaced with variable names defined in")
-    print('           "page_objects.py", supporting the Page Object Pattern.')
+    print("     A modified version of the file where the selectors")
+    print("     have been replaced with variable names defined in")
+    print('     "page_objects.py", supporting the Page Object Pattern.')
     print("")
-    print('           (seleniumbase "objectify" has the same outcome as')
-    print('            combining "extract-objects" with "inject-objects")')
+    print('     (seleniumbase "objectify" has the same outcome as')
+    print('      combining "extract-objects" with "inject-objects")')
     print("")
 
 
@@ -555,16 +561,16 @@ def show_revert_objects_usage():
     print(sc)
     print("")
     print("  Usage:")
-    print("           seleniumbase revert-objects [SB_FILE.py] [OPTIONS]")
-    print("           OR:    sbase revert-objects [SB_FILE.py] [OPTIONS]")
+    print("     seleniumbase revert-objects [SB_FILE.py] [OPTIONS]")
+    print("     OR:    sbase revert-objects [SB_FILE.py] [OPTIONS]")
     print("  Options:")
-    print("           -c, --comments  (Keep existing comments for the lines.)")
-    print("                           (Default: No comments are kept.)")
+    print("     -c, --comments  (Keep existing comments for the lines.)")
+    print("                     (Default: No comments are kept.)")
     print("  Output:")
-    print('           Reverts the changes made by "seleniumbase objectify" or')
-    print('           "seleniumbase inject-objects" when run against a')
-    print("           seleniumbase Python file. Objects will get replaced by")
-    print('           selectors stored in the "page_objects.py" file.')
+    print('     Reverts the changes made by "seleniumbase objectify" or')
+    print('     "seleniumbase inject-objects" when run against a')
+    print("     seleniumbase Python file. Objects will get replaced by")
+    print('     selectors stored in the "page_objects.py" file.')
     print("")
 
 
@@ -576,12 +582,12 @@ def show_encrypt_usage():
     print(sc)
     print("")
     print("  Usage:")
-    print("           seleniumbase encrypt   ||   seleniumbase obfuscate")
-    print("                                --OR--")
-    print("                  sbase encrypt   ||          sbase obfuscate")
+    print("     seleniumbase encrypt   ||   seleniumbase obfuscate")
+    print("                          --OR--")
+    print("            sbase encrypt   ||          sbase obfuscate")
     print("  Output:")
-    print("           Runs the password encryption/obfuscation tool.")
-    print("           (Where you can enter a password to encrypt/obfuscate.)")
+    print("     Runs the password encryption/obfuscation tool.")
+    print("     (Where you can enter a password to encrypt/obfuscate.)")
     print("")
 
 
@@ -593,12 +599,12 @@ def show_decrypt_usage():
     print(sc)
     print("")
     print("  Usage:")
-    print("           seleniumbase decrypt   ||   seleniumbase unobfuscate")
-    print("                                --OR--")
-    print("                  sbase decrypt   ||          sbase unobfuscate")
+    print("     seleniumbase decrypt   ||   seleniumbase unobfuscate")
+    print("                          --OR--")
+    print("            sbase decrypt   ||          sbase unobfuscate")
     print("  Output:")
-    print("           Runs the password decryption/unobfuscation tool.")
-    print("           (Where you can enter an encrypted password to decrypt.)")
+    print("     Runs the password decryption/unobfuscation tool.")
+    print("     (Where you can enter an encrypted password to decrypt.)")
     print("")
 
 
@@ -610,11 +616,11 @@ def show_download_usage():
     print(sc)
     print("")
     print("  Usage:")
-    print("           seleniumbase download server")
-    print("           OR:    sbase download server")
+    print("     seleniumbase download server")
+    print("     OR:    sbase download server")
     print("  Output:")
-    print("           Downloads the Selenium Standalone Server.")
-    print("           (Server is required for using your own Selenium Grid.)")
+    print("     Downloads the Selenium Standalone Server.")
+    print("     (Server is required for using your own Selenium Grid.)")
     print("")
 
 
@@ -626,22 +632,22 @@ def show_grid_hub_usage():
     print(sc)
     print("")
     print("  Usage:")
-    print("           seleniumbase grid-hub {start|stop|restart} [OPTIONS]")
-    print("           OR:    sbase grid-hub {start|stop|restart} [OPTIONS]")
+    print("     seleniumbase grid-hub {start|stop|restart} [OPTIONS]")
+    print("     OR:    sbase grid-hub {start|stop|restart} [OPTIONS]")
     print("  Options:")
-    print("           -v, --verbose  (Increase verbosity of logging output.)")
-    print("                          (Default: Quiet logging / not verbose.)")
-    print("           --timeout=TIMEOUT  (Close idle browser after TIMEOUT.)")
-    print("                              (The default TIMEOUT: 230 seconds.)")
-    print("                              (Use --timeout=0 to skip timeouts.)")
+    print("     -v, --verbose  (Increase verbosity of logging output.)")
+    print("                    (Default: Quiet logging / not verbose.)")
+    print("     --timeout=TIMEOUT  (Close idle browser after TIMEOUT.)")
+    print("                        (The default TIMEOUT: 230 seconds.)")
+    print("                        (Use --timeout=0 to skip timeouts.)")
     print("  Example:")
-    print("           seleniumbase grid-hub start")
+    print("     seleniumbase grid-hub start")
     print("  Output:")
-    print("           Controls the Selenium Grid Hub Server, which allows")
-    print("           for running tests on multiple machines in parallel")
-    print("           to speed up test runs and reduce the total time")
-    print("           of test suite execution.")
-    print('           You can "start" or "stop" the Grid Hub server.')
+    print("     Controls the Selenium Grid Hub Server, which allows")
+    print("     for running tests on multiple machines in parallel")
+    print("     to speed up test runs and reduce the total time")
+    print("     of test suite execution.")
+    print('     You can "start" or "stop" the Grid Hub server.')
     print("")
 
 
@@ -653,19 +659,19 @@ def show_grid_node_usage():
     print(sc)
     print("")
     print("  Usage:")
-    print("           seleniumbase grid-node {start|stop|restart} [OPTIONS]")
-    print("           OR:    sbase grid-node {start|stop|restart} [OPTIONS]")
+    print("     seleniumbase grid-node {start|stop|restart} [OPTIONS]")
+    print("     OR:    sbase grid-node {start|stop|restart} [OPTIONS]")
     print("  Options:")
-    print("           --hub=[HOST/IP]  (The Grid Hub Hostname / IP Address.)")
-    print("                                 (Default: 127.0.0.1 if not set.)")
-    print("           -v, --verbose  (Increase verbosity of logging output.)")
-    print("                          (Default: Quiet logging / Not verbose.)")
+    print("     --hub=[HOST/IP]  (The Grid Hub Hostname / IP Address.)")
+    print("                           (Default: 127.0.0.1 if not set.)")
+    print("     -v, --verbose  (Increase verbosity of logging output.)")
+    print("                    (Default: Quiet logging / Not verbose.)")
     print("  Example:")
-    print("           seleniumbase grid-node start --hub=127.0.0.1")
+    print("     seleniumbase grid-node start --hub=127.0.0.1")
     print("  Output:")
-    print("           Controls the Selenium Grid node, which serves as a")
-    print("           worker machine for your Selenium Grid Hub server.")
-    print('           You can "start" or "stop" the Grid node.')
+    print("     Controls the Selenium Grid node, which serves as a")
+    print("     worker machine for your Selenium Grid Hub server.")
+    print('     You can "start" or "stop" the Grid node.')
     print("")
 
 
@@ -792,16 +798,16 @@ def show_options():
     line = '(Some options are Chromium-specific, e.g. "--guest --mobile")'
     print(line)
     op = "\n"
-    op += '--browser=BROWSER  (Choice of web browser. Default is "chrome".)\n'
-    op += "--edge / --firefox / --safari  (Shortcut for browser selection.)\n"
-    op += "--headless  (Run tests headlessly. Default setting on Linux OS.)\n"
-    op += "--demo  (Slow down and visually see test actions as they occur.)\n"
-    op += "--slow  (Slow down the automation. Faster than using Demo Mode.)\n"
+    op += '--browser=BROWSER  (Choice of web browser. Default is "chrome")\n'
+    op += "--edge / --firefox / --safari  (Shortcut for browser selection)\n"
+    op += "--headless  (Run tests headlessly. Default setting on Linux OS)\n"
+    op += "--demo  (Slow down and visually see test actions as they occur)\n"
+    op += "--slow  (Slow down the automation. Faster than using Demo Mode)\n"
     op += "--rs / --reuse-session  (Reuse browser session between tests.)\n"
     op += "--reuse-class-session / --rcs  (RS, but for class tests only.)\n"
     op += "--crumbs  (Clear all cookies between tests reusing a session.)\n"
-    op += "--maximize  (Start tests with the web browser window maximized.)\n"
-    op += "--dashboard  (Enable SeleniumBase's Dashboard at dashboard.html)\n"
+    op += "--maximize  (Start tests with the browser window maximized)\n"
+    op += "--dashboard  (Enable SeleniumBase Dashboard at dashboard.html)\n"
     op += "--incognito  (Enable Chromium's Incognito Mode.)\n"
     op += "--guest  (Enable Chromium's Guest Mode.)\n"
     op += "--dark  (Enable Chromium's Dark Mode.)\n"
@@ -813,15 +819,15 @@ def show_options():
     op += "--collect-only / --co  (Only show discovered tests. No run.)\n"
     op += "--co -q  (Only show full names of discovered tests. No run.)\n"
     op += "-x  (Stop running tests after the first failure is reached.)\n"
-    op += "--pdb  (Enter the Post Mortem Debug Mode after any test fails.)\n"
-    op += "--trace  (Enter Debug Mode immediately after starting any test.)\n"
-    op += "      | Debug Mode Commands  >>>   help / h: List all commands. |\n"
-    op += "      |   n: Next line of method. s: Step through. c: Continue. |\n"
-    op += "      |  return / r: Run until method returns. j: Jump to line. |\n"
-    op += "      | where / w: Show stack spot. u: Up stack. d: Down stack. |\n"
-    op += "      | longlist / ll: See code. dir(): List namespace objects. |\n"
+    op += "--pdb  (Enter Post Mortem Debug Mode after any test fails.)\n"
+    op += "--trace  (Enter Debug Mode immediately after starting tests.)\n"
+    op += " | Debug Mode Commands >>>      help / h: List all commands. |\n"
+    op += " | n: Next line of method.      s: Step into.   c: Continue. |\n"
+    op += " | where / w: Show stack spot.  u: Up stack.  d: Down stack. |\n"
+    op += " | return / r: Run until method returns.    j: Jump to line. |\n"
+    op += " | longlist / ll: See code.   dir(): List namespace objects. |\n"
     op += "--help / -h  (Display list of all available pytest options.)\n"
-    op += "--ftrace / --final-trace  (Enter Debug Mode after any test.)\n"
+    op += "--ftrace / --final-trace  (Enter Debug Mode after tests end.)\n"
     op += "--recorder / --rec  (Save browser actions as Python scripts.)\n"
     op += "--rec-behave / --rec-gherkin  (Save actions as Gherkin code.)\n"
     op += "--rec-print  (Display recorded scripts when they are created.)\n"
@@ -834,14 +840,14 @@ def show_options():
     op += '--metrics=STRING  (Set mobile "CSSWidth,CSSHeight,PixelRatio".)\n'
     op += "--ad-block  (Block certain types of iframe ads from appearing.)\n"
     op += "--settings-file=FILE  (Override default SeleniumBase settings.)\n"
-    op += '--env=ENV  (Set the test env. Access with "self.env" in tests.)\n'
-    op += '--data=DATA  (Extra test data. Access with "self.data" in tests.)\n'
-    op += "--disable-csp  (Disable the Content Security Policy of websites.)\n"
-    op += "--remote-debug  (Sync to Ch-R-Debugger chrome://inspect/#devices)\n"
+    op += '--env=ENV  (Set the test env. Use "self.env" to access.)\n'
+    op += '--data=DATA  (Extra test data. Use "self.data" to access.)\n'
+    op += "--disable-csp  (Disable the Content Security Policy of sites.)\n"
+    op += "--remote-debug  (Sync to Ch_Debugger chrome://inspect/#devices)\n"
     op += "--server=SERVER  (The Selenium Grid server/IP used for tests.)\n"
     op += "--port=PORT  (The Selenium Grid port used by the test server.)\n"
-    op += "--proxy=SERVER:PORT  (Connect to a proxy server:port for tests.)\n"
-    op += "--proxy=USER:PASS@SERVER:PORT  (Use authenticated proxy server.)\n"
+    op += "--proxy=SERVER:PORT  (Connect to a proxy server:port for tests)\n"
+    op += "--proxy=USER:PASS@SERVER:PORT  (Use authenticated proxy server)\n"
     op += cr
     op = op.replace("\n-", "\n" + c1 + "-").replace("  (", cr + "  (")
     op = op.replace(" / -", cr + " / " + c1 + "-")
@@ -851,7 +857,8 @@ def show_options():
     op = op.replace("Debug Mode Commands", c5 + "Debug Mode Commands" + c3)
     op = op.replace(">>>", c4 + ">>>" + c3)
     print(op)
-    line = "For the full list of " + c2 + "command-line options" + cr
+    line = "To view all " + c3 + "pytest" + cr
+    line += " " + c2 + "command-line options" + cr
     line += ', type: "' + c3 + "pytest" + cr + " " + c1 + "--help" + cr + '".'
     print(line)
     print("")
@@ -873,14 +880,14 @@ def show_behave_options():
     line = '(Some options are Chromium-specific, e.g. "-D guest -D mobile")'
     print(line)
     op = "\n"
-    op += '-D browser=BROWSER  (The web browser to use. Default is "chrome")\n'
+    op += '-D browser=BROWSER  (Choice of web browser. Default is "chrome")\n'
     op += "-D headless  (Run tests headlessly. Default mode on Linux OS.)\n"
-    op += "-D demo  (Slow down and visually see test actions as they occur.)\n"
-    op += "-D slow  (Slow down the automation. Faster than using Demo Mode.)\n"
+    op += "-D demo  (Slow down and visually see test actions as they occur)\n"
+    op += "-D slow  (Slow down the automation. Faster than using Demo Mode)\n"
     op += "-D reuse-session / -D rs  (Reuse browser session between tests.)\n"
     op += "-D crumbs  (Clear all cookies between tests reusing a session.)\n"
-    op += "-D maximize  (Start tests with the web browser window maximized.)\n"
-    op += "-D dashboard  (Enable SeleniumBase's Dashboard at dashboard.html)\n"
+    op += "-D maximize  (Start tests with the web browser window maximized)\n"
+    op += "-D dashboard  (Enable SeleniumBase Dashboard at dashboard.html)\n"
     op += "-D incognito  (Enable Chromium's Incognito Mode.)\n"
     op += "-D guest  (Enable Chromium's Guest Mode.)\n"
     op += "-D dark  (Enable Chromium's Dark Mode.)\n"
@@ -889,11 +896,11 @@ def show_behave_options():
     op += "--dry-run / -d  (Dry run. Only show discovered tests.)\n"
     op += "--stop  (Stop running tests after the first failure is reached.)\n"
     op += "-D pdb  (Enter the Post Mortem Debug Mode after any test fails.)\n"
-    op += "      | Debug Mode Commands  >>>   help / h: List all commands. |\n"
-    op += "      |   n: Next line of method. s: Step through. c: Continue. |\n"
-    op += "      |  return / r: Run until method returns. j: Jump to line. |\n"
-    op += "      | where / w: Show stack spot. u: Up stack. d: Down stack. |\n"
-    op += "      | longlist / ll: See code. dir(): List namespace objects. |\n"
+    op += "     | Debug Mode Commands  >>>   help / h: List all commands. |\n"
+    op += "     |   n: Next line of method. s: Step through. c: Continue. |\n"
+    op += "     |  return / r: Run until method returns. j: Jump to line. |\n"
+    op += "     | where / w: Show stack spot. u: Up stack. d: Down stack. |\n"
+    op += "     | longlist / ll: See code. dir(): List namespace objects. |\n"
     op += "-D recorder  (Record browser actions to generate test scripts.)\n"
     op += "-D rec-print  (Display recorded scripts when they are created.)\n"
     op += "-D save-screenshot  (Save a screenshot at the end of each test.)\n"
@@ -905,14 +912,14 @@ def show_behave_options():
     op += '-D metrics=STRING  (Set mobile "CSSWidth,CSSHeight,PixelRatio".)\n'
     op += "-D ad-block  (Block some types of display ads after page loads.)\n"
     op += "-D settings-file=FILE  (Override default SeleniumBase settings.)\n"
-    op += '-D env=ENV  (Set the test env. Access using "self.env" in tests.)\n'
+    op += '-D env=ENV  (Set the test env. Access using "self.env" in tests)\n'
     op += '-D data=DATA  (Extra test data. Access using "self.data".)\n'
     op += "-D disable-csp  (Disable the Content Security Policy of sites.)\n"
     op += "-D remote-debug  (Sync Ch-R-Debugger chrome://inspect/#devices)\n"
     op += "-D server=SERVER  (The Selenium Grid server/IP used for tests.)\n"
     op += "-D port=PORT  (The Selenium Grid port used by the test server.)\n"
-    op += "-D proxy=SERVER:PORT  (Connect to a proxy server:port for tests.)\n"
-    op += "-D proxy=USER:PASS@SERVER:PORT  (Use authenticated proxy server.)\n"
+    op += "-D proxy=SERVER:PORT  (Connect to a proxy server:port for tests)\n"
+    op += "-D proxy=USER:PASS@SERVER:PORT  (Use authenticated proxy server)\n"
     op += cr
     op = op.replace("\n-", "\n" + c1 + "-").replace("  (", cr + "  (")
     op = op.replace(" / -", cr + " / " + c1 + "-")
@@ -934,7 +941,7 @@ def show_detailed_help():
     c6 = colorama.Back.CYAN
     cr = colorama.Style.RESET_ALL
     show_basic_usage()
-    print(c6 + "            " + c2 + "  Commands:  " + c6 + "            ")
+    print(c6 + "              " + c2 + "  Commands:  " + c6 + "              ")
     print(cr)
     show_install_usage()
     show_commander_usage()
@@ -959,7 +966,10 @@ def show_detailed_help():
     show_download_usage()
     show_grid_hub_usage()
     show_grid_node_usage()
-    print('* (Use "' + c3 + "pytest" + cr + '" for running tests) *\n')
+    print(
+        '* (Use "' + c3 + "pytest" + cr + '" or "' + c3 + ''
+        '' + "python" + cr + '" for running tests) *\n'
+    )
 
 
 def main():
@@ -967,7 +977,7 @@ def main():
     command_args = None
     num_args = len(sys.argv)
     if num_args == 1:
-        show_usage()
+        show_basic_usage()
         return
     elif num_args == 2:
         command = sys.argv[1]
@@ -1195,7 +1205,7 @@ def main():
         else:
             show_basic_usage()
             show_grid_node_usage()
-    elif command == "version" or command == "--version":
+    elif command == "version" or command == "--version" or command == "-v":
         if len(command_args) == 0:
             from seleniumbase.console_scripts import logo_helper
 
@@ -1231,7 +1241,7 @@ def main():
                         "proxy.py", version=constants.ProxyPy.VER
                     )
             os.system("proxy %s" % " ".join(sys.argv[2:]))
-    elif command == "help" or command == "--help":
+    elif command == "help" or command == "--help" or command == "-h":
         if len(command_args) >= 1:
             if command_args[0] == "get":
                 print("")
@@ -1355,7 +1365,7 @@ def main():
                 return
         show_detailed_help()
     else:
-        show_usage()
+        show_basic_usage()
         c5 = colorama.Fore.RED + colorama.Back.LIGHTYELLOW_EX
         c7 = colorama.Fore.BLACK + colorama.Back.MAGENTA
         cr = colorama.Style.RESET_ALL