diff --git a/package-lock.json b/package-lock.json
index f8853b6..acc474f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.1.0",
       "dependencies": {
         "@formatjs/intl-localematcher": "^0.5.4",
-        "@next/third-parties": "^14.1.4",
+        "@next/third-parties": "^14.2.0-canary.34",
         "clipboard": "^2.0.11",
         "negotiator": "^0.6.3",
         "next": "14.1.3",
@@ -2212,9 +2212,9 @@
       }
     },
     "node_modules/@next/third-parties": {
-      "version": "14.1.4",
-      "resolved": "https://registry.npmjs.org/@next/third-parties/-/third-parties-14.1.4.tgz",
-      "integrity": "sha512-e/kpEFq5/ZPhHkxpJkvhMfLp3OC6KCBou0/BV8BvgjXAPgEo6sa0ZXe0l4ZEb3wcA7NIEHIpqCmjU5Z7QAHcKQ==",
+      "version": "14.2.0-canary.34",
+      "resolved": "https://registry.npmjs.org/@next/third-parties/-/third-parties-14.2.0-canary.34.tgz",
+      "integrity": "sha512-3CoRFeckka+wEaP7PX82j5j4OayZ4ELelnkIcmNvR842az2N7LPI4e40D0p8eiI0O4lSm3VoRW9EPKSqfddkhg==",
       "dependencies": {
         "third-party-capital": "1.0.20"
       },
diff --git a/package.json b/package.json
index 9843182..924d39a 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@formatjs/intl-localematcher": "^0.5.4",
-    "@next/third-parties": "^14.1.4",
+    "@next/third-parties": "^14.2.0-canary.34",
     "clipboard": "^2.0.11",
     "negotiator": "^0.6.3",
     "next": "14.1.3",
diff --git a/src/client/components/atoms/CopyEmailButton/CopyEmailButton.tsx b/src/client/components/atoms/CopyEmailButton/CopyEmailButton.tsx
index 2b48516..7ccbf4e 100644
--- a/src/client/components/atoms/CopyEmailButton/CopyEmailButton.tsx
+++ b/src/client/components/atoms/CopyEmailButton/CopyEmailButton.tsx
@@ -21,8 +21,7 @@ export const CopyEmailButton = ({
     const clipboard = new Clipboard(".copy-email-button");
     clipboard.on("success", () => {
       setShowSuccess(true);
-      sendGAEvent({
-        event: "copyEmailButton",
+      sendGAEvent("event", "copy_email", {
         page: "home",
         action: "clipboard",
         value: "success",
@@ -45,11 +44,9 @@ export const CopyEmailButton = ({
       <Button
         data-clipboard-text={CONTACT_EMAIL}
         onClick={() =>
-          sendGAEvent({
-            event: "copyEmailButton",
+          sendGAEvent("event", "contact_button", {
             page: "home",
             action: "onClick",
-            value: "clicked",
           })
         }
         className="copy-email-button w-full h-[40px] rounded-xl bg-button-light dark:bg-button-dark mt-4 text-sm text-text-light dark:text-text-dark"
@@ -59,9 +56,8 @@ export const CopyEmailButton = ({
 
       <div className="relative">
         <span
-          className={`w-24 flex justify-center text-emerald-600 dark:text-emerald-400 text-xs absolute top-1 right-0 ${
-            showSuccess ? "" : "hidden"
-          }`}
+          className={`w-24 flex justify-center text-emerald-600 dark:text-emerald-400 text-xs absolute top-1 right-0 ${showSuccess ? "" : "hidden"
+            }`}
         >
           {successFeedback}
         </span>
diff --git a/src/client/components/atoms/SkillCard/SkillCard.tsx b/src/client/components/atoms/SkillCard/SkillCard.tsx
index 42922ae..e5bb833 100644
--- a/src/client/components/atoms/SkillCard/SkillCard.tsx
+++ b/src/client/components/atoms/SkillCard/SkillCard.tsx
@@ -44,8 +44,7 @@ export const SkillCard = ({ Icon, tags, title }: SkillCardProps) => {
 
   const handleToggleRotate = () => {
     setRotateCard((state) => !state);
-    sendGAEvent({
-      event: "toggleRotateSkillCard",
+    sendGAEvent("event", "rotate_skill_card", {
       page: "home",
       action: `click:${title}`,
       value: `rotate-${rotateCard ? "back" : "front"}`,
diff --git a/src/client/components/atoms/ToggleThemeButton/ToggleThemeButton.tsx b/src/client/components/atoms/ToggleThemeButton/ToggleThemeButton.tsx
index 3b1bef9..9900b3b 100644
--- a/src/client/components/atoms/ToggleThemeButton/ToggleThemeButton.tsx
+++ b/src/client/components/atoms/ToggleThemeButton/ToggleThemeButton.tsx
@@ -16,7 +16,7 @@ export const ToggleThemeButton = ({ dictionary }: TranslationProps) => {
 
   const handleToggleTheme = () => {
     const newTheme = isDark ? "light" : "dark";
-    sendGAEvent({ event: "toggle_theme", theme: newTheme });
+    sendGAEvent("event", "toggle_theme", { theme: newTheme });
     setTheme(newTheme);
   };
 
@@ -28,9 +28,8 @@ export const ToggleThemeButton = ({ dictionary }: TranslationProps) => {
     return null;
   }
 
-  const buttonLabel = `${dictionary.theme.toggle} ${
-    dictionary.theme[isDark ? "light" : "dark"]
-  }`;
+  const buttonLabel = `${dictionary.theme.toggle} ${dictionary.theme[isDark ? "light" : "dark"]
+    }`;
 
   return (
     <button