diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml
index 675707453e..1ac6b20003 100644
--- a/.github/workflows/release-develop.yml
+++ b/.github/workflows/release-develop.yml
@@ -194,5 +194,5 @@ jobs:
           PAYLOAD_VERSION: ${{ env.RELEASE_VERSION }}
         with:
           repository: budibase/budibase-deploys
-          event: deploy-develop-to-qa
+          event: deploy-budibase-develop-to-qa
           github_pat: ${{ secrets.GH_ACCESS_TOKEN }}
\ No newline at end of file
diff --git a/.github/workflows/smoke_test.yaml b/.github/workflows/smoke_test.yaml
index cffb914aaf..29c7f5f85a 100644
--- a/.github/workflows/smoke_test.yaml
+++ b/.github/workflows/smoke_test.yaml
@@ -18,30 +18,18 @@ jobs:
       - run: yarn
       - run: yarn bootstrap
       - run: yarn build
-      - name: Pull cypress.env.yaml from budibase-infra
+      - name: Pull  from budibase-infra
         run: | 
           curl -H "Authorization: token ${{ secrets.GH_PERSONAL_TOKEN }}" \
           -H 'Accept: application/vnd.github.v3.raw' \
-          -o packages/builder/cypress.env.json \
-          -L https://api.github.com/repos/budibase/budibase-infra/contents/test/cypress.env.json
-          wc -l packages/builder/cypress.env.json
-
-      - name: Cypress run
-        id: cypress
-        continue-on-error: true
-        uses: cypress-io/github-action@v2
-        with:
-          record: true
-          install: false
-          tag: nightly
-          command: yarn test:e2e:ci:record
-        env:
-          CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
+          -o 
+          -L 
+          wc -l 
       
       - uses: actions/upload-artifact@v3
         with:
           name: Test Reports
-          path: packages/builder/cypress/reports/testReport.html
+          path: 
 
       # TODO: enable once running in QA test env
       # - name: Configure AWS Credentials
@@ -54,11 +42,3 @@ jobs:
       # - name: Upload test results HTML
       #   uses: aws-actions/configure-aws-credentials@v1
       #   run: aws s3 cp packages/builder/cypress/reports/testReport.html s3://{{ secrets.BUDI_QA_REPORTS_BUCKET_NAME }}/$GITHUB_RUN_ID/index.html
-
-      - name: Cypress Discord Notify
-        run: yarn test:e2e:ci:notify
-        env:
-          CYPRESS_WEBHOOK_URL: ${{ secrets.BUDI_QA_WEBHOOK }}
-          CYPRESS_OUTCOME: ${{ steps.cypress.outcome }}
-          CYPRESS_DASHBOARD_URL: ${{ steps.cypress.outputs.dashboardUrl }}
-          GITHUB_RUN_URL: $GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID
diff --git a/lerna.json b/lerna.json
index 4f3e8c24f9..5ae449aa0e 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.2.12-alpha.55",
+  "version": "2.2.12-alpha.64",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/package.json b/package.json
index 7da8db506d..6290930269 100644
--- a/package.json
+++ b/package.json
@@ -51,10 +51,6 @@
     "lint:fix:eslint": "eslint --fix packages qa-core",
     "lint:fix:prettier": "prettier --write \"packages/**/*.{js,ts,svelte}\" && prettier --write \"examples/**/*.{js,ts,svelte}\" && prettier --write \"qa-core/**/*.{js,ts,svelte}\"",
     "lint:fix": "yarn run lint:fix:prettier && yarn run lint:fix:eslint",
-    "test:e2e": "lerna run cy:test --stream",
-    "test:e2e:ci": "lerna run cy:ci --stream",
-    "test:e2e:ci:record": "lerna run cy:ci:record --stream",
-    "test:e2e:ci:notify": "lerna run cy:ci:notify",
     "build:specs": "lerna run specs",
     "build:docker": "lerna run build:docker && npm run build:docker:proxy && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh $BUDIBASE_RELEASE_VERSION && cd -",
     "build:docker:pre": "lerna run build && lerna run predocker",
@@ -84,4 +80,4 @@
     "install:pro": "bash scripts/pro/install.sh",
     "dep:clean": "yarn clean && yarn bootstrap"
   }
-}
+}
\ No newline at end of file
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 160c1b1100..94e3c84972 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.2.12-alpha.55",
+  "version": "2.2.12-alpha.64",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@budibase/nano": "10.1.1",
-    "@budibase/types": "2.2.12-alpha.55",
+    "@budibase/types": "2.2.12-alpha.64",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/backend-core/src/db/couch/DatabaseImpl.ts b/packages/backend-core/src/db/couch/DatabaseImpl.ts
index 9b4761d961..a60a748bdc 100644
--- a/packages/backend-core/src/db/couch/DatabaseImpl.ts
+++ b/packages/backend-core/src/db/couch/DatabaseImpl.ts
@@ -15,18 +15,47 @@ import { getCouchInfo } from "./connections"
 import { directCouchCall } from "./utils"
 import { getPouchDB } from "./pouchDB"
 import { WriteStream, ReadStream } from "fs"
+import { newid } from "../../newid"
+
+function buildNano(couchInfo: { url: string; cookie: string }) {
+  return Nano({
+    url: couchInfo.url,
+    requestDefaults: {
+      headers: {
+        Authorization: couchInfo.cookie,
+      },
+    },
+    parseUrl: false,
+  })
+}
+
+export function DatabaseWithConnection(
+  dbName: string,
+  connection: string,
+  opts?: DatabaseOpts
+) {
+  if (!connection) {
+    throw new Error("Must provide connection details")
+  }
+  return new DatabaseImpl(dbName, opts, connection)
+}
 
 export class DatabaseImpl implements Database {
   public readonly name: string
   private static nano: Nano.ServerScope
+  private readonly instanceNano?: Nano.ServerScope
   private readonly pouchOpts: DatabaseOpts
 
-  constructor(dbName?: string, opts?: DatabaseOpts) {
+  constructor(dbName?: string, opts?: DatabaseOpts, connection?: string) {
     if (dbName == null) {
       throw new Error("Database name cannot be undefined.")
     }
     this.name = dbName
     this.pouchOpts = opts || {}
+    if (connection) {
+      const couchInfo = getCouchInfo(connection)
+      this.instanceNano = buildNano(couchInfo)
+    }
     if (!DatabaseImpl.nano) {
       DatabaseImpl.init()
     }
@@ -34,15 +63,7 @@ export class DatabaseImpl implements Database {
 
   static init() {
     const couchInfo = getCouchInfo()
-    DatabaseImpl.nano = Nano({
-      url: couchInfo.url,
-      requestDefaults: {
-        headers: {
-          Authorization: couchInfo.cookie,
-        },
-      },
-      parseUrl: false,
-    })
+    DatabaseImpl.nano = buildNano(couchInfo)
   }
 
   async exists() {
@@ -50,6 +71,10 @@ export class DatabaseImpl implements Database {
     return response.status === 200
   }
 
+  private nano() {
+    return this.instanceNano || DatabaseImpl.nano
+  }
+
   async checkSetup() {
     let shouldCreate = !this.pouchOpts?.skip_setup
     // check exists in a lightweight fashion
@@ -58,9 +83,9 @@ export class DatabaseImpl implements Database {
       throw new Error("DB does not exist")
     }
     if (!exists) {
-      await DatabaseImpl.nano.db.create(this.name)
+      await this.nano().db.create(this.name)
     }
-    return DatabaseImpl.nano.db.use(this.name)
+    return this.nano().db.use(this.name)
   }
 
   private async updateOutput(fnc: any) {
@@ -101,6 +126,13 @@ export class DatabaseImpl implements Database {
     return this.updateOutput(() => db.destroy(_id, _rev))
   }
 
+  async post(document: AnyDocument, opts?: DatabasePutOpts) {
+    if (!document._id) {
+      document._id = newid()
+    }
+    return this.put(document, opts)
+  }
+
   async put(document: AnyDocument, opts?: DatabasePutOpts) {
     if (!document._id) {
       throw new Error("Cannot store document without _id field.")
@@ -146,7 +178,7 @@ export class DatabaseImpl implements Database {
 
   async destroy() {
     try {
-      await DatabaseImpl.nano.db.destroy(this.name)
+      await this.nano().db.destroy(this.name)
     } catch (err: any) {
       // didn't exist, don't worry
       if (err.statusCode === 404) {
diff --git a/packages/backend-core/src/db/couch/connections.ts b/packages/backend-core/src/db/couch/connections.ts
index a2206de634..06c661f350 100644
--- a/packages/backend-core/src/db/couch/connections.ts
+++ b/packages/backend-core/src/db/couch/connections.ts
@@ -1,7 +1,7 @@
 import env from "../../environment"
 
-export const getCouchInfo = () => {
-  const urlInfo = getUrlInfo()
+export const getCouchInfo = (connection?: string) => {
+  const urlInfo = getUrlInfo(connection)
   let username
   let password
   if (env.COUCH_DB_USERNAME) {
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 3afd638637..dbafc7e8f9 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "2.2.12-alpha.55",
+  "version": "2.2.12-alpha.64",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "1.2.1",
-    "@budibase/string-templates": "2.2.12-alpha.55",
+    "@budibase/string-templates": "2.2.12-alpha.64",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/bbui/src/ActionButton/ActionButton.svelte b/packages/bbui/src/ActionButton/ActionButton.svelte
index 640f696458..663128160f 100644
--- a/packages/bbui/src/ActionButton/ActionButton.svelte
+++ b/packages/bbui/src/ActionButton/ActionButton.svelte
@@ -9,7 +9,6 @@
   export let longPressable = false
   export let disabled = false
   export let icon = ""
-  export let dataCy = null
   export let size = "M"
   export let active = false
   export let fullWidth = false
@@ -37,7 +36,6 @@
 </script>
 
 <button
-  data-cy={dataCy}
   use:longPress
   class:spectrum-ActionButton--quiet={quiet}
   class:spectrum-ActionButton--emphasized={emphasized}
@@ -88,7 +86,7 @@
   }
   .is-selected:not(.spectrum-ActionButton--emphasized):not(.spectrum-ActionButton--quiet) {
     background: var(--spectrum-global-color-gray-300);
-    border-color: var(--spectrum-global-color-gray-700);
+    border-color: var(--spectrum-global-color-gray-500);
   }
   .noPadding {
     padding: 0;
diff --git a/packages/bbui/src/ActionMenu/ActionMenu.svelte b/packages/bbui/src/ActionMenu/ActionMenu.svelte
index c5602d6b0c..08425e8f59 100644
--- a/packages/bbui/src/ActionMenu/ActionMenu.svelte
+++ b/packages/bbui/src/ActionMenu/ActionMenu.svelte
@@ -6,7 +6,6 @@
   export let disabled = false
   export let align = "left"
   export let portalTarget
-  export let dataCy
 
   let anchor
   let dropdown
@@ -37,7 +36,7 @@
 <div use:getAnchor on:click={openMenu}>
   <slot name="control" />
 </div>
-<Popover bind:this={dropdown} {anchor} {align} {portalTarget} {dataCy}>
+<Popover bind:this={dropdown} {anchor} {align} {portalTarget}>
   <Menu>
     <slot />
   </Menu>
diff --git a/packages/bbui/src/Actions/position_dropdown.js b/packages/bbui/src/Actions/position_dropdown.js
index 1884bbf2d6..abc7188985 100644
--- a/packages/bbui/src/Actions/position_dropdown.js
+++ b/packages/bbui/src/Actions/position_dropdown.js
@@ -1,11 +1,21 @@
-export default function positionDropdown(
-  element,
-  { anchor, align, maxWidth, useAnchorWidth }
-) {
-  const update = () => {
+export default function positionDropdown(element, opts) {
+  let resizeObserver
+  let latestOpts = opts
+
+  // We need a static reference to this function so that we can properly
+  // clean up the scroll listener.
+  const scrollUpdate = () => {
+    updatePosition(latestOpts)
+  }
+
+  // Updates the position of the dropdown
+  const updatePosition = opts => {
+    const { anchor, align, maxWidth, useAnchorWidth, offset = 5 } = opts
     if (!anchor) {
       return
     }
+
+    // Compute bounds
     const anchorBounds = anchor.getBoundingClientRect()
     const elementBounds = element.getBoundingClientRect()
     let styles = {
@@ -20,9 +30,9 @@ export default function positionDropdown(
     if (align === "right-outside") {
       styles.top = anchorBounds.top
     } else if (window.innerHeight - anchorBounds.bottom < 100) {
-      styles.top = anchorBounds.top - elementBounds.height - 5
+      styles.top = anchorBounds.top - elementBounds.height - offset
     } else {
-      styles.top = anchorBounds.bottom + 5
+      styles.top = anchorBounds.bottom + offset
       styles.maxHeight = window.innerHeight - anchorBounds.bottom - 20
     }
 
@@ -36,7 +46,7 @@ export default function positionDropdown(
     if (align === "right") {
       styles.left = anchorBounds.left + anchorBounds.width - elementBounds.width
     } else if (align === "right-outside") {
-      styles.left = anchorBounds.right + 10
+      styles.left = anchorBounds.right + offset
     } else {
       styles.left = anchorBounds.left
     }
@@ -51,26 +61,47 @@ export default function positionDropdown(
     })
   }
 
+  // The actual svelte action callback which creates observers on the relevant
+  // DOM elements
+  const update = newOpts => {
+    latestOpts = newOpts
+
+    // Cleanup old state
+    if (resizeObserver) {
+      resizeObserver.disconnect()
+    }
+
+    // Do nothing if no anchor
+    const { anchor } = newOpts
+    if (!anchor) {
+      return
+    }
+
+    // Observe both anchor and element and resize the popover as appropriate
+    resizeObserver = new ResizeObserver(() => updatePosition(newOpts))
+    resizeObserver.observe(anchor)
+    resizeObserver.observe(element)
+    resizeObserver.observe(document.body)
+  }
+
   // Apply initial styles which don't need to change
   element.style.position = "absolute"
   element.style.zIndex = "9999"
 
-  // Observe both anchor and element and resize the popover as appropriate
-  const resizeObserver = new ResizeObserver(entries => {
-    entries.forEach(update)
-  })
-  if (anchor) {
-    resizeObserver.observe(anchor)
-  }
-  resizeObserver.observe(element)
-  resizeObserver.observe(document.body)
+  // Set up a scroll listener
+  document.addEventListener("scroll", scrollUpdate, true)
 
-  document.addEventListener("scroll", update, true)
+  // Perform initial update
+  update(opts)
 
   return {
+    update,
     destroy() {
-      resizeObserver.disconnect()
-      document.removeEventListener("scroll", update, true)
+      // Cleanup
+      if (resizeObserver) {
+        resizeObserver.disconnect()
+      }
+      document.removeEventListener("scroll", scrollUpdate, true)
     },
   }
 }
diff --git a/packages/bbui/src/Button/Button.svelte b/packages/bbui/src/Button/Button.svelte
index b8ffe9f7e6..f8a6004f8f 100644
--- a/packages/bbui/src/Button/Button.svelte
+++ b/packages/bbui/src/Button/Button.svelte
@@ -13,7 +13,6 @@
   export let icon = undefined
   export let active = false
   export let tooltip = undefined
-  export let dataCy
   export let newStyles = true
   export let id
 
@@ -33,7 +32,6 @@
   class:disabled
   class="spectrum-Button spectrum-Button--size{size.toUpperCase()}"
   {disabled}
-  data-cy={dataCy}
   on:click|preventDefault
   on:mouseover={() => (showTooltip = true)}
   on:focus={() => (showTooltip = true)}
diff --git a/packages/bbui/src/Form/Core/EnvDropdown.svelte b/packages/bbui/src/Form/Core/EnvDropdown.svelte
index eb2d6baca9..8701facc08 100644
--- a/packages/bbui/src/Form/Core/EnvDropdown.svelte
+++ b/packages/bbui/src/Form/Core/EnvDropdown.svelte
@@ -11,7 +11,6 @@
   export let id = null
   export let readonly = false
   export let updateOnChange = true
-  export let dataCy
   export let align
   export let autofocus = false
   export let variables
@@ -123,7 +122,6 @@
       disabled={hbsValue.length || disabled}
       {readonly}
       {id}
-      data-cy={dataCy}
       value={hbsValue.length ? `{{ ${hbsValue[0]} }}` : value}
       placeholder={placeholder || ""}
       on:click
diff --git a/packages/bbui/src/Form/Core/Switch.svelte b/packages/bbui/src/Form/Core/Switch.svelte
index 9e45683382..ffbef6b27d 100644
--- a/packages/bbui/src/Form/Core/Switch.svelte
+++ b/packages/bbui/src/Form/Core/Switch.svelte
@@ -6,7 +6,6 @@
   export let id = null
   export let text = null
   export let disabled = false
-  export let dataCy = null
 
   const dispatch = createEventDispatcher()
   const onChange = event => {
@@ -16,7 +15,6 @@
 
 <div class="spectrum-Switch spectrum-Switch--emphasized">
   <input
-    data-cy={dataCy}
     checked={value}
     {disabled}
     on:change={onChange}
diff --git a/packages/bbui/src/Form/Core/TextField.svelte b/packages/bbui/src/Form/Core/TextField.svelte
index 6a64876a2c..fe05ef2c64 100644
--- a/packages/bbui/src/Form/Core/TextField.svelte
+++ b/packages/bbui/src/Form/Core/TextField.svelte
@@ -11,7 +11,6 @@
   export let readonly = false
   export let updateOnChange = true
   export let quiet = false
-  export let dataCy
   export let align
   export let autofocus = false
 
@@ -89,7 +88,6 @@
     {disabled}
     {readonly}
     {id}
-    data-cy={dataCy}
     value={value || ""}
     placeholder={placeholder || ""}
     on:click
diff --git a/packages/bbui/src/Form/EnvDropdown.svelte b/packages/bbui/src/Form/EnvDropdown.svelte
index 33924af0a5..b5db23a870 100644
--- a/packages/bbui/src/Form/EnvDropdown.svelte
+++ b/packages/bbui/src/Form/EnvDropdown.svelte
@@ -13,7 +13,6 @@
   export let error = null
   export let updateOnChange = true
   export let quiet = false
-  export let dataCy
   export let autofocus
   export let variables
   export let showModal
@@ -28,7 +27,6 @@
 
 <Field {label} {labelPosition} {error}>
   <EnvDropdown
-    {dataCy}
     {updateOnChange}
     {error}
     {disabled}
diff --git a/packages/bbui/src/Form/Input.svelte b/packages/bbui/src/Form/Input.svelte
index 251b23c86a..f37cf55b63 100644
--- a/packages/bbui/src/Form/Input.svelte
+++ b/packages/bbui/src/Form/Input.svelte
@@ -13,7 +13,6 @@
   export let error = null
   export let updateOnChange = true
   export let quiet = false
-  export let dataCy
   export let autofocus
 
   const dispatch = createEventDispatcher()
@@ -25,7 +24,6 @@
 
 <Field {label} {labelPosition} {error}>
   <TextField
-    {dataCy}
     {updateOnChange}
     {error}
     {disabled}
diff --git a/packages/bbui/src/Form/InputDropdown.svelte b/packages/bbui/src/Form/InputDropdown.svelte
index 73516ea37c..12db30a43a 100644
--- a/packages/bbui/src/Form/InputDropdown.svelte
+++ b/packages/bbui/src/Form/InputDropdown.svelte
@@ -14,7 +14,6 @@
   export let error = null
   export let updateOnChange = true
   export let quiet = false
-  export let dataCy
   export let autofocus
   export let options = []
 
@@ -32,7 +31,6 @@
 
 <Field {label} {labelPosition} {error}>
   <InputDropdown
-    {dataCy}
     {updateOnChange}
     {error}
     {disabled}
diff --git a/packages/bbui/src/Form/PickerDropdown.svelte b/packages/bbui/src/Form/PickerDropdown.svelte
index 58f68a6386..156ec9bc7e 100644
--- a/packages/bbui/src/Form/PickerDropdown.svelte
+++ b/packages/bbui/src/Form/PickerDropdown.svelte
@@ -21,7 +21,6 @@
   export let getSecondaryOptionColour = () => {}
   export let getSecondaryOptionIcon = () => {}
   export let quiet = false
-  export let dataCy
   export let autofocus
   export let primaryOptions = []
   export let secondaryOptions = []
@@ -98,7 +97,6 @@
   <PickerDropdown
     {searchTerm}
     {autocomplete}
-    {dataCy}
     {error}
     {disabled}
     {readonly}
diff --git a/packages/bbui/src/Form/Toggle.svelte b/packages/bbui/src/Form/Toggle.svelte
index 37de2836ba..8cc6506651 100644
--- a/packages/bbui/src/Form/Toggle.svelte
+++ b/packages/bbui/src/Form/Toggle.svelte
@@ -9,7 +9,6 @@
   export let text = null
   export let disabled = false
   export let error = null
-  export let dataCy = null
 
   const dispatch = createEventDispatcher()
   const onChange = e => {
@@ -19,5 +18,5 @@
 </script>
 
 <Field {label} {labelPosition} {error}>
-  <Switch {dataCy} {error} {disabled} {text} {value} on:change={onChange} />
+  <Switch {error} {disabled} {text} {value} on:change={onChange} />
 </Field>
diff --git a/packages/bbui/src/Menu/Item.svelte b/packages/bbui/src/Menu/Item.svelte
index dfe61c1736..ed759f5b10 100644
--- a/packages/bbui/src/Menu/Item.svelte
+++ b/packages/bbui/src/Menu/Item.svelte
@@ -5,7 +5,6 @@
   const dispatch = createEventDispatcher()
   const actionMenu = getContext("actionMenu")
 
-  export let dataCy
   export let icon = undefined
   export let disabled = undefined
   export let noClose = false
@@ -35,7 +34,6 @@
 </script>
 
 <li
-  data-cy={dataCy}
   on:click|preventDefault={disabled ? null : onClick}
   class="spectrum-Menu-item"
   class:is-disabled={disabled}
diff --git a/packages/bbui/src/Modal/ModalContent.svelte b/packages/bbui/src/Modal/ModalContent.svelte
index 261dcbc24a..226414ee11 100644
--- a/packages/bbui/src/Modal/ModalContent.svelte
+++ b/packages/bbui/src/Modal/ModalContent.svelte
@@ -23,7 +23,7 @@
   export let secondaryButtonText = undefined
   export let secondaryAction = undefined
   export let secondaryButtonWarning = false
-  export let dataCy = null
+
   const { hide, cancel } = getContext(Context.Modal)
   let loading = false
   $: confirmDisabled = disabled || loading
@@ -63,7 +63,6 @@
   role="dialog"
   tabindex="-1"
   aria-modal="true"
-  data-cy={dataCy}
 >
   <div class="spectrum-Dialog-grid">
     {#if title || $$slots.header}
diff --git a/packages/bbui/src/Popover/Popover.svelte b/packages/bbui/src/Popover/Popover.svelte
index c32f93ea2a..8f6ef06591 100644
--- a/packages/bbui/src/Popover/Popover.svelte
+++ b/packages/bbui/src/Popover/Popover.svelte
@@ -13,11 +13,11 @@
   export let anchor
   export let align = "right"
   export let portalTarget
-  export let dataCy
   export let maxWidth
   export let open = false
   export let useAnchorWidth = false
   export let dismissible = true
+  export let offset = 5
 
   $: target = portalTarget || getContext(Context.PopoverRoot) || ".spectrum"
 
@@ -57,31 +57,28 @@
 </script>
 
 {#if open}
-  {#key anchor}
-    <Portal {target}>
-      <div
-        tabindex="0"
-        use:positionDropdown={{
-          anchor,
-          align,
-          maxWidth,
-          useAnchorWidth,
-          showTip: false,
-        }}
-        use:clickOutside={{
-          callback: dismissible ? handleOutsideClick : () => {},
-          anchor,
-        }}
-        on:keydown={handleEscape}
-        class="spectrum-Popover is-open"
-        role="presentation"
-        data-cy={dataCy}
-        transition:fly|local={{ y: -20, duration: 200 }}
-      >
-        <slot />
-      </div>
-    </Portal>
-  {/key}
+  <Portal {target}>
+    <div
+      tabindex="0"
+      use:positionDropdown={{
+        anchor,
+        align,
+        maxWidth,
+        useAnchorWidth,
+        offset,
+      }}
+      use:clickOutside={{
+        callback: dismissible ? handleOutsideClick : () => {},
+        anchor,
+      }}
+      on:keydown={handleEscape}
+      class="spectrum-Popover is-open"
+      role="presentation"
+      transition:fly|local={{ y: -20, duration: 200 }}
+    >
+      <slot />
+    </div>
+  </Portal>
 {/if}
 
 <style>
diff --git a/packages/bbui/src/SideNavigation/Item.svelte b/packages/bbui/src/SideNavigation/Item.svelte
index aa86fc02a8..dab88b05bc 100644
--- a/packages/bbui/src/SideNavigation/Item.svelte
+++ b/packages/bbui/src/SideNavigation/Item.svelte
@@ -8,7 +8,6 @@
   export let icon = ""
   export let selected = false
   export let disabled = false
-  export let dataCy
   export let badge = ""
 </script>
 
@@ -17,7 +16,6 @@
   class:is-selected={selected}
   class:is-disabled={disabled}
   on:click
-  data-cy={dataCy}
 >
   {#if heading}
     <h2 class="spectrum-SideNav-heading" id="nav-heading-{heading}">
diff --git a/packages/builder/cypress.json b/packages/builder/cypress.json
deleted file mode 100644
index b779794543..0000000000
--- a/packages/builder/cypress.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "baseUrl": "http://localhost:4100",
-  "video": true,
-  "projectId": "bmbemn",
-  "reporter": "cypress-multi-reporters",
-  "reporterOptions": {
-    "configFile": "reporterConfig.json"
-  },
-  "env": {
-    "PORT": "4100",
-    "WORKER_PORT": "4200",
-    "JWT_SECRET": "test",
-    "HOST_IP": ""
-  }
-}
\ No newline at end of file
diff --git a/packages/builder/cypress/fixtures/apikey.json b/packages/builder/cypress/fixtures/apikey.json
deleted file mode 100644
index 1def14ed6c..0000000000
--- a/packages/builder/cypress/fixtures/apikey.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "budibase": "CB373643-3FC4-4902-9E31-449C0ED066B6"
-}
\ No newline at end of file
diff --git a/packages/builder/cypress/fixtures/example.json b/packages/builder/cypress/fixtures/example.json
deleted file mode 100644
index da18d9352a..0000000000
--- a/packages/builder/cypress/fixtures/example.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "name": "Using fixtures to represent data",
-  "email": "hello@cypress.io",
-  "body": "Fixtures are a great way to mock data for responses to routes"
-}
\ No newline at end of file
diff --git a/packages/builder/cypress/fixtures/exported-app.txt b/packages/builder/cypress/fixtures/exported-app.txt
deleted file mode 100644
index 28aeaf958a..0000000000
--- a/packages/builder/cypress/fixtures/exported-app.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-{"version":"1.2.9","db_type":"http","start_time":"2022-05-12T13:47:50.453Z","db_info":{"db_name":"app_dev_7cae7fa4db8745da848f91430a8211bf","purge_seq":"0-g1AAAABXeJzLYWBgYMpgTmEQTM4vTc5ISXIwNDLXMwBCwxyQVB4LkGRoAFL_gSArkQGP2kSGpHqIoiwAtOgYRA","update_seq":"11-g1AAAACbeJzLYWBgYMpgTmEQTM4vTc5ISXIwNDLXMwBCwxyQVB4LkGRoAFL_gSArgzmRPRcowJ5klmZgaZmKTR8e0xIZkuqhxrBAjEk0NzcwMsSmIQsA89QoWg","sizes":{"file":94626,"external":5665,"active":7627},"props":{},"doc_del_count":0,"doc_count":7,"disk_format_version":8,"compact_running":false,"cluster":{"q":2,"n":1,"w":1,"r":1},"instance_start_time":"0","host":"http://localhost:4005/app_dev_7cae7fa4db8745da848f91430a8211bf/","auto_compaction":false,"adapter":"http"}}
-{"docs":[{"_id":"_design/database","_rev":"4-ad6d41ef604ab34da380438c1be89521","views":{"by_link":{"map":"function (doc) {\n            // everything in this must remain constant as its going to Pouch, no external variables\n            if (doc.type === \"link\") {\n                let doc1 = doc.doc1;\n                let doc2 = doc.doc2;\n                // eslint-disable-next-line no-undef\n                emit([doc1.tableId, doc1.rowId], {\n                    id: doc2.rowId,\n                    thisId: doc1.rowId,\n                    fieldName: doc1.fieldName,\n                });\n                // if linking to same table can't emit twice\n                if (doc1.tableId !== doc2.tableId) {\n                    // eslint-disable-next-line no-undef\n                    emit([doc2.tableId, doc2.rowId], {\n                        id: doc1.rowId,\n                        thisId: doc2.rowId,\n                        fieldName: doc2.fieldName,\n                    });\n                }\n            }\n        }"},"screen_routes":{"map":"function(doc) {\n      if (doc._id.startsWith(\"screen_\")) {\n        emit(doc._id, {\n          id: doc._id,\n          routing: doc.routing,\n        })\n      }\n    }"}},"indexes":{"rows":{"index":"function (doc) {\n        function idx(input, prev) {\n            for (let key of Object.keys(input)) {\n                let idxKey = prev != null ? `${prev}.${key}` : key;\n                idxKey = idxKey.replace(/ /g, \"_\");\n                if (Array.isArray(input[key])) {\n                    for (let val of input[key]) {\n                        if (typeof val !== \"object\") {\n                            // eslint-disable-next-line no-undef\n                            index(idxKey, val, { store: true });\n                        }\n                    }\n                }\n                else if (key === \"_id\" || key === \"_rev\" || input[key] == null) {\n                    continue;\n                }\n                if (typeof input[key] === \"string\") {\n                    // eslint-disable-next-line no-undef\n                    index(idxKey, input[key].toLowerCase(), { store: true });\n                }\n                else if (typeof input[key] !== \"object\") {\n                    // eslint-disable-next-line no-undef\n                    index(idxKey, input[key], { store: true });\n                }\n                else {\n                    idx(input[key], idxKey);\n                }\n            }\n        }\n        if (doc._id.startsWith(\"ro_\")) {\n            // eslint-disable-next-line no-undef\n            index(\"default\", doc._id);\n            idx(doc);\n        }\n    }","analyzer":"keyword"}},"_revisions":{"start":4,"ids":["ad6d41ef604ab34da380438c1be89521","cb47f4fd824d5e096ac8b76117e6f93d","68a9a1d1b01b327676ecbaa4b1e5b8a7","0b24e44a44af45e51e562fd124ce3007"]}},{"_id":"app_metadata","_rev":"2-a4fe55378bfec0fc71e58a1364ac9965","appId":"app_dev_7cae7fa4db8745da848f91430a8211bf","type":"app","version":"1.0.155-alpha.0","componentLibraries":["@budibase/standard-components"],"name":"My app","url":"/my-app","instance":{"_id":"app_dev_7cae7fa4db8745da848f91430a8211bf"},"tenantId":"default","updatedAt":"2022-05-12T13:47:28.756Z","createdAt":"2022-05-12T13:47:26.825Z","status":"development","_revisions":{"start":2,"ids":["a4fe55378bfec0fc71e58a1364ac9965","f0d06bdb6e6ae4781eb5c4aa224002ff"]}},{"_id":"layout_private_master","_rev":"1-c02411b58d697e38763889a375d52159","componentLibraries":["@budibase/standard-components"],"title":"My app","favicon":"./_shared/favicon.png","stylesheets":[],"name":"Navigation Layout","props":{"_id":"4f569166-a4f3-47ea-a09e-6d218c75586f","_instanceName":"Navigation Layout","_component":"@budibase/standard-components/layout","_children":[{"_id":"7fcf11e4-6f5b-4085-8e0d-9f3d44c98967","_component":"@budibase/standard-components/screenslot","_instanceName":"Screen slot","_styles":{"normal":{"flex":"1 1 auto","display":"flex","flex-direction":"column","justify-content":"flex-start","align-items":"stretch"},"hover":{},"active":{},"selected":{}},"_children":[]}],"_styles":{"active":{},"hover":{},"normal":{},"selected":{}},"title":"My app","navigation":"Top","width":"Large","links":[{"text":"Home","url":"/"}]}},{"_id":"layout_public_master","_rev":"1-d6bce47046d4d0de4f19a6ff95064109","componentLibraries":["@budibase/standard-components"],"title":"My app","favicon":"./_shared/favicon.png","stylesheets":[],"name":"Empty Layout","props":{"_id":"3723ffa1-f9e0-4c05-8013-98195c788ed6","_instanceName":"Empty Layout","_component":"@budibase/standard-components/layout","_children":[{"_id":"7fcf11e4-6f5b-4085-8e0d-9f3d44c98967","_component":"@budibase/standard-components/screenslot","_instanceName":"Screen slot","_styles":{"normal":{"flex":"1 1 auto","display":"flex","flex-direction":"column","justify-content":"flex-start","align-items":"stretch"},"hover":{},"active":{},"selected":{}},"_children":[]}],"_styles":{"active":{},"hover":{},"normal":{},"selected":{}},"navigation":"None","width":"Large","links":[{"text":"Home","url":"/"}]}},{"_id":"screen_b19c454fa5ae41ab874a8860623ab37c","_rev":"1-02dddd460ad14de50dc885aa362452c6","layoutId":"layout_private_master","props":{"_id":"c87457efbc05a43f39064d9dacc9d4b67","_component":"@budibase/standard-components/container","_styles":{"normal":{},"hover":{},"active":{},"selected":{}},"_children":[],"_instanceName":"New Screen","direction":"column","hAlign":"stretch","vAlign":"top","size":"grow","gap":"M"},"routing":{"route":"/home","roleId":"BASIC","roldId":"BASIC"},"name":"screen-id"},{"_id":"ta_users","_rev":"1-30a4344f056c24cf776d5736eb3c7ed5","type":"table","views":{},"name":"Users","schema":{"email":{"type":"string","constraints":{"type":"string","email":true,"length":{"maximum":""},"presence":true},"fieldName":"email","name":"email"},"firstName":{"name":"firstName","fieldName":"firstName","type":"string","constraints":{"type":"string","presence":false}},"lastName":{"name":"lastName","fieldName":"lastName","type":"string","constraints":{"type":"string","presence":false}},"roleId":{"fieldName":"roleId","name":"roleId","type":"options","constraints":{"type":"string","presence":false,"inclusion":["ADMIN","POWER","BASIC","PUBLIC"]}},"status":{"fieldName":"status","name":"status","type":"options","constraints":{"type":"string","presence":false,"inclusion":["active","inactive"]}}},"primaryDisplay":"email"}]}
-{"seq":"11-g1AAAACbeJzLYWBgYMpgTmEQTM4vTc5ISXIwNDLXMwBCwxyQVCJDUv3___-zMpgTWXKBAuxJiebmBkaG2DTgMSaPBUgyNACp_1DT2CGmmaUZWFqmYtOXBQAWQiha"}
diff --git a/packages/builder/cypress/fixtures/profile.json b/packages/builder/cypress/fixtures/profile.json
deleted file mode 100644
index b6c355ca5c..0000000000
--- a/packages/builder/cypress/fixtures/profile.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id": 8739,
-  "name": "Jane",
-  "email": "jane@example.com"
-}
\ No newline at end of file
diff --git a/packages/builder/cypress/fixtures/users.json b/packages/builder/cypress/fixtures/users.json
deleted file mode 100644
index f82fc8dfb2..0000000000
--- a/packages/builder/cypress/fixtures/users.json
+++ /dev/null
@@ -1,232 +0,0 @@
-[
-  {
-    "id": 1,
-    "name": "Leanne Graham",
-    "username": "Bret",
-    "email": "Sincere@april.biz",
-    "address": {
-      "street": "Kulas Light",
-      "suite": "Apt. 556",
-      "city": "Gwenborough",
-      "zipcode": "92998-3874",
-      "geo": {
-        "lat": "-37.3159",
-        "lng": "81.1496"
-      }
-    },
-    "phone": "1-770-736-8031 x56442",
-    "website": "hildegard.org",
-    "company": {
-      "name": "Romaguera-Crona",
-      "catchPhrase": "Multi-layered client-server neural-net",
-      "bs": "harness real-time e-markets"
-    }
-  },
-  {
-    "id": 2,
-    "name": "Ervin Howell",
-    "username": "Antonette",
-    "email": "Shanna@melissa.tv",
-    "address": {
-      "street": "Victor Plains",
-      "suite": "Suite 879",
-      "city": "Wisokyburgh",
-      "zipcode": "90566-7771",
-      "geo": {
-        "lat": "-43.9509",
-        "lng": "-34.4618"
-      }
-    },
-    "phone": "010-692-6593 x09125",
-    "website": "anastasia.net",
-    "company": {
-      "name": "Deckow-Crist",
-      "catchPhrase": "Proactive didactic contingency",
-      "bs": "synergize scalable supply-chains"
-    }
-  },
-  {
-    "id": 3,
-    "name": "Clementine Bauch",
-    "username": "Samantha",
-    "email": "Nathan@yesenia.net",
-    "address": {
-      "street": "Douglas Extension",
-      "suite": "Suite 847",
-      "city": "McKenziehaven",
-      "zipcode": "59590-4157",
-      "geo": {
-        "lat": "-68.6102",
-        "lng": "-47.0653"
-      }
-    },
-    "phone": "1-463-123-4447",
-    "website": "ramiro.info",
-    "company": {
-      "name": "Romaguera-Jacobson",
-      "catchPhrase": "Face to face bifurcated interface",
-      "bs": "e-enable strategic applications"
-    }
-  },
-  {
-    "id": 4,
-    "name": "Patricia Lebsack",
-    "username": "Karianne",
-    "email": "Julianne.OConner@kory.org",
-    "address": {
-      "street": "Hoeger Mall",
-      "suite": "Apt. 692",
-      "city": "South Elvis",
-      "zipcode": "53919-4257",
-      "geo": {
-        "lat": "29.4572",
-        "lng": "-164.2990"
-      }
-    },
-    "phone": "493-170-9623 x156",
-    "website": "kale.biz",
-    "company": {
-      "name": "Robel-Corkery",
-      "catchPhrase": "Multi-tiered zero tolerance productivity",
-      "bs": "transition cutting-edge web services"
-    }
-  },
-  {
-    "id": 5,
-    "name": "Chelsey Dietrich",
-    "username": "Kamren",
-    "email": "Lucio_Hettinger@annie.ca",
-    "address": {
-      "street": "Skiles Walks",
-      "suite": "Suite 351",
-      "city": "Roscoeview",
-      "zipcode": "33263",
-      "geo": {
-        "lat": "-31.8129",
-        "lng": "62.5342"
-      }
-    },
-    "phone": "(254)954-1289",
-    "website": "demarco.info",
-    "company": {
-      "name": "Keebler LLC",
-      "catchPhrase": "User-centric fault-tolerant solution",
-      "bs": "revolutionize end-to-end systems"
-    }
-  },
-  {
-    "id": 6,
-    "name": "Mrs. Dennis Schulist",
-    "username": "Leopoldo_Corkery",
-    "email": "Karley_Dach@jasper.info",
-    "address": {
-      "street": "Norberto Crossing",
-      "suite": "Apt. 950",
-      "city": "South Christy",
-      "zipcode": "23505-1337",
-      "geo": {
-        "lat": "-71.4197",
-        "lng": "71.7478"
-      }
-    },
-    "phone": "1-477-935-8478 x6430",
-    "website": "ola.org",
-    "company": {
-      "name": "Considine-Lockman",
-      "catchPhrase": "Synchronised bottom-line interface",
-      "bs": "e-enable innovative applications"
-    }
-  },
-  {
-    "id": 7,
-    "name": "Kurtis Weissnat",
-    "username": "Elwyn.Skiles",
-    "email": "Telly.Hoeger@billy.biz",
-    "address": {
-      "street": "Rex Trail",
-      "suite": "Suite 280",
-      "city": "Howemouth",
-      "zipcode": "58804-1099",
-      "geo": {
-        "lat": "24.8918",
-        "lng": "21.8984"
-      }
-    },
-    "phone": "210.067.6132",
-    "website": "elvis.io",
-    "company": {
-      "name": "Johns Group",
-      "catchPhrase": "Configurable multimedia task-force",
-      "bs": "generate enterprise e-tailers"
-    }
-  },
-  {
-    "id": 8,
-    "name": "Nicholas Runolfsdottir V",
-    "username": "Maxime_Nienow",
-    "email": "Sherwood@rosamond.me",
-    "address": {
-      "street": "Ellsworth Summit",
-      "suite": "Suite 729",
-      "city": "Aliyaview",
-      "zipcode": "45169",
-      "geo": {
-        "lat": "-14.3990",
-        "lng": "-120.7677"
-      }
-    },
-    "phone": "586.493.6943 x140",
-    "website": "jacynthe.com",
-    "company": {
-      "name": "Abernathy Group",
-      "catchPhrase": "Implemented secondary concept",
-      "bs": "e-enable extensible e-tailers"
-    }
-  },
-  {
-    "id": 9,
-    "name": "Glenna Reichert",
-    "username": "Delphine",
-    "email": "Chaim_McDermott@dana.io",
-    "address": {
-      "street": "Dayna Park",
-      "suite": "Suite 449",
-      "city": "Bartholomebury",
-      "zipcode": "76495-3109",
-      "geo": {
-        "lat": "24.6463",
-        "lng": "-168.8889"
-      }
-    },
-    "phone": "(775)976-6794 x41206",
-    "website": "conrad.com",
-    "company": {
-      "name": "Yost and Sons",
-      "catchPhrase": "Switchable contextually-based project",
-      "bs": "aggregate real-time technologies"
-    }
-  },
-  {
-    "id": 10,
-    "name": "Clementina DuBuque",
-    "username": "Moriah.Stanton",
-    "email": "Rey.Padberg@karina.biz",
-    "address": {
-      "street": "Kattie Turnpike",
-      "suite": "Suite 198",
-      "city": "Lebsackbury",
-      "zipcode": "31428-2261",
-      "geo": {
-        "lat": "-38.2386",
-        "lng": "57.2232"
-      }
-    },
-    "phone": "024-648-3804",
-    "website": "ambrose.net",
-    "company": {
-      "name": "Hoeger LLC",
-      "catchPhrase": "Centralized empowering task-force",
-      "bs": "target end-to-end tables"
-    }
-  }
-]
\ No newline at end of file
diff --git a/packages/builder/cypress/integration/addMultiOptionDatatype.spec.js b/packages/builder/cypress/integration/addMultiOptionDatatype.spec.js
deleted file mode 100644
index f844402958..0000000000
--- a/packages/builder/cypress/integration/addMultiOptionDatatype.spec.js
+++ /dev/null
@@ -1,45 +0,0 @@
-import filterTests from "../support/filterTests"
-const interact = require('../support/interact')
-
-filterTests(['all'], () => {
-  xcontext("Add Multi-Option Datatype", () => {
-    before(() => {
-      cy.login()
-      cy.createTestApp()
-    })
-
-    it("should create a new table, with data", () => {
-      cy.createTable("Multi Data")
-      cy.addColumn("Multi Data", "Test Data", "Multi-select", "1\n2\n3\n4\n5")
-      cy.addRowMultiValue(["1", "2", "3", "4", "5"])
-    })
-
-  it("should add form with multi select picker, containing 5 options", () => {
-    cy.navigateToFrontend()
-    // Add data provider
-    cy.searchAndAddComponent("Data Provider")
-    cy.get(interact.DATASOURCE_PROP_CONTROL).click()
-    cy.get(interact.DROPDOWN).contains("Multi Data").click()
-    // Add Form with schema to match table
-    cy.searchAndAddComponent("Form")
-    cy.get(interact.DATASOURCE_PROP_CONTROL).click()
-    cy.get(interact.DROPDOWN).contains("Multi Data").click()
-    // Add multi-select picker to form
-    cy.searchAndAddComponent("Multi-select Picker").then(componentId => {
-      cy.get(interact.DATASOURCE_FIELD_CONTROL).type("Test Data").type("{enter}")
-      cy.wait(1000)
-      cy.getComponent(componentId).contains("Choose some options").click()
-      // Check picker has 5 items
-      cy.getComponent(componentId).find("li").should("have.length", 5)
-      // Select all items
-      for (let i = 1; i < 6; i++) {
-        cy.getComponent(componentId).find("li").contains(i).click()
-      }
-      // Check items have been selected
-      cy.getComponent(componentId)
-        .find(interact.SPECTRUM_PICKER_LABEL)
-        .contains("(5)")
-      })
-    })
-  })
-})
diff --git a/packages/builder/cypress/integration/addRadioButtons.spec.js b/packages/builder/cypress/integration/addRadioButtons.spec.js
deleted file mode 100644
index 3e344c3656..0000000000
--- a/packages/builder/cypress/integration/addRadioButtons.spec.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import filterTests from "../support/filterTests"
-const interact = require('../support/interact')
-
-filterTests(['all'], () => {
-    xcontext("Add Radio Buttons", () => {
-        before(() => {
-        cy.login()
-        cy.createTestApp()
-        })
-
-    it("should add Radio Buttons options picker on form, add data, and confirm", () => {
-        cy.navigateToFrontend()
-        cy.searchAndAddComponent("Form")
-        cy.searchAndAddComponent("Options Picker").then((componentId) => {
-        // Provide field setting
-        cy.get(interact.DATASOURCE_FIELD_CONTROL).type("1")
-        // Open dropdown and select Radio buttons
-        cy.get(interact.OPTION_TYPE_PROP_CONTROL).click().then(() => {
-            cy.get(interact.SPECTRUM_POPOVER).contains('Radio buttons')
-            .click()
-            })
-        const radioButtonsTotal = 3
-        // Add values and confirm total
-        addRadioButtonData(radioButtonsTotal)
-        cy.getComponent(componentId).find('[type="radio"]')
-        .should('have.length', radioButtonsTotal)
-            })
-        })
-        
-        const addRadioButtonData = (totalRadioButtons) => {
-            cy.get(interact.OPTION_SOURCE_PROP_CONROL).click().then(() => {
-                cy.get(interact.SPECTRUM_POPOVER).contains('Custom')
-                .click()
-                .wait(1000)
-            })
-            cy.addCustomSourceOptions(totalRadioButtons)
-        }
-
-    after(() => {
-        cy.deleteAllApps()
-        })
-    })
-})
diff --git a/packages/builder/cypress/integration/adminAndManagement/accountPortals.spec.js b/packages/builder/cypress/integration/adminAndManagement/accountPortals.spec.js
deleted file mode 100644
index d9eb5a9f25..0000000000
--- a/packages/builder/cypress/integration/adminAndManagement/accountPortals.spec.js
+++ /dev/null
@@ -1,116 +0,0 @@
-import filterTests from "../../support/filterTests"
-const interact = require('../../support/interact')
-
-filterTests(["smoke", "all"], () => {
-  xcontext("Account Portals", () => {
-
-    const bbUserEmail = "bbuser@test.com"
-
-    before(() => {
-      cy.login()
-      cy.deleteApp("Cypress Tests")
-      cy.createApp("Cypress Tests", false)
-
-      // Create new user
-      cy.wait(500)
-      cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 })
-      cy.createUser(bbUserEmail)
-      cy.contains("bbuser").click()
-      cy.wait(500)
-
-      // Reset password
-      cy.get(".title").within(() => {
-        cy.get(interact.SPECTRUM_ICON).click({ force: true })
-      })
-      cy.get(interact.SPECTRUM_MENU).within(() => {
-        cy.get(interact.SPECTRUM_MENU_ITEM).contains("Force password reset").click({ force: true })
-      })
-
-      cy.get(interact.SPECTRUM_DIALOG_GRID)
-        .find(interact.SPECTRUM_TEXTFIELD_INPUT).invoke('val').as('pwd')
-
-      cy.get(interact.SPECTRUM_BUTTON).contains("Reset password").click({ force: true })
-
-      // Login as new user and set password
-      cy.logOut()
-      cy.get('@pwd').then((pwd) => {
-        cy.login(bbUserEmail, pwd)
-      })
-
-      for (let i = 0; i < 2; i++) {
-        cy.get(interact.SPECTRUM_TEXTFIELD_INPUT).eq(i).type("test")
-      }
-      cy.get(interact.SPECTRUM_BUTTON).contains("Reset your password").click({ force: true })
-      //cy.logoutNoAppGrid()
-    })
-
-    xit("should verify Standard Portal", () => {
-      // Development access should be disabled (Admin access is already disabled)
-      cy.login()
-      cy.setUserRole("bbuser", "App User")
-      bbUserLogin()
-
-      // Verify Standard Portal
-      cy.get(interact.SPECTRUM_SIDENAV).should('not.exist') // No config sections
-      cy.get(interact.CREATE_APP_BUTTON).should('not.exist') // No create app button
-      cy.get(".app").should('not.exist') // No apps -> no roles assigned to user
-      cy.get(interact.CONTAINER).should('contain', bbUserEmail) // Message containing users email
-
-      cy.logoutNoAppGrid()
-    })
-
-    xit("should verify Admin Portal", () => {
-      cy.login()
-      // Configure user role
-      cy.setUserRole("bbuser", "Admin")
-      bbUserLogin()
-
-      // Verify available options for Admin portal
-      cy.get(interact.SPECTRUM_SIDENAV)
-        .should('contain', 'Apps')
-        //.and('contain', 'Usage')
-        .and('contain', 'Users')
-        .and('contain', 'Auth')
-        .and('contain', 'Email')
-        .and('contain', 'Organisation')
-        .and('contain', 'Theming')
-        .and('contain', 'Update')
-      //.and('contain', 'Upgrade')
-
-      cy.logOut()
-    })
-
-    xit("should verify Development Portal", () => {
-      // Only Development access should be enabled
-      cy.login()
-      cy.setUserRole("bbuser", "Developer")
-      bbUserLogin()
-
-      // Verify available options for Admin portal
-      cy.get(interact.SPECTRUM_SIDENAV)
-        .should('contain', 'Apps')
-        //.and('contain', 'Usage')
-        .and('not.contain', 'Users')
-        .and('not.contain', 'Auth')
-        .and('not.contain', 'Email')
-        .and('not.contain', 'Organisation')
-        .and('contain', 'Theming')
-        .and('not.contain', 'Update')
-        .and('not.contain', 'Upgrade')
-
-      cy.logOut()
-    })
-
-    const bbUserLogin = () => {
-      // Login as bbuser
-      cy.logOut()
-      cy.login(bbUserEmail, "test")
-    }
-
-    after(() => {
-      cy.login()
-      // Delete BB user
-      cy.deleteUser(bbUserEmail)
-    })
-  })
-})
diff --git a/packages/builder/cypress/integration/adminAndManagement/authentication.spec.js b/packages/builder/cypress/integration/adminAndManagement/authentication.spec.js
deleted file mode 100644
index 140dfb9ff8..0000000000
--- a/packages/builder/cypress/integration/adminAndManagement/authentication.spec.js
+++ /dev/null
@@ -1,178 +0,0 @@
-import filterTests from "../../support/filterTests"
-// const interact = require("../support/interact")
-
-filterTests(["smoke", "all"], () => {
-  xcontext("Auth Configuration", () => {
-    before(() => {
-      cy.login()
-    })
-
-    after(() => {
-      cy.get(".spectrum-SideNav li").contains("Auth").click()
-      cy.location().should(loc => {
-        expect(loc.pathname).to.eq("/builder/portal/manage/auth")
-      })
-
-      cy.get("[data-cy=new-scope-input]").clear()
-
-      cy.get("div.content").scrollTo("bottom")
-      cy.get("[data-cy=oidc-active]").click()
-
-      cy.get("[data-cy=oidc-active]").should('not.be.checked')
-
-      cy.intercept("POST", "/api/global/configs").as("updateAuth")
-      cy.get("button[data-cy=oidc-save]").contains("Save").click({ force: true })
-      cy.wait("@updateAuth")
-      cy.get("@updateAuth").its("response.statusCode").should("eq", 200)
-
-      cy.get(".spectrum-Toast-content")
-        .contains("Settings saved")
-        .should("be.visible")
-    })
-
-    it("Should allow updating of the OIDC config", () => {
-      cy.get(".spectrum-SideNav li").contains("Auth").click()
-      cy.location().should(loc => {
-        expect(loc.pathname).to.eq("/builder/portal/manage/auth")
-      })
-      cy.get("div.content").scrollTo("bottom")
-      cy.get(".spectrum-Toast .spectrum-ClearButton").click()
-
-      cy.get("input[data-cy=configUrl]").type("http://budi-auth.com/v2")
-      cy.get("input[data-cy=clientID]").type("34ac6a13-f24a-4b52-c70d-fa544ffd11b2")
-      cy.get("input[data-cy=clientSecret]").type("12A8Q~4nS_DWhOOJ2vWIRsNyDVsdtXPD.Zxa9df_")
-
-      cy.get("button[data-cy=oidc-save]").should("not.be.disabled");
-
-      cy.intercept("POST", "/api/global/configs").as("updateAuth")
-      cy.get("button[data-cy=oidc-save]").contains("Save").click({ force: true })
-      cy.wait("@updateAuth")
-      cy.get("@updateAuth").its("response.statusCode").should("eq", 200)
-
-      cy.get(".spectrum-Toast-content")
-        .contains("Settings saved")
-        .should("be.visible")
-    })
-
-    it("Should display default scopes in advanced config.", () => {
-      cy.get(".spectrum-SideNav li").contains("Auth").click()
-      cy.location().should(loc => {
-        expect(loc.pathname).to.eq("/builder/portal/manage/auth")
-      })
-      cy.get("div.content").scrollTo("bottom")
-
-      cy.get(".spectrum-Tags").find(".spectrum-Tags-item").its("length").should("eq", 4)
-
-      cy.get(".spectrum-Tags-item").contains("openid")
-      cy.get(".spectrum-Tags-item").contains("openid").find(".spectrum-ClearButton").should("not.exist")
-
-      cy.get(".spectrum-Tags-item").contains("offline_access")
-      cy.get(".spectrum-Tags-item").contains("email")
-      cy.get(".spectrum-Tags-item").contains("profile")
-    })
-
-    it("Add a new scopes", () => {
-      cy.get(".spectrum-SideNav li").contains("Auth").click()
-      cy.location().should(loc => {
-        expect(loc.pathname).to.eq("/builder/portal/manage/auth")
-      })
-      cy.get("div.content").scrollTo("bottom")
-
-      cy.get("[data-cy=new-scope-input]").type("Sample{enter}")
-      cy.get(".spectrum-Tags").find(".spectrum-Tags-item").its("length").should("eq", 5)
-      cy.get(".spectrum-Tags-item").contains("Sample")
-
-      cy.get(".auth-form input.spectrum-Textfield-input").type("Another ")
-      cy.get(".spectrum-Tags").find(".spectrum-Tags-item").its("length").should("eq", 6)
-      cy.get(".spectrum-Tags-item").contains("Another")
-
-      cy.get("button[data-cy=oidc-save]").should("not.be.disabled");
-
-      cy.intercept("POST", "/api/global/configs").as("updateAuth")
-      cy.get("button[data-cy=oidc-save]").contains("Save").click({ force: true })
-      cy.wait("@updateAuth")
-      cy.get("@updateAuth").its("response.statusCode").should("eq", 200)
-
-      cy.reload()
-
-      cy.get("div.content").scrollTo("bottom")
-
-      cy.get(".spectrum-Tags-item").contains("openid")
-      cy.get(".spectrum-Tags-item").contains("offline_access")
-      cy.get(".spectrum-Tags-item").contains("email")
-      cy.get(".spectrum-Tags-item").contains("profile")
-      cy.get(".spectrum-Tags-item").contains("Sample")
-      cy.get(".spectrum-Tags-item").contains("Another")
-    })
-
-    it("Should allow the removal of auth scopes", () => {
-      cy.get(".spectrum-SideNav li").contains("Auth").click()
-      cy.location().should(loc => {
-        expect(loc.pathname).to.eq("/builder/portal/manage/auth")
-      })
-      cy.get("div.content").scrollTo("bottom")
-
-      cy.get(".spectrum-Tags-item").contains("offline_access").parent().find(".spectrum-ClearButton").click()
-      cy.get(".spectrum-Tags-item").contains("profile").parent().find(".spectrum-ClearButton").click()
-
-      cy.get(".spectrum-Tags").find(".spectrum-Tags-item").its("length").should("eq", 4)
-
-      cy.get(".spectrum-Tags-item").contains("offline_access").should("not.exist")
-      cy.get(".spectrum-Tags-item").contains("profile").should("not.exist")
-
-      cy.get("button[data-cy=oidc-save]").should("not.be.disabled");
-
-      cy.intercept("POST", "/api/global/configs").as("updateAuth")
-      cy.get("button[data-cy=oidc-save]").contains("Save").click({ force: true })
-      cy.wait("@updateAuth")
-      cy.get("@updateAuth").its("response.statusCode").should("eq", 200)
-
-      cy.get(".spectrum-Toast-content")
-        .contains("Settings saved")
-        .should("be.visible")
-
-      cy.reload()
-
-      cy.get(".spectrum-Tags").find(".spectrum-Tags-item").its("length").should("eq", 4)
-
-      cy.get(".spectrum-Tags-item").contains("offline_access").should("not.exist")
-      cy.get(".spectrum-Tags-item").contains("profile").should("not.exist")
-    })
-
-    it("Should allow auth scopes to be reset to the core defaults.", () => {
-      cy.get(".spectrum-SideNav li").contains("Auth").click()
-
-      cy.get("div.content").scrollTo("bottom")
-
-      cy.get("[data-cy=restore-oidc-default-scopes]").click({ force: true })
-
-      cy.get(".spectrum-Tags").find(".spectrum-Tags-item").its("length").should("eq", 4)
-
-      cy.get(".spectrum-Tags-item").contains("openid")
-      cy.get(".spectrum-Tags-item").contains("offline_access")
-      cy.get(".spectrum-Tags-item").contains("email")
-      cy.get(".spectrum-Tags-item").contains("profile")
-    })
-
-    it("Should not allow invalid characters in the auth scopes", () => {
-      cy.get("[data-cy=new-scope-input]").type("thisIsInvalid\\{enter}")
-      cy.get(".spectrum-Form-itemField .error").contains("Auth scopes cannot contain spaces, double quotes or backslashes")
-      cy.get(".spectrum-Tags").find(".spectrum-Tags-item").its("length").should("eq", 4)
-
-      cy.get("[data-cy=new-scope-input]").clear()
-
-      cy.get("[data-cy=new-scope-input]").type("alsoInvalid\"{enter}")
-      cy.get(".spectrum-Form-itemField .error").contains("Auth scopes cannot contain spaces, double quotes or backslashes")
-      cy.get(".spectrum-Tags").find(".spectrum-Tags-item").its("length").should("eq", 4)
-
-      cy.get("[data-cy=new-scope-input]").clear()
-    })
-
-    it("Should not allow duplicate auth scopes", () => {
-      cy.get("[data-cy=new-scope-input]").type("offline_access{enter}")
-      cy.get(".spectrum-Form-itemField .error").contains("Auth scope already exists")
-      cy.get(".spectrum-Tags").find(".spectrum-Tags-item").its("length").should("eq", 4)
-    })
-
-  })
-})
\ No newline at end of file
diff --git a/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js b/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js
deleted file mode 100644
index 3d3f5d3956..0000000000
--- a/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js
+++ /dev/null
@@ -1,238 +0,0 @@
-import filterTests from "../../support/filterTests"
-const interact = require('../../support/interact')
-
-filterTests(["smoke", "all"], () => {
-  xcontext("User Management", () => {
-    before(() => {
-      cy.login()
-      cy.deleteApp("Cypress Tests")
-      cy.createApp("Cypress Tests", false)
-    })
-
-    xit("should create a user via basic onboarding", () => {
-      cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000})
-      cy.createUser("bbuser@test.com")
-      cy.get(interact.SPECTRUM_TABLE).should("contain", "bbuser")
-    })
-
-    xit("should confirm App User role for a New User", () => {
-      cy.contains("bbuser").click()
-      cy.get(".spectrum-Form-itemField").eq(3).should('contain', 'App User')
-
-      // User should not have app access
-      cy.get(".spectrum-Heading").contains("Apps").parent().within(() => {
-        cy.get(interact.LIST_ITEMS, { timeout: 500 }).should("contain", "This user has access to no apps")
-      })
-    })
-
-    if (Cypress.env("TEST_ENV")) {
-      xit("should assign role types", () => {
-        // 3 apps minimum required - to assign an app to each role type
-        cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
-          .its("body")
-          .then(val => {
-            if (val.length < 3) {
-              for (let i = 1; i < 3; i++) {
-                const uuid = () => Cypress._.random(0, 1e6)
-                const name = uuid()
-                if(i < 1){
-                  cy.createApp(name, false)
-                } else {
-                  cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000})
-                  cy.wait(1000)
-                  cy.get(interact.CREATE_APP_BUTTON, { timeout: 2000 }).click({ force: true })
-                  cy.createAppFromScratch(name)
-                }
-              }
-            }
-          })
-        // Navigate back to the user
-        cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000})
-        cy.get(interact.SPECTRUM_SIDENAV).contains("Users").click()
-        cy.get(interact.SPECTRUM_TABLE, { timeout: 1000 }).contains("bbuser").click()
-        cy.get(interact.SPECTRUM_HEADING).contains("bbuser", { timeout: 2000})
-        for (let i = 0; i < 3; i++) {
-          cy.get(interact.SPECTRUM_TABLE, { timeout: 3000})
-            .eq(1)
-            .find(interact.SPECTRUM_TABLE_ROW)
-            .eq(0)
-            .find(interact.SPECTRUM_TABLE_CELL)
-            .eq(0)
-            .click()
-          cy.get(interact.SPECTRUM_DIALOG_GRID, { timeout: 1000 })
-            .contains("Choose an option")
-            .click()
-            .then(() => {
-              if (i == 0) {
-                cy.get(interact.SPECTRUM_MENU, { timeout: 2000 }).contains("Admin").click({ force: true })
-              }
-              else if (i == 1) {
-                cy.get(interact.SPECTRUM_MENU, { timeout: 2000 }).contains("Power").click({ force: true })
-              }
-              else if (i == 2) {
-                cy.get(interact.SPECTRUM_MENU, { timeout: 2000 }).contains("Basic").click({ force: true })
-              }
-              cy.get(interact.SPECTRUM_BUTTON, { timeout: 2000 })
-                .contains("Update role")
-                .click({ force: true })
-            })
-            cy.reload()
-            cy.wait(1000)
-        }
-        // Confirm roles exist within Configure roles table
-        cy.get(interact.SPECTRUM_TABLE, { timeout: 20000 })
-          .eq(0)
-          .within(assginedRoles => {
-            expect(assginedRoles).to.contain("Admin")
-            expect(assginedRoles).to.contain("Power")
-            expect(assginedRoles).to.contain("Basic")
-          })
-      })
-  
-      xit("should unassign role types", () => {
-        // Set each app within Configure roles table to 'No Access'
-        cy.get(interact.SPECTRUM_TABLE)
-          .eq(0)
-          .find(interact.SPECTRUM_TABLE_ROW)
-          .its("length")
-          .then(len => {
-            for (let i = 0; i < len; i++) {
-              cy.get(interact.SPECTRUM_TABLE)
-                .eq(0)
-                .find(interact.SPECTRUM_TABLE_ROW)
-                .eq(0)
-                .find(interact.SPECTRUM_TABLE_CELL)
-                .eq(0)
-                .click()
-                .then(() => {
-                  cy.get(interact.SPECTRUM_PICKER).eq(1).click({ force: true })
-                  cy.get(interact.SPECTRUM_POPOVER, { timeout: 500 }).contains("No Access").click()
-                })
-              cy.get(interact.SPECTRUM_BUTTON)
-                .contains("Update role")
-                .click({ force: true })
-            }
-          })
-        // Confirm Configure roles table no longer has any apps in it
-        cy.get(interact.SPECTRUM_TABLE, { timeout: 1000 }).eq(0).contains("No rows found")
-      })
-    }
-
-    xit("should enable Developer access and verify application access", () => {
-      // Enable Developer access
-      cy.get(interact.FIELD)
-        .eq(4)
-        .within(() => {
-          cy.get(interact.SPECTRUM_SWITCH_INPUT).click({ force: true })
-        })
-      // No Access table should now be empty
-      cy.get(interact.CONTAINER)
-        .contains("No Access")
-        .parent()
-        .within(() => {
-          cy.get(interact.SPECTRUM_TABLE).contains("No rows found")
-        })
-
-      // Each app within Configure roles should have Admin access
-      cy.get(interact.SPECTRUM_TABLE)
-        .eq(0)
-        .find(interact.SPECTRUM_TABLE_ROW)
-        .its("length")
-        .then(len => {
-          for (let i = 0; i < len; i++) {
-            cy.get(interact.SPECTRUM_TABLE)
-              .eq(0)
-              .find(interact.SPECTRUM_TABLE_ROW)
-              .eq(i)
-              .contains("Admin")
-            cy.wait(500)
-          }
-        })
-    })
-
-    xit("should disable Developer access and verify application access", () => {
-      // Disable Developer access
-      cy.get(interact.FIELD)
-        .eq(4)
-        .within(() => {
-          cy.get(".spectrum-Switch-input").click({ force: true })
-        })
-      // Configure roles table should now be empty
-      cy.get(interact.CONTAINER)
-        .contains("Configure roles")
-        .parent()
-        .within(() => {
-          cy.get(interact.SPECTRUM_TABLE).contains("No rows found")
-        })
-    })
-
-    xit("Should edit user details within user details page", () => {
-      // Add First name
-      cy.get(interact.FIELD, { timeout: 1000 }).eq(1).within(() => {
-        cy.wait(500)
-        cy.get(interact.SPECTRUM_TEXTFIELD_INPUT, { timeout: 1000 }).wait(500).clear().click().type("bb")
-      })
-      // Add Last name
-      cy.get(interact.FIELD, { timeout: 1000 }).eq(2).within(() => {
-        cy.wait(500)
-        cy.get(interact.SPECTRUM_TEXTFIELD_INPUT, { timeout: 1000 }).click().wait(500).clear().type("test")
-      })
-      cy.get(interact.FIELD, { timeout: 1000 }).eq(0).click()
-      // Reload page
-      cy.reload()
-
-      // Confirm details have been saved
-      cy.get(interact.FIELD, { timeout: 20000 }).eq(1).within(() => {
-        cy.get(interact.SPECTRUM_TEXTFIELD_INPUT).should('have.value', "bb")
-      })
-      cy.get(interact.FIELD, { timeout: 1000 }).eq(2).within(() => {
-        cy.get(interact.SPECTRUM_TEXTFIELD_INPUT, { timeout: 1000 }).should('have.value', "test")
-      })
-    })
-
-    xit("should reset the users password", () => {
-      cy.get(".title").within(() => {
-        cy.get(interact.SPECTRUM_ICON).click({ force: true })
-      })
-      cy.get(interact.SPECTRUM_MENU).within(() => {
-        cy.get(interact.SPECTRUM_MENU_ITEM).contains("Force password reset").click({ force: true })
-      })
-
-      // Reset password modal
-      cy.get(interact.SPECTRUM_DIALOG_GRID)
-      .find(interact.SPECTRUM_TEXTFIELD_INPUT).invoke('val').as('pwd')
-      cy.get(interact.SPECTRUM_BUTTON).contains("Reset password").click({ force: true })
-      cy.get(interact.SPECTRUM_BUTTON).contains("Reset password").should('not.exist')
-
-      // Logout, then login with new password
-      cy.logOut()
-      cy.get('@pwd').then((pwd) => {
-        cy.login("bbuser@test.com", pwd)
-      })
-
-      // Reset password screen
-      for (let i = 0; i < 2; i++) {
-        cy.get(interact.SPECTRUM_TEXTFIELD_INPUT).eq(i).type("test")
-      }
-      cy.get(interact.SPECTRUM_BUTTON).contains("Reset your password").click({ force: true })
-
-      // Confirm user logged in afer password change
-      cy.login("bbuser@test.com", "test")
-      cy.get(".avatar > .icon").click({ force: true })
-
-      cy.get(".spectrum-Menu-item").contains("Update user information").click({ force: true })
-      cy.get(interact.SPECTRUM_TEXTFIELD_INPUT)
-      .eq(0)
-      .invoke('val').should('eq', 'bbuser@test.com')
-      
-      // Logout and login as previous user
-      cy.logoutNoAppGrid()
-      cy.login()
-      })
-
-    xit("should delete a user", () => {
-      cy.deleteUser("bbuser@test.com")
-      cy.get(interact.SPECTRUM_TABLE, { timeout: 4000 }).should("not.have.text", "bbuser")
-    })
-  })
-})
diff --git a/packages/builder/cypress/integration/adminAndManagement/userSettings.spec.js b/packages/builder/cypress/integration/adminAndManagement/userSettings.spec.js
deleted file mode 100644
index 18362031c9..0000000000
--- a/packages/builder/cypress/integration/adminAndManagement/userSettings.spec.js
+++ /dev/null
@@ -1,114 +0,0 @@
-import filterTests from "../../support/filterTests"
-const interact = require('../../support/interact')
-
-filterTests(["smoke", "all"], () => {
-  context("User Settings Menu", () => {
-
-    before(() => {
-      cy.login()
-    })
-
-    it("should update user information via user settings menu", () => {
-      const fname = "test"
-      const lname = "user"
-
-      cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.updateUserInformation(fname, lname)
-
-      // Go to user info and confirm name update
-      cy.contains("Users").click()
-      cy.contains("test@test.com").click()
-
-      cy.get(interact.FIELD, { timeout: 1000 }).eq(1).within(() => {
-        cy.get(interact.SPECTRUM_TEXTFIELD_INPUT).should('have.value', fname)
-      })
-      cy.get(interact.FIELD).eq(2).within(() => {
-        cy.get(interact.SPECTRUM_TEXTFIELD_INPUT).should('have.value', lname)
-      })
-    })
-
-    xit("should allow copying of the users API key", () => {
-      cy.get(".user-dropdown .avatar > .icon", { timeout: 2000 }).click({ force: true })
-      cy.get(interact.SPECTRUM_MENU_ITEM).contains("View API key").click({ force: true })
-      cy.get(interact.SPECTRUM_DIALOG_CONTENT).within(() => {
-        cy.get(interact.SPECTRUM_ICON).click({ force: true })
-      })
-      // There may be timing issues with this on the smoke build
-      cy.wait(500)
-      cy.get(".spectrum-Toast-content")
-        .contains("URL copied to clipboard")
-        .should("be.visible")
-    })
-
-    it("should allow API key regeneration", () => {
-      cy.get(".user-dropdown .icon", { timeout: 2000 }).click({ force: true })
-      cy.get(interact.SPECTRUM_MENU_ITEM).contains("View API key").click({ force: true })
-      cy.get(interact.SPECTRUM_DIALOG_CONTENT).within(() => {
-        cy.get(interact.SPECTRUM_ICON).click({ force: true })
-      })
-      // Get initial API key value
-      cy.get(interact.SPECTRUM_DIALOG_CONTENT)
-        .find(interact.SPECTRUM_TEXTFIELD_INPUT).invoke('val').as('keyOne')
-
-      // Click re-generate key button
-      cy.get("button").contains("Regenerate key").click({ force: true })
-
-      // Verify API key was changed
-      cy.get(interact.SPECTRUM_DIALOG_CONTENT).within(() => {
-        cy.get('@keyOne').then((keyOne) => {
-          cy.get(interact.SPECTRUM_TEXTFIELD_INPUT).invoke('val').should('not.eq', keyOne)
-        })
-      })
-      cy.closeModal()
-    })
-
-    it("should update password", () => {
-      // Access Update password modal
-      cy.get(".user-dropdown .icon", { timeout: 2000 }).click({ force: true })
-      cy.get(interact.SPECTRUM_MENU_ITEM).contains("Update password").click({ force: true })
-
-      // Enter new password and update
-      cy.get(interact.SPECTRUM_DIALOG_GRID).within(() => {
-        for (let i = 0; i < 2; i++) {
-          // password set to 'newpwd'
-          cy.get(interact.SPECTRUM_TEXTFIELD_INPUT).eq(i).type("newpwd")
-        }
-        cy.get("button").contains("Update password").click({ force: true })
-      })
-
-      // Logout & in with new password
-      //cy.logOut()
-      cy.login("test@test.com", "newpwd")
-    })
-
-    xit("should open and close developer mode", () => {
-      cy.get(".user-dropdown .icon", { timeout: 2000 }).click({ force: true })
-
-      // Close developer mode & verify
-      cy.get(interact.SPECTRUM_MENU_ITEM).contains("Close developer mode").click({ force: true })
-      cy.get(interact.SPECTRUM_SIDENAV).should('not.exist') // No config sections
-      cy.get(interact.CREATE_APP_BUTTON).should('not.exist') // No create app button
-      cy.get(".app").should('not.exist') // At least one app should be available
-
-      // Open developer mode & verify
-      cy.get(".avatar > .icon").click({ force: true })
-      cy.get(interact.SPECTRUM_MENU_ITEM).contains("Open developer mode").click({ force: true })
-      cy.get(".app-table").should('exist') // config sections available
-      cy.get(interact.CREATE_APP_BUTTON).should('exist') // create app button available
-    })
-
-    after(() => {
-      // Change password back to original value
-      cy.get(".user-dropdown .icon", { timeout: 2000 }).click({ force: true })
-      cy.get(interact.SPECTRUM_MENU_ITEM).contains("Update password").click({ force: true })
-      cy.get(interact.SPECTRUM_DIALOG_GRID).within(() => {
-        for (let i = 0; i < 2; i++) {
-          cy.get(interact.SPECTRUM_TEXTFIELD_INPUT).eq(i).type("test")
-        }
-        cy.get("button").contains("Update password").click({ force: true })
-      })
-      // Remove users name
-      cy.updateUserInformation()
-    })
-  })
-})
diff --git a/packages/builder/cypress/integration/appOverview.spec.js b/packages/builder/cypress/integration/appOverview.spec.js
deleted file mode 100644
index 60d0f2a06d..0000000000
--- a/packages/builder/cypress/integration/appOverview.spec.js
+++ /dev/null
@@ -1,442 +0,0 @@
-import filterTests from "../support/filterTests"
-import clientPackage from "@budibase/client/package.json"
-
-filterTests(["all"], () => {
-  xcontext("Application Overview screen", () => {
-    before(() => {
-      cy.login()
-      cy.deleteAllApps()
-      cy.createApp("Cypress Tests")
-    })
-
-    xit("Should be accessible from the applications list", () => {
-      cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.get(".appTable .title")
-        .eq(0)
-        .invoke("attr", "data-cy")
-        .then($dataCy => {
-          const dataCy = $dataCy
-          cy.get(".appTable .app-row-actions button")
-            .contains("Manage")
-            .click({ force: true })
-
-          cy.location().should(loc => {
-            expect(loc.pathname).to.eq("/builder/portal/overview/" + dataCy)
-          })
-        })
-    })
-
-    // Find a more suitable place for this.
-    xit("Should allow unlocking in the app list", () => {
-      cy.visit(`${Cypress.config().baseUrl}/builder`)
-
-      cy.get(".appTable .lock-status").eq(0).contains("Locked by you").click()
-
-      cy.unlockApp({ owned: true })
-
-      cy.get(".appTable").should("exist")
-      cy.get(".lock-status").should("not.be.visible")
-    })
-
-    xit("Should allow unlocking in the app overview screen", () => {
-      cy.visit(`${Cypress.config().baseUrl}/builder`)
-
-      cy.get(".appTable .app-row-actions button")
-        .contains("Edit")
-        .eq(0)
-        .click({ force: true })
-      cy.wait(1000)
-      cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.get(".appTable .app-row-actions button")
-        .contains("Manage")
-        .eq(0)
-        .click({ force: true })
-      cy.get(".lock-status").eq(0).contains("Locked by you").click()
-
-      cy.unlockApp({ owned: true })
-
-      cy.get(".lock-status").should("not.be.visible")
-    })
-
-    xit("Should reflect the deploy state of an app that hasn't been published.", () => {
-      cy.visit(`${Cypress.config().baseUrl}/builder`)
-
-      cy.get(".appTable .app-row-actions button")
-        .contains("Manage")
-        .eq(0)
-        .click({ force: true })
-      cy.get(".header-right button.spectrum-Button[data-cy='view-app']").should(
-        "be.disabled"
-      )
-
-      cy.get(".spectrum-Tabs-item.is-selected").contains("Overview")
-      cy.get(".overview-tab").should("be.visible")
-
-      cy.get(".overview-tab [data-cy='app-status']").within(() => {
-        cy.get(".status-display").contains("Unpublished")
-        cy.get(".status-display .icon svg[aria-label='GlobeStrike']").should(
-          "exist"
-        )
-        cy.get(".status-text").contains("-")
-      })
-    })
-
-    xit("Should reflect the app deployment state", () => {
-      cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 })
-      cy.get(".appTable .app-row-actions button")
-        .contains("Edit")
-        .eq(0)
-        .click({ force: true })
-
-      cy.wait(500)
-      cy.get(".toprightnav button.spectrum-Button", { timeout: 2000 })
-        .contains("Publish")
-        .click({ force: true })
-      cy.get(".spectrum-Modal [data-cy='deploy-app-modal']")
-        .should("be.visible")
-        .within(() => {
-          cy.get(".spectrum-Button").contains("Publish").click({ force: true })
-          cy.wait(1000)
-        })
-
-      cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.get(".appTable .app-row-actions button")
-        .contains("Manage")
-        .eq(0)
-        .click({ force: true })
-      cy.get(".header-right button.spectrum-Button[data-cy='view-app']").should(
-        "not.be.disabled"
-      )
-
-      cy.get(".overview-tab [data-cy='app-status']").within(() => {
-        cy.get(".status-display").contains("Published")
-        cy.get(".status-display .icon svg[aria-label='GlobeCheck']").should(
-          "exist"
-        )
-        cy.get(".status-text").contains("Last published a few seconds ago")
-      })
-    })
-
-    xit("Should reflect an application that has been unpublished", () => {
-      cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.get(".appTable .app-row-actions button")
-        .contains("Edit")
-        .eq(0)
-        .click({ force: true })
-
-      cy.get(".deployment-top-nav svg[aria-label='Globe']").click({
-        force: true,
-      })
-
-      cy.get("[data-cy='publish-popover-menu']").should("be.visible")
-      cy.get(
-        "[data-cy='publish-popover-menu'] [data-cy='publish-popover-action']"
-      ).click({ force: true })
-
-      cy.get("[data-cy='unpublish-modal']")
-        .should("be.visible")
-        .within(() => {
-          cy.get(".confirm-wrap button").click({ force: true })
-        })
-
-      cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.wait(1000)
-      cy.get(".appTable .app-row-actions button", { timeout: 10000 })
-        .contains("Manage")
-        .eq(0)
-        .click({ force: true })
-      cy.get(".overview-tab [data-cy='app-status']").within(() => {
-        cy.get(".status-display").contains("Unpublished")
-        cy.get(".status-display .icon svg[aria-label='GlobeStrike']").should(
-          "exist"
-        )
-        cy.get(".status-text").contains("Last published a few seconds ago")
-      })
-    })
-
-    xit("Should allow the editing of the application icon and colour", () => {
-      cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.get(".appTable .app-row-actions button")
-        .contains("Manage")
-        .eq(0)
-        .click({ force: true })
-      cy.get(".edit-hover", { timeout: 1000 }).eq(0).click({ force: true })
-      // Select random icon
-      cy.wait(400)
-      cy.get(".grid").within(() => {
-        cy.get(".icon-item")
-          .eq(Math.floor(Math.random() * 23) + 1)
-          .click()
-      })
-      // Select random colour
-      cy.get(".fill").click()
-      cy.get(".colors").within(() => {
-        cy.get(".color")
-          .eq(Math.floor(Math.random() * 33) + 1)
-          .click()
-      })
-      cy.intercept("**/applications/**").as("iconChange")
-      cy.get(".spectrum-Button").contains("Save").click({ force: true })
-      cy.wait("@iconChange")
-      cy.get("@iconChange").its("response.statusCode").should("eq", 200)
-      // Confirm icon has changed from default
-      // Confirm colour has been applied
-      cy.get(".spectrum-ActionButton-label").contains("Back").click({ force: true })
-      cy.get(".appTable", { timeout: 2000 }).within(() => {
-        cy.get("[aria-label]")
-          .eq(0)
-          .children()
-          .should("have.attr", "xlink:href")
-          .and("not.contain", "#spectrum-icon-18-Apps")
-        cy.get(".title")
-          .children()
-          .children()
-          .should("have.attr", "style")
-          .and("contains", "color")
-      })
-    })
-
-    xit("Should reflect the last time the application was edited", () => {
-      cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.get(".appTable .app-row-actions button")
-        .contains("Manage")
-        .eq(0)
-        .click({ force: true })
-      cy.get(".header-right button").contains("Edit").click({ force: true })
-
-      cy.navigateToFrontend()
-
-      cy.searchAndAddComponent("Headline").then(componentId => {
-        cy.getComponent(componentId).should("exist")
-      })
-
-      cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.get(".appTable .app-row-actions button")
-        .contains("Manage")
-        .eq(0)
-        .click({ force: true })
-      cy.get(".overview-tab [data-cy='edited-by']").within(() => {
-        cy.get(".editor-name").contains("You")
-        cy.get(".last-edit-text").contains("Last edited a few seconds ago")
-      })
-    })
-
-    xit("Should reflect application version is up-to-date", () => {
-      cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.get(".appTable .app-row-actions button")
-        .contains("Manage")
-        .eq(0)
-        .click({ force: true })
-      cy.get(".overview-tab [data-cy='app-version']").within(() => {
-        cy.get(".version-status").contains("You're running the latest!")
-      })
-    })
-
-    it("Should navigate to the settings tab when clicking the App Version card header", () => {
-      cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.get(".appTable .app-row-actions button")
-        .contains("Manage")
-        .eq(0)
-        .click({ force: true })
-      cy.get(".spectrum-Tabs-item.is-selected").contains("Overview")
-      cy.get(".overview-tab").should("be.visible")
-
-      cy.get(".overview-tab [data-cy='app-version'] .dash-card-header").click({
-        force: true,
-      })
-
-      cy.get(".spectrum-Tabs-item.is-selected").contains("Settings")
-      cy.get(".settings-tab").should("be.visible")
-      cy.get(".overview-tab").should("not.exist")
-    })
-
-    it("Should allow the upgrading of an application, if available.", () => {
-      cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.get(".appTable .app-row-actions button")
-        .contains("Manage")
-        .eq(0)
-        .click({ force: true })
-      cy.wait(500)
-
-      cy.location().then(loc => {
-        const params = loc.pathname.split("/")
-        const appId = params[params.length - 1]
-        cy.log(appId)
-        //Downgrade the app for the test
-        cy.alterAppVersion(appId, "0.0.1-alpha.0").then(() => {
-          cy.reload()
-          cy.log("Current deployment version: " + clientPackage.version)
-
-          cy.get(".version-status a", { timeout: 5000 }).contains("Update").click()
-          cy.get(".spectrum-Tabs-item.is-selected").contains("Settings")
-
-          cy.get(".version-section .page-action button")
-            .contains("Update")
-            .click({ force: true })
-
-          cy.intercept("POST", "**/applications/**/client/update").as(
-            "updateVersion"
-          )
-          cy.get(".spectrum-Modal.is-open button")
-            .contains("Update")
-            .click({ force: true })
-
-          cy.wait("@updateVersion")
-            .its("response.statusCode")
-            .should("eq", 200)
-            .then(() => {
-              cy.visit(`${Cypress.config().baseUrl}/builder`)
-              cy.get(".appTable .app-row-actions button")
-                .contains("Manage")
-                .eq(0)
-                .click({ force: true })
-              cy.get(".spectrum-Tabs-item")
-                .contains("Overview")
-                .click({ force: true })
-              cy.get(".overview-tab [data-cy='app-version']").within(() => {
-                cy.get(".spectrum-Heading").contains(clientPackage.version)
-                cy.get(".version-status").contains("You're running the latest!")
-              })
-            })
-        })
-      })
-    })
-
-    xit("Should allow editing of the app details.", () => {
-      cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 })
-      cy.get(".appTable .app-row-actions button")
-        .contains("Manage")
-        .eq(0)
-        .click({ force: true })
-      cy.get(".spectrum-Tabs-item").contains("Settings").click()
-      cy.get(".spectrum-Tabs-item.is-selected").contains("Settings")
-      cy.get(".settings-tab").should("be.visible")
-
-      cy.get(".details-section .page-action button")
-        .contains("Edit")
-        .click({ force: true })
-      cy.updateAppName("sample name")
-
-      //publish and check its disabled
-      cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 })
-      cy.wait(500)
-      cy.get(".appTable .app-row-actions button")
-        .contains("Edit")
-        .eq(0)
-        .click({ force: true })
-
-      cy.get(".toprightnav button.spectrum-Button")
-        .contains("Publish")
-        .click({ force: true })
-      cy.get(".spectrum-Modal [data-cy='deploy-app-modal']")
-        .should("be.visible")
-        .within(() => {
-          cy.get(".spectrum-Button").contains("Publish").click({ force: true })
-          cy.wait(1000)
-        })
-
-      cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 10000 })
-      cy.get(".appTable .app-row-actions button", { timeout: 5000 })
-        .contains("Manage")
-        .eq(0)
-        .click({ force: true })
-      cy.get(".spectrum-Tabs-item").contains("Settings").click()
-      cy.get(".spectrum-Tabs-item.is-selected").contains("Settings")
-
-      cy.get(".details-section .page-action .spectrum-Button").scrollIntoView()
-      cy.get(".details-section .page-action .spectrum-Button", { timeout: 1000 }).should(
-        "be.disabled"
-      )
-    })
-
-    xit("Should allow copying of the published application Id", () => {
-      cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.get(".appTable .app-row-actions")
-        .eq(0)
-        .within(() => {
-          cy.get(".spectrum-Button").contains("Edit").click({ force: true })
-        })
-
-      cy.publishApp("sample-name")
-
-      cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.get(".appTable .app-row-actions button")
-        .contains("Manage")
-        .eq(0)
-        .click({ force: true })
-      cy.get(".app-overview-actions-icon > .icon").click({ force: true })
-
-      cy.get("[data-cy='app-overview-menu-popover']")
-        .eq(0)
-        .within(() => {
-          cy.get(".spectrum-Menu-item")
-            .contains("Copy App ID")
-            .click({ force: true })
-        })
-
-      cy.get(".spectrum-Toast-content")
-        .contains("App ID copied to clipboard.")
-        .should("be.visible")
-    })
-
-    xit("Should allow unpublishing of the application via the Unpublish link", () => {
-      cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.get(".appTable .app-row-actions button")
-        .contains("Manage")
-        .eq(0)
-        .click({ force: true })
-
-      cy.get(`[data-cy="app-status"]`).within(() => {
-        cy.contains("Unpublish").click({ force: true })
-      })
-
-      cy.get("[data-cy='unpublish-modal']")
-        .should("be.visible")
-        .within(() => {
-          cy.get(".confirm-wrap button").click({ force: true })
-        })
-
-      cy.get(".overview-tab [data-cy='app-status']").within(() => {
-        cy.get(".status-display").contains("Unpublished")
-        cy.get(".status-display .icon svg[aria-label='GlobeStrike']")
-          .should("exist")
-      })
-    })
-
-    xit("Should allow deleting of the application", () => {
-      cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.get(".appTable .app-row-actions button")
-        .contains("Manage")
-        .eq(0)
-        .click({ force: true })
-      cy.get(".app-overview-actions-icon > .icon").click({ force: true })
-
-      cy.get("[data-cy='app-overview-menu-popover']")
-        .eq(0)
-        .within(() => {
-          cy.get(".spectrum-Menu-item")
-            .contains("Delete")
-            .click({ force: true })
-          cy.wait(500)
-        })
-
-      //The test application was renamed earlier in the spec
-      cy.get(".spectrum-Dialog-grid").within(() => {
-        cy.get("input").type("sample name")
-        cy.get(".spectrum-Button--warning").click()
-      })
-
-      cy.location().should(loc => {
-        expect(loc.pathname).to.eq("/builder/portal/apps")
-      })
-
-      cy.get(".appTable").should("not.exist")
-
-      cy.get(".welcome .container h1").contains("Let's create your first app!")
-    })
-
-    after(() => {
-      cy.deleteAllApps()
-    })
-  })
-})
diff --git a/packages/builder/cypress/integration/appPublishWorkflow.spec.js b/packages/builder/cypress/integration/appPublishWorkflow.spec.js
deleted file mode 100644
index 3376db0b2d..0000000000
--- a/packages/builder/cypress/integration/appPublishWorkflow.spec.js
+++ /dev/null
@@ -1,108 +0,0 @@
-import filterTests from "../support/filterTests"
-import { APP_TABLE_APP_NAME, DEPLOY_SUCCESS_MODAL } from "../support/interact";
-const interact = require('../support/interact')
-
-filterTests(['all'], () => {
-  xcontext("Publish Application Workflow", () => {
-    before(() => {
-      cy.login()
-      cy.deleteAllApps()
-      cy.createApp("Cypress Tests", false)
-    })
-
-    xit("Should reflect the unpublished status correctly", () => {
-      cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 })
-
-      cy.get(interact.APP_TABLE_STATUS, { timeout: 3000 }).eq(0)
-        .within(() => {
-          cy.contains("Unpublished")
-          cy.get(interact.GLOBESTRIKE).should("exist")
-        })
-
-      cy.get(interact.APP_TABLE_ROW_ACTION).eq(0)
-        .within(() => {
-          cy.get(interact.SPECTRUM_BUTTON_TEMPLATE).contains("Edit").click({ force: true })
-        })
-
-      cy.get(interact.DEPLOYMENT_TOP_NAV_GLOBESTRIKE).should("exist")
-      cy.get(interact.DEPLOYMENT_TOP_GLOBE).should("not.exist")
-    })
-
-    xit("Should publish an application and correctly reflect that", () => {
-      //Assuming the previous test was run and the unpublished app is open in edit mode.
-      cy.get(interact.TOPRIGHTNAV_BUTTON_SPECTRUM).contains("Publish").click({ force: true })
-
-      cy.get(interact.DEPLOY_APP_MODAL).should("be.visible")
-        .within(() => {
-          cy.get(interact.SPECTRUM_BUTTON).contains("Publish").click({ force: true })
-        });
-
-      //Verify that the app url is presented correctly to the user
-      cy.get(interact.DEPLOY_SUCCESS_MODAL, { timeout: 1000 })
-        .should("be.visible")
-        .within(() => {
-          let appUrl = Cypress.config().baseUrl + '/app/cypress-tests'
-          cy.get(interact.DEPLOY_APP_URL_INPUT).should('have.value', appUrl)
-          cy.get(interact.SPECTRUM_BUTTON).contains("Done").click({ force: true })
-        })
-
-      cy.visit(`${Cypress.config().baseUrl}/builder`)
-
-      cy.get(interact.APP_TABLE_STATUS, { timeout: 3000 }).eq(0)
-        .within(() => {
-          cy.contains("Published")
-          cy.get(interact.GLOBE).should("exist")
-        })
-
-      cy.get(interact.APP_TABLE_ROW_ACTION).eq(0)
-        .within(() => {
-          cy.get(interact.SPECTRUM_BUTTON).contains("Manage")
-          cy.get(interact.SPECTRUM_BUTTON).contains("Edit").click({ force: true })
-        })
-
-      cy.get(interact.DEPLOYMENT_TOP_GLOBE).should("exist").click({ force: true })
-
-      cy.get(interact.PUBLISH_POPOVER_MENU).should("be.visible")
-        .within(() => {
-          cy.get(interact.PUBLISH_POPOVER_ACTION).should("exist")
-          cy.get("button").contains("View app").should("exist")
-          cy.get(interact.PUBLISH_POPOVER_MESSAGE).should("have.text", "Last published a few seconds ago")
-        })
-    })
-
-    xit("Should unpublish an application using the link and reflect the status change", () => {
-      //Assuming the previous test app exists and is published
-
-      cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 })
-
-      cy.get(interact.APP_TABLE_STATUS).eq(0)
-        .within(() => {
-          cy.contains("Published")
-          cy.get("svg[aria-label='Globe']").should("exist")
-        })
-
-      cy.get(interact.APP_TABLE).eq(0)
-        .within(() => {
-          cy.get(interact.APP_TABLE_APP_NAME).click({ force: true })
-        })
-
-      cy.get(interact.DEPLOYMENT_TOP_GLOBE).should("exist").click({ force: true })
-
-      cy.get("[data-cy='publish-popover-menu']")
-        .within(() => {
-          cy.get(interact.PUBLISH_POPOVER_ACTION).click({ force: true })
-        })
-
-      cy.get(interact.UNPUBLISH_MODAL).should("be.visible")
-        .within(() => {
-          cy.get(interact.CONFIRM_WRAP_BUTTON).click({ force: true }
-          )
-        })
-
-      cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 6000 })
-      cy.wait(500)
-      cy.get(interact.APP_TABLE_STATUS, { timeout: 10000 }).eq(0).contains("Unpublished")
-
-    })
-  })
-})
diff --git a/packages/builder/cypress/integration/autoScreensUI.spec.js b/packages/builder/cypress/integration/autoScreensUI.spec.js
deleted file mode 100644
index 581e5c431b..0000000000
--- a/packages/builder/cypress/integration/autoScreensUI.spec.js
+++ /dev/null
@@ -1,101 +0,0 @@
-import filterTests from "../support/filterTests"
-const interact = require('../support/interact')
-
-filterTests(['smoke', 'all'], () => {
-  xcontext("Auto Screens UI", () => {
-    before(() => {
-      cy.login()
-      cy.deleteAllApps()
-    })
-
-    it("should disable the autogenerated screen options if no sources are available", () => {
-      cy.createApp("First Test App", false)
-      cy.closeModal();
-
-      cy.navigateToAutogeneratedModal()
-      cy.get(interact.CONFIRM_WRAP_SPE_BUTTON).should('be.disabled')
-
-      cy.deleteAllApps()
-    });
-
-    it("should not display incompatible sources", () => {
-      cy.createApp("Test App")
-
-      cy.selectExternalDatasource("REST")
-      cy.selectExternalDatasource("S3")
-      cy.get(interact.SPECTRUM_MODAL).within(() => {
-        cy.get(interact.SPECTRUM_BUTTON).contains("Save and continue to query").click({ force : true })
-      })
-      
-      cy.navigateToAutogeneratedModal()
-
-      cy.get(interact.DATA_SOURCE_ENTRY).should('have.length', 1)
-      cy.get(interact.DATA_SOURCE_ENTRY)
-
-      cy.deleteAllApps()
-    });
-      
-    it("should generate internal table screens", () => {
-      cy.createTestApp()
-      // Create Autogenerated screens from the internal table
-      cy.createDatasourceScreen(["Cypress Tests"])
-      // Confirm screens have been auto generated
-      cy.get(interact.BODY).should('contain', "cypress-tests")
-        .and('contain', 'cypress-tests/:id')
-        .and('contain', 'cypress-tests/new/row')
-    })
-
-    it("should generate multiple internal table screens at once", () => {
-      const initialTable = "Cypress Tests"
-      const secondTable = "Table Two"
-      // Create a second internal table
-      cy.createTable(secondTable)
-      // Create Autogenerated screens from the internal tables
-      cy.createDatasourceScreen([initialTable, secondTable])
-      // Confirm screens have been auto generated
-      // Previously generated tables are suffixed with numbers - as expected
-      cy.wait(1000)
-      cy.get(interact.BODY).should('contain', 'cypress-tests-2')
-        .and('contain', 'cypress-tests-2/:id')
-        .and('contain', 'cypress-tests-2/new/row')
-        .and('contain', 'table-two')
-        .and('contain', 'table-two/:id')
-        .and('contain', 'table-two/new/row')
-    })
-
-    it("should generate multiple internal table screens with the same screen access level", () => {
-      //The tables created in the previous step still exist
-      cy.createTable("Table Three")
-      cy.createTable("Table Four")
-      cy.createDatasourceScreen(["Table Three", "Table Four"], "Admin")
-
-      // Filter screens to Admin
-      cy.filterScreensAccessLevel('Admin')
-
-      cy.get(interact.BODY).should('contain', 'table-three')
-      .and('contain', 'table-three/:id')
-      .and('contain', 'table-three/new/row')
-      .and('contain', 'table-four')
-      .and('contain', 'table-four/:id')
-      .and('contain', 'table-four/new/row')
-      .and('not.contain', 'table-two')
-      .and('not.contain', 'cypress-tests')
-    })
-
-    if (Cypress.env("TEST_ENV")) {
-      it("should generate datasource screens", () => {
-        // Using MySQL datasource for testing this
-        const datasource = "MySQL"
-        // Select & configure MySQL datasource
-        cy.selectExternalDatasource(datasource)
-        cy.addDatasourceConfig(datasource)
-        // Create Autogenerated screens from a MySQL table - MySQL contains books table
-        cy.createDatasourceScreen(["books"])
-        
-        cy.get(interact.BODY).should('contain', 'books')
-          .and('contain', 'books/:id')
-          .and('contain', 'books/new/row')
-      })
-    }
-  })
-})
diff --git a/packages/builder/cypress/integration/createApp.spec.js b/packages/builder/cypress/integration/createApp.spec.js
deleted file mode 100644
index 897c7f8b91..0000000000
--- a/packages/builder/cypress/integration/createApp.spec.js
+++ /dev/null
@@ -1,235 +0,0 @@
-import filterTests from '../support/filterTests'
-const interact = require('../support/interact')
-
-filterTests(['smoke', 'all'], () => {
-  context("Create an Application", () => {
-
-    before(() => {
-      cy.login()
-      cy.deleteAllApps()
-    })
-
-    if (!(Cypress.env("TEST_ENV"))) {
-      it.skip("should show the new user UI/UX", () => {
-        cy.visit(`${Cypress.config().baseUrl}/builder/portal/apps/create`, { timeout: 5000 }) //added /portal/apps/create
-        cy.wait(1000)
-        cy.get(interact.CREATE_APP_BUTTON, { timeout: 10000 }).contains('Start from scratch').should("exist")
-
-        cy.get(interact.TEMPLATE_CATEGORY_FILTER).should("exist")
-        cy.get(interact.TEMPLATE_CATEGORY).should("exist")
-
-        cy.get(interact.APP_TABLE).should("not.exist")
-      })
-    }
-
-    xit("should provide filterable templates", () => {
-      cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 })
-      cy.wait(500)
-
-      cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
-        .its("body")
-        .then(val => {
-          if (val.length > 0) {
-            cy.get(interact.SPECTRUM_BUTTON).contains("View Templates").click({ force: true })
-          }
-        })
-
-      cy.get(interact.TEMPLATE_CATEGORY_FILTER).should("exist")
-      cy.get(interact.TEMPLATE_CATEGORY).should("exist")
-
-      cy.get(interact.TEMPLATE_CATEGORY_ACTIONGROUP).its('length').should('be.gt', 1)
-      cy.get(interact.TEMPLATE_CATEGORY_FILTER_ACTIONBUTTON).its('length').should('be.gt', 2)
-
-      cy.get(interact.TEMPLATE_CATEGORY_FILTER_ACTIONBUTTON).eq(1).click()
-      cy.get(interact.TEMPLATE_CATEGORY_ACTIONGROUP).should('have.length', 1)
-
-      cy.get(interact.TEMPLATE_CATEGORY_FILTER_ACTIONBUTTON).eq(0).click()
-      cy.get(interact.TEMPLATE_CATEGORY_ACTIONGROUP).its('length').should('be.gt', 1)
-    })
-
-    it("should enforce a valid url before submission", () => {
-      cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 10000 })
-
-      // Start create app process. If apps already exist, click second button
-      cy.wait(1000)
-      cy.get(interact.CREATE_APP_BUTTON, { timeout: 3000 }).click({ force: true })
-
-      const appName = "Cypress Tests"
-      cy.get(interact.SPECTRUM_MODAL).within(() => {
-
-        cy.get(interact.APP_NAME_INPUT).eq(0).should('have.focus')
-
-        //Auto fill
-        cy.get(interact.APP_NAME_INPUT).eq(0).clear()
-        cy.get(interact.APP_NAME_INPUT).eq(0).type(appName).should("have.value", appName).blur()
-        cy.get(interact.APP_NAME_INPUT).eq(1).should("have.value", "/cypress-tests")
-        cy.get(interact.SPECTRUM_BUTTON_GROUP).contains("Create app").should('not.be.disabled')
-
-        //Empty the app url - disabled create
-        cy.get(interact.APP_NAME_INPUT).eq(1).clear().blur()
-        cy.get(interact.SPECTRUM_BUTTON_GROUP).contains("Create app").should('be.disabled')
-
-        //Invalid url
-        cy.get(interact.APP_NAME_INPUT).eq(1).type("/new app-url").blur()
-        cy.get(interact.SPECTRUM_BUTTON_GROUP).contains("Create app").should('be.disabled')
-
-        //Specifically alter the url
-        cy.get(interact.APP_NAME_INPUT).eq(1).clear()
-        cy.get(interact.APP_NAME_INPUT).eq(1).type("another-app-name").blur()
-        cy.get(interact.APP_NAME_INPUT).eq(1).should("have.value", "/another-app-name")
-        cy.get(interact.APP_NAME_INPUT).eq(0).should("have.value", appName)
-        cy.get(interact.SPECTRUM_BUTTON_GROUP).contains("Create app").should('not.be.disabled')
-
-      })
-    })
-
-    it.skip("should create the first application from scratch", () => {
-      const appName = "Cypress Tests"
-      cy.createApp(appName, false)
-
-      cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 })
-
-      cy.applicationInAppTable(appName)
-      cy.deleteApp(appName)
-    })
-
-    it.skip("should create the first application from scratch with a default name", () => {
-      cy.updateUserInformation("", "")
-      cy.createApp("", false)
-      cy.applicationInAppTable("My app")
-      cy.deleteApp("My app")
-    })
-
-    it("should create the first application from scratch, using the users first name as the default app name", () => {
-      cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 })
-
-      cy.updateUserInformation("Ted", "Userman")
-
-      cy.createApp("", false)
-      cy.applicationInAppTable("Teds app")
-      cy.deleteApp("Teds app")
-
-      // Accomodate names that end in 'S'
-      cy.updateUserInformation("Chris", "Userman")
-
-      cy.createApp("", false)
-      cy.applicationInAppTable("Chris app")
-      cy.deleteApp("Chris app")
-
-      cy.updateUserInformation("", "")
-    })
-
-    it("should create an application from an export", () => {
-      const exportedApp = 'cypress/fixtures/exported-app.txt'
-
-      cy.importApp(exportedApp, "")
-      cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 2000 })
-      cy.applicationInAppTable("My app")
-      cy.get(".app-table .name").eq(0).click()
-      cy.closeModal()
-      cy.get(`[aria-label="ShowMenu"]`).click()
-      cy.get(".spectrum-Menu").within(() => {
-        cy.contains("Overview").click()
-      })
-      cy.get(".app-overview-actions-icon").within(() => {
-        cy.get(".spectrum-Icon").click({ force: true })
-      })
-      cy.get(".spectrum-Menu").contains("Delete").click({ force: true })
-      cy.get(".spectrum-Dialog-grid").within(() => {
-        cy.get("input").type("My app")
-      })
-      cy.get(".spectrum-Button--warning").click()
-    })
-
-    it("should create an application from an export, using the users first name as the default app name", () => {
-      const exportedApp = 'cypress/fixtures/exported-app.txt'
-
-      cy.updateUserInformation("Ted", "Userman")
-      cy.importApp(exportedApp, "")
-      cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.applicationInAppTable("Teds app")
-      cy.get(".app-table .name").eq(0).click()
-      cy.closeModal()
-      cy.get(`[aria-label="ShowMenu"]`).click()
-      cy.get(".spectrum-Menu").within(() => {
-        cy.contains("Overview").click()
-      })
-      cy.get(".app-overview-actions-icon").within(() => {
-        cy.get(".spectrum-Icon").click({ force: true })
-      })
-      cy.get(".spectrum-Menu").contains("Delete").click({ force: true })
-      cy.get(".spectrum-Dialog-grid").within(() => {
-        cy.get("input").type("Teds app")
-      })
-      cy.get(".spectrum-Button--warning").click()
-      cy.updateUserInformation("", "")
-    })
-
-    xit("should generate the first application from a template", () => {
-      cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.wait(500)
-
-      // Navigate to Create new app section if apps already exist
-      cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
-        .its("body")
-        .then(val => {
-          if (val.length > 0) {
-            cy.get(interact.CREATE_APP_BUTTON).click({ force: true })
-          }
-        })
-
-      cy.get(interact.TEMPLATE_CATEGORY_FILTER).should("exist")
-      cy.get(interact.TEMPLATE_CATEGORY).should("exist")
-
-      // Select template
-      cy.get(interact.TEMPLATE_CATEGORY_ACTIONGROUP).eq(0).within(() => {
-        const card = cy.get('.template-card').eq(0).should("exist");
-        const cardOverlay = card.get('.template-thumbnail-action-overlay').should("exist")
-        cardOverlay.invoke("show")
-        cardOverlay.get("button").contains("Use template").should("exist").click({ force: true })
-      })
-
-      // CMD Create app from theme card
-      cy.get(".spectrum-Modal").should('be.visible')
-
-      const templateName = cy.get(".spectrum-Modal .template-thumbnail-text")
-      templateName.invoke('text')
-        .then(templateNameText => {
-          const templateNameParsed = "/" + templateNameText.toLowerCase().replace(/\s+/g, "-")
-          cy.get(interact.SPECTRUM_MODAL_INPUT).eq(0).should("have.value", templateNameText)
-          cy.get(interact.SPECTRUM_MODAL_INPUT).eq(1).should("have.value", templateNameParsed)
-
-          cy.get(".spectrum-Modal .spectrum-ButtonGroup").contains("Create app").click()
-          cy.wait(5000)
-
-          cy.visit(`${Cypress.config().baseUrl}/builder`)
-          cy.wait(2000)
-
-          cy.applicationInAppTable(templateNameText)
-          cy.deleteApp(templateNameText)
-        });
-
-    })
-
-    it("should display a second application and app filtering", () => {
-      // Create first app
-      const appName = "Cypress Tests"
-      cy.createApp(appName)
-
-      cy.visit(`${Cypress.config().baseUrl}/builder`)
-
-      // Create second app
-      const secondAppName = "Second App Demo"
-      cy.createApp(secondAppName)
-
-      cy.visit(`${Cypress.config().baseUrl}/builder`)
-
-      //Both applications should exist and be searchable
-      cy.searchForApplication(appName)
-      cy.searchForApplication(secondAppName)
-
-      cy.deleteApp(secondAppName)
-    })
-
-  })
-})
diff --git a/packages/builder/cypress/integration/createAutomation.spec.js b/packages/builder/cypress/integration/createAutomation.spec.js
deleted file mode 100644
index 6326691d28..0000000000
--- a/packages/builder/cypress/integration/createAutomation.spec.js
+++ /dev/null
@@ -1,64 +0,0 @@
-import filterTests from "../support/filterTests"
-const interact = require('../support/interact')
-
-filterTests(['smoke', 'all'], () => {
-  xcontext("Create a automation", () => {
-    before(() => {
-      cy.login()
-      cy.createTestApp()
-    })
-
-    xit("should create a automation", () => {
-      cy.createTestTableWithData()
-      cy.wait(2000)
-      cy.contains("Automate").click()
-      cy.get(interact.SPECTRUM_BUTTON_TEMPLATE).contains("Add automation").click({ force: true })
-      cy.get(interact.MODAL_INNER_WRAPPER).within(() => {
-        cy.get("input").type("Add Row")
-        cy.contains("Row Created").click({ force: true })
-        cy.get(interact.SPECTRUM_BUTTON_CTA, { timeout: 500 }).click()
-      })
-
-      // Setup trigger
-      cy.get(interact.SPECTRUM_PICKER_LABEL).click()
-      cy.wait(500)
-      cy.contains("dog").click()
-      // Create action
-      cy.get('[aria-label="AddCircle"]', { timeout: 2000 }).click()
-      cy.get(interact.MODAL_INNER_WRAPPER).within(() => {
-        cy.wait(1000)
-        cy.contains("Create Row").trigger('mouseover').click().click()
-        cy.get(interact.SPECTRUM_BUTTON_CTA).click()
-      })
-      cy.get(interact.SPECTRUM_PICKER_LABEL).eq(1).click()
-      cy.contains("dog").click()
-      cy.get(interact.SPECTRUM_TEXTFIELD_INPUT)
-        .first()
-        .type("{{ trigger.row.name }}", { parseSpecialCharSequences: false })
-      cy.get(interact.SPECTRUM_TEXTFIELD_INPUT)
-        .eq(1)
-        .type("11")
-      cy.contains("Finish and test automation").click()
-
-      cy.get(interact.MODAL_INNER_WRAPPER).within(() => {
-        cy.get(interact.SPECTRUM_PICKER_LABEL, { timeout: 1000 }).click()
-        cy.contains("dog").click()
-        cy.get(interact.SPECTRUM_TEXTFIELD_INPUT, { timeout: 1000 })
-          .first()
-          .type("automationGoodboy")
-        cy.get(interact.SPECTRUM_TEXTFIELD_INPUT)
-          .eq(1)
-          .type("11")
-        cy.get(interact.SPECTRUM_TEXTFIELD_INPUT)
-          .eq(2)
-          .type("123456")
-        cy.get(interact.SPECTRUM_TEXTFIELD_INPUT)
-          .eq(3)
-          .type("123456")
-        cy.contains("Test").click()
-      })
-      cy.contains("Data").click()
-      cy.contains("automationGoodboy")
-    })
-  })
-})
diff --git a/packages/builder/cypress/integration/createBinding.spec.js b/packages/builder/cypress/integration/createBinding.spec.js
deleted file mode 100644
index 0722d29f1d..0000000000
--- a/packages/builder/cypress/integration/createBinding.spec.js
+++ /dev/null
@@ -1,66 +0,0 @@
-import filterTests from "../support/filterTests"
-
-filterTests(['smoke', 'all'], () => {
-  context("Create Bindings", () => {
-    before(() => {
-      cy.login()
-      cy.createTestApp()
-      cy.navigateToFrontend()
-    })
-
-    it("should add a current user binding", () => {
-      cy.searchAndAddComponent("Paragraph").then(componentId => {
-        addSettingBinding("text", ["Current User", "_id"], "Current User._id")
-      })
-      cy.deleteComponentByName("New Paragraph")
-    })
-
-    it("should handle an invalid binding", () => {
-      cy.searchAndAddComponent("Paragraph").then(componentId => {
-        // Cypress needs to escape curly brackets
-        cy.get("[data-cy=setting-text] input")
-          .type("{{}{{}{{} Current User._id {}}{}}")
-          .blur()
-        cy.getComponent(componentId).should("have.text", "{{{ [user].[_id] }}")
-        cy.deleteComponentByName("New Paragraph")
-      })
-    })
-
-    xit("should add a URL param binding", () => {
-      const paramName = "foo"
-      cy.createScreen(`/test/:${paramName}`)
-      cy.searchAndAddComponent("Paragraph").then(componentId => {
-        addSettingBinding("text", ["URL", paramName], `URL.${paramName}`)
-        // The builder preview pages don't have a real URL, so all we can do
-        // is check that we were able to bind to the property, and that the
-        // component exists on the page
-        cy.getComponent(componentId).should("have.text", "New Paragraph")
-      })
-    })
-
-    it("should add a binding with a handlebars helper", () => {
-      cy.searchAndAddComponent("Paragraph").then(componentId => {
-        // Cypress needs to escape curly brackets
-        cy.get("[data-cy=setting-text] input")
-          .type("{{}{{} add 1 2 {}}{}}")
-          .blur()
-        cy.getComponent(componentId).should("have.text", "3")
-      })
-    })
-  })
-
-  const addSettingBinding = (setting, bindingCategories, bindingText, clickOption = true) => {
-    cy.get(`[data-cy="setting-${setting}"] [data-cy=text-binding-button]`).click()
-    cy.get(".category-list li").contains(bindingCategories[0])
-    cy.get(".drawer").within(() => {
-      if (clickOption) {
-        cy.get(".category-list li").contains(bindingCategories[0]).click()
-        cy.get("li.binding").contains(bindingCategories[1]).click()
-        cy.get("textarea").should("have.value", `{{ ${bindingText} }}`)
-      } else {
-        cy.get("textarea").type(bindingText)
-      }
-      cy.contains("Save").click()
-    })
-  }
-})
diff --git a/packages/builder/cypress/integration/createComponents.spec.js b/packages/builder/cypress/integration/createComponents.spec.js
deleted file mode 100644
index 7f29466258..0000000000
--- a/packages/builder/cypress/integration/createComponents.spec.js
+++ /dev/null
@@ -1,275 +0,0 @@
-import filterTests from "../support/filterTests"
-const interact = require("../support/interact")
-
-filterTests(["all"], () => {
-  xcontext("Create Components", () => {
-    let headlineId
-
-    before(() => {
-      cy.login()
-      cy.createTestApp()
-      cy.createTable("dog")
-      cy.addColumn("dog", "name", "Text")
-      cy.addColumn("dog", "age", "Number")
-      cy.addColumn("dog", "breed", "Options")
-
-      cy.navigateToFrontend()
-      cy.wait(1000) //allow the iframe some wiggle room
-    })
-
-    //Use the tree to delete a selected component
-    const deleteSelectedComponent = () => {
-      cy.get(
-        ".nav-item.selected .actions > div > .icon"
-      ).click({
-        force: true,
-      })
-      cy.get(".spectrum-Popover.is-open li").contains("Delete").click()
-      cy.get(".spectrum-Modal button").contains("Delete Component").click({
-        force: true,
-      })
-    }
-
-    it("should add a container", () => {
-      cy.searchAndAddComponent("Container").then(componentId => {
-        cy.getComponent(componentId).should("exist")
-      })
-    })
-
-    it("should add a headline", () => {
-      cy.searchAndAddComponent("Headline").then(componentId => {
-        headlineId = componentId
-        cy.getComponent(headlineId).should("exist")
-      })
-    })
-
-    it("should change the text of the headline", () => {
-      const text = "Lorem ipsum dolor sit amet."
-      cy.get("[data-cy=setting-text] input").type(text).blur()
-      cy.getComponent(headlineId).should("have.text", text)
-    })
-
-    it("should change the size of the headline", () => {
-      cy.get("[data-cy=setting-size]").scrollIntoView().click()
-      cy.get("[data-cy=setting-size]").within(() => {
-        cy.get(".spectrum-Form-item li.spectrum-Menu-item")
-          .contains("3XL")
-          .click()
-      })
-
-      cy.getComponent(headlineId).within(() => {
-        cy.get(".spectrum-Heading").should("have.css", "font-size", "60px")
-      })
-    })
-
-    it("should create a form and reset to match schema", () => {
-      cy.searchAndAddComponent("Form").then(() => {
-        cy.get("[data-cy=setting-dataSource]").contains("Custom").click()
-        cy.get(interact.DROPDOWN).contains("dog").click()
-        cy.wait(500)
-        cy.searchAndAddComponent("Field Group").then(fieldGroupId => {
-          cy.contains("Update form fields").click()
-          cy.get(".spectrum-Modal")
-            .get(".confirm-wrap .spectrum-Button")
-            .click()
-          cy.wait(500)
-          cy.getComponent(fieldGroupId).within(() => {
-            cy.contains("name").should("exist")
-            cy.contains("age").should("exist")
-            cy.contains("breed").should("exist")
-            // cy.contains("image").should("exist")
-          })
-          cy.getComponent(fieldGroupId).find("input").should("have.length", 2)
-          cy.getComponent(fieldGroupId)
-            .find(interact.SPECTRUM_PICKER)
-            .should("have.length", 1)
-        })
-      })
-    })
-
-    it("deletes a component", () => {
-      cy.searchAndAddComponent("Paragraph").then(componentId => {
-        cy.get("[data-cy=setting-_instanceName] input").type(componentId).blur()
-        cy.get(
-          ".nav-item.selected .actions > div > .icon"
-        ).click({
-          force: true,
-        })
-        cy.get(".spectrum-Popover.is-open li").contains("Delete").click()
-        cy.get(".spectrum-Modal button").contains("Delete Component").click({
-          force: true,
-        })
-        cy.getComponent(componentId).should("not.exist")
-      })
-    })
-
-    it("should clear the iframe place holder when a form field has been set", () => {
-      cy.searchAndAddComponent("Form").then(formId => {
-        //For deletion
-        cy.get("[data-cy=setting-_instanceName] input")
-          .clear()
-          .type(formId)
-          .blur()
-        cy.get("[data-cy=setting-dataSource]").contains("Custom").click()
-        cy.get(".dropdown").contains("dog").click()
-
-        const fieldTypeToColumnName = {
-          "Text Field": "name",
-          "Number Field": "age",
-          "Options Picker": "breed",
-        }
-
-        const componentTypeLabels = Object.keys(fieldTypeToColumnName)
-
-        const testFieldFocusOnCreate = componentLabel => {
-          cy.log("Adding: " + componentLabel)
-          return cy.searchAndAddComponent(componentLabel).then(componentId => {
-            cy.get("[data-cy=setting-field] button.spectrum-Picker").click()
-
-            //Click the first appropriate field. They are filtered by type
-            cy.get(
-              "[data-cy=setting-field] .spectrum-Popover.is-open li.spectrum-Menu-item"
-            )
-              .contains(fieldTypeToColumnName[componentLabel])
-              .click()
-            cy.wait(500)
-            cy.getComponent(componentId)
-              .find(".component-placeholder")
-              .should("not.exist")
-          })
-        }
-
-        cy.wait(500)
-        cy.wrap(componentTypeLabels)
-          .each(label => {
-            return testFieldFocusOnCreate(label)
-          })
-          .then(() => {
-            cy.get(".nav-item")
-              .contains(formId)
-              .click({ force: true })
-            deleteSelectedComponent()
-          })
-      })
-    })
-
-    it("should populate the provider for charts with a data provider in its path", () => {
-      cy.searchAndAddComponent("Data Provider").then(providerId => {
-        //For deletion
-        cy.get("[data-cy=setting-_instanceName] input")
-          .clear()
-          .type(providerId)
-          .blur()
-        cy.get("[data-cy=setting-dataSource]")
-          .contains("Choose an option")
-          .click()
-        cy.get(`[data-cy=dataSource-popover-${providerId}] ul li`)
-          .contains("dog")
-          .click()
-
-        const chartTypeLabels = [
-          "Bar Chart",
-          "Line Chart",
-          "Area Chart",
-          "Pie Chart",
-          "Donut Chart",
-          "Candlestick Chart",
-        ]
-
-        const testFocusOnCreate = chartLabel => {
-          cy.log("Adding: " + chartLabel)
-          cy.searchAndAddComponent(chartLabel).then(componentId => {
-            cy.get(
-              "[data-cy=dataProvider-prop-control] .spectrum-Picker"
-            ).should("not.have.class", "is-focused")
-
-            // Pre populated.
-            cy.get("[data-cy=dataProvider-prop-control] .spectrum-Picker-label")
-              .contains(providerId)
-              .should("exist")
-          })
-        }
-        cy.wait(1000)
-        cy.wrap(chartTypeLabels)
-          .each(label => {
-            return testFocusOnCreate(label)
-          })
-          .then(() => {
-            cy.get(".nav-item")
-              .contains(providerId)
-              .click({ force: true })
-            deleteSelectedComponent()
-          })
-      })
-    })
-
-    it("should replace the placeholder when a url is set on an image", () => {
-      cy.searchAndAddComponent("Image").then(imageId => {
-        cy.get("[data-cy=setting-_instanceName] input")
-          .clear()
-          .type(imageId)
-          .blur()
-        //return $("New Data Provider.Rows")[0]["Attachment"][0]["url"]
-        //No minio, so just enter something local that will not reslove
-        cy.get("[data-cy=url-prop-control] input[type=text]")
-          .type("cypress/fixtures/ghost.png")
-          .blur()
-        cy.getComponent(imageId)
-          .find(".component-placeholder")
-          .should("not.exist")
-        cy.getComponent(imageId).find(`img[alt=${imageId}]`).should("exist")
-        cy.get(".nav-item")
-          .contains(imageId)
-          .click({ force: true })
-        deleteSelectedComponent()
-      })
-    })
-
-    it("should add a markdown component.", () => {
-      cy.searchAndAddComponent("Markdown Viewer").then(markdownId => {
-        cy.get("[data-cy=setting-_instanceName] input")
-          .clear()
-          .type(markdownId)
-          .blur()
-        cy.get(
-          "[data-cy=value-prop-control] input[type=text].spectrum-Textfield-input"
-        )
-          .type("# Hi")
-          .blur()
-        cy.getComponent(markdownId)
-          .find(".component-placeholder")
-          .should("not.exist")
-        cy.getComponent(markdownId)
-          .find(".editor-preview-full h1")
-          .contains("Hi")
-        cy.get(".nav-item")
-          .contains(markdownId)
-          .click({ force: true })
-        deleteSelectedComponent()
-      })
-    })
-
-    it("should direct the user when adding an Icon component.", () => {
-      cy.searchAndAddComponent("Icon").then(iconId => {
-        cy.get("[data-cy=setting-_instanceName] input")
-          .clear()
-          .type(iconId)
-          .blur()
-        cy.get("[data-cy=icon-prop-control] .spectrum-ActionButton").click()
-        cy.get("[data-cy=icon-popover].spectrum-Popover.is-open").within(() => {
-          cy.get(".search-input input").type("save").blur()
-          cy.get(".search-input button").click({ force: true })
-          cy.get(".icon-area .icon-container").eq(0).click({ force: true })
-        })
-        cy.getComponent(iconId)
-          .find(".component-placeholder")
-          .should("not.exist")
-        cy.getComponent(iconId).find("i.ri-save-fill").should("exist")
-        cy.get(".nav-item")
-          .contains(iconId)
-          .click({ force: true })
-        deleteSelectedComponent()
-      })
-    })
-  })
-})
diff --git a/packages/builder/cypress/integration/createScreen.spec.js b/packages/builder/cypress/integration/createScreen.spec.js
deleted file mode 100644
index 09d8485386..0000000000
--- a/packages/builder/cypress/integration/createScreen.spec.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import filterTests from "../support/filterTests"
-const interact = require('../support/interact')
-
-filterTests(["smoke", "all"], () => {
-  xcontext("Screen Tests", () => {
-    before(() => {
-      cy.login()
-      cy.createTestApp()
-      cy.navigateToFrontend()
-    })
-
-    it.skip("Should successfully create a screen", () => {
-      cy.createScreen("test")
-      cy.get(interact.BODY).within(() => {
-        cy.contains("/test").should("exist")
-      })
-    })
-
-    it("Should update the url", () => {
-      cy.createScreen("test with spaces")
-      cy.get(interact.BODY).within(() => {
-        cy.contains("/test-with-spaces").should("exist")
-      })
-    })
-
-    it.skip("should delete all screens then create first screen via button", () => {
-      cy.deleteAllScreens()
-
-      cy.contains("Create first screen").click()
-      cy.get(interact.BODY, { timeout: 2000 }).should('contain', '/home')
-    })
-
-    it("Should create and filter screens by access level", () => {
-      const accessLevels = ["Basic", "Admin", "Public", "Power"]
-
-      for (const access of accessLevels) {
-        // Create screen with specified access level
-        cy.createScreen(access, access)
-        // Filter by access level and confirm screen visible
-        cy.filterScreensAccessLevel(access)
-        cy.get(interact.BODY).within(() => {
-          cy.get(interact.NAV_ITEM).should('contain', access.toLowerCase())
-        })
-      }
-
-      // Filter by All screens - Confirm all screens visible
-      cy.filterScreensAccessLevel("All screens")
-      cy.get(interact.BODY).should('contain', accessLevels[0])
-        .and('contain', accessLevels[1])
-        .and('contain', accessLevels[2])
-        .and('contain', accessLevels[3])
-    })
-  })
-})
diff --git a/packages/builder/cypress/integration/createTable.spec.js b/packages/builder/cypress/integration/createTable.spec.js
deleted file mode 100644
index 1c3e69a36b..0000000000
--- a/packages/builder/cypress/integration/createTable.spec.js
+++ /dev/null
@@ -1,112 +0,0 @@
-import filterTests from "../support/filterTests"
-const interact = require('../support/interact')
-
-filterTests(["smoke", "all"], () => {
-  xcontext("Create a Table", () => {
-    before(() => {
-      cy.login()
-      cy.createTestApp()
-    })
-
-    it("should create a new Table", () => {
-      cy.createTable("dog")
-      // Check if Table exists
-      cy.get(interact.TABLE_TITLE_H1, { timeout: 1000 }).should("have.text", "dog")
-    })
-
-    it("adds a new column to the table", () => {
-      cy.addColumn("dog", "name", "Text")
-      cy.contains("name").should("be.visible")
-    })
-
-    it("creates a row in the table", () => {
-      cy.addRow(["Rover"])
-      cy.contains("Rover").should("be.visible")
-    })
-
-    it("updates a column on the table", () => {
-      cy.get(interact.TABLE_TITLE).click()
-      cy.get(interact.SPECTRUM_TABLE_EDIT).click()
-      cy.get(interact.MODAL_INNER_WRAPPER).within(() => {
-
-      cy.get("input").eq(0).type("updated", { force: true })
-      // Unset table display column
-      cy.get(interact.SPECTRUM_SWITCH_INPUT).eq(1).click()
-      cy.contains("Save Column").click()
-      })
-      cy.contains("nameupdated ").should("contain", "nameupdated")
-    })
-
-    it("edits a row", () => {
-      cy.contains("button", "Edit").click({ force: true })
-      cy.wait(500)
-      cy.get(interact.SPECTRUM_MODAL_INPUT).clear()
-      cy.get(interact.SPECTRUM_MODAL_INPUT).type("Updated")
-      cy.contains("Save").click()
-      cy.contains("Updated").should("have.text", "Updated")
-    })
-
-    it("deletes a row", () => {
-      cy.get(interact.SPECTRUM_CHECKBOX_INPUT).check({ force: true })
-      cy.contains("Delete 1 row").click()
-      cy.get(interact.SPECTRUM_MODAL).contains("Delete").click()
-      cy.contains("RoverUpdated").should("not.exist")
-    })
-
-    if (Cypress.env("TEST_ENV")) {
-      // No Pagination in CI - Test env only for the next two tests
-      xit("Adds 15 rows and checks pagination", () => {
-        // 10 rows per page, 15 rows should create 2 pages within table
-        const totalRows = 16
-        for (let i = 1; i < totalRows; i++) {
-          cy.addRow([i])
-        }
-        cy.reload()
-        cy.get(interact.SPECTRUM_PAGINATION, { timeout: 2000 }).within(() => {
-          cy.get(interact.SPECTRUM_ACTION_BUTTON).eq(1).click()
-        })
-        cy.get(interact.SPECTRUM_PAGINATION).within(() => {
-          cy.get(interact.SPECTRUM_BODY_SECOND).contains("Page 2")
-        })
-      })
-
-      xit("Deletes rows and checks pagination", () => {
-        // Delete rows, removing second page from table
-        cy.get(interact.SPECTRUM_CHECKBOX_INPUT).check({ force: true })
-        cy.get(interact.POPOVERS).within(() => {
-          cy.get(interact.SPECTRUM_BUTTON).click({ force: true })
-        })
-        cy.get(interact.SPECTRUM_DIALOG_GRID).contains("Delete").click({ force: true })
-
-        // Confirm table only has one page
-        cy.get(interact.SPECTRUM_PAGINATION, { timeout: 1000 }).within(() => {
-          cy.get(interact.SPECTRUM_ACTION_BUTTON).eq(1).should("not.be.enabled")
-        })
-      })
-    }
-
-    it("deletes a column", () => {
-      const columnName = "nameupdated"
-      cy.get(interact.TABLE_TITLE).click()
-      cy.get(interact.SPECTRUM_TABLE_EDIT).click()
-      cy.contains("Delete").click()
-      cy.get(interact.DELETE_COLUMN_CONFIRM).type(columnName)
-      cy.contains("Delete Column").click()
-      cy.contains("nameupdated").should("not.exist")
-    })
-
-    it("deletes a table", () => {
-      cy.get(interact.NAV_ITEM)
-        .contains("dog")
-        .parents(interact.NAV_ITEM)
-        .first()
-        .within(() => {
-          cy.get(interact.ACTION_SPECTRUM_ICON).click({ force: true })
-        })
-      cy.get(interact.SPECTRUM_MENU_CHILD2).click()
-      cy.get(interact.DELETE_TABLE_CONFIRM).type("dog")
-      cy.contains("Delete Table").click()
-      cy.contains("dog").should("not.exist")
-    })
-  })
-})
diff --git a/packages/builder/cypress/integration/createView.spec.js b/packages/builder/cypress/integration/createView.spec.js
deleted file mode 100644
index c1494b6756..0000000000
--- a/packages/builder/cypress/integration/createView.spec.js
+++ /dev/null
@@ -1,161 +0,0 @@
-import filterTests from "../support/filterTests"
-const interact = require('../support/interact')
-
-filterTests(['smoke', 'all'], () => {
-  xcontext("Create a View", () => {
-    before(() => {
-      cy.login()
-      cy.createTestApp()
-      cy.createTable("data")
-      cy.addColumn("data", "group", "Text")
-      cy.addColumn("data", "age", "Number")
-      cy.addColumn("data", "rating", "Number")
-
-      // 6 Rows
-      cy.addRow(["Students", 25, 1])
-      cy.addRow(["Students", 20, 3])
-      cy.addRow(["Students", 18, 6])
-      cy.addRow(["Students", 25, 2])
-      cy.addRow(["Teachers", 49, 5])
-      cy.addRow(["Teachers", 36, 3])
-    })
-
-    xit("creates a view", () => {
-      cy.contains("Create view").click()
-      cy.get(interact.MODAL_INNER_WRAPPER).within(() => {
-        cy.get("input").type("Test View")
-        cy.get("button").contains("Create View").click({ force: true })
-      })
-      cy.contains(interact.TABLE_TITLE_H1, "Test View", { timeout: 10000 })
-      cy.get(".table-wrapper").within(() => {
-        cy.get(interact.TITLE).then($headers => {
-          expect($headers).to.have.length(3)
-          const headers = Array.from($headers).map(header =>
-            header.textContent.trim()
-          )
-          expect(removeSpacing(headers)).to.deep.eq(["group", "age", "rating"])
-        })
-      })
-    })
-
-    xit("filters the view by age over 10", () => {
-      cy.contains("Filter").click()
-      cy.contains("Add Filter").click()
-
-      cy.get(interact.MODAL_INNER_WRAPPER).within(() => {
-        cy.get(interact.SPECTRUM_PICKER_LABEL).eq(0).click()
-        cy.contains("age").click({ force: true })
-
-        cy.get(interact.SPECTRUM_PICKER_LABEL).eq(1).click()
-        cy.contains("More Than").click({ force: true })
-
-        cy.get("input").type(18)
-        cy.contains("Save").click()
-      })
-
-      cy.get(interact.SPECTRUM_TABLE_ROW).get($values => {
-        expect($values).to.have.length(5)
-      })
-    })
-
-    xit("creates a stats calculation view based on age", () => {
-      cy.wait(1000)
-      cy.contains("Calculate").click()
-      cy.get(interact.MODAL_INNER_WRAPPER).within(() => {
-        cy.get(interact.SPECTRUM_PICKER_LABEL).eq(0).click()
-        cy.contains("Statistics").click()
-
-        cy.get(interact.SPECTRUM_PICKER_LABEL).eq(1).click()
-        cy.contains("age").click({ force: true })
-
-        cy.get(interact.SPECTRUM_BUTTON).contains("Save").click({ force: true })
-      })
-
-      cy.wait(1000)
-      cy.get(".table-wrapper").within(() => {
-        cy.get(interact.TITLE).then($headers => {
-          expect($headers).to.have.length(7)
-          const headers = Array.from($headers).map(header =>
-            header.textContent.trim()
-          )
-          expect(removeSpacing(headers)).to.deep.eq([
-            "field",
-            "sum",
-            "min",
-            "max",
-            "count",
-            "sumsqr",
-            "avg",
-          ])
-        })
-      })
-      cy.get(interact.SPECTRUM_TABLE_CELL).then($values => {
-        let values = Array.from($values).map(header => header.textContent.trim())
-        expect(values).to.deep.eq(["age", "155", "20", "49", "5", "5347", "31"])
-      })
-    })
-
-    xit("groups the view by group", () => {
-      cy.contains("Group by").click()
-      cy.get(interact.MODAL_INNER_WRAPPER).within(() => {
-        cy.get(interact.SPECTRUM_PICKER_LABEL).eq(0).click()
-        cy.contains("group").click()
-        cy.contains("Save").click()
-      })
-      cy.wait(1000)
-      cy.contains("Students").should("be.visible")
-      cy.contains("Teachers").should("be.visible")
-
-      cy.get(interact.SPECTRUM_TABLE_CELL).then($values => {
-        let values = Array.from($values).map(header => header.textContent.trim())
-        expect(values).to.deep.eq([
-          "Students",
-          "70",
-          "20",
-          "25",
-          "3",
-          "1650",
-          "23.333333333333332",
-          "Teachers",
-          "85",
-          "36",
-          "49",
-          "2",
-          "3697",
-          "42.5",
-        ])
-      })
-    })
-
-    xit("renames a view", () => {
-      cy.contains(interact.NAV_ITEM, "Test View")
-        .find(".actions .icon.open-popover")
-        .click({ force: true })
-      cy.get(interact.SPECTRUM_MENU_ITEM_LABEL).contains("Edit").click()
-      cy.get(interact.MODAL_INNER_WRAPPER).within(() => {
-        cy.get("input").type(" Updated")
-        cy.contains("Save").click()
-      })
-      cy.wait(1000)
-      cy.contains("Test View Updated").should("be.visible")
-    })
-
-    it("deletes a view", () => {
-      cy.contains(interact.NAV_ITEM, "Test View Updated")
-        .find(".actions .icon.open-popover")
-        .click({ force: true })
-      cy.contains("Delete").click()
-      cy.contains("Delete View").click()
-      cy.wait(500)
-      cy.contains("TestView Updated").should("not.exist")
-    })
-  })
-
-  function removeSpacing(headers) {
-    let newHeaders = []
-    for (let header of headers) {
-      newHeaders.push(header.replace(/\s\s+/g, " "))
-    }
-    return newHeaders
-  }
-})
diff --git a/packages/builder/cypress/integration/customThemingProperties.spec.js b/packages/builder/cypress/integration/customThemingProperties.spec.js
deleted file mode 100644
index e9de0985d0..0000000000
--- a/packages/builder/cypress/integration/customThemingProperties.spec.js
+++ /dev/null
@@ -1,86 +0,0 @@
-import filterTests from "../support/filterTests"
-
-filterTests(['all'], () => {
-  xcontext("Custom Theming Properties", () => {
-      before(() => {
-        cy.login()
-        cy.createTestApp()
-        cy.navigateToFrontend()
-      })
-
-      /* Default Values:
-      Button roundness = Large
-      Accent colour = Blue 600
-      Accent colour (hover) = Blue 500
-      Navigation bar background colour = Gray 100
-      Navigation bar text colour = Gray 800 */
-      it("should reset the color property values", () => {
-        // Open Theme modal and change colours  
-        cy.get(".spectrum-ActionButton-label").contains("Theme").click()
-          cy.get(".spectrum-Picker").contains("Large").click()
-          .parents()
-          .get(".spectrum-Menu-itemLabel").contains("None").click()
-          changeThemeColors()
-          // Reset colours
-          cy.get(".spectrum-Button-label").contains("Reset").click({force: true})
-          // Check values have reset
-          checkThemeColorDefaults()
-      })
-      
-      /* Button Roundness Values:
-      None = 0
-      Small = 4px
-      Medium = 8px
-      Large = 16px */
-      it("should test button roundness", () => {
-        const buttonRoundnessValues = ["0", "4px", "8px", "16px"]
-        // Add button, change roundness and confirm value
-        cy.addComponent("Button", null).then((componentId) => {
-          buttonRoundnessValues.forEach(function (item, index){
-            cy.get(".spectrum-ActionButton-label").contains("Theme").click()
-            cy.get(".setting").contains("Button roundness").parent()
-            .get(".select-wrapper").click()
-            cy.get(".spectrum-Popover").find('li').eq(index).click()
-            cy.get(".spectrum-Button").contains("View changes").click({force: true})
-            cy.reload()
-            cy.getComponent(componentId)
-          .parents(".svelte-xiqd1c").eq(0).should('have.attr', 'style').and('contains', `--buttonBorderRadius:${item}`)
-        })
-      })
-    })
-      
-      const changeThemeColors = () => {
-        // Changes the theme colours
-        cy.get(".spectrum-FieldLabel").contains("Accent color")
-          .parent().find(".container.svelte-z3cm5a").click()
-          .find('[title="Red 400"]').click()
-          cy.get(".spectrum-FieldLabel").contains("Accent color (hover)")
-          .parent().find(".container.svelte-z3cm5a").click()
-          .find('[title="Orange 400"]').click()
-          cy.get(".spectrum-FieldLabel").contains("Navigation bar background color")
-          .parent().find(".container.svelte-z3cm5a").click()
-          .find('[title="Yellow 400"]').click()
-          cy.get(".spectrum-FieldLabel").contains("Navigation bar text color")
-          .parent().find(".container.svelte-z3cm5a").click()
-          .find('[title="Green 400"]').click()
-      }
-      
-      const checkThemeColorDefaults = () => {
-        cy.get(".spectrum-FieldLabel").contains("Accent color")
-          .parent().find(".container.svelte-z3cm5a").click()
-          .get('[title="Blue 600"]').children().find('[aria-label="Checkmark"]')
-          cy.get(".spectrum-Dialog-grid").click()
-          cy.get(".spectrum-FieldLabel").contains("Accent color (hover)")
-          .parent().find(".container.svelte-z3cm5a").click()
-          .get('[title="Blue 500"]').children().find('[aria-label="Checkmark"]')
-          cy.get(".spectrum-Dialog-grid").click()
-          cy.get(".spectrum-FieldLabel").contains("Navigation bar background color")
-          .parent().find(".container.svelte-z3cm5a").click()
-          .get('[title="Gray 100"]').children().find('[aria-label="Checkmark"]')
-          cy.get(".spectrum-Dialog-grid").click()
-          cy.get(".spectrum-FieldLabel").contains("Navigation bar text color")
-          .parent().find(".container.svelte-z3cm5a").click()
-          .get('[title="Gray 800"]').children().find('[aria-label="Checkmark"]')
-      }
-  })
-})
diff --git a/packages/builder/cypress/integration/datasources/datasourceWizard.spec.js b/packages/builder/cypress/integration/datasources/datasourceWizard.spec.js
deleted file mode 100644
index 837a433951..0000000000
--- a/packages/builder/cypress/integration/datasources/datasourceWizard.spec.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import filterTests from "../../support/filterTests"
-
-filterTests(['all'], () => {
-  xcontext("Datasource Wizard", () => {
-    if (Cypress.env("TEST_ENV")) {
-      before(() => {
-        cy.login()
-        cy.createTestApp()
-      })
-
-    it("should navigate in and out of a datasource via wizard", () => {
-      // Select PostgreSQL and add config (without fetch)
-      const datasource = "Oracle"
-      cy.selectExternalDatasource(datasource)
-      cy.addDatasourceConfig(datasource, true)
-      
-      // Navigate back within datasource wizard
-      cy.get(".spectrum-Dialog-grid").within(() => {
-        cy.get(".spectrum-Button").contains("Back").click({ force: true })
-      })
-    
-      // Select PostgreSQL datasource again
-      cy.get(".item-list", { timeout: 1000 }).contains(datasource).click()
-      cy.get(".spectrum-Dialog-grid").within(() => {
-        cy.get(".spectrum-Button").contains("Continue").click({ force: true })
-      })
-      
-      // Fetch tables after selection
-      // Previously entered config should not have been saved
-      // Config is back to default values
-      // Modal will close and provide 500 error
-      cy.intercept('**/datasources').as('datasourceConnection')
-      cy.get(".spectrum-Dialog-grid").within(() => {
-        cy.get(".spectrum-Button").contains("Save and fetch tables").click({ force: true })
-      })
-      cy.wait("@datasourceConnection")
-      cy.get("@datasourceConnection").its('response.body')
-          .should('have.property', 'status', 500)
-      })
-    }
-  })
-})
diff --git a/packages/builder/cypress/integration/datasources/mySql.spec.js b/packages/builder/cypress/integration/datasources/mySql.spec.js
deleted file mode 100644
index 11370a9bf3..0000000000
--- a/packages/builder/cypress/integration/datasources/mySql.spec.js
+++ /dev/null
@@ -1,229 +0,0 @@
-import filterTests from "../../support/filterTests"
-
-filterTests(["all"], () => {
-  xcontext("MySQL Datasource Testing", () => {
-    if (Cypress.env("TEST_ENV")) {
-      before(() => {
-        cy.login()
-        cy.createTestApp()
-      })
-      const datasource = "MySQL"
-      const queryName = "Cypress Test Query"
-      const queryRename = "CT Query Rename"
-
-      it("Should add MySQL datasource without configuration", () => {
-        // Select MySQL datasource
-        cy.selectExternalDatasource(datasource)
-        // Attempt to fetch tables without applying configuration
-        cy.intercept("**/datasources").as("datasource")
-        cy.get(".spectrum-Button")
-          .contains("Save and fetch tables")
-          .click({ force: true })
-          cy.wait(500)
-        // Intercept Request after button click & apply assertions
-        cy.wait("@datasource")
-        cy.get("@datasource")
-          .its("response.body")
-          .should(
-            "have.property",
-            "message",
-            "connect ECONNREFUSED 127.0.0.1:3306"
-          )
-        cy.get("@datasource")
-          .its("response.body")
-          .should("have.property", "status", 500)
-        cy.get(".spectrum-Button").contains("Skip table fetch").click({ force: true })
-      })
-
-      it("should add MySQL datasource and fetch tables", () => {
-        // Add & configure MySQL datasource
-        cy.selectExternalDatasource(datasource)
-        cy.intercept("**/datasources").as("datasource")
-        cy.addDatasourceConfig(datasource)
-        // Check response from datasource after adding configuration
-        cy.wait("@datasource")
-        cy.get("@datasource").its("response.statusCode").should("eq", 200)
-        // Confirm fetch tables was successful
-        cy.get(".spectrum-Table")
-          .eq(0)
-          .find(".spectrum-Table-row")
-          .its("length")
-          .should("be.gt", 0)
-      })
-
-      it("should check table fetching error", () => {
-        // MySQL test datasource contains tables without primary keys
-        cy.get(".spectrum-InLineAlert")
-          .should("contain", "Error fetching tables")
-          .and("contain", "No primary key constraint found")
-      })
-
-      it("should define a One relationship type", () => {
-        // Select relationship type & configure
-        cy.get(".spectrum-Button")
-          .contains("Define relationship")
-          .click({ force: true })
-        cy.get(".spectrum-Dialog-grid").within(() => {
-          cy.get(".spectrum-Picker").eq(0).click()
-          cy.get(".spectrum-Popover").contains("One").click()
-          cy.get(".spectrum-Picker").eq(1).click()
-          cy.get(".spectrum-Popover").contains("REGIONS").click()
-          cy.get(".spectrum-Picker").eq(2).click()
-          cy.get(".spectrum-Popover").contains("REGION_ID").click()
-          cy.get(".spectrum-Picker").eq(3).click()
-          cy.get(".spectrum-Popover").contains("COUNTRIES").click()
-          cy.get(".spectrum-Picker").eq(4).click()
-          cy.get(".spectrum-Popover").contains("REGION_ID").click()
-        })
-        // Save relationship & reload page
-        cy.get(".spectrum-ButtonGroup").within(() => {
-          cy.get(".spectrum-Button").contains("Save").click({ force: true })
-        })
-        cy.reload()
-
-        // Confirm table length & column name
-        cy.get(".spectrum-Table")
-          .eq(1)
-          .find(".spectrum-Table-row")
-          .its("length")
-          .should("eq", 1)
-        cy.get(".spectrum-Table-cell").should("contain", "COUNTRIES to REGIONS")
-      })
-
-      it("should define a Many relationship type", () => {
-        // Select relationship type & configure
-        cy.get(".spectrum-Button")
-          .contains("Define relationship")
-          .click({ force: true })
-        cy.get(".spectrum-Dialog-grid").within(() => {
-          cy.get(".spectrum-Picker").eq(0).click()
-          cy.get(".spectrum-Popover").contains("Many").click()
-          cy.get(".spectrum-Picker").eq(1).click()
-          cy.get(".spectrum-Popover").contains("LOCATIONS").click()
-          cy.get(".spectrum-Picker").eq(2).click()
-          cy.get(".spectrum-Popover").contains("REGIONS").click()
-          cy.get(".spectrum-Picker").eq(3).click()
-          cy.get(".spectrum-Popover").contains("COUNTRIES").click()
-          cy.get(".spectrum-Picker").eq(4).click()
-          cy.get(".spectrum-Popover").contains("COUNTRY_ID").click()
-          cy.get(".spectrum-Picker").eq(5).click()
-          cy.get(".spectrum-Popover").contains("REGION_ID").click()
-          // Save relationship & reload page
-          cy.get(".spectrum-Button").contains("Save").click({ force: true })
-          cy.reload()
-          cy.wait(1000)
-        })
-        // Confirm table length & relationship name
-        cy.get(".spectrum-Table", { timeout: 1000 })
-          .eq(1)
-          .find(".spectrum-Table-row")
-          .its("length")
-          .should("eq", 2)
-        cy.get(".spectrum-Table-cell").should(
-          "contain",
-          "LOCATIONS through COUNTRIES → REGIONS"
-        )
-      })
-
-      it("should delete relationships", () => {
-        // Delete both relationships
-        cy.get(".spectrum-Table")
-          .eq(1)
-          .find(".spectrum-Table-row")
-          .its("length")
-          .then(len => {
-            for (let i = 0; i < len; i++) {
-              cy.get(".spectrum-Table")
-                .eq(1)
-                .within(() => {
-                  cy.get(".spectrum-Table-cell").eq(0).click({ force: true })
-                })
-              cy.get(".spectrum-Dialog-grid", { timeout: 500 }).within(() => {
-                cy.get(".spectrum-Button")
-                  .contains("Delete")
-                  .click({ force: true })
-              })
-              cy.reload()
-              cy.wait(500)
-            }
-            // Confirm relationships no longer exist
-            cy.get(".spectrum-Body").should(
-              "contain",
-              "No relationships configured"
-            )
-          })
-      })
-
-      it("should add a query", () => {
-        // Add query
-        cy.get(".spectrum-Button").contains("Add query").click({ force: true })
-        cy.get(".spectrum-Form-item")
-          .eq(0)
-          .within(() => {
-            cy.get("input").type(queryName)
-          })
-        // Insert Query within Fields section
-        cy.get(".CodeMirror textarea")
-          .eq(0)
-          .type("SELECT * FROM books", { force: true })
-        // Intercept query execution
-        cy.intercept("**/queries/preview").as("query")
-        cy.get(".spectrum-Button").contains("Run Query").click({ force: true })
-        cy.wait(500)
-        cy.wait("@query")
-        // Assert against Status Code & Body
-        cy.get("@query").its("response.statusCode").should("eq", 200)
-        cy.get("@query").its("response.body").should("not.be.empty")
-        // Save query
-        cy.intercept("POST", "**/queries").as("saveQuery")
-        cy.get(".spectrum-Button").contains("Save Query").click({ force: true })
-        cy.wait("@saveQuery")
-        cy.get("@saveQuery").its("response.statusCode").should("eq", 200)
-        cy.get(".nav-item").should("contain", queryName)
-      })
-
-      it("should duplicate a query", () => {
-        /// Get query nav item - QueryName
-        cy.get(".nav-item")
-          .contains(queryName)
-          .parent()
-          .within(() => {
-            cy.get(".spectrum-Icon").eq(1).click({ force: true })
-          })
-        // Select and confirm duplication
-        cy.get(".spectrum-Menu").contains("Duplicate").click()
-        cy.get(".nav-item").should("contain", queryName + " (1)")
-      })
-
-      it("should edit a query name", () => {
-        // Rename query
-        cy.get(".spectrum-Form-item")
-          .eq(0)
-          .within(() => {
-            cy.get("input").clear().type(queryRename)
-          })
-        // Click on a nav item
-        cy.get(".nav-item").first().click()
-        // Confirm name change
-        cy.get(".nav-item").should("contain", queryRename)
-      })
-
-      it("should delete a query", () => {
-        // Get query nav item - QueryName
-        cy.get(".nav-item")
-          .contains(queryRename)
-          .parent()
-          .within(() => {
-            cy.get(".spectrum-Icon").eq(1).click({ force: true })
-        })
-        // Select Delete
-        cy.get(".spectrum-Menu").contains("Delete").click()
-        cy.get(".spectrum-Button")
-          .contains("Delete Query")
-          .click({ force: true })
-        // Confirm deletion
-        cy.get(".nav-item", { timeout: 1000 }).should("not.contain", queryRename)
-      })
-    }
-  })
-})
diff --git a/packages/builder/cypress/integration/datasources/oracle.spec.js b/packages/builder/cypress/integration/datasources/oracle.spec.js
deleted file mode 100644
index ae1ca5cd75..0000000000
--- a/packages/builder/cypress/integration/datasources/oracle.spec.js
+++ /dev/null
@@ -1,229 +0,0 @@
-import filterTests from "../../support/filterTests"
-
-filterTests(["all"], () => {
-  xcontext("Oracle Datasource Testing", () => {
-    if (Cypress.env("TEST_ENV")) {
-      before(() => {
-        cy.login()
-        cy.createTestApp()
-      })
-      const datasource = "Oracle"
-      const queryName = "Cypress Test Query"
-      const queryRename = "CT Query Rename"
-
-      it("Should add Oracle datasource and skip table fetch", () => {
-        // Select Oracle datasource
-        cy.selectExternalDatasource(datasource)
-        // Skip table fetch - no config added
-        cy.get(".spectrum-Button")
-          .contains("Skip table fetch")
-          .click({ force: true })
-        cy.wait(500)
-        // Confirm config contains localhost
-        cy.get(".spectrum-Textfield-input", { timeout: 500 })
-          .eq(1)
-          .should("have.value", "localhost")
-        // Add another Oracle datasource, configure & skip table fetch
-        cy.selectExternalDatasource(datasource)
-        cy.addDatasourceConfig(datasource, true)
-        // Confirm config and no tables
-        cy.get(".spectrum-Textfield-input")
-          .eq(1)
-          .should("have.value", Cypress.env("oracle").HOST)
-        cy.get(".spectrum-Body").eq(2).should("contain", "No tables found.")
-      })
-
-      it("Should add Oracle datasource and fetch tables without configuration", () => {
-        // Select Oracle datasource
-        cy.selectExternalDatasource(datasource)
-        // Attempt to fetch tables without applying configuration
-        cy.intercept("**/datasources").as("datasource")
-        cy.get(".spectrum-Button")
-          .contains("Save and fetch tables")
-          .click({ force: true })
-        // Intercept Request after button click & apply assertions
-        cy.wait("@datasource")
-        cy.get("@datasource")
-          .its("response.body")
-          .should("have.property", "status", 500)
-        cy.get(".spectrum-Button").contains("Skip table fetch").click({ force: true })
-      })
-
-      xit("should add Oracle datasource and fetch tables", () => {
-        // Add & configure Oracle datasource
-        cy.selectExternalDatasource(datasource)
-        cy.intercept("**/datasources").as("datasource")
-        cy.addDatasourceConfig(datasource)
-        // Check response from datasource after adding configuration
-        cy.wait("@datasource")
-        cy.get("@datasource").its("response.statusCode").should("eq", 200)
-        // Confirm fetch tables was successful
-        cy.get(".spectrum-Table")
-          .eq(0)
-          .find(".spectrum-Table-row")
-          .its("length")
-          .should("be.gt", 0)
-      })
-
-      xit("should define a One relationship type", () => {
-        // Select relationship type & configure
-        cy.get(".spectrum-Button")
-          .contains("Define relationship")
-          .click({ force: true })
-        cy.get(".spectrum-Dialog-grid").within(() => {
-          cy.get(".spectrum-Picker").eq(0).click()
-          cy.get(".spectrum-Popover").contains("One").click()
-          cy.get(".spectrum-Picker").eq(1).click()
-          cy.get(".spectrum-Popover").contains("REGIONS").click()
-          cy.get(".spectrum-Picker").eq(2).click()
-          cy.get(".spectrum-Popover").contains("REGION_ID").click()
-          cy.get(".spectrum-Picker").eq(3).click()
-          cy.get(".spectrum-Popover").contains("COUNTRIES").click()
-          cy.get(".spectrum-Picker").eq(4).click()
-          cy.get(".spectrum-Popover").contains("REGION_ID").click()
-          // Save relationship & reload page
-          cy.get(".spectrum-Button").contains("Save").click({ force: true })
-          cy.reload()
-        })
-        // Confirm table length & column name
-        cy.get(".spectrum-Table")
-          .eq(1)
-          .find(".spectrum-Table-row")
-          .its("length")
-          .should("eq", 1)
-        cy.get(".spectrum-Table-cell").should("contain", "COUNTRIES to REGIONS")
-      })
-
-      xit("should define a Many relationship type", () => {
-        // Select relationship type & configure
-        cy.get(".spectrum-Button")
-          .contains("Define relationship")
-          .click({ force: true })
-        cy.get(".spectrum-Dialog-grid").within(() => {
-          cy.get(".spectrum-Picker").eq(0).click()
-          cy.get(".spectrum-Popover").contains("Many").click()
-          cy.get(".spectrum-Picker").eq(1).click()
-          cy.get(".spectrum-Popover").contains("LOCATIONS").click()
-          cy.get(".spectrum-Picker").eq(2).click()
-          cy.get(".spectrum-Popover").contains("REGIONS").click()
-          cy.get(".spectrum-Picker").eq(3).click()
-          cy.get(".spectrum-Popover").contains("COUNTRIES").click()
-          cy.get(".spectrum-Picker").eq(4).click()
-          cy.get(".spectrum-Popover").contains("COUNTRY_ID").click()
-          cy.get(".spectrum-Picker").eq(5).click()
-          cy.get(".spectrum-Popover").contains("REGION_ID").click()
-          // Save relationship & reload page
-          cy.get(".spectrum-Button").contains("Save").click({ force: true })
-          cy.reload()
-        })
-        // Confirm table length & relationship name
-        cy.get(".spectrum-Table")
-          .eq(1)
-          .find(".spectrum-Table-row")
-          .its("length")
-          .should("eq", 2)
-        cy.get(".spectrum-Table-cell").should(
-          "contain",
-          "LOCATIONS through COUNTRIES → REGIONS"
-        )
-      })
-
-      xit("should delete relationships", () => {
-        // Delete both relationships
-        cy.get(".spectrum-Table")
-          .eq(1)
-          .find(".spectrum-Table-row")
-          .its("length")
-          .then(len => {
-            for (let i = 0; i < len; i++) {
-              cy.get(".spectrum-Table")
-                .eq(1)
-                .within(() => {
-                  cy.get(".spectrum-Table-row").eq(0).click()
-                })
-              cy.get(".spectrum-Dialog-grid", { timeout: 500 }).within(() => {
-                cy.get(".spectrum-Button")
-                  .contains("Delete")
-                  .click({ force: true })
-              })
-              cy.reload()
-            }
-            // Confirm relationships no longer exist
-            cy.get(".spectrum-Body").should(
-              "contain",
-              "No relationships configured"
-            )
-          })
-      })
-
-      xit("should add a query", () => {
-        // Add query
-        cy.get(".spectrum-Button").contains("Add query").click({ force: true })
-        cy.get(".spectrum-Form-item")
-          .eq(0)
-          .within(() => {
-            cy.get("input").type(queryName)
-          })
-        // Insert Query within Fields section
-        cy.get(".CodeMirror textarea")
-          .eq(0)
-          .type("SELECT * FROM JOBS", { force: true })
-        // Intercept query execution
-        cy.intercept("**/queries/preview").as("query")
-        cy.get(".spectrum-Button").contains("Run Query").click({ force: true })
-        cy.wait(500)
-        cy.wait("@query")
-        // Assert against Status Code & Body
-        cy.get("@query").its("response.statusCode").should("eq", 200)
-        cy.get("@query").its("response.body").should("not.be.empty")
-        // Save query
-        cy.get(".spectrum-Button").contains("Save Query").click({ force: true })
-        cy.get(".nav-item").should("contain", queryName)
-      })
-
-      xit("should duplicate a query", () => {
-        // Get query nav item
-        cy.get(".nav-item")
-          .contains(queryName)
-          .parent()
-          .within(() => {
-            cy.get(".spectrum-Icon").eq(1).click({ force: true })
-          })
-        // Select and confirm duplication
-        cy.get(".spectrum-Menu").contains("Duplicate").click()
-        cy.get(".nav-item").should("contain", queryName + " (1)")
-      })
-
-      xit("should edit a query name", () => {
-        // Rename query
-        cy.get(".spectrum-Form-item")
-          .eq(0)
-          .within(() => {
-            cy.get("input").clear().type(queryRename)
-          })
-        // Save query
-        cy.get(".spectrum-Button").contains("Save Query").click({ force: true })
-        cy.get(".nav-item").should("contain", queryRename)
-      })
-
-      xit("should delete a query", () => {
-        // Get query nav item - QueryName
-        cy.get(".nav-item")
-          .contains(queryName)
-          .parent()
-          .within(() => {
-            cy.get(".spectrum-Icon").eq(1).click({ force: true })
-          })
-
-        // Select Delete
-        cy.get(".spectrum-Menu").contains("Delete").click()
-        cy.get(".spectrum-Button")
-          .contains("Delete Query")
-          .click({ force: true })
-
-        // Confirm deletion
-        cy.get(".nav-item", { timeout: 1000 }).should("not.contain", queryName)
-      })
-    }
-  })
-})
diff --git a/packages/builder/cypress/integration/datasources/postgreSql.spec.js b/packages/builder/cypress/integration/datasources/postgreSql.spec.js
deleted file mode 100644
index e1aa0ff128..0000000000
--- a/packages/builder/cypress/integration/datasources/postgreSql.spec.js
+++ /dev/null
@@ -1,283 +0,0 @@
-import filterTests from "../../support/filterTests"
-
-filterTests(["all"], () => {
-  xcontext("PostgreSQL Datasource Testing", () => {
-    if (Cypress.env("TEST_ENV")) {
-      before(() => {
-        cy.login()
-        cy.createTestApp()
-      })
-      const datasource = "PostgreSQL"
-      const queryName = "Cypress Test Query"
-      const queryRename = "CT Query Rename"
-
-      xit("Should add PostgreSQL datasource without configuration", () => {
-        // Select PostgreSQL datasource
-        cy.selectExternalDatasource(datasource)
-        // Attempt to fetch tables without applying configuration
-        cy.intercept("**/datasources").as("datasource")
-        cy.get(".spectrum-Button")
-          .contains("Save and fetch tables")
-          .click({ force: true })
-        // Intercept Request after button click & apply assertions
-        cy.wait("@datasource")
-        cy.get("@datasource")
-          .its("response.body")
-          .should("have.property", "status", 500)
-        cy.get(".spectrum-Button").contains("Skip table fetch").click({ force: true })
-      })
-
-      it("should add PostgreSQL datasource and fetch tables", () => {
-        // Add & configure PostgreSQL datasource
-        cy.selectExternalDatasource(datasource)
-        cy.intercept("**/datasources").as("datasource")
-        cy.addDatasourceConfig(datasource)
-        // Check response from datasource after adding configuration
-        cy.wait("@datasource")
-        cy.get("@datasource").its("response.statusCode").should("eq", 200)
-        cy.wait(2000)
-        // Confirm fetch tables was successful
-        cy.get(".spectrum-Table")
-          .eq(0)
-          .find(".spectrum-Table-row")
-          .its("length")
-          .should("be.gt", 0)
-      })
-
-      it("should define a One relationship type", () => {
-        // Select relationship type & configure
-        cy.get(".spectrum-Button")
-          .contains("Define relationship")
-          .click({ force: true })
-        cy.get(".spectrum-Dialog-grid").within(() => {
-          cy.get(".spectrum-Picker").eq(0).click()
-          cy.get(".spectrum-Popover").contains("One").click()
-          cy.get(".spectrum-Picker").eq(1).click()
-          cy.get(".spectrum-Popover").contains("REGIONS").click()
-          cy.get(".spectrum-Picker").eq(2).click()
-          cy.get(".spectrum-Popover").contains("REGION_ID").click()
-          cy.get(".spectrum-Picker").eq(3).click()
-          cy.get(".spectrum-Popover").contains("COUNTRIES").click()
-          cy.get(".spectrum-Picker").eq(4).click()
-          cy.get(".spectrum-Popover").contains("REGION_ID").click()
-          // Save relationship & reload page
-          cy.get(".spectrum-Button").contains("Save").click({ force: true })
-          cy.reload()
-        })
-        // Confirm table length & column name
-        cy.get(".spectrum-Table")
-          .eq(1)
-          .find(".spectrum-Table-row")
-          .its("length")
-          .should("eq", 1)
-        cy.get(".spectrum-Table-cell").should("contain", "COUNTRIES to REGIONS")
-      })
-
-      it("should define a Many relationship type", () => {
-        // Select relationship type & configure
-        cy.get(".spectrum-Button")
-          .contains("Define relationship")
-          .click({ force: true })
-        cy.get(".spectrum-Dialog-grid").within(() => {
-          cy.get(".spectrum-Picker").eq(0).click()
-          cy.get(".spectrum-Popover").contains("Many").click()
-          cy.get(".spectrum-Picker").eq(1).click()
-          cy.get(".spectrum-Popover").contains("LOCATIONS").click()
-          cy.get(".spectrum-Picker").eq(2).click()
-          cy.get(".spectrum-Popover").contains("REGIONS").click()
-          cy.get(".spectrum-Picker").eq(3).click()
-          cy.get(".spectrum-Popover").contains("COUNTRIES").click()
-          cy.get(".spectrum-Picker").eq(4).click()
-          cy.get(".spectrum-Popover").contains("COUNTRY_ID").click()
-          cy.get(".spectrum-Picker").eq(5).click()
-          cy.get(".spectrum-Popover").contains("REGION_ID").click()
-          // Save relationship & reload page
-          cy.get(".spectrum-Button").contains("Save").click({ force: true })
-          cy.reload()
-        })
-        // Confirm table length & relationship name
-        cy.get(".spectrum-Table")
-          .eq(1)
-          .find(".spectrum-Table-row")
-          .its("length")
-          .should("eq", 2)
-        cy.get(".spectrum-Table-cell").should(
-          "contain",
-          "LOCATIONS through COUNTRIES → REGIONS"
-        )
-      })
-
-      it("should delete a relationship", () => {
-        cy.get(".hierarchy-items-container").contains("PostgreSQL").click({ force: true })
-        cy.reload()
-        // Delete one relationship
-        cy.get(".spectrum-Table")
-          .eq(1)
-          .within(() => {
-            cy.get(".spectrum-Table-cell").eq(0).click({ force: true })
-          })
-        cy.get(".spectrum-Dialog-grid", { timeout: 500 }).within(() => {
-          cy.get(".spectrum-Button").contains("Delete").click({ force: true })
-        })
-        cy.reload()
-        cy.wait(500)
-        // Confirm relationship was deleted
-        cy.get(".spectrum-Table")
-          .eq(1)
-          .find(".spectrum-Table-row")
-          .its("length")
-          .should("eq", 1)
-      })
-
-      it("should add a query", () => {
-        // Add query
-        cy.get(".spectrum-Button").contains("Add query").click({ force: true })
-        cy.get(".spectrum-Form-item")
-          .eq(0)
-          .within(() => {
-            cy.get("input").type(queryName)
-          })
-        // Insert Query within Fields section
-        cy.get(".CodeMirror textarea")
-          .eq(0)
-          .type("SELECT * FROM books", { force: true })
-        // Intercept query execution
-        cy.intercept("**/queries/preview").as("query")
-        cy.get(".spectrum-Button").contains("Run Query").click({ force: true })
-        cy.wait(500)
-        cy.wait("@query")
-        // Assert against Status Code & Body
-        cy.get("@query").its("response.statusCode").should("eq", 200)
-        cy.get("@query").its("response.body").should("not.be.empty")
-        // Save query
-        cy.intercept("**/queries").as("saveQuery")
-        cy.get(".spectrum-Button").contains("Save Query").click({ force: true })
-        cy.wait("@saveQuery")
-        cy.get(".spectrum-Tabs-content", { timeout: 2000 }).should("contain", queryName)
-      })
-
-      it("should switch to schema with no tables", () => {
-        // Switch Schema - To one without any tables
-        cy.get(".hierarchy-items-container").contains("PostgreSQL").click({ force: true })
-        switchSchema("randomText")
-
-        // No tables displayed
-        cy.get(".spectrum-Body", { timeout: 10000 }).eq(2, { timeout: 10000 }).should("contain", "No tables found")
-
-        // Previously created query should be visible
-        cy.get(".spectrum-Table").should("contain", queryName)
-      })
-
-      it("should switch schemas", () => {
-        // Switch schema - To one with tables
-        switchSchema("1")
-
-        // Confirm tables exist - Check for specific one
-        cy.get(".spectrum-Table", { timeout: 20000 }).eq(0).should("contain", "test")
-        cy.get(".spectrum-Table")
-          .eq(0)
-          .find(".spectrum-Table-row")
-          .its("length")
-          .should("eq", 1)
-
-        // Confirm specific table visible within left nav bar
-        cy.get(".hierarchy-items-container").should("contain", "test")
-
-        // Switch back to public schema
-        switchSchema("public")
-
-        // Confirm tables exist - again
-        cy.get(".spectrum-Table", { timeout: 20000 }).eq(0).should("contain", "REGIONS")
-        cy.get(".spectrum-Table")
-          .eq(0)
-          .find(".spectrum-Table-row")
-          .its("length")
-          .should("be.gt", 1)
-
-        // Confirm specific table visible within left nav bar
-        cy.get(".hierarchy-items-container").should("contain", "REGIONS")
-
-        // No relationships and one query
-        cy.get(".spectrum-Body")
-          .eq(3)
-          .should("contain", "No relationships configured.")
-        cy.get(".spectrum-Table").eq(1).should("contain", queryName)
-      })
-
-      it("should duplicate a query", () => {
-        // Locate previously created query
-        cy.get(".nav-item")
-          .contains(queryName)
-          .siblings(".actions")
-          .within(() => {
-            cy.get(".spectrum-Icon").click({ force: true })
-          })
-        // Select and confirm duplication
-        cy.get(".spectrum-Menu").contains("Duplicate").click()
-        cy.get(".nav-item").should("contain", queryName + " (1)")
-      })
-
-      it("should edit a query name", () => {
-        // Access query
-        cy.get(".hierarchy-items-container", { timeout: 2000 })
-          //.contains(queryName + " (1)")
-          .contains(queryName)
-          .click({ force: true })
-
-        // Rename query
-        cy.wait(1000)
-        cy.get(".spectrum-Form-item", { timeout: 2000 })
-          .eq(0)
-          .within(() => {
-            cy.get("input").clear().type(queryRename)
-          })
-
-        // Click on a nav item and confirm name change
-        cy.get(".nav-item").first().click()
-        // Confirm name change
-        cy.get(".nav-item").should("contain", queryRename)
-      })
-
-      it("should delete a query", () => {
-        // Get query nav item - QueryName
-        cy.get(".nav-item")
-          .contains(queryRename)
-          .parent()
-          .within(() => {
-            cy.get(".spectrum-Icon").eq(1).click({ force: true })
-        })
-        // Select Delete
-        cy.get(".spectrum-Menu").contains("Delete").click()
-        cy.get(".spectrum-Button")
-          .contains("Delete Query")
-          .click({ force: true })
-        // Confirm deletion
-        cy.reload()
-        cy.get(".nav-item", { timeout: 30000 }).contains(datasource).click({ force: true })
-        cy.get(".nav-item", { timeout: 1000 }).should("not.contain", queryRename)
-      })
-
-      const switchSchema = schema => {
-        // Edit configuration - Change Schema
-        cy.get(".spectrum-Textfield")
-          .eq(6)
-          .within(() => {
-            cy.get("input").clear().type(schema)
-          })
-        // Save configuration & fetch
-        cy.get(".spectrum-Button").contains("Save").click({ force: true })
-        cy.get(".spectrum-Button")
-          .contains("Fetch tables")
-          .click({ force: true })
-        // Click fetch tables again within modal
-        cy.get(".spectrum-Dialog-grid").within(() => {
-          cy.get(".spectrum-Button")
-            .contains("Fetch tables")
-            .click({ force: true })
-        })
-        cy.reload()
-        cy.wait(1000)
-      }
-    }
-  })
-})
diff --git a/packages/builder/cypress/integration/datasources/rest.spec.js b/packages/builder/cypress/integration/datasources/rest.spec.js
deleted file mode 100644
index 7f715ae50c..0000000000
--- a/packages/builder/cypress/integration/datasources/rest.spec.js
+++ /dev/null
@@ -1,45 +0,0 @@
-import filterTests from "../../support/filterTests"
-
-filterTests(["smoke", "all"], () => {
-  xcontext("REST Datasource Testing", () => {
-    before(() => {
-      cy.login()
-      cy.createTestApp()
-    })
-
-    const datasource = "REST"
-    const restUrl = "https://api.openbrewerydb.org/breweries"
-
-    it("Should add REST datasource with incorrect API", () => {
-      // Select REST datasource
-      cy.selectExternalDatasource(datasource)
-      // Enter incorrect api & attempt to send query
-      cy.get(".query-buttons", { timeout: 1000 }).contains("Add query").click({ force: true })
-      cy.intercept("**/preview").as("queryError")
-      cy.get("input").clear().type("random text")
-      cy.get(".spectrum-Button").contains("Send").click({ force: true })
-      // Intercept Request after button click & apply assertions
-      cy.wait("@queryError")
-      cy.get("@queryError")
-        .its("response.body")
-        .should("have.property", "message", "Invalid URL: http://random text")
-      cy.get("@queryError")
-        .its("response.body")
-        .should("have.property", "status", 400)
-    })
-
-    it("should add and configure a REST datasource", () => {
-      // Select REST datasource and create query
-      cy.selectExternalDatasource(datasource)
-      cy.wait(500)
-      // createRestQuery confirms query creation
-      cy.createRestQuery("GET", restUrl, "/breweries")
-      // Confirm status code response within REST datasource
-      cy.get(".stats", { timeout: 1000 }).within(() => {
-        cy.get(".spectrum-FieldLabel")
-        .eq(0)
-        .should("contain", 200)
-      })
-    })
-  })
-})
diff --git a/packages/builder/cypress/integration/queryLevelTransformers.spec.js b/packages/builder/cypress/integration/queryLevelTransformers.spec.js
deleted file mode 100644
index 7357bbe905..0000000000
--- a/packages/builder/cypress/integration/queryLevelTransformers.spec.js
+++ /dev/null
@@ -1,147 +0,0 @@
-import filterTests from "../support/filterTests"
-const interact = require("../support/interact")
-
-filterTests(["smoke", "all"], () => {
-  context("Query Level Transformers", () => {
-    before(() => {
-      cy.login()
-      cy.createTestApp()
-    })
-
-    it("should write a transformer function", () => {
-      // Add REST datasource - contains API for breweries
-      const datasource = "REST"
-      const restUrl = "https://api.openbrewerydb.org/breweries"
-      cy.selectExternalDatasource(datasource)
-      cy.createRestQuery("GET", restUrl, "breweries")
-      cy.reload()
-      cy.contains(".nav-item-content", "breweries", { timeout: 20000 }).click()
-      cy.contains(interact.SPECTRUM_TABS_ITEM, "Transformer", { timeout: 5000 }).click({ force: true })
-      // Get Transformer Function from file
-      cy.readFile("cypress/support/queryLevelTransformerFunction.js").then(
-        transformerFunction => {
-          cy.get(interact.CODEMIRROR_TEXTAREA, { timeout: 5000 })
-            // Highlight current text and overwrite with file contents
-            .type(Cypress.platform === "darwin" ? "{cmd}a" : "{ctrl}a", {
-              force: true,
-            })
-            .type(transformerFunction, { parseSpecialCharSequences: false })
-        }
-      )
-      // Send Query
-      cy.intercept("**/queries/preview").as("query")
-      cy.get(interact.SPECTRUM_BUTTON).contains("Save").click({ force: true })
-      cy.get(interact.SPECTRUM_BUTTON).contains("Send").click({ force: true })
-      cy.wait("@query")
-      // Assert against Status Code, body, & body rows
-      cy.get("@query").its("response.statusCode").should("eq", 200)
-      cy.get("@query").its("response.body").should("not.be.empty")
-      cy.get("@query").its("response.body.rows").should("not.be.empty")
-    })
-
-    it("should add data to the previous query", () => {
-      // Add REST datasource - contains API for breweries
-      const datasource = "REST"
-      const restUrl = "https://api.openbrewerydb.org/breweries"
-      cy.selectExternalDatasource(datasource)
-      cy.createRestQuery("GET", restUrl, "breweries")
-      cy.reload()
-      cy.contains(".nav-item-content", "breweries", { timeout: 2000 }).click()
-      cy.contains(interact.SPECTRUM_TABS_ITEM, "Transformer", { timeout: 5000 }).click({ force: true })
-      // Get Transformer Function with Data from file
-      cy.readFile(
-        "cypress/support/queryLevelTransformerFunctionWithData.js"
-      ).then(transformerFunction => {
-        //console.log(transformerFunction[1])
-        cy.get(interact.CODEMIRROR_TEXTAREA)
-          // Highlight current text and overwrite with file contents
-          .type(Cypress.platform === "darwin" ? "{cmd}a" : "{ctrl}a", {
-            force: true,
-          })
-          .type(transformerFunction, { parseSpecialCharSequences: false })
-      })
-      // Send Query
-      cy.intercept("**/queries/preview").as("query")
-      cy.get(interact.SPECTRUM_BUTTON).contains("Send").click({ force: true })
-      cy.wait("@query")
-      // Assert against Status Code, body, & body rows
-      cy.get("@query").its("response.statusCode").should("eq", 200)
-      cy.get("@query").its("response.body").should("not.be.empty")
-      cy.get("@query").its("response.body.rows").should("not.be.empty")
-    })
-
-    it("should run an invalid query within the transformer section", () => {
-      // Add REST datasource - contains API for breweries
-      const datasource = "REST"
-      const restUrl = "https://api.openbrewerydb.org/breweries"
-      cy.selectExternalDatasource(datasource)
-      cy.createRestQuery("GET", restUrl, "breweries")
-      cy.reload()
-      cy.contains(".nav-item-content", "breweries", { timeout: 10000 }).click()
-      cy.contains(interact.SPECTRUM_TABS_ITEM, "Transformer", { timeout: 5000 }).click({ force: true })
-      // Clear the code box and add "test"
-      cy.get(interact.CODEMIRROR_TEXTAREA)
-        .type(Cypress.platform === "darwin" ? "{cmd}a" : "{ctrl}a", {
-          force: true,
-        })
-        .type("test")
-      // Run Query and intercept
-      cy.intercept("**/preview").as("queryError")
-      cy.get(interact.SPECTRUM_BUTTON).contains("Send").click({ force: true })
-      cy.wait("@queryError")
-      cy.wait(500)
-      // Assert against message and status for the query error
-      cy.get("@queryError")
-        .its("response.body")
-        .should("have.property", "message", "test is not defined")
-      cy.get("@queryError")
-        .its("response.body")
-        .should("have.property", "status", 400)
-    })
-
-    xit("should run an invalid query via POST request", () => {
-      // POST request with transformer as null
-      cy.request({
-        method: "POST",
-        url: `${Cypress.config().baseUrl}/api/queries/`,
-        body: {
-          fields: { headers: {}, queryString: null, path: null },
-          parameters: [],
-          schema: {},
-          name: "test",
-          queryVerb: "read",
-          transformer: null,
-          datasourceId: "test",
-        },
-        // Expected 400 error - Transformer must be a string
-        failOnStatusCode: false,
-      }).then(response => {
-        expect(response.status).to.equal(400)
-        expect(response.body.message).to.include(
-          'Invalid body - "transformer" must be a string'
-        )
-      })
-    })
-
-    xit("should run an empty query", () => {
-      // POST request with Transformer as an empty string
-      cy.request({
-        method: "POST",
-        url: `${Cypress.config().baseUrl}/api/queries/preview`,
-        body: {
-          fields: { headers: {}, queryString: null, path: null },
-          queryVerb: "read",
-          transformer: "",
-          datasourceId: "test",
-        },
-        // Expected 400 error - Transformer is not allowed to be empty
-        failOnStatusCode: false,
-      }).then(response => {
-        expect(response.status).to.equal(400)
-        expect(response.body.message).to.include(
-          'Invalid body - "transformer" is not allowed to be empty'
-        )
-      })
-    })
-  })
-})
diff --git a/packages/builder/cypress/integration/renameAnApplication.spec.js b/packages/builder/cypress/integration/renameAnApplication.spec.js
deleted file mode 100644
index 6e432e476b..0000000000
--- a/packages/builder/cypress/integration/renameAnApplication.spec.js
+++ /dev/null
@@ -1,112 +0,0 @@
-import filterTests from "../support/filterTests"
-const interact = require("../support/interact")
-
-filterTests(["all"], () => {
-  xcontext("Rename an App", () => {
-    beforeEach(() => {
-      cy.login()
-      cy.createTestApp()
-    })
-
-    it("should rename an unpublished application", () => {
-      const appName = "Cypress Tests"
-      const appRename = "Cypress Renamed"
-      // Rename app, Search for app, Confirm name was changed
-      cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 })
-      renameApp(appName, appRename)
-      cy.reload()
-      cy.searchForApplication(appRename)
-      cy.get(interact.APP_TABLE).find(interact.TITLE).should("have.length", 1)
-      cy.applicationInAppTable(appRename)
-      // Set app name back to Cypress Tests
-      cy.reload()
-      renameApp(appRename, appName)
-    })
-
-    xit("Should rename a published application", () => {
-      // It is not possible to rename a published application
-      const appName = "Cypress Tests"
-      const appRename = "Cypress Renamed"
-      // Publish the app
-      cy.get(interact.TOP_RIGHT_NAV)
-      cy.get(interact.SPECTRUM_BUTTON)
-        .contains("Publish")
-        .click({ force: true })
-      cy.get(interact.SPECTRUM_DIALOG_GRID).within(() => {
-        // Click publish again within the modal
-        cy.get(interact.SPECTRUM_BUTTON)
-          .contains("Publish")
-          .click({ force: true })
-      })
-      // Rename app, Search for app, Confirm name was changed
-      cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 })
-      renameApp(appName, appRename, true)
-      cy.get(interact.APP_TABLE).find(interact.WRAPPER).should("have.length", 1)
-      cy.applicationInAppTable(appRename)
-    })
-
-    it("Should try to rename an application to have no name", () => {
-      const appName = "Cypress Tests"
-      cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 })
-      renameApp(appName, " ", false, true)
-      // Close modal and confirm name has not been changed
-      cy.get(interact.SPECTRUM_DIALOG_GRID, { timeout: 1000 }).contains("Cancel").click()
-      cy.applicationInAppTable(appName)
-    })
-
-    xit("Should create two applications with the same name", () => {
-      // It is not possible to have applications with the same name
-      const appName = "Cypress Tests"
-      cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 })
-      cy.get(interact.SPECTRUM_BUTTON), { timeout: 500 }
-        .contains("Create app")
-        .click({ force: true })
-      cy.contains(/Start from scratch/).click()
-      cy.get(interact.SPECTRUM_MODAL).within(() => {
-        cy.get("input").eq(0).type(appName)
-        cy.get(interact.SPECTRUM_BUTTON_GROUP)
-          .contains("Create app")
-          .click({ force: true })
-        cy.get(interact.ERROR).should(
-          "have.text",
-          "Another app with the same name already exists"
-        )
-      })
-    })
-
-    it("should validate application names", () => {
-      // App name must be letters, numbers and spaces only
-      // This test checks numbers and special characters specifically
-      const appName = "Cypress Tests"
-      const numberName = 12345
-      const specialCharName = "£$%^"
-      cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 })
-      renameApp(appName, numberName)
-      cy.applicationInAppTable(numberName)
-      renameApp(numberName, specialCharName)
-      cy.get(interact.ERROR).should(
-        "have.text",
-        "App name must be letters, numbers and spaces only"
-      )
-      // Set app name back to Cypress Tests
-      renameApp(numberName, appName)
-    })
-
-    const renameApp = (originalName, changedName, published, noName) => {
-      cy.searchForApplication(originalName)
-      cy.get(interact.APP_TABLE, { timeout: 1000 }).within(() => {
-        cy.get(".app-row-actions button")
-          .contains("Manage")
-          .eq(0)
-          .click({ force: true })
-      })
-      cy.get(".spectrum-Tabs-item").contains("Settings").click()
-      cy.get(".spectrum-Tabs-item.is-selected").contains("Settings")
-      cy.get(".settings-tab").should("be.visible")
-      cy.get(".details-section .page-action button")
-        .contains("Edit")
-        .click({ force: true })
-      cy.updateAppName(changedName, noName)
-    }
-  })
-})
diff --git a/packages/builder/cypress/integration/revertApp.spec.js b/packages/builder/cypress/integration/revertApp.spec.js
deleted file mode 100644
index 2cd806b02c..0000000000
--- a/packages/builder/cypress/integration/revertApp.spec.js
+++ /dev/null
@@ -1,75 +0,0 @@
-import filterTests from "../support/filterTests"
-const interact = require('../support/interact')
-
-filterTests(['smoke', 'all'], () => {
-    xcontext("Revert apps", () => {
-        before(() => {
-        cy.login()
-        cy.createTestApp()
-        })
-        
-        it("should try to revert an unpublished app", () => {
-            // Click revert icon
-            cy.get(interact.TOP_RIGHT_NAV).within(() => {
-                cy.get(interact.AREA_LABEL_REVERT).click({ force: true })
-            })
-            cy.get(interact.SPECTRUM_MODAL).within(() => {
-                // Enter app name before revert
-                cy.get(interact.SPECTRUM_TEXTFIELD_INPUT).type("Cypress Tests")
-                cy.intercept('**/revert').as('revertApp')
-                // Click Revert
-                cy.get(interact.SPECTRUM_BUTTON).contains("Revert").click({ force: true })
-                // Intercept Request after button click & apply assertions
-                cy.wait("@revertApp")
-                cy.get("@revertApp").its('response.body').should('have.property', 'message', "App has not yet been deployed")
-                cy.get("@revertApp").its('response.body').should('have.property', 'status', 400)
-            })
-        })
-        
-        it("should revert a published app", () => {
-            cy.navigateToFrontend()
-
-            // Add initial component - Paragraph
-            cy.searchAndAddComponent("Paragraph")
-            // Publish app
-            cy.get(interact.SPECTRUM_BUTTON).contains("Publish").click({ force: true })
-            cy.get(interact.SPECTRUM_BUTTON_GROUP).within(() => {
-                cy.get(interact.SPECTRUM_BUTTON).contains("Publish").click({ force: true })
-            })
-            cy.wait(1000) // Wait for next modal to finish loading
-            cy.get(interact.SPECTRUM_BUTTON_GROUP, { timeout: 1000 }).within(() => {
-                cy.get(interact.SPECTRUM_BUTTON).contains("Done").click({ force: true })
-            })
-
-            // Add second component - Button
-            cy.searchAndAddComponent("Button")
-            // Click Revert
-            cy.get(interact.TOP_RIGHT_NAV).within(() => {
-                cy.get(interact.AREA_LABEL_REVERT).click({ force: true })
-            })
-            cy.get(interact.SPECTRUM_DIALOG_GRID).within(() => {
-                cy.get("input").type("Cypress Tests")
-                // Click Revert
-                cy.get(interact.SPECTRUM_BUTTON).contains("Revert").click({ force: true })
-                cy.wait(2000) // Wait for app to finish reverting
-            })
-            // Confirm Paragraph component is still visible
-            cy.get(interact.ROOT, { timeout: 1000 }).contains("New Paragraph")
-            // Confirm Button component is not visible
-            cy.get(interact.ROOT, { timeout: 1000 }).should("not.have.text", "New Button")
-        })
-        
-        it("should enter incorrect app name when reverting", () => {
-            // Click Revert
-            cy.get(interact.TOP_RIGHT_NAV, { timeout: 1000 }).within(() => {
-                cy.get(interact.AREA_LABEL_REVERT).click({ force: true })
-            })
-            // Enter incorrect app name
-            cy.get(interact.SPECTRUM_DIALOG_GRID).within(() => {
-                cy.get("input").type("Cypress Tests")
-                // Revert button within modal should be disabled
-                cy.get(interact.SPECTRUM_BUTTON).eq(1).should('be.disabled')
-            })
-        })
-    })
-})
diff --git a/packages/builder/cypress/plugins/index.js b/packages/builder/cypress/plugins/index.js
deleted file mode 100644
index 771ba886b5..0000000000
--- a/packages/builder/cypress/plugins/index.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/// <reference types="cypress" />
-// ***********************************************************
-// This example plugins/index.js can be used to load plugins
-//
-// You can change the location of this file or turn off loading
-// the plugins file with the 'pluginsFile' configuration option.
-//
-// You can read more here:
-// https://on.cypress.io/plugins-guide
-// ***********************************************************
-
-// This function is called when a project is opened or re-opened (e.g. due to
-// the project's config changing)
-
-/**
- * @type {Cypress.PluginConfig}
- */
-// eslint-disable-next-line no-unused-vars
-module.exports = (on, config) => {
-  // `on` is used to hook into various events Cypress emits
-  // `config` is the resolved Cypress config
-  require("cypress-terminal-report/src/installLogsPrinter")(on)
-}
diff --git a/packages/builder/cypress/support/commands.js b/packages/builder/cypress/support/commands.js
deleted file mode 100644
index e63fd41591..0000000000
--- a/packages/builder/cypress/support/commands.js
+++ /dev/null
@@ -1,945 +0,0 @@
-Cypress.on("uncaught:exception", () => {
-  return false
-})
-
-// ACCOUNTS & USERS
-Cypress.Commands.add("login", (email, password) => {
-  cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 30000 })
-  cy.url()
-    .should("include", "/builder/")
-    .then(url => {
-      if (url.includes("builder/admin")) {
-        // create admin user
-        cy.get("input").first().type("test@test.com")
-        cy.get('input[type="password"]').first().type("test")
-        cy.get('input[type="password"]').eq(1).type("test")
-        cy.contains("Create super admin user").click({ force: true })
-      }
-      if (url.includes("builder/auth") || url.includes("builder/admin")) {
-        // login
-        cy.contains("Sign in to Budibase").then(() => {
-          if (email == null) {
-            cy.get("input").first().type("test@test.com")
-            cy.get('input[type="password"]').type("test")
-          } else {
-            cy.get("input").first().type(email)
-            cy.get('input[type="password"]').type(password)
-          }
-          cy.get("button").first().click({ force: true })
-          cy.wait(1000)
-        })
-      }
-    })
-})
-
-Cypress.Commands.add("logOut", () => {
-  cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 30000 })
-  cy.get(".user-dropdown .avatar > .icon").click({ force: true })
-  cy.get(".spectrum-Popover[data-cy='user-menu']").within(() => {
-    cy.get("li[data-cy='user-logout']").click({ force: true })
-  })
-  cy.wait(2000)
-})
-
-Cypress.Commands.add("logoutNoAppGrid", () => {
-  // Logs user out when app grid is not present
-  cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 30000 })
-  cy.get(".avatar > .icon").click({ force: true })
-  cy.get(".spectrum-Popover[data-cy='user-menu']").within(() => {
-    cy.get(".spectrum-Menu-item").contains("Log out").click({ force: true })
-  })
-  cy.wait(2000)
-})
-
-Cypress.Commands.add("createUser", (email, permission) => {
-  cy.contains("Users").click()
-  cy.get(`[data-cy="add-user"]`).click()
-  cy.get(".spectrum-Dialog-grid").within(() => {
-    // Enter email
-    cy.get(".spectrum-Textfield-input").clear().click().type(email)
-
-    // Select permission, if applicable
-    // Default is App User
-    if (permission != null) {
-      cy.get(".spectrum-Picker-label").click()
-      cy.get(".spectrum-Menu").within(() => {
-        cy.get(".spectrum-Menu-item")
-          .contains(permission)
-          .click({ force: true })
-      })
-    }
-    // Add user
-    cy.get(".spectrum-Button").contains("Add users").click({ force: true })
-    cy.get(".spectrum-ActionButton").contains("Add email").should("not.exist")
-  })
-  // Onboarding modal
-  cy.get(".spectrum-Dialog-grid", { timeout: 5000 }).contains(
-    "Choose your onboarding"
-  )
-  cy.get(".spectrum-Dialog-grid").within(() => {
-    cy.get(".onboarding-type").eq(1).click()
-    cy.get(".spectrum-Button").contains("Done").click({ force: true })
-    cy.get(".spectrum-Button").contains("Cancel").should("not.exist")
-  })
-
-  // Accounts created modal - Click Done button
-  cy.get(".spectrum-Button").contains("Done").click({ force: true })
-})
-
-Cypress.Commands.add("deleteUser", email => {
-  // Assumes user has access to Users section
-  cy.contains("Users", { timeout: 2000 }).click()
-  cy.contains(email).click()
-
-  cy.get(".title").within(() => {
-    cy.get(".spectrum-Icon").click({ force: true })
-  })
-  cy.get(".spectrum-Menu").within(() => {
-    cy.get(".spectrum-Menu-item").contains("Delete").click({ force: true })
-  })
-  cy.get(".spectrum-Dialog-grid").contains("Delete user").click({ force: true })
-})
-
-Cypress.Commands.add("updateUserInformation", (firstName, lastName) => {
-  cy.get(".user-dropdown .icon", { timeout: 2000 }).click({
-    force: true,
-  })
-
-  cy.get(".spectrum-Popover[data-cy='user-menu']").within(() => {
-    cy.get("li[data-cy='user-info']").click({ force: true })
-  })
-
-  cy.get(".spectrum-Modal.is-open").within(() => {
-    cy.get("[data-cy='user-first-name']").clear()
-
-    if (!firstName || firstName == "") {
-      cy.get("[data-cy='user-first-name']").invoke("val").should("be.empty")
-    } else {
-      cy.get("[data-cy='user-first-name']")
-        .type(firstName)
-        .should("have.value", firstName)
-        .blur()
-    }
-
-    cy.get("[data-cy='user-last-name']").clear()
-
-    if (!lastName || lastName == "") {
-      cy.get("[data-cy='user-last-name']").invoke("val").should("be.empty")
-    } else {
-      cy.get("[data-cy='user-last-name']")
-        .type(lastName)
-        .should("have.value", lastName)
-        .blur()
-    }
-    cy.get(".confirm-wrap").within(() => {
-      cy.get("button").contains("Save").click({ force: true })
-    })
-    cy.get(".spectrum-Dialog-grid").should("not.exist")
-  })
-})
-
-Cypress.Commands.add("setUserRole", (user, role) => {
-  cy.contains("Users").click()
-  cy.contains(user).click()
-
-  // Set Role
-  cy.wait(500)
-  cy.get(".spectrum-Form-itemField")
-    .eq(3)
-    .within(() => {
-      cy.get(".spectrum-Picker-label").click({ force: true })
-    })
-  cy.get(".spectrum-Menu").within(() => {
-    cy.get(".spectrum-Menu-itemLabel").contains(role).click({ force: true })
-  })
-  cy.get(".spectrum-Form-itemField").eq(3).should("contain", role)
-})
-
-// APPLICATIONS
-Cypress.Commands.add("createTestApp", () => {
-  const appName = "Cypress Tests"
-  cy.deleteApp(appName)
-  cy.createApp(appName, "This app is used for Cypress testing.")
-})
-
-Cypress.Commands.add("createApp", (name, addDefaultTable) => {
-  const shouldCreateDefaultTable =
-    typeof addDefaultTable != "boolean" ? true : addDefaultTable
-
-  cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 30000 })
-  cy.url({ timeout: 30000 }).should("include", "/apps")
-  cy.get(`[data-cy="create-app-btn"]`, { timeout: 5000 }).click({ force: true })
-
-  // If apps already exist
-  cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`, {
-    timeout: 5000,
-  })
-    .its("body")
-    .then(val => {
-      if (val.length > 0) {
-        cy.get(`[data-cy="create-app-btn"]`, { timeout: 5000 }).click({
-          force: true,
-        })
-      }
-    })
-
-  cy.get(".spectrum-Modal").within(() => {
-    cy.get("input").eq(0).should("have.focus")
-    if (name && name != "") {
-      cy.get("input").eq(0).clear()
-      cy.get("input").eq(0).type(name).should("have.value", name).blur()
-    }
-    cy.get(".spectrum-ButtonGroup")
-      .contains("Create app")
-      .click({ force: true })
-    cy.wait(2000)
-  })
-  if (shouldCreateDefaultTable) {
-    cy.createTable("Cypress Tests", true)
-  }
-})
-
-Cypress.Commands.add("deleteApp", name => {
-  cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 30000 })
-  cy.wait(2000)
-  cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
-    .its("body")
-    .then(val => {
-      const findAppName = val.some(val => val.name == name)
-      if (findAppName) {
-        if (val.length > 0) {
-          const appId = val.reduce((acc, app) => {
-            if (name === app.name) {
-              acc = app.appId
-            }
-            return acc
-          }, "")
-
-          if (appId == "") {
-            return
-          }
-
-          // Go to app overview
-          const appIdParsed = appId.split("_").pop()
-          const actionEleId = `[data-cy=row_actions_${appIdParsed}]`
-          cy.get(actionEleId).click()
-          cy.get(`[aria-label="ShowMenu"]`).click()
-          cy.get(".spectrum-Menu").within(() => {
-            cy.contains("Overview").click()
-          })
-
-          cy.wait(500)
-
-          // Unpublish first if needed
-          cy.get(`[data-cy="app-status"]`).then($status => {
-            if ($status.text().includes("- Unpublish")) {
-              // Exact match for Unpublish
-              cy.contains("Unpublish").click({ force: true })
-              cy.get(".spectrum-Modal").within(() => {
-                cy.contains("Unpublish app").click({ force: true })
-              })
-            }
-          })
-
-          // Delete app
-          cy.get(".app-overview-actions-icon").within(() => {
-            cy.get(".spectrum-Icon").click({ force: true })
-          })
-          cy.get(".spectrum-Menu").contains("Delete").click({ force: true })
-          cy.get(".spectrum-Dialog-grid").within(() => {
-            cy.get("input").type(name)
-          })
-          cy.get(".spectrum-Button--warning").click()
-        } else {
-          return
-        }
-      } else {
-        return
-      }
-    })
-})
-
-Cypress.Commands.add("deleteAllApps", () => {
-  cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 30000 })
-  cy.wait(500)
-  cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`, {
-    timeout: 5000,
-  })
-    .its("body")
-    .then(val => {
-      for (let i = 0; i < val.length; i++) {
-        cy.deleteApp(val[i].name)
-        cy.reload()
-      }
-    })
-})
-
-Cypress.Commands.add("unlockApp", unlock_config => {
-  let config = { ...unlock_config }
-
-  cy.get(".spectrum-Modal .spectrum-Dialog[data-cy='app-lock-modal']")
-    .should("be.visible")
-    .within(() => {
-      if (config.owned) {
-        cy.get(".spectrum-Dialog-heading").contains("Locked by you")
-        cy.get(".lock-expiry-body").contains(
-          "This lock will expire in 10 minutes from now"
-        )
-
-        cy.intercept("**/lock").as("unlockApp")
-        cy.get(".spectrum-Button")
-          .contains("Release Lock")
-          .click({ force: true })
-        cy.wait("@unlockApp")
-        cy.get("@unlockApp").its("response.statusCode").should("eq", 200)
-        cy.get("@unlockApp").its("response.body").should("deep.equal", {
-          message: "Lock released successfully.",
-        })
-      } else {
-        //Show the name ?
-        cy.get(".lock-expiry-body").should("not.be.visible")
-        cy.get(".spectrum-Button").contains("Done")
-      }
-    })
-})
-
-Cypress.Commands.add("updateAppName", (changedName, noName) => {
-  cy.get(".spectrum-Modal").within(() => {
-    if (noName == true) {
-      cy.get("input").clear()
-      cy.get(".spectrum-Dialog-grid")
-        .click()
-        .contains("App name must be letters, numbers and spaces only")
-      return cy
-    }
-    cy.get("input").clear()
-    cy.get("input")
-      .eq(0)
-      .type(changedName)
-      .should("have.value", changedName)
-      .blur()
-    cy.get(".spectrum-ButtonGroup").contains("Save").click({ force: true })
-    cy.wait(500)
-  })
-})
-
-Cypress.Commands.add("publishApp", resolvedAppPath => {
-  // Assumes you have navigated to an application first
-  cy.get(".toprightnav button.spectrum-Button")
-    .contains("Publish")
-    .click({ force: true })
-
-  cy.get(".spectrum-Modal [data-cy='deploy-app-modal']")
-    .should("be.visible")
-    .within(() => {
-      cy.get(".spectrum-Button").contains("Publish").click({ force: true })
-      cy.wait(1000)
-    })
-
-  // Verify that the app url is presented correctly to the user
-  cy.get(".spectrum-Modal [data-cy='deploy-app-success-modal']")
-    .should("be.visible")
-    .within(() => {
-      let appUrl = Cypress.config().baseUrl + "/app/" + resolvedAppPath
-      cy.get("[data-cy='deployed-app-url'] input").should("have.value", appUrl)
-      cy.get(".spectrum-Button").contains("Done").click({ force: true })
-    })
-})
-
-Cypress.Commands.add("alterAppVersion", (appId, version) => {
-  return cy
-    .request("put", `${Cypress.config().baseUrl}/api/applications/${appId}`, {
-      version: version || "0.0.1-alpha.0",
-    })
-    .then(resp => {
-      expect(resp.status).to.eq(200)
-    })
-})
-
-Cypress.Commands.add("importApp", (exportFilePath, name) => {
-  cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 30000 })
-
-  cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
-    .its("body")
-    .then(val => {
-      if (val.length > 0) {
-        cy.get(`[data-cy="create-app-btn"]`).click({ force: true })
-      }
-      cy.wait(500)
-      cy.get(`[data-cy="import-app-btn"]`).click({
-        force: true,
-      })
-    })
-
-  cy.get(".spectrum-Modal").within(() => {
-    cy.get("input").eq(1).should("have.focus")
-
-    cy.get(".spectrum-Dropzone").selectFile(exportFilePath, {
-      action: "drag-drop",
-    })
-
-    cy.get(".gallery .filename").contains("exported-app.txt")
-
-    if (name && name != "") {
-      cy.get("input").eq(0).type(name).should("have.value", name).blur()
-    }
-    cy.get(".confirm-wrap button")
-      .should("not.be.disabled")
-      .click({ force: true })
-    cy.wait(3000)
-  })
-})
-
-// Filters visible with 1 or more
-Cypress.Commands.add("searchForApplication", appName => {
-  cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 30000 })
-  cy.wait(2000)
-
-  // No app filter functionality if only 1 app exists
-  cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
-    .its("body")
-    .then(val => {
-      if (val.length < 2) {
-        return
-      } else {
-        // Searches for the app
-        cy.get(".spectrum-Search").then(() => {
-          cy.get(".spectrum-Textfield").within(() => {
-            cy.get("input").eq(0).clear({ force: true })
-            cy.get("input").eq(0).type(appName, { force: true })
-          })
-        })
-      }
-    })
-})
-
-// Assumes there are no others
-Cypress.Commands.add("applicationInAppTable", appName => {
-  cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 30000 })
-  cy.get(".app-table", { timeout: 30000 }).within(() => {
-    cy.get(".title").contains(appName).should("exist")
-  })
-})
-
-Cypress.Commands.add("createAppFromScratch", appName => {
-  cy.get(`[data-cy="create-app-btn"]`)
-    .contains("Start from scratch")
-    .click({ force: true })
-  cy.get(".spectrum-Modal").within(() => {
-    cy.get("input")
-      .eq(0)
-      .clear()
-      .type(appName)
-      .should("have.value", appName)
-      .blur()
-    cy.get(".spectrum-ButtonGroup").contains("Create app").click()
-    cy.wait(10000)
-  })
-  cy.createTable("Cypress Tests", true)
-})
-
-// TABLES
-Cypress.Commands.add("createTable", (tableName, initialTable) => {
-  // Creates an internal Budibase DB table
-  if (!initialTable) {
-    cy.navigateToDataSection()
-  }
-  cy.get(`[data-cy="new-datasource"]`, { timeout: 20000 }).click()
-  cy.wait(2000)
-  cy.get(".item", { timeout: 2000 })
-    .contains("Budibase DB")
-    .click({ force: true })
-    .then(() => {
-      cy.get(".spectrum-Button", { timeout: 2000 })
-        .contains("Continue")
-        .click({ force: true })
-    })
-  cy.get(".spectrum-Modal").contains("Create Table", { timeout: 10000 })
-  cy.get(".spectrum-Modal", { timeout: 2000 }).within(() => {
-    cy.get("input", { timeout: 2000 }).first().type(tableName).blur()
-    cy.get(".spectrum-ButtonGroup").contains("Create").click()
-  })
-  // Ensure modal has closed and table is created
-  cy.get(".spectrum-Modal", { timeout: 2000 }).should("not.exist")
-  cy.get(".nav-item", { timeout: 2000 })
-    .contains("Budibase DB")
-    .click({ force: true })
-  cy.get(".nav-item-content", { timeout: 2000 }).should("contain", tableName)
-})
-
-Cypress.Commands.add("createTestTableWithData", () => {
-  cy.createTable("dog")
-  cy.addColumn("dog", "name", "Text")
-  cy.addColumn("dog", "age", "Number")
-})
-
-Cypress.Commands.add(
-  "addColumn",
-  (tableName, columnName, type, multiOptions = null) => {
-    // Select Table
-    cy.selectTable(tableName)
-    cy.contains(".nav-item", tableName).click()
-    cy.contains("Create column").click()
-
-    // Configure column
-    cy.get(".spectrum-Modal").within(() => {
-      cy.get("input").first().type(columnName)
-
-      // Unset table display column
-      cy.contains("display column").click({ force: true })
-      cy.get(".spectrum-Picker-label").click()
-      cy.contains(type).click()
-
-      // Add options for Multi-select Type
-      if (multiOptions !== null) {
-        cy.get(".spectrum-Textfield-input").eq(1).type(multiOptions)
-      }
-
-      cy.contains("Save Column").click()
-    })
-  }
-)
-
-Cypress.Commands.add("addRow", values => {
-  cy.contains("Create row").click()
-  cy.get(".spectrum-Modal").within(() => {
-    for (let i = 0; i < values.length; i++) {
-      cy.get("input").eq(i).type(values[i]).blur()
-    }
-    cy.get(".spectrum-ButtonGroup").contains("Create").click()
-  })
-})
-
-Cypress.Commands.add("addRowMultiValue", values => {
-  cy.contains("Create row").click()
-  cy.get(".spectrum-Modal").within(() => {
-    cy.get(".spectrum-Form-itemField")
-      .click()
-      .then(() => {
-        cy.get(".spectrum-Popover").within(() => {
-          for (let i = 0; i < values.length; i++) {
-            cy.get(".spectrum-Menu-item").eq(i).click()
-          }
-        })
-        cy.get(".spectrum-Dialog-grid").click("top")
-        cy.get(".spectrum-ButtonGroup").contains("Create").click()
-      })
-  })
-})
-
-Cypress.Commands.add("selectTable", tableName => {
-  cy.get(".nav-item").contains("Budibase DB").click()
-  cy.contains(".nav-item", tableName).click()
-})
-
-Cypress.Commands.add("addCustomSourceOptions", totalOptions => {
-  cy.get('[data-cy="customOptions-prop-control"]').within(() => {
-    cy.get(".spectrum-ActionButton-label").click({ force: true })
-  })
-  for (let i = 0; i < totalOptions; i++) {
-    // Add radio button options
-    cy.get(".spectrum-Button-label", { timeout: 1000 })
-      .contains("Add Option")
-      .click({ force: true })
-      .then(() => {
-        cy.get("[placeholder='Label']", { timeout: 500 }).eq(i).type(i)
-        cy.get("[placeholder='Value']").eq(i).type(i)
-      })
-  }
-  // Save options
-  cy.get(".spectrum-Button").contains("Save").click({ force: true })
-})
-
-// DESIGN SECTION
-Cypress.Commands.add("searchAndAddComponent", component => {
-  // Open component menu
-  cy.get(".icon-side-nav").within(() => {
-    cy.get(".icon-side-nav-item").eq(1).click()
-  })
-  cy.get(".add-component > .spectrum-Button")
-    .contains("Add component")
-    .click({ force: true })
-  cy.get(".container", { timeout: 1000 }).within(() => {
-    cy.get(".title").should("contain", "Add component")
-
-    // Search and add component
-    cy.get(".spectrum-Textfield-input").clear().type(component)
-    cy.get(".body").within(() => {
-      cy.get(".component")
-        .contains(new RegExp("^" + component + "$"), { timeout: 3000 })
-        .click({ force: true })
-    })
-  })
-  cy.wait(1000)
-  cy.location().then(loc => {
-    const params = loc.pathname.split("/")
-    const componentId = params[params.length - 1]
-    cy.getComponent(componentId, { timeout: 3000 }).should("exist")
-    return cy.wrap(componentId)
-  })
-})
-
-Cypress.Commands.add("deleteComponentByName", componentName => {
-  cy.get(".body")
-    .eq(0)
-    .contains(componentName)
-    .siblings(".actions")
-    .within(() => {
-      cy.get(".spectrum-Icon").click({ force: true })
-    })
-  cy.get(".spectrum-Menu").contains("Delete").click()
-  cy.get(".spectrum-Dialog").contains("Delete Component").click()
-})
-
-Cypress.Commands.add("addComponent", (category, component) => {
-  if (category) {
-    cy.get(`[data-cy="category-${category}"]`, { timeout: 3000 }).click({
-      force: true,
-    })
-  }
-  cy.wait(500)
-  if (component) {
-    cy.get(`[data-cy="component-${component}"]`, { timeout: 3000 }).click({
-      force: true,
-    })
-  }
-  cy.wait(1000)
-  cy.location().then(loc => {
-    const params = loc.pathname.split("/")
-    const componentId = params[params.length - 1]
-    cy.getComponent(componentId, { timeout: 3000 }).should("exist")
-    return cy.wrap(componentId)
-  })
-})
-
-Cypress.Commands.add("getComponent", componentId => {
-  return cy
-    .get("iframe")
-    .its("0.contentDocument")
-    .should("exist")
-    .its("body")
-    .should("not.be.undefined")
-    .then(cy.wrap)
-    .find(`[data-id='${componentId}']`)
-})
-
-Cypress.Commands.add("createScreen", (route, accessLevelLabel) => {
-  // Blank Screen
-  cy.contains("Design").click()
-  cy.get(".spectrum-Button").contains("Add screen").click({ force: true })
-  cy.get(".spectrum-Modal").within(() => {
-    cy.get("[data-cy='blank-screen']").click()
-    cy.get(".spectrum-Button").contains("Continue").click({ force: true })
-  })
-  cy.wait(500)
-  cy.get(".spectrum-Dialog-grid", { timeout: 500 }).within(() => {
-    cy.get(".spectrum-Form-itemField").eq(0).type(route)
-    cy.get(".confirm-wrap").contains("Continue").click({ force: true })
-  })
-
-  cy.get(".spectrum-Modal", { timeout: 1000 }).within(() => {
-    if (accessLevelLabel) {
-      cy.get(".spectrum-Picker-label").click()
-      cy.wait(500)
-      cy.contains(accessLevelLabel).click()
-    }
-    cy.get(".spectrum-Button").contains("Done").click({ force: true })
-  })
-})
-
-Cypress.Commands.add(
-  "createDatasourceScreen",
-  (datasourceNames, accessLevelLabel) => {
-    cy.contains("Design").click()
-    cy.get(".spectrum-Button").contains("Add screen").click({ force: true })
-    cy.get(".spectrum-Dialog-grid").within(() => {
-      cy.get("[data-cy='autogenerated-screens']").click()
-      cy.intercept("**/api/datasources").as("autoScreens")
-      cy.get(".spectrum-Button").contains("Continue").click({ force: true })
-      cy.wait("@autoScreens")
-      cy.wait(5000)
-    })
-    cy.get("[data-cy='autogenerated-screens']").should("not.exist")
-    cy.get("[data-cy='data-source-modal']", { timeout: 10000 }).within(() => {
-      for (let i = 0; i < datasourceNames.length; i++) {
-        cy.get(".data-source-entry")
-          .contains(datasourceNames[i], { timeout: 20000 })
-          .click({ force: true })
-        // Ensure the check mark is visible
-        cy.get(".data-source-entry")
-          .contains(datasourceNames[i])
-          .get(".data-source-check", { timeout: 20000 })
-          .should("exist")
-      }
-
-      cy.get(".spectrum-Button").contains("Confirm").click({ force: true })
-    })
-
-    cy.get(".spectrum-Modal", { timeout: 10000 }).within(() => {
-      if (accessLevelLabel) {
-        cy.get(".spectrum-Picker-label", { timeout: 10000 }).click()
-        cy.contains(accessLevelLabel).click()
-      }
-      cy.get(".spectrum-Button").contains("Done").click({ force: true })
-    })
-
-    cy.contains("Design").click()
-  }
-)
-
-Cypress.Commands.add(
-  "createAutogeneratedScreens",
-  (screenNames, accessLevelLabel) => {
-    cy.navigateToAutogeneratedModal()
-
-    for (let i = 0; i < screenNames.length; i++) {
-      cy.get(".data-source-entry").contains(screenNames[i]).click()
-    }
-
-    cy.get(".spectrum-Modal").within(() => {
-      if (accessLevelLabel) {
-        cy.get(".spectrum-Picker-label").click()
-        cy.wait(500)
-        cy.contains(accessLevelLabel).click()
-      }
-      cy.get(".spectrum-Button").contains("Confirm").click({ force: true })
-      cy.wait(4000)
-    })
-  }
-)
-
-Cypress.Commands.add("filterScreensAccessLevel", accessLevel => {
-  // Filters screens by access level dropdown
-  cy.get(".body").within(() => {
-    cy.get(".spectrum-Form-item").eq(1).click()
-  })
-  cy.get(".spectrum-Menu").within(() => {
-    cy.contains(accessLevel).click()
-  })
-})
-
-Cypress.Commands.add("deleteScreen", screen => {
-  // Navigates to Design section and deletes specified screen
-  cy.contains("Design").click()
-  cy.get(".body").within(() => {
-    cy.contains(screen)
-      .siblings(".actions")
-      .within(() => {
-        cy.get(".spectrum-Icon").click({ force: true })
-      })
-  })
-  cy.get(".spectrum-Menu > .spectrum-Menu-item > .spectrum-Menu-itemLabel")
-    .contains("Delete")
-    .click()
-
-  cy.get(
-    ".spectrum-Dialog-grid > .spectrum-ButtonGroup > .confirm-wrap > .spectrum-Button"
-  ).click({ force: true })
-  cy.get(".spectrum-Dialog-grid", { timeout: 10000 }).should("not.exist")
-})
-
-Cypress.Commands.add("deleteAllScreens", () => {
-  // Deletes all screens
-  cy.get(".body")
-    .find(".nav-item")
-    .its("length")
-    .then(len => {
-      for (let i = 0; i < len; i++) {
-        cy.get(".body > .nav-item")
-          .eq(0)
-          .invoke("text")
-          .then(text => {
-            cy.deleteScreen(text.trim())
-          })
-      }
-    })
-})
-
-// NAVIGATION
-Cypress.Commands.add("navigateToFrontend", () => {
-  // Clicks on Design tab and then the Home nav item
-  cy.wait(500)
-  cy.intercept("**/preview").as("preview")
-  cy.contains("Design").click()
-  cy.wait("@preview")
-  cy.get("@preview").then(res => {
-    if (res.statusCode != 200) {
-      cy.reload()
-    }
-  })
-  cy.get(".spectrum-Search", { timeout: 20000 }).type("/")
-  cy.get(".nav-item", { timeout: 2000 }).contains("home").click({ force: true })
-})
-
-Cypress.Commands.add("navigateToDataSection", () => {
-  // Clicks on the Data tab
-  cy.wait(500)
-  cy.contains("Data").click()
-})
-
-Cypress.Commands.add("navigateToAutogeneratedModal", () => {
-  // Screen name must already exist within datasource
-  cy.contains("Design").click()
-  cy.get(".spectrum-Button").contains("Add screen").click({ force: true })
-  cy.get(".spectrum-Modal").within(() => {
-    cy.get(".item", { timeout: 2000 })
-      .contains("Autogenerated screens")
-      .click({ force: true })
-    cy.get(".spectrum-Button").contains("Continue").click({ force: true })
-    cy.wait(500)
-  })
-})
-
-// DATASOURCES
-Cypress.Commands.add("selectExternalDatasource", datasourceName => {
-  // Navigates to Data Section
-  cy.navigateToDataSection()
-  // Open Datasource modal
-  cy.get(".container").within(() => {
-    cy.get("[data-cy='new-datasource']").click()
-  })
-  // Clicks specified datasource & continue
-  cy.get(".item-list", { timeout: 1000 }).contains(datasourceName).click()
-  cy.get(".spectrum-Dialog-grid").within(() => {
-    cy.get(".spectrum-Button").contains("Continue").click({ force: true })
-  })
-  cy.wait(500)
-})
-
-Cypress.Commands.add("addDatasourceConfig", (datasource, skipFetch) => {
-  // selectExternalDatasource should be called prior to this
-  // Adds the config for specified datasource & fetches tables
-  // Currently supports MySQL, PostgreSQL, Oracle
-  // Host IP Address
-  cy.get(".spectrum-Dialog-grid", { timeout: 500 }).within(() => {
-    cy.get(".form-row")
-      .eq(0)
-      .within(() => {
-        cy.get(".spectrum-Textfield").within(() => {
-          if (datasource == "Oracle") {
-            cy.get("input").clear().type(Cypress.env("oracle").HOST)
-          } else {
-            cy.get("input")
-              .clear({ force: true })
-              .type(Cypress.env("HOST_IP"), { force: true })
-          }
-        })
-      })
-  })
-  // Database Name
-  cy.get(".spectrum-Dialog-grid").within(() => {
-    if (datasource == "MySQL") {
-      cy.get(".form-row")
-        .eq(4)
-        .within(() => {
-          cy.get("input").clear().type(Cypress.env("mysql").DATABASE)
-        })
-    } else {
-      cy.get(".form-row")
-        .eq(2)
-        .within(() => {
-          if (datasource == "PostgreSQL") {
-            cy.get("input").clear().type(Cypress.env("postgresql").DATABASE)
-          }
-          if (datasource == "Oracle") {
-            cy.get("input").clear().type(Cypress.env("oracle").DATABASE)
-          }
-        })
-    }
-  })
-  // User
-  cy.get(".spectrum-Dialog-grid").within(() => {
-    if (datasource == "MySQL") {
-      cy.get(".form-row")
-        .eq(2)
-        .within(() => {
-          cy.get("input").clear().type(Cypress.env("mysql").USER)
-        })
-    } else {
-      cy.get(".form-row")
-        .eq(3)
-        .within(() => {
-          if (datasource == "PostgreSQL") {
-            cy.get("input").clear().type(Cypress.env("postgresql").USER)
-          }
-          if (datasource == "Oracle") {
-            cy.get("input").clear().type(Cypress.env("oracle").USER)
-          }
-        })
-    }
-  })
-  // Password
-  cy.get(".spectrum-Dialog-grid").within(() => {
-    if (datasource == "MySQL") {
-      cy.get(".form-row")
-        .eq(3)
-        .within(() => {
-          cy.get("input").clear().type(Cypress.env("mysql").PASSWORD)
-        })
-    } else {
-      cy.get(".form-row")
-        .eq(4)
-        .within(() => {
-          if (datasource == "PostgreSQL") {
-            cy.get("input").clear().type(Cypress.env("postgresql").PASSWORD)
-          }
-          if (datasource == "Oracle") {
-            cy.get("input").clear().type(Cypress.env("oracle").PASSWORD)
-          }
-        })
-    }
-  })
-  // Click to fetch tables
-  if (skipFetch) {
-    cy.get(".spectrum-Dialog-grid").within(() => {
-      cy.get(".spectrum-Button")
-        .contains("Skip table fetch")
-        .click({ force: true })
-    })
-  } else {
-    cy.intercept("**/tables").as("datasourceTables")
-    cy.get(".spectrum-Dialog-grid").within(() => {
-      cy.get(".spectrum-Button")
-        .contains("Save and fetch tables")
-        .click({ force: true })
-    })
-    // Wait for tables to be fetched
-    cy.wait("@datasourceTables", { timeout: 60000 })
-  }
-})
-
-Cypress.Commands.add("createRestQuery", (method, restUrl, queryPrettyName) => {
-  // addExternalDatasource should be called prior to this
-  // Configures REST datasource & sends query
-  cy.get(".spectrum-Button", { timeout: 1000 })
-    .contains("Add query")
-    .click({ force: true })
-  // Select Method & add Rest URL
-  cy.get(".spectrum-Picker-label").eq(1).click()
-  cy.get(".spectrum-Menu").contains(method).click()
-  cy.get("input").clear().type(restUrl)
-  // Send query
-  cy.get(".spectrum-Button").contains("Send").click({ force: true })
-  cy.get(".spectrum-Button", { timeout: 500 })
-    .contains("Save")
-    .click({ force: true })
-  cy.get(".hierarchy-items-container")
-    .should("contain", method)
-    .and("contain", queryPrettyName)
-})
-
-// MISC
-Cypress.Commands.add("closeModal", () => {
-  cy.get(".spectrum-Modal", { timeout: 2000 }).within(() => {
-    cy.get(".close-icon").click()
-  })
-  // Confirm modal has closed
-  cy.get(".spectrum-Modal", { timeout: 10000 }).should("not.exist")
-})
-
-Cypress.Commands.add("expandBudibaseConnection", () => {
-  if (Cypress.$(".nav-item > .content > .opened").length === 0) {
-    // expand the Budibase DB connection string
-    cy.get(".icon.arrow").eq(0).click()
-  }
-})
diff --git a/packages/builder/cypress/support/cookies.js b/packages/builder/cypress/support/cookies.js
deleted file mode 100644
index 3e2fba6481..0000000000
--- a/packages/builder/cypress/support/cookies.js
+++ /dev/null
@@ -1,3 +0,0 @@
-Cypress.Cookies.defaults({
-  preserve: "budibase:auth",
-})
diff --git a/packages/builder/cypress/support/filterTests.js b/packages/builder/cypress/support/filterTests.js
deleted file mode 100644
index 074fd05d33..0000000000
--- a/packages/builder/cypress/support/filterTests.js
+++ /dev/null
@@ -1,16 +0,0 @@
-const filterTests = (testTags, runTest) => {
-  // testTags is an array of tags
-  // runTest is all tests
-  if (Cypress.env("TEST_TAGS")) {
-    const tags = Cypress.env("TEST_TAGS").split("/")
-    const found = testTags.some($testTags => tags.includes($testTags))
-
-    if (found) {
-      runTest()
-    }
-  } else {
-    runTest()
-  }
-}
-
-export default filterTests
diff --git a/packages/builder/cypress/support/index.js b/packages/builder/cypress/support/index.js
deleted file mode 100644
index acd53a1592..0000000000
--- a/packages/builder/cypress/support/index.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// ***********************************************************
-// This example support/index.js is processed and
-// loaded automatically before your test files.
-//
-// This is a great place to put global configuration and
-// behavior that modifies Cypress.
-//
-// You can change the location of this file or turn off
-// automatically serving support files with the
-// 'supportFile' configuration option.
-//
-// You can read more here:
-// https://on.cypress.io/configuration
-// ***********************************************************
-
-// Import commands.js using ES2015 syntax:
-import "./commands"
-import "./cookies"
-
-// Alternatively you can use CommonJS syntax:
-// require('./commands')
-require("cypress-terminal-report/src/installLogsCollector")()
diff --git a/packages/builder/cypress/support/interact.js b/packages/builder/cypress/support/interact.js
deleted file mode 100644
index 4f2451ce4b..0000000000
--- a/packages/builder/cypress/support/interact.js
+++ /dev/null
@@ -1,136 +0,0 @@
-// createApp test
-export const CREATE_APP_BUTTON = '[data-cy="create-app-btn"]'
-export const TEMPLATE_CATEGORY_FILTER = ".template-category-filters"
-export const TEMPLATE_CATEGORY = ".template-categories"
-export const APP_TABLE = ".appTable"
-export const SPECTRUM_BUTTON_TEMPLATE = ".spectrum-Button"
-export const TEMPLATE_CATEGORY_ACTIONGROUP = ".template-category"
-export const TEMPLATE_CATEGORY_FILTER_ACTIONBUTTON =
-  ".template-category-filters .spectrum-ActionButton"
-export const SPECTRUM_MODAL = ".spectrum-Modal"
-export const APP_NAME_INPUT = "input" // we need to update this with atribute cy-data;
-export const SPECTRUM_BUTTON_GROUP = ".spectrum-ButtonGroup"
-export const SPECTRUM_MODAL_INPUT = ".spectrum-Modal input"
-
-//AddMultiOptionDatatype
-export const CATEGORY_DATA = '[data-cy="category-Data"]'
-export const COMPONENT_DATA_PROVIDER = '[data-cy="component-Data Provider"]'
-export const DATASOURCE_PROP_CONTROL = '[data-cy="dataSource-prop-control"]'
-export const DROPDOWN = ".dropdown"
-export const SPECTRUM_PICKER_LABEL = ".spectrum-Picker-label"
-export const DATASOURCE_FIELD_CONTROL = '[data-cy="field-prop-control"]'
-export const OPTION_TYPE_PROP_CONTROL = '[data-cy="optionsType-prop-control'
-
-//AddRadioButtons
-export const SPECTRUM_POPOVER = ".spectrum-Popover"
-export const OPTION_SOURCE_PROP_CONROL = '[data-cy="optionsSource-prop-control'
-export const APP_TABLE_STATUS = ".appTable .app-status"
-export const APP_TABLE_ROW_ACTION = ".appTable .app-row-actions"
-export const APP_TABLE_APP_NAME = '[data-cy="app-name-link"]'
-export const DEPLOYMENT_TOP_NAV_GLOBESTRIKE =
-  ".deployment-top-nav svg[aria-label=GlobeStrike]"
-export const DEPLOYMENT_TOP_GLOBE = ".deployment-top-nav svg[aria-label=Globe]"
-export const PUBLISH_POPOVER_MENU = '[data-cy="publish-popover-menu"]'
-export const PUBLISH_POPOVER_ACTION = '[data-cy="publish-popover-action"]'
-export const PUBLISH_POPOVER_MESSAGE = ".publish-popover-message"
-export const SPECTRUM_BUTTON = ".spectrum-Button"
-export const SPECTRUM_LINK = ".spectrum-Link"
-export const TOPRIGHTNAV_BUTTON_SPECTRUM = ".toprightnav button.spectrum-Button"
-
-//createComponents
-export const SETTINGS = "[data-cy=Settings]"
-export const SETTINGS_INPUT = "[data-cy=setting-text] input"
-export const DESIGN = "[data-cy=Design]"
-export const FONT_SIZE_PROP_CONTROL = "[data-cy=font-size-prop-control]"
-export const DATA_CY_DATASOURCE = "[data-cy=setting-dataSource]"
-export const DROPDOWN_CONTAINER = ".dropdown-container"
-export const SPECTRUM_PICKER = ".spectrum-Picker"
-
-//autoScreens
-export const LABEL_ADD_CIRCLE = "[aria-label=AddCircle]"
-export const ITEM_DISABLED = ".item.disabled"
-export const CONFIRM_WRAP_SPE_BUTTON = ".confirm-wrap .spectrum-Button"
-export const DATA_SOURCE_ENTRY = ".data-source-entry"
-export const BODY = ".body"
-
-//publishWorkFlow
-export const DEPLOY_APP_MODAL = ".spectrum-Modal [data-cy=deploy-app-modal]"
-export const DEPLOY_SUCCESS_MODAL =
-  ".spectrum-Modal [data-cy=deploy-app-success-modal]"
-export const DEPLOY_APP_URL_INPUT = "[data-cy=deployed-app-url] input"
-export const GLOBESTRIKE = "svg[aria-label=GlobeStrike]"
-export const GLOBE = "svg[aria-label=Globe]"
-export const UNPUBLISH_MODAL = "[data-cy=unpublish-modal]"
-export const CONFIRM_WRAP_BUTTON = ".confirm-wrap button"
-export const DEPLOYMENT_TOP_NAV = ".deployment-top-nav"
-
-//changeAppiconAndColour
-export const APP_ROW_ACTION = ".app-row-actions-icon"
-export const SPECTRUM_MENU = ".spectrum-Menu"
-export const ICON_ITEM = ".icon-item"
-export const FILL = ".fill"
-export const COLOURSS = ".colors"
-export const AREA_LABEL = "[aria-label]"
-export const TITLE = ".title"
-export const GRID = ".grid"
-export const COLOUR = ".color"
-
-//createAutomation
-export const ADD_BUTTON_SPECTRUM = ".add-button .spectrum-Icon"
-export const MODAL_INNER_WRAPPER = ".modal-inner-wrapper"
-export const SPECTRUM_BUTTON_CTA = ".spectrum-Button--cta"
-export const SPECTRUM_TEXTFIELD_INPUT = ".spectrum-Textfield-input"
-
-//createTable
-export const TABLE_TITLE_H1 = ".table-title h1"
-export const TABLE_TITLE = ".title"
-export const SPECTRUM_TABLE_EDIT = ".spectrum-Table-editIcon > use"
-export const SPECTRUM_SWITCH_INPUT = ".spectrum-Switch-input"
-export const SPECTRUM_CHECKBOX_INPUT = ".spectrum-Checkbox-input"
-export const SPECTRUM_PAGINATION = ".spectrum-Pagination"
-export const SPECTRUM_ACTION_BUTTON = ".spectrum-ActionButton"
-export const SPECTRUM_BODY_SECOND = ".spectrum-Body--secondary"
-export const POPOVERS = ".popovers"
-export const SPECTRUM_DIALOG_GRID = ".spectrum-Dialog-grid"
-export const DELETE_COLUMN_CONFIRM = '[data-cy="delete-column-confirm"]'
-export const NAV_ITEM = ".nav-item"
-export const ACTION_SPECTRUM_ICON = ".actions .spectrum-Icon"
-export const SPECTRUM_MENU_CHILD2 = ".spectrum-Menu > :nth-child(2)"
-export const DELETE_TABLE_CONFIRM = '[data-cy="delete-table-confirm"]'
-
-//adminAndManagement Folder
-export const SPECTRUM_TABLE = ".spectrum-Table"
-export const SPECTRUM_SIDENAV = ".spectrum-SideNav"
-export const SPECTRUM_TABLE_ROW = ".spectrum-Table-row"
-export const SPECTRUM_TABLE_CELL = ".spectrum-Table-cell"
-export const FIELD = ".field"
-export const CONTAINER = ".container"
-export const REGENERATE = ".regenerate"
-export const SPECTRUM_DIALOG_CONTENT = ".spectrum-Dialog-content"
-export const SPECTRUM_ICON = ".spectrum-Icon"
-export const SPECTRUM_HEADING = ".spectrum-Heading"
-export const SPECTRUM_FORM_ITEMFIELD = ".spectrum-Form-itemField"
-export const LIST_ITEMS = ".list-items"
-
-//createView
-export const SPECTRUM_MENU_ITEM_LABEL = ".spectrum-Menu-itemLabel"
-
-//revertApp
-export const TOP_RIGHT_NAV = ".toprightnav"
-export const AREA_LABEL_REVERT = "[aria-label=Revert]"
-export const ROOT = ".root"
-
-//queryLevelTransformers
-export const SPECTRUM_TABS_ITEM = ".spectrum-Tabs-itemLabel"
-export const CODEMIRROR_TEXTAREA = ".CodeMirror textarea"
-
-//renameApplication
-export const WRAPPER = ".wrapper"
-export const ERROR = ".error"
-export const AREA_LABEL_MORE = "[aria-label=More]"
-export const APP_ROW_ACTION_MENU_POPOVER =
-  '[data-cy="app-row-actions-menu-popover"]'
-export const SPECTRUM_MENU_ITEM = ".spectrum-Menu-item"
-
-//commands
-export const HOME_LOGO = ".home-logo"
diff --git a/packages/builder/cypress/support/queryLevelTransformerFunction.js b/packages/builder/cypress/support/queryLevelTransformerFunction.js
deleted file mode 100644
index 7dc05018f8..0000000000
--- a/packages/builder/cypress/support/queryLevelTransformerFunction.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/* eslint-disable */
-const breweries = data
-const totals = {}
-
-for (let brewery of breweries) 
-  {const state = brewery.state
-  if (totals[state] == null) 
-    {totals[state] = 1
-  } else 
-    {totals[state]++
-  }
-}
-const entries = Object.entries(totals)
-return entries.map(([state, count]) => ({ state, count }))
diff --git a/packages/builder/cypress/support/queryLevelTransformerFunctionWithData.js b/packages/builder/cypress/support/queryLevelTransformerFunctionWithData.js
deleted file mode 100644
index fcf50b4412..0000000000
--- a/packages/builder/cypress/support/queryLevelTransformerFunctionWithData.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/* eslint-disable */
-const breweries = data
-const totals = {}
-for (let brewery of breweries) 
-  {const state = brewery.state
-  if (totals[state] == null) 
-    {totals[state] = 1
-  } else 
-    {totals[state]++
-  }
-}
-const stateCodes = 
-  {texas: "tx",
-  colorado: "co",
-  florida: "fl",
-  iwoa: "ia",
-  louisiana: "la",
-  california: "ca",
-  pennsylvania: "pa",
-  georgia: "ga",
-  "new hampshire": "nh",
-  virginia: "va",
-  michigan: "mi",
-  maryland: "md",
-  ohio: "oh",
-}
-const entries = Object.entries(totals)
-return entries.map(([state, count]) => 
-  {stateCodes[state.toLowerCase()]
-  return { state, count, flag: "http://flags.ox3.in/svg/us/${stateCode}.svg" }
-})
diff --git a/packages/builder/cypress/ts/setup.ts b/packages/builder/cypress/ts/setup.ts
deleted file mode 100644
index b6b12bf730..0000000000
--- a/packages/builder/cypress/ts/setup.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// @ts-ignore
-import { run } from "../setup"
-
-run("../../server/src/index", "../../worker/src/index")
diff --git a/packages/builder/package.json b/packages/builder/package.json
index e4b364d082..fe722e9032 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.2.12-alpha.55",
+  "version": "2.2.12-alpha.64",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -9,20 +9,7 @@
     "dev:builder": "routify -c dev:vite",
     "dev:vite": "vite --host 0.0.0.0",
     "rollup": "rollup -c -w",
-    "test": "jest",
-    "cy:setup": "ts-node ./cypress/ts/setup.ts",
-    "cy:setup:ci": "node ./cypress/setup.js",
-    "cy:open": "cypress open",
-    "cy:run": "cypress run",
-    "cy:run:ci": "cypress run --headed --browser chrome --spec cypress/integration/createApp.spec.js",
-    "cy:run:ci:record": "xvfb-run cypress run --headed --browser chrome --record",
-    "cy:test": "start-server-and-test cy:setup http://localhost:4100/builder cy:run",
-    "cy:ci": "start-server-and-test cy:setup:ci http://localhost:4100/builder cy:run:ci",
-    "cy:ci:record": "start-server-and-test cy:setup:ci http://localhost:4100/builder cy:run:ci:record; npm run cy:ci:report",
-    "cy:ci:report": "mochawesome-merge cypress/reports/*.json > cypress/reports/testReport.json && marge cypress/reports/testReport.json --reportDir cypress/reports --inline",
-    "cy:ci:notify": "node scripts/cypressResultsWebhook",
-    "cy:debug": "start-server-and-test cy:setup http://localhost:4100/builder cy:open",
-    "cy:debug:ci": "start-server-and-test cy:setup:ci http://localhost:4100/builder cy:open"
+    "test": "jest"
   },
   "jest": {
     "globals": {
@@ -71,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.2.12-alpha.55",
-    "@budibase/client": "2.2.12-alpha.55",
-    "@budibase/frontend-core": "2.2.12-alpha.55",
-    "@budibase/string-templates": "2.2.12-alpha.55",
+    "@budibase/bbui": "2.2.12-alpha.64",
+    "@budibase/client": "2.2.12-alpha.64",
+    "@budibase/frontend-core": "2.2.12-alpha.64",
+    "@budibase/string-templates": "2.2.12-alpha.64",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/builder/cypress/setup.js b/packages/builder/setup.js
similarity index 79%
rename from packages/builder/cypress/setup.js
rename to packages/builder/setup.js
index 0e2f25b028..744c20896a 100644
--- a/packages/builder/cypress/setup.js
+++ b/packages/builder/setup.js
@@ -1,14 +1,14 @@
-const cypressConfig = require("../cypress.json")
+const testConfig = require("./testConfig.json")
 
 // normal development system
-const SERVER_PORT = cypressConfig.env.PORT
-const WORKER_PORT = cypressConfig.env.WORKER_PORT
+const SERVER_PORT = testConfig.env.PORT
+const WORKER_PORT = testConfig.env.WORKER_PORT
 
 if (!process.env.NODE_ENV) {
   process.env.NODE_ENV = "cypress"
 }
 process.env.ENABLE_ANALYTICS = "0"
-process.env.JWT_SECRET = cypressConfig.env.JWT_SECRET
+process.env.JWT_SECRET = testConfig.env.JWT_SECRET
 process.env.SELF_HOSTED = 1
 process.env.WORKER_URL = `http://localhost:${WORKER_PORT}/`
 process.env.APPS_URL = `http://localhost:${SERVER_PORT}/`
@@ -23,10 +23,7 @@ process.env.ALLOW_DEV_AUTOMATIONS = 1
 // Stop info logs polluting test outputs
 process.env.LOG_LEVEL = "error"
 
-exports.run = (
-  serverLoc = "../../server/dist",
-  workerLoc = "../../worker/dist"
-) => {
+exports.run = (serverLoc = "../server/dist", workerLoc = "../worker/dist") => {
   // require("dotenv").config({ path: resolve(dir, ".env") })
   // don't make this a variable or top level require
   // it will cause environment module to be loaded prematurely
diff --git a/packages/builder/src/builderStore/dataBinding.js b/packages/builder/src/builderStore/dataBinding.js
index b8fa22e51b..fca106edbd 100644
--- a/packages/builder/src/builderStore/dataBinding.js
+++ b/packages/builder/src/builderStore/dataBinding.js
@@ -509,21 +509,24 @@ const getSelectedRowsBindings = asset => {
   return bindings
 }
 
+export const makeStateBinding = key => {
+  return {
+    type: "context",
+    runtimeBinding: `${makePropSafe("state")}.${makePropSafe(key)}`,
+    readableBinding: `State.${key}`,
+    category: "State",
+    icon: "AutomatedSegment",
+    display: { name: key },
+  }
+}
+
 /**
  * Gets all state bindings that are globally available.
  */
 const getStateBindings = () => {
   let bindings = []
   if (get(store).clientFeatures?.state) {
-    const safeState = makePropSafe("state")
-    bindings = getAllStateVariables().map(key => ({
-      type: "context",
-      runtimeBinding: `${safeState}.${makePropSafe(key)}`,
-      readableBinding: `State.${key}`,
-      category: "State",
-      icon: "AutomatedSegment",
-      display: { name: key },
-    }))
+    bindings = getAllStateVariables().map(makeStateBinding)
   }
   return bindings
 }
diff --git a/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte b/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
index f5f947ac85..1c93880ec1 100644
--- a/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
+++ b/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
@@ -42,13 +42,7 @@
 </script>
 
 {#if type === "options" && meta.constraints.inclusion.length !== 0}
-  <Select
-    {label}
-    data-cy="{meta.name}-select"
-    bind:value
-    options={meta.constraints.inclusion}
-    sort
-  />
+  <Select {label} bind:value options={meta.constraints.inclusion} sort />
 {:else if type === "datetime"}
   <DatePicker
     {error}
@@ -61,7 +55,7 @@
 {:else if type === "attachment"}
   <Dropzone {label} {error} bind:value />
 {:else if type === "boolean"}
-  <Toggle text={label} {error} bind:value data-cy="{meta.name}-input" />
+  <Toggle text={label} {error} bind:value />
 {:else if type === "array" && meta.constraints.inclusion.length !== 0}
   <Multiselect
     bind:value
@@ -87,12 +81,5 @@
     {error}
   />
 {:else}
-  <Input
-    {label}
-    data-cy="{meta.name}-input"
-    {type}
-    {error}
-    bind:value
-    disabled={readonly}
-  />
+  <Input {label} {type} {error} bind:value disabled={readonly} />
 {/if}
diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
index 05396c8f8f..4ed77d55b2 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
@@ -546,9 +546,5 @@
     Your data will be deleted and this action cannot be undone - enter the column
     name to confirm.
   </p>
-  <Input
-    dataCy="delete-column-confirm"
-    bind:value={deleteColName}
-    placeholder={originalName}
-  />
+  <Input bind:value={deleteColName} placeholder={originalName} />
 </ConfirmDialog>
diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte
index 058cae3868..d39740b892 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte
@@ -119,7 +119,6 @@
        selection is always undefined -->
   <Select
     label="Role"
-    data-cy="roleId-select"
     bind:value={row.roleId}
     options={$roles}
     getOptionLabel={role => role.name}
diff --git a/packages/builder/src/components/backend/DataTable/modals/EditRow.svelte b/packages/builder/src/components/backend/DataTable/modals/EditRow.svelte
index 5d858a50f4..cdb752d27a 100644
--- a/packages/builder/src/components/backend/DataTable/modals/EditRow.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/EditRow.svelte
@@ -13,7 +13,7 @@
   }
 </script>
 
-<Button data-cy="edit-row" secondary small on:click={showModal}>Edit</Button>
+<Button secondary small on:click={showModal}>Edit</Button>
 <Modal bind:this={modal}>
   <svelte:component this={modalContentComponent} {row} />
 </Modal>
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/modals/UpdateDatasourceModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/modals/UpdateDatasourceModal.svelte
index ff9df6ab3e..89721773cf 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/modals/UpdateDatasourceModal.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/modals/UpdateDatasourceModal.svelte
@@ -47,7 +47,6 @@
     disabled={error || !name || !datasource?.type}
   >
     <Input
-      data-cy="datasource-name-input"
       label="Datasource Name"
       on:input={checkValid}
       bind:value={name}
diff --git a/packages/builder/src/components/backend/TableNavigator/ListItem.svelte b/packages/builder/src/components/backend/TableNavigator/ListItem.svelte
index aa94297977..94abca42e7 100644
--- a/packages/builder/src/components/backend/TableNavigator/ListItem.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/ListItem.svelte
@@ -6,13 +6,7 @@
   export let indented
 </script>
 
-<div
-  data-cy="table-nav-item"
-  class:indented
-  class:selected
-  on:click
-  class={className}
->
+<div class:indented class:selected on:click class={className}>
   <i class={icon} />
   <span>{title}</span>
   <slot />
diff --git a/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte b/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte
index 7808134fb4..d7beab11e4 100644
--- a/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte
@@ -108,7 +108,6 @@
   disabled={error || !name || (rows.length && !allValid)}
 >
   <Input
-    data-cy="table-name-input"
     thin
     label="Table Name"
     on:input={checkValid}
diff --git a/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte b/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte
index 5ea3183b33..01c62d56f7 100644
--- a/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte
@@ -134,11 +134,7 @@
     This action cannot be undone - to continue please enter the table name below
     to confirm.
   </p>
-  <Input
-    bind:value={deleteTableName}
-    placeholder={table.name}
-    dataCy="delete-table-confirm"
-  />
+  <Input bind:value={deleteTableName} placeholder={table.name} />
 </ConfirmDialog>
 
 <style>
diff --git a/packages/builder/src/components/common/AppLockModal.svelte b/packages/builder/src/components/common/AppLockModal.svelte
index 6f8936fcf4..875b4afce0 100644
--- a/packages/builder/src/components/common/AppLockModal.svelte
+++ b/packages/builder/src/components/common/AppLockModal.svelte
@@ -74,7 +74,6 @@
 <Modal bind:this={appLockModal}>
   <ModalContent
     title={lockedByHeading}
-    dataCy={"app-lock-modal"}
     showConfirmButton={false}
     showCancelButton={false}
   >
diff --git a/packages/builder/src/components/common/ConfirmDialog.svelte b/packages/builder/src/components/common/ConfirmDialog.svelte
index 352b97da59..ece20fe102 100644
--- a/packages/builder/src/components/common/ConfirmDialog.svelte
+++ b/packages/builder/src/components/common/ConfirmDialog.svelte
@@ -9,7 +9,6 @@
   export let onCancel = undefined
   export let warning = true
   export let disabled
-  export let dataCy = null
 
   let modal
 
@@ -29,7 +28,6 @@
     {cancelText}
     {warning}
     {disabled}
-    {dataCy}
   >
     <Body size="S">
       {body}
diff --git a/packages/builder/src/components/common/DashCard.svelte b/packages/builder/src/components/common/DashCard.svelte
index 40c7133c42..ac621ae68e 100644
--- a/packages/builder/src/components/common/DashCard.svelte
+++ b/packages/builder/src/components/common/DashCard.svelte
@@ -4,12 +4,11 @@
   export let title = ""
   export let actionIcon
   export let action
-  export let dataCy
 
   $: actionDefined = typeof action === "function"
 </script>
 
-<div class="dash-card" data-cy={dataCy}>
+<div class="dash-card">
   <div class="dash-card-header" class:active={actionDefined} on:click={action}>
     <span class="dash-card-title">
       <Detail size="M">{title}</Detail>
diff --git a/packages/builder/src/components/common/TemplateDisplay.svelte b/packages/builder/src/components/common/TemplateDisplay.svelte
index 4699b2492c..4fbd8b1fb8 100644
--- a/packages/builder/src/components/common/TemplateDisplay.svelte
+++ b/packages/builder/src/components/common/TemplateDisplay.svelte
@@ -68,7 +68,7 @@
   <div class="template-categories">
     <Layout gap="XL" noPadding>
       {#each filteredCategories as category}
-        <div class="template-category" data-cy={category.name}>
+        <div class="template-category">
           <Detail size="M">{category.name}</Detail>
           <div class="template-grid">
             {#each category.templates as templateEntry}
diff --git a/packages/builder/src/components/common/bindings/DrawerBindableCombobox.svelte b/packages/builder/src/components/common/bindings/DrawerBindableCombobox.svelte
index 9033844dd0..c929f1039e 100644
--- a/packages/builder/src/components/common/bindings/DrawerBindableCombobox.svelte
+++ b/packages/builder/src/components/common/bindings/DrawerBindableCombobox.svelte
@@ -66,11 +66,7 @@
     {error}
   />
   {#if !disabled}
-    <div
-      class="icon"
-      on:click={bindingDrawer.show}
-      data-cy="text-binding-button"
-    >
+    <div class="icon" on:click={bindingDrawer.show}>
       <Icon size="S" name="FlashOn" />
     </div>
   {/if}
diff --git a/packages/builder/src/components/common/inputs/CopyInput.svelte b/packages/builder/src/components/common/inputs/CopyInput.svelte
index fea4e87701..fe7746d1f9 100644
--- a/packages/builder/src/components/common/inputs/CopyInput.svelte
+++ b/packages/builder/src/components/common/inputs/CopyInput.svelte
@@ -3,7 +3,6 @@
 
   export let label = null
   export let value
-  export let dataCy = null
 
   const copyToClipboard = val => {
     const dummy = document.createElement("textarea")
@@ -16,7 +15,7 @@
   }
 </script>
 
-<div data-cy={dataCy}>
+<div>
   <Input readonly {value} {label} />
   <div class="icon" on:click={() => copyToClipboard(value)}>
     <Icon size="S" name="Copy" />
diff --git a/packages/builder/src/components/deploy/DeployModal.svelte b/packages/builder/src/components/deploy/DeployModal.svelte
index df48605926..2b881e524e 100644
--- a/packages/builder/src/components/deploy/DeployModal.svelte
+++ b/packages/builder/src/components/deploy/DeployModal.svelte
@@ -66,7 +66,6 @@
     title="Publish to production"
     confirmText="Publish"
     onConfirm={publishApp}
-    dataCy={"deploy-app-modal"}
   >
     The changes you have made will be published to the production version of the
     application.
@@ -88,12 +87,7 @@
 
 <!-- Publish complete -->
 <Modal bind:this={publishCompleteModal}>
-  <ModalContent
-    confirmText="Done"
-    cancelText="View App"
-    onCancel={viewApp}
-    dataCy="deploy-app-success-modal"
-  >
+  <ModalContent confirmText="Done" cancelText="View App" onCancel={viewApp}>
     <div slot="header" class="app-published-header">
       <svg
         width="26px"
@@ -105,11 +99,7 @@
       </svg>
       <span class="app-published-header-text">App Published!</span>
     </div>
-    <CopyInput
-      value={publishedUrl}
-      label="You can view your app at:"
-      dataCy="deployed-app-url"
-    />
+    <CopyInput value={publishedUrl} label="You can view your app at:" />
   </ModalContent>
 </Modal>
 
diff --git a/packages/builder/src/components/deploy/DeployNavigation.svelte b/packages/builder/src/components/deploy/DeployNavigation.svelte
index 43ba387009..d3a428fed2 100644
--- a/packages/builder/src/components/deploy/DeployNavigation.svelte
+++ b/packages/builder/src/components/deploy/DeployNavigation.svelte
@@ -124,36 +124,37 @@
         bind:this={publishPopover}
         align="right"
         disabled={!isPublished}
-        dataCy="publish-popover-menu"
         anchor={publishPopoverAnchor}
+        offset={10}
       >
-        <Layout gap="M">
-          <Heading size="XS">Your published app</Heading>
-          <Body size="S">
-            <span class="publish-popover-message">
-              {processStringSync(
-                "Last published {{ duration time 'millisecond' }} ago",
-                {
-                  time:
-                    new Date().getTime() -
-                    new Date(latestDeployments[0].updatedAt).getTime(),
-                }
-              )}
-            </span>
-          </Body>
-          <div class="publish-popover-actions">
-            <Button
-              warning={true}
-              icon="GlobeStrike"
-              disabled={!isPublished}
-              on:click={unpublishApp}
-              dataCy="publish-popover-action"
-            >
-              Unpublish
-            </Button>
-            <Button cta on:click={viewApp}>View app</Button>
-          </div>
-        </Layout>
+        <div class="popover-content">
+          <Layout noPadding gap="M">
+            <Heading size="XS">Your published app</Heading>
+            <Body size="S">
+              <span class="publish-popover-message">
+                {processStringSync(
+                  "Last published {{ duration time 'millisecond' }} ago",
+                  {
+                    time:
+                      new Date().getTime() -
+                      new Date(latestDeployments[0].updatedAt).getTime(),
+                  }
+                )}
+              </span>
+            </Body>
+            <div class="buttons">
+              <Button
+                warning={true}
+                icon="GlobeStrike"
+                disabled={!isPublished}
+                on:click={unpublishApp}
+              >
+                Unpublish
+              </Button>
+              <Button cta on:click={viewApp}>View app</Button>
+            </div>
+          </Layout>
+        </div>
       </Popover>
     </div>
   {/if}
@@ -172,7 +173,6 @@
   title="Confirm unpublish"
   okText="Unpublish app"
   onOk={confirmUnpublishApp}
-  dataCy={"unpublish-modal"}
 >
   Are you sure you want to unpublish the app <b>{selectedApp?.name}</b>?
 </ConfirmDialog>
@@ -183,11 +183,8 @@
 </div>
 
 <style>
-  .publish-popover-actions :global([data-cy="publish-popover-action"]) {
-    margin-right: var(--spacing-s);
-  }
-  :global([data-cy="publish-popover-menu"]) {
-    padding: 10px;
+  .popover-content {
+    padding: var(--spacing-xl);
   }
   .buttons {
     display: flex;
diff --git a/packages/builder/src/components/deploy/RevertModal.svelte b/packages/builder/src/components/deploy/RevertModal.svelte
index 67d83ca25b..a8f9d8f6e3 100644
--- a/packages/builder/src/components/deploy/RevertModal.svelte
+++ b/packages/builder/src/components/deploy/RevertModal.svelte
@@ -33,7 +33,6 @@
   hoverable
   on:click={revertModal.show}
   tooltip="Revert changes"
-  dataCy="revert-application-topnav"
 />
 <Modal bind:this={revertModal}>
   <ModalContent
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionDrawer.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionDrawer.svelte
index 1d18fa3a92..43e3b0ed99 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionDrawer.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionDrawer.svelte
@@ -11,7 +11,10 @@
   } from "@budibase/bbui"
   import { getAvailableActions } from "./index"
   import { generate } from "shortid"
-  import { getEventContextBindings } from "builderStore/dataBinding"
+  import {
+    getEventContextBindings,
+    makeStateBinding,
+  } from "builderStore/dataBinding"
   import { currentAsset, store } from "builderStore"
 
   const flipDurationMs = 150
@@ -52,7 +55,7 @@
     actions,
     selectedAction?.id
   )
-  $: allBindings = eventContexBindings.concat(bindings)
+  $: allBindings = getAllBindings(bindings, eventContexBindings, actions)
   $: {
     // Ensure each action has a unique ID
     if (actions) {
@@ -111,6 +114,33 @@
   function handleDndFinalize(e) {
     actions = e.detail.items
   }
+
+  const getAllBindings = (bindings, eventContextBindings, actions) => {
+    let allBindings = eventContextBindings.concat(bindings)
+
+    // Ensure bindings are generated for all "update state" action keys
+    actions
+      .filter(action => {
+        // Find all "Update State" actions which set values
+        return (
+          action[EVENT_TYPE_KEY] === "Update State" &&
+          action.parameters?.type === "set" &&
+          action.parameters.key
+        )
+      })
+      .forEach(action => {
+        // Check we have a binding for this action, and generate one if not
+        const stateBinding = makeStateBinding(action.parameters.key)
+        const hasKey = allBindings.some(binding => {
+          return binding.runtimeBinding === stateBinding.runtimeBinding
+        })
+        if (!hasKey) {
+          allBindings.push(stateBinding)
+        }
+      })
+
+    return allBindings
+  }
 </script>
 
 <DrawerContent>
@@ -186,7 +216,7 @@
         <div class="selected-action-container">
           <svelte:component
             this={selectedActionComponent}
-            parameters={selectedAction.parameters}
+            bind:parameters={selectedAction.parameters}
             bindings={allBindings}
             {nested}
           />
diff --git a/packages/builder/src/components/design/settings/controls/DataSourceSelect.svelte b/packages/builder/src/components/design/settings/controls/DataSourceSelect.svelte
index 49151a09b0..6f0eb6f424 100644
--- a/packages/builder/src/components/design/settings/controls/DataSourceSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/DataSourceSelect.svelte
@@ -193,11 +193,7 @@
     </Drawer>
   {/if}
 </div>
-<Popover
-  bind:this={dropdownRight}
-  anchor={anchorRight}
-  dataCy={`dataSource-popover-${$store.selectedComponentId}`}
->
+<Popover bind:this={dropdownRight} anchor={anchorRight}>
   <div class="dropdown">
     <div class="title">
       <Heading size="XS">Tables</Heading>
diff --git a/packages/builder/src/components/design/settings/controls/IconSelect/IconSelect.svelte b/packages/builder/src/components/design/settings/controls/IconSelect/IconSelect.svelte
index 0aad0e844d..be83713550 100644
--- a/packages/builder/src/components/design/settings/controls/IconSelect/IconSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/IconSelect/IconSelect.svelte
@@ -121,12 +121,7 @@
     {displayValue}
   </ActionButton>
 </div>
-<Popover
-  bind:this={dropdown}
-  on:open={setSelectedUI}
-  anchor={buttonAnchor}
-  dataCy="icon-popover"
->
+<Popover bind:this={dropdown} on:open={setSelectedUI} anchor={buttonAnchor}>
   <div class="container">
     <div class="search-area">
       <div class="alphabet-area">
diff --git a/packages/builder/src/components/design/settings/controls/PropertyControl.svelte b/packages/builder/src/components/design/settings/controls/PropertyControl.svelte
index 70b88c41e5..ab448b850c 100644
--- a/packages/builder/src/components/design/settings/controls/PropertyControl.svelte
+++ b/packages/builder/src/components/design/settings/controls/PropertyControl.svelte
@@ -74,17 +74,13 @@
   })
 </script>
 
-<div
-  class="property-control"
-  class:highlighted={highlighted && nullishValue}
-  data-cy={`setting-${key}`}
->
+<div class="property-control" class:highlighted={highlighted && nullishValue}>
   {#if type !== "boolean" && label}
     <div class="label">
       <Label>{label}</Label>
     </div>
   {/if}
-  <div data-cy={`${key}-prop-control`} class="control">
+  <div id={`${key}-prop-control`} class="control">
     <svelte:component
       this={control}
       {componentInstance}
diff --git a/packages/builder/src/components/portal/environment/CreateEditVariableModal.svelte b/packages/builder/src/components/portal/environment/CreateEditVariableModal.svelte
index c76cb7d468..602a054eaf 100644
--- a/packages/builder/src/components/portal/environment/CreateEditVariableModal.svelte
+++ b/packages/builder/src/components/portal/environment/CreateEditVariableModal.svelte
@@ -22,6 +22,8 @@
   let developmentValue
   let useProductionValue = true
 
+  const HasSpacesRegex = /[\\"\s]/
+
   const deleteVariable = async name => {
     try {
       await environment.deleteVariable(name)
@@ -47,10 +49,16 @@
 </script>
 
 <ModalContent
+  disabled={HasSpacesRegex.test(name)}
   onConfirm={() => saveVariable()}
   title={!row ? "Add new environment variable" : "Edit environment variable"}
 >
-  <Input disabled={row} label="Name" bind:value={name} />
+  <Input
+    disabled={row}
+    label="Name"
+    bind:value={name}
+    error={HasSpacesRegex.test(name) && "Must not include spaces"}
+  />
   <div>
     <Heading size="XS">Production</Heading>
     <Input
diff --git a/packages/builder/src/components/portal/onboarding/TourPopover.svelte b/packages/builder/src/components/portal/onboarding/TourPopover.svelte
index b04c796d04..e6a4ed3b27 100644
--- a/packages/builder/src/components/portal/onboarding/TourPopover.svelte
+++ b/packages/builder/src/components/portal/onboarding/TourPopover.svelte
@@ -108,59 +108,62 @@
   }
 </script>
 
-{#key tourStepKey}
-  <Popover
-    align={tourStep?.align}
-    bind:this={popover}
-    anchor={popoverAnchor}
-    dataCy="tour-popover-menu"
-    maxWidth={300}
-    dismissible={false}
-  >
-    <Layout gap="M">
-      <div class="tour-header">
-        <Heading size="XS">{tourStep?.title || "-"}</Heading>
-        <div>{`${tourStepIdx + 1}/${tourSteps?.length}`}</div>
+{#if tourKey}
+  {#key tourStepKey}
+    <Popover
+      align={tourStep?.align}
+      bind:this={popover}
+      anchor={popoverAnchor}
+      maxWidth={300}
+      dismissible={false}
+      offset={15}
+    >
+      <div class="tour-content">
+        <Layout noPadding gap="M">
+          <div class="tour-header">
+            <Heading size="XS">{tourStep?.title || "-"}</Heading>
+            <div>{`${tourStepIdx + 1}/${tourSteps?.length}`}</div>
+          </div>
+          <Body size="S">
+            <span class="tour-body">
+              {#if tourStep.layout}
+                <svelte:component this={tourStep.layout} />
+              {:else}
+                {tourStep?.body || ""}
+              {/if}
+            </span>
+          </Body>
+          <div class="tour-footer">
+            <div class="tour-navigation">
+              {#if tourStepIdx > 0}
+                <Button
+                  secondary
+                  on:click={previousStep}
+                  disabled={tourStepIdx == 0}
+                >
+                  <div>Back</div>
+                </Button>
+              {/if}
+              <Button cta on:click={nextStep}>
+                <div>{lastStep ? "Finish" : "Next"}</div>
+              </Button>
+            </div>
+          </div>
+        </Layout>
       </div>
-      <Body size="S">
-        <span class="tour-body">
-          {#if tourStep.layout}
-            <svelte:component this={tourStep.layout} />
-          {:else}
-            {tourStep?.body || ""}
-          {/if}
-        </span>
-      </Body>
-      <div class="tour-footer">
-        <div class="tour-navigation">
-          {#if tourStepIdx > 0}
-            <Button
-              secondary
-              on:click={previousStep}
-              disabled={tourStepIdx == 0}
-            >
-              <div>Back</div>
-            </Button>
-          {/if}
-          <Button cta on:click={nextStep}>
-            <div>{lastStep ? "Finish" : "Next"}</div>
-          </Button>
-        </div>
-      </div>
-    </Layout>
-  </Popover>
-{/key}
+    </Popover>
+  {/key}
+{/if}
 
 <style>
+  .tour-content {
+    padding: var(--spacing-xl);
+  }
   .tour-navigation {
     grid-gap: var(--spectrum-alias-grid-baseline);
     display: flex;
     justify-content: end;
   }
-  :global([data-cy="tour-popover-menu"]) {
-    padding: 10px;
-    margin-top: var(--spacing-l);
-  }
   .tour-body :global(.feature-list) {
     margin-bottom: 0px;
     padding-left: var(--spacing-xl);
diff --git a/packages/builder/src/components/portal/onboarding/steps/OnboardingData.svelte b/packages/builder/src/components/portal/onboarding/steps/OnboardingData.svelte
index 674d5c14ab..c2bd0ad5e9 100644
--- a/packages/builder/src/components/portal/onboarding/steps/OnboardingData.svelte
+++ b/packages/builder/src/components/portal/onboarding/steps/OnboardingData.svelte
@@ -1,5 +1,5 @@
 <div>
-  In this section you can mange the data for your app:
+  In this section you can manage the data for your app:
   <ul class="feature-list">
     <li>Connect data sources</li>
     <li>Edit data</li>
diff --git a/packages/builder/src/components/settings/ProfileModal.svelte b/packages/builder/src/components/settings/ProfileModal.svelte
index 850bde2f35..daeeb791bb 100644
--- a/packages/builder/src/components/settings/ProfileModal.svelte
+++ b/packages/builder/src/components/settings/ProfileModal.svelte
@@ -23,14 +23,6 @@
     Personalise the platform by adding your first name and last name.
   </Body>
   <Input disabled bind:value={$auth.user.email} label="Email" />
-  <Input
-    bind:value={$values.firstName}
-    label="First name"
-    dataCy="user-first-name"
-  />
-  <Input
-    bind:value={$values.lastName}
-    label="Last name"
-    dataCy="user-last-name"
-  />
+  <Input bind:value={$values.firstName} label="First name" />
+  <Input bind:value={$values.lastName} label="Last name" />
 </ModalContent>
diff --git a/packages/builder/src/components/start/AppRow.svelte b/packages/builder/src/components/start/AppRow.svelte
index 0404bc6b05..96c0e2154a 100644
--- a/packages/builder/src/components/start/AppRow.svelte
+++ b/packages/builder/src/components/start/AppRow.svelte
@@ -30,11 +30,11 @@
 </script>
 
 <div class="app-row" on:click={handleDefaultClick}>
-  <div class="title" data-cy={`${app.devId}`}>
+  <div class="title">
     <div class="app-icon">
       <Icon size="L" name={app.icon?.name || "Apps"} color={app.icon?.color} />
     </div>
-    <div class="name" data-cy="app-name-link">
+    <div class="name">
       <Heading size="S">
         {app.name}
       </Heading>
@@ -56,7 +56,7 @@
     <Body size="S">{app.deployed ? "Published" : "Unpublished"}</Body>
   </div>
 
-  <div class="app-row-actions" data-cy={`row_actions_${app.appId}`}>
+  <div class="app-row-actions">
     <AppLockModal {app} buttonSize="M" />
     <Button size="S" secondary on:click={goToOverview}>Manage</Button>
     <Button size="S" primary disabled={app.lockedOther} on:click={goToBuilder}>
diff --git a/packages/builder/src/components/start/CreateAppModal.svelte b/packages/builder/src/components/start/CreateAppModal.svelte
index e48aacceea..9ebc046cdc 100644
--- a/packages/builder/src/components/start/CreateAppModal.svelte
+++ b/packages/builder/src/components/start/CreateAppModal.svelte
@@ -138,7 +138,6 @@
       }
 
       $goto(`/builder/app/${createdApp.instance._id}`)
-      // apps.load()
     } catch (error) {
       creating = false
       console.error(error)
diff --git a/packages/builder/src/components/start/ExportAppModal.svelte b/packages/builder/src/components/start/ExportAppModal.svelte
index c523dbf87b..948416b192 100644
--- a/packages/builder/src/components/start/ExportAppModal.svelte
+++ b/packages/builder/src/components/start/ExportAppModal.svelte
@@ -1,6 +1,5 @@
 <script>
   import { ModalContent, Toggle, Body, InlineAlert } from "@budibase/bbui"
-  import { licensing } from "stores/portal"
 
   export let app
   export let published
@@ -17,11 +16,9 @@
 </script>
 
 <ModalContent {title} {confirmText} onConfirm={exportApp}>
-  {#if licensing.environmentVariablesEnabled}
-    <InlineAlert
-      header="Do not share your budibase application exports publicly as they may contain sensitive information such as database credentials or secret keys."
-    />
-  {/if}
+  <InlineAlert
+    header="Do not share your budibase application exports publicly as they may contain sensitive information such as database credentials or secret keys."
+  />
   <Body
     >Apps can be exported with or without data that is within internal tables -
     select this below.</Body
diff --git a/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte
index ff931cf2f4..8b401866f5 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte
@@ -11,9 +11,7 @@
 <div class="data">
   <Panel title="Sources" borderRight>
     <Layout paddingX="L" paddingY="XL" gap="S">
-      <Button dataCy={`new-datasource`} cta on:click={modal.show}>
-        Add source
-      </Button>
+      <Button cta on:click={modal.show}>Add source</Button>
       <CreateDatasourceModal bind:modal />
       <DatasourceNavigator />
     </Layout>
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
index 0399b6375b..9534df5f10 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
@@ -204,7 +204,7 @@
       store.actions.settings.highlight(data.setting)
 
       // Also scroll setting into view
-      const selector = `[data-cy="${data.setting}-prop-control"`
+      const selector = `#${data.setting}-prop-control`
       const element = document.querySelector(selector)?.parentElement
       if (element) {
         element.scrollIntoView({
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/new/_components/NewComponentPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/new/_components/NewComponentPanel.svelte
index 6b3f302264..033881c0ac 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/new/_components/NewComponentPanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/new/_components/NewComponentPanel.svelte
@@ -256,7 +256,6 @@
                   draggable="true"
                   on:dragstart={() => onDragStart(component.component)}
                   on:dragend={onDragEnd}
-                  data-cy={`component-${component.name}`}
                   class="component"
                   class:selected={selectedIndex ===
                     orderMap[component.component]}
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/DatasourceModal.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/DatasourceModal.svelte
index 3115a22151..26e44ca1d0 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/DatasourceModal.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/DatasourceModal.svelte
@@ -66,7 +66,7 @@
   })
 </script>
 
-<span data-cy="data-source-modal">
+<span>
   <ModalContent
     title="Autogenerated screens"
     confirmText="Confirm"
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/NewScreenModal.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/NewScreenModal.svelte
index 04e0cc242a..b5cd28c702 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/NewScreenModal.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/NewScreenModal.svelte
@@ -33,7 +33,7 @@
           selectedScreenMode = blankScreenModeKey
         }}
       >
-        <div data-cy="blank-screen" class="content screen-type-wrap">
+        <div class="content screen-type-wrap">
           <Icon name="WebPage" />
           <div class="screen-type-text">
             <Heading size="XS">Blank screen</Heading>
@@ -60,7 +60,7 @@
         class:disabled={!$tables.list.filter(table => table._id !== "ta_users")
           .length}
       >
-        <div data-cy="autogenerated-screens" class="content screen-type-wrap">
+        <div class="content screen-type-wrap">
           <Icon name="WebPages" />
           <div class="screen-type-text">
             <Heading size="XS">Autogenerated screens</Heading>
diff --git a/packages/builder/src/pages/builder/apps/index.svelte b/packages/builder/src/pages/builder/apps/index.svelte
index 001bf43b50..23f4df5bb5 100644
--- a/packages/builder/src/pages/builder/apps/index.svelte
+++ b/packages/builder/src/pages/builder/apps/index.svelte
@@ -94,7 +94,7 @@
         <Layout noPadding>
           <div class="header">
             <img class="logo" alt="logo" src={$organisation.logoUrl || Logo} />
-            <ActionMenu align="right" dataCy="user-menu">
+            <ActionMenu align="right">
               <div slot="control" class="avatar">
                 <Avatar
                   size="M"
diff --git a/packages/builder/src/pages/builder/auth/forgot.svelte b/packages/builder/src/pages/builder/auth/forgot.svelte
index d58fdf99e0..2ea8bf7a94 100644
--- a/packages/builder/src/pages/builder/auth/forgot.svelte
+++ b/packages/builder/src/pages/builder/auth/forgot.svelte
@@ -52,7 +52,7 @@
           <span class="back-chev" on:click={() => $goto("../")}>
             <Icon name="ChevronLeft" size="XL" />
           </span>
-          Forgotten your password?
+          Forgot your password?
         </div>
       </Heading>
     </span>
@@ -83,7 +83,12 @@
       </FancyForm>
     </Layout>
     <div>
-      <Button disabled={!email || error || submitted} cta on:click={forgot}>
+      <Button
+        size="L"
+        disabled={!email || error || submitted}
+        cta
+        on:click={forgot}
+      >
         Reset password
       </Button>
     </div>
@@ -92,7 +97,7 @@
 
 <style>
   img {
-    width: 48px;
+    width: 46px;
   }
   .back-chev {
     display: inline-block;
@@ -102,5 +107,6 @@
   .heading-content {
     display: flex;
     align-items: center;
+    gap: var(--spacing-m);
   }
 </style>
diff --git a/packages/builder/src/pages/builder/auth/login.svelte b/packages/builder/src/pages/builder/auth/login.svelte
index 032cf850fa..80122c23a5 100644
--- a/packages/builder/src/pages/builder/auth/login.svelte
+++ b/packages/builder/src/pages/builder/auth/login.svelte
@@ -66,7 +66,7 @@
 <svelte:window on:keydown={handleKeydown} />
 
 <TestimonialPage>
-  <Layout gap="S" noPadding>
+  <Layout gap="L" noPadding>
     <Layout justifyItems="center" noPadding>
       {#if loaded}
         <img alt="logo" src={$organisation.logoUrl || Logo} />
@@ -124,14 +124,19 @@
       </FancyForm>
     </Layout>
     <Layout gap="XS" noPadding justifyItems="center">
-      <Button cta disabled={Object.keys(errors).length > 0} on:click={login}>
+      <Button
+        size="L"
+        cta
+        disabled={Object.keys(errors).length > 0}
+        on:click={login}
+      >
         Log in to {company}
       </Button>
     </Layout>
     <Layout gap="XS" noPadding justifyItems="center">
       <div class="user-actions">
-        <ActionButton quiet on:click={() => $goto("./forgot")}>
-          Forgot password
+        <ActionButton size="L" quiet on:click={() => $goto("./forgot")}>
+          Forgot password?
         </ActionButton>
       </div>
     </Layout>
diff --git a/packages/builder/src/pages/builder/invite/index.svelte b/packages/builder/src/pages/builder/invite/index.svelte
index 4b786db497..35231117c4 100644
--- a/packages/builder/src/pages/builder/invite/index.svelte
+++ b/packages/builder/src/pages/builder/invite/index.svelte
@@ -68,7 +68,7 @@
 </script>
 
 <TestimonialPage>
-  <Layout gap="S" noPadding>
+  <Layout gap="M" noPadding>
     <img alt="logo" src={$organisation.logoUrl || Logo} />
     <Layout gap="XS" noPadding>
       <Heading size="M">Join {company}</Heading>
@@ -175,6 +175,7 @@
     </Layout>
     <div>
       <Button
+        size="L"
         disabled={Object.keys(errors).length > 0 || onboarding}
         cta
         on:click={acceptInvite}
diff --git a/packages/builder/src/pages/builder/portal/_components/UserDropdown.svelte b/packages/builder/src/pages/builder/portal/_components/UserDropdown.svelte
index 284c1898ab..d396edd4e2 100644
--- a/packages/builder/src/pages/builder/portal/_components/UserDropdown.svelte
+++ b/packages/builder/src/pages/builder/portal/_components/UserDropdown.svelte
@@ -21,33 +21,25 @@
   }
 </script>
 
-<ActionMenu align="right" dataCy="user-menu">
+<ActionMenu align="right">
   <div slot="control" class="user-dropdown">
     <Avatar size="M" initials={$auth.initials} url={$auth.user.pictureUrl} />
     <Icon size="XL" name="ChevronDown" />
   </div>
-  <MenuItem
-    icon="UserEdit"
-    on:click={() => profileModal.show()}
-    dataCy="user-info"
-  >
+  <MenuItem icon="UserEdit" on:click={() => profileModal.show()}>
     My profile
   </MenuItem>
-  <MenuItem icon="Moon" on:click={() => themeModal.show()} dataCy="theme">
-    Theme
-  </MenuItem>
+  <MenuItem icon="Moon" on:click={() => themeModal.show()}>Theme</MenuItem>
   <MenuItem icon="LockClosed" on:click={() => updatePasswordModal.show()}>
     Update password
   </MenuItem>
-  <MenuItem icon="Key" on:click={() => apiKeyModal.show()} dataCy="api-key">
+  <MenuItem icon="Key" on:click={() => apiKeyModal.show()}>
     View API key
   </MenuItem>
   <MenuItem icon="UserDeveloper" on:click={() => $goto("../apps")}>
     Close developer mode
   </MenuItem>
-  <MenuItem dataCy="user-logout" icon="LogOut" on:click={logout}>
-    Log out
-  </MenuItem>
+  <MenuItem icon="LogOut" on:click={logout}>Log out</MenuItem>
 </ActionMenu>
 
 <Modal bind:this={themeModal}>
diff --git a/packages/builder/src/pages/builder/portal/_layout.svelte b/packages/builder/src/pages/builder/portal/_layout.svelte
index 1f95c2f694..e1f6d8ca3f 100644
--- a/packages/builder/src/pages/builder/portal/_layout.svelte
+++ b/packages/builder/src/pages/builder/portal/_layout.svelte
@@ -14,7 +14,7 @@
   let activeTab = "Apps"
 
   $: $url(), updateActiveTab($menu)
-  $: fullScreen = !$apps?.length
+  $: fullscreen = !$apps.length
 
   const updateActiveTab = menu => {
     for (let entry of menu) {
@@ -37,7 +37,8 @@
         $redirect("../")
       } else {
         try {
-          await organisation.init()
+          // We need to load apps to know if we need to show onboarding fullscreen
+          await Promise.all([apps.load(), organisation.init()])
         } catch (error) {
           notifications.error("Error getting org config")
         }
@@ -47,37 +48,39 @@
   })
 </script>
 
-{#if fullScreen}
-  <slot />
-{:else if $auth.user && loaded}
-  <HelpMenu />
-  <div class="container">
-    <div class="nav">
-      <div class="branding">
-        <Logo />
+{#if $auth.user && loaded}
+  {#if fullscreen}
+    <slot />
+  {:else}
+    <HelpMenu />
+    <div class="container">
+      <div class="nav">
+        <div class="branding">
+          <Logo />
+        </div>
+        <div class="desktop">
+          <Tabs selected={activeTab}>
+            {#each $menu as { title, href }}
+              <Tab {title} on:click={() => $goto(href)} />
+            {/each}
+          </Tabs>
+        </div>
+        <div class="mobile">
+          <Icon hoverable name="ShowMenu" on:click={showMobileMenu} />
+        </div>
+        <div class="desktop">
+          <UpgradeButton />
+        </div>
+        <div class="dropdown">
+          <UserDropdown />
+        </div>
       </div>
-      <div class="desktop">
-        <Tabs selected={activeTab}>
-          {#each $menu as { title, href }}
-            <Tab {title} on:click={() => $goto(href)} />
-          {/each}
-        </Tabs>
-      </div>
-      <div class="mobile">
-        <Icon hoverable name="ShowMenu" on:click={showMobileMenu} />
-      </div>
-      <div class="desktop">
-        <UpgradeButton />
-      </div>
-      <div class="dropdown">
-        <UserDropdown />
+      <div class="main">
+        <slot />
       </div>
+      <MobileMenu visible={mobileMenuVisible} on:close={hideMobileMenu} />
     </div>
-    <div class="main">
-      <slot />
-    </div>
-    <MobileMenu visible={mobileMenuVisible} on:close={hideMobileMenu} />
-  </div>
+  {/if}
 {/if}
 
 <style>
diff --git a/packages/builder/src/pages/builder/portal/apps/_layout.svelte b/packages/builder/src/pages/builder/portal/apps/_layout.svelte
index b91f5f0c5a..8c887da093 100644
--- a/packages/builder/src/pages/builder/portal/apps/_layout.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/_layout.svelte
@@ -10,13 +10,11 @@
   onMount(async () => {
     try {
       // Always load latest
-      await apps.load()
-      await licensing.init()
-      await templates.load()
-
-      if ($licensing.groupsEnabled) {
-        await groups.actions.init()
-      }
+      await Promise.all([
+        licensing.init(),
+        templates.load(),
+        groups.actions.init(),
+      ])
 
       if ($templates?.length === 0) {
         notifications.error("There was a problem loading quick start templates")
diff --git a/packages/builder/src/pages/builder/portal/apps/create.svelte b/packages/builder/src/pages/builder/portal/apps/create.svelte
index 1f273360ab..c1b7e5d115 100644
--- a/packages/builder/src/pages/builder/portal/apps/create.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/create.svelte
@@ -50,20 +50,10 @@
       </Breadcrumbs>
       <Header title={"Create new app"}>
         <div slot="buttons">
-          <Button
-            dataCy="import-app-btn"
-            size="M"
-            secondary
-            on:click={initiateAppImport}
-          >
+          <Button size="M" secondary on:click={initiateAppImport}>
             Import app
           </Button>
-          <Button
-            dataCy="create-app-btn"
-            size="M"
-            cta
-            on:click={initiateAppCreation}
-          >
+          <Button size="M" cta on:click={initiateAppCreation}>
             Start from scratch
           </Button>
         </div>
diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte
index c91ba6c437..a4c3415953 100644
--- a/packages/builder/src/pages/builder/portal/apps/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/index.svelte
@@ -11,15 +11,17 @@
     Body,
     Icon,
     Search,
+    InlineAlert,
   } from "@budibase/bbui"
   import Spinner from "components/common/Spinner.svelte"
   import CreateAppModal from "components/start/CreateAppModal.svelte"
   import AppLimitModal from "components/portal/licensing/AppLimitModal.svelte"
+  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
 
   import { store, automationStore } from "builderStore"
   import { API } from "api"
   import { onMount } from "svelte"
-  import { apps, auth, admin, licensing } from "stores/portal"
+  import { apps, auth, admin, licensing, environment } from "stores/portal"
   import { goto } from "@roxi/routify"
   import AppRow from "components/start/AppRow.svelte"
   import { AppStatus } from "constants"
@@ -35,6 +37,7 @@
   let creatingFromTemplate = false
   let automationErrors
   let accessFilterList = null
+  let confirmDownloadDialog
 
   $: welcomeHeader = `Welcome ${$auth?.user?.firstName || "back"}`
   $: enrichedApps = enrichApps($apps, $auth.user, sortBy)
@@ -193,6 +196,7 @@
 
   onMount(async () => {
     try {
+      await environment.loadVariables()
       // If the portal is loaded from an external URL with a template param
       const initInfo = await auth.getInitInfo()
       if (initInfo?.init_template) {
@@ -240,12 +244,7 @@
         <Layout noPadding gap="L">
           <div class="title">
             <div class="buttons">
-              <Button
-                dataCy="create-app-btn"
-                size="M"
-                cta
-                on:click={initiateAppCreation}
-              >
+              <Button size="M" cta on:click={initiateAppCreation}>
                 Create new app
               </Button>
               {#if $apps?.length > 0}
@@ -258,13 +257,7 @@
                 </Button>
               {/if}
               {#if !$apps?.length}
-                <Button
-                  dataCy="import-app-btn"
-                  size="L"
-                  quiet
-                  secondary
-                  on:click={initiateAppImport}
-                >
+                <Button size="L" quiet secondary on:click={initiateAppImport}>
                   Import app
                 </Button>
               {/if}
@@ -275,7 +268,7 @@
                   <Icon
                     name="Download"
                     hoverable
-                    on:click={initiateAppsExport}
+                    on:click={confirmDownloadDialog.show}
                   />
                 {/if}
                 <Select
@@ -323,6 +316,18 @@
 
 <AppLimitModal bind:this={appLimitModal} />
 
+<ConfirmDialog
+  bind:this={confirmDownloadDialog}
+  okText="Continue"
+  onOk={initiateAppsExport}
+  warning={false}
+  title="Download all apps"
+>
+  <InlineAlert
+    header="Do not share your budibase application exports publicly as they may contain sensitive information such as database credentials or secret keys."
+  />
+</ConfirmDialog>
+
 <style>
   .title {
     display: flex;
diff --git a/packages/builder/src/pages/builder/portal/apps/onboarding/_components/NamePanel.svelte b/packages/builder/src/pages/builder/portal/apps/onboarding/_components/NamePanel.svelte
index 740cfda8f2..730cfbe4a2 100644
--- a/packages/builder/src/pages/builder/portal/apps/onboarding/_components/NamePanel.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/onboarding/_components/NamePanel.svelte
@@ -5,6 +5,8 @@
   export let name = ""
   export let url = ""
   export let onNext = () => {}
+
+  const nameRegex = /^[a-zA-Z0-9\s]*$/
   let nameError = null
   let urlError = null
 
@@ -14,6 +16,9 @@
     if (name.length < 1) {
       return "Name must be provided"
     }
+    if (!nameRegex.test(name)) {
+      return "No special characters are allowed"
+    }
   }
 
   const validateUrl = url => {
diff --git a/packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte b/packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte
index 6df756f119..b8e64ccbab 100644
--- a/packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte
@@ -17,8 +17,8 @@
   import createFromScratchScreen from "builderStore/store/screenTemplates/createFromScratchScreen"
   import { Roles } from "constants/backend"
 
-  let name = ""
-  let url = ""
+  let name = "My first app"
+  let url = "my-first-app"
   let stage = "name"
   let appId = null
 
@@ -57,7 +57,7 @@
     defaultScreenTemplate.routing.roldId = Roles.BASIC
     await store.actions.screens.save(defaultScreenTemplate)
 
-    return createdApp.instance._id
+    appId = createdApp.instance._id
   }
 
   const getIntegrations = async () => {
@@ -79,14 +79,14 @@
     }
   }
 
-  const goToApp = appId => {
+  const goToApp = () => {
     $goto(`/builder/app/${appId}`)
     notifications.success(`App created successfully`)
   }
 
   const handleCreateApp = async ({ datasourceConfig, useSampleData }) => {
     try {
-      appId = await createApp(useSampleData)
+      await createApp(useSampleData)
 
       if (datasourceConfig) {
         await saveDatasource({
@@ -99,7 +99,7 @@
         })
       }
 
-      goToApp(appId)
+      goToApp()
     } catch (e) {
       console.log(e)
       notifications.error("There was a problem creating your app")
@@ -111,7 +111,7 @@
   <CreateTableModal
     name="Your Data"
     beforeSave={createApp}
-    afterSave={() => goToApp(appId)}
+    afterSave={goToApp}
   />
 </Modal>
 
@@ -142,7 +142,7 @@
             <div class="dataButtonIcon">
               <FontAwesomeIcon name="fa-solid fa-file-arrow-up" />
             </div>
-            Upload file
+            Upload data (CSV or JSON)
           </div>
         </FancyButton>
       </div>
diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/_layout.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/_layout.svelte
index 3438e3e25f..74649ff3fd 100644
--- a/packages/builder/src/pages/builder/portal/overview/[appId]/_layout.svelte
+++ b/packages/builder/src/pages/builder/portal/overview/[appId]/_layout.svelte
@@ -100,8 +100,9 @@
   const deleteApp = async () => {
     try {
       await API.deleteApp(app?.devId)
+      apps.load()
       notifications.success("App deleted successfully")
-      $goto("../")
+      $goto("../../")
     } catch (err) {
       notifications.error("Error deleting app")
     }
@@ -139,7 +140,6 @@
               secondary
               disabled={!isPublished}
               on:click={viewApp}
-              dataCy="view-app"
             >
               View
             </Button>
@@ -154,7 +154,7 @@
               Edit
             </Button>
           </span>
-          <ActionMenu align="right" dataCy="app-overview-menu-popover">
+          <ActionMenu align="right">
             <span slot="control" class="app-overview-actions-icon">
               <Icon hoverable name="More" />
             </span>
@@ -248,11 +248,7 @@
     <br />
     Please enter the app name below to confirm.
     <br /><br />
-    <Input
-      bind:value={deletionConfirmationAppName}
-      data-cy="delete-app-confirmation"
-      placeholder={app?.name}
-    />
+    <Input bind:value={deletionConfirmationAppName} placeholder={app?.name} />
   </ConfirmDialog>
 {/key}
 
diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/overview.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/overview.svelte
index 5c19026d9b..2d2b6775fb 100644
--- a/packages/builder/src/pages/builder/portal/overview/[appId]/overview.svelte
+++ b/packages/builder/src/pages/builder/portal/overview/[appId]/overview.svelte
@@ -104,7 +104,7 @@
 <div class="overview-tab">
   <Layout noPadding gap="XL">
     <div class="top">
-      <DashCard title={"App Status"} dataCy={"app-status"}>
+      <DashCard title={"App Status"}>
         <div class="status-content">
           <div class="status-display">
             {#if isPublished}
@@ -137,7 +137,7 @@
         </div>
       </DashCard>
       {#if appEditor}
-        <DashCard title={"Last Edited"} dataCy={"edited-by"}>
+        <DashCard title={"Last Edited"}>
           <div class="last-edited-content">
             <div class="updated-by">
               {#if appEditor}
@@ -167,9 +167,8 @@
         action={() => {
           $goto("./version")
         }}
-        dataCy={"app-version"}
       >
-        <div class="version-content" data-cy={$store.version}>
+        <div class="version-content">
           <Heading size="XS">{$store.version}</Heading>
           {#if updateAvailable}
             <div class="version-status">
@@ -195,7 +194,6 @@
           action={() => {
             $goto("./access")
           }}
-          dataCy={"access"}
         >
           {#if appUsers.length || appGroups.length}
             <Layout noPadding gap="S">
@@ -246,7 +244,6 @@
           action={() => {
             $goto("../automation-history")
           }}
-          dataCy={"automation-history"}
         >
           <div class="automation-content">
             <div class="automation-metrics">
@@ -272,7 +269,6 @@
           action={() => {
             $goto("../backups")
           }}
-          dataCy={"backups"}
         >
           <div class="backups-content">test</div>
         </DashCard>
@@ -286,7 +282,6 @@
   title="Confirm unpublish"
   okText="Unpublish app"
   onOk={confirmUnpublishApp}
-  dataCy={"unpublish-modal"}
 >
   Are you sure you want to unpublish the app <b>{app?.name}</b>?
 </ConfirmDialog>
diff --git a/packages/builder/src/pages/builder/portal/overview/_layout.svelte b/packages/builder/src/pages/builder/portal/overview/_layout.svelte
index 6427a25f4f..2157840bbc 100644
--- a/packages/builder/src/pages/builder/portal/overview/_layout.svelte
+++ b/packages/builder/src/pages/builder/portal/overview/_layout.svelte
@@ -1,17 +1,12 @@
 <script>
-  import { apps, groups, licensing } from "stores/portal"
+  import { groups } from "stores/portal"
   import { onMount } from "svelte"
 
-  let loaded = !!$apps?.length
+  let loaded = false
 
   onMount(async () => {
-    if (!loaded) {
-      await apps.load()
-      if ($licensing.groupsEnabled) {
-        await groups.actions.init()
-      }
-      loaded = true
-    }
+    await groups.actions.init()
+    loaded = true
   })
 </script>
 
diff --git a/packages/builder/src/pages/builder/portal/settings/auth/index.svelte b/packages/builder/src/pages/builder/portal/settings/auth/index.svelte
index f0ca5c9797..608ca271c0 100644
--- a/packages/builder/src/pages/builder/portal/settings/auth/index.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/auth/index.svelte
@@ -391,7 +391,6 @@
                 bind:value={providers.oidc.config.configs[0][field.name]}
                 readonly={field.readonly}
                 placeholder={field.placeholder}
-                dataCy={field.name}
               />
             </div>
             {#if field.copyButton}
@@ -432,7 +431,6 @@
       <div class="form-row">
         <Label size="L">Activated</Label>
         <Toggle
-          dataCy={"oidc-active"}
           text=""
           bind:value={providers.oidc.config.configs[0].activated}
         />
@@ -448,7 +446,6 @@
           on:click={() => {
             providers.oidc.config.configs[0]["scopes"] = [...defaultScopes]
           }}
-          dataCy={"restore-oidc-default-scopes"}
         >
           Restore Defaults
         </Button>
@@ -463,7 +460,6 @@
       <div class="form-row">
         <Label size="L">Auth Scopes</Label>
         <Input
-          dataCy={"new-scope-input"}
           error={scopesFields[0].error}
           placeholder={"New Scope"}
           bind:value={scopesFields[0].inputText}
@@ -532,7 +528,6 @@
         disabled={oidcSaveButtonDisabled}
         cta
         on:click={() => save([providers.oidc])}
-        dataCy="oidc-save"
       >
         Save
       </Button>
diff --git a/packages/builder/src/pages/builder/portal/settings/environment/index.svelte b/packages/builder/src/pages/builder/portal/settings/environment/index.svelte
index 6ffe261e31..3c170235e9 100644
--- a/packages/builder/src/pages/builder/portal/settings/environment/index.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/environment/index.svelte
@@ -25,8 +25,14 @@
   $: schema = buildSchema(noEncryptionKey)
 
   onMount(async () => {
-    await environment.checkStatus()
-    await environment.loadVariables()
+    try {
+      await environment.checkStatus()
+      await environment.loadVariables()
+    } catch (error) {
+      notifications.error(
+        `Error loading environment variables: ${error.message}`
+      )
+    }
   })
 
   const buildSchema = noEncryptionKey => {
diff --git a/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte b/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte
index ee584dd71b..a45414d307 100644
--- a/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte
+++ b/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte
@@ -146,7 +146,7 @@
 
   onMount(async () => {
     try {
-      await Promise.all([groups.actions.init(), apps.load(), roles.fetch()])
+      await Promise.all([groups.actions.init(), roles.fetch()])
       loaded = true
     } catch (error) {
       notifications.error("Error fetching user group data")
diff --git a/packages/builder/src/pages/builder/portal/users/groups/index.svelte b/packages/builder/src/pages/builder/portal/users/groups/index.svelte
index 43561d2d30..cd93a97e19 100644
--- a/packages/builder/src/pages/builder/portal/users/groups/index.svelte
+++ b/packages/builder/src/pages/builder/portal/users/groups/index.svelte
@@ -80,9 +80,7 @@
     try {
       // always load latest
       await licensing.init()
-      if ($licensing.groupsEnabled) {
-        await groups.actions.init()
-      }
+      await groups.actions.init()
     } catch (error) {
       notifications.error("Error getting user groups")
     }
diff --git a/packages/builder/src/pages/builder/portal/users/users/[userId].svelte b/packages/builder/src/pages/builder/portal/users/users/[userId].svelte
index 26a1d25f44..b14e3420cc 100644
--- a/packages/builder/src/pages/builder/portal/users/users/[userId].svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/[userId].svelte
@@ -215,12 +215,7 @@
 
   onMount(async () => {
     try {
-      await Promise.all([
-        fetchUser(),
-        groups.actions.init(),
-        apps.load(),
-        roles.fetch(),
-      ])
+      await Promise.all([fetchUser(), groups.actions.init(), roles.fetch()])
       loaded = true
     } catch (error) {
       notifications.error("Error getting user groups")
diff --git a/packages/builder/src/pages/builder/portal/users/users/index.svelte b/packages/builder/src/pages/builder/portal/users/users/index.svelte
index 3bc18f5ddb..0776b1adc4 100644
--- a/packages/builder/src/pages/builder/portal/users/users/index.svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/index.svelte
@@ -222,12 +222,7 @@
   <Divider />
   <div class="controls">
     <ButtonGroup>
-      <Button
-        disabled={readonly}
-        dataCy="add-user"
-        on:click={createUserModal.show}
-        cta
-      >
+      <Button disabled={readonly} on:click={createUserModal.show} cta>
         Add users
       </Button>
       <Button disabled={readonly} on:click={importUsersModal.show} secondary>
diff --git a/packages/builder/testConfig.json b/packages/builder/testConfig.json
new file mode 100644
index 0000000000..f93adb0262
--- /dev/null
+++ b/packages/builder/testConfig.json
@@ -0,0 +1,13 @@
+{
+    "baseUrl": "http://localhost:4100",
+    "projectId": "bmbemn",
+    "reporterOptions": {
+        "configFile": "reporterConfig.json"
+    },
+    "env": {
+        "PORT": "4100",
+        "WORKER_PORT": "4200",
+        "JWT_SECRET": "test",
+        "HOST_IP": ""
+    }
+}
\ No newline at end of file
diff --git a/packages/builder/ts/setup.ts b/packages/builder/ts/setup.ts
new file mode 100644
index 0000000000..12965ce7c9
--- /dev/null
+++ b/packages/builder/ts/setup.ts
@@ -0,0 +1,4 @@
+// @ts-ignore
+import { run } from "../setup"
+
+run("../server/src/index", "../worker/src/index")
diff --git a/packages/builder/yarn.lock b/packages/builder/yarn.lock
index cc6d28b11f..20fc29b0e3 100644
--- a/packages/builder/yarn.lock
+++ b/packages/builder/yarn.lock
@@ -7,11 +7,6 @@
   resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.1.0.tgz#417fef4a143f4396ad0b3b4351fee21323f15aa8"
   integrity sha512-mMVJ/j/GbZ/De4ZHWbQAQO1J6iVnjtZLc9WEdkUQb8S/Bu2cAF2bETXUgMAdvMG3/ngtKmcNBe+Zms9bg6jnQQ==
 
-"@adobe/spectrum-css-workflow-icons@1.2.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@adobe/spectrum-css-workflow-icons/-/spectrum-css-workflow-icons-1.2.1.tgz#7e2cb3fcfb5c8b12d7275afafbb6ec44913551b4"
-  integrity sha512-uVgekyBXnOVkxp+CUssjN/gefARtudZC8duEn1vm0lBQFwGRZFlDEzU1QC+aIRWCrD1Z8OgRpmBYlSZ7QS003w==
-
 "@ampproject/remapping@^2.1.0":
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d"
@@ -945,137 +940,6 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/bbui@2.2.12-alpha.51":
-  version "2.2.12-alpha.51"
-  resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-2.2.12-alpha.51.tgz#c346501eeb4daba522794a6fd6063b387100454b"
-  integrity sha512-Eajnvt/kMl7kN/UhBB22DkHwItglk4PYwAxaaNa2OIUyl9NYYkDKDCvjCm+NeIgTZNmk+1FXsGN6FFcufbn+Og==
-  dependencies:
-    "@adobe/spectrum-css-workflow-icons" "1.2.1"
-    "@budibase/string-templates" "2.2.12-alpha.51"
-    "@spectrum-css/accordion" "3.0.24"
-    "@spectrum-css/actionbutton" "1.0.1"
-    "@spectrum-css/actiongroup" "1.0.1"
-    "@spectrum-css/avatar" "3.0.2"
-    "@spectrum-css/button" "3.0.1"
-    "@spectrum-css/buttongroup" "3.0.2"
-    "@spectrum-css/checkbox" "3.0.2"
-    "@spectrum-css/dialog" "3.0.1"
-    "@spectrum-css/divider" "1.0.3"
-    "@spectrum-css/dropzone" "3.0.2"
-    "@spectrum-css/fieldgroup" "3.0.2"
-    "@spectrum-css/fieldlabel" "3.0.1"
-    "@spectrum-css/icon" "3.0.1"
-    "@spectrum-css/illustratedmessage" "3.0.2"
-    "@spectrum-css/inlinealert" "2.0.1"
-    "@spectrum-css/inputgroup" "3.0.2"
-    "@spectrum-css/label" "2.0.10"
-    "@spectrum-css/link" "3.1.1"
-    "@spectrum-css/menu" "3.0.1"
-    "@spectrum-css/modal" "3.0.1"
-    "@spectrum-css/pagination" "3.0.3"
-    "@spectrum-css/picker" "1.0.1"
-    "@spectrum-css/popover" "3.0.1"
-    "@spectrum-css/progressbar" "1.0.2"
-    "@spectrum-css/progresscircle" "1.0.2"
-    "@spectrum-css/radio" "3.0.2"
-    "@spectrum-css/search" "3.0.2"
-    "@spectrum-css/sidenav" "3.0.2"
-    "@spectrum-css/slider" "3.0.1"
-    "@spectrum-css/statuslight" "3.0.2"
-    "@spectrum-css/stepper" "3.0.3"
-    "@spectrum-css/switch" "1.0.2"
-    "@spectrum-css/table" "3.0.1"
-    "@spectrum-css/tabs" "3.2.12"
-    "@spectrum-css/tags" "3.0.2"
-    "@spectrum-css/textfield" "3.0.1"
-    "@spectrum-css/toast" "3.0.1"
-    "@spectrum-css/tooltip" "3.0.3"
-    "@spectrum-css/treeview" "3.0.2"
-    "@spectrum-css/typography" "3.0.1"
-    "@spectrum-css/underlay" "2.0.9"
-    "@spectrum-css/vars" "3.0.1"
-    dayjs "^1.10.4"
-    easymde "^2.16.1"
-    svelte-flatpickr "^3.2.3"
-    svelte-portal "^1.0.0"
-
-"@budibase/client@2.2.12-alpha.51":
-  version "2.2.12-alpha.51"
-  resolved "https://registry.yarnpkg.com/@budibase/client/-/client-2.2.12-alpha.51.tgz#3177ceee2bc37c27c49ba2afc1de3d9274cfbe42"
-  integrity sha512-WlPWYtUtYMfP6RI9F+FazRP06Y1Ay6pZA3/4Kxy+Gw4B78Qvf9OEj14DO++4raZP507d94TyGbewxq/EfTfEng==
-  dependencies:
-    "@budibase/bbui" "2.2.12-alpha.51"
-    "@budibase/frontend-core" "2.2.12-alpha.51"
-    "@budibase/string-templates" "2.2.12-alpha.51"
-    "@spectrum-css/button" "^3.0.3"
-    "@spectrum-css/card" "^3.0.3"
-    "@spectrum-css/divider" "^1.0.3"
-    "@spectrum-css/link" "^3.1.3"
-    "@spectrum-css/page" "^3.0.1"
-    "@spectrum-css/tag" "^3.1.4"
-    "@spectrum-css/typography" "^3.0.2"
-    "@spectrum-css/vars" "^3.0.1"
-    apexcharts "^3.22.1"
-    dayjs "^1.10.5"
-    downloadjs "1.4.7"
-    html5-qrcode "^2.2.1"
-    leaflet "^1.7.1"
-    regexparam "^1.3.0"
-    sanitize-html "^2.7.0"
-    screenfull "^6.0.1"
-    shortid "^2.2.15"
-    socket.io-client "^4.5.1"
-    svelte "^3.49.0"
-    svelte-apexcharts "^1.0.2"
-    svelte-flatpickr "^3.1.0"
-    svelte-spa-router "^3.0.5"
-
-"@budibase/frontend-core@2.2.12-alpha.51":
-  version "2.2.12-alpha.51"
-  resolved "https://registry.yarnpkg.com/@budibase/frontend-core/-/frontend-core-2.2.12-alpha.51.tgz#029b84a5427113b36d8d72861cf6b7e43cde09b3"
-  integrity sha512-iO4dIxKbfcQIsHkaSYmvsPi5btOXEgu3+Gb1RRMJ6x/H3Mn17tHUXG1q+zkRLszXurR/h1Z/YzF60wUYxJzm7A==
-  dependencies:
-    "@budibase/bbui" "2.2.12-alpha.51"
-    lodash "^4.17.21"
-    svelte "^3.46.2"
-
-"@budibase/handlebars-helpers@^0.11.8":
-  version "0.11.8"
-  resolved "https://registry.yarnpkg.com/@budibase/handlebars-helpers/-/handlebars-helpers-0.11.8.tgz#6953d29673a8c5c407e096c0a84890465c7ce841"
-  integrity sha512-ggWJUt0GqsHFAEup5tlWlcrmYML57nKhpNGGLzVsqXVYN8eVmf3xluYmmMe7fDYhQH0leSprrdEXmsdFQF3HAQ==
-  dependencies:
-    array-sort "^1.0.0"
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    for-in "^1.0.2"
-    get-object "^0.2.0"
-    get-value "^3.0.1"
-    handlebars "^4.7.7"
-    handlebars-utils "^1.0.6"
-    has-value "^2.0.2"
-    helper-md "^0.2.2"
-    html-tag "^2.0.0"
-    is-even "^1.0.0"
-    is-glob "^4.0.1"
-    kind-of "^6.0.3"
-    micromatch "^3.1.5"
-    relative "^3.0.2"
-    striptags "^3.1.1"
-    to-gfm-code-block "^0.1.1"
-    year "^0.2.1"
-
-"@budibase/string-templates@2.2.12-alpha.51":
-  version "2.2.12-alpha.51"
-  resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.2.12-alpha.51.tgz#13fd7ac4bfe628b517541974aa560d75129a7d31"
-  integrity sha512-fgJJopKfc/VHCYLE7KRda6bJzrHyn0wBJfo3DImogPE2cfAxdXTMpMj2IX4dza8mePJC6WjtJbtc2NLZtg7u2w==
-  dependencies:
-    "@budibase/handlebars-helpers" "^0.11.8"
-    dayjs "^1.10.4"
-    handlebars "^4.7.6"
-    handlebars-utils "^1.0.6"
-    lodash "^4.17.20"
-    vm2 "^3.9.4"
-
 "@cnakazawa/watch@^1.0.3":
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a"
@@ -1603,140 +1467,11 @@
   dependencies:
     "@sinonjs/commons" "^1.7.0"
 
-"@socket.io/component-emitter@~3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz#96116f2a912e0c02817345b3c10751069920d553"
-  integrity sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==
-
-"@spectrum-css/accordion@3.0.24":
-  version "3.0.24"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/accordion/-/accordion-3.0.24.tgz#f89066c120c57b0cfc9aba66d60c39fc1cf69f74"
-  integrity sha512-jNOmUsxmiT3lRLButnN5KKHM94fd+87fjiF8L0c4uRNgJl6ZsBuxPXrM15lV4y1f8D2IACAw01/ZkGRAeaCOFA==
-
 "@spectrum-css/accordion@^3.0.24":
   version "3.0.30"
   resolved "https://registry.yarnpkg.com/@spectrum-css/accordion/-/accordion-3.0.30.tgz#0893a6db28bab984bf5adaf7e1ba194e741db615"
   integrity sha512-J9zw5blM72pl+mtticqJKwLHaQYBwtrfwDXwQuz3lOTUcedzxQ0Pk2lZ1P46+98hdJzxTXZ5RjIyXre3TPEq1w==
 
-"@spectrum-css/actionbutton@1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/actionbutton/-/actionbutton-1.0.1.tgz#9c75da37ea6915919fb574c74bd60dacc03b6577"
-  integrity sha512-AUqtyNabHF451Aj9i3xz82TxS5Z6k1dttA68/1hMeU9kbPCSS4P6Viw3vaRGs9CSspuR8xnnhDgrq+F+zMy2Hw==
-
-"@spectrum-css/actiongroup@1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/actiongroup/-/actiongroup-1.0.1.tgz#b95b86e7af229e90fe1e70399d8d4b547b4bd31c"
-  integrity sha512-5Q6uMjzv5BFA2TwGASr/jAtJpTWl26fhWvgGY8kOA0RCSij35l+YJg/FPXf6Nnj2qCOl8DkNycjT9YXJ+bhyVA==
-
-"@spectrum-css/avatar@3.0.2":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/avatar/-/avatar-3.0.2.tgz#4f1826223eae330e64b6d3cc899e9bc2e98dac95"
-  integrity sha512-wEczvSqxttTWSiL3cOvXV/RmGRwSkw2w6+slcHhnf0kb7ovymMM+9oz8vvEpEsSeo5u598bc+7ktrKFpAd6soQ==
-
-"@spectrum-css/button@3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/button/-/button-3.0.1.tgz#6db8c3e851baecd0f1c2d88fef37d49d01c6e643"
-  integrity sha512-YXrBtjIYisk4Vaxnp0RiE4gdElQX04P2mc4Pi2GlQ27dJKlHmufYcF+kAqGdtiyK5yjdN/vKRcC8y13aA4rusA==
-
-"@spectrum-css/button@^3.0.3":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/button/-/button-3.0.3.tgz#2df1efaab6c7e0b3b06cb4b59e1eae59c7f1fc84"
-  integrity sha512-6CnLPqqtaU/PcSSIGeGRi0iFIIxIUByYLKFO6zn5NEUc12KQ28dJ4PLwB6WBa0L8vRoAGlnWWH2ZZweTijbXgg==
-
-"@spectrum-css/buttongroup@3.0.2":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/buttongroup/-/buttongroup-3.0.2.tgz#fd3387973ca3131609e32112de42a1c0400a48d8"
-  integrity sha512-Wu7B4GJ/SAeVHz9SUGAkeIH8pLaZh4t+w2ykSKOPQIRuK2jCBoudkEClVxviNVwqekccf5XLFXg9GpYF1a3Uaw==
-
-"@spectrum-css/card@^3.0.3":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/card/-/card-3.0.3.tgz#56b2e2da6b80c1583228baa279de7407383bfb6b"
-  integrity sha512-+oKLUI2a0QmQP9EzySeq/G4FpUkkdaDNbuEbqCj2IkPMc/2v/nwzsPhh1fj2UIghGAiiUwXfPpzax1e8fyhQUg==
-
-"@spectrum-css/checkbox@3.0.2":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/checkbox/-/checkbox-3.0.2.tgz#53ca2fba0d9faa1fead10e7206eb1f6cdcfd6ddd"
-  integrity sha512-hPbGcnm7kJvJS4jp/P/bdaZvbyR1eIE9mteuZqcBgdmyp9m/k6+mW5jmsbtqb3Y4mMPWvOJFfz/sIvWJP0F0Zg==
-
-"@spectrum-css/dialog@3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/dialog/-/dialog-3.0.1.tgz#33aae036282159f6aa998848b8c0828640a9620a"
-  integrity sha512-hUFbRR6RGT63MNuP7wP+k9KU+uRuICsduMihskh700e+jiQ+Gsv53fBFDlB843FoZYlIXzFQXgtjMUC5a4Qibw==
-
-"@spectrum-css/divider@1.0.3":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/divider/-/divider-1.0.3.tgz#639e2ebaa0834efa40f42397668bbd5c153ea385"
-  integrity sha512-Zy4Rn40w8UtzMh3wx/U9+CepSCpm1aOCGftHgWDub0XZuVTzh0c1WwyzTuLCx2Hf21z5VRGNiDh8bGEEzSbtNA==
-  dependencies:
-    "@spectrum-css/vars" "^3.0.2"
-
-"@spectrum-css/divider@^1.0.3":
-  version "1.0.27"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/divider/-/divider-1.0.27.tgz#435bf738a65b4eb15c899edf5c536bea22f2d679"
-  integrity sha512-hWKPHOEo9lkOGN5zecpVVwVxE3x0SJHQJKDNx1g0xs/P/AthAboK+L1c9Rq29czNfcQ2kUjumi4igzQzcqABMQ==
-  dependencies:
-    "@spectrum-css/vars" "^8.0.0"
-
-"@spectrum-css/dropzone@3.0.2":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/dropzone/-/dropzone-3.0.2.tgz#34f137851054442b219fed7f32006b93fc5e0bcf"
-  integrity sha512-BuBBzm5re6lM0AWgd6V+mI5eEGnnmFEtcFiJBEn9jYNEQYgflFhvnERUt89jMX5WmspiecwI2JBWJFrtFsOzug==
-
-"@spectrum-css/fieldgroup@3.0.2":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/fieldgroup/-/fieldgroup-3.0.2.tgz#1c1afd3c444d8650fefac275dc66a7a913933846"
-  integrity sha512-Vyw0kQJdLW18J6w4H+YAsoLntvkw5rXmW3CH5H3SDTXkBztxtHSSe3e106Nw5MoZxTfHlom6CxbYXYCTjQfqGw==
-
-"@spectrum-css/fieldlabel@3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/fieldlabel/-/fieldlabel-3.0.1.tgz#39f7c0f25cc2ff402afeff005341b0832f7c588c"
-  integrity sha512-LMfwrwIq8wEEvxFLobdLvXRwKrp8o9Fty4iJ9aYl2Rj1uXkfRd8qLz9HGZjLEE1OuJgoTBgamYABl7EvoA5PLw==
-
-"@spectrum-css/icon@3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/icon/-/icon-3.0.1.tgz#e300a6fc353c85c6b5d6e7a364408a940c31b177"
-  integrity sha512-cGFtIrcQ/7tthdkHK1npuEFiCdYVHLqwmLxghUYQw8Tb8KgJaw3OBO1tpjgsUizexNgu26BjVRIbGxNWuBXIHQ==
-
-"@spectrum-css/illustratedmessage@3.0.2":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/illustratedmessage/-/illustratedmessage-3.0.2.tgz#6a480be98b027e050b086e7899e40d87adb0a8c0"
-  integrity sha512-dqnE8X27bGcO0HN8+dYx8O4o0dNNIAqeivOzDHhe2El+V4dTzMrNIerF6G0NLm3GjVf6XliwmitsZK+K6FmbtA==
-
-"@spectrum-css/inlinealert@2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/inlinealert/-/inlinealert-2.0.1.tgz#7521f88f6c845806403cc7d925773c7414e204a2"
-  integrity sha512-Xy5RCOwgurqUXuGQCsEDUduDd5408bmEpmFg+feynG7VFUgLFZWBeylSENB/OqjlFtO76PHXNVdHkhDscPIHTA==
-
-"@spectrum-css/inputgroup@3.0.2":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/inputgroup/-/inputgroup-3.0.2.tgz#f1b13603832cbd22394f3d898af13203961f8691"
-  integrity sha512-O0G3Lw9gxsh8gTLQWIAKkN1O8cWhjpEUl+oR1PguIKFni72uNr2ikU9piOwy/r0gJG2Q/TVs6hAshoAAkmsSzw==
-
-"@spectrum-css/label@2.0.10":
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/label/-/label-2.0.10.tgz#2368651d7636a19385b5d300cdf6272db1916001"
-  integrity sha512-xCbtEiQkZIlLdWFikuw7ifDCC21DOC/KMgVrrVJHXFc4KRQe9LTZSqmGF3tovm+CSq1adE59mYoTbojVQ9YuEQ==
-
-"@spectrum-css/link@3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/link/-/link-3.1.1.tgz#cb526a2e10b50ef5a7ae29cca7272e2610d597eb"
-  integrity sha512-Bi88lRhTY7g6nM/ryW1yY4Cji211ZYNtRxkxbV7n2lPvwMAAQtyx0qVD3ru4kTGj/FFVvmPR3XiOE10K13HSNA==
-
-"@spectrum-css/link@^3.1.3":
-  version "3.1.23"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/link/-/link-3.1.23.tgz#9d9ff64c41366edbfdb19d04a5deec88bf2ea8fd"
-  integrity sha512-CAJQGnGTrTtR4tF1L94ou9Y+c4vnx9d5rWhb3AMzKb2Focqz02xSkTyaCCH7OM/3CwD8TCLOMANon8LcRpGAjA==
-
-"@spectrum-css/menu@3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/menu/-/menu-3.0.1.tgz#2a376f991acc24e12ec892bb6b9db2650fc41fbe"
-  integrity sha512-Qjg0+1O0eC89sb/bRFq2AGnQ8XqhVy23TUXHyffNM8qdcMssnlny3QmhzjURCZKvx/Y5UytCpzhedPQqSpQwZg==
-
-"@spectrum-css/modal@3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/modal/-/modal-3.0.1.tgz#613a6b83d0330a4d38db41a98090800751c56d8d"
-  integrity sha512-F7D99F3cjDGT9DM9sogx/p49jrNYT7a1J6TUoqV73wUf+0gP+dTsskBOo9jB8VbUE+POQPjiDLB+SWLp6iBB+w==
-
 "@spectrum-css/page@^3.0.1":
   version "3.0.9"
   resolved "https://registry.yarnpkg.com/@spectrum-css/page/-/page-3.0.9.tgz#f8a705dee90af958e2ee20307218e4f82a018c36"
@@ -1744,127 +1479,7 @@
   dependencies:
     "@spectrum-css/vars" "^4.3.1"
 
-"@spectrum-css/pagination@3.0.3":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/pagination/-/pagination-3.0.3.tgz#b204c3ada384c4af751a354bc428346d82eeea65"
-  integrity sha512-OJ/v9GeNXJOZ9Yr9LDBYPrR2NCiLOWP9wANT/a5sqFuugRnQbn/HYMnRp9TBxwpDY6ihaPo0T/wi7kLiAJFdDw==
-
-"@spectrum-css/picker@1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/picker/-/picker-1.0.1.tgz#98991198576d26bd14160824e7b6f3c278ff930b"
-  integrity sha512-Rv4/UBOdNW1gs7WVBCJnPD5VFly8MqP++psDX6kcugUIcfJy0GC3acvElotmKRlCDk8Qxks2W2A0jKeSgphTmA==
-
-"@spectrum-css/popover@3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/popover/-/popover-3.0.1.tgz#5863c1efc53f98f9aba2de9186666780041303fc"
-  integrity sha512-LmOSj/yCwQQ9iGmCYnHiJsJR/HfPiGqI1Jl7pkKxBOCxYBMS/5+ans9vfCN2Qnd0eK7WSbfPg72S6mjye7db2Q==
-
-"@spectrum-css/progressbar@1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/progressbar/-/progressbar-1.0.2.tgz#b5a59432517f9ae6dad49d9504691bc5ac42b424"
-  integrity sha512-+jExeBLtVCqo3BqtFq5WCtZ028Dzk+oUnX6y4z6ZamKPqOyOELOtFnhYnyhyRndQOqYwKUTXx9zsaWA/lpJOHw==
-
-"@spectrum-css/progresscircle@1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/progresscircle/-/progresscircle-1.0.2.tgz#258ea9170fb70f795edda03e38a61d93bef4487c"
-  integrity sha512-JLULpyzjIY95lzlWR1yE1gv4l1K6p+scQ+edmuZZUHBzwM3pUtkvHJmUlA9TYdResUYW6Uka60VRdY6lZ8gnFQ==
-
-"@spectrum-css/radio@3.0.2":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/radio/-/radio-3.0.2.tgz#9c1386894920bbed604e4e174fbbd45d9d762152"
-  integrity sha512-0TDdzC9omNXnpKHEXNuuGeXdNh4x8jvTKVUqMRLb7vY4hY94hAdt6X01NBqka+jzK35HxGzpDdPADAz62yZLPQ==
-
-"@spectrum-css/search@3.0.2":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/search/-/search-3.0.2.tgz#70e93e321032d40b399498b2324e3b70e050551e"
-  integrity sha512-3UbT8yZmNOwrZxq+CUmumE+26ZySZ8OoKNM6U20SLMPLgdx6MrRugVE88r3Bl0sJ0RZX/5bU8nausdiHeX+Jlw==
-
-"@spectrum-css/sidenav@3.0.2":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/sidenav/-/sidenav-3.0.2.tgz#9d70f408d588ee79c69857751010333671f32713"
-  integrity sha512-YpIdH/F0jEICYmoduGrnkTmxwJq1kfKxEp0wOs+ZkQOsvKMv1an7nyhsfOKCQqcGNfYzJ9mJAk7/u5+vsxHa8g==
-
-"@spectrum-css/slider@3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/slider/-/slider-3.0.1.tgz#5281e6f47eb5a4fd3d1816c138bf66d01d7f2e49"
-  integrity sha512-DI2dtMRnQuDM1miVzl3SGyR1khUEKnwdXfO5EHDFwkC3yav43F5QogkfjmjFmWWobMVovdJlAuiaaJ/IHejD0Q==
-
-"@spectrum-css/statuslight@3.0.2":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/statuslight/-/statuslight-3.0.2.tgz#dc54b6cd113413dcdb909c486b5d7bae60db65c5"
-  integrity sha512-xodB8g8vGJH20XmUj9ZsPlM1jHrGeRbvmVXkz0q7YvQrYAhim8pP3W+XKKZAletPFAuu8cmUOc6SWn6i4X4z6w==
-
-"@spectrum-css/stepper@3.0.3":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/stepper/-/stepper-3.0.3.tgz#ae89846886431e3edeee060207b8f81540f73a34"
-  integrity sha512-prAD61ImlOTs9b6PfB3cB08x4lAfxtvnW+RZiTYky0E8GgZdrc/MfCkL5/oqQaIQUtyQv/3Lb7ELAf/0K8QTXw==
-
-"@spectrum-css/switch@1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/switch/-/switch-1.0.2.tgz#f0b4c69271964573e02b08e90998096e49e1de44"
-  integrity sha512-zqmHpgWPNg1gEwdUNFYV3CBX5JaeALfIqcJIxE0FLZqr9d1C4+oLE0ItIFzt1bwr4bFAOmkEpvtiY+amluzGxQ==
-
-"@spectrum-css/table@3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/table/-/table-3.0.1.tgz#753e0e2498082c0c36b9600828516aff3ac338cd"
-  integrity sha512-XQ+srMTv9hK1H0nctWUtqyzitmvyb5TNR+7mjAmKRdkBRSTQQSipDhenxZp72ekzMtMoSYZVZ77kgo0Iw3Fpug==
-
-"@spectrum-css/tabs@3.2.12":
-  version "3.2.12"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/tabs/-/tabs-3.2.12.tgz#9b08f23d5aa881b3441af7757800c7173e5685ff"
-  integrity sha512-rPFUW9SSW4+3/UJ3UrtY2/l3sQvlqB1fqxHLPDjgykvbfrnMejcCTNV4ZrFNHXpE/6+kGnk+yVViSPtWGwJzkA==
-
-"@spectrum-css/tag@^3.1.4":
-  version "3.3.15"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/tag/-/tag-3.3.15.tgz#971184fd8cb977b85a529f808313851863123278"
-  integrity sha512-pF6Wh61Z7hmAy20twIlpjdDuivYj6UPtWIzK7giyJKr/qcn20BjVN2ChIeFB1N+vBamJdLsuQOewv4AJ3+LZ2Q==
-
-"@spectrum-css/tags@3.0.2":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/tags/-/tags-3.0.2.tgz#5bf35fb79c97cd9344de485bd4626ad5b9f07757"
-  integrity sha512-HbvMk+QHvCDD1/ScvSErpKROcpAbXuMD4Hl/Gz/1A1lQ0fJ/CJeCq/MMsL7zjK1nlItU/ySu8r8KIuRF+6F8SQ==
-
-"@spectrum-css/textfield@3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/textfield/-/textfield-3.0.1.tgz#e875b8e37817378ad08fc4af7d53026df38911e5"
-  integrity sha512-MUV5q87CVxbkNdSNoxGrFbgyKc51ft/WWf3aVEoPdPw5yBnXqFe1w1YmAit5zYDOOhhs58sCLAlUcCMlOpkgrA==
-
-"@spectrum-css/toast@3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/toast/-/toast-3.0.1.tgz#36f62ea05302761e59b9d53e05f6c04423861796"
-  integrity sha512-jov++S358BrN2tmMfaoYk1N6u9HojgeuQk61keXrK2m3VE5/n94x7Lg3kIPeSWO0odyDfBlMqT9jacbRey3QTg==
-
-"@spectrum-css/tooltip@3.0.3":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/tooltip/-/tooltip-3.0.3.tgz#26b8ca3b3d30e29630244d85eb4fc11d0c841281"
-  integrity sha512-ztRF7WW1FzyNavXBRc+80z67UoOrY9wl3cMYsVD3MpDnyxdzP8cjza1pCcolKBaFqRTcQKkxKw3GWtGICRKR5A==
-
-"@spectrum-css/treeview@3.0.2":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/treeview/-/treeview-3.0.2.tgz#d54d8f17290babb1c885f5d9355e225421beb0d2"
-  integrity sha512-foO7UBJv1JMFaKgDPVt8jBghZSVbqhXR8TaGaxHSnMubv7ygmKkc1AITrWC2STILCn84ju2vchOohMZfW6sYwg==
-
-"@spectrum-css/typography@3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/typography/-/typography-3.0.1.tgz#957dafd9b18c314fa37a88b549042ba2175f5b3f"
-  integrity sha512-XyR68K2rIZX3u4j7HhMLOqLVHDJZcapp3XUqgYMzMWccBFleA0qPxKpfRWqVIA5DzTMSIw0wEcZPYKWFZ2e6dA==
-
-"@spectrum-css/typography@^3.0.2":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/typography/-/typography-3.0.2.tgz#ea3ca0a60e18064527819d48c8c4364cab4fcd38"
-  integrity sha512-5ZOLmQe0edzsDMyhghUd4hBb5uxGsFrxzf+WasfcUw9klSfTsRZ09n1BsaaWbgrLjlMQ+EEHS46v5VNo0Ms2CA==
-
-"@spectrum-css/underlay@2.0.9":
-  version "2.0.9"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/underlay/-/underlay-2.0.9.tgz#fc10f971d1325cc844b727e6260f7217844060e8"
-  integrity sha512-X86xd0PG4QobmUyXA90BFGnyygaI8kW64dA4ysf4z0cOvUWjNbAAl3a/DB/WRyrnp63Zqv83T/cgNbetagTbWg==
-
-"@spectrum-css/vars@3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/vars/-/vars-3.0.1.tgz#561fd69098f896a647242dd8d6108af603bfa31e"
-  integrity sha512-l4oRcCOqInChYXZN6OQhpe3isk6l4OE6Ys8cgdlsiKp53suNoQxyyd9p/eGRbCjZgH3xQ8nK0t4DHa7QYC0S6w==
-
-"@spectrum-css/vars@^3.0.1", "@spectrum-css/vars@^3.0.2":
+"@spectrum-css/vars@^3.0.1":
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/@spectrum-css/vars/-/vars-3.0.2.tgz#ea9062c3c98dfc6ba59e5df14a03025ad8969999"
   integrity sha512-vzS9KqYXot4J3AEER/u618MXWAS+IoMvYMNrOoscKiLLKYQWenaueakUWulFonToPd/9vIpqtdbwxznqrK5qDw==
@@ -1874,11 +1489,6 @@
   resolved "https://registry.yarnpkg.com/@spectrum-css/vars/-/vars-4.3.1.tgz#d333fa41909f691c8750b5c15ad9ba029df2248e"
   integrity sha512-rX6Iasu9BsFMVgEN0vGRPm9dmSxva+IK/uqQAa9HM0lliwqUiFrJxrFXHHpiAgNuux/U4srEJwbSpGzfF+CegQ==
 
-"@spectrum-css/vars@^8.0.0":
-  version "8.0.3"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/vars/-/vars-8.0.3.tgz#a5da23c58861b36ee48b9cd5983f956d2bb7977f"
-  integrity sha512-LoSPi5273u21O5ItFr3FuLZS3D0y9dlmJImmat8W66r6dPaFJhHDRAbIB93hGOk5mPxqrQb8guAUx7FmvZrbuQ==
-
 "@sveltejs/vite-plugin-svelte@1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-1.0.1.tgz#7f468f03c933fcdfc60d4773671c73f33b9ef4d6"
@@ -1990,18 +1600,6 @@
   dependencies:
     "@babel/types" "^7.3.0"
 
-"@types/codemirror@^5.60.4":
-  version "5.60.7"
-  resolved "https://registry.yarnpkg.com/@types/codemirror/-/codemirror-5.60.7.tgz#efbb78e5e79f90c6762c2127c02096648e600808"
-  integrity sha512-QXIC+RPzt/1BGSuD6iFn6UMC9TDp+9hkOANYNPVsjjrDdzKphfRkwQDKGp2YaC54Yhz0g6P5uYTCCibZZEiMAA==
-  dependencies:
-    "@types/tern" "*"
-
-"@types/estree@*":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2"
-  integrity sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==
-
 "@types/estree@0.0.39":
   version "0.0.39"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
@@ -2056,11 +1654,6 @@
     expect "^29.0.0"
     pretty-format "^29.0.0"
 
-"@types/marked@^4.0.7":
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/@types/marked/-/marked-4.0.8.tgz#b316887ab3499d0a8f4c70b7bd8508f92d477955"
-  integrity sha512-HVNzMT5QlWCOdeuBsgXP8EZzKUf0+AXzN+sLmjvaB3ZlLqO+e4u0uXrdw9ub69wBKFs+c6/pA4r9sy6cCDvImw==
-
 "@types/minimatch@*":
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca"
@@ -2106,13 +1699,6 @@
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c"
   integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==
 
-"@types/tern@*":
-  version "0.23.4"
-  resolved "https://registry.yarnpkg.com/@types/tern/-/tern-0.23.4.tgz#03926eb13dbeaf3ae0d390caf706b2643a0127fb"
-  integrity sha512-JAUw1iXGO1qaWwEOzxTKJZ/5JxVeON9kvGZ/osgZaJImBnyjyn0cjovPsf6FNLmyGY8Vw9DoXZCMlfMkMwHRWg==
-  dependencies:
-    "@types/estree" "*"
-
 "@types/testing-library__jest-dom@^5.9.1":
   version "5.14.5"
   resolved "https://registry.yarnpkg.com/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.14.5.tgz#d113709c90b3c75fdb127ec338dad7d5f86c974f"
@@ -2164,7 +1750,7 @@ acorn-walk@^7.1.1:
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
   integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
 
-acorn-walk@^8.1.1, acorn-walk@^8.2.0:
+acorn-walk@^8.1.1:
   version "8.2.0"
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
   integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
@@ -2174,7 +1760,7 @@ acorn@^7.1.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
-acorn@^8.2.4, acorn@^8.4.1, acorn@^8.7.0:
+acorn@^8.2.4, acorn@^8.4.1:
   version "8.8.2"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a"
   integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==
@@ -2246,18 +1832,6 @@ anymatch@^3.0.3:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-apexcharts@^3.19.2, apexcharts@^3.22.1:
-  version "3.36.3"
-  resolved "https://registry.yarnpkg.com/apexcharts/-/apexcharts-3.36.3.tgz#debd58ded07163d51e00aeb15827d594e0cc8129"
-  integrity sha512-8/FXEs0ohXMff07Gv28XjhPwEJphIUdq2/wii/pcvi54Tw6z1mjrV8ydN8rlWi/ve8BAPBefJkLmRWv7UOBsLw==
-  dependencies:
-    svg.draggable.js "^2.2.2"
-    svg.easing.js "^2.0.0"
-    svg.filter.js "^2.0.2"
-    svg.pathmorphing.js "^0.1.3"
-    svg.resize.js "^1.4.3"
-    svg.select.js "^3.0.1"
-
 arch@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz#1bc47818f305764f23ab3306b0bfc086c5a29d11"
@@ -2273,7 +1847,7 @@ arg@^5.0.2:
   resolved "https://registry.yarnpkg.com/arg/-/arg-5.0.2.tgz#c81433cc427c92c4dcf4865142dbca6f15acd59c"
   integrity sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==
 
-argparse@^1.0.10, argparse@^1.0.7:
+argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
   integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
@@ -2302,15 +1876,6 @@ arr-union@^3.1.0:
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
   integrity sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==
 
-array-sort@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-sort/-/array-sort-1.0.0.tgz#e4c05356453f56f53512a7d1d6123f2c54c0a88a"
-  integrity sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==
-  dependencies:
-    default-compare "^1.0.0"
-    get-value "^2.0.6"
-    kind-of "^5.0.2"
-
 array-union@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
@@ -2363,13 +1928,6 @@ atob@^2.1.2:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
-autolinker@~0.28.0:
-  version "0.28.1"
-  resolved "https://registry.yarnpkg.com/autolinker/-/autolinker-0.28.1.tgz#0652b491881879f0775dace0cdca3233942a4e47"
-  integrity sha512-zQAFO1Dlsn69eXaO6+7YZc+v84aquQKbwpzCE3L0stj56ERn9hutFxPopViLjo9G+rWwjozRhgS5KJ25Xy19cQ==
-  dependencies:
-    gulp-header "^1.7.1"
-
 available-typed-arrays@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
@@ -2773,14 +2331,7 @@ co@^4.6.0:
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
   integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==
 
-codemirror-spell-checker@1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/codemirror-spell-checker/-/codemirror-spell-checker-1.1.2.tgz#1c660f9089483ccb5113b9ba9ca19c3f4993371e"
-  integrity sha512-2Tl6n0v+GJRsC9K3MLCdLaMOmvWL0uukajNJseorZJsslaxZyZMgENocPU8R0DyoTAiKsyqiemSOZo7kjGV0LQ==
-  dependencies:
-    typo-js "*"
-
-codemirror@^5.59.0, codemirror@^5.63.1:
+codemirror@^5.59.0:
   version "5.65.11"
   resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.65.11.tgz#c818edc3274788c008f636520c5490a1f7009b4f"
   integrity sha512-Gp62g2eKSCHYt10axmGhKq3WoJSvVpvhXmowNq7pZdRVowwtvBR/hi2LSP5srtctKkRT33T6/n8Kv1UGp7JW4A==
@@ -2864,13 +2415,6 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
-concat-with-sourcemaps@*:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz#d4ea93f05ae25790951b99e7b3b09e3908a4082e"
-  integrity sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==
-  dependencies:
-    source-map "^0.6.1"
-
 configent@^2.1.4:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/configent/-/configent-2.2.0.tgz#2de230fc43f22c47cfd99016aa6962d6f9546994"
@@ -2900,11 +2444,6 @@ core-util-is@1.0.2:
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
   integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==
 
-core-util-is@~1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
-  integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
-
 create-require@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
@@ -3037,12 +2576,12 @@ dateformat@^4.5.1:
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-4.6.3.tgz#556fa6497e5217fedb78821424f8a1c22fa3f4b5"
   integrity sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA==
 
-dayjs@^1.10.4, dayjs@^1.10.5, dayjs@^1.11.2:
+dayjs@^1.10.4, dayjs@^1.11.2:
   version "1.11.7"
   resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.7.tgz#4b296922642f70999544d1144a2c25730fce63e2"
   integrity sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ==
 
-debug@4, debug@4.3.4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2:
+debug@4, debug@4.3.4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -3111,13 +2650,6 @@ deepmerge@^4.2.2:
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.0.tgz#65491893ec47756d44719ae520e0e2609233b59b"
   integrity sha512-z2wJZXrmeHdvYJp/Ux55wIjqo81G5Bp4c+oELTW+7ar6SogWHajt5a9gO3s3IDaGSAXjDk0vlQKN3rms8ab3og==
 
-default-compare@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/default-compare/-/default-compare-1.0.0.tgz#cb61131844ad84d84788fb68fd01681ca7781a2f"
-  integrity sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==
-  dependencies:
-    kind-of "^5.0.2"
-
 define-properties@^1.1.3, define-properties@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1"
@@ -3190,20 +2722,6 @@ dom-accessibility-api@^0.5.6, dom-accessibility-api@^0.5.9:
   resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz#5a7429e6066eb3664d911e33fb0e45de8eb08453"
   integrity sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==
 
-dom-serializer@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-2.0.0.tgz#e41b802e1eedf9f6cae183ce5e622d789d7d8e53"
-  integrity sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==
-  dependencies:
-    domelementtype "^2.3.0"
-    domhandler "^5.0.2"
-    entities "^4.2.0"
-
-domelementtype@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d"
-  integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
-
 domexception@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304"
@@ -3211,22 +2729,6 @@ domexception@^2.0.1:
   dependencies:
     webidl-conversions "^5.0.0"
 
-domhandler@^5.0.1, domhandler@^5.0.2:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-5.0.3.tgz#cc385f7f751f1d1fc650c21374804254538c7d31"
-  integrity sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==
-  dependencies:
-    domelementtype "^2.3.0"
-
-domutils@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-3.0.1.tgz#696b3875238338cb186b6c0612bd4901c89a4f1c"
-  integrity sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q==
-  dependencies:
-    dom-serializer "^2.0.0"
-    domelementtype "^2.3.0"
-    domhandler "^5.0.1"
-
 dotenv@^8.2.0:
   version "8.6.0"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b"
@@ -3242,17 +2744,6 @@ duplexer@~0.1.1:
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
   integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
 
-easymde@^2.16.1:
-  version "2.18.0"
-  resolved "https://registry.yarnpkg.com/easymde/-/easymde-2.18.0.tgz#ff1397d07329b1a7b9187d2d0c20766fa16b3b1b"
-  integrity sha512-IxVVUxNWIoXLeqtBU4BLc+eS/ScYhT1Dcb6yF5Wchoj1iXAV+TIIDWx+NCaZhY7RcSHqDPKllbYq7nwGKILnoA==
-  dependencies:
-    "@types/codemirror" "^5.60.4"
-    "@types/marked" "^4.0.7"
-    codemirror "^5.63.1"
-    codemirror-spell-checker "1.1.2"
-    marked "^4.1.0"
-
 ecc-jsbn@~0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
@@ -3283,22 +2774,6 @@ end-of-stream@^1.1.0:
   dependencies:
     once "^1.4.0"
 
-engine.io-client@~6.2.3:
-  version "6.2.3"
-  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-6.2.3.tgz#a8cbdab003162529db85e9de31575097f6d29458"
-  integrity sha512-aXPtgF1JS3RuuKcpSrBtimSjYvrbhKW9froICH4s0F3XQWLxsKNxqzG39nnvQZQnva4CMvUK63T7shevxRyYHw==
-  dependencies:
-    "@socket.io/component-emitter" "~3.1.0"
-    debug "~4.3.1"
-    engine.io-parser "~5.0.3"
-    ws "~8.2.3"
-    xmlhttprequest-ssl "~2.0.0"
-
-engine.io-parser@~5.0.3:
-  version "5.0.6"
-  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.0.6.tgz#7811244af173e157295dec9b2718dfe42a64ef45"
-  integrity sha512-tjuoZDMAdEhVnSFleYPCtdL2GXwVTGtNjoeJd9IhIG3C1xs9uwxqRNEu5WpnDZCaozwVlK/nuQhpodhXSIMaxw==
-
 enquirer@^2.3.6:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
@@ -3306,16 +2781,6 @@ enquirer@^2.3.6:
   dependencies:
     ansi-colors "^4.1.1"
 
-ent@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d"
-  integrity sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA==
-
-entities@^4.2.0, entities@^4.3.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174"
-  integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==
-
 error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
@@ -3486,11 +2951,6 @@ escape-string-regexp@^2.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
   integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
 
-escape-string-regexp@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
-  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
-
 escodegen@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd"
@@ -3786,11 +3246,6 @@ find-up@^4.0.0, find-up@^4.1.0:
     locate-path "^5.0.0"
     path-exists "^4.0.0"
 
-flatpickr@^4.5.2:
-  version "4.6.13"
-  resolved "https://registry.yarnpkg.com/flatpickr/-/flatpickr-4.6.13.tgz#8a029548187fd6e0d670908471e43abe9ad18d94"
-  integrity sha512-97PMG/aywoYpB4IvbvUJi0RQi8vearvU0oov1WW3k0WZPBMrTQVqekSX5CjSG/M4Q3i6A/0FKXC7RyAoAUUSPw==
-
 fn-name@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/fn-name/-/fn-name-3.0.0.tgz#0596707f635929634d791f452309ab41558e3c5c"
@@ -3857,11 +3312,6 @@ from@~0:
   resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe"
   integrity sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g==
 
-fs-exists-sync@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add"
-  integrity sha512-cR/vflFyPZtrN6b38ZyWxpWdhlXrzZEBawlpBQMq7033xVY7/kg0GDMBK5jg8lDYQckdJ5x/YC88lM3C7VMsLg==
-
 fs-extra@^10.0.0:
   version "10.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf"
@@ -3943,14 +3393,6 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3:
     has "^1.0.3"
     has-symbols "^1.0.3"
 
-get-object@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/get-object/-/get-object-0.2.0.tgz#d92ff7d5190c64530cda0543dac63a3d47fe8c0c"
-  integrity sha512-7P6y6k6EzEFmO/XyUyFlXm1YLJy9xeA1x/grNV8276abX5GuwUtYgKFkRFkLixw4hf4Pz9q2vgv/8Ar42R0HuQ==
-  dependencies:
-    is-number "^2.0.2"
-    isobject "^0.2.0"
-
 get-package-type@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
@@ -3980,13 +3422,6 @@ get-value@^2.0.3, get-value@^2.0.6:
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
   integrity sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==
 
-get-value@^3.0.0, get-value@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/get-value/-/get-value-3.0.1.tgz#5efd2a157f1d6a516d7524e124ac52d0a39ef5a8"
-  integrity sha512-mKZj9JLQrwMBtj5wxi6MH8Z5eSKaERpAwjg43dPtlGI1ZVEgH/qC7T8/6R2OBSUA+zzHBZgICsVJaEIV2tKTDA==
-  dependencies:
-    isobject "^3.0.1"
-
 getos@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/getos/-/getos-3.2.1.tgz#0134d1f4e00eb46144c5a9c0ac4dc087cbb27dc5"
@@ -4063,35 +3498,6 @@ growly@^1.3.0:
   resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
   integrity sha512-+xGQY0YyAWCnqy7Cd++hc2JqMYzlm0dG30Jd0beaA64sROr8C4nt8Yc9V5Ro3avlSUDTN0ulqP/VBKi1/lLygw==
 
-gulp-header@^1.7.1:
-  version "1.8.12"
-  resolved "https://registry.yarnpkg.com/gulp-header/-/gulp-header-1.8.12.tgz#ad306be0066599127281c4f8786660e705080a84"
-  integrity sha512-lh9HLdb53sC7XIZOYzTXM4lFuXElv3EVkSDhsd7DoJBj7hm+Ni7D3qYbb+Rr8DuM8nRanBvkVO9d7askreXGnQ==
-  dependencies:
-    concat-with-sourcemaps "*"
-    lodash.template "^4.4.0"
-    through2 "^2.0.0"
-
-handlebars-utils@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/handlebars-utils/-/handlebars-utils-1.0.6.tgz#cb9db43362479054782d86ffe10f47abc76357f9"
-  integrity sha512-d5mmoQXdeEqSKMtQQZ9WkiUcO1E3tPbWxluCK9hVgIDPzQa9WsKo3Lbe/sGflTe7TomHEeZaOgwIkyIr1kfzkw==
-  dependencies:
-    kind-of "^6.0.0"
-    typeof-article "^0.1.1"
-
-handlebars@^4.7.6, handlebars@^4.7.7:
-  version "4.7.7"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1"
-  integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==
-  dependencies:
-    minimist "^1.2.5"
-    neo-async "^2.6.0"
-    source-map "^0.6.1"
-    wordwrap "^1.0.0"
-  optionalDependencies:
-    uglify-js "^3.1.4"
-
 harmony-reflect@^1.4.6:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/harmony-reflect/-/harmony-reflect-1.6.2.tgz#31ecbd32e648a34d030d86adb67d4d47547fe710"
@@ -4149,14 +3555,6 @@ has-value@^1.0.0:
     has-values "^1.0.0"
     isobject "^3.0.0"
 
-has-value@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/has-value/-/has-value-2.0.2.tgz#d0f12e8780ba8e90e66ad1a21c707fdb67c25658"
-  integrity sha512-ybKOlcRsK2MqrM3Hmz/lQxXHZ6ejzSPzpNabKB45jb5qDgJvKPa3SdapTsTLwEb9WltgWpOmNax7i+DzNOk4TA==
-  dependencies:
-    get-value "^3.0.0"
-    has-values "^2.0.1"
-
 has-values@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
@@ -4170,13 +3568,6 @@ has-values@^1.0.0:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
-has-values@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/has-values/-/has-values-2.0.1.tgz#3876200ff86d8a8546a9264a952c17d5fc17579d"
-  integrity sha512-+QdH3jOmq9P8GfdjFg0eJudqx1FqU62NQJ4P16rOEHeRdl7ckgwn6uqQjzYE0ZoHVV/e5E2esuJ5Gl5+HUW19w==
-  dependencies:
-    kind-of "^6.0.2"
-
 has@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
@@ -4184,16 +3575,6 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
-helper-md@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/helper-md/-/helper-md-0.2.2.tgz#c1f59d7e55bbae23362fd8a0e971607aec69d41f"
-  integrity sha512-49TaQzK+Ic7ZVTq4i1UZxRUJEmAilTk8hz7q4I0WNUaTclLR8ArJV5B3A1fe1xF2HtsDTr2gYKLaVTof/Lt84Q==
-  dependencies:
-    ent "^2.2.0"
-    extend-shallow "^2.0.1"
-    fs-exists-sync "^0.1.0"
-    remarkable "^1.6.2"
-
 hosted-git-info@^2.1.4:
   version "2.8.9"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
@@ -4211,29 +3592,6 @@ html-escaper@^2.0.0:
   resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
   integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
 
-html-tag@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/html-tag/-/html-tag-2.0.0.tgz#36c3bc8d816fd30b570d5764a497a641640c2fed"
-  integrity sha512-XxzooSo6oBoxBEUazgjdXj7VwTn/iSTSZzTYKzYY6I916tkaYzypHxy+pbVU1h+0UQ9JlVf5XkNQyxOAiiQO1g==
-  dependencies:
-    is-self-closing "^1.0.1"
-    kind-of "^6.0.0"
-
-html5-qrcode@^2.2.1:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/html5-qrcode/-/html5-qrcode-2.3.4.tgz#7e2b4575a23b10ff5e26d2bf147c8027c1ece389"
-  integrity sha512-VPZrOTG8XR9HmIAhSSiGtJVPErZxKy/DuGc9cPQLburCWZEbvxQGJP9y4K4P+8vdalLtYB/vM5YP1BdWQKZ8jQ==
-
-htmlparser2@^8.0.0:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-8.0.1.tgz#abaa985474fcefe269bc761a779b544d7196d010"
-  integrity sha512-4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA==
-  dependencies:
-    domelementtype "^2.3.0"
-    domhandler "^5.0.2"
-    domutils "^3.0.1"
-    entities "^4.3.0"
-
 http-proxy-agent@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a"
@@ -4320,7 +3678,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@~2.0.3:
+inherits@2:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -4465,13 +3823,6 @@ is-docker@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
   integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
 
-is-even@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-even/-/is-even-1.0.0.tgz#76b5055fbad8d294a86b6a949015e1c97b717c06"
-  integrity sha512-LEhnkAdJqic4Dbqn58A0y52IXoHWlsueqQkKfMfdEnIYG8A1sm/GHidKkS6yvXlMoRrkM34csHnXQtOqcb+Jzg==
-  dependencies:
-    is-odd "^0.1.2"
-
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
@@ -4526,13 +3877,6 @@ is-number-object@^1.0.4:
   dependencies:
     has-tostringtag "^1.0.0"
 
-is-number@^2.0.2:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
-  integrity sha512-QUzH43Gfb9+5yckcrSA0VBDwEtDUchrk4F6tfJZQuNzDJbEDB9cZNzSfXGQ1jqmdDY/kl41lUOWM9syA8z8jlg==
-  dependencies:
-    kind-of "^3.0.2"
-
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
@@ -4545,13 +3889,6 @@ is-number@^7.0.0:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
-is-odd@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-0.1.2.tgz#bc573b5ce371ef2aad6e6f49799b72bef13978a7"
-  integrity sha512-Ri7C2K7o5IrUU9UEI8losXJCCD/UtsaIrkR5sxIcFg4xQ9cRJXlWA5DQvTE0yDc0krvSNLsRGXN11UPS6KyfBw==
-  dependencies:
-    is-number "^3.0.0"
-
 is-path-inside@^3.0.2:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
@@ -4569,11 +3906,6 @@ is-plain-object@^3.0.0:
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-3.0.1.tgz#662d92d24c0aa4302407b0d45d21f2251c85f85b"
   integrity sha512-Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g==
 
-is-plain-object@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
-  integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
-
 is-potential-custom-element-name@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
@@ -4587,13 +3919,6 @@ is-regex@^1.1.4:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
-is-self-closing@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-self-closing/-/is-self-closing-1.0.1.tgz#5f406b527c7b12610176320338af0fa3896416e4"
-  integrity sha512-E+60FomW7Blv5GXTlYee2KDrnG6srxF7Xt1SjrhWUGUEsTFIqY/nq2y3DaftCsgUMdh89V07IVfhY9KIJhLezg==
-  dependencies:
-    self-closing-tags "^1.0.1"
-
 is-set@^2.0.1, is-set@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.2.tgz#90755fa4c2562dc1c5d4024760d6119b94ca18ec"
@@ -4676,7 +4001,7 @@ is-wsl@^2.2.0:
   dependencies:
     is-docker "^2.0.0"
 
-isarray@1.0.0, isarray@~1.0.0:
+isarray@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
   integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==
@@ -4691,11 +4016,6 @@ isexe@^2.0.0:
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
-isobject@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-0.2.0.tgz#a3432192f39b910b5f02cc989487836ec70aa85e"
-  integrity sha512-VaWq6XYAsbvM0wf4dyBO7WH9D7GosB7ZZlqrawI9BBiTMINBeCyqSKBa35m870MY3O4aM31pYyZi9DfGrYMJrQ==
-
 isobject@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
@@ -5308,7 +4628,7 @@ jsprim@^2.0.2:
     json-schema "0.4.0"
     verror "1.10.0"
 
-kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.1.0, kind-of@^3.2.0:
+kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
   integrity sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==
@@ -5322,12 +4642,12 @@ kind-of@^4.0.0:
   dependencies:
     is-buffer "^1.1.5"
 
-kind-of@^5.0.0, kind-of@^5.0.2:
+kind-of@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
   integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
 
-kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3:
+kind-of@^6.0.0, kind-of@^6.0.2:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
@@ -5347,11 +4667,6 @@ lazy-ass@1.6.0, lazy-ass@^1.6.0:
   resolved "https://registry.yarnpkg.com/lazy-ass/-/lazy-ass-1.6.0.tgz#7999655e8646c17f089fdd187d150d3324d54513"
   integrity sha512-cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw==
 
-leaflet@^1.7.1:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.9.3.tgz#52ec436954964e2d3d39e0d433da4b2500d74414"
-  integrity sha512-iB2cR9vAkDOu5l3HAay2obcUHZ7xwUBBjph8+PGtmW/2lYhbLizWtG7nTeYht36WfOslixQF9D/uSIzhZgGMfQ==
-
 leven@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
@@ -5396,11 +4711,6 @@ lodash-es@^4.17.11:
   resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee"
   integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==
 
-lodash._reinterpolate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
-  integrity sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA==
-
 lodash.debounce@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
@@ -5431,22 +4741,7 @@ lodash.once@^4.1.1:
   resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
   integrity sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==
 
-lodash.template@^4.4.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab"
-  integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==
-  dependencies:
-    lodash._reinterpolate "^3.0.0"
-    lodash.templatesettings "^4.0.0"
-
-lodash.templatesettings@^4.0.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33"
-  integrity sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==
-  dependencies:
-    lodash._reinterpolate "^3.0.0"
-
-lodash@4.17.21, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0:
+lodash@4.17.21, lodash@^4.17.15, lodash@^4.17.21, lodash@^4.7.0:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -5552,11 +4847,6 @@ map-visit@^1.0.0:
   dependencies:
     object-visit "^1.0.0"
 
-marked@^4.1.0:
-  version "4.2.12"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-4.2.12.tgz#d69a64e21d71b06250da995dcd065c11083bebb5"
-  integrity sha512-yr8hSKa3Fv4D3jdZmtMMPghgVt6TWbk86WQaWhDloQjRSQhMMYCAro7jP7VDJrjjdV8pxVxMssXS8B8Y5DZ5aw==
-
 merge-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
@@ -5572,7 +4862,7 @@ methods@^1.1.2:
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
   integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==
 
-micromatch@^3.1.4, micromatch@^3.1.5:
+micromatch@^3.1.4:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
   integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
@@ -5628,7 +4918,7 @@ minimatch@^3.0.4, minimatch@^3.1.1:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6, minimist@^1.2.7:
+minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.6, minimist@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
   integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
@@ -5736,11 +5026,6 @@ ncp@^2.0.0:
   resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"
   integrity sha512-zIdGUrPRFTUELUvr3Gmc7KZ2Sw/h1PiVM0Af/oHB6zgnV1ikqSfRk+TOufi79aHYCW3NiOXmr1BP5nWbzojLaA==
 
-neo-async@^2.6.0:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
-  integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
-
 nice-try@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
@@ -5959,11 +5244,6 @@ parse-json@^5.0.0:
     json-parse-even-better-errors "^2.3.0"
     lines-and-columns "^1.1.6"
 
-parse-srcset@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/parse-srcset/-/parse-srcset-1.0.2.tgz#f2bd221f6cc970a938d88556abc589caaaa2bde1"
-  integrity sha512-/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q==
-
 parse5@6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
@@ -6053,7 +5333,7 @@ posix-character-classes@^0.1.0:
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
   integrity sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==
 
-postcss@^8.3.11, postcss@^8.4.18:
+postcss@^8.4.18:
   version "8.4.21"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.21.tgz#c639b719a57efc3187b13a1d765675485f4134f4"
   integrity sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==
@@ -6109,11 +5389,6 @@ pretty-format@^29.0.0, pretty-format@^29.4.1:
     ansi-styles "^5.0.0"
     react-is "^18.0.0"
 
-process-nextick-args@~2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
-  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
-
 prompts@^2.0.1:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069"
@@ -6217,19 +5492,6 @@ read-pkg@^5.2.0:
     parse-json "^5.0.0"
     type-fest "^0.6.0"
 
-readable-stream@~2.3.6:
-  version "2.3.7"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
-  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.1.1"
-    util-deprecate "~1.0.1"
-
 redent@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f"
@@ -6279,16 +5541,6 @@ regexp.prototype.flags@^1.4.3:
     define-properties "^1.1.3"
     functions-have-names "^1.2.2"
 
-regexparam@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/regexparam/-/regexparam-2.0.1.tgz#c912f5dae371e3798100b3c9ce22b7414d0889fa"
-  integrity sha512-zRgSaYemnNYxUv+/5SeoHI0eJIgTL/A2pUtXUPLHQxUldagouJ9p+K6IbIZ/JiQuCEv2E2B1O11SjVQy3aMCkw==
-
-regexparam@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/regexparam/-/regexparam-1.3.0.tgz#2fe42c93e32a40eff6235d635e0ffa344b92965f"
-  integrity sha512-6IQpFBv6e5vz1QAqI+V4k8P2e/3gRrqfCJ9FI+O1FLQTO+Uz6RXZEZOPmTJ6hlGj7gkERzY5BRCv09whKP96/g==
-
 regexpu-core@^5.2.1:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.2.2.tgz#3e4e5d12103b64748711c3aad69934d7718e75fc"
@@ -6313,21 +5565,6 @@ regjsparser@^0.9.1:
   dependencies:
     jsesc "~0.5.0"
 
-relative@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/relative/-/relative-3.0.2.tgz#0dcd8ec54a5d35a3c15e104503d65375b5a5367f"
-  integrity sha512-Q5W2qeYtY9GbiR8z1yHNZ1DGhyjb4AnLEjt8iE6XfcC1QIu+FAtj3HQaO0wH28H1mX6cqNLvAqWhP402dxJGyA==
-  dependencies:
-    isobject "^2.0.0"
-
-remarkable@^1.6.2:
-  version "1.7.4"
-  resolved "https://registry.yarnpkg.com/remarkable/-/remarkable-1.7.4.tgz#19073cb960398c87a7d6546eaa5e50d2022fcd00"
-  integrity sha512-e6NKUXgX95whv7IgddywbeN/ItCkWbISmc2DiqHJb0wTrqZIexqdco5b8Z3XZoo/48IdNVKM9ZCvTPJ4F5uvhg==
-  dependencies:
-    argparse "^1.0.10"
-    autolinker "~0.28.0"
-
 remixicon@2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/remixicon/-/remixicon-2.5.0.tgz#b5e245894a1550aa23793f95daceadbf96ad1a41"
@@ -6480,11 +5717,6 @@ safe-buffer@^5.0.1, safe-buffer@^5.1.2:
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
-safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
-
 safe-regex@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
@@ -6512,18 +5744,6 @@ sane@^4.0.3:
     minimist "^1.1.1"
     walker "~1.0.5"
 
-sanitize-html@^2.7.0:
-  version "2.8.1"
-  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.8.1.tgz#319c4fdba67e1edf35b1fd6d9362210044826d47"
-  integrity sha512-qK5neD0SaMxGwVv5txOYv05huC3o6ZAA4h5+7nJJgWMNFUNRjcjLO6FpwAtKzfKCZ0jrG6xTk6eVFskbvOGblg==
-  dependencies:
-    deepmerge "^4.2.2"
-    escape-string-regexp "^4.0.0"
-    htmlparser2 "^8.0.0"
-    is-plain-object "^5.0.0"
-    parse-srcset "^1.0.2"
-    postcss "^8.3.11"
-
 saxes@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d"
@@ -6531,16 +5751,6 @@ saxes@^5.0.1:
   dependencies:
     xmlchars "^2.2.0"
 
-screenfull@^6.0.1:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/screenfull/-/screenfull-6.0.2.tgz#3dbe4b8c4f8f49fb8e33caa8f69d0bca730ab238"
-  integrity sha512-AQdy8s4WhNvUZ6P8F6PB21tSPIYKniic+Ogx0AacBMjKP1GUHN2E9URxQHtCusiwxudnCKkdy4GrHXPPJSkCCw==
-
-self-closing-tags@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/self-closing-tags/-/self-closing-tags-1.0.1.tgz#6c5fa497994bb826b484216916371accee490a5d"
-  integrity sha512-7t6hNbYMxM+VHXTgJmxwgZgLGktuXtVVD5AivWzNTdJBM4DBjnDKDzkf2SrNjihaArpeJYNjxkELBu1evI4lQA==
-
 "semver@2 || 3 || 4 || 5", semver@^5.5.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
@@ -6609,13 +5819,6 @@ shortid@2.2.15:
   dependencies:
     nanoid "^2.1.0"
 
-shortid@^2.2.15:
-  version "2.2.16"
-  resolved "https://registry.yarnpkg.com/shortid/-/shortid-2.2.16.tgz#b742b8f0cb96406fd391c76bfc18a67a57fe5608"
-  integrity sha512-Ugt+GIZqvGXCIItnsL+lvFJOiN7RYqlGy7QE41O3YC1xbNSeDGIRO7xg2JJXIAj1cAGnOeC1r7/T9pgrtQbv4g==
-  dependencies:
-    nanoid "^2.1.0"
-
 side-channel@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
@@ -6688,24 +5891,6 @@ snapdragon@^0.8.1:
     source-map-resolve "^0.5.0"
     use "^3.1.0"
 
-socket.io-client@^4.5.1:
-  version "4.5.4"
-  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-4.5.4.tgz#d3cde8a06a6250041ba7390f08d2468ccebc5ac9"
-  integrity sha512-ZpKteoA06RzkD32IbqILZ+Cnst4xewU7ZYK12aS1mzHftFFjpoMz69IuhP/nL25pJfao/amoPI527KnuhFm01g==
-  dependencies:
-    "@socket.io/component-emitter" "~3.1.0"
-    debug "~4.3.2"
-    engine.io-client "~6.2.3"
-    socket.io-parser "~4.2.1"
-
-socket.io-parser@~4.2.1:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.2.tgz#1dd384019e25b7a3d374877f492ab34f2ad0d206"
-  integrity sha512-DJtziuKypFkMMHCm2uIshOYC7QaylbtzQwiMYDuCKy3OPkjLzu4B2vAhTlqipRHHzrI0NJeBAizTK7X+6m1jVw==
-  dependencies:
-    "@socket.io/component-emitter" "~3.1.0"
-    debug "~4.3.1"
-
 source-map-js@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
@@ -6875,13 +6060,6 @@ string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
-string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
-  dependencies:
-    safe-buffer "~5.1.0"
-
 strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
@@ -6916,11 +6094,6 @@ strip-indent@^3.0.0:
   dependencies:
     min-indent "^1.0.0"
 
-striptags@^3.1.1:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/striptags/-/striptags-3.2.0.tgz#cc74a137db2de8b0b9a370006334161f7dd67052"
-  integrity sha512-g45ZOGzHDMe2bdYMdIvdAfCQkCTDMGBazSw1ypMowwGIee7ZQ5dU0rBJ8Jqgl+jAKIv4dbeE1jscZq9wid1Tkw==
-
 supports-color@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
@@ -6955,25 +6128,11 @@ supports-preserve-symlinks-flag@^1.0.0:
   resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
   integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
 
-svelte-apexcharts@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/svelte-apexcharts/-/svelte-apexcharts-1.0.2.tgz#4e000f8b8f7c901c05658c845457dfc8314d54c1"
-  integrity sha512-6qlx4rE+XsonZ0FZudfwqOQ34Pq+3wpxgAD75zgEmGoYhYBJcwmikTuTf3o8ZBsZue9U/pAwhNy3ed1Bkq1gmA==
-  dependencies:
-    apexcharts "^3.19.2"
-
 svelte-dnd-action@^0.9.8:
   version "0.9.22"
   resolved "https://registry.yarnpkg.com/svelte-dnd-action/-/svelte-dnd-action-0.9.22.tgz#003eee9dddb31d8c782f6832aec8b1507fff194d"
   integrity sha512-lOQJsNLM1QWv5mdxIkCVtk6k4lHCtLgfE59y8rs7iOM6erchbLC9hMEFYSveZz7biJV0mpg7yDSs4bj/RT/YkA==
 
-svelte-flatpickr@^3.1.0, svelte-flatpickr@^3.2.3:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/svelte-flatpickr/-/svelte-flatpickr-3.3.1.tgz#2f2fb60d8190e583ff62d82162a5c2f3fd7824a8"
-  integrity sha512-cKHET/oFoGA/qIoAX87+XvC5n3KuFrCSYBTzI1gl1TKZsTiVnbQkJOIsIa96S19tbnyyPKn+tdt028vzBA3qyA==
-  dependencies:
-    flatpickr "^4.5.2"
-
 svelte-hmr@^0.14.12:
   version "0.14.12"
   resolved "https://registry.yarnpkg.com/svelte-hmr/-/svelte-hmr-0.14.12.tgz#a127aec02f1896500b10148b2d4d21ddde39973f"
@@ -6989,78 +6148,16 @@ svelte-loading-spinners@^0.1.1:
   resolved "https://registry.yarnpkg.com/svelte-loading-spinners/-/svelte-loading-spinners-0.1.7.tgz#3fa6fa0ef67ab635773bf20b07d0b071debbadaa"
   integrity sha512-EKCId1DjVL2RSUVJJsvtNcqQHox03XIgh4xh/4p7r6ST7d8mut6INY9/LqK4A17PFU64+3quZmqiSfOlf480CA==
 
-svelte-portal@1.0.0, svelte-portal@^1.0.0:
+svelte-portal@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/svelte-portal/-/svelte-portal-1.0.0.tgz#36a47c5578b1a4d9b4dc60fa32a904640ec4cdd3"
   integrity sha512-nHf+DS/jZ6jjnZSleBMSaZua9JlG5rZv9lOGKgJuaZStfevtjIlUJrkLc3vbV8QdBvPPVmvcjTlazAzfKu0v3Q==
 
-svelte-spa-router@^3.0.5:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/svelte-spa-router/-/svelte-spa-router-3.3.0.tgz#2fc0967a49dc361dfe4d38dddad6e662eed5b42c"
-  integrity sha512-cwRNe7cxD43sCvSfEeaKiNZg3FCizGxeMcf7CPiWRP3jKXjEma3vxyyuDtPOam6nWbVxl9TNM3hlE/i87ZlqcQ==
-  dependencies:
-    regexparam "2.0.1"
-
-svelte@^3.46.2, svelte@^3.48.0, svelte@^3.49.0:
+svelte@^3.48.0:
   version "3.55.1"
   resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.55.1.tgz#6f93b153e5248039906ce5fe196efdb9e05dfce8"
   integrity sha512-S+87/P0Ve67HxKkEV23iCdAh/SX1xiSfjF1HOglno/YTbSTW7RniICMCofWGdJJbdjw3S+0PfFb1JtGfTXE0oQ==
 
-svg.draggable.js@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/svg.draggable.js/-/svg.draggable.js-2.2.2.tgz#c514a2f1405efb6f0263e7958f5b68fce50603ba"
-  integrity sha512-JzNHBc2fLQMzYCZ90KZHN2ohXL0BQJGQimK1kGk6AvSeibuKcIdDX9Kr0dT9+UJ5O8nYA0RB839Lhvk4CY4MZw==
-  dependencies:
-    svg.js "^2.0.1"
-
-svg.easing.js@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/svg.easing.js/-/svg.easing.js-2.0.0.tgz#8aa9946b0a8e27857a5c40a10eba4091e5691f12"
-  integrity sha512-//ctPdJMGy22YoYGV+3HEfHbm6/69LJUTAqI2/5qBvaNHZ9uUFVC82B0Pl299HzgH13rKrBgi4+XyXXyVWWthA==
-  dependencies:
-    svg.js ">=2.3.x"
-
-svg.filter.js@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/svg.filter.js/-/svg.filter.js-2.0.2.tgz#91008e151389dd9230779fcbe6e2c9a362d1c203"
-  integrity sha512-xkGBwU+dKBzqg5PtilaTb0EYPqPfJ9Q6saVldX+5vCRy31P6TlRCP3U9NxH3HEufkKkpNgdTLBJnmhDHeTqAkw==
-  dependencies:
-    svg.js "^2.2.5"
-
-svg.js@>=2.3.x, svg.js@^2.0.1, svg.js@^2.2.5, svg.js@^2.4.0, svg.js@^2.6.5:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/svg.js/-/svg.js-2.7.1.tgz#eb977ed4737001eab859949b4a398ee1bb79948d"
-  integrity sha512-ycbxpizEQktk3FYvn/8BH+6/EuWXg7ZpQREJvgacqn46gIddG24tNNe4Son6omdXCnSOaApnpZw6MPCBA1dODA==
-
-svg.pathmorphing.js@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/svg.pathmorphing.js/-/svg.pathmorphing.js-0.1.3.tgz#c25718a1cc7c36e852ecabc380e758ac09bb2b65"
-  integrity sha512-49HWI9X4XQR/JG1qXkSDV8xViuTLIWm/B/7YuQELV5KMOPtXjiwH4XPJvr/ghEDibmLQ9Oc22dpWpG0vUDDNww==
-  dependencies:
-    svg.js "^2.4.0"
-
-svg.resize.js@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/svg.resize.js/-/svg.resize.js-1.4.3.tgz#885abd248e0cd205b36b973c4b578b9a36f23332"
-  integrity sha512-9k5sXJuPKp+mVzXNvxz7U0uC9oVMQrrf7cFsETznzUDDm0x8+77dtZkWdMfRlmbkEEYvUn9btKuZ3n41oNA+uw==
-  dependencies:
-    svg.js "^2.6.5"
-    svg.select.js "^2.1.2"
-
-svg.select.js@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/svg.select.js/-/svg.select.js-2.1.2.tgz#e41ce13b1acff43a7441f9f8be87a2319c87be73"
-  integrity sha512-tH6ABEyJsAOVAhwcCjF8mw4crjXSI1aa7j2VQR8ZuJ37H2MBUbyeqYr5nEO7sSN3cy9AR9DUwNg0t/962HlDbQ==
-  dependencies:
-    svg.js "^2.2.5"
-
-svg.select.js@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/svg.select.js/-/svg.select.js-3.0.1.tgz#a4198e359f3825739226415f82176a90ea5cc917"
-  integrity sha512-h5IS/hKkuVCbKSieR9uQCj9w+zLHoPh+ce19bBYyqF53g6mnPB8sAtIbe1s9dh2S2fCmYX2xel1Ln3PJBbK4kw==
-  dependencies:
-    svg.js "^2.6.5"
-
 symbol-tree@^3.2.4:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
@@ -7110,14 +6207,6 @@ throttleit@^1.0.0:
   resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c"
   integrity sha512-rkTVqu6IjfQ/6+uNuuc3sZek4CEYxTJom3IktzgdSxcZqdARuebbA/f4QmAxMQIxqq9ZLEUkSYqvuk1I6VKq4g==
 
-through2@^2.0.0:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
-  integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
-  dependencies:
-    readable-stream "~2.3.6"
-    xtend "~4.0.1"
-
 through@2, through@^2.3.8, through@~2.3, through@~2.3.1:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
@@ -7140,11 +6229,6 @@ to-fast-properties@^2.0.0:
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
   integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==
 
-to-gfm-code-block@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/to-gfm-code-block/-/to-gfm-code-block-0.1.1.tgz#25d045a5fae553189e9637b590900da732d8aa82"
-  integrity sha512-LQRZWyn8d5amUKnfR9A9Uu7x9ss7Re8peuWR2gkh1E+ildOfv2aF26JpuDg8JtvCduu5+hOrMIH+XstZtnagqg==
-
 to-object-path@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
@@ -7296,28 +6380,11 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
-typeof-article@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/typeof-article/-/typeof-article-0.1.1.tgz#9f07e733c3fbb646ffa9e61c08debacd460e06af"
-  integrity sha512-Vn42zdX3FhmUrzEmitX3iYyLb+Umwpmv8fkZRIknYh84lmdrwqZA5xYaoKiIj2Rc5i/5wcDrpUmZcbk1U51vTw==
-  dependencies:
-    kind-of "^3.1.0"
-
 typescript@4.7.3:
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.3.tgz#8364b502d5257b540f9de4c40be84c98e23a129d"
   integrity sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA==
 
-typo-js@*:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/typo-js/-/typo-js-1.2.2.tgz#340484d81fe518e77c81a5a770162b14492f183b"
-  integrity sha512-C7pYBQK17EjSg8tVNY91KHdUt5Nf6FMJ+c3js076quPmBML57PmNMzAcIq/2kf/hSYtFABNDIYNYlJRl5BJhGw==
-
-uglify-js@^3.1.4:
-  version "3.17.4"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c"
-  integrity sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==
-
 unicode-canonical-property-names-ecmascript@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"
@@ -7412,11 +6479,6 @@ utf-8-validate@^5.0.2:
   dependencies:
     node-gyp-build "^4.3.0"
 
-util-deprecate@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
-
 uuid@8.3.1:
   version "8.3.1"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.1.tgz#2ba2e6ca000da60fce5a196954ab241131e05a31"
@@ -7475,14 +6537,6 @@ vite@^3.0.8:
   optionalDependencies:
     fsevents "~2.3.2"
 
-vm2@^3.9.4:
-  version "3.9.13"
-  resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.13.tgz#774a1a3d73b9b90b1aa45bcc5f25e349f2eef649"
-  integrity sha512-0rvxpB8P8Shm4wX2EKOiMp7H2zq+HUE/UwodY0pCZXs9IffIKZq6vUti5OgkVCTakKo9e/fgO4X1fkwfjWxE3Q==
-  dependencies:
-    acorn "^8.7.0"
-    acorn-walk "^8.2.0"
-
 w3c-hr-time@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd"
@@ -7616,11 +6670,6 @@ word-wrap@~1.2.3:
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
   integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
 
-wordwrap@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
-  integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==
-
 wrap-ansi@^6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
@@ -7659,11 +6708,6 @@ ws@^7.4.6:
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591"
   integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
 
-ws@~8.2.3:
-  version "8.2.3"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz#63a56456db1b04367d0b721a0b80cae6d8becbba"
-  integrity sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==
-
 xml-name-validator@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
@@ -7674,16 +6718,6 @@ xmlchars@^2.2.0:
   resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
   integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
 
-xmlhttprequest-ssl@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz#91360c86b914e67f44dce769180027c0da618c67"
-  integrity sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A==
-
-xtend@~4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
-  integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
-
 y18n@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
@@ -7755,11 +6789,6 @@ yauzl@^2.10.0:
     buffer-crc32 "~0.2.3"
     fd-slicer "~1.1.0"
 
-year@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/year/-/year-0.2.1.tgz#4083ae520a318b23ec86037f3000cb892bdf9bb0"
-  integrity sha512-9GnJUZ0QM4OgXuOzsKNzTJ5EOkums1Xc+3YQXp+Q+UxFjf7zLucp9dQ8QMIft0Szs1E1hUiXFim1OYfEKFq97w==
-
 yn@3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 3273216211..0d884ee324 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.2.12-alpha.55",
+  "version": "2.2.12-alpha.64",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,9 +26,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "2.2.12-alpha.55",
-    "@budibase/string-templates": "2.2.12-alpha.55",
-    "@budibase/types": "2.2.12-alpha.55",
+    "@budibase/backend-core": "2.2.12-alpha.64",
+    "@budibase/string-templates": "2.2.12-alpha.64",
+    "@budibase/types": "2.2.12-alpha.64",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index 67a4c0d44c..1c2f54b426 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.2.12-alpha.55",
+  "version": "2.2.12-alpha.64",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "2.2.12-alpha.55",
-    "@budibase/frontend-core": "2.2.12-alpha.55",
-    "@budibase/string-templates": "2.2.12-alpha.55",
+    "@budibase/bbui": "2.2.12-alpha.64",
+    "@budibase/frontend-core": "2.2.12-alpha.64",
+    "@budibase/string-templates": "2.2.12-alpha.64",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/assets/bg.png b/packages/frontend-core/assets/bg.png
index 1d2c2fb595..a1bbb42217 100644
Binary files a/packages/frontend-core/assets/bg.png and b/packages/frontend-core/assets/bg.png differ
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index a6bc7f3ba7..dae6f5324b 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.2.12-alpha.55",
+  "version": "2.2.12-alpha.64",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.2.12-alpha.55",
+    "@budibase/bbui": "2.2.12-alpha.64",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 21426b70ba..865c3a755f 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.2.12-alpha.55",
+  "version": "2.2.12-alpha.64",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 4b53718855..bd743c35f1 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.2.12-alpha.55",
+  "version": "2.2.12-alpha.64",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.2.12-alpha.55",
-    "@budibase/client": "2.2.12-alpha.55",
-    "@budibase/pro": "2.2.12-alpha.55",
-    "@budibase/string-templates": "2.2.12-alpha.55",
-    "@budibase/types": "2.2.12-alpha.55",
+    "@budibase/backend-core": "2.2.12-alpha.64",
+    "@budibase/client": "2.2.12-alpha.64",
+    "@budibase/pro": "2.2.12-alpha.64",
+    "@budibase/string-templates": "2.2.12-alpha.64",
+    "@budibase/types": "2.2.12-alpha.64",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/server/src/integrations/couchdb.ts b/packages/server/src/integrations/couchdb.ts
index 67be21c9d1..257b84ca13 100644
--- a/packages/server/src/integrations/couchdb.ts
+++ b/packages/server/src/integrations/couchdb.ts
@@ -1,11 +1,11 @@
 import {
-  Integration,
   DatasourceFieldType,
-  QueryType,
+  Document,
+  Integration,
   IntegrationBase,
+  QueryType,
 } from "@budibase/types"
-
-const PouchDB = require("pouchdb")
+import { db as dbCore } from "@budibase/backend-core"
 
 interface CouchDBConfig {
   url: string
@@ -39,6 +39,15 @@ const SCHEMA: Integration = {
     update: {
       type: QueryType.JSON,
     },
+    get: {
+      type: QueryType.FIELDS,
+      fields: {
+        id: {
+          type: DatasourceFieldType.STRING,
+          required: true,
+        },
+      },
+    },
     delete: {
       type: QueryType.FIELDS,
       fields: {
@@ -57,7 +66,7 @@ class CouchDBIntegration implements IntegrationBase {
 
   constructor(config: CouchDBConfig) {
     this.config = config
-    this.client = new PouchDB(`${config.url}/${config.database}`)
+    this.client = dbCore.DatabaseWithConnection(config.database, config.url)
   }
 
   async query(
@@ -66,31 +75,48 @@ class CouchDBIntegration implements IntegrationBase {
     query: { json?: object; id?: string }
   ) {
     try {
-      const response = await this.client[command](query.id || query.json)
-      await this.client.close()
-      return response
+      return await this.client[command](query.id || query.json)
     } catch (err) {
       console.error(errorMsg, err)
       throw err
     }
   }
 
-  async create(query: { json: object }) {
-    return this.query("post", "Error writing to couchDB", query)
+  private parse(query: { json: string | object }) {
+    return typeof query.json === "string" ? JSON.parse(query.json) : query.json
   }
 
-  async read(query: { json: object }) {
+  async create(query: { json: string | object }) {
+    const parsed = this.parse(query)
+    return this.query("post", "Error writing to couchDB", { json: parsed })
+  }
+
+  async read(query: { json: string | object }) {
+    const parsed = this.parse(query)
     const result = await this.query("allDocs", "Error querying couchDB", {
       json: {
         include_docs: true,
-        ...query.json,
+        ...parsed,
       },
     })
     return result.rows.map((row: { doc: object }) => row.doc)
   }
 
-  async update(query: { json: object }) {
-    return this.query("put", "Error updating couchDB document", query)
+  async update(query: { json: string | object }) {
+    const parsed: Document = this.parse(query)
+    if (!parsed?._rev && parsed?._id) {
+      const oldDoc = await this.get({ id: parsed._id })
+      parsed._rev = oldDoc._rev
+    }
+    return this.query("put", "Error updating couchDB document", {
+      json: parsed,
+    })
+  }
+
+  async get(query: { id: string }) {
+    return this.query("get", "Error retrieving couchDB document by ID", {
+      id: query.id,
+    })
   }
 
   async delete(query: { id: string }) {
diff --git a/packages/server/src/integrations/elasticsearch.ts b/packages/server/src/integrations/elasticsearch.ts
index c021662a41..aeba628d30 100644
--- a/packages/server/src/integrations/elasticsearch.ts
+++ b/packages/server/src/integrations/elasticsearch.ts
@@ -80,11 +80,11 @@ const SCHEMA: Integration = {
     delete: {
       type: QueryType.FIELDS,
       fields: {
-        index: {
+        id: {
           type: DatasourceFieldType.STRING,
           required: true,
         },
-        id: {
+        index: {
           type: DatasourceFieldType.STRING,
           required: true,
         },
@@ -164,9 +164,13 @@ class ElasticSearchIntegration implements IntegrationBase {
     }
   }
 
-  async delete(query: object) {
+  async delete(query: { id: string; index: string }) {
+    const { id, index } = query
     try {
-      const result = await this.client.delete(query)
+      const result = await this.client.delete({
+        id,
+        index,
+      })
       return result.body
     } catch (err) {
       console.error("Error deleting from elasticsearch", err)
diff --git a/packages/server/src/integrations/tests/couchdb.spec.ts b/packages/server/src/integrations/tests/couchdb.spec.ts
index e05a2bd247..0d744cd343 100644
--- a/packages/server/src/integrations/tests/couchdb.spec.ts
+++ b/packages/server/src/integrations/tests/couchdb.spec.ts
@@ -1,23 +1,32 @@
-jest.mock(
-  "pouchdb",
-  () =>
-    function CouchDBMock(this: any) {
-      this.post = jest.fn()
-      this.allDocs = jest.fn(() => ({ rows: [] }))
-      this.put = jest.fn()
-      this.get = jest.fn()
-      this.remove = jest.fn()
-      this.plugin = jest.fn()
-      this.close = jest.fn()
-    }
-)
+import { DatabaseWithConnection } from "@budibase/backend-core/src/db"
+
+jest.mock("@budibase/backend-core", () => {
+  const core = jest.requireActual("@budibase/backend-core")
+  return {
+    ...core,
+    db: {
+      ...core.db,
+      DatabaseWithConnection: function () {
+        return {
+          post: jest.fn(),
+          allDocs: jest.fn().mockReturnValue({ rows: [] }),
+          put: jest.fn(),
+          get: jest.fn().mockReturnValue({ _rev: "a" }),
+          remove: jest.fn(),
+        }
+      },
+    },
+  }
+})
 
 import { default as CouchDBIntegration } from "../couchdb"
 
 class TestConfiguration {
   integration: any
 
-  constructor(config: any = {}) {
+  constructor(
+    config: any = { url: "http://somewhere", database: "something" }
+  ) {
     this.integration = new CouchDBIntegration.integration(config)
   }
 }
@@ -33,8 +42,8 @@ describe("CouchDB Integration", () => {
     const doc = {
       test: 1,
     }
-    const response = await config.integration.create({
-      json: doc,
+    await config.integration.create({
+      json: JSON.stringify(doc),
     })
     expect(config.integration.client.post).toHaveBeenCalledWith(doc)
   })
@@ -44,8 +53,8 @@ describe("CouchDB Integration", () => {
       name: "search",
     }
 
-    const response = await config.integration.read({
-      json: doc,
+    await config.integration.read({
+      json: JSON.stringify(doc),
     })
 
     expect(config.integration.client.allDocs).toHaveBeenCalledWith({
@@ -60,11 +69,14 @@ describe("CouchDB Integration", () => {
       name: "search",
     }
 
-    const response = await config.integration.update({
-      json: doc,
+    await config.integration.update({
+      json: JSON.stringify(doc),
     })
 
-    expect(config.integration.client.put).toHaveBeenCalledWith(doc)
+    expect(config.integration.client.put).toHaveBeenCalledWith({
+      ...doc,
+      _rev: "a",
+    })
   })
 
   it("calls the delete method with the correct params", async () => {
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index a91f2d8025..ec1f44244c 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1273,13 +1273,13 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.2.12-alpha.55":
-  version "2.2.12-alpha.55"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.55.tgz#76932ec6a17d6dd9a30693c352f3774e87eca60b"
-  integrity sha512-xqqNbhOjWGwkuTm16uwxiCH9HTxWIqFrn1UyLv617uHKTLIgPcMCyHgEcL2ebEHpTki3qcw+QQ1XupuNKqYfQQ==
+"@budibase/backend-core@2.2.12-alpha.64":
+  version "2.2.12-alpha.64"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.64.tgz#5000c09344cafb5a993b497f1bf270489b617816"
+  integrity sha512-KPpUi8xZKHRlVU5H7lznXDNk/XZtUPhSdIAxFYoemvR3FUGZW4TRxEa07ZU5y6NssiDE/Fy/pCdPYO4fNJQncQ==
   dependencies:
     "@budibase/nano" "10.1.1"
-    "@budibase/types" "2.2.12-alpha.55"
+    "@budibase/types" "2.2.12-alpha.64"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1374,13 +1374,13 @@
     qs "^6.11.0"
     tough-cookie "^4.1.2"
 
-"@budibase/pro@2.2.12-alpha.55":
-  version "2.2.12-alpha.55"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.55.tgz#7f9a0e53a47546dd92ea396045905687f8fdca39"
-  integrity sha512-KE6K9iaq3hYOmmQu49MVlgNHlFiys44jhqpKuU2mBkOXnL3EhL6Z8/4wuZwZxykSScFnD7pxl21IX9uucfgx6g==
+"@budibase/pro@2.2.12-alpha.64":
+  version "2.2.12-alpha.64"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.64.tgz#0fd36cf9cbf360282cef4022780217b622854895"
+  integrity sha512-3fMLsgGTqrqa3WNYk5X4vNAoyLW+WGdPvyyRhJx+O5XjG6EIEzx1XlabmpYDcFbz7np0QiLUxW68yV6uggwVfg==
   dependencies:
-    "@budibase/backend-core" "2.2.12-alpha.55"
-    "@budibase/types" "2.2.12-alpha.55"
+    "@budibase/backend-core" "2.2.12-alpha.64"
+    "@budibase/types" "2.2.12-alpha.64"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1406,10 +1406,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.2.12-alpha.55":
-  version "2.2.12-alpha.55"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.55.tgz#0f56d82fadfc5a68412dc5c693ecaf63a1501b2b"
-  integrity sha512-Perf4gZ1ZN2Kq/CLklNlpzKmZ0EcObKig+hG2k0L+MCUzML8i4oF9dEqDL6Ru72/xC9mYl8//o4NOwXGfHlTXw==
+"@budibase/types@2.2.12-alpha.64":
+  version "2.2.12-alpha.64"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.64.tgz#329ec9355c3c94cf98f382157c73473dd75a46b7"
+  integrity sha512-G2BxiP8WyOE2l+feKpF13JiFgPbyHUYPgfW0WycIcUsN9XetH3GqpiB0SRWxq80i41FpzaC2aUArGXIC+2Ai5Q==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 55b6e5658a..5a69f51432 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.2.12-alpha.55",
+  "version": "2.2.12-alpha.64",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index 9b2df2329b..74aed42dd8 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.2.12-alpha.55",
+  "version": "2.2.12-alpha.64",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 6a5a9a6c0c..cd19017144 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.2.12-alpha.55",
+  "version": "2.2.12-alpha.64",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.2.12-alpha.55",
-    "@budibase/pro": "2.2.12-alpha.55",
-    "@budibase/string-templates": "2.2.12-alpha.55",
-    "@budibase/types": "2.2.12-alpha.55",
+    "@budibase/backend-core": "2.2.12-alpha.64",
+    "@budibase/pro": "2.2.12-alpha.64",
+    "@budibase/string-templates": "2.2.12-alpha.64",
+    "@budibase/types": "2.2.12-alpha.64",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 94be058d01..e6a7dedbca 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -470,13 +470,13 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.2.12-alpha.55":
-  version "2.2.12-alpha.55"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.55.tgz#76932ec6a17d6dd9a30693c352f3774e87eca60b"
-  integrity sha512-xqqNbhOjWGwkuTm16uwxiCH9HTxWIqFrn1UyLv617uHKTLIgPcMCyHgEcL2ebEHpTki3qcw+QQ1XupuNKqYfQQ==
+"@budibase/backend-core@2.2.12-alpha.64":
+  version "2.2.12-alpha.64"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.64.tgz#5000c09344cafb5a993b497f1bf270489b617816"
+  integrity sha512-KPpUi8xZKHRlVU5H7lznXDNk/XZtUPhSdIAxFYoemvR3FUGZW4TRxEa07ZU5y6NssiDE/Fy/pCdPYO4fNJQncQ==
   dependencies:
     "@budibase/nano" "10.1.1"
-    "@budibase/types" "2.2.12-alpha.55"
+    "@budibase/types" "2.2.12-alpha.64"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -521,13 +521,13 @@
     qs "^6.11.0"
     tough-cookie "^4.1.2"
 
-"@budibase/pro@2.2.12-alpha.55":
-  version "2.2.12-alpha.55"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.55.tgz#7f9a0e53a47546dd92ea396045905687f8fdca39"
-  integrity sha512-KE6K9iaq3hYOmmQu49MVlgNHlFiys44jhqpKuU2mBkOXnL3EhL6Z8/4wuZwZxykSScFnD7pxl21IX9uucfgx6g==
+"@budibase/pro@2.2.12-alpha.64":
+  version "2.2.12-alpha.64"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.64.tgz#0fd36cf9cbf360282cef4022780217b622854895"
+  integrity sha512-3fMLsgGTqrqa3WNYk5X4vNAoyLW+WGdPvyyRhJx+O5XjG6EIEzx1XlabmpYDcFbz7np0QiLUxW68yV6uggwVfg==
   dependencies:
-    "@budibase/backend-core" "2.2.12-alpha.55"
-    "@budibase/types" "2.2.12-alpha.55"
+    "@budibase/backend-core" "2.2.12-alpha.64"
+    "@budibase/types" "2.2.12-alpha.64"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -535,10 +535,10 @@
     lru-cache "^7.14.1"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.2.12-alpha.55":
-  version "2.2.12-alpha.55"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.55.tgz#0f56d82fadfc5a68412dc5c693ecaf63a1501b2b"
-  integrity sha512-Perf4gZ1ZN2Kq/CLklNlpzKmZ0EcObKig+hG2k0L+MCUzML8i4oF9dEqDL6Ru72/xC9mYl8//o4NOwXGfHlTXw==
+"@budibase/types@2.2.12-alpha.64":
+  version "2.2.12-alpha.64"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.64.tgz#329ec9355c3c94cf98f382157c73473dd75a46b7"
+  integrity sha512-G2BxiP8WyOE2l+feKpF13JiFgPbyHUYPgfW0WycIcUsN9XetH3GqpiB0SRWxq80i41FpzaC2aUArGXIC+2Ai5Q==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"
diff --git a/qa-core/package.json b/qa-core/package.json
index bf760c17a3..8508361566 100644
--- a/qa-core/package.json
+++ b/qa-core/package.json
@@ -14,8 +14,8 @@
     "test:debug": "DEBUG=1 jest",
     "docker:up": "docker-compose up -d",
     "docker:down": "docker-compose down",
-    "api:server:setup": "npm run docker:up && env-cmd ts-node ../packages/builder/cypress/ts/setup.ts",
-    "api:server:setup:ci": "env-cmd node ../packages/builder/cypress/setup.js",
+    "api:server:setup": "npm run docker:up && env-cmd ts-node ../packages/builder/ts/setup.ts",
+    "api:server:setup:ci": "env-cmd node ../packages/builder/setup.js",
     "api:test:ci": "start-server-and-test api:server:setup:ci http://localhost:4100/builder test",
     "api:test": "start-server-and-test api:server:setup http://localhost:4100/builder test"
   },