Cleaning up.
Adjusting to syntax changes.
Adding ncmpcpp, too.