Update Colors & functionality
Add 'goal' functionality