Styles folder modularised;
Merge remote-tracking branch 'origin/feature/modular-styles'