Added Color-class, more cleanup