Huge overhaul to 0.60. Add icons, more favorite list support.