Add docopt, cli-colors and resolve some inconsistencies