[possibly 21.0] Make global-faces overridable by resoureces