diff --git a/Makefile.generic b/Makefile.generic
index f868db64d61c58d01686a7b37cee9d7ab72db768..19fa82c6f848d1a69437d24250b72332dd15a379 100644
--- a/Makefile.generic
+++ b/Makefile.generic
@@ -1,4 +1,4 @@
-# $fiHeader: Makefile.generic,v 1.4 93/03/31 10:38:24 cer Exp $
+# $fiHeader: Makefile.generic,v 1.5 93/04/02 13:35:41 cer Exp $
 #
 #  Makefile.generic for CLIM 2.0
 #
@@ -262,13 +262,13 @@ dcl	:
 	make dcl	
 
 clim-motif.o	: stub-motif.o stub-xt.o $(MOTIFLIB)
-	ld -r $(LDFLAGS) -o clim-motif.o stub-motif.o stub-xt.o $(MOTIFLIB)
+	ld -r $(LDFLAGS) -o clim-motif.o stub-motif.o stub-xt.o $(MOTIFXTRAOS) $(MOTIFLIB)
 
 clim-olit.o	: stub-olit.o stub-xt.o $(LIBXOL)
 	ld -r $(LDFLAGS) -o clim-olit.o stub-olit.o stub-xt.o $(LIBXOL)
 
 clim-motif_d.o	: stub-motif.o stub-xt.o $(MOTIFLIB_d)
-	ld -r  $(LDFLAGS) -o clim-motif_d.o stub-motif.o stub-xt.o $(MOTIFLIB_d)
+	ld -r  $(LDFLAGS) -o clim-motif_d.o stub-motif.o stub-xt.o $(MOTIFXTRAOS) $(MOTIFLIB_d)
 
 clim-olit_d.o	: stub-olit.o  stub-xt.o $(LIBXOL_d)
 	ld -r $(LDFLAGS) -o clim-olit_d.o stub-olit.o stub-xt.o $(LIBXOL_d)
@@ -295,7 +295,7 @@ xlibsupport.o	: xlib/xlibsupport.c
 
 
 xtsupport.o: misc/xtsupport.c
-	$(CC) -c $(CFLAGS) -o xtsupport.o misc/xtsupport.c
+	$(CC) -c $(CFLAGS) $(XTSUPPORTINCLUDES) -o xtsupport.o misc/xtsupport.c
 
 MyDrawingA.o: misc/MyDrawingA.c
 	$(CC) -c $(CFLAGS) -o MyDrawingA.o misc/MyDrawingA.c
diff --git a/Makefile.sun4 b/Makefile.sun4
index 676b5a7a5ae7ba1e0af87fcc3cd046974b1c41b5..95afb179c671314afdfb2cb9fd7c8ed686d5a8d0 100644
--- a/Makefile.sun4
+++ b/Makefile.sun4
@@ -1,14 +1,18 @@
-# $fiHeader: Makefile,v 1.74 93/02/10 10:04:04 cer Exp $
+# $fiHeader: Makefile.sun4,v 1.1 93/03/01 14:26:12 cer Exp $
 #
 #  Makefile.sun4 for CLIM 2.0
 #
 
 include Makefile.defs
 
-MOTIFLIB=/x11/R4/sun4-lib/libXm$(DEBUGLIB).a
-MOTIFLIB_d=/x11/R4/sun4-lib/libXm_d.a
-XLIB= /x11/R4/sun4-lib/libX11$(DEBUGLIB).a 
-XTLIB=/x11/R4/sun4-lib/libXt$(DEBUGLIB).a
-XINCLUDES=-I/x11/motif-1.1/lib
+MOTIFLIB=/3rd/motif-1.2.1/usr/lib/libXm$(DEBUGLIB).a
+#MOTIFLIB_d=/3rd/motif-1.2.1/usr/lib/libXm_d.a
+MOTIFLIB_d=/3rd/motif-1.2.1/usr/lib/libXm.a
+XLIB= /3rd/motif-1.2.1/usr/lib/libX11$(DEBUGLIB).a 
+XTLIB=/3rd/motif-1.2.1/usr/lib/libXt$(DEBUGLIB).a
+XINCLUDES=-I/3rd/motif-1.2.1/usr/include
+XTSUPPORTINCLUDES=-I/x11/R5/src/mit/lib/Xt
+# Do we really need this. Why is it referenced?
+MOTIFXTRAOS=/3rd/motif-1.2.1/usr/lib/Motif/Sun/dlsym.o
 
 include Makefile.generic
diff --git a/Makefile.sun4.motif-1.1.4 b/Makefile.sun4.motif-1.1.4
new file mode 100644
index 0000000000000000000000000000000000000000..4bc572ff964e75e9560cf80f2de65516b7090047
--- /dev/null
+++ b/Makefile.sun4.motif-1.1.4
@@ -0,0 +1,15 @@
+# $fiHeader: Makefile.sun4,v 1.1 93/03/01 14:26:12 cer Exp $
+#
+#  Makefile.sun4 for CLIM 2.0
+#
+
+include Makefile.defs
+
+MOTIFLIB=/x11/R4/sun4-lib/libXm$(DEBUGLIB).a
+MOTIFLIB_d=/x11/R4/sun4-lib/libXm_d.a
+XLIB= /x11/R4/sun4-lib/libX11$(DEBUGLIB).a 
+XTLIB=/x11/R4/sun4-lib/libXt$(DEBUGLIB).a
+XINCLUDES=-I/x11/motif-1.1/lib
+XTSUPPORTINCLUDES=-I/x11/R4/src/mit/lib/Xt
+
+include Makefile.generic
diff --git a/clim/graph-formatting.lisp b/clim/graph-formatting.lisp
index 8439077142d4a2a58d9382ba82fbb56a1382f832..4bcaeaf9a19fe2ddfdd33de8cf34723254fd2750 100644
--- a/clim/graph-formatting.lisp
+++ b/clim/graph-formatting.lisp
@@ -1,6 +1,6 @@
 ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CLIM-INTERNALS; Base: 10; Lowercase: Yes -*-
 
-;; $fiHeader: graph-formatting.lisp,v 1.25 93/03/19 09:43:29 cer Exp $
+;; $fiHeader: graph-formatting.lisp,v 1.26 93/03/31 10:38:37 cer Exp $
 
 (in-package :clim-internals)
 
@@ -812,6 +812,7 @@ circular graphs without accounting for this case.
 		  (setf (generation-start-depth descr) depth-so-far)
 		  (incf depth-so-far (+ generation-separation (generation-depth descr))))
 		;; Determine breadth-spacing
+		(assert broadest-gen-descr)
 		(incf max-gen-breadth
 		      (* within-generation-separation (generation-size broadest-gen-descr)))
 		(loop for descr in generation-descriptors do
diff --git a/misc/xtsupport.c b/misc/xtsupport.c
index 617ff7370c65138701d927bc46280fb5d6e2c9a0..4710673b4437bfea82f1dabbe9f2c4b528a95b2f 100644
--- a/misc/xtsupport.c
+++ b/misc/xtsupport.c
@@ -1,7 +1,7 @@
-/* $fiHeader: xtsupport.c,v 1.2 93/03/01 14:26:21 cer Exp $ */
+/* $fiHeader: xtsupport.c,v 1.3 93/03/04 19:00:49 colin Exp $ */
 
 #ifdef sparc
-#include "/x11/R4/src/mit/lib/Xt/IntrinsicI.h"
+#include "IntrinsicI.h"
 #endif
 
 #ifdef ultrix
diff --git a/tk-silica/pkg.lisp b/tk-silica/pkg.lisp
index 9f4de630b9da75f0fbea3e4d056becc97bf3a265..414feff01e88c3836bfebfe6cd91d583dc47f496 100644
--- a/tk-silica/pkg.lisp
+++ b/tk-silica/pkg.lisp
@@ -18,11 +18,44 @@
 ;; 52.227-19 or DOD FAR Supplement 252.227-7013 (c) (1) (ii), as
 ;; applicable.
 ;;
-;; $fiHeader: pkg.lisp,v 1.7 92/07/27 19:30:23 cer Exp $
+;; $fiHeader: pkg.lisp,v 1.8 92/10/02 15:20:58 cer Exp $
 
 (defpackage tk-silica
   (:nicknames xm-silica xt-silica)
   (:use clim-lisp clim-utils clim silica tk)
-  (:import-from excl #:if*))
+  (:import-from excl #:if*)
+  (:export
+   ;; Motif 
+ 
+   #:motif-separator
+   #:motif-scroll-bar
+   #:motif-slider
+   #:motif-push-button
+   #:motif-label-pane
+   #:motif-text-field
+   #:motif-text-editor
+   #:motif-toggle-button
+   #:motif-menu-bar
+   #:motif-radio-box
+   #:motif-check-box
+   #:motif-frame-pane
+   #:motif-list-pane
+   #:motif-option-pane
+
+   ;; Openlook
+ 
+   #:openlook-scroll-bar
+   #:openlook-slider
+   #:openlook-push-button
+   #:openlook-label-pane
+   #:openlook-text-field
+   #:openlook-text-editor
+   #:openlook-toggle-button
+   #:openlook-menu-bar
+   #:openlook-radio-box
+   #:openlook-check-box
+   #:openlook-list-pane
+   #:openlook-option-pane
+   
+   ))
 
-  
diff --git a/utils/packages.lisp b/utils/packages.lisp
index f49a9343f99baea952b7ab1902a65eb48c068a60..fd9062be1ac8304b72b1c05bb8570324834d2fbb 100644
--- a/utils/packages.lisp
+++ b/utils/packages.lisp
@@ -1,6 +1,6 @@
 ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CL-USER; Base: 10; Lowercase: Yes -*-
 
-;; $fiHeader: packages.lisp,v 1.50 93/03/19 09:47:26 cer Exp $
+;; $fiHeader: packages.lisp,v 1.51 93/03/25 15:41:59 colin Exp $
 
 (in-package #-ANSI-90 :user #+ANSI-90 :common-lisp-user)
 
@@ -2851,9 +2851,12 @@
     gadget
     gadget-activate-callback
     gadget-active-p
+    gadget-alignment
     gadget-armed-callback
     gadget-client
+    gadget-columns
     gadget-disarmed-callback
+    gadget-editable-p
     gadget-id
     gadget-indicator-type
     gadget-label
@@ -2869,6 +2872,7 @@
     gadget-show-value-p
     gadget-value
     gadget-value-changed-callback
+    gadget-word-wrap
     gadgetp
     labelled-gadget-mixin
     list-pane
@@ -3406,16 +3410,12 @@
     frame-user-specified-position-p
     frame-user-specified-size-p
     frame-wrapper
-    gadget-alignment
-    gadget-columns
-    gadget-editable-p
     gadget-event
     gadget-focus-out-callback
     gadget-focus-in-callback
     gadget-lines
     gadget-supplied-scrolling
     gadget-visible-items
-    gadget-word-wrap
     generic-label-pane
     generic-list-pane
     generic-option-pane