diff --git a/_includes/tabs.html b/_includes/tabs.html
index ee537a80..60d83066 100644
--- a/_includes/tabs.html
+++ b/_includes/tabs.html
@@ -1,7 +1,8 @@
 <div class="tab-container">
+	<!-- <div class="tab-container-border"></div> -->
 	{% for tab in page.tabs[include.index] %}
 		<input id="tab-{{ tab[0] }}" class="d-none" name="tabs" type="radio" {% if forloop.first %}checked{% endif %}>
-		<label for="tab-{{ tab[0] }}" class="tab-link btn btn-outline-secondary" onclick="setTab('{{ tab[0] }}')">{{ tab[1] }}</label>
+		<label for="tab-{{ tab[0] }}" class="tab-link" onclick="setTab('{{ tab[0] }}')">{{ tab[1] }}</label>
 		<div class="tab">{{ include.tabs[forloop.index0] | markdownify }}</div>
 	{% endfor %}
 </div>
diff --git a/_sass/base.scss b/_sass/base.scss
index aa5324ae..99e1ebcb 100644
--- a/_sass/base.scss
+++ b/_sass/base.scss
@@ -273,7 +273,7 @@ html:not([dir=rtl]) {
 		margin-right: 0!important;
 		padding-right: 0.25rem;
 	}
-	
+
 	.btn-qr {
 		border-top-left-radius: 0;
 		border-bottom-left-radius: 0;
@@ -303,7 +303,7 @@ html[dir=rtl] {
 		margin-left: 0!important;
 		padding-left: 0.25rem;
 	}
-	
+
 	.btn-qr {
 		border-top-right-radius: 0;
 		border-bottom-right-radius: 0;
@@ -539,35 +539,44 @@ a.footnote::after {
 	display: flex;
 	flex-wrap: wrap;
 
-	.tab-link.btn {
-		margin-right: 0.25rem;
+	.tab-link {
+		border: 1px solid $borders;
+		padding: 0.5rem 1rem;
+		margin-bottom: -1px;
+		transition: 150ms ease;
+	}
+	.tab-link:not(:first-of-type) {
+		border-left-width: 0px;
+	}
+	.tab-link:first-of-type {
+		border-top-left-radius: 0.25rem;
+	}
+	.tab-link:last-of-type {
+		border-top-right-radius: 0.25rem;
 	}
 
 	.tab {
 		display: none;
 		order: 99;
-		padding-top: 1rem;
+		padding: 1rem 1rem 0 1rem;
+		margin-bottom: 1rem;
 		width: 100%;
+		border: 1px solid $borders;
+		border-radius: 0 0.25rem 0.25rem 0.25rem;
 	}
-	
-	input:checked + label + .tab {
+
+	input:checked + .tab-link + .tab {
 		display: block;
 	}
-	
-	abel {
-		margin-right: 0.25rem;
+
+	input:checked + .tab-link:not(:hover):not(:active):not(:focus) {
+		background-color: $borders;
+		border-color: $borders;
 	}
-	
-	input:checked + label.btn-outline-secondary {
-		color: #fff;
-		background-color: #6c757d;
-		border-color: #6c757d;
-	}
-	
-	input:checked + label.btn-outline-secondary:hover, input:checked + label.btn-outline-secondary:active, input:checked+label.btn-outline-secondary:focus {
-		color: #fff;
-		background-color: #5c636a;
-		border-color: #565e64;
+	.tab-link:hover, .tab-link:active, .tab-link:focus {
+		color: $borders-hover-color;
+		background-color: $borders-hover;
+		border-color: $borders-hover;
 	}
 }
 
@@ -575,10 +584,10 @@ a.footnote::after {
 // FAQs
 #faq-container {
 	margin-bottom: 1rem;
-	
+
 	> details.accordian-item {
 		margin-bottom: 0;
-		
+
 		> summary.accordion-button {
 			color: $header-color;
 
@@ -606,7 +615,7 @@ a.footnote::after {
 				}
 			}
 		}
-	
+
 		> .faq {
 			background-color: $active-accordian-bg-color;
 		}
@@ -615,7 +624,7 @@ a.footnote::after {
 			summary.accordion-button {
 				color: $active-accordian-header-color;
 				background-color: $active-accordian-header-bg-color;
-	
+
 				&::after {
 					background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%230c63e4'%3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e");
 					transform: rotate(-180deg);
diff --git a/assets/css/dark.scss b/assets/css/dark.scss
index bafff61c..87e413e9 100755
--- a/assets/css/dark.scss
+++ b/assets/css/dark.scss
@@ -7,6 +7,8 @@ $main-bg: #333;
 $main-color: #ccc;
 $header-color: #ddd;
 $borders: #555;
+$borders-hover: #777;
+$borders-hover-color: #fff;
 $light-borders: #444;
 $blockquote-color: #999;
 $code-bg: #5559;
diff --git a/assets/css/light.scss b/assets/css/light.scss
index 4622e88e..5198e0cd 100755
--- a/assets/css/light.scss
+++ b/assets/css/light.scss
@@ -7,6 +7,8 @@ $main-bg: #fff;
 $main-color: #222;
 $header-color: #222;
 $borders: #bbb;
+$borders-hover: #666;
+$borders-hover-color: #fff;
 $light-borders: #dee2e6;
 $blockquote-color: #666;
 $code-bg: #ccc6;