changing the templating to account for themes

just minor changes for future proofing and maintaining theme'ing