diff --git a/web/typo3conf/ext/ep_events/Resources/Private/Assets/js/components/Configurator.vue b/web/typo3conf/ext/ep_events/Resources/Private/Assets/js/components/Configurator.vue
index 24fc53b2..a4eff87d 100644
--- a/web/typo3conf/ext/ep_events/Resources/Private/Assets/js/components/Configurator.vue
+++ b/web/typo3conf/ext/ep_events/Resources/Private/Assets/js/components/Configurator.vue
@@ -205,14 +205,9 @@
                 this.formErrors = {};
             },
             trackConversion () {
-                window.google_trackConversion({
-                    google_conversion_id: 1072535457,
-                    google_conversion_language: "en",
-                    google_conversion_format: "1",
-                    google_conversion_color: "ffffff",
-                    google_conversion_label: "lead",
-                    google_conversion_value: 0
-                });
+                ga('create', 'UA-230208-3') ;
+                ga('send', 'event', 'Formular', 'Abschicken');
+                gtag('event', 'conversion', { 'send_to': 'AW-1072535457/BScCCKyEtocBEKGvtv8D' });
             }
         },
         computed: {
diff --git a/web/typo3conf/ext/ep_events/Resources/Private/Assets/js/components/InquiryForm.vue b/web/typo3conf/ext/ep_events/Resources/Private/Assets/js/components/InquiryForm.vue
index 5b3338fc..7cca96cd 100644
--- a/web/typo3conf/ext/ep_events/Resources/Private/Assets/js/components/InquiryForm.vue
+++ b/web/typo3conf/ext/ep_events/Resources/Private/Assets/js/components/InquiryForm.vue
@@ -54,14 +54,9 @@
                 this.$session.set('formData', this.formData);
             },
             trackConversion () {
-                window.google_trackConversion({
-                    google_conversion_id: 1072535457,
-                    google_conversion_language: "en",
-                    google_conversion_format: "1",
-                    google_conversion_color: "ffffff",
-                    google_conversion_label: "lead",
-                    google_conversion_value: 0
-                });
+                ga('create', 'UA-230208-3') ;
+                ga('send', 'event', 'Formular', 'Abschicken');
+                gtag('event', 'conversion', { 'send_to': 'AW-1072535457/BScCCKyEtocBEKGvtv8D' });
             }
         },
         watch: {
diff --git a/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/Configurator.html b/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/Configurator.html
index c4aa9b56..3352a8d1 100644
--- a/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/Configurator.html
+++ b/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/Configurator.html
@@ -276,7 +276,7 @@
                              alt="Processing...">
                     </div>
                     <div class="configurator__overlay" v-if="success" @click.prevent="resetForm()">
-                        <p class="form__overlay__text"><strong>{f:translate(key: 'tx_epevents.label.configurator_thank_you', extensionName: 'EpEvents') -> f:format.raw()}</strong></p>
+                        <p class="form__overlay__text"><strong class="form-success">{f:translate(key: 'tx_epevents.label.configurator_thank_you', extensionName: 'EpEvents') -> f:format.raw()}</strong></p>
                     </div>
                     <div class="configurator__overlay" v-if="error">
                         <strong>{f:translate(key: 'tx_epevents.label.error_occured', extensionName: 'EpEvents') -> f:format.raw()}</strong>
diff --git a/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/ContactForm.html b/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/ContactForm.html
index d4a41720..cda04524 100644
--- a/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/ContactForm.html
+++ b/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/ContactForm.html
@@ -101,7 +101,7 @@
                             <img src="{f:uri.resource(path: 'images/spinner_default.gif', extensionName: 'ep_events')}" alt="Processing...">
                         </div>
                         <div class="form__overlay" v-show="success">
-                            <p class="form__overlay__text"><strong>{f:translate(key: 'tx_epevents.label.contact_form_thank_you', extensionName: 'EpEvents') -> f:format.raw()}</strong></p>
+                            <p class="form__overlay__text"><strong class="form-success">{f:translate(key: 'tx_epevents.label.contact_form_thank_you', extensionName: 'EpEvents') -> f:format.raw()}</strong></p>
                             <p class="form__overlay__text">
                                 <a class="form__button" href="{v:site.url()}"
                                    title="{f:translate(key: 'tx_epevents.label.contact_form_continue')}">
diff --git a/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/InquiryForm.html b/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/InquiryForm.html
index f483a1b4..4f65c362 100644
--- a/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/InquiryForm.html
+++ b/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/InquiryForm.html
@@ -89,7 +89,7 @@
                             <img src="{f:uri.resource(path: 'images/spinner_box.gif', extensionName: 'ep_events')}" alt="Processing...">
                         </div>
                         <div class="form__overlay" v-show="success">
-                            <strong>{f:translate(key: 'tx_epevents.label.contact_form_thank_you', extensionName: 'EpEvents') -> f:format.raw()}</strong>
+                            <strong class="form-success">{f:translate(key: 'tx_epevents.label.contact_form_thank_you', extensionName: 'EpEvents') -> f:format.raw()}</strong>
                         </div>
                         <div class="form__overlay" v-show="error">
                             <strong>{f:translate(key: 'tx_epevents.label.error_occured', extensionName: 'EpEvents') -> f:format.raw()}</strong>