Minor fixes, a Cake3 change and the verification_email template
Removing the incomplete HTML email templates, if somebody wants them please create them and do a PR