diff --git a/app/Actions/Dashboard/Models/GetModels.ts b/app/Actions/Dashboard/Models/GetModels.ts
index 1916a98b01..5c7c86b663 100644
--- a/app/Actions/Dashboard/Models/GetModels.ts
+++ b/app/Actions/Dashboard/Models/GetModels.ts
@@ -1,7 +1,7 @@
 import type { Model } from '@stacksjs/types'
+import { Glob } from 'bun'
 import { Action } from '@stacksjs/actions'
 import { path } from '@stacksjs/path'
-import { Glob } from 'bun'
 
 export default new Action({
   name: 'GetModels',
diff --git a/bun.lockb b/bun.lockb
index f678b7c6dd..21145ffb1b 100755
Binary files a/bun.lockb and b/bun.lockb differ
diff --git a/storage/framework/core/actions/src/build/cli.ts b/storage/framework/core/actions/src/build/cli.ts
index 5346df83e1..b8c9b2c347 100644
--- a/storage/framework/core/actions/src/build/cli.ts
+++ b/storage/framework/core/actions/src/build/cli.ts
@@ -1,6 +1,6 @@
+import { $ } from 'bun'
 import { log } from '@stacksjs/cli'
 import { buddyPath } from '@stacksjs/path'
-import { $ } from 'bun'
 
 log.info('Building CLI...')
 
diff --git a/storage/framework/core/actions/src/build/core.ts b/storage/framework/core/actions/src/build/core.ts
index a808c8546e..f946c0471f 100644
--- a/storage/framework/core/actions/src/build/core.ts
+++ b/storage/framework/core/actions/src/build/core.ts
@@ -1,9 +1,9 @@
+import { $ } from 'bun'
 import process from 'node:process'
 import { dim, italic, log } from '@stacksjs/cli'
 import { corePath } from '@stacksjs/path'
 import { glob } from '@stacksjs/storage'
 import { ExitCode } from '@stacksjs/types'
-import { $ } from 'bun'
 
 log.info('Building core packages')
 
diff --git a/storage/framework/core/actions/src/build/server.ts b/storage/framework/core/actions/src/build/server.ts
index 12c34a50ea..e74d02b142 100644
--- a/storage/framework/core/actions/src/build/server.ts
+++ b/storage/framework/core/actions/src/build/server.ts
@@ -1,6 +1,6 @@
+import { $ } from 'bun'
 import { log } from '@stacksjs/cli'
 import { frameworkPath } from '@stacksjs/path'
-import { $ } from 'bun'
 
 log.info('Building Server...')
 
diff --git a/storage/framework/core/actions/src/check/ports.ts b/storage/framework/core/actions/src/check/ports.ts
index dd0f6aa7f7..233a9084b0 100644
--- a/storage/framework/core/actions/src/check/ports.ts
+++ b/storage/framework/core/actions/src/check/ports.ts
@@ -1,7 +1,7 @@
+import { $ } from 'bun'
 import process from 'node:process'
 import { log } from '@stacksjs/logging'
 import { findStacksProjects } from '@stacksjs/utils'
-import { $ } from 'bun'
 
 const projects = await findStacksProjects(undefined, { quiet: true })
 
diff --git a/storage/framework/core/actions/src/upgrade/shell.ts b/storage/framework/core/actions/src/upgrade/shell.ts
index 7910760a50..f55daf2469 100644
--- a/storage/framework/core/actions/src/upgrade/shell.ts
+++ b/storage/framework/core/actions/src/upgrade/shell.ts
@@ -1,10 +1,10 @@
+import { $ } from 'bun'
 import process from 'node:process'
 import { italic, runCommand } from '@stacksjs/cli'
 import { log } from '@stacksjs/logging'
 import { path as p } from '@stacksjs/path'
 import { writeFile } from '@stacksjs/storage'
 import { ExitCode } from '@stacksjs/types'
-import { $ } from 'bun'
 
 const homePath = (await $`echo $HOME`.text()).trim()
 const zshrcPath = p.join(homePath, '.zshrc')
diff --git a/storage/framework/core/actions/tests/ai.test.ts b/storage/framework/core/actions/tests/ai.test.ts
index 247dd0dddd..6390430171 100644
--- a/storage/framework/core/actions/tests/ai.test.ts
+++ b/storage/framework/core/actions/tests/ai.test.ts
@@ -1,6 +1,6 @@
+import { describe, expect, it, mock } from 'bun:test'
 import { requestModelAccess } from '@stacksjs/ai'
 import { ai } from '@stacksjs/config'
-import { describe, expect, it, mock } from 'bun:test'
 
 describe('requestModelAccess', () => {
   it('should request access to AI models', async () => {
diff --git a/storage/framework/core/ai/tests/ai.test.ts b/storage/framework/core/ai/tests/ai.test.ts
index 1d4803943c..6b772b5192 100644
--- a/storage/framework/core/ai/tests/ai.test.ts
+++ b/storage/framework/core/ai/tests/ai.test.ts
@@ -1,3 +1,4 @@
+import { afterEach, beforeEach, describe, expect, it, mock, spyOn } from 'bun:test'
 import {
   BedrockClient,
   CreateModelCustomizationJobCommand,
@@ -7,7 +8,6 @@ import {
 import { log } from '@stacksjs/cli'
 import { ai } from '@stacksjs/config'
 import { mockClient } from 'aws-sdk-client-mock'
-import { afterEach, beforeEach, describe, expect, it, mock, spyOn } from 'bun:test'
 import {
   createModelCustomizationJob,
   getModelCustomizationJob,
diff --git a/storage/framework/core/alias/tests/alias.test.ts b/storage/framework/core/alias/tests/alias.test.ts
index 29c61e3d04..c3e4f26709 100644
--- a/storage/framework/core/alias/tests/alias.test.ts
+++ b/storage/framework/core/alias/tests/alias.test.ts
@@ -1,6 +1,6 @@
+import { describe, expect, it } from 'bun:test'
 import fs from 'node:fs'
 import path from 'node:path'
-import { describe, expect, it } from 'bun:test'
 import { alias } from '../src/index'
 
 describe('@stacksjs/alias', () => {
diff --git a/storage/framework/core/buddy/bin/cli.ts b/storage/framework/core/buddy/bin/cli.ts
index 1376f0d207..42c98d8583 100644
--- a/storage/framework/core/buddy/bin/cli.ts
+++ b/storage/framework/core/buddy/bin/cli.ts
@@ -1,7 +1,7 @@
+import { $ } from 'bun'
 import { existsSync, readdirSync, statSync } from 'node:fs'
 import { join } from 'node:path'
 import process from 'node:process'
-import { $ } from 'bun'
 import { cac } from 'cac'
 import { version } from '../package.json'
 
diff --git a/storage/framework/core/buddy/src/commands/deploy.ts b/storage/framework/core/buddy/src/commands/deploy.ts
index 2391f5c0a2..4be994b8e3 100644
--- a/storage/framework/core/buddy/src/commands/deploy.ts
+++ b/storage/framework/core/buddy/src/commands/deploy.ts
@@ -1,4 +1,5 @@
 import type { CLI, DeployOptions } from '@stacksjs/types'
+import { $ } from 'bun'
 import process from 'node:process'
 import { runAction } from '@stacksjs/actions'
 import { intro, italic, log, outro, prompts, runCommand } from '@stacksjs/cli'
@@ -7,7 +8,6 @@ import { addDomain, hasUserDomainBeenAddedToCloud } from '@stacksjs/dns'
 import { Action } from '@stacksjs/enums'
 import { path as p } from '@stacksjs/path'
 import { ExitCode } from '@stacksjs/types'
-import { $ } from 'bun'
 
 export function deploy(buddy: CLI): void {
   const descriptions = {
diff --git a/storage/framework/core/buddy/src/commands/list.ts b/storage/framework/core/buddy/src/commands/list.ts
index 79a830064a..693abe0ba6 100644
--- a/storage/framework/core/buddy/src/commands/list.ts
+++ b/storage/framework/core/buddy/src/commands/list.ts
@@ -1,8 +1,8 @@
 import type { CLI, CliOptions } from '@stacksjs/types'
+import { $ } from 'bun'
 import process from 'node:process'
 import { log } from '@stacksjs/logging'
 import { projectPath } from '@stacksjs/path'
-import { $ } from 'bun'
 
 export function list(buddy: CLI): void {
   const descriptions = {
diff --git a/storage/framework/core/buddy/src/commands/outdated.ts b/storage/framework/core/buddy/src/commands/outdated.ts
index 3ade9778ef..46e640afc3 100644
--- a/storage/framework/core/buddy/src/commands/outdated.ts
+++ b/storage/framework/core/buddy/src/commands/outdated.ts
@@ -1,8 +1,8 @@
 import type { CLI, CliOptions } from '@stacksjs/types'
+import { $ } from 'bun'
 import process from 'node:process'
 import { log } from '@stacksjs/logging'
 import { projectPath } from '@stacksjs/path'
-import { $ } from 'bun'
 
 export function outdated(buddy: CLI): void {
   const descriptions = {
diff --git a/storage/framework/core/buddy/src/commands/ports.ts b/storage/framework/core/buddy/src/commands/ports.ts
index 4e721ff52f..f7fcd8fe30 100644
--- a/storage/framework/core/buddy/src/commands/ports.ts
+++ b/storage/framework/core/buddy/src/commands/ports.ts
@@ -1,4 +1,5 @@
 import type { CLI, Ports, PortsOptions } from '@stacksjs/types'
+import { $ } from 'bun'
 import process from 'node:process'
 import { intro, italic, outro } from '@stacksjs/cli'
 import { ports as projectPorts } from '@stacksjs/config'
@@ -6,7 +7,6 @@ import { log } from '@stacksjs/logging'
 import { findProjectPath, path as p, projectPath } from '@stacksjs/path'
 import { ExitCode } from '@stacksjs/types'
 import { findStacksProjects } from '@stacksjs/utils'
-import { $ } from 'bun'
 
 export function ports(buddy: CLI): void {
   const descriptions = {
diff --git a/storage/framework/core/cache/tests/DynamoDB.test.ts b/storage/framework/core/cache/tests/DynamoDB.test.ts
index c89db442bf..85cb9da756 100644
--- a/storage/framework/core/cache/tests/DynamoDB.test.ts
+++ b/storage/framework/core/cache/tests/DynamoDB.test.ts
@@ -1,6 +1,6 @@
-import { deleteStacksTable, launchServer } from '@stacksjs/testing'
-
 import { afterAll, afterEach, beforeAll, describe, expect, it } from 'bun:test'
+
+import { deleteStacksTable, launchServer } from '@stacksjs/testing'
 import { dynamodb } from '../src/drivers/dynamodb'
 
 beforeAll(async () => {
diff --git a/storage/framework/core/cli/tests/cli.test.ts b/storage/framework/core/cli/tests/cli.test.ts
index 8ef46a206c..5d549d199a 100644
--- a/storage/framework/core/cli/tests/cli.test.ts
+++ b/storage/framework/core/cli/tests/cli.test.ts
@@ -1,6 +1,6 @@
+import { afterEach, describe, expect, it, mock, spyOn } from 'bun:test'
 import { log } from '@stacksjs/logging'
 import { ExitCode } from '@stacksjs/types'
-import { afterEach, describe, expect, it, mock, spyOn } from 'bun:test'
 import { CAC } from 'cac'
 import {
   buddyOptions,
diff --git a/storage/framework/core/components/stepper/package.json b/storage/framework/core/components/stepper/package.json
index dd10d51953..553ff94ffc 100644
--- a/storage/framework/core/components/stepper/package.json
+++ b/storage/framework/core/components/stepper/package.json
@@ -4,7 +4,9 @@
   "version": "0.64.6",
   "description": "A modern stepper component.",
   "author": "Chris Breuer",
-  "contributors": ["Chris Breuer <chris@stacksjs.org>"],
+  "contributors": [
+    "Chris Breuer <chris@stacksjs.org>"
+  ],
   "license": "MIT",
   "funding": "https://github.com/sponsors/chrisbbreuer",
   "homepage": "https://github.com/stacksjs/stacks/tree/main/storage/framework/core/components/stepper#readme",
@@ -16,8 +18,15 @@
   "bugs": {
     "url": "https://github.com/stacksjs/stacks/issues"
   },
-  "keywords": ["steppers", "components", "library", "stacks"],
-  "sideEffects": ["**/*.css"],
+  "keywords": [
+    "steppers",
+    "components",
+    "library",
+    "stacks"
+  ],
+  "sideEffects": [
+    "**/*.css"
+  ],
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -27,7 +36,11 @@
       "import": "./dist/*"
     }
   },
-  "files": ["README.md", "dist", "src"],
+  "files": [
+    "README.md",
+    "dist",
+    "src"
+  ],
   "scripts": {
     "dev": "bunx --bun vite",
     "build": "bunx --bun vite build --mode lib",
@@ -48,7 +61,7 @@
     "@types/clean-css": "^4.2.11",
     "@vue/tsconfig": "^0.5.1",
     "clean-css": "^5.3.3",
-    "unocss": "0.63.4",
+    "unocss": "0.61.0",
     "unplugin-icons": "^0.19.3"
   }
 }
diff --git a/storage/framework/core/database/src/migrations.ts b/storage/framework/core/database/src/migrations.ts
index fd57fb3f4e..895a79fd13 100644
--- a/storage/framework/core/database/src/migrations.ts
+++ b/storage/framework/core/database/src/migrations.ts
@@ -1,9 +1,9 @@
+import { $ } from 'bun'
 import { log } from '@stacksjs/cli'
 import { database } from '@stacksjs/config'
 import { type Err, err, handleError, type Ok, ok, type Result } from '@stacksjs/error-handling'
 import { path } from '@stacksjs/path'
 import { fs, globSync } from '@stacksjs/storage'
-import { $ } from 'bun'
 import { FileMigrationProvider, type MigrationResult, Migrator } from 'kysely'
 import { generateMysqlMigration, generatePostgresMigration, generateSqliteMigration, resetMysqlDatabase, resetPostgresDatabase, resetSqliteDatabase } from './drivers'
 import { db } from './utils'
diff --git a/storage/framework/core/error-handling/tests/error-handling.test.ts b/storage/framework/core/error-handling/tests/error-handling.test.ts
index 43b8be2c4e..58dbc9ff47 100644
--- a/storage/framework/core/error-handling/tests/error-handling.test.ts
+++ b/storage/framework/core/error-handling/tests/error-handling.test.ts
@@ -1,5 +1,5 @@
-import { italic } from '@stacksjs/cli'
 import { afterAll, beforeAll, describe, expect, it, mock, spyOn } from 'bun:test'
+import { italic } from '@stacksjs/cli'
 import fs from 'fs-extra'
 import { ErrorHandler, handleError } from '../src/handler'
 import { rescue } from '../src/utils'
diff --git a/storage/framework/core/lint/package.json b/storage/framework/core/lint/package.json
index 15127208df..11644c4289 100644
--- a/storage/framework/core/lint/package.json
+++ b/storage/framework/core/lint/package.json
@@ -4,7 +4,9 @@
   "version": "0.64.6",
   "description": "The Stacks way to lint.",
   "author": "Chris Breuer",
-  "contributors": ["Chris Breuer <chris@stacksjs.org>"],
+  "contributors": [
+    "Chris Breuer <chris@stacksjs.org>"
+  ],
   "license": "MIT",
   "funding": "https://github.com/sponsors/chrisbbreuer",
   "homepage": "https://github.com/stacksjs/stacks/tree/main/storage/framework/core/lint#readme",
@@ -37,7 +39,11 @@
   },
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
-  "files": ["README.md", "dist", "src"],
+  "files": [
+    "README.md",
+    "dist",
+    "src"
+  ],
   "scripts": {
     "build": "bun build.ts",
     "typecheck": "bun tsc --noEmit",
@@ -51,7 +57,7 @@
     "@stacksjs/eslint-config": "^3.7.3-stacks-1.5",
     "@stylistic/eslint-plugin": "^2.9.0",
     "@typescript-eslint/eslint-plugin": "^8.8.1",
-    "@unocss/eslint-plugin": "0.63.4",
+    "@unocss/eslint-plugin": "0.61.0",
     "@vitest/eslint-plugin": "^1.1.7",
     "eslint": "^9.12.0",
     "eslint-config-flat-gitignore": "^0.3.0",
diff --git a/storage/framework/core/types/package.json b/storage/framework/core/types/package.json
index 043416716a..ca613e67f3 100644
--- a/storage/framework/core/types/package.json
+++ b/storage/framework/core/types/package.json
@@ -4,7 +4,9 @@
   "version": "0.64.6",
   "description": "The Stacks framework types.",
   "author": "Chris Breuer",
-  "contributors": ["Chris Breuer <chris@stacksjs.org>"],
+  "contributors": [
+    "Chris Breuer <chris@stacksjs.org>"
+  ],
   "license": "MIT",
   "funding": "https://github.com/sponsors/chrisbbreuer",
   "homepage": "https://github.com/stacksjs/stacks/tree/main/stacks/types#readme",
@@ -16,7 +18,12 @@
   "bugs": {
     "url": "https://github.com/stacksjs/stacks/issues"
   },
-  "keywords": ["types", "stacks", "framework", "typescript"],
+  "keywords": [
+    "types",
+    "stacks",
+    "framework",
+    "typescript"
+  ],
   "exports": {
     ".": {
       "bun": "./src/index.ts",
@@ -27,7 +34,11 @@
   },
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
-  "files": ["README.md", "dist", "src"],
+  "files": [
+    "README.md",
+    "dist",
+    "src"
+  ],
   "scripts": {
     "build": "bun build.ts",
     "typecheck": "bun tsc --noEmit",
@@ -52,7 +63,7 @@
     "meilisearch": "^0.44.1",
     "neverthrow": "^8.0.0",
     "ora": "^8.1.0",
-    "unocss": "0.63.4",
+    "unocss": "0.61.0",
     "unplugin-auto-import": "^0.18.3",
     "unplugin-vue-components": "^0.27.4",
     "vite": "^5.4.8",
diff --git a/storage/framework/core/ui/package.json b/storage/framework/core/ui/package.json
index 8116b87615..a139aca02c 100644
--- a/storage/framework/core/ui/package.json
+++ b/storage/framework/core/ui/package.json
@@ -4,7 +4,9 @@
   "version": "0.64.6",
   "description": "The Stacks UI engine.",
   "author": "Chris Breuer",
-  "contributors": ["Chris Breuer <chris@stacksjs.org>"],
+  "contributors": [
+    "Chris Breuer <chris@stacksjs.org>"
+  ],
   "license": "MIT",
   "funding": "https://github.com/sponsors/chrisbbreuer",
   "homepage": "https://github.com/stacksjs/stacks/tree/main/storage/framework/core/ui#readme",
@@ -16,7 +18,15 @@
   "bugs": {
     "url": "https://github.com/stacksjs/stacks/issues"
   },
-  "keywords": ["css", "atomic", "ui", "engine", "styles", "stacks", "unocss"],
+  "keywords": [
+    "css",
+    "atomic",
+    "ui",
+    "engine",
+    "styles",
+    "stacks",
+    "unocss"
+  ],
   "sideEffects": false,
   "exports": {
     ".": {
@@ -37,7 +47,11 @@
   },
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
-  "files": ["README.md", "dist", "src"],
+  "files": [
+    "README.md",
+    "dist",
+    "src"
+  ],
   "scripts": {
     "build": "bun build.ts",
     "typecheck": "bun tsc --noEmit",
@@ -56,7 +70,7 @@
     "@unhead/vue": "^1.11.7",
     "pinia": "^2.2.4",
     "unhead": "^1.11.7",
-    "unocss": "0.63.4",
+    "unocss": "0.61.0",
     "unocss-preset-primitives": "0.0.2-beta.1",
     "vite-plugin-vue-layouts": "^0.11.0",
     "vue": "^3.5.11",
diff --git a/storage/framework/orm/src/tests/Models.test.ts b/storage/framework/orm/src/tests/Models.test.ts
index 9aa8899921..9f8b1fd686 100644
--- a/storage/framework/orm/src/tests/Models.test.ts
+++ b/storage/framework/orm/src/tests/Models.test.ts
@@ -1,6 +1,6 @@
 import type { UserModel } from '../models/User'
-import { refreshDatabase } from '@stacksjs/testing'
 import { beforeEach, describe, expect, it } from 'bun:test'
+import { refreshDatabase } from '@stacksjs/testing'
 import User from '../models/User'
 
 beforeEach(async () => {
diff --git a/storage/framework/views/web/package.json b/storage/framework/views/web/package.json
index 459663a217..8621906abf 100644
--- a/storage/framework/views/web/package.json
+++ b/storage/framework/views/web/package.json
@@ -16,7 +16,7 @@
     "@stacksjs/config": "workspace:*",
     "@stacksjs/server": "workspace:*",
     "@unhead/vue": "^1.11.7",
-    "@unocss/reset": "0.63.4",
+    "@unocss/reset": "0.61.0",
     "@vueuse/core": "^11.1.0",
     "@vueuse/head": "^2.0.0",
     "nprogress": "^0.2.0",
@@ -37,7 +37,7 @@
     "markdown-it-shikiji": "^0.10.2",
     "rollup": "^4.24.0",
     "shikiji": "^0.10.2",
-    "unocss": "0.63.4",
+    "unocss": "0.61.0",
     "unplugin-auto-import": "^0.18.3",
     "unplugin-vue-components": "^0.27.4",
     "unplugin-vue-markdown": "^0.26.2",