use newer RxUI

here's a consolidated pull request instead of that mess I made 2 months ago