make DISABLE_EBOOK_WINDOW default, fix most remaining inconsistencies