1 files changed, 35 insertions, 34 deletions

diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json
index 94372d415e..b3ee4c912b 100644
--- a/resources/themes/cura-light/theme.json
+++ b/resources/themes/cura-light/theme.json
@@ -6,166 +6,166 @@
     "fonts": {
         "large": {
             "size": 1.35,
-            "weight": 40,
+            "weight": 400,
             "family": "Noto Sans"
         },
         "large_ja_JP": {
             "size": 1.35,
-            "weight": 50,
+            "weight": 400,
             "family": "Noto Sans"
         },
         "large_zh_CN": {
             "size": 1.35,
-            "weight": 50,
+            "weight": 400,
             "family": "Noto Sans"
         },
         "large_zh_TW": {
             "size": 1.35,
-            "weight": 50,
+            "weight": 400,
             "family": "Noto Sans"
         },
         "large_bold": {
             "size": 1.35,
-            "weight": 63,
+            "weight": 600,
             "family": "Noto Sans"
         },
         "huge": {
             "size": 1.8,
-            "weight": 50,
+            "weight": 400,
             "family": "Noto Sans"
         },
         "huge_bold": {
             "size": 1.8,
-            "weight": 63,
+            "weight": 600,
             "family": "Noto Sans"
         },
         "medium": {
             "size": 1.16,
-            "weight": 40,
+            "weight": 400,
             "family": "Noto Sans"
         },
         "medium_ja_JP": {
             "size": 1.16,
-            "weight": 50,
+            "weight": 400,
             "family": "Noto Sans"
         },
         "medium_zh_CN": {
             "size": 1.16,
-            "weight": 50,
+            "weight": 400,
             "family": "Noto Sans"
         },
         "medium_zh_TW": {
             "size": 1.16,
-            "weight": 50,
+            "weight": 400,
             "family": "Noto Sans"
         },
         "medium_bold": {
             "size": 1.16,
-            "weight": 63,
+            "weight": 600,
             "family": "Noto Sans"
         },
         "default": {
             "size": 0.95,
-            "weight": 40,
+            "weight": 400,
             "family": "Noto Sans"
         },
         "default_ja_JP": {
             "size": 1.0,
-            "weight": 50,
+            "weight": 400,
             "family": "Noto Sans"
         },
         "default_zh_CN": {
             "size": 1.0,
-            "weight": 50,
+            "weight": 400,
             "family": "Noto Sans"
         },
         "default_zh_TW": {
             "size": 1.0,
-            "weight": 50,
+            "weight": 400,
             "family": "Noto Sans"
         },
         "default_bold": {
             "size": 0.95,
-            "weight": 63,
+            "weight": 600,
             "family": "Noto Sans"
         },
         "default_bold_ja_JP": {
             "size": 1.0,
-            "weight": 63,
+            "weight": 600,
             "family": "Noto Sans"
         },
         "default_bold_zh_CN": {
             "size": 1.0,
-            "weight": 63,
+            "weight": 600,
             "family": "Noto Sans"
         },
         "default_bold_zh_TW": {
             "size": 1.0,
-            "weight": 63,
+            "weight": 600,
             "family": "Noto Sans"
         },
         "default_italic": {
             "size": 0.95,
-            "weight": 40,
+            "weight": 400,
             "italic": true,
             "family": "Noto Sans"
         },
         "default_italic_ja_JP": {
             "size": 1.0,
-            "weight": 50,
+            "weight": 400,
             "italic": true,
             "family": "Noto Sans"
         },
         "default_italic_zh_CN": {
             "size": 1.0,
-            "weight": 50,
+            "weight": 400,
             "italic": true,
             "family": "Noto Sans"
         },
         "default_italic_zh_TW": {
             "size": 1.0,
-            "weight": 50,
+            "weight": 400,
             "italic": true,
             "family": "Noto Sans"
         },
         "small": {
             "size": 0.9,
-            "weight": 40,
+            "weight": 400,
             "family": "Noto Sans"
         },
         "small_ja_JP": {
             "size": 0.9,
-            "weight": 50,
+            "weight": 400,
             "family": "Noto Sans"
         },
         "small_zh_CN": {
             "size": 0.9,
-            "weight": 50,
+            "weight": 400,
             "family": "Noto Sans"
         },
         "small_zh_TW": {
             "size": 0.9,
-            "weight": 50,
+            "weight": 400,
             "family": "Noto Sans"
         },
         "small_emphasis": {
             "size": 0.9,
-            "weight": 100,
+            "weight": 700,
             "family": "Noto Sans"
         },
         "small_emphasis_ja_JP": {
             "size": 0.9,
-            "weight": 100,
+            "weight": 700,
             "family": "Noto Sans"
         },
         "small_emphasis_zh_CN": {
             "size": 0.9,
-            "weight": 100,
+            "weight": 700,
             "family": "Noto Sans"
         },
         "small_emphasis_zh_TW": {
             "size": 0.9,
-            "weight": 100,
+            "weight": 700,
             "family": "Noto Sans"
         }
     },
@@ -313,7 +313,7 @@
         "setting_control_text": [35, 35, 35, 255],
         "setting_control_button": [102, 102, 102, 255],
         "setting_control_button_hover": [8, 7, 63, 255],
-        "setting_control_disabled": [245, 245, 245, 255],
+        "setting_control_disabled": "background_2",
         "setting_control_disabled_text": [127, 127, 127, 255],
         "setting_control_disabled_border": [127, 127, 127, 255],
         "setting_unit": [127, 127, 127, 255],
@@ -364,7 +364,8 @@
         "text_field": "background_1",
         "text_field_border": [180, 180, 180, 255],
         "text_field_border_hovered": "border_main",
-        "text_field_border_disabled": "border_main",
+        "text_field_border_active": "border_accent_2",
+        "text_field_border_disabled": "background_2",
         "text_field_text": "text_default",
         "text_field_text_disabled": "text_disabled",