[WIP] Merge all our changes into master

We've been using twui from a branch. Maybe because we were trying to maintain compatibility with upstream?

Let's stop doing that. We're trying to kill this thing, so let's just do what we need to do for now.