refactor: standardize Tailwind class syntax and component usage

- Replaced arbitrary CSS values with standard Tailwind utilities (e.g., `bottom-[-18rem]` → `-bottom-72`, `mt-[-2rem]` → `-mt-8`)
- Fixed invalid gradient syntax by removing `bg-` prefix from gradient utilities
- Consolidated text styling by replacing inline elements with CT/CP text components
- Adjusted CT component typography from semibold to medium for better visual hierarchy

README.md

@@ -1,93 +1,195 @@
 # Project Mycelium Website
 
-A multi-page website for Project Mycelium built with React, Vite, TypeScript, and Tailwind CSS.
+All in one project mycelium website
 
-## Tech Stack
 
-- **Framework**: React 19
+- **Repository:** [https://git.ourworld.tf/ourworld_web/www_projectmycelium_com/](https://git.ourworld.tf/ourworld_web/www_projectmycelium_com/)
-- **Build Tool**: Vite 7
+
+
+- **Main Branch (Production):** [https://www.projectmycelium.com/](https://www.projectmycelium.com)
+- **Dev Branch (Staging):** [https://www2.projectmycelium.com/](https://www2.projectmycelium.com/)
+
+
+
+---
+
+
+## About
+
+
+This is the official website for Mycelium , built using Vite.js and Tailwind CSS.
+
+
+---
+
+
+## Technologies
+
+
+- **Framework**: Vite.js (React)
 - **Language**: TypeScript
-- **Styling**: Tailwind CSS 4
+- **Styling**: Tailwind CSS
-- **Routing**: React Router DOM 7
-- **Animations**: Framer Motion 11
 
-## Project Structure
 
-```
+---
-src/
-├── components/          # Shared components
-│   ├── AnimatedSection.tsx
-│   ├── Button.tsx
-│   ├── CircleBackground.tsx
-│   ├── Container.tsx
-│   ├── Header.tsx
-│   ├── Layout.tsx
-│   └── Logo.tsx
-├── pages/              # Page-specific components
-│   ├── home/           # Home page blocks
-│   ├── cloud/          # Cloud page blocks
-│   ├── network/        # Network page blocks
-│   │   ├── animations/ # SVG animations
-│   │   ├── Hero.tsx
-│   │   ├── About.tsx
-│   │   ├── Features.tsx
-│   │   ├── PrimaryFeatures.tsx
-│   │   ├── SecondaryFeatures.tsx
-│   │   ├── CallToAction.tsx
-│   │   └── NetworkPage.tsx
-│   └── agents/         # Agents page blocks
-├── styles/
-│   └── tailwind.css    # Tailwind configuration
-└── App.tsx            # Main app with routing
-```
 
-## Pages
 
-- **Home** (`/`) - Main landing page with placeholder content
+## Dependencies
-- **Cloud** (`/cloud`) - Mycelium Cloud information (placeholder)
-- **Network** (`/network`) - Full Network page with:
-  - Hero section
-  - Our Mission (About)
-  - Core Components (Features with animations)
-  - How It Works
-  - Roadmap
-  - Call to Action
-- **Agents** (`/agents`) - Mycelium Agents information (placeholder)
 
-## Development
+- **@emailjs/browser**: ^4.4.1
+- **@headlessui/react**: ^2.2.9
+- **@heroicons/react**: ^2.2.0
+- **@lobehub/icons**: ^1.97.2
+- **@radix-ui/react-icons**: ^1.3.2
+- **@react-three/drei**: ^9.89.2
+- **@react-three/fiber**: ^8.15.12
+- **@tabler/icons-react**: ^3.35.0
+- **@tailwindcss/forms**: ^0.5.10
+- **@types/node**: ^20.19.23
+- **@types/react**: ^18.3.26
+- **@types/react-dom**: ^18.3.7
+- **@types/react-router-dom**: ^5.3.3
+- **class-variance-authority**: ^0.7.1
+- **clsx**: ^2.1.1
+- **cobe**: ^0.6.5
+- **dotted-map**: ^2.2.3
+- **framer-motion**: ^10.18.0
+- **lucide-react**: ^0.544.0
+- **motion**: ^12.23.24
+- **popmotion**: ^11.0.5
+- **react**: ^18.3.1
+- **react-countup**: ^6.5.3
+- **react-dom**: ^18.3.1
+- **react-icons**: ^5.5.0
+- **react-router-dom**: ^7.9.4
+- **react-type-animation**: ^3.2.0
+- **tailwind-merge**: ^3.3.1
+- **tailwindcss**: ^4.1.15
+- **three**: ^0.151.0
+- **typescript**: ^5.9.3
+- **use-debounce**: ^10.0.6
 
-Install dependencies:
+### Dev Dependencies
-```bash
-npm install
-```
 
-Run development server:
+- **@tailwindcss/postcss**: ^4.1.15
-```bash
+- **@types/three**: ^0.151.0
-npm run dev
+- **@vitejs/plugin-react**: ^5.0.4
-```
+- **autoprefixer**: ^10.4.20
+- **eslint**: ^8.57.1
+- **prettier**: ^3.6.2
+- **prettier-plugin-tailwindcss**: ^0.6.14
+- **sharp**: ^0.33.1
+- **tw-animate-css**: ^1.4.0
+- **vite**: ^7.1.7
 
-Build for production:
+---
-```bash
-npm run build
-```
 
-Preview production build:
-```bash
-npm run preview
-```
 
-## Styling
+## File Structure
 
-The project follows the same styling conventions as the source Mycelium website:
-- **Font**: Inter (Google Fonts)
-- **Colors**: Custom gray scale and cyan accent
-- **Animations**: Framer Motion with reduced motion support
-- **Design**: Tailwind CSS with custom theme extensions
 
-## Migration Notes
+- **Pages**: `src/pages`
+- **Components**: `src/components`
+- **Images**: `public/images`, `src/images`
+- **CSS**: `src/index.css`, `src/App.css`
 
-This website consolidates multiple one-pager sites into a single multi-page application. The Network page contains fully migrated content from the original www_mycelium_net repository, including:
+
-- All animated SVG components
+---
-- Responsive layouts
+
-- Hover effects and transitions
+
-- Accessibility features
+## Branding
+
+
+- **Font**: 'Mulish', 'Neuton'
+- **Logos**: `public/images/logo.svg`, `public/images/logomark.svg`
+
+---
+
+
+## Get Started
+
+
+Follow these steps to get the project running locally:
+
+
+1.  **Install Dependencies**:
+
+    `npm install`
+
+2.  **Build the Project**:
+
+    `npm run build`
+
+3.  **Start the Development Server**:
+
+    `npm run dev`
+
+---
+
+
+## Development Guide
+
+
+This project follows a modular, component-based architecture. Pages are assembled by combining reusable components into a single layout.
+
+
+### Homepage Structure
+
+
+The homepage is composed of components from `src/components` and pages are defined in `src/pages`.
+
+To edit a specific section of the homepage, navigate to `src/components/`  and modify the corresponding component file.
+
+
+### Base Layout
+
+The base layout for all pages is defined in `src/components/Layout.tsx`.
+
+
+### Creating a New Page
+
+To create a new page, add a new route in `src/App.tsx` and create a corresponding component in `src/pages`.
+
+
+---
+
+
+## Contributing
+
+
+- **Never update the `main` branch directly.** All changes must be reviewed and merged by the team through a pull request.
+- **Always work on the `development` branch.** Create a feature branch from `development` and submit your pull request to `development`.
+- **Request a review.** After submitting your pull request, ask the team to review and accept it into the `main` branch.
+
+
+---
+
+
+## Report an Error
+
+
+To report an issue, please use the following link and provide the requested information:
+
+
+- **Issue Tracker**: [git.ourworld.tf/ourworld_web/HOME/issues/new](https://git.ourworld.tf/ourworld_web/HOME/issues/new) and tag **OW Website & Wiki Project 2025**
+
+
+- See the current web rpoject on [OW Website & Wiki Project 2025](https://git.ourworld.tf/ourworld_web/-/projects/153)
+
+
+When reporting an issue, please include:
+
+
+- **URL**: The page where the error occurred.
+- **Repo**: The repository you are working with.
+- **Branch**: The specific branch you are on.
+- **Problem**: A detailed description of the problem.
+
+
+---
+
+
+## Questions
+
+
+If you have any questions, you can reach out to [sashaastiadi](https://git.ourworld.tf/sashaastiadi).

index.html

@@ -8,6 +8,7 @@
     <meta name="description" content="Project Mycelium's technology enables anyone to deploy their own Internet infrastructure, anywhere." />
     <link rel="preconnect" href="https://fonts.googleapis.com" />
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
+    <link href="https://fonts.googleapis.com/css2?family=Mulish:wght@400;500;700&display=swap" rel="stylesheet" />
   </head>
   <body>
     <div id="root"></div>

public/images/github.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" aria-label="GitHub" viewBox="0 0 512 512" id="github">
+  <rect width="512" height="512" fill="#1B1817" rx="15%"></rect>
+  <path fill="#fff" d="M335 499c14 0 12 17 12 17H165s-2-17 12-17c13 0 16-6 16-12l-1-50c-71 16-86-28-86-28-12-30-28-37-28-37-24-16 1-16 1-16 26 2 40 26 40 26 22 39 59 28 74 22 2-17 9-28 16-35-57-6-116-28-116-126 0-28 10-51 26-69-3-6-11-32 3-67 0 0 21-7 70 26 42-12 86-12 128 0 49-33 70-26 70-26 14 35 6 61 3 67 16 18 26 41 26 69 0 98-60 120-117 126 10 8 18 24 18 48l-1 70c0 6 3 12 16 12z"></path>
+</svg>

src/App.tsx

@@ -1,30 +1,34 @@
-import { BrowserRouter, Routes, Route } from 'react-router-dom'
+import { HashRouter, Routes, Route } from 'react-router-dom';
-import { Layout } from './components/Layout'
+import { Layout } from './components/Layout';
-import HomePage from './pages/home/HomePage'
+import { lazy, Suspense } from 'react';
-import CloudPage from './pages/cloud/CloudPage'
+
-import NetworkPage from './pages/network/NetworkPage'
+const HomePage = lazy(() => import('./pages/home/HomePage'));
-import AgentsPage from './pages/agents/AgentsPage'
+const CloudPage = lazy(() => import('./pages/cloud/CloudPage'));
-import DownloadPage from './pages/download/DownloadPage'
+const NetworkPage = lazy(() => import('./pages/network/NetworkPage'));
-import ComputePage from './pages/compute/ComputePage'
+const AgentsPage = lazy(() => import('./pages/agents/AgentsPage'));
-import StoragePage from './pages/storage/StoragePage'
+const DownloadPage = lazy(() => import('./pages/download/DownloadPage'));
-import GpuPage from './pages/gpu/GpuPage'
+const ComputePage = lazy(() => import('./pages/compute/ComputePage'));
+const StoragePage = lazy(() => import('./pages/storage/StoragePage'));
+const GpuPage = lazy(() => import('./pages/gpu/GpuPage'));
 
 function App() {
   return (
-    <BrowserRouter>
+    <HashRouter>
-      <Routes>
+      <Suspense fallback={<div>Loading...</div>}>
-        <Route path="/" element={<Layout />}>
+        <Routes>
-          <Route index element={<HomePage />} />
+          <Route path="/" element={<Layout />}>
-          <Route path="cloud" element={<CloudPage />} />
+            <Route index element={<HomePage />} />
-          <Route path="network" element={<NetworkPage />} />
+            <Route path="cloud" element={<CloudPage />} />
-          <Route path="agents" element={<AgentsPage />} />
+            <Route path="network" element={<NetworkPage />} />
-                    <Route path="download" element={<DownloadPage />} />
+            <Route path="agents" element={<AgentsPage />} />
-          <Route path="compute" element={<ComputePage />} />
+            <Route path="download" element={<DownloadPage />} />
-          <Route path="storage" element={<StoragePage />} />
+            <Route path="compute" element={<ComputePage />} />
-          <Route path="gpu" element={<GpuPage />} />
+            <Route path="storage" element={<StoragePage />} />
-        </Route>
+            <Route path="gpu" element={<GpuPage />} />
-      </Routes>
+          </Route>
-    </BrowserRouter>
+        </Routes>
+      </Suspense>
+    </HashRouter>
   )
 }
 

src/components/AnimatedSection.tsx

@@ -1,4 +1,5 @@
 import { motion } from 'framer-motion'
+import { forwardRef } from 'react'
 
 type AnimatedSectionProps = {
   children: React.ReactNode
@@ -6,9 +7,11 @@ type AnimatedSectionProps = {
   className?: string
 }
 
-export function AnimatedSection({ children, id, className }: AnimatedSectionProps) {
+export const AnimatedSection = forwardRef<HTMLElement, AnimatedSectionProps>(
+  ({ children, id, className }, ref) => {
   return (
-    <motion.section
+        <motion.section
+      ref={ref}
       id={id}
       className={className}
       initial={{ opacity: 0, y: 40 }}
@@ -19,4 +22,5 @@ export function AnimatedSection({ children, id, className }: AnimatedSectionProp
       {children}
     </motion.section>
   )
-}
+  },
+)

src/components/Button.tsx

@@ -3,9 +3,9 @@ import clsx from 'clsx'
 
 const baseStyles = {
   solid:
-    'inline-flex justify-center rounded-full py-2 px-4 text-sm font-semibold transition-colors',
+    'inline-flex justify-center rounded-full py-2 px-5 text-base font-semibold transition-colors',
   outline:
-    'inline-flex justify-center rounded-full border py-[calc(--spacing(2)-1px)] px-[calc(--spacing(4)-1px)] text-sm transition-colors',
+    'inline-flex justify-center bg-transparent rounded-full border py-[calc(--spacing(2)-1px)] px-[calc(--spacing(5)-1px)] text-base transition-colors',
 }
 
 const variantStyles = {
@@ -17,7 +17,7 @@ const variantStyles = {
     green: 'bg-green-500 text-white hover:bg-green-600',
   },
   outline: {
-    cyan: 'border-cyan-500 text-cyan-500 hover:bg-cyan-50',
+    cyan: 'border-cyan-500 text-cyan-500',
     gray: 'border-gray-300 text-gray-700 hover:border-cyan-500 active:border-cyan-500',
     white: 'border-gray-300 text-white hover:border-cyan-500 active:border-cyan-500',
   },

src/components/Footer.tsx

@@ -3,12 +3,12 @@ import { Container } from './Container'
 
 export function Footer() {
   return (
-    <footer className="border-t border-gray-200">
+    <footer className="">
       <Container>
         <div className="flex flex-col items-start justify-between gap-y-12 pt-16 pb-6 lg:flex-row lg:items-center lg:py-8">
           <div>
             <div className="flex items-center text-gray-900">
-              <img src="/src/images/logomark.svg" alt="Mycelium Logomark" className="h-15 w-15 flex-none" />
+              <img src="/images/logomark.svg" alt="Mycelium Logomark" className="h-15 w-15 flex-none" />
               <div className="ml-4">
                 <p className="text-base font-semibold">Project Mycelium</p>
                 <p className="mt-1 text-sm">Unleash the Power of Decentralization</p>
@@ -31,7 +31,7 @@ export function Footer() {
           </div>
           <div className="group relative -mx-4 flex items-center self-stretch p-4 transition-colors hover:bg-gray-100 sm:self-auto sm:rounded-2xl lg:mx-0 lg:self-auto lg:p-6">
             <div className="relative flex h-16 w-16 flex-none items-center justify-center">
-              <img src="/src/images/github.svg" alt="GitHub" className="h-16 w-16" />
+              <img src="/images/github.svg" alt="GitHub" className="h-16 w-16" />
             </div>
             <div className="ml-4 lg:w-72">
               <p className="text-base font-semibold text-gray-900">
@@ -46,7 +46,7 @@ export function Footer() {
             </div>
           </div>
         </div>
-        <div className="flex flex-col items-center border-t border-gray-200 pt-8 pb-12 md:flex-row-reverse md:justify-between md:pt-6">
+        <div className="flex flex-col items-center border-t border-gray-100 pt-8 pb-12 md:flex-row-reverse md:justify-between md:pt-6">
           <p className="mt-6 text-sm text-gray-500 md:mt-0">
             &copy; Copyright{' '}
             <a href="https://www.threefold.io" target="_blank" rel="noopener noreferrer" className="hover:text-cyan-500 transition-colors">

src/components/Header.tsx

@@ -1,15 +1,36 @@
-import { Link } from 'react-router-dom'
+import { useState } from 'react'
+import { Link, useLocation } from 'react-router-dom'
 import { Dropdown } from './ui/Dropdown'
 import { ChevronDownIcon } from '@heroicons/react/20/solid'
 import { Container } from './Container'
 import { Button } from './Button'
 import pmyceliumLogo from '../images/logos/logo_1.png'
+import { Dialog } from '@headlessui/react'
+import { Bars3Icon, XMarkIcon } from '@heroicons/react/24/outline'
+
+const cloudNavItems = [
+  { name: 'Cloud', href: '/cloud' },
+  { name: 'Compute', href: '/compute' },
+  { name: 'Storage', href: '/storage' },
+  { name: 'GPU', href: '/gpu' },
+]
 
 export function Header() {
+  const location = useLocation()
+  const [mobileMenuOpen, setMobileMenuOpen] = useState(false)
+
+  const getCurrentPageName = () => {
+    const currentPath = location.pathname;
+    if (currentPath.startsWith('/compute')) return 'Compute';
+    if (currentPath.startsWith('/storage')) return 'Storage';
+    if (currentPath.startsWith('/gpu')) return 'GPU';
+    return 'Cloud';
+  };
+
   return (
-    <header>
+    <header className="bg-white">
-      <nav>
+      <nav className="border-b border-gray-100">
-                <Container className="relative z-50 flex justify-between py-4">
+        <Container className="flex bg-transparent justify-between py-4">
           <div className="relative z-10 flex items-center gap-16">
             <Link to="/" aria-label="Home">
               <img src={pmyceliumLogo} alt="Mycelium" className="h-8 w-auto" />
@@ -18,16 +39,18 @@ export function Header() {
               <Dropdown
                 buttonContent={
                   <>
-                    Cloud
+                    {['Compute', 'Storage', 'GPU'].includes(getCurrentPageName()) ? (
+                      <>
+                        <span className="text-gray-500">Cloud {' >'} </span>
+                        <span>{getCurrentPageName()}</span>
+                      </>
+                    ) : (
+                      'Cloud'
+                    )}
                     <ChevronDownIcon className="h-5 w-5" aria-hidden="true" />
                   </>
                 }
-                items={[
+                items={cloudNavItems}
-                  { name: 'Cloud', href: '/cloud' },
-                  { name: 'Compute', href: '/compute' },
-                  { name: 'Storage', href: '/storage' },
-                  { name: 'GPU', href: '/gpu' },
-                ]}
               />
               <Link
                 to="/network"
@@ -52,15 +75,94 @@ export function Header() {
                 target="_blank"
                 rel="noopener noreferrer"
               >
-                Start Deployment
+                Deploy Now
               </Button>
               <Button to="/download" variant="solid" color="cyan">
                 Get Mycelium Connector
               </Button>
             </div>
+            <div className="lg:hidden">
+              <button
+                type="button"
+                className="-m-2.5 inline-flex items-center justify-center rounded-md p-2.5 text-gray-700 hover:text-cyan-500 transition-colors"
+                onClick={() => setMobileMenuOpen(true)}
+              >
+                <span className="sr-only">Open main menu</span>
+                <Bars3Icon className="h-6 w-6" aria-hidden="true" />
+              </button>
+            </div>
           </div>
         </Container>
       </nav>
+      <Dialog as="div" className="lg:hidden" open={mobileMenuOpen} onClose={setMobileMenuOpen}>
+        <div className="fixed inset-0 z-10" />
+        <Dialog.Panel className="fixed inset-y-0 right-0 z-10 w-full overflow-y-auto lg:bg-transparent lg:bg-transparent bg-white px-6 py-6 sm:max-w-sm sm:ring-1 sm:ring-gray-900/10">
+          <div className="flex items-center justify-between">
+            <Link to="#" className="-m-1.5 p-1.5">
+              <span className="sr-only">Mycelium</span>
+              <img
+                className="h-8 w-auto"
+                src={pmyceliumLogo}
+                alt=""
+              />
+            </Link>
+            <button
+              type="button"
+              className="-m-2.5 rounded-md p-2.5 text-gray-700 hover:text-cyan-500 transition-colors"
+              onClick={() => setMobileMenuOpen(false)}
+            >
+              <span className="sr-only">Close menu</span>
+              <XMarkIcon className="h-6 w-6" aria-hidden="true" />
+            </button>
+          </div>
+          <div className="mt-6 flow-root">
+            <div className="-my-6 divide-y divide-gray-500/10">
+              <div className="space-y-2 py-6">
+                {cloudNavItems.map((item) => (
+                  <Link
+                    key={item.name}
+                    to={item.href}
+                    className="-mx-3 block rounded-lg px-3 py-2 text-base font-semibold leading-7 text-gray-900 hover:bg-gray-50"
+                    onClick={() => setMobileMenuOpen(false)}
+                  >
+                    {item.name}
+                  </Link>
+                ))}
+                <Link
+                  to="/network"
+                  className="-mx-3 block rounded-lg px-3 py-2 text-base font-semibold leading-7 text-gray-900 hover:bg-gray-50"
+                  onClick={() => setMobileMenuOpen(false)}
+                >
+                  Network
+                </Link>
+                <Link
+                  to="/agents"
+                  className="-mx-3 block rounded-lg px-3 py-2 text-base font-semibold leading-7 text-gray-900 hover:bg-gray-50"
+                  onClick={() => setMobileMenuOpen(false)}
+                >
+                  Agents
+                </Link>
+              </div>
+              <div className="py-6">
+                <Button
+                  to="https://myceliumcloud.tf"
+                  variant="outline"
+                  as="a"
+                  target="_blank"
+                  rel="noopener noreferrer"
+                  className="w-full"
+                  onClick={() => setMobileMenuOpen(false)}
+                >
+                  Start Deployment
+                </Button>
+                <Button to="/download" variant="solid" color="cyan" className="mt-4 w-full" onClick={() => setMobileMenuOpen(false)}>
+                  Get Mycelium Connector
+                </Button>
+              </div>
+            </div>
+          </div>
+        </Dialog.Panel>
+      </Dialog>
     </header>
   )
 }

src/components/Layout.tsx

@@ -5,12 +5,14 @@ import { Header } from './Header'
 export function Layout() {
 
   return (
-    <div className="bg-white antialiased" style={{ fontFamily: 'var(--font-inter)' }}>
+    <div className="bg-[#fdfdfd] antialiased relative" style={{ fontFamily: 'var(--font-inter)' }}>
-      <Header />
+      <div className="relative z-10">
-            <main className="">
+        <Header />
-        <Outlet />
+        <main>
-      </main>
+          <Outlet />
-      <Footer />
+        </main>
+        <Footer />
+      </div>
     </div>
   )
 }

src/components/Texts.tsx

@@ -13,6 +13,7 @@ const colorVariants = {
   secondary: 'text-gray-600',
   light: 'text-gray-50',
   accent: 'text-cyan-500',
+  cyan: 'text-cyan-50',
   white: 'text-white',
   dark: 'text-gray-950',
   tertiary: 'text-gray-700',
@@ -33,7 +34,8 @@ type PolymorphicProps<E extends React.ElementType, P> = P & {
 
 const createTextComponent = <DefaultElement extends React.ElementType>(
   defaultElement: DefaultElement,
-  defaultClassName: string
+  defaultClassName: string,
+  defaultProps: Omit<TextOwnProps, 'className' | 'children'> = {}
 ) => {
   type Props<E extends React.ElementType = DefaultElement> = PolymorphicProps<
     E,
@@ -41,9 +43,9 @@ const createTextComponent = <DefaultElement extends React.ElementType>(
   >
 
   function Text<E extends React.ElementType = DefaultElement>({
-    font = 'sans',
+    font = defaultProps.font || 'sans',
     as,
-    color = 'primary',
+    color = defaultProps.color || 'primary',
     className,
     children,
     ...props
@@ -72,7 +74,7 @@ const createTextComponent = <DefaultElement extends React.ElementType>(
 // Exports based on your tailwind.css and the example
 export const H1 = createTextComponent(
   'h1',
-  'text-6xl lg:text-7xl font-medium leading-tight tracking-tight'
+  'text-5xl lg:text-7xl font-medium leading-tight tracking-tight'
 )
 export const H2 = createTextComponent(
   'h2',
@@ -88,7 +90,7 @@ export const H4 = createTextComponent(
 )
 export const P = createTextComponent(
   'p',
-  'text-base lg:text-lg leading-relaxed'
+  'text-base lg:text-xl leading-relaxed'
 )
 export const Small = createTextComponent(
   'small',
@@ -100,11 +102,12 @@ export const Subtle = createTextComponent(
 )
 export const H5 = createTextComponent(
   'h5',
-  'text-xl lg:text-2xl font-light leading-snug tracking-normal'
+  'text-xl lg:text-2xl font-light lg:leading-snug leading-[0.85] tracking-normal'
 )
 export const Eyebrow = createTextComponent(
   'h2',
-  'text-base/7 font-semibold tracking-wide'
+  'text-base/7 font-semibold  uppercase tracking-[0.16em]',
+  { color: 'accent' }
 )
 export const SectionHeader = createTextComponent(
   'p',
@@ -128,7 +131,7 @@ export const FeatureTitle = createTextComponent(
 )
 export const FeatureDescription = createTextComponent(
   'p',
-  'text-sm leading-normal tracking-normal'
+  'lg:text-base text-sm leading-normal tracking-normal'
 )
 export const MobileFeatureTitle = createTextComponent(
   'h3',
@@ -159,5 +162,5 @@ export const DownloadCardDescription = createTextComponent(
   'text-base/7 leading-normal tracking-normal'
 )
 
-export const CT = createTextComponent('span', 'text-lg lg:text-xl font-semibold')
+export const CT = createTextComponent('span', 'text-base lg:text-lg font-medium')
-export const CP = createTextComponent('p', 'text-sm lg:text-sm tracking-wide leading-[1.525] font-light')
+export const CP = createTextComponent('p', 'text-sm lg:text-base tracking-wide leading-tight font-light')