fixed colors
Merge branch 'master' into MoreUITweaks
Merge pull request #13 from hey-you-project/MoreUITweaks

More ui tweaks