WIP: Colors, small changes