Added aliasses and changed colors