Refactored CSS includes