revisions to my theming challenge