second attempt at fixing up my theming woes