simplify stylesheets, fix extend bug