diff --git a/apps/www/components/Hero/Hero.tsx b/apps/www/components/Hero/Hero.tsx
index 16a3448661a..8f9d8a6d1ca 100644
--- a/apps/www/components/Hero/Hero.tsx
+++ b/apps/www/components/Hero/Hero.tsx
@@ -24,7 +24,7 @@ const Hero = () => {
               <div className="relative z-10 lg:h-auto pt-[90px] lg:pt-[90px] lg:min-h-[300px] flex flex-col items-center justify-center sm:mx-auto md:w-3/4 lg:mx-0 lg:w-full gap-4 lg:gap-8">
                 <div className="flex flex-col items-center">
                   <div className="z-40 w-full flex justify-center -mt-4 lg:-mt-12 mb-8">
-                    <AnnouncementBadge url="/ga-week" badge="GA Week" announcement="Day 1" />
+                    <AnnouncementBadge url="/ga-week#day-2" badge="GA Week" announcement="Day 2" />
                   </div>
                   <h1 className="text-foreground text-4xl sm:text-5xl sm:leading-none lg:text-7xl">
                     <span className="block text-[#F4FFFA00] bg-clip-text bg-gradient-to-b from-foreground to-foreground-light">
diff --git a/apps/www/pages/ga-week/index.tsx b/apps/www/pages/ga-week/index.tsx
index 76f899f804f..706f20c4fec 100644
--- a/apps/www/pages/ga-week/index.tsx
+++ b/apps/www/pages/ga-week/index.tsx
@@ -65,14 +65,19 @@ export default function GAWeekIndex({ meetups }: Props) {
     }
   }, [supabase])
 
+  const isDark = resolvedTheme?.includes('dark')
   const isDarkTheme = resolvedTheme === 'dark'
 
   useEffect(() => {
-    if (isDarkTheme) {
-      setTheme('deep-dark')
-    }
+    isDarkTheme && setTheme('deep-dark')
   }, [isDarkTheme])
 
+  useEffect(() => {
+    return () => {
+      isDark && setTheme('dark')
+    }
+  }, [])
+
   useEffect(() => {
     if (session?.user) {
       if (userData?.id) {
diff --git a/apps/www/pages/ga-week/tickets/[username].tsx b/apps/www/pages/ga-week/tickets/[username].tsx
index 885f2ff229e..1e46d014e98 100644
--- a/apps/www/pages/ga-week/tickets/[username].tsx
+++ b/apps/www/pages/ga-week/tickets/[username].tsx
@@ -43,14 +43,19 @@ export default function UsernamePage({ user, ogImageUrl }: Props) {
   const [ticketState, setTicketState] = useState<TicketState>('ticket')
   const { resolvedTheme, setTheme } = useTheme()
 
+  const isDark = resolvedTheme?.includes('dark')
   const isDarkTheme = resolvedTheme === 'dark'
 
   useEffect(() => {
-    if (isDarkTheme) {
-      setTheme('deep-dark')
-    }
+    isDarkTheme && setTheme('deep-dark')
   }, [isDarkTheme])
 
+  useEffect(() => {
+    return () => {
+      isDark && setTheme('dark')
+    }
+  }, [])
+
   if (!ticketNumber) {
     return <Error statusCode={404} />
   }
diff --git a/apps/www/pages/ga.tsx b/apps/www/pages/ga.tsx
index 9694737a166..48d367ff2eb 100644
--- a/apps/www/pages/ga.tsx
+++ b/apps/www/pages/ga.tsx
@@ -30,11 +30,15 @@ export default function IndexPage() {
   const isDarkTheme = resolvedTheme === 'dark'
 
   useEffect(() => {
-    if (isDarkTheme) {
-      setTheme('deep-dark')
-    }
+    isDarkTheme && setTheme('deep-dark')
   }, [isDarkTheme])
 
+  useEffect(() => {
+    return () => {
+      isDark && setTheme('dark')
+    }
+  }, [])
+
   return (
     <DefaultLayout>
       <NextSeo
diff --git a/packages/ui/src/components/PromoToast/PromoToast.tsx b/packages/ui/src/components/PromoToast/PromoToast.tsx
index adb5462c85c..5f7f29e2c52 100644
--- a/packages/ui/src/components/PromoToast/PromoToast.tsx
+++ b/packages/ui/src/components/PromoToast/PromoToast.tsx
@@ -3,7 +3,6 @@ import Link from 'next/link'
 import { useEffect, useState } from 'react'
 import { Button, cn } from 'ui'
 import { LOCAL_STORAGE_KEYS } from 'common'
-import announcement from '../../layout/banners/data/Announcement.json'
 import { useTheme } from 'next-themes'
 
 const LW11BGDark =
@@ -41,15 +40,15 @@ const PromoToast = () => {
       )}
     >
       <div className="relative z-10 text-foreground-lighter flex flex-col text-sm w-full mb-2">
-        <p className="relative z-10 text-foreground flex flex-col text-lg w-full leading-6 mb-1">
+        <p className="text-foreground flex flex-col text-lg w-full leading-6 mb-1">
           General Availability Week
         </p>
-        <span className="uppercase font-mono">Day 1</span>
+        <span className="uppercase font-mono">Day 2</span>
       </div>
 
       <div className="relative z-10 flex items-center space-x-2">
         <Button asChild type="secondary">
-          <Link target="_blank" rel="noreferrer" href="https://supabase.com/ga-week">
+          <Link target="_blank" rel="noreferrer" href="https://supabase.com/ga-week#day-2">
             Learn more
           </Link>
         </Button>