Some fixes after the last theme review
.