--- cvs/src/fluxbox.cc	2004-01-21 21:23:42.000000000 +0100
+++ fb/src/fluxbox.cc	2004-02-10 01:32:23.017214808 +0100
@@ -569,7 +570,7 @@ Fluxbox::Fluxbox(int argc, char **argv, 
     }
 
     // setup theme manager to have our style file ready to be scanned
-    FbTk::ThemeManager::instance().load(getStyleFilename());
+    FbTk::ThemeManager::instance().load(FbTk::StringUtil::expandFilename(getStyleFilename()));
 
     XSynchronize(disp, False);
     sync(false);
@@ -1643,11 +1644,11 @@ void Fluxbox::load_rc() {
     if (m_rc_stylefile->empty()) 
         *m_rc_stylefile = DEFAULTSTYLE;
     else // expand tilde
-        *m_rc_stylefile = StringUtil::expandFilename(*m_rc_stylefile);
+        *m_rc_stylefile = *m_rc_stylefile;
 
 
     // expand tilde
-    *m_rc_groupfile = StringUtil::expandFilename(*m_rc_groupfile);
+    *m_rc_groupfile = *m_rc_groupfile;
 
 #ifdef DEBUG
     cerr<<__FILE__<<": Loading groups ("<<*m_rc_groupfile<<")"<<endl;
--- cvs/src/Workspace.cc	2004-01-21 21:23:41.000000000 +0100
+++ fb/src/Workspace.cc	2004-02-10 01:28:11.480454208 +0100
@@ -339,7 +339,7 @@ bool Workspace::checkGrouping(FluxboxWin
 }
 
 bool Workspace::loadGroups(const std::string &filename) {
-    string real_filename = filename;
+    string real_filename = FbTk::StringUtil::expandFilename(filename);
     FbTk::StringUtil::removeTrailingWhitespace(real_filename);
     ifstream infile(real_filename.c_str());
     if (!infile)
--- cvs/src/FbTk/Theme.cc	2004-01-13 09:16:46.000000000 +0100
+++ fb/src/FbTk/Theme.cc	2004-02-10 01:36:09.687755648 +0100
@@ -79,7 +79,7 @@ bool ThemeManager::unregisterTheme(Theme
 }
 
 bool ThemeManager::load(const std::string &filename, int screen_num) {
-    std::string location = FbTk::StringUtil::expandFilename(filename);
+    std::string location = filename;
     std::string prefix = "";
 
     if (Directory::isDirectory(filename)) {
--- cvs/src/Slit.cc	2004-02-06 18:30:49.000000000 +0100
+++ fb/src/Slit.cc	2004-02-10 00:52:31.801734816 +0100
@@ -1128,11 +1128,13 @@ void Slit::loadClientList(const char *fi
         return;
 
     // save filename so we can save client list later
-    m_filename = FbTk::StringUtil::expandFilename(filename); 
+    m_filename = filename;
+   
+    std::string real_filename = FbTk::StringUtil::expandFilename(filename); 
 
     struct stat buf;
-    if (stat(m_filename.c_str(), &buf) != 0) {
-        std::ifstream file(m_filename.c_str());
+    if (stat(real_filename.c_str(), &buf) != 0) {
+        std::ifstream file(real_filename.c_str());
         std::string name;
         while (! file.eof()) {
             name = "";
@@ -1169,7 +1171,7 @@ void Slit::updateClientmenu() {
     m_clientlist_menu.insert("Cycle Up", cycle_up);
     m_clientlist_menu.insert("Cycle Down", cycle_down);
 
-    FbTk::MenuItem *separator = new FbTk::MenuItem("-------");
+    FbTk::MenuItem *separator = new FbTk::MenuItem("---");
     separator->setEnabled(false);
     m_clientlist_menu.insert(separator);
 
@@ -1185,7 +1187,7 @@ void Slit::updateClientmenu() {
 
 void Slit::saveClientList() {
 
-    std::ofstream file(m_filename.c_str());
+    std::ofstream file(FbTk::StringUtil::expandFilename(m_filename).c_str());
     SlitClients::iterator it = m_client_list.begin();
     SlitClients::iterator it_end = m_client_list.end();
     std::string prevName;