Added a calculator (which works :O) and finally actually fixed the color bugs