DEFINITE MASTER COMMIT
MASTER COMMIT Font hack re-added.