college theme bug fixes. most border control. #4419