diff --git a/src/fe-gtk/chanview-tabs.c b/src/fe-gtk/chanview-tabs.c
index f99e61f1..10203476 100644
--- a/src/fe-gtk/chanview-tabs.c
+++ b/src/fe-gtk/chanview-tabs.c
@@ -524,7 +524,7 @@ cv_tabs_add (chanview *cv, chan *ch, char *name, GtkTreeIter *parent)
 	GtkWidget *but;
 
 	but = gtk_toggle_button_new_with_label (name);
-	gtk_widget_set_name (but, "xchat-tab");
+	gtk_widget_set_name (but, "hexchat-tab");
 	g_object_set_data (G_OBJECT (but), "c", ch);
 	/* used to trap right-clicks */
 	g_signal_connect (G_OBJECT (but), "button_press_event",
diff --git a/src/fe-gtk/chanview-tree.c b/src/fe-gtk/chanview-tree.c
index 9fa58393..4a4f1db2 100644
--- a/src/fe-gtk/chanview-tree.c
+++ b/src/fe-gtk/chanview-tree.c
@@ -94,7 +94,7 @@ cv_tree_init (chanview *cv)
 	gtk_widget_show (win);
 
 	view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (cv->store));
-	gtk_widget_set_name (view, "xchat-tree");
+	gtk_widget_set_name (view, "hexchat-tree");
 	if (cv->style)
 		gtk_widget_set_style (view, cv->style);
 	/*gtk_widget_modify_base (view, GTK_STATE_NORMAL, &colors[COL_BG]);*/
diff --git a/src/fe-gtk/fe-gtk.c b/src/fe-gtk/fe-gtk.c
index 9ff3c5a4..f100b895 100644
--- a/src/fe-gtk/fe-gtk.c
+++ b/src/fe-gtk/fe-gtk.c
@@ -293,7 +293,7 @@ const char cursor_color_rc[] =
 		"GtkEntry::cursor-color=\"#%02x%02x%02x\""
 #endif
 	"}"
-	"widget \"*.xchat-inputbox\" style : application \"xc-ib-st\"";
+	"widget \"*.hexchat-inputbox\" style : application \"xc-ib-st\"";
 
 GtkStyle *
 create_input_style (GtkStyle *style)
diff --git a/src/fe-gtk/maingui.c b/src/fe-gtk/maingui.c
index 886eaf2a..5b37dbb8 100644
--- a/src/fe-gtk/maingui.c
+++ b/src/fe-gtk/maingui.c
@@ -2116,7 +2116,7 @@ mg_create_chanmodebuttons (session_gui *gui, GtkWidget *box)
 
 	gui->flag_k = mg_create_flagbutton (_("Keyword"), box, "K");
 	gui->key_entry = gtk_entry_new ();
-	gtk_widget_set_name (gui->key_entry, "xchat-inputbox");
+	gtk_widget_set_name (gui->key_entry, "hexchat-inputbox");
 	gtk_entry_set_max_length (GTK_ENTRY (gui->key_entry), 16);
 	gtk_widget_set_size_request (gui->key_entry, 30, -1);
 	gtk_box_pack_start (GTK_BOX (box), gui->key_entry, 0, 0, 0);
@@ -2128,7 +2128,7 @@ mg_create_chanmodebuttons (session_gui *gui, GtkWidget *box)
 
 	gui->flag_l = mg_create_flagbutton (_("User Limit"), box, "L");
 	gui->limit_entry = gtk_entry_new ();
-	gtk_widget_set_name (gui->limit_entry, "xchat-inputbox");
+	gtk_widget_set_name (gui->limit_entry, "hexchat-inputbox");
 	gtk_entry_set_max_length (GTK_ENTRY (gui->limit_entry), 10);
 	gtk_widget_set_size_request (gui->limit_entry, 30, -1);
 	gtk_box_pack_start (GTK_BOX (box), gui->limit_entry, 0, 0, 0);
@@ -2218,7 +2218,7 @@ mg_create_topicbar (session *sess, GtkWidget *box)
 		sess->res->tab = NULL;
 
 	gui->topic_entry = topic = gtk_entry_new ();
-	gtk_widget_set_name (topic, "xchat-inputbox");
+	gtk_widget_set_name (topic, "hexchat-inputbox");
 	gtk_container_add (GTK_CONTAINER (hbox), topic);
 	g_signal_connect (G_OBJECT (topic), "activate",
 							G_CALLBACK (mg_topic_cb), 0);
@@ -2859,7 +2859,7 @@ mg_create_entry (session *sess, GtkWidget *box)
 	gtk_container_add (GTK_CONTAINER (hbox), entry);
 #endif
 
-	gtk_widget_set_name (entry, "xchat-inputbox");
+	gtk_widget_set_name (entry, "hexchat-inputbox");
 	g_signal_connect (G_OBJECT (entry), "key_press_event",
 							G_CALLBACK (key_handle_key_press), NULL);
 	g_signal_connect (G_OBJECT (entry), "focus_in_event",
diff --git a/src/fe-gtk/setup.c b/src/fe-gtk/setup.c
index 24e1cd4d..2929834a 100644
--- a/src/fe-gtk/setup.c
+++ b/src/fe-gtk/setup.c
@@ -1428,7 +1428,7 @@ setup_create_color_button (GtkWidget *table, int num, int row, int col)
 	but = gtk_button_new_with_label (" ");
 	gtk_label_set_markup (GTK_LABEL (GTK_BIN (but)->child), buf);
 	/* win32 build uses this to turn off themeing */
-	g_object_set_data (G_OBJECT (but), "xchat-color", (gpointer)1);
+	g_object_set_data (G_OBJECT (but), "hexchat-color", (gpointer)1);
 	gtk_table_attach (GTK_TABLE (table), but, col, col+1, row, row+1,
 							GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
 	g_signal_connect (G_OBJECT (but), "clicked",
diff --git a/src/fe-gtk/userlistgui.c b/src/fe-gtk/userlistgui.c
index 2859f598..89ddd49b 100644
--- a/src/fe-gtk/userlistgui.c
+++ b/src/fe-gtk/userlistgui.c
@@ -632,7 +632,7 @@ userlist_create (GtkWidget *box)
 	gtk_widget_show (sw);
 
 	treeview = gtk_tree_view_new ();
-	gtk_widget_set_name (treeview, "xchat-userlist");
+	gtk_widget_set_name (treeview, "hexchat-userlist");
 	gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE);
 	gtk_tree_selection_set_mode (gtk_tree_view_get_selection
 										  (GTK_TREE_VIEW (treeview)),