diff --git a/assets/css/v2/style.css b/assets/css/v2/style.css
index f759a329..c1e18169 100644
--- a/assets/css/v2/style.css
+++ b/assets/css/v2/style.css
@@ -212,7 +212,7 @@ textarea:not([rows]) {
   --details-margin: 0.5rem 0rem;
 
   /* Tab Group */
-  --magrin-tab-group: 1rem 0 0 0;
+  --margin-tab-group: 1rem -1rem 0 -1rem;
 
   --overflow-gutter-extension: 1rem;
 
@@ -1856,9 +1856,10 @@ li:has(> div > blockquote) {
 
 /* MARK: Tabs
 */
+
+/* NOTE: :checked selectors defined in layouts/shortcodes/tabs.html */
 .tabs-container {
   width: calc(100% + 2rem);
-  margin-inline-start: -1rem;
   margin: var(--margin-tab-group);
 
   input[type="radio"] {
@@ -1873,18 +1874,12 @@ li:has(> div > blockquote) {
     scrollbar-width: none;
     white-space: nowrap;
     margin: 0;
-    padding-inline-start: 2rem;
-
-    > :not(:last-child) {
-      border-right: none;
-    }
+    padding-inline-start: 1rem;
 
     li {
       list-style: none;
-      border: 1px solid oklch(var(--color-tabs-inactive-border));
-      border-bottom: 1px solid oklch(var(--color-foreground));
-      color: oklch(var(--color-brand));
-      padding: 10px;
+      border-bottom: 1px solid oklch(var(--color-tabs-inactive-border));
+      padding: 0.25rem 0.75rem;
       margin: 0;
       position: relative;
 
@@ -1900,8 +1895,8 @@ li:has(> div > blockquote) {
       display: block;
       bottom: 0;
       left: 0;
-      width: 2rem;
-      border-bottom: 1px solid oklch(var(--color-foreground));
+      width: 1rem;
+      border-bottom: 1px solid oklch(var(--color-tabs-inactive-border));
     }
 
     &::after {
@@ -1912,18 +1907,17 @@ li:has(> div > blockquote) {
       left: 0;
       right: 0;
       width: 100%;
-      border-bottom: 1px solid oklch(var(--color-foreground));
+      border-bottom: 1px solid oklch(var(--color-tabs-inactive-border));
     }
   }
 
   .tab-contents {
     padding-block: 1rem;
-    border-bottom: 1px solid oklch(var(--color-foreground));
 
     .tab-content {
       display: none;
       width: 100%;
-      padding: 1rem;
+      padding: 0.5rem 1rem;
 
       --flow-gap: 2rem;
 
diff --git a/layouts/shortcodes/tabs.html b/layouts/shortcodes/tabs.html
index 1b8a3c69..c2e85bfe 100644
--- a/layouts/shortcodes/tabs.html
+++ b/layouts/shortcodes/tabs.html
@@ -9,7 +9,7 @@
         <input type="radio" name="{{$tab_set_id}}" id="{{$id}}" aria-hidden="true" checked="checked">
       {{- else -}}
         <input type="radio" name="{{$tab_set_id}}" id="{{$id}}" aria-hidden="true">
-      {{- end -}}  
+      {{- end -}}
 	{{- end -}}
 	<ul class="tab-labels" role="tablist" id="{{ $tab_set_id }}" data-testid="labels-{{ $tab_set_id }}">
 	  {{- range $i, $e := $tabs -}}
@@ -42,19 +42,8 @@
 <style>
   {{- range $i, $e := $tabs -}}
   	.tabs-container input[type="radio"]:checked:nth-of-type({{ add $i 1 }}) ~ .tab-labels li:nth-of-type({{ add $i 1 }}) {
-	  border: none;
-      border-top: 1px solid oklch(var(--color-foreground));
-      border-left: 1px solid oklch(var(--color-foreground));
-      border-bottom: none;
-      color: oklch(var(--color-foreground));
-
-	  + li {
-		border-left: 1px solid oklch(var(--color-foreground));
-	  }
-
-	  &:last-of-type {
-      	border-right: 1px solid oklch(var(--color-foreground));
-      }
+      border-bottom: 2px solid oklch(var(--color-brand));
+      color: oklch(var(--color-brand));
 	}
 
 	.tabs-container input[type="radio"]:checked:nth-of-type({{ add $i 1 }}) ~ .tab-contents div:nth-of-type({{ add $i 1 }}) {