Ah thanks, I'm in the design team and got the commit rights for the new templates in 3.6, so I'm not entirely new to the project :) But I didn't touch any code so far. I hope this isn't too off-topic: When I want to continue working, is 'git reset --hard origin/master' all I need to do? Thanks Alex