Amend todo keywords and capture templates