diff -aur xchat-2.6.8/src/common/xchat.c xchat-2.6.8-DarkCow/src/common/xchat.c
--- xchat-2.6.8/src/common/xchat.c	2006-10-11 10:04:55.000000000 +0100
+++ xchat-2.6.8-DarkCow/src/common/xchat.c	2007-02-04 17:45:22.000000000 +0000
@@ -586,7 +586,7 @@
 
 #if 1
 static char defaultconf_urlhandlers[] =
-		"NAME Open Link in Opera\n"		"CMD !opera -remote 'openURL(%s)'\n\n";
+		"NAME Open Link in Opera\n"		"CMD !opera -newpage '%s'\n\n";
 #else
 #ifdef WIN32
 static char defaultconf_urlhandlers[] =
@@ -735,6 +735,7 @@
 	notify_load ();
 	ignore_load ();
 
+#if 0
 	snprintf (buf, sizeof (buf),
 		"NAME %s\n"						"CMD query %%s\n\n"\
 		"NAME %s\n"						"CMD send %%s\n\n"\
@@ -784,8 +785,8 @@
 		_("KickBan"),
 		_("KickBan"),
 		_("KickBan"));
+#endif
 
-#if 0
 	snprintf (buf, sizeof (buf),
 	"NAME SUB\n"				"CMD %s\n\n"\
 		"NAME %s\n"				"CMD dcc send %%s\n\n"\
@@ -891,7 +892,7 @@
 		_("Telnet"),
 		_("Open Dialog Window")
 		);
-#endif
+
 	list_loadconf ("popup.conf", &popup_list, buf);
 
 	snprintf (buf, sizeof (buf),
diff -aur xchat-2.6.8/src/fe-gtk/menu.c xchat-2.6.8-DarkCow/src/fe-gtk/menu.c
--- xchat-2.6.8/src/fe-gtk/menu.c	2006-10-02 05:51:03.000000000 +0100
+++ xchat-2.6.8-DarkCow/src/fe-gtk/menu.c	2007-02-04 18:20:59.000000000 +0000
@@ -751,8 +751,7 @@
 	if (strncmp (str_copy, "irc://", 6) == 0 ||
 	    strncmp (str_copy, "ircs://",7) == 0)
 		menu_quick_item_with_callback (open_url_cb, _("Connect"), menu, str_copy);
-	else
-		menu_quick_item_with_callback (open_url_cb, _("Open Link in Browser"), menu, str_copy);
+
 	menu_quick_item_with_callback (copy_to_clipboard_cb, _("Copy Selected Link"), menu, str_copy);
 	/* custom ones from urlhandlers.conf */
 	menu_create (menu, urlhandler_list, str_copy, TRUE);
@@ -1339,7 +1338,7 @@
 #define DETACH_OFFSET (12)
 	{0, menu_detach, GTK_STOCK_REDO, M_MENUSTOCK, 0, 0, 1, GDK_I},	/* 12 */
 #define CLOSE_OFFSET (13)
-	{0, menu_close, GTK_STOCK_CLOSE, M_MENUSTOCK, 0, 0, 1, GDK_w},
+	{0, menu_close, GTK_STOCK_CLOSE, M_MENUSTOCK, 0, 0, 1},
 	{0, 0, 0, M_SEP, 0, 0, 0},
 	{N_("_Quit"), mg_safe_quit, GTK_STOCK_QUIT, M_MENUSTOCK, 0, 0, 1, GDK_q},	/* 15 */