CSS extraction for #142
merge