Rework style setup to reduce duplication