diff --git a/.vscode/launch.json b/.vscode/launch.json
index 2fda61345b..543d1e6179 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -20,6 +20,16 @@
       "args": ["${workspaceFolder}/packages/worker/src/index.ts"],
       "cwd": "${workspaceFolder}/packages/worker"
     },
+    {
+      "name": "Camunda Worker",
+      "type": "node",
+      "request": "launch",
+      "runtimeArgs": ["--nolazy", "-r", "ts-node/register/transpile-only"],
+      "args": [
+        "${workspaceFolder}/packages/account-portal/packages/server/src/v2/run.ts"
+      ],
+      "cwd": "${workspaceFolder}/packages/account-portal/packages/server"
+    },
     {
       "type": "chrome",
       "request": "launch",
diff --git a/lerna.json b/lerna.json
index 2f9e66675b..77ca852955 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,6 +1,6 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "3.0.0",
+  "version": "3.0.2",
   "npmClient": "yarn",
   "packages": [
     "packages/*",
diff --git a/packages/bbui/src/ColorPicker/ColorPicker.svelte b/packages/bbui/src/ColorPicker/ColorPicker.svelte
index 7bedc769c8..a5c619671a 100644
--- a/packages/bbui/src/ColorPicker/ColorPicker.svelte
+++ b/packages/bbui/src/ColorPicker/ColorPicker.svelte
@@ -6,6 +6,11 @@
   import Icon from "../Icon/Icon.svelte"
   import Input from "../Form/Input.svelte"
   import { capitalise } from "../helpers"
+  import {
+    ensureValidTheme,
+    getThemeClassNames,
+    DefaultAppTheme,
+  } from "@budibase/shared-core"
 
   export let value
   export let size = "M"
@@ -18,6 +23,7 @@
 
   $: customValue = getCustomValue(value)
   $: checkColor = getCheckColor(value)
+  $: themeClasses = getThemeClasses(spectrumTheme)
 
   const dispatch = createEventDispatcher()
   const categories = [
@@ -91,6 +97,14 @@
     },
   ]
 
+  const getThemeClasses = theme => {
+    if (!theme) {
+      return ""
+    }
+    theme = ensureValidTheme(theme, DefaultAppTheme)
+    return getThemeClassNames(theme)
+  }
+
   const onChange = value => {
     dispatch("change", value)
     dropdown.hide()
@@ -147,7 +161,7 @@
   }}
 >
   <div
-    class="fill {spectrumTheme || ''}"
+    class="fill {themeClasses}"
     style={value ? `background: ${value};` : ""}
     class:placeholder={!value}
   />
@@ -171,7 +185,7 @@
                 title={prettyPrint(color)}
               >
                 <div
-                  class="fill {spectrumTheme || ''}"
+                  class="fill {themeClasses}"
                   style="background: var(--spectrum-global-color-{color}); color: {checkColor};"
                 >
                   {#if value === `var(--spectrum-global-color-${color})`}
diff --git a/packages/server/src/api/controllers/row/staticFormula.ts b/packages/server/src/api/controllers/row/staticFormula.ts
index cce349ff58..28853a8faf 100644
--- a/packages/server/src/api/controllers/row/staticFormula.ts
+++ b/packages/server/src/api/controllers/row/staticFormula.ts
@@ -160,7 +160,7 @@ export async function finaliseRow(
     dynamic: false,
   })
   if (aiEnabled) {
-    enrichedRow = await processAIColumns(table, row, {
+    enrichedRow = await processAIColumns(table, enrichedRow, {
       contextRows: [enrichedRow],
     })
   }
diff --git a/scripts/deploy-camunda.sh b/scripts/deploy-camunda.sh
index 440de65bb2..66c505a6f0 100755
--- a/scripts/deploy-camunda.sh
+++ b/scripts/deploy-camunda.sh
@@ -17,15 +17,12 @@ echo "waiting for Camunda to be ready..."
 
 while is_camunda_ready -eq 0; do sleep 1; done
 
-cd src/main/resources/models
-
 echo "deploy processes..."
-zbctl deploy resource offboarding.bpmn --insecure
-zbctl deploy resource onboarding.bpmn --insecure
-zbctl deploy resource free_trial.bpmn --insecure
-zbctl deploy resource verify_sso_login.bpmn --insecure
+for file in src/main/resources/models/*; do
+    zbctl deploy resource $file --insecure
+done
 
-cd ../../../../../budibase/packages/pro
+cd ../budibase/packages/pro
 yarn && yarn build
 
 cd ../account-portal/packages/server