diff --git a/src/assets/scss/_settings.scss b/src/assets/scss/_settings.scss
index 128fa1e..fe0f238 100644
--- a/src/assets/scss/_settings.scss
+++ b/src/assets/scss/_settings.scss
@@ -72,7 +72,7 @@
 // 1. Global
 // ---------
 
-$global-font-size:100%; 
+$global-font-size:100%;
 $global-width: 100vw;
 $global-lineheight: 1.5;
 
@@ -305,20 +305,20 @@ $button-font-family: inherit;
 $button-font-weight: null;
 $button-font-variant: all-petite-caps;
 $button-padding: $global-padding $global-padding*3;
-$button-margin: 0;
+$button-margin: $global-margin/4;
 $button-fill: solid;
-$button-background: $primary-color;
-$button-background-hover: scale-color($button-background, $lightness: -15%);
-$button-color: $white;
+$button-background: $white;//$primary-color;
+$button-background-hover: scale-color($primary-color, $lightness: 95%);
+$button-color: $primary-color;//$white;
 $button-color-alt: $black;
 $button-radius: $global-radius-archive;
-$button-border: 1px solid transparent;
+$button-border: 2px solid $button-color;//1px solid transparent;
 $button-hollow-border-width: 2px;
 $button-sizes: (
-  tiny: 0.6rem,
-  small: 0.75rem,
-  default: 1.2rem,
-  large: 1.5rem,
+  tiny: 0.7rem,
+  small: 0.95rem,
+  default: 1.6rem,
+  large: 2.4rem,
 );
 $button-palette: $foundation-palette;
 $button-opacity-disabled: 0.25;
@@ -441,7 +441,7 @@ $flexbox-responsive-breakpoints: true;
 // 20. Forms
 // ---------
 
-$fieldset-border: 1px solid $medium-gray;
+$fieldset-border: none; //1px solid $medium-gray;
 $fieldset-padding: rem-calc(20);
 $fieldset-margin: rem-calc(18 0);
 $legend-padding: rem-calc(0 3);
@@ -450,32 +450,32 @@ $helptext-color: $black;
 $helptext-font-size: rem-calc(13);
 $helptext-font-style: italic;
 $input-prefix-color: $black;
-$input-prefix-background: $light-gray;
-$input-prefix-border: 1px solid $medium-gray;
+$input-prefix-background: none; //$light-gray;
+$input-prefix-border: none; //1px solid $medium-gray;
 $input-prefix-padding: 1rem;
 $form-label-color: $black;
 $form-label-font-size: rem-calc(14);
 $form-label-font-weight: $global-weight-normal;
 $form-label-line-height: 1.8;
 $select-background: $white;
-$select-triangle-color: $dark-gray;
+$select-triangle-color: $primary-color;
 $select-radius: $global-radius;
-$input-color: $black;
-$input-placeholder-color: $medium-gray;
+$input-color: $primary-color;
+$input-placeholder-color: scale-color($primary-color, $lightness: 60%); //$antracite-grey;
 $input-font-family: inherit;
 $input-font-size: rem-calc(16);
 $input-font-weight: $global-weight-normal;
 $input-line-height: $global-lineheight;
-$input-background: $white;
-$input-background-focus: $white;
+$input-background: scale-color($primary-color, $lightness: 95%);
+$input-background-focus:  scale-color($primary-color, $lightness: 85%);
 $input-background-disabled: $light-gray;
-$input-border: 1px solid $medium-gray;
-$input-border-focus: 1px solid $dark-gray;
+$input-border: none; //1px solid $medium-gray;
+$input-border-focus: none; // 1px solid $dark-gray;
 $input-padding: $form-spacing / 2;
-$input-shadow: inset 0 1px 2px rgba($black, 0.1);
-$input-shadow-focus: 0 0 5px $medium-gray;
+$input-shadow: none; //inset 0 1px 2px rgba($black, 0.1);
+$input-shadow-focus: none; //0 0 5px $medium-gray;
 $input-cursor-disabled: not-allowed;
-$input-transition: box-shadow 0.5s, border-color 0.25s ease-in-out;
+$input-transition: none; //box-shadow 0.5s, border-color 0.25s ease-in-out;
 $input-number-spinners: true;
 $input-radius: $global-radius;
 $form-button-radius: $global-radius;
@@ -906,4 +906,3 @@ $grid-padding-gutters: $grid-margin-gutters;
 $grid-container-padding: $grid-padding-gutters;
 $grid-container-max: $global-width;
 $xy-block-grid-max: 8;
-