Added avalon theme
Rearranged avalon theme