properly fix (and re-organize) selfont selection.