While we wait for the next release of the CMS, I was going through the template system I am working on, and saw some old code in the forums that I wanted to update. So I did and so far everything seems to work as intended, but if anyone has any issues, please, let me know. Thanks.