Fine tune colors for bold mode
Fine tune colors for bold mode
Remove commented code
Nicer implementation
Rebase from fork