--- cb_names.c	2001-10-18 07:25:18.000000000 -0400
+++ cb_names.c	2015-01-24 12:55:44.000000000 -0500
@@ -149,1 +154,1 @@
-/*	"Default (fixed) 13", */
+	"Fixed (13)",
@@ -178,14 +163,15 @@
-        "-adobe-courier-bold-r-normal--10-100-75-75-m-60-iso8859-1",  
-        "-adobe-courier-bold-r-normal--12-120-75-75-m-70-iso8859-1",
-        "-adobe-courier-bold-r-normal--14-140-75-75-m-90-iso8859-1",
-	"-adobe-courier-medium-r-normal--10-100-75-75-m-60-iso8859-1",
-        "-adobe-courier-medium-r-normal--12-120-75-75-m-70-iso8859-1",
-        "-adobe-courier-medium-r-normal--14-140-75-75-m-90-iso8859-1",
-        "-adobe-courier-medium-r-normal--18-180-75-75-m-110-iso8859-1",
-        "-adobe-helvetica-medium-r-normal--14-100-100-100-p-76-iso8859-1",
-        "-adobe-helvetica-medium-r-normal--20-140-100-100-p-100-iso8859-1",
-        "-adobe-times-bold-r-normal--14-140-75-75-p-77-iso8859-1",
-        "-adobe-times-medium-r-normal--18-180-75-75-p-94-iso8859-1",
-        "-adobe-times-medium-r-normal--20-140-100-100-p-100-iso8859-1",
-        "-adobe-times-medium-r-normal--24-240-75-75-p-132-iso8859-1",
-        "-adobe-new century schoolbook-medium-r-normal--18-180-75-75-p-103-iso8859-1",
+	"-*-courier-bold-r-normal--10-100-75-75-m-60-*-*",
+	"-*-courier-bold-r-normal--12-120-75-75-m-70-*-*",
+	"-*-courier-bold-r-normal--14-140-75-75-m-90-*-*",
+	"-*-courier-medium-r-normal--10-100-75-75-m-60-*-*",
+	"-*-courier-medium-r-normal--12-120-75-75-m-70-*-*",
+	"-*-fixed-medium-r-*-13-*",
+	"-*-courier-medium-r-normal--14-140-75-75-m-90-*-*",
+	"-*-courier-medium-r-normal--18-180-75-75-m-110-*-*",
+	"-*-helvetica-medium-r-normal--14-100-100-100-p-76-*-*",
+	"-*-helvetica-medium-r-normal--20-140-100-100-p-100-*-*",
+	"-*-times-bold-r-normal--14-140-75-75-p-77-*-*",
+	"-*-times-medium-r-normal--18-180-75-75-p-94-*-*",
+	"-*-times-medium-r-normal--20-140-100-100-p-100-*-*",
+	"-*-times-medium-r-normal--24-240-75-75-p-132-*-*",
+	"-*-* schoolbook-medium-r-normal--18-180-75-75-p-103-*-*",