diff --git a/WINGs/wcolorpanel.c b/WINGs/wcolorpanel.c
index 00921f17..a19423a1 100644
--- a/WINGs/wcolorpanel.c
+++ b/WINGs/wcolorpanel.c
@@ -394,7 +394,7 @@ static WMColorPanel *makeColorPanel(WMScreen * scrPtr, const char *name)
 	panel->mode = WMWheelModeColorPanel;
 	panel->lastChanged = 0;
 	panel->slidersmode = WMRGBModeColorPanel;
-	panel->configurationPath = wstrconcat(wusergnusteppath(), "/Library/Colors/");
+	panel->configurationPath = wstrconcat(wuserdatapath(), "/Colors/");
 
 	/* Some General Purpose Widgets */
 	panel->colorWell = WMCreateColorWell(panel->win);
diff --git a/WPrefs.app/Appearance.c b/WPrefs.app/Appearance.c
index aed1e95b..b986e64f 100644
--- a/WPrefs.app/Appearance.c
+++ b/WPrefs.app/Appearance.c
@@ -1828,7 +1828,7 @@ static void createPanel(Panel * p)
 	char *tmp;
 	Bool ok = True;
 
-	panel->fprefix = wstrconcat(wusergnusteppath(), "/Library/WindowMaker");
+	panel->fprefix = wstrconcat(wuserdatapath(), "/" PACKAGE_TARNAME);
 
 	if (access(panel->fprefix, F_OK) != 0) {
 		if (mkdir(panel->fprefix, 0755) < 0) {
diff --git a/WPrefs.app/MouseSettings.c b/WPrefs.app/MouseSettings.c
index 528f6950..bf9696da 100644
--- a/WPrefs.app/MouseSettings.c
+++ b/WPrefs.app/MouseSettings.c
@@ -650,7 +650,7 @@ static void storeCommandInScript(const char *cmd, const char *line)
 	umask(permissions);
 	permissions = (S_IRWXU | S_IRWXG | S_IRWXO) & (~permissions);
 
-	path = wstrconcat(wusergnusteppath(), "/Library/WindowMaker/autostart");
+	path = wstrconcat(wuserdatapath(), "/" PACKAGE_TARNAME "/autostart");
 
 	f = fopen(path, "rb");
 	if (!f) {
@@ -668,7 +668,7 @@ static void storeCommandInScript(const char *cmd, const char *line)
 		char *tmppath;
 		FILE *fo;
 
-		tmppath = wstrconcat(wusergnusteppath(), "/Library/WindowMaker/autostart.tmp");
+		tmppath = wstrconcat(wuserdatapath(), "/" PACKAGE_TARNAME "/autostart.tmp");
 		fo = fopen(tmppath, "wb");
 		if (!fo) {
 			werror(_("could not create temporary file %s"), tmppath);
diff --git a/src/icon.c b/src/icon.c
index e823fecd..74085512 100644
--- a/src/icon.c
+++ b/src/icon.c
@@ -51,7 +51,7 @@
 /**** Global varianebles ****/
 
 #define MOD_MASK wPreferences.modifier_mask
-#define CACHE_ICON_PATH "/Library/WindowMaker/CachedPixmaps"
+#define CACHE_ICON_PATH "/" PACKAGE_TARNAME "/CachedPixmaps"
 #define ICON_BORDER 3
 
 static void miniwindowExpose(WObjDescriptor *desc, XEvent *event);
@@ -424,17 +424,15 @@ static char *get_icon_cache_path(void)
 	char *path;
 	int len, ret;
 
-	prefix = wusergnusteppath();
-	len = strlen(prefix) + strlen(CACHE_ICON_PATH) + 2;
-	path = wmalloc(len);
-	snprintf(path, len, "%s%s/", prefix, CACHE_ICON_PATH);
+	prefix = wuserdatapath();
+	path = wstrconcat(prefix, CACHE_ICON_PATH "/");
 
 	/* If the folder exists, exit */
 	if (access(path, F_OK) == 0)
 		return path;
 
 	/* Create the folder */
-	ret = wmkdirhier((const char *) path);
+	ret = wmkdirhier(path);
 
 	/* Exit 1 on success, 0 on failure */
 	if (ret == 1)
diff --git a/src/main.c b/src/main.c
index 7b47b0d6..b89a2139 100644
--- a/src/main.c
+++ b/src/main.c
@@ -510,7 +510,7 @@ static void execInitScript(void)
 {
 	char *file, *paths;
 
-	paths = wstrconcat(wusergnusteppath(), "/Library/WindowMaker");
+	paths = wstrconcat(wuserdatapath(), "/" PACKAGE_TARNAME);
 	paths = wstrappend(paths, ":" DEF_CONFIG_PATHS);
 
 	file = wfindfile(paths, DEF_INIT_SCRIPT);
@@ -528,7 +528,7 @@ void ExecExitScript(void)
 {
 	char *file, *paths;
 
-	paths = wstrconcat(wusergnusteppath(), "/Library/WindowMaker");
+	paths = wstrconcat(wuserdatapath(), "/" PACKAGE_TARNAME);
 	paths = wstrappend(paths, ":" DEF_CONFIG_PATHS);
 
 	file = wfindfile(paths, DEF_EXIT_SCRIPT);
diff --git a/util/getstyle.c b/util/getstyle.c
index c2c61c3e..d7a10253 100644
--- a/util/getstyle.c
+++ b/util/getstyle.c
@@ -175,7 +175,7 @@ static void findCopyFile(const char *dir, const char *file)
 	wfree(fullPath);
 }
 
-#define THEME_SUBPATH "/Library/WindowMaker/Themes/"
+#define THEME_SUBPATH "/" PACKAGE_TARNAME "/Themes/"
 #define THEME_EXTDIR  ".themed/"
 
 static void makeThemePack(WMPropList * style, const char *themeName)
@@ -186,16 +186,16 @@ static void makeThemePack(WMPropList * style, const char *themeName)
 	int i;
 	size_t themeNameLen;
 	char *themeDir;
-	const char *user_base;
+	const char *user_library;
 
-	user_base = wusergnusteppath();
-	if (user_base == NULL)
+	user_library = wuserdatapath();
+	if (user_library == NULL)
 		return;
-	themeNameLen = strlen(user_base) + sizeof(THEME_SUBPATH) + strlen(themeName) + sizeof(THEME_EXTDIR) + 1;
+	themeNameLen = strlen(user_library) + sizeof(THEME_SUBPATH) + strlen(themeName) + sizeof(THEME_EXTDIR) + 1;
 	themeDir = wmalloc(themeNameLen);
 	snprintf(themeDir, themeNameLen,
 	         "%s" THEME_SUBPATH "%s" THEME_EXTDIR,
-	         user_base, themeName);
+	         user_library, themeName);
 	ThemePath = themeDir;
 
 	if (!wmkdirhier(themeDir)) {