diff --git a/src/app/[orgId]/components/Header.tsx b/src/app/[orgId]/components/Header.tsx
index 50c850c4..647682b6 100644
--- a/src/app/[orgId]/components/Header.tsx
+++ b/src/app/[orgId]/components/Header.tsx
@@ -87,13 +87,13 @@ export default function Header({ email, orgName, name }: HeaderProps) {
                         <div className="flex items-center gap-4 mr-4">
                             <Link
                                 href="/docs"
-                                className="text-muted-foreground hover:text-black"
+                                className="text-muted-foreground hover:text-foreground"
                             >
                                 Documentation
                             </Link>
                             <Link
                                 href="/support"
-                                className="text-muted-foreground hover:text-black"
+                                className="text-muted-foreground hover:text-foreground"
                             >
                                 Support
                             </Link>
diff --git a/src/app/[orgId]/layout.tsx b/src/app/[orgId]/layout.tsx
index c8016fdb..6e325773 100644
--- a/src/app/[orgId]/layout.tsx
+++ b/src/app/[orgId]/layout.tsx
@@ -15,22 +15,22 @@ const topNavItems = [
     {
         title: "Sites",
         href: "/{orgId}/sites",
-        icon: <Combine />,
+        icon: <Combine className="h-5 w-5"/>,
     },
     {
         title: "Resources",
         href: "/{orgId}/resources",
-        icon: <Waypoints />,
+        icon: <Waypoints className="h-5 w-5"/>,
     },
     {
         title: "Users",
         href: "/{orgId}/users",
-        icon: <Users />,
+        icon: <Users className="h-5 w-5"/>,
     },
     {
         title: "General",
         href: "/{orgId}/general",
-        icon: <Cog />,
+        icon: <Cog className="h-5 w-5"/>,
     },
 ];
 
@@ -53,8 +53,8 @@ export default async function ConfigurationLaytout({
 
     return (
         <>
-            <div className="w-full bg-muted border-b border-bg mb-6 select-none sm:px-0 px-3 pt-3">
-                <div className="container mx-auto flex flex-col content-between gap-4">
+            <div className="w-full bg-muted mb-6 select-none sm:px-0 px-3 pt-3 border-b border-border">
+                <div className="container mx-auto flex flex-col content-between gap-4 ">
                     <Header email={user.email} orgName={params.orgId} />
                     <TopbarNav items={topNavItems} orgId={params.orgId} />
                 </div>
diff --git a/src/app/[orgId]/sites/[niceId]/layout.tsx b/src/app/[orgId]/sites/[niceId]/layout.tsx
index 3b1c7603..9a567616 100644
--- a/src/app/[orgId]/sites/[niceId]/layout.tsx
+++ b/src/app/[orgId]/sites/[niceId]/layout.tsx
@@ -82,10 +82,6 @@ export default async function SettingsLayout({
                     href={`/${params.orgId}/sites`}
                     className="text-primary font-medium"
                 >
-                    <div className="flex items-center gap-0.5 hover:underline">
-                        <ChevronLeft />
-                        <span>View all sites</span>
-                    </div>
                 </Link>
             </div>
 
diff --git a/src/app/[orgId]/sites/components/DataTable.tsx b/src/app/[orgId]/sites/components/DataTable.tsx
index a797df0c..1dee581f 100644
--- a/src/app/[orgId]/sites/components/DataTable.tsx
+++ b/src/app/[orgId]/sites/components/DataTable.tsx
@@ -125,7 +125,7 @@ export function DataTable<TData, TValue>({
                                     colSpan={columns.length}
                                     className="h-24 text-center"
                                 >
-                                    No results.
+                                    No sites. Create one to get started.
                                 </TableCell>
                             </TableRow>
                         )}
diff --git a/src/app/globals.css b/src/app/globals.css
index bc8a2290..2aa2b710 100644
--- a/src/app/globals.css
+++ b/src/app/globals.css
@@ -4,48 +4,78 @@
 
 @layer base {
     :root {
-        --background: 231 0% 100%;
-        --foreground: 231 0% 10%;
-        --card: 231 0% 100%;
-        --card-foreground: 231 0% 15%;
-        --popover: 231 0% 100%;
-        --popover-foreground: 231 95% 10%;
-        --primary: 231 34% 49%;
-        --primary-foreground: 0 0% 100%;
-        --secondary: 231 10% 90%;
+        --background: 0 0% 100%;
+        --foreground: 30 28.57% 2.75%;
+
+        --primary: 23.64 23.74% 27.25%;
+        --primary-foreground: 20 8.11% 92.75%;
+
+        --card: 30 11.11% 96.47%;
+        --card-foreground: 30 28.57% 2.75%;
+
+        --popover: 0 0% 100%;
+        --popover-foreground: 30 28.57% 2.75%;
+
+        --secondary: 24 9.09% 89.22%;
         --secondary-foreground: 0 0% 0%;
-        --muted: 193 10% 95%;
-        --muted-foreground: 231 0% 40%;
-        --accent: 193 10% 90%;
-        --accent-foreground: 231 0% 15%;
-        --destructive: 0 50% 50%;
-        --destructive-foreground: 231 0% 100%;
-        --border: 231 20% 82%;
-        --input: 231 20% 50%;
-        --ring: 231 34% 49%;
-        --radius: 0.75rem;
+
+        --muted: 20 8.11% 92.75%;
+        --muted-foreground: 0 0% 40%;
+
+        --accent: 20 8.11% 92.75%;
+        --accent-foreground: 24 23.81% 4.12%;
+
+        --destructive: 0 84.2% 60.2%;
+        --destructive-foreground: 210 40% 98%;
+
+        --border: 20 8.11% 85.49%;
+        --input: 30 3.64% 78.43%;
+        --ring: 23.64 23.74% 27.25%;
+
+        --chart-1: 23.64 23.74% 27.25%;
+        --chart-2: 23.57 14.43% 38.04%;
+        --chart-3: 22.86 8.71% 52.75%;
+        --chart-4: 23.33 8.82% 60%;
+        --chart-5: 24 8.98% 67.25%;
+
+        --radius: 0.5rem;
     }
     .dark {
-        --background: 231 10% 10%;
-        --foreground: 231 0% 100%;
-        --card: 231 0% 10%;
-        --card-foreground: 231 0% 100%;
-        --popover: 231 10% 5%;
-        --popover-foreground: 231 0% 100%;
-        --primary: 231 34% 49%;
-        --primary-foreground: 0 0% 100%;
-        --secondary: 231 10% 20%;
+        --background: 0 0% 10.98%;
+        --foreground: 24 9.09% 89.22%;
+
+        --primary: 23.64 23.74% 27.25%;
+        --primary-foreground: 20 8.11% 92.75%;
+
+        --card: 0 0% 8.63%;
+        --card-foreground: 24 9.09% 89.22%;
+
+        --popover: 0 0% 4.71%;
+        --popover-foreground: 24 9.09% 89.22%;
+
+        --secondary: 23.33 28.13% 12.55%;
         --secondary-foreground: 0 0% 100%;
-        --muted: 231 10% 18%;
-        --muted-foreground: 231 0% 65%;
-        --accent: 193 10% 25%;
-        --accent-foreground: 231 0% 95%;
-        --destructive: 0 50% 50%;
-        --destructive-foreground: 231 0% 100%;
-        --border: 231 20% 50%;
-        --input: 231 20% 50%;
-        --ring: 231 34% 49%;
-        --radius: 0.75rem;
+
+        --muted: 0 0% 9.8%;
+        --muted-foreground: 0 0% 51.37%;
+
+        --accent: 0 0% 23.53%;
+        --accent-foreground: 24 9.09% 89.22%;
+
+        --destructive: 0 84.2% 60.2%;
+        --destructive-foreground: 210 40% 98%;
+
+        --border: 20 21.43% 5.49%;
+        --input: 0 0% 27.06%;
+        --ring: 23.64 23.74% 27.25%;
+
+        --chart-1: 23.64 23.74% 27.25%;
+        --chart-2: 23.57 23.73% 23.14%;
+        --chart-3: 24.55 24.44% 17.65%;
+        --chart-4: 23.33 23.68% 14.9%;
+        --chart-5: 24 23.81% 12.35%;
+
+        --radius: 0.5rem;
     }
 }
 
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 8ae974d5..44427ae0 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -9,8 +9,8 @@ export const metadata: Metadata = {
     description: "",
 };
 
-const font = Inter({ subsets: ["latin"] });
-// const font = Open_Sans({ subsets: ["latin"] });
+// const font = Inter({ subsets: ["latin"] });
+const font = Open_Sans({ subsets: ["latin"] });
 
 export default async function RootLayout({
     children,
diff --git a/src/components/ui/table.tsx b/src/components/ui/table.tsx
index 7f3502f8..bca0da4a 100644
--- a/src/components/ui/table.tsx
+++ b/src/components/ui/table.tsx
@@ -58,7 +58,7 @@ const TableRow = React.forwardRef<
   <tr
     ref={ref}
     className={cn(
-      "border-b transition-colors hover:bg-muted/50 data-[state=selected]:bg-muted",
+      "border-b transition-colors data-[state=selected]:bg-muted bg-muted",
       className
     )}
     {...props}