Tweaked calculation formula and colors