fixed up the bugs in the theme