core update

moved 2011 styling partially to core