Changed colors in HVAC Fragment
Merge conflicts from upstream