diff --git a/messages/en-US.json b/messages/en-US.json
index a57c45e6e..26790b29b 100644
--- a/messages/en-US.json
+++ b/messages/en-US.json
@@ -2469,7 +2469,7 @@
     "connectionLogs": "Network Logs",
     "connectionLogsDescription": "View network session logs handled by sites in this organization",
     "sidebarLogsConnection": "Network Logs",
-    "sidebarLogsStreaming": "Streaming",
+    "sidebarLogsStreaming": "Event Streaming",
     "sourceAddress": "Source Address",
     "destinationAddress": "Destination Address",
     "duration": "Duration",
diff --git a/src/app/[orgId]/settings/resources/proxy/create/page.tsx b/src/app/[orgId]/settings/resources/proxy/create/page.tsx
index f5c20d8cc..51bb9a861 100644
--- a/src/app/[orgId]/settings/resources/proxy/create/page.tsx
+++ b/src/app/[orgId]/settings/resources/proxy/create/page.tsx
@@ -776,9 +776,15 @@ export default function Page() {
                                     pathMatchType: row.original.pathMatchType
                                 }}
                                 onChange={(config) =>
-                                    updateTarget(row.original.targetId,
-                                        config.path === null && config.pathMatchType === null
-                                            ? { ...config, rewritePath: null, rewritePathType: null }
+                                    updateTarget(
+                                        row.original.targetId,
+                                        config.path === null &&
+                                            config.pathMatchType === null
+                                            ? {
+                                                  ...config,
+                                                  rewritePath: null,
+                                                  rewritePathType: null
+                                              }
                                             : config
                                     )
                                 }
@@ -804,9 +810,15 @@ export default function Page() {
                                     pathMatchType: row.original.pathMatchType
                                 }}
                                 onChange={(config) =>
-                                    updateTarget(row.original.targetId,
-                                        config.path === null && config.pathMatchType === null
-                                            ? { ...config, rewritePath: null, rewritePathType: null }
+                                    updateTarget(
+                                        row.original.targetId,
+                                        config.path === null &&
+                                            config.pathMatchType === null
+                                            ? {
+                                                  ...config,
+                                                  rewritePath: null,
+                                                  rewritePathType: null
+                                              }
                                             : config
                                     )
                                 }
@@ -1061,7 +1073,7 @@ export default function Page() {
                                                                 : null
                                                         );
                                                     }}
-                                                    cols={2}
+                                                    cols={3}
                                                 />
                                             </>
                                         )}
@@ -1118,28 +1130,30 @@ export default function Page() {
                                         </SettingsSectionDescription>
                                     </SettingsSectionHeader>
                                     <SettingsSectionBody>
-                                        <DomainPicker
-                                            orgId={orgId as string}
-                                            warnOnProvidedDomain={
-                                                remoteExitNodes.length >= 1
-                                            }
-                                            onDomainChange={(res) => {
-                                                if (!res) return;
+                                        <SettingsSectionForm>
+                                            <DomainPicker
+                                                orgId={orgId as string}
+                                                warnOnProvidedDomain={
+                                                    remoteExitNodes.length >= 1
+                                                }
+                                                onDomainChange={(res) => {
+                                                    if (!res) return;
 
-                                                httpForm.setValue(
-                                                    "subdomain",
-                                                    res.subdomain
-                                                );
-                                                httpForm.setValue(
-                                                    "domainId",
-                                                    res.domainId
-                                                );
-                                                console.log(
-                                                    "Domain changed:",
-                                                    res
-                                                );
-                                            }}
-                                        />
+                                                    httpForm.setValue(
+                                                        "subdomain",
+                                                        res.subdomain
+                                                    );
+                                                    httpForm.setValue(
+                                                        "domainId",
+                                                        res.domainId
+                                                    );
+                                                    console.log(
+                                                        "Domain changed:",
+                                                        res
+                                                    );
+                                                }}
+                                            />
+                                        </SettingsSectionForm>
                                     </SettingsSectionBody>
                                 </SettingsSection>
                             ) : (
@@ -1155,98 +1169,101 @@ export default function Page() {
                                         </SettingsSectionDescription>
                                     </SettingsSectionHeader>
                                     <SettingsSectionBody>
-                                        <Form {...tcpUdpForm}>
-                                            <form
-                                                onKeyDown={(e) => {
-                                                    if (e.key === "Enter") {
-                                                        e.preventDefault(); // block default enter refresh
-                                                    }
-                                                }}
-                                                className="space-y-4 grid gap-4 grid-cols-1 md:grid-cols-2 items-start"
-                                                id="tcp-udp-settings-form"
-                                            >
-                                                <Controller
-                                                    control={tcpUdpForm.control}
-                                                    name="protocol"
-                                                    render={({ field }) => (
-                                                        <FormItem>
-                                                            <FormLabel>
-                                                                {t("protocol")}
-                                                            </FormLabel>
-                                                            <Select
-                                                                onValueChange={
-                                                                    field.onChange
-                                                                }
-                                                                {...field}
-                                                            >
-                                                                <FormControl>
-                                                                    <SelectTrigger>
-                                                                        <SelectValue
-                                                                            placeholder={t(
-                                                                                "protocolSelect"
-                                                                            )}
-                                                                        />
-                                                                    </SelectTrigger>
-                                                                </FormControl>
-                                                                <SelectContent>
-                                                                    <SelectItem value="tcp">
-                                                                        TCP
-                                                                    </SelectItem>
-                                                                    <SelectItem value="udp">
-                                                                        UDP
-                                                                    </SelectItem>
-                                                                </SelectContent>
-                                                            </Select>
-                                                            <FormMessage />
-                                                        </FormItem>
-                                                    )}
-                                                />
+                                        <SettingsSectionForm>
+                                            <Form {...tcpUdpForm}>
+                                                <form
+                                                    onKeyDown={(e) => {
+                                                        if (e.key === "Enter") {
+                                                            e.preventDefault(); // block default enter refresh
+                                                        }
+                                                    }}
+                                                    className="space-y-4 grid gap-4 grid-cols-1 md:grid-cols-2 items-start"
+                                                    id="tcp-udp-settings-form"
+                                                >
+                                                    <Controller
+                                                        control={
+                                                            tcpUdpForm.control
+                                                        }
+                                                        name="protocol"
+                                                        render={({ field }) => (
+                                                            <FormItem>
+                                                                <FormLabel>
+                                                                    {t(
+                                                                        "protocol"
+                                                                    )}
+                                                                </FormLabel>
+                                                                <Select
+                                                                    onValueChange={
+                                                                        field.onChange
+                                                                    }
+                                                                    {...field}
+                                                                >
+                                                                    <FormControl>
+                                                                        <SelectTrigger>
+                                                                            <SelectValue
+                                                                                placeholder={t(
+                                                                                    "protocolSelect"
+                                                                                )}
+                                                                            />
+                                                                        </SelectTrigger>
+                                                                    </FormControl>
+                                                                    <SelectContent>
+                                                                        <SelectItem value="tcp">
+                                                                            TCP
+                                                                        </SelectItem>
+                                                                        <SelectItem value="udp">
+                                                                            UDP
+                                                                        </SelectItem>
+                                                                    </SelectContent>
+                                                                </Select>
+                                                                <FormMessage />
+                                                            </FormItem>
+                                                        )}
+                                                    />
 
-                                                <FormField
-                                                    control={tcpUdpForm.control}
-                                                    name="proxyPort"
-                                                    render={({ field }) => (
-                                                        <FormItem>
-                                                            <FormLabel>
-                                                                {t(
-                                                                    "resourcePortNumber"
-                                                                )}
-                                                            </FormLabel>
-                                                            <FormControl>
-                                                                <Input
-                                                                    type="number"
-                                                                    value={
-                                                                        field.value ??
-                                                                        ""
-                                                                    }
-                                                                    onChange={(
-                                                                        e
-                                                                    ) =>
-                                                                        field.onChange(
+                                                    <FormField
+                                                        control={
+                                                            tcpUdpForm.control
+                                                        }
+                                                        name="proxyPort"
+                                                        render={({ field }) => (
+                                                            <FormItem>
+                                                                <FormLabel>
+                                                                    {t(
+                                                                        "resourcePortNumber"
+                                                                    )}
+                                                                </FormLabel>
+                                                                <FormControl>
+                                                                    <Input
+                                                                        type="number"
+                                                                        value={
+                                                                            field.value ??
+                                                                            ""
+                                                                        }
+                                                                        onChange={(
                                                                             e
-                                                                                .target
-                                                                                .value
-                                                                                ? parseInt(
-                                                                                      e
-                                                                                          .target
-                                                                                          .value
-                                                                                  )
-                                                                                : undefined
-                                                                        )
-                                                                    }
-                                                                />
-                                                            </FormControl>
-                                                            <FormMessage />
-                                                            <FormDescription>
-                                                                {t(
-                                                                    "resourcePortNumberDescription"
-                                                                )}
-                                                            </FormDescription>
-                                                        </FormItem>
-                                                    )}
-                                                />
-                                            </form>
-                                        </Form>
+                                                                        ) =>
+                                                                            field.onChange(
+                                                                                e
+                                                                                    .target
+                                                                                    .value
+                                                                                    ? parseInt(
+                                                                                          e
+                                                                                              .target
+                                                                                              .value
+                                                                                      )
+                                                                                    : undefined
+                                                                            )
+                                                                        }
+                                                                    />
+                                                                </FormControl>
+                                                                <FormMessage />
+                                                            </FormItem>
+                                                        )}
+                                                    />
+                                                </form>
+                                            </Form>
+                                        </SettingsSectionForm>
                                     </SettingsSectionBody>
                                 </SettingsSection>
                             )}
diff --git a/src/app/globals.css b/src/app/globals.css
index bbb165c28..64db322e3 100644
--- a/src/app/globals.css
+++ b/src/app/globals.css
@@ -6,7 +6,7 @@
 
 :root {
     --radius: 0.75rem;
-    --background: oklch(0.985 0 0);
+    --background: oklch(1 0 0);
     --foreground: oklch(0.141 0.005 285.823);
     --card: oklch(1 0 0);
     --card-foreground: oklch(0.141 0.005 285.823);
@@ -22,30 +22,30 @@
     --accent-foreground: oklch(0.21 0.006 285.885);
     --destructive: oklch(0.577 0.245 27.325);
     --destructive-foreground: oklch(0.985 0 0);
-    --border: oklch(0.91 0.004 286.32);
-    --input: oklch(0.92 0.004 286.32);
+    --border: oklch(0.88 0.004 286.32);
+    --input: oklch(0.88 0.004 286.32);
     --ring: oklch(0.705 0.213 47.604);
     --chart-1: oklch(0.646 0.222 41.116);
     --chart-2: oklch(0.6 0.118 184.704);
     --chart-3: oklch(0.398 0.07 227.392);
     --chart-4: oklch(0.828 0.189 84.429);
     --chart-5: oklch(0.769 0.188 70.08);
-    --sidebar: oklch(0.985 0 0);
+    --sidebar: #fafafa;
     --sidebar-foreground: oklch(0.141 0.005 285.823);
     --sidebar-primary: oklch(0.705 0.213 47.604);
     --sidebar-primary-foreground: oklch(0.98 0.016 73.684);
-    --sidebar-accent: oklch(0.967 0.001 286.375);
+    --sidebar-accent: #eaeaea;
     --sidebar-accent-foreground: oklch(0.21 0.006 285.885);
     --sidebar-border: oklch(0.92 0.004 286.32);
     --sidebar-ring: oklch(0.705 0.213 47.604);
 }
 
 .dark {
-    --background: oklch(0.19 0.006 285.885);
+    --background: #0d0d0f;
     --foreground: oklch(0.985 0 0);
-    --card: oklch(0.21 0.006 285.885);
+    --card: #0d0d0f;
     --card-foreground: oklch(0.985 0 0);
-    --popover: oklch(0.21 0.006 285.885);
+    --popover: #0d0d0f;
     --popover-foreground: oklch(0.985 0 0);
     --primary: oklch(0.6717 0.1946 41.93);
     --primary-foreground: oklch(0.98 0.016 73.684);
@@ -57,7 +57,7 @@
     --accent-foreground: oklch(0.985 0 0);
     --destructive: oklch(0.5382 0.1949 22.216);
     --destructive-foreground: oklch(0.985 0 0);
-    --border: oklch(1 0 0 / 13%);
+    --border: oklch(1 0 0 / 18%);
     --input: oklch(1 0 0 / 18%);
     --ring: oklch(0.646 0.222 41.116);
     --chart-1: oklch(0.488 0.243 264.376);
@@ -65,11 +65,11 @@
     --chart-3: oklch(0.769 0.188 70.08);
     --chart-4: oklch(0.627 0.265 303.9);
     --chart-5: oklch(0.645 0.246 16.439);
-    --sidebar: oklch(0.21 0.006 285.885);
+    --sidebar: #040404;
     --sidebar-foreground: oklch(0.985 0 0);
     --sidebar-primary: oklch(0.646 0.222 41.116);
     --sidebar-primary-foreground: oklch(0.98 0.016 73.684);
-    --sidebar-accent: oklch(0.274 0.006 286.033);
+    --sidebar-accent: #131317;
     --sidebar-accent-foreground: oklch(0.985 0 0);
     --sidebar-border: oklch(1 0 0 / 10%);
     --sidebar-ring: oklch(0.646 0.222 41.116);
@@ -110,6 +110,15 @@
     --color-chart-4: var(--chart-4);
     --color-chart-5: var(--chart-5);
 
+    --color-sidebar: var(--sidebar);
+    --color-sidebar-foreground: var(--sidebar-foreground);
+    --color-sidebar-primary: var(--sidebar-primary);
+    --color-sidebar-primary-foreground: var(--sidebar-primary-foreground);
+    --color-sidebar-accent: var(--sidebar-accent);
+    --color-sidebar-accent-foreground: var(--sidebar-accent-foreground);
+    --color-sidebar-border: var(--sidebar-border);
+    --color-sidebar-ring: var(--sidebar-ring);
+
     --radius-lg: var(--radius);
     --radius-md: calc(var(--radius) - 2px);
     --radius-sm: calc(var(--radius) - 4px);
@@ -166,7 +175,9 @@ p {
 }
 
 @keyframes dot-pulse {
-    0%, 80%, 100% {
+    0%,
+    80%,
+    100% {
         opacity: 0.3;
         transform: scale(0.8);
     }
@@ -189,7 +200,10 @@ p {
     /* Only apply custom viewport height on mobile */
     @media (max-width: 767px) {
         .h-screen-safe {
-            height: var(--vh, 100vh); /* Use CSS variable set by ViewportHeightFix on mobile */
+            height: var(
+                --vh,
+                100vh
+            ); /* Use CSS variable set by ViewportHeightFix on mobile */
         }
     }
 }
diff --git a/src/components/InternalResourceForm.tsx b/src/components/InternalResourceForm.tsx
index a4a793753..7dc500468 100644
--- a/src/components/InternalResourceForm.tsx
+++ b/src/components/InternalResourceForm.tsx
@@ -1176,7 +1176,7 @@ export function InternalResourceForm({
                                                                             </span>
                                                                         )
                                                                     )}
-                                                                    <span className="pl-1">
+                                                                    <span className="pl-1 font-normal">
                                                                         {t(
                                                                             "accessClientSelect"
                                                                         )}
diff --git a/src/components/LayoutHeader.tsx b/src/components/LayoutHeader.tsx
index bef016853..29850f115 100644
--- a/src/components/LayoutHeader.tsx
+++ b/src/components/LayoutHeader.tsx
@@ -49,7 +49,7 @@ export function LayoutHeader({ showTopBar }: LayoutHeaderProps) {
 
     return (
         <div className="absolute top-0 left-0 right-0 z-50 hidden md:block">
-            <div className="absolute inset-0 bg-background/83 backdrop-blur-sm" />
+            <div className="absolute inset-0 bg-background backdrop-blur-sm" />
             <div className="relative z-10 px-6 py-2">
                 <div className="container mx-auto max-w-12xl">
                     <div className="h-16 flex items-center justify-between">
diff --git a/src/components/LayoutSidebar.tsx b/src/components/LayoutSidebar.tsx
index 27d8c2cd8..6e80ffd52 100644
--- a/src/components/LayoutSidebar.tsx
+++ b/src/components/LayoutSidebar.tsx
@@ -125,7 +125,7 @@ export function LayoutSidebar({
     return (
         <div
             className={cn(
-                "hidden md:flex border-r bg-card flex-col h-full shrink-0 relative",
+                "hidden md:flex border-r bg-sidebar flex-col h-full shrink-0 relative",
                 isSidebarCollapsed ? "w-16" : "w-64"
             )}
         >
@@ -154,7 +154,7 @@ export function LayoutSidebar({
                             <Link
                                 href="/admin"
                                 className={cn(
-                                    "flex items-center transition-colors text-muted-foreground hover:text-foreground text-sm w-full hover:bg-secondary/80 dark:hover:bg-secondary/50 rounded-md",
+                                    "flex items-center transition-colors text-muted-foreground hover:text-foreground text-sm w-full hover:bg-sidebar-accent/80 dark:hover:bg-sidebar-accent/50 rounded-md",
                                     isSidebarCollapsed
                                         ? "px-2 py-2 justify-center"
                                         : "px-3 py-1.5"
@@ -191,7 +191,7 @@ export function LayoutSidebar({
                     />
                 </div>
                 {/* Fade gradient at bottom to indicate scrollable content */}
-                <div className="sticky bottom-0 left-0 right-0 h-8 pointer-events-none bg-gradient-to-t from-card to-transparent" />
+                <div className="sticky bottom-0 left-0 right-0 h-8 pointer-events-none bg-gradient-to-t from-sidebar to-transparent" />
             </div>
 
             {isSidebarCollapsed && (
@@ -206,7 +206,7 @@ export function LayoutSidebar({
                                         setHasManualToggle(true);
                                         setSidebarStateCookie(false);
                                     }}
-                                    className="rounded-md p-2 text-muted-foreground hover:text-foreground hover:bg-secondary/80 dark:hover:bg-secondary/50 transition-colors"
+                                    className="rounded-md p-2 text-muted-foreground hover:text-foreground hover:bg-sidebar-accent/80 dark:hover:bg-sidebar-accent/50 transition-colors"
                                     aria-label={t("sidebarExpand")}
                                 >
                                     <PanelRightOpen className="h-4 w-4" />
diff --git a/src/components/OrgIdpTable.tsx b/src/components/OrgIdpTable.tsx
index 1fe61b2fc..bdbaafa27 100644
--- a/src/components/OrgIdpTable.tsx
+++ b/src/components/OrgIdpTable.tsx
@@ -187,23 +187,6 @@ export default function IdpTable({ idps, orgId }: Props) {
     };
 
     const columns: ExtendedColumnDef<IdpRow>[] = [
-        {
-            accessorKey: "idpId",
-            friendlyName: "ID",
-            header: ({ column }) => {
-                return (
-                    <Button
-                        variant="ghost"
-                        onClick={() =>
-                            column.toggleSorting(column.getIsSorted() === "asc")
-                        }
-                    >
-                        ID
-                        <ArrowUpDown className="ml-2 h-4 w-4" />
-                    </Button>
-                );
-            }
-        },
         {
             accessorKey: "name",
             friendlyName: t("name"),
diff --git a/src/components/OrgSelector.tsx b/src/components/OrgSelector.tsx
index fcbc700a2..5f77582f5 100644
--- a/src/components/OrgSelector.tsx
+++ b/src/components/OrgSelector.tsx
@@ -76,8 +76,8 @@ export function OrgSelector({
                     className={cn(
                         "cursor-pointer transition-colors",
                         isCollapsed
-                            ? "w-full h-16 flex items-center justify-center hover:bg-muted"
-                            : "w-full px-5 py-4 hover:bg-muted"
+                            ? "w-full h-16 flex items-center justify-center hover:bg-sidebar-accent/80 dark:hover:bg-sidebar-accent/50"
+                            : "w-full px-5 py-4 hover:bg-sidebar-accent/80 dark:hover:bg-sidebar-accent/50"
                     )}
                 >
                     {isCollapsed ? (
@@ -172,7 +172,7 @@ export function OrgSelector({
                         <Button
                             variant="ghost"
                             size="sm"
-                            className="w-full justify-start h-8 font-normal text-muted-foreground hover:text-foreground"
+                            className="w-full justify-start h-8 font-normal text-muted-foreground"
                             onClick={() => {
                                 setOpen(false);
                                 router.push("/setup");
diff --git a/src/components/SidebarNav.tsx b/src/components/SidebarNav.tsx
index 5769bf5cf..dd673dace 100644
--- a/src/components/SidebarNav.tsx
+++ b/src/components/SidebarNav.tsx
@@ -121,8 +121,8 @@ function CollapsibleNavItem({
                         "flex items-center w-full rounded-md transition-colors",
                         "px-3 py-1.5",
                         isActive
-                            ? "bg-secondary font-medium"
-                            : "text-muted-foreground hover:bg-secondary/80 dark:hover:bg-secondary/50 hover:text-foreground",
+                            ? "bg-sidebar-accent font-medium"
+                            : "text-muted-foreground hover:bg-sidebar-accent/80 dark:hover:bg-sidebar-accent/50 hover:text-foreground",
                         isDisabled && "cursor-not-allowed opacity-60"
                     )}
                     disabled={isDisabled}
@@ -256,8 +256,8 @@ function CollapsedNavItemWithPopover({
                                 className={cn(
                                     "flex items-center rounded-md transition-colors px-2 py-2 justify-center w-full",
                                     isActive || isChildActive
-                                        ? "bg-secondary font-medium"
-                                        : "text-muted-foreground hover:bg-secondary/80 dark:hover:bg-secondary/50 hover:text-foreground",
+                                        ? "bg-sidebar-accent font-medium"
+                                        : "text-muted-foreground hover:bg-sidebar-accent/80 dark:hover:bg-sidebar-accent/50 hover:text-foreground",
                                     isDisabled &&
                                         "cursor-not-allowed opacity-60"
                                 )}
@@ -308,8 +308,8 @@ function CollapsedNavItemWithPopover({
                                         className={cn(
                                             "flex items-center rounded-md transition-colors px-3 py-1.5 text-sm",
                                             childIsActive
-                                                ? "bg-secondary font-medium"
-                                                : "text-muted-foreground hover:bg-secondary/50 hover:text-foreground",
+                                                ? "bg-sidebar-accent font-medium"
+                                                : "text-muted-foreground hover:bg-sidebar-accent/50 hover:text-foreground",
                                             childIsDisabled &&
                                                 "cursor-not-allowed opacity-60"
                                         )}
@@ -450,8 +450,8 @@ export function SidebarNav({
                     "flex items-center rounded-md transition-colors relative",
                     isCollapsed ? "px-2 py-2 justify-center" : "px-3 py-1.5",
                     isActive
-                        ? "bg-secondary font-medium"
-                        : "text-muted-foreground hover:bg-secondary/80 dark:hover:bg-secondary/50 hover:text-foreground",
+                        ? "bg-sidebar-accent font-medium"
+                        : "text-muted-foreground hover:bg-sidebar-accent/80 dark:hover:bg-sidebar-accent/50 hover:text-foreground",
                     isDisabled && "cursor-not-allowed opacity-60"
                 )}
                 onClick={(e) => {