So I had to fix those in mine before it diverged.
You can remove the colspan from main-link.
<td class='main-link clearfix' colspan="{{titleColSpan}}">
into
<td class='main-link clearfix'>
For category page, if you notice in mine, I surrounded all topic list styles with .topic-list:not(.categories) to make sure it didn’t affect the category page.