Fix theme-slug issues