diff --git a/.prettierrc b/.prettierrc
index e23b0be753..eda2e6131b 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -3,6 +3,8 @@
   "semi": false,
   "singleQuote": false,
   "trailingComma": "es5",
+  "arrowParens": "avoid",
+  "jsxBracketSameLine": false,
   "plugins": ["prettier-plugin-svelte"],
-  "svelteSortOrder" : "scripts-markup-styles"
+  "svelteSortOrder" : "options-scripts-markup-styles"
 }
\ No newline at end of file
diff --git a/package.json b/package.json
index f98624812f..171f9510f3 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
     "prettier-plugin-svelte": "^2.2.0",
     "rimraf": "^3.0.2",
     "rollup-plugin-replace": "^2.2.0",
-    "svelte": "^3.30.0"
+    "svelte": "^3.37.0"
   },
   "scripts": {
     "bootstrap": "lerna link && lerna bootstrap",
diff --git a/packages/auth/src/db/index.js b/packages/auth/src/db/index.js
index cca0a3ddba..f94fe4afea 100644
--- a/packages/auth/src/db/index.js
+++ b/packages/auth/src/db/index.js
@@ -1,9 +1,9 @@
 let Pouch
 
-module.exports.setDB = (pouch) => {
+module.exports.setDB = pouch => {
   Pouch = pouch
 }
 
-module.exports.getDB = (dbName) => {
+module.exports.getDB = dbName => {
   return new Pouch(dbName)
 }
diff --git a/packages/auth/src/db/utils.js b/packages/auth/src/db/utils.js
index de743a7764..105e038907 100644
--- a/packages/auth/src/db/utils.js
+++ b/packages/auth/src/db/utils.js
@@ -48,7 +48,7 @@ exports.getGroupParams = (id = "", otherProps = {}) => {
  * Generates a new global user ID.
  * @returns {string} The new user ID which the user doc can be stored under.
  */
-exports.generateGlobalUserID = (id) => {
+exports.generateGlobalUserID = id => {
   return `${DocumentTypes.USER}${SEPARATOR}${id || newid()}`
 }
 
@@ -70,7 +70,7 @@ exports.getGlobalUserParams = (globalId, otherProps = {}) => {
  * Generates a template ID.
  * @param ownerId The owner/user of the template, this could be global or a group level.
  */
-exports.generateTemplateID = (ownerId) => {
+exports.generateTemplateID = ownerId => {
   return `${DocumentTypes.TEMPLATE}${SEPARATOR}${ownerId}${newid()}`
 }
 
@@ -132,7 +132,7 @@ const determineScopedConfig = async function (db, { type, user, group }) {
       }
     )
   )
-  const configs = response.rows.map((row) => {
+  const configs = response.rows.map(row => {
     const config = row.doc
 
     // Config is specific to a user and a group
diff --git a/packages/auth/src/hashing.js b/packages/auth/src/hashing.js
index fe9b034c63..7f3af2855f 100644
--- a/packages/auth/src/hashing.js
+++ b/packages/auth/src/hashing.js
@@ -4,7 +4,7 @@ const { v4 } = require("uuid")
 
 const SALT_ROUNDS = env.SALT_ROUNDS || 10
 
-exports.hash = async (data) => {
+exports.hash = async data => {
   const salt = await bcrypt.genSalt(SALT_ROUNDS)
   return bcrypt.hash(data, salt)
 }
diff --git a/packages/auth/src/utils.js b/packages/auth/src/utils.js
index beb1c33cf1..10507410b1 100644
--- a/packages/auth/src/utils.js
+++ b/packages/auth/src/utils.js
@@ -22,7 +22,7 @@ function confirmAppId(possibleAppId) {
  * @param {object} ctx The main request body to look through.
  * @returns {string|undefined} If an appId was found it will be returned.
  */
-exports.getAppId = (ctx) => {
+exports.getAppId = ctx => {
   const options = [ctx.headers["x-budibase-app-id"], ctx.params.appId]
   if (ctx.subdomains) {
     options.push(ctx.subdomains[1])
@@ -41,7 +41,7 @@ exports.getAppId = (ctx) => {
   }
   let appPath =
     ctx.request.headers.referrer ||
-    ctx.path.split("/").filter((subPath) => subPath.startsWith(APP_PREFIX))
+    ctx.path.split("/").filter(subPath => subPath.startsWith(APP_PREFIX))
   if (!appId && appPath.length !== 0) {
     appId = confirmAppId(appPath[0])
   }
@@ -101,11 +101,11 @@ exports.clearCookie = (ctx, name) => {
  * @param {object} ctx The koa context object to be tested.
  * @return {boolean} returns true if the call is from the client lib (a built app rather than the builder).
  */
-exports.isClient = (ctx) => {
+exports.isClient = ctx => {
   return ctx.headers["x-budibase-type"] === "client"
 }
 
-exports.getGlobalUserByEmail = async (email) => {
+exports.getGlobalUserByEmail = async email => {
   const db = getDB(StaticDatabases.GLOBAL.name)
   try {
     let users = (
@@ -114,7 +114,7 @@ exports.getGlobalUserByEmail = async (email) => {
         include_docs: true,
       })
     ).rows
-    users = users.map((user) => user.doc)
+    users = users.map(user => user.doc)
     return users.length <= 1 ? users[0] : users
   } catch (err) {
     if (err != null && err.name === "not_found") {
diff --git a/packages/bbui/src/ActionGroup/ActionGroup.svelte b/packages/bbui/src/ActionGroup/ActionGroup.svelte
index 514b473521..43d8cd8de5 100644
--- a/packages/bbui/src/ActionGroup/ActionGroup.svelte
+++ b/packages/bbui/src/ActionGroup/ActionGroup.svelte
@@ -8,7 +8,7 @@
   // Attaches a spectrum-ActionGroup-item class to buttons inside the div
   function group(element) {
     const buttons = Array.from(element.getElementsByTagName("button"))
-    buttons.forEach((button) => {
+    buttons.forEach(button => {
       button.classList.add("spectrum-ActionGroup-item")
     })
   }
diff --git a/packages/bbui/src/Actions/position_dropdown.js b/packages/bbui/src/Actions/position_dropdown.js
index 776fc7f83e..a25cc1bbd5 100644
--- a/packages/bbui/src/Actions/position_dropdown.js
+++ b/packages/bbui/src/Actions/position_dropdown.js
@@ -47,7 +47,7 @@ export default function positionDropdown(element, { anchor, align }) {
   element.style[positionSide] = `${dimensions[positionSide]}px`
   element.style.left = `${calcLeftPosition(dimensions).toFixed(0)}px`
 
-  const resizeObserver = new ResizeObserver((entries) => {
+  const resizeObserver = new ResizeObserver(entries => {
     entries.forEach(() => {
       dimensions = getDimensions()
       element.style[positionSide] = `${dimensions[positionSide]}px`
diff --git a/packages/bbui/src/ButtonGroup/ButtonGroup.svelte b/packages/bbui/src/ButtonGroup/ButtonGroup.svelte
index f33f8566c3..e299f085ca 100644
--- a/packages/bbui/src/ButtonGroup/ButtonGroup.svelte
+++ b/packages/bbui/src/ButtonGroup/ButtonGroup.svelte
@@ -4,7 +4,11 @@
 
   function group(element) {
     const buttons = Array.from(element.getElementsByTagName("button"))
+<<<<<<< HEAD
     buttons.forEach((button) => {
+=======
+    buttons.forEach(button => {
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
       button.classList.add("spectrum-ButtonGroup-item")
     })
   }
diff --git a/packages/bbui/src/Form/Core/Select.svelte b/packages/bbui/src/Form/Core/Select.svelte
index 3249423feb..01aa8ea067 100644
--- a/packages/bbui/src/Form/Core/Select.svelte
+++ b/packages/bbui/src/Form/Core/Select.svelte
@@ -53,6 +53,10 @@
   {getOptionValue}
   isPlaceholder={value == null || value === ""}
   placeholderOption={placeholder}
+<<<<<<< HEAD
   isOptionSelected={(option) => option === value}
+=======
+  isOptionSelected={option => option === value}
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
   onSelectOption={selectOption}
 />
diff --git a/packages/bbui/src/Form/Core/TextArea.svelte b/packages/bbui/src/Form/Core/TextArea.svelte
index a61871d959..85650f3356 100644
--- a/packages/bbui/src/Form/Core/TextArea.svelte
+++ b/packages/bbui/src/Form/Core/TextArea.svelte
@@ -43,8 +43,15 @@
     {disabled}
     {id}
     on:focus={() => (focus = true)}
+<<<<<<< HEAD
     on:blur={onChange}>{value || ""}</textarea
   >
+=======
+    on:blur={onChange}
+  >
+    {value || ""}
+  </textarea>
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
 </div>
 
 <style>
diff --git a/packages/bbui/src/Modal/ModalContent.svelte b/packages/bbui/src/Modal/ModalContent.svelte
index 630b41dcc6..4b8c0333ef 100644
--- a/packages/bbui/src/Modal/ModalContent.svelte
+++ b/packages/bbui/src/Modal/ModalContent.svelte
@@ -7,7 +7,7 @@
   import Context from "../context"
 
   export let title = undefined
-  export let size = "small"
+  export let size = "S"
   export let cancelText = "Cancel"
   export let confirmText = "Confirm"
   export let showCancelButton = true
@@ -30,7 +30,11 @@
 </script>
 
 <div
-  class="spectrum-Dialog spectrum-Dialog--{size}"
+  class="spectrum-Dialog"
+  class:spectrum-Dialog--small={size === "S"}
+  class:spectrum-Dialog--medium={size === "M"}
+  class:spectrum-Dialog--large={size === "L"}
+  class:spectrum-Dialog--extraLarge={size === "XL"}
   style="position: relative;"
   role="dialog"
   tabindex="-1"
@@ -76,6 +80,9 @@
 </div>
 
 <style>
+  .spectrum-Dialog--extraLarge {
+    width: 1000px;
+  }
   .content-grid {
     display: grid;
     position: relative;
diff --git a/packages/bbui/src/Stores/notifications.js b/packages/bbui/src/Stores/notifications.js
index 0f397f4dba..ce0c9921f0 100644
--- a/packages/bbui/src/Stores/notifications.js
+++ b/packages/bbui/src/Stores/notifications.js
@@ -7,7 +7,7 @@ export const createNotificationStore = () => {
   const _notifications = writable([], () => {
     return () => {
       // clear all the timers
-      timeoutIds.forEach((timeoutId) => {
+      timeoutIds.forEach(timeoutId => {
         clearTimeout(timeoutId)
       })
       _notifications.set([])
@@ -25,11 +25,11 @@ export const createNotificationStore = () => {
       return
     }
     let _id = id()
-    _notifications.update((state) => {
+    _notifications.update(state => {
       return [...state, { id: _id, type, message, icon }]
     })
     const timeoutId = setTimeout(() => {
-      _notifications.update((state) => {
+      _notifications.update(state => {
         return state.filter(({ id }) => id !== _id)
       })
     }, NOTIFICATION_TIMEOUT)
@@ -41,10 +41,10 @@ export const createNotificationStore = () => {
   return {
     subscribe,
     send,
-    info: (msg) => send(msg, "info", "Info"),
-    error: (msg) => send(msg, "error", "Alert"),
-    warning: (msg) => send(msg, "warning", "Alert"),
-    success: (msg) => send(msg, "success", "CheckmarkCircle"),
+    info: msg => send(msg, "info", "Info"),
+    error: msg => send(msg, "error", "Alert"),
+    warning: msg => send(msg, "warning", "Alert"),
+    success: msg => send(msg, "success", "CheckmarkCircle"),
     blockNotifications,
   }
 }
diff --git a/packages/bbui/src/Table/Table.svelte b/packages/bbui/src/Table/Table.svelte
index 9495d0754f..4d93b53b8a 100644
--- a/packages/bbui/src/Table/Table.svelte
+++ b/packages/bbui/src/Table/Table.svelte
@@ -31,6 +31,7 @@
   // Table state
   let height = 0
   let loaded = false
+  $: schema = fixSchema(schema)
   $: if (!loading) loaded = true
   $: rows = data ?? []
   $: visibleRowCount = getVisibleRowCount(loaded, height, rows.length, rowCount)
@@ -50,7 +51,7 @@
     rows.length
   )
 
-  // Reset state when data chanegs
+  // Reset state when data changes
   $: data.length, reset()
   const reset = () => {
     nextScrollTop = 0
@@ -59,6 +60,24 @@
     timeout = null
   }
 
+  const fixSchema = schema => {
+    let fixedSchema = {}
+    Object.entries(schema || {}).forEach(([fieldName, fieldSchema]) => {
+      if (typeof fieldSchema === "string") {
+        fixedSchema[fieldName] = {
+          type: fieldSchema,
+          name: fieldName,
+        }
+      } else {
+        fixedSchema[fieldName] = {
+          ...fieldSchema,
+          name: fieldName,
+        }
+      }
+    })
+    return fixedSchema
+  }
+
   const getVisibleRowCount = (loaded, height, allRows, rowCount) => {
     if (!loaded) {
       return rowCount || 0
@@ -118,7 +137,6 @@
       if (!field || !fieldSchema) {
         return
       }
-      schema[field].name = field
       if (!fieldSchema?.autocolumn) {
         columns.push(fieldSchema)
       } else if (showAutoColumns) {
@@ -239,7 +257,11 @@
                         <svg
                           class="spectrum-Icon spectrum-Table-editIcon"
                           focusable="false"
+<<<<<<< HEAD
                           on:click={(e) => editColumn(e, field)}
+=======
+                          on:click={e => editColumn(e, field)}
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
                         >
                           <use xlink:href="#spectrum-icon-18-Edit" />
                         </svg>
diff --git a/packages/builder/cypress/support/commands.js b/packages/builder/cypress/support/commands.js
index 57a5fe16de..4f759a60ea 100644
--- a/packages/builder/cypress/support/commands.js
+++ b/packages/builder/cypress/support/commands.js
@@ -6,7 +6,7 @@
 //
 
 Cypress.Commands.add("login", () => {
-  cy.getCookie("budibase:auth").then((cookie) => {
+  cy.getCookie("budibase:auth").then(cookie => {
     // Already logged in
     if (cookie) return
 
@@ -20,13 +20,13 @@ Cypress.Commands.add("login", () => {
   })
 })
 
-Cypress.Commands.add("createApp", (name) => {
+Cypress.Commands.add("createApp", name => {
   cy.visit(`localhost:${Cypress.env("PORT")}/builder`)
   // wait for init API calls on visit
   cy.wait(100)
   cy.contains("Create New Web App").click()
   cy.get("body")
-    .then(($body) => {
+    .then($body => {
       if ($body.find("input[name=apiKey]").length) {
         // input was found, do something else here
         cy.get("input[name=apiKey]").type(name).should("have.value", name)
@@ -50,9 +50,9 @@ Cypress.Commands.add("createApp", (name) => {
     })
 })
 
-Cypress.Commands.add("deleteApp", (name) => {
+Cypress.Commands.add("deleteApp", name => {
   cy.visit(`localhost:${Cypress.env("PORT")}/builder`)
-  cy.get(".apps").then(($apps) => {
+  cy.get(".apps").then($apps => {
     cy.wait(1000)
     if ($apps.find(`[data-cy="app-${name}"]`).length) {
       cy.get(`[data-cy="app-${name}"]`).contains("Open").click()
@@ -78,7 +78,7 @@ Cypress.Commands.add("createTestTableWithData", () => {
   cy.addColumn("dog", "age", "Number")
 })
 
-Cypress.Commands.add("createTable", (tableName) => {
+Cypress.Commands.add("createTable", tableName => {
   // Enter table name
   cy.get("[data-cy=new-table]").click()
   cy.get(".spectrum-Modal").within(() => {
@@ -104,7 +104,7 @@ Cypress.Commands.add("addColumn", (tableName, columnName, type) => {
   })
 })
 
-Cypress.Commands.add("addRow", (values) => {
+Cypress.Commands.add("addRow", values => {
   cy.contains("Create row").click()
   cy.get(".spectrum-Modal").within(() => {
     for (let i = 0; i < values.length; i++) {
@@ -134,7 +134,7 @@ Cypress.Commands.add("addComponent", (category, component) => {
   }
   cy.get(`[data-cy="component-${component}"]`).click()
   cy.wait(1000)
-  cy.location().then((loc) => {
+  cy.location().then(loc => {
     const params = loc.pathname.split("/")
     const componentId = params[params.length - 1]
     cy.getComponent(componentId).should("exist")
@@ -142,7 +142,7 @@ Cypress.Commands.add("addComponent", (category, component) => {
   })
 })
 
-Cypress.Commands.add("getComponent", (componentId) => {
+Cypress.Commands.add("getComponent", componentId => {
   return cy
     .get("iframe")
     .its("0.contentDocument")
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 12a4664823..4b9522aab0 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -106,7 +106,7 @@
     "rollup": "^2.44.0",
     "rollup-plugin-copy": "^3.4.0",
     "start-server-and-test": "^1.12.1",
-    "svelte": "^3.36.0",
+    "svelte": "^3.37.0",
     "svelte-jester": "^1.3.2",
     "vite": "^2.1.5"
   },
diff --git a/packages/builder/src/analytics.js b/packages/builder/src/analytics.js
index f801eb84db..e6a647a08b 100644
--- a/packages/builder/src/analytics.js
+++ b/packages/builder/src/analytics.js
@@ -32,7 +32,7 @@ function identify(id) {
   if (!analyticsEnabled || !id) return
   if (posthogConfigured) posthog.identify(id)
   if (sentryConfigured)
-    Sentry.configureScope((scope) => {
+    Sentry.configureScope(scope => {
       scope.setUser({ id: id })
     })
 }
@@ -73,7 +73,7 @@ if (!localStorage.getItem(APP_FIRST_STARTED_KEY)) {
   localStorage.setItem(APP_FIRST_STARTED_KEY, Date.now())
 }
 
-const isFeedbackTimeElapsed = (sinceDateStr) => {
+const isFeedbackTimeElapsed = sinceDateStr => {
   const sinceDate = parseFloat(sinceDateStr)
   const feedbackMilliseconds = feedbackHours * 60 * 60 * 1000
   return Date.now() > sinceDate + feedbackMilliseconds
@@ -107,7 +107,7 @@ function highlightFeedbackIcon() {
 }
 
 // Opt In/Out
-const ifAnalyticsEnabled = (func) => () => {
+const ifAnalyticsEnabled = func => () => {
   if (analyticsEnabled && process.env.POSTHOG_TOKEN) {
     return func()
   }
diff --git a/packages/builder/src/builderStore/api.js b/packages/builder/src/builderStore/api.js
index a9244bfa6a..2e683238bc 100644
--- a/packages/builder/src/builderStore/api.js
+++ b/packages/builder/src/builderStore/api.js
@@ -2,7 +2,7 @@ import { store } from "./index"
 import { get as svelteGet } from "svelte/store"
 import { removeCookie, Cookies } from "./cookies"
 
-const apiCall = (method) => async (
+const apiCall = method => async (
   url,
   body,
   headers = { "Content-Type": "application/json" }
diff --git a/packages/builder/src/builderStore/cookies.js b/packages/builder/src/builderStore/cookies.js
index 2966087524..a84f1a4f20 100644
--- a/packages/builder/src/builderStore/cookies.js
+++ b/packages/builder/src/builderStore/cookies.js
@@ -4,7 +4,7 @@ export const Cookies = {
 }
 
 export function getCookie(cookieName) {
-  return document.cookie.split(";").some((cookie) => {
+  return document.cookie.split(";").some(cookie => {
     return cookie.trim().startsWith(`${cookieName}=`)
   })
 }
diff --git a/packages/builder/src/builderStore/dataBinding.js b/packages/builder/src/builderStore/dataBinding.js
index 633f56176e..0318ab0ee1 100644
--- a/packages/builder/src/builderStore/dataBinding.js
+++ b/packages/builder/src/builderStore/dataBinding.js
@@ -34,7 +34,7 @@ export const getDataProviderComponents = (asset, componentId) => {
   path.pop()
 
   // Filter by only data provider components
-  return path.filter((component) => {
+  return path.filter(component => {
     const def = store.actions.components.getDefinition(component._component)
     return def?.context != null
   })
@@ -54,7 +54,7 @@ export const getActionProviderComponents = (asset, componentId, actionType) => {
   path.pop()
 
   // Filter by only data provider components
-  return path.filter((component) => {
+  return path.filter(component => {
     const def = store.actions.components.getDefinition(component._component)
     return def?.actions?.includes(actionType)
   })
@@ -70,7 +70,7 @@ export const getDatasourceForProvider = (asset, component) => {
   }
 
   // If this component has a dataProvider setting, go up the stack and use it
-  const dataProviderSetting = def.settings.find((setting) => {
+  const dataProviderSetting = def.settings.find(setting => {
     return setting.type === "dataProvider"
   })
   if (dataProviderSetting) {
@@ -82,7 +82,7 @@ export const getDatasourceForProvider = (asset, component) => {
 
   // Extract datasource from component instance
   const validSettingTypes = ["dataSource", "table", "schema"]
-  const datasourceSetting = def.settings.find((setting) => {
+  const datasourceSetting = def.settings.find(setting => {
     return validSettingTypes.includes(setting.type)
   })
   if (!datasourceSetting) {
@@ -112,7 +112,7 @@ const getContextBindings = (asset, componentId) => {
   let bindings = []
 
   // Create bindings for each data provider
-  dataProviders.forEach((component) => {
+  dataProviders.forEach(component => {
     const def = store.actions.components.getDefinition(component._component)
     const contextDefinition = def.context
     let schema
@@ -127,7 +127,7 @@ const getContextBindings = (asset, componentId) => {
       // Static contexts are fully defined by the components
       schema = {}
       const values = contextDefinition.values || []
-      values.forEach((value) => {
+      values.forEach(value => {
         schema[value.key] = { name: value.label, type: "string" }
       })
     } else if (contextDefinition.type === "schema") {
@@ -148,7 +148,7 @@ const getContextBindings = (asset, componentId) => {
 
     // Create bindable properties for each schema field
     const safeComponentId = makePropSafe(component._id)
-    keys.forEach((key) => {
+    keys.forEach(key => {
       const fieldSchema = schema[key]
 
       // Make safe runtime binding and replace certain bindings with a
@@ -197,7 +197,7 @@ const getUserBindings = () => {
   })
   const keys = Object.keys(schema).sort()
   const safeUser = makePropSafe("user")
-  keys.forEach((key) => {
+  keys.forEach(key => {
     const fieldSchema = schema[key]
     // Replace certain bindings with a new property to help display components
     let runtimeBoundKey = key
@@ -224,17 +224,17 @@ const getUserBindings = () => {
 /**
  * Gets all bindable properties from URL parameters.
  */
-const getUrlBindings = (asset) => {
+const getUrlBindings = asset => {
   const url = asset?.routing?.route ?? ""
   const split = url.split("/")
   let params = []
-  split.forEach((part) => {
+  split.forEach(part => {
     if (part.startsWith(":") && part.length > 1) {
       params.push(part.replace(/:/g, "").replace(/\?/g, ""))
     }
   })
   const safeURL = makePropSafe("url")
-  return params.map((param) => ({
+  return params.map(param => ({
     type: "context",
     runtimeBinding: `${safeURL}.${makePropSafe(param)}`,
     readableBinding: `URL.${param}`,
@@ -250,10 +250,10 @@ export const getSchemaForDatasource = (datasource, isForm = false) => {
     const { type } = datasource
     if (type === "query") {
       const queries = get(queriesStores).list
-      table = queries.find((query) => query._id === datasource._id)
+      table = queries.find(query => query._id === datasource._id)
     } else {
       const tables = get(tablesStore).list
-      table = tables.find((table) => table._id === datasource.tableId)
+      table = tables.find(table => table._id === datasource.tableId)
     }
     if (table) {
       if (type === "view") {
@@ -261,7 +261,7 @@ export const getSchemaForDatasource = (datasource, isForm = false) => {
       } else if (type === "query" && isForm) {
         schema = {}
         const params = table.parameters || []
-        params.forEach((param) => {
+        params.forEach(param => {
           if (param?.name) {
             schema[param.name] = { ...param, type: "string" }
           }
@@ -277,14 +277,23 @@ export const getSchemaForDatasource = (datasource, isForm = false) => {
       schema["_rev"] = { type: "string" }
     }
 
-    // Ensure there are "name" properties for all fields
-    if (schema) {
-      Object.keys(schema).forEach((field) => {
-        if (!schema[field].name) {
-          schema[field].name = field
+    // Ensure there are "name" properties for all fields and that field schema
+    // are objects
+    let fixedSchema = {}
+    Object.entries(schema || {}).forEach(([fieldName, fieldSchema]) => {
+      if (typeof fieldSchema === "string") {
+        fixedSchema[fieldName] = {
+          type: fieldSchema,
+          name: fieldName,
         }
-      })
-    }
+      } else {
+        fixedSchema[fieldName] = {
+          ...fieldSchema,
+          name: fieldName,
+        }
+      }
+    })
+    schema = fixedSchema
   }
   return { schema, table }
 }
@@ -293,14 +302,14 @@ export const getSchemaForDatasource = (datasource, isForm = false) => {
  * Builds a form schema given a form component.
  * A form schema is a schema of all the fields nested anywhere within a form.
  */
-const buildFormSchema = (component) => {
+const buildFormSchema = component => {
   let schema = {}
   if (!component) {
     return schema
   }
   const def = store.actions.components.getDefinition(component._component)
   const fieldSetting = def?.settings?.find(
-    (setting) => setting.key === "field" && setting.type.startsWith("field/")
+    setting => setting.key === "field" && setting.type.startsWith("field/")
   )
   if (fieldSetting && component.field) {
     const type = fieldSetting.type.split("field/")[1]
@@ -308,7 +317,7 @@ const buildFormSchema = (component) => {
       schema[component.field] = { type }
     }
   }
-  component._children?.forEach((child) => {
+  component._children?.forEach(child => {
     const childSchema = buildFormSchema(child)
     schema = { ...schema, ...childSchema }
   })
@@ -339,7 +348,7 @@ function bindingReplacement(bindableProperties, textWithBindings, convertTo) {
     return textWithBindings
   }
   const convertFromProps = bindableProperties
-    .map((el) => el[convertFrom])
+    .map(el => el[convertFrom])
     .sort((a, b) => {
       return b.length - a.length
     })
@@ -349,9 +358,7 @@ function bindingReplacement(bindableProperties, textWithBindings, convertTo) {
     let newBoundValue = boundValue
     for (let from of convertFromProps) {
       if (newBoundValue.includes(from)) {
-        const binding = bindableProperties.find(
-          (el) => el[convertFrom] === from
-        )
+        const binding = bindableProperties.find(el => el[convertFrom] === from)
         newBoundValue = newBoundValue.replace(from, binding[convertTo])
       }
     }
diff --git a/packages/builder/src/builderStore/index.js b/packages/builder/src/builderStore/index.js
index e3ed25b92e..6fecda84c0 100644
--- a/packages/builder/src/builderStore/index.js
+++ b/packages/builder/src/builderStore/index.js
@@ -12,16 +12,12 @@ export const automationStore = getAutomationStore()
 export const themeStore = getThemeStore()
 export const hostingStore = getHostingStore()
 
-export const currentAsset = derived(store, ($store) => {
+export const currentAsset = derived(store, $store => {
   const type = $store.currentFrontEndType
   if (type === FrontendTypes.SCREEN) {
-    return $store.screens.find(
-      (screen) => screen._id === $store.selectedScreenId
-    )
+    return $store.screens.find(screen => screen._id === $store.selectedScreenId)
   } else if (type === FrontendTypes.LAYOUT) {
-    return $store.layouts.find(
-      (layout) => layout._id === $store.selectedLayoutId
-    )
+    return $store.layouts.find(layout => layout._id === $store.selectedLayoutId)
   }
   return null
 })
@@ -36,24 +32,24 @@ export const selectedComponent = derived(
   }
 )
 
-export const currentAssetId = derived(store, ($store) => {
+export const currentAssetId = derived(store, $store => {
   return $store.currentFrontEndType === FrontendTypes.SCREEN
     ? $store.selectedScreenId
     : $store.selectedLayoutId
 })
 
-export const currentAssetName = derived(currentAsset, ($currentAsset) => {
+export const currentAssetName = derived(currentAsset, $currentAsset => {
   return $currentAsset?.name
 })
 
 // leave this as before for consistency
-export const allScreens = derived(store, ($store) => {
+export const allScreens = derived(store, $store => {
   return $store.screens
 })
 
-export const mainLayout = derived(store, ($store) => {
+export const mainLayout = derived(store, $store => {
   return $store.layouts?.find(
-    (layout) => layout._id === LAYOUT_NAMES.MASTER.PRIVATE
+    layout => layout._id === LAYOUT_NAMES.MASTER.PRIVATE
   )
 })
 
diff --git a/packages/builder/src/builderStore/loadComponentLibraries.js b/packages/builder/src/builderStore/loadComponentLibraries.js
index be8ce41d24..8bdfcf7538 100644
--- a/packages/builder/src/builderStore/loadComponentLibraries.js
+++ b/packages/builder/src/builderStore/loadComponentLibraries.js
@@ -5,7 +5,7 @@ import { get } from "builderStore/api"
  * their props and other metadata from components.json.
  * @param {string} appId - ID of the currently running app
  */
-export const fetchComponentLibDefinitions = async (appId) => {
+export const fetchComponentLibDefinitions = async appId => {
   const LIB_DEFINITION_URL = `/api/${appId}/components/definitions`
   try {
     const libDefinitionResponse = await get(LIB_DEFINITION_URL)
diff --git a/packages/builder/src/builderStore/store/automation/Automation.js b/packages/builder/src/builderStore/store/automation/Automation.js
index 89f6c2f9af..a9dce88258 100644
--- a/packages/builder/src/builderStore/store/automation/Automation.js
+++ b/packages/builder/src/builderStore/store/automation/Automation.js
@@ -37,7 +37,7 @@ export default class Automation {
       return
     }
 
-    const stepIdx = steps.findIndex((step) => step.id === id)
+    const stepIdx = steps.findIndex(step => step.id === id)
     if (stepIdx < 0) throw new Error("Block not found.")
     steps.splice(stepIdx, 1, updatedBlock)
     this.automation.definition.steps = steps
@@ -51,7 +51,7 @@ export default class Automation {
       return
     }
 
-    const stepIdx = steps.findIndex((step) => step.id === id)
+    const stepIdx = steps.findIndex(step => step.id === id)
     if (stepIdx < 0) throw new Error("Block not found.")
     steps.splice(stepIdx, 1)
     this.automation.definition.steps = steps
diff --git a/packages/builder/src/builderStore/store/automation/index.js b/packages/builder/src/builderStore/store/automation/index.js
index 4b75f12abb..7a01bccfab 100644
--- a/packages/builder/src/builderStore/store/automation/index.js
+++ b/packages/builder/src/builderStore/store/automation/index.js
@@ -4,14 +4,14 @@ import Automation from "./Automation"
 import { cloneDeep } from "lodash/fp"
 import analytics from "analytics"
 
-const automationActions = (store) => ({
+const automationActions = store => ({
   fetch: async () => {
     const responses = await Promise.all([
       api.get(`/api/automations`),
       api.get(`/api/automations/definitions/list`),
     ])
-    const jsonResponses = await Promise.all(responses.map((x) => x.json()))
-    store.update((state) => {
+    const jsonResponses = await Promise.all(responses.map(x => x.json()))
+    store.update(state => {
       let selected = state.selectedAutomation?.automation
       state.automations = jsonResponses[0]
       state.blockDefinitions = {
@@ -22,7 +22,7 @@ const automationActions = (store) => ({
       // if previously selected find the new obj and select it
       if (selected) {
         selected = jsonResponses[0].filter(
-          (automation) => automation._id === selected._id
+          automation => automation._id === selected._id
         )
         state.selectedAutomation = new Automation(selected[0])
       }
@@ -40,7 +40,7 @@ const automationActions = (store) => ({
     const CREATE_AUTOMATION_URL = `/api/automations`
     const response = await api.post(CREATE_AUTOMATION_URL, automation)
     const json = await response.json()
-    store.update((state) => {
+    store.update(state => {
       state.automations = [...state.automations, json.automation]
       store.actions.select(json.automation)
       return state
@@ -50,9 +50,9 @@ const automationActions = (store) => ({
     const UPDATE_AUTOMATION_URL = `/api/automations`
     const response = await api.put(UPDATE_AUTOMATION_URL, automation)
     const json = await response.json()
-    store.update((state) => {
+    store.update(state => {
       const existingIdx = state.automations.findIndex(
-        (existing) => existing._id === automation._id
+        existing => existing._id === automation._id
       )
       state.automations.splice(existingIdx, 1, json.automation)
       state.automations = state.automations
@@ -65,9 +65,9 @@ const automationActions = (store) => ({
     const DELETE_AUTOMATION_URL = `/api/automations/${_id}/${_rev}`
     await api.delete(DELETE_AUTOMATION_URL)
 
-    store.update((state) => {
+    store.update(state => {
       const existingIdx = state.automations.findIndex(
-        (existing) => existing._id === _id
+        existing => existing._id === _id
       )
       state.automations.splice(existingIdx, 1)
       state.automations = state.automations
@@ -81,15 +81,15 @@ const automationActions = (store) => ({
     const TRIGGER_AUTOMATION_URL = `/api/automations/${_id}/trigger`
     return await api.post(TRIGGER_AUTOMATION_URL)
   },
-  select: (automation) => {
-    store.update((state) => {
+  select: automation => {
+    store.update(state => {
       state.selectedAutomation = new Automation(cloneDeep(automation))
       state.selectedBlock = null
       return state
     })
   },
-  addBlockToAutomation: (block) => {
-    store.update((state) => {
+  addBlockToAutomation: block => {
+    store.update(state => {
       const newBlock = state.selectedAutomation.addBlock(cloneDeep(block))
       state.selectedBlock = newBlock
       return state
@@ -98,10 +98,10 @@ const automationActions = (store) => ({
       name: block.name,
     })
   },
-  deleteAutomationBlock: (block) => {
-    store.update((state) => {
+  deleteAutomationBlock: block => {
+    store.update(state => {
       const idx = state.selectedAutomation.automation.definition.steps.findIndex(
-        (x) => x.id === block.id
+        x => x.id === block.id
       )
       state.selectedAutomation.deleteBlock(block.id)
 
diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js
index 92a1a3015b..be553066b9 100644
--- a/packages/builder/src/builderStore/store/frontend.js
+++ b/packages/builder/src/builderStore/store/frontend.js
@@ -49,10 +49,10 @@ export const getFrontendStore = () => {
   const store = writable({ ...INITIAL_FRONTEND_STATE })
 
   store.actions = {
-    initialise: async (pkg) => {
+    initialise: async pkg => {
       const { layouts, screens, application, clientLibPath } = pkg
       const components = await fetchComponentLibDefinitions(application._id)
-      store.update((state) => ({
+      store.update(state => ({
         ...state,
         libraries: application.componentLibraries,
         components,
@@ -70,7 +70,7 @@ export const getFrontendStore = () => {
 
       // Initialise backend stores
       const [_integrations] = await Promise.all([
-        api.get("/api/integrations").then((r) => r.json()),
+        api.get("/api/integrations").then(r => r.json()),
       ])
       datasources.init()
       integrations.set(_integrations)
@@ -82,18 +82,18 @@ export const getFrontendStore = () => {
       fetch: async () => {
         const response = await api.get("/api/routing")
         const json = await response.json()
-        store.update((state) => {
+        store.update(state => {
           state.routes = json.routes
           return state
         })
       },
     },
     screens: {
-      select: (screenId) => {
-        store.update((state) => {
+      select: screenId => {
+        store.update(state => {
           let screens = get(allScreens)
           let screen =
-            screens.find((screen) => screen._id === screenId) || screens[0]
+            screens.find(screen => screen._id === screenId) || screens[0]
           if (!screen) return state
 
           // Update role to the screen's role setting so that it will always
@@ -107,9 +107,9 @@ export const getFrontendStore = () => {
           return state
         })
       },
-      create: async (screen) => {
+      create: async screen => {
         screen = await store.actions.screens.save(screen)
-        store.update((state) => {
+        store.update(state => {
           state.selectedScreenId = screen._id
           state.selectedComponentId = screen.props._id
           state.currentFrontEndType = FrontendTypes.SCREEN
@@ -118,15 +118,15 @@ export const getFrontendStore = () => {
         })
         return screen
       },
-      save: async (screen) => {
+      save: async screen => {
         const creatingNewScreen = screen._id === undefined
         const response = await api.post(`/api/screens`, screen)
         screen = await response.json()
         await store.actions.routing.fetch()
 
-        store.update((state) => {
+        store.update(state => {
           const foundScreen = state.screens.findIndex(
-            (el) => el._id === screen._id
+            el => el._id === screen._id
           )
           if (foundScreen !== -1) {
             state.screens.splice(foundScreen, 1)
@@ -141,14 +141,14 @@ export const getFrontendStore = () => {
 
         return screen
       },
-      delete: async (screens) => {
+      delete: async screens => {
         const screensToDelete = Array.isArray(screens) ? screens : [screens]
 
         const screenDeletePromises = []
-        store.update((state) => {
+        store.update(state => {
           for (let screenToDelete of screensToDelete) {
             state.screens = state.screens.filter(
-              (screen) => screen._id !== screenToDelete._id
+              screen => screen._id !== screenToDelete._id
             )
             screenDeletePromises.push(
               api.delete(
@@ -177,8 +177,8 @@ export const getFrontendStore = () => {
       },
     },
     layouts: {
-      select: (layoutId) => {
-        store.update((state) => {
+      select: layoutId => {
+        store.update(state => {
           const layout =
             store.actions.layouts.find(layoutId) || get(store).layouts[0]
           if (!layout) return
@@ -189,15 +189,15 @@ export const getFrontendStore = () => {
           return state
         })
       },
-      save: async (layout) => {
+      save: async layout => {
         const layoutToSave = cloneDeep(layout)
         const creatingNewLayout = layoutToSave._id === undefined
         const response = await api.post(`/api/layouts`, layoutToSave)
         const savedLayout = await response.json()
 
-        store.update((state) => {
+        store.update(state => {
           const layoutIdx = state.layouts.findIndex(
-            (stateLayout) => stateLayout._id === savedLayout._id
+            stateLayout => stateLayout._id === savedLayout._id
           )
           if (layoutIdx >= 0) {
             // update existing layout
@@ -216,14 +216,14 @@ export const getFrontendStore = () => {
 
         return savedLayout
       },
-      find: (layoutId) => {
+      find: layoutId => {
         if (!layoutId) {
           return get(mainLayout)
         }
         const storeContents = get(store)
-        return storeContents.layouts.find((layout) => layout._id === layoutId)
+        return storeContents.layouts.find(layout => layout._id === layoutId)
       },
-      delete: async (layoutToDelete) => {
+      delete: async layoutToDelete => {
         const response = await api.delete(
           `/api/layouts/${layoutToDelete._id}/${layoutToDelete._rev}`
         )
@@ -231,9 +231,9 @@ export const getFrontendStore = () => {
           const json = await response.json()
           throw new Error(json.message)
         }
-        store.update((state) => {
+        store.update(state => {
           state.layouts = state.layouts.filter(
-            (layout) => layout._id !== layoutToDelete._id
+            layout => layout._id !== layoutToDelete._id
           )
           if (layoutToDelete._id === state.selectedLayoutId) {
             state.selectedLayoutId = get(mainLayout)._id
@@ -243,7 +243,7 @@ export const getFrontendStore = () => {
       },
     },
     components: {
-      select: (component) => {
+      select: component => {
         if (!component) {
           return
         }
@@ -263,13 +263,13 @@ export const getFrontendStore = () => {
         }
 
         // Otherwise select the component
-        store.update((state) => {
+        store.update(state => {
           state.selectedComponentId = component._id
           state.currentView = "component"
           return state
         })
       },
-      getDefinition: (componentName) => {
+      getDefinition: componentName => {
         if (!componentName) {
           return null
         }
@@ -287,7 +287,7 @@ export const getFrontendStore = () => {
         // Generate default props
         let props = { ...presetProps }
         if (definition.settings) {
-          definition.settings.forEach((setting) => {
+          definition.settings.forEach(setting => {
             if (setting.defaultValue !== undefined) {
               props[setting.key] = setting.defaultValue
             }
@@ -367,7 +367,7 @@ export const getFrontendStore = () => {
 
         // Save components and update UI
         await store.actions.preview.saveSelected()
-        store.update((state) => {
+        store.update(state => {
           state.currentView = "component"
           state.selectedComponentId = componentInstance._id
           return state
@@ -380,7 +380,7 @@ export const getFrontendStore = () => {
 
         return componentInstance
       },
-      delete: async (component) => {
+      delete: async component => {
         if (!component) {
           return
         }
@@ -391,7 +391,7 @@ export const getFrontendStore = () => {
         const parent = findComponentParent(asset.props, component._id)
         if (parent) {
           parent._children = parent._children.filter(
-            (child) => child._id !== component._id
+            child => child._id !== component._id
           )
           store.actions.components.select(parent)
         }
@@ -404,7 +404,7 @@ export const getFrontendStore = () => {
         }
 
         // Update store with copied component
-        store.update((state) => {
+        store.update(state => {
           state.componentToPaste = cloneDeep(component)
           state.componentToPaste.isCut = cut
           return state
@@ -415,7 +415,7 @@ export const getFrontendStore = () => {
           const parent = findComponentParent(selectedAsset.props, component._id)
           if (parent) {
             parent._children = parent._children.filter(
-              (child) => child._id !== component._id
+              child => child._id !== component._id
             )
             store.actions.components.select(parent)
           }
@@ -423,7 +423,7 @@ export const getFrontendStore = () => {
       },
       paste: async (targetComponent, mode) => {
         let promises = []
-        store.update((state) => {
+        store.update(state => {
           // Stop if we have nothing to paste
           if (!state.componentToPaste) {
             return state
@@ -444,7 +444,7 @@ export const getFrontendStore = () => {
           if (cut) {
             state.componentToPaste = null
           } else {
-            const randomizeIds = (component) => {
+            const randomizeIds = component => {
               if (!component) {
                 return
               }
@@ -497,7 +497,7 @@ export const getFrontendStore = () => {
         }
         await store.actions.preview.saveSelected()
       },
-      updateCustomStyle: async (style) => {
+      updateCustomStyle: async style => {
         const selected = get(selectedComponent)
         selected._styles.custom = style
         await store.actions.preview.saveSelected()
@@ -507,7 +507,7 @@ export const getFrontendStore = () => {
         selected._styles = { normal: {}, hover: {}, active: {} }
         await store.actions.preview.saveSelected()
       },
-      updateTransition: async (transition) => {
+      updateTransition: async transition => {
         const selected = get(selectedComponent)
         if (transition == null || transition === "") {
           selected._transition = ""
@@ -522,7 +522,7 @@ export const getFrontendStore = () => {
           return
         }
         component[name] = value
-        store.update((state) => {
+        store.update(state => {
           state.selectedComponentId = component._id
           return state
         })
diff --git a/packages/builder/src/builderStore/store/hosting.js b/packages/builder/src/builderStore/store/hosting.js
index d2112df862..f180d4157a 100644
--- a/packages/builder/src/builderStore/store/hosting.js
+++ b/packages/builder/src/builderStore/store/hosting.js
@@ -17,20 +17,18 @@ export const getHostingStore = () => {
         api.get("/api/hosting/"),
         api.get("/api/hosting/urls"),
       ])
-      const [info, urls] = await Promise.all(
-        responses.map((resp) => resp.json())
-      )
-      store.update((state) => {
+      const [info, urls] = await Promise.all(responses.map(resp => resp.json()))
+      store.update(state => {
         state.hostingInfo = info
         state.appUrl = urls.app
         return state
       })
       return info
     },
-    save: async (hostingInfo) => {
+    save: async hostingInfo => {
       const response = await api.post("/api/hosting", hostingInfo)
       const revision = (await response.json()).rev
-      store.update((state) => {
+      store.update(state => {
         state.hostingInfo = {
           ...hostingInfo,
           _rev: revision,
@@ -40,12 +38,10 @@ export const getHostingStore = () => {
     },
     fetchDeployedApps: async () => {
       let deployments = await (await get("/api/hosting/apps")).json()
-      store.update((state) => {
+      store.update(state => {
         state.deployedApps = deployments
-        state.deployedAppNames = Object.values(deployments).map(
-          (app) => app.name
-        )
-        state.deployedAppUrls = Object.values(deployments).map((app) => app.url)
+        state.deployedAppNames = Object.values(deployments).map(app => app.name)
+        state.deployedAppUrls = Object.values(deployments).map(app => app.url)
         return state
       })
       return deployments
diff --git a/packages/builder/src/builderStore/store/localStorage.js b/packages/builder/src/builderStore/store/localStorage.js
index a09031498e..aaf10460b6 100644
--- a/packages/builder/src/builderStore/store/localStorage.js
+++ b/packages/builder/src/builderStore/store/localStorage.js
@@ -12,13 +12,13 @@ export const localStorageStore = (localStorageKey, initialValue) => {
   })
 
   // New store setter which updates the store and localstorage
-  const set = (value) => {
+  const set = value => {
     store.set(value)
     localStorage.setItem(localStorageKey, JSON.stringify(value))
   }
 
   // New store updater which updates the store and localstorage
-  const update = (updaterFn) => set(updaterFn(get(store)))
+  const update = updaterFn => set(updaterFn(get(store)))
 
   // Hydrates the store from localstorage
   const hydrate = () => {
diff --git a/packages/builder/src/builderStore/store/notifications.js b/packages/builder/src/builderStore/store/notifications.js
index 933e4a1d12..85e708e92a 100644
--- a/packages/builder/src/builderStore/store/notifications.js
+++ b/packages/builder/src/builderStore/store/notifications.js
@@ -6,7 +6,7 @@ export const notificationStore = writable({
 })
 
 export function send(message, type = "default") {
-  notificationStore.update((state) => {
+  notificationStore.update(state => {
     state.notifications = [
       ...state.notifications,
       { id: generate(), type, message },
@@ -16,8 +16,8 @@ export function send(message, type = "default") {
 }
 
 export const notifier = {
-  danger: (msg) => send(msg, "danger"),
-  warning: (msg) => send(msg, "warning"),
-  info: (msg) => send(msg, "info"),
-  success: (msg) => send(msg, "success"),
+  danger: msg => send(msg, "danger"),
+  warning: msg => send(msg, "warning"),
+  info: msg => send(msg, "info"),
+  success: msg => send(msg, "success"),
 }
diff --git a/packages/builder/src/builderStore/store/screenTemplates/index.js b/packages/builder/src/builderStore/store/screenTemplates/index.js
index 217426f489..38ae434753 100644
--- a/packages/builder/src/builderStore/store/screenTemplates/index.js
+++ b/packages/builder/src/builderStore/store/screenTemplates/index.js
@@ -3,7 +3,7 @@ import rowDetailScreen from "./rowDetailScreen"
 import rowListScreen from "./rowListScreen"
 import createFromScratchScreen from "./createFromScratchScreen"
 
-const allTemplates = (tables) => [
+const allTemplates = tables => [
   ...newRowScreen(tables),
   ...rowDetailScreen(tables),
   ...rowListScreen(tables),
@@ -18,7 +18,7 @@ const createTemplateOverride = (frontendState, create) => () => {
 }
 
 export default (frontendState, tables) => {
-  const enrichTemplate = (template) => ({
+  const enrichTemplate = template => ({
     ...template,
     create: createTemplateOverride(frontendState, template.create),
   })
diff --git a/packages/builder/src/builderStore/store/screenTemplates/newRowScreen.js b/packages/builder/src/builderStore/store/screenTemplates/newRowScreen.js
index 1599a07725..be399b4bb8 100644
--- a/packages/builder/src/builderStore/store/screenTemplates/newRowScreen.js
+++ b/packages/builder/src/builderStore/store/screenTemplates/newRowScreen.js
@@ -10,7 +10,7 @@ import {
 } from "./utils/commonComponents"
 
 export default function (tables) {
-  return tables.map((table) => {
+  return tables.map(table => {
     return {
       name: `${table.name} - New`,
       create: () => createScreen(table),
@@ -19,14 +19,14 @@ export default function (tables) {
   })
 }
 
-export const newRowUrl = (table) => sanitizeUrl(`/${table.name}/new/row`)
+export const newRowUrl = table => sanitizeUrl(`/${table.name}/new/row`)
 export const NEW_ROW_TEMPLATE = "NEW_ROW_TEMPLATE"
 
 function generateTitleContainer(table, formId) {
   return makeTitleContainer("New Row").addChild(makeSaveButton(table, formId))
 }
 
-const createScreen = (table) => {
+const createScreen = table => {
   const screen = new Screen()
     .component("@budibase/standard-components/container")
     .instanceName(`${table.name} - New`)
@@ -52,7 +52,7 @@ const createScreen = (table) => {
 
   // Add all form fields from this schema to the field group
   const datasource = { type: "table", tableId: table._id }
-  makeDatasourceFormComponents(datasource).forEach((component) => {
+  makeDatasourceFormComponents(datasource).forEach(component => {
     fieldGroup.addChild(component)
   })
 
diff --git a/packages/builder/src/builderStore/store/screenTemplates/rowDetailScreen.js b/packages/builder/src/builderStore/store/screenTemplates/rowDetailScreen.js
index 02889fa537..16480b199e 100644
--- a/packages/builder/src/builderStore/store/screenTemplates/rowDetailScreen.js
+++ b/packages/builder/src/builderStore/store/screenTemplates/rowDetailScreen.js
@@ -13,7 +13,7 @@ import {
 } from "./utils/commonComponents"
 
 export default function (tables) {
-  return tables.map((table) => {
+  return tables.map(table => {
     return {
       name: `${table.name} - Detail`,
       create: () => createScreen(table),
@@ -23,7 +23,7 @@ export default function (tables) {
 }
 
 export const ROW_DETAIL_TEMPLATE = "ROW_DETAIL_TEMPLATE"
-export const rowDetailUrl = (table) => sanitizeUrl(`/${table.name}/:id`)
+export const rowDetailUrl = table => sanitizeUrl(`/${table.name}/:id`)
 
 function generateTitleContainer(table, title, formId, repeaterId) {
   // have to override style for this, its missing margin
@@ -80,7 +80,7 @@ function generateTitleContainer(table, title, formId, repeaterId) {
   return makeTitleContainer(title).addChild(deleteButton).addChild(saveButton)
 }
 
-const createScreen = (table) => {
+const createScreen = table => {
   const provider = new Component("@budibase/standard-components/dataprovider")
     .instanceName(`Data Provider`)
     .customProps({
@@ -122,7 +122,7 @@ const createScreen = (table) => {
 
   // Add all form fields from this schema to the field group
   const datasource = { type: "table", tableId: table._id }
-  makeDatasourceFormComponents(datasource).forEach((component) => {
+  makeDatasourceFormComponents(datasource).forEach(component => {
     fieldGroup.addChild(component)
   })
 
diff --git a/packages/builder/src/builderStore/store/screenTemplates/rowListScreen.js b/packages/builder/src/builderStore/store/screenTemplates/rowListScreen.js
index 390edfb143..37f1a8f04a 100644
--- a/packages/builder/src/builderStore/store/screenTemplates/rowListScreen.js
+++ b/packages/builder/src/builderStore/store/screenTemplates/rowListScreen.js
@@ -5,7 +5,7 @@ import { Component } from "./utils/Component"
 import { makePropSafe } from "@budibase/string-templates"
 
 export default function (tables) {
-  return tables.map((table) => {
+  return tables.map(table => {
     return {
       name: `${table.name} - List`,
       create: () => createScreen(table),
@@ -15,7 +15,7 @@ export default function (tables) {
 }
 
 export const ROW_LIST_TEMPLATE = "ROW_LIST_TEMPLATE"
-export const rowListUrl = (table) => sanitizeUrl(`/${table.name}`)
+export const rowListUrl = table => sanitizeUrl(`/${table.name}`)
 
 function generateTitleContainer(table) {
   const newButton = new Component("@budibase/standard-components/button")
@@ -70,7 +70,7 @@ function generateTitleContainer(table) {
     .addChild(newButton)
 }
 
-const createScreen = (table) => {
+const createScreen = table => {
   const provider = new Component("@budibase/standard-components/dataprovider")
     .instanceName(`Data Provider`)
     .customProps({
diff --git a/packages/builder/src/builderStore/store/screenTemplates/utils/commonComponents.js b/packages/builder/src/builderStore/store/screenTemplates/utils/commonComponents.js
index 18a777e509..19f950226c 100644
--- a/packages/builder/src/builderStore/store/screenTemplates/utils/commonComponents.js
+++ b/packages/builder/src/builderStore/store/screenTemplates/utils/commonComponents.js
@@ -178,7 +178,7 @@ export function makeDatasourceFormComponents(datasource) {
   const { schema } = getSchemaForDatasource(datasource, true)
   let components = []
   let fields = Object.keys(schema || {})
-  fields.forEach((field) => {
+  fields.forEach(field => {
     const fieldSchema = schema[field]
     // skip autocolumns
     if (fieldSchema.autocolumn) {
diff --git a/packages/builder/src/builderStore/store/screenTemplates/utils/sanitizeUrl.js b/packages/builder/src/builderStore/store/screenTemplates/utils/sanitizeUrl.js
index 96e6b9df5d..16224a45bc 100644
--- a/packages/builder/src/builderStore/store/screenTemplates/utils/sanitizeUrl.js
+++ b/packages/builder/src/builderStore/store/screenTemplates/utils/sanitizeUrl.js
@@ -1,7 +1,7 @@
 export default function (url) {
   return url
     .split("/")
-    .map((part) => {
+    .map(part => {
       // if parameter, then use as is
       if (part.startsWith(":")) return part
       return encodeURIComponent(part.replace(/ /g, "-"))
diff --git a/packages/builder/src/builderStore/store/theme.js b/packages/builder/src/builderStore/store/theme.js
index 2c3ccd857c..fd6b05df59 100644
--- a/packages/builder/src/builderStore/store/theme.js
+++ b/packages/builder/src/builderStore/store/theme.js
@@ -9,14 +9,14 @@ export const getThemeStore = () => {
   const store = localStorageStore("bb-theme", initialValue)
 
   // Update theme class when store changes
-  store.subscribe((state) => {
+  store.subscribe(state => {
     // Handle any old local storage values - this can be removed after the update
     if (state.darkMode !== undefined) {
       store.set(initialValue)
       return
     }
 
-    state.options.forEach((option) => {
+    state.options.forEach(option => {
       themeElement.classList.toggle(
         `spectrum--${option}`,
         option === state.theme
diff --git a/packages/builder/src/builderStore/storeUtils.js b/packages/builder/src/builderStore/storeUtils.js
index 2fd1dae8c1..6d0f0beab0 100644
--- a/packages/builder/src/builderStore/storeUtils.js
+++ b/packages/builder/src/builderStore/storeUtils.js
@@ -2,14 +2,14 @@
  * Recursively searches for a specific component ID
  */
 export const findComponent = (rootComponent, id) => {
-  return searchComponentTree(rootComponent, (comp) => comp._id === id)
+  return searchComponentTree(rootComponent, comp => comp._id === id)
 }
 
 /**
  * Recursively searches for a specific component type
  */
 export const findComponentType = (rootComponent, type) => {
-  return searchComponentTree(rootComponent, (comp) => comp._component === type)
+  return searchComponentTree(rootComponent, comp => comp._component === type)
 }
 
 /**
@@ -68,7 +68,7 @@ export const findAllMatchingComponents = (rootComponent, selector) => {
   }
   let components = []
   if (rootComponent._children) {
-    rootComponent._children.forEach((child) => {
+    rootComponent._children.forEach(child => {
       components = [
         ...components,
         ...findAllMatchingComponents(child, selector),
diff --git a/packages/builder/src/builderStore/uuid.js b/packages/builder/src/builderStore/uuid.js
index 9cddf638bc..149da83c68 100644
--- a/packages/builder/src/builderStore/uuid.js
+++ b/packages/builder/src/builderStore/uuid.js
@@ -1,7 +1,7 @@
 export function uuid() {
   // always want to make this start with a letter, as this makes it
   // easier to use with template string bindings in the client
-  return "cxxxxxxxxxxxx4xxxyxxxxxxxxxxxxxxx".replace(/[xy]/g, (c) => {
+  return "cxxxxxxxxxxxx4xxxyxxxxxxxxxxxxxxx".replace(/[xy]/g, c => {
     const r = (Math.random() * 16) | 0,
       v = c == "x" ? r : (r & 0x3) | 0x8
     return v.toString(16)
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
index e2251cf7de..4f8840c906 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
@@ -39,9 +39,13 @@
       {#if block.type === "TRIGGER"}Trigger{:else}Step {blockIdx + 1}{/if}
     </div>
     {#if block.type !== "TRIGGER" || allowDeleteTrigger}
+<<<<<<< HEAD
       <div on:click|stopPropagation={deleteStep}>
         <Icon name="Close" />
       </div>
+=======
+      <div on:click|stopPropagation={deleteStep}><Icon name="Close" /></div>
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
     {/if}
   </header>
   <hr />
diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBindingPanel.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBindingPanel.svelte
index 897c0469e4..0e26b15600 100644
--- a/packages/builder/src/components/automation/SetupPanel/AutomationBindingPanel.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/AutomationBindingPanel.svelte
@@ -60,7 +60,7 @@
       <div class="section">
         {#each categories as [categoryName, bindings]}
           <Heading size="XS">{categoryName}</Heading>
-          {#each bindableProperties.filter((binding) =>
+          {#each bindableProperties.filter(binding =>
             binding.label.match(searchRgx)
           ) as binding}
             <div class="binding" on:click={() => addToText(binding)}>
@@ -76,7 +76,7 @@
       </div>
       <div class="section">
         <Heading size="XS">Helpers</Heading>
-        {#each helpers.filter((helper) => helper.label.match(searchRgx) || helper.description.match(searchRgx)) as helper}
+        {#each helpers.filter(helper => helper.label.match(searchRgx) || helper.description.match(searchRgx)) as helper}
           <div class="binding" on:click={() => addToText(helper)}>
             <span class="binding__label">{helper.label}</span>
             <br />
diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
index b2fbd18a04..c524a4435e 100644
--- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
@@ -71,6 +71,7 @@
           panel={AutomationBindingPanel}
           type={"email"}
           value={block.inputs[key]}
+<<<<<<< HEAD
           on:change={(e) => (block.inputs[key] = e.detail)}
           {bindings}
         />
@@ -80,12 +81,20 @@
         <TableSelector bind:value={block.inputs[key]} />
       {:else if value.customType === "queryParams"}
         <QueryParamSelector bind:value={block.inputs[key]} {bindings} />
+=======
+          on:change={e => (block.inputs[key] = e.detail)}
+          {bindings}
+        />
+      {:else if value.customType === "table"}
+        <TableSelector bind:value={block.inputs[key]} />
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
       {:else if value.customType === "row"}
         <RowSelector bind:value={block.inputs[key]} {bindings} />
       {:else if value.customType === "webhookUrl"}
         <WebhookDisplay value={block.inputs[key]} />
       {:else if value.customType === "triggerSchema"}
         <SchemaSetup bind:value={block.inputs[key]} />
+<<<<<<< HEAD
       {:else if value.customType === "code"}
         <CodeEditorModal>
           <pre>{JSON.stringify(bindings, null, 2)}</pre>
@@ -102,12 +111,18 @@
             value={block.inputs[key]}
           />
         </CodeEditorModal>
+=======
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
       {:else if value.type === "string" || value.type === "number"}
         <DrawerBindableInput
           panel={AutomationBindingPanel}
           type={value.customType}
           value={block.inputs[key]}
+<<<<<<< HEAD
           on:change={(e) => (block.inputs[key] = e.detail)}
+=======
+          on:change={e => (block.inputs[key] = e.detail)}
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
           {bindings}
         />
       {/if}
diff --git a/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte b/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
index 23c293d102..f894aceb24 100644
--- a/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
@@ -22,8 +22,13 @@
 <Select
   bind:value={value.tableId}
   options={$tables.list}
+<<<<<<< HEAD
   getOptionLabel={(table) => table.name}
   getOptionValue={(table) => table._id}
+=======
+  getOptionLabel={table => table.name}
+  getOptionValue={table => table._id}
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
 />
 
 {#if schemaFields.length}
diff --git a/packages/builder/src/components/automation/SetupPanel/SchemaSetup.svelte b/packages/builder/src/components/automation/SetupPanel/SchemaSetup.svelte
index f2522d70c1..a9346b08b6 100644
--- a/packages/builder/src/components/automation/SetupPanel/SchemaSetup.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/SchemaSetup.svelte
@@ -66,7 +66,11 @@
       />
       <Select
         value={field.type}
+<<<<<<< HEAD
         on:change={(e) => (value[field.name] = e.target.value)}
+=======
+        on:change={e => (value[field.name] = e.target.value)}
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
         options={typeOptions}
       />
       <i
diff --git a/packages/builder/src/components/automation/SetupPanel/TableSelector.svelte b/packages/builder/src/components/automation/SetupPanel/TableSelector.svelte
index c0c80e8444..0004813912 100644
--- a/packages/builder/src/components/automation/SetupPanel/TableSelector.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/TableSelector.svelte
@@ -8,6 +8,11 @@
 <Select
   bind:value
   options={$tables.list}
+<<<<<<< HEAD
   getOptionLabel={(table) => table.name}
   getOptionValue={(table) => table._id}
+=======
+  getOptionLabel={table => table.name}
+  getOptionValue={table => table._id}
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
 />
diff --git a/packages/builder/src/components/backend/DataTable/Table.svelte b/packages/builder/src/components/backend/DataTable/Table.svelte
index 4273089d89..5c66a5b740 100644
--- a/packages/builder/src/components/backend/DataTable/Table.svelte
+++ b/packages/builder/src/components/backend/DataTable/Table.svelte
@@ -40,7 +40,7 @@
           component: RoleCell,
         },
       ]
-      UNEDITABLE_USER_FIELDS.forEach((field) => {
+      UNEDITABLE_USER_FIELDS.forEach(field => {
         if (schema[field]) {
           schema[field].editable = false
         }
@@ -68,19 +68,19 @@
       rows: selectedRows,
       type: "delete",
     })
-    data = data.filter((row) => !selectedRows.includes(row))
+    data = data.filter(row => !selectedRows.includes(row))
     notifications.success(`Successfully deleted ${selectedRows.length} rows`)
     selectedRows = []
   }
 
-  const editRow = (row) => {
+  const editRow = row => {
     editableRow = row
     if (row) {
       editRowModal.show()
     }
   }
 
-  const editColumn = (field) => {
+  const editColumn = field => {
     editableColumn = schema?.[field]
     if (editableColumn) {
       editColumnModal.show()
@@ -118,9 +118,9 @@
     allowEditRows={allowEditing}
     allowEditColumns={allowEditing}
     showAutoColumns={!hideAutocolumns}
-    on:editcolumn={(e) => editColumn(e.detail)}
-    on:editrow={(e) => editRow(e.detail)}
-    on:clickrelationship={(e) => selectRelationship(e.detail)}
+    on:editcolumn={e => editColumn(e.detail)}
+    on:editrow={e => editRow(e.detail)}
+    on:clickrelationship={e => selectRelationship(e.detail)}
   />
 {/key}
 
diff --git a/packages/builder/src/components/backend/DataTable/modals/CalculateModal.svelte b/packages/builder/src/components/backend/DataTable/modals/CalculateModal.svelte
index 91c783c4c7..c82596abb6 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CalculateModal.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CalculateModal.svelte
@@ -50,8 +50,13 @@
     <Select
       bind:value={view.calculation}
       options={CALCULATIONS}
+<<<<<<< HEAD
       getOptionLabel={(x) => x.name}
       getOptionValue={(x) => x.key}
+=======
+      getOptionLabel={x => x.name}
+      getOptionValue={x => x.key}
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
     />
     {#if view.calculation}
       <Label>Of</Label>
diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
index 01c24b5f11..af7948a0f6 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
@@ -197,8 +197,13 @@
       ...Object.values(fieldDefinitions),
       { name: "Auto Column", type: AUTO_COL },
     ]}
+<<<<<<< HEAD
     getOptionLabel={(field) => field.name}
     getOptionValue={(field) => field.type}
+=======
+    getOptionLabel={field => field.name}
+    getOptionValue={field => field.type}
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
   />
 
   {#if canBeRequired || canBeDisplay}
@@ -274,8 +279,13 @@
       label="Table"
       bind:value={field.tableId}
       options={tableOptions}
+<<<<<<< HEAD
       getOptionLabel={(table) => table.name}
       getOptionValue={(table) => table._id}
+=======
+      getOptionLabel={table => table.name}
+      getOptionValue={table => table._id}
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
     />
     {#if relationshipOptions && relationshipOptions.length > 0}
       <RadioGroup
@@ -283,8 +293,13 @@
         label="Define the relationship"
         bind:value={field.relationshipType}
         options={relationshipOptions}
+<<<<<<< HEAD
         getOptionLabel={(option) => option.name}
         getOptionValue={(option) => option.value}
+=======
+        getOptionLabel={option => option.name}
+        getOptionValue={option => option.value}
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
       />
     {/if}
     <Input label={`Column name in other table`} bind:value={field.fieldName} />
@@ -294,8 +309,13 @@
       value={field.subtype}
       on:change={(e) => (field.subtype = e.detail)}
       options={Object.entries(getAutoColumnInformation())}
+<<<<<<< HEAD
       getOptionLabel={(option) => option[1].name}
       getOptionValue={(option) => option[0]}
+=======
+      getOptionLabel={option => option[1].name}
+      getOptionValue={option => option[0]}
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
     />
   {/if}
 
diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte
index 330ee9326a..5cd95ecab5 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte
@@ -94,8 +94,13 @@
     data-cy="roleId-select"
     bind:value={row.roleId}
     options={$roles}
+<<<<<<< HEAD
     getOptionLabel={(role) => role.name}
     getOptionValue={(role) => role._id}
+=======
+    getOptionLabel={role => role.name}
+    getOptionValue={role => role._id}
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
   />
   <Select
     label="Status"
@@ -104,8 +109,13 @@
       { label: "Active", value: "active" },
       { label: "Inactive", value: "inactive" },
     ]}
+<<<<<<< HEAD
     getOptionLabel={(status) => status.label}
     getOptionValue={(status) => status.value}
+=======
+    getOptionLabel={status => status.label}
+    getOptionValue={status => status.value}
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
   />
   {#each customSchemaKeys as [key, meta]}
     {#if !meta.autocolumn}
diff --git a/packages/builder/src/components/backend/DataTable/modals/EditRoles.svelte b/packages/builder/src/components/backend/DataTable/modals/EditRoles.svelte
index c803c06373..6cfb922d76 100644
--- a/packages/builder/src/components/backend/DataTable/modals/EditRoles.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/EditRoles.svelte
@@ -98,8 +98,13 @@
     on:change={changeRole}
     options={$roles}
     placeholder="Create new role"
+<<<<<<< HEAD
     getOptionValue={(role) => role._id}
     getOptionLabel={(role) => role.name}
+=======
+    getOptionValue={role => role._id}
+    getOptionLabel={role => role.name}
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
   />
   {#if selectedRole}
     <Input
@@ -111,16 +116,26 @@
       label="Inherits Role"
       bind:value={selectedRole.inherits}
       options={otherRoles}
+<<<<<<< HEAD
       getOptionValue={(role) => role._id}
       getOptionLabel={(role) => role.name}
+=======
+      getOptionValue={role => role._id}
+      getOptionLabel={role => role.name}
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
       placeholder="None"
     />
     <Select
       label="Base Permissions"
       bind:value={selectedRole.permissionId}
       options={basePermissions}
+<<<<<<< HEAD
       getOptionValue={(x) => x._id}
       getOptionLabel={(x) => x.name}
+=======
+      getOptionValue={x => x._id}
+      getOptionLabel={x => x.name}
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
       placeholder="Choose permissions"
     />
   {/if}
diff --git a/packages/builder/src/components/backend/DataTable/modals/ExportModal.svelte b/packages/builder/src/components/backend/DataTable/modals/ExportModal.svelte
index 9f194c589a..0608d8e824 100644
--- a/packages/builder/src/components/backend/DataTable/modals/ExportModal.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/ExportModal.svelte
@@ -32,7 +32,12 @@
     bind:value={exportFormat}
     options={FORMATS}
     placeholder={null}
+<<<<<<< HEAD
     getOptionLabel={(x) => x.name}
     getOptionValue={(x) => x.key}
+=======
+    getOptionLabel={x => x.name}
+    getOptionValue={x => x.key}
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
   />
 </ModalContent>
diff --git a/packages/builder/src/components/backend/DataTable/modals/FilterModal.svelte b/packages/builder/src/components/backend/DataTable/modals/FilterModal.svelte
index f2dd629348..bec07d1bc1 100644
--- a/packages/builder/src/components/backend/DataTable/modals/FilterModal.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/FilterModal.svelte
@@ -102,7 +102,7 @@
     return viewTable.schema[field].type === "number"
   }
 
-  const fieldChanged = (filter) => (ev) => {
+  const fieldChanged = filter => ev => {
     // reset if type changed
     if (
       filter.key &&
@@ -113,16 +113,11 @@
     }
   }
 
-  const getOptionLabel = (x) => x.name
-  const getOptionValue = (x) => x.key
+  const getOptionLabel = x => x.name
+  const getOptionValue = x => x.key
 </script>
 
-<ModalContent
-  title="Filter"
-  confirmText="Save"
-  onConfirm={saveView}
-  size="large"
->
+<ModalContent title="Filter" confirmText="Save" onConfirm={saveView} size="L">
   {#if view.filters.length}
     <div class="input-group-row">
       {#each view.filters as filter, idx}
@@ -152,7 +147,7 @@
           <Select
             bind:value={filter.value}
             options={fieldOptions(filter.key)}
-            getOptionLabel={(x) => x.toString()}
+            getOptionLabel={x => x.toString()}
           />
         {:else if filter.key && isDate(filter.key)}
           <DatePicker
diff --git a/packages/builder/src/components/backend/DataTable/modals/ManageAccessModal.svelte b/packages/builder/src/components/backend/DataTable/modals/ManageAccessModal.svelte
index f7bc5b5089..14cb572ff1 100644
--- a/packages/builder/src/components/backend/DataTable/modals/ManageAccessModal.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/ManageAccessModal.svelte
@@ -38,10 +38,10 @@
       <Input value={capitalise(level)} disabled />
       <Select
         value={permissions[level]}
-        on:change={(e) => changePermission(level, e.detail)}
+        on:change={e => changePermission(level, e.detail)}
         options={$roles}
-        getOptionLabel={(x) => x.name}
-        getOptionValue={(x) => x._id}
+        getOptionLabel={x => x.name}
+        getOptionValue={x => x._id}
       />
     {/each}
   </div>
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
index cccc0f7259..87daad4c3a 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
@@ -44,7 +44,7 @@
         </div>
         <EditDatasourcePopover {datasource} />
       </NavItem>
-      {#each $queries.list.filter((query) => query.datasourceId === datasource._id) as query}
+      {#each $queries.list.filter(query => query.datasourceId === datasource._id) as query}
         <NavItem
           indentLevel={1}
           icon="SQLQuery"
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/modals/CreateDatasourceModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/modals/CreateDatasourceModal.svelte
index 1dc751d6b6..b787697802 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/modals/CreateDatasourceModal.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/modals/CreateDatasourceModal.svelte
@@ -43,7 +43,7 @@
 
 <ModalContent
   title="Create Datasource"
-  size="large"
+  size="L"
   confirmText="Create"
   onConfirm={saveDatasource}
   disabled={error || !name}
diff --git a/packages/builder/src/components/backend/TableNavigator/TableDataImport.svelte b/packages/builder/src/components/backend/TableNavigator/TableDataImport.svelte
index 9bec1f696d..b7f5a0e968 100644
--- a/packages/builder/src/components/backend/TableNavigator/TableDataImport.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/TableDataImport.svelte
@@ -128,8 +128,13 @@
           on:change={handleTypeChange(columnName)}
           options={typeOptions}
           placeholder={null}
+<<<<<<< HEAD
           getOptionLabel={(option) => option.label}
           getOptionValue={(option) => option.value}
+=======
+          getOptionLabel={option => option.label}
+          getOptionValue={option => option.value}
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
         />
         <span class="field-status" class:error={!schema[columnName].success}>
           {schema[columnName].success ? "Success" : "Failure"}
diff --git a/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte b/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte
index 0c88741d5e..2d419f18aa 100644
--- a/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte
@@ -24,11 +24,9 @@
 
   function showDeleteModal() {
     const screens = $allScreens
-    templateScreens = screens.filter(
-      (screen) => screen.autoTableId === table._id
-    )
+    templateScreens = screens.filter(screen => screen.autoTableId === table._id)
     willBeDeleted = ["All table data"].concat(
-      templateScreens.map((screen) => `Screen ${screen.props._instanceName}`)
+      templateScreens.map(screen => `Screen ${screen.props._instanceName}`)
     )
     confirmDeleteDialog.show()
   }
diff --git a/packages/builder/src/components/common/DrawerBindableInput.svelte b/packages/builder/src/components/common/DrawerBindableInput.svelte
index 6f55c5ef48..8a72e46b72 100644
--- a/packages/builder/src/components/common/DrawerBindableInput.svelte
+++ b/packages/builder/src/components/common/DrawerBindableInput.svelte
@@ -34,7 +34,8 @@
     {label}
     value={readableValue}
     on:change={event => onChange(event.detail)}
-    {placeholder} />
+    {placeholder}
+  />
   <div class="icon" on:click={bindingDrawer.show}>
     <Icon size="S" name="FlashOn" />
   </div>
@@ -45,12 +46,13 @@
   </svelte:fragment>
   <Button cta slot="buttons" on:click={handleClose}>Save</Button>
   <svelte:component
-    slot="body"
     this={panel}
+    slot="body"
     value={readableValue}
     close={handleClose}
     on:update={event => (tempValue = event.detail)}
-    bindableProperties={bindings} />
+    bindableProperties={bindings}
+  />
 </Drawer>
 
 <style>
diff --git a/packages/builder/src/components/common/LinkedRowSelector.svelte b/packages/builder/src/components/common/LinkedRowSelector.svelte
index c57210a33b..c0eacb0586 100644
--- a/packages/builder/src/components/common/LinkedRowSelector.svelte
+++ b/packages/builder/src/components/common/LinkedRowSelector.svelte
@@ -44,8 +44,13 @@
     value={linkedIds?.[0]}
     options={rows}
     getOptionLabel={getPrettyName}
+<<<<<<< HEAD
     getOptionValue={(row) => row._id}
     on:change={(e) => (linkedIds = e.detail ? [e.detail] : [])}
+=======
+    getOptionValue={row => row._id}
+    on:change={e => (linkedIds = e.detail ? [e.detail] : [])}
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
     {label}
   />
 {:else}
@@ -54,6 +59,10 @@
     {label}
     options={rows}
     getOptionLabel={getPrettyName}
+<<<<<<< HEAD
     getOptionValue={(row) => row._id}
+=======
+    getOptionValue={row => row._id}
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
   />
 {/if}
diff --git a/packages/builder/src/components/design/NavigationPanel/ComponentDropdownMenu.svelte b/packages/builder/src/components/design/NavigationPanel/ComponentDropdownMenu.svelte
index 3b77440115..7322be165f 100644
--- a/packages/builder/src/components/design/NavigationPanel/ComponentDropdownMenu.svelte
+++ b/packages/builder/src/components/design/NavigationPanel/ComponentDropdownMenu.svelte
@@ -24,7 +24,7 @@
     if (currentIndex === 0) {
       return
     }
-    const newChildren = parent._children.filter((c) => c !== component)
+    const newChildren = parent._children.filter(c => c !== component)
     newChildren.splice(currentIndex - 1, 0, component)
     parent._children = newChildren
     store.actions.preview.saveSelected()
@@ -40,7 +40,7 @@
     if (currentIndex === parent._children.length - 1) {
       return
     }
-    const newChildren = parent._children.filter((c) => c !== component)
+    const newChildren = parent._children.filter(c => c !== component)
     newChildren.splice(currentIndex + 1, 0, component)
     parent._children = newChildren
     store.actions.preview.saveSelected()
@@ -60,7 +60,7 @@
     store.actions.components.copy(component, cut)
   }
 
-  const pasteComponent = (mode) => {
+  const pasteComponent = mode => {
     // lives in store - also used by drag drop
     store.actions.components.paste(component, mode)
   }
diff --git a/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/PathTree.svelte b/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/PathTree.svelte
index 18a1367a7a..c9ce885c3e 100644
--- a/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/PathTree.svelte
+++ b/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/PathTree.svelte
@@ -35,11 +35,11 @@
     route.subpaths[selectedScreen?.routing?.route] !== undefined
   $: routeOpened = routeManuallyOpened || routeSelected || hasSearchMatch
 
-  const changeScreen = (screenId) => {
+  const changeScreen = screenId => {
     store.actions.screens.select(screenId)
   }
 
-  const getAllScreens = (route) => {
+  const getAllScreens = route => {
     let screens = []
     Object.entries(route.subpaths).forEach(([route, subpath]) => {
       Object.entries(subpath.screens).forEach(([role, id]) => {
@@ -51,7 +51,7 @@
 
   const getFilteredScreens = (screens, searchString) => {
     return screens.filter(
-      (screen) => !searchString || screen.route.includes(searchString)
+      screen => !searchString || screen.route.includes(searchString)
     )
   }
 
diff --git a/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/ScreenDropdownMenu.svelte b/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/ScreenDropdownMenu.svelte
index 899551d5bc..69491f2c57 100644
--- a/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/ScreenDropdownMenu.svelte
+++ b/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/ScreenDropdownMenu.svelte
@@ -8,7 +8,7 @@
 
   let confirmDeleteDialog
 
-  $: screen = $allScreens.find((screen) => screen._id === screenId)
+  $: screen = $allScreens.find(screen => screen._id === screenId)
 
   const deleteScreen = () => {
     try {
diff --git a/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/dragDropStore.js b/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/dragDropStore.js
index 31ac3032f9..fed3361fec 100644
--- a/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/dragDropStore.js
+++ b/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/dragDropStore.js
@@ -17,8 +17,8 @@ export default function () {
   const store = writable({})
 
   store.actions = {
-    dragstart: (component) => {
-      store.update((state) => {
+    dragstart: component => {
+      store.update(state => {
         state.dragged = component
         return state
       })
@@ -29,7 +29,7 @@ export default function () {
       canHaveChildrenButIsEmpty,
       mousePosition,
     }) => {
-      store.update((state) => {
+      store.update(state => {
         state.targetComponent = component
         // only allow dropping inside when container is empty
         // if container has children, drag over them
@@ -65,7 +65,7 @@ export default function () {
       })
     },
     reset: () => {
-      store.update((state) => {
+      store.update(state => {
         state.dropPosition = ""
         state.targetComponent = null
         state.dragged = null
@@ -85,7 +85,7 @@ export default function () {
       }
       // Stop if the target is a child of source
       const path = findComponentPath(state.dragged, state.targetComponent._id)
-      const ids = path.map((component) => component._id)
+      const ids = path.map(component => component._id)
       if (ids.includes(state.targetComponent._id)) {
         return
       }
diff --git a/packages/builder/src/components/design/NavigationPanel/FrontendNavigatePane.svelte b/packages/builder/src/components/design/NavigationPanel/FrontendNavigatePane.svelte
index 4f73791820..36e0d1661c 100644
--- a/packages/builder/src/components/design/NavigationPanel/FrontendNavigatePane.svelte
+++ b/packages/builder/src/components/design/NavigationPanel/FrontendNavigatePane.svelte
@@ -26,22 +26,21 @@
   ]
 
   let modal
-  $: selected =
-    tabs.find((t) => t.key === $params.assetType)?.title || "Screens"
+  $: selected = tabs.find(t => t.key === $params.assetType)?.title || "Screens"
 
   const navigate = ({ detail }) => {
-    const { key } = tabs.find((t) => t.title === detail)
+    const { key } = tabs.find(t => t.title === detail)
     $goto(`../${key}`)
   }
 
-  const updateAccessRole = (event) => {
+  const updateAccessRole = event => {
     const role = event.detail
 
     // Select a valid screen with this new role - otherwise we'll not be
     // able to change role at all because ComponentNavigationTree will kick us
     // back the current role again because the same screen ID is still selected
     const firstValidScreenId = $allScreens.find(
-      (screen) => screen.routing.roleId === role
+      screen => screen.routing.roleId === role
     )?._id
     if (firstValidScreenId) {
       store.actions.screens.select(firstValidScreenId)
@@ -50,7 +49,7 @@
     // Otherwise clear the selected screen ID so that the first new valid screen
     // can be selected by ComponentNavigationTree
     else {
-      store.update((state) => {
+      store.update(state => {
         state.selectedScreenId = null
         return state
       })
@@ -73,8 +72,8 @@
             on:change={updateAccessRole}
             value={$selectedAccessRole}
             label="Filter by Access"
-            getOptionLabel={(role) => role.name}
-            getOptionValue={(role) => role._id}
+            getOptionLabel={role => role.name}
+            getOptionValue={role => role._id}
             options={$roles}
           />
           <Search
diff --git a/packages/builder/src/components/design/NavigationPanel/NewScreenModal.svelte b/packages/builder/src/components/design/NavigationPanel/NewScreenModal.svelte
index 15fb5f535a..552172d6c0 100644
--- a/packages/builder/src/components/design/NavigationPanel/NewScreenModal.svelte
+++ b/packages/builder/src/components/design/NavigationPanel/NewScreenModal.svelte
@@ -95,7 +95,11 @@
     on:change={(ev) => templateChanged(ev.detail)}
     options={templates}
     placeholder={null}
+<<<<<<< HEAD
     getOptionLabel={(x) => x.name}
+=======
+    getOptionLabel={x => x.name}
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
     getOptionValue={(x, idx) => idx}
   />
   <Input label="Name" bind:value={name} />
@@ -109,8 +113,13 @@
     label="Access"
     bind:value={roleId}
     options={$roles}
+<<<<<<< HEAD
     getOptionLabel={(x) => x.name}
     getOptionValue={(x) => x._id}
+=======
+    getOptionLabel={x => x.name}
+    getOptionValue={x => x._id}
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
   />
   <Toggle text="Create link in navigation bar" bind:value={createLink} />
 </ModalContent>
diff --git a/packages/builder/src/components/design/PropertiesPanel/BindingPanel.svelte b/packages/builder/src/components/design/PropertiesPanel/BindingPanel.svelte
index f8fcce0d24..9d98a2b530 100644
--- a/packages/builder/src/components/design/PropertiesPanel/BindingPanel.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/BindingPanel.svelte
@@ -1,6 +1,13 @@
 <script>
   import groupBy from "lodash/fp/groupBy"
-  import { Search, TextArea, Heading, Label, DrawerContent, Layout } from "@budibase/bbui"
+  import {
+    Search,
+    TextArea,
+    Heading,
+    Label,
+    DrawerContent,
+    Layout,
+  } from "@budibase/bbui"
   import { createEventDispatcher } from "svelte"
   import { isValid } from "@budibase/string-templates"
   import {
@@ -59,53 +66,53 @@
 
 <DrawerContent>
   <svelte:fragment slot="sidebar">
-  <Layout>
-    <Search placeholder="Search" bind:value={search} />
-    {#if context}
+    <Layout>
+      <Search placeholder="Search" bind:value={search} />
+      {#if context}
+        <section>
+          <Heading size="XS">Columns</Heading>
+          <ul>
+            {#each context.filter(context =>
+              context.readableBinding.match(searchRgx)
+            ) as { readableBinding }}
+              <li on:click={() => addToText(readableBinding)}>
+                {readableBinding}
+              </li>
+            {/each}
+          </ul>
+        </section>
+      {/if}
+      {#if instance}
+        <section>
+          <Heading size="XS">Components</Heading>
+          <ul>
+            {#each instance.filter(instance =>
+              instance.readableBinding.match(searchRgx)
+            ) as { readableBinding }}
+              <li on:click={() => addToText(readableBinding)}>
+                {readableBinding}
+              </li>
+            {/each}
+          </ul>
+        </section>
+      {/if}
       <section>
-        <Heading size="XS">Columns</Heading>
+        <Heading size="XS">Helpers</Heading>
         <ul>
-          {#each context.filter((context) =>
-            context.readableBinding.match(searchRgx)
-          ) as { readableBinding }}
-            <li on:click={() => addToText(readableBinding)}>
-              {readableBinding}
-            </li>
-          {/each}
-        </ul>
-      </section>
-    {/if}
-    {#if instance}
-      <section>
-        <Heading size="XS">Components</Heading>
-        <ul>
-          {#each instance.filter((instance) =>
-            instance.readableBinding.match(searchRgx)
-          ) as { readableBinding }}
-            <li on:click={() => addToText(readableBinding)}>
-              {readableBinding}
-            </li>
-          {/each}
-        </ul>
-      </section>
-    {/if}
-    <section>
-      <Heading size="XS">Helpers</Heading>
-      <ul>
-        {#each helpers.filter((helper) => helper.label.match(searchRgx) || helper.description.match(searchRgx)) as helper}
-          <li on:click={() => addToText(helper.text)}>
-            <div>
-              <Label extraSmall>{helper.displayText}</Label>
-              <div class="description">
-                {@html helper.description}
+          {#each helpers.filter(helper => helper.label.match(searchRgx) || helper.description.match(searchRgx)) as helper}
+            <li on:click={() => addToText(helper.text)}>
+              <div>
+                <Label extraSmall>{helper.displayText}</Label>
+                <div class="description">
+                  {@html helper.description}
+                </div>
+                <pre>{helper.example || ''}</pre>
               </div>
-              <pre>{helper.example || ''}</pre>
-            </div>
-          </li>
-        {/each}
-      </ul>
-    </section>
-  </Layout>
+            </li>
+          {/each}
+        </ul>
+      </section>
+    </Layout>
   </svelte:fragment>
   <div class="main">
     <TextArea
@@ -125,7 +132,7 @@
 
 <style>
   .main {
-    padding: var(--spacing-m)
+    padding: var(--spacing-m);
   }
   section {
     display: grid;
diff --git a/packages/builder/src/components/design/PropertiesPanel/DesignView.svelte b/packages/builder/src/components/design/PropertiesPanel/DesignView.svelte
index ba58b783b7..fbf4482e67 100644
--- a/packages/builder/src/components/design/PropertiesPanel/DesignView.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/DesignView.svelte
@@ -65,7 +65,11 @@
           <div class="custom-styles">
             <TextArea
               value={componentInstance._styles.custom}
+<<<<<<< HEAD
               on:change={(event) => onCustomStyleChanged(event.detail)}
+=======
+              on:change={event => onCustomStyleChanged(event.detail)}
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
               placeholder="Enter some CSS..."
             />
           </div>
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DataProviderSelect.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DataProviderSelect.svelte
index 7b2aa75541..26cdbaa8ef 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DataProviderSelect.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DataProviderSelect.svelte
@@ -17,6 +17,11 @@
   {value}
   on:change
   options={providers}
+<<<<<<< HEAD
   getOptionLabel={(component) => component._instanceName}
   getOptionValue={(component) => `{{ literal ${makePropSafe(component._id)} }}`}
+=======
+  getOptionLabel={component => component._instanceName}
+  getOptionValue={component => `{{ literal ${makePropSafe(component._id)} }}`}
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
 />
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DataSourceSelect.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DataSourceSelect.svelte
index aa685f7b90..28642e3227 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DataSourceSelect.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DataSourceSelect.svelte
@@ -121,7 +121,11 @@
           {#if value.parameters.length > 0}
             <ParameterBuilder
               bind:customParams={value.queryParams}
+<<<<<<< HEAD
               parameters={queries.find((query) => query._id === value._id)
+=======
+              parameters={queries.find(query => query._id === value._id)
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
                 .parameters}
               bindings={queryBindableProperties}
             />
@@ -131,7 +135,11 @@
             query={value}
             schema={fetchQueryDefinition(value)}
             datasource={$datasources.list.find(
+<<<<<<< HEAD
               (ds) => ds._id === value.datasourceId
+=======
+              ds => ds._id === value.datasourceId
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
             )}
             editable={false}
           />
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/EventEditor.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/EventEditor.svelte
index dfd8475d60..6028bc64ea 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/EventEditor.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/EventEditor.svelte
@@ -21,7 +21,7 @@
   // dndzone needs an id on the array items, so this adds some temporary ones.
   $: {
     if (actions) {
-      actions.forEach((action) => {
+      actions.forEach(action => {
         if (!action.id) {
           action.id = generate()
         }
@@ -33,7 +33,7 @@
 
   $: selectedActionComponent =
     selectedAction &&
-    actionTypes.find((t) => t.name === selectedAction[EVENT_TYPE_KEY]).component
+    actionTypes.find(t => t.name === selectedAction[EVENT_TYPE_KEY]).component
 
   // Select the first action if we delete an action
   $: {
@@ -42,12 +42,12 @@
     }
   }
 
-  const deleteAction = (index) => {
+  const deleteAction = index => {
     actions.splice(index, 1)
     actions = actions
   }
 
-  const addAction = (actionType) => () => {
+  const addAction = actionType => () => {
     const newAction = {
       parameters: {},
       [EVENT_TYPE_KEY]: actionType.name,
@@ -60,7 +60,7 @@
     selectedAction = newAction
   }
 
-  const selectAction = (action) => () => {
+  const selectAction = action => () => {
     selectedAction = action
   }
 
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/EventPropertyControl.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/EventPropertyControl.svelte
index 97a8654971..fb2752edde 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/EventPropertyControl.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/EventPropertyControl.svelte
@@ -52,7 +52,7 @@
 </script>
 
 <Button secondary on:click={drawer.show}>Define Actions</Button>
-<Drawer bind:this={drawer} title={'Actions'}>
+<Drawer bind:this={drawer} title={"Actions"}>
   <svelte:fragment slot="description">
     Define what actions to run.
   </svelte:fragment>
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/DeleteRow.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/DeleteRow.svelte
index b824d09bab..143a733ff4 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/DeleteRow.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/DeleteRow.svelte
@@ -16,8 +16,13 @@
   <Select
     bind:value={parameters.tableId}
     options={tableOptions}
+<<<<<<< HEAD
     getOptionLabel={(table) => table.name}
     getOptionValue={(table) => table._id}
+=======
+    getOptionLabel={table => table.name}
+    getOptionValue={table => table._id}
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
   />
 
   <Label small>Row ID</Label>
@@ -25,7 +30,11 @@
     {bindings}
     title="Row ID to delete"
     value={parameters.rowId}
+<<<<<<< HEAD
     on:change={(value) => (parameters.rowId = value.detail)}
+=======
+    on:change={value => (parameters.rowId = value.detail)}
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
   />
 
   <Label small>Row Rev</Label>
@@ -33,7 +42,11 @@
     {bindings}
     title="Row rev to delete"
     value={parameters.revId}
+<<<<<<< HEAD
     on:change={(value) => (parameters.revId = value.detail)}
+=======
+    on:change={value => (parameters.revId = value.detail)}
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
   />
 </div>
 
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/ExecuteQuery.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/ExecuteQuery.svelte
index 3d4dd7fb38..a8b90a52d6 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/ExecuteQuery.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/ExecuteQuery.svelte
@@ -8,9 +8,9 @@
 
   export let parameters
 
-  $: query = $queries.list.find((q) => q._id === parameters.queryId)
+  $: query = $queries.list.find(q => q._id === parameters.queryId)
   $: datasource = $datasources.list.find(
-    (ds) => ds._id === parameters.datasourceId
+    ds => ds._id === parameters.datasourceId
   )
   $: bindableProperties = getBindableProperties(
     $currentAsset,
@@ -18,7 +18,7 @@
   )
 
   function fetchQueryDefinition(query) {
-    const source = $datasources.list.find((ds) => ds._id === query.datasourceId)
+    const source = $datasources.list.find(ds => ds._id === query.datasourceId)
       .source
     return $integrations[source].query[query.queryVerb]
   }
@@ -29,8 +29,8 @@
   <Select
     bind:value={parameters.datasourceId}
     option={$datasources.list}
-    getOptionLabel={(source) => source.name}
-    getOptionValue={(source) => source._id}
+    getOptionLabel={source => source.name}
+    getOptionValue={source => source._id}
   />
 
   {#if parameters.datasourceId}
@@ -38,10 +38,10 @@
     <Select
       bind:value={parameters.queryId}
       options={$queries.list.filter(
-        (query) => query.datasourceId === datasource._id
+        query => query.datasourceId === datasource._id
       )}
-      getOptionLabel={(query) => query.name}
-      getOptionValue={(query) => query._id}
+      getOptionLabel={query => query.name}
+      getOptionValue={query => query._id}
     />
   {/if}
 
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/LogIn.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/LogIn.svelte
index 21a60d7906..00fd1794fd 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/LogIn.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/LogIn.svelte
@@ -15,14 +15,22 @@
   <DrawerBindableInput
     title="Email"
     value={parameters.email}
+<<<<<<< HEAD
     on:change={(value) => (parameters.email = value.detail)}
+=======
+    on:change={value => (parameters.email = value.detail)}
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
     {bindings}
   />
   <Label small>Password</Label>
   <DrawerBindableInput
     title="Password"
     value={parameters.password}
+<<<<<<< HEAD
     on:change={(value) => (parameters.password = value.detail)}
+=======
+    on:change={value => (parameters.password = value.detail)}
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
     {bindings}
   />
 </div>
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/NavigateTo.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/NavigateTo.svelte
index 4b7766ed6d..0698cee807 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/NavigateTo.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/NavigateTo.svelte
@@ -18,7 +18,11 @@
     title="Destination URL"
     placeholder="/screen"
     value={parameters.url}
+<<<<<<< HEAD
     on:change={(value) => (parameters.url = value.detail)}
+=======
+    on:change={value => (parameters.url = value.detail)}
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
     {bindings}
   />
 </div>
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/SaveFields.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/SaveFields.svelte
index 400de67a08..ef153ed78e 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/SaveFields.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/SaveFields.svelte
@@ -20,11 +20,11 @@
   )
 
   const addField = () => {
-    fields = [...fields.filter((field) => field[0]), ["", ""]]
+    fields = [...fields.filter(field => field[0]), ["", ""]]
   }
 
-  const removeField = (name) => {
-    fields = fields.filter((field) => field[0] !== name)
+  const removeField = name => {
+    fields = fields.filter(field => field[0] !== name)
   }
 
   const updateFieldValue = (idx, value) => {
@@ -37,10 +37,10 @@
     fields = fields
   }
 
-  const onChange = (fields) => {
+  const onChange = fields => {
     const newParamFields = {}
     fields
-      .filter((field) => field[0])
+      .filter(field => field[0])
       .forEach(([field, value]) => {
         newParamFields[field] = value
       })
@@ -54,15 +54,15 @@
     {#if schemaFields}
       <Select
         value={field[0]}
-        on:change={(event) => updateFieldName(idx, event.detail)}
-        options={schemaFields.map((field) => field.name)}
+        on:change={event => updateFieldName(idx, event.detail)}
+        options={schemaFields.map(field => field.name)}
       />
     {:else}
       <Input
         thin
         secondary
         value={field[0]}
-        on:change={(event) => updateFieldName(idx, event.detail)}
+        on:change={event => updateFieldName(idx, event.detail)}
       />
     {/if}
     <Label small>{valueLabel}</Label>
@@ -70,7 +70,7 @@
       title={`Value for "${field[0]}"`}
       value={field[1]}
       bindings={bindableProperties}
-      on:change={(event) => updateFieldValue(idx, event.detail)}
+      on:change={event => updateFieldValue(idx, event.detail)}
     />
     <ActionButton
       size="S"
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/SaveRow.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/SaveRow.svelte
index 9193713a07..70e44ea83a 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/SaveRow.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/SaveRow.svelte
@@ -17,12 +17,12 @@
   $: schemaFields = getSchemaFields(parameters?.tableId)
   $: tableOptions = $tables.list || []
 
-  const getSchemaFields = (tableId) => {
+  const getSchemaFields = tableId => {
     const { schema } = getSchemaForDatasource({ type: "table", tableId })
     return Object.values(schema || {})
   }
 
-  const onFieldsChanged = (e) => {
+  const onFieldsChanged = e => {
     parameters.fields = e.detail
   }
 </script>
@@ -39,16 +39,16 @@
       bind:value={parameters.providerId}
       options={dataProviderComponents}
       placeholder="None"
-      getOptionLabel={(option) => option._instanceName}
-      getOptionValue={(option) => option._id}
+      getOptionLabel={option => option._instanceName}
+      getOptionValue={option => option._id}
     />
 
     <Label small>Table</Label>
     <Select
       bind:value={parameters.tableId}
       options={tableOptions}
-      getOptionLabel={(option) => option.name}
-      getOptionValue={(option) => option._id}
+      getOptionLabel={option => option.name}
+      getOptionValue={option => option._id}
     />
 
     {#if parameters.tableId}
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/TriggerAutomation.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/TriggerAutomation.svelte
index abd43c33e4..b64d39a273 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/TriggerAutomation.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/TriggerAutomation.svelte
@@ -80,8 +80,13 @@
         bind:value={parameters.automationId}
         placeholder="Choose automation"
         options={automations}
+<<<<<<< HEAD
         getOptionLabel={(x) => x.name}
         getOptionValue={(x) => x._id}
+=======
+        getOptionLabel={x => x.name}
+        getOptionValue={x => x._id}
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
       />
     {:else}
       <Input
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/ValidateForm.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/ValidateForm.svelte
index f0e6bda8aa..bc69cc0b2d 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/ValidateForm.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/ValidateForm.svelte
@@ -17,8 +17,13 @@
   <Select
     bind:value={parameters.componentId}
     options={actionProviders}
+<<<<<<< HEAD
     getOptionLabel={(x) => x._instanceName}
     getOptionValue={(x) => x._id}
+=======
+    getOptionLabel={x => x._instanceName}
+    getOptionValue={x => x._id}
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
   />
 </div>
 
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FieldSelect.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FieldSelect.svelte
index e0e019a5a1..791c9e2ab4 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FieldSelect.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FieldSelect.svelte
@@ -32,7 +32,11 @@
     return value
   }
 
+<<<<<<< HEAD
   const onChange = (value) => {
+=======
+  const onChange = value => {
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
     boundValue = getValidValue(value.detail, options)
     dispatch("change", boundValue)
   }
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor.svelte
index 12b3c395bc..977248e919 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor.svelte
@@ -18,7 +18,7 @@
 
   $: schemaFields = getSchemaFields(componentInstance)
 
-  const getSchemaFields = (component) => {
+  const getSchemaFields = component => {
     const datasource = getDatasourceForProvider($currentAsset, component)
     const { schema } = getSchemaForDatasource(datasource)
     return Object.values(schema || {})
@@ -30,7 +30,7 @@
     drawer.hide()
   }
 
-  const onFieldsChanged = (event) => {
+  const onFieldsChanged = event => {
     tempValue = event.detail
   }
 </script>
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/LayoutSelect.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/LayoutSelect.svelte
index 5fcbc8a236..aa21c74ae2 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/LayoutSelect.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/LayoutSelect.svelte
@@ -9,6 +9,11 @@
   bind:value
   on:change
   options={$store.layouts}
+<<<<<<< HEAD
   getOptionLabel={(layout) => layout.name}
   getOptionValue={(layout) => layout._id}
+=======
+  getOptionLabel={layout => layout.name}
+  getOptionValue={layout => layout._id}
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
 />
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyControl.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyControl.svelte
index 59aff93be1..b85341bf6f 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyControl.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyControl.svelte
@@ -80,27 +80,32 @@
       onChange={handleChange}
       {type}
       {...props}
-      name={key} />
+      name={key}
+    />
   </div>
-  {#if bindable && !key.startsWith('_') && type === 'text'}
+  {#if bindable && !key.startsWith("_") && type === "text"}
     <div
       class="icon"
       data-cy={`${key}-binding-button`}
-      on:click={bindingDrawer.show}>
+      on:click={bindingDrawer.show}
+    >
       <Icon size="S" name="FlashOn" />
     </div>
     <Drawer bind:this={bindingDrawer} title={capitalise(key)}>
       <svelte:fragment slot="description">
-          Add the objects on the left to enrich your text.
+        Add the objects on the left to enrich your text.
       </svelte:fragment>
-      <Button cta slot="buttons" disabled={!valid} on:click={handleClose}>Save</Button>
+      <Button cta slot="buttons" disabled={!valid} on:click={handleClose}
+        >Save</Button
+      >
       <BindingPanel
         slot="body"
         bind:valid
         value={safeValue}
         close={handleClose}
         on:update={e => (temporaryBindableValue = e.detail)}
-        {bindableProperties} />
+        {bindableProperties}
+      />
     </Drawer>
   {/if}
 </div>
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyGroup.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyGroup.svelte
index b2bd763014..f40038a999 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyGroup.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyGroup.svelte
@@ -32,7 +32,11 @@
           control={prop.control}
           key={prop.key}
           value={style[prop.key]}
+<<<<<<< HEAD
           onChange={(value) => onStyleChanged(styleCategory, prop.key, value)}
+=======
+          onChange={value => onStyleChanged(styleCategory, prop.key, value)}
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
           props={getControlProps(prop)}
         />
       {/each}
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/RoleSelect.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/RoleSelect.svelte
index 751883c4ea..74c9075b7d 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/RoleSelect.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/RoleSelect.svelte
@@ -9,6 +9,11 @@
   bind:value
   on:change
   options={$roles}
+<<<<<<< HEAD
   getOptionLabel={(role) => role.name}
   getOptionValue={(role) => role._id}
+=======
+  getOptionLabel={role => role.name}
+  getOptionValue={role => role._id}
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
 />
diff --git a/packages/builder/src/components/design/PropertiesPanel/SettingsView.svelte b/packages/builder/src/components/design/PropertiesPanel/SettingsView.svelte
index fc8e42b95e..d316affb44 100644
--- a/packages/builder/src/components/design/PropertiesPanel/SettingsView.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/SettingsView.svelte
@@ -80,11 +80,11 @@
     "field/link": RelationshipFieldSelect,
   }
 
-  const getControl = (type) => {
+  const getControl = type => {
     return controlMap[type]
   }
 
-  const canRenderControl = (setting) => {
+  const canRenderControl = setting => {
     const control = getControl(setting?.type)
     if (!control) {
       return false
@@ -95,7 +95,7 @@
     return true
   }
 
-  const onInstanceNameChange = (name) => {
+  const onInstanceNameChange = name => {
     onChange("_instanceName", name)
   }
 
@@ -103,13 +103,13 @@
     const form = findClosestMatchingComponent(
       $currentAsset.props,
       componentInstance._id,
-      (component) => component._component.endsWith("/form")
+      component => component._component.endsWith("/form")
     )
     const dataSource = form?.dataSource
     const fields = makeDatasourceFormComponents(dataSource)
     onChange(
       "_children",
-      fields.map((field) => field.json())
+      fields.map(field => field.json())
     )
   }
 </script>
@@ -123,7 +123,7 @@
         label={def.label}
         key={def.key}
         value={get(assetInstance, def.key)}
-        onChange={(val) => onScreenPropChange(def.key, val)}
+        onChange={val => onScreenPropChange(def.key, val)}
       />
     {/each}
   {/if}
@@ -150,7 +150,7 @@
           value={componentInstance[setting.key] ??
             componentInstance[setting.key]?.defaultValue}
           {componentInstance}
-          onChange={(val) => onChange(setting.key, val)}
+          onChange={val => onChange(setting.key, val)}
           props={{ options: setting.options, placeholder: setting.placeholder }}
         />
       {/if}
diff --git a/packages/builder/src/components/feedback/FeedbackNavLink.svelte b/packages/builder/src/components/feedback/FeedbackNavLink.svelte
index a0450ca37e..791448c7e6 100644
--- a/packages/builder/src/components/feedback/FeedbackNavLink.svelte
+++ b/packages/builder/src/components/feedback/FeedbackNavLink.svelte
@@ -13,7 +13,7 @@
 
   onMount(() => {
     const interval = setInterval(() => {
-      store.update((state) => {
+      store.update(state => {
         state.highlightFeedbackIcon = analytics.highlightFeedbackIcon()
         return state
       })
diff --git a/packages/builder/src/components/integration/QueryEditor.svelte b/packages/builder/src/components/integration/QueryEditor.svelte
index 54c73d42ae..47f47c0fc1 100644
--- a/packages/builder/src/components/integration/QueryEditor.svelte
+++ b/packages/builder/src/components/integration/QueryEditor.svelte
@@ -138,7 +138,7 @@
 
     editor = CodeMirror.fromTextArea(refs.editor, opts)
 
-    editor.on("change", (instance) => {
+    editor.on("change", instance => {
       if (!updating_externally) {
         const value = instance.getValue()
         dispatch("change", { value })
@@ -164,7 +164,7 @@
   }
 
   function sleep(ms) {
-    return new Promise((fulfil) => setTimeout(fulfil, ms))
+    return new Promise(fulfil => setTimeout(fulfil, ms))
   }
 </script>
 
diff --git a/packages/builder/src/components/integration/QueryParameterBuilder.svelte b/packages/builder/src/components/integration/QueryParameterBuilder.svelte
index 4c3532abee..4563515ea0 100644
--- a/packages/builder/src/components/integration/QueryParameterBuilder.svelte
+++ b/packages/builder/src/components/integration/QueryParameterBuilder.svelte
@@ -64,7 +64,7 @@
           title={`Query parameter "${parameter.name}"`}
           placeholder="Value"
           thin
-          on:change={(evt) => onBindingChange(parameter.name, evt.detail)}
+          on:change={evt => onBindingChange(parameter.name, evt.detail)}
           value={runtimeToReadableBinding(
             bindings,
             customParams?.[parameter.name]
diff --git a/packages/builder/src/components/integration/QueryViewer.svelte b/packages/builder/src/components/integration/QueryViewer.svelte
index 73b701082f..ea2b5a94a4 100644
--- a/packages/builder/src/components/integration/QueryViewer.svelte
+++ b/packages/builder/src/components/integration/QueryViewer.svelte
@@ -33,7 +33,7 @@
     { label: "Datetime", value: "DATETIME" },
   ]
 
-  $: datasource = $datasources.list.find((ds) => ds._id === query.datasourceId)
+  $: datasource = $datasources.list.find(ds => ds._id === query.datasourceId)
   $: query.schema = fields.reduce(
     (acc, next) => ({
       ...acc,
@@ -89,7 +89,7 @@
 
       // Assume all the fields are strings and create a basic schema from the
       // unique fields returned by the server
-      fields = json.schemaFields.map((field) => ({
+      fields = json.schemaFields.map(field => ({
         name: field,
         type: "STRING",
       }))
@@ -126,7 +126,7 @@
         <Select
           bind:value={query.queryVerb}
           options={Object.keys(queryConfig)}
-          getOptionLabel={(verb) =>
+          getOptionLabel={verb =>
             queryConfig[verb]?.displayName || capitalise(verb)}
         />
       </div>
diff --git a/packages/builder/src/components/settings/tabs/APIKeys.svelte b/packages/builder/src/components/settings/tabs/APIKeys.svelte
index e0b3daf9d4..ad6119cfbd 100644
--- a/packages/builder/src/components/settings/tabs/APIKeys.svelte
+++ b/packages/builder/src/components/settings/tabs/APIKeys.svelte
@@ -36,7 +36,11 @@
 
 <div class="container">
   <Input
+<<<<<<< HEAD
     on:change={(e) => updateKey(["budibase", e.detail])}
+=======
+    on:change={e => updateKey(["budibase", e.detail])}
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
     value={keys.budibase}
     label="Budibase Cloud API Key"
   />
diff --git a/packages/builder/src/components/start/CreateAppModal.svelte b/packages/builder/src/components/start/CreateAppModal.svelte
index 357214a137..9202343322 100644
--- a/packages/builder/src/components/start/CreateAppModal.svelte
+++ b/packages/builder/src/components/start/CreateAppModal.svelte
@@ -47,9 +47,9 @@
         .test(
           "non-existing-app-name",
           "App with same name already exists. Please try another app name.",
-          (value) =>
+          value =>
             !existingAppNames.some(
-              (appName) => appName.toLowerCase() === value.toLowerCase()
+              appName => appName.toLowerCase() === value.toLowerCase()
             )
         )
     }
@@ -57,11 +57,11 @@
 
   const checkValidity = async (values, validator) => {
     const obj = object().shape(validator)
-    Object.keys(validator).forEach((key) => ($errors[key] = null))
+    Object.keys(validator).forEach(key => ($errors[key] = null))
     try {
       await obj.validate(values, { abortEarly: false })
     } catch (validationErrors) {
-      validationErrors.inner.forEach((error) => {
+      validationErrors.inner.forEach(error => {
         $errors[error.path] = capitalise(error.message)
       })
     }
diff --git a/packages/builder/src/components/start/Steps/Info.svelte b/packages/builder/src/components/start/Steps/Info.svelte
index ffb963d465..42cd5e1e2f 100644
--- a/packages/builder/src/components/start/Steps/Info.svelte
+++ b/packages/builder/src/components/start/Steps/Info.svelte
@@ -14,7 +14,7 @@
 
   function handleFile(evt) {
     const fileArray = Array.from(evt.target.files)
-    if (fileArray.some((file) => file.size >= FILE_SIZE_LIMIT)) {
+    if (fileArray.some(file => file.size >= FILE_SIZE_LIMIT)) {
       notifications.error(
         `Files cannot exceed ${
           FILE_SIZE_LIMIT / BYTES_IN_MB
diff --git a/packages/builder/src/components/start/Steps/User.svelte b/packages/builder/src/components/start/Steps/User.svelte
index 6fa1750976..b51e5faaff 100644
--- a/packages/builder/src/components/start/Steps/User.svelte
+++ b/packages/builder/src/components/start/Steps/User.svelte
@@ -15,8 +15,8 @@
       { label: "Admin", value: "ADMIN" },
       { label: "Power User", value: "POWER_USER" },
     ]}
-    getOptionLabel={(option) => option.label}
-    getOptionValue={(option) => option.value}
+    getOptionLabel={option => option.label}
+    getOptionValue={option => option.value}
     error={$errors.roleId}
   />
 </div>
diff --git a/packages/builder/src/constants/completions.js b/packages/builder/src/constants/completions.js
index 7cee222046..32de934324 100644
--- a/packages/builder/src/constants/completions.js
+++ b/packages/builder/src/constants/completions.js
@@ -3,7 +3,7 @@ import { getManifest } from "@budibase/string-templates"
 export function handlebarsCompletions() {
   const manifest = getManifest()
 
-  return Object.keys(manifest).flatMap((key) =>
+  return Object.keys(manifest).flatMap(key =>
     Object.entries(manifest[key]).map(([helperName, helperConfig]) => ({
       text: helperName,
       path: helperName,
diff --git a/packages/builder/src/helpers.js b/packages/builder/src/helpers.js
index 8de210c159..89c7a0a6aa 100644
--- a/packages/builder/src/helpers.js
+++ b/packages/builder/src/helpers.js
@@ -1,6 +1,6 @@
 import { last, flow } from "lodash/fp"
 
-export const buildStyle = (styles) => {
+export const buildStyle = styles => {
   let str = ""
   for (let s in styles) {
     if (styles[s]) {
@@ -11,15 +11,14 @@ export const buildStyle = (styles) => {
   return str
 }
 
-export const convertCamel = (str) => {
-  return str.replace(/[A-Z]/g, (match) => `-${match.toLowerCase()}`)
+export const convertCamel = str => {
+  return str.replace(/[A-Z]/g, match => `-${match.toLowerCase()}`)
 }
 
 export const pipe = (arg, funcs) => flow(funcs)(arg)
 
-export const capitalise = (s) =>
-  s.substring(0, 1).toUpperCase() + s.substring(1)
+export const capitalise = s => s.substring(0, 1).toUpperCase() + s.substring(1)
 
-export const get_name = (s) => (!s ? "" : last(s.split("/")))
+export const get_name = s => (!s ? "" : last(s.split("/")))
 
-export const get_capitalised_name = (name) => pipe(name, [get_name, capitalise])
+export const get_capitalised_name = name => pipe(name, [get_name, capitalise])
diff --git a/packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/index.svelte b/packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/index.svelte
index 0c14c7358b..c0f8b99778 100644
--- a/packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/index.svelte
+++ b/packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/index.svelte
@@ -9,9 +9,7 @@
 
   let unsaved = false
 
-  $: datasource = $datasources.list.find(
-    (ds) => ds._id === $datasources.selected
-  )
+  $: datasource = $datasources.list.find(ds => ds._id === $datasources.selected)
   $: integration = datasource && $integrations[datasource.source]
 
   async function saveDatasource() {
@@ -74,7 +72,7 @@
         <Button secondary on:click={() => $goto("./new")}>Add Query</Button>
       </div>
       <div class="query-list">
-        {#each $queries.list.filter((query) => query.datasourceId === datasource._id) as query}
+        {#each $queries.list.filter(query => query.datasourceId === datasource._id) as query}
           <div class="query-list-item" on:click={() => onClickQuery(query)}>
             <p class="query-name">{query.name}</p>
             <p>{capitalise(query.queryVerb)}</p>
diff --git a/packages/builder/src/stores/backend/auth.js b/packages/builder/src/stores/backend/auth.js
index a2548a3deb..29dd6dcdd0 100644
--- a/packages/builder/src/stores/backend/auth.js
+++ b/packages/builder/src/stores/backend/auth.js
@@ -13,12 +13,12 @@ export function createAuthStore() {
   const { subscribe, set } = writable(null)
 
   checkAuth()
-    .then((user) => set({ user }))
+    .then(user => set({ user }))
     .catch(() => set({ user: null }))
 
   return {
     subscribe,
-    login: async (creds) => {
+    login: async creds => {
       const response = await api.post(`/api/admin/auth`, creds)
       const json = await response.json()
       if (response.status === 200) {
@@ -36,7 +36,7 @@ export function createAuthStore() {
       await response.json()
       set({ user: null })
     },
-    createUser: async (user) => {
+    createUser: async user => {
       const response = await api.post(`/api/admin/users`, user)
       if (response.status !== 200) {
         throw "Unable to create user"
diff --git a/packages/builder/src/stores/backend/datasources.js b/packages/builder/src/stores/backend/datasources.js
index 563d3a98dd..ff634c0185 100644
--- a/packages/builder/src/stores/backend/datasources.js
+++ b/packages/builder/src/stores/backend/datasources.js
@@ -21,19 +21,19 @@ export function createDatasourcesStore() {
     fetch: async () => {
       const response = await api.get(`/api/datasources`)
       const json = await response.json()
-      update((state) => ({ ...state, list: json }))
+      update(state => ({ ...state, list: json }))
       return json
     },
-    select: async (datasourceId) => {
-      update((state) => ({ ...state, selected: datasourceId }))
-      queries.update((state) => ({ ...state, selected: null }))
+    select: async datasourceId => {
+      update(state => ({ ...state, selected: datasourceId }))
+      queries.update(state => ({ ...state, selected: null }))
     },
-    save: async (datasource) => {
+    save: async datasource => {
       const response = await api.post("/api/datasources", datasource)
       const json = await response.json()
 
-      update((state) => {
-        const currentIdx = state.list.findIndex((ds) => ds._id === json._id)
+      update(state => {
+        const currentIdx = state.list.findIndex(ds => ds._id === json._id)
 
         const sources = state.list
 
@@ -47,13 +47,13 @@ export function createDatasourcesStore() {
       })
       return json
     },
-    delete: async (datasource) => {
+    delete: async datasource => {
       const response = await api.delete(
         `/api/datasources/${datasource._id}/${datasource._rev}`
       )
-      update((state) => {
+      update(state => {
         const sources = state.list.filter(
-          (existing) => existing._id !== datasource._id
+          existing => existing._id !== datasource._id
         )
         return { list: sources, selected: null }
       })
diff --git a/packages/builder/src/stores/backend/permissions.js b/packages/builder/src/stores/backend/permissions.js
index 8d84e6d74b..9172210872 100644
--- a/packages/builder/src/stores/backend/permissions.js
+++ b/packages/builder/src/stores/backend/permissions.js
@@ -6,7 +6,7 @@ export function createPermissionStore() {
 
   return {
     subscribe,
-    forResource: async (resourceId) => {
+    forResource: async resourceId => {
       const response = await api.get(`/api/permission/${resourceId}`)
       const json = await response.json()
       return json
diff --git a/packages/builder/src/stores/backend/queries.js b/packages/builder/src/stores/backend/queries.js
index 2eed72a635..47ce365c61 100644
--- a/packages/builder/src/stores/backend/queries.js
+++ b/packages/builder/src/stores/backend/queries.js
@@ -17,13 +17,13 @@ export function createQueriesStore() {
     fetch: async () => {
       const response = await api.get(`/api/queries`)
       const json = await response.json()
-      update((state) => ({ ...state, list: json }))
+      update(state => ({ ...state, list: json }))
       return json
     },
     save: async (datasourceId, query) => {
       const _integrations = get(integrations)
       const dataSource = get(datasources).list.filter(
-        (ds) => ds._id === datasourceId
+        ds => ds._id === datasourceId
       )
       // check if readable attribute is found
       if (dataSource.length !== 0) {
@@ -39,10 +39,8 @@ export function createQueriesStore() {
         throw new Error("Failed saving query.")
       }
       const json = await response.json()
-      update((state) => {
-        const currentIdx = state.list.findIndex(
-          (query) => query._id === json._id
-        )
+      update(state => {
+        const currentIdx = state.list.findIndex(query => query._id === json._id)
 
         const queries = state.list
 
@@ -55,19 +53,19 @@ export function createQueriesStore() {
       })
       return json
     },
-    select: (query) => {
-      update((state) => ({ ...state, selected: query._id }))
-      datasources.update((state) => ({
+    select: query => {
+      update(state => ({ ...state, selected: query._id }))
+      datasources.update(state => ({
         ...state,
         selected: query.datasourceId,
       }))
     },
-    delete: async (query) => {
+    delete: async query => {
       const response = await api.delete(
         `/api/queries/${query._id}/${query._rev}`
       )
-      update((state) => {
-        state.list = state.list.filter((existing) => existing._id !== query._id)
+      update(state => {
+        state.list = state.list.filter(existing => existing._id !== query._id)
         if (state.selected === query._id) {
           state.selected = null
         }
diff --git a/packages/builder/src/stores/backend/roles.js b/packages/builder/src/stores/backend/roles.js
index 782036aefe..1a1a9c04c5 100644
--- a/packages/builder/src/stores/backend/roles.js
+++ b/packages/builder/src/stores/backend/roles.js
@@ -9,12 +9,12 @@ export function createRolesStore() {
     fetch: async () => {
       set(await getRoles())
     },
-    delete: async (role) => {
+    delete: async role => {
       const response = await api.delete(`/api/roles/${role._id}/${role._rev}`)
-      update((state) => state.filter((existing) => existing._id !== role._id))
+      update(state => state.filter(existing => existing._id !== role._id))
       return response
     },
-    save: async (role) => {
+    save: async role => {
       const response = await api.post("/api/roles", role)
       set(await getRoles())
       return response
diff --git a/packages/builder/src/stores/backend/tables.js b/packages/builder/src/stores/backend/tables.js
index 52e0a914c2..faecf0d753 100644
--- a/packages/builder/src/stores/backend/tables.js
+++ b/packages/builder/src/stores/backend/tables.js
@@ -10,17 +10,17 @@ export function createTablesStore() {
   async function fetch() {
     const tablesResponse = await api.get(`/api/tables`)
     const tables = await tablesResponse.json()
-    update((state) => ({ ...state, list: tables }))
+    update(state => ({ ...state, list: tables }))
   }
 
   async function select(table) {
     if (!table) {
-      update((state) => ({
+      update(state => ({
         ...state,
         selected: {},
       }))
     } else {
-      update((state) => ({
+      update(state => ({
         ...state,
         selected: table,
         draft: cloneDeep(table),
@@ -31,7 +31,7 @@ export function createTablesStore() {
 
   async function save(table) {
     const updatedTable = cloneDeep(table)
-    const oldTable = get(store).list.filter((t) => t._id === table._id)[0]
+    const oldTable = get(store).list.filter(t => t._id === table._id)[0]
 
     const fieldNames = []
     // update any renamed schema keys to reflect their names
@@ -78,16 +78,16 @@ export function createTablesStore() {
         draft: {},
       })
     },
-    delete: async (table) => {
+    delete: async table => {
       await api.delete(`/api/tables/${table._id}/${table._rev}`)
-      update((state) => ({
+      update(state => ({
         ...state,
-        list: state.list.filter((existing) => existing._id !== table._id),
+        list: state.list.filter(existing => existing._id !== table._id),
         selected: {},
       }))
     },
     saveField: ({ originalName, field, primaryDisplay = false, indexes }) => {
-      update((state) => {
+      update(state => {
         // delete the original if renaming
         // need to handle if the column had no name, empty string
         if (originalName || originalName === "") {
@@ -115,8 +115,8 @@ export function createTablesStore() {
         return state
       })
     },
-    deleteField: (field) => {
-      update((state) => {
+    deleteField: field => {
+      update(state => {
         delete state.draft.schema[field.name]
         save(state.draft)
         return state
diff --git a/packages/builder/src/stores/backend/views.js b/packages/builder/src/stores/backend/views.js
index b45f0aa4ed..d6497bf871 100644
--- a/packages/builder/src/stores/backend/views.js
+++ b/packages/builder/src/stores/backend/views.js
@@ -10,17 +10,17 @@ export function createViewsStore() {
 
   return {
     subscribe,
-    select: async (view) => {
-      update((state) => ({
+    select: async view => {
+      update(state => ({
         ...state,
         selected: view,
       }))
     },
-    delete: async (view) => {
+    delete: async view => {
       await api.delete(`/api/views/${view}`)
       await tables.fetch()
     },
-    save: async (view) => {
+    save: async view => {
       const response = await api.post(`/api/views`, view)
       const json = await response.json()
 
@@ -30,14 +30,14 @@ export function createViewsStore() {
       }
 
       const viewTable = get(tables).list.find(
-        (table) => table._id === view.tableId
+        table => table._id === view.tableId
       )
 
       if (view.originalName) delete viewTable.views[view.originalName]
       viewTable.views[view.name] = viewMeta
       await tables.save(viewTable)
 
-      update((state) => ({ ...state, selected: viewMeta }))
+      update(state => ({ ...state, selected: viewMeta }))
     },
   }
 }
diff --git a/packages/cli/src/hosting/makeEnv.js b/packages/cli/src/hosting/makeEnv.js
index ee14fd5e31..318a72def1 100644
--- a/packages/cli/src/hosting/makeEnv.js
+++ b/packages/cli/src/hosting/makeEnv.js
@@ -61,7 +61,7 @@ module.exports.make = async (inputs = {}) => {
   )
 }
 
-module.exports.get = (property) => {
+module.exports.get = property => {
   const props = fs.readFileSync(FILE_PATH, "utf8").split(property)
   if (props[0].charAt(0) === "=") {
     property = props[0]
diff --git a/packages/cli/src/index.js b/packages/cli/src/index.js
index 13e5386b59..6693446b39 100644
--- a/packages/cli/src/index.js
+++ b/packages/cli/src/index.js
@@ -17,6 +17,6 @@ async function init() {
   await program.parseAsync(process.argv)
 }
 
-init().catch((err) => {
+init().catch(err => {
   console.error(`Unexpected error - `, err)
 })
diff --git a/packages/cli/src/questions.js b/packages/cli/src/questions.js
index d363c32790..ea0c412a60 100644
--- a/packages/cli/src/questions.js
+++ b/packages/cli/src/questions.js
@@ -1,6 +1,6 @@
 const inquirer = require("inquirer")
 
-exports.confirmation = async (question) => {
+exports.confirmation = async question => {
   const config = {
     type: "confirm",
     message: question,
@@ -27,7 +27,7 @@ exports.number = async (question, defaultNumber) => {
     type: "input",
     name: "number",
     message: question,
-    validate: (value) => {
+    validate: value => {
       let valid = !isNaN(parseFloat(value))
       return valid || "Please enter a number"
     },
diff --git a/packages/cli/src/structures/Command.js b/packages/cli/src/structures/Command.js
index 6d7da1a206..a8d24566be 100644
--- a/packages/cli/src/structures/Command.js
+++ b/packages/cli/src/structures/Command.js
@@ -34,7 +34,7 @@ class Command {
       "--help",
       getSubHelpDescription(`Get help with ${this.command} options`)
     )
-    command.action(async (options) => {
+    command.action(async options => {
       try {
         let executed = false
         for (let opt of thisCmd.opts) {
diff --git a/packages/cli/src/utils.js b/packages/cli/src/utils.js
index 9da1eeeefa..f61636389d 100644
--- a/packages/cli/src/utils.js
+++ b/packages/cli/src/utils.js
@@ -21,23 +21,23 @@ exports.downloadFile = async (url, filePath) => {
   })
 }
 
-exports.getHelpDescription = (string) => {
+exports.getHelpDescription = string => {
   return chalk.cyan(string)
 }
 
-exports.getSubHelpDescription = (string) => {
+exports.getSubHelpDescription = string => {
   return chalk.green(string)
 }
 
-exports.error = (error) => {
+exports.error = error => {
   return chalk.red(`Error - ${error}`)
 }
 
-exports.success = (success) => {
+exports.success = success => {
   return chalk.green(success)
 }
 
-exports.info = (info) => {
+exports.info = info => {
   return chalk.cyan(info)
 }
 
@@ -45,7 +45,7 @@ exports.logErrorToFile = (file, error) => {
   fs.writeFileSync(path.resolve(`./${file}`), `Budibase Error\n${error}`)
 }
 
-exports.parseEnv = (env) => {
+exports.parseEnv = env => {
   const lines = env.toString().split("\n")
   let result = {}
   for (const line of lines) {
diff --git a/packages/client/package.json b/packages/client/package.json
index 01dde2f719..a34835eccf 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -38,7 +38,7 @@
     "rollup-plugin-svelte": "^7.1.0",
     "rollup-plugin-svg": "^2.0.0",
     "rollup-plugin-terser": "^7.0.2",
-    "svelte": "^3.35.0"
+    "svelte": "^3.37.0"
   },
   "gitHead": "4b6efc42ed3273595c7a129411f4d883733d3321"
 }
diff --git a/packages/client/src/api/api.js b/packages/client/src/api/api.js
index cd11f71ef4..8b2328c6a2 100644
--- a/packages/client/src/api/api.js
+++ b/packages/client/src/api/api.js
@@ -7,7 +7,7 @@ let cache = {}
 /**
  * Handler for API errors.
  */
-const handleError = (error) => {
+const handleError = error => {
   return { error }
 }
 
@@ -61,7 +61,7 @@ const makeApiCall = async ({ method, url, body, json = true }) => {
  * Future invocation for this URL will return the cached result instead of
  * hitting the server again.
  */
-const makeCachedApiCall = async (params) => {
+const makeCachedApiCall = async params => {
   const identifier = params.url
   if (!identifier) {
     return null
@@ -76,7 +76,7 @@ const makeCachedApiCall = async (params) => {
 /**
  * Constructs an API call function for a particular HTTP method.
  */
-const requestApiCall = (method) => async (params) => {
+const requestApiCall = method => async params => {
   const { url, cache = false } = params
   const fixedUrl = `/${url}`.replace("//", "/")
   const enrichedParams = { ...params, method, url: fixedUrl }
diff --git a/packages/client/src/api/app.js b/packages/client/src/api/app.js
index 6f1f0679af..61c23ef6a6 100644
--- a/packages/client/src/api/app.js
+++ b/packages/client/src/api/app.js
@@ -3,7 +3,7 @@ import API from "./api"
 /**
  * Fetches screen definition for an app.
  */
-export const fetchAppDefinition = async (appId) => {
+export const fetchAppDefinition = async appId => {
   return await API.get({
     url: `/api/applications/${appId}/definition`,
   })
diff --git a/packages/client/src/api/attachments.js b/packages/client/src/api/attachments.js
index a03aa595f9..ff5c48c911 100644
--- a/packages/client/src/api/attachments.js
+++ b/packages/client/src/api/attachments.js
@@ -3,7 +3,7 @@ import API from "./api"
 /**
  * Uploads an attachment to the server.
  */
-export const uploadAttachment = async (data) => {
+export const uploadAttachment = async data => {
   return await API.post({
     url: "/api/attachments/upload",
     body: data,
diff --git a/packages/client/src/api/datasources.js b/packages/client/src/api/datasources.js
index 49d1132467..508e1e8db0 100644
--- a/packages/client/src/api/datasources.js
+++ b/packages/client/src/api/datasources.js
@@ -7,7 +7,7 @@ import { executeQuery } from "./queries"
 /**
  * Fetches all rows for a particular Budibase data source.
  */
-export const fetchDatasource = async (dataSource) => {
+export const fetchDatasource = async dataSource => {
   if (!dataSource || !dataSource.type) {
     return []
   }
diff --git a/packages/client/src/api/rows.js b/packages/client/src/api/rows.js
index b67c6318ae..87cc9a9d37 100644
--- a/packages/client/src/api/rows.js
+++ b/packages/client/src/api/rows.js
@@ -18,7 +18,7 @@ export const fetchRow = async ({ tableId, rowId }) => {
 /**
  * Creates a row in a table.
  */
-export const saveRow = async (row) => {
+export const saveRow = async row => {
   if (!row?.tableId) {
     return
   }
@@ -39,7 +39,7 @@ export const saveRow = async (row) => {
 /**
  * Updates a row in a table.
  */
-export const updateRow = async (row) => {
+export const updateRow = async row => {
   if (!row?.tableId || !row?._id) {
     return
   }
@@ -115,15 +115,15 @@ export const enrichRows = async (rows, tableId) => {
     const schema = tableDefinition && tableDefinition.schema
     if (schema) {
       const keys = Object.keys(schema)
-      rows.forEach((row) => {
+      rows.forEach(row => {
         for (let key of keys) {
           const type = schema[key].type
           if (type === "link") {
             // Enrich row a string join of relationship fields
             row[`${key}_text`] =
               row[key]
-                ?.map((option) => option?.primaryDisplay)
-                .filter((option) => !!option)
+                ?.map(option => option?.primaryDisplay)
+                .filter(option => !!option)
                 .join(", ") || ""
           } else if (type === "attachment") {
             // Enrich row with the first image URL for any attachment fields
diff --git a/packages/client/src/api/tables.js b/packages/client/src/api/tables.js
index 86be3cd748..248e1516c2 100644
--- a/packages/client/src/api/tables.js
+++ b/packages/client/src/api/tables.js
@@ -5,14 +5,14 @@ import { enrichRows } from "./rows"
  * Fetches a table definition.
  * Since definitions cannot change at runtime, the result is cached.
  */
-export const fetchTableDefinition = async (tableId) => {
+export const fetchTableDefinition = async tableId => {
   return await API.get({ url: `/api/tables/${tableId}`, cache: true })
 }
 
 /**
  * Fetches all rows from a table.
  */
-export const fetchTableData = async (tableId) => {
+export const fetchTableData = async tableId => {
   const rows = await API.get({ url: `/api/${tableId}/rows` })
   return await enrichRows(rows, tableId)
 }
diff --git a/packages/client/src/store/builder.js b/packages/client/src/store/builder.js
index 9e1e87c800..295bb6ccc9 100644
--- a/packages/client/src/store/builder.js
+++ b/packages/client/src/store/builder.js
@@ -12,7 +12,7 @@ const createBuilderStore = () => {
   }
   const store = writable(initialState)
   const actions = {
-    selectComponent: (id) => {
+    selectComponent: id => {
       if (id) {
         window.dispatchEvent(
           new CustomEvent("bb-select-component", { detail: id })
diff --git a/packages/client/src/store/context.js b/packages/client/src/store/context.js
index 51d288fa38..e9d307d4f3 100644
--- a/packages/client/src/store/context.js
+++ b/packages/client/src/store/context.js
@@ -1,9 +1,9 @@
 import { writable, derived } from "svelte/store"
 
-export const createContextStore = (oldContext) => {
+export const createContextStore = oldContext => {
   const newContext = writable({})
   const contexts = oldContext ? [oldContext, newContext] : [newContext]
-  const totalContext = derived(contexts, ($contexts) => {
+  const totalContext = derived(contexts, $contexts => {
     return $contexts.reduce((total, context) => ({ ...total, ...context }), {})
   })
 
@@ -12,7 +12,7 @@ export const createContextStore = (oldContext) => {
     if (!providerId || data === undefined) {
       return
     }
-    newContext.update((state) => {
+    newContext.update(state => {
       state[providerId] = data
 
       // Keep track of the closest component ID so we can later hydrate a "data" prop.
@@ -29,7 +29,7 @@ export const createContextStore = (oldContext) => {
     if (!providerId || !actionType) {
       return
     }
-    newContext.update((state) => {
+    newContext.update(state => {
       state[`${providerId}_${actionType}`] = callback
       return state
     })
diff --git a/packages/client/src/store/dataSource.js b/packages/client/src/store/dataSource.js
index 75d844a27e..2645c949a2 100644
--- a/packages/client/src/store/dataSource.js
+++ b/packages/client/src/store/dataSource.js
@@ -40,8 +40,8 @@ export const createDataSourceStore = () => {
 
     // Store configs for each relevant dataSource ID
     if (dataSourceIds.length) {
-      store.update((state) => {
-        dataSourceIds.forEach((id) => {
+      store.update(state => {
+        dataSourceIds.forEach(id => {
           state.push({
             dataSourceId: id,
             instanceId,
@@ -55,22 +55,22 @@ export const createDataSourceStore = () => {
 
   // Removes all registered dataSource instances belonging to a particular
   // instance ID
-  const unregisterInstance = (instanceId) => {
-    store.update((state) => {
-      return state.filter((instance) => instance.instanceId !== instanceId)
+  const unregisterInstance = instanceId => {
+    store.update(state => {
+      return state.filter(instance => instance.instanceId !== instanceId)
     })
   }
 
   // Invalidates a specific dataSource ID by refreshing all instances
   // which depend on data from that dataSource
-  const invalidateDataSource = (dataSourceId) => {
-    const relatedInstances = get(store).filter((instance) => {
+  const invalidateDataSource = dataSourceId => {
+    const relatedInstances = get(store).filter(instance => {
       return instance.dataSourceId === dataSourceId
     })
     if (relatedInstances?.length) {
       notificationStore.blockNotifications(1000)
     }
-    relatedInstances?.forEach((instance) => {
+    relatedInstances?.forEach(instance => {
       instance.refresh()
     })
   }
diff --git a/packages/client/src/store/notification.js b/packages/client/src/store/notification.js
index 6e06760702..6c40ca275f 100644
--- a/packages/client/src/store/notification.js
+++ b/packages/client/src/store/notification.js
@@ -7,7 +7,7 @@ const createNotificationStore = () => {
   const _notifications = writable([], () => {
     return () => {
       // clear all the timers
-      timeoutIds.forEach((timeoutId) => {
+      timeoutIds.forEach(timeoutId => {
         clearTimeout(timeoutId)
       })
       _notifications.set([])
@@ -25,11 +25,11 @@ const createNotificationStore = () => {
       return
     }
     let _id = id()
-    _notifications.update((state) => {
+    _notifications.update(state => {
       return [...state, { id: _id, type, message }]
     })
     const timeoutId = setTimeout(() => {
-      _notifications.update((state) => {
+      _notifications.update(state => {
         return state.filter(({ id }) => id !== _id)
       })
     }, NOTIFICATION_TIMEOUT)
@@ -41,10 +41,10 @@ const createNotificationStore = () => {
   return {
     subscribe,
     send,
-    danger: (msg) => send(msg, "danger"),
-    warning: (msg) => send(msg, "warning"),
-    info: (msg) => send(msg, "info"),
-    success: (msg) => send(msg, "success"),
+    danger: msg => send(msg, "danger"),
+    warning: msg => send(msg, "warning"),
+    info: msg => send(msg, "info"),
+    success: msg => send(msg, "success"),
     blockNotifications,
   }
 }
diff --git a/packages/client/src/store/routes.js b/packages/client/src/store/routes.js
index 71e61c9a58..aa86718ec0 100644
--- a/packages/client/src/store/routes.js
+++ b/packages/client/src/store/routes.js
@@ -14,7 +14,7 @@ const createRouteStore = () => {
   const fetchRoutes = async () => {
     const routeConfig = await API.fetchRoutes()
     let routes = []
-    Object.values(routeConfig.routes).forEach((route) => {
+    Object.values(routeConfig.routes).forEach(route => {
       Object.entries(route.subpaths).forEach(([path, config]) => {
         routes.push({
           path,
@@ -28,21 +28,21 @@ const createRouteStore = () => {
       return a.path > b.path ? -1 : 1
     })
 
-    store.update((state) => {
+    store.update(state => {
       state.routes = routes
       state.routeSessionId = Math.random()
       return state
     })
   }
-  const setRouteParams = (routeParams) => {
-    store.update((state) => {
+  const setRouteParams = routeParams => {
+    store.update(state => {
       state.routeParams = routeParams
       return state
     })
   }
-  const setActiveRoute = (route) => {
-    store.update((state) => {
-      state.activeRoute = state.routes.find((x) => x.path === route)
+  const setActiveRoute = route => {
+    store.update(state => {
+      state.activeRoute = state.routes.find(x => x.path === route)
       return state
     })
   }
diff --git a/packages/client/src/store/screens.js b/packages/client/src/store/screens.js
index 7f21199acc..49927db9d7 100644
--- a/packages/client/src/store/screens.js
+++ b/packages/client/src/store/screens.js
@@ -25,12 +25,12 @@ const createScreenStore = () => {
           activeScreen = screens[0]
         } else if ($routeStore.activeRoute) {
           activeScreen = screens.find(
-            (screen) => screen._id === $routeStore.activeRoute.screenId
+            screen => screen._id === $routeStore.activeRoute.screenId
           )
         }
         if (activeScreen) {
           activeLayout = layouts.find(
-            (layout) => layout._id === activeScreen.layoutId
+            layout => layout._id === activeScreen.layoutId
           )
         }
       }
diff --git a/packages/client/src/utils/buttonActions.js b/packages/client/src/utils/buttonActions.js
index 0b988f0314..4d2865d586 100644
--- a/packages/client/src/utils/buttonActions.js
+++ b/packages/client/src/utils/buttonActions.js
@@ -16,27 +16,27 @@ const saveRowHandler = async (action, context) => {
   }
 }
 
-const deleteRowHandler = async (action) => {
+const deleteRowHandler = async action => {
   const { tableId, revId, rowId } = action.parameters
   if (tableId && revId && rowId) {
     await deleteRow({ tableId, rowId, revId })
   }
 }
 
-const triggerAutomationHandler = async (action) => {
+const triggerAutomationHandler = async action => {
   const { fields } = action.parameters
   if (fields) {
     await triggerAutomation(action.parameters.automationId, fields)
   }
 }
 
-const navigationHandler = (action) => {
+const navigationHandler = action => {
   if (action.parameters.url) {
     routeStore.actions.navigate(action.parameters.url)
   }
 }
 
-const queryExecutionHandler = async (action) => {
+const queryExecutionHandler = async action => {
   const { datasourceId, queryId, queryParams } = action.parameters
   await executeQuery({
     datasourceId,
@@ -68,7 +68,7 @@ const refreshDatasourceHandler = async (action, context) => {
   )
 }
 
-const loginHandler = async (action) => {
+const loginHandler = async action => {
   const { email, password } = action.parameters
   await authStore.actions.logIn({ email, password })
 }
@@ -98,7 +98,7 @@ export const enrichButtonActions = (actions, context) => {
   if (get(builderStore).inBuilder) {
     return () => {}
   }
-  const handlers = actions.map((def) => handlerMap[def["##eventHandlerType"]])
+  const handlers = actions.map(def => handlerMap[def["##eventHandlerType"]])
   return async () => {
     for (let i = 0; i < handlers.length; i++) {
       try {
diff --git a/packages/client/src/utils/hash.js b/packages/client/src/utils/hash.js
index 30c7913c20..2c42007e43 100644
--- a/packages/client/src/utils/hash.js
+++ b/packages/client/src/utils/hash.js
@@ -1,4 +1,4 @@
-export const hashString = (str) => {
+export const hashString = str => {
   if (!str) {
     return 0
   }
diff --git a/packages/client/src/utils/styleable.js b/packages/client/src/utils/styleable.js
index 92707c7543..9a89f1d273 100644
--- a/packages/client/src/utils/styleable.js
+++ b/packages/client/src/utils/styleable.js
@@ -53,7 +53,7 @@ export const styleable = (node, styles = {}) => {
     }
 
     // Applies a style string to a DOM node
-    const applyStyles = (styleString) => {
+    const applyStyles = styleString => {
       node.style = addBuilderPreviewStyles(node, styleString, componentId)
       node.dataset.componentId = componentId
     }
@@ -70,7 +70,7 @@ export const styleable = (node, styles = {}) => {
 
     // Handler to select a component in the builder when clicking it in the
     // builder preview
-    selectComponent = (event) => {
+    selectComponent = event => {
       builderStore.actions.selectComponent(componentId)
       event.preventDefault()
       event.stopPropagation()
@@ -106,7 +106,7 @@ export const styleable = (node, styles = {}) => {
 
   return {
     // Clean up old listeners and apply new ones on update
-    update: (newStyles) => {
+    update: newStyles => {
       removeListeners()
       setupStyles(newStyles)
     },
diff --git a/packages/client/yarn.lock b/packages/client/yarn.lock
index aff171b725..1e982786e2 100644
--- a/packages/client/yarn.lock
+++ b/packages/client/yarn.lock
@@ -2873,10 +2873,10 @@ svelte-spa-router@^3.0.5:
   dependencies:
     regexparam "1.3.0"
 
-svelte@^3.35.0:
-  version "3.35.0"
-  resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.35.0.tgz#e0d0ba60c4852181c2b4fd851194be6fda493e65"
-  integrity sha512-gknlZkR2sXheu/X+B7dDImwANVvK1R0QGQLd8CNIfxxGPeXBmePnxfzb6fWwTQRsYQG7lYkZXvpXJvxvpsoB7g==
+svelte@^3.37.0:
+  version "3.38.2"
+  resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.38.2.tgz#55e5c681f793ae349b5cc2fe58e5782af4275ef5"
+  integrity sha512-q5Dq0/QHh4BLJyEVWGe7Cej5NWs040LWjMbicBGZ+3qpFWJ1YObRmUDZKbbovddLC9WW7THTj3kYbTOFmU9fbg==
 
 svgo@^1.0.0:
   version "1.3.2"
diff --git a/packages/server/__mocks__/aws-sdk.js b/packages/server/__mocks__/aws-sdk.js
index e76b1616e6..503d098256 100644
--- a/packages/server/__mocks__/aws-sdk.js
+++ b/packages/server/__mocks__/aws-sdk.js
@@ -1,6 +1,6 @@
 const aws = {}
 
-const response = (body) => () => ({ promise: () => body })
+const response = body => () => ({ promise: () => body })
 
 function DocumentClient() {
   this.put = jest.fn(response({}))
diff --git a/packages/server/scripts/dev/manage.js b/packages/server/scripts/dev/manage.js
index bb5dfb2da2..305df573e4 100644
--- a/packages/server/scripts/dev/manage.js
+++ b/packages/server/scripts/dev/manage.js
@@ -47,7 +47,7 @@ async function init() {
     SELF_HOSTED: 1,
   }
   let envFile = ""
-  Object.keys(envFileJson).forEach((key) => {
+  Object.keys(envFileJson).forEach(key => {
     envFile += `${key}=${envFileJson[key]}\n`
   })
   fs.writeFileSync(envFilePath, envFile)
@@ -79,7 +79,7 @@ const managementCommand = process.argv.slice(2)[0]
 
 if (
   !managementCommand ||
-  !Object.values(Commands).some((command) => managementCommand === command)
+  !Object.values(Commands).some(command => managementCommand === command)
 ) {
   throw new Error(
     "You must supply either an 'up', 'down' or 'nuke' commmand to manage the budibase development environment."
@@ -105,7 +105,7 @@ command()
   .then(() => {
     console.log("Done! 🎉")
   })
-  .catch((err) => {
+  .catch(err => {
     console.error(
       "Something went wrong while managing budibase dev environment:",
       err.message
diff --git a/packages/server/scripts/exportAppTemplate.js b/packages/server/scripts/exportAppTemplate.js
index 2673b9b284..34988cda37 100755
--- a/packages/server/scripts/exportAppTemplate.js
+++ b/packages/server/scripts/exportAppTemplate.js
@@ -25,7 +25,7 @@ yargs
         type: "string",
       },
     },
-    async (args) => {
+    async args => {
       if (!env.isDev()) {
         throw "Only works in dev"
       }
diff --git a/packages/server/scripts/replicateApp.js b/packages/server/scripts/replicateApp.js
index 90f54087ce..2c66bb26d9 100644
--- a/packages/server/scripts/replicateApp.js
+++ b/packages/server/scripts/replicateApp.js
@@ -14,7 +14,7 @@ console.log(`Replicating from ${appName} to ${remoteUrl}/${appName}`)
 
 const run = async () => {
   const allDbs = await CouchDB.allDbs()
-  const appDbNames = allDbs.filter((dbName) => dbName.startsWith("inst_app"))
+  const appDbNames = allDbs.filter(dbName => dbName.startsWith("inst_app"))
   let apps = []
   for (let dbName of appDbNames) {
     const db = new CouchDB(dbName)
@@ -22,12 +22,12 @@ const run = async () => {
   }
   apps = await Promise.all(apps)
   const app = apps.find(
-    (a) => a.name === appName || a.name.toLowerCase() === appName
+    a => a.name === appName || a.name.toLowerCase() === appName
   )
 
   if (!app) {
     console.log(
-      `Could not find app... apps: ${apps.map((app) => app.name).join(", ")}`
+      `Could not find app... apps: ${apps.map(app => app.name).join(", ")}`
     )
     return
   }
diff --git a/packages/server/src/api/controllers/application.js b/packages/server/src/api/controllers/application.js
index 4668a31675..c9a1507201 100644
--- a/packages/server/src/api/controllers/application.js
+++ b/packages/server/src/api/controllers/application.js
@@ -43,7 +43,7 @@ async function getLayouts(db) {
         include_docs: true,
       })
     )
-  ).rows.map((row) => row.doc)
+  ).rows.map(row => row.doc)
 }
 
 async function getScreens(db) {
@@ -53,7 +53,7 @@ async function getScreens(db) {
         include_docs: true,
       })
     )
-  ).rows.map((row) => row.doc)
+  ).rows.map(row => row.doc)
 }
 
 function getUserRoleId(ctx) {
diff --git a/packages/server/src/api/controllers/auth.js b/packages/server/src/api/controllers/auth.js
index ed70254222..2ac3d30e48 100644
--- a/packages/server/src/api/controllers/auth.js
+++ b/packages/server/src/api/controllers/auth.js
@@ -3,7 +3,7 @@ const { outputProcessing } = require("../../utilities/rowProcessor")
 const { InternalTables } = require("../../db/utils")
 const { getFullUser } = require("../../utilities/users")
 
-exports.fetchSelf = async (ctx) => {
+exports.fetchSelf = async ctx => {
   if (!ctx.user) {
     ctx.throw(403, "No user logged in")
   }
diff --git a/packages/server/src/api/controllers/automation.js b/packages/server/src/api/controllers/automation.js
index 8238ffdb6b..01db17f754 100644
--- a/packages/server/src/api/controllers/automation.js
+++ b/packages/server/src/api/controllers/automation.js
@@ -156,7 +156,7 @@ exports.fetch = async function (ctx) {
       include_docs: true,
     })
   )
-  ctx.body = response.rows.map((row) => row.doc)
+  ctx.body = response.rows.map(row => row.doc)
 }
 
 exports.find = async function (ctx) {
diff --git a/packages/server/src/api/controllers/component.js b/packages/server/src/api/controllers/component.js
index 2c9440058e..60e1e99e35 100644
--- a/packages/server/src/api/controllers/component.js
+++ b/packages/server/src/api/controllers/component.js
@@ -7,7 +7,7 @@ exports.fetchAppComponentDefinitions = async function (ctx) {
   const app = await db.get(appId)
 
   let componentManifests = await Promise.all(
-    app.componentLibraries.map(async (library) => {
+    app.componentLibraries.map(async library => {
       let manifest = await getComponentLibraryManifest(appId, library)
 
       return {
diff --git a/packages/server/src/api/controllers/datasource.js b/packages/server/src/api/controllers/datasource.js
index bd8497c4a4..4f3ebdb609 100644
--- a/packages/server/src/api/controllers/datasource.js
+++ b/packages/server/src/api/controllers/datasource.js
@@ -13,7 +13,7 @@ exports.fetch = async function (ctx) {
         include_docs: true,
       })
     )
-  ).rows.map((row) => row.doc)
+  ).rows.map(row => row.doc)
 }
 
 exports.save = async function (ctx) {
@@ -38,7 +38,7 @@ exports.destroy = async function (ctx) {
 
   // Delete all queries for the datasource
   const rows = await db.allDocs(getQueryParams(ctx.params.datasourceId, null))
-  await db.bulkDocs(rows.rows.map((row) => ({ ...row.doc, _deleted: true })))
+  await db.bulkDocs(rows.rows.map(row => ({ ...row.doc, _deleted: true })))
 
   // delete the datasource
   await db.remove(ctx.params.datasourceId, ctx.params.revId)
diff --git a/packages/server/src/api/controllers/deploy/utils.js b/packages/server/src/api/controllers/deploy/utils.js
index 2b5d0af2ed..59f94905fa 100644
--- a/packages/server/src/api/controllers/deploy/utils.js
+++ b/packages/server/src/api/controllers/deploy/utils.js
@@ -131,6 +131,6 @@ exports.performReplication = (appId, session, dbUrl) => {
     const replication = local.sync(remote)
 
     replication.on("complete", () => resolve())
-    replication.on("error", (err) => reject(err))
+    replication.on("error", err => reject(err))
   })
 }
diff --git a/packages/server/src/api/controllers/dev.js b/packages/server/src/api/controllers/dev.js
index 2e2a6d57f8..003f82faa8 100644
--- a/packages/server/src/api/controllers/dev.js
+++ b/packages/server/src/api/controllers/dev.js
@@ -21,14 +21,14 @@ async function redirect(ctx, method) {
   ctx.cookies
 }
 
-exports.redirectGet = async (ctx) => {
+exports.redirectGet = async ctx => {
   await redirect(ctx, "GET")
 }
 
-exports.redirectPost = async (ctx) => {
+exports.redirectPost = async ctx => {
   await redirect(ctx, "POST")
 }
 
-exports.redirectDelete = async (ctx) => {
+exports.redirectDelete = async ctx => {
   await redirect(ctx, "DELETE")
 }
diff --git a/packages/server/src/api/controllers/hosting.js b/packages/server/src/api/controllers/hosting.js
index 1720378fa2..8b7b31e00a 100644
--- a/packages/server/src/api/controllers/hosting.js
+++ b/packages/server/src/api/controllers/hosting.js
@@ -7,13 +7,13 @@ const {
 } = require("../../utilities/builder/hosting")
 const { StaticDatabases } = require("../../db/utils")
 
-exports.fetchInfo = async (ctx) => {
+exports.fetchInfo = async ctx => {
   ctx.body = {
     types: Object.values(HostingTypes),
   }
 }
 
-exports.save = async (ctx) => {
+exports.save = async ctx => {
   const db = new CouchDB(StaticDatabases.BUILDER_HOSTING.name)
   const { type } = ctx.request.body
   if (type === HostingTypes.CLOUD && ctx.request.body._rev) {
@@ -29,16 +29,16 @@ exports.save = async (ctx) => {
   }
 }
 
-exports.fetch = async (ctx) => {
+exports.fetch = async ctx => {
   ctx.body = await getHostingInfo()
 }
 
-exports.fetchUrls = async (ctx) => {
+exports.fetchUrls = async ctx => {
   ctx.body = {
     app: await getAppUrl(ctx.appId),
   }
 }
 
-exports.getDeployedApps = async (ctx) => {
+exports.getDeployedApps = async ctx => {
   ctx.body = await getDeployedApps(ctx)
 }
diff --git a/packages/server/src/api/controllers/layout.js b/packages/server/src/api/controllers/layout.js
index f745761d42..4c6c7755ef 100644
--- a/packages/server/src/api/controllers/layout.js
+++ b/packages/server/src/api/controllers/layout.js
@@ -32,7 +32,7 @@ exports.destroy = async function (ctx) {
         include_docs: true,
       })
     )
-  ).rows.map((element) => element.doc.layoutId)
+  ).rows.map(element => element.doc.layoutId)
   if (layoutsUsedByScreens.includes(layoutId)) {
     ctx.throw(400, "Cannot delete a layout that's being used by a screen")
   }
diff --git a/packages/server/src/api/controllers/permission.js b/packages/server/src/api/controllers/permission.js
index ffce2e8d97..74987d5214 100644
--- a/packages/server/src/api/controllers/permission.js
+++ b/packages/server/src/api/controllers/permission.js
@@ -47,7 +47,7 @@ async function getAllDBRoles(db) {
       include_docs: true,
     })
   )
-  return body.rows.map((row) => row.doc)
+  return body.rows.map(row => row.doc)
 }
 
 async function updatePermissionOnRole(
@@ -63,7 +63,7 @@ async function updatePermissionOnRole(
   const docUpdates = []
 
   // the permission is for a built in, make sure it exists
-  if (isABuiltin && !dbRoles.some((role) => role._id === dbRoleId)) {
+  if (isABuiltin && !dbRoles.some(role => role._id === dbRoleId)) {
     const builtin = getBuiltinRoles()[roleId]
     builtin._id = getDBRoleID(builtin._id)
     dbRoles.push(builtin)
@@ -101,7 +101,7 @@ async function updatePermissionOnRole(
   }
 
   const response = await db.bulkDocs(docUpdates)
-  return response.map((resp) => {
+  return response.map(resp => {
     resp._id = getExternalRoleID(resp.id)
     delete resp.id
     return resp
@@ -152,7 +152,7 @@ exports.getResourcePerms = async function (ctx) {
       include_docs: true,
     })
   )
-  const roles = body.rows.map((row) => row.doc)
+  const roles = body.rows.map(row => row.doc)
   let permissions = {}
   for (let level of SUPPORTED_LEVELS) {
     // update the various roleIds in the resource permissions
diff --git a/packages/server/src/api/controllers/query.js b/packages/server/src/api/controllers/query.js
index 1f3e7370d8..e3f961f071 100644
--- a/packages/server/src/api/controllers/query.js
+++ b/packages/server/src/api/controllers/query.js
@@ -35,7 +35,7 @@ exports.fetch = async function (ctx) {
       include_docs: true,
     })
   )
-  ctx.body = enrichQueries(body.rows.map((row) => row.doc))
+  ctx.body = enrichQueries(body.rows.map(row => row.doc))
 }
 
 exports.save = async function (ctx) {
diff --git a/packages/server/src/api/controllers/role.js b/packages/server/src/api/controllers/role.js
index 19174cac35..e1d469d977 100644
--- a/packages/server/src/api/controllers/role.js
+++ b/packages/server/src/api/controllers/role.js
@@ -57,20 +57,20 @@ exports.fetch = async function (ctx) {
       include_docs: true,
     })
   )
-  let roles = body.rows.map((row) => row.doc)
+  let roles = body.rows.map(row => row.doc)
   const builtinRoles = getBuiltinRoles()
 
   // need to combine builtin with any DB record of them (for sake of permissions)
   for (let builtinRoleId of EXTERNAL_BUILTIN_ROLE_IDS) {
     const builtinRole = builtinRoles[builtinRoleId]
     const dbBuiltin = roles.filter(
-      (dbRole) => getExternalRoleID(dbRole._id) === builtinRoleId
+      dbRole => getExternalRoleID(dbRole._id) === builtinRoleId
     )[0]
     if (dbBuiltin == null) {
       roles.push(builtinRole)
     } else {
       // remove role and all back after combining with the builtin
-      roles = roles.filter((role) => role._id !== dbBuiltin._id)
+      roles = roles.filter(role => role._id !== dbBuiltin._id)
       dbBuiltin._id = getExternalRoleID(dbBuiltin._id)
       roles.push(Object.assign(builtinRole, dbBuiltin))
     }
@@ -116,8 +116,8 @@ exports.destroy = async function (ctx) {
         include_docs: true,
       })
     )
-  ).rows.map((row) => row.doc)
-  const usersWithRole = users.filter((user) => user.roleId === roleId)
+  ).rows.map(row => row.doc)
+  const usersWithRole = users.filter(user => user.roleId === roleId)
   if (usersWithRole.length !== 0) {
     ctx.throw(400, "Cannot delete role when it is in use.")
   }
diff --git a/packages/server/src/api/controllers/routing.js b/packages/server/src/api/controllers/routing.js
index 502b78f107..fc3237c6d5 100644
--- a/packages/server/src/api/controllers/routing.js
+++ b/packages/server/src/api/controllers/routing.js
@@ -56,11 +56,11 @@ async function getRoutingStructure(appId) {
   return { routes: routing.json }
 }
 
-exports.fetch = async (ctx) => {
+exports.fetch = async ctx => {
   ctx.body = await getRoutingStructure(ctx.appId)
 }
 
-exports.clientFetch = async (ctx) => {
+exports.clientFetch = async ctx => {
   const routing = await getRoutingStructure(ctx.appId)
   let roleId = ctx.user.role._id
   // builder is a special case, always return the full routing structure
diff --git a/packages/server/src/api/controllers/row.js b/packages/server/src/api/controllers/row.js
index f085ca91db..6d0cc08548 100644
--- a/packages/server/src/api/controllers/row.js
+++ b/packages/server/src/api/controllers/row.js
@@ -213,7 +213,7 @@ exports.fetchView = async function (ctx) {
   })
 
   if (!calculation) {
-    response.rows = response.rows.map((row) => row.doc)
+    response.rows = response.rows.map(row => row.doc)
     let table
     try {
       table = await db.get(viewInfo.meta.tableId)
@@ -227,7 +227,7 @@ exports.fetchView = async function (ctx) {
   }
 
   if (calculation === CALCULATION_TYPES.STATS) {
-    response.rows = response.rows.map((row) => ({
+    response.rows = response.rows.map(row => ({
       group: row.key,
       field,
       ...row.value,
@@ -240,7 +240,7 @@ exports.fetchView = async function (ctx) {
     calculation === CALCULATION_TYPES.COUNT ||
     calculation === CALCULATION_TYPES.SUM
   ) {
-    ctx.body = response.rows.map((row) => ({
+    ctx.body = response.rows.map(row => ({
       group: row.key,
       field,
       value: row.value,
@@ -303,7 +303,7 @@ exports.fetchTableRows = async function (ctx) {
         include_docs: true,
       })
     )
-    rows = response.rows.map((row) => row.doc)
+    rows = response.rows.map(row => row.doc)
   }
   ctx.body = await outputProcessing(appId, table, rows)
 }
@@ -399,13 +399,13 @@ exports.fetchEnrichedRow = async function (ctx) {
   // look up the actual rows based on the ids
   const response = await db.allDocs({
     include_docs: true,
-    keys: linkVals.map((linkVal) => linkVal.id),
+    keys: linkVals.map(linkVal => linkVal.id),
   })
   // need to include the IDs in these rows for any links they may have
   let linkedRows = await outputProcessing(
     appId,
     table,
-    response.rows.map((row) => row.doc)
+    response.rows.map(row => row.doc)
   )
   // insert the link rows in the correct place throughout the main row
   for (let fieldName of Object.keys(table.schema)) {
@@ -413,8 +413,8 @@ exports.fetchEnrichedRow = async function (ctx) {
     if (field.type === FieldTypes.LINK) {
       // find the links that pertain to this field, get their indexes
       const linkIndexes = linkVals
-        .filter((link) => link.fieldName === fieldName)
-        .map((link) => linkVals.indexOf(link))
+        .filter(link => link.fieldName === fieldName)
+        .map(link => linkVals.indexOf(link))
       // find the rows that the links state are linked to this field
       row[fieldName] = linkedRows.filter((linkRow, index) =>
         linkIndexes.includes(index)
@@ -430,7 +430,7 @@ async function bulkDelete(ctx) {
   const { rows } = ctx.request.body
   const db = new CouchDB(appId)
 
-  let updates = rows.map((row) =>
+  let updates = rows.map(row =>
     linkRows.updateLinks({
       appId,
       eventType: linkRows.EventType.ROW_DELETE,
@@ -441,7 +441,7 @@ async function bulkDelete(ctx) {
   // TODO remove special user case in future
   if (ctx.params.tableId === InternalTables.USER_METADATA) {
     updates = updates.concat(
-      rows.map((row) => {
+      rows.map(row => {
         ctx.params = {
           id: row._id,
         }
@@ -449,11 +449,11 @@ async function bulkDelete(ctx) {
       })
     )
   } else {
-    await db.bulkDocs(rows.map((row) => ({ ...row, _deleted: true })))
+    await db.bulkDocs(rows.map(row => ({ ...row, _deleted: true })))
   }
   await Promise.all(updates)
 
-  rows.forEach((row) => {
+  rows.forEach(row => {
     ctx.eventEmitter && ctx.eventEmitter.emitRow(`row:delete`, appId, row)
   })
 }
diff --git a/packages/server/src/api/controllers/screen.js b/packages/server/src/api/controllers/screen.js
index 3638b41958..6095d00c95 100644
--- a/packages/server/src/api/controllers/screen.js
+++ b/packages/server/src/api/controllers/screen.js
@@ -2,7 +2,7 @@ const CouchDB = require("../../db")
 const { getScreenParams, generateScreenID } = require("../../db/utils")
 const { AccessController } = require("../../utilities/security/roles")
 
-exports.fetch = async (ctx) => {
+exports.fetch = async ctx => {
   const appId = ctx.appId
   const db = new CouchDB(appId)
 
@@ -12,7 +12,7 @@ exports.fetch = async (ctx) => {
         include_docs: true,
       })
     )
-  ).rows.map((element) => element.doc)
+  ).rows.map(element => element.doc)
 
   ctx.body = await new AccessController(appId).checkScreensAccess(
     screens,
@@ -20,7 +20,7 @@ exports.fetch = async (ctx) => {
   )
 }
 
-exports.save = async (ctx) => {
+exports.save = async ctx => {
   const appId = ctx.appId
   const db = new CouchDB(appId)
   let screen = ctx.request.body
@@ -38,7 +38,7 @@ exports.save = async (ctx) => {
   }
 }
 
-exports.destroy = async (ctx) => {
+exports.destroy = async ctx => {
   const db = new CouchDB(ctx.appId)
   await db.remove(ctx.params.screenId, ctx.params.screenRev)
   ctx.body = {
diff --git a/packages/server/src/api/controllers/search/index.js b/packages/server/src/api/controllers/search/index.js
index 87dc9a1f09..234c7eb258 100644
--- a/packages/server/src/api/controllers/search/index.js
+++ b/packages/server/src/api/controllers/search/index.js
@@ -1,6 +1,6 @@
 const { QueryBuilder, buildSearchUrl, search } = require("./utils")
 
-exports.rowSearch = async (ctx) => {
+exports.rowSearch = async ctx => {
   const appId = ctx.appId
   const { tableId } = ctx.params
   const { bookmark, query, raw } = ctx.request.body
diff --git a/packages/server/src/api/controllers/search/utils.js b/packages/server/src/api/controllers/search/utils.js
index 18c10ceb93..d3ffb26be7 100644
--- a/packages/server/src/api/controllers/search/utils.js
+++ b/packages/server/src/api/controllers/search/utils.js
@@ -116,7 +116,7 @@ class QueryBuilder {
   }
 }
 
-exports.search = async (query) => {
+exports.search = async query => {
   const response = await fetch(query, {
     method: "GET",
   })
@@ -125,7 +125,7 @@ exports.search = async (query) => {
     rows: [],
   }
   if (json.rows != null && json.rows.length > 0) {
-    output.rows = json.rows.map((row) => row.doc)
+    output.rows = json.rows.map(row => row.doc)
   }
   if (json.bookmark) {
     output.bookmark = json.bookmark
diff --git a/packages/server/src/api/controllers/static/index.js b/packages/server/src/api/controllers/static/index.js
index 750297f8ef..b9e4e52e53 100644
--- a/packages/server/src/api/controllers/static/index.js
+++ b/packages/server/src/api/controllers/static/index.js
@@ -43,7 +43,7 @@ exports.uploadFile = async function (ctx) {
       ? Array.from(ctx.request.files.file)
       : [ctx.request.files.file]
 
-  const uploads = files.map(async (file) => {
+  const uploads = files.map(async file => {
     const fileExtension = [...file.name.split(".")].pop()
     // filenames converted to UUIDs so they are unique
     const processedFileName = `${uuid.v4()}.${fileExtension}`
diff --git a/packages/server/src/api/controllers/table/index.js b/packages/server/src/api/controllers/table/index.js
index 221febe6ff..4299727135 100644
--- a/packages/server/src/api/controllers/table/index.js
+++ b/packages/server/src/api/controllers/table/index.js
@@ -16,7 +16,7 @@ exports.fetch = async function (ctx) {
       include_docs: true,
     })
   )
-  ctx.body = body.rows.map((row) => row.doc)
+  ctx.body = body.rows.map(row => row.doc)
 }
 
 exports.find = async function (ctx) {
@@ -137,7 +137,7 @@ exports.destroy = async function (ctx) {
       include_docs: true,
     })
   )
-  await db.bulkDocs(rows.rows.map((row) => ({ ...row.doc, _deleted: true })))
+  await db.bulkDocs(rows.rows.map(row => ({ ...row.doc, _deleted: true })))
 
   // update linked rows
   await linkRows.updateLinks({
@@ -152,7 +152,7 @@ exports.destroy = async function (ctx) {
   // remove table search index
   const currentIndexes = await db.getIndexes()
   const existingIndex = currentIndexes.indexes.find(
-    (existing) => existing.name === `search:${ctx.params.tableId}`
+    existing => existing.name === `search:${ctx.params.tableId}`
   )
   if (existingIndex) {
     await db.deleteIndex(existingIndex)
diff --git a/packages/server/src/api/controllers/table/utils.js b/packages/server/src/api/controllers/table/utils.js
index a549f248f5..3cf64e8e31 100644
--- a/packages/server/src/api/controllers/table/utils.js
+++ b/packages/server/src/api/controllers/table/utils.js
@@ -16,7 +16,7 @@ exports.checkForColumnUpdates = async (db, oldTable, updatedTable) => {
   let deletedColumns = []
   if (oldTable && oldTable.schema && updatedTable.schema) {
     deletedColumns = Object.keys(oldTable.schema).filter(
-      (colName) => updatedTable.schema[colName] == null
+      colName => updatedTable.schema[colName] == null
     )
   }
   // check for renaming of columns or deleted columns
@@ -31,7 +31,7 @@ exports.checkForColumnUpdates = async (db, oldTable, updatedTable) => {
         doc[rename.updated] = doc[rename.old]
         delete doc[rename.old]
       } else if (deletedColumns.length !== 0) {
-        deletedColumns.forEach((colName) => delete doc[colName])
+        deletedColumns.forEach(colName => delete doc[colName])
       }
       return doc
     })
@@ -102,12 +102,12 @@ exports.handleSearchIndexes = async (appId, table) => {
     const indexName = `search:${table._id}`
 
     const existingIndex = currentIndexes.indexes.find(
-      (existing) => existing.name === indexName
+      existing => existing.name === indexName
     )
 
     if (existingIndex) {
       const currentFields = existingIndex.def.fields.map(
-        (field) => Object.keys(field)[0]
+        field => Object.keys(field)[0]
       )
 
       // if index fields have changed, delete the original index
@@ -138,7 +138,7 @@ exports.handleSearchIndexes = async (appId, table) => {
   return table
 }
 
-exports.checkStaticTables = (table) => {
+exports.checkStaticTables = table => {
   // check user schema has all required elements
   if (table._id === InternalTables.USER_METADATA) {
     for (let [key, schema] of Object.entries(USERS_TABLE_SCHEMA.schema)) {
diff --git a/packages/server/src/api/controllers/user.js b/packages/server/src/api/controllers/user.js
index cbcebe93cc..b0f7761602 100644
--- a/packages/server/src/api/controllers/user.js
+++ b/packages/server/src/api/controllers/user.js
@@ -22,11 +22,11 @@ exports.fetchMetadata = async function (ctx) {
         include_docs: true,
       })
     )
-  ).rows.map((row) => row.doc)
+  ).rows.map(row => row.doc)
   const users = []
   for (let user of global) {
     // find the metadata that matches up to the global ID
-    const info = metadata.find((meta) => meta._id.includes(user._id))
+    const info = metadata.find(meta => meta._id.includes(user._id))
     // remove these props, not for the correct DB
     users.push({
       ...user,
diff --git a/packages/server/src/api/controllers/view/exporters.js b/packages/server/src/api/controllers/view/exporters.js
index bdd9ce1a3e..830aef1832 100644
--- a/packages/server/src/api/controllers/view/exporters.js
+++ b/packages/server/src/api/controllers/view/exporters.js
@@ -1,9 +1,9 @@
 exports.csv = function (headers, rows) {
-  let csv = headers.map((key) => `"${key}"`).join(",")
+  let csv = headers.map(key => `"${key}"`).join(",")
 
   for (let row of rows) {
     csv = `${csv}\n${headers
-      .map((header) => `"${row[header]}"`.trim())
+      .map(header => `"${row[header]}"`.trim())
       .join(",")}`
   }
   return csv
diff --git a/packages/server/src/api/controllers/view/index.js b/packages/server/src/api/controllers/view/index.js
index dc3b9c0bec..3d0f236fce 100644
--- a/packages/server/src/api/controllers/view/index.js
+++ b/packages/server/src/api/controllers/view/index.js
@@ -6,7 +6,7 @@ const { fetchView } = require("../row")
 const { ViewNames } = require("../../../db/utils")
 
 const controller = {
-  fetch: async (ctx) => {
+  fetch: async ctx => {
     const db = new CouchDB(ctx.appId)
     const designDoc = await db.get("_design/database")
     const response = []
@@ -24,7 +24,7 @@ const controller = {
 
     ctx.body = response
   },
-  save: async (ctx) => {
+  save: async ctx => {
     const db = new CouchDB(ctx.appId)
     const { originalName, ...viewToSave } = ctx.request.body
     const designDoc = await db.get("_design/database")
@@ -65,7 +65,7 @@ const controller = {
       name: viewToSave.name,
     }
   },
-  destroy: async (ctx) => {
+  destroy: async ctx => {
     const db = new CouchDB(ctx.appId)
     const designDoc = await db.get("_design/database")
     const viewName = decodeURI(ctx.params.viewName)
@@ -80,7 +80,7 @@ const controller = {
 
     ctx.body = view
   },
-  exportView: async (ctx) => {
+  exportView: async ctx => {
     const db = new CouchDB(ctx.appId)
     const designDoc = await db.get("_design/database")
     const viewName = decodeURI(ctx.query.view)
diff --git a/packages/server/src/api/controllers/webhook.js b/packages/server/src/api/controllers/webhook.js
index f83de104fb..c810f85004 100644
--- a/packages/server/src/api/controllers/webhook.js
+++ b/packages/server/src/api/controllers/webhook.js
@@ -21,17 +21,17 @@ exports.WebhookType = {
   AUTOMATION: "automation",
 }
 
-exports.fetch = async (ctx) => {
+exports.fetch = async ctx => {
   const db = new CouchDB(ctx.appId)
   const response = await db.allDocs(
     getWebhookParams(null, {
       include_docs: true,
     })
   )
-  ctx.body = response.rows.map((row) => row.doc)
+  ctx.body = response.rows.map(row => row.doc)
 }
 
-exports.save = async (ctx) => {
+exports.save = async ctx => {
   const db = new CouchDB(ctx.appId)
   const webhook = ctx.request.body
   webhook.appId = ctx.appId
@@ -50,12 +50,12 @@ exports.save = async (ctx) => {
   }
 }
 
-exports.destroy = async (ctx) => {
+exports.destroy = async ctx => {
   const db = new CouchDB(ctx.appId)
   ctx.body = await db.remove(ctx.params.id, ctx.params.rev)
 }
 
-exports.buildSchema = async (ctx) => {
+exports.buildSchema = async ctx => {
   const db = new CouchDB(ctx.params.instance)
   const webhook = await db.get(ctx.params.id)
   webhook.bodySchema = toJsonSchema(ctx.request.body)
@@ -75,7 +75,7 @@ exports.buildSchema = async (ctx) => {
   ctx.body = await db.put(webhook)
 }
 
-exports.trigger = async (ctx) => {
+exports.trigger = async ctx => {
   const db = new CouchDB(ctx.params.instance)
   const webhook = await db.get(ctx.params.id)
   // validate against the schema
diff --git a/packages/server/src/api/index.js b/packages/server/src/api/index.js
index 8708fee6af..81a86820e7 100644
--- a/packages/server/src/api/index.js
+++ b/packages/server/src/api/index.js
@@ -40,6 +40,7 @@ router
     }
     await next()
   })
+<<<<<<< HEAD
   .use("/bulladmin", (ctx) => {
     ctx.status = 200
     ctx.respond = false
@@ -47,6 +48,10 @@ router
   })
   .use("/health", (ctx) => (ctx.status = 200))
   .use("/version", (ctx) => (ctx.body = pkg.version))
+=======
+  .use("/health", ctx => (ctx.status = 200))
+  .use("/version", ctx => (ctx.body = pkg.version))
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
   .use(buildAuthMiddleware(NO_AUTH_ENDPOINTS))
   .use(currentApp)
 
@@ -67,7 +72,7 @@ router.use(async (ctx, next) => {
   }
 })
 
-router.get("/health", (ctx) => (ctx.status = 200))
+router.get("/health", ctx => (ctx.status = 200))
 
 // authenticated routes
 for (let route of mainRoutes) {
diff --git a/packages/server/src/api/routes/tests/utilities/TestFunctions.js b/packages/server/src/api/routes/tests/utilities/TestFunctions.js
index 5ad3ed61be..0e11dd2056 100644
--- a/packages/server/src/api/routes/tests/utilities/TestFunctions.js
+++ b/packages/server/src/api/routes/tests/utilities/TestFunctions.js
@@ -7,7 +7,7 @@ function Request(appId, params) {
   this.params = params
 }
 
-exports.getAllTableRows = async (config) => {
+exports.getAllTableRows = async config => {
   const req = new Request(config.appId, { tableId: config.table._id })
   await rowController.fetchTableRows(req)
   return req.body
@@ -26,7 +26,7 @@ exports.clearAllApps = async () => {
   }
 }
 
-exports.clearAllAutomations = async (config) => {
+exports.clearAllAutomations = async config => {
   const automations = await config.getAllAutomations()
   for (let auto of automations) {
     await config.deleteAutomation(auto)
@@ -88,6 +88,6 @@ exports.checkPermissionsEndpoint = async ({
     .expect(403)
 }
 
-exports.getDB = (config) => {
+exports.getDB = config => {
   return new CouchDB(config.getAppId())
 }
diff --git a/packages/server/src/api/routes/tests/utilities/index.js b/packages/server/src/api/routes/tests/utilities/index.js
index b8b9e04ec3..e9361aa67d 100644
--- a/packages/server/src/api/routes/tests/utilities/index.js
+++ b/packages/server/src/api/routes/tests/utilities/index.js
@@ -11,7 +11,7 @@ jest.mock("../../../../utilities/workerRequests", () => ({
   }),
 }))
 
-exports.delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms))
+exports.delay = ms => new Promise(resolve => setTimeout(resolve, ms))
 
 let request, config
 
@@ -44,7 +44,7 @@ exports.getConfig = () => {
   return config
 }
 
-exports.switchToSelfHosted = async (func) => {
+exports.switchToSelfHosted = async func => {
   // self hosted stops any attempts to Dynamo
   env._set("NODE_ENV", "production")
   env._set("SELF_HOSTED", true)
diff --git a/packages/server/src/app.js b/packages/server/src/app.js
index 87435d68a8..f08c7934bb 100644
--- a/packages/server/src/app.js
+++ b/packages/server/src/app.js
@@ -73,7 +73,7 @@ module.exports = server.listen(env.PORT || 0, async () => {
   await automations.init()
 })
 
-process.on("uncaughtException", (err) => {
+process.on("uncaughtException", err => {
   console.error(err)
   server.close()
   server.destroy()
diff --git a/packages/server/src/automations/index.js b/packages/server/src/automations/index.js
index e50b853a9e..8f30b6b32f 100644
--- a/packages/server/src/automations/index.js
+++ b/packages/server/src/automations/index.js
@@ -9,7 +9,7 @@ let workers = workerFarm(require.resolve("./thread"))
 
 function runWorker(job) {
   return new Promise((resolve, reject) => {
-    workers(job, (err) => {
+    workers(job, err => {
       if (err) {
         reject(err)
       } else {
@@ -32,7 +32,7 @@ async function updateQuota(automation) {
  */
 module.exports.init = async function () {
   await actions.init()
-  triggers.automationQueue.process(async (job) => {
+  triggers.automationQueue.process(async job => {
     try {
       if (env.USE_QUOTAS) {
         job.data.automation.apiKey = await updateQuota(job.data.automation)
diff --git a/packages/server/src/automations/tests/utilities/index.js b/packages/server/src/automations/tests/utilities/index.js
index 7f65d08690..ab9de55430 100644
--- a/packages/server/src/automations/tests/utilities/index.js
+++ b/packages/server/src/automations/tests/utilities/index.js
@@ -17,7 +17,7 @@ exports.afterAll = () => {
   config.end()
 }
 
-exports.runInProd = async (fn) => {
+exports.runInProd = async fn => {
   env._set("NODE_ENV", "production")
   env._set("USE_QUOTAS", 1)
   let error
@@ -37,7 +37,7 @@ exports.runStep = async function runStep(stepId, inputs) {
   let step
   if (
     Object.values(exports.actions)
-      .map((action) => action.stepId)
+      .map(action => action.stepId)
       .includes(stepId)
   ) {
     step = await actions.getAction(stepId)
diff --git a/packages/server/src/automations/triggers.js b/packages/server/src/automations/triggers.js
index c214be9dd1..e11784eb95 100644
--- a/packages/server/src/automations/triggers.js
+++ b/packages/server/src/automations/triggers.js
@@ -208,8 +208,8 @@ async function queueRelevantRowAutomations(event, eventType) {
 
   // filter down to the correct event type
   automations = automations.rows
-    .map((automation) => automation.doc)
-    .filter((automation) => {
+    .map(automation => automation.doc)
+    .filter(automation => {
       const trigger = automation.definition.trigger
       return trigger && trigger.event === eventType
     })
diff --git a/packages/server/src/constants/screens.js b/packages/server/src/constants/screens.js
index 0634758929..ac6112a63f 100644
--- a/packages/server/src/constants/screens.js
+++ b/packages/server/src/constants/screens.js
@@ -50,7 +50,7 @@ exports.createHomeScreen = () => ({
   name: "home-screen",
 })
 
-exports.createLoginScreen = (app) => ({
+exports.createLoginScreen = app => ({
   description: "",
   url: "",
   layoutId: BASE_LAYOUT_PROP_IDS.PUBLIC,
diff --git a/packages/server/src/db/builder.js b/packages/server/src/db/builder.js
index 21ff25d327..d2bbcd404b 100644
--- a/packages/server/src/db/builder.js
+++ b/packages/server/src/db/builder.js
@@ -27,7 +27,7 @@ exports.getBuilderMainDoc = async () => {
   }
 }
 
-exports.setBuilderMainDoc = async (doc) => {
+exports.setBuilderMainDoc = async doc => {
   if (!env.SELF_HOSTED) {
     throw SELF_HOST_ERR
   }
diff --git a/packages/server/src/db/client.js b/packages/server/src/db/client.js
index bf86603270..3e3a4f50fe 100644
--- a/packages/server/src/db/client.js
+++ b/packages/server/src/db/client.js
@@ -31,7 +31,7 @@ allDbs(Pouch)
 /* istanbul ignore next */
 // eslint-disable-next-line no-unused-vars
 function replicateLocal() {
-  Pouch.allDbs().then((dbs) => {
+  Pouch.allDbs().then(dbs => {
     for (let db of dbs) {
       new Pouch(db).sync(
         new PouchDB(`http://127.0.0.1:5984/${db}`, { live: true })
diff --git a/packages/server/src/db/dynamoClient.js b/packages/server/src/db/dynamoClient.js
index 59e21c6119..19924b1a7e 100644
--- a/packages/server/src/db/dynamoClient.js
+++ b/packages/server/src/db/dynamoClient.js
@@ -100,7 +100,7 @@ class Table {
   }
 }
 
-exports.init = (endpoint) => {
+exports.init = endpoint => {
   let AWS = require("aws-sdk")
   AWS.config.update({
     region: AWS_REGION,
diff --git a/packages/server/src/db/linkedRows/LinkController.js b/packages/server/src/db/linkedRows/LinkController.js
index 1be4bb9fec..53ce8e45ad 100644
--- a/packages/server/src/db/linkedRows/LinkController.js
+++ b/packages/server/src/db/linkedRows/LinkController.js
@@ -194,11 +194,11 @@ class LinkController {
       if (field.type === FieldTypes.LINK && rowField != null) {
         // check which links actual pertain to the update in this row
         const thisFieldLinkDocs = linkDocs.filter(
-          (linkDoc) =>
+          linkDoc =>
             linkDoc.doc1.fieldName === fieldName ||
             linkDoc.doc2.fieldName === fieldName
         )
-        const linkDocIds = thisFieldLinkDocs.map((linkDoc) => {
+        const linkDocIds = thisFieldLinkDocs.map(linkDoc => {
           return linkDoc.doc1.rowId === row._id
             ? linkDoc.doc2.rowId
             : linkDoc.doc1.rowId
@@ -218,7 +218,7 @@ class LinkController {
                 rowId: linkId,
                 includeDocs: IncludeDocs.EXCLUDE,
               })
-            ).filter((link) => link.id !== row._id)
+            ).filter(link => link.id !== row._id)
 
             // The 1 side of 1:N is already related to something else
             // You must remove the existing relationship
@@ -251,12 +251,12 @@ class LinkController {
         }
         // find the docs that need to be deleted
         let toDeleteDocs = thisFieldLinkDocs
-          .filter((doc) => {
+          .filter(doc => {
             let correctDoc =
               doc.doc1.fieldName === fieldName ? doc.doc2 : doc.doc1
             return rowField.indexOf(correctDoc.rowId) === -1
           })
-          .map((doc) => {
+          .map(doc => {
             return { ...doc, _deleted: true }
           })
         // now add the docs to be deleted to the bulk operation
@@ -282,7 +282,7 @@ class LinkController {
     if (linkDocs.length === 0) {
       return null
     }
-    const toDelete = linkDocs.map((doc) => {
+    const toDelete = linkDocs.map(doc => {
       return {
         ...doc,
         _deleted: true,
@@ -301,7 +301,7 @@ class LinkController {
     let oldTable = this._oldTable
     let field = oldTable.schema[fieldName]
     const linkDocs = await this.getTableLinkDocs()
-    let toDelete = linkDocs.filter((linkDoc) => {
+    let toDelete = linkDocs.filter(linkDoc => {
       let correctFieldName =
         linkDoc.doc1.tableId === oldTable._id
           ? linkDoc.doc1.fieldName
@@ -309,7 +309,7 @@ class LinkController {
       return correctFieldName === fieldName
     })
     await this._db.bulkDocs(
-      toDelete.map((doc) => {
+      toDelete.map(doc => {
         return {
           ...doc,
           _deleted: true,
@@ -434,7 +434,7 @@ class LinkController {
       return null
     }
     // get link docs for this table and configure for deletion
-    const toDelete = linkDocs.map((doc) => {
+    const toDelete = linkDocs.map(doc => {
       return {
         ...doc,
         _deleted: true,
diff --git a/packages/server/src/db/linkedRows/index.js b/packages/server/src/db/linkedRows/index.js
index 0c129d62fa..386741e42a 100644
--- a/packages/server/src/db/linkedRows/index.js
+++ b/packages/server/src/db/linkedRows/index.js
@@ -33,11 +33,11 @@ exports.getLinkDocuments = getLinkDocuments
 exports.createLinkView = createLinkView
 
 async function getLinksForRows(appId, rows) {
-  const tableIds = [...new Set(rows.map((el) => el.tableId))]
+  const tableIds = [...new Set(rows.map(el => el.tableId))]
   // start by getting all the link values for performance reasons
   const responses = flatten(
     await Promise.all(
-      tableIds.map((tableId) =>
+      tableIds.map(tableId =>
         getLinkDocuments({
           appId,
           tableId: tableId,
@@ -51,7 +51,7 @@ async function getLinksForRows(appId, rows) {
   return getUniqueByProp(
     responses
       // create a unique ID which we can use for getting only unique ones
-      .map((el) => ({ ...el, unique: el.id + el.thisId + el.fieldName })),
+      .map(el => ({ ...el, unique: el.id + el.thisId + el.fieldName })),
     "unique"
   )
 }
@@ -127,8 +127,8 @@ exports.attachLinkIDs = async (appId, rows) => {
   for (let row of rows) {
     // find anything that matches the row's ID we are searching for and join it
     links
-      .filter((el) => el.thisId === row._id)
-      .forEach((link) => {
+      .filter(el => el.thisId === row._id)
+      .forEach(link => {
         if (row[link.fieldName] == null) {
           row[link.fieldName] = []
         }
@@ -154,21 +154,21 @@ exports.attachLinkedPrimaryDisplay = async (appId, table, rows) => {
     return rows
   }
   const db = new CouchDB(appId)
-  const links = (await getLinksForRows(appId, rows)).filter((link) =>
-    rows.some((row) => row._id === link.thisId)
+  const links = (await getLinksForRows(appId, rows)).filter(link =>
+    rows.some(row => row._id === link.thisId)
   )
-  const linkedRowIds = links.map((link) => link.id)
+  const linkedRowIds = links.map(link => link.id)
   const linked = (await db.allDocs(getMultiIDParams(linkedRowIds))).rows.map(
-    (row) => row.doc
+    row => row.doc
   )
   // will populate this as we find them
   const linkedTables = []
   for (let row of rows) {
-    for (let link of links.filter((link) => link.thisId === row._id)) {
+    for (let link of links.filter(link => link.thisId === row._id)) {
       if (row[link.fieldName] == null) {
         row[link.fieldName] = []
       }
-      const linkedRow = linked.find((row) => row._id === link.id)
+      const linkedRow = linked.find(row => row._id === link.id)
       const linkedTableId =
         linkedRow.tableId || getRelatedTableForField(table, link.fieldName)
       const linkedTable = await getLinkedTable(db, linkedTableId, linkedTables)
diff --git a/packages/server/src/db/linkedRows/linkUtils.js b/packages/server/src/db/linkedRows/linkUtils.js
index 6c28918555..fc3e71b8d9 100644
--- a/packages/server/src/db/linkedRows/linkUtils.js
+++ b/packages/server/src/db/linkedRows/linkUtils.js
@@ -49,7 +49,7 @@ exports.getLinkDocuments = async function ({
     let linkRows = (await db.query(getQueryIndex(ViewNames.LINK), params)).rows
     // filter to get unique entries
     const foundIds = []
-    linkRows = linkRows.filter((link) => {
+    linkRows = linkRows.filter(link => {
       // make sure anything unique is the correct key
       if (
         (tableId && link.key[0] !== tableId) ||
@@ -65,9 +65,9 @@ exports.getLinkDocuments = async function ({
     })
 
     if (includeDocs) {
-      return linkRows.map((row) => row.doc)
+      return linkRows.map(row => row.doc)
     } else {
-      return linkRows.map((row) => row.value)
+      return linkRows.map(row => row.value)
     }
   } catch (err) {
     // check if the view doesn't exist, it should for all new instances
@@ -83,18 +83,18 @@ exports.getLinkDocuments = async function ({
 
 exports.getUniqueByProp = (array, prop) => {
   return array.filter((obj, pos, arr) => {
-    return arr.map((mapObj) => mapObj[prop]).indexOf(obj[prop]) === pos
+    return arr.map(mapObj => mapObj[prop]).indexOf(obj[prop]) === pos
   })
 }
 
-exports.getLinkedTableIDs = (table) => {
+exports.getLinkedTableIDs = table => {
   return Object.values(table.schema)
-    .filter((column) => column.type === FieldTypes.LINK)
-    .map((column) => column.tableId)
+    .filter(column => column.type === FieldTypes.LINK)
+    .map(column => column.tableId)
 }
 
 exports.getLinkedTable = async (db, id, tables) => {
-  let linkedTable = tables.find((table) => table._id === id)
+  let linkedTable = tables.find(table => table._id === id)
   if (linkedTable) {
     return linkedTable
   }
diff --git a/packages/server/src/db/utils.js b/packages/server/src/db/utils.js
index 0d492cde33..bbed248cf8 100644
--- a/packages/server/src/db/utils.js
+++ b/packages/server/src/db/utils.js
@@ -52,7 +52,7 @@ exports.SEPARATOR = SEPARATOR
 exports.UNICODE_MAX = UNICODE_MAX
 exports.SearchIndexes = SearchIndexes
 
-exports.getQueryIndex = (viewName) => {
+exports.getQueryIndex = viewName => {
   return `database/${viewName}`
 }
 
@@ -135,14 +135,14 @@ exports.getUserMetadataParams = (userId = null, otherProps = {}) => {
  * @param {string} globalId The ID of the global user.
  * @returns {string} The new user ID which the user doc can be stored under.
  */
-exports.generateUserMetadataID = (globalId) => {
+exports.generateUserMetadataID = globalId => {
   return exports.generateRowID(InternalTables.USER_METADATA, globalId)
 }
 
 /**
  * Breaks up the ID to get the global ID.
  */
-exports.getGlobalIDFromUserMetadataID = (id) => {
+exports.getGlobalIDFromUserMetadataID = id => {
   return id.split(
     `${DocumentTypes.ROW}${SEPARATOR}${InternalTables.USER_METADATA}${SEPARATOR}`
   )[1]
@@ -214,7 +214,7 @@ exports.getAppParams = (appId = null, otherProps = {}) => {
  * Generates a new role ID.
  * @returns {string} The new role ID which the role doc can be stored under.
  */
-exports.generateRoleID = (id) => {
+exports.generateRoleID = id => {
   return `${DocumentTypes.ROLE}${SEPARATOR}${id || newid()}`
 }
 
@@ -229,7 +229,7 @@ exports.getRoleParams = (roleId = null, otherProps = {}) => {
  * Generates a new layout ID.
  * @returns {string} The new layout ID which the layout doc can be stored under.
  */
-exports.generateLayoutID = (id) => {
+exports.generateLayoutID = id => {
   return `${DocumentTypes.LAYOUT}${SEPARATOR}${id || newid()}`
 }
 
@@ -289,7 +289,7 @@ exports.getDatasourceParams = (datasourceId = null, otherProps = {}) => {
  * Generates a new query ID.
  * @returns {string} The new query ID which the query doc can be stored under.
  */
-exports.generateQueryID = (datasourceId) => {
+exports.generateQueryID = datasourceId => {
   return `${
     DocumentTypes.QUERY
   }${SEPARATOR}${datasourceId}${SEPARATOR}${newid()}`
@@ -313,7 +313,7 @@ exports.getQueryParams = (datasourceId = null, otherProps = {}) => {
 /**
  * This can be used with the db.allDocs to get a list of IDs
  */
-exports.getMultiIDParams = (ids) => {
+exports.getMultiIDParams = ids => {
   return {
     keys: ids,
     include_docs: true,
diff --git a/packages/server/src/db/views/staticViews.js b/packages/server/src/db/views/staticViews.js
index f1fcd05275..5f5bc7db14 100644
--- a/packages/server/src/db/views/staticViews.js
+++ b/packages/server/src/db/views/staticViews.js
@@ -25,7 +25,7 @@ const SCREEN_PREFIX = DocumentTypes.SCREEN + SEPARATOR
  * @returns {Promise<void>} The view now exists, please note that the next view of this query will actually build it,
  * so it may be slow.
  */
-exports.createLinkView = async (appId) => {
+exports.createLinkView = async appId => {
   const db = new CouchDB(appId)
   const designDoc = await db.get("_design/database")
   const view = {
@@ -57,7 +57,7 @@ exports.createLinkView = async (appId) => {
   await db.put(designDoc)
 }
 
-exports.createRoutingView = async (appId) => {
+exports.createRoutingView = async appId => {
   const db = new CouchDB(appId)
   const designDoc = await db.get("_design/database")
   const view = {
@@ -89,7 +89,7 @@ async function searchIndex(appId, indexName, fnString) {
   await db.put(designDoc)
 }
 
-exports.createAllSearchIndex = async (appId) => {
+exports.createAllSearchIndex = async appId => {
   await searchIndex(
     appId,
     SearchIndexes.ROWS,
diff --git a/packages/server/src/integrations/couchdb.js b/packages/server/src/integrations/couchdb.js
index 3dd6a5898f..df58b0e487 100644
--- a/packages/server/src/integrations/couchdb.js
+++ b/packages/server/src/integrations/couchdb.js
@@ -61,7 +61,7 @@ class CouchDBIntegration {
         include_docs: true,
         ...query.json,
       })
-      return result.rows.map((row) => row.doc)
+      return result.rows.map(row => row.doc)
     } catch (err) {
       console.error("Error querying couchDB", err)
       throw err
diff --git a/packages/server/src/middleware/joi-validator.js b/packages/server/src/middleware/joi-validator.js
index 8e5feab255..1686b0e727 100644
--- a/packages/server/src/middleware/joi-validator.js
+++ b/packages/server/src/middleware/joi-validator.js
@@ -19,10 +19,10 @@ function validate(schema, property) {
   }
 }
 
-module.exports.body = (schema) => {
+module.exports.body = schema => {
   return validate(schema, "body")
 }
 
-module.exports.params = (schema) => {
+module.exports.params = schema => {
   return validate(schema, "params")
 }
diff --git a/packages/server/src/middleware/resourceId.js b/packages/server/src/middleware/resourceId.js
index 1c677f6b9e..4216131119 100644
--- a/packages/server/src/middleware/resourceId.js
+++ b/packages/server/src/middleware/resourceId.js
@@ -38,7 +38,7 @@ class ResourceIdGetter {
 
 module.exports.ResourceIdGetter = ResourceIdGetter
 
-module.exports.paramResource = (main) => {
+module.exports.paramResource = main => {
   return new ResourceIdGetter("params").mainResource(main).build()
 }
 
@@ -49,7 +49,7 @@ module.exports.paramSubResource = (main, sub) => {
     .build()
 }
 
-module.exports.bodyResource = (main) => {
+module.exports.bodyResource = main => {
   return new ResourceIdGetter("body").mainResource(main).build()
 }
 
diff --git a/packages/server/src/middleware/usageQuota.js b/packages/server/src/middleware/usageQuota.js
index 02d1f6d13c..ac8336e769 100644
--- a/packages/server/src/middleware/usageQuota.js
+++ b/packages/server/src/middleware/usageQuota.js
@@ -54,7 +54,7 @@ module.exports = async (ctx, next) => {
       ctx.request.files.file.length > 1
         ? Array.from(ctx.request.files.file)
         : [ctx.request.files.file]
-    usage = files.map((file) => file.size).reduce((total, size) => total + size)
+    usage = files.map(file => file.size).reduce((total, size) => total + size)
   }
   try {
     await usageQuota.update(ctx.auth.apiKey, property, usage)
diff --git a/packages/server/src/tests/utilities/TestConfiguration.js b/packages/server/src/tests/utilities/TestConfiguration.js
index 34d5bf0da5..c031cf082d 100644
--- a/packages/server/src/tests/utilities/TestConfiguration.js
+++ b/packages/server/src/tests/utilities/TestConfiguration.js
@@ -89,7 +89,7 @@ class TestConfiguration {
     if (this.server) {
       this.server.close()
     }
-    cleanup(this.allApps.map((app) => app._id))
+    cleanup(this.allApps.map(app => app._id))
   }
 
   defaultHeaders() {
diff --git a/packages/server/src/tests/utilities/index.js b/packages/server/src/tests/utilities/index.js
index 46bbae470a..aa8039ce2f 100644
--- a/packages/server/src/tests/utilities/index.js
+++ b/packages/server/src/tests/utilities/index.js
@@ -1,4 +1,4 @@
-exports.makePartial = (obj) => {
+exports.makePartial = obj => {
   const newObj = {}
   for (let key of Object.keys(obj)) {
     if (typeof obj[key] === "object") {
diff --git a/packages/server/src/tests/utilities/structures.js b/packages/server/src/tests/utilities/structures.js
index b3a103adf2..5e27ff4a3b 100644
--- a/packages/server/src/tests/utilities/structures.js
+++ b/packages/server/src/tests/utilities/structures.js
@@ -44,7 +44,7 @@ exports.basicAutomation = () => {
   }
 }
 
-exports.basicRow = (tableId) => {
+exports.basicRow = tableId => {
   return {
     name: "Test Contact",
     description: "original description",
@@ -78,7 +78,7 @@ exports.basicDatasource = () => {
   }
 }
 
-exports.basicQuery = (datasourceId) => {
+exports.basicQuery = datasourceId => {
   return {
     datasourceId: datasourceId,
     name: "New Query",
@@ -89,7 +89,7 @@ exports.basicQuery = (datasourceId) => {
   }
 }
 
-exports.basicUser = (role) => {
+exports.basicUser = role => {
   return {
     email: "bill@bill.com",
     password: "yeeooo",
@@ -105,7 +105,7 @@ exports.basicLayout = () => {
   return cloneDeep(EMPTY_LAYOUT)
 }
 
-exports.basicWebhook = (automationId) => {
+exports.basicWebhook = automationId => {
   return {
     live: true,
     name: "webhook",
diff --git a/packages/server/src/utilities/bcrypt.js b/packages/server/src/utilities/bcrypt.js
index 1457afb350..6c52d2c2c7 100644
--- a/packages/server/src/utilities/bcrypt.js
+++ b/packages/server/src/utilities/bcrypt.js
@@ -5,7 +5,7 @@ const env = require("../environment")
 
 const SALT_ROUNDS = env.SALT_ROUNDS || 10
 
-exports.hash = async (data) => {
+exports.hash = async data => {
   const salt = await bcrypt.genSalt(SALT_ROUNDS)
   const result = await bcrypt.hash(data, salt)
   return result
diff --git a/packages/server/src/utilities/builder/hosting.js b/packages/server/src/utilities/builder/hosting.js
index 73ce93e261..271e4a1b07 100644
--- a/packages/server/src/utilities/builder/hosting.js
+++ b/packages/server/src/utilities/builder/hosting.js
@@ -42,7 +42,7 @@ exports.getHostingInfo = async () => {
   return doc
 }
 
-exports.getAppUrl = async (appId) => {
+exports.getAppUrl = async appId => {
   const hostingInfo = await exports.getHostingInfo()
   const protocol = getProtocol(hostingInfo)
   let url
diff --git a/packages/server/src/utilities/csvParser.js b/packages/server/src/utilities/csvParser.js
index fe63eb9075..3ae020eb65 100644
--- a/packages/server/src/utilities/csvParser.js
+++ b/packages/server/src/utilities/csvParser.js
@@ -2,13 +2,13 @@ const csv = require("csvtojson")
 
 const VALIDATORS = {
   string: () => true,
-  number: (attribute) => !isNaN(Number(attribute)),
-  datetime: (attribute) => !isNaN(new Date(attribute).getTime()),
+  number: attribute => !isNaN(Number(attribute)),
+  datetime: attribute => !isNaN(new Date(attribute).getTime()),
 }
 
 const PARSERS = {
-  number: (attribute) => Number(attribute),
-  datetime: (attribute) => new Date(attribute).toISOString(),
+  number: attribute => Number(attribute),
+  datetime: attribute => new Date(attribute).toISOString(),
 }
 
 function parse(csvString, parsers) {
@@ -17,7 +17,7 @@ function parse(csvString, parsers) {
   const schema = {}
 
   return new Promise((resolve, reject) => {
-    result.on("header", (headers) => {
+    result.on("header", headers => {
       for (let header of headers) {
         schema[header] = {
           type: parsers[header] ? parsers[header].type : "string",
@@ -25,7 +25,7 @@ function parse(csvString, parsers) {
         }
       }
     })
-    result.subscribe((row) => {
+    result.subscribe(row => {
       // For each CSV row parse all the columns that need parsed
       for (let key in parsers) {
         if (!schema[key] || schema[key].success) {
@@ -41,7 +41,7 @@ function parse(csvString, parsers) {
         }
       }
     })
-    result.on("done", (error) => {
+    result.on("done", error => {
       if (error) {
         console.error(error)
         reject(error)
diff --git a/packages/server/src/utilities/fileSystem/index.js b/packages/server/src/utilities/fileSystem/index.js
index 64a9960c80..d84c6deb8a 100644
--- a/packages/server/src/utilities/fileSystem/index.js
+++ b/packages/server/src/utilities/fileSystem/index.js
@@ -73,7 +73,7 @@ exports.checkDevelopmentEnvironment = () => {
  * @param {Object} template The template object retrieved from the Koa context object.
  * @returns {Object} Returns an fs read stream which can be loaded into the database.
  */
-exports.getTemplateStream = async (template) => {
+exports.getTemplateStream = async template => {
   if (template.file) {
     return fs.createReadStream(template.file.path)
   } else {
@@ -89,7 +89,7 @@ exports.getTemplateStream = async (template) => {
  * @param {string} path The path to the handlebars file which is to be loaded.
  * @returns {string} The loaded handlebars file as a string - loaded as utf8.
  */
-exports.loadHandlebarsFile = (path) => {
+exports.loadHandlebarsFile = path => {
   return fs.readFileSync(path, "utf8")
 }
 
@@ -99,7 +99,7 @@ exports.loadHandlebarsFile = (path) => {
  * @param {string} contents the contents of the file which is to be returned from the API.
  * @return {Object} the read stream which can be put into the koa context body.
  */
-exports.apiFileReturn = (contents) => {
+exports.apiFileReturn = contents => {
   const path = join(budibaseTempDir(), uuid())
   fs.writeFileSync(path, contents)
   return fs.createReadStream(path)
@@ -132,7 +132,7 @@ exports.performBackup = async (appId, backupName) => {
  * @param {string} appId The ID of the app which is being created.
  * @return {Promise<void>} once promise completes app resources should be ready in object store.
  */
-exports.createApp = async (appId) => {
+exports.createApp = async appId => {
   await downloadLibraries(appId)
   await newAppPublicPath(appId)
 }
@@ -142,7 +142,7 @@ exports.createApp = async (appId) => {
  * @param {string} appId The ID of the app which is being deleted.
  * @return {Promise<void>} once promise completes the app resources will be removed from object store.
  */
-exports.deleteApp = async (appId) => {
+exports.deleteApp = async appId => {
   await deleteFolder(ObjectStoreBuckets.APPS, `${appId}/`)
 }
 
@@ -225,7 +225,7 @@ exports.readFileSync = (filepath, options = "utf8") => {
 /**
  * Given a set of app IDs makes sure file system is cleared of any of their temp info.
  */
-exports.cleanup = (appIds) => {
+exports.cleanup = appIds => {
   for (let appId of appIds) {
     fs.rmdirSync(join(budibaseTempDir(), appId), { recursive: true })
   }
diff --git a/packages/server/src/utilities/fileSystem/newApp.js b/packages/server/src/utilities/fileSystem/newApp.js
index ae2c6d1bbd..91cc771743 100644
--- a/packages/server/src/utilities/fileSystem/newApp.js
+++ b/packages/server/src/utilities/fileSystem/newApp.js
@@ -8,7 +8,7 @@ const BUCKET_NAME = ObjectStoreBuckets.APPS
 
 // can't really test this due to the downloading nature of it, wouldn't be a great test case
 /* istanbul ignore next */
-exports.downloadLibraries = async (appId) => {
+exports.downloadLibraries = async appId => {
   const LIBRARIES = ["standard-components"]
 
   const paths = {}
@@ -26,7 +26,7 @@ exports.downloadLibraries = async (appId) => {
   return paths
 }
 
-exports.newAppPublicPath = async (appId) => {
+exports.newAppPublicPath = async appId => {
   const path = join(appId, "public")
   const sourcepath = require.resolve("@budibase/client")
   const destPath = join(path, "budibase-client.js")
diff --git a/packages/server/src/utilities/fileSystem/processor.js b/packages/server/src/utilities/fileSystem/processor.js
index 1ad608bf1c..3778b50168 100644
--- a/packages/server/src/utilities/fileSystem/processor.js
+++ b/packages/server/src/utilities/fileSystem/processor.js
@@ -6,7 +6,7 @@ const FORMATS = {
 
 function processImage(file) {
   // this will overwrite the temp file
-  return jimp.read(file.path).then((img) => {
+  return jimp.read(file.path).then(img => {
     return img.resize(300, jimp.AUTO).write(file.path)
   })
 }
diff --git a/packages/server/src/utilities/fileSystem/utilities.js b/packages/server/src/utilities/fileSystem/utilities.js
index 8103b734dd..b586cfcfe5 100644
--- a/packages/server/src/utilities/fileSystem/utilities.js
+++ b/packages/server/src/utilities/fileSystem/utilities.js
@@ -53,7 +53,7 @@ const PUBLIC_BUCKETS = [ObjectStoreBuckets.APPS]
  * @return {Object} an S3 object store object, check S3 Nodejs SDK for usage.
  * @constructor
  */
-exports.ObjectStore = (bucket) => {
+exports.ObjectStore = bucket => {
   if (env.SELF_HOSTED) {
     AWS.config.update({
       accessKeyId: env.MINIO_ACCESS_KEY,
@@ -199,7 +199,7 @@ exports.deleteFolder = async (bucket, folder) => {
     },
   }
 
-  response.Contents.forEach((content) => {
+  response.Contents.forEach(content => {
     deleteParams.Delete.Objects.push({ Key: content.Key })
   })
 
diff --git a/packages/server/src/utilities/index.js b/packages/server/src/utilities/index.js
index 041e558004..4210e6678b 100644
--- a/packages/server/src/utilities/index.js
+++ b/packages/server/src/utilities/index.js
@@ -6,7 +6,7 @@ const { OBJ_STORE_DIRECTORY, ObjectStoreBuckets } = require("../constants")
 const BB_CDN = "https://cdn.app.budi.live/assets"
 const APP_PREFIX = DocumentTypes.APP + SEPARATOR
 
-exports.wait = (ms) => new Promise((resolve) => setTimeout(resolve, ms))
+exports.wait = ms => new Promise(resolve => setTimeout(resolve, ms))
 
 exports.isDev = env.isDev
 
@@ -19,14 +19,14 @@ exports.isDev = env.isDev
  */
 exports.getAllApps = async () => {
   let allDbs = await CouchDB.allDbs()
-  const appDbNames = allDbs.filter((dbName) => dbName.startsWith(APP_PREFIX))
-  const appPromises = appDbNames.map((db) => new CouchDB(db).get(db))
+  const appDbNames = allDbs.filter(dbName => dbName.startsWith(APP_PREFIX))
+  const appPromises = appDbNames.map(db => new CouchDB(db).get(db))
   if (appPromises.length === 0) {
     return []
   } else {
     const response = await Promise.allSettled(appPromises)
     return response
-      .filter((result) => result.status === "fulfilled")
+      .filter(result => result.status === "fulfilled")
       .map(({ value }) => value)
   }
 }
@@ -37,7 +37,7 @@ exports.getAllApps = async () => {
  * @param {string} url The URL to test and remove any extra double slashes.
  * @return {string} The updated url.
  */
-exports.checkSlashesInUrl = (url) => {
+exports.checkSlashesInUrl = url => {
   return url.replace(/(https?:\/\/)|(\/)+/g, "$1$2")
 }
 
@@ -63,7 +63,7 @@ exports.objectStoreUrl = () => {
  * @return {string} The URL to be inserted into appPackage response or server rendered
  * app index file.
  */
-exports.clientLibraryPath = (appId) => {
+exports.clientLibraryPath = appId => {
   if (env.isProd()) {
     return `${exports.objectStoreUrl()}/${appId}/budibase-client.js`
   } else {
@@ -71,7 +71,7 @@ exports.clientLibraryPath = (appId) => {
   }
 }
 
-exports.attachmentsRelativeURL = (attachmentKey) => {
+exports.attachmentsRelativeURL = attachmentKey => {
   return exports.checkSlashesInUrl(
     `/${ObjectStoreBuckets.APPS}/${attachmentKey}`
   )
diff --git a/packages/server/src/utilities/routing/index.js b/packages/server/src/utilities/routing/index.js
index 223eef7664..541733dcc4 100644
--- a/packages/server/src/utilities/routing/index.js
+++ b/packages/server/src/utilities/routing/index.js
@@ -2,14 +2,14 @@ const CouchDB = require("../../db")
 const { createRoutingView } = require("../../db/views/staticViews")
 const { ViewNames, getQueryIndex, UNICODE_MAX } = require("../../db/utils")
 
-exports.getRoutingInfo = async (appId) => {
+exports.getRoutingInfo = async appId => {
   const db = new CouchDB(appId)
   try {
     const allRouting = await db.query(getQueryIndex(ViewNames.ROUTING), {
       startKey: "",
       endKey: UNICODE_MAX,
     })
-    return allRouting.rows.map((row) => row.value)
+    return allRouting.rows.map(row => row.value)
   } catch (err) {
     // check if the view doesn't exist, it should for all new instances
     /* istanbul ignore next */
diff --git a/packages/server/src/utilities/rowProcessor.js b/packages/server/src/utilities/rowProcessor.js
index 28a0ee51ac..ef31e2bee2 100644
--- a/packages/server/src/utilities/rowProcessor.js
+++ b/packages/server/src/utilities/rowProcessor.js
@@ -14,9 +14,9 @@ const TYPE_TRANSFORM_MAP = {
     "": [],
     [null]: [],
     [undefined]: undefined,
-    parse: (link) => {
+    parse: link => {
       if (Array.isArray(link) && typeof link[0] === "object") {
-        return link.map((el) => (el && el._id ? el._id : el))
+        return link.map(el => (el && el._id ? el._id : el))
       }
       if (typeof link === "string") {
         return [link]
@@ -43,13 +43,13 @@ const TYPE_TRANSFORM_MAP = {
     "": null,
     [null]: null,
     [undefined]: undefined,
-    parse: (n) => parseFloat(n),
+    parse: n => parseFloat(n),
   },
   [FieldTypes.DATETIME]: {
     "": null,
     [undefined]: undefined,
     [null]: null,
-    parse: (date) => {
+    parse: date => {
       if (date instanceof Date) {
         return date.toISOString()
       }
@@ -186,7 +186,7 @@ exports.outputProcessing = async (appId, table, rows) => {
         if (row[property] == null || row[property].length === 0) {
           continue
         }
-        row[property].forEach((attachment) => {
+        row[property].forEach(attachment => {
           attachment.url = attachmentsRelativeURL(attachment.key)
         })
       }
diff --git a/packages/server/src/utilities/security/permissions.js b/packages/server/src/utilities/security/permissions.js
index 33d42a9414..03fa5fa562 100644
--- a/packages/server/src/utilities/security/permissions.js
+++ b/packages/server/src/utilities/security/permissions.js
@@ -126,9 +126,9 @@ exports.getBuiltinPermissions = () => {
   return cloneDeep(BUILTIN_PERMISSIONS)
 }
 
-exports.getBuiltinPermissionByID = (id) => {
+exports.getBuiltinPermissionByID = id => {
   const perms = Object.values(BUILTIN_PERMISSIONS)
-  return perms.find((perm) => perm._id === id)
+  return perms.find(perm => perm._id === id)
 }
 
 exports.doesHaveResourcePermission = (
@@ -163,8 +163,8 @@ exports.doesHaveBasePermission = (permType, permLevel, permissionIds) => {
   const builtins = Object.values(BUILTIN_PERMISSIONS)
   let permissions = flatten(
     builtins
-      .filter((builtin) => permissionIds.indexOf(builtin._id) !== -1)
-      .map((builtin) => builtin.permissions)
+      .filter(builtin => permissionIds.indexOf(builtin._id) !== -1)
+      .map(builtin => builtin.permissions)
   )
   for (let permission of permissions) {
     if (
@@ -181,7 +181,7 @@ exports.higherPermission = (perm1, perm2) => {
   return levelToNumber(perm1) > levelToNumber(perm2) ? perm1 : perm2
 }
 
-exports.isPermissionLevelHigherThanRead = (level) => {
+exports.isPermissionLevelHigherThanRead = level => {
   return levelToNumber(level) > 1
 }
 
diff --git a/packages/server/src/utilities/security/roles.js b/packages/server/src/utilities/security/roles.js
index 3517235d00..abfaa5c241 100644
--- a/packages/server/src/utilities/security/roles.js
+++ b/packages/server/src/utilities/security/roles.js
@@ -49,15 +49,15 @@ exports.getBuiltinRoles = () => {
 }
 
 exports.BUILTIN_ROLE_ID_ARRAY = Object.values(BUILTIN_ROLES).map(
-  (role) => role._id
+  role => role._id
 )
 
 exports.BUILTIN_ROLE_NAME_ARRAY = Object.values(BUILTIN_ROLES).map(
-  (role) => role.name
+  role => role.name
 )
 
 function isBuiltin(role) {
-  return exports.BUILTIN_ROLE_ID_ARRAY.some((builtin) => role.includes(builtin))
+  return exports.BUILTIN_ROLE_ID_ARRAY.some(builtin => role.includes(builtin))
 }
 
 /**
@@ -112,7 +112,7 @@ exports.getRole = async (appId, roleId) => {
   // but can be extended by a doc stored about them (e.g. permissions)
   if (isBuiltin(roleId)) {
     role = cloneDeep(
-      Object.values(BUILTIN_ROLES).find((role) => role._id === roleId)
+      Object.values(BUILTIN_ROLES).find(role => role._id === roleId)
     )
   }
   try {
@@ -163,7 +163,7 @@ async function getAllUserRoles(appId, userRoleId) {
  */
 exports.getUserRoleHierarchy = async (appId, userRoleId) => {
   // special case, if they don't have a role then they are a public user
-  return (await getAllUserRoles(appId, userRoleId)).map((role) => role._id)
+  return (await getAllUserRoles(appId, userRoleId)).map(role => role._id)
 }
 
 /**
@@ -176,7 +176,7 @@ exports.getUserRoleHierarchy = async (appId, userRoleId) => {
 exports.getUserPermissions = async (appId, userRoleId) => {
   const rolesHierarchy = await getAllUserRoles(appId, userRoleId)
   const basePermissions = [
-    ...new Set(rolesHierarchy.map((role) => role.permissionId)),
+    ...new Set(rolesHierarchy.map(role => role.permissionId)),
   ]
   const permissions = {}
   for (let role of rolesHierarchy) {
@@ -245,7 +245,7 @@ class AccessController {
 /**
  * Adds the "role_" for builtin role IDs which are to be written to the DB (for permissions).
  */
-exports.getDBRoleID = (roleId) => {
+exports.getDBRoleID = roleId => {
   if (roleId.startsWith(DocumentTypes.ROLE)) {
     return roleId
   }
@@ -255,7 +255,7 @@ exports.getDBRoleID = (roleId) => {
 /**
  * Remove the "role_" from builtin role IDs that have been written to the DB (for permissions).
  */
-exports.getExternalRoleID = (roleId) => {
+exports.getExternalRoleID = roleId => {
   // for built in roles we want to remove the DB role ID element (role_)
   if (roleId.startsWith(DocumentTypes.ROLE) && isBuiltin(roleId)) {
     return roleId.split(`${DocumentTypes.ROLE}${SEPARATOR}`)[1]
diff --git a/packages/server/src/utilities/security/utilities.js b/packages/server/src/utilities/security/utilities.js
index 1cd6543dcb..f22b11dbd3 100644
--- a/packages/server/src/utilities/security/utilities.js
+++ b/packages/server/src/utilities/security/utilities.js
@@ -15,8 +15,8 @@ const CURRENTLY_SUPPORTED_LEVELS = [
   PermissionLevels.READ,
 ]
 
-exports.getPermissionType = (resourceId) => {
-  const docType = Object.values(DocumentTypes).filter((docType) =>
+exports.getPermissionType = resourceId => {
+  const docType = Object.values(DocumentTypes).filter(docType =>
     resourceId.startsWith(docType)
   )[0]
   switch (docType) {
@@ -41,7 +41,7 @@ exports.getPermissionType = (resourceId) => {
  * @param resourceId
  * @returns {{}}
  */
-exports.getBasePermissions = (resourceId) => {
+exports.getBasePermissions = resourceId => {
   const type = exports.getPermissionType(resourceId)
   const permissions = {}
   for (let [roleId, role] of Object.entries(getBuiltinRoles())) {
@@ -49,7 +49,7 @@ exports.getBasePermissions = (resourceId) => {
       continue
     }
     const perms = getBuiltinPermissionByID(role.permissionId)
-    const typedPermission = perms.permissions.find((perm) => perm.type === type)
+    const typedPermission = perms.permissions.find(perm => perm.type === type)
     if (
       typedPermission &&
       CURRENTLY_SUPPORTED_LEVELS.indexOf(typedPermission.level) !== -1
diff --git a/packages/server/src/utilities/usageQuota.js b/packages/server/src/utilities/usageQuota.js
index 77844f771f..d042d290d5 100644
--- a/packages/server/src/utilities/usageQuota.js
+++ b/packages/server/src/utilities/usageQuota.js
@@ -49,7 +49,7 @@ exports.Properties = {
   AUTOMATION: "automationRuns",
 }
 
-exports.getAPIKey = async (appId) => {
+exports.getAPIKey = async appId => {
   if (!env.USE_QUOTAS) {
     return { apiKey: null }
   }
diff --git a/packages/server/src/utilities/workerRequests.js b/packages/server/src/utilities/workerRequests.js
index 2dea9b1a30..2de74aa155 100644
--- a/packages/server/src/utilities/workerRequests.js
+++ b/packages/server/src/utilities/workerRequests.js
@@ -34,7 +34,7 @@ function request(ctx, request) {
 
 exports.request = request
 
-exports.getDeployedApps = async (ctx) => {
+exports.getDeployedApps = async ctx => {
   if (!env.SELF_HOSTED) {
     throw "Can only check apps for self hosted environments"
   }
@@ -84,7 +84,7 @@ exports.getGlobalUsers = async (ctx, appId = null, globalId = null) => {
     return users
   }
   if (Array.isArray(users)) {
-    users = users.map((user) => getAppRole(appId, user))
+    users = users.map(user => getAppRole(appId, user))
   } else {
     users = getAppRole(appId, users)
   }
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index 16d2beeb08..d3030d590d 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -23,7 +23,7 @@
   ],
   "devDependencies": {
     "@sveltejs/vite-plugin-svelte": "^1.0.0-next.5",
-    "svelte": "^3.35.0",
+    "svelte": "^3.37.0",
     "vite": "^2.1.5"
   },
   "keywords": [
diff --git a/packages/standard-components/scripts/deploy.js b/packages/standard-components/scripts/deploy.js
index 2d5cc9a778..e0a63d0607 100644
--- a/packages/standard-components/scripts/deploy.js
+++ b/packages/standard-components/scripts/deploy.js
@@ -36,6 +36,6 @@ run()
   .then(() => {
     console.log(`Deployment complete, version ${packageJson.version}`)
   })
-  .catch((err) => {
+  .catch(err => {
     console.error(err)
   })
diff --git a/packages/standard-components/src/DataProvider.svelte b/packages/standard-components/src/DataProvider.svelte
index c229a1e3a1..1824203381 100644
--- a/packages/standard-components/src/DataProvider.svelte
+++ b/packages/standard-components/src/DataProvider.svelte
@@ -94,12 +94,23 @@
       schema = {}
     }
 
-    // Ensure all schema fields have a name property
-    Object.entries(schema).forEach(([key, value]) => {
-      if (!value.name) {
-        value.name = key
+    // Ensure there are "name" properties for all fields and that field schema
+    // are objects
+    let fixedSchema = {}
+    Object.entries(schema || {}).forEach(([fieldName, fieldSchema]) => {
+      if (typeof fieldSchema === "string") {
+        fixedSchema[fieldName] = {
+          type: fieldSchema,
+          name: fieldName,
+        }
+      } else {
+        fixedSchema[fieldName] = {
+          ...fieldSchema,
+          name: fieldName,
+        }
       }
     })
+    schema = fixedSchema
   }
 </script>
 
diff --git a/packages/standard-components/src/charts/ApexOptionsBuilder.js b/packages/standard-components/src/charts/ApexOptionsBuilder.js
index d1c93e99a0..5c2ae1eb05 100644
--- a/packages/standard-components/src/charts/ApexOptionsBuilder.js
+++ b/packages/standard-components/src/charts/ApexOptionsBuilder.js
@@ -1,8 +1,8 @@
 export class ApexOptionsBuilder {
   formatters = {
-    ["Default"]: (val) => Math.round(val * 100) / 100,
-    ["Thousands"]: (val) => `${Math.round(val / 1000)}K`,
-    ["Millions"]: (val) => `${Math.round(val / 1000000)}M`,
+    ["Default"]: val => Math.round(val * 100) / 100,
+    ["Thousands"]: val => `${Math.round(val / 1000)}K`,
+    ["Millions"]: val => `${Math.round(val / 1000000)}M`,
   }
   options = {
     series: [],
diff --git a/packages/standard-components/src/charts/BarChart.svelte b/packages/standard-components/src/charts/BarChart.svelte
index 58fde4cfcd..1391c88b58 100644
--- a/packages/standard-components/src/charts/BarChart.svelte
+++ b/packages/standard-components/src/charts/BarChart.svelte
@@ -20,17 +20,29 @@
 
   $: options = setUpChart(dataProvider)
 
+<<<<<<< HEAD
   const setUpChart = (provider) => {
     const allCols = [labelColumn, ...(valueColumns || [null])]
     if (!provider || allCols.find((x) => x == null)) {
+=======
+  const setUpChart = provider => {
+    const allCols = [labelColumn, ...(valueColumns || [null])]
+    if (!provider || allCols.find(x => x == null)) {
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
       return null
     }
 
     // Fatch data
     const { schema, rows } = provider
+<<<<<<< HEAD
     const reducer = (row) => (valid, column) => valid && row[column] != null
     const hasAllColumns = (row) => allCols.reduce(reducer(row), true)
     const data = rows.filter((row) => hasAllColumns(row)).slice(0, 100)
+=======
+    const reducer = row => (valid, column) => valid && row[column] != null
+    const hasAllColumns = row => allCols.reduce(reducer(row), true)
+    const data = rows.filter(row => hasAllColumns(row)).slice(0, 100)
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
     if (!schema || !data.length) {
       return null
     }
@@ -57,9 +69,15 @@
       builder = builder.xType(labelFieldType)
       useDates = labelFieldType === "datetime"
     }
+<<<<<<< HEAD
     const series = valueColumns.map((column) => ({
       name: column,
       data: data.map((row) => {
+=======
+    const series = valueColumns.map(column => ({
+      name: column,
+      data: data.map(row => {
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
         if (!useDates) {
           return row[column]
         } else {
@@ -69,7 +87,11 @@
     }))
     builder = builder.series(series)
     if (!useDates) {
+<<<<<<< HEAD
       builder = builder.categories(data.map((row) => row[labelColumn]))
+=======
+      builder = builder.categories(data.map(row => row[labelColumn]))
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
     }
 
     // Build chart options
diff --git a/packages/standard-components/src/forms/BooleanField.svelte b/packages/standard-components/src/forms/BooleanField.svelte
index 0fef45d8fd..c016f6dc5a 100644
--- a/packages/standard-components/src/forms/BooleanField.svelte
+++ b/packages/standard-components/src/forms/BooleanField.svelte
@@ -26,7 +26,11 @@
       disabled={$fieldState.disabled}
       error={$fieldState.error}
       id={$fieldState.fieldId}
+<<<<<<< HEAD
       on:change={(e) => fieldApi.setValue(e.detail)}
+=======
+      on:change={e => fieldApi.setValue(e.detail)}
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
       {text}
     />
   {/if}
diff --git a/packages/standard-components/src/forms/OptionsField.svelte b/packages/standard-components/src/forms/OptionsField.svelte
index 7045f27dd4..42649cc075 100644
--- a/packages/standard-components/src/forms/OptionsField.svelte
+++ b/packages/standard-components/src/forms/OptionsField.svelte
@@ -29,7 +29,11 @@
       error={$fieldState.error}
       options={fieldSchema?.constraints?.inclusion ?? []}
       {placeholder}
+<<<<<<< HEAD
       on:change={(e) => fieldApi.setValue(e.detail)}
+=======
+      on:change={e => fieldApi.setValue(e.detail)}
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
     />
   {/if}
 </Field>
diff --git a/packages/standard-components/src/forms/RelationshipField.svelte b/packages/standard-components/src/forms/RelationshipField.svelte
index 7f6c7f5549..23d30656e9 100644
--- a/packages/standard-components/src/forms/RelationshipField.svelte
+++ b/packages/standard-components/src/forms/RelationshipField.svelte
@@ -82,7 +82,11 @@
       disabled={$fieldState.disabled}
       error={$fieldState.error}
       getOptionLabel={getDisplayName}
+<<<<<<< HEAD
       getOptionValue={(option) => option._id}
+=======
+      getOptionValue={option => option._id}
+>>>>>>> 900637c221e4034babd21d69dcaa71b360a2adb2
     />
   {/if}
 </Field>
diff --git a/packages/standard-components/src/forms/validation.js b/packages/standard-components/src/forms/validation.js
index bef2b6e40f..5b49fa0848 100644
--- a/packages/standard-components/src/forms/validation.js
+++ b/packages/standard-components/src/forms/validation.js
@@ -21,15 +21,11 @@ export const createValidatorFromConstraints = (constraints, field, table) => {
     // Min / max number constraint
     if (exists(constraints.numericality?.greaterThanOrEqualTo)) {
       const min = constraints.numericality.greaterThanOrEqualTo
-      checks.push(
-        numericalConstraint((x) => x >= min, `Minimum value is ${min}`)
-      )
+      checks.push(numericalConstraint(x => x >= min, `Minimum value is ${min}`))
     }
     if (exists(constraints.numericality?.lessThanOrEqualTo)) {
       const max = constraints.numericality.lessThanOrEqualTo
-      checks.push(
-        numericalConstraint((x) => x <= max, `Maximum value is ${max}`)
-      )
+      checks.push(numericalConstraint(x => x <= max, `Maximum value is ${max}`))
     }
 
     // Inclusion constraint
@@ -50,7 +46,7 @@ export const createValidatorFromConstraints = (constraints, field, table) => {
   }
 
   // Evaluate each constraint
-  return (value) => {
+  return value => {
     for (let check of checks) {
       const error = check(value)
       if (error) {
@@ -61,9 +57,9 @@ export const createValidatorFromConstraints = (constraints, field, table) => {
   }
 }
 
-const exists = (value) => value != null && value !== ""
+const exists = value => value != null && value !== ""
 
-const presenceConstraint = (value) => {
+const presenceConstraint = value => {
   let invalid
   if (Array.isArray(value)) {
     invalid = value.length === 0
@@ -73,14 +69,14 @@ const presenceConstraint = (value) => {
   return invalid ? "Required" : null
 }
 
-const lengthConstraint = (maxLength) => (value) => {
+const lengthConstraint = maxLength => value => {
   if (value && value.length > maxLength) {
     return `Maximum ${maxLength} characters`
   }
   return null
 }
 
-const numericalConstraint = (constraint, error) => (value) => {
+const numericalConstraint = (constraint, error) => value => {
   if (isNaN(value)) {
     return "Must be a number"
   }
@@ -91,7 +87,7 @@ const numericalConstraint = (constraint, error) => (value) => {
   return null
 }
 
-const inclusionConstraint = (options = []) => (value) => {
+const inclusionConstraint = (options = []) => value => {
   if (value == null || value === "") {
     return null
   }
@@ -103,7 +99,7 @@ const inclusionConstraint = (options = []) => (value) => {
 
 const dateConstraint = (dateString, isEarliest) => {
   const dateLimit = Date.parse(dateString)
-  return (value) => {
+  return value => {
     if (value == null || value === "") {
       return null
     }
diff --git a/packages/standard-components/src/helpers.js b/packages/standard-components/src/helpers.js
index 91652b358f..af98473ac9 100644
--- a/packages/standard-components/src/helpers.js
+++ b/packages/standard-components/src/helpers.js
@@ -4,7 +4,7 @@
  * @param string
  * @returns {string}
  */
-export const capitalise = (string) => {
+export const capitalise = string => {
   return string.substring(0, 1).toUpperCase() + string.substring(1)
 }
 
@@ -26,9 +26,7 @@ export const cssVars = (node, props) => {
         delete props[key]
       })
 
-      Object.keys(props).forEach((name) =>
-        node.style.removeProperty(`--${name}`)
-      )
+      Object.keys(props).forEach(name => node.style.removeProperty(`--${name}`))
       props = new_props
     },
   }
diff --git a/packages/string-templates/scripts/gen-collection-info.js b/packages/string-templates/scripts/gen-collection-info.js
index 8e902fe07f..1977f95d22 100644
--- a/packages/string-templates/scripts/gen-collection-info.js
+++ b/packages/string-templates/scripts/gen-collection-info.js
@@ -93,8 +93,8 @@ function getCommentInfo(file, func) {
   docs.description = docs.description.replace(/[ ]{2,}/g, " ")
   docs.description = docs.description.replace(/is is/g, "is")
   const examples = docs.tags
-    .filter((el) => el.title === "example")
-    .map((el) => el.description)
+    .filter(el => el.title === "example")
+    .map(el => el.description)
   const blocks = docs.description.split("```")
   if (examples.length > 0) {
     docs.example = examples.join(" ")
@@ -130,9 +130,9 @@ function run() {
       const fnc = entry[1].toString()
       const jsDocInfo = getCommentInfo(collectionFile, fnc)
       let args = jsDocInfo.tags
-        .filter((tag) => tag.title === "param")
+        .filter(tag => tag.title === "param")
         .map(
-          (tag) =>
+          tag =>
             tag.description &&
             tag.description.replace(/`/g, "").split(" ")[0].trim()
         )
diff --git a/packages/string-templates/src/helpers/Helper.js b/packages/string-templates/src/helpers/Helper.js
index 979100d2f7..8eee332678 100644
--- a/packages/string-templates/src/helpers/Helper.js
+++ b/packages/string-templates/src/helpers/Helper.js
@@ -6,7 +6,7 @@ class Helper {
 
   register(handlebars) {
     // wrap the function so that no helper can cause handlebars to break
-    handlebars.registerHelper(this.name, (value) => {
+    handlebars.registerHelper(this.name, value => {
       return this.fn(value) || value
     })
   }
diff --git a/packages/string-templates/src/helpers/external.js b/packages/string-templates/src/helpers/external.js
index cb3197c232..0fa7f734d0 100644
--- a/packages/string-templates/src/helpers/external.js
+++ b/packages/string-templates/src/helpers/external.js
@@ -23,7 +23,7 @@ const ADDED_HELPERS = {
   duration: duration,
 }
 
-exports.registerAll = (handlebars) => {
+exports.registerAll = handlebars => {
   for (let [name, helper] of Object.entries(ADDED_HELPERS)) {
     handlebars.registerHelper(name, helper)
   }
@@ -51,7 +51,7 @@ exports.registerAll = (handlebars) => {
   exports.externalHelperNames = externalNames.concat(Object.keys(ADDED_HELPERS))
 }
 
-exports.unregisterAll = (handlebars) => {
+exports.unregisterAll = handlebars => {
   for (let name of Object.keys(ADDED_HELPERS)) {
     handlebars.unregisterHelper(name)
   }
diff --git a/packages/string-templates/src/helpers/index.js b/packages/string-templates/src/helpers/index.js
index d8dc0045f1..05145f7c7a 100644
--- a/packages/string-templates/src/helpers/index.js
+++ b/packages/string-templates/src/helpers/index.js
@@ -14,11 +14,11 @@ const HTML_SWAPS = {
 
 const HELPERS = [
   // external helpers
-  new Helper(HelperFunctionNames.OBJECT, (value) => {
+  new Helper(HelperFunctionNames.OBJECT, value => {
     return new SafeString(JSON.stringify(value))
   }),
   // this help is applied to all statements
-  new Helper(HelperFunctionNames.ALL, (value) => {
+  new Helper(HelperFunctionNames.ALL, value => {
     // null/undefined values produce bad results
     if (value == null) {
       return ""
@@ -27,12 +27,12 @@ const HELPERS = [
     if (text == null || typeof text !== "string") {
       return text
     }
-    return text.replace(/[<>]/g, (tag) => {
+    return text.replace(/[<>]/g, tag => {
       return HTML_SWAPS[tag] || tag
     })
   }),
   // adds a note for post-processor
-  new Helper(HelperFunctionNames.LITERAL, (value) => {
+  new Helper(HelperFunctionNames.LITERAL, value => {
     const type = typeof value
     const outputVal = type === "object" ? JSON.stringify(value) : value
     return `{{${LITERAL_MARKER} ${type}-${outputVal}}}`
@@ -46,7 +46,7 @@ module.exports.HelperNames = () => {
   )
 }
 
-module.exports.registerAll = (handlebars) => {
+module.exports.registerAll = handlebars => {
   for (let helper of HELPERS) {
     helper.register(handlebars)
   }
@@ -54,7 +54,7 @@ module.exports.registerAll = (handlebars) => {
   externalHandlebars.registerAll(handlebars)
 }
 
-module.exports.unregisterAll = (handlebars) => {
+module.exports.unregisterAll = handlebars => {
   for (let helper of HELPERS) {
     helper.unregister(handlebars)
   }
diff --git a/packages/string-templates/src/processors/index.js b/packages/string-templates/src/processors/index.js
index c42b80fe8b..174041133a 100644
--- a/packages/string-templates/src/processors/index.js
+++ b/packages/string-templates/src/processors/index.js
@@ -27,12 +27,12 @@ module.exports.preprocess = (string, finalise = true) => {
   // might want to pre-process for other benefits but still want to see errors
   if (!finalise) {
     processors = processors.filter(
-      (processor) => processor.name !== preprocessor.PreprocessorNames.FINALISE
+      processor => processor.name !== preprocessor.PreprocessorNames.FINALISE
     )
   }
   return process(string, processors)
 }
 
-module.exports.postprocess = (string) => {
+module.exports.postprocess = string => {
   return process(string, postprocessor.processors)
 }
diff --git a/packages/string-templates/src/processors/postprocessor.js b/packages/string-templates/src/processors/postprocessor.js
index ba2fbc9878..adc8362abe 100644
--- a/packages/string-templates/src/processors/postprocessor.js
+++ b/packages/string-templates/src/processors/postprocessor.js
@@ -17,7 +17,7 @@ class Postprocessor {
 }
 
 module.exports.processors = [
-  new Postprocessor(PostProcessorNames.CONVERT_LITERALS, (statement) => {
+  new Postprocessor(PostProcessorNames.CONVERT_LITERALS, statement => {
     if (!statement.includes(LITERAL_MARKER)) {
       return statement
     }
diff --git a/packages/string-templates/src/processors/preprocessor.js b/packages/string-templates/src/processors/preprocessor.js
index 02027049c5..ee3a3a9730 100644
--- a/packages/string-templates/src/processors/preprocessor.js
+++ b/packages/string-templates/src/processors/preprocessor.js
@@ -24,7 +24,7 @@ class Preprocessor {
 }
 
 module.exports.processors = [
-  new Preprocessor(PreprocessorNames.SWAP_TO_DOT, (statement) => {
+  new Preprocessor(PreprocessorNames.SWAP_TO_DOT, statement => {
     let startBraceIdx = statement.indexOf("[")
     let lastIdx = 0
     while (startBraceIdx !== -1) {
@@ -39,7 +39,7 @@ module.exports.processors = [
     return statement
   }),
 
-  new Preprocessor(PreprocessorNames.FIX_FUNCTIONS, (statement) => {
+  new Preprocessor(PreprocessorNames.FIX_FUNCTIONS, statement => {
     for (let specialCase of FUNCTION_CASES) {
       const toFind = `{ ${specialCase}`,
         replacement = `{${specialCase}`
@@ -48,7 +48,7 @@ module.exports.processors = [
     return statement
   }),
 
-  new Preprocessor(PreprocessorNames.FINALISE, (statement) => {
+  new Preprocessor(PreprocessorNames.FINALISE, statement => {
     let insideStatement = statement.slice(2, statement.length - 2)
     if (insideStatement.charAt(0) === " ") {
       insideStatement = insideStatement.slice(1)
@@ -63,7 +63,7 @@ module.exports.processors = [
         return statement
       }
     }
-    if (HelperNames().some((option) => option.includes(possibleHelper))) {
+    if (HelperNames().some(option => option.includes(possibleHelper))) {
       insideStatement = `(${insideStatement})`
     }
     return `{{ all ${insideStatement} }}`
diff --git a/packages/string-templates/src/utilities.js b/packages/string-templates/src/utilities.js
index b1a9d6415c..38496b04b4 100644
--- a/packages/string-templates/src/utilities.js
+++ b/packages/string-templates/src/utilities.js
@@ -3,7 +3,7 @@ const ALPHA_NUMERIC_REGEX = /^[A-Za-z0-9]+$/g
 
 module.exports.FIND_HBS_REGEX = /{{([^{].*?)}}/g
 
-module.exports.isAlphaNumeric = (char) => {
+module.exports.isAlphaNumeric = char => {
   return char.match(ALPHA_NUMERIC_REGEX)
 }
 
@@ -12,7 +12,7 @@ module.exports.swapStrings = (string, start, length, swap) => {
 }
 
 // removes null and undefined
-module.exports.removeNull = (obj) => {
+module.exports.removeNull = obj => {
   obj = _(obj).omitBy(_.isUndefined).omitBy(_.isNull).value()
   for (let [key, value] of Object.entries(obj)) {
     // only objects
@@ -23,14 +23,14 @@ module.exports.removeNull = (obj) => {
   return obj
 }
 
-module.exports.addConstants = (obj) => {
+module.exports.addConstants = obj => {
   if (obj.now == null) {
     obj.now = new Date()
   }
   return obj
 }
 
-module.exports.removeHandlebarsStatements = (string) => {
+module.exports.removeHandlebarsStatements = string => {
   let regexp = new RegExp(exports.FIND_HBS_REGEX)
   let matches = string.match(regexp)
   if (matches == null) {
diff --git a/packages/worker/scripts/dev/manage.js b/packages/worker/scripts/dev/manage.js
index a3d545b4a1..f363bd05ac 100644
--- a/packages/worker/scripts/dev/manage.js
+++ b/packages/worker/scripts/dev/manage.js
@@ -16,7 +16,7 @@ async function init() {
     COUCH_DB_URL: "http://budibase:budibase@localhost:10000/db/",
   }
   let envFile = ""
-  Object.keys(envFileJson).forEach((key) => {
+  Object.keys(envFileJson).forEach(key => {
     envFile += `${key}=${envFileJson[key]}\n`
   })
   fs.writeFileSync(envFilePath, envFile)
@@ -32,7 +32,7 @@ command()
   .then(() => {
     console.log("Done! 🎉")
   })
-  .catch((err) => {
+  .catch(err => {
     console.error(
       "Something went wrong while managing budibase dev worker:",
       err.message
diff --git a/packages/worker/src/api/controllers/admin/configs.js b/packages/worker/src/api/controllers/admin/configs.js
index 6a84b299f0..bf9259f953 100644
--- a/packages/worker/src/api/controllers/admin/configs.js
+++ b/packages/worker/src/api/controllers/admin/configs.js
@@ -52,7 +52,7 @@ exports.fetch = async function (ctx) {
       include_docs: true,
     })
   )
-  ctx.body = response.rows.map((row) => row.doc)
+  ctx.body = response.rows.map(row => row.doc)
 }
 
 /**
@@ -66,7 +66,7 @@ exports.find = async function (ctx) {
   const { group } = ctx.query
   if (group) {
     const group = await db.get(group)
-    const userInGroup = group.users.some((groupUser) => groupUser === userId)
+    const userInGroup = group.users.some(groupUser => groupUser === userId)
     if (!ctx.user.admin && !userInGroup) {
       ctx.throw(400, `User is not in specified group: ${group}.`)
     }
diff --git a/packages/worker/src/api/controllers/admin/email.js b/packages/worker/src/api/controllers/admin/email.js
index dfb0d5b461..9f4060d20f 100644
--- a/packages/worker/src/api/controllers/admin/email.js
+++ b/packages/worker/src/api/controllers/admin/email.js
@@ -53,7 +53,7 @@ async function buildEmail(purpose, email, user) {
   })
 }
 
-exports.sendEmail = async (ctx) => {
+exports.sendEmail = async ctx => {
   const { groupId, email, userId, purpose } = ctx.request.body
   const db = new CouchDB(GLOBAL_DB)
   const params = {}
diff --git a/packages/worker/src/api/controllers/admin/groups.js b/packages/worker/src/api/controllers/admin/groups.js
index 6abc986394..8a70721431 100644
--- a/packages/worker/src/api/controllers/admin/groups.js
+++ b/packages/worker/src/api/controllers/admin/groups.js
@@ -34,7 +34,7 @@ exports.fetch = async function (ctx) {
       include_docs: true,
     })
   )
-  ctx.body = response.rows.map((row) => row.doc)
+  ctx.body = response.rows.map(row => row.doc)
 }
 
 exports.find = async function (ctx) {
diff --git a/packages/worker/src/api/controllers/admin/templates.js b/packages/worker/src/api/controllers/admin/templates.js
index 0a3f2fa487..30c90d50bf 100644
--- a/packages/worker/src/api/controllers/admin/templates.js
+++ b/packages/worker/src/api/controllers/admin/templates.js
@@ -9,7 +9,7 @@ const { getTemplates } = require("../../../constants/templates")
 
 const GLOBAL_DB = StaticDatabases.GLOBAL.name
 
-exports.save = async (ctx) => {
+exports.save = async ctx => {
   const db = new CouchDB(GLOBAL_DB)
   const type = ctx.params.type
   let template = ctx.request.body
@@ -30,36 +30,36 @@ exports.save = async (ctx) => {
   }
 }
 
-exports.definitions = async (ctx) => {
+exports.definitions = async ctx => {
   ctx.body = {
     purpose: TemplateMetadata,
     bindings: Object.values(TemplateBindings),
   }
 }
 
-exports.fetch = async (ctx) => {
+exports.fetch = async ctx => {
   ctx.body = await getTemplates()
 }
 
-exports.fetchByType = async (ctx) => {
+exports.fetchByType = async ctx => {
   ctx.body = await getTemplates({
     type: ctx.params.type,
   })
 }
 
-exports.fetchByOwner = async (ctx) => {
+exports.fetchByOwner = async ctx => {
   ctx.body = await getTemplates({
     ownerId: ctx.params.ownerId,
   })
 }
 
-exports.find = async (ctx) => {
+exports.find = async ctx => {
   ctx.body = await getTemplates({
     id: ctx.params.id,
   })
 }
 
-exports.destroy = async (ctx) => {
+exports.destroy = async ctx => {
   const db = new CouchDB(GLOBAL_DB)
   await db.remove(ctx.params.id, ctx.params.rev)
   ctx.message = `Template ${ctx.params.id} deleted.`
diff --git a/packages/worker/src/api/controllers/admin/users.js b/packages/worker/src/api/controllers/admin/users.js
index bcb159b618..146373e671 100644
--- a/packages/worker/src/api/controllers/admin/users.js
+++ b/packages/worker/src/api/controllers/admin/users.js
@@ -11,7 +11,7 @@ const FIRST_USER_EMAIL = "test@test.com"
 const FIRST_USER_PASSWORD = "test"
 const GLOBAL_DB = StaticDatabases.GLOBAL.name
 
-exports.save = async (ctx) => {
+exports.save = async ctx => {
   const db = new CouchDB(GLOBAL_DB)
   const { email, password, _id } = ctx.request.body
 
@@ -60,7 +60,7 @@ exports.save = async (ctx) => {
   }
 }
 
-exports.firstUser = async (ctx) => {
+exports.firstUser = async ctx => {
   ctx.request.body = {
     email: FIRST_USER_EMAIL,
     password: FIRST_USER_PASSWORD,
@@ -72,7 +72,7 @@ exports.firstUser = async (ctx) => {
   await exports.save(ctx)
 }
 
-exports.destroy = async (ctx) => {
+exports.destroy = async ctx => {
   const db = new CouchDB(GLOBAL_DB)
   const dbUser = await db.get(ctx.params.id)
   await db.remove(dbUser._id, dbUser._rev)
@@ -82,14 +82,14 @@ exports.destroy = async (ctx) => {
 }
 
 // called internally by app server user fetch
-exports.fetch = async (ctx) => {
+exports.fetch = async ctx => {
   const db = new CouchDB(GLOBAL_DB)
   const response = await db.allDocs(
     getGlobalUserParams(null, {
       include_docs: true,
     })
   )
-  const users = response.rows.map((row) => row.doc)
+  const users = response.rows.map(row => row.doc)
   // user hashed password shouldn't ever be returned
   for (let user of users) {
     if (user) {
@@ -100,7 +100,7 @@ exports.fetch = async (ctx) => {
 }
 
 // called internally by app server user find
-exports.find = async (ctx) => {
+exports.find = async ctx => {
   const db = new CouchDB(GLOBAL_DB)
   let user
   try {
diff --git a/packages/worker/src/api/controllers/app.js b/packages/worker/src/api/controllers/app.js
index 8c96ccdfbc..bed3b55942 100644
--- a/packages/worker/src/api/controllers/app.js
+++ b/packages/worker/src/api/controllers/app.js
@@ -5,7 +5,7 @@ const env = require("../../environment")
 const APP_PREFIX = "app_"
 const URL_REGEX_SLASH = /\/|\\/g
 
-exports.getApps = async (ctx) => {
+exports.getApps = async ctx => {
   let allDbs
   // allDbs call of CouchDB is very inaccurate in production
   if (env.COUCH_DB_URL) {
@@ -13,8 +13,8 @@ exports.getApps = async (ctx) => {
   } else {
     allDbs = await CouchDB.allDbs()
   }
-  const appDbNames = allDbs.filter((dbName) => dbName.startsWith(APP_PREFIX))
-  const appPromises = appDbNames.map((db) => new CouchDB(db).get(db))
+  const appDbNames = allDbs.filter(dbName => dbName.startsWith(APP_PREFIX))
+  const appPromises = appDbNames.map(db => new CouchDB(db).get(db))
 
   const apps = await Promise.allSettled(appPromises)
   const body = {}
diff --git a/packages/worker/src/api/controllers/auth.js b/packages/worker/src/api/controllers/auth.js
index 58e277f6a2..bcda523a93 100644
--- a/packages/worker/src/api/controllers/auth.js
+++ b/packages/worker/src/api/controllers/auth.js
@@ -34,7 +34,7 @@ exports.authenticate = async (ctx, next) => {
   })(ctx, next)
 }
 
-exports.logout = async (ctx) => {
+exports.logout = async ctx => {
   clearCookie(ctx, Cookies.Auth)
   ctx.body = { message: "User logged out" }
 }
diff --git a/packages/worker/src/api/index.js b/packages/worker/src/api/index.js
index fe8609de7e..d0e60ffcd2 100644
--- a/packages/worker/src/api/index.js
+++ b/packages/worker/src/api/index.js
@@ -26,7 +26,7 @@ router
       br: false,
     })
   )
-  .use("/health", (ctx) => (ctx.status = 200))
+  .use("/health", ctx => (ctx.status = 200))
   .use(buildAuthMiddleware(NO_AUTH_ENDPOINTS))
   // for now no public access is allowed to worker (bar health check)
   .use((ctx, next) => {
@@ -50,7 +50,7 @@ router.use(async (ctx, next) => {
   }
 })
 
-router.get("/health", (ctx) => (ctx.status = 200))
+router.get("/health", ctx => (ctx.status = 200))
 
 // authenticated routes
 for (let route of routes) {
diff --git a/packages/worker/src/constants/templates/index.js b/packages/worker/src/constants/templates/index.js
index 18904bb8df..23e5508341 100644
--- a/packages/worker/src/constants/templates/index.js
+++ b/packages/worker/src/constants/templates/index.js
@@ -35,7 +35,7 @@ exports.addBaseTemplates = (templates, type = null) => {
   }
   for (let purpose of purposeList) {
     // check if a template exists already for purpose
-    if (templates.find((template) => template.purpose === purpose)) {
+    if (templates.find(template => template.purpose === purpose)) {
       continue
     }
     if (exports.EmailTemplates[purpose]) {
@@ -56,18 +56,18 @@ exports.getTemplates = async ({ ownerId, type, id } = {}) => {
       include_docs: true,
     })
   )
-  let templates = response.rows.map((row) => row.doc)
+  let templates = response.rows.map(row => row.doc)
   // should only be one template with ID
   if (id) {
     return templates[0]
   }
   if (type) {
-    templates = templates.filter((template) => template.type === type)
+    templates = templates.filter(template => template.type === type)
   }
   return exports.addBaseTemplates(templates, type)
 }
 
 exports.getTemplateByPurpose = async (type, purpose) => {
   const templates = await exports.getTemplates({ type })
-  return templates.find((template) => template.purpose === purpose)
+  return templates.find(template => template.purpose === purpose)
 }
diff --git a/packages/worker/src/index.js b/packages/worker/src/index.js
index c80d27ddae..8b67181fcc 100644
--- a/packages/worker/src/index.js
+++ b/packages/worker/src/index.js
@@ -44,7 +44,7 @@ module.exports = server.listen(parseInt(env.PORT || 4002), async () => {
   console.log(`Worker running on ${JSON.stringify(server.address())}`)
 })
 
-process.on("uncaughtException", (err) => {
+process.on("uncaughtException", err => {
   console.error(err)
   server.close()
   server.destroy()
diff --git a/packages/worker/src/middleware/joi-validator.js b/packages/worker/src/middleware/joi-validator.js
index 8e5feab255..1686b0e727 100644
--- a/packages/worker/src/middleware/joi-validator.js
+++ b/packages/worker/src/middleware/joi-validator.js
@@ -19,10 +19,10 @@ function validate(schema, property) {
   }
 }
 
-module.exports.body = (schema) => {
+module.exports.body = schema => {
   return validate(schema, "body")
 }
 
-module.exports.params = (schema) => {
+module.exports.params = schema => {
   return validate(schema, "params")
 }
diff --git a/packages/worker/src/utilities/email.js b/packages/worker/src/utilities/email.js
index 3a17b2bfd1..b5e64a2793 100644
--- a/packages/worker/src/utilities/email.js
+++ b/packages/worker/src/utilities/email.js
@@ -1,6 +1,6 @@
 const nodemailer = require("nodemailer")
 
-exports.createSMTPTransport = (config) => {
+exports.createSMTPTransport = config => {
   const options = {
     port: config.port,
     host: config.host,
@@ -15,7 +15,7 @@ exports.createSMTPTransport = (config) => {
   return nodemailer.createTransport(options)
 }
 
-exports.verifyConfig = async (config) => {
+exports.verifyConfig = async config => {
   const transport = exports.createSMTPTransport(config)
   await transport.verify()
 }
diff --git a/packages/worker/src/utilities/fileSystem.js b/packages/worker/src/utilities/fileSystem.js
index 6bb44fa4ac..8f0bc8d3ed 100644
--- a/packages/worker/src/utilities/fileSystem.js
+++ b/packages/worker/src/utilities/fileSystem.js
@@ -1,5 +1,5 @@
 const { readFileSync } = require("fs")
 
-exports.readStaticFile = (path) => {
+exports.readStaticFile = path => {
   return readFileSync(path, "utf-8")
 }
diff --git a/packages/worker/src/utilities/index.js b/packages/worker/src/utilities/index.js
index 4ad800cc58..b402a82cf3 100644
--- a/packages/worker/src/utilities/index.js
+++ b/packages/worker/src/utilities/index.js
@@ -4,6 +4,6 @@
  * @param {string} url The URL to test and remove any extra double slashes.
  * @return {string} The updated url.
  */
-exports.checkSlashesInUrl = (url) => {
+exports.checkSlashesInUrl = url => {
   return url.replace(/(https?:\/\/)|(\/)+/g, "$1$2")
 }
diff --git a/packages/worker/src/utilities/templates.js b/packages/worker/src/utilities/templates.js
index 4000ed5365..3035dc2bbc 100644
--- a/packages/worker/src/utilities/templates.js
+++ b/packages/worker/src/utilities/templates.js
@@ -14,7 +14,7 @@ exports.getSettingsTemplateContext = async () => {
       include_docs: true,
     })
   )
-  let settings = response.rows.map((row) => row.doc)[0] || {}
+  let settings = response.rows.map(row => row.doc)[0] || {}
   if (!settings.platformUrl) {
     settings.platformUrl = LOCAL_URL
   }
diff --git a/yarn.lock b/yarn.lock
index 29a01a69bd..c8c4430e09 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4559,10 +4559,10 @@ supports-color@^7.1.0:
   dependencies:
     has-flag "^4.0.0"
 
-svelte@^3.30.0:
-  version "3.30.0"
-  resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.30.0.tgz#cbde341e96bf34f4ac73c8f14f8a014e03bfb7d6"
-  integrity sha512-z+hdIACb9TROGvJBQWcItMtlr4s0DBUgJss6qWrtFkOoIInkG+iAMo/FJZQFyDBQZc+dul2+TzYSi/tpTT5/Ag==
+svelte@^3.37.0:
+  version "3.38.2"
+  resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.38.2.tgz#55e5c681f793ae349b5cc2fe58e5782af4275ef5"
+  integrity sha512-q5Dq0/QHh4BLJyEVWGe7Cej5NWs040LWjMbicBGZ+3qpFWJ1YObRmUDZKbbovddLC9WW7THTj3kYbTOFmU9fbg==
 
 table@^5.2.3:
   version "5.4.6"