Addition of generic template/theme
Work towards generic template
Cleaning things up
Changes to the Generic theme