Some more template improvements and updated translations