diff -ur Gridlock/AppController.m Gridlock.alex/AppController.m
--- Gridlock/AppController.m	Mon Aug 26 07:00:30 2002
+++ Gridlock.alex/AppController.m	Thu Oct 17 22:49:00 2002
@@ -47,8 +47,6 @@
 
   [gc setAvailableGames:gameArray];
   [NSBundle loadNibNamed:@"GameWindow" owner:gc];
-  // UI needs to be slightly manually corrected for GNUstep
-  if ([gc respondsToSelector:@selector(fixGNUstepUI)]) [gc fixGNUstepUI];
 }
 
 -(BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)theApplication {
@@ -59,8 +57,6 @@
   if (!prefsController) {
     prefsController = [[PrefsWindowController alloc] init];
     [NSBundle loadNibNamed:@"PrefsWindow" owner:prefsController];
-    // UI needs to be slightly manually corrected for GNUstep
-    if ([prefsController respondsToSelector:@selector(fixGNUstepUI)]) [prefsController fixGNUstepUI];
   }
   [prefsController showWindow];
 }
diff -ur Gridlock/GameController.m Gridlock.alex/GameController.m
--- Gridlock/GameController.m	Sat Aug 31 19:23:30 2002
+++ Gridlock.alex/GameController.m	Thu Oct 17 22:49:31 2002
@@ -77,14 +77,15 @@
     player2TurnView = [[[PlayerTurnIndicatorView alloc] initWithFrame:p2Frame] autorelease];
     [[player1TurnView superview] addSubview:player2TurnView];
   }
-  
-  // owner doesn't have -awakeFromNib called 
-  [self awakeFromNib];
 }
 #endif
 
 -(void)awakeFromNib {
   [self retain];
+
+#ifdef GNUSTEP
+  [self fixGNUstepUI];
+#endif
   
   // retain configuration label and popup because they might be removed from the view
   [configurationLabel retain];
Only in Gridlock: Gridlock.app
diff -ur Gridlock/PrefsWindowController.m Gridlock.alex/PrefsWindowController.m
--- Gridlock/PrefsWindowController.m	Sat Aug 31 18:32:11 2002
+++ Gridlock.alex/PrefsWindowController.m	Thu Oct 17 22:49:56 2002
@@ -51,13 +51,13 @@
   }
   [imageRadioButton setButtonType:NSRadioButton];
   [colorRadioButton setButtonType:NSRadioButton];
-  
-  [self awakeFromNib];
 }
 #endif
 
 -(void)awakeFromNib {
-  
+#ifdef GNUSTEP
+  [self fixGNUstepUI];
+#endif
   radioGroup = [[NSArray alloc] initWithObjects:imageRadioButton,colorRadioButton,nil];
   imageDefinitions = [[NSArray alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"PieceImages" ofType:@"plist"]];
   [self buildImagePopups];
diff -ur Gridlock/hypergrid.h Gridlock.alex/hypergrid.h
--- Gridlock/hypergrid.h	Mon Aug 26 07:00:40 2002
+++ Gridlock.alex/hypergrid.h	Thu Oct 17 22:11:33 2002
@@ -95,4 +95,4 @@
 
 // debugging...
 
-void hypergrid_debug_coords(hypergrid *gridptr, int *coords);
\ No newline at end of file
+void hypergrid_debug_coords(hypergrid *gridptr, int *coords);