Colors and animation fixes