added theme classes, but we fix in one theme at this moment