Re-arrange bundles, and improve indent guide line color