Applied the recategorization for themes, added new layers