Styles refactors and vendor fixes