Improve dealing with CSS imports