renamed pushy selectors / separated required and optional css