restructure themes