I think that's where the consensus was pushing for, to be self funding and not rely on the DHF.

I don't think the self funding will ever get close to fully replace the DHF in terms of funding. But I may be wrong.

One thing that I think would be very useful is photo layout templates. Sara did a post before for the markups for multiple layouts

Will think about it.