Index: trunk/Ohana/src/kapa/setup/SetUpWindow.c
===================================================================
--- trunk/Ohana/src/kapa/setup/SetUpWindow.c	(revision 5612)
+++ trunk/Ohana/src/kapa/setup/SetUpWindow.c	(revision 5852)
@@ -5,6 +5,7 @@
 void SetUpWindow (int *argc, char **argv) {
 
-  int N;
   Icon icon;
+  char *name;
+  int Ncolors;
 
   icon.width = icon_width;
@@ -21,8 +22,15 @@
   SetNormalHints ();
   SetWMHints (&icon);
-  NameWindow ("Kapa");
 
-  MakeColormap (*argc, argv);  /* move to SetUpWindow? */
+  if (NAME_WINDOW == NULL) {
+    NameWindow ("Kapa");
+  } else {
+    ALLOCATE (name, char, strlen(NAME_WINDOW) + 10);
+    sprintf (name, "Kapa %s", NAME_WINDOW);
+    NameWindow (name);
+    free (name);
+  }
 
+  graphic.color = KapaX11colors (graphic.display, graphic.colormap, graphic.fore, &Ncolors);
   if (MAP_WINDOW) MapWindow (graphic);
   return;