added colorfilter
fixed mergeconflict