Colors and even more fixes