Add color scheme, fix naming