Added dynamic theme support