theme page reorganisation