Rearranged avalon theme