diff --git a/src/common/cfgfiles.c b/src/common/cfgfiles.c
index 111234e9..7f27659d 100644
--- a/src/common/cfgfiles.c
+++ b/src/common/cfgfiles.c
@@ -32,7 +32,7 @@
 
 #ifndef WIN32
 #include <unistd.h>
-#define XCHAT_DIR ".xchat2"
+#define HEXCHAT_DIR "hexchat"
 #endif
 
 #define DEF_FONT "Monospace 9"
@@ -325,7 +325,7 @@ get_xdir_fs (void)
 			if (!get_reg_str ("Software\\Microsoft\\Windows\\CurrentVersion\\"
 					"Explorer\\Shell Folders", "AppData", out, sizeof (out)))
 				return "./config";
-			xdir_fs = g_strdup_printf ("%s\\" "X-Chat 2", out);
+			xdir_fs = g_strdup_printf ("%s\\" "HexChat", out);
 		}
 	}
 	return xdir_fs;
@@ -337,7 +337,7 @@ char *
 get_xdir_fs (void)
 {
 	if (!xdir_fs)
-		xdir_fs = g_strdup_printf ("%s/" XCHAT_DIR, g_get_home_dir ());
+		xdir_fs = g_strdup_printf ("%s/.config/" HEXCHAT_DIR, g_get_home_dir ());
 
 	return xdir_fs;
 }
diff --git a/src/htm/Main.cs b/src/htm/Main.cs
index 5572ff76..67fcf32f 100644
--- a/src/htm/Main.cs
+++ b/src/htm/Main.cs
@@ -36,8 +36,8 @@ namespace thememan
 {
     public partial class HTM : Form
     {
-        public string appdata = (Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\X-Chat 2\\");
-        public string home = (Environment.GetFolderPath(Environment.SpecialFolder.Personal) + "/.xchat2/");
+        public string appdata = (Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HexChat\\");
+        public string home = (Environment.GetFolderPath(Environment.SpecialFolder.Personal) + "/.config/hexchat/");
 
         public string xchatdir;
         public string themedir = "themes\\";
@@ -146,7 +146,7 @@ namespace thememan
 
         private void applybutton_Click_1(object sender, EventArgs e)
         {
-            DialogResult result = MessageBox.Show("XChat must be closed and this will overwrite your current theme!\n\nDo you wish to continue?", "Warning", MessageBoxButtons.OKCancel, MessageBoxIcon.Warning);
+            DialogResult result = MessageBox.Show("HexChat must be closed and this will overwrite your current theme!\n\nDo you wish to continue?", "Warning", MessageBoxButtons.OKCancel, MessageBoxIcon.Warning);
             if (result == DialogResult.OK)
             {
                 File.Copy(xchatdir + themedir + themelist.SelectedItem.ToString() + "\\colors.conf", xchatdir + "colors.conf", true);
@@ -170,7 +170,7 @@ namespace thememan
         private void importbutton_Click_1(object sender, EventArgs e)
         {
             importDialog = new OpenFileDialog();
-            importDialog.Filter = "XChat Theme Files|*.xct";
+            importDialog.Filter = "HexChat Theme Files|*.hct";
             importDialog.FilterIndex = 1;
             importDialog.FileOk += new CancelEventHandler(importdialog_FileOk);
             importDialog.ShowDialog();