- moved some stuff around
- added {@loc:...} template placeholder