Overlay changes

Reviewers: @donovanhide, @ximinez, @rec
No error checking/reporting in case promote has a wrong value (e.g. "'never'")?