fixed theme ui change conflict