Filling and fontlocking

This is the big thing I spent the last two days working on. And somehow I managed to forget to PR.
exactly. :-)
I'm not sure if we need to cask it since it's built-in. But I guess it can't hurt.