Improved color contrast. Simplified some rules and removed some unused ones.