merge #25 (themes), minor fixes