removed snap theme
merge conflict