More changes

Color changing and more handlers