Messed up the theme
Changing some more template functions over