Updating default theme.
Resolving conflicts