Night mode fixes

Restore expando images, more merges, link legibility improved