Update workflow to install dependencies

.gitea/workflows/lint.yaml

@@ -5,7 +5,6 @@ on:
   push:
     branches:
       - main
-      - staging
 
 jobs:
   lint:

build-webapp.sh

@@ -14,7 +14,6 @@ VITE_SERVER_URL = 'LACONIC_HOSTED_CONFIG_server_url'
 VITE_GITHUB_CLIENT_ID = 'LACONIC_HOSTED_CONFIG_github_clientid'
 VITE_GITHUB_PWA_TEMPLATE_REPO = 'LACONIC_HOSTED_CONFIG_github_pwa_templaterepo'
 VITE_GITHUB_IMAGE_UPLOAD_PWA_TEMPLATE_REPO = 'LACONIC_HOSTED_CONFIG_github_image_upload_templaterepo'
-VITE_GITHUB_NEXT_APP_TEMPLATE_REPO = 'LACONIC_HOSTED_CONFIG_github_next_app_templaterepo'
 VITE_WALLET_CONNECT_ID = 'LACONIC_HOSTED_CONFIG_wallet_connect_id'
 VITE_LACONICD_CHAIN_ID = 'LACONIC_HOSTED_CONFIG_laconicd_chain_id'
 VITE_LIT_RELAY_API_KEY = 'LACONIC_HOSTED_CONFIG_lit_relay_api_key'

packages/backend/src/database.ts

@@ -49,25 +49,12 @@ export class Database {
     await this.dataSource.initialize();
     log('database initialized');
 
-    let organizations = await this.getOrganizations({});
+    const organizations = await this.getOrganizations({});
 
     // Load an organization if none exist
     if (!organizations.length) {
       const orgEntities = await getEntities(path.resolve(__dirname, ORGANIZATION_DATA_PATH));
-      organizations = await loadAndSaveData(Organization, this.dataSource, [orgEntities[0]]);
+      await loadAndSaveData(Organization, this.dataSource, [orgEntities[0]]);
-    }
-
-    // Hotfix for updating old DB data
-    if (organizations[0].slug === 'snowball-tools-1') {
-      const [orgEntity] = await getEntities(path.resolve(__dirname, ORGANIZATION_DATA_PATH));
-      
-      await this.updateOrganization(
-        organizations[0].id,
-        {
-          slug: orgEntity.slug as string,
-          name: orgEntity.name as string
-        }
-      )
     }
   }
 
@@ -134,14 +121,6 @@ export class Database {
     return newUserOrganization;
   }
 
-  async updateOrganization(organizationId: string, data: DeepPartial<Organization>): Promise<boolean> {
-    const organizationRepository = this.dataSource.getRepository(Organization);
-    const updateResult = await organizationRepository.update({ id: organizationId }, data);
-    assert(updateResult.affected);
-
-    return updateResult.affected > 0;
-  }
-
   async getProjects(options: FindManyOptions<Project>): Promise<Project[]> {
     const projectRepository = this.dataSource.getRepository(Project);
     const projects = await projectRepository.find(options);

packages/deployer/deploy-frontend.sh

@@ -8,11 +8,8 @@ echo "Using AUTHORITY: $AUTHORITY"
 # Repository URL
 REPO_URL="https://git.vdb.to/cerc-io/snowballtools-base"
 
-# Get the latest commit hash for a branch
+# Get the latest commit hash from the repository
-BRANCH_NAME="main"
+LATEST_HASH=$(git ls-remote $REPO_URL HEAD | awk '{print $1}')
-LATEST_HASH=$(git ls-remote $REPO_URL refs/heads/$BRANCH_NAME | awk '{print $1}')
-
-echo "Latest commit hash for branch $BRANCH_NAME: $LATEST_HASH"
 
 # Extract version from ../frontend/package.json
 PACKAGE_VERSION=$(jq -r '.version' ../frontend/package.json)

packages/deployer/records/application-deployment-request.yml

@@ -10,7 +10,6 @@ record:
       LACONIC_HOSTED_CONFIG_github_clientid: Ov23liaet4yc0KX0iM1c
       LACONIC_HOSTED_CONFIG_github_pwa_templaterepo: laconic-templates/test-progressive-web-app
       LACONIC_HOSTED_CONFIG_github_image_upload_templaterepo: laconic-templates/image-upload-pwa-example
-      LACONIC_HOSTED_CONFIG_github_next_app_templaterepo: laconic-templates/starter.nextjs-react-tailwind
       LACONIC_HOSTED_CONFIG_wallet_connect_id: 63cad7ba97391f63652161f484670e15
   meta:
     note: Added by Snowball @ Thu Apr  4 14:49:41 UTC 2024

packages/deployer/remove-deployment.sh

@@ -1,57 +0,0 @@
-#!/bin/bash
-
-source .env
-echo "Using REGISTRY_BOND_ID: $REGISTRY_BOND_ID"
-echo "Using DEPLOYER_LRN: $DEPLOYER_LRN"
-
-# Generate application-deployment-removal-request.yml
-REMOVAL_REQUEST_RECORD_FILE=records/application-deployment-removal-request.yml
-# TODO: Pass deployment record ID as arg
-DEPLOYMENT_RECORD_ID=bafyreidjho77xeczaqpyawhc4wbpm5it5atibtuxk6ost6vnpu2svlp3ka
-
-cat > $REMOVAL_REQUEST_RECORD_FILE <<EOF
-record:
-  deployer: $DEPLOYER_LRN
-  deployment: $DEPLOYMENT_RECORD_ID
-  type: ApplicationDeploymentRemovalRequest
-  version: 1.0.0
-EOF
-
-CONFIG_FILE=config.yml
-
-sleep 2
-REMOVAL_REQUEST_ID=$(yarn --silent laconic -c $CONFIG_FILE registry record publish --filename $REMOVAL_REQUEST_RECORD_FILE | jq -r '.id')
-echo "ApplicationDeploymentRemovalRequest published"
-echo $REMOVAL_REQUEST_ID
-
-# Deployment checks
-RETRY_INTERVAL=30
-MAX_RETRIES=20
-
-# Check that an ApplicationDeploymentRemovalRecord is published
-retry_count=0
-while true; do
-  removal_records_response=$(yarn --silent laconic -c $CONFIG_FILE registry record list --type ApplicationDeploymentRemovalRecord --all request $REMOVAL_REQUEST_ID)
-  len_removal_records=$(echo $removal_records_response | jq 'length')
-
-  # Check if number of records returned is 0
-  if [ $len_removal_records -eq 0 ]; then
-    # Check if retries are exhausted
-    if [ $retry_count -eq $MAX_RETRIES ]; then
-      echo "Retries exhausted"
-      echo "ApplicationDeploymentRemovalRecord for deployment removal request $REMOVAL_REQUEST_ID not found"
-      exit 1
-    else
-      echo "ApplicationDeploymentRemovalRecord not found, retrying in $RETRY_INTERVAL sec..."
-      sleep $RETRY_INTERVAL
-      retry_count=$((retry_count+1))
-    fi
-  else
-    echo "ApplicationDeploymentRemovalRecord found"
-    REMOVAL_RECORD_ID=$(echo $removal_records_response | jq -r '.[0].id')
-    echo $REMOVAL_RECORD_ID
-    break
-  fi
-done
-
-echo "Deployment removal successful"

packages/deployer/staging-records/application-deployment-request.yml

@@ -11,7 +11,6 @@ record:
       LACONIC_HOSTED_CONFIG_github_templaterepo: snowball-tools/test-progressive-web-app
       LACONIC_HOSTED_CONFIG_github_pwa_templaterepo: snowball-tools/test-progressive-web-app
       LACONIC_HOSTED_CONFIG_github_image_upload_templaterepo: snowball-tools/image-upload-pwa-example
-      LACONIC_HOSTED_CONFIG_github_next_app_templaterepo: snowball-tools/starter.nextjs-react-tailwind
       LACONIC_HOSTED_CONFIG_wallet_connect_id: eda9ba18042a5ea500f358194611ece2
       LACONIC_HOSTED_CONFIG_lit_relay_api_key: 15DDD969-E75F-404D-AAD9-58A37C4FD354_snowball
       LACONIC_HOSTED_CONFIG_aplchemy_api_key: THvPart_gqI5x02RNYSBntlmwA66I_qc

packages/frontend/.env.example

@@ -3,7 +3,6 @@ VITE_SERVER_URL='http://localhost:8000'
 VITE_GITHUB_CLIENT_ID=
 VITE_GITHUB_PWA_TEMPLATE_REPO="snowball-tools/test-progressive-web-app"
 VITE_GITHUB_IMAGE_UPLOAD_PWA_TEMPLATE_REPO="snowball-tools/image-upload-pwa-example"
-VITE_GITHUB_NEXT_APP_TEMPLATE_REPO="snowball-tools/starter.nextjs-react-tailwind"
 
 VITE_WALLET_CONNECT_ID=
 

packages/frontend/index.html

@@ -1,21 +1,19 @@
 <!doctype html>
-<html lang="en" class="dark dark:bg-background dark:text-foreground">
+<html lang="en">
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta name="description" content="laconic tools dashboard" />
+    <meta name="description" content="snowball tools dashboard" />
     <link rel="icon" href="/favicon.ico" />
+    <link rel="apple-touch-icon" href="/logo192.png" />
+    <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
+    <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png" />
+    <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />
     <link rel="manifest" href="/site.webmanifest" />
     <meta name="msapplication-TileColor" content="#2d89ef" />
     <meta name="theme-color" content="#ffffff" />
     <link rel="manifest" href="/manifest.json" />
-    <title>Laconic</title>
+    <title>Snowball</title>
-    <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=DM+Mono:ital,wght@0,300;0,400;0,500;1,300;1,400;1,500&display=swap"
-      rel="stylesheet"
-    />
   </head>
   <body>
     <div id="root"></div>

packages/frontend/public/laconic-logo.svg

@@ -1,4 +0,0 @@
-<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="48" height="48" rx="4" fill="#29292E"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M16.0494 24.6233C18.8425 21.8302 20.5713 17.973 20.5706 13.7142C20.5717 13.1361 20.5396 12.5645 20.4762 12L12 12.0008L12.0003 28.2867C11.9996 30.2608 12.7522 32.2356 14.2578 33.7411C15.7633 35.2466 17.7395 36.0001 19.7139 35.9991L19.7134 35.9996L36 36L35.9995 27.5227C35.4362 27.4605 34.8645 27.4285 34.2852 27.4284C30.0275 27.4289 26.1701 29.1577 23.377 31.9507C21.3446 33.9321 18.0858 33.9325 16.0785 31.9252C14.0722 29.9191 14.0715 26.6593 16.0494 24.6233ZM34.2419 13.7624C31.9012 11.4217 28.0982 11.4208 25.7566 13.7624C23.4151 16.1038 23.4159 19.9067 25.7566 22.2473C28.0986 24.5892 31.9004 24.5889 34.2419 22.2473C36.5835 19.9059 36.5839 16.1042 34.2419 13.7624Z" fill="#FBFBFB"/>
-</svg>

packages/frontend/public/logo.svg

@@ -1,10 +1 @@
-<svg width="115" height="20" viewBox="0 0 115 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="500" height="500" viewBox="0 0 500 500" fill="none" xmlns="http://www.w3.org/2000/svg"><rect width="500" height="500" fill="#0F86F5"/><path fill-rule="evenodd" clip-rule="evenodd" d="M191.873 125.126C224.893 126.765 250.458 150.121 274.042 172.995C297.925 196.158 323.089 221.108 324.868 254.114C326.718 288.42 308.902 321.108 283.281 344.355C258.67 366.687 225.288 373.859 191.873 374.788C157.228 375.752 119.038 374.394 95.1648 349.588C71.6207 325.125 74.6696 287.843 75.7341 254.114C76.7518 221.865 79.2961 188.525 101.009 164.41C123.845 139.047 157.543 123.423 191.873 125.126Z" fill="#4BA4F7"/><path fill-rule="evenodd" clip-rule="evenodd" d="M229.373 125.126C262.393 126.765 287.958 150.121 311.542 172.995C335.425 196.158 360.589 221.108 362.368 254.114C364.218 288.42 346.402 321.108 320.781 344.355C296.17 366.687 262.788 373.859 229.373 374.788C194.728 375.752 156.538 374.394 132.665 349.588C109.121 325.125 112.17 287.843 113.234 254.114C114.252 221.865 116.796 188.525 138.509 164.41C161.345 139.047 195.043 123.423 229.373 125.126Z" fill="#8AC4FA"/><path fill-rule="evenodd" clip-rule="evenodd" d="M266.873 125.126C299.893 126.765 325.458 150.121 349.042 172.995C372.925 196.158 398.089 221.108 399.868 254.114C401.718 288.42 383.902 321.108 358.281 344.355C333.67 366.687 300.288 373.859 266.873 374.788C232.228 375.752 194.038 374.394 170.165 349.588C146.621 325.125 149.67 287.843 150.734 254.114C151.752 221.865 154.296 188.525 176.009 164.41C198.845 139.047 232.543 123.423 266.873 125.126Z" fill="#CAE4FD"/><path fill-rule="evenodd" clip-rule="evenodd" d="M304.373 125.126C337.393 126.765 362.958 150.121 386.542 172.995C410.425 196.158 435.589 221.108 437.368 254.114C439.218 288.42 421.402 321.108 395.781 344.355C371.17 366.687 337.788 373.859 304.373 374.788C269.728 375.752 231.538 374.394 207.665 349.588C184.121 325.125 187.17 287.843 188.234 254.114C189.252 221.865 191.796 188.525 213.509 164.41C236.345 139.047 270.043 123.423 304.373 125.126Z" fill="white"/></svg>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M3.37388 10.5194C5.70149 8.19185 7.14225 4.97748 7.1416 1.42853C7.14246 0.94681 7.11586 0.470456 7.063 0L-0.000488281 0.000643078L-0.000273922 13.5723C-0.000917354 15.2174 0.62632 16.863 1.88091 18.1175C3.1356 19.3721 4.78235 20.0001 6.42772 19.9993L6.42729 19.9997L19.9995 20L19.999 12.9355C19.5296 12.8838 19.0532 12.857 18.5704 12.8569C15.0224 12.8574 11.8079 14.298 9.48026 16.6255C7.78654 18.2768 5.07093 18.2771 3.39812 16.6043C1.72638 14.9325 1.72562 12.2161 3.37388 10.5194ZM18.5344 1.46863C16.5837 -0.481929 13.4146 -0.48268 11.4633 1.46863C9.512 3.41984 9.51276 6.58895 11.4633 8.53941C13.415 10.491 16.5831 10.4907 18.5344 8.53941C20.4857 6.5882 20.4861 3.42016 18.5344 1.46863Z" fill="#FBFBFB"/>
-<path d="M31.4741 18.5838H39.2552V16.3302H34.075V1.41351H31.4741V18.5838Z" fill="#FBFBFB"/>
-<path d="M49.8108 1.41351H45.4976L40.9893 18.5838H43.6769L44.8039 14.2913H50.3744L51.5014 18.5838H54.3191L49.8108 1.41351ZM45.3458 12.145L47.6 3.2593H47.6866L49.8541 12.145H45.3458Z" fill="#FBFBFB"/>
-<path d="M62.9292 8.06885H65.9636C65.9636 3.17534 64.3813 1.07196 60.6967 1.07196C56.8169 1.07196 55.1479 3.73341 55.1479 9.97909C55.1479 16.2462 56.8169 18.9291 60.6967 18.9291C64.3813 18.9291 65.9636 16.8901 65.9853 12.1468H62.9508C62.9292 15.8599 62.474 16.7828 60.6967 16.7828C58.6593 16.7828 58.1607 15.4307 58.1824 9.97909C58.1824 4.54896 58.6809 3.19678 60.6967 3.21823C62.474 3.21823 62.9292 4.18413 62.9292 8.06885Z" fill="#FBFBFB"/>
-<path d="M73.7781 1.07209C77.7229 1.09364 79.4135 3.77643 79.4135 10.0007C79.4135 16.2249 77.7229 18.9078 73.7781 18.9292C69.8117 18.9507 68.1211 16.2678 68.1211 10.0007C68.1211 3.73354 69.8117 1.05064 73.7781 1.07209ZM71.1555 10.0007C71.1555 15.4308 71.6757 16.783 73.7781 16.783C75.8589 16.783 76.3791 15.4308 76.3791 10.0007C76.3791 4.54909 75.8589 3.19691 73.7781 3.21847C71.6757 3.23992 71.1555 4.59209 71.1555 10.0007Z" fill="#FBFBFB"/>
-<path d="M85.0819 18.5624L82.481 18.5838V1.41351H87.0544L91.3243 15.4073H91.3676V1.41351H93.968V18.5838H89.677L85.1254 3.51689H85.0819V18.5624Z" fill="#FBFBFB"/>
-<path d="M100.468 1.41351H97.8677V18.5838H100.468V1.41351Z" fill="#FBFBFB"/>
-<path d="M111.139 8.06885H114.174C114.174 3.17534 112.591 1.07196 108.906 1.07196C105.028 1.07196 103.358 3.73341 103.358 9.97909C103.358 16.2462 105.028 18.9291 108.906 18.9291C112.591 18.9291 114.174 16.8901 114.195 12.1468H111.161C111.139 15.8599 110.684 16.7828 108.906 16.7828C106.869 16.7828 106.371 15.4307 106.393 9.97909C106.393 4.54896 106.891 3.19678 108.906 3.21823C110.684 3.21823 111.139 4.18413 111.139 8.06885Z" fill="#FBFBFB"/>
-</svg>

packages/frontend/public/site.webmanifest

@@ -1,5 +1,5 @@
 {
-  "name": "Laconic Tools Dashboard",
+  "name": "Snowball Tools Dashboard",
   "short_name": "snowball tools",
   "icons": [
     {

packages/frontend/src/assets/templates.ts

@@ -1,14 +1,13 @@
 import {
   VITE_GITHUB_IMAGE_UPLOAD_PWA_TEMPLATE_REPO,
   VITE_GITHUB_PWA_TEMPLATE_REPO,
-  VITE_GITHUB_NEXT_APP_TEMPLATE_REPO,
 } from 'utils/constants';
 
 export default [
   {
     id: '1',
     name: 'Progressive Web App (PWA)',
-    icon: 'web',
+    icon: 'pwa',
     repoFullName: `${VITE_GITHUB_PWA_TEMPLATE_REPO}`,
     isComingSoon: false,
   },
@@ -21,9 +20,23 @@ export default [
   },
   {
     id: '3',
-    name: 'Next.js + React + TailwindCSS',
+    name: 'Kotlin',
-    icon: 'web',
+    icon: 'kotlin',
-    repoFullName: `${VITE_GITHUB_NEXT_APP_TEMPLATE_REPO}`,
+    repoFullName: '',
-    isComingSoon: false,
+    isComingSoon: true,
+  },
+  {
+    id: '4',
+    name: 'React Native',
+    icon: 'react-native',
+    repoFullName: '',
+    isComingSoon: true,
+  },
+  {
+    id: '5',
+    name: 'Swift',
+    icon: 'swift',
+    repoFullName: '',
+    isComingSoon: true,
   },
 ];

packages/frontend/src/components/Logo.tsx

@@ -1,4 +1,5 @@
 import { Link } from 'react-router-dom';
+import { Heading } from './shared/Heading';
 
 interface LogoProps {
   orgSlug?: string;
@@ -8,7 +9,14 @@ export const Logo = ({ orgSlug }: LogoProps) => {
   return (
     <Link to={`/${orgSlug}`}>
       <div className="flex items-center gap-3 px-0 lg:px-2">
-        <img src="/logo.svg" alt="Snowball Logo" />
+        <img
+          src="/logo.svg"
+          alt="Snowball Logo"
+          className="lg:h-10 lg:w-10 h-8 w-8 rounded-lg"
+        />
+        <Heading className="lg:text-[24px] text-[19px] font-semibold">
+          Snowball
+        </Heading>
       </div>
     </Link>
   );

packages/frontend/src/components/SearchBar.tsx

@@ -10,7 +10,7 @@ const SearchBar: React.ForwardRefRenderFunction<
   return (
     <div className="relative flex w-full">
       <Input
-        leftIcon={<SearchIcon className="text-foreground-secondary" />}
+        leftIcon={<SearchIcon />}
         onChange={onChange}
         value={value}
         type="search"

packages/frontend/src/components/Stepper.tsx

@@ -24,8 +24,8 @@ const Stepper = ({ activeStep, stepperValues }: StepperProps) => {
             <div
               className={`text-sm ${
                 activeStep === stepperValue.step
-                  ? 'text-black font-semibold dark:text-foreground'
+                  ? 'text-black font-semibold'
-                  : 'text-gray-600 dark:text-foreground-secondary'
+                  : 'text-gray-600'
               }`}
             >
               {stepperValue.label}

packages/frontend/src/components/projects/ProjectCard/ProjectCard.theme.ts

@@ -4,9 +4,7 @@ export const projectCardTheme = tv({
   slots: {
     wrapper: [
       'bg-surface-card',
-      'dark:bg-overlay2',
       'shadow-card',
-      'dark:shadow-background',
       'rounded-2xl',
       'flex',
       'flex-col',
@@ -19,16 +17,10 @@ export const projectCardTheme = tv({
       'text-sm',
       'font-medium',
       'text-elements-high-em',
-      'dark:text-foreground',
       'tracking-[-0.006em]',
       'truncate',
     ],
-    description: [
+    description: ['text-xs', 'text-elements-low-em', 'truncate'],
-      'text-xs',
-      'text-elements-low-em',
-      'dark:text-foreground-secondary',
-      'truncate',
-    ],
     icons: ['flex', 'items-center', 'gap-1'],
     lowerContent: [
       'transition-colors',
@@ -40,7 +32,6 @@ export const projectCardTheme = tv({
       'gap-2',
       'rounded-b-2xl',
       'group-hover:bg-surface-card-hovered',
-      'dark:group-hover:bg-overlay3',
     ],
     latestDeployment: ['flex', 'items-center', 'gap-2'],
     deploymentStatusContainer: [
@@ -51,15 +42,10 @@ export const projectCardTheme = tv({
       'justify-center',
     ],
     deploymentStatus: ['w-1', 'h-1', 'rounded-full'],
-    deploymentName: [
+    deploymentName: ['text-xs', 'text-elements-low-em'],
-      'text-xs',
-      'text-elements-low-em',
-      'dark:text-foreground-secondary',
-    ],
     deploymentText: [
       'text-xs',
       'text-elements-low-em',
-      'dark:text-foreground-secondary',
       'font-mono',
       'flex',
       'items-center',
@@ -67,11 +53,9 @@ export const projectCardTheme = tv({
     ],
     wavyBorder: [
       'bg-surface-card',
-      'dark:bg-background',
       'transition-colors',
       'duration-150',
       'group-hover:bg-surface-card-hovered',
-      'dark:group-hover:bg-overlay2',
     ],
   },
   variants: {
@@ -83,7 +67,7 @@ export const projectCardTheme = tv({
         deploymentStatus: ['bg-orange-400'],
       },
       failure: {
-        deploymentStatus: ['bg-error'],
+        deploymentStatus: ['bg-rose-500'],
       },
       pending: {
         deploymentStatus: ['bg-gray-500'],

packages/frontend/src/components/projects/ProjectCard/ProjectCard.tsx

@@ -88,7 +88,7 @@ export const ProjectCard = ({
         </div>
         {/* Icons */}
         <div className={theme.icons()}>
-          {hasError && <WarningDiamondIcon className="text-error" />}
+          {hasError && <WarningDiamondIcon className="text-elements-danger" />}
           <Menu placement="bottom-end">
             <MenuHandler>
               <Button
@@ -101,15 +101,12 @@ export const ProjectCard = ({
                 <HorizontalDotIcon />
               </Button>
             </MenuHandler>
-            <MenuList className="dark:bg-overlay3 dark:shadow-background dark:border-none">
+            <MenuList>
-              <MenuItem
+              <MenuItem onClick={navigateToSettingsOnClick}>
-                onClick={navigateToSettingsOnClick}
-                className="text-foreground"
-              >
                 Project settings
               </MenuItem>
               <MenuItem
-                className="text-error"
+                className="text-red-500"
                 onClick={navigateToSettingsOnClick}
               >
                 Delete project

packages/frontend/src/components/projects/ProjectSearchBar/ProjectSearchBar.tsx

@@ -59,12 +59,12 @@ export const ProjectSearchBar = ({ onChange }: ProjectSearchBarProps) => {
   }, [fetchProjects, debouncedInputValue]);
 
   return (
-    <div className="relative w-full lg:w-fit dark:bg-overlay">
+    <div className="relative w-full lg:w-fit">
       <SearchBar {...getInputProps()} />
       <div
         {...getMenuProps({}, { suppressRefError: true })}
         className={cn(
-          'flex flex-col shadow-dropdown rounded-xl dark:bg-overlay2 bg-surface-card absolute w-[459px] max-h-52 overflow-y-auto px-2 py-2 gap-1 z-50',
+          'flex flex-col shadow-dropdown rounded-xl bg-surface-card absolute w-[459px] max-h-52 overflow-y-auto px-2 py-2 gap-1 z-50',
           { hidden: !inputValue || !isOpen },
         )}
       >

packages/frontend/src/components/projects/ProjectSearchBar/ProjectSearchBarEmpty.tsx

@@ -13,10 +13,10 @@ export const ProjectSearchBarEmpty = ({
       {...props}
       className={cn('flex items-center px-2 py-2 gap-3', className)}
     >
-      <div className="w-8 h-8 rounded-lg flex items-center justify-center bg-orange-50 text-elements-warning dark:bg-red-50 text-error">
+      <div className="w-8 h-8 rounded-lg flex items-center justify-center bg-orange-50 text-elements-warning">
         <InfoRoundFilledIcon size={16} />
       </div>
-      <p className="text-elements-low-em text-sm dark:text-foreground-secondary tracking-[-0.006em]">
+      <p className="text-elements-low-em text-sm tracking-[-0.006em]">
         No projects matching this name
       </p>
     </div>

packages/frontend/src/components/projects/create/Configure.tsx

@@ -379,10 +379,7 @@ const Configure = () => {
           <Heading as="h4" className="md:text-lg font-medium">
             Configure deployment
           </Heading>
-          <Heading
+          <Heading as="h5" className="text-sm font-sans text-elements-low-em">
-            as="h5"
-            className="text-sm font-sans text-elements-low-em dark:text-foreground-secondaryu"
-          >
             The app can be deployed by setting the deployer LRN for a single
             deployment or by creating a deployer auction for multiple
             deployments
@@ -403,7 +400,6 @@ const Configure = () => {
                     onChange={(event) => onChange(event.target.value)}
                     size="small"
                     displayEmpty
-                    className="dark:bg-overlay2 dark:text-foreground"
                     sx={{
                       fontFamily: 'inherit',
                       '& .MuiOutlinedInput-notchedOutline': {
@@ -423,7 +419,7 @@ const Configure = () => {
               <div className="flex flex-col justify-start gap-4 mb-6">
                 <Heading
                   as="h5"
-                  className="text-sm font-sans text-elements-low-em dark:text-foreground-secondary"
+                  className="text-sm font-sans text-elements-low-em"
                 >
                   The app will be deployed by the configured deployer
                 </Heading>
@@ -433,7 +429,7 @@ const Configure = () => {
                   rules={{ required: true }}
                   render={({ field: { value, onChange }, fieldState }) => (
                     <FormControl fullWidth error={Boolean(fieldState.error)}>
-                      <span className="text-sm dark:text-foreground text-elements-high-em dark:text-foreground mb-4">
+                      <span className="text-sm text-elements-high-em mb-4">
                         Select deployer LRN
                       </span>
                       <Select
@@ -444,7 +440,6 @@ const Configure = () => {
                         }}
                         displayEmpty
                         size="small"
-                        className="dark:bg-overlay2 dark:text-foreground"
                       >
                         {deployers.map((deployer) => (
                           <MenuItem
@@ -471,12 +466,12 @@ const Configure = () => {
                 <div className="flex flex-col justify-start gap-4 mb-6">
                   <Heading
                     as="h5"
-                    className="text-sm font-sans text-elements-low-em dark:text-foreground-secondary"
+                    className="text-sm font-sans text-elements-low-em"
                   >
                     Set the number of deployers and maximum price for each
                     deployment
                   </Heading>
-                  <span className="text-sm text-elements-high-em dark:text-foreground">
+                  <span className="text-sm text-elements-high-em">
                     Number of Deployers
                   </span>
                   <Controller
@@ -493,7 +488,7 @@ const Configure = () => {
                   />
                 </div>
                 <div className="flex flex-col justify-start gap-4 mb-6">
-                  <span className="text-sm text-elements-high-em dark:text-foreground">
+                  <span className="text-sm text-elements-high-em">
                     Maximum Price (alnt)
                   </span>
                   <Controller
@@ -511,7 +506,7 @@ const Configure = () => {
             <Heading as="h4" className="md:text-lg font-medium mb-3">
               Environment Variables
             </Heading>
-            <div className="p-4 bg-slate-100 dark:bg-overlay3 rounded-lg mb-6">
+            <div className="p-4 bg-slate-100 rounded-lg mb-6">
               <EnvironmentVariablesForm />
             </div>
 
@@ -543,7 +538,6 @@ const Configure = () => {
                     <Button
                       {...buttonSize}
                       type="submit"
-                      shape="default"
                       disabled={
                         isLoading || isPaymentLoading || !selectedAccount
                       }

packages/frontend/src/components/projects/create/ConnectAccount.tsx

@@ -6,6 +6,7 @@ import { Button } from '../../shared/Button';
 import {
   GitIcon,
   EllipsesIcon,
+  SnowballIcon,
   GithubIcon,
   GitTeaIcon,
 } from '../../shared/CustomIcon';
@@ -14,7 +15,6 @@ import { IconWithFrame } from '../../shared/IconWithFrame';
 import { Heading } from '../../shared/Heading';
 import { MockConnectGitCard } from './MockConnectGitCard';
 import { VITE_GITHUB_CLIENT_ID } from 'utils/constants';
-import { LaconicIcon } from 'components/shared/CustomIcon/LaconicIcon';
 
 const SCOPES = 'public_repo user';
 const GITHUB_OAUTH_URL = `https://github.com/login/oauth/authorize?client_id=${VITE_GITHUB_CLIENT_ID}&scope=${encodeURIComponent(SCOPES)}`;
@@ -46,24 +46,20 @@ const ConnectAccount: React.FC<ConnectAccountInterface> = ({
 
   // TODO: Use correct height
   return (
-    <div className="dark:bg-overlay bg-gray-100 flex flex-col p-4 gap-7 justify-center items-center text-center text-sm h-full rounded-2xl">
+    <div className="bg-gray-100 flex flex-col p-4 gap-7 justify-center items-center text-center text-sm h-full rounded-2xl">
       <div className="flex flex-col items-center max-w-[420px]">
         {/** Icons */}
         <div className="w-52 h-16 justify-center items-center gap-4 inline-flex mb-7">
-          <IconWithFrame icon={<GitIcon />} hasHighlight={false} />
+          <IconWithFrame icon={<GitIcon />} />
           <EllipsesIcon className="items-center gap-1.5 flex" />
-          <IconWithFrame
+          <IconWithFrame className="bg-blue-400" icon={<SnowballIcon />} />
-            className="bg-background"
-            icon={<LaconicIcon />}
-            hasHighlight={false}
-          />
         </div>
         {/** Text */}
         <div className="flex flex-col gap-1.5 mb-6">
-          <Heading className="text-xl font-medium dark:text-foreground">
+          <Heading className="text-xl font-medium">
             Connect to your Git account
           </Heading>
-          <p className="text-center text-elements-mid-em dark:text-foreground-secondary">
+          <p className="text-center text-elements-mid-em">
             Once connected, you can import a repository from your account or
             start with one of our templates.
           </p>
@@ -74,14 +70,14 @@ const ConnectAccount: React.FC<ConnectAccountInterface> = ({
             url={GITHUB_OAUTH_URL}
             onCode={handleCode}
             onClose={() => {}}
-            title="Laconic"
+            title="Snowball"
             width={1000}
             height={1000}
           >
             <Button
               className="w-full sm:w-auto"
               leftIcon={<GithubIcon />}
-              variant="primary"
+              variant="tertiary"
             >
               Connect to GitHub
             </Button>
@@ -89,7 +85,7 @@ const ConnectAccount: React.FC<ConnectAccountInterface> = ({
           <Button
             className="w-full sm:w-auto"
             leftIcon={<GitTeaIcon />}
-            variant="primary"
+            variant="tertiary"
           >
             Connect to GitTea
           </Button>

packages/frontend/src/components/projects/create/ConnectWallet.tsx

@@ -15,7 +15,7 @@ const ConnectWallet = ({
   };
 
   return (
-    <div className="p-4 bg-slate-100 dark:bg-overlay3 rounded-lg mb-6">
+    <div className="p-4 bg-slate-100 rounded-lg mb-6">
       {accounts.length === 0 ? (
         <div>
           <Button type={'button'} onClick={handleConnect}>
@@ -30,7 +30,6 @@ const ConnectWallet = ({
             onChange={(value) => {
               value && onAccountChange(value);
             }}
-            className="dark:bg-overlay2 dark:text-foreground"
           >
             {accounts.map((account, index) => (
               <Option key={index} value={account.address}>

packages/frontend/src/components/projects/create/DeployStep.tsx

@@ -36,7 +36,7 @@ const DeployStep = ({ step, status, title, startTime }: DeployStepsProps) => {
               </div>
             )}
             {status === DeployStatus.PROCESSING && (
-              <LoaderIcon className="animate-spin text-elements-link dark:text-foreground" />
+              <LoaderIcon className="animate-spin text-elements-link" />
             )}
           </div>
 
@@ -44,8 +44,7 @@ const DeployStep = ({ step, status, title, startTime }: DeployStepsProps) => {
           <span
             className={cn(
               'text-left text-sm md:text-base',
-              status === DeployStatus.PROCESSING &&
+              status === DeployStatus.PROCESSING && 'text-elements-link',
-                'text-elements-link dark:text-foreground',
             )}
           >
             {title}
@@ -55,10 +54,7 @@ const DeployStep = ({ step, status, title, startTime }: DeployStepsProps) => {
         {/* Timer */}
         {status === DeployStatus.PROCESSING && (
           <div className="flex items-center gap-1.5">
-            <ClockOutlineIcon
+            <ClockOutlineIcon size={16} className="text-elements-low-em" />
-              size={16}
-              className="text-elements-low-em dark:text-foreground-secondary"
-            />
             <Stopwatch
               offsetTimestamp={setStopWatchOffset(startTime!)}
               isPaused={false}

packages/frontend/src/components/projects/create/MockConnectGitCard.tsx

@@ -56,8 +56,16 @@ export const MockConnectGitCard = () => {
       icon: 'pwa',
     },
     {
-      name: 'Next.js + React + TailwindCSS',
+      name: 'React Native',
-      icon: 'next-app',
+      icon: 'react-native',
+    },
+    {
+      name: 'Kotlin',
+      icon: 'kotlin',
+    },
+    {
+      name: 'Swift',
+      icon: 'swift',
     },
   ];
 
@@ -86,7 +94,7 @@ export const MockConnectGitCard = () => {
   }, [segmentedControlsValue]);
 
   return (
-    <div className="relative dark:bg-overlay bg-base-bg shadow-card dark:shadow-background rounded-2xl px-2 py-2 w-full max-w-[560px] flex flex-col gap-2">
+    <div className="relative bg-base-bg shadow-card rounded-2xl px-2 py-2 w-full max-w-[560px] flex flex-col gap-2">
       {/* Content */}
       <SegmentedControls
         value={segmentedControlsValue}
@@ -98,7 +106,7 @@ export const MockConnectGitCard = () => {
       {renderContent}
 
       {/* Shade */}
-      <div className="pointer-events-none z-99 absolute inset-0 rounded-2xl bg-gradient-to-t from-white dark:from-overlay to-transparent" />
+      <div className="pointer-events-none z-99 absolute inset-0 rounded-2xl bg-gradient-to-t from-white to-transparent" />
     </div>
   );
 };
@@ -113,18 +121,18 @@ const MockProjectCard = ({
   visibility?: string;
 }) => {
   return (
-    <div className="group flex items-start sm:items-center gap-3 pl-3 py-3 cursor-pointer rounded-xl hover:bg-base-bg-emphasized dark:hover:bg-background relative">
+    <div className="group flex items-start sm:items-center gap-3 pl-3 py-3 cursor-pointer rounded-xl hover:bg-base-bg-emphasized relative">
       {/* Icon container */}
-      <div className="w-10 h-10 bg-base-bg dark:bg-background rounded-md justify-center items-center flex">
+      <div className="w-10 h-10 bg-base-bg rounded-md justify-center items-center flex">
         <GithubIcon />
       </div>
       {/* Content */}
       <div className="flex flex-1 gap-3 flex-wrap">
         <div className="flex flex-col items-start gap-1">
-          <p className="text-elements-high-em text-sm dark:text-foreground font-medium tracking-[-0.006em]">
+          <p className="text-elements-high-em text-sm font-medium tracking-[-0.006em]">
             {full_name}
           </p>
-          <p className="text-elements-low-em text-xs dark:text-foreground-secondary">
+          <p className="text-elements-low-em text-xs">
             {updated_at && relativeTimeISO(updated_at)}
           </p>
         </div>
@@ -141,13 +149,13 @@ const MockProjectCard = ({
 
 const MockTemplateCard = ({ icon, name }: { icon: string; name: string }) => {
   return (
-    <div className="flex items-center gap-3 px-3 py-3 hover:bg-base-bg-emphasized dark:hover:bg-background relative rounded-2xl group relative cursor-default">
+    <div className="flex items-center gap-3 px-3 py-3 hover:bg-base-bg-emphasized rounded-2xl group relative cursor-default">
       {/* Icon */}
-      <div className="px-1 py-1 rounded-xl bg-base-bg dark:bg-background border border-border-interactive/10 shadow-card-sm">
+      <div className="px-1 py-1 rounded-xl bg-base-bg border border-border-interactive/10 shadow-card-sm">
         <TemplateIcon type={icon as TemplateIconType} />
       </div>
       {/* Name */}
-      <p className="flex-1 text-left text-sm tracking-tighter text-elements-high-em dark:text-foreground">
+      <p className="flex-1 text-left text-sm tracking-tighter text-elements-high-em">
         {name}
       </p>
     </div>

packages/frontend/src/components/projects/create/ProjectRepoCard/ProjectRepoCard.tsx

@@ -49,21 +49,21 @@ export const ProjectRepoCard: React.FC<ProjectRepoCardProps> = ({
       onClick={createProject}
     >
       {/* Icon container */}
-      <div className="w-10 h-10 bg-base-bg rounded-md justify-center items-center flex dark:bg-overlay">
+      <div className="w-10 h-10 bg-base-bg rounded-md justify-center items-center flex">
         <GithubIcon />
       </div>
       {/* Content */}
       <div className="flex flex-1 gap-3 flex-wrap">
         <div className="flex flex-col gap-1">
-          <p className="text-elements-high-em dark:text-foreground text-sm font-medium tracking-[-0.006em]">
+          <p className="text-elements-high-em text-sm font-medium tracking-[-0.006em]">
             {repository.full_name}
           </p>
-          <p className="text-elements-low-em dark:text-foreground-secondary text-xs">
+          <p className="text-elements-low-em text-xs">
             {repository.updated_at && relativeTimeISO(repository.updated_at)}
           </p>
         </div>
         {repository.visibility === 'private' && (
-          <div className="bg-orange-50 border border-orange-200 px-2 py-1 flex items-center gap-1 rounded-lg text-xs text-orange-600 dark:text-error h-fit">
+          <div className="bg-orange-50 border border-orange-200 px-2 py-1 flex items-center gap-1 rounded-lg text-xs text-orange-600 h-fit">
             <LockIcon />
             Private
           </div>

packages/frontend/src/components/projects/create/RepositoryList/RepositoryList.tsx

@@ -166,9 +166,7 @@ export const RepositoryList = () => {
         </div>
       ) : (
         <div className="mt-4 p-6 flex flex-col gap-4 items-center justify-center">
-          <p className="text-elements-high-em dark:text-foreground font-sans">
+          <p className="text-elements-high-em font-sans">No repository found</p>
-            No repository found
-          </p>
           <Button
             variant="tertiary"
             leftIcon={<RefreshIcon />}

packages/frontend/src/components/projects/project/overview/Activity/Activity.tsx

@@ -16,7 +16,7 @@ export const Activity = ({
       <div className="flex items-center justify-between">
         <Heading className="text-lg leading-6 font-medium">Activity</Heading>
         <Button variant="tertiary" size="sm">
-          SEE ALL
+          See all
         </Button>
       </div>
       <div className="mt-5">

packages/frontend/src/components/projects/project/overview/Activity/AuctionCard.tsx

@@ -18,6 +18,7 @@ import { Button, Heading, Tag } from 'components/shared';
 const WAIT_DURATION = 5000;
 
 const DIALOG_STYLE = {
+  backgroundColor: 'rgba(0,0,0, .9)',
   padding: '2em',
   borderRadius: '0.5em',
   marginLeft: '0.5em',
@@ -85,27 +86,27 @@ export const AuctionCard = ({ project }: { project: Project }) => {
 
   return (
     <>
-      <div className="p-3 gap-2 rounded-xl border dark:border-overlay3 border-gray-200 transition-colors hover:bg-base-bg-alternate dark:hover:bg-overlay3 flex flex-col mt-8">
+      <div className="p-3 gap-2 rounded-xl border border-gray-200 transition-colors hover:bg-base-bg-alternate flex flex-col mt-8">
         <div className="flex justify-between items-center">
           <Heading className="text-lg leading-6 font-medium">
             Auction details
           </Heading>
           <Button onClick={handleOpenDialog} variant="tertiary" size="sm">
-            VIEW DETAILS
+            View details
           </Button>
         </div>
 
         <div className="flex justify-between items-center mt-2">
-          <span className="text-elements-high-em dark:text-foreground-secondary text-sm font-medium tracking-tight">
+          <span className="text-elements-high-em text-sm font-medium tracking-tight">
             Auction Id
           </span>
-          <span className="text-elements-mid-em dark:text-foreground text-sm text-right">
+          <span className="text-elements-mid-em text-sm text-right">
             {project.auctionId}
           </span>
         </div>
 
         <div className="flex justify-between items-center mt-1">
-          <span className="text-elements-high-em dark:text-foreground-secondary text-sm font-medium tracking-tight">
+          <span className="text-elements-high-em text-sm font-medium tracking-tight">
             Auction Status
           </span>
           <div className="ml-2">{renderAuctionStatus()}</div>
@@ -115,20 +116,17 @@ export const AuctionCard = ({ project }: { project: Project }) => {
           <>
             {deployers?.length > 0 ? (
               <div>
-                <span className="text-elements-high-em dark:text-foreground-secondary text-sm font-medium tracking-tight">
+                <span className="text-elements-high-em text-sm font-medium tracking-tight">
                   Deployer LRNs
                 </span>
                 {deployers.map((deployer, index) => (
-                  <p
+                  <p key={index} className="text-elements-mid-em text-sm">
-                    key={index}
-                    className="text-elements-mid-em dark:text-foreground text-sm"
-                  >
                     {'\u2022'} {deployer.deployerLrn}
                   </p>
                 ))}
 
                 <div className="flex justify-between items-center mt-1">
-                  <span className="text-elements-high-em dark:text-foreground-secondary text-sm font-medium tracking-tight">
+                  <span className="text-elements-high-em text-sm font-medium tracking-tight">
                     Deployer Funds Status
                   </span>
                   <div className="ml-2">
@@ -143,7 +141,7 @@ export const AuctionCard = ({ project }: { project: Project }) => {
               </div>
             ) : (
               <div className="mt-3">
-                <span className="text-elements-high-em dark:text-foreground-secondary text-sm font-medium tracking-tight">
+                <span className="text-elements-high-em text-sm font-medium tracking-tight">
                   No winning deployers
                 </span>
               </div>
@@ -157,24 +155,15 @@ export const AuctionCard = ({ project }: { project: Project }) => {
         onClose={handleCloseDialog}
         fullWidth
         maxWidth="md"
-        PaperProps={{
-          className: 'dark:bg-overlay2',
-        }}
       >
-        <DialogTitle className="dark:text-foreground">
+        <DialogTitle>Auction Details</DialogTitle>
-          Auction Details
-        </DialogTitle>
         <DialogContent style={DIALOG_STYLE}>
           {auctionDetails && (
-            <pre className="dark:text-foreground-secondary">
+            <pre>{JSON.stringify(auctionDetails, null, 2)}</pre>
-              {JSON.stringify(auctionDetails, null, 2)}
-            </pre>
           )}
         </DialogContent>
         <DialogActions>
-          <Button onClick={handleCloseDialog} shape="default">
+          <Button onClick={handleCloseDialog}>Close</Button>
-            CLOSE
-          </Button>
         </DialogActions>
       </Dialog>
     </>

packages/frontend/src/components/projects/project/overview/OverviewInfo.tsx

@@ -18,7 +18,7 @@ export const OverviewInfo = ({
 
   return (
     <div className="flex justify-between gap-2 py-3 text-sm items-center">
-      <div className="flex gap-2 items-center text-elements-high-em dark:text-foreground-secondary">
+      <div className="flex gap-2 items-center text-elements-high-em">
         {styledIcon}
         {label}
       </div>

packages/frontend/src/components/projects/project/settings/AddMemberDialog.tsx

@@ -93,11 +93,11 @@ const AddMemberDialog = ({
             />
           </Modal.Body>
           <Modal.Footer>
-            <Button onClick={handleOpen} variant="danger" shape="default">
+            <Button onClick={handleOpen} variant="secondary">
               Cancel
             </Button>
-            <Button type="submit" disabled={!isValid} shape="default">
+            <Button type="submit" disabled={!isValid}>
-              SEND INVITE
+              Send invite
             </Button>
           </Modal.Footer>
         </form>

packages/frontend/src/components/projects/project/settings/DisplayEnvironmentVariables.tsx

@@ -24,7 +24,7 @@ const DisplayEnvironmentVariables = ({
   return (
     <>
       <div
-        className="flex gap-4 p-2 dark:text-foreground"
+        className="flex gap-4 p-2"
         onClick={() => setOpenCollapse((cur) => !cur)}
       >
         {openCollapse ? <ChevronUpSmallIcon /> : <ChevronDownSmallIcon />}
@@ -33,7 +33,7 @@ const DisplayEnvironmentVariables = ({
       </div>
       <Collapse open={openCollapse}>
         {variables.length === 0 ? (
-          <div className="bg-slate-100 dark:bg-overlay2 dark:text-foreground rounded-xl flex-col p-4">
+          <div className="bg-slate-100 rounded-xl flex-col p-4">
             No environment variables added yet. Once you add them, they'll show
             up here.
           </div>

packages/frontend/src/components/projects/project/settings/MemberCard.tsx

@@ -80,7 +80,7 @@ const MemberCard = ({
 
   return (
     <div
-      className={`flex py-1 items-center ${!isFirstCard && 'mt-1 border-t border-gray-300'} dark:text-foreground`}
+      className={`flex py-1 items-center ${!isFirstCard && 'mt-1 border-t border-gray-300'}`}
     >
       <div className="basis-1/2">
         {member.name && (

packages/frontend/src/components/projects/project/settings/SetupDomain.tsx

@@ -102,8 +102,8 @@ const SetupDomain = () => {
       )}
 
       <div className="self-stretch">
-        <Button disabled={!isValid} type="submit" shape="default">
+        <Button disabled={!isValid} type="submit">
-          NEXT
+          Next
         </Button>
       </div>
     </form>

packages/frontend/src/components/shared/Avatar/Avatar.theme.ts

@@ -30,12 +30,7 @@ export const avatarTheme = tv(
           fallback: ['text-elements-warning', 'bg-base-bg-emphasized-warning'],
         },
         blue: {
-          fallback: [
+          fallback: ['text-elements-info', 'bg-base-bg-emphasized-info'],
-            'text-elements-info',
-            'bg-base-bg-emphasized-info',
-            'dark:text-foreground',
-            'dark:bg-primary',
-          ],
         },
       },
       size: {

packages/frontend/src/components/shared/Button/Button.theme.ts

@@ -16,7 +16,6 @@ export const buttonTheme = tv(
       'disabled:cursor-not-allowed',
       'transition-colors',
       'duration-150',
-      'font-mono',
     ],
     variants: {
       size: {
@@ -29,7 +28,7 @@ export const buttonTheme = tv(
         true: 'w-full',
       },
       shape: {
-        default: 'rounded',
+        default: 'rounded-lg',
         rounded: 'rounded-full',
       },
       iconOnly: {
@@ -40,21 +39,21 @@ export const buttonTheme = tv(
           'text-elements-on-primary',
           'border',
           'border-transparent',
-          'bg-primary',
+          'bg-controls-primary',
           'shadow-button',
-          'hover:bg-primary-hovered',
+          'hover:bg-controls-primary-hovered',
-          'focus-visible:bg-primary-hovered',
+          'focus-visible:bg-controls-primary-hovered',
           'disabled:text-elements-on-disabled',
           'disabled:bg-controls-disabled',
           'disabled:border-transparent',
           'disabled:shadow-none',
         ],
         secondary: [
-          'text-primary',
+          'text-elements-on-secondary',
           'border',
           'border-transparent',
-          'bg-secondary',
+          'bg-controls-secondary',
-          'hover:bg-overlay2',
+          'hover:bg-controls-secondary-hovered',
           'focus-visible:bg-controls-secondary-hovered',
           'disabled:text-elements-on-disabled',
           'disabled:bg-controls-disabled',
@@ -78,12 +77,10 @@ export const buttonTheme = tv(
         ],
         ghost: [
           'text-elements-on-tertiary',
-          'dark:text-foreground-secondary',
           'border',
           'border-transparent',
           'bg-transparent',
           'hover:bg-controls-tertiary-hovered',
-          'dark:hover:bg-overlay2',
           'hover:border-border-interactive-hovered',
           'focus-visible:bg-controls-tertiary-hovered',
           'focus-visible:border-border-interactive-hovered',
@@ -96,7 +93,7 @@ export const buttonTheme = tv(
           'text-elements-on-danger',
           'border',
           'border-transparent',
-          'bg-error',
+          'bg-border-danger',
           'hover:bg-controls-danger-hovered',
           'focus-visible:bg-controls-danger-hovered',
           'disabled:text-elements-on-disabled',

packages/frontend/src/components/shared/Calendar/Calendar.css

@@ -40,11 +40,11 @@ abbr[title] {
 }
 
 .react-calendar__tile {
-  @apply h-12 w-12 text-elements-high-em dark:text-foreground;
+  @apply h-12 w-12 text-elements-high-em;
 }
 
 .react-calendar__tile:hover {
-  @apply bg-base-bg-emphasized dark:bg-overlay3 rounded-lg;
+  @apply bg-base-bg-emphasized rounded-lg;
 }
 
 .react-calendar__tile:focus-visible {
@@ -52,7 +52,7 @@ abbr[title] {
 }
 
 .react-calendar__tile--now {
-  @apply bg-base-bg-emphasized dark:bg-overlay3 text-elements-high-em rounded-lg;
+  @apply bg-base-bg-emphasized text-elements-high-em rounded-lg;
 }
 
 .react-calendar__tile--now:hover {
@@ -77,7 +77,7 @@ abbr[title] {
 
 /* Range -- START */
 .react-calendar__tile--range {
-  @apply bg-controls-secondary dark:bg-overlay3 text-elements-on-secondary rounded-none;
+  @apply bg-controls-secondary text-elements-on-secondary rounded-none;
 }
 
 .react-calendar__tile--range:hover {
@@ -89,7 +89,7 @@ abbr[title] {
 }
 
 .react-calendar__tile--rangeStart {
-  @apply bg-controls-primary dark:bg-primary text-elements-on-primary rounded-lg;
+  @apply bg-controls-primary text-elements-on-primary rounded-lg;
 }
 
 .react-calendar__tile--rangeStart:hover {
@@ -101,7 +101,7 @@ abbr[title] {
 }
 
 .react-calendar__tile--rangeEnd {
-  @apply bg-controls-primary dark:bg-primary text-elements-on-primary rounded-lg;
+  @apply bg-controls-primary text-elements-on-primary rounded-lg;
 }
 
 .react-calendar__tile--rangeEnd:hover {

packages/frontend/src/components/shared/Calendar/Calendar.theme.ts

@@ -5,9 +5,7 @@ export const calendarTheme = tv({
     wrapper: [
       'max-w-[352px]',
       'bg-surface-floating',
-      'dark:bg-overlay2',
       'shadow-dropdown',
-      'dark:shadow-background',
       'rounded-xl',
     ],
     calendar: ['flex', 'flex-col', 'py-2', 'px-2', 'gap-2'],
@@ -30,12 +28,9 @@ export const calendarTheme = tv({
       'border',
       'border-border-interactive',
       'text-elements-high-em',
-      'dark:text-foreground',
       'shadow-field',
       'bg-white',
-      'dark:bg-overlay3',
       'hover:bg-base-bg-alternate',
-      'dark:hover:bg-foreground-secondary',
       'focus-visible:bg-base-bg-alternate',
     ],
     footer: [

packages/frontend/src/components/shared/Calendar/Calendar.tsx

@@ -280,7 +280,6 @@ export const Calendar = ({
           showNavigation={false}
           selectRange={selectRange}
           onChange={handleChange}
-          // tileClassName="dark:text-foreground-secondary dark:hover:bg-overlay3"
           onClickMonth={(date) => handleChangeNavigation('month', date)}
           onClickYear={(date) => handleChangeNavigation('year', date)}
         />
@@ -298,20 +297,19 @@ export const Calendar = ({
         ) : (
           <>
             {value && (
-              <Button variant="danger" onClick={handleReset} shape="default">
+              <Button variant="danger" onClick={handleReset}>
-                RESET
+                Reset
               </Button>
             )}
             <div className="space-x-3">
-              <Button variant="tertiary" onClick={onCancel} shape="default">
+              <Button variant="tertiary" onClick={onCancel}>
-                CANCEL
+                Cancel
               </Button>
               <Button
                 disabled={!value}
                 onClick={() => (value ? onSelect?.(value) : null)}
-                shape="default"
               >
-                SELECT
+                Select
               </Button>
             </div>
           </>

packages/frontend/src/components/shared/Checkbox/Checkbox.theme.ts

@@ -11,9 +11,7 @@ export const getCheckboxVariant = tv({
       'focus-visible:text-controls-disabled',
       'group-focus-visible:text-controls-disabled',
       'data-[state=checked]:text-elements-on-primary',
-      'dark:data-[state=checked]:text-foreground',
       'data-[state=checked]:group-focus-visible:text-elements-on-primary',
-      'dark:data-[state=checked]:group-focus-visible:text-foreground',
       'data-[state=indeterminate]:text-elements-on-primary',
       'data-[state=checked]:data-[disabled]:text-elements-on-disabled-active',
     ],
@@ -25,7 +23,6 @@ export const getCheckboxVariant = tv({
       'border',
       'border-border-interactive/10',
       'bg-controls-tertiary',
-      'dark:bg-background',
       'rounded-md',
       'transition-all',
       'duration-150',
@@ -33,13 +30,9 @@ export const getCheckboxVariant = tv({
       'shadow-button',
       'group-hover:border-border-interactive/[0.14]',
       'group-hover:bg-controls-tertiary',
-      'dark:group-hover:bg-overlay',
       'data-[state=checked]:bg-controls-primary',
-      'dark:data-[state=checked]:bg-primary',
       'data-[state=checked]:hover:bg-controls-primary-hovered',
-      'dark:data-[state=checked]:hover:bg-primary-hovered',
       'data-[state=checked]:focus-visible:bg-controls-primary-hovered',
-      'dark:data-[state=checked]:focus-visible:bg-primary-hovered',
       'data-[disabled]:bg-controls-disabled',
       'data-[disabled]:shadow-none',
       'data-[disabled]:hover:border-border-interactive/10',
@@ -50,17 +43,12 @@ export const getCheckboxVariant = tv({
       'text-sm',
       'tracking-[-0.006em]',
       'text-elements-high-em',
-      'dark:text-foreground',
       'flex',
       'flex-col',
       'gap-1',
       'px-1',
     ],
-    description: [
+    description: ['text-xs', 'text-elements-low-em'],
-      'text-xs',
-      'text-elements-low-em',
-      'dark:text-foreground-secondary',
-    ],
   },
   variants: {
     disabled: {

packages/frontend/src/components/shared/CustomIcon/GitIcon.tsx

@@ -11,7 +11,7 @@ export const GitIcon: React.FC<CustomIconProps> = (props) => {
     >
       <path
         d="M35.7782 16.4219L20.0791 0.723956C19.864 0.508762 19.6087 0.338053 19.3276 0.221583C19.0466 0.105114 18.7453 0.045166 18.4411 0.045166C18.1368 0.045166 17.8356 0.105114 17.5545 0.221583C17.2735 0.338053 17.0181 0.508762 16.8031 0.723956L13.5443 3.9843L17.6788 8.11882C18.1649 7.95374 18.6875 7.92797 19.1875 8.04442C19.6874 8.16088 20.1448 8.41491 20.5079 8.77778C20.8731 9.14329 21.128 9.60418 21.2435 10.1077C21.359 10.6113 21.3304 11.1372 21.161 11.6253L25.1473 15.6103C25.6355 15.4408 26.1616 15.4122 26.6653 15.5279C27.169 15.6437 27.6299 15.899 27.9952 16.2646C28.251 16.5204 28.454 16.8241 28.5925 17.1584C28.7309 17.4926 28.8022 17.8509 28.8022 18.2127C28.8022 18.5745 28.7309 18.9328 28.5925 19.267C28.454 19.6013 28.251 19.905 27.9952 20.1608C27.4779 20.6776 26.7766 20.9678 26.0455 20.9678C25.3143 20.9678 24.6131 20.6776 24.0958 20.1608C23.7116 19.7759 23.4497 19.286 23.3434 18.7526C23.237 18.2192 23.2907 17.6663 23.4979 17.1634L19.7805 13.4472V23.2287C20.1729 23.4225 20.5134 23.707 20.7739 24.0586C21.0345 24.4103 21.2075 24.8189 21.2786 25.2507C21.3497 25.6825 21.317 26.1251 21.183 26.5417C21.0491 26.9583 20.8178 27.337 20.5083 27.6465C20.2525 27.9023 19.9488 28.1053 19.6146 28.2438C19.2803 28.3822 18.922 28.4535 18.5602 28.4535C18.1984 28.4535 17.8402 28.3822 17.5059 28.2438C17.1716 28.1053 16.8679 27.9023 16.6121 27.6465C16.3562 27.3907 16.1532 27.0869 16.0147 26.7526C15.8762 26.4183 15.8049 26.06 15.8049 25.6982C15.8049 25.3363 15.8762 24.978 16.0147 24.6437C16.1532 24.3094 16.3562 24.0057 16.6121 23.7499C16.8699 23.4916 17.1763 23.2869 17.5137 23.1477V13.2762C17.1777 13.1378 16.8724 12.9344 16.6153 12.6777C16.3582 12.421 16.1543 12.116 16.0154 11.7802C15.8765 11.4445 15.8053 11.0846 15.8059 10.7212C15.8065 10.3579 15.8789 9.9982 16.0189 9.66291L11.9423 5.58552L1.17673 16.3483C0.742912 16.783 0.499268 17.372 0.499268 17.9862C0.499268 18.6003 0.742912 19.1893 1.17673 19.624L16.8766 35.3239C17.3113 35.7576 17.9002 36.0011 18.5143 36.0011C19.1283 36.0011 19.7172 35.7576 20.1519 35.3239L35.7782 19.6975C36.212 19.2629 36.4557 18.6738 36.4557 18.0597C36.4557 17.4456 36.212 16.8566 35.7782 16.4219Z"
-        fill="#0000F4"
+        fill="#158FFF"
       />
     </CustomIcon>
   );

packages/frontend/src/components/shared/CustomIcon/GithubIcon.tsx

@@ -13,7 +13,7 @@ export const GithubIcon: React.FC<CustomIconProps> = (props) => {
         fillRule="evenodd"
         clipRule="evenodd"
         d="M9.9702 0.206024C4.45694 0.206024 0 4.69582 0 10.2503C0 14.6903 2.85571 18.4487 6.81735 19.7789C7.31265 19.8789 7.49408 19.5628 7.49408 19.2968C7.49408 19.064 7.47776 18.2658 7.47776 17.4342C4.70429 18.033 4.12674 16.2368 4.12674 16.2368C3.68102 15.0728 3.02061 14.7736 3.02061 14.7736C2.11286 14.1583 3.08673 14.1583 3.08673 14.1583C4.09367 14.2248 4.62204 15.1893 4.62204 15.1893C5.51327 16.7191 6.94939 16.2868 7.52714 16.0207C7.60959 15.3721 7.87388 14.9232 8.15449 14.6738C5.94245 14.4409 3.6151 13.5762 3.6151 9.71807C3.6151 8.62051 4.01102 7.72256 4.63837 7.02419C4.53939 6.7748 4.19265 5.74358 4.73755 4.36337C4.73755 4.36337 5.57939 4.09725 7.47755 5.39439C8.29022 5.17453 9.12832 5.06268 9.9702 5.06174C10.812 5.06174 11.6702 5.17827 12.4627 5.39439C14.361 4.09725 15.2029 4.36337 15.2029 4.36337C15.7478 5.74358 15.4008 6.7748 15.3018 7.02419C15.9457 7.72256 16.3253 8.62051 16.3253 9.71807C16.3253 13.5762 13.998 14.4242 11.7694 14.6738C12.1327 14.9897 12.4461 15.5883 12.4461 16.5362C12.4461 17.8832 12.4298 18.9642 12.4298 19.2966C12.4298 19.5628 12.6114 19.8789 13.1065 19.7791C17.0682 18.4485 19.9239 14.6903 19.9239 10.2503C19.9402 4.69582 15.4669 0.206024 9.9702 0.206024Z"
-        fill="#FBFBFB"
+        fill="#0B1D2E"
       />
     </CustomIcon>
   );

packages/frontend/src/components/shared/CustomIcon/LaconicIcon.tsx

@@ -1,21 +0,0 @@
-import { CustomIcon, CustomIconProps } from './CustomIcon';
-
-export const LaconicIcon: React.FC<CustomIconProps> = (props) => {
-  return (
-    <CustomIcon
-      width="48"
-      height="48"
-      viewBox="0 0 48 48"
-      fill="none"
-      {...props}
-    >
-      <rect width="48" height="48" rx="4" fill="#29292E" />
-      <path
-        fill-rule="evenodd"
-        clip-rule="evenodd"
-        d="M16.0494 24.6233C18.8425 21.8302 20.5713 17.973 20.5706 13.7142C20.5717 13.1361 20.5396 12.5645 20.4762 12L12 12.0008L12.0003 28.2867C11.9996 30.2608 12.7522 32.2356 14.2578 33.7411C15.7633 35.2466 17.7395 36.0001 19.7139 35.9991L19.7134 35.9996L36 36L35.9995 27.5227C35.4362 27.4605 34.8645 27.4285 34.2852 27.4284C30.0275 27.4289 26.1701 29.1577 23.377 31.9507C21.3446 33.9321 18.0858 33.9325 16.0785 31.9252C14.0722 29.9191 14.0715 26.6593 16.0494 24.6233ZM34.2419 13.7624C31.9012 11.4217 28.0982 11.4208 25.7566 13.7624C23.4151 16.1038 23.4159 19.9067 25.7566 22.2473C28.0986 24.5892 31.9004 24.5889 34.2419 22.2473C36.5835 19.9059 36.5839 16.1042 34.2419 13.7624Z"
-        fill="#FBFBFB"
-      />
-    </CustomIcon>
-  );
-};

packages/frontend/src/components/shared/CustomIcon/templates/TemplateIcon.tsx

@@ -1,12 +1,18 @@
 import { useMemo } from 'react';
 import { CustomIconProps } from '../CustomIcon';
+import { ReactNativeIcon } from './ReactNativeIcon';
 import { cloneIcon } from 'utils/cloneIcon';
 import { PWAIcon } from './PWAIcon';
 import { WebAppIcon } from './WebAppIcon';
+import { KotlinIcon } from './KotlinIcon';
+import { SwitfIcon } from './SwiftIcon';
 
 const TEMPLATE_ICONS = [
+  'react-native',
   'pwa',
-  'web'
+  'web',
+  'kotlin',
+  'swift',
 ] as const;
 export type TemplateIconType = (typeof TEMPLATE_ICONS)[number];
 
@@ -17,10 +23,16 @@ export interface TemplateIconProps extends CustomIconProps {
 export const TemplateIcon = ({ type, ...props }: TemplateIconProps) => {
   const renderIcon = useMemo(() => {
     switch (type) {
+      case 'react-native':
+        return <ReactNativeIcon />;
       case 'pwa':
         return <PWAIcon />;
       case 'web':
         return <WebAppIcon />;
+      case 'kotlin':
+        return <KotlinIcon />;
+      case 'swift':
+        return <SwitfIcon />;
       default:
         throw new Error(`Invalid template icon type: ${type}`);
     }

packages/frontend/src/components/shared/Heading/Heading.theme.ts

@@ -1,12 +1,7 @@
 import { tv, type VariantProps } from 'tailwind-variants';
 
 export const headingTheme = tv({
-  base: [
+  base: ['text-elements-high-em', 'font-display', 'font-normal'],
-    'text-elements-high-em',
-    'dark:text-foreground',
-    'font-display',
-    'font-normal',
-  ],
 });
 
 export type HeadingVariants = VariantProps<typeof headingTheme>;

packages/frontend/src/components/shared/IconWithFrame/IconWithFrame.tsx

@@ -18,7 +18,7 @@ export const IconWithFrame = ({
         'relative justify-center items-center gap-2.5 inline-flex',
         'w-16 h-16 rounded-2xl shadow-inner',
         'border border-b-[3px] border-border-interactive border-opacity-10',
-        'bg-background',
+        'bg-controls-secondary',
         className,
       )}
       {...props}

packages/frontend/src/components/shared/Input/Input.theme.ts

@@ -14,29 +14,22 @@ export const inputTheme = tv(
         'disabled:cursor-not-allowed',
         'disabled:bg-controls-disabled',
       ],
-      label: [
+      label: ['text-sm', 'text-elements-high-em'],
-        'text-sm',
-        'text-elements-high-em',
-        'dark:text-foreground-secondary',
-      ],
       description: ['text-xs', 'text-elements-low-em'],
       input: [
         'focus-ring',
-        'dark:focus:ring-0',
         'block',
         'w-full',
         'h-full',
         'shadow-sm',
         'border',
         'rounded-lg',
-        'dark:bg-overlay2',
-        'dark:text-foreground',
         'text-elements-mid-em',
         'border-border-interactive',
         'disabled:shadow-none',
         'disabled:border-none',
       ],
-      icon: ['text-elements-low-em dark:text-foreground-secondary'],
+      icon: ['text-elements-low-em'],
       iconContainer: [
         'absolute',
         'inset-y-0',
@@ -46,13 +39,7 @@ export const inputTheme = tv(
         'cursor-pointer',
       ],
       helperIcon: [],
-      helperText: [
+      helperText: ['flex', 'gap-2', 'items-center', 'text-elements-danger'],
-        'flex',
-        'gap-2',
-        'items-center',
-        'text-elements-danger',
-        'dark:text-primary',
-      ],
     },
     variants: {
       state: {
@@ -67,7 +54,7 @@ export const inputTheme = tv(
             'shadow-none',
             'focus:outline-border-danger',
           ],
-          helperText: 'text-error',
+          helperText: 'text-elements-danger',
         },
       },
       size: {

packages/frontend/src/components/shared/Modal/Modal.theme.ts

@@ -31,7 +31,6 @@ export const modalTheme = tv({
       'sm:px-6',
       'sm:py-5',
       'bg-base-bg-alternate',
-      'dark:bg-overlay2',
     ],
     headerTitle: [
       'text-base',
@@ -40,11 +39,7 @@ export const modalTheme = tv({
       'sm:tracking-normal',
       'text-elements-high-em',
     ],
-    headerDescription: [
+    headerDescription: ['text-sm', 'text-elements-low-em'],
-      'text-sm',
-      'text-elements-low-em',
-      'dark:text-foreground-secondary',
-    ],
     footer: ['flex', 'gap-3', 'px-4', 'pb-4', 'pt-7', 'sm:pb-6', 'sm:px-6'],
     content: [
       'h-fit',
@@ -58,11 +53,8 @@ export const modalTheme = tv({
       'sm:max-w-[562px]',
       'rounded-2xl',
       'bg-base-bg',
-      'dark:bg-overlay',
       'shadow-card',
-      'dark:shadow-background',
       'text-elements-high-em',
-      'dark:text-foreground-secondary',
     ],
     body: ['flex-1', 'px-4', 'pt-4', 'sm:pt-6', 'sm:px-6'],
   },

packages/frontend/src/components/shared/Radio/Radio.theme.ts

@@ -4,12 +4,7 @@ export const radioTheme = tv({
   slots: {
     root: ['flex', 'gap-3'],
     wrapper: ['flex', 'items-center', 'gap-2', 'group'],
-    label: [
+    label: ['text-sm', 'tracking-[-0.006em]', 'text-elements-high-em'],
-      'text-sm',
-      'tracking-[-0.006em]',
-      'text-elements-high-em',
-      'dark:text-foreground',
-    ],
     radio: [
       'w-5',
       'h-5',
@@ -22,7 +17,6 @@ export const radioTheme = tv({
       'focus-ring',
       // Checked
       'data-[state=checked]:bg-controls-primary',
-      'data-[state=checked]:bg-controls-primary',
       'data-[state=checked]:group-hover:bg-controls-primary-hovered',
     ],
     indicator: [
@@ -42,7 +36,6 @@ export const radioTheme = tv({
       'after:group-focus-visible:bg-controls-disabled',
       // Checked
       'after:data-[state=checked]:bg-elements-on-primary',
-      'dark:after:data-[state=checked]:bg-primary-hovered',
       'after:data-[state=checked]:group-hover:bg-elements-on-primary',
       'after:data-[state=checked]:group-focus-visible:bg-elements-on-primary',
     ],

packages/frontend/src/components/shared/SegmentedControls/SegmentedControls.theme.ts

@@ -9,7 +9,6 @@ export const segmentedControlsTheme = tv({
       'flex',
       'items-center',
       'bg-base-bg-emphasized',
-      'dark:bg-background',
       'gap-0.5',
       'rounded-lg',
     ],
@@ -19,7 +18,6 @@ export const segmentedControlsTheme = tv({
       'justify-center',
       'gap-2',
       'text-elements-mid-em',
-      'dark:text-foreground',
       'bg-transparent',
       'border',
       'border-transparent',
@@ -28,7 +26,6 @@ export const segmentedControlsTheme = tv({
       'rounded-lg',
       'focus-ring',
       'hover:bg-controls-tertiary-hovered',
-      'dark:hover:bg-overlay2',
       'focus-visible:z-20',
       'focus-visible:bg-controls-tertiary-hovered',
       'disabled:text-controls-disabled',
@@ -36,7 +33,6 @@ export const segmentedControlsTheme = tv({
       'disabled:cursor-not-allowed',
       'disabled:border-transparent',
       'data-[active=true]:bg-controls-tertiary',
-      'dark:data-[active=true]:bg-overlay2',
       'data-[active=true]:text-elements-high-em',
       'data-[active=true]:border-border-interactive/10',
       'data-[active=true]:shadow-field',

packages/frontend/src/components/shared/Select/Select.theme.ts

@@ -3,16 +3,8 @@ import { VariantProps, tv } from 'tailwind-variants';
 export const selectTheme = tv({
   slots: {
     container: ['flex', 'flex-col', 'relative', 'gap-2', 'w-full'],
-    label: [
+    label: ['text-sm', 'text-elements-high-em'],
-      'text-sm',
+    description: ['text-xs', 'text-elements-low-em'],
-      'text-elements-high-em',
-      'dark:text-foreground-secondary',
-    ],
-    description: [
-      'text-xs',
-      'text-elements-low-em',
-      'dark:text-foreground-secondary',
-    ],
     inputWrapper: [
       'relative',
       'flex',
@@ -22,7 +14,6 @@ export const selectTheme = tv({
       'w-full',
       'rounded-lg',
       'bg-transparent',
-      'dark:bg-overlay2',
       'text-elements-mid-em',
       'shadow-sm',
       'border',
@@ -31,7 +22,7 @@ export const selectTheme = tv({
       'disabled:shadow-none',
       'disabled:border-none',
     ],
-    input: ['outline-none', 'dark:bg-overlay2', 'dark:text-foreground'],
+    input: ['outline-none'],
     iconContainer: [
       'absolute',
       'inset-y-0',
@@ -41,15 +32,9 @@ export const selectTheme = tv({
       'z-10',
       'cursor-pointer',
     ],
-    icon: ['text-elements-mid-em', 'dark:text-foreground-secondary'],
+    icon: ['text-elements-mid-em'],
     helperIcon: [],
-    helperText: [
+    helperText: ['flex', 'gap-2', 'items-center', 'text-elements-low-em'],
-      'flex',
-      'gap-2',
-      'items-center',
-      'text-elements-low-em',
-      'dark:text-foreground-secondary',
-    ],
     popover: [
       'z-20',
       'absolute',
@@ -59,14 +44,12 @@ export const selectTheme = tv({
       'gap-0.5',
       'min-w-full',
       'bg-surface-floating',
-      'dark:bg-overlay2',
       'shadow-dropdown',
       'w-auto',
       'max-h-60',
       'overflow-auto',
       'border',
       'border-gray-200',
-      'dark:border-overlay',
       'rounded-xl',
     ],
   },
@@ -96,7 +79,7 @@ export const selectTheme = tv({
           'shadow-none',
           'focus:outline-border-danger',
         ],
-        helperText: ['text-error'],
+        helperText: ['text-elements-danger'],
       },
     },
     size: {

packages/frontend/src/components/shared/Select/SelectItem/SelectItem.theme.ts

@@ -12,12 +12,11 @@ export const selectItemTheme = tv({
       'group',
       'data-[disabled]:cursor-not-allowed',
     ],
-    icon: ['h-4.5', 'w-4.5', 'text-elements-high-em', 'dark:text-foreground'],
+    icon: ['h-4.5', 'w-4.5', 'text-elements-high-em'],
     content: ['flex', 'flex-1', 'whitespace-nowrap'],
     label: [
       'text-sm',
       'text-elements-high-em',
-      'dark:text-foreground',
       'tracking-[-0.006em]',
       'data-[disabled]:text-elements-disabled',
     ],
@@ -48,11 +47,7 @@ export const selectItemTheme = tv({
     },
     active: {
       true: {
-        wrapper: [
+        wrapper: ['bg-base-bg-emphasized', 'data-[disabled]:bg-transparent'],
-          'bg-base-bg-emphasized',
-          'dark:bg-overlay3',
-          'data-[disabled]:bg-transparent',
-        ],
       },
     },
   },

packages/frontend/src/components/shared/Sidebar/Sidebar.tsx

@@ -87,15 +87,15 @@ export const Sidebar = ({ mobileOpen }: SidebarProps) => {
                 value=""
                 className="hidden lg:flex"
               >
-                <a className="cursor-pointer font-mono" onClick={handleLogOut}>
+                <a className="cursor-pointer" onClick={handleLogOut}>
-                  LOG OUT
+                  Log Out
                 </a>
               </Tabs.Trigger>
               <Tabs.Trigger icon={<QuestionMarkRoundIcon />} value="">
-                <a className="cursor-pointer font-mono">DOCUMENTATION</a>
+                <a className="cursor-pointer">Documentation</a>
               </Tabs.Trigger>
               <Tabs.Trigger icon={<LifeBuoyIcon />} value="">
-                <a className="cursor-pointer font-mono">SUPPORT</a>
+                <a className="cursor-pointer">Support</a>
               </Tabs.Trigger>
             </Tabs.List>
           </Tabs>

packages/frontend/src/components/shared/Switch/Switch.theme.ts

@@ -45,7 +45,6 @@ export const switchTheme = tv({
       true: {
         switch: [
           'bg-controls-primary',
-          'dark:bg-primary',
           'hover:bg-controls-primary-hovered',
           'focus-visible:bg-controls-primary-hovered',
         ],

packages/frontend/src/components/shared/Table/Table.theme.ts

@@ -8,7 +8,6 @@ export const tableTheme = tv({
       'border-b',
       'border-sky-950/opacity-5',
       'text-sky-950',
-      'dark:text-foreground-secondary',
       'text-sm',
       'font-medium',
       'leading-tight',
@@ -18,7 +17,6 @@ export const tableTheme = tv({
     columnHeaderCell: [
       'p-4',
       'text-sky-950',
-      'dark:text-foreground-secondary',
       'text-sm',
       'font-medium',
       'uppercase',
@@ -28,7 +26,6 @@ export const tableTheme = tv({
     rowHeaderCell: [
       'p-4',
       'text-slate-600',
-      'dark:text-foreground',
       'text-sm',
       'font-normal',
       'leading-tight',
@@ -39,7 +36,6 @@ export const tableTheme = tv({
       'whitespace-nowrap',
       'text-sm',
       'text-slate-600',
-      'dark:text-foreground',
       'font-normal',
       'text-left',
     ],

packages/frontend/src/components/shared/Tabs/Tabs.theme.ts

@@ -11,17 +11,14 @@ export const tabsTheme = tv({
       'cursor-default',
       'select-none',
       'text-elements-low-em',
-      'dark:text-foreground',
       'border-b-2',
       'border-transparent',
       'hover:border-border-interactive/10',
       'hover:text-elements-mid-em',
-      'dark:hover:text-foreground-secondary',
       'focus-within:border-border-interactive/10',
       'data-[state=active]:font-medium',
       'data-[state=active]:text-elements-high-em',
       'data-[state=active]:border-elements-high-em',
-      'data-[state=active]:border-primary',
       // Vertical
       'data-[orientation=vertical]:px-3',
       'data-[orientation=vertical]:py-3',
@@ -30,7 +27,6 @@ export const tabsTheme = tv({
       'data-[orientation=vertical]:rounded-xl',
       'data-[orientation=vertical]:border-transparent',
       'data-[orientation=vertical]:hover:bg-base-bg-emphasized',
-      'data-[orientation=vertical]:dark:hover:bg-overlay2',
       'data-[orientation=vertical]:hover:text-elements-mid-em',
       'data-[orientation=vertical]:hover:border-transparent',
       'data-[orientation=vertical]:focus-visible:border-transparent',
@@ -38,17 +34,13 @@ export const tabsTheme = tv({
       'data-[orientation=vertical]:focus-visible:text-elements-mid-em',
       'data-[orientation=vertical]:data-[state=active]:font-normal',
       'data-[orientation=vertical]:data-[state=active]:bg-base-bg-emphasized',
-      'data-[orientation=vertical]:data-[state=active]:dark:bg-overlay',
       'data-[orientation=vertical]:data-[state=active]:border-transparent',
       'data-[orientation=vertical]:data-[state=active]:hover:text-elements-high-em',
       'data-[orientation=vertical]:data-[state=active]:focus-visible:text-elements-high-em',
       // TODO: demo additions
       'data-[orientation=vertical]:data-[state=active]:bg-snowball-200',
-      'data-[orientation=vertical]:data-[state=active]:dark:bg-overlay',
       'data-[orientation=vertical]:data-[state=active]:hover:bg-snowball-200',
-      'data-[orientation=vertical]:data-[state=active]:dark:hover:bg-overlay2',
       'data-[orientation=vertical]:data-[state=active]:text-snowball-800',
-      'data-[orientation=vertical]:data-[state=active]:dark:text-foreground',
       'data-[orientation=vertical]:data-[state=active]:hover:text-snowball-800',
       'data-[orientation=vertical]:data-[state=active]:shadow-[0px_1px_0px_0px_rgba(8,47,86,0.06)_inset]',
     ],

packages/frontend/src/components/shared/Tooltip/Tooltip.theme.ts

@@ -6,10 +6,8 @@ export const tooltipTheme = tv({
       'z-tooltip',
       'rounded-md',
       'bg-surface-high-contrast',
-      'dark:bg-overlay3',
       'p-2',
       'text-elements-on-high-contrast',
-      'dark:text-foreground-secondary',
     ],
     arrow: ['fill-surface-high-contrast'],
   },

packages/frontend/src/context/Web3Provider.tsx

@@ -17,7 +17,7 @@ import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { VITE_WALLET_CONNECT_ID, BASE_URL } from 'utils/constants';
 
 if (!VITE_WALLET_CONNECT_ID) {
-  throw new Error('Error: VITE_WALLET_CONNECT_ID env config is not set');
+  throw new Error('Error: REACT_APP_WALLET_CONNECT_ID env config is not set');
 }
 assert(BASE_URL, 'VITE_SERVER_URL is not set in env');
 

packages/frontend/src/index.css

@@ -144,7 +144,6 @@
 @layer utilities {
   .focus-ring {
     @apply focus-visible:ring-[3px] focus-visible:ring-snowball-200 focus-visible:ring-offset-1 focus-visible:ring-offset-snowball-500 focus-visible:outline-none;
-    @apply focus-visible:ring-[3px] dark:focus-visible:ring-primary focus-visible:ring-offset-1 dark:focus-visible:ring-offset-primary focus-visible:outline-none;
   }
 
   @keyframes dialog-overlay-show {

packages/frontend/src/layouts/ProjectSearch.tsx

@@ -32,7 +32,7 @@ const ProjectSearch = () => {
   return (
     <section className="h-full flex flex-col">
       {/* Header */}
-      <div className="sticky hidden lg:block top-0 border-b dark:bg-overlay bg-base-bg border-border-separator/[0.06] hover:z-30">
+      <div className="sticky hidden lg:block top-0 border-b bg-base-bg border-border-separator/[0.06] hover:z-30">
         <div className="flex pr-6 pl-2 py-2 items-center">
           <div className="flex-1">
             <ProjectSearchBar
@@ -69,7 +69,7 @@ const ProjectSearch = () => {
       </div>
 
       {/* Content */}
-      <section className="h-full z-0 overflow-y-auto dark:bg-overlay">
+      <section className="h-full z-0 overflow-y-auto">
         <Outlet />
       </section>
     </section>

packages/frontend/src/logo.svg

@@ -0,0 +1 @@
+<svg width="500" height="500" viewBox="0 0 500 500" fill="none" xmlns="http://www.w3.org/2000/svg"><rect width="500" height="500" fill="#0F86F5"/><path fill-rule="evenodd" clip-rule="evenodd" d="M191.873 125.126C224.893 126.765 250.458 150.121 274.042 172.995C297.925 196.158 323.089 221.108 324.868 254.114C326.718 288.42 308.902 321.108 283.281 344.355C258.67 366.687 225.288 373.859 191.873 374.788C157.228 375.752 119.038 374.394 95.1648 349.588C71.6207 325.125 74.6696 287.843 75.7341 254.114C76.7518 221.865 79.2961 188.525 101.009 164.41C123.845 139.047 157.543 123.423 191.873 125.126Z" fill="#4BA4F7"/><path fill-rule="evenodd" clip-rule="evenodd" d="M229.373 125.126C262.393 126.765 287.958 150.121 311.542 172.995C335.425 196.158 360.589 221.108 362.368 254.114C364.218 288.42 346.402 321.108 320.781 344.355C296.17 366.687 262.788 373.859 229.373 374.788C194.728 375.752 156.538 374.394 132.665 349.588C109.121 325.125 112.17 287.843 113.234 254.114C114.252 221.865 116.796 188.525 138.509 164.41C161.345 139.047 195.043 123.423 229.373 125.126Z" fill="#8AC4FA"/><path fill-rule="evenodd" clip-rule="evenodd" d="M266.873 125.126C299.893 126.765 325.458 150.121 349.042 172.995C372.925 196.158 398.089 221.108 399.868 254.114C401.718 288.42 383.902 321.108 358.281 344.355C333.67 366.687 300.288 373.859 266.873 374.788C232.228 375.752 194.038 374.394 170.165 349.588C146.621 325.125 149.67 287.843 150.734 254.114C151.752 221.865 154.296 188.525 176.009 164.41C198.845 139.047 232.543 123.423 266.873 125.126Z" fill="#CAE4FD"/><path fill-rule="evenodd" clip-rule="evenodd" d="M304.373 125.126C337.393 126.765 362.958 150.121 386.542 172.995C410.425 196.158 435.589 221.108 437.368 254.114C439.218 288.42 421.402 321.108 395.781 344.355C371.17 366.687 337.788 373.859 304.373 374.788C269.728 375.752 231.538 374.394 207.665 349.588C184.121 325.125 187.17 287.843 188.234 254.114C189.252 221.865 191.796 188.525 213.509 164.41C236.345 139.047 270.043 123.423 304.373 125.126Z" fill="white"/></svg>

packages/frontend/src/pages/AuthPage.tsx

@@ -1,8 +1,9 @@
+import { CloudyFlow } from 'components/CloudyFlow';
 import { Login } from './auth/Login';
 
 const AuthPage = () => {
   return (
-    <div className="dark:bg-background flex flex-col min-h-screen">
+    <CloudyFlow className="flex flex-col min-h-screen">
       <div className="py-8 relative z-10">
         <div className="flex justify-center items-center gap-2.5">
           <img
@@ -10,14 +11,17 @@ const AuthPage = () => {
             alt="snowball logo"
             className="h-10 rounded-xl"
           />
+          <div className="text-sky-950 text-2xl font-semibold font-display leading-loose">
+            Snowball
+          </div>
         </div>
       </div>
       <div className="pb-12 relative z-10 flex-1 flex-center">
-        <div className="max-w-[520px] w-full dark:bg-overlay bg-white rounded-xl shadow">
+        <div className="max-w-[520px] w-full bg-white rounded-xl shadow">
           <Login />
         </div>
       </div>
-    </div>
+    </CloudyFlow>
   );
 };
 

packages/frontend/src/pages/auth/Done.tsx

@@ -10,16 +10,16 @@ type Props = {
 };
 export const Done = ({ continueTo }: Props) => {
   return (
-    <div className="dark: bg-background">
+    <div>
       <div className="self-stretch p-3 xs:p-6 flex-col justify-center items-center gap-5 flex">
-        <div className="w-16 h-16 p-2 dark:bg-overlay bg-sky-100 rounded-[800px] justify-center items-center gap-2 inline-flex">
+        <div className="w-16 h-16 p-2 bg-sky-100 rounded-[800px] justify-center items-center gap-2 inline-flex">
           <CheckRoundFilledIcon />
         </div>
         <div>
-          <div className="self-stretch text-center dark:text-foreground text-sky-950 text-2xl font-medium font-display leading-loose">
+          <div className="self-stretch text-center text-sky-950 text-2xl font-medium font-display leading-loose">
             You&apos;re in!
           </div>
-          <div className="text-center dark:text-foreground-secondary text-slate-600 text-sm font-normal font-['Inter'] leading-tight">
+          <div className="text-center text-slate-600 text-sm font-normal font-['Inter'] leading-tight">
             It's time to get your project rolling 😎
           </div>
         </div>
@@ -33,7 +33,7 @@ export const Done = ({ continueTo }: Props) => {
           href={continueTo}
           variant={'primary'}
         >
-          Enter Laconic
+          Enter Snowball
         </Button>
       </div>
     </div>

packages/frontend/src/pages/auth/Login.tsx

@@ -4,8 +4,8 @@ export const Login = () => {
   return (
     <div>
       <div className="self-stretch p-3 xs:p-6 flex-col justify-center items-center gap-5 flex">
-        <div className="self-stretch text-center text-foreground text-2xl font-medium font-display leading-tight">
+        <div className="self-stretch text-center text-sky-950 text-2xl font-medium font-display leading-tight">
-          Sign in to Laconic
+          Sign in to Snowball
         </div>
       </div>
       <WavyBorder className="self-stretch" variant="stroke" />

packages/frontend/src/pages/org-slug/index.tsx

@@ -30,7 +30,7 @@ const Projects = () => {
       <div className="flex items-center">
         <div className="grow">
           <div className="flex gap-4 items-center">
-            <Heading as="h2" className="text-[24px] dark:text-foreground">
+            <Heading as="h2" className="text-[24px]">
               Projects
             </Heading>
             <Badge className="bg-base-bg-alternate text-elements-mid-em h-7 w-7">
@@ -39,7 +39,7 @@ const Projects = () => {
           </div>
         </div>
         <Link to="projects/create">
-          <Button leftIcon={<PlusIcon />}>CREATE PROJECT</Button>
+          <Button leftIcon={<PlusIcon />}>Create project</Button>
         </Link>
       </div>
       {/* List of projects */}

packages/frontend/src/pages/org-slug/layout.tsx

@@ -39,7 +39,7 @@ export const DashboardLayout = ({
       <section
         {...props}
         className={cn(
-          'flex flex-col lg:flex-row h-screen bg-background',
+          'flex flex-col lg:flex-row h-screen bg-snowball-50',
           className,
         )}
       >
@@ -112,7 +112,7 @@ export const DashboardLayout = ({
             }}
             transition={{ ease: 'easeInOut', duration: 0.3 }}
           >
-            <div className="rounded-t-3xl lg:rounded-3xl dark:bg-background bg-base-bg h-full shadow-card dark:shadow-background overflow-y-auto relative">
+            <div className="rounded-t-3xl lg:rounded-3xl bg-base-bg h-full shadow-card overflow-y-auto relative">
               <OctokitProvider>
                 <Outlet />
               </OctokitProvider>

packages/frontend/src/pages/org-slug/projects/Id.tsx

@@ -78,7 +78,7 @@ const Id = () => {
                 leftIcon={<ChevronLeft />}
                 onClick={() => navigate(-1)}
               />
-              <Heading className="text-2xl font-medium truncate dark:text-foreground">
+              <Heading className="text-2xl font-medium truncate">
                 {project?.name}
               </Heading>
             </div>
@@ -88,24 +88,17 @@ const Id = () => {
                   {...buttonSize}
                   className="h-11 transition-colors"
                   variant="tertiary"
-                  shape="default"
                 >
-                  OPEN REPO
+                  Open repo
                 </Button>
               </Link>
-              {project.deployments.length > 0 && (
+              {(project.deployments.length > 0) &&
-                <Link
+                <Link to={`https://${project.name.toLowerCase()}.${project.deployments[0].deployer.baseDomain}`}>
-                  to={`https://${project.name.toLowerCase()}.${project.deployments[0].deployer.baseDomain}`}
+                  <Button {...buttonSize} className="h-11 transition-colors">
-                >
+                    Go to app
-                  <Button
-                    {...buttonSize}
-                    className="h-11 transition-colors"
-                    shape="default"
-                  >
-                    GO TO APP
                   </Button>
                 </Link>
-              )}
+              }
             </div>
           </div>
           <WavyBorder />

packages/frontend/src/pages/org-slug/projects/create/layout.tsx

@@ -20,10 +20,7 @@ export const CreateProjectLayout = ({
   const closeBtnLink = `/${orgSlug}`;
 
   const heading = (
-    <Heading
+    <Heading as="h2" className="flex-1 text-xl md:text-2xl font-medium">
-      as="h2"
-      className="flex-1 text-xl md:text-2xl font-medium dark:text-foreground"
-    >
       Create new project
     </Heading>
   );
@@ -33,20 +30,17 @@ export const CreateProjectLayout = ({
       {/* Desktop */}
       <section
         {...props}
-        className={cn(
+        className={cn('h-full flex-col hidden md:flex', className)}
-          'dark:bg-background h-full flex-col hidden md:flex',
-          className,
-        )}
       >
         <div className="sticky top-0">
-          <div className="flex px-6 py-4 dark:bg-overlay bg-base-bg items-center gap-4">
+          <div className="flex px-6 py-4 bg-base-bg items-center gap-4">
             {heading}
 
             {/* Cannot save btn as variable since responsive variant don't work with compoundVariant */}
             <Link to={closeBtnLink}>
               <Button
                 iconOnly
-                variant="primary"
+                variant="tertiary"
                 leftIcon={<CrossIcon />}
                 aria-label="close"
               />

packages/frontend/src/pages/org-slug/projects/id/Deployments.tsx

@@ -121,22 +121,21 @@ const DeploymentsTabPanel = () => {
           })
         ) : (
           // TODO: Update the height based on the layout, need to re-styling the layout similar to create project layout
-          <div className="h-3/4 bg-base-bg-alternate dark:bg-overlay3 flex flex-col rounded-xl items-center justify-center text-center gap-5">
+          <div className="h-3/4 bg-base-bg-alternate flex flex-col rounded-xl items-center justify-center text-center gap-5">
             <div className="space-y-1">
-              <p className="font-medium tracking-[-0.011em] text-elements-high-em dark:text-foreground">
+              <p className="font-medium tracking-[-0.011em] text-elements-high-em">
                 No deployments found
               </p>
-              <p className="text-sm tracking-[-0.006em] text-elements-mid-em dark:text-foreground-secondary">
+              <p className="text-sm tracking-[-0.006em] text-elements-mid-em">
                 Please change your search query or filters.
               </p>
             </div>
             <Button
-              variant="primary"
+              variant="tertiary"
-              shape="default"
               leftIcon={<RefreshIcon />}
               onClick={handleResetFilters}
             >
-              RESET FILTERS
+              Reset filters
             </Button>
           </div>
         )}

packages/frontend/src/pages/org-slug/projects/id/Overview.tsx

@@ -126,7 +126,7 @@ const OverviewTabPanel = () => {
             type="blue"
           />
           <div className="flex-1 space-y-1 overflow-hidden">
-            <Heading className="text-lg leading-6 font-medium truncate dark:text-foreground">
+            <Heading className="text-lg leading-6 font-medium truncate">
               {project.name}
             </Heading>
             {project.deployments &&
@@ -136,7 +136,7 @@ const OverviewTabPanel = () => {
                   <a
                     key={index}
                     href={`https://${project.name.toLowerCase()}.${deployment.deployer.baseDomain}`}
-                    className="text-sm text-elements-low-em dark:text-foreground tracking-tight truncate"
+                    className="text-sm text-elements-low-em tracking-tight truncate"
                   >
                     {deployment.deployer.baseDomain}
                   </a>
@@ -161,7 +161,7 @@ const OverviewTabPanel = () => {
                 variant="tertiary"
                 size="sm"
               >
-                SETUP
+                Setup
               </Button>
             </div>
           )}
@@ -171,8 +171,8 @@ const OverviewTabPanel = () => {
             {/* SOURCE */}
             <OverviewInfo label="Source" icon={<GithubStrokeIcon />}>
               <div className="flex gap-2 items-center">
-                <BranchStrokeIcon className="text-elements-low-em dark:text-foreground w-4 h-5" />
+                <BranchStrokeIcon className="text-elements-low-em w-4 h-5" />
-                <span className="text-elements-high-em dark:text-foreground-secondary text-sm tracking-tighter">
+                <span className="text-elements-high-em text-sm tracking-tighter">
                   {project.deployments[0]?.branch}
                 </span>
               </div>
@@ -184,10 +184,8 @@ const OverviewTabPanel = () => {
               project.deployments.length > 0 &&
               project.deployments.map((deployment) => (
               <div className="flex gap-2 items-center">
-                    <Link
+                <Link to={`https://${project.name.toLowerCase()}.${deployment.deployer.baseDomain}`}>
-                      to={`https://${project.name.toLowerCase()}.${deployment.deployer.baseDomain}`}
+                  <span className="text-controls-primary group hover:border-controls-primary transition-colors border-b border-b-transparent flex gap-2 items-center text-sm tracking-tight">
-                    >
-                      <span className="text-controls-primary dark:text-foreground group hover:border-controls-primary transition-colors border-b border-b-transparent flex gap-2 items-center text-sm tracking-tight">
                     {`https://${project.name.toLowerCase()}.${deployment.deployer.baseDomain}`}
                     <LinkIcon className="group-hover:rotate-45 transition-transform" />
                   </span>
@@ -198,7 +196,7 @@ const OverviewTabPanel = () => {
 
             {/* DEPLOYMENT DATE */}
             <OverviewInfo label="Deployment date" icon={<CalendarDaysIcon />}>
-              <div className="flex gap-2 items-center text-elements-high-em dark:text-foreground text-sm tracking-tighter">
+              <div className="flex gap-2 items-center text-elements-high-em text-sm tracking-tighter">
                 <span>{relativeTimeMs(project.deployments[0].createdAt)}</span>
                 by
                 <Avatar

packages/frontend/src/pages/org-slug/projects/id/routes.tsx

@@ -8,7 +8,7 @@ import CollaboratorsTabPanel from './settings/Collaborators';
 import Domains from './settings/Domains';
 
 const Integrations = () => (
-  <div className="dark:text-foreground">
+  <div>
     Content of integrations tab
     <p className="block">
       There are many variations of passages of Lorem Ipsum available.

packages/frontend/src/pages/org-slug/projects/id/settings/Collaborators.tsx

@@ -117,10 +117,9 @@ const CollaboratorsTabPanel = () => {
           size="md"
           onClick={() => setAddMemberDialogOpen((preVal) => !preVal)}
           leftIcon={<PlusIcon />}
-          variant="primary"
+          variant="secondary"
-          shape="default"
         >
-          ADD MEMBER
+          Add member
         </Button>
       }
     >

packages/frontend/src/pages/org-slug/projects/id/settings/EnvironmentVariables.tsx

@@ -111,10 +111,10 @@ export const EnvironmentVariablesTabPanel = () => {
 
   return (
     <ProjectSettingContainer headingText="Environment variables">
-      <p className="text-slate-600 dark:text-foreground-secondary text-sm font-normal leading-tight">
+      <p className="text-slate-600 text-sm font-normal leading-tight">
         A new deployment is required for your changes to take effect.
       </p>
-      <div className="bg-slate-100 dark:bg-overlay2 rounded-xl flex-col">
+      <div className="bg-slate-100 rounded-xl flex-col">
         <Heading
           onClick={() => setCreateNewVariable((cur) => !cur)}
           className="p-4"
@@ -131,12 +131,12 @@ export const EnvironmentVariablesTabPanel = () => {
                 createEnvironmentVariablesHandler(data),
               )}
             >
-              <div className="p-4 bg-slate-100 dark:bg-overlay3">
+              <div className="p-4 bg-slate-100">
                 <EnvironmentVariablesForm />
               </div>
               <div className="p-2">
-                <Button size="md" type="submit" shape="default">
+                <Button size="md" type="submit">
-                  SAVE CHANGES
+                  Save changes
                 </Button>
               </div>
             </form>

packages/frontend/src/pages/org-slug/projects/id/settings/EnvironmentVariablesForm.tsx

@@ -1,11 +1,13 @@
 import { useEffect, useMemo } from 'react';
 import { useFieldArray, useFormContext } from 'react-hook-form';
 
+// TODO: Use custom checkbox component
+import { Checkbox } from '@snowballtools/material-tailwind-react-fork';
+
 import { Button } from 'components/shared/Button';
 import { InlineNotification } from 'components/shared/InlineNotification';
 import AddEnvironmentVariableRow from 'components/projects/project/settings/AddEnvironmentVariableRow';
 import { EnvironmentVariablesFormValues } from 'types/types';
-import { Checkbox } from 'components/shared/Checkbox';
 
 const EnvironmentVariablesForm = () => {
   const {
@@ -52,12 +54,8 @@ const EnvironmentVariablesForm = () => {
         />
       ))}
       <div className="flex gap-1 p-2">
-        <Button
+        <Button size="md" onClick={() => append({ key: '', value: '' })}>
-          size="md"
+          + Add variable
-          onClick={() => append({ key: '', value: '' })}
-          shape="default"
-        >
-          + ADD VARIABLE
         </Button>
       </div>
       {isFieldEmpty && (

packages/frontend/src/pages/org-slug/projects/id/settings/General.tsx

@@ -18,7 +18,6 @@ const GeneralTabPanel = () => {
   const client = useGQLClient();
   const { toast } = useToast();
   const { project, onUpdate } = useOutletContext<OutletContextType>();
-  console.log(project);
 
   const [transferOrganizations, setTransferOrganizations] = useState<
     SelectOption[]
@@ -158,9 +157,8 @@ const GeneralTabPanel = () => {
           type="submit"
           size="md"
           disabled={!updateProjectFormState.isDirty}
-          shape="default"
         >
-          SAVE
+          Save
         </Button>
       </form>
       <form
@@ -187,8 +185,8 @@ const GeneralTabPanel = () => {
             setSelectedTransferOrganization(value as SelectOption)
           }
         />
-        <Button disabled type="submit" size="md" shape="default">
+        <Button disabled type="submit" size="md">
-          TRANSFER
+          Transfer
         </Button>
       </form>
       <TransferProjectDialog
@@ -213,7 +211,7 @@ const GeneralTabPanel = () => {
           onClick={handleDeleteProjectDialog}
           leftIcon={<TrashIcon />}
         >
-          DELETE PROJECT
+          Delete project
         </Button>
         <DeleteProjectDialog
           handleOpen={handleDeleteProjectDialog}

packages/frontend/src/pages/org-slug/projects/id/settings/Git.tsx

@@ -139,7 +139,7 @@ const GitTabPanel = () => {
       <div className="self-stretch space-y-3">
         <div className="flex justify-between mt-4">
           <div>
-            <p className="text-slate-600 dark:text-foreground-secondary text-sm font-normal leading-tight">
+            <p className="text-slate-600 text-sm font-normal leading-tight">
               Pull request comments
             </p>
           </div>
@@ -153,7 +153,7 @@ const GitTabPanel = () => {
 
         <div className="flex justify-between">
           <div>
-            <p className="text-slate-600 dark:text-foreground-secondary text-sm font-normal leading-tight">
+            <p className="text-slate-600 text-sm font-normal leading-tight">
               Commit comments
             </p>
           </div>
@@ -171,18 +171,18 @@ const GitTabPanel = () => {
         className="space-y-3"
       >
         <ProjectSettingHeader headingText="Production branch" />
-        <p className="text-slate-600 dark:text-foreground-secondary text-sm font-normal leading-tight">
+        <p className="text-slate-600 text-sm font-normal leading-tight">
           By default, each commit pushed to the{' '}
           <span className="font-bold">{project.prodBranch}</span> branch
           initiates a production deployment. You can opt for a different branch
           for deployment in the settings.
         </p>
-        <p className="text-slate-600 dark:text-foreground-secondary text-sm font-normal leading-tight">
+        <p className="text-slate-600 text-sm font-normal leading-tight">
           Branch name
         </p>
         <Input {...registerProdBranch('prodBranch')} />
-        <Button size="md" variant="primary" shape="default">
+        <Button size="md" variant="primary">
-          SAVE
+          Save
         </Button>
       </form>
 
@@ -191,21 +191,21 @@ const GitTabPanel = () => {
         className="space-y-3"
       >
         <ProjectSettingHeader headingText="Deploy webhooks" />
-        <p className="text-slate-600 dark:text-foreground-secondary text-sm font-normal leading-tight">
+        <p className="text-slate-600 text-sm font-normal leading-tight">
           {' '}
           Webhooks configured to trigger when there is a change in a
           project&apos;s build or deployment status.
         </p>
         <div className="flex gap-1">
           <div className="grow">
-            <p className="text-slate-600 dark:text-foreground-secondary text-sm font-normal leading-tight">
+            <p className="text-slate-600 text-sm font-normal leading-tight">
               Webhook URL
             </p>
             <Input {...registerWebhooks('webhookUrl')} />
           </div>
           <div className="self-end">
-            <Button size="sm" type="submit" shape="default">
+            <Button size="sm" type="submit">
-              SAVE
+              Save
             </Button>
           </div>
         </div>

packages/frontend/src/pages/org-slug/projects/id/settings/domains/add/Config.tsx

@@ -102,10 +102,9 @@ const Config = () => {
         className="w-fit"
         onClick={handleSubmitDomain}
         variant="primary"
-        shape="default"
         rightIcon={<ArrowRightCircleIcon />}
       >
-        FINISH
+        Finish
       </Button>
     </ProjectSettingContainer>
   );

packages/frontend/src/pages/org-slug/projects/id/settings/domains/add/index.tsx

@@ -33,29 +33,19 @@ const AddDomain = () => {
   return (
     <div className="p-4">
       <div className="flex justify-between">
-        <Typography variant="h3" className="dark:text-foreground">
+        <Typography variant="h3">Add Domain</Typography>
-          Add Domain
-        </Typography>
         <Link to={`/${orgSlug}/projects/${id}`}>
-          <IconButton
+          <IconButton className="rounded-full" variant="outlined">
-            className="rounded-full dark:text-foreground dark:border-foreground"
-            variant="outlined"
-          >
             X
           </IconButton>
         </Link>
       </div>
 
       <div className=" w-2/3 mx-auto">
-        <div className="bg-blue-gray-50 dark:bg-overlay rounded-lg mt-6 mb-10">
+        <div className="bg-blue-gray-50 rounded-lg mt-6 mb-10">
           <div className="flex justify-start gap-3 p-5">
-            <i className="bg-gray-100 dark:bg-overlay dark:text-foreground w-12 h-12 rounded-lg">
+            <i className="bg-gray-100 w-12 h-12 rounded-lg">^</i>
-              ^
+            <Typography className="my-auto w-1/3" variant="h5">
-            </i>
-            <Typography
-              className="my-auto w-1/3 dark:text-foreground"
-              variant="h5"
-            >
               Project Name
             </Typography>
           </div>

packages/frontend/src/utils/constants.ts

@@ -5,8 +5,6 @@ export const VITE_GITHUB_PWA_TEMPLATE_REPO = import.meta.env
   .VITE_GITHUB_PWA_TEMPLATE_REPO;
 export const VITE_GITHUB_IMAGE_UPLOAD_PWA_TEMPLATE_REPO = import.meta.env
   .VITE_GITHUB_IMAGE_UPLOAD_PWA_TEMPLATE_REPO;
-export const VITE_GITHUB_NEXT_APP_TEMPLATE_REPO = import.meta.env
-  .VITE_GITHUB_NEXT_APP_TEMPLATE_REPO;
 export const VITE_GITHUB_CLIENT_ID = import.meta.env.VITE_GITHUB_CLIENT_ID;
 export const VITE_WALLET_CONNECT_ID = import.meta.env.VITE_WALLET_CONNECT_ID;
 export const VITE_BUGSNAG_API_KEY = import.meta.env.VITE_BUGSNAG_API_KEY;

packages/frontend/tailwind.config.js

@@ -9,17 +9,6 @@ export default withMT({
     '../../node_modules/@snowballtools/material-tailwind-react-fork/theme/components/**/*.{js,ts,jsx,tsx}',
   ],
   theme: {
-    colors: {
-      background: '#0F0F0F',
-      overlay: '#18181A',
-      overlay2: '#29292E',
-      overlay3: '#48474F',
-      primary: '#0000F4',
-      'primary-hovered': '#0000F4AA',
-      foreground: '#FBFBFB',
-      'foreground-secondary': '#8E8E8E',
-      error: '#B20710',
-    },
     extend: {
       screens: {
         xxs: '400px',
@@ -31,7 +20,7 @@ export default withMT({
       fontFamily: {
         sans: ['Inter', 'sans-serif'],
         display: ['Inter Display', 'sans-serif'],
-        mono: ['DM Mono', 'monospace'],
+        mono: ['JetBrains Mono', 'monospace'],
       },
       fontSize: {
         '2xs': '0.625rem',