diff --git a/.github/workflows/issue-title-formatter.yml b/.github/workflows/issue-title-formatter.yml
new file mode 100644
index 0000000..e3370ff
--- /dev/null
+++ b/.github/workflows/issue-title-formatter.yml
@@ -0,0 +1,19 @@
+name: "Auto Format Issue Title"
+
+on:
+  issues:
+    types: [opened, labeled]
+permissions:
+  issues: write
+
+jobs:
+  format_title:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Format issue title
+        uses: recursivezero/template/.github/actions/format-issue-title@v2.5
+        with:
+          prefix: TZD
+          dry_run: false
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/package.json b/package.json
index b4aa1f2..b810f02 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
   "contributors": [],
   "timestamp": {
     "createdOn": "Sun, 07 Jan 2024 00:00:00 +05:30",
-    "updatedOn": "Sun,11 Aug 2024 00:44:39 +05:30"
+    "updatedOn": "Sun,15 June 2025 02:10:39 +05:30"
   },
   "type": "module",
   "funding": {
@@ -100,4 +100,4 @@
     "prettier-plugin-astro": "0.14.1",
     "prettier-plugin-tailwindcss": "0.6.8"
   }
-}
+}
\ No newline at end of file
diff --git a/public/theme.js b/public/theme.js
new file mode 100644
index 0000000..3578f4a
--- /dev/null
+++ b/public/theme.js
@@ -0,0 +1,7 @@
+(function () {
+  const savedTheme = localStorage.getItem("theme");
+  console.log("Saved theme:", savedTheme);
+  if (savedTheme) {
+    document.documentElement.setAttribute("data-theme", savedTheme);
+  }
+})();
diff --git a/src/assets/images/about.jpg b/src/assets/images/about.jpg
new file mode 100644
index 0000000..b420289
Binary files /dev/null and b/src/assets/images/about.jpg differ
diff --git a/src/assets/images/contact-us.jpeg b/src/assets/images/contact-us.jpeg
new file mode 100644
index 0000000..f2fc779
Binary files /dev/null and b/src/assets/images/contact-us.jpeg differ
diff --git a/src/assets/images/person-with-laptop.jpg b/src/assets/images/person-with-laptop.jpg
new file mode 100644
index 0000000..e771fb0
Binary files /dev/null and b/src/assets/images/person-with-laptop.jpg differ
diff --git a/src/assets/images/workplace.jpg b/src/assets/images/workplace.jpg
new file mode 100644
index 0000000..cb90657
Binary files /dev/null and b/src/assets/images/workplace.jpg differ
diff --git a/src/assets/styles/globals.css b/src/assets/styles/globals.css
index f358ba3..a0bf36a 100644
--- a/src/assets/styles/globals.css
+++ b/src/assets/styles/globals.css
@@ -21,7 +21,6 @@
   html {
     color-scheme: light dark;
     height: 100%;
-    font-family: "Mudra";
 
     font-family: system-ui, sans-serif;
     scroll-behavior: smooth;
@@ -146,9 +145,10 @@
   .yellowBtnHover:hover {
     background-color: #b89405;
   }
+
   .clipped-logo {
     position: relative;
     -webkit-clip-path: inset(30px 10px 30px 10px);
     clip-path: inset(30px 10px 30px 10px);
   }
-}
+}
\ No newline at end of file
diff --git a/src/components/AboutSection.astro b/src/components/AboutSection.astro
index 2cf84ba..b646f22 100644
--- a/src/components/AboutSection.astro
+++ b/src/components/AboutSection.astro
@@ -1,3 +1,8 @@
+---
+import image from "@/assets/images/about.jpg";
+import { Image } from "astro:assets";
+---
+
 <section>
   <div class="w-full px-4 py-8 md:px-6 md:py-12 lg:px-8">
     <div class="mx-auto">
@@ -7,9 +12,10 @@
       </h1>
       <div class="flex flex-col gap-[1.5rem] lg:flex-row lg:justify-between lg:gap-[1.2rem] xl:gap-[3rem]">
         <figure class="basis-[55%] lg:h-[500px]">
-          <img
-            src="https://images.unsplash.com/photo-1515378791036-0648a3ef77b2?crop=entropy&cs=srgb&fm=jpg&ixid=M3wzNDk5MjB8MHwxfHNlYXJjaHw0MXx8VGVjaG5vbG9neXxlbnwwfHx8fDE3MDE2MTQ0NTd8MA&ixlib=rb-4.0.3&q=85"
-            alt="person working on a laptop "
+          <Image
+            src={image}
+            width={800}
+            alt="person working on a laptop"
             class="h-[250px] w-full rounded-xl object-cover md:h-[500px] lg:h-full"
           />
         </figure>
diff --git a/src/components/AppsSimplifySection.astro b/src/components/AppsSimplifySection.astro
index 6aaf226..e9e7cbe 100644
--- a/src/components/AppsSimplifySection.astro
+++ b/src/components/AppsSimplifySection.astro
@@ -1,3 +1,8 @@
+---
+import workplace from "@/assets/images/workplace.jpg";
+import { Image } from "astro:assets";
+---
+
 <section>
   <div class="p-[20px] lg:py-[50px]">
     <div class="mx-auto">
@@ -11,9 +16,10 @@
       <div class="section-description flex-row-reverse items-start justify-between gap-[20px] lg:flex">
         <div class="section-image mb-[10px] h-[150px] basis-[50%] md:h-[300px]">
           <figure>
-            <img
-              src="https://images.unsplash.com/photo-1563986768494-4dee2763ff3f?crop=entropy&cs=tinysrgb&fit=max&fm=jpg&ixid=M3wzNDk5MjB8MHwxfHNlYXJjaHw0NXx8VGVjaG5vbG9neXxlbnwwfHx8fDE3MDE2MTQ0NTh8MA&ixlib=rb-4.0.3&q=80&w=1080"
-              alt=""
+            <Image
+              src={workplace}
+              width={400}
+              alt="workplace"
               class="h-[150px] w-full rounded-[10px] object-cover md:h-[300px]"
             />
           </figure>
diff --git a/src/components/BlogCard.astro b/src/components/BlogCard.astro
index 436ac01..92baa9f 100644
--- a/src/components/BlogCard.astro
+++ b/src/components/BlogCard.astro
@@ -29,7 +29,7 @@ const { url, title, description, image, author, date, height = "auto" } = Astro.
 
         <div class="absolute bottom-0 left-0 right-0 p-4 transition-transform duration-300 group-hover:translate-y-0">
           <h3
-            class="translate-y-6 text-base font-bold leading-tight text-white transition-transform duration-300 ease-in-out group-hover:translate-y-0"
+            class="translate-y-6 text-base font-bold leading-tight text-white transition-transform duration-300 ease-in-out group-hover:translate-y-0 dark:text-black"
           >
             {title}
           </h3>
diff --git a/src/components/ContactSection.astro b/src/components/ContactSection.astro
index 0bd7a00..5a7113b 100644
--- a/src/components/ContactSection.astro
+++ b/src/components/ContactSection.astro
@@ -1,12 +1,18 @@
+---
+import contactUs from "@/assets/images/contact-us.jpeg";
+import { Image } from "astro:assets";
+---
+
 <section>
   <div class="p-[20px]">
     <div class="mx-auto">
       <div class="flex-row-reverse items-start gap-[20px] lg:flex">
         <div class="mb-[10px] basis-[50%] md:mb-[40px]">
           <figure>
-            <img
-              src="https://images.unsplash.com/photo-1504384308090-c894fdcc538d?crop=entropy&cs=tinysrgb&fit=max&fm=jpg&ixid=M3wzNDk5MjB8MHwxfHNlYXJjaHw0Nnx8VGVjaG5vbG9neXxlbnwwfHx8fDE3MDE2MTQ0NTh8MA&ixlib=rb-4.0.3&q=80&w=1080"
-              alt="contactus image"
+            <Image
+              src={contactUs}
+              width={800}
+              alt="contact us"
               class="h-[200px] w-full rounded-[10px] object-cover md:h-[400px]"
             />
           </figure>
diff --git a/src/components/Header.astro b/src/components/Header.astro
index 2bcea04..b41603c 100644
--- a/src/components/Header.astro
+++ b/src/components/Header.astro
@@ -45,21 +45,6 @@ const isActive = (linkPath: string) => {
           </a>
         </h1>
         <ul class="menu-list flex items-center gap-[1.5rem] lg:flex-row-reverse">
-          <!--<li id="themeToggle">
-            <button class="sunBtn">const currentPath = Astro.url.pathname;
-const base = import.meta.env.BASE_URL || '/';
-
-// Helper function to create correct paths
-const createPath = (path: string) => {
-  if (path === '/') return base;
-  return `${base}${path}`.replace(/\/+/g, '/');
-};
-              <i class="fa fa-sun-o" aria-hidden="true">Light</i>
-            </button>
-            <button class="moonBtn hidden">
-              <i class="fa fa-moon-o" aria-hidden="true">Dark</i>
-            </button>
-          </li>-->
           <li id="menuToggle" class="menu-button lg:hidden">
             <button id="closeBtn" class="ml-[3px] hidden">
               <i class="fa fa-times" aria-hidden="true"></i>
diff --git a/src/content/article/terms.md b/src/content/article/terms.md
index 753a991..e4c375b 100644
--- a/src/content/article/terms.md
+++ b/src/content/article/terms.md
@@ -3,7 +3,7 @@ title: "Terms & Conditions"
 author: "Admin"
 ---
 
-Welcome to COMPANY-NAME! These terms and conditions outline the rules and regulations for the use of COMPANY-NAME's Website, located at [COMPANY-NAME.com](https://www.COMPANY-NAME.com).
+Welcome to RecursiveZero! These terms and conditions outline the rules and regulations for the use of RecursiveZero's Website, located at [RecursiveZero.com](https://www.recursivezero.com).
 
 By accessing this website, we assume you accept these terms and conditions. Do not continue to use [Your Company
 Name] if you do not agree to take all of the terms and conditions stated on this page.
@@ -16,7 +16,7 @@ interchangeable and therefore as referring to same.
 
 ## Cookies
 
-We employ the use of cookies. By accessing COMPANY-NAME, you agreed to use cookies in agreement with the COMPANY-NAME's Privacy Policy.
+We employ the use of cookies. By accessing RecursiveZero, you agreed to use cookies in agreement with the RecursiveZero's Privacy Policy.
 
 Most interactive websites use cookies to let us retrieve the user's details for each visit. Cookies are used by
 our website to enable the functionality of certain areas to make it easier for people visiting our website. Some
@@ -24,14 +24,14 @@ of our affiliate/advertising partners may also use cookies.
 
 ## License
 
-Unless otherwise stated, COMPANY-NAME and/or its licensors own the intellectual property rights for all material on COMPANY-NAME. All intellectual property rights are reserved.
-You may access this from COMPANY-NAME for your own personal use subjected to restrictions set in these terms and conditions.
+Unless otherwise stated, RecursiveZero and/or its licensors own the intellectual property rights for all material on RecursiveZero. All intellectual property rights are reserved.
+You may access this from RecursiveZero for your own personal use subjected to restrictions set in these terms and conditions.
 
 ### You must not
 
-- Republish material from COMPANY-NAME
-- Sell, rent, or sub-license material from COMPANY-NAME
-- Reproduce, duplicate or copy material from COMPANY-NAME
-- Redistribute content from COMPANY-NAME
+- Republish material from RecursiveZero
+- Sell, rent, or sub-license material from RecursiveZero
+- Reproduce, duplicate or copy material from RecursiveZero
+- Redistribute content from RecursiveZero
 
 If you have any questions about our Terms and Conditions, please [contact us](/contact)
diff --git a/src/layouts/BaseLayout.astro b/src/layouts/BaseLayout.astro
index e1c895c..9954e64 100644
--- a/src/layouts/BaseLayout.astro
+++ b/src/layouts/BaseLayout.astro
@@ -8,6 +8,8 @@ import Header from "@/components/Header.astro";
 import Menu from "./common/Menu.astro";
 import Footer from "@/components/Footer.astro";
 
+import ThemeProvider from "@/components/ThemeProvider.astro";
+
 const {
   meta: { title, description = siteConfig.description, ogImage, articleDate }
 } = Astro.props;
@@ -15,11 +17,12 @@ const {
 
 <html lang={siteConfig.lang}>
   <head>
+    <script src="/theme.js" is:inline></script>
     <BaseHead title={title} description={description} ogImage={ogImage} date={articleDate} />
     <title>{title}</title>
   </head>
   <body id="pageBody">
-    <!--<ThemeProvider />-->
+    <ThemeProvider />
     <Header />
     <main id="main" class="main">
       <div class="sidebar"><Menu /></div>
diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro
deleted file mode 100644
index bb4e2ec..0000000
--- a/src/layouts/Layout.astro
+++ /dev/null
@@ -1,72 +0,0 @@
----
-interface Props {
-	title: string;
-	description: string;
-	url?: string;
-}
-
-const { title, description } = Astro.props;
----
-
-<!doctype html>
-<html lang="en">
-	<head>
-		<meta charset="UTF-8" />
-		<meta name="description" content={description} />
-		<meta name="viewport" content="width=device-width" />
-		<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
-		<meta name="generator" content={Astro.generator} />
-
-  <!-- HTML Meta Tags -->
-  <title>Welcome to Recursive Zero.</title>
-
-  <!-- Facebook Meta Tags -->
-  <meta property="og:url" content="https://www.recursivezero.com">
-  <meta property="og:type" content="website">
-  <meta property="og:title" content={title}>
-  <meta property="og:description" content={description}>
-  <meta property="og:image" content="logo_large">
-
-  <!-- Twitter Meta Tags -->
-  <meta name="twitter:card" content="logo_large">
-  <meta property="twitter:domain" content="recursivezero.com">
-  <meta property="twitter:url" content="https://www.recursivezero.com">
-  <meta name="twitter:title" content={title}>
-  <meta name="twitter:description" content={description}>
-  <meta name="twitter:image" content="logo_large">
-   
-	<title>{title}</title>
-	</head>
-	<body>
-		<slot />
-	</body>
-</html>
-<style is:global>
-	:root {
-		--accent: 136, 58, 234;
-		--accent-light: 224, 204, 250;
-		--accent-dark: 49, 10, 101;
-		--accent-gradient: linear-gradient(
-			45deg,
-			rgb(var(--accent)),
-			rgb(var(--accent-light)) 30%,
-			white 60%
-		);
-	}
-	html {
-		font-family: system-ui, sans-serif;
-		background: #13151a;
-		background-size: 224px;
-	}
-	code {
-		font-family:
-			Menlo,
-			Monaco,
-			Lucida Console,
-			Liberation Mono,
-			DejaVu Sans Mono,
-			Bitstream Vera Sans Mono,
-			Courier New,
-			monospace;
-	}
-</style>
diff --git a/src/layouts/common/Menu.astro b/src/layouts/common/Menu.astro
index c51b061..73fefb8 100644
--- a/src/layouts/common/Menu.astro
+++ b/src/layouts/common/Menu.astro
@@ -71,6 +71,8 @@ import { NavbarLinks } from "@/utils/constants";
 
   const update = () => {
     document.documentElement.dataset.theme = config.theme;
+    themer.setAttribute("aria-pressed", String(config.theme === "dark"));
+    localStorage.setItem("theme", config.theme);
   };
 
   const sync = () => {
diff --git a/src/pages/terms.astro b/src/pages/terms.astro
index 8acc90a..7f25977 100644
--- a/src/pages/terms.astro
+++ b/src/pages/terms.astro
@@ -1,8 +1,11 @@
 ---
+import MarkdownContent from "@/components/MarkdownContent.astro";
+import { Content } from "@/content/article/terms.md";
 import BaseLayout from "@/layouts/BaseLayout";
-import TitleLayout from "@/layouts/TitleLayout";
 ---
 
-<BaseLayout meta={{ title: "Terms and Condition" }}>
-  <TitleLayout title="Terms and Conditions" />
+<BaseLayout meta={{ title: "Terms and Conditions" }}>
+  <MarkdownContent>
+    <Content />
+  </MarkdownContent>
 </BaseLayout>
diff --git a/src/pages/work.astro b/src/pages/work.astro
index 276c793..a83eebb 100644
--- a/src/pages/work.astro
+++ b/src/pages/work.astro
@@ -1,5 +1,6 @@
 ---
 import BlogCard from "@/components/BlogCard.astro";
+import Card from "@/components/Card.astro";
 import BaseLayout from "@/layouts/BaseLayout";
 
 const pages = import.meta.glob("./work/*.astro", { eager: true });
@@ -36,6 +37,17 @@ const pageList = Object.entries(pages).map(([path, module]) => {
           />
         ))
       }
+      <Card href="http://abcdkbd.com" title="ABCDKBD" body="An interactive kids learning platform." />
+      <Card
+        href="http://app.threadzip.com"
+        title="ThreadZip"
+        body="A B2B marketplace for textile raw material businesses."
+      />
+      <Card
+        href="http://lab.threadzip.com"
+        title="ThreadZip Lab"
+        body="A python tool that uses computer vision to identify and generate fabric patterns."
+      />
     </div>
   </main>
 </BaseLayout>