Merge "Fix erroneous LXX theme text color mappings" into main