refactor, colour scheme, cli fix