Changed some alias, added colors