fix some more test still using dict
fix theme path construction