diff --git a/Documentation/ChangeLog b/Documentation/ChangeLog
index 2c1dd9f..fece4be 100644
--- a/Documentation/ChangeLog
+++ b/Documentation/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-14 Serg Stoyan <stoyan255@ukr.net>
+
+	* Fixed interface (*.gorm) files wrt to latest GORM changes.
+
 2004-07-22 Serg Stoyan <stoyan255@ukr.net>
 
 	* Library/PCButton.m: Rewritten tooltips code. Almost ready for 
@@ -6,15 +10,9 @@
 	* Library/PCProjectBuilder.m: Use new tooltip code and remove old
 	style code.
 	* Library/PCProjectLauncher.m: ditto.
-	* Library/PCProjectWindow.m: ditto. Editor button replaced with
-	Loaded Files button.
-	* Library/PCProjectInspector.m: Remove textfields linking programmatically 
-	and make it using GORM. Fix applying changes to textfields.
+	* Library/PCProjectWindow.m: ditto.
 	
-	* Images/ButtonTile.tiff: removed.
-	* Images/Editor.tiff: removed.
-	
-	* Update all gorm files with the latest GORM version.
+	*Images/ButtonTile.tiff: removed.
 	
 2004-07-15 Serg Stoyan <stoyan255@ukr.net>
 
diff --git a/GNUmakefile b/GNUmakefile
index d432b14..efe6930 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -48,6 +48,7 @@ Images/MultiFiles.tiff \
 Images/Options.tiff \
 Images/Run.tiff \
 Images/Stop.tiff \
+Images/Editor.tiff \
 Images/ProjectCenter_add.tiff \
 Images/ProjectCenter_cvs.tiff \
 Images/ProjectCenter_dist.tiff \
diff --git a/Library/PCButton.m b/Library/PCButton.m
index ee549e0..5e81134 100644
--- a/Library/PCButton.m
+++ b/Library/PCButton.m
@@ -251,6 +251,7 @@
   [ttWindow setFrameOrigin:origin];
 }
 
+// NSView methods
 - (NSToolTipTag)addToolTipRect:(NSRect)aRect
                          owner:(id)anObject
                       userData:(void *)data
@@ -279,12 +280,6 @@
   return tag;
 }
    
-- (void)removeToolTip:(NSToolTipTag)tag
-{
-  [self removeTrackingRect:tag];
-//  [toolTips removeObjectForKey:[NSNumber numberWithInt:tag]];
-}
-                              
 - (void)removeAllToolTips
 {
   int               i, j;
@@ -309,12 +304,18 @@
   _hasTooltips = NO;
 }
    
+- (void)removeToolTip:(NSToolTipTag)tag
+{
+  [self removeTrackingRect:tag];
+//  [toolTips removeObjectForKey:[NSNumber numberWithInt:tag]];
+}
+                              
 - (void)setToolTip:(NSString *)string
 {
   NSTrackingRectTag tag;
   NSRect            rect;
   
-  if (string == nil) // Remove tooltip
+  if (string == nil) // Remove old tooltip
     {
       if (_hasTooltips)
 	{
diff --git a/Library/PCProjectInspector.m b/Library/PCProjectInspector.m
index cca5e35..4862145 100644
--- a/Library/PCProjectInspector.m
+++ b/Library/PCProjectInspector.m
@@ -306,11 +306,6 @@
 // ==== Notifications
 // ============================================================================
 
-- (void)controlTextDidEndEditing:(NSNotification *)aNotification
-{
-  [self changeCommonProjectEntry:[aNotification object]];
-}
-
 - (void)activeProjectDidChange:(NSNotification *)aNotif
 {
   PCProject *rootProject = [projectManager rootActiveProject];
@@ -435,6 +430,13 @@
   // Buttons
   [self setSearchOrderButtonsState];
 
+  [cppOptField setNextText:objcOptField];
+  [objcOptField setNextText:cOptField];
+  [cOptField setNextText:ldOptField];
+  [ldOptField setNextText:installPathField];
+  [installPathField setNextText:toolField];
+  [toolField setNextText:cppOptField];
+  
   // Retain view
   [buildAttributesView retain];
 }
@@ -592,7 +594,13 @@
   [authorDown setRefusesFirstResponder:YES];
   [authorDown setImage: [NSImage imageNamed:@"common_ArrowDown"]];
 
-  // Retain view
+  // Link textfields
+  [descriptionField setNextText:releaseField];
+  [releaseField setNextText:licenseField];
+  [licenseField setNextText:licDescriptionField];
+  [licDescriptionField setNextText:urlField];
+  [urlField setNextText:descriptionField];
+
   [projectDescriptionView retain];
 }
 
diff --git a/Library/Resources/ProjectInspector.gorm/data.info b/Library/Resources/ProjectInspector.gorm/data.info
index 800a444..27a8774 100644
Binary files a/Library/Resources/ProjectInspector.gorm/data.info and b/Library/Resources/ProjectInspector.gorm/data.info differ
diff --git a/Library/Resources/ProjectInspector.gorm/objects.gorm b/Library/Resources/ProjectInspector.gorm/objects.gorm
index 6f6bd47..b7b1bba 100644
Binary files a/Library/Resources/ProjectInspector.gorm/objects.gorm and b/Library/Resources/ProjectInspector.gorm/objects.gorm differ
diff --git a/Resources/Preferences.gorm/data.info b/Resources/Preferences.gorm/data.info
index 800a444..27a8774 100644
Binary files a/Resources/Preferences.gorm/data.info and b/Resources/Preferences.gorm/data.info differ
diff --git a/Resources/Preferences.gorm/objects.gorm b/Resources/Preferences.gorm/objects.gorm
index a762fa9..e8fcd1e 100644
Binary files a/Resources/Preferences.gorm/objects.gorm and b/Resources/Preferences.gorm/objects.gorm differ