Variablise spacing values
Put size variants behind a feature switch
Put all modifiers behind feature switches
Reorder modifiers