Using macros to define constants, default animation value change

Using macros to define constants, default animation value change