Refactor bundler
[broken] Fix styles processing