Move waldorf specific styles into waldorf