Fixed theme bug