fixed theme counts (#318, #319)