diff --git a/assets/sass/_theme/design-system/form.sass b/assets/sass/_theme/design-system/form.sass
index cdf6dd84b58b4bf619ad0d1a7761485081729d2a..5158dcc015be159544a55fa15e7ba7027a05d430 100644
--- a/assets/sass/_theme/design-system/form.sass
+++ b/assets/sass/_theme/design-system/form.sass
@@ -14,7 +14,7 @@ form
         margin-left: $spacing-2
     input[type="text"], input[type="search"], input[type="email"], input[type="tel"], input[type="password"]
         @include body-text
-        border: 1px solid rgba(0, 0, 0, 0.3)
+        border: 1px solid var(--color-border)
         border-radius: $form-input-border-radius
         padding: $spacing-1 
     input[type="submit"], button
diff --git a/assets/sass/_theme/design-system/search.sass b/assets/sass/_theme/design-system/search.sass
index 844e04318e653f1078ac00413b2263d339ae72fd..d238726ce0d7274019c08674a1145fca7fb0eb04 100644
--- a/assets/sass/_theme/design-system/search.sass
+++ b/assets/sass/_theme/design-system/search.sass
@@ -9,6 +9,7 @@
 .pagefind-ui__button, 
 .search__close
     @include meta
+    color: var(--color-text)
 .pagefind-ui__toggle
     color: $header-color
     cursor: pointer
@@ -94,11 +95,12 @@
                     right: $spacing-3
                     top: space(35)
         &__search-input
-            background-color: $color-background
+            background-color: var(--color-background)
             border-left: 0
             border-right: 0
             border-radius: 0
             border-top: 0
+            color: var(--color-text)
             padding-left: 0
             padding-right: $spacing-3 !important
             position: fixed