Update order and add fold markers
Remove right status
Tweak colours