diff --git a/src/media/css/colors/dark/colors_standard.css b/src/media/css/colors/dark/colors_standard.css
index b1d5a06..dceb18c 100644
--- a/src/media/css/colors/dark/colors_standard.css
+++ b/src/media/css/colors/dark/colors_standard.css
@@ -246,6 +246,16 @@
 	--focus-ring-opacity: .6;
 	--focus-ring-color: #5472ff66;
 
+	/* Forms and inputs - adapted for dark mode */
+	--input-color: #e6ebf1;
+	--input-bg: #1a2332;
+	--input-border-color: #3a4250;
+	--input-focus-border-color: #5472ff;
+	--input-focus-box-shadow: 0 0 0 0.25rem rgba(84, 114, 255, 0.25);
+	--input-placeholder-color: #8894aa;
+	--input-disabled-bg: #0f1318;
+	--input-disabled-border-color: #2b323b;
+	
 	--form-valid-color: #78d694;
 	--form-valid-border-color: #78d694;
 	--form-invalid-color: #ff8e86;
diff --git a/src/media/css/colors/light/colors_standard.css b/src/media/css/colors/light/colors_standard.css
index a578960..87036b5 100644
--- a/src/media/css/colors/light/colors_standard.css
+++ b/src/media/css/colors/light/colors_standard.css
@@ -219,6 +219,16 @@
 	--focus-ring-width: .25rem;
 	--focus-ring-opacity: .25;
 	--focus-ring-color: #01015640;
+	/* Forms and inputs */
+	--input-color: hsl(210, 11%, 15%);
+	--input-bg: #ffffff;
+	--input-border-color: hsl(210, 14%, 83%);
+	--input-focus-border-color: #8894aa;
+	--input-focus-box-shadow: 0 0 0 0.25rem rgba(1, 1, 86, 0.25);
+	--input-placeholder-color: hsl(210, 7%, 46%);
+	--input-disabled-bg: hsl(210, 16%, 93%);
+	--input-disabled-border-color: hsl(210, 14%, 83%);
+	
 	--form-valid-color: #448344;
 	--form-valid-border-color: #448344;
 	--form-invalid-color: #a51f18;
diff --git a/src/media/css/template.css b/src/media/css/template.css
index 5d1d9ca..fc8bb80 100644
--- a/src/media/css/template.css
+++ b/src/media/css/template.css
@@ -2601,10 +2601,10 @@ progress {
 	font-size: 1rem;
 	font-weight: 400;
 	line-height: 1;
-	color: hsl(210, 11%, 15%);
-	background-color: var(--body-color);
+	color: var(--input-color);
+	background-color: var(--input-bg);
 	background-clip: padding-box;
-	border: 1px solid hsl(210, 14%, 83%);
+	border: 1px solid var(--input-border-color);
 	-webkit-appearance: none;
 	-moz-appearance: none;
 	appearance: none;
@@ -2633,12 +2633,12 @@ progress {
 }
 
 .form-control:focus {
-	color: hsl(210, 11%, 15%);
-	background-color: var(--body-color);
-	border-color: #8894aa;
+	color: var(--input-color);
+	background-color: var(--input-bg);
+	border-color: var(--input-focus-border-color);
 	outline: 0;
-	-webkit-box-shadow: 0 0 0 0.25rem rgba(1, 1, 86, 0.25);
-	box-shadow: 0 0 0 0.25rem rgba(1, 1, 86, 0.25);
+	-webkit-box-shadow: var(--input-focus-box-shadow);
+	box-shadow: var(--input-focus-box-shadow);
 }
 
 .form-control::-webkit-date-and-time-value {
@@ -2646,32 +2646,32 @@ progress {
 }
 
 .form-control::-webkit-input-placeholder {
-	color: hsl(210, 7%, 46%);
+	color: var(--input-placeholder-color);
 	opacity: 1;
 }
 
 .form-control::-moz-placeholder {
-	color: hsl(210, 7%, 46%);
+	color: var(--input-placeholder-color);
 	opacity: 1;
 }
 
 .form-control:-ms-input-placeholder {
-	color: hsl(210, 7%, 46%);
+	color: var(--input-placeholder-color);
 	opacity: 1;
 }
 
 .form-control::-ms-input-placeholder {
-	color: hsl(210, 7%, 46%);
+	color: var(--input-placeholder-color);
 	opacity: 1;
 }
 
 .form-control::placeholder {
-	color: hsl(210, 7%, 46%);
+	color: var(--input-placeholder-color);
 	opacity: 1;
 }
 
 .form-control:disabled {
-	background-color: hsl(210, 16%, 93%);
+	background-color: var(--input-disabled-bg);
 	opacity: 1;
 }