FocusPointerComponent more colours
Merge branch 'master'