Fix image composition
Created by: renefritze
Turns out that I misunderstood the evaluation order/scope of ONBUILD so that a lot of the last refcator didn't actually do what it was supposed to. So now I'm using my good old friend m4 for textual inclusion.