Fixes and colors

Probably one of the last commits before the release of the app.