Think I finally fixed colors. Miss tests
Merge branch 'master' into gh-pages
Generate deploy