diff --git a/app/ui/lib/Message.tsx b/app/ui/lib/Message.tsx
index 5fbdcb602..fad20308b 100644
--- a/app/ui/lib/Message.tsx
+++ b/app/ui/lib/Message.tsx
@@ -77,7 +77,7 @@ export const Message = ({
   return (
     <div
       className={cn(
-        'relative flex items-start gap-2 overflow-hidden rounded-md p-3 pr-5 ring ring-current/15',
+        'relative flex items-start gap-2 overflow-hidden rounded-md p-3 pr-5 ring ring-current/10',
         color[variant],
         textColor[variant],
         className
diff --git a/app/ui/styles/index.css b/app/ui/styles/index.css
index 494076224..ba9963505 100644
--- a/app/ui/styles/index.css
+++ b/app/ui/styles/index.css
@@ -69,6 +69,15 @@
   }
 }
 
+::-moz-selection {
+  /* Code for Firefox */
+  @apply text-accent bg-accent;
+}
+
+::selection {
+  @apply text-accent bg-accent;
+}
+
 @custom-variant selected {
   .is-selected & {
     @slot;
diff --git a/package-lock.json b/package-lock.json
index 8a8d095a6..31179d4d0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,7 +13,7 @@
         "@base-ui/react": "^1.1.0",
         "@floating-ui/react": "^0.26.23",
         "@headlessui/react": "^2.2.9",
-        "@oxide/design-system": "5.0.0--canary.163.22682420553.0",
+        "@oxide/design-system": "^6.0.1",
         "@react-aria/live-announcer": "^3.3.4",
         "@tailwindcss/container-queries": "^0.1.1",
         "@tailwindcss/vite": "^4.1.17",
@@ -1698,9 +1698,9 @@
       }
     },
     "node_modules/@oxide/design-system": {
-      "version": "5.0.0--canary.163.22682420553.0",
-      "resolved": "https://registry.npmjs.org/@oxide/design-system/-/design-system-5.0.0--canary.163.22682420553.0.tgz",
-      "integrity": "sha512-1QLM/yxY5B9PVtd9nAINN+I/qVeSN0bzkbrsf+mb1aoiFWB3yb/IaMOaFxygkDS/SPOZkbLi3htRNftkE5wYjA==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/@oxide/design-system/-/design-system-6.0.1.tgz",
+      "integrity": "sha512-5MozWts+liLNDv2jLaTLuw4DDLysQXTTwFOoq7PUBLYcgBW0tPRoCMPkCw3TnB8H4aLxnpAXY4VIhOcMtWMumw==",
       "license": "MPL 2.0",
       "dependencies": {
         "@floating-ui/react": "^0.27.16",
@@ -4804,9 +4804,6 @@
       "cpu": [
         "arm"
       ],
-      "libc": [
-        "glibc"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -4820,9 +4817,6 @@
       "cpu": [
         "arm"
       ],
-      "libc": [
-        "musl"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -4836,9 +4830,6 @@
       "cpu": [
         "arm64"
       ],
-      "libc": [
-        "glibc"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -4852,9 +4843,6 @@
       "cpu": [
         "arm64"
       ],
-      "libc": [
-        "musl"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -4868,9 +4856,6 @@
       "cpu": [
         "loong64"
       ],
-      "libc": [
-        "glibc"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -4884,9 +4869,6 @@
       "cpu": [
         "loong64"
       ],
-      "libc": [
-        "musl"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -4900,9 +4882,6 @@
       "cpu": [
         "ppc64"
       ],
-      "libc": [
-        "glibc"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -4916,9 +4895,6 @@
       "cpu": [
         "ppc64"
       ],
-      "libc": [
-        "musl"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -4932,9 +4908,6 @@
       "cpu": [
         "riscv64"
       ],
-      "libc": [
-        "glibc"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -4948,9 +4921,6 @@
       "cpu": [
         "riscv64"
       ],
-      "libc": [
-        "musl"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -4964,9 +4934,6 @@
       "cpu": [
         "s390x"
       ],
-      "libc": [
-        "glibc"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -4980,9 +4947,6 @@
       "cpu": [
         "x64"
       ],
-      "libc": [
-        "glibc"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -4996,9 +4960,6 @@
       "cpu": [
         "x64"
       ],
-      "libc": [
-        "musl"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
diff --git a/package.json b/package.json
index 3e688cb95..bc2e80c95 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
     "@base-ui/react": "^1.1.0",
     "@floating-ui/react": "^0.26.23",
     "@headlessui/react": "^2.2.9",
-    "@oxide/design-system": "5.0.0--canary.163.22682420553.0",
+    "@oxide/design-system": "^6.0.1",
     "@react-aria/live-announcer": "^3.3.4",
     "@tailwindcss/container-queries": "^0.1.1",
     "@tailwindcss/vite": "^4.1.17",