diff --git a/server/server.js b/server/server.js
index 9d8a57ee..3eb73111 100644
--- a/server/server.js
+++ b/server/server.js
@@ -1,4 +1,9 @@
 console.log("Welcome to Uptime Kuma");
+
+if (! process.env.NODE_ENV) {
+    process.env.NODE_ENV = "production";
+}
+
 console.log("Node Env: " + process.env.NODE_ENV);
 
 const { sleep, debug, TimeLogger, getRandomInt } = require("../src/util");
diff --git a/src/languages/de-DE.js b/src/languages/de-DE.js
index 223d23b9..fcae9415 100644
--- a/src/languages/de-DE.js
+++ b/src/languages/de-DE.js
@@ -143,4 +143,18 @@ export default {
     Token: "Token",
     "Show URI": "URI Anzeigen",
     "Clear all statistics": "Lösche alle Statistiken",
+    Tags: "Tags",
+    "Add New below or Select...": "Füge neuen hinzu oder wähle aus...",
+    "Tag with this name already exist.": "Ein Tag mit dem Namen existiert bereits.",
+    "Tag with this value already exist.": "Ein Tag mit dem Wert existiert bereits.",
+    color: "Farbe",
+    "value (optional)": "Wert (Optional)",
+    Gray: "Grau",
+    Red: "Rot",
+    Orange: "Orange",
+    Green: "Grün",
+    Blue: "Blau",
+    Indigo: "Indigo",
+    Purple: "Lila",
+    Pink: "Pink",
 }
diff --git a/src/languages/en.js b/src/languages/en.js
index 9b3e5422..4f88d304 100644
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -143,4 +143,18 @@ export default {
     Token: "Token",
     "Show URI": "Show URI",
     "Clear all statistics": "Clear all Statistics",
+    Tags: "Tags",
+    "Add New below or Select...": "Add New below or Select...",
+    "Tag with this name already exist.": "Tag with this name already exist.",
+    "Tag with this value already exist.": "Tag with this value already exist.",
+    color: "color",
+    "value (optional)": "value (optional)",
+    Gray: "Gray",
+    Red: "Red",
+    Orange: "Orange",
+    Green: "Green",
+    Blue: "Blue",
+    Indigo: "Indigo",
+    Purple: "Purple",
+    Pink: "Pink",
 }
diff --git a/src/languages/nl-NL.js b/src/languages/nl-NL.js
index 8e61125f..540d03c8 100644
--- a/src/languages/nl-NL.js
+++ b/src/languages/nl-NL.js
@@ -16,6 +16,14 @@ export default {
     resoverserverDescription: "Cloudflare is de standaardserver, u kunt de resolver server op elk moment wijzigen.",
     rrtypeDescription: "Selecteer het RR-type dat u wilt monitoren",
     pauseMonitorMsg: "Weet je zeker dat je wilt pauzeren?",
+    enableDefaultNotificationDescription: "Voor elke nieuwe monitor wordt deze melding standaard ingeschakeld. U kunt de melding nog steeds afzonderlijk uitschakelen voor elke monitor.",
+    clearEventsMsg: "Weet je zeker dat je alle evenementen voor deze monitor wilt verwijderen?",
+    clearHeartbeatsMsg: "Weet je zeker dat je alle heartbeats voor deze monitor wilt verwijderen?",
+    confirmClearStatisticsMsg: "Weet u zeker dat u alle statistieken wilt verwijderen?",
+    twoFAVerifyLabel: "Voer uw 2FA controle token in voor verificatie",
+    tokenValidSettingsMsg: "Token is geldig! U kunt nu de 2FA-instellingen opslaan.",
+    confirmEnableTwoFAMsg: "Weet je zeker dat je 2FA wilt inschakelen?",
+    confirmDisableTwoFAMsg: "Weet je zeker dat je 2FA wilt uitschakelen?",
     Settings: "Instellingen",
     Dashboard: "Dashboard",
     "New Update": "Nieuwe update",
@@ -107,41 +115,32 @@ export default {
     "Last Result": "Laatste resultaat",
     "Create your admin account": "Maak uw beheerdersaccount aan",
     "Repeat Password": "Herhaal wachtwoord",
+    "Import/Export Backup": "Backup importeren/exporteren",
+    Export: "Exporteren",
+    Import: "Importeren",
     respTime: "resp. tijd (ms)",
     notAvailableShort: "N.v.t.",
-    Create: "Create",
-    clearEventsMsg: "Are you sure want to delete all events for this monitor?",
-    clearHeartbeatsMsg: "Are you sure want to delete all heartbeats for this monitor?",
-    confirmClearStatisticsMsg: "Are you sure want to delete ALL statistics?",
-    "Clear Data": "Clear Data",
-    Events: "Events",
+    "Default enabled": "Default enabled",
+    "Apply on all existing monitors": "Pas toe op alle bestaande monitors",
+    Create: "Aanmaken",
+    "Clear Data": "Data wissen",
+    Events: "Gebeurtenissen",
     Heartbeats: "Heartbeats",
     "Auto Get": "Auto Get",
-    enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.",
-    "Default enabled": "Default enabled",
-    "Also apply to existing monitors": "Also apply to existing monitors",
-    "Import/Export Backup": "Import/Export Backup",
-    Export: "Export",
-    Import: "Import",
-    backupDescription: "You can backup all monitors and all notifications into a JSON file.",
-    backupDescription2: "PS: History and event data is not included.",
-    backupDescription3: "Sensitive data such as notification tokens is included in the export file, please keep it carefully.",
-    alertNoFile: "Please select a file to import.",
-    alertWrongFileType: "Please select a JSON file.",
-    twoFAVerifyLabel: "Please type in your token to verify that 2FA is working",
-    tokenValidSettingsMsg: "Token is valid! You can now save the 2FA settings.",
-    confirmEnableTwoFAMsg: "Are you sure you want to enable 2FA?",
-    confirmDisableTwoFAMsg: "Are you sure you want to disable 2FA?",
-    "Apply on all existing monitors": "Apply on all existing monitors",
-    "Verify Token": "Verify Token",
-    "Setup 2FA": "Setup 2FA",
-    "Enable 2FA": "Enable 2FA",
-    "Disable 2FA": "Disable 2FA",
-    "2FA Settings": "2FA Settings",
-    "Two Factor Authentication": "Two Factor Authentication",
-    Active: "Active",
-    Inactive: "Inactive",
+    backupDescription: "U kunt een back-up maken van alle monitoren en alle meldingen in een JSON-bestand.",
+    backupDescription2: "PS: Geschiedenis- en gebeurtenisgegevens zijn niet inbegrepen.",
+    backupDescription3: "Gevoelige gegevens zoals melding tokens zijn opgenomen in het exportbestand, houd het veilig opgeslagen.",
+    alertNoFile: "Selecteer een bestand om te importeren.",
+    alertWrongFileType: "Selecteer een JSON-bestand.",
+    "Verify Token": "Controleer token",
+    "Setup 2FA": "2FA instellingen",
+    "Enable 2FA": "Schakel 2FA in",
+    "Disable 2FA": "Schakel 2FA uit",
+    "2FA Settings": "2FA-instellingen",
+    "Two Factor Authentication": "Two Factor Authenticatie",
+    Active: "Actief",
+    Inactive: "Inactief",
     Token: "Token",
-    "Show URI": "Show URI",
-    "Clear all statistics": "Clear all Statistics",
+    "Show URI": "Toon URI",
+    "Clear all statistics": "Wis alle statistieken",
 }