diff --git a/client/components/global/ProTag.vue b/client/components/global/ProTag.vue
index 841aed9..0aac4d7 100644
--- a/client/components/global/ProTag.vue
+++ b/client/components/global/ProTag.vue
@@ -77,8 +77,7 @@ export default {
 
   methods: {
     openChat() {
-      window.$crisp.push(['do', 'chat:show'])
-      window.$crisp.push(['do', 'chat:open'])
+      useCrisp().openAndShowChat()
     },
   }
 }
diff --git a/client/components/open/forms/OpenFormField.vue b/client/components/open/forms/OpenFormField.vue
index e0a28ea..d9738cb 100644
--- a/client/components/open/forms/OpenFormField.vue
+++ b/client/components/open/forms/OpenFormField.vue
@@ -230,7 +230,7 @@ export default {
         classes += '-mx-4 px-4 -my-1 py-1 group/nffield relative transition-colors'
 
         if (this.beingEdited) {
-          classes += ' bg-blue-50 rounded-md'
+          classes += ' bg-blue-50 dark:bg-gray-800 rounded-md'
         }
       }
       return classes
diff --git a/client/components/open/forms/components/form-components/FormAboutSubmission.vue b/client/components/open/forms/components/form-components/FormAboutSubmission.vue
index b1230b7..829974f 100644
--- a/client/components/open/forms/components/form-components/FormAboutSubmission.vue
+++ b/client/components/open/forms/components/form-components/FormAboutSubmission.vue
@@ -67,7 +67,7 @@
           <small>If the submission has the same value(s) as a previous one for the selected
             column(s), we will update it, instead of creating a new one.
             <a href="#"
-               @click.prevent="$crisp.push(['do', 'helpdesk:article:open', ['en', 'how-to-update-a-page-on-form-submission-1t1jwmn']])"
+               @click.prevent="crisp.openHelpdeskArticle('how-to-update-a-page-on-form-submission-1t1jwmn')"
             >More
               info here.</a>
           </small>
@@ -142,7 +142,8 @@ export default {
     const {content: form} = storeToRefs(workingFormStore)
     return {
       form,
-      workingFormStore
+      workingFormStore,
+      crisp: useCrisp()
     }
   },
   data () {
diff --git a/client/components/pages/forms/show/FormCleanings.vue b/client/components/pages/forms/show/FormCleanings.vue
index 29def81..fe174e1 100644
--- a/client/components/pages/forms/show/FormCleanings.vue
+++ b/client/components/pages/forms/show/FormCleanings.vue
@@ -99,8 +99,7 @@ export default {
   },
   methods: {
     openCrisp () {
-      this.$crisp.push(['do', 'chat:show'])
-      this.$crisp.push(['do', 'chat:open'])
+      useCrisp().openAndShowChat()
     }
   }
 }
diff --git a/client/components/pages/pricing/CustomPlan.vue b/client/components/pages/pricing/CustomPlan.vue
index c4f1704..29fc2f4 100644
--- a/client/components/pages/pricing/CustomPlan.vue
+++ b/client/components/pages/pricing/CustomPlan.vue
@@ -32,9 +32,7 @@ export default {
 
   methods: {
     customPlanClick () {
-      window.$crisp.push(['do', 'chat:show'])
-      window.$crisp.push(['do', 'chat:open'])
-      window.$crisp.push(['do', 'message:send', ['text', 'Hi, I would like to discuss about a custom plan']])
+      useCrisp().sendTextMessage('Hi, I would like to discuss about a custom plan')
     }
   }
 }
diff --git a/client/pages/forms/[slug]/index.vue b/client/pages/forms/[slug]/index.vue
index 6475df9..d9b9800 100644
--- a/client/pages/forms/[slug]/index.vue
+++ b/client/pages/forms/[slug]/index.vue
@@ -82,7 +82,6 @@ const passwordEntered = function (password) {
         openCompleteForm.value.addPasswordError('Invalid password.')
       }
     })
-    openCompleteForm.value.submit()
   })
 }
 
diff --git a/client/pages/pricing.vue b/client/pages/pricing.vue
index a0a7f4b..f3ae5f1 100644
--- a/client/pages/pricing.vue
+++ b/client/pages/pricing.vue
@@ -271,8 +271,7 @@ export default {
 
   methods: {
     contactUs() {
-      window.$crisp.push(['do', 'chat:show'])
-      window.$crisp.push(['do', 'chat:open'])
+      useCrisp().openAndShowChat()
     }
   }
 }
diff --git a/client/pages/subscriptions/success.vue b/client/pages/subscriptions/success.vue
index df63c75..83e7db3 100644
--- a/client/pages/subscriptions/success.vue
+++ b/client/pages/subscriptions/success.vue
@@ -32,7 +32,8 @@ export default {
     return {
       authStore,
       authenticated : computed(() => authStore.check),
-      user : computed(() => authStore.user)
+      user : computed(() => authStore.user),
+      crisp: useCrisp()
     }
   },
 
@@ -58,7 +59,7 @@ export default {
     redirectIfSubscribed () {
       if (this.user.is_subscribed) {
         useAmplitude().logEvent('subscribed', { plan: this.user.has_enterprise_subscription ? 'enterprise' : 'pro' })
-        this.$crisp.push(['set', 'session:event', [[['subscribed', { plan: this.user.has_enterprise_subscription ? 'enterprise' : 'pro' }, 'blue']]]])
+        this.crisp.pushEvent('subscribed', { plan: this.user.has_enterprise_subscription ? 'enterprise' : 'pro' })
         this.$router.push({ name: 'home' })
 
         if (this.user.has_enterprise_subscription) {
diff --git a/client/tailwind.config.js b/client/tailwind.config.js
index ae0d3b5..236a8ea 100644
--- a/client/tailwind.config.js
+++ b/client/tailwind.config.js
@@ -12,9 +12,10 @@ module.exports = {
   ],
   safelist: [
     {
-      pattern:  /.*bg-(blue|gray|red|yellow|green).*/,
+      pattern: /.*bg-(blue|gray|red|yellow|green).*/,
     },
-    ...['green', 'red', 'blue', 'yellow'].map((color) => ['bg-' + color + '-100', 'border-' + color + '-500']).flat() // Alerts
+    ...['green', 'red', 'blue', 'yellow'].map((color) => ['bg-' + color + '-100', 'border-' + color + '-500']).flat(), // Alerts
+    ...['dark:hover:bg-notion-dark-light']
   ],
   darkMode: 'class', // or 'media' or 'class'
   theme: {
@@ -26,8 +27,8 @@ module.exports = {
           '16%': {transform: 'translateY(+10%)'}
         },
         'infinite-scroll': {
-          from: { transform: 'translateX(0)' },
-          to: { transform: 'translateX(-100%)' },
+          from: {transform: 'translateX(0)'},
+          to: {transform: 'translateX(-100%)'},
         }
       },
       animation: {
@@ -84,7 +85,7 @@ module.exports = {
   },
   plugins: [
     require('@tailwindcss/aspect-ratio'),
-    plugin(function({ addVariant }) {
+    plugin(function ({addVariant}) {
       addVariant('between', '&:not(:first-child):not(:last-child)')
       addVariant('hocus', ['&:hover', '&:focus'])
     })