rework of theme includes