theme bug fixed