3 files changed, 50 insertions, 35 deletions
diff --git a/FrontEnd/src/views/common/button/Button.css b/FrontEnd/src/views/common/button/Button.css
index 0df22ebe..dacea3e1 100644
--- a/FrontEnd/src/views/common/button/Button.css
+++ b/FrontEnd/src/views/common/button/Button.css
@@ -1,46 +1,52 @@
-.cru-button:not(.outline) {
-  color: var(--cru-light-color);
-  cursor: pointer;
-  padding: 0.2em 0.5em;
-  border-radius: 0.2em;
-  border: none;
+.cru-button {
+  font-size: 1rem;
+  padding: 0.4em 0.8em;
   transition: all 0.5s;
-  background-color: var(--cru-theme-color);
+  border-radius: 0.2em;
+  border: 1px solid;
+  cursor: pointer;
+}
+
+.cru-button:not(.outline) {
+  color: var(--cru-key-on-color);
+  background-color: var(--cru-key-color);
+  border-color: var(--cru-key-color);
 }
 
 .cru-button:not(.outline):hover {
-  background-color: var(--cru-theme-d1-color);
+  filter: brightness(var(--cru-hover-darkness));
+}
+
+.cru-button:not(.outline):focus {
+  filter: brightness(var(--cru-focus-darkness));
 }
 
 .cru-button:not(.outline):active {
-  background-color: var(--cru-theme-d2-color);
+  filter: brightness(var(--cru-press-darkness));
 }
 
 .cru-button:not(.outline):disabled {
-  background-color: var(--cru-disabled-color);
+  background-color: var(--cru-surface-on-color);
   cursor: auto;
 }
 
+
 .cru-button.outline {
-  color: var(--cru-theme-color);
-  border: var(--cru-theme-color) 1px solid;
-  cursor: pointer;
-  padding: 0.2em 0.5em;
-  border-radius: 0.2em;
-  transition: all 0.6s;
-  background-color: var(--cru-background-color);
+  color: var(--cru-key-color);
+  border: var(--cru-key-color) 1px solid;
+  background-color: var(--cru-surface-color);
 }
 
 .cru-button.outline:hover {
-  color: var(--cru-theme-d1-color);
-  border-color: var(--cru-theme-d1-color);
-  background-color: var(--cru-background-color);
+  filter: brightness(var(--cru-hover-brightness));
+}
+
+.cru-button.outline:focus {
+  filter: brightness(var(--cru-focus-brightness));
 }
 
 .cru-button.outline:active {
-  color: var(--cru-theme-l2-color);
-  border-color: var(--cru-theme-l2-color);
-  background-color: var(--cru-background-1-color);
+  filter: brightness(var(--cru-press-brightness));
 }
 
 .cru-button.outline:disabled {
diff --git a/FrontEnd/src/views/common/button/FlatButton.css b/FrontEnd/src/views/common/button/FlatButton.css
index 01eabca9..f9a7d772 100644
--- a/FrontEnd/src/views/common/button/FlatButton.css
+++ b/FrontEnd/src/views/common/button/FlatButton.css
@@ -1,18 +1,27 @@
 .cru-flat-button {
-  cursor: pointer;
-  padding: 0.2em 0.5em;
+  font-size: 1rem;
+  padding: 0.4em 0.8em;
+  transition: all 0.5s;
   border-radius: 0.2em;
-  border: none;
-  background-color: transparent;
-  transition: all 0.6s;
-  color: var(--cru-theme-color);
+  background-color: var(--cru-surface-color);
+  border: 1px none;
+  color: var(--cru-key-color);
+  cursor: pointer;
 }
 
-.cru-flat-button.disabled {
-  color: var(--cru-disabled-color);
-  cursor: default;
+.cru-flat-button:hover {
+  filter: brightness(var(--cru-hover-darkness));
 }
 
-.cru-flat-button:hover:not(.disabled) {
-  background-color: #e9ecef;
+.cru-flat-button:focus {
+  filter: brightness(var(--cru-focus-darkness));
 }
+
+.cru-flat-button:active {
+  filter: brightness(var(--cru-press-darkness));
+}
+
+.cru-flat-button.disabled {
+  color: var(--cru-disabled-color);
+  cursor: auto;
+}
+\ No newline at end of file
diff --git a/FrontEnd/src/views/common/button/IconButton.css b/FrontEnd/src/views/common/button/IconButton.css
index 45fb103c..25c5f84c 100644
--- a/FrontEnd/src/views/common/button/IconButton.css
+++ b/FrontEnd/src/views/common/button/IconButton.css
@@ -1,5 +1,5 @@
 .cru-icon-button {
-  color: var(--cru-theme-color);
+  color: var(--cru-key-color);
   font-size: 1.4rem;
   background: none;
   border: none;