diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 420df80f..14b48bbf 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -20,19 +20,15 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - uses: nanasess/setup-chromedriver@master
-      with:
-        chromedriver-version: '79.0.3945.36'
-    - run: |
-        export DISPLAY=:99
-        sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 & # optional
-        cp .github/workflows/nightwatch.json .
     - name: Use Node.js ${{ matrix.node-version }}
       uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
+    - run: |
+        export DISPLAY=:99
+        sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 & # optional
     - run: npm ci
     - run: npm run build --if-present
-    - run: npm test
+    - run: npx nightwatch tests --verbose
       env:
         CI: true
diff --git a/.github/workflows/nightwatch.json b/.github/workflows/nightwatch.json
deleted file mode 100644
index 9b0caa73..00000000
--- a/.github/workflows/nightwatch.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "src_folders": ["tests"],
-  "webdriver": {
-    "start_process": true,
-    "server_path": "node_modules/.bin/chromedriver",
-    "port": 9515
-  },
-  "test_settings": {
-    "default": {
-      "desiredCapabilities": {
-        "browserName": "chrome",
-        "javascriptEnabled": true,
-        "acceptSslCerts": true,
-        "chromeOptions": {
-          "prefs": {
-            "intl.accept_languages": "en-US,en"
-          },
-          "args": ["--headless"]
-        }
-      }
-    }
-  }
-}
diff --git a/.gitignore b/.gitignore
index e2d086fc..6405991f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,4 +26,3 @@ wbo-backup.zip
 
 # Nightwatch test results
 tests_output/
-nightwatch.conf.js
\ No newline at end of file
diff --git a/nightwatch.conf.js b/nightwatch.conf.js
new file mode 100644
index 00000000..defb9216
--- /dev/null
+++ b/nightwatch.conf.js
@@ -0,0 +1,216 @@
+// Autogenerated by Nightwatch
+// Refer to the online docs for more details: https://nightwatchjs.org/gettingstarted/configuration/
+const Services = {}; loadServices();
+
+module.exports = {
+  // An array of folders (excluding subfolders) where your tests are located;
+  // if this is not specified, the test source must be passed as the second argument to the test runner.
+  src_folders: [],
+
+  // See https://nightwatchjs.org/guide/working-with-page-objects/
+  page_objects_path: '',
+
+  // See https://nightwatchjs.org/guide/extending-nightwatch/#writing-custom-commands
+  custom_commands_path: '',
+
+  // See https://nightwatchjs.org/guide/extending-nightwatch/#writing-custom-assertions
+  custom_assertions_path: '',
+
+  // See https://nightwatchjs.org/guide/#external-globals
+  globals_path: '',
+
+  webdriver: {},
+
+  test_settings: {
+    default: {
+      disable_error_log: false,
+      launch_url: 'https://nightwatchjs.org',
+
+      screenshots: {
+        enabled: false,
+        path: 'screens',
+        on_failure: true
+      },
+
+      desiredCapabilities: {
+        browserName: 'firefox'
+      },
+
+      webdriver: {
+        start_process: true,
+        server_path: (Services.geckodriver ? Services.geckodriver.path : '')
+      }
+    },
+
+
+
+    firefox: {
+      desiredCapabilities: {
+        browserName: 'firefox',
+        alwaysMatch: {
+          // Enable this if you encounter unexpected SSL certificate errors in Firefox
+          // acceptInsecureCerts: true,
+          'moz:firefoxOptions': {
+            args: [
+              '-headless',
+              '-verbose'
+            ],
+          }
+        }
+      },
+      webdriver: {
+        start_process: true,
+        port: 4444,
+        server_path: (Services.geckodriver ? Services.geckodriver.path : ''),
+        cli_args: [
+          // very verbose geckodriver logs
+          // '-vv'
+        ]
+      }
+    },
+
+    chrome: {
+      desiredCapabilities: {
+        browserName: 'chrome',
+        chromeOptions: {
+          // This tells Chromedriver to run using the legacy JSONWire protocol (not required in Chrome 78)
+          // w3c: false,
+          // More info on Chromedriver: https://sites.google.com/a/chromium.org/chromedriver/
+          args: [
+            //'--no-sandbox',
+            //'--ignore-certificate-errors',
+            //'--allow-insecure-localhost',
+            '--headless'
+          ]
+        }
+      },
+
+      webdriver: {
+        start_process: true,
+        port: 9515,
+        server_path: (Services.chromedriver ? Services.chromedriver.path : ''),
+        cli_args: [
+          // --verbose
+        ]
+      }
+    },
+
+    //////////////////////////////////////////////////////////////////////////////////
+    // Configuration for when using the browserstack.com cloud service               |
+    //                                                                               |
+    // Please set the username and access key by setting the environment variables:  |
+    // - BROWSERSTACK_USER                                                           |
+    // - BROWSERSTACK_KEY                                                            |
+    // .env files are supported                                                      |
+    //////////////////////////////////////////////////////////////////////////////////
+    browserstack: {
+      selenium: {
+        host: 'hub-cloud.browserstack.com',
+        port: 443
+      },
+      // More info on configuring capabilities can be found on:
+      // https://www.browserstack.com/automate/capabilities?tag=selenium-4
+      desiredCapabilities: {
+        'bstack:options': {
+          local: 'false',
+          userName: '${BROWSERSTACK_USER}',
+          accessKey: '${BROWSERSTACK_KEY}',
+        }
+      },
+
+      disable_error_log: true,
+      webdriver: {
+        keep_alive: true,
+        start_process: false
+      }
+    },
+
+    'browserstack.chrome': {
+      extends: 'browserstack',
+      desiredCapabilities: {
+        browserName: 'chrome',
+        chromeOptions: {
+          // This tells Chromedriver to run using the legacy JSONWire protocol
+          // More info on Chromedriver: https://sites.google.com/a/chromium.org/chromedriver/
+          w3c: false
+        }
+      }
+    },
+
+    'browserstack.firefox': {
+      extends: 'browserstack',
+      desiredCapabilities: {
+        browserName: 'firefox'
+      }
+    },
+
+    'browserstack.ie': {
+      extends: 'browserstack',
+      desiredCapabilities: {
+        browserName: 'IE',
+        browserVersion: '11.0',
+        'bstack:options': {
+          os: 'Windows',
+          osVersion: '10',
+          local: 'false',
+          seleniumVersion: '3.5.2',
+          resolution: '1366x768'
+        }
+      }
+    },
+
+    //////////////////////////////////////////////////////////////////////////////////
+    // Configuration for when using the Selenium service, either locally or remote,  |
+    //  like Selenium Grid                                                           |
+    //////////////////////////////////////////////////////////////////////////////////
+    selenium: {
+      // Selenium Server is running locally and is managed by Nightwatch
+      selenium: {
+        start_process: true,
+        port: 4444,
+        server_path: (Services.seleniumServer ? Services.seleniumServer.path : ''),
+        cli_args: {
+          'webdriver.gecko.driver': (Services.geckodriver ? Services.geckodriver.path : ''),
+          'webdriver.chrome.driver': (Services.chromedriver ? Services.chromedriver.path : '')
+        }
+      }
+    },
+
+    'selenium.chrome': {
+      extends: 'selenium',
+      desiredCapabilities: {
+        browserName: 'chrome',
+        chromeOptions: {
+          w3c: false
+        }
+      }
+    },
+
+    'selenium.firefox': {
+      extends: 'selenium',
+      desiredCapabilities: {
+        browserName: 'firefox',
+        'moz:firefoxOptions': {
+          args: [
+            '-headless',
+            '-verbose'
+          ]
+        }
+      }
+    }
+  }
+};
+
+function loadServices() {
+  try {
+    Services.seleniumServer = require('selenium-server');
+  } catch (err) { }
+
+  try {
+    Services.chromedriver = require('chromedriver');
+  } catch (err) { }
+
+  try {
+    Services.geckodriver = require('geckodriver');
+  } catch (err) { }
+}