Updated i18n and Categories