Reorganized rules in base styles section