Retool the tags for theme