Improve css toolkit