College theme bug fixes. #3607