diff -up e-smith-base-5.8.0/root/etc/e-smith/db/configuration/migrate/05sysconfig.LOCALE e-smith-base-5.8.0/root/etc/e-smith/db/configuration/migrate/05sysconfig
--- e-smith-base-5.8.0/root/etc/e-smith/db/configuration/migrate/05sysconfig.LOCALE	2014-03-23 22:47:24.000000000 -0400
+++ e-smith-base-5.8.0/root/etc/e-smith/db/configuration/migrate/05sysconfig	2016-04-12 03:17:54.640000000 -0400
@@ -1,5 +1,5 @@
 {
-    open F, "/etc/sysconfig/i18n";
+    open F, "/etc/locale.conf";
     my ($line) = grep(/^LANG/, <F>);
     close F;
 
@@ -8,19 +8,19 @@
     my $kbdtype = "pc";
     my $keytable = "us";
 
-    if (open F, "/etc/sysconfig/keyboard")
+    if (open F, "/etc/X11/xorg.conf.d/00-keyboard.conf")
     {
 	my @lines = <F>;
 	close F;
 
-	($line) = grep(/^KEYBOARDTYPE/, @lines);
-	if ($line =~ /^KEYBOARDTYPE="(.*)"/)
-	{
-	    $kbdtype = $1;
-	}
+	#($line) = grep(/^KEYBOARDTYPE/, @lines);
+	#if ($line =~ /^KEYBOARDTYPE="(.*)"/)
+	#{
+	#    $kbdtype = $1;
+	#}
 
-	($line) = grep(/^KEYTABLE/, @lines);
-	if ($line =~ /^KEYTABLE="(.*)"/)
+	($line) = grep(/^\s+Option "XkbLayout"/, @lines);
+	if ($line =~ /^\s+Option "XkbLayout"\s+"(.*)"/)
 	{
 	    $keytable = $1;
 	}