Added Color-class, added toggle(), more cleanup