merged tarr theme dev into master, fix url for tarr theme