Font updates.
Remove xmodmap stuff (was brittle)