diff --git a/src/button.css b/src/button.css
index 8368c9d..18381bb 100644
--- a/src/button.css
+++ b/src/button.css
@@ -6,12 +6,13 @@
 
 .btn {
 	background-color: var(--synergy-btn-bg);
-	padding: 9px 16px;
+	padding: 9px .8rem;
 	border: 0;
 	color: var(--synergy-text-color);
 	font: inherit;
 	font-weight: 700;
 	font-size: 1rem;
+	line-height: 1.25;
 	border-radius: var(--synergy-border-radius);
 	transition: .2s background-color;
 	cursor: pointer;
@@ -40,7 +41,7 @@
 }
 
 .btn:focus-visible {
-	box-shadow: 0 0 0 5px var(--synergy-btn-bg);
+	box-shadow: 0 0 0 5px var(--synergy-focus-highlight);
 }
 
 .btn.btn-primary:focus-visible {
diff --git a/src/checkbox.css b/src/checkbox.css
index 3904a64..a84c510 100644
--- a/src/checkbox.css
+++ b/src/checkbox.css
@@ -29,7 +29,7 @@ label.cbox > input + *::before {
 	height: 1rem;
 	border-radius: 50%;
 	aspect-ratio: 1 / 1;
-	border: 2px solid var(--synergy-border);
+	border: var(--synergy-border-width) solid var(--synergy-border);
 	transition: background .1s, box-shadow .2s;
 	background: var(--synergy-bg);
 	box-shadow: 0 1px 2px 0 rgba(0, 0, 0, .1);
diff --git a/src/input.css b/src/input.css
index 08b9c1e..fa23abd 100644
--- a/src/input.css
+++ b/src/input.css
@@ -7,8 +7,8 @@
 
 .inp label {
 	position: absolute;
-	top: 9px;
-	left: 7px;
+	top: 7px;
+	left: 5px;
 	font-size: 1rem;
 	font-weight: 700;
 	transform-origin: 0 0;
@@ -20,6 +20,7 @@
 	border-radius: 10px;
 	line-height: 1.2rem;
 	color: var(--synergy-label);
+	margin: var(--synergy-border-width);
 }
 
 .inp :is(
@@ -30,7 +31,7 @@
 .inp :is(input, textarea):focus + label {
 	color: var(--synergy-label-active);
 	transform: scale(.8);
-	top: -.6rem;
+	top: -.7rem;
 }
 
 /* Common styles */