Fix problems with Themo applications (9)