[#34] Restructure imports to avoid duplicate style rules.

Fix duplicate styles in resulting theme css.