Fixed custom templates to allow overloading/fallback.