diff --git a/src/lib/components/bottom-nav-namespaces.svelte b/src/lib/components/bottom-nav-namespaces.svelte
index 33e77beae..eac4dbdec 100644
--- a/src/lib/components/bottom-nav-namespaces.svelte
+++ b/src/lib/components/bottom-nav-namespaces.svelte
@@ -45,7 +45,7 @@
 
 <style lang="postcss">
   .namespace {
-    @apply w-full cursor-pointer rounded border border-transparent text-left text-sm font-medium hover:surface-interactive-secondary focus-visible:surface-interactive-secondary focus-visible:border-inverse focus-visible:outline-none focus-visible:ring-4 focus-visible:ring-primary/70 dark:focus-visible:border-interactive;
+    @apply w-full cursor-pointer rounded border border-transparent text-left text-sm font-medium hover:surface-interactive-secondary focus-visible:surface-interactive-secondary focus-visible:border-inverse focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary/70 dark:focus-visible:border-interactive;
 
     &.selected {
       @apply text-brand;
diff --git a/src/lib/components/bottom-nav-settings.svelte b/src/lib/components/bottom-nav-settings.svelte
index a930f9c04..0d71c6ef4 100644
--- a/src/lib/components/bottom-nav-settings.svelte
+++ b/src/lib/components/bottom-nav-settings.svelte
@@ -42,7 +42,7 @@
         : 'transcoder-off'}
     />
     <DataEncoderSettings />
-    <div class="border-b-2 border-subtle" />
+    <div class="border-b border-subtle" />
     <NavigationButton
       onClick={() => ($useDarkMode = !$useDarkMode)}
       tooltip={$useDarkMode
diff --git a/src/lib/components/bottom-nav.svelte b/src/lib/components/bottom-nav.svelte
index 4422342b6..1c596d65e 100644
--- a/src/lib/components/bottom-nav.svelte
+++ b/src/lib/components/bottom-nav.svelte
@@ -114,7 +114,7 @@
       class="grow text-white"
       on:click={onNamespaceClick}>{truncateNamespace(namespace)}</Button
     >
-    <div class="ml-1 h-full w-1 border-l-2 border-subtle" />
+    <div class="ml-1 h-full w-1 border-l border-subtle" />
     <Button
       variant="ghost"
       size="xs"
@@ -144,7 +144,7 @@
 
 <style lang="postcss">
   .namespace-wrapper {
-    @apply surface-black flex h-10 w-full grow flex-row items-center rounded-lg border-2 border-subtle px-0.5 text-sm dark:focus-within:surface-primary focus-within:border-interactive focus-within:outline-none focus-within:ring-4 focus-within:ring-primary/70;
+    @apply surface-black flex h-10 w-full grow flex-row items-center rounded-lg border border-subtle px-0.5 text-sm dark:focus-within:surface-primary focus-within:border-interactive focus-within:outline-none focus-within:ring-2 focus-within:ring-primary/70;
   }
 
   .nav-button {
diff --git a/src/lib/components/event/event-details-full.svelte b/src/lib/components/event/event-details-full.svelte
index 68dac245d..57b170274 100644
--- a/src/lib/components/event/event-details-full.svelte
+++ b/src/lib/components/event/event-details-full.svelte
@@ -20,13 +20,13 @@
 {#if showEventGroup}
   <div class="w-full p-2">
     <div
-      class="flex flex-col gap-0 overflow-hidden rounded-xl border-2 border-subtle xl:flex-row"
+      class="flex flex-col gap-0 overflow-hidden rounded-xl border border-subtle xl:flex-row"
     >
       {#each group.eventList as groupEvent}
         {@const attributes = formatAttributes(groupEvent)}
         {@const details = Object.entries(attributes)}
         <div
-          class="w-full border-subtle [&:not(:last-child)]:border-r-2"
+          class="w-full border-subtle [&:not(:last-child)]:border-r"
           class:three-events={group.eventList.length === 3 ||
             (group.eventList.length === 2 && pendingEvent)}
           class:two-events={group.eventList.length === 2 ||
@@ -54,7 +54,7 @@
       {#if pendingEvent}
         {@const details = Object.entries(pendingEvent)}
         <div
-          class="w-full border-subtle [&:not(:last-child)]:border-r-2"
+          class="w-full border-subtle [&:not(:last-child)]:border-r"
           class:three-events={group.eventList.length === 2}
           class:two-events={group.eventList.length === 1}
         >
@@ -76,7 +76,7 @@
   {@const attributes = formatAttributes(event)}
   {@const details = Object.entries(attributes)}
   <div class="w-full p-2">
-    <div class="w-full overflow-hidden rounded-xl border-2 border-subtle">
+    <div class="w-full overflow-hidden rounded-xl border border-subtle">
       <EventLinksExpanded links={event?.links} />
       {#each details as [key, value] (key)}
         <EventDetailsRowExpanded {key} {value} {attributes} />
diff --git a/src/lib/components/event/event-details-row.svelte b/src/lib/components/event/event-details-row.svelte
index 135e504f7..491665be7 100644
--- a/src/lib/components/event/event-details-row.svelte
+++ b/src/lib/components/event/event-details-row.svelte
@@ -61,6 +61,6 @@
 
 <style lang="postcss">
   .payload {
-    @apply overflow-hidden rounded border-2 border-subtle bg-primary px-1 py-0.5 font-mono text-xs;
+    @apply overflow-hidden rounded border border-subtle bg-primary px-1 py-0.5 font-mono text-xs;
   }
 </style>
diff --git a/src/lib/components/event/event-group-details.svelte b/src/lib/components/event/event-group-details.svelte
index 03c16e0ff..ef3341399 100644
--- a/src/lib/components/event/event-group-details.svelte
+++ b/src/lib/components/event/event-group-details.svelte
@@ -19,7 +19,7 @@
   $: ({ workflow, run, namespace } = $page.params);
 </script>
 
-<div class="w-full border-slate-700 lg:w-1/3 lg:border-r-2">
+<div class="w-full border-slate-700 lg:w-1/3 lg:border-r">
   <Table class="surface-primary w-full table-fixed pb-2" variant="simple">
     {#each [...eventGroup.events].reverse() as [id, eventInGroup] (id)}
       <tr
diff --git a/src/lib/components/feedback-button.svelte b/src/lib/components/feedback-button.svelte
index 1d652a4e7..f072373aa 100644
--- a/src/lib/components/feedback-button.svelte
+++ b/src/lib/components/feedback-button.svelte
@@ -19,7 +19,7 @@
 
 <style lang="postcss">
   .feedback-button {
-    @apply flex w-40 cursor-pointer items-center justify-between rounded-full px-4 py-2 text-sm text-purple-200 shadow-md;
+    @apply flex cursor-pointer items-center justify-between rounded-full px-4 py-2 text-sm text-purple-200 shadow-md;
   }
 
   .feedback-button:hover {
@@ -27,6 +27,6 @@
   }
 
   .feedback-icon {
-    @apply mr-2 rounded-full border-2 border-purple-200;
+    @apply mr-2 rounded-full border-purple-200;
   }
 </style>
diff --git a/src/lib/components/lines-and-dots/svg/group-details-row.svelte b/src/lib/components/lines-and-dots/svg/group-details-row.svelte
index 7f9b5facd..9174a1337 100644
--- a/src/lib/components/lines-and-dots/svg/group-details-row.svelte
+++ b/src/lib/components/lines-and-dots/svg/group-details-row.svelte
@@ -162,7 +162,7 @@
           runId={childWorkflowStartedEvent.attributes.workflowExecution.runId}
           height={childTimelineHeight}
           width={childTimelineWidth}
-          class="overflow-x-hidden rounded-br rounded-tr border-b-2 border-r-2 border-t-2 border-subtle bg-primary"
+          class="overflow-x-hidden rounded-br rounded-tr border-y border-r border-subtle bg-primary"
         />
       {/key}
     </foreignObject>
diff --git a/src/lib/components/lines-and-dots/svg/timeline-graph.svelte b/src/lib/components/lines-and-dots/svg/timeline-graph.svelte
index a05cc3533..ec7088ce4 100644
--- a/src/lib/components/lines-and-dots/svg/timeline-graph.svelte
+++ b/src/lib/components/lines-and-dots/svg/timeline-graph.svelte
@@ -67,7 +67,7 @@
 </script>
 
 <div
-  class="relative h-auto overflow-auto border-b-2 border-subtle"
+  class="relative h-auto overflow-auto border-b border-subtle"
   bind:clientWidth={canvasWidth}
   style="max-height: {viewportHeight}px;"
   on:scroll={handleScroll}
diff --git a/src/lib/components/lines-and-dots/workflow-error.svelte b/src/lib/components/lines-and-dots/workflow-error.svelte
index 6cec7c2c4..74037b33b 100644
--- a/src/lib/components/lines-and-dots/workflow-error.svelte
+++ b/src/lib/components/lines-and-dots/workflow-error.svelte
@@ -46,7 +46,7 @@
       </p>
     {/if}
     <div
-      class="mt-2 flex w-full flex-col gap-0 overflow-hidden rounded-xl border-2 border-danger"
+      class="mt-2 flex w-full flex-col gap-0 overflow-hidden rounded-xl border border-danger"
     >
       <div class="flex items-center justify-between gap-2 bg-danger px-2 py-2">
         <div class="flex items-center gap-2">
diff --git a/src/lib/components/panel.svelte b/src/lib/components/panel.svelte
index bc1cabca5..6c791512a 100644
--- a/src/lib/components/panel.svelte
+++ b/src/lib/components/panel.svelte
@@ -8,7 +8,7 @@
 
 <style lang="postcss">
   .panel {
-    @apply rounded-xl border-2 p-8 dark:border-subtle;
+    @apply rounded-xl border p-8 dark:border-subtle;
 
     &.error {
       @apply border-danger bg-danger;
diff --git a/src/lib/components/schedule/schedule-basic-frequency.svelte b/src/lib/components/schedule/schedule-basic-frequency.svelte
index 32a1a5574..f2063008d 100644
--- a/src/lib/components/schedule/schedule-basic-frequency.svelte
+++ b/src/lib/components/schedule/schedule-basic-frequency.svelte
@@ -22,6 +22,6 @@
 
 <style lang="postcss">
   .frequency {
-    @apply flex h-auto max-h-32 flex-col overflow-auto rounded-lg border-2 border-subtle bg-primary px-2 py-2 font-mono text-sm;
+    @apply flex h-auto max-h-32 flex-col overflow-auto rounded-lg border border-subtle bg-primary px-2 py-2 font-mono text-sm;
   }
 </style>
diff --git a/src/lib/components/schedule/schedule-recent-runs.svelte b/src/lib/components/schedule/schedule-recent-runs.svelte
index 0ecf1068f..8928da47c 100644
--- a/src/lib/components/schedule/schedule-recent-runs.svelte
+++ b/src/lib/components/schedule/schedule-recent-runs.svelte
@@ -93,6 +93,6 @@
 
 <style lang="postcss">
   .row {
-    @apply my-1 inline-flex w-full items-center border-b-2 border-subtle py-1;
+    @apply my-1 inline-flex w-full items-center border-b border-subtle py-1;
   }
 </style>
diff --git a/src/lib/components/schedule/schedule-upcoming-runs.svelte b/src/lib/components/schedule/schedule-upcoming-runs.svelte
index 6eef6e893..71a648c13 100644
--- a/src/lib/components/schedule/schedule-upcoming-runs.svelte
+++ b/src/lib/components/schedule/schedule-upcoming-runs.svelte
@@ -30,6 +30,6 @@
 
 <style lang="postcss">
   .row {
-    @apply my-1 inline-flex h-10 w-full justify-start border-b-2 border-subtle py-1;
+    @apply my-1 inline-flex h-10 w-full justify-start border-b border-subtle py-1;
   }
 </style>
diff --git a/src/lib/components/workflow/pending-activities.svelte b/src/lib/components/workflow/pending-activities.svelte
index 1b288f0f8..90bb1127b 100644
--- a/src/lib/components/workflow/pending-activities.svelte
+++ b/src/lib/components/workflow/pending-activities.svelte
@@ -189,7 +189,7 @@
   }
 
   .pending-activity-summary {
-    @apply w-full overflow-x-scroll border-b-2 border-subtle py-1 text-sm;
+    @apply w-full overflow-x-scroll border-b border-subtle py-1 text-sm;
   }
 
   .pending-activity-row:last-child .pending-activity-summary {
diff --git a/src/lib/components/workflow/workflow-loading-row.svelte b/src/lib/components/workflow/workflow-loading-row.svelte
index 3dd996d52..4eb6c9f7b 100644
--- a/src/lib/components/workflow/workflow-loading-row.svelte
+++ b/src/lib/components/workflow/workflow-loading-row.svelte
@@ -18,11 +18,11 @@
 
 <style lang="postcss">
   .row {
-    @apply items-center border-b-2 p-2 text-sm no-underline last-of-type:border-b-0 md:table-row md:text-base;
+    @apply items-center border-b p-2 text-sm no-underline last-of-type:border-b-0 md:table-row md:text-base;
   }
 
   .cell {
-    @apply p-2 text-left md:border-b-2;
+    @apply p-2 text-left md:border-b;
   }
 
   .row:last-of-type .cell {
diff --git a/src/lib/components/workflow/workflows-summary-configurable-table/table-empty-state.svelte b/src/lib/components/workflow/workflows-summary-configurable-table/table-empty-state.svelte
index 187528cc6..034027986 100644
--- a/src/lib/components/workflow/workflows-summary-configurable-table/table-empty-state.svelte
+++ b/src/lib/components/workflow/workflows-summary-configurable-table/table-empty-state.svelte
@@ -31,7 +31,7 @@
   aria-live="polite"
 >
   <div
-    class="surface-primary flex w-auto min-w-[280px] flex-col gap-4 border-b-2 border-table p-8 xl:min-w-[520px] xl:border-b-0 xl:border-r-2"
+    class="surface-primary flex w-auto min-w-[280px] flex-col gap-4 border-b border-table p-8 xl:min-w-[520px] xl:border-b-0 xl:border-r"
   >
     {#if updating}
       <Loading />
diff --git a/src/lib/holocene/accordion/accordion-group.svelte b/src/lib/holocene/accordion/accordion-group.svelte
index 7bdc4e0ae..f7da29070 100644
--- a/src/lib/holocene/accordion/accordion-group.svelte
+++ b/src/lib/holocene/accordion/accordion-group.svelte
@@ -1,5 +1,5 @@
 <div
-  class="*:rounded-none *:border-t-0 [&>*:first-child]:rounded-t-2xl [&>*:first-child]:border-t-2 [&>*:last-child]:rounded-b-2xl"
+  class="*:rounded-none *:border-t-0 [&>*:first-child]:rounded-t-2xl [&>*:first-child]:border-t [&>*:last-child]:rounded-b-2xl"
 >
   <slot />
 </div>
diff --git a/src/lib/holocene/accordion/accordion.svelte b/src/lib/holocene/accordion/accordion.svelte
index 181b7947c..9a3dfe365 100644
--- a/src/lib/holocene/accordion/accordion.svelte
+++ b/src/lib/holocene/accordion/accordion.svelte
@@ -42,7 +42,7 @@
 {#if expandable}
   <div
     class={merge(
-      'surface-primary w-full rounded-2xl border-2 border-subtle p-2 focus-within:ring-4 focus-within:ring-inset focus-within:ring-primary/70',
+      'surface-primary w-full rounded-2xl border border-subtle p-2 focus-within:ring-2 focus-within:ring-inset focus-within:ring-primary/70',
       className,
     )}
     {...$$restProps}
@@ -95,7 +95,7 @@
   </div>
 {:else}
   <div
-    class="surface-primary w-full rounded-2xl border-2 border-subtle p-4"
+    class="surface-primary w-full rounded-2xl border border-subtle p-4"
     {...$$restProps}
   >
     <div class="flex w-full flex-col rounded-lg">
diff --git a/src/lib/holocene/alert.svelte b/src/lib/holocene/alert.svelte
index 6ba761d5b..360e41069 100644
--- a/src/lib/holocene/alert.svelte
+++ b/src/lib/holocene/alert.svelte
@@ -64,7 +64,7 @@
 
 <style lang="postcss">
   .alert {
-    @apply items-start gap-2 break-words rounded-lg border-2 p-5 text-sm text-primary;
+    @apply items-start gap-2 break-words rounded-lg border p-5 text-sm text-primary;
   }
 
   .alert.success {
diff --git a/src/lib/holocene/button.svelte b/src/lib/holocene/button.svelte
index ced4059a1..231c0a8bf 100644
--- a/src/lib/holocene/button.svelte
+++ b/src/lib/holocene/button.svelte
@@ -20,7 +20,7 @@
       'w-fit',
       'items-center',
       'justify-center',
-      'border-2',
+      'border',
       'gap-2',
       'rounded-lg',
       'disabled:opacity-50',
@@ -30,7 +30,7 @@
       'transition-shadow',
       'focus-visible:outline-none',
       'focus-visible:border-inverse',
-      'focus-visible:ring-4',
+      'focus-visible:ring-2',
       'whitespace-nowrap',
       'no-underline',
       '[.button-group>&]:rounded-none',
diff --git a/src/lib/holocene/card.svelte b/src/lib/holocene/card.svelte
index 5928f00b3..bfce13189 100644
--- a/src/lib/holocene/card.svelte
+++ b/src/lib/holocene/card.svelte
@@ -4,6 +4,6 @@
 
 <style lang="postcss">
   .card {
-    @apply rounded-2xl border-2 border-subtle p-4;
+    @apply rounded-2xl border border-subtle p-4;
   }
 </style>
diff --git a/src/lib/holocene/checkbox.svelte b/src/lib/holocene/checkbox.svelte
index ca2a0a68e..435052b3d 100644
--- a/src/lib/holocene/checkbox.svelte
+++ b/src/lib/holocene/checkbox.svelte
@@ -114,8 +114,8 @@
           'flex-none',
           'cursor-pointer',
           'rounded-md',
-          'border-2',
-          'bg-transparent',
+          'border',
+          'bg-primary',
           'text-inverse',
           'bg-clip-padding',
           'peer-indeterminate:bg-interactive',
@@ -124,17 +124,17 @@
           'peer-checked:border-interactive',
         ],
         !disabled && [
-          'group-hover:border-transparent',
-          'peer-focus-visible:border-transparent',
-          'group-hover:peer-checked:border-transparent',
-          'group-hover:peer-indeterminate:border-transparent',
+          'group-hover:border-inverse',
+          'peer-focus-visible:border-inverse',
+          'group-hover:peer-checked:border-inverse',
+          'group-hover:peer-indeterminate:border-inverse',
           'group-hover:bg-interactive-active',
           'peer-focus-visible:bg-interactive-active',
           'group-hover:peer-checked:bg-interactive-active',
           'group-hover:peer-indeterminate:bg-interactive-active',
-          'group-hover:ring-4',
+          'group-hover:ring-2',
           'group-hover:ring-primary/70',
-          'peer-focus-visible:ring-4',
+          'peer-focus-visible:ring-2',
           'peer-focus-visible:ring-primary/70',
         ],
         disabled && ['cursor-not-allowed', 'opacity-50'],
diff --git a/src/lib/holocene/combobox/combobox.svelte b/src/lib/holocene/combobox/combobox.svelte
index fbee0ee64..d4fe98e43 100644
--- a/src/lib/holocene/combobox/combobox.svelte
+++ b/src/lib/holocene/combobox/combobox.svelte
@@ -436,7 +436,7 @@
       />
     </div>
     {#if $$slots.action}
-      <div class="ml-1 flex h-full items-center border-l-2 border-subtle p-0.5">
+      <div class="ml-1 flex h-full items-center border-l border-subtle p-0.5">
         {#if actionTooltip}
           <Tooltip text={actionTooltip} right>
             <slot name="action" />
@@ -446,7 +446,7 @@
         {/if}
       </div>
     {:else if href}
-      <div class="ml-1 flex h-full items-center border-l-2 border-subtle p-0.5">
+      <div class="ml-1 flex h-full items-center border-l border-subtle p-0.5">
         {#if actionTooltip}
           <Tooltip text={actionTooltip} right>
             <Button
@@ -519,10 +519,10 @@
 
 <style lang="postcss">
   .combobox-wrapper {
-    @apply surface-primary flex w-full flex-row items-center rounded-lg border-2 border-subtle text-sm dark:focus-within:surface-primary focus-within:border-interactive focus-within:outline-none focus-within:ring-4 focus-within:ring-primary/70;
+    @apply surface-primary flex w-full flex-row items-center rounded-lg border border-subtle text-sm dark:focus-within:surface-primary focus-within:border-interactive focus-within:outline-none focus-within:ring-2 focus-within:ring-primary/70;
 
     &.invalid {
-      @apply border-2 border-danger text-danger focus-within:ring-danger/70;
+      @apply border border-danger text-danger focus-within:ring-danger/70;
     }
 
     &.disabled {
diff --git a/src/lib/holocene/copyable/button.svelte b/src/lib/holocene/copyable/button.svelte
index a430ba3ac..a5203a6b3 100644
--- a/src/lib/holocene/copyable/button.svelte
+++ b/src/lib/holocene/copyable/button.svelte
@@ -23,7 +23,7 @@
 
 <button
   class={merge(
-    'surface-interactive-secondary m-1 rounded-md border-2 border-[transparent] bg-transparent p-1 focus-visible:outline-none focus-visible:ring-4 focus-visible:ring-primary/70',
+    'surface-interactive-secondary m-1 rounded-md border border-[transparent] bg-transparent p-1 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary/70',
     className,
   )}
   on:click
diff --git a/src/lib/holocene/empty-state.svelte b/src/lib/holocene/empty-state.svelte
index 09a45e056..06e4ba3ea 100644
--- a/src/lib/holocene/empty-state.svelte
+++ b/src/lib/holocene/empty-state.svelte
@@ -22,7 +22,7 @@
     <p class="text-center">{content}</p>
   {/if}
   {#if error}
-    <p class="rounded-md border-2 border-danger bg-danger p-5 text-center">
+    <p class="rounded-md border border-danger bg-danger p-5 text-center">
       {error}
     </p>
   {/if}
diff --git a/src/lib/holocene/input/chip-input.svelte b/src/lib/holocene/input/chip-input.svelte
index b9bd24dfd..d2aadaaf3 100644
--- a/src/lib/holocene/input/chip-input.svelte
+++ b/src/lib/holocene/input/chip-input.svelte
@@ -174,11 +174,11 @@
 
 <style lang="postcss">
   .input-container {
-    @apply surface-primary flex max-h-20 min-h-[2.5rem] w-full flex-row flex-wrap gap-1 overflow-y-scroll rounded-lg border-2 border-subtle p-2 text-sm text-primary focus-within:border-interactive focus-within:ring-4 focus-within:ring-primary/70;
+    @apply surface-primary flex max-h-20 min-h-[2.5rem] w-full flex-row flex-wrap gap-1 overflow-y-scroll rounded-lg border border-subtle p-2 text-sm text-primary focus-within:border-interactive focus-within:ring-2 focus-within:ring-primary/70;
   }
 
   .invalid {
-    @apply border-danger focus-within:border-danger focus-within:ring-4 focus-within:ring-danger/70;
+    @apply border-danger focus-within:border-danger focus-within:ring-2 focus-within:ring-danger/70;
   }
 
   input {
diff --git a/src/lib/holocene/input/input.svelte b/src/lib/holocene/input/input.svelte
index 7a74e9928..4ca7b965b 100644
--- a/src/lib/holocene/input/input.svelte
+++ b/src/lib/holocene/input/input.svelte
@@ -93,7 +93,9 @@
   <div class="input-group flex rounded-lg">
     <slot name="before-input" {disabled} />
     <div
-      class="input-container"
+      class={merge(
+        'surface-primary relative box-border inline-flex h-10 w-full items-center rounded-lg border border-subtle text-sm focus-within:outline-none focus-within:ring-2 focus-within:ring-primary/70',
+      )}
       class:disabled
       class:error
       class:noBorder
@@ -185,7 +187,7 @@
 <style lang="postcss">
   /* Base styles */
   .input-container {
-    @apply surface-primary relative box-border inline-flex h-10 w-full items-center rounded-lg border-2 border-subtle text-sm focus-within:outline-none focus-within:ring-4 focus-within:ring-primary/70;
+    /* @apply ; */
 
     &.error,
     &.invalid {
diff --git a/src/lib/holocene/input/number-input.svelte b/src/lib/holocene/input/number-input.svelte
index 9f29bf621..e62ca4ea6 100644
--- a/src/lib/holocene/input/number-input.svelte
+++ b/src/lib/holocene/input/number-input.svelte
@@ -88,7 +88,7 @@
   }
 
   .input-container {
-    @apply surface-primary relative box-border flex h-10 w-16 items-center rounded-lg border-2 border-subtle text-sm focus-within:outline-none focus-within:ring-4 focus-within:ring-primary/70;
+    @apply surface-primary relative box-border flex h-10 w-16 items-center rounded-lg border border-subtle text-sm focus-within:outline-none focus-within:ring-2 focus-within:ring-primary/70;
   }
 
   .input-container.search {
diff --git a/src/lib/holocene/input/range-input.svelte b/src/lib/holocene/input/range-input.svelte
index e3ca93a39..c48e4745d 100644
--- a/src/lib/holocene/input/range-input.svelte
+++ b/src/lib/holocene/input/range-input.svelte
@@ -124,7 +124,7 @@
   }
 
   .numeric-input {
-    @apply h-10 w-10 rounded-lg border-2 border-subtle bg-information text-center text-sm focus-within:outline-none focus-within:ring-4 focus-within:ring-primary/70;
+    @apply h-10 w-10 rounded-lg border border-subtle bg-information text-center text-sm focus-within:outline-none focus-within:ring-2 focus-within:ring-primary/70;
 
     appearance: textfield;
   }
@@ -140,7 +140,7 @@
   }
 
   .numeric-input:focus {
-    @apply outline outline-2 outline-blue-700;
+    @apply outline ring-2 ring-primary/70;
   }
 
   .floating-value {
@@ -148,7 +148,7 @@
   }
 
   input[type='range']::-webkit-slider-thumb {
-    @apply h-4 w-8 appearance-none rounded-full border-2 border-solid border-primary bg-information;
+    @apply h-4 w-8 appearance-none rounded-full border border-solid border-primary bg-information;
   }
 
   input[type='range']::-moz-range-thumb {
@@ -160,10 +160,10 @@
   }
 
   input[type='range']:focus::-webkit-slider-thumb {
-    @apply border border-primary outline outline-2 outline-blue-700;
+    @apply border border-primary ring-2 ring-primary/70;
   }
 
   input[type='range']:focus::-moz-range-thumb {
-    @apply border border-primary outline outline-2 outline-blue-700;
+    @apply border border-primary ring-2 ring-primary/70;
   }
 </style>
diff --git a/src/lib/holocene/keyboard-shortcut/shortcut.svelte b/src/lib/holocene/keyboard-shortcut/shortcut.svelte
index b9b5f3d63..950aca116 100644
--- a/src/lib/holocene/keyboard-shortcut/shortcut.svelte
+++ b/src/lib/holocene/keyboard-shortcut/shortcut.svelte
@@ -30,6 +30,6 @@
 
 <style lang="postcss">
   .shortcut {
-    @apply inline-flex w-auto min-w-[32px] items-center justify-center rounded-lg border-2 border-slate-100 px-1 py-1.5 text-xs font-semibold text-white dark:border-slate-500 dark:bg-slate-600 dark:text-slate-100;
+    @apply inline-flex w-auto min-w-[32px] items-center justify-center rounded-lg border border-slate-100 px-1 py-1.5 text-xs font-semibold text-white dark:border-slate-500 dark:bg-slate-600 dark:text-slate-100;
   }
 </style>
diff --git a/src/lib/holocene/link.svelte b/src/lib/holocene/link.svelte
index ba9bae605..adc2c3ad7 100644
--- a/src/lib/holocene/link.svelte
+++ b/src/lib/holocene/link.svelte
@@ -59,7 +59,7 @@
 
 <style lang="postcss">
   .link {
-    @apply max-w-fit cursor-pointer items-center gap-2 rounded text-primary underline underline-offset-2 hover:text-brand focus-visible:text-brand focus-visible:outline-none focus-visible:ring-4 focus-visible:ring-primary/70;
+    @apply max-w-fit cursor-pointer items-center gap-2 rounded text-primary underline underline-offset-2 hover:text-brand focus-visible:text-brand focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary/70;
 
     &.active {
       @apply text-brand;
diff --git a/src/lib/holocene/menu/menu-item.svelte b/src/lib/holocene/menu/menu-item.svelte
index 76ba4c2e8..666050f23 100644
--- a/src/lib/holocene/menu/menu-item.svelte
+++ b/src/lib/holocene/menu/menu-item.svelte
@@ -181,7 +181,7 @@
 
 <style lang="postcss">
   .menu-item {
-    @apply cursor-pointer rounded border border-transparent text-sm font-medium focus-visible:border-inverse focus-visible:outline-none focus-visible:ring-4 focus-visible:ring-primary/70 dark:focus-visible:border-interactive;
+    @apply cursor-pointer rounded border border-transparent text-sm font-medium focus-visible:border-inverse focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary/70 dark:focus-visible:border-interactive;
 
     &.hoverable {
       @apply hover:surface-interactive-secondary focus-visible:surface-interactive-secondary;
diff --git a/src/lib/holocene/menu/menu.svelte b/src/lib/holocene/menu/menu.svelte
index b69a59dc1..983b1d40c 100644
--- a/src/lib/holocene/menu/menu.svelte
+++ b/src/lib/holocene/menu/menu.svelte
@@ -65,7 +65,7 @@
 
 <style lang="postcss">
   .menu {
-    @apply surface-primary absolute z-20 mt-1 min-w-fit list-none overflow-auto rounded-lg border-2 border-subtle text-primary shadow;
+    @apply surface-primary absolute z-20 mt-1 min-w-fit list-none overflow-auto rounded-lg border border-subtle text-primary shadow;
 
     &.left,
     &.top-left {
diff --git a/src/lib/holocene/modal.svelte b/src/lib/holocene/modal.svelte
index 558f6cf1b..690f0b094 100644
--- a/src/lib/holocene/modal.svelte
+++ b/src/lib/holocene/modal.svelte
@@ -137,7 +137,7 @@
 
 <style lang="postcss">
   .body {
-    @apply surface-primary z-50 w-full max-w-lg overflow-y-auto rounded-2xl border-2 border-secondary p-0 text-primary shadow-xl md:h-max;
+    @apply surface-primary z-50 w-full max-w-lg overflow-y-auto rounded-2xl border border-secondary p-0 text-primary shadow-xl md:h-max;
   }
 
   .body::backdrop {
diff --git a/src/lib/holocene/navigation/navigation-container.svelte b/src/lib/holocene/navigation/navigation-container.svelte
index 9d127b7a2..00ac87a28 100644
--- a/src/lib/holocene/navigation/navigation-container.svelte
+++ b/src/lib/holocene/navigation/navigation-container.svelte
@@ -18,7 +18,7 @@
 <nav
   class={merge(
     'group grid h-screen min-h-[600px] w-16 grid-cols-[2rem] grid-rows-[fit-content(1.5rem)_minmax(3rem,4rem)_1fr_8rem] gap-2 border-r border-subtle px-4 py-5 transition-width data-[nav=open]:w-[180px] data-[nav=open]:grid-cols-[100%]',
-    'focus-visible:[&_[role=button]]:outline-none focus-visible:[&_[role=button]]:ring-4 focus-visible:[&_[role=button]]:ring-primary/70 focus-visible:[&_a]:outline-none focus-visible:[&_a]:ring-4 focus-visible:[&_a]:ring-primary/70',
+    'focus-visible:[&_[role=button]]:outline-none focus-visible:[&_[role=button]]:ring-2 focus-visible:[&_[role=button]]:ring-primary/70 focus-visible:[&_a]:outline-none focus-visible:[&_a]:ring-2 focus-visible:[&_a]:ring-primary/70',
     isCloud
       ? 'bg-gradient-to-b from-indigo-600 to-indigo-950 text-off-white focus-visible:[&_[role=button]]:ring-success focus-visible:[&_a]:ring-success'
       : 'surface-black',
@@ -32,7 +32,7 @@
   </a>
   <button
     title={$navOpen ? 'Collapse Navigation' : 'Expand Navigation'}
-    class="mx-[8px] self-start justify-self-end rounded opacity-0 transition-[opacity,transform] focus-visible:outline-none focus-visible:ring-4 group-hover:opacity-100 group-focus:opacity-100 group-data-[nav=open]:rotate-180 {isCloud
+    class="mx-[8px] self-start justify-self-end rounded opacity-0 transition-[opacity,transform] focus-visible:outline-none focus-visible:ring-2 group-hover:opacity-100 group-focus:opacity-100 group-data-[nav=open]:rotate-180 {isCloud
       ? 'focus-visible:ring-primary/70 focus-visible:dark:ring-success'
       : 'focus-visible:ring-primary/70'}"
     on:click={toggle}
diff --git a/src/lib/holocene/orderable-list/orderable-list.svelte b/src/lib/holocene/orderable-list/orderable-list.svelte
index eb5618a1f..a4ce00282 100644
--- a/src/lib/holocene/orderable-list/orderable-list.svelte
+++ b/src/lib/holocene/orderable-list/orderable-list.svelte
@@ -19,6 +19,6 @@
   }
 
   .orderable-list {
-    @apply surface-primary rounded-lg border-2 border-subtle;
+    @apply surface-primary rounded-lg border border-subtle;
   }
 </style>
diff --git a/src/lib/holocene/pill-container/pill.svelte b/src/lib/holocene/pill-container/pill.svelte
index 8b16a01bf..902980eb1 100644
--- a/src/lib/holocene/pill-container/pill.svelte
+++ b/src/lib/holocene/pill-container/pill.svelte
@@ -51,7 +51,7 @@
   on:click|stopPropagation={handleClick}
   class={merge(
     'surface-subtle flex items-center justify-center gap-2 rounded-full px-3 py-1 text-sm',
-    'focus-visible:outline-none focus-visible:ring-4 focus-visible:ring-primary/70',
+    'focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary/70',
     isActive && 'bg-interactive text-white',
     className,
   )}
diff --git a/src/lib/holocene/radio-input/radio-input.svelte b/src/lib/holocene/radio-input/radio-input.svelte
index 7f74d0d47..9c520ba01 100644
--- a/src/lib/holocene/radio-input/radio-input.svelte
+++ b/src/lib/holocene/radio-input/radio-input.svelte
@@ -63,7 +63,7 @@
   }
 
   input[type='radio'] {
-    @apply box-border h-5 w-5 cursor-pointer appearance-none rounded-full border-2 border-secondary outline-none;
+    @apply box-border h-5 w-5 cursor-pointer appearance-none rounded-full border border-secondary outline-none;
 
     &:checked {
       @apply bg-interactive;
@@ -72,7 +72,7 @@
     &:enabled {
       &:focus-visible,
       &:hover {
-        @apply bg-interactive-active ring-4 ring-primary/70;
+        @apply bg-interactive-active ring-2 ring-primary/70;
 
         &:checked {
           &:not(:active) {
@@ -88,7 +88,7 @@
 
     &:checked,
     &:active {
-      @apply shadow-[inset_0_0_0_2px] shadow-white dark:shadow-black;
+      @apply shadow-[inset_0_0_0_1px] shadow-white dark:shadow-black;
     }
 
     &:disabled {
diff --git a/src/lib/holocene/tab/tab.svelte b/src/lib/holocene/tab/tab.svelte
index 871051f13..7156edb2c 100644
--- a/src/lib/holocene/tab/tab.svelte
+++ b/src/lib/holocene/tab/tab.svelte
@@ -65,7 +65,7 @@
 
 <style lang="postcss">
   .tab {
-    @apply flex cursor-pointer items-center gap-1 whitespace-nowrap border-b-2 border-transparent text-sm font-medium outline-none focus-visible:rounded-sm focus-visible:ring-4 focus-visible:ring-primary/70;
+    @apply flex cursor-pointer items-center gap-1 whitespace-nowrap border-b border-transparent text-sm font-medium outline-none focus-visible:rounded-sm focus-visible:ring-2 focus-visible:ring-primary/70;
 
     &:not(.disabled) {
       @apply hover:text-brand;
diff --git a/src/lib/holocene/table/paginated-table/index.svelte b/src/lib/holocene/table/paginated-table/index.svelte
index 2581842b7..2cc57c69c 100644
--- a/src/lib/holocene/table/paginated-table/index.svelte
+++ b/src/lib/holocene/table/paginated-table/index.svelte
@@ -54,11 +54,11 @@
   }
 
   .primary {
-    @apply rounded-lg border-2 border-table;
+    @apply rounded-lg border border-table;
   }
 
   .split {
-    @apply border-t-2 border-subtle;
+    @apply border-t border-subtle;
   }
 
   .paginated-table {
diff --git a/src/lib/holocene/table/table.svelte b/src/lib/holocene/table/table.svelte
index 7b1657da4..1e614123b 100644
--- a/src/lib/holocene/table/table.svelte
+++ b/src/lib/holocene/table/table.svelte
@@ -45,7 +45,7 @@
   }
 
   table.fancy {
-    @apply surface-primary border-separate border-spacing-0 rounded-xl border-2 border-table;
+    @apply surface-primary border-separate border-spacing-0 rounded-xl border border-table;
 
     thead {
       @apply surface-table;
diff --git a/src/lib/holocene/textarea.svelte b/src/lib/holocene/textarea.svelte
index 4e2f24474..173a13368 100644
--- a/src/lib/holocene/textarea.svelte
+++ b/src/lib/holocene/textarea.svelte
@@ -46,7 +46,7 @@
   {/if}
   <div
     class={merge(
-      'relative box-border inline-flex w-full rounded-lg border-2 border-subtle focus-within:border-information focus-within:ring-4 focus-within:ring-primary/70',
+      'relative box-border inline-flex w-full rounded-lg border border-subtle focus-within:border-information focus-within:ring-2 focus-within:ring-primary/70',
       !isValid && 'error',
       !disabled && 'hover:border-information',
     )}
@@ -97,7 +97,7 @@
 
 <style lang="postcss">
   .error {
-    @apply border-danger focus-within:border-danger focus-within:ring-4 focus-within:ring-danger/70;
+    @apply border-danger focus-within:border-danger focus-within:ring-2 focus-within:ring-danger/70;
   }
 
   .error-msg {
diff --git a/src/lib/holocene/toggle-button/toggle-button.svelte b/src/lib/holocene/toggle-button/toggle-button.svelte
index 5200722f3..d81f70688 100644
--- a/src/lib/holocene/toggle-button/toggle-button.svelte
+++ b/src/lib/holocene/toggle-button/toggle-button.svelte
@@ -75,10 +75,10 @@
 
 <style lang="postcss">
   .toggle-button {
-    @apply surface-primary flex items-center justify-center border-2 border-subtle px-4 py-2 text-sm leading-4 text-primary focus-visible:outline-none;
+    @apply surface-primary flex items-center justify-center border border-subtle px-4 py-2 text-sm leading-4 text-primary focus-visible:outline-none;
 
     &:not(.disabled) {
-      @apply hover:surface-interactive-secondary focus-visible:surface-interactive-secondary focus-visible:ring-4 focus-visible:ring-primary/70;
+      @apply hover:surface-interactive-secondary focus-visible:surface-interactive-secondary focus-visible:ring-2 focus-visible:ring-primary/70;
     }
   }
 
diff --git a/src/lib/holocene/toggle-switch.svelte b/src/lib/holocene/toggle-switch.svelte
index b58d2cbd8..9c964c509 100644
--- a/src/lib/holocene/toggle-switch.svelte
+++ b/src/lib/holocene/toggle-switch.svelte
@@ -39,7 +39,7 @@
   <span
     class="surface-background not-sr-only flex h-5 w-9 items-center rounded-xl border border-secondary p-px peer-checked:justify-end peer-checked:border-interactive peer-checked:bg-interactive peer-checked:text-off-white {disabled
       ? ''
-      : 'group-hover:border-information group-hover:bg-interactive-secondary-hover group-hover:peer-checked:bg-interactive-hover'} peer-focus-visible:border-inverse peer-focus-visible:bg-interactive-secondary-hover peer-focus-visible:ring-4 peer-focus-visible:ring-primary/70 peer-focus-visible:peer-checked:bg-interactive-hover"
+      : 'group-hover:border-information group-hover:bg-interactive-secondary-hover group-hover:peer-checked:bg-interactive-hover'} peer-focus-visible:border-inverse peer-focus-visible:bg-interactive-secondary-hover peer-focus-visible:ring-2 peer-focus-visible:ring-primary/70 peer-focus-visible:peer-checked:bg-interactive-hover"
   >
     <span class="h-4 w-4 rounded-[50%] bg-current" />
   </span>
diff --git a/src/lib/holocene/user-menu-mobile.svelte b/src/lib/holocene/user-menu-mobile.svelte
index 96ae44f8e..beeaaba27 100644
--- a/src/lib/holocene/user-menu-mobile.svelte
+++ b/src/lib/holocene/user-menu-mobile.svelte
@@ -7,7 +7,7 @@
 </script>
 
 {#if $authUser.accessToken}
-  <div class="border-b-2 border-subtle" />
+  <div class="border-b border-subtle" />
   <NavigationButton
     tooltip={$authUser.email}
     label={$authUser.email}
diff --git a/src/lib/layouts/workflow-history-layout.svelte b/src/lib/layouts/workflow-history-layout.svelte
index 7b35af46b..2b536149b 100644
--- a/src/lib/layouts/workflow-history-layout.svelte
+++ b/src/lib/layouts/workflow-history-layout.svelte
@@ -81,7 +81,7 @@
   </div>
 </div>
 <div class="px-8 pb-24">
-  <div class="flex w-full flex-col rounded-sm border-2 border-subtle">
+  <div class="flex w-full flex-col rounded-sm border border-subtle">
     <TimelineGraph
       {workflow}
       {groups}
diff --git a/src/lib/layouts/workflow-run-layout.svelte b/src/lib/layouts/workflow-run-layout.svelte
index 5a3b6d460..803082aa7 100644
--- a/src/lib/layouts/workflow-run-layout.svelte
+++ b/src/lib/layouts/workflow-run-layout.svelte
@@ -226,7 +226,7 @@
     {:else if !$workflowRun.workflow}
       <Loading class="pt-24" />
     {:else}
-      <div class="border-b-2 border-subtle px-4 pt-8 md:pt-20 xl:px-8">
+      <div class="border-b border-subtle px-4 pt-8 md:pt-20 xl:px-8">
         <WorkflowHeader namespace={$page.params.namespace} />
       </div>
       <slot />
diff --git a/src/lib/pages/nexus-endpoint.svelte b/src/lib/pages/nexus-endpoint.svelte
index 610f6c4e2..13fea2731 100644
--- a/src/lib/pages/nexus-endpoint.svelte
+++ b/src/lib/pages/nexus-endpoint.svelte
@@ -33,9 +33,7 @@
     </div>
     <p>UUID: {endpoint.id}</p>
   </div>
-  <div
-    class="surface-primary max-w-fit rounded-lg border-2 border-secondary p-4"
-  >
+  <div class="surface-primary max-w-fit rounded-lg border border-secondary p-4">
     <p class="text-lg">Target</p>
     <div class="flex flex-col gap-4 lg:flex-row">
       <div class="flex items-center gap-2">
diff --git a/src/lib/vendor/codemirror/theme.ts b/src/lib/vendor/codemirror/theme.ts
index 2588f24c3..f48de47eb 100644
--- a/src/lib/vendor/codemirror/theme.ts
+++ b/src/lib/vendor/codemirror/theme.ts
@@ -12,7 +12,7 @@ export const TEMPORAL_THEME = (isDark) =>
         color: css('--color-text-primary'),
         backgroundColor: css('--color-surface-primary'),
         borderRadius: '0.25rem',
-        borderWidth: '2px',
+        borderWidth: '1px',
         borderColor: css('--color-border-subtle'),
         padding: '0.5rem',
       },
diff --git a/src/routes/(login)/login/+page.svelte b/src/routes/(login)/login/+page.svelte
index f3c39aabb..6c80700e8 100644
--- a/src/routes/(login)/login/+page.svelte
+++ b/src/routes/(login)/login/+page.svelte
@@ -23,7 +23,7 @@
   <FeedbackButton />
 </header>
 <section class="my-[20vh] text-center">
-  <h1 class="text-8xl font-semibold" data-testid="login-title">
+  <h1 class="text-7xl font-semibold sm:text-8xl" data-testid="login-title">
     Welcome back.
   </h1>
   <p class="my-7" data-testid="login-info">Let's get you signed in.</p>
@@ -48,7 +48,7 @@
   {#if error}
     <div class="my-12 flex flex-col items-center justify-start gap-2">
       <p
-        class="rounded-md border-2 border-orange-500 bg-orange-100 p-5 text-center"
+        class="rounded-md border border-orange-500 bg-orange-100 p-5 text-center"
       >
         {error}
       </p>
diff --git a/src/routes/(login)/signin/+page.svelte b/src/routes/(login)/signin/+page.svelte
index f3c39aabb..6c80700e8 100644
--- a/src/routes/(login)/signin/+page.svelte
+++ b/src/routes/(login)/signin/+page.svelte
@@ -23,7 +23,7 @@
   <FeedbackButton />
 </header>
 <section class="my-[20vh] text-center">
-  <h1 class="text-8xl font-semibold" data-testid="login-title">
+  <h1 class="text-7xl font-semibold sm:text-8xl" data-testid="login-title">
     Welcome back.
   </h1>
   <p class="my-7" data-testid="login-info">Let's get you signed in.</p>
@@ -48,7 +48,7 @@
   {#if error}
     <div class="my-12 flex flex-col items-center justify-start gap-2">
       <p
-        class="rounded-md border-2 border-orange-500 bg-orange-100 p-5 text-center"
+        class="rounded-md border border-orange-500 bg-orange-100 p-5 text-center"
       >
         {error}
       </p>