Starting to rename the theme stuff to Scaffolding