Merge branch 'main' into system-color-preference

2024-09-03 09:21:55 +10:00
parent 26d75c5128 06f0dfa945
commit be22b3a3d9
40 changed files with 4624 additions and 396 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,5 @@ yarn-error.log*
 # typescript
 *.tsbuildinfo
 next-env.d.ts
+
+!src/app/.env/
--- a/.prettierrc
+++ b/.prettierrc
@@ -0,0 +1,7 @@
+{
+  "tabWidth": 2,
+  "useTabs": true,
+  "semi": true,
+  "trailingComma": "all",
+  "plugins": ["prettier-plugin-tailwindcss"]
+}
--- a/messages/README-LANGUAGES.md
+++ b/messages/README-LANGUAGES.md
@@ -1,18 +0,0 @@
-# Contributing Translations
-
-To contribute to the translation of your language you must modify the json in `/messages` that is named corresponding to the ISO Language Code of your given language. 
-
-If you do not see a JSON for your language then add the language. 
-
-## Adding a language 
-
-1.  To add a language you must add the language to the `const SUPPORTED_LANGUAGES = ['en', 'de'];` variable in the `./src/i18n.ts` file.
-2. You must create a new `.json` file in the `./messages` directory
-3. Copy the contents of the `en.json` file, make your way down the key-value pairs and change **only the values** to the translated equivalent.
-
-
-
-
-
-
-
--- a/messages/de.json
+++ b/messages/de.json
@@ -1,7 +0,0 @@
-{
-    "navigation": {
-        "getting-started": "Erste Schritte",
-        "donate": "Spenden",
-        "useful-links": "Nützliche Links"
-    }
-}
--- a/messages/en.json
+++ b/messages/en.json
@@ -1,7 +0,0 @@
-{
-    "navigation": {
-        "getting-started": "Getting Started",
-        "donate": "Donate",
-        "useful-links": "Useful Links"
-    }
-}
--- a/next.config.js
+++ b/next.config.js
@@ -1,8 +1,6 @@
-const createNextIntlPlugin = require('next-intl/plugin');
+
 const { PHASE_DEVELOPMENT_SERVER } = require('next/constants')
- 
-const withNextIntl = createNextIntlPlugin();
- 
+
 /** @type {import('next').NextConfig} */
 const nextConfig = (phase, { defaultConfig }) => {
  const defaultConfigWWW = {
@@ -15,9 +13,11 @@ const nextConfig = (phase, { defaultConfig }) => {
        {
          protocol: "https",
          hostname: "cdn.jsdelivr.net",
+          port: '',
+          pathname: '/gh/zen-browser/**',
        }
      ],
-      domains: ['cdn.jsdelivr.net', "raw.githubusercontent.com"],  // Allow images from jsDelivr
+      domains: ['localhost', 'cdn.jsdelivr.net', "raw.githubusercontent.com"],  // Allow images from jsDelivr
    },
    experimental: {
      serverActions: {
@@ -42,4 +42,4 @@ const nextConfig = (phase, { defaultConfig }) => {
  };
 };
 
-module.exports = withNextIntl(nextConfig);
+module.exports = nextConfig;
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -9,7 +9,10 @@
    "dev": "next dev --turbo",
    "build": "next build",
    "start": "next start",
-    "lint": "next lint"
+    "lint": "next lint",
+    "pages:build": "npx @cloudflare/next-on-pages",
+    "preview": "npm run pages:build && wrangler pages dev",
+    "deploy": "npm run pages:build && wrangler pages deploy"
  },
  "dependencies": {
    "@hookform/resolvers": "^3.9.0",
@@ -36,7 +39,6 @@
    "framer-motion": "^11.3.24",
    "lucide-react": "^0.400.0",
    "next": "14.2.4",
-    "next-intl": "^3.18.1",
    "next-themes": "^0.3.0",
    "react": "^18.3.1",
    "react-dom": "^18.3.1",
@@ -50,6 +52,7 @@
    "zod": "^3.23.8"
  },
  "devDependencies": {
+    "@cloudflare/next-on-pages": "^1.13.2",
    "@types/canvas-confetti": "^1.6.4",
    "@types/node": "^20.14.15",
    "@types/react": "^18.3.3",
@@ -58,6 +61,8 @@
    "eslint": "^8.57.0",
    "eslint-config-next": "14.2.4",
    "postcss": "^8.4.41",
+    "prettier": "^3.3.3",
+    "prettier-plugin-tailwindcss": "^0.6.6",
    "tailwindcss": "^3.4.9",
    "typescript": "^5.5.4"
  }
--- a/public/compact-mode.png
+++ b/public/compact-mode.png
--- a/public/favicon.ico
+++ b/public/favicon.ico
--- a/public/feature-item-1.png
+++ b/public/feature-item-1.png
--- a/public/logos/zen-alpha-black.png
+++ b/public/logos/zen-alpha-black.png
--- a/src/app/.env/page.tsx
+++ b/src/app/.env/page.tsx
@@ -0,0 +1,7 @@
+
+import { redirect } from "next/navigation";
+
+export default function WhyAreYouEvenHere() {
+    redirect("https://www.youtube.com/watch?v=dQw4w9WgXcQ");
+    return null;
+}
--- a/src/app/branding-assets/page.tsx
+++ b/src/app/branding-assets/page.tsx
@@ -6,8 +6,6 @@ export default function BrandingAssetsPage() {
  return (
    <main className="flex min-h-screen flex-col items-center justify-start">
      <BrandingAssets />
-      <Footer />  
-      <Navigation /> {/* At the bottom of the page */}
    </main>
  );
 }
--- a/src/app/create-theme/page.tsx
+++ b/src/app/create-theme/page.tsx
@@ -6,8 +6,6 @@ export default function BrandingAssetsPage() {
  return (
    <main className="flex min-h-screen flex-col items-center justify-start">
      <CreateThemePage />
-      <Footer />  
-      <Navigation /> {/* At the bottom of the page */}
    </main>
  );
 }
--- a/src/app/download/page.tsx
+++ b/src/app/download/page.tsx
@@ -7,8 +7,6 @@ export default function Download() {
  return (
    <main className="flex min-h-screen flex-col items-center justify-start">
      <DownloadPage />
-      <Footer />  
-      <Navigation /> {/* At the bottom of the page */}
    </main>   
  );
 }
--- a/src/app/feed.xml/route.ts
+++ b/src/app/feed.xml/route.ts
@@ -1,110 +0,0 @@
-import { Feed } from "feed";
-import { releaseNotes } from "@/lib/release-notes";
-import type { ReleaseNote } from "@/lib/release-notes";
-
-// Force feed.xml to be cached as static and remain constant for the lifetime of the current site build.
-// The supplied releaseNotes array is constant per build, so this will always be the latest release notes.
-export const dynamic = "force-static";
-
-/** The default number of entries to include in the RSS feed. */
-const RSS_ENTRY_LIMIT = 20;
-
-/**
- * Handles the GET request for the `feed.xml` endpoint.
- * @returns The RSS feed for the Zen Browser release notes.
- */
-export async function GET() {
-    // Just in case the release notes array is empty for whatever reason.
-    const latestDate = releaseNotes.length > 0
-        ? formatRssDate(releaseNotes[0].date)
-        : new Date();
-
-    const feed = new Feed({
-        id: "https://www.zen-browser.app/release-notes",
-        link: "https://www.zen-browser.app/release-notes",
-        title: "Zen Browser Release Notes",
-        description: "Release Notes for the Zen Browser",
-        language: "en",
-        favicon: "https://www.zen-browser.app/favicon.ico",
-        copyright: `Zen Browser © ${new Date().getFullYear()} - Made with ❤️ by the Zen team.`,
-        updated: latestDate,
-    });
-
-    for (const releaseNote of releaseNotes.slice(0, RSS_ENTRY_LIMIT)) {
-        feed.addItem({
-            title: `Release notes for version ${releaseNote.version}`,
-            id: `https://www.zen-browser.app/release-notes/${releaseNote.version}`,
-            link: `https://www.zen-browser.app/release-notes/${releaseNote.version}`,
-            date: formatRssDate(releaseNote.date),
-            description: releaseNote.extra,
-            content: formatReleaseNote(releaseNote),
-        });
-    }
-
-    return new Response(feed.rss2(), {
-        headers: {
-            'Content-Type': 'application/xml; charset=utf-8',
-        },
-    });
-}
-
-/**
- * Formats a date string in the format day/month/year. 
- * 
- * Note: If release notes change to ISO format, this will need to be updated.
- * @param dateStr The date string to format.
- * @returns The passed in date string as a Date object.
- */
-function formatRssDate(dateStr: string) {
-    const splitDate = dateStr.split("/");
-    if (splitDate.length !== 3) {
-        throw new Error("Invalid date format");
-    }
-
-    const day = Number(splitDate[0]);
-    const month = Number(splitDate[1]) - 1;
-    const year = Number(splitDate[2]);
-    return new Date(year, month, day);
-}
-
-/**
- * Formats the release note entry for use as the content of the RSS feed.
- * @param releaseNote The release note to format.
- * @returns The formatted release note as a HTML string.
- */
-function formatReleaseNote(releaseNote: ReleaseNote) {
-    let content = "<p>If you encounter any issues, please report them on <a href=\"https://github.com/zen-browser/desktop/issues/\">the issues page</a>. Thanks everyone for your feedback! ❤️</p>";
-
-    if (releaseNote.extra) {
-        content += `<p>${releaseNote.extra.replace(/(\n)/g, "<br />")}</p>`
-    }
-
-    if (releaseNote.breakingChanges) {
-        content += `<h2>⚠️ Breaking changes</h2>`
-        content += `<ul>`
-        for (const breakingChange of releaseNote.breakingChanges) {
-            content += `<li>${breakingChange}</li>`
-        }
-        content += `</ul>`
-    }
-
-    if (releaseNote.features) {
-        content += `<h2>⭐ Features</h2>`
-        content += `<ul>`
-        for (const feature of releaseNote.features) {
-            content += `<li>${feature}</li>`
-        }
-        content += `</ul>`
-    }
-
-    if (releaseNote.fixes) {
-        content += `<h2>✓ Fixes</h2>`
-        content += `<ul>`
-        for (const fix of releaseNote.fixes) {
-            content += `<li>${fix.description}</li>`
-        }
-        content += `</ul>`
-    }
-
-    return content;
-}
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -3,8 +3,8 @@ import { Inter } from "next/font/google";
 import "./globals.css";
 import { ThemeProvider } from "@/components/theme-provider";
 import StyledComponentsRegistry from "@/lib/styled-components-registry";
-import {NextIntlClientProvider} from 'next-intl';
-import {getLocale, getMessages} from 'next-intl/server';
+import Footer from "@/components/footer";
+import { Navigation } from "@/components/navigation";

 const inter = Inter({ subsets: ["latin"] });

@@ -19,26 +19,27 @@ export default async function RootLayout({
 }: Readonly<{
  children: React.ReactNode;
 }>) {
-  const locale = await getLocale();
-
-  const messages = await getMessages();

  return (
-    <html lang={locale} suppressHydrationWarning>
+    <html suppressHydrationWarning>
      <head>
        <link rel="me" href="https://fosstodon.org/@zenbrowser"></link>
        <link rel="alternate" type="application/rss+xml" title="Zen Browser Release Notes" href="https://www.zen-browser.app/feed.xml" />
      </head>
      <body className={inter.className}>
-        <NextIntlClientProvider messages={messages}>
-          <ThemeProvider
-            attribute="class"
-            enableSystem
-            disableTransitionOnChange
-          >
-            <StyledComponentsRegistry>{children}</StyledComponentsRegistry>
-          </ThemeProvider>
-        </NextIntlClientProvider>
+        <ThemeProvider
+          attribute="class"
+          enableSystem
+          disableTransitionOnChange
+        >
+          <StyledComponentsRegistry>
+            <div>
+              {children}
+              <Footer />  
+              <Navigation /> {/* At the bottom of the page */}
+            </div>
+          </StyledComponentsRegistry>
+        </ThemeProvider>
      </body>
    </html>
  );
--- a/src/app/not-found.tsx
+++ b/src/app/not-found.tsx
@@ -0,0 +1,8 @@
+
+export default function NotFoundPage() {
+  return (
+    <main className="flex min-h-screen flex-col items-center justify-start">
+      <h1>404</h1>
+    </main>
+  );
+}
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -10,8 +10,6 @@ export default function Home() {
    <main className="flex min-h-screen overflow-x-hidden flex-col items-center justify-start">
      <Header />
      <Features />
-      <Footer />  
-      <Navigation /> {/* At the bottom of the page */}
    </main>   
  );
 }
--- a/src/app/privacy-policy/page.tsx
+++ b/src/app/privacy-policy/page.tsx
@@ -83,7 +83,7 @@ You can also optionally enable telemetry data collection and other Mozilla Resea
 # 9. Contact Us
 If you have any questions or concerns about this Privacy Policy or Zen Browser, please contact us at:

-* Discord: [Zen Browser's Discord](https://discord.gg/nnShMQzR4b)
+* Discord: [Zen Browser's Discord](https://discord.com/servers/mauro-s-little-sweatshop-1088172780480114748)
 * GitHub: [Organization](https://github.com/zen-browser)

 ---
@@ -91,8 +91,6 @@ If you have any questions or concerns about this Privacy Policy or Zen Browser,
 By using Zen Browser, you agree to this Privacy Policy. Remember, with Zen, your privacy is in your hands.`}
        </Markdown>
      </div>
-      <Footer />  
-      <Navigation /> {/* At the bottom of the page */}
    </main>
  )
 }
--- a/src/app/release-notes/[version]/page.tsx
+++ b/src/app/release-notes/[version]/page.tsx
@@ -30,16 +30,12 @@ export default function ReleaseNotePage({ params }: { params: { version: string
            </Button>
          </a>
        </div>
-        <Footer />
-        <Navigation /> {/* At the bottom of the page */}
      </main>
    );
  }
  return (
    <main className="flex min-h-screen flex-col items-center justify-center">
      <ReleaseNote data={releaseNote} />
-      <Footer />
-      <Navigation /> {/* At the bottom of the page */}
    </main>
  );
 }
--- a/src/app/release-notes/page.tsx
+++ b/src/app/release-notes/page.tsx
@@ -28,8 +28,6 @@ export default function ReleaseNotes() {
          ))}
        </div>
      </div>
-      <Footer />  
-      <Navigation /> {/* At the bottom of the page */}
    </main>
  )
 }
--- a/src/app/themes/[theme]/page.tsx
+++ b/src/app/themes/[theme]/page.tsx
@@ -49,8 +49,6 @@ export default async function ThemeInfoPage({ params }: { params: { theme: strin
  return (
    <main className="flex min-h-screen flex-col items-center justify-start">
      <ThemePage themeID={theme} />
-      <Footer />  
-      <Navigation /> {/* At the bottom of the page */}
    </main>
  );
 }
--- a/src/app/themes/page.tsx
+++ b/src/app/themes/page.tsx
@@ -2,13 +2,13 @@
 import Footer from "@/components/footer";
 import MarketplacePage from "@/components/marketplace";
 import { Navigation } from "@/components/navigation";
+import { getAllThemes, ZenTheme } from "@/lib/themes";
+import { GetStaticProps } from "next";

-export default function ThemesMarketplace() {
+export default async function ThemesMarketplace() {
  return (
    <main className="flex min-h-screen flex-col items-center justify-start">
-      <MarketplacePage />
-      <Footer />  
-      <Navigation /> {/* At the bottom of the page */}
+      <MarketplacePage themes={await getAllThemes()} />
    </main>   
  );
 }
--- a/src/app/welcome/page.tsx
+++ b/src/app/welcome/page.tsx
@@ -7,8 +7,6 @@ export default function Download() {
  return (
    <main className="flex min-h-screen flex-col items-center justify-start">
      <WelcomePage />
-      <Footer />  
-      <Navigation /> {/* At the bottom of the page */}
    </main>   
  );
 }
--- a/src/components/CachedImage.tsx
+++ b/src/components/CachedImage.tsx
@@ -0,0 +1,9 @@
+import Image from "next/image";
+
+function imageLoader({ src }: { src: string }) {
+    return `https://cdn.jsdelivr.net/gh/zen-browser/${src}`;
+}
+
+export default function CachedImage({ ...props }: any) {
+    return <Image {...props} loader={imageLoader} />;
+}
--- a/src/components/features.tsx
+++ b/src/components/features.tsx
@@ -1,6 +1,7 @@
 'use client';
 import Sticky from 'react-sticky-el';
 import {
+  BookmarkCheckIcon,
  CheckIcon,
  ChevronLeft,
  ChevronRight,
@@ -18,9 +19,12 @@ import {
  ShieldCheck,
  SidebarCloseIcon,
  SidebarIcon,
+  SidebarOpenIcon,
  SpaceIcon,
  SplitSquareHorizontal,
  SplitSquareVertical,
+  SplitSquareVerticalIcon,
+  TableIcon,
  XIcon,
 } from 'lucide-react';
 import {
@@ -29,11 +33,13 @@ import {
  HeartFilledIcon,
  Link1Icon,
  LockClosedIcon,
+  QuestionMarkCircledIcon,
  QuestionMarkIcon,
  ReloadIcon,
+  SpaceBetweenHorizontallyIcon,
  UpdateIcon,
 } from '@radix-ui/react-icons';
-import Image from 'next/image';
+import Image from "next/legacy/image";
 import Link from 'next/link';
 import { Button } from './ui/button';
 import { COLORS } from './create-theme';
@@ -52,6 +58,8 @@ import ThemeCard from './theme-card';
 import { getAllThemes, ZenTheme } from '@/lib/themes';
 import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from './ui/accordion';
 import Logo from './logo';
+import CachedImage from './CachedImage';
+import { transform } from 'next/dist/build/swc';

 function Checkmark() {
  return (
@@ -84,8 +92,13 @@ export default function Features() {
              <Button className='mt-8' onClick={() => window.open('/themes', '_self')}>View Theme Store</Button>
            </div>
          </div>
-          <div className='flex justify-center lg:mx-0 mx-10'>
-            <img src="https://cdn.jsdelivr.net/gh/zen-browser/www/public/themes.webp" alt="Zen Browser" className="rounded-md" />
+          <hr />
+          <div className="flex p-12 flex-col justify-center">
+            <h3 className='text-4xl font-medium text-gray-800 dark:text-gray-100'>Always up to date <UpdateIcon className='inline w-10 h-10'></UpdateIcon></h3>
+            <p className='text-lg mt-4 text-gray-600 dark:text-gray-300'>Zen Browser is always up to date, ensuring that you have the latest features and security updates. With automatic updates, you can rest easy knowing that your browser is secure and up to date.</p>
+            <div className="relative">
+              <Button className='mt-8' onClick={() => window.open('/download', '_self')}>Download Now</Button>
+            </div>
          </div>
        </div>

@@ -124,7 +137,7 @@ export default function Features() {
      </div>
      <div className='w-full md:w-5/6 lg:w-3/4 flex flex-col lg:flex-row md:rounded-md mx-auto bg-surface mt-36 shadow'>
        <div className='p-16 lg:w-1/2 flex flex-col justify-center'>
-          <h1 className='text-4xl font-medium text-gray-800 dark:text-gray-100'>Built for simplicity</h1>
+          <h1 className='text-4xl font-medium text-gray-800 dark:text-gray-100'>Built for simplicity <EyeIcon className='inline w-8 h-8'></EyeIcon></h1>
          <p className='text-lg mt-4 text-gray-600 dark:text-gray-300'>Zen Browser is designed to be simple and easy to use. It's built with the user in mind, so you can focus on what matters most.</p>
          <div className='w-full mt-8'>
            <div className='flex items-center'>
@@ -141,12 +154,12 @@ export default function Features() {
            </div>
          </div>
        </div>
-        <img src="https://cdn.jsdelivr.net/gh/zen-browser/www/public/browser-1.png" alt="Zen Browser" className="rounded-md lg:w-1/2 object-cover object-right" />
+        <CachedImage width={1350} height={900} src="www/public/browser-1.png" alt="Zen Browser" className="rounded-md lg:w-1/2 object-cover object-right" />
      </div>
      <div className='w-full md:w-5/6 lg:w-3/4 flex flex-col lg:flex-row md:rounded-md mx-auto bg-surface mt-36 shadow'>
-        <img src="https://cdn.jsdelivr.net/gh/zen-browser/www/public/browser-2.png" alt="Zen Browser" className="rounded-md lg:w-1/2 object-cover object-left" />
+        <CachedImage width={1350} height={900} src="www/public/browser-2.png" alt="Zen Browser" className="rounded-md lg:w-1/2 object-cover object-left" />
        <div className='p-16 lg:w-1/2 flex flex-col justify-center'>
-          <h1 className='text-4xl font-medium text-gray-800 dark:text-gray-100'>Split Views</h1>
+          <h1 className='text-4xl font-medium text-gray-800 dark:text-gray-100'>Split Views <SplitSquareHorizontal className='inline w-8 h-8'></SplitSquareHorizontal></h1>
          <p className='text-lg mt-4 text-gray-600 dark:text-gray-300'>Zen Browser allows you to split your view into multiple panes, so you can work on multiple things at once. It's perfect for multitasking.</p>
          <div className="relative">
            <Button className='mt-8' onClick={() => window.open('/download', '_self')}>Download Now</Button>
@@ -155,7 +168,7 @@ export default function Features() {
      </div>
      <div className='w-full md:w-5/6 lg:w-3/4 p-5 lg:p-12 flex flex-col lg:flex-row md:rounded-md mx-auto bg-surface mt-36 shadow'>
        <div className="flex p-16 lg:w-1/2 flex-col justify-center">
-          <h3 className='text-4xl font-medium text-gray-800 dark:text-gray-100'>Better tab management</h3>
+          <h3 className='text-4xl font-medium text-gray-800 dark:text-gray-100'>Better tab management <BookmarkCheckIcon className='inline w-8 h-8'></BookmarkCheckIcon></h3>
          <p className='text-lg mt-4 text-gray-600 dark:text-gray-300'>Better tab management helps you stay organized and focused, reducing clutter and enhancing productivity</p>
          <div className='w-full mt-8'>
            <div className='flex items-center'>
@@ -178,7 +191,7 @@ export default function Features() {
        </div>
        <div className="border-t lg:border-t-0 lg:border-l h-[1px] lg:h-[unset] lg:w-[1px] mx-2"></div>
        <div className="flex p-16 lg:w-1/2 flex-col">
-          <h3 className='text-4xl font-medium text-gray-800 dark:text-gray-100'>Security and Privacy is <span className='text-purple-500 font-bold'>important</span> to us</h3>
+          <h3 className='text-4xl font-medium text-gray-800 dark:text-gray-100'>Security and Privacy is <span className='text-purple-500 font-bold'>important</span> to us <LockClosedIcon className='inline w-8 h-8'></LockClosedIcon></h3>
          <p className='text-lg mt-4 text-gray-600 dark:text-gray-300'>
            Zen is based on Firefox, ensuring that your browsing experience prioritizes security and privacy. With advanced tracking protection and minimal data collection, Zen keeps your online activity safe and secure, giving you peace of mind as you explore the web.
          </p>
@@ -190,7 +203,7 @@ export default function Features() {
      </div>
      <div className='w-full md:w-5/6 lg:w-3/4 flex flex-col lg:flex-row md:rounded-md mx-auto bg-surface mt-36 shadow'>
        <div className='p-16 lg:w-1/2 flex flex-col justify-center'>
-          <h1 className='text-4xl font-medium text-gray-800 dark:text-gray-100'>Sidebar</h1>
+          <h1 className='text-4xl font-medium text-gray-800 dark:text-gray-100'>Sidebar <SidebarIcon className='inline w-8 h-8 ml-1'></SidebarIcon></h1>
          <p className='text-lg mt-4 text-gray-600 dark:text-gray-300'>Zen Browser has a built-in sidebar that lets you quickly access your favorite websites, bookmarks, and more. It's the perfect way to stay organized.</p>
          <div className='w-full mt-8'>
            <div className='flex items-center'>
@@ -207,29 +220,22 @@ export default function Features() {
            </div>
          </div>
        </div>
-        <img src="https://cdn.jsdelivr.net/gh/zen-browser/www/public/browser-3.png" alt="Zen Browser" className="rounded-md lg:w-1/2 object-cover object-right" />
+        <CachedImage width={1350} height={900} src="www/public/browser-3.png" alt="Zen Browser" className="rounded-md lg:w-1/2 object-cover object-right" />
      </div>
      <div className='w-full md:w-5/6 lg:w-3/4 flex flex-col lg:flex-row md:rounded-md mx-auto bg-surface mt-36 shadow'>
-        <img src="https://cdn.jsdelivr.net/gh/zen-browser/www/public/browser-4.jpg" alt="Zen Browser" className="rounded-md lg:w-1/2 object-cover object-left" />
+        <CachedImage width={1350} height={900} src="www/public/browser-4.jpg" alt="Zen Browser" className="rounded-md lg:w-1/2 object-cover object-left" />
        <div className='p-16 lg:w-1/2 flex flex-col justify-center'>
-          <h1 className='text-4xl font-medium text-gray-800 dark:text-gray-100'>Introducing Compact Mode</h1>
+          <h1 className='text-4xl font-medium text-gray-800 dark:text-gray-100'>Introducing Compact Mode <SidebarCloseIcon className='inline w-8 h-8'></SidebarCloseIcon></h1>
          <p className='text-lg mt-4 text-gray-600 dark:text-gray-300'>Zen Browser's compact mode gives you more screen real estate by hiding the title bar and tabs. It's perfect for when you need to focus on your work.</p>
          <div className="relative">
            <Button className='mt-8' onClick={() => window.open('/download', '_self')}>What are you waiting for?</Button>
          </div>
        </div>
      </div>
-      {/*<div className='w-full md:w-5/6 lg:w-3/4 flex flex-col lg:flex-row md:rounded-md mx-auto bg-surface mt-36 shadow'>
-        <div className="lg:w-1/2 rounded-md relative overflow-hidden">
-          <img src={`https://cdn.jsdelivr.net/gh/zen-browser/www/public/feature-${feature}.png`} alt="Zen Browser" className="rounded-md lg:w-1/2" />
-          {feature == "item-1" && (
-            <div className="absolute top-[50%] left-[50%] transform -translate-x-1/2 -translate-y-1/2 bg-background p-4 flex rounded-full">
-              <Logo /> <HeartFilledIcon /> <PaintBucket />
-            </div>
-          )}
-        </div>
-        <div className="relative w-full lg:w-1/2 p-5 lg:p-12">
-          <Accordion type="single" collapsible value={feature} onValueChange={setFeature} defaultValue="item-1">
+      <div className='w-full md:w-5/6 lg:w-3/4 flex flex-col lg:flex-row md:rounded-md mx-auto bg-surface mt-36 shadow'>
+        <div className="relative w-full lg:w-1/2 p-5 lg:p-12 flex flex-col justify-center">
+          <h1 className='text-4xl font-medium text-gray-800 dark:text-gray-100'>Frequently Asked Questions <QuestionMarkCircledIcon className='inline w-8 h-8'></QuestionMarkCircledIcon></h1>
+          <Accordion type="single" value={feature} onValueChange={setFeature} defaultValue="item-1" className='mt-8'>
            <AccordionItem value="item-1">
              <AccordionTrigger>is it firefox based?</AccordionTrigger>
              <AccordionContent>
@@ -250,7 +256,43 @@ export default function Features() {
            </AccordionItem>
          </Accordion>
        </div>
-      </div>*/}
+        <div className="lg:w-1/2 h-auto rounded-md relative overflow-hidden">
+          <CachedImage width={1350} height={900} src="www/public/feature-item-1.png" alt="Zen Browser" className="object-cover h-full w-full robject-right ounded-md" />
+          {feature == "item-1" && (
+            <div className='w-full h-full absolute top-0 left-0 grid grid-rows-3'>
+              <div></div>
+              <div className="w-fit h-fit m-auto tems-center bg-background p-4 border-2 border-white shadow flex rounded-full animate-fade-in">
+                <Logo className='w-10 h-10' /> <span className='text-4xl mx-4'>+</span> <svg className='w-10 h-10 relative dark:fill-white' xmlns="http://www.w3.org/2000/svg" fill-opacity="context-fill-opacity"><path style={{ transform: "scale(2) translate(5%, 5%)" }} d="M10.39 0C8.948.788 7.987 2.025 7.767 3.66c-1.017.162-1.768.781-1.768.781s.72-.44 1.736-.511a4.04 4.04 0 0 1 3.789 2.034s-.758-.62-1.928-.468c1.315.68 1.872 2.002 1.701 3.369-.17 1.367-1.183 2.435-2.354 2.723-1.171.287-2.333.099-3.229-.61-.896-.708-1.251-1.533-1.305-2.254.213-.533.541-.812 1.1-1.092.558-.279 1.422-.283 1.572-.283s.8-.507.95-.894c-.726-.363-1.292-.65-1.696-.934-.404-.283-.492-.534-1.012-.898-.307-1.006-.021-1.955-.021-1.955s-1.043.437-1.93 1.49c0 0-.342-.338-.28-2.006-.427.155-1.366 1.004-1.947 1.92a7.277 7.277 0 0 0-.798 1.723A8.296 8.296 0 0 0-.003 8a8 8 0 0 0 16 0c0-2.256-.93-4.252-2.188-5.002 0 0 .542.932.813 2.43-.4-1.04-1.235-2.166-1.877-2.844-.643-.678-2.068-1.88-2.357-2.584z" /></svg>
+              </div>
+              <a href='https://github.com/zen-browser/desktop?tab=readme-ov-file#compatibility' target='_blank' className="w-fit h-fit m-auto items-center border-2 border-white shadow tems-center bg-background p-4 flex rounded-full opacity-0 animate-fade-in [--animation-delay:300ms]">
+                See what version of Firefox Zen uses <ExternalLinkIcon className='opacity-50 h-4 w-4 ml-4' />
+              </a>
+            </div>
+          )}
+          {feature == "item-2" && (
+            <div className='w-full h-full absolute top-0 left-0 grid grid-rows-3'>
+              <div></div>
+              <div className="w-fit h-fit m-auto tems-center bg-background p-4 border-2 border-white shadow flex rounded-full animate-fade-in">
+                <LockClosedIcon className='w-10 h-10' /> <span className='text-4xl mx-4'>+</span> <EyeClosedIcon className='w-10 h-10' />
+              </div>
+              <a href='/privacy-policy' target='_blank' className="w-fit h-fit m-auto items-center border-2 border-white shadow tems-center bg-background p-4 flex rounded-full opacity-0 animate-fade-in [--animation-delay:300ms]">
+                Learn about Zen's privacy policy <ExternalLinkIcon className='opacity-50 h-4 w-4 ml-4' />
+              </a>
+            </div>
+          )}
+          {feature == "item-3" && (
+            <div className='w-full h-full absolute top-0 left-0 grid grid-rows-3'>
+              <div></div>
+              <div className="w-fit h-fit m-auto tems-center bg-background p-4 border-2 border-white shadow flex rounded-full animate-fade-in">
+                <ShieldCheck className='w-10 h-10' /> <span className='text-4xl mx-4'>+</span> <ShieldAlertIcon className='w-10 h-10' />
+              </div>
+              <a href='https://docs.zen-browser.app/security' target='_blank' className="w-fit h-fit m-auto items-center w-fit border-2 border-white shadow tems-center bg-background p-4 flex rounded-full opacity-0 animate-fade-in [--animation-delay:300ms]">
+                See how Zen keeps you safe <ExternalLinkIcon className='opacity-50 h-4 w-4 ml-4' />
+              </a>
+            </div>
+          )}
+        </div>
+      </div>
      <div className='w-full md:w-5/6 lg:w-3/4 p-5 lg:p-12 flex flex-col lg:flex-row md:rounded-md mx-auto bg-surface mt-36 shadow'>
        <div className="flex p-16 lg:w-1/2 flex-col justify-center">
          <h3 className='text-4xl font-medium text-gray-800 dark:text-gray-100'>Convinced?</h3>
--- a/src/components/footer.tsx
+++ b/src/components/footer.tsx
@@ -1,18 +1,114 @@
+
 import Link from "next/link";
 import Logo from "./logo";
 import TextReveal from "./ui/text-reveal";
+import { DiscordLogoIcon, GitHubLogoIcon } from "@radix-ui/react-icons";
+import { MastodonLogo } from "./icons/mastodon";
+import { Button } from "./ui/button";

 export default function Footer() {
  return (
-    <div className="font-medium flex-col md:flex-row px-10 md:px-0 border-t w-full border-grey py-10 mt-10 flex justify-center align-center">
-      Zen Browser © {new Date().getFullYear()} - Made with ❤️ by the Zen team.
-      <a
-        href={"https://github.com/zen-browser"}
-        target="_blank"
-        className="mt-5 md:mt-0 md:ml-2 font-bold"
-      >
-        Source Code
-      </a>
+    <div className="font-medium px-10 md:px-0 border-t w-full border-grey py-10 mt-10 flex align-center flex-col">
+      <div className="flex mx-auto px-10 lg:px-0 border-b pb-10 justify-between pt-10 w-full lg:!w-2/3">
+        <div className="flex flex-col">
+          <Logo />
+          <div className="mt-auto">
+            <h1 className="text-2xl font-bold opacity-80">Zen Browser</h1>
+            <h2 className="text-md font-bold opacity-80 mt-6">Follow Us</h2>
+            <div className="flex mt-4 opacity-70">
+              <a href="https://github.com/zen-browser">
+                <GitHubLogoIcon className="w-5 h-5" />
+              </a>
+              <a href="https://discord.com/servers/mauro-s-little-sweatshop-1088172780480114748" className="ml-5">
+                <DiscordLogoIcon className="w-5 h-5" />
+              </a>
+              <a href="https://fosstodon.org/@zenbrowser" className="ml-5">
+                <MastodonLogo className="w-5 h-5" />
+              </a>
+            </div>
+          </div>
+        </div>
+        <div className="flex flex-col md:flex-row">
+          <div>
+            <h2 className="text-md font-bold opacity-80">Get Started</h2>
+            <ul className="mt-4 opacity-70 font-normal">
+              <li>
+                <a href="/themes">
+                  Themes
+                </a>
+              </li>
+              <li className="mt-2">
+                <a href="/download">
+                  Download
+                </a>
+              </li>
+              <li className="mt-2">
+                <a href="/create-theme">
+                  Create a Theme
+                </a>
+              </li>
+            </ul>
+          </div>
+          <div className="mt-10 md:mt-0 md:ml-12 lg:ml-24">
+            <h2 className="text-md font-bold opacity-80">Get Help</h2>
+            <ul className="mt-4 opacity-70 font-normal">
+              <li>
+                <a href="https://discord.com/invite/mauro-s-little-sweatshop">
+                  Discord
+                </a>
+              </li>
+              <li className="mt-2 font-normal">
+                <a href="https://github.com/zen-browser/desktop/issues">
+                  Report an Issue
+                </a>
+              </li>
+            </ul>
+            <h2 className="text-md font-bold opacity-80 mt-8">About</h2>
+            <ul className="mt-4 opacity-70 font-normal">
+              <li className="mt-2">
+                <a href="/about">
+                  About Us
+                </a>
+              </li>
+              <li className="mt-2">
+                <a href="/privacy-policy">Privacy Policy</a>
+              </li>
+            </ul>
+          </div>
+          <div className="mt-10 md:mt-0 md:ml-12 lg:ml-24">
+            <h2 className="text-md font-bold opacity-80">Resources</h2>
+            <ul className="mt-4 opacity-70 font-normal">
+              <li>
+                <a href="/branding-assets">Branding Assets</a>
+              </li>
+              <li className="mt-2">
+                <a href="https://github.com/zen-browser/desktop">Source Code</a>
+              </li>
+              <li className="mt-2">
+                <a href="https://docs.zen-browser.app">Documentation</a>
+              </li>
+              <li className="mt-2">
+                <a href="/release-notes">Release Notes</a>
+              </li>
+            </ul>
+            <h2 className="text-md font-bold opacity-80 mt-8">Support Us</h2>
+            <ul className="mt-4 opacity-70 font-normal">
+              <li>
+                <a href="https://patreon.com/zen_browser">Patreon</a>
+              </li>
+              <li className="mt-2">
+                <a href="https://ko-fi.com/zen_browser">Ko-fi</a>
+              </li>
+            </ul>
+          </div>
+        </div>
+      </div>
+      <div className="flex w-full pt-10 pr-5 pl-3 mx-auto lg:!w-2/3 items-center">
+        <p className="text-xs font-normal opacity-30">Crafted with ❤️ by the community - Copyright © {new Date().getFullYear()} Zen Browser</p>
+        <a href="/download" className="ml-auto">
+          <Button className="ml-auto">Download</Button>
+        </a>
+      </div>
    </div>
  );
 }
--- a/src/components/header.tsx
+++ b/src/components/header.tsx
@@ -9,7 +9,7 @@ import { BorderBeam } from "./ui/border-beam";
 import { ny } from "@/lib/utils";
 import { ChevronDown, ChevronRight } from "lucide-react";
 import Particles from "./ui/particles";
-import Image from "next/image";
+import Image from "next/legacy/image";
 import Link from "next/link";
 export default function Header() {
  const ref = useRef(null);
--- a/src/components/icons/mastodon.tsx
+++ b/src/components/icons/mastodon.tsx
@@ -0,0 +1,7 @@
+export const MastodonLogo = (props: any) => (
+    <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 256 256" {...props}>
+
+  <path fill="currentColor" d="M184 32H72a40 40 0 0 0-40 40v120a40 40 0 0 0 40 40h88a8 8 0 0 0 0-16H72a24 24 0 0 1-24-24v-8h136a40 40 0 0 0 40-40V72a40 40 0 0 0-40-40m24 112a24 24 0 0 1-24 24H48V72a24 24 0 0 1 24-24h112a24 24 0 0 1 24 24Zm-24-40v32a8 8 0 0 1-16 0v-32a16 16 0 0 0-32 0v32a8 8 0 0 1-16 0v-32a16 16 0 0 0-32 0v32a8 8 0 0 1-16 0v-32a32 32 0 0 1 56-21.13A32 32 0 0 1 184 104"></path>
+
+</svg>
+)
--- a/src/components/logo.tsx
+++ b/src/components/logo.tsx
@@ -1,13 +1,14 @@
 "use client";
 import { LOGO_COLORS } from "@/lib/logos";
 import { ny } from "@/lib/utils";
-import Image from "next/image";
+import Image from "next/legacy/image";
 import React from "react";
+import CachedImage from "./CachedImage";

 export default function Logo({ withText, ...props }: any) {
  return (
    <div className="flex items-center m-0" {...props}>
-      <img src={`https://cdn.jsdelivr.net/gh/zen-browser/www/public/logos/zen-black.svg`} width={40} height={40} alt="Zen Logo" className={ny("transition-all duration-300 hover:scale-110", withText && "mr-2")} />
+      <CachedImage src={`www/public/logos/zen-black.svg`} width={40} height={40} alt="Zen Logo" className={ny("transition-all duration-300 hover:scale-110", withText && "mr-2")} />
      {withText && <span className="text-2xl font-bold ml-2">zen</span>}
    </div>
  );
--- a/src/components/marketplace.tsx
+++ b/src/components/marketplace.tsx
@@ -5,14 +5,9 @@ import { getAllThemes, getThemesFromSearch, ZenTheme } from "@/lib/themes";
 import ThemeCard from "./theme-card";
 import { Button } from "./ui/button";

-export default function MarketplacePage() {
+export default function MarketplacePage({ themes }: {themes:ZenTheme[]}) {
  const [searchInput, setSearchInput] = React.useState("");
  const [tags, setTags] = React.useState<string[]>(["all"]);
-  const [themes, setThemes] = React.useState<ZenTheme[]>([]);
-
-  React.useEffect(() => {
-    getAllThemes().then(setThemes);
-  }, []);

  return (
    <div className="flex flex-col w-full mx-auto items-center justify-center h-full">
--- a/src/components/mobile-nav.tsx
+++ b/src/components/mobile-nav.tsx
@@ -13,7 +13,7 @@ import { ny } from '@/lib/utils'
 import { components } from './navigation'

 export function MobileNav() {
-   const [open, setOpen] = React.useState(false)
+   const [open, setOpen] = React.useState(false);

   return (
      <Sheet open={open} onOpenChange={setOpen}>
@@ -37,31 +37,41 @@ export function MobileNav() {
            >
               <Logo withText />
            </MobileLink>
-            <ScrollArea className="my-4 h-[calc(100vh-8rem)] pb-10 pl-6">
+            <ScrollArea className="mt-4 h-[calc(100vh-8rem)] pl-6">
               <div className="flex flex-col space-y-3">
                  <MobileLink
                     href="/download"
                    onOpenChange={setOpen}
                  >
-                    Download
+                    <div>Download</div>
+                     <p className="opacity-60 text-xs">
+                        Get the latest version of Zen Browser.
+                     </p>
                  </MobileLink>
                  <MobileLink
                     href="/themes"
                    onOpenChange={setOpen}
                  >
-                    Theme Store
+                    <div>Theme Store</div>
+                     <p className="opacity-60 text-xs">
+                        Customize your browsing experience.
+                     </p>
                  </MobileLink>
                  <MobileLink
                     href="/release-notes"
                    onOpenChange={setOpen}
                  >
-                    Release Notes
+                    <div>Release Notes</div>
+                     <p className="opacity-60 text-xs">
+                        Stay up to date with the latest changes.
+                     </p>
                  </MobileLink>
                  <MobileLink
                     href="https://patreon.com/zen_browser?utm_medium=unknown&utm_source=join_link&utm_campaign=creatorshare_creator&utm_content=copyLink"
                     onOpenChange={setOpen}
                  >
-                     Donate {"<"}3
+                     <div>Donate {"<"}3</div>
+                     <p className="opacity-60 text-xs">Support the project</p>
                  </MobileLink>
                  {components.map(({title, href, description}) => (
                     <MobileLink
@@ -69,7 +79,8 @@ export function MobileNav() {
                        key={href}
                        onOpenChange={setOpen}
                     >
-                        {title}
+                        <div>{title}</div>
+                        <p className='opacity-60 text-xs'>{description}</p>
                     </MobileLink>
                  ))}
                </div>
@@ -100,7 +111,7 @@ function MobileLink({
            router.push(href.toString())
            onOpenChange?.(false)
         }}
-         className={ny(className)}
+         className={ny(className, "my-4")}
         {...props}
      >
         {children}
--- a/src/components/navigation.tsx
+++ b/src/components/navigation.tsx
@@ -1,5 +1,4 @@
-"use client"
- 
+
 import * as React from "react"
 import Link from "next/link"
 
@@ -18,40 +17,36 @@ import { ModeToggle } from "./mode-toggle"
 import { MobileNav } from "./mobile-nav"
 import { HeartIcon } from "lucide-react"
 import { HeartFilledIcon } from "@radix-ui/react-icons"
-import { useTranslations } from "next-intl";
 
 export const components: { title: string; href: string; description: string }[] = [
  {
    title: "Privacy Policy",
    href: "/privacy-policy",
-    description: "Learn how we handle your data. Don't worry, we don't collect anything!",
+    description: "Read our privacy policy to learn more about how we handle your data."
  },
  {
    title: "Discord",
-    href: "https://discord.gg/nnShMQzR4b",
-    description: "Join our Discord server to chat with the community."
+    href: "https://discord.com/servers/mauro-s-little-sweatshop-1088172780480114748",
+    description: "Join our Discord server to chat with the community and get support."
  },
  {
    title: "Source Code",
    href: "https://github.com/zen-browser",
-    description: "Check out our source code on GitHub and leave a star!"
+    description: "View the source code on GitHub and contribute to the project."
  },
  {
    title: "Branding Assets",
    href: "/branding-assets",
-    description: "Download Zen Browser branding assets for your website or project."
+    description: "Download our branding assets to use in your projects."
  },
  {
    title: "Documentation",
    href: "https://docs.zen-browser.app/",
-    description: "Learn how to use Zen Browser and build your own themes."
+    description: "Read the documentation to learn more about Zen Browser."
  }
 ]
 
 export function Navigation() {
-
-  const t = useTranslations('navigation');
-
  return (
    <div className="bg-background z-40 top-0 left-0 w-full flex fixed border-b border-grey p-2 items-center justify-center">
      <MobileNav />
@@ -63,7 +58,7 @@ export function Navigation() {
            </NavigationMenuLink>
          </NavigationMenuItem>
          <NavigationMenuItem>
-            <NavigationMenuTrigger>{t('getting-started')}</NavigationMenuTrigger>
+            <NavigationMenuTrigger>Getting Started</NavigationMenuTrigger>
            <NavigationMenuContent>
              <ul className="grid gap-3 p-6 md:w-[400px] lg:w-[500px] lg:grid-cols-[.75fr_1fr]">
                <li className="row-span-3">
@@ -74,7 +69,7 @@ export function Navigation() {
                    >
                      <Logo />
                      <div className="mb-2 mt-4 text-lg font-medium">
-                        Zen Browser
+                      Zen Browser
                      </div>
                      <p className="text-sm leading-tight text-muted-foreground">
                        Firefox based browser with a focus on privacy and
@@ -84,13 +79,13 @@ export function Navigation() {
                  </NavigationMenuLink>
                </li>
                <ListItem href="/download" title="Download">
-                  Start using Zen Browser today with just a few clicks.
+                Start using Zen Browser today with just a few clicks.
                </ListItem>
                <ListItem href="/themes" title="Themes Store">
-                  Customize your browser with a variety of themes!
+                Customize your browser with a variety of themes!
                </ListItem>
                <ListItem href="/release-notes" title="Release Notes">
-                  Stay up to date with the latest changes.
+                Stay up to date with the latest changes.
                </ListItem>
              </ul>
            </NavigationMenuContent>
@@ -98,7 +93,7 @@ export function Navigation() {
          <NavigationMenuItem>
            <NavigationMenuTrigger>
              <HeartFilledIcon className="text-red-500" />
-              <span className="ml-2">{t('donate')}</span>
+              <span className="ml-2">Donate</span>
            </NavigationMenuTrigger>
            <NavigationMenuContent>
              <ul className="grid w-[400px] gap-3 p-4 md:w-[500px] md:grid-cols-2 lg:w-[600px] ">
@@ -109,7 +104,7 @@ export function Navigation() {
                  Support us on Patreon and get exclusive rewards and keep the project alive.
                </ListItem>
                <ListItem
-                  title="Ko-fi"
+                  title="Ko-Fi"
                  href="https://ko-fi.com/zen_browser?utm_medium=unknown&utm_source=join_link&utm_campaign=creatorshare_creator&utm_content=copyLink"
                >
                  Ko-fi is a way to support us with a one-time donation and help us keep the project alive.
@@ -118,7 +113,7 @@ export function Navigation() {
            </NavigationMenuContent>
          </NavigationMenuItem>
          <NavigationMenuItem>
-            <NavigationMenuTrigger>{t('useful-links')}</NavigationMenuTrigger>
+            <NavigationMenuTrigger>{"Useful Links"}</NavigationMenuTrigger>
            <NavigationMenuContent>
              <ul className="grid w-[400px] gap-3 p-4 md:w-[500px] md:grid-cols-2 lg:w-[600px] ">
                {components.map((component) => (
--- a/src/components/theme-card.tsx
+++ b/src/components/theme-card.tsx
@@ -1,4 +1,4 @@
-import Image from "next/image";
+
 import { getThemeAuthorLink, ZenTheme } from "@/lib/themes";
 import styled from "styled-components";
 import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle, DialogTrigger } from "./ui/dialog";import { Button } from "./ui/button";
--- a/src/components/theme-page.tsx
+++ b/src/components/theme-page.tsx
@@ -1,8 +1,7 @@

-import Image from "next/image";
+
 import { getThemeAuthorLink, getThemeFromId, getThemeMarkdown, ZenTheme } from "@/lib/themes";
 import { Button } from "./ui/button";
-import { useEffect, useState } from "react";
 import Markdown from "react-markdown";
 import '../app/privacy-policy/markdown.css';
 import { ChevronLeft, LoaderCircleIcon } from "lucide-react";
@@ -50,7 +49,7 @@ export default async function ThemePage({ themeID }: { themeID: string }) {
        <p id="install-theme-error" className="text-muted-foreground text-sm mt-2">You need to have Zen Browser installed to install this theme. <a href="/download" className="text-blue-500">Download now!</a></p>
      </div>
      <hr className="block my-4 lg:hidden" />
-      <div className="flex flex-col lg:border-l lg:min-h-96 px-5 lg:pl-10 max-w-xl lg:min-w-96 w-full">
+      <div className="flex lg:border-l flex-col lg:min-h-[calc(100vh/2-2rem)] px-5 lg:pl-10 max-w-xl lg:min-w-96 w-full">
        <div id="policy" className="w-full">
          {readme === null ? (
            <LoaderCircleIcon className="animate-spin w-12 h-12 mx-auto" />
--- a/src/i18n.ts
+++ b/src/i18n.ts
@@ -1,35 +0,0 @@
-import { getRequestConfig } from "next-intl/server";
-import { headers } from "next/headers";
-
-const SUPPORTED_LANGUAGES = ['en', 'de']; 
-
-export default getRequestConfig(async () => {
-  const headersList = headers();
-  
-  const acceptLanguage = headersList.get("accept-language") || "en";
-  
-  const [primaryLanguage] = acceptLanguage
-    .split(",")
-    .map((lang) => lang.split(";")[0])
-    .map((lang) => lang.toLowerCase());
-
-  const locale = SUPPORTED_LANGUAGES.includes(primaryLanguage) ? primaryLanguage : 'en';
-
-  try {
-    const messages = (await import(`../messages/${locale}.json`)).default;
-
-    return {
-      locale,
-      messages,
-    };
-  } catch (error) {
-    console.error(`Failed to load messages for locale: ${locale}`, error);
-    
-    const fallbackMessages = (await import(`../messages/en.json`)).default;
-
-    return {
-      locale: "en",
-      messages: fallbackMessages,
-    };
-  }
-});
--- a/src/lib/release-notes.ts
+++ b/src/lib/release-notes.ts
@@ -674,6 +674,49 @@ export const releaseNotes: ReleaseNote[] = [
        "Added labels to buttons during expand-on-hover"
    ],
    fixes: [
+        {
+            description: "Tab bar stuck on right side",
+            issue: 1115
+        }
+    ]
+    },
+    {
+    version: "1.0.0-a.35",
+    date: "02/09/2024",
+    extra: "This release is the thirty-fifth alpha release of the 1.0.0-alpha series. Things are getting stable!",
+    features: [
+        "Added option to restore legacy toolbar interface",
+        "Added profile-guided optimization (Windows)",
+        "Added Apple developer certificate (macOS)",
+        "Added experimental Zen Labs settings",
+        "Changed interface colors",
+        "Disabled efficiency-mode by default (Windows)",
+        "Enabled GPU-accelerated web rendering by default",
+        "Enabled Video Acceleration API for media decoding",
+        "Improved support for translations",
+        "Added Identical Code Folding compiler optimization",
+    ],
+    fixes: [
+        {
+            description: "Zen Browser is damaged and can't be opened on macOS",
+            issue: 53
+        },
+        {
+            description: "Can't reorganize tabs in compact mode",
+            issue: 1168
+        },
+        {
+            description: "Theme Store settings page doesn't display installed themes",
+            issue: 1125
+        },
+        {
+            description: "No Homebrew support",
+            issue: 273
+        },
+        {
+            description: "Remember last active workspaces on startup",
+            issue: 240
+        }
    ]
    }
 ].reverse();
--- a/wrangler.toml
+++ b/wrangler.toml
@@ -0,0 +1,4 @@
+name = "zenbrowser-www"
+compatibility_date = "2024-07-29"
+compatibility_flags = ["nodejs_compat"]
+pages_build_output_dir = "out"