Switch internal refs
Fix font keying