add multi theming support