Color changes and timer bug fixes

Commit all bug fixes and timer changes to github
comment

test comment