diff -ur enlightenment-0.16.6.orig/po/de.po enlightenment-0.16.6/po/de.po
--- enlightenment-0.16.6.orig/po/de.po	Wed Nov  5 19:07:37 2003
+++ enlightenment-0.16.6/po/de.po	Thu Nov 13 13:30:50 2003
@@ -783,7 +783,7 @@
 "Enlightenment has just experienced some major problems in\n"
 "attempting to load the theme you specified or the default\n"
 "configuration directory:\n"
-"%s/config/\n"
+"%s/\n"
 "This will prevent Enlightenment from loading any configuration\n"
 "files at all.\n"
 "Since this couldn't be found Enlightenment is probably not\n"
diff -ur enlightenment-0.16.6.orig/po/dk.po enlightenment-0.16.6/po/dk.po
--- enlightenment-0.16.6.orig/po/dk.po	Wed Nov  5 19:07:37 2003
+++ enlightenment-0.16.6/po/dk.po	Thu Nov 13 13:31:19 2003
@@ -633,7 +633,7 @@
 "Enlightenment has just experienced some major problems in\n"
 "attempting to load the theme you specified or the default\n"
 "configuration directory:\n"
-"%s/config/\n"
+"%s/\n"
 "This will prevent Enlightenment from loading any configuration\n"
 "files at all.\n"
 "Since this couldn't be found Enlightenment is probably not\n"
diff -ur enlightenment-0.16.6.orig/po/en_US.po enlightenment-0.16.6/po/en_US.po
--- enlightenment-0.16.6.orig/po/en_US.po	Wed Nov  5 19:07:37 2003
+++ enlightenment-0.16.6/po/en_US.po	Thu Nov 13 13:30:47 2003
@@ -533,7 +533,7 @@
 "Enlightenment has just experienced some major problems in\n"
 "attempting to load the theme you specified or the default\n"
 "configuration directory:\n"
-"%s/config/\n"
+"%s/\n"
 "This will prevent Enlightenment from loading any configuration\n"
 "files at all.\n"
 "Since this couldn't be found Enlightenment is probably not\n"
diff -ur enlightenment-0.16.6.orig/po/es.po enlightenment-0.16.6/po/es.po
--- enlightenment-0.16.6.orig/po/es.po	Wed Nov  5 19:07:37 2003
+++ enlightenment-0.16.6/po/es.po	Thu Nov 13 13:31:16 2003
@@ -700,7 +700,7 @@
 "Enlightenment has just experienced some major problems in\n"
 "attempting to load the theme you specified or the default\n"
 "configuration directory:\n"
-"%s/config/\n"
+"%s/\n"
 "This will prevent Enlightenment from loading any configuration\n"
 "files at all.\n"
 "Since this couldn't be found Enlightenment is probably not\n"
@@ -724,7 +724,7 @@
 "Enlightenment ha experimentado algunos problemas graves\n"
 "al intentar cargar el tema que Ud. eligió ó el directorio\n"
 "de configuración por omisión:\n"
-"%s/config/\n"
+"%s/\n"
 "Esto impedirá que Enlightenment carga cualquier tipo de\n"
 "archivos de configuración.\n"
 "Ya que nada ha sido encontrado, Enlightenment probablemente\n"
diff -ur enlightenment-0.16.6.orig/po/fr.po enlightenment-0.16.6/po/fr.po
--- enlightenment-0.16.6.orig/po/fr.po	Wed Nov  5 19:07:37 2003
+++ enlightenment-0.16.6/po/fr.po	Thu Nov 13 13:30:43 2003
@@ -666,7 +666,7 @@
 "Enlightenment has just experienced some major problems in\n"
 "attempting to load the theme you specified or the default\n"
 "configuration directory:\n"
-"%s/config/\n"
+"%s/\n"
 "This will prevent Enlightenment from loading any configuration\n"
 "files at all.\n"
 "Since this couldn't be found Enlightenment is probably not\n"
@@ -690,7 +690,7 @@
 "Enlightenment vient de rencontrer des problèmes majeurs en tentant\n"
 "de charger le thème que vous avez spécifié ou répertoire de\n"
 "configuration par défaut :\n"
-"%s/config/\n"
+"%s/\n"
 "Cela empêchera Enlightenment de charger le moindre fichier\n"
 "de configuration.\n"
 "Puisque ce répertoire n'a pu être trouvé, Enlightenment ne trouvera\n"
diff -ur enlightenment-0.16.6.orig/po/hu.po enlightenment-0.16.6/po/hu.po
--- enlightenment-0.16.6.orig/po/hu.po	Wed Nov  5 19:07:37 2003
+++ enlightenment-0.16.6/po/hu.po	Thu Nov 13 13:31:12 2003
@@ -555,7 +555,7 @@
 "Enlightenment has just experienced some major problems in\n"
 "attempting to load the theme you specified or the default\n"
 "configuration directory:\n"
-"%s/config/\n"
+"%s/\n"
 "This will prevent Enlightenment from loading any configuration\n"
 "files at all.\n"
 "Since this couldn't be found Enlightenment is probably not\n"
diff -ur enlightenment-0.16.6.orig/po/ja.po enlightenment-0.16.6/po/ja.po
--- enlightenment-0.16.6.orig/po/ja.po	Wed Nov  5 19:07:39 2003
+++ enlightenment-0.16.6/po/ja.po	Thu Nov 13 13:30:38 2003
@@ -686,7 +686,7 @@
 "Enlightenment has just experienced some major problems in\n"
 "attempting to load the theme you specified or the default\n"
 "configuration directory:\n"
-"%s/config/\n"
+"%s/\n"
 "This will prevent Enlightenment from loading any configuration\n"
 "files at all.\n"
 "Since this couldn't be found Enlightenment is probably not\n"
@@ -710,7 +710,7 @@
 "¥Æ¡¼¥Þ¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ò / ÀßÄê¥Õ¥¡¥¤¥ë¤¬Æþ¤Ã¤Æ¤¤¤ë¥Ç¥£¥ì¥¯¥È¥ê¤ò\n"
 "Æɤ߹þ¤à¤È¤³¤í¤Ç¤è¤¯¤¢¤ëÌäÂê¤ËľÌ̤·¤Þ¤·¤¿¡£\n"
 "¥Ç¥£¥ì¥¯¥È¥ê¤Ï :\n"
-"%s/config/\n"
+"%s/\n"
 "\n"
 "¤³¤ÎÌäÂê¤Î¤¿¤áÀßÄê¥Õ¥¡¥¤¥ë¤òÆɤߤ³¤á¤Þ¤»¤ó¡£\n"
 "\n"
diff -ur enlightenment-0.16.6.orig/po/ko.po enlightenment-0.16.6/po/ko.po
--- enlightenment-0.16.6.orig/po/ko.po	Wed Nov  5 19:07:38 2003
+++ enlightenment-0.16.6/po/ko.po	Thu Nov 13 13:31:09 2003
@@ -679,7 +679,7 @@
 "Enlightenment has just experienced some major problems in\n"
 "attempting to load the theme you specified or the default\n"
 "configuration directory:\n"
-"%s/config/\n"
+"%s/\n"
 "This will prevent Enlightenment from loading any configuration\n"
 "files at all.\n"
 "Since this couldn't be found Enlightenment is probably not\n"
@@ -702,7 +702,7 @@
 msgstr ""
 "ÀζóÀÌÆ°¸ÕÆ®°¡ ´ç½ÅÀÌ ¸í½ÃÇÑ Å׸¶ ȤÀº ±âº» ¼³Á¤ µð·ºÅ丮ÀÇ\n"
 "Å׸¶¸¦ Àд Áß Áß´ëÇÑ ¹®Á¦°¡ ¹ß»ýÇß½À´Ï´Ù:\n"
-"%s/config/\n"
+"%s/\n"
 "ÀζóÀÌÆ°¸ÕÆ®´Â ´õ ÀÌ»ó ¼³Á¤ÆÄÀÏÀ» ÀоîµéÀÏ ¼ö ¾ø½À´Ï´Ù.\n"
 "ÀζóÀÌÆ°¸ÕÆ®°¡ ´ç½ÅÀÇ ½Ã½ºÅÛ¿¡¼­ ¾î¶² ¼³Á¤ÆÄÀϵµ Àоî\n"
 "µéÀÏ ¼ö ¾ø¾úÀ¸¹Ç·Î ½ÃÀÛÇÒ ¶§ ¼³Á¤°ª ¾øÀÌ ½ÃÀ۵Ǿú½À´Ï´Ù.\n"
diff -ur enlightenment-0.16.6.orig/po/nl.po enlightenment-0.16.6/po/nl.po
--- enlightenment-0.16.6.orig/po/nl.po	Wed Nov  5 19:07:38 2003
+++ enlightenment-0.16.6/po/nl.po	Thu Nov 13 13:30:26 2003
@@ -662,7 +662,7 @@
 "Enlightenment has just experienced some major problems in\n"
 "attempting to load the theme you specified or the default\n"
 "configuration directory:\n"
-"%s/config/\n"
+"%s/\n"
 "This will prevent Enlightenment from loading any configuration\n"
 "files at all.\n"
 "Since this couldn't be found Enlightenment is probably not\n"
diff -ur enlightenment-0.16.6.orig/po/no.po enlightenment-0.16.6/po/no.po
--- enlightenment-0.16.6.orig/po/no.po	Wed Nov  5 19:07:38 2003
+++ enlightenment-0.16.6/po/no.po	Thu Nov 13 13:31:05 2003
@@ -694,7 +694,7 @@
 "Enlightenment has just experienced some major problems in\n"
 "attempting to load the theme you specified or the default\n"
 "configuration directory:\n"
-"%s/config/\n"
+"%s/\n"
 "This will prevent Enlightenment from loading any configuration\n"
 "files at all.\n"
 "Since this couldn't be found Enlightenment is probably not\n"
diff -ur enlightenment-0.16.6.orig/po/pt.po enlightenment-0.16.6/po/pt.po
--- enlightenment-0.16.6.orig/po/pt.po	Wed Nov  5 19:07:38 2003
+++ enlightenment-0.16.6/po/pt.po	Thu Nov 13 13:31:02 2003
@@ -699,7 +699,7 @@
 "Enlightenment has just experienced some major problems in\n"
 "attempting to load the theme you specified or the default\n"
 "configuration directory:\n"
-"%s/config/\n"
+"%s/\n"
 "This will prevent Enlightenment from loading any configuration\n"
 "files at all.\n"
 "Since this couldn't be found Enlightenment is probably not\n"
@@ -723,7 +723,7 @@
 "O Enlightenment teve alguns problemas a carregar o tema que\n"
 "especificou ou a directoría de configuração que vem por\n"
 "defeito:\n"
-"%s/config/\n"
+"%s/\n"
 "Isto irá impedir o Enlightenment the carregar quaisquer\n"
 "ficheiros de configuração.\n"
 "Como até agora nada foi encontrado o Enlightenment, provavelmente,\n"
diff -ur enlightenment-0.16.6.orig/po/pt_BR.po enlightenment-0.16.6/po/pt_BR.po
--- enlightenment-0.16.6.orig/po/pt_BR.po	Wed Nov  5 19:07:39 2003
+++ enlightenment-0.16.6/po/pt_BR.po	Thu Nov 13 13:31:27 2003
@@ -700,7 +700,7 @@
 "Enlightenment has just experienced some major problems in\n"
 "attempting to load the theme you specified or the default\n"
 "configuration directory:\n"
-"%s/config/\n"
+"%s/\n"
 "This will prevent Enlightenment from loading any configuration\n"
 "files at all.\n"
 "Since this couldn't be found Enlightenment is probably not\n"
@@ -724,7 +724,7 @@
 "O Enlightenment acaba de encontrar um grande problema enquanto\n"
 "tentava carregar o tema escolhido por você ou o diretório da\n"
 "configuração padrão:\n"
-"%s/config/\n"
+"%s/\n"
 "Isso irá impedir que o Enlightenment carregue qualquer arquivo de\n"
 "configuração.\n"
 "Já que isso não foi encontrado, o Enlightenment provavelmente\n"
diff -ur enlightenment-0.16.6.orig/po/ru.po enlightenment-0.16.6/po/ru.po
--- enlightenment-0.16.6.orig/po/ru.po	Wed Nov  5 19:07:38 2003
+++ enlightenment-0.16.6/po/ru.po	Thu Nov 13 13:30:58 2003
@@ -687,7 +687,7 @@
 "Enlightenment has just experienced some major problems in\n"
 "attempting to load the theme you specified or the default\n"
 "configuration directory:\n"
-"%s/config/\n"
+"%s/\n"
 "This will prevent Enlightenment from loading any configuration\n"
 "files at all.\n"
 "Since this couldn't be found Enlightenment is probably not\n"
@@ -711,7 +711,7 @@
 "Enlightenment ÔÏÌØËÏ ÞÔÏ ÓÔÏÌËÎÕÌÓÑ Ó ÓÅÒØÅÚÎÙÍÉ ÐÒÏÂÌÅÍÁÍÉ\n"
 "ÐÒÉ ÐÏÐÙÔËÅ ÚÁÇÒÕÚËÉ ÕËÁÚÁÎÎÏÊ ÷ÁÍÉ ÔÅÍÙ\n"
 "ÉÌÉ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÏÊ ÄÉÒÅËÔÏÒÉÉ:\n"
-"%s/config/\n"
+"%s/\n"
 "üÔÏ ÎÅ ÐÏÚ×ÏÌÉÔ Enlightenment ÚÁÇÒÕÚÉÔØ\n"
 "ËÁËÉÅ ÂÙ ÔÏ ÎÉ ÂÙÌÏ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÅ ÆÁÊÌÙ.\n"
 "÷ÓÌÅÄÓÔ×ÉÅ ÜÔÏÇÏ, Enlightenment ÓËÏÒÅÅ ×ÓÅÇÏ ÎÅ ÎÁÊÄÅÔ\n"
diff -ur enlightenment-0.16.6.orig/po/sv.po enlightenment-0.16.6/po/sv.po
--- enlightenment-0.16.6.orig/po/sv.po	Wed Nov  5 19:07:38 2003
+++ enlightenment-0.16.6/po/sv.po	Thu Nov 13 13:31:23 2003
@@ -680,7 +680,7 @@
 "Enlightenment has just experienced some major problems in\n"
 "attempting to load the theme you specified or the default\n"
 "configuration directory:\n"
-"%s/config/\n"
+"%s/\n"
 "This will prevent Enlightenment from loading any configuration\n"
 "files at all.\n"
 "Since this couldn't be found Enlightenment is probably not\n"
@@ -703,7 +703,7 @@
 msgstr ""
 "Enlightenment har just upptäckt några allvarliga fel vid försök\n"
 "att ladda temat du valt, eller i grundkonfigurationskatalogen:\n"
-"%s/config/\n"
+"%s/\n"
 "Detta kommer att hindra Enlightenment från att ladda\n"
 "några konfigurationsfiler över huvud taget.\n"
 "Eftersom dessa inte kan hittas kommer Enlightenment troligtvis\n"
diff -ur enlightenment-0.16.6.orig/po/tr.po enlightenment-0.16.6/po/tr.po
--- enlightenment-0.16.6.orig/po/tr.po	Wed Nov  5 19:07:39 2003
+++ enlightenment-0.16.6/po/tr.po	Thu Nov 13 13:30:53 2003
@@ -685,7 +685,7 @@
 "Enlightenment has just experienced some major problems in\n"
 "attempting to load the theme you specified or the default\n"
 "configuration directory:\n"
-"%s/config/\n"
+"%s/\n"
 "This will prevent Enlightenment from loading any configuration\n"
 "files at all.\n"
 "Since this couldn't be found Enlightenment is probably not\n"
diff -ur enlightenment-0.16.6.orig/src/config.c enlightenment-0.16.6/src/config.c
--- enlightenment-0.16.6.orig/src/config.c	Wed Nov  5 18:58:50 2003
+++ enlightenment-0.16.6/src/config.c	Tue Nov 11 07:03:53 2003
@@ -3263,7 +3263,7 @@
 	  }
 	Esnprintf(execline, sizeof(execline), "%s " "-P " "-nostdinc " "-undef "
 #ifndef __EMX__
-		  "-include %s/config/definitions " "-I%s " "-I%s/config "
+		  "-include %s/definitions " "-I%s " "-I%s "
 		  "-D ENLIGHTENMENT_VERSION=%s " "-D ENLIGHTENMENT_ROOT=%s "
 		  "-D ENLIGHTENMENT_BIN=%s "
 #else
@@ -3278,7 +3278,7 @@
 		  "-D USER_SHELL=%s " "-D ENLIGHTENMENT_VERSION_015=1 "
 		  "%s %s/cached/cfg/%s.preparsed",
 #ifndef __EMX__
-		  epp_path, ENLIGHTENMENT_ROOT, themepath, ENLIGHTENMENT_ROOT,
+		  epp_path, CONFIGDATADIR, themepath, CONFIGDATADIR,
 		  ENLIGHTENMENT_VERSION, ENLIGHTENMENT_ROOT, ENLIGHTENMENT_BIN,
 #else
 		  epp_path, x11root, ENLIGHTENMENT_ROOT, themepath, x11root,
@@ -3534,7 +3534,7 @@
 
    /* look in system config dir */
 #ifndef __EMX__
-   Esnprintf(s, sizeof(s), "%s/config/%s", ENLIGHTENMENT_ROOT, file);
+   Esnprintf(s, sizeof(s), "%s/%s", CONFIGDATADIR, file);
 #else
    Esnprintf(s, sizeof(s), "%s/config/%s", __XOS2RedirRoot(ENLIGHTENMENT_ROOT),
 	     file);
@@ -3579,7 +3579,7 @@
 
    /* look in system config dir */
 #ifndef __EMX__
-   Esnprintf(s, sizeof(s), "%s/config/%s", ENLIGHTENMENT_ROOT, file);
+   Esnprintf(s, sizeof(s), "%s/%s", CONFIGDATADIR, file);
 #else
    Esnprintf(s, sizeof(s), "%s/config/%s", __XOS2RedirRoot(ENLIGHTENMENT_ROOT),
 	     file);
@@ -3669,7 +3669,7 @@
    Fnlib_add_dir(pFnlibData, s);
 #endif
 #ifndef __EMX__
-   Esnprintf(s, sizeof(s), "%s/config/", ENLIGHTENMENT_ROOT);
+   Esnprintf(s, sizeof(s), "%s/", CONFIGDATADIR);
 #else
    Esnprintf(s, sizeof(s), "%s/config/", __XOS2RedirRoot(ENLIGHTENMENT_ROOT));
 #endif
@@ -3701,7 +3701,7 @@
 	Alert(_
 	      ("Enlightenment has just experienced some major problems in\n"
 	       "attempting to load the theme you specified or the default\n"
-	       "configuration directory:\n" "%s/config/\n"
+	       "configuration directory:\n" "%s/\n"
 	       "This will prevent Enlightenment from loading any "
 	       "configuration\n" "files at all.\n"
 	       "Since this couldn't be found Enlightenment is probably not\n"
@@ -3721,7 +3721,7 @@
 	       "maintainer.\n"
 	       "If you are the administrator of your own system please\n"
 	       "consult the documentation that came with Enlightenment for\n"
-	       "additional information.\n"), ENLIGHTENMENT_ROOT);
+	       "additional information.\n"), CONFIGDATADIR);
 	EDBUG_RETURN(0);
      }
    strcpy(themepath, theme);