Expand templates

From OSINT.INFO
Expand templates