Template system needs CSS changes