diff --git a/html/setup.html b/html/setup.html
index 568eca8..3fffa6f 100644
--- a/html/setup.html
+++ b/html/setup.html
@@ -266,10 +266,10 @@
                         </label>
                         <div>
                             <label class="row switch pb-1">
-                                <input type="radio" name="email-24h" value="true" checked><span>{{ .lang.Email.time24h }}</span>
+                                <input type="radio" name="email-24h" value="true" checked><span>{{ .lang.Strings.time24h }}</span>
                             </label>
                             <label class="row switch pb-1">
-                                <input type="radio" name="email-24h" value="false"><span>{{ .lang.Email.time12h }}</span>
+                                <input type="radio" name="email-24h" value="false"><span>{{ .lang.Strings.time12h }}</span>
                             </label>
                         </div>
                     </div>
diff --git a/lang/common/de-de.json b/lang/common/de-de.json
index e11c69c..c4dc902 100644
--- a/lang/common/de-de.json
+++ b/lang/common/de-de.json
@@ -12,6 +12,8 @@
         "error": "Fehler",
         "copy": "Kopieren",
         "theme": "Thema",
+        "time24h": "24h-Format",
+        "time12h": "12h-Format",
         "copied": "Kopiert"
     }
 }
diff --git a/lang/common/el-gr.json b/lang/common/el-gr.json
index 7415812..8148f35 100644
--- a/lang/common/el-gr.json
+++ b/lang/common/el-gr.json
@@ -12,6 +12,8 @@
         "error": "Σφάλμα",
         "copy": "Αντιγραφή",
         "theme": "Θέμα",
+        "time24h": "24 Ώρες",
+        "time12h": "12 Ώρες",
         "copied": "Αντιγράφηκε"
     }
 }
diff --git a/lang/common/en-us.json b/lang/common/en-us.json
index 703c9b6..8dd076a 100644
--- a/lang/common/en-us.json
+++ b/lang/common/en-us.json
@@ -12,6 +12,8 @@
         "error": "Error",
         "copy": "Copy",
         "copied": "Copied",
+        "time24h": "24h Time",
+        "time12h": "12h Time",
         "theme": "Theme"
     }
 }
diff --git a/lang/common/fr-fr.json b/lang/common/fr-fr.json
index 7aac155..026e8bf 100644
--- a/lang/common/fr-fr.json
+++ b/lang/common/fr-fr.json
@@ -12,6 +12,8 @@
         "success": "Succès",
         "error": "Erreur",
         "copy": "Copier",
+        "time24h": "Temps 24h",
+        "time12h": "Temps 12h",
         "theme": "Thème"
     }
 }
diff --git a/lang/common/id-id.json b/lang/common/id-id.json
index 3e01705..bfe567a 100644
--- a/lang/common/id-id.json
+++ b/lang/common/id-id.json
@@ -11,6 +11,8 @@
         "success": "Sukses",
         "error": "Error",
         "copy": "Salin",
+        "time24h": "Waktu 24 jam",
+        "time12h": "Waktu 12 jam",
         "theme": "Tema"
     }
 }
diff --git a/lang/common/nl-nl.json b/lang/common/nl-nl.json
index 88c93b3..35a0e54 100644
--- a/lang/common/nl-nl.json
+++ b/lang/common/nl-nl.json
@@ -12,6 +12,8 @@
         "error": "Fout",
         "copy": "Kopiëer",
         "theme": "Thema",
+        "time24h": "24u-formaat",
+        "time12h": "12u-formaat",
         "copied": "Gekopieerd"
     }
 }
diff --git a/lang/common/pt-br.json b/lang/common/pt-br.json
index 767c579..bf557f0 100644
--- a/lang/common/pt-br.json
+++ b/lang/common/pt-br.json
@@ -12,6 +12,8 @@
         "error": "Erro",
         "copy": "Copiar",
         "theme": "Tema",
+        "time24h": "Horário 24h",
+        "time12h": "Horário 12h",
         "copied": "Copiado"
     }
 }
diff --git a/lang/common/sv-se.json b/lang/common/sv-se.json
index 6f48746..b7fd2cb 100644
--- a/lang/common/sv-se.json
+++ b/lang/common/sv-se.json
@@ -11,6 +11,8 @@
         "success": "Lyckades",
         "error": "Fel",
         "copy": "Kopiera",
+        "time24h": "24 timmarsklocka",
+        "time12h": "12 timmarsklocka",
         "theme": "Tema"
     }
 }
diff --git a/lang/setup/de-de.json b/lang/setup/de-de.json
index 01ba131..55b9d35 100644
--- a/lang/setup/de-de.json
+++ b/lang/setup/de-de.json
@@ -82,8 +82,6 @@
         "senderName": "Absendername",
         "dateFormat": "Datumsformat",
         "dateFormatNotice": "Datum folgt dem strftime-Format. Für weitere Informationen, besuche {n}.",
-        "time24h": "24h-Format",
-        "time12h": "12h-Format",
         "encryption": "Verschlüsselung",
         "mailgunApiURL": "API-URL"
     },
diff --git a/lang/setup/el-gr.json b/lang/setup/el-gr.json
index 7ee8b02..a144361 100644
--- a/lang/setup/el-gr.json
+++ b/lang/setup/el-gr.json
@@ -82,8 +82,6 @@
         "senderName": "Ονομα αποστολέα",
         "dateFormat": "Μορφή ημερομηνίας",
         "dateFormatNotice": "Η ημερομηνία ακολουθεί τη μορφή strftime. Για περισσότερες πληροφορίες, επισκεφτείτε το {n}.",
-        "time24h": "24 Ώρες",
-        "time12h": "12 Ώρες",
         "encryption": "Κρυπτογράφηση",
         "mailgunApiURL": "Διεύθυνση API"
     },
diff --git a/lang/setup/en-us.json b/lang/setup/en-us.json
index 90d0b6f..e9c4e2c 100644
--- a/lang/setup/en-us.json
+++ b/lang/setup/en-us.json
@@ -89,8 +89,6 @@
         "senderName": "Sender Name",
         "dateFormat": "Date Format",
         "dateFormatNotice": "Date follows the strftime format. For more info, visit {n}.",
-        "time24h": "24h Time",
-        "time12h": "12h Time",
         "encryption": "Encryption",
         "mailgunApiURL": "API URL"
     },
diff --git a/lang/setup/fr-fr.json b/lang/setup/fr-fr.json
index c940ef4..9099aba 100644
--- a/lang/setup/fr-fr.json
+++ b/lang/setup/fr-fr.json
@@ -82,8 +82,6 @@
         "senderName": "Nom de l'envoyeur",
         "dateFormat": "Format de la date",
         "dateFormatNotice": "La date suis le format srtftime. Pour plus d'informations, consultez {n}.",
-        "time24h": "Temps 24h",
-        "time12h": "Temps 12h",
         "encryption": "Chiffrement",
         "mailgunApiURL": "URL de l'API"
     },
diff --git a/lang/setup/id-id.json b/lang/setup/id-id.json
index e67496f..5190924 100644
--- a/lang/setup/id-id.json
+++ b/lang/setup/id-id.json
@@ -82,8 +82,6 @@
         "senderName": "Nama Pengirim",
         "dateFormat": "Format Tanggal",
         "dateFormatNotice": "Tanggal mengikuti format strftime. Untuk info lebih lanjut, kunjungi {n}.",
-        "time24h": "Waktu 24 jam",
-        "time12h": "Waktu 12 jam",
         "encryption": "Enkripsi",
         "mailgunApiURL": "URL API"
     },
diff --git a/lang/setup/nl-nl.json b/lang/setup/nl-nl.json
index bd15b2c..0bbce6f 100644
--- a/lang/setup/nl-nl.json
+++ b/lang/setup/nl-nl.json
@@ -82,8 +82,6 @@
         "senderName": "Naam afzender",
         "dateFormat": "Datumformaat",
         "dateFormatNotice": "Datum volgend het strftime formaat. Meer info op {n}.",
-        "time24h": "24u-formaat",
-        "time12h": "12u-formaat",
         "encryption": "Versleuteling",
         "mailgunApiURL": "API-URL"
     },
diff --git a/lang/setup/pt-br.json b/lang/setup/pt-br.json
index f33d1eb..ad25758 100644
--- a/lang/setup/pt-br.json
+++ b/lang/setup/pt-br.json
@@ -82,8 +82,6 @@
         "senderName": "Nome do remetente",
         "dateFormat": "Formato da Data",
         "dateFormatNotice": "A data segue o formato strftime. Para obter mais informações, visite {n}.",
-        "time24h": "Horário 24h",
-        "time12h": "Horário 12h",
         "encryption": "Encriptação",
         "mailgunApiURL": "API URL"
     },
diff --git a/lang/setup/sv-se.json b/lang/setup/sv-se.json
index 075504a..46c1e01 100644
--- a/lang/setup/sv-se.json
+++ b/lang/setup/sv-se.json
@@ -82,8 +82,6 @@
         "senderName": "Avsändarens namn",
         "dateFormat": "Datumformat",
         "dateFormatNotice": "Datum följer strftime-formatet. Mer information finns på {n}.",
-        "time24h": "24 timmarsklocka",
-        "time12h": "12 timmarsklocka",
         "encryption": "Kryptering",
         "mailgunApiURL": "API URL"
     },