Filling and fontlocking

This is the big thing I spent the last two days working on. And somehow I managed to forget to PR.
…and this