Updated stylesheets naming and structure