Adding some new colors
Minor changes + indentation fixes