marvel: de-CM-ify the tree a bit
add PA Lightbuilb overlay