Note that even the velocity macros should be reworked to get results closer to the new XWiki macros.
https://github.com/xwiki/xwiki-platform/blob/679b8516cdf266af200f69f7c101e59bf8d25255/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/macros.vm#L956-L966
> All cases of usage of a CSS class without the macro
See: