From a0daebb4a7cdca242c7c6938fcd8e074d184aa04 Mon Sep 17 00:00:00 2001
From: Weizhen Huang <weizhen@blender.org>
Date: Tue, 16 Sep 2025 18:02:07 +0200
Subject: [PATCH] Revert "New Colors v4"

This reverts commit a1dfd67cbfeaee97432453c4b5fcd994700f2ca7.
Did not mean to push
---
 .../datafiles/userdef/userdef_default_theme.c | 86 ++++++++--------
 .../presets/interface_theme/Blender_Light.xml | 97 ++++++++++---------
 2 files changed, 92 insertions(+), 91 deletions(-)

diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c
index c137c1303fd..f6c916f9d40 100644
--- a/release/datafiles/userdef/userdef_default_theme.c
+++ b/release/datafiles/userdef/userdef_default_theme.c
@@ -792,103 +792,103 @@ const bTheme U_theme_default = {
   .tarm = {
     {
       .solid = RGBA(0xe06254ff),
-      .select = RGBA(0xff7566ff),
-      .active = RGBA(0xffe8e6ff),
+      .select = RGBA(0xff7f71ff),
+      .active = RGBA(0xffe9e6ff),
     },
     {
-      .solid = RGBA(0xd2b1a1ff),
-      .select = RGBA(0xfea275ff),
-      .active = RGBA(0xffeee6ff),
+      .solid = RGBA(0xd2a087ff),
+      .select = RGBA(0xeeb899ff),
+      .active = RGBA(0xffefe6ff),
     },
     {
-      .solid = RGBA(0xd2743fff),
-      .select = RGBA(0xffbb6eff),
-      .active = RGBA(0xfff3e6ff),
+      .solid = RGBA(0xd2944dff),
+      .select = RGBA(0xeda348ff),
+      .active = RGBA(0xfff4e6ff),
     },
     {
       .solid = RGBA(0xd5bb3aff),
-      .select = RGBA(0xedd041ff),
+      .select = RGBA(0xd0b639ff),
       .active = RGBA(0xfffbe6ff),
     },
     {
       .solid = RGBA(0xb9b379ff),
-      .select = RGBA(0xe5de96ff),
-      .active = RGBA(0xfffde6ff),
+      .select = RGBA(0xbcb57bff),
+      .active = RGBA(0xfffce6ff),
     },
     {
       .solid = RGBA(0x9fbe39ff),
-      .select = RGBA(0xc5eb47ff),
-      .active = RGBA(0xf9ffe6ff),
+      .select = RGBA(0xacc13aff),
+      .active = RGBA(0xfbffe6ff),
     },
     {
       .solid = RGBA(0x7bc83bff),
-      .select = RGBA(0x91eb45ff),
-      .active = RGBA(0xf1ffe6ff),
+      .select = RGBA(0x85cc3cff),
+      .active = RGBA(0xf3ffe6ff),
     },
     {
       .solid = RGBA(0xa2c491ff),
-      .select = RGBA(0xc1e9acff),
-      .active = RGBA(0xefffe6ff),
+      .select = RGBA(0xa1bc8bff),
+      .active = RGBA(0xf1ffe6ff),
     },
     {
       .solid = RGBA(0x2ebe4aff),
-      .select = RGBA(0x3ce35bff),
-      .active = RGBA(0xe6ffebff),
+      .select = RGBA(0x37e14eff),
+      .active = RGBA(0xe6ffe9ff),
+    },
+    {
+      .solid = RGBA(0x71c595ff),
+      .select = RGBA(0x77c88bff),
+      .active = RGBA(0xe6ffecff),
     },
     {
       .solid = RGBA(0x34d79cff),
-      .select = RGBA(0x39efadff),
+      .select = RGBA(0x35da9eff),
       .active = RGBA(0xe6fff6ff),
     },
     {
       .solid = RGBA(0x3ad5d4ff),
-      .select = RGBA(0x3fe7e6ff),
-      .active = RGBA(0xe6ffffff),
+      .select = RGBA(0x3bd2d7ff),
+      .active = RGBA(0xe6feffff),
     },
     {
-      .solid = RGBA(0x88bbd7ff),
-      .select = RGBA(0x71b6f9ff),
-      .active = RGBA(0xe6f3ffff),
+      .solid = RGBA(0x61b0ddff),
+      .select = RGBA(0x6bc1f3ff),
+      .active = RGBA(0xe6f6ffff),
+    },
+    {
+      .solid = RGBA(0x9cc1e5ff),
+      .select = RGBA(0x83d0e1ff),
+      .active = RGBA(0xe6fbffff),
     },
     {
       .solid = RGBA(0x9d94ffff),
-      .select = RGBA(0x9990ffff),
+      .select = RGBA(0xb2abffff),
       .active = RGBA(0xe8e6ffff),
     },
     {
       .solid = RGBA(0xcfb2f1ff),
-      .select = RGBA(0xc28effff),
+      .select = RGBA(0xc4a8e3ff),
       .active = RGBA(0xf2e6ffff),
     },
     {
       .solid = RGBA(0xce68f2ff),
-      .select = RGBA(0xde80ffff),
-      .active = RGBA(0xf9e6ffff),
+      .select = RGBA(0xe59cffff),
+      .active = RGBA(0xf8e6ffff),
     },
     {
       .solid = RGBA(0xe74ad2ff),
-      .select = RGBA(0xff71edff),
+      .select = RGBA(0xff95f1ff),
       .active = RGBA(0xffe6fcff),
     },
     {
       .solid = RGBA(0xdaa1c9ff),
-      .select = RGBA(0xfd8bdbff),
+      .select = RGBA(0xdda3ccff),
       .active = RGBA(0xffe6f8ff),
     },
     {
       .solid = RGBA(0xd85989ff),
-      .select = RGBA(0xff83b1ff),
-      .active = RGBA(0xffe6efff),
-    },
-    {
-      .solid = RGBA(0xb4abaeff),
-      .select = RGBA(0xd6adb3ff),
-      .active = RGBA(0xffe6eaff),
-    },
-    {
-      .solid = RGBA(0x464344ff),
-      .select = RGBA(0xb1b0b0ff),
-      .active = RGBA(0xffe6e6ff),
+      .select = RGBA(0xff98d9ff),
+      .active = RGBA(0xffe6f6ff),
     },
   },
   .collection_color = {
diff --git a/scripts/presets/interface_theme/Blender_Light.xml b/scripts/presets/interface_theme/Blender_Light.xml
index e864e417eaf..45b6dad497b 100644
--- a/scripts/presets/interface_theme/Blender_Light.xml
+++ b/scripts/presets/interface_theme/Blender_Light.xml
@@ -998,143 +998,144 @@
         </space>
       </ThemeSpreadsheet>
     </spreadsheet>
-    <bone_color_sets><ThemeBoneColorSet
+    <bone_color_sets>
+      <ThemeBoneColorSet
         normal="#e06254"
-        select="#ff7566"
-        active="#ffe8e6"
+        select="#ff7f71"
+        active="#ffe9e6"
         show_colored_constraints="FALSE"
         >
       </ThemeBoneColorSet>
       <ThemeBoneColorSet
-        normal="#d2b1a1"
-        select="#fea275"
-        active="#ffeee6"
+        normal="#d2a087"
+        select="#eeb899"
+        active="#ffefe6"
         show_colored_constraints="FALSE"
         >
       </ThemeBoneColorSet>
       <ThemeBoneColorSet
-        normal="#d2743f"
-        select="#ffbb6e"
-        active="#fff3e6"
+        normal="#d2944d"
+        select="#eda348"
+        active="#fff4e6"
         show_colored_constraints="FALSE"
         >
       </ThemeBoneColorSet>
       <ThemeBoneColorSet
         normal="#d5bb3a"
-        select="#edd041"
+        select="#d0b639"
         active="#fffbe6"
         show_colored_constraints="FALSE"
         >
       </ThemeBoneColorSet>
       <ThemeBoneColorSet
         normal="#b9b379"
-        select="#e5de96"
-        active="#fffde6"
+        select="#bcb57b"
+        active="#fffce6"
         show_colored_constraints="FALSE"
         >
       </ThemeBoneColorSet>
       <ThemeBoneColorSet
         normal="#9fbe39"
-        select="#c5eb47"
-        active="#f9ffe6"
+        select="#acc13a"
+        active="#fbffe6"
         show_colored_constraints="FALSE"
         >
       </ThemeBoneColorSet>
       <ThemeBoneColorSet
         normal="#7bc83b"
-        select="#91eb45"
-        active="#f1ffe6"
+        select="#85cc3c"
+        active="#f3ffe6"
         show_colored_constraints="FALSE"
         >
       </ThemeBoneColorSet>
       <ThemeBoneColorSet
         normal="#a2c491"
-        select="#c1e9ac"
-        active="#efffe6"
+        select="#a1bc8b"
+        active="#f1ffe6"
         show_colored_constraints="FALSE"
         >
       </ThemeBoneColorSet>
       <ThemeBoneColorSet
         normal="#2ebe4a"
-        select="#3ce35b"
-        active="#e6ffeb"
+        select="#37e14e"
+        active="#e6ffe9"
+        show_colored_constraints="FALSE"
+        >
+      </ThemeBoneColorSet>
+      <ThemeBoneColorSet
+        normal="#71c595"
+        select="#77c88b"
+        active="#e6ffec"
         show_colored_constraints="FALSE"
         >
       </ThemeBoneColorSet>
       <ThemeBoneColorSet
         normal="#34d79c"
-        select="#39efad"
+        select="#35da9e"
         active="#e6fff6"
         show_colored_constraints="FALSE"
         >
       </ThemeBoneColorSet>
       <ThemeBoneColorSet
         normal="#3ad5d4"
-        select="#3fe7e6"
-        active="#e6ffff"
+        select="#3bd2d7"
+        active="#e6feff"
         show_colored_constraints="FALSE"
         >
       </ThemeBoneColorSet>
       <ThemeBoneColorSet
-        normal="#88bbd7"
-        select="#71b6f9"
-        active="#e6f3ff"
+        normal="#61b0dd"
+        select="#6bc1f3"
+        active="#e6f6ff"
+        show_colored_constraints="FALSE"
+        >
+      </ThemeBoneColorSet>
+      <ThemeBoneColorSet
+        normal="#9cc1e5"
+        select="#83d0e1"
+        active="#e6fbff"
         show_colored_constraints="FALSE"
         >
       </ThemeBoneColorSet>
       <ThemeBoneColorSet
         normal="#9d94ff"
-        select="#9990ff"
+        select="#b2abff"
         active="#e8e6ff"
         show_colored_constraints="FALSE"
         >
       </ThemeBoneColorSet>
       <ThemeBoneColorSet
         normal="#cfb2f1"
-        select="#c28eff"
+        select="#c4a8e3"
         active="#f2e6ff"
         show_colored_constraints="FALSE"
         >
       </ThemeBoneColorSet>
       <ThemeBoneColorSet
         normal="#ce68f2"
-        select="#de80ff"
-        active="#f9e6ff"
+        select="#e59cff"
+        active="#f8e6ff"
         show_colored_constraints="FALSE"
         >
       </ThemeBoneColorSet>
       <ThemeBoneColorSet
         normal="#e74ad2"
-        select="#ff71ed"
+        select="#ff95f1"
         active="#ffe6fc"
         show_colored_constraints="FALSE"
         >
       </ThemeBoneColorSet>
       <ThemeBoneColorSet
         normal="#daa1c9"
-        select="#fd8bdb"
+        select="#dda3cc"
         active="#ffe6f8"
         show_colored_constraints="FALSE"
         >
       </ThemeBoneColorSet>
       <ThemeBoneColorSet
         normal="#d85989"
-        select="#ff83b1"
-        active="#ffe6ef"
-        show_colored_constraints="FALSE"
-        >
-      </ThemeBoneColorSet>
-      <ThemeBoneColorSet
-        normal="#b4abae"
-        select="#d6adb3"
-        active="#ffe6ea"
-        show_colored_constraints="FALSE"
-        >
-      </ThemeBoneColorSet>
-      <ThemeBoneColorSet
-        normal="#464344"
-        select="#b1b0b0"
-        active="#ffe6e6"
+        select="#ff98d9"
+        active="#ffe6f6"
         show_colored_constraints="FALSE"
         >
       </ThemeBoneColorSet>