Updated color scheme, some other stuff