Worked on stabilizing editor theming within the godotengine/godot repository, focusing on resolving a bug that caused the editor’s custom base color to be overridden when the Follow System Theme option was enabled. Addressed this by refining the Theme Manager’s logic in C++, ensuring that user-defined theme settings are consistently respected across different platforms and environments. The solution involved careful configuration management and regression testing against edge cases to prevent visual inconsistencies. Updated documentation and code comments to clarify the intended behavior and rationale behind theme interactions, contributing to a more predictable and user-friendly editor experience for Godot users.