Color scheme redesign, some small bug fixes