diff --git a/cmd/xfe/XfeWidgets/Xfe/CallProcs.c b/cmd/xfe/XfeWidgets/Xfe/CallProcs.c
index a591f874851..284ac476907 100644
--- a/cmd/xfe/XfeWidgets/Xfe/CallProcs.c
+++ b/cmd/xfe/XfeWidgets/Xfe/CallProcs.c
@@ -99,6 +99,28 @@ _XfeCallProcSelectPixel(Widget w,int offset,XrmValue * value)
 }
 /*----------------------------------------------------------------------*/
 /* extern */ void
+_XfeCallProcDefaultLabelFontList(Widget w,int offset,XrmValue * value)
+{
+    static XmFontList font_list;
+
+	font_list = XmFontListCopy(_XmGetDefaultFontList(w,XmLABEL_FONTLIST));
+    
+    value->addr = (XPointer) &font_list;
+    value->size = sizeof(font_list);
+}
+/*----------------------------------------------------------------------*/
+/* extern */ void
+_XfeCallProcDefaultTextFontList(Widget w,int offset,XrmValue * value)
+{
+    static XmFontList font_list;
+
+	font_list = XmFontListCopy(_XmGetDefaultFontList(w,XmTEXT_FONTLIST));
+    
+    value->addr = (XPointer) &font_list;
+    value->size = sizeof(font_list);
+}
+/*----------------------------------------------------------------------*/
+/* extern */ void
 _XfeCallProcOrientationCursor(Widget w,int offset,XrmValue * value)
 {
     static Cursor		drag_cursor;
diff --git a/cmd/xfe/XfeWidgets/Xfe/PrepareP.h b/cmd/xfe/XfeWidgets/Xfe/PrepareP.h
index 6c07e539d58..67e973e2870 100644
--- a/cmd/xfe/XfeWidgets/Xfe/PrepareP.h
+++ b/cmd/xfe/XfeWidgets/Xfe/PrepareP.h
@@ -32,55 +32,55 @@
 /* XfeLabel - superclass = XfePrimitive									*/
 /*																		*/
 /*----------------------------------------------------------------------*/
-#define _XFE_PREPARE_LABEL_STRING					(1 << 0)
+#define _XFE_PREPARE_LABEL_STRING					XfePrepare1
 
 /*----------------------------------------------------------------------*/
 /*																		*/
 /* XfeButton - superclass = XfeLabel									*/
 /*																		*/
 /*----------------------------------------------------------------------*/
-#define _XFE_PREPARE_BUTTON_PIXMAP					(1 << 1)
-#define _XFE_PREPARE_BUTTON_ARMED_PIXMAP			(1 << 2)
-#define _XFE_PREPARE_BUTTON_RAISED_PIXMAP			(1 << 3)
-#define _XFE_PREPARE_BUTTON_INSENSITIVE_PIXMAP		(1 << 4)
+#define _XFE_PREPARE_BUTTON_PIXMAP					XfePrepare2
+#define _XFE_PREPARE_BUTTON_ARMED_PIXMAP			XfePrepare3
+#define _XFE_PREPARE_BUTTON_RAISED_PIXMAP			XfePrepare4
+#define _XFE_PREPARE_BUTTON_INSENSITIVE_PIXMAP		XfePrepare5
 
 /*----------------------------------------------------------------------*/
 /*																		*/
 /* XfeLogo - superclass = XfeButton										*/
 /*																		*/
 /*----------------------------------------------------------------------*/
-#define _XFE_PREPARE_LOGO_ANIMATION					(1 << 5)
+#define _XFE_PREPARE_LOGO_ANIMATION					XfePrepare6
 
 /*----------------------------------------------------------------------*/
 /*																		*/
 /* XfeTab - superclass = XfeButton										*/
 /*																		*/
 /*----------------------------------------------------------------------*/
-#define _XFE_PREPARE_TAB_BOTTOM_PIXMAP				(1 << 5)
-#define _XFE_PREPARE_TAB_HORIZONTAL_PIXMAP			(1 << 6)
-#define _XFE_PREPARE_TAB_LEFT_PIXMAP				(1 << 7)
-#define _XFE_PREPARE_TAB_RIGHT_PIXMAP				(1 << 8)
-#define _XFE_PREPARE_TAB_TOP_PIXMAP					(1 << 9)
-#define _XFE_PREPARE_TAB_VERTICAL_PIXMAP			(1 << 10)
-#define _XFE_PREPARE_TAB_BOTTOM_RAISED_PIXMAP		(1 << 11)
-#define _XFE_PREPARE_TAB_HORIZONTAL_RAISED_PIXMAP	(1 << 12)
-#define _XFE_PREPARE_TAB_LEFT_RAISED_PIXMAP			(1 << 13)
-#define _XFE_PREPARE_TAB_RIGHT_RAISED_PIXMAP		(1 << 14)
-#define _XFE_PREPARE_TAB_TOP_RAISED_PIXMAP			(1 << 15)
-#define _XFE_PREPARE_TAB_VERTICAL_RAISED_PIXMAP		(1 << 16)
+#define _XFE_PREPARE_TAB_BOTTOM_PIXMAP				XfePrepare6
+#define _XFE_PREPARE_TAB_HORIZONTAL_PIXMAP			XfePrepare7
+#define _XFE_PREPARE_TAB_LEFT_PIXMAP				XfePrepare8
+#define _XFE_PREPARE_TAB_RIGHT_PIXMAP				XfePrepare9
+#define _XFE_PREPARE_TAB_TOP_PIXMAP					XfePrepare10
+#define _XFE_PREPARE_TAB_VERTICAL_PIXMAP			XfePrepare11
+#define _XFE_PREPARE_TAB_BOTTOM_RAISED_PIXMAP		XfePrepare12
+#define _XFE_PREPARE_TAB_HORIZONTAL_RAISED_PIXMAP	XfePrepare13
+#define _XFE_PREPARE_TAB_LEFT_RAISED_PIXMAP			XfePrepare14
+#define _XFE_PREPARE_TAB_RIGHT_RAISED_PIXMAP		XfePrepare15
+#define _XFE_PREPARE_TAB_TOP_RAISED_PIXMAP			XfePrepare16
+#define _XFE_PREPARE_TAB_VERTICAL_RAISED_PIXMAP		XfePrepare17
 
 /*----------------------------------------------------------------------*/
 /*																		*/
 /* XfeComboBox - superclass = XfeManager								*/
 /*																		*/
 /*----------------------------------------------------------------------*/
-#define _XFE_PREPARE_ARROW							(1 << 0)
+#define _XFE_PREPARE_ARROW							XfePrepare1
 
 /*----------------------------------------------------------------------*/
 /*																		*/
 /* XfeToolBar - superclass = XfeOriented								*/
 /*																		*/
 /*----------------------------------------------------------------------*/
-#define _XFE_PREPARE_MAX_CHILD_DIMENSIONS			(1 << 0)
+#define _XFE_PREPARE_MAX_CHILD_DIMENSIONS			XfePrepare1
 
 #endif											/* end PrepareP.h		*/
diff --git a/cmd/xfe/XfeWidgets/Xfe/XfeP.h b/cmd/xfe/XfeWidgets/Xfe/XfeP.h
index 11089df462c..06d1369340e 100644
--- a/cmd/xfe/XfeWidgets/Xfe/XfeP.h
+++ b/cmd/xfe/XfeWidgets/Xfe/XfeP.h
@@ -321,6 +321,16 @@ if (_XfeIsAlive(_w) && XtIsRealized(_w)) \
 #define XfePrepare8				(1 << 7)
 #define XfePrepare9				(1 << 8)
 #define XfePrepare10			(1 << 9)
+#define XfePrepare11			(1 << 10)
+#define XfePrepare12			(1 << 11)
+#define XfePrepare13			(1 << 12)
+#define XfePrepare14			(1 << 13)
+#define XfePrepare15			(1 << 14)
+#define XfePrepare16			(1 << 15)
+#define XfePrepare17			(1 << 16)
+#define XfePrepare18			(1 << 17)
+#define XfePrepare19			(1 << 18)
+#define XfePrepare20			(1 << 19)
 #define XfePrepareAll			(~(0))
 
 /*----------------------------------------------------------------------*/
@@ -486,6 +496,16 @@ _XfeCallProcOrientationCursor	(Widget			w,
 								 int			offset,
 								 XrmValue *		value);
 /*----------------------------------------------------------------------*/
+extern void
+_XfeCallProcDefaultLabelFontList(Widget			w,
+								 int			offset,
+								 XrmValue *		value);
+/*----------------------------------------------------------------------*/
+extern void
+_XfeCallProcDefaultTextFontList	(Widget			w,
+								 int			offset,
+								 XrmValue *		value);
+/*----------------------------------------------------------------------*/
 
 /*----------------------------------------------------------------------*/
 /*																		*/