updated transitions and @keyframes