diff --git a/package-lock.json b/package-lock.json
index 8ca9c97b..046dc633 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -28,7 +28,7 @@
       "devDependencies": {
         "@cypress/webpack-preprocessor": "~5.11.1",
         "@empathyco/eslint-plugin-x": "^2.0.0-alpha.27",
-        "@empathyco/x-tailwindcss": "^1.0.0-alpha.20",
+        "@empathyco/x-tailwindcss": "^1.0.0-alpha.25",
         "@empathyco/x-translations": "^1.1.0-alpha.33",
         "@rollup/plugin-commonjs": "~21.0.1",
         "@rollup/plugin-json": "~4.1.0",
@@ -2163,28 +2163,38 @@
       }
     },
     "node_modules/@empathyco/x-deep-merge": {
-      "version": "1.3.0-alpha.33",
-      "resolved": "https://registry.npmjs.org/@empathyco/x-deep-merge/-/x-deep-merge-1.3.0-alpha.33.tgz",
-      "integrity": "sha512-janmC0HBWLAVdWb9kHyJTcffO68rloQOfZEpW/2mVXY8bxYU1TmHTnvbZPZZJCEg5R1U8Ssijq0taMkfM1BohA==",
+      "version": "1.3.0-alpha.34",
+      "resolved": "https://registry.npmjs.org/@empathyco/x-deep-merge/-/x-deep-merge-1.3.0-alpha.34.tgz",
+      "integrity": "sha512-2TMI3jU139A/i2G5pUUujFsosAOVgWtSdTWD//f59FR1pMzlfTDhimSkJBt+joBIWJehbYWt6Bi4iN04Tu1/gA==",
       "dependencies": {
-        "@empathyco/x-utils": "^1.0.0-alpha.18",
-        "tslib": "~2.4.1"
+        "@empathyco/x-utils": "^1.0.0-alpha.19",
+        "tslib": "~2.5.0"
       },
       "engines": {
         "node": ">=16"
       }
     },
+    "node_modules/@empathyco/x-deep-merge/node_modules/tslib": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
+      "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
+    },
     "node_modules/@empathyco/x-logger": {
-      "version": "1.2.0-alpha.10",
-      "resolved": "https://registry.npmjs.org/@empathyco/x-logger/-/x-logger-1.2.0-alpha.10.tgz",
-      "integrity": "sha512-sJmVl1UV00MzqNeDt6ixZVbtUJvwxYGA3Art6f70V4lQf9hfvSQ/Y7OzR5nH1+hF8zzfb4or44de3+XnmjTi7Q==",
+      "version": "1.2.0-alpha.11",
+      "resolved": "https://registry.npmjs.org/@empathyco/x-logger/-/x-logger-1.2.0-alpha.11.tgz",
+      "integrity": "sha512-fZMkFGcAV8HM0fKW6YyUAYMEf+snZyg41SSnxTezgsoOr6mhJr95SoPH/wlXx0fLEC5u9K2OPdMZtoLHMnBSJw==",
       "dependencies": {
-        "tslib": "~2.4.1"
+        "tslib": "~2.5.0"
       },
       "engines": {
         "node": ">=16"
       }
     },
+    "node_modules/@empathyco/x-logger/node_modules/tslib": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
+      "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
+    },
     "node_modules/@empathyco/x-priority-queue": {
       "version": "0.1.0-alpha.13",
       "resolved": "https://registry.npmjs.org/@empathyco/x-priority-queue/-/x-priority-queue-0.1.0-alpha.13.tgz",
@@ -2198,26 +2208,31 @@
       }
     },
     "node_modules/@empathyco/x-storage-service": {
-      "version": "2.0.0-alpha.10",
-      "resolved": "https://registry.npmjs.org/@empathyco/x-storage-service/-/x-storage-service-2.0.0-alpha.10.tgz",
-      "integrity": "sha512-3xlJToZIe3X3Toeey8mACTjCInJuVvo7gzuTqRcHVgZhiFmi4iTyqolfDltjbzOuftRtjo413pFWTl+zxQsBpw==",
+      "version": "2.0.0-alpha.11",
+      "resolved": "https://registry.npmjs.org/@empathyco/x-storage-service/-/x-storage-service-2.0.0-alpha.11.tgz",
+      "integrity": "sha512-qVd6DlTvvlnB1U2S97srAP3XZTGsBnfA3ivv8rH/wJlgdoqdyhH3Xr60WpsxYFzTjN9uiTKp5EIjsAZaykwyXQ==",
       "dependencies": {
-        "@empathyco/x-logger": "^1.2.0-alpha.10",
-        "tslib": "~2.4.1"
+        "@empathyco/x-logger": "^1.2.0-alpha.11",
+        "tslib": "~2.5.0"
       },
       "engines": {
         "node": ">=16"
       }
     },
+    "node_modules/@empathyco/x-storage-service/node_modules/tslib": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
+      "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
+    },
     "node_modules/@empathyco/x-tailwindcss": {
-      "version": "1.0.0-alpha.20",
-      "resolved": "https://registry.npmjs.org/@empathyco/x-tailwindcss/-/x-tailwindcss-1.0.0-alpha.20.tgz",
-      "integrity": "sha512-8Zfxf7fXZDKfjC39chfOUhmCnfeSIrqyJDaihHCRKG5s27xNjFMpx1v0jQd6gllZNoYxN9VfTDKxpTfI6NfzUA==",
+      "version": "1.0.0-alpha.25",
+      "resolved": "https://registry.npmjs.org/@empathyco/x-tailwindcss/-/x-tailwindcss-1.0.0-alpha.25.tgz",
+      "integrity": "sha512-o9E27/pJT7Mf/5VD2U5SpCtQP+3SzADyBmLAnhmRSzdwqlZDhO1zCYk1vlZeFQeuc7P6L8y2GOWM9Os80yS7wQ==",
       "dev": true,
       "dependencies": {
-        "@empathyco/x-deep-merge": "^1.3.0-alpha.33",
-        "@empathyco/x-utils": "^1.0.0-alpha.18",
-        "tslib": "~2.4.1"
+        "@empathyco/x-deep-merge": "^1.3.0-alpha.34",
+        "@empathyco/x-utils": "^1.0.0-alpha.19",
+        "tslib": "~2.5.0"
       },
       "engines": {
         "node": ">=16"
@@ -2239,6 +2254,12 @@
         }
       }
     },
+    "node_modules/@empathyco/x-tailwindcss/node_modules/tslib": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
+      "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==",
+      "dev": true
+    },
     "node_modules/@empathyco/x-translations": {
       "version": "1.1.0-alpha.33",
       "resolved": "https://registry.npmjs.org/@empathyco/x-translations/-/x-translations-1.1.0-alpha.33.tgz",
@@ -2268,18 +2289,23 @@
       }
     },
     "node_modules/@empathyco/x-utils": {
-      "version": "1.0.0-alpha.18",
-      "resolved": "https://registry.npmjs.org/@empathyco/x-utils/-/x-utils-1.0.0-alpha.18.tgz",
-      "integrity": "sha512-g0kyaaaeyeN3KQ1xoTu+mT8IHEFVoUJvwwL0jcVi+3BZbDgA7b45CvMlw9IuXh2OxqfuHSm893FaNZn3z0HCXQ==",
+      "version": "1.0.0-alpha.19",
+      "resolved": "https://registry.npmjs.org/@empathyco/x-utils/-/x-utils-1.0.0-alpha.19.tgz",
+      "integrity": "sha512-SLdnCV/Hpr6V+g2n4rB6DtPLj15OtDqnHn/wyX3Z7H32BZ2YYLq9z/ZBis9A20ppoTRTdHYJKB+8Slhcpka0Pg==",
       "dependencies": {
-        "@empathyco/x-storage-service": "^2.0.0-alpha.10",
-        "nanoid": "~3.1.31",
-        "tslib": "~2.4.1"
+        "@empathyco/x-storage-service": "^2.0.0-alpha.11",
+        "nanoid": "~3.3.0",
+        "tslib": "~2.5.0"
       },
       "engines": {
         "node": ">=16"
       }
     },
+    "node_modules/@empathyco/x-utils/node_modules/tslib": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
+      "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
+    },
     "node_modules/@es-joy/jsdoccomment": {
       "version": "0.36.1",
       "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.36.1.tgz",
@@ -5282,17 +5308,6 @@
         "source-map": "^0.6.1"
       }
     },
-    "node_modules/@vue/compiler-sfc/node_modules/nanoid": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
-      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
     "node_modules/@vue/compiler-sfc/node_modules/postcss": {
       "version": "8.4.21",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz",
@@ -8609,18 +8624,6 @@
         "webpack": "^5.0.0"
       }
     },
-    "node_modules/css-loader/node_modules/nanoid": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
-      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
-      "dev": true,
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
     "node_modules/css-loader/node_modules/postcss": {
       "version": "8.4.21",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz",
@@ -18505,9 +18508,15 @@
       }
     },
     "node_modules/nanoid": {
-      "version": "3.1.32",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.32.tgz",
-      "integrity": "sha512-F8mf7R3iT9bvThBoW4tGXhXFHCctyCiUUPrWF8WaTqa3h96d9QybkSeba43XVOOE3oiLfkVDe4bT8MeGmkrTxw==",
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
+      "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
       "bin": {
         "nanoid": "bin/nanoid.cjs"
       },
@@ -22758,18 +22767,6 @@
       "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
       "dev": true
     },
-    "node_modules/rollup-plugin-styles/node_modules/nanoid": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
-      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
-      "dev": true,
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
     "node_modules/rollup-plugin-styles/node_modules/normalize-url": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
@@ -25236,18 +25233,6 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "node_modules/tailwindcss/node_modules/nanoid": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
-      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
-      "dev": true,
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
     "node_modules/tailwindcss/node_modules/postcss": {
       "version": "8.4.21",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz",
@@ -29202,20 +29187,34 @@
       }
     },
     "@empathyco/x-deep-merge": {
-      "version": "1.3.0-alpha.33",
-      "resolved": "https://registry.npmjs.org/@empathyco/x-deep-merge/-/x-deep-merge-1.3.0-alpha.33.tgz",
-      "integrity": "sha512-janmC0HBWLAVdWb9kHyJTcffO68rloQOfZEpW/2mVXY8bxYU1TmHTnvbZPZZJCEg5R1U8Ssijq0taMkfM1BohA==",
+      "version": "1.3.0-alpha.34",
+      "resolved": "https://registry.npmjs.org/@empathyco/x-deep-merge/-/x-deep-merge-1.3.0-alpha.34.tgz",
+      "integrity": "sha512-2TMI3jU139A/i2G5pUUujFsosAOVgWtSdTWD//f59FR1pMzlfTDhimSkJBt+joBIWJehbYWt6Bi4iN04Tu1/gA==",
       "requires": {
-        "@empathyco/x-utils": "^1.0.0-alpha.18",
-        "tslib": "~2.4.1"
+        "@empathyco/x-utils": "^1.0.0-alpha.19",
+        "tslib": "~2.5.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
+          "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
+        }
       }
     },
     "@empathyco/x-logger": {
-      "version": "1.2.0-alpha.10",
-      "resolved": "https://registry.npmjs.org/@empathyco/x-logger/-/x-logger-1.2.0-alpha.10.tgz",
-      "integrity": "sha512-sJmVl1UV00MzqNeDt6ixZVbtUJvwxYGA3Art6f70V4lQf9hfvSQ/Y7OzR5nH1+hF8zzfb4or44de3+XnmjTi7Q==",
+      "version": "1.2.0-alpha.11",
+      "resolved": "https://registry.npmjs.org/@empathyco/x-logger/-/x-logger-1.2.0-alpha.11.tgz",
+      "integrity": "sha512-fZMkFGcAV8HM0fKW6YyUAYMEf+snZyg41SSnxTezgsoOr6mhJr95SoPH/wlXx0fLEC5u9K2OPdMZtoLHMnBSJw==",
       "requires": {
-        "tslib": "~2.4.1"
+        "tslib": "~2.5.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
+          "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
+        }
       }
     },
     "@empathyco/x-priority-queue": {
@@ -29228,23 +29227,38 @@
       }
     },
     "@empathyco/x-storage-service": {
-      "version": "2.0.0-alpha.10",
-      "resolved": "https://registry.npmjs.org/@empathyco/x-storage-service/-/x-storage-service-2.0.0-alpha.10.tgz",
-      "integrity": "sha512-3xlJToZIe3X3Toeey8mACTjCInJuVvo7gzuTqRcHVgZhiFmi4iTyqolfDltjbzOuftRtjo413pFWTl+zxQsBpw==",
+      "version": "2.0.0-alpha.11",
+      "resolved": "https://registry.npmjs.org/@empathyco/x-storage-service/-/x-storage-service-2.0.0-alpha.11.tgz",
+      "integrity": "sha512-qVd6DlTvvlnB1U2S97srAP3XZTGsBnfA3ivv8rH/wJlgdoqdyhH3Xr60WpsxYFzTjN9uiTKp5EIjsAZaykwyXQ==",
       "requires": {
-        "@empathyco/x-logger": "^1.2.0-alpha.10",
-        "tslib": "~2.4.1"
+        "@empathyco/x-logger": "^1.2.0-alpha.11",
+        "tslib": "~2.5.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
+          "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
+        }
       }
     },
     "@empathyco/x-tailwindcss": {
-      "version": "1.0.0-alpha.20",
-      "resolved": "https://registry.npmjs.org/@empathyco/x-tailwindcss/-/x-tailwindcss-1.0.0-alpha.20.tgz",
-      "integrity": "sha512-8Zfxf7fXZDKfjC39chfOUhmCnfeSIrqyJDaihHCRKG5s27xNjFMpx1v0jQd6gllZNoYxN9VfTDKxpTfI6NfzUA==",
+      "version": "1.0.0-alpha.25",
+      "resolved": "https://registry.npmjs.org/@empathyco/x-tailwindcss/-/x-tailwindcss-1.0.0-alpha.25.tgz",
+      "integrity": "sha512-o9E27/pJT7Mf/5VD2U5SpCtQP+3SzADyBmLAnhmRSzdwqlZDhO1zCYk1vlZeFQeuc7P6L8y2GOWM9Os80yS7wQ==",
       "dev": true,
       "requires": {
-        "@empathyco/x-deep-merge": "^1.3.0-alpha.33",
-        "@empathyco/x-utils": "^1.0.0-alpha.18",
-        "tslib": "~2.4.1"
+        "@empathyco/x-deep-merge": "^1.3.0-alpha.34",
+        "@empathyco/x-utils": "^1.0.0-alpha.19",
+        "tslib": "~2.5.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
+          "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==",
+          "dev": true
+        }
       }
     },
     "@empathyco/x-translations": {
@@ -29266,13 +29280,20 @@
       }
     },
     "@empathyco/x-utils": {
-      "version": "1.0.0-alpha.18",
-      "resolved": "https://registry.npmjs.org/@empathyco/x-utils/-/x-utils-1.0.0-alpha.18.tgz",
-      "integrity": "sha512-g0kyaaaeyeN3KQ1xoTu+mT8IHEFVoUJvwwL0jcVi+3BZbDgA7b45CvMlw9IuXh2OxqfuHSm893FaNZn3z0HCXQ==",
+      "version": "1.0.0-alpha.19",
+      "resolved": "https://registry.npmjs.org/@empathyco/x-utils/-/x-utils-1.0.0-alpha.19.tgz",
+      "integrity": "sha512-SLdnCV/Hpr6V+g2n4rB6DtPLj15OtDqnHn/wyX3Z7H32BZ2YYLq9z/ZBis9A20ppoTRTdHYJKB+8Slhcpka0Pg==",
       "requires": {
-        "@empathyco/x-storage-service": "^2.0.0-alpha.10",
-        "nanoid": "~3.1.31",
-        "tslib": "~2.4.1"
+        "@empathyco/x-storage-service": "^2.0.0-alpha.11",
+        "nanoid": "~3.3.0",
+        "tslib": "~2.5.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
+          "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
+        }
       }
     },
     "@es-joy/jsdoccomment": {
@@ -31535,11 +31556,6 @@
         "source-map": "^0.6.1"
       },
       "dependencies": {
-        "nanoid": {
-          "version": "3.3.4",
-          "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
-          "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw=="
-        },
         "postcss": {
           "version": "8.4.21",
           "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz",
@@ -34187,12 +34203,6 @@
         "semver": "^7.3.8"
       },
       "dependencies": {
-        "nanoid": {
-          "version": "3.3.4",
-          "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
-          "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
-          "dev": true
-        },
         "postcss": {
           "version": "8.4.21",
           "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz",
@@ -41627,9 +41637,9 @@
       }
     },
     "nanoid": {
-      "version": "3.1.32",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.32.tgz",
-      "integrity": "sha512-F8mf7R3iT9bvThBoW4tGXhXFHCctyCiUUPrWF8WaTqa3h96d9QybkSeba43XVOOE3oiLfkVDe4bT8MeGmkrTxw=="
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
+      "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA=="
     },
     "native-request": {
       "version": "1.1.0",
@@ -44898,12 +44908,6 @@
           "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
           "dev": true
         },
-        "nanoid": {
-          "version": "3.3.4",
-          "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
-          "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
-          "dev": true
-        },
         "normalize-url": {
           "version": "6.1.0",
           "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
@@ -46770,12 +46774,6 @@
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
-        "nanoid": {
-          "version": "3.3.4",
-          "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
-          "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
-          "dev": true
-        },
         "postcss": {
           "version": "8.4.21",
           "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz",
diff --git a/package.json b/package.json
index 9c919d99..c1732dea 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "lint:fix": "npm run lint -- --fix",
     "install:local": "npm install file:../x/packages/x-components/empathyco-x-components-3.0.0-alpha.346.tgz --no-save",
     "install:utils:local": "npm install file:../x/packages/x-archetype-utils/empathyco-x-archetype-utils-0.1.0-alpha.2.tgz --no-save",
-    "install:xds:local": "npm install file:../x/packages/x-tailwindcss/empathyco-x-tailwindcss-1.0.0-alpha.9.tgz --no-save",
+    "install:xds:local": "npm install file:../x/packages/x-tailwindcss/empathyco-x-tailwindcss-1.0.0-alpha.25.tgz --no-save",
     "json:csv": "json-csv ./src/i18n/messages",
     "csv:json": "csv-json ./output ./src/i18n/messages",
     "prepare": "husky install"
@@ -46,7 +46,7 @@
   "devDependencies": {
     "@cypress/webpack-preprocessor": "~5.11.1",
     "@empathyco/eslint-plugin-x": "^2.0.0-alpha.27",
-    "@empathyco/x-tailwindcss": "^1.0.0-alpha.20",
+    "@empathyco/x-tailwindcss": "^1.0.0-alpha.25",
     "@empathyco/x-translations": "^1.1.0-alpha.33",
     "@rollup/plugin-commonjs": "~21.0.1",
     "@rollup/plugin-json": "~4.1.0",
diff --git a/src/components/pre-search/custom-query-preview.vue b/src/components/pre-search/custom-query-preview.vue
index c65e70a6..5c737367 100644
--- a/src/components/pre-search/custom-query-preview.vue
+++ b/src/components/pre-search/custom-query-preview.vue
@@ -13,7 +13,7 @@
         <template #header>
           <BaseEventButton
             :events="getEvent(query)"
-            class="x-button-tight x-button max-desktop:x-px-16"
+            class="x-button-neutral x-button-tight x-button max-desktop:x-px-16"
           >
             {{ query }}
             ({{ totalResults }})
diff --git a/src/components/predictive-layer/predictive-layer.vue b/src/components/predictive-layer/predictive-layer.vue
index db523199..2885b4b9 100644
--- a/src/components/predictive-layer/predictive-layer.vue
+++ b/src/components/predictive-layer/predictive-layer.vue
@@ -38,17 +38,17 @@
             <BaseIdModalOpen
               v-if="isTabletOrLess && !$x.query.searchBox"
               modalId="my-history-aside"
-              class="x-self-end x-button-sm x-button-tight x-pr-8"
+              class="x-self-end x-button-neutral x-button-sm x-button-tight x-pr-8"
             >
               {{ $t('myHistory.openButton') }}
               <SettingsIcon class="x-icon-lg" />
             </BaseIdModalOpen>
             <div v-if="showHistoryQueries" class="x-flex x-flex-col x-gap-4">
               <div v-if="!$x.query.searchBox" class="x-flex x-items-center">
-                <h1 class="x-uppercase x-title4 x-title4-sm x-flex-1">
+                <h1 class="x-title4 x-title4-sm x-flex-1 x-uppercase">
                   {{ $t('historyQueries.title') }}
                 </h1>
-                <ClearHistoryQueries class="x-button-sm x-button-tight x-px-8">
+                <ClearHistoryQueries class="x-button-neutral x-button-sm x-button-tight x-px-8">
                   <TrashIcon v-if="isTabletOrLess" class="x-icon-lg" />
                   <span v-else>{{ $t('historyQueries.clear') }}</span>
                 </ClearHistoryQueries>
@@ -109,7 +109,7 @@
               class="x-flex x-flex-col x-gap-4"
               :class="{ 'x-pt-16': $x.query.searchBox && isDesktopOrGreater }"
             >
-              <h1 class="x-uppercase x-title4 x-title4-sm x-py-8 desktop:x-p-0">
+              <h1 class="x-title4 x-title4-sm x-py-8 x-uppercase desktop:x-p-0">
                 {{ $t('nextQueries.title') }}
               </h1>
               <NextQueries
@@ -134,7 +134,7 @@
             </div>
 
             <div v-if="showPopularSearches" class="x-flex x-flex-col x-gap-4">
-              <h1 class="x-uppercase x-title4 x-title4-sm">
+              <h1 class="x-title4 x-title4-sm x-uppercase">
                 {{ $t('popularSearches.title') }}
               </h1>
               <PopularSearches
@@ -156,7 +156,7 @@
             <BaseIdModalOpen
               v-if="isDesktopOrGreater && !$x.query.searchBox"
               modalId="my-history-aside"
-              class="x-self-start x-button-sm x-button-tight"
+              class="x-self-start x-button-neutral x-button-sm x-button-tight"
               data-test="my-history-button"
             >
               <SettingsIcon />