Fix problems with Themo applications (8)