Preparing Support for custom shell overlay, see #185