Better preprocessing in theme.