Improve typesetting of theme10