Split color creation by tables/components
Remove unused local
Use more descriptive variable name
Merge branch 'feature/timer' into development