After Omar integration, before CSS