nav and color prep
Merge branch 'master' of github.com:Myztiq/gaffer