college theme bug fixes for 3.9. #3607