v2013 Major CSS rework