Attached is (yet another) test version, with all of the changes previous, plus:
- Fix for FimF not working with the manual 'Are you an Adult' popup, and;
- Fix for the keyboard shortcuts issue with calibre 2.10.
- Still contains the self-closing <p> change for that one ffnet story--haven't decided yet if I should include that or not in the next release.