Improved & fixed regenix templates