diff --git a/daikoku/public/themes/brutalism.css b/daikoku/public/themes/brutalism.css
index 48b2fd5f7..d053cef5f 100644
--- a/daikoku/public/themes/brutalism.css
+++ b/daikoku/public/themes/brutalism.css
@@ -1,70 +1,58 @@
 :root {
-  /* colors*/
-    --error-color: #dc3545;
-    --info-color: #17a2b8;
-    --success-color: #65B741;
-    --warning-color: #ffc107;
-    --danger-color: #dc3545;
-
-  /*level 1*/
-
-  --body_bg-color: FireBrick;
-  --body_text-color: DarkTurquoise;
-  --body_link-color: Cyan;
-  --body_link-hover-color: LightCyan;
-
-  /*level 2*/
-  --level2_bg-color: SandyBrown;
-  --level2_text-color: Wheat;
-  --level2_link-color: Sienna;
-  --level2_link-hover-color: Brown;
-
-  /*level 3*/
-  --level3_bg-color: BlanchedAlmond;
-  --level3_text-color: SandyBrown;
+  --body_bg-color: pink;
+  --body_text-color: green;
+  --body_link-color:red;
+  --body_link-hover-color:yellow;
+  
+  --level2_bg-color: orange;
+  --level2_text-color: blue;
+  --level2_link-color: red;
+  --level2_link-hover-color: brown;
+
+  --level3_bg-color : #bbd700;
+  --level3_text-color : #222;
   --level3_link-color: #4c4c4d;
-  --level3_link-hover-color: grey;
-  --level3_link-hover-bg-color: white;
-
-  /*sidebar*/
-  --sidebar-bg-color: PeachPuff;
-  --sidebar-text-color: DarkKhaki;
-  --sidebar-text-hover-color: PaleGoldenrod;
-
-  /*companion*/
-  --menu-bg-color: DarkOrange;
-  --menu-text-color: OrangeRed;
-  --menu-text-hover-bg-color: SlateGray;
-  --menu-text-hover-color: white;
-  --menu-link-color: DimGray;
-
-
-  /* NEW cards */
-  --card_header-bg-color: DarkGreen;
-  --card_header-text-color: white;
-  --card_bg-color: YellowGreen;
-  --card_text-color: white;
-  --card_link-color: olive;
-  --card_link-hover-color: orange;
-
-  /*btns*/
-  --btn-bg-color: MediumPurple;
-  --btn-text-color: Yellow;
-  --btn-border-color: Violet;
+  --level3_link-hover-color : #000;
+  --level3_link-hover-bg-color :grey;
+
+  --sidebar-bg-color: beige;
+  --sidebar-text-color: brown;
+  --sidebar-text-hover-color:orange;      
+
+  --menu-bg-color: #fba979;
+  --menu-text-color: #ac6407;
+  --menu-text-hover-bg-color: cadetblue;
+  --menu-text-hover-color: yellow;
+  --menu-divider-color: grey;     
+
+  --card_header-bg-color : indigo;
+  --card_header-text-color: gold;
+  --card_bg-color: lavender;
+  --card_text-color: black;
+  --card_link-color: lightseagreen;
+  --card_link-hover-color : lime;
+  
+  --btn-bg-color: #fff;
+  --btn-text-color: #495057;
+  --btn-border-color: #97b0c7;
 
-  /*badge*/
   --badge-tags-bg-color: #ffc107;
   --badge-tags-bg-hover-color: #ffe1a7;
   --badge-tags-text-color: #212529;
 
-  /*form*/
-  --form-text-color: white;
-  --form-border-color: white;
-  --form-bg-color: black;
+  --form-text-color: #000;
+  --form-border-color: #586069;
+  --form-bg-color: #ff5e8c;
 
-  --form-select-focused-color: red;
-  --form-select-focused-text-color: green;
+  --form-select-focused-color: lightgrey;
+  --form-select-focused-text-color: white;
   --form-select-heading-color: yellow;
-  --form-select-hover-color: black;
-  --form-select-hover-text-color: brown;
+  --form-select-hover-color: lightgrey;
+  --form-select-hover-text-color: white;
+
+  --error-color:#dc3545;
+  --info-color: #17a2b8;
+  --success-color: #65B741;
+  --warning-color: #ffc107;
+  --danger-color: #dc3545;  
 }
\ No newline at end of file
diff --git a/daikoku/public/themes/dark.css b/daikoku/public/themes/dark.css
index 3f21a3502..571d91b27 100644
--- a/daikoku/public/themes/dark.css
+++ b/daikoku/public/themes/dark.css
@@ -1,44 +1,37 @@
-:root[data-theme="DARK"] {
-  --error-color: #dc3545;
-  --info-color: #17a2b8;
-  --success-color: #65B741;
-  --warning-color: #ffc107;
-  --danger-color: #dc3545;
-
+:root[data-theme="DARK"] {  
   --body_bg-color: #000;
   --body_text-color: #b3b3b3;
-  --body_link-color: #b3b3b3;
-  --body_link-hover-color: orange;
+  --body_link-color:#b3b3b3;
+  --body_link-hover-color:orange;
 
   --level2_bg-color: #121212;
   --level2_text-color: #b3b3b3;
   --level2_link-color: #9f9e9e;
   --level2_link-hover-color: #fff;
 
-  --level3_bg-color: #242424;
-  --level3_text-color: #e8e8e8;
+  --level3_bg-color : #242424;
+  --level3_text-color : #e8e8e8;
   --level3_link-color: #9f9e9e;
-  --level3_link-hover-color: #fff;
-  --level3_link-hover-bg-color: grey;
+  --level3_link-hover-color : #fff;
+  --level3_link-hover-bg-color : grey;    
 
   --sidebar-bg-color: #121212;
   --sidebar-text-color: #b3b3b3;
-  --sidebar-text-hover-color: orange;
+  --sidebar-text-hover-color:orange;
   
   --menu-bg-color: #242424;
   --menu-text-color: #fff;
   --menu-text-hover-bg-color: #121212;
   --menu-text-hover-color: #fff;
-  --menu-link-color: #b3b3b3;
-  
-  --card_header-bg-color: #404040;
+  --menu-link-color: #b3b3b3;  
+
+  --card_header-bg-color : #404040;
   --card_header-text-color: #fff;
   --card_bg-color: #282828;
   --card_text-color: #fff;
-  --card_link-color: #b3b3b3;
-  --card_link-hover-color: orange;
-
-
+  --card_link-color: #ffe1a7;
+  --card_link-hover-color : #ffc107;
+  
   --btn-bg-color: #fff;
   --btn-text-color: #495057;
   --btn-border-color: #97b0c7;
@@ -55,5 +48,11 @@
   --form-select-focused-text-color: white;
   --form-select-heading-color: yellow;
   --form-select-hover-color: grey;
-  --form-select-hover-text-color: white;
+  --form-select-hover-text-color: white;  
+
+  --error-color:#dc3545;
+  --info-color: #17a2b8;
+  --success-color: #65B741;
+  --warning-color: #ffc107;
+  --danger-color: #dc3545;
 }
\ No newline at end of file
diff --git a/daikoku/public/themes/light.css b/daikoku/public/themes/light.css
index d99d6f142..e70b6723b 100644
--- a/daikoku/public/themes/light.css
+++ b/daikoku/public/themes/light.css
@@ -1,44 +1,36 @@
 :root {
-  --error-color: #dc3545;
-  --info-color: #17a2b8;
-  --success-color: #65B741;
-  --warning-color: #ffc107;
-  --danger-color: #dc3545;
-
   --body_bg-color: #f1f3f6;
   --body_text-color: #8a8a8a;
-  --body_link-color: #4c4c4d;
-  --body_link-hover-color: orange;
-
+  --body_link-color:#4c4c4d;
+  --body_link-hover-color:orange;
+  
   --level2_bg-color: #e5e7ea;
   --level2_text-color: #4c4c4d;
   --level2_link-color: #605c5c;
-  --level2_link-hover-color: #000;
-
+  --level2_link-hover-color: #000;  
 
-  --level3_bg-color: #fff;
-  --level3_text-color: #222;
+  --level3_bg-color : #fff;
+  --level3_text-color : #222;
   --level3_link-color: #4c4c4d;
-  --level3_link-hover-color: #000;
-  --level3_link-hover-bg-color: grey;
+  --level3_link-hover-color : #000;
+  --level3_link-hover-bg-color :grey;
 
   --sidebar-bg-color: #e5e7ea;
   --sidebar-text-color: #4c4c4d;
-  --sidebar-text-hover-color: orange;
+  --sidebar-text-hover-color:orange;
 
   --menu-bg-color: #fff;
   --menu-text-color: #aaa;
   --menu-text-hover-bg-color: #444;
   --menu-text-hover-color: #fff;
-  --menu-link-color: #666;
-
+  --menu-link-color: #666; 
 
   --card_header-bg-color: #404040;
   --card_header-text-color: #fff;
   --card_bg-color: #282828;
   --card_text-color: #fff;
-  --card_link-color: #b3b3b3;
-  --card_link-hover-color: orange;
+  --card_link-color: #ffe1a7;
+  --card_link-hover-color : #ffc107;
 
   --btn-bg-color: #fff;
   --btn-text-color: #495057;
@@ -46,7 +38,7 @@
 
   --badge-tags-bg-color: #ffc107;
   --badge-tags-bg-hover-color: #ffe1a7;
-  --badge-tags-text-color: #212529;
+  --badge-tags-text-color: #212529;    
 
   --form-text-color: #000;
   --form-border-color: #586069;
@@ -57,4 +49,10 @@
   --form-select-heading-color: yellow;
   --form-select-hover-color: lightgrey;
   --form-select-hover-text-color: white;
+
+  --error-color:#dc3545;
+  --info-color: #17a2b8;
+  --success-color: #65B741;
+  --warning-color: #ffc107;
+  --danger-color: #dc3545;  
 }
\ No newline at end of file