Updates various templates and added Carlos' CPT framework