Merge current and current-archive.  Fix up colors for menus.