First part cleanup

Use Tabs activity for Color Settings, seperating away from changing color, i dunno, i find it more cleaner and usuable
Just cleaning up
Merge branch 'jb3-cleanup' into jb3