Color tweaks, move views/controllers into lib.