Expand templates

From Kingdom of Atenveldt
Expand templates