diff --git a/src/Remember.cc b/src/Remember.cc
index f2499df1..8e030db7 100644
--- a/src/Remember.cc
+++ b/src/Remember.cc
@@ -21,7 +21,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Remember.cc,v 1.18 2003/05/26 11:27:31 rathnor Exp $
+// $Id: Remember.cc,v 1.19 2003/05/27 11:55:23 rathnor Exp $
 
 #include "Remember.hh"
 #include "StringUtil.hh"
@@ -32,10 +32,6 @@
 #include "MenuItem.hh"
 #include "App.hh"
 
-// TODO get rid of these
-#define RC_PATH "fluxbox"
-#define RC_INIT_FILE "init"
-
 #include <X11/Xlib.h>
 
 //use GNU extensions
@@ -301,7 +297,9 @@ int Remember::parseApp(ifstream &file, Application &app) {
 
 void Remember::load() {
 
-    string apps_string = getenv("HOME")+string("/.")+RC_PATH+string("/")+"apps";
+    string apps_string;
+    Fluxbox::instance()->getDefaultDataFilename("apps", apps_string);
+
 #ifdef DEBUG
     cerr<<__FILE__<<"("<<__FUNCTION__<<"): Loading apps file ["<<apps_string<<"]"<<endl;
 #endif // DEBUG
@@ -356,7 +354,8 @@ void Remember::save() {
 #ifdef DEBUG
     cerr<<__FILE__<<"("<<__FUNCTION__<<"): Saving apps file..."<<endl;
 #endif // DEBUG
-    string apps_string = getenv("HOME")+string("/.")+RC_PATH+string("/")+"apps";
+    string apps_string;
+    Fluxbox::instance()->getDefaultDataFilename("apps", apps_string);
     ofstream apps_file(apps_string.c_str());
     Apps::iterator it = apps.begin();
     Apps::iterator it_end = apps.end();
diff --git a/src/fluxbox.hh b/src/fluxbox.hh
index 2d03b076..ea4b34fc 100644
--- a/src/fluxbox.hh
+++ b/src/fluxbox.hh
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: fluxbox.hh,v 1.60 2003/05/18 22:02:55 fluxgen Exp $
+// $Id: fluxbox.hh,v 1.61 2003/05/27 11:55:23 rathnor Exp $
 
 #ifndef	 FLUXBOX_HH
 #define	 FLUXBOX_HH
@@ -191,6 +191,8 @@ public:
     bool menuTimestampsChanged() const;
     bool haveShape() const { return m_have_shape; }
     int shapeEventbase() const { return m_shape_eventbase; }
+    void getDefaultDataFilename(char *, std::string &);
+
 private:
     struct cursor {
         Cursor session, move, ll_angle, lr_angle;
@@ -208,7 +210,6 @@ private:
 		
 
     std::string getRcFilename();
-    void getDefaultDataFilename(char *, std::string &);
     void load_rc();
 	
     void reload_rc();