Externalize term-colors, a few prompt tweaks & general clean-up