new structure for Theme