Changed more colors, chargebar needs more work