theme bug fixing