diff --git a/main/ui/src/main/resources/css/dark_theme.css b/main/ui/src/main/resources/css/dark_theme.css
index cac2d664a..695ca5530 100644
--- a/main/ui/src/main/resources/css/dark_theme.css
+++ b/main/ui/src/main/resources/css/dark_theme.css
@@ -23,36 +23,58 @@
  ******************************************************************************/
 
 .root {
-	PRIMARY: #79B01A;
-	SECONDARY: #626262;
-	PRIMARY_BG: #598016;
-	MAIN_BG: #3B3B3B;
-	TEXT_FILL: #F7F7F7;
-	TEXT_FILL_PRIMARY: #79B01A;
-	TEXT_FILL_SECONDARY: #9E9E9E;
+	GREEN_0: #373B30;
+	GREEN_1: #384D14;
+	GREEN_2: #476611;
+	GREEN_3: #598016;
+	GREEN_4: #699917;
+	GREEN_5: #79B01A;
+	GREEN_6: #9ED938;
+	GREEN_7: #B9E070;
+	GREEN_8: #D7E7BA;
+	GREEN_9: #F3F5F0;
+
+	GRAY_0: #222;
+	GRAY_1: #3B3B3B;
+	GRAY_2: #515151;
+	GRAY_3: #626262;
+	GRAY_4: #7E7E7E;
+	GRAY_5: #9E9E9E;
+	GRAY_6: #B1B1B1;
+	GRAY_7: #CFCFCF;
+	GRAY_8: #E1E1E1;
+	GRAY_9: #F7F7F7;
+
+	PRIMARY: GREEN_5;
+	SECONDARY: GRAY_3;
+	PRIMARY_BG: GREEN_3;
+	MAIN_BG: GRAY_1;
+	TEXT_FILL: GRAY_9;
+	TEXT_FILL_PRIMARY: GREEN_5;
+	TEXT_FILL_SECONDARY: GRAY_5;
 	TEXT_FILL_WHITE: white;
-	TEXT_FILL_WHITE_SECONDARY: #7E7E7E;
-	CONTROL_BORDER_NORMAL: #626262;
-	CONTROL_BORDER_FOCUSED: #9E9E9E;
-	CONTROL_BORDER_DISABLED: #515151;
-	CONTROL_BG_NORMAL: #222;
-	CONTROL_BG_HOVER: #3B3B3B;
-	CONTROL_BG_ARMED: #515151;
-	CONTROL_BG_DISABLED: #3B3B3B;
-	CONTROL_PRIMARY_BORDER_NORMAL: #70A11B;
-	CONTROL_PRIMARY_BORDER_FOCUSED: #91D126;
-	CONTROL_PRIMARY_BORDER_DISABLED: #688040;
-	CONTROL_PRIMARY_BG_NORMAL: #598016;
-	CONTROL_PRIMARY_BG_ARMED: #70A11B;
-	CONTROL_PRIMARY_BG_DISABLED: #4D5E2F;
-	CONTROL_PRIMARY_LIGHT_BG_NORMAL: #3A3B39;
-	CONTROL_WHITE_BG_ARMED: #E1E1E1;
-	SCROLL_BAR_THUMB_NORMAL: #626262;
-	SCROLL_BAR_THUMB_HOVER: #7E7E7E;
+	TEXT_FILL_WHITE_SECONDARY: GRAY_4;
+	CONTROL_BORDER_NORMAL: GRAY_3;
+	CONTROL_BORDER_FOCUSED: GRAY_5;
+	CONTROL_BORDER_DISABLED: GRAY_2;
+	CONTROL_BG_NORMAL: GRAY_0;
+	CONTROL_BG_HOVER: GRAY_1;
+	CONTROL_BG_ARMED: GRAY_2;
+	CONTROL_BG_DISABLED: GRAY_1;
+	CONTROL_PRIMARY_BORDER_NORMAL: GREEN_5;
+	CONTROL_PRIMARY_BORDER_FOCUSED: GREEN_7;
+	CONTROL_PRIMARY_BORDER_DISABLED: GREEN_3;
+	CONTROL_PRIMARY_BG_NORMAL: GREEN_3;
+	CONTROL_PRIMARY_BG_ARMED: GREEN_4;
+	CONTROL_PRIMARY_BG_DISABLED: GREEN_2;
+	CONTROL_PRIMARY_LIGHT_BG_NORMAL: GREEN_0;
+	CONTROL_WHITE_BG_ARMED: GRAY_8;
+	SCROLL_BAR_THUMB_NORMAL: GRAY_3;
+	SCROLL_BAR_THUMB_HOVER: GRAY_4;
 	INDICATOR_BG: #C74234;
-	PROGRESS_INDICATOR_BEGIN: #CFCFCF;
-	PROGRESS_INDICATOR_END: #9E9E9E;
-	PASSWORD_STRENGTH_INDICATOR_BG: #FFF;
+	PROGRESS_INDICATOR_BEGIN: GRAY_7;
+	PROGRESS_INDICATOR_END: GRAY_5;
+	PASSWORD_STRENGTH_INDICATOR_BG: white;
 	PASSWORD_STRENGTH_INDICATOR_BG_STRENGTH_0: #E74C3C;
 	PASSWORD_STRENGTH_INDICATOR_BG_STRENGTH_1: #E67E22;
 	PASSWORD_STRENGTH_INDICATOR_BG_STRENGTH_2: #F1C40F;
diff --git a/main/ui/src/main/resources/css/light_theme.css b/main/ui/src/main/resources/css/light_theme.css
index a8fd1db74..8461806af 100644
--- a/main/ui/src/main/resources/css/light_theme.css
+++ b/main/ui/src/main/resources/css/light_theme.css
@@ -23,36 +23,58 @@
  ******************************************************************************/
 
 .root {
-	PRIMARY: #79B01A;
-	SECONDARY: #9E9E9E;
-	PRIMARY_BG: #70A11B;
-	MAIN_BG: #F7F7F7;
-	TEXT_FILL: #222;
-	TEXT_FILL_PRIMARY: #6B9B17;
-	TEXT_FILL_SECONDARY: #7E7E7E;
+	GREEN_0: #373B30;
+	GREEN_1: #384D14;
+	GREEN_2: #476611;
+	GREEN_3: #598016;
+	GREEN_4: #699917;
+	GREEN_5: #79B01A;
+	GREEN_6: #91C734;
+	GREEN_7: #B9E070;
+	GREEN_8: #D7E7BA;
+	GREEN_9: #F3F5F0;
+
+	GRAY_0: #222;
+	GRAY_1: #3B3B3B;
+	GRAY_2: #515151;
+	GRAY_3: #626262;
+	GRAY_4: #7E7E7E;
+	GRAY_5: #9E9E9E;
+	GRAY_6: #B1B1B1;
+	GRAY_7: #CFCFCF;
+	GRAY_8: #E1E1E1;
+	GRAY_9: #F7F7F7;
+
+	PRIMARY: GREEN_5;
+	SECONDARY: GRAY_5;
+	PRIMARY_BG: GREEN_5;
+	MAIN_BG: GRAY_9;
+	TEXT_FILL: GRAY_0;
+	TEXT_FILL_PRIMARY: GREEN_4;
+	TEXT_FILL_SECONDARY: GRAY_4;
 	TEXT_FILL_WHITE: white;
-	TEXT_FILL_WHITE_SECONDARY: #B1B1B1;
-	CONTROL_BORDER_NORMAL: #CFCFCF;
-	CONTROL_BORDER_FOCUSED: #9E9E9E;
-	CONTROL_BORDER_DISABLED: #E1E1E1;
-	CONTROL_BG_NORMAL: #FFF;
-	CONTROL_BG_HOVER: #F7F7F7;
-	CONTROL_BG_ARMED: #E1E1E1;
-	CONTROL_BG_DISABLED: #F7F7F7;
-	CONTROL_PRIMARY_BORDER_NORMAL: #598016;
-	CONTROL_PRIMARY_BORDER_FOCUSED: #425E10;
-	CONTROL_PRIMARY_BORDER_DISABLED: #688040;
-	CONTROL_PRIMARY_BG_NORMAL: #70A11B;
-	CONTROL_PRIMARY_BG_ARMED: #598016;
-	CONTROL_PRIMARY_BG_DISABLED: #83A150;
-	CONTROL_PRIMARY_LIGHT_BG_NORMAL: #F6F7F2;
-	CONTROL_WHITE_BG_ARMED: #E1E1E1;
-	SCROLL_BAR_THUMB_NORMAL: #CFCFCF;
-	SCROLL_BAR_THUMB_HOVER: #B1B1B1;
+	TEXT_FILL_WHITE_SECONDARY: GRAY_5;
+	CONTROL_BORDER_NORMAL: GRAY_7;
+	CONTROL_BORDER_FOCUSED: GRAY_5;
+	CONTROL_BORDER_DISABLED: GRAY_8;
+	CONTROL_BG_NORMAL: white;
+	CONTROL_BG_HOVER: GRAY_9;
+	CONTROL_BG_ARMED: GRAY_8;
+	CONTROL_BG_DISABLED: GRAY_9;
+	CONTROL_PRIMARY_BORDER_NORMAL: GREEN_3;
+	CONTROL_PRIMARY_BORDER_FOCUSED: GREEN_1;
+	CONTROL_PRIMARY_BORDER_DISABLED: GREEN_5;
+	CONTROL_PRIMARY_BG_NORMAL: GREEN_5;
+	CONTROL_PRIMARY_BG_ARMED: GREEN_4;
+	CONTROL_PRIMARY_BG_DISABLED: GREEN_6;
+	CONTROL_PRIMARY_LIGHT_BG_NORMAL: GREEN_9;
+	CONTROL_WHITE_BG_ARMED: GRAY_8;
+	SCROLL_BAR_THUMB_NORMAL: GRAY_7;
+	SCROLL_BAR_THUMB_HOVER: GRAY_6;
 	INDICATOR_BG: #E74C3C;
-	PROGRESS_INDICATOR_BEGIN: #515151;
-	PROGRESS_INDICATOR_END: #7E7E7E;
-	PASSWORD_STRENGTH_INDICATOR_BG: #FFF;
+	PROGRESS_INDICATOR_BEGIN: GRAY_2;
+	PROGRESS_INDICATOR_END: GRAY_4;
+	PASSWORD_STRENGTH_INDICATOR_BG: white;
 	PASSWORD_STRENGTH_INDICATOR_BG_STRENGTH_0: #E74C3C;
 	PASSWORD_STRENGTH_INDICATOR_BG_STRENGTH_1: #E67E22;
 	PASSWORD_STRENGTH_INDICATOR_BG_STRENGTH_2: #F1C40F;