Refactors theming layer for singularity grid