7 files changed, 18 insertions, 6 deletions
diff --git a/FrontEnd/src/views/common/button/Button.css b/FrontEnd/src/views/common/button/Button.css
index 406d70d2..e0b8e733 100644
--- a/FrontEnd/src/views/common/button/Button.css
+++ b/FrontEnd/src/views/common/button/Button.css
@@ -28,7 +28,7 @@
   padding: 0.2em 0.5em;
   border-radius: 0.2em;
   transition: all 0.6s;
-  background-color: white;
+  background-color: var(--cru-background-color);
 }
 
 .cru-button.outline:hover {
diff --git a/FrontEnd/src/views/common/button/Button.tsx b/FrontEnd/src/views/common/button/Button.tsx
index 53f41bc1..e1015f71 100644
--- a/FrontEnd/src/views/common/button/Button.tsx
+++ b/FrontEnd/src/views/common/button/Button.tsx
@@ -1,7 +1,7 @@
 import { ComponentPropsWithoutRef, Ref } from "react";
 import classNames from "classnames";
 
-import { I18nText, useC, ThemeColor } from "@/common";
+import { I18nText, useC, ThemeColor } from "../common";
 
 import "./Button.css";
 
diff --git a/FrontEnd/src/views/common/button/FlatButton.css b/FrontEnd/src/views/common/button/FlatButton.css
index f0d33153..ea45e783 100644
--- a/FrontEnd/src/views/common/button/FlatButton.css
+++ b/FrontEnd/src/views/common/button/FlatButton.css
@@ -9,7 +9,7 @@
 }
 
 .cru-flat-button.disabled {
-  color: var(--cru-theme-l1-color);
+  color: var(--cru-theme-f1-color);
   cursor: default;
 }
 
diff --git a/FrontEnd/src/views/common/button/FlatButton.tsx b/FrontEnd/src/views/common/button/FlatButton.tsx
index a5354670..7b268b6d 100644
--- a/FrontEnd/src/views/common/button/FlatButton.tsx
+++ b/FrontEnd/src/views/common/button/FlatButton.tsx
@@ -1,7 +1,7 @@
 import { ComponentPropsWithoutRef, Ref } from "react";
 import classNames from "classnames";
 
-import { I18nText, useC, ThemeColor } from "@/common";
+import { I18nText, useC, ThemeColor } from "../common";
 
 import "./FlatButton.css";
 
diff --git a/FrontEnd/src/views/common/button/IconButton.tsx b/FrontEnd/src/views/common/button/IconButton.tsx
index 0ff9541a..e5454574 100644
--- a/FrontEnd/src/views/common/button/IconButton.tsx
+++ b/FrontEnd/src/views/common/button/IconButton.tsx
@@ -1,7 +1,7 @@
 import { ComponentPropsWithoutRef } from "react";
 import classNames from "classnames";
 
-import { ThemeColor } from "@/common";
+import { ThemeColor } from "../common";
 
 import "./IconButton.css";
 
diff --git a/FrontEnd/src/views/common/button/LoadingButton.tsx b/FrontEnd/src/views/common/button/LoadingButton.tsx
index c4cafc0c..249f3e1d 100644
--- a/FrontEnd/src/views/common/button/LoadingButton.tsx
+++ b/FrontEnd/src/views/common/button/LoadingButton.tsx
@@ -2,7 +2,7 @@ import * as React from "react";
 import classNames from "classnames";
 import { useTranslation } from "react-i18next";
 
-import { convertI18nText, I18nText, ThemeColor } from "@/common";
+import { I18nText, ThemeColor, convertI18nText } from "../common";
 
 import Spinner from "../Spinner";
 
diff --git a/FrontEnd/src/views/common/common.ts b/FrontEnd/src/views/common/common.ts
new file mode 100644
index 00000000..e3a5a2a2
--- /dev/null
+++ b/FrontEnd/src/views/common/common.ts
@@ -0,0 +1,12 @@
+export type { I18nText } from "@/common";
+export { c, convertI18nText, useC } from "@/common";
+
+export const themeColors = [
+  "primary",
+  "secondary",
+  "tertiary",
+  "danger",
+  "success",
+] as const;
+
+export type ThemeColor = (typeof themeColors)[number];