update theme
add merge.tool alias for git