Partial border upgrade push

The new thumbnail borders have me reconsidering things so I'll go ahead and merge the definite changes into 5.4.