push changes, colors working