Added new theme
merge conflict resloved