theme bug fixes