Move color usage from code to XML where it belongs
Rename some ids