Moved tags out of includes, changed translations