Use fillIn and expandEntities on text
Handle old CODEX names too
Moved text/ to html/ and made use of entities for logotypes, etc