color updates
Merge branch 'master' of github.com:michaelmuse/twendy
Merge branch 'master' of github.com:michaelmuse/twendy
type fixes