cleaned up some code, removed cache, changed default colors