3 files changed, 19 insertions, 12 deletions
diff --git a/src/components/Display/Display.scss b/src/components/Display/Display.scss
index d86f4e9..bef03dc 100644
--- a/src/components/Display/Display.scss
+++ b/src/components/Display/Display.scss
@@ -18,7 +18,7 @@
 }
 
 .ItemsDisplay .legend {
-  background-color: $altBG;
+  background-color: $background2;
 }
 
 .ItemsDisplay th {
@@ -27,16 +27,16 @@
 
 .ItemsDisplay td {
   text-align: center;
-  border-bottom: 1px solid $tableDefBorderColor;
+  border-bottom: 1px solid $underline1;
   font-size: 1.5rem;
 }
 
 .ItemsDisplay .disabledBorder {
-  border-bottom: 1px solid $tableDisabledBorderColor;
+  border-bottom: 1px solid $underline0;
 }
 
 .ItemsDisplay .warningBorder {
-  border-bottom: 1px solid $warningBorderColor;
+  border-bottom: 1px solid $underline3;
 }
 
 .ItemsDisplay .leftAlign {
@@ -44,7 +44,7 @@
 }
 
 .SummaryDisplayTR td {
-  color: $altFG;
+  color: $foreground2;
   font-size: 1.7rem;
 }
 
@@ -56,7 +56,7 @@
 .SummaryDisplay h1 {
   font-size: 3rem;
   margin: 0.5rem -1.5rem;
-  border-bottom: 1px dotted $labelUnderlineColor;
+  border-bottom: 1px dotted $underline1;
 }
 
 .SummaryDisplay table {
@@ -71,5 +71,5 @@
 
 .SummaryDisplay .grandTotal td {
   font-size: 2rem;
-  color: $altFG;
+  color: $foreground2;
 }
diff --git a/src/components/Form/Form.scss b/src/components/Form/Form.scss
index c880bea..09dfc16 100644
--- a/src/components/Form/Form.scss
+++ b/src/components/Form/Form.scss
@@ -23,18 +23,20 @@ input[type=number] {
 @mixin formPane {
   padding: 1.5rem;
   box-sizing: border-box;
-  border: 1px solid $formPaneBorderColor;
+  border: 1px solid $border1;
 
   display: flex;
   flex-direction: column;
   justify-content: space-around;
+
+  background-color: $background4;
 }
 
 @mixin formWideLabel {
   display: flex;
   justify-content: space-between;
 
-  border-bottom: 1px dotted $labelUnderlineColor;
+  border-bottom: 1px dotted $underline1;
   padding: 0.8rem 0;
   font-size: 1.5rem;
 }
@@ -120,4 +122,9 @@ input {
   margin: 1rem;
 }
 
+/* */
+.MetaInfoForm {
+  width: 60%;
+}
+
 
diff --git a/src/components/Header/Header.scss b/src/components/Header/Header.scss
index 4e5253d..73f0e45 100644
--- a/src/components/Header/Header.scss
+++ b/src/components/Header/Header.scss
@@ -19,7 +19,7 @@
 	padding: none;
 	width: 100%;
 	height: 5rem;
-	background-color: $altBG;
+	background-color: $background2;
 	box-shadow: $defBigShadow;
 }
 
@@ -30,7 +30,7 @@
 nav a {
 	text-decoration: none;
 	padding: 0.3rem;
-	color: $defLink;
+	color: $link1;
 }
 
 .placeholder {
@@ -44,5 +44,5 @@ nav a {
 
 
 p, h1, h2, h3, h4, h5, h6 {
-	color: $defFG;
+	color: $foreground1;
 }