:Added calendar themes specific
:Resolved conflicts