fix some bugs with themes & assets