Added multi-theme support