Finalized layout and color themes
Merge branch 'master' of https://github.com/UnicycleLabs/intouch