diff --git a/ui/scss/_vars.scss b/ui/scss/_vars.scss
index c25920a21..b8115d0ca 100644
--- a/ui/scss/_vars.scss
+++ b/ui/scss/_vars.scss
@@ -43,6 +43,8 @@
 
   /* Input */
   --input-width: 330px;
+  --input-border-size: 2px;
+  --input-border-color: rgba(0,0,0,.25);
 
   /* Button */
   --button-primary-bg: var(--color-primary);
diff --git a/ui/scss/component/_button.scss b/ui/scss/component/_button.scss
index 3b5fdce8d..0f4d851e5 100644
--- a/ui/scss/component/_button.scss
+++ b/ui/scss/component/_button.scss
@@ -55,12 +55,11 @@ $button-focus-shift: 12%;
   color: var(--button-primary-color);
   background-color: var(--button-primary-bg);
   box-shadow: var(--box-shadow-layer);
-  opacity: 0.9;
+
   &:focus {
-    color: var(--button-primary-color);
+    //color: var(--button-primary-active-color);
+    //background-color:color: var(--button-primary-active-bg);
     //box-shadow: $box-shadow-focus;
-    //background-color: mix(black, $color-primary, $button-focus-shift)
-    opacity: 1;
   }
 }
 .button-alt
diff --git a/ui/scss/component/_form-field.scss b/ui/scss/component/_form-field.scss
index 050a4cd27..841d58d62 100644
--- a/ui/scss/component/_form-field.scss
+++ b/ui/scss/component/_form-field.scss
@@ -1,8 +1,5 @@
 @import "../global";
 
-$width-input-border: 2px;
-$color-form-border: #000;
-
 .form-row-submit
 {
   margin-top: $spacing-vertical;
@@ -24,7 +21,7 @@ $color-form-border: #000;
 }
 
 input[type="text"].input-copyable {
-  border: 1px solid var(--color-form-border);
+  border: 1px solid var(--input-border-color);
   line-height: 1;
   padding-top: $spacing-vertical * 1/3;
   padding-bottom: $spacing-vertical * 1/3;
@@ -50,7 +47,7 @@ input[type="text"].input-copyable {
     padding-right: 5px;
     height: $spacing-vertical;
     &:focus {
-      outline: $width-input-border solid var(--color-primary);
+      outline:  var(--input-border-size) solid var(--color-primary);
     }
   }
 
@@ -81,7 +78,7 @@ input[type="text"].input-copyable {
   input[type="number"],
   input[type="search"],
   input[type="date"] {
-    border-bottom: $width-input-border solid $color-form-border;
+    border-bottom: var(--input-border-size) solid var(--input-border-color);
     line-height: 1;
     padding-top: $spacing-vertical * 1/3;
     padding-bottom: $spacing-vertical * 1/3;
@@ -109,7 +106,7 @@ input[type="text"].input-copyable {
 
   textarea {
     padding: 2px;
-    border: $width-input-border solid $color-form-border;
+    border: var(--input-border-size) solid var(--input-border-color);
   }
 }
 .form-field--SimpleMDE {