Fix overlays for now

These overlays have not been added to cm-12.0 yet
They will be re-enabled when merged