Refactors theming layer for singularity grid

David, do you want to review and accept the pull request? 

Thanks,
Aaron