diff --git a/apps/www/app/templates/client.tsx b/apps/www/app/templates/client.tsx
deleted file mode 100644
index 085050ebb9..0000000000
--- a/apps/www/app/templates/client.tsx
+++ /dev/null
@@ -1,423 +0,0 @@
-"use client";
-import { CTA } from "@/components/cta";
-import { ChangelogLight } from "@/components/svg/changelog";
-import { CodeIcon, FrameworkIcon } from "@/components/svg/template-page";
-import { Checkbox } from "@/components/template/checkbox";
-
-import { ImageWithBlur } from "@/components/image-with-blur";
-import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
-} from "@/components/template/form";
-import { SearchInput } from "@/components/template/input";
-import { PageIntro } from "@/components/template/page-intro";
-import {
-  Accordion,
-  AccordionContent,
-  AccordionItem,
-  AccordionTrigger,
-} from "@/components/ui/accordion";
-import { FrostedGlassFilter } from "@/components/ui/image-glass-filter";
-import { MeteorLinesAngular } from "@/components/ui/meteorLines";
-import { Separator } from "@/components/ui/separator";
-import {
-  type TemplatesFormValues,
-  getDefaulTemplatesFormValues,
-  schema,
-  updateUrl,
-} from "@/lib/templates-form";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { ArrowRight, SearchX, VenetianMask } from "lucide-react";
-import Link from "next/link";
-import { useEffect, useMemo } from "react";
-import { useForm } from "react-hook-form";
-import { type Framework, type Language, templates } from "./data";
-
-export function TemplatesClient() {
-  const form = useForm<TemplatesFormValues>({
-    resolver: zodResolver(schema),
-    defaultValues: getDefaulTemplatesFormValues(),
-    reValidateMode: "onChange",
-  });
-
-  const languages = Object.values(templates).reduce(
-    (acc, { language }) => {
-      if (!acc[language]) {
-        acc[language] = 0;
-      }
-      acc[language]++;
-      return acc;
-    },
-    {} as Record<Language, number>,
-  );
-
-  const frameworks = Object.values(templates).reduce(
-    (acc, { framework }) => {
-      if (!framework) {
-        return acc;
-      }
-      if (!acc[framework]) {
-        acc[framework] = 0;
-      }
-      acc[framework]++;
-      return acc;
-    },
-    {} as Record<Framework, number>,
-  );
-
-  const fields = form.watch();
-
-  useEffect(() => {
-    updateUrl(fields);
-  }, [fields]);
-
-  const filteredTemplates = useMemo(
-    () =>
-      Object.entries(templates).reduce(
-        (acc, [id, template]) => {
-          if (
-            fields.frameworks.length > 0 &&
-            (!template.framework || !fields.frameworks.includes(template.framework))
-          ) {
-            return acc;
-          }
-          if (fields.languages.length > 0 && !fields.languages.includes(template.language)) {
-            return acc;
-          }
-          if (
-            fields.search &&
-            !template.title.toLowerCase().includes(fields.search.toLowerCase()) &&
-            !template.description.toLowerCase().includes(fields.search.toLowerCase())
-          ) {
-            return acc;
-          }
-          acc[id] = template;
-          return acc;
-        },
-        {} as typeof templates,
-      ),
-    [fields],
-  );
-
-  return (
-    <div className="flex flex-col mx-auto py-28 lg:py-16 text-white/60">
-      <div>
-        <div className="relative -z-100 max-w-[1000px] mx-auto">
-          <ChangelogLight className="w-full -top-52" />
-        </div>
-        <div className="w-full h-full overflow-clip -z-20">
-          <MeteorLinesAngular
-            number={1}
-            xPos={0}
-            speed={10}
-            delay={5}
-            className="overflow-hidden"
-          />
-          <MeteorLinesAngular
-            number={1}
-            xPos={0}
-            speed={10}
-            delay={0}
-            className="overflow-hidden"
-          />
-          <MeteorLinesAngular
-            number={1}
-            xPos={100}
-            speed={10}
-            delay={7}
-            className="overflow-hidden sm:hidden"
-          />
-          <MeteorLinesAngular
-            number={1}
-            xPos={100}
-            speed={10}
-            delay={2}
-            className="overflow-hidden sm:hidden"
-          />
-          <MeteorLinesAngular
-            number={1}
-            xPos={200}
-            speed={10}
-            delay={7}
-            className="overflow-hidden"
-          />
-          <MeteorLinesAngular
-            number={1}
-            xPos={200}
-            speed={10}
-            delay={2}
-            className="overflow-hidden"
-          />
-          <MeteorLinesAngular
-            number={1}
-            xPos={400}
-            speed={10}
-            delay={5}
-            className="overflow-hidden sm:hidden md:block"
-          />
-          <MeteorLinesAngular
-            number={1}
-            xPos={400}
-            speed={10}
-            delay={0}
-            className="overflow-hidden sm:hidden md:block"
-          />
-        </div>
-      </div>
-
-      <PageIntro title="Find your template">
-        <p className="mt-6 text-base about-founders-text-gradient ">
-          Jumpstart your API development with our pre-built solutions.
-        </p>
-      </PageIntro>
-      <div className="container mx-auto mt-24 overflow-hidden text-white">
-        <div className="flex flex-col mb-24 lg:space-x-8 lg:flex-row">
-          <div className="w-full lg:w-[232px]">
-            <Form {...form}>
-              <h2 className="w-full mb-4 font-semibold text-left blog-heading-gradient">
-                Filter templates
-              </h2>
-              <FormField
-                control={form.control}
-                name="search"
-                render={({ field }) => (
-                  <FormItem>
-                    <FormControl>
-                      <SearchInput
-                        placeholder="Search"
-                        {...field}
-                        className="rounded-lg border-[.75px] border-white/20 lg:w-[232px]"
-                      />
-                    </FormControl>
-                    <FormMessage />
-                  </FormItem>
-                )}
-              />
-              <Accordion type="multiple" defaultValue={["languages", "frameworks"]}>
-                <FormField
-                  control={form.control}
-                  name="languages"
-                  render={() => (
-                    <FormItem className="mt-0 mb-4">
-                      <Separator className="mb-4 " orientation="horizontal" />
-
-                      <AccordionItem value="languages">
-                        <AccordionTrigger className="flex items-center w-full text-left">
-                          <span className="w-6 h-6 rounded-md bg-white/10">
-                            <CodeIcon />
-                          </span>
-                          <span className="w-full pl-4 text-sm text-left ">Language</span>
-                        </AccordionTrigger>
-
-                        <AccordionContent>
-                          <Separator className="my-4 " orientation="horizontal" />
-                          {Object.entries(languages).map(([language, occurences]) => (
-                            <FormField
-                              key={language}
-                              control={form.control}
-                              name="languages"
-                              render={({ field }) => {
-                                return (
-                                  <FormItem
-                                    key={language}
-                                    className="flex flex-row items-center px-2 py-1 space-x-3 h-10 space-y-0 duration-150 rounded-md bg-[rgba(255,255,255,0.05)] group hover:bg-[rgba(255,255,255,0.15)] mb-2"
-                                  >
-                                    <FormControl>
-                                      <Checkbox
-                                        aria-label={`Checkbox for ${language}`}
-                                        className="ml-2"
-                                        checked={field.value?.includes(language)}
-                                        onCheckedChange={(checked) => {
-                                          return checked
-                                            ? field.onChange([...field.value, language])
-                                            : field.onChange(
-                                                field.value?.filter(
-                                                  (value: string) => value !== language,
-                                                ),
-                                              );
-                                        }}
-                                      />
-                                    </FormControl>
-                                    <FormLabel className="flex items-center justify-between w-full">
-                                      <span className="text-sm font-normal">{language}</span>
-                                      <span className="px-2 py-1 text-xs duration-150 rounded-md text-white/70 bg-white/20 group-hover:text-white/80">
-                                        {occurences}
-                                      </span>
-                                    </FormLabel>
-                                  </FormItem>
-                                );
-                              }}
-                            />
-                          ))}
-
-                          <FormMessage />
-                        </AccordionContent>
-                      </AccordionItem>
-                    </FormItem>
-                  )}
-                />
-                <Separator className="mt-4 mb-4" orientation="horizontal" />
-                <FormField
-                  control={form.control}
-                  name="frameworks"
-                  render={() => (
-                    <FormItem className="mt-4 mb-4">
-                      <AccordionItem value="frameworks">
-                        <AccordionTrigger className="flex items-center w-full text-left">
-                          <span className="w-6 h-6 rounded-md bg-white/10">
-                            <FrameworkIcon />
-                          </span>
-                          <span className="w-full pl-4 text-sm text-left ">Framework</span>
-                        </AccordionTrigger>
-
-                        <AccordionContent>
-                          <Separator className="mt-4 mb-4" orientation="horizontal" />
-                          {Object.entries(frameworks).map(([framework, occurences]) => (
-                            <FormField
-                              key={framework}
-                              control={form.control}
-                              name="frameworks"
-                              render={({ field }) => {
-                                return (
-                                  <FormItem
-                                    key={framework}
-                                    className="flex flex-row items-center px-2 py-1 space-x-3 h-10 space-y-0 duration-150 rounded-md bg-[rgba(255,255,255,0.05)] group hover:bg-[rgba(255,255,255,0.15)] mb-2"
-                                  >
-                                    <FormControl>
-                                      <Checkbox
-                                        aria-label={`Checkbox for ${framework}`}
-                                        checked={field.value?.includes(framework)}
-                                        onCheckedChange={(checked) => {
-                                          return checked
-                                            ? field.onChange([...field.value, framework])
-                                            : field.onChange(
-                                                field.value?.filter(
-                                                  (value: string) => value !== framework,
-                                                ),
-                                              );
-                                        }}
-                                      />
-                                    </FormControl>
-                                    <FormLabel className="flex items-center justify-between w-full">
-                                      <span className="text-sm font-normal">{framework}</span>
-                                      <span className="px-2 py-1 text-xs duration-150 rounded-md text-white/70 bg-white/20 group-hover:text-white/80">
-                                        {occurences}
-                                      </span>
-                                    </FormLabel>
-                                  </FormItem>
-                                );
-                              }}
-                            />
-                          ))}
-                          <FormMessage />
-                        </AccordionContent>
-                      </AccordionItem>
-                    </FormItem>
-                  )}
-                />
-              </Accordion>
-            </Form>
-          </div>
-          <div className="flex-grow block w-full xl:w-3/4">
-            {Object.entries(filteredTemplates).length === 0 ? (
-              <div className="animate-in relative fade-in-50 w-full flex min-h-[400px] flex-col items-center justify-center rounded-xl border border-white/60 p-8 text-center">
-                <div className="mx-auto flex max-w-[420px] flex-col items-center justify-center text-center">
-                  <div className="flex items-center justify-center w-20 h-20 border rounded-full border-white/60">
-                    <SearchX />
-                  </div>
-                  <h2 className="mt-6 text-xl font-semibold">No template found</h2>
-                  <p className="mt-2 mb-8 text-sm font-normal leading-6 text-center text-white/60">
-                    Try removing some filters or{" "}
-                    <Link
-                      href="https://github.com/unkeyed/examples"
-                      className="underline text-white/60 hover:text-white/80"
-                      target="_blank"
-                      rel="noreferrer"
-                    >
-                      submit a template
-                    </Link>
-                    .
-                  </p>
-                </div>
-              </div>
-            ) : (
-              <div className="grid grid-cols-1 gap-8 auto-rows-fr xl:grid-cols-3 md:grid-cols-2 grid-col-1">
-                {Object.entries(filteredTemplates).map(([id, template]) => (
-                  <Link
-                    key={id}
-                    href={`/templates/${id}`}
-                    className="flex flex-col items-start justify-between h-full overflow-hidden duration-200 border rounded-xl border-white/10 hover:border-white/20"
-                  >
-                    <div className="relative w-full h-full">
-                      {template.image ? (
-                        <FrostedGlassFilter>
-                          <ImageWithBlur
-                            src={template.image}
-                            alt=""
-                            width={800}
-                            height={400}
-                            className="object-cover w-full bg-gray-100 aspect-video"
-                          />
-                        </FrostedGlassFilter>
-                      ) : (
-                        <div className="flex items-center justify-center w-full h-full">
-                          <VenetianMask className="w-8 h-8 text-white/60" />
-                        </div>
-                      )}
-                    </div>
-                    <div className="flex flex-col justify-start w-full h-full p-4">
-                      <div>
-                        <div className="flex flex-row justify-start w-full h-full gap-3">
-                          {template.framework !== undefined ? (
-                            <div className="px-2 py-1 text-xs rounded-md bg-[rgb(26,26,26)] text-white/60">
-                              {template.framework?.toString()}
-                            </div>
-                          ) : null}
-                          {template.language !== undefined ? (
-                            <div className="px-2 py-1 text-xs rounded-md bg-[rgb(26,26,26)] text-white/60">
-                              {template.language?.toString()}
-                            </div>
-                          ) : null}
-                        </div>
-                      </div>
-                      <div className="flex flex-col items-end content-end justify-end w-full h-full">
-                        <div className="w-full h-12 mt-6">
-                          <h3 className="text-lg font-semibold leading-6 text-left text-white group-hover:text-gray-600 line-clamp-2">
-                            {template.title}
-                          </h3>
-                        </div>
-                        <div className="w-full h-12">
-                          <p className="mt-4 mb-6 text-sm leading-6 text-left text-white/60 line-clamp-2">
-                            {template.description}
-                          </p>
-                        </div>
-                        {/* No images currently in author */}
-                        {/* <Avatar className="w-8 h-8 rounded-full" >
-                      <AvatarImage src={template.authors} />
-                    </Avatar> */}
-
-                        <div className="flex flex-row w-full h-24 sm:mb-4 md:mb-0 items-end">
-                          <div className="flex items-center justify-between w-full">
-                            <p className="text-xs leading-6 text-left text-white">
-                              {template.authors.join(", ")}
-                            </p>
-                            <ArrowRight strokeWidth={1.5} className="size-5 text-gray-400" />
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </Link>
-                ))}
-              </div>
-            )}
-          </div>
-        </div>
-      </div>
-      <CTA />
-    </div>
-  );
-}
diff --git a/oss.gg/3_follow_the_unkey_x_account.md b/oss.gg/3_follow_the_unkey_x_account.md
index 43d22b1eab..3a53411e4a 100644
--- a/oss.gg/3_follow_the_unkey_x_account.md
+++ b/oss.gg/3_follow_the_unkey_x_account.md
@@ -54,3 +54,6 @@ Your turn 👇
 
 » 16-October-2024 by [Zia Ur Rehman](@zia_webdev)
 » Link to Account: https://x.com/zia_webdev
+
+» 23-October-2024 by [Shreyans Lakhani](@LakhaniShreyas)
+» Link to Account: <https://x.com/LakhaniShreyas>
diff --git a/oss.gg/4_starry_eyed_supporter.md b/oss.gg/4_starry_eyed_supporter.md
index f4a1e34d6f..5c0af255d1 100644
--- a/oss.gg/4_starry_eyed_supporter.md
+++ b/oss.gg/4_starry_eyed_supporter.md
@@ -27,5 +27,6 @@ Your turn 👇
 » 16-October-2024 by [Zia Ur Rehman](@zia_webdev)
 » Link to Issue: https://github.com/unkeyed/unkey/issues/2455
 
+» 23-October-2024 by [Shreyas Lakhani] (@ShreyasLakhani)
 
 ---