fixed up some theme problems