Merge "Fix other colors loading" into main