#261 Externalized base64-inlined images; bugfixes