fix the mess that were the custom templates. Now it's 100% awesome