Manual revert to TkTech's changes
Now enhanced with rogeliodh's Calibre support

And other enhancements.
Updated .gitignore to fix unnecessary conflict