rough buildout, modifications and simplification from previous theme framework