Add key items for new states; tweak colors a bit. Issue #238.