Refactored app colors a bit