Made themes optional