Place some recolors in sublists

Signed-off-by: Gaurav Munjal <Gaurav0@aol.com>
Fix issues with collapse all / redraw

Signed-off-by: Gaurav Munjal <Gaurav0@aol.com>