diff --git a/modules/mail/default.nix b/modules/mail/default.nix
index 5539e1f..e14123f 100644
--- a/modules/mail/default.nix
+++ b/modules/mail/default.nix
@@ -3,7 +3,7 @@
 {
   imports = [
     ./smart.nix
-    ./systemd-failures.nix
+    ./systemd.nix
     ./smtp.nix
   ];
 }
\ No newline at end of file
diff --git a/modules/misc/internationalisation.nix b/modules/misc/internationalisation.nix
index 47eb470..d047f55 100644
--- a/modules/misc/internationalisation.nix
+++ b/modules/misc/internationalisation.nix
@@ -1,22 +1,22 @@
-{ config, ... }:
+{ config, lib, ... }:
 
 {
-  i18n.defaultLocale = "fr_FR.UTF-8";
+  i18n.defaultLocale = "${config.numbus.locale}.UTF-8";
   i18n.extraLocaleSettings = {
-    LC_ADDRESS = "fr_FR.UTF-8";
-    LC_IDENTIFICATION = "fr_FR.UTF-8";
-    LC_MEASUREMENT = "fr_FR.UTF-8";
-    LC_MONETARY = "fr_FR.UTF-8";
-    LC_NAME = "fr_FR.UTF-8";
-    LC_NUMERIC = "fr_FR.UTF-8";
-    LC_PAPER = "fr_FR.UTF-8";
-    LC_TELEPHONE = "fr_FR.UTF-8";
-    LC_TIME = "fr_FR.UTF-8";
+    LC_ADDRESS = "${config.numbus.locale}.UTF-8";
+    LC_IDENTIFICATION = "${config.numbus.locale}.UTF-8";
+    LC_MEASUREMENT = "${config.numbus.locale}.UTF-8";
+    LC_MONETARY = "${config.numbus.locale}.UTF-8";
+    LC_NAME = "${config.numbus.locale}.UTF-8";
+    LC_NUMERIC = "${config.numbus.locale}.UTF-8";
+    LC_PAPER = "${config.numbus.locale}.UTF-8";
+    LC_TELEPHONE = "${config.numbus.locale}.UTF-8";
+    LC_TIME = "${config.numbus.locale}.UTF-8";
   };
 
-  console.keyMap = "fr";
+  console.keyMap = lib.toLower config.numbus.language;
   services.xserver.xkb = {
-    layout = "fr";
+    layout = lib.toLower config.numbus.language;
     variant = "";
   };
 }
\ No newline at end of file