diff --git a/packages/builder/.gitignore b/packages/builder/.gitignore
index 7ff36cba13..70c94f7a78 100644
--- a/packages/builder/.gitignore
+++ b/packages/builder/.gitignore
@@ -7,4 +7,4 @@ dist/
 routify
 cypress/videos
 cypress/screenshots
-.routify
\ No newline at end of file
+.routify/
\ No newline at end of file
diff --git a/packages/builder/src/components/automation/AutomationPanel/AutomationList.svelte b/packages/builder/src/components/automation/AutomationPanel/AutomationList.svelte
index 68a83828a5..bb2057955f 100644
--- a/packages/builder/src/components/automation/AutomationPanel/AutomationList.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/AutomationList.svelte
@@ -1,6 +1,6 @@
 <script>
   import { onMount } from "svelte"
-  import { goto } from "@sveltech/routify"
+  import { goto } from "@roxi/routify"
   import { automationStore } from "builderStore"
   import NavItem from "components/common/NavItem.svelte"
   import EditAutomationPopover from "./EditAutomationPopover.svelte"
diff --git a/packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte b/packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte
index abc7bd9f96..9450555774 100644
--- a/packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { backendUiStore, automationStore } from "builderStore"
-  import { goto } from "@sveltech/routify"
+  import { goto } from "@roxi/routify"
   import { notifier } from "builderStore/store/notifications"
   import { Input, ModalContent } from "@budibase/bbui"
   import analytics from "analytics"
diff --git a/packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte b/packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte
index a99a16e240..a49f778b57 100644
--- a/packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte
@@ -1,5 +1,5 @@
 <script>    
-  import { goto } from "@sveltech/routify"
+  import { goto } from "@roxi/routify"
   import { automationStore, backendUiStore } from "builderStore"
   import { notifier } from "builderStore/store/notifications"
   import { DropdownMenu } from "@budibase/bbui"
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditDatasourcePopover.svelte b/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditDatasourcePopover.svelte
index c7842001d0..f8a4360769 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditDatasourcePopover.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditDatasourcePopover.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { goto } from "@sveltech/routify"
+  import { goto } from "@roxi/routify"
   import { backendUiStore } from "builderStore"
   import { notifier } from "builderStore/store/notifications"
   import { DropdownMenu } from "@budibase/bbui"
diff --git a/packages/builder/src/pages/[application]/automate/[automation]/_layout.svelte b/packages/builder/src/pages/[application]/automate/[automation]/_layout.svelte
index ce6917df6b..3be71a1bbe 100644
--- a/packages/builder/src/pages/[application]/automate/[automation]/_layout.svelte
+++ b/packages/builder/src/pages/[application]/automate/[automation]/_layout.svelte
@@ -1,6 +1,6 @@
 <script>
   import { automationStore } from "builderStore"
-  import { params } from "@sveltech/routify"
+  import { params } from "@roxi/routify"
 
   if ($params.automation) {
     const automation = $automationStore.automations.find(
diff --git a/packages/builder/src/pages/[application]/automate/index.svelte b/packages/builder/src/pages/[application]/automate/index.svelte
index 98e5b80a18..10c94edf3a 100644
--- a/packages/builder/src/pages/[application]/automate/index.svelte
+++ b/packages/builder/src/pages/[application]/automate/index.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { goto, leftover } from "@sveltech/routify"
+  import { goto, leftover } from "@roxi/routify"
   import { onMount } from 'svelte'
   import { automationStore } from "builderStore"
 
diff --git a/packages/builder/src/pages/[application]/data/_layout.svelte b/packages/builder/src/pages/[application]/data/_layout.svelte
index 0674c93c88..1db1008a8e 100644
--- a/packages/builder/src/pages/[application]/data/_layout.svelte
+++ b/packages/builder/src/pages/[application]/data/_layout.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { isActive, goto } from "@sveltech/routify"
+  import { isActive, goto } from "@roxi/routify"
   import { Switcher, Modal } from "@budibase/bbui"
   import TableNavigator from "components/backend/TableNavigator/TableNavigator.svelte"
   import DatasourceNavigator from "components/backend/DatasourceNavigator/DatasourceNavigator.svelte"
diff --git a/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte b/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte
index e2e7ea3e44..5066daee8b 100644
--- a/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte
+++ b/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { params } from "@sveltech/routify"
+  import { params } from "@roxi/routify"
   import { backendUiStore } from "builderStore"
 
   if ($params.query) {
diff --git a/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/index.svelte b/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/index.svelte
index 46ae11bd07..7adcda7090 100644
--- a/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/index.svelte
+++ b/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/index.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { goto, beforeUrlChange } from "@sveltech/routify"
+  import { goto, beforeUrlChange } from "@roxi/routify"
   import { Button, Heading, Body, Spacer } from "@budibase/bbui"
   import { backendUiStore } from "builderStore"
   import { notifier } from "builderStore/store/notifications"
diff --git a/packages/builder/src/pages/[application]/data/datasource/_layout.svelte b/packages/builder/src/pages/[application]/data/datasource/_layout.svelte
deleted file mode 100644
index b4b8bfddc3..0000000000
--- a/packages/builder/src/pages/[application]/data/datasource/_layout.svelte
+++ /dev/null
@@ -1,18 +0,0 @@
-<script>
-  import { backendUiStore } from "builderStore"
-  import { goto, leftover } from "@roxi/routify"
-  import { onMount } from "svelte"
-
-  onMount(async () => {
-    // navigate to first datasource in list, if not already selected
-    if (
-      !$leftover &&
-      $backendUiStore.datasources.length > 0 &&
-      !$backendUiStore.selectedDatasourceId
-    ) {
-      $goto(`./${$backendUiStore.datasources[0]._id}`)
-    }
-  })
-</script>
-
-<slot />
diff --git a/packages/builder/src/pages/[application]/data/datasource/index.svelte b/packages/builder/src/pages/[application]/data/datasource/index.svelte
index b1c7708465..f617a4d018 100644
--- a/packages/builder/src/pages/[application]/data/datasource/index.svelte
+++ b/packages/builder/src/pages/[application]/data/datasource/index.svelte
@@ -1,11 +1,11 @@
 <script>
     import { backendUiStore } from "builderStore"
-    import { goto } from "@sveltech/routify"
+    import { goto } from "@roxi/routify"
     import { onMount } from "svelte"
 
     onMount(async () => {
       // navigate to first table in list, if not already selected
-      $backendUiStore.datasources.length > 0 && $goto(`../${$backendUiStore.datasources[0]._id}`)
+      $backendUiStore.datasources.length > 0 && $goto(`./${$backendUiStore.datasources[0]._id}`)
     })
   </script>
   
diff --git a/packages/builder/src/pages/[application]/data/table/_layout.svelte b/packages/builder/src/pages/[application]/data/table/_layout.svelte
deleted file mode 100644
index 8806879bc2..0000000000
--- a/packages/builder/src/pages/[application]/data/table/_layout.svelte
+++ /dev/null
@@ -1,19 +0,0 @@
-<script>
-  import { backendUiStore } from "builderStore"
-  import { goto, leftover } from "@roxi/routify"
-  import { onMount } from "svelte"
-
-  onMount(async () => {
-    // navigate to first table in list, if not already selected
-    // and this is the final url (i.e. no selectedTable)
-    if (
-      !$leftover &&
-      $backendUiStore.tables.length > 0 &&
-      (!$backendUiStore.selectedTable || !$backendUiStore.selectedTable._id)
-    ) {
-      $goto(`./${$backendUiStore.tables[0]._id}`)
-    }
-  })
-</script>
-
-<slot />
diff --git a/packages/builder/src/pages/[application]/data/table/index.svelte b/packages/builder/src/pages/[application]/data/table/index.svelte
index d1659257d4..b4755c6f40 100644
--- a/packages/builder/src/pages/[application]/data/table/index.svelte
+++ b/packages/builder/src/pages/[application]/data/table/index.svelte
@@ -1,10 +1,10 @@
 <script>
   import { backendUiStore } from "builderStore"
-  import { goto } from "@sveltech/routify"
+  import { goto } from "@roxi/routify"
   import { onMount } from "svelte"
 
   onMount(async () => {
-    $backendUiStore.tables.length > 0 && $goto(`../${$backendUiStore.tables[0]._id}`)
+    $backendUiStore.tables.length > 0 && $goto(`./${$backendUiStore.tables[0]._id}`)
   })
 </script>
 
diff --git a/packages/builder/src/pages/index.svelte b/packages/builder/src/pages/index.svelte
index 214055a1c1..267c36f633 100644
--- a/packages/builder/src/pages/index.svelte
+++ b/packages/builder/src/pages/index.svelte
@@ -1,5 +1,4 @@
 <script>
-  import { store } from "builderStore"
   import api from "builderStore/api"
   import AppList from "components/start/AppList.svelte"
   import { get } from "builderStore/api"
diff --git a/packages/client/yarn.lock b/packages/client/yarn.lock
index bcef9d320d..e316c3134f 100644
--- a/packages/client/yarn.lock
+++ b/packages/client/yarn.lock
@@ -1699,10 +1699,10 @@ svelte-spa-router@^3.0.5:
   dependencies:
     regexparam "1.3.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.35.0:
+  version "3.35.0"
+  resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.35.0.tgz#e0d0ba60c4852181c2b4fd851194be6fda493e65"
+  integrity sha512-gknlZkR2sXheu/X+B7dDImwANVvK1R0QGQLd8CNIfxxGPeXBmePnxfzb6fWwTQRsYQG7lYkZXvpXJvxvpsoB7g==
 
 symbol-tree@^3.2.4:
   version "3.2.4"
diff --git a/packages/standard-components/yarn.lock b/packages/standard-components/yarn.lock
index 8a026bd592..f338dd36d2 100644
--- a/packages/standard-components/yarn.lock
+++ b/packages/standard-components/yarn.lock
@@ -2830,10 +2830,10 @@ svelte-portal@^1.0.0:
   resolved "https://registry.yarnpkg.com/svelte-portal/-/svelte-portal-1.0.0.tgz#36a47c5578b1a4d9b4dc60fa32a904640ec4cdd3"
   integrity sha512-nHf+DS/jZ6jjnZSleBMSaZua9JlG5rZv9lOGKgJuaZStfevtjIlUJrkLc3vbV8QdBvPPVmvcjTlazAzfKu0v3Q==
 
-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.35.0:
+  version "3.35.0"
+  resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.35.0.tgz#e0d0ba60c4852181c2b4fd851194be6fda493e65"
+  integrity sha512-gknlZkR2sXheu/X+B7dDImwANVvK1R0QGQLd8CNIfxxGPeXBmePnxfzb6fWwTQRsYQG7lYkZXvpXJvxvpsoB7g==
 
 svg.draggable.js@^2.2.2:
   version "2.2.2"