Add neko.  Many fixes.  Add support for icons.