much closer to having working and modular themes
clean up theme a little bit