diff --git a/include/config.h.in b/include/config.h.in
index ea90de7..3a0146f 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -3,11 +3,11 @@
 
 #define PREFIX "@CMAKE_INSTALL_PREFIX@"
 #define CONFDIR "@CMAKE_INSTALL_FULL_SYSCONFDIR@"
-#define DATADIR "@CMAKE_INSTALL_FULL_DATAROOTDIR@"
-#define ICON128DIR DATADIR "/mde/icons/128x128"
-#define ICON64DIR DATADIR "/mde/icons/64x64"
-#define ICON32DIR DATADIR "/mde/icons/32x32"
-#define ICON16DIR DATADIR "/mde/icons/16x16"
+#define DATAROOTDIR "@CMAKE_INSTALL_FULL_DATAROOTDIR@"
+#define ICON128DIR DATAROOTDIR "/mde/icons/128x128"
+#define ICON64DIR DATAROOTDIR "/mde/icons/64x64"
+#define ICON32DIR DATAROOTDIR "/mde/icons/32x32"
+#define ICON16DIR DATAROOTDIR "/mde/icons/16x16"
 
 #cmakedefine HAS_PATHS_H
 
diff --git a/mdeartworks b/mdeartworks
index 891431c..6981b48 160000
--- a/mdeartworks
+++ b/mdeartworks
@@ -1 +1 @@
-Subproject commit 891431c4fe2f95032ae3c14213e77f678c89ebd4
+Subproject commit 6981b4840e283003124c519eab6f2ecfc903c2f0
diff --git a/mdebase b/mdebase
index 08a3fa8..e3edcfa 160000
--- a/mdebase
+++ b/mdebase
@@ -1 +1 @@
-Subproject commit 08a3fa8f20bfd0c34d9f116f2f4092ddcad63db9
+Subproject commit e3edcfa7e1eea4c6f4da9296fc146c926353d6f6