diff --git a/components/Abbreviation.vue b/components/Abbreviation.vue
index dc8110b63..538d4a628 100644
--- a/components/Abbreviation.vue
+++ b/components/Abbreviation.vue
@@ -4,26 +4,35 @@
     </span>
 </template>
 
-<script>
+<script lang="ts">
+import Vue from 'vue';
 import { abbreviations } from '../src/data.ts';
 
-export default {
+export default Vue.extend({
     props: {
-        v: { required: true },
+        v: { required: true, type: String },
     },
-    data() {
-        const abbrs = {};
-        let word = this.v.trim();
-        let m = null;
-        while ((m = word.match(/^(\w+\.?) /)) !== null) {
-            const abbr = m[1];
-            abbrs[abbr] = abbreviations[abbr] || null;
-            word = word.substring(abbr.length + 1).trim();
-        }
+    computed: {
+        dissectedWord(): { abbrs: Record<string, string | null>, word: string } {
+            const abbrs: Record<string, string | null> = {};
+            let word = this.v.trim();
+            let m = null;
+            while ((m = word.match(/^(\w+\.?) /)) !== null) {
+                const abbr = m[1];
+                abbrs[abbr] = abbreviations[abbr] || null;
+                word = word.substring(abbr.length + 1).trim();
+            }
 
-        return { abbrs, word };
+            return { abbrs, word };
+        },
+        abbrs(): Record<string, string | null> {
+            return this.dissectedWord.abbrs;
+        },
+        word(): string {
+            return this.dissectedWord.word;
+        },
     },
-};
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/components/Noun.vue b/components/Noun.vue
index d11481c64..b8124a0e4 100644
--- a/components/Noun.vue
+++ b/components/Noun.vue
@@ -29,11 +29,15 @@
     </div>
 </template>
 
-<script>
-export default {
+<script lang="ts">
+import Vue from 'vue';
+import type { PropType } from 'vue';
+import type { genders, MinimalNoun } from '../src/classes.ts';
+
+export default Vue.extend({
     props: {
-        noun: { required: true },
-        gender: { required: true },
+        noun: { required: true, type: Object as PropType<MinimalNoun> },
+        gender: { required: true, type: String as PropType<typeof genders[number]> },
     },
-};
+});
 </script>
diff --git a/components/NounSubmitForm.vue b/components/NounSubmitForm.vue
index 5b8579b55..62f4f86d3 100644
--- a/components/NounSubmitForm.vue
+++ b/components/NounSubmitForm.vue
@@ -83,24 +83,66 @@
             <template v-if="$config.nouns.templates">
                 <a v-if="!templateVisible" href="#" class="btn btn-outline-primary w-100 mb-3" @click.prevent="templateVisible = true">
                     <Icon v="copy" />
-                    <T>nouns.template</T>
+                    <T>nouns.template.header</T>
                 </a>
                 <div v-else class="card mb-3">
                     <a href="#" class="card-header" @click.prevent="templateVisible = false">
                         <Icon v="copy" />
-                        <T>nouns.template</T>
+                        <T>nouns.template.header</T>
                     </a>
                     <div class="card-body">
-                        <T>nouns.root</T><T>quotation.colon</T> <input v-model="templateBase" class="form-control form-control-sm d-inline-block w-auto" autofocus>
-
-                        <ul>
-                            <li v-for="template in templates" class="my-2">
-                                {{ template.toString() }}
-                                <button type="button" class="btn btn-outline-primary btn-sm" @click="form = template.fill(templateBase)">
-                                    <Icon v="copy" />
-                                </button>
-                            </li>
-                        </ul>
+                        <T>nouns.template.root</T><T>quotation.colon</T>
+                        <input v-model="templateBase" class="form-control form-control-sm d-inline-block w-auto" autofocus>
+                        <table class="table table-striped table-hover table-fixed-3 mt-2">
+                            <thead>
+                                <tr>
+                                    <th class="text-nowrap">
+                                        <Icon v="mars" />
+                                        <span class="d-none d-md-inline"><T>nouns.masculine</T></span>
+                                        <span class="d-md-none"><T>nouns.masculineShort</T></span>
+                                    </th>
+                                    <th class="text-nowrap">
+                                        <Icon v="venus" />
+                                        <span class="d-none d-md-inline"><T>nouns.feminine</T></span>
+                                        <span class="d-md-none"><T>nouns.feminineShort</T></span>
+                                    </th>
+                                    <th class="text-nowrap">
+                                        <Icon v="neuter" />
+                                        <span class="d-none d-md-inline"><T>nouns.neuter</T></span>
+                                        <span class="d-md-none"><T>nouns.neuterShort</T></span>
+                                    </th>
+                                    <th></th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <tr v-for="(template, i) in templates" :key="i">
+                                    <td>
+                                        <Noun :noun="template" gender="masc" />
+                                    </td>
+                                    <td>
+                                        <Noun :noun="template" gender="fem" />
+                                    </td>
+                                    <td>
+                                        <Noun :noun="template" gender="neutr" />
+                                    </td>
+                                    <th>
+                                        <ul class="list-unstyled list-btn-concise">
+                                            <li>
+                                                <button
+                                                    type="button"
+                                                    class="btn btn-concise btn-outline-primary btn-sm"
+                                                    :disabled="!templateBase"
+                                                    @click="applyTemplate(template)"
+                                                >
+                                                    <Icon v="copy" />
+                                                    <span class="btn-label"><T>nouns.template.apply</T></span>
+                                                </button>
+                                            </li>
+                                        </ul>
+                                    </th>
+                                </tr>
+                            </tbody>
+                        </table>
                     </div>
                 </div>
             </template>
@@ -131,55 +173,65 @@
     </section>
 </template>
 
-<script class="ts">
+<script lang="ts">
 import Vue from 'vue';
 import { nounTemplates, abbreviations } from '../src/data.ts';
+import type { Noun, MinimalNoun } from '../src/classes.ts';
+import type { Config } from '../locale/config.ts';
+
+const emptyForm = (config: Config): MinimalNoun => {
+    return {
+        masc: [''],
+        fem: [''],
+        neutr: [''],
+        mascPl: config.nouns.pluralsRequired ? [''] : [],
+        femPl: config.nouns.pluralsRequired ? [''] : [],
+        neutrPl: config.nouns.pluralsRequired ? [''] : [],
+        sources: [],
+        base: null,
+    };
+};
 
 export default Vue.extend({
     data() {
         return {
-            form: {
-                masc: [''],
-                fem: [''],
-                neutr: [''],
-                mascPl: this.$config.nouns.pluralsRequired ? [''] : [],
-                femPl: this.$config.nouns.pluralsRequired ? [''] : [],
-                neutrPl: this.$config.nouns.pluralsRequired ? [''] : [],
-                sources: [],
-                base: null,
-            },
+            form: emptyForm(this.$config),
             submitting: false,
             afterSubmit: false,
-            templates: nounTemplates,
             templateBase: '',
             templateVisible: false,
             abbreviations,
         };
     },
+    computed: {
+        templates() {
+            return nounTemplates.map((template) => {
+                return template.fill(this.templateBase || '-');
+            });
+        },
+    },
     methods: {
+        async applyTemplate(template: MinimalNoun): Promise<void> {
+            if (JSON.stringify(this.form) !== JSON.stringify(emptyForm(this.$config))) {
+                await this.$confirm(this.$t('nouns.template.overwrite'));
+            }
+            this.form = template;
+            this.templateVisible = false;
+        },
         async submit() {
             this.submitting = true;
             try {
                 await this.$post('/nouns/submit', this.form);
 
                 this.afterSubmit = true;
-                this.form = {
-                    masc: [''],
-                    fem: [''],
-                    neutr: [''],
-                    mascPl: this.$config.nouns.pluralsRequired ? [''] : [],
-                    femPl: this.$config.nouns.pluralsRequired ? [''] : [],
-                    neutrPl: this.$config.nouns.pluralsRequired ? [''] : [],
-                    sources: [],
-                    base: null,
-                };
+                this.form = emptyForm(this.$config);
                 this.templateVisible = false;
                 this.templateBase = '';
             } finally {
                 this.submitting = false;
             }
         },
-        edit(word) {
+        edit(word: Noun): void {
             this.form = {
                 masc: word.masc,
                 fem: word.fem,
diff --git a/locale/_base/translations.suml b/locale/_base/translations.suml
index 9e756731c..85bee3c0f 100644
--- a/locale/_base/translations.suml
+++ b/locale/_base/translations.suml
@@ -177,8 +177,11 @@ nouns:
         another: 'Submit another one'
         moderation: 'Submissions will have to get approved before getting published.'
 
-    template: 'Use a template'
-    root: 'Root'
+    template:
+        header: 'Use a template'
+        root: 'Root'
+        apply: 'Apply template'
+        overwrite: 'Are you sure you want to apply this template? This will replace previous inputs'
 
     masculine: 'masculine'
     masculineShort: 'masc.'
diff --git a/locale/ar/translations.suml b/locale/ar/translations.suml
index d81c4cebb..4a8ccb172 100644
--- a/locale/ar/translations.suml
+++ b/locale/ar/translations.suml
@@ -156,8 +156,9 @@ nouns:
         another: 'إرسال المزيد'
         moderation: 'يجب أن يتم الموافقة على التقديمات المطروحة قبل إتمام نشرها.'
 
-    template: 'استخدام نموذج'
-    root: 'الجذر'
+    template:
+        header: 'استخدام نموذج'
+        root: 'الجذر'
 
     masculine: 'مذكر'
     masculineShort: 'ذكري'
diff --git a/locale/de/nouns/NounsExtra.vue b/locale/de/nouns/NounsExtra.vue
index 811e3986d..675d6e027 100644
--- a/locale/de/nouns/NounsExtra.vue
+++ b/locale/de/nouns/NounsExtra.vue
@@ -155,14 +155,14 @@ export default {
                         A_pl: 'die Arbeitense',
                     }),
                     extendedDeclension: new NounDeclension({
-                        N: 'meinens beste Lehrens',
-                        G: 'meinens beste Lehrens',
-                        D: 'meinens beste Lehrens',
-                        A: 'meinens beste Lehrens',
-                        N_pl: 'meine besten Lehrens',
-                        G_pl: 'meiner besten Lehrens',
-                        D_pl: 'meinen besten Lehrens',
-                        A_pl: 'meine besten Lehrens',
+                        N: 'meinens beste Lehrense',
+                        G: 'meinens beste Lehrense',
+                        D: 'meinens beste Lehrense',
+                        A: 'meinens beste Lehrense',
+                        N_pl: 'meine besten Lehrense',
+                        G_pl: 'meiner besten Lehrense',
+                        D_pl: 'meinen besten Lehrense',
+                        A_pl: 'meine besten Lehrense',
                     }),
                 },
                 'ex-Formen': {
@@ -240,7 +240,7 @@ export default {
                         A: 'die Arbeitsperson',
                         N_pl: 'die Arbeitspersonen',
                         G_pl: 'der Arbeitspersonen',
-                        D_pl: 'den Arbeitspersonenn',
+                        D_pl: 'den Arbeitspersonen',
                         A_pl: 'die Arbeitspersonen',
                     }),
                     extendedDeclension: new NounDeclension({
@@ -250,7 +250,7 @@ export default {
                         A: 'meine beste Lehrperson',
                         N_pl: 'meine besten Lehrpersonen',
                         G_pl: 'meiner besten Lehrpersonen',
-                        D_pl: 'meinen besten Lehrpersonenn',
+                        D_pl: 'meinen besten Lehrpersonen',
                         A_pl: 'meine besten Lehrpersonen',
                     }),
                 },
diff --git a/locale/de/nouns/nounTemplates.tsv b/locale/de/nouns/nounTemplates.tsv
index 696511d98..66e7d55e4 100644
--- a/locale/de/nouns/nounTemplates.tsv
+++ b/locale/de/nouns/nounTemplates.tsv
@@ -1,3 +1,6 @@
 masc	fem	neutr	mascPl	femPl	neutrPl
--mann	-frau	-person	-männer	-frauen	-leute
--	-in	-In/-:in/-*in	-e	-innen	-Innen/-:innen/-*innen
+der -mann	die -frau	die -person	die -männer	die -frauen	die -leute
+der -	die -in	das -y/de -e/din -nin/dens -ens/der:die -:in/der_die -_in/der*die -*in	die -en	die -innen	die -ys/die -erne/die -ninnen/die -ense/die -:innen/die -_innen/die -*innen
+der -	die -in	das -y/de -ere/din -nin/dens -ens/der:die -:in/der_die -_in/der*die -*in	die -e	die -innen	die -ys/die -erne/die -ninnen/die -ense/die -:innen/die -_innen/die -*innen
+der -e	die -in	das -y/de -ere/din -nin/dens -ens/der:die -:in/der_die -_in/der*die -*in	die -en	die -innen	die -ys/die -erne/die -erninnen/die -ense/die -:innen/die -_innen/die -*innen
+der -er	die -erin	das -y/de -ere/din -ernin/dens -ens/der:die -er:in/der_die -er_in/der*die -er*in	die -er	die -erinnen	die -ys/de -erne/die -erninnen/die -ense/die -er:innen/die -er_innen/die -er*innen
diff --git a/locale/de/translations.suml b/locale/de/translations.suml
index f34bc3815..8fb7d517f 100644
--- a/locale/de/translations.suml
+++ b/locale/de/translations.suml
@@ -177,8 +177,11 @@ nouns:
         another: 'Einen weiteren Eintrag einreichen'
         moderation: 'Einreichungen müssen erst genehmigt werden, bevor sie veröffentlicht werden.'
 
-    template: 'Eine Vorlage nutzen.'
-    root: 'Wurzel'
+    template:
+        header: 'Eine Vorlage nutzen'
+        root: 'Wurzel'
+        apply: 'Vorlage anwenden'
+        overwrite: 'Bist du sicher, dass du diese Vorlage anwenden möchtest? Sie ersetzt die vorherigen Eingaben'
 
     masculine: 'Maskulin'
     masculineShort: 'Mask.'
diff --git a/locale/en/translations.suml b/locale/en/translations.suml
index d2f303424..d94fcf028 100644
--- a/locale/en/translations.suml
+++ b/locale/en/translations.suml
@@ -175,8 +175,11 @@ nouns:
         another: 'Submit another one'
         moderation: 'Submissions will have to get approved before getting published.'
 
-    template: 'Use a template'
-    root: 'Root'
+    template:
+        header: 'Use a template'
+        root: 'Root'
+        apply: 'Apply template'
+        overwrite: 'Are you sure you want to apply this template? This will replace previous inputs'
 
     masculine: 'masculine'
     masculineShort: 'masc.'
diff --git a/locale/eo/translations.suml b/locale/eo/translations.suml
index 3d96bb4df..615566ba6 100644
--- a/locale/eo/translations.suml
+++ b/locale/eo/translations.suml
@@ -114,8 +114,9 @@ nouns:
             Parolante pri la homo kies genro estas nekonata, al mult-genra grupo, kaj specife al neduumuloj kiuj malferme
             preferas ilin, uzu la formojn neŭtralajn. [*enmeti iun aldonon pri -ip- sufikso]
         - 'Sube estas la vortaro de neŭtralaĵoj. Vi povas kontribui al ĝi kaj aldoni viajn proponojn.'
-    template: 'Uzi ŝablonon'
-    root: 'Radiko'
+    template:
+        header: 'Uzi ŝablonon'
+        root: 'Radiko'
 
     masculine: 'vira'
     masculineShort: 'vira'
diff --git a/locale/es/translations.suml b/locale/es/translations.suml
index 41d9cf68c..930050cc8 100644
--- a/locale/es/translations.suml
+++ b/locale/es/translations.suml
@@ -164,8 +164,9 @@ nouns:
         another: 'Enviar otra'
         moderation: 'Los envíos deben ser aprobados antes de ser publicados.'
 
-    template: 'Usar una plantilla'
-    root: 'Raíz'
+    template:
+        header: 'Usar una plantilla'
+        root: 'Raíz'
 
     masculine: 'masculino'
     masculineShort: 'masc.'
diff --git a/locale/et/translations.suml b/locale/et/translations.suml
index 2a47719bd..6d194fe30 100644
--- a/locale/et/translations.suml
+++ b/locale/et/translations.suml
@@ -142,8 +142,9 @@ nouns:
         another: 'Esita veel üks'
         moderation: 'Pakkumised kinnitatakse enne avaldamist moderaatori poolt.'
 
-    template: 'Kasuta malli'
-    root: 'Juur'
+    template:
+        header: 'Kasuta malli'
+        root: 'Juur'
 
     masculine: 'mehelik'
     masculineShort: 'meh.'
diff --git a/locale/fr/translations.suml b/locale/fr/translations.suml
index fc2665b3c..6c156cc70 100644
--- a/locale/fr/translations.suml
+++ b/locale/fr/translations.suml
@@ -159,7 +159,8 @@ nouns:
         another: 'Soumettre un autre mot'
         moderation: 'Les soumissions devront être approuvées avant d’être publiées.'
 
-    template: 'Utiliser un template'
+    template:
+        header: 'Utiliser un template'
 
     masculine: 'masculin'
     masculineShort: 'masc.'
diff --git a/locale/gl/translations.suml b/locale/gl/translations.suml
index 40ca6ee7d..6c12cd3a9 100644
--- a/locale/gl/translations.suml
+++ b/locale/gl/translations.suml
@@ -154,8 +154,9 @@ nouns:
         another: 'Enviar outra'
         moderation: 'Os envios devem ser aprovados antes de serem publicados.'
 
-    template: 'Usar um modelo'
-    root: 'Radical'
+    template:
+        header: 'Usar um modelo'
+        root: 'Radical'
 
     masculine: 'masculino'
     masculineShort: 'masc.'
diff --git a/locale/it/translations.suml b/locale/it/translations.suml
index 829939507..19f7becf4 100644
--- a/locale/it/translations.suml
+++ b/locale/it/translations.suml
@@ -157,8 +157,9 @@ nouns:
         another: 'Inviane un’altra'
         moderation: 'Le proposte dovranno essere approvate prima di essere pubblicate.'
 
-    template: 'usa un template'
-    root: 'Radice'
+    template:
+        header: 'usa un template'
+        root: 'Radice'
 
     masculine: 'maschile'
     masculineShort: 'masc.'
diff --git a/locale/ja/translations.suml b/locale/ja/translations.suml
index d77ff0f5a..5e69a8a4f 100644
--- a/locale/ja/translations.suml
+++ b/locale/ja/translations.suml
@@ -150,7 +150,8 @@ nouns:
 
     submit:
         moderation: '公開前に管理者による承認が必要です。'
-    template: 'テンプレートを使う'
+    template:
+        header: 'テンプレートを使う'
 
 community:
     header: 'コミュニティ'
diff --git a/locale/ko/translations.suml b/locale/ko/translations.suml
index 73366b905..2865686b0 100644
--- a/locale/ko/translations.suml
+++ b/locale/ko/translations.suml
@@ -159,8 +159,9 @@ nouns:
         another: '더 추가하기'
         moderation: '제출물은 게시되기 전에 승인을 받아야 합니다.'
 
-    template: '템플릿 쓰기'
-    root: '룻'
+    template:
+        header: '템플릿 쓰기'
+        root: '룻'
 
     masculine: '남성 명사'
     masculineShort: '남성'
diff --git a/locale/lad/translations.suml b/locale/lad/translations.suml
index b8ebde25d..8b16a66ac 100644
--- a/locale/lad/translations.suml
+++ b/locale/lad/translations.suml
@@ -157,8 +157,9 @@ nouns:
         another: 'Embiar otruno'
         moderation: 'Los embios deven ser aseptados antes de ser publikados.'
 
-    template: 'Uzar una plantiya'
-    root: 'Rais'
+    template:
+        header: 'Uzar una plantiya'
+        root: 'Rais'
 
     masculine: 'maskulino'
     masculineShort: 'mask.'
diff --git a/locale/nl/translations.suml b/locale/nl/translations.suml
index 5a9498e04..75f475bc3 100644
--- a/locale/nl/translations.suml
+++ b/locale/nl/translations.suml
@@ -156,7 +156,8 @@ nouns:
         another: 'Dien nog een woord in'
         moderation: 'Inzendingen zullen moeten worden goedgekeurd alvorens te worden gepubliceerd.'
 
-    template: 'Gebruik een sjabloon'
+    template:
+        header: 'Gebruik een sjabloon'
 
     masculine: 'mannelijk'
     masculineShort: 'mann.'
diff --git a/locale/no/translations.suml b/locale/no/translations.suml
index ddc40df82..b24e9e18d 100644
--- a/locale/no/translations.suml
+++ b/locale/no/translations.suml
@@ -151,8 +151,9 @@ nouns:
         another: 'Legg til en annen'
         moderation: 'Bidrag må bli vurdert før de blir lagt ut.'
 
-    template: 'Bruk en mal'
-    root: 'Rot'
+    template:
+        header: 'Bruk en mal'
+        root: 'Rot'
 
     masculine: 'maskulin'
     masculineShort: 'mask.'
diff --git a/locale/pl/translations.suml b/locale/pl/translations.suml
index 88275735b..855f2832b 100644
--- a/locale/pl/translations.suml
+++ b/locale/pl/translations.suml
@@ -300,8 +300,9 @@ nouns:
         another: 'Zgłoś kolejne słowo'
         moderation: 'Propozycje będą musiały zostać zatwierdzone przed opublikowaniem.'
 
-    template: 'Użyj szablonu'
-    root: 'Rdzeń rzeczownika'
+    template:
+        header: 'Użyj szablonu'
+        root: 'Rdzeń rzeczownika'
 
     masculine: 'maskulatyw'
     masculineShort: 'mask.'
diff --git a/locale/pt/translations.suml b/locale/pt/translations.suml
index 252160147..53b8439d9 100644
--- a/locale/pt/translations.suml
+++ b/locale/pt/translations.suml
@@ -168,8 +168,9 @@ nouns:
         another: 'Enviar outra'
         moderation: 'Os envios devem ser aprovados antes de serem publicados.'
 
-    template: 'Usar um modelo'
-    root: 'Radical'
+    template:
+        header: 'Usar um modelo'
+        root: 'Radical'
 
     masculine: 'masculino'
     masculineShort: 'masc.'
diff --git a/locale/ro/translations.suml b/locale/ro/translations.suml
index c7c0355d9..cf19a281a 100644
--- a/locale/ro/translations.suml
+++ b/locale/ro/translations.suml
@@ -161,8 +161,9 @@ nouns:
         another: 'Trimite încă unul'
         moderation: 'Contribuțiile trebuie să fie aprobate înainte de a apărea.'
 
-    template: 'Folosește un șablon'
-    root: 'Rădăcină'
+    template:
+        header: 'Folosește un șablon'
+        root: 'Rădăcină'
 
     masculine: 'masculin'
     masculineShort: 'masc.'
diff --git a/locale/ru/translations.suml b/locale/ru/translations.suml
index cf0be6d6e..38d705a3c 100644
--- a/locale/ru/translations.suml
+++ b/locale/ru/translations.suml
@@ -183,8 +183,9 @@ nouns:
         another: 'Добавить ещё'
         moderation: 'Предложения должны быть одобрены перед публикацией.'
 
-    template: 'Использовать шаблон'
-    root: 'Корень'
+    template:
+        header: 'Использовать шаблон'
+        root: 'Корень'
 
     masculine: 'мужской'
     masculineShort: 'м.'
diff --git a/locale/sv/translations.suml b/locale/sv/translations.suml
index b8d0d5e88..79ded00ee 100644
--- a/locale/sv/translations.suml
+++ b/locale/sv/translations.suml
@@ -163,8 +163,9 @@ nouns:
         another: 'Skicka in en till'
         moderation: 'Bidragen måste godkännas innan de publiceras.'
 
-    template: 'Använd en mall'
-    root: 'Rot'
+    template:
+        header: 'Använd en mall'
+        root: 'Rot'
 
     masculine: 'maskulin'
     masculineShort: 'mask.'
diff --git a/locale/tr/translations.suml b/locale/tr/translations.suml
index 95c95f9ce..95082a1f7 100644
--- a/locale/tr/translations.suml
+++ b/locale/tr/translations.suml
@@ -147,8 +147,9 @@ nouns:
         another: 'Başka bir kelime gönder'
         moderation: 'Gönderimlerin yayınlanmadan önce onaylanması gerekecektir.'
 
-    template: 'Şablon kullan'
-    root: 'Kökü'
+    template:
+        header: 'Şablon kullan'
+        root: 'Kökü'
 
     masculine: 'maskülen'
     masculineShort: 'mask.'
diff --git a/locale/ua/translations.suml b/locale/ua/translations.suml
index 7ff1484ac..8eddf0678 100644
--- a/locale/ua/translations.suml
+++ b/locale/ua/translations.suml
@@ -188,8 +188,9 @@ nouns:
         another: 'Додати ще'
         moderation: 'Пропозиції мають бути схвалені перед публікацією.'
 
-    template: 'Використати шаблон'
-    root: 'Корінь'
+    template:
+        header: 'Використати шаблон'
+        root: 'Корінь'
 
     masculine: 'чоловічий'
     masculineShort: 'ч.'
diff --git a/locale/vi/translations.suml b/locale/vi/translations.suml
index 8bcd39236..4de6af2f8 100644
--- a/locale/vi/translations.suml
+++ b/locale/vi/translations.suml
@@ -165,7 +165,8 @@ nouns:
         another: 'Gửi thêm'
         moderation: 'Các từ sẽ phải được phê duyệt trước khi được thêm vào.'
 
-    template: 'Sử dụng một mẫu'
+    template:
+        header: 'Sử dụng một mẫu'
 
     masculine: 'nam tính'
     masculineShort: 'nam'
diff --git a/locale/zh/translations.suml b/locale/zh/translations.suml
index ab3b9f058..90132e91a 100644
--- a/locale/zh/translations.suml
+++ b/locale/zh/translations.suml
@@ -148,8 +148,9 @@ nouns:
         another: '提交另一個'
         moderation: '提交的內容必須先批准才能發布。'
 
-    template: '使用模板'
-    root: '根'
+    template:
+        header: '使用模板'
+        root: '根'
 
     # TODO: 陽剛 and 陰柔 sounds waaay better than (translated) men-ish and woman-ish
     # but i'm not exactly sure about the implications and how other people see them
diff --git a/src/classes.ts b/src/classes.ts
index 59239aee1..6e6b1592f 100644
--- a/src/classes.ts
+++ b/src/classes.ts
@@ -875,6 +875,9 @@ export interface NounRaw {
     declension: unknown;
 }
 
+export const genders = ['masc', 'fem', 'neutr'] as const;
+const gendersWithNumerus = ['masc', 'fem', 'neutr', 'mascPl', 'femPl', 'neutrPl'] as const;
+
 export class Noun {
     id: string;
     masc: string[];
@@ -914,7 +917,7 @@ export class Noun {
             return true;
         }
 
-        for (const field of ['masc', 'fem', 'neutr', 'mascPl', 'femPl', 'neutrPl'] as const) {
+        for (const field of gendersWithNumerus) {
             for (const value of this[field]) {
                 const v = value.toLowerCase();
                 if (filter.startsWith('-') && v.endsWith(filter.substring(1))) {
@@ -930,6 +933,8 @@ export class Noun {
     }
 }
 
+export type MinimalNoun = Pick<Noun, typeof gendersWithNumerus[number] | 'sources' | 'base'>;
+
 export class NounTemplate {
     masc: string[];
     fem: string[];
@@ -947,21 +952,33 @@ export class NounTemplate {
         this.neutrPl = neutrPl;
     }
 
-    fill(stem: string) {
+    static from(data: Record<typeof gendersWithNumerus[number], string>): NounTemplate {
+        return new NounTemplate(
+            data.masc.split('/'),
+            data.fem.split('/'),
+            data.neutr.split('/'),
+            data.mascPl.split('/'),
+            data.femPl.split('/'),
+            data.neutrPl.split('/'),
+        );
+    }
+
+    fill(stem: string): MinimalNoun {
         return {
-            masc: this.masc.map((e) => stem + e),
-            fem: this.fem.map((e) => stem + e),
-            neutr: this.neutr.map((e) => stem + e),
-            mascPl: this.mascPl.map((e) => stem + e),
-            femPl: this.femPl.map((e) => stem + e),
-            neutrPl: this.neutrPl.map((e) => stem + e),
+            masc: this.masc.map((e) => e.replace('-', stem)),
+            fem: this.fem.map((e) => e.replace('-', stem)),
+            neutr: this.neutr.map((e) => e.replace('-', stem)),
+            mascPl: this.mascPl.map((e) => e.replace('-', stem)),
+            femPl: this.femPl.map((e) => e.replace('-', stem)),
+            neutrPl: this.neutrPl.map((e) => e.replace('-', stem)),
+            sources: [],
             base: null,
         };
     }
 
     toString(): string {
         return [this.masc, this.fem, this.neutr, this.mascPl, this.femPl, this.neutrPl]
-            .map((es) => es.map((e) => `-${e}`).join('/'))
+            .map((es) => es.join('/'))
             .join(', ')
         ;
     }
diff --git a/src/data.ts b/src/data.ts
index 4c2c63df2..bbbe5e33a 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -20,14 +20,7 @@ export const examples = buildList(function* () {
 import nounTemplatesRaw from '../data/nouns/nounTemplates.tsv';
 export const nounTemplates = buildList(function* () {
     for (const t of nounTemplatesRaw) {
-        yield new NounTemplate(
-            t.masc.replace(/-/g, '').split('/'),
-            t.fem.replace(/-/g, '').split('/'),
-            t.neutr.replace(/-/g, '').split('/'),
-            t.mascPl.replace(/-/g, '').split('/'),
-            t.femPl.replace(/-/g, '').split('/'),
-            t.neutrPl.replace(/-/g, '').split('/'),
-        );
+        yield NounTemplate.from(t);
     }
 });
 
diff --git a/src/missingTranslations.ts b/src/missingTranslations.ts
index ec9b953dc..ddd2e38fd 100644
--- a/src/missingTranslations.ts
+++ b/src/missingTranslations.ts
@@ -128,6 +128,10 @@ export function listMissingTranslations(
             return false;
         }
 
+        if (!config.nouns.templates && keyMatches('nouns.template.')) {
+            return false;
+        }
+
         if (!config.terminology.enabled && keyMatches('terminology.')) {
             return false;
         }