Topic list coloring fixes

Only the fixes from #2342