Filling and fontlocking

This is the big thing I spent the last two days working on. And somehow I managed to forget to PR.
Ok, I looked around a bit and I think we're not supposed to list non-versioned built-in's as dependencies. So I'm leaving this one.