diff --git a/ChangeLog b/ChangeLog
index 966a156e..4a6b47c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-06-30 00:21 Gregory John Casamento <greg_casamento@yahoo.com>
+
+	* English.lproj/GormPrefGeneral.gorm: Remove the preferences
+	to manually change if the inspector or palette is shown.
+	* Gorm.m: -[Gorm applicationWillTerminate:] added code to
+	save the inspector and palette state.
+
 2005-06-20 20:11 Gregory John Casamento <greg_casamento@yahoo.com>
 
 	* GNUmakefile.preamble: Remove dependency on GL.
diff --git a/English.lproj/GormPrefGeneral.gorm/data.info b/English.lproj/GormPrefGeneral.gorm/data.info
index 116d972c..e4eb27a4 100644
Binary files a/English.lproj/GormPrefGeneral.gorm/data.info and b/English.lproj/GormPrefGeneral.gorm/data.info differ
diff --git a/English.lproj/GormPrefGeneral.gorm/objects.gorm b/English.lproj/GormPrefGeneral.gorm/objects.gorm
index cdcce861..9f363a80 100644
Binary files a/English.lproj/GormPrefGeneral.gorm/objects.gorm and b/English.lproj/GormPrefGeneral.gorm/objects.gorm differ
diff --git a/Gorm.m b/Gorm.m
index 7d359381..d7e28275 100644
--- a/Gorm.m
+++ b/Gorm.m
@@ -212,12 +212,12 @@
 
 - (void) applicationWillTerminate: (NSApplication*)sender
 {
-//   [[NSUserDefaults standardUserDefaults] 
-//     setBool: [[[self inspectorsManager] panel] isVisible]
-//     forKey: @"ShowInspectors"];
-//   [[NSUserDefaults standardUserDefaults] 
-//     setBool: [[[self palettesManager] panel] isVisible]
-//     forKey: @"ShowPalettes"];
+  [[NSUserDefaults standardUserDefaults] 
+    setBool: [[[self inspectorsManager] panel] isVisible]
+    forKey: @"ShowInspectors"];
+  [[NSUserDefaults standardUserDefaults] 
+    setBool: [[[self palettesManager] panel] isVisible]
+    forKey: @"ShowPalettes"];
 }
 
 - (BOOL) applicationShouldTerminate: (NSApplication*)sender