Added multi theme support