Regenerated with the new way to get terminology (through AppleEvents),
which sometimes seems to result in different terminology. It does
seem to be mostly compatible, though.
diff --git a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/__init__.py b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/__init__.py
index 06a3485..607b1c3 100644
--- a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/__init__.py
@@ -1,6 +1,5 @@
 """
 Package generated from /Volumes/Moes/Applications (Mac OS 9)/Metrowerks CodeWarrior 7.0/Metrowerks CodeWarrior/CodeWarrior IDE 4.2.6
-Resource aete resid 0 AppleEvent Suites
 """
 import aetools
 Error = aetools.Error
@@ -57,23 +56,6 @@
 getbaseclasses(application)
 getbaseclasses(insertion_point)
 getbaseclasses(document)
-getbaseclasses(single_class_browser)
-getbaseclasses(project_document)
-getbaseclasses(symbol_browser)
-getbaseclasses(editor_document)
-getbaseclasses(file_compare_document)
-getbaseclasses(class_browser)
-getbaseclasses(subtarget)
-getbaseclasses(message_document)
-getbaseclasses(project_inspector)
-getbaseclasses(text_document)
-getbaseclasses(catalog_document)
-getbaseclasses(class_hierarchy)
-getbaseclasses(target)
-getbaseclasses(build_progress_document)
-getbaseclasses(target_file)
-getbaseclasses(ToolServer_worksheet)
-getbaseclasses(single_class_hierarchy)
 getbaseclasses(File_Mapping)
 getbaseclasses(browser_catalog)
 getbaseclasses(Build_Settings)
@@ -110,6 +92,23 @@
 getbaseclasses(Target_Source_Trees)
 getbaseclasses(Debugger_Display)
 getbaseclasses(class_)
+getbaseclasses(single_class_browser)
+getbaseclasses(project_document)
+getbaseclasses(symbol_browser)
+getbaseclasses(editor_document)
+getbaseclasses(file_compare_document)
+getbaseclasses(class_browser)
+getbaseclasses(subtarget)
+getbaseclasses(message_document)
+getbaseclasses(project_inspector)
+getbaseclasses(text_document)
+getbaseclasses(catalog_document)
+getbaseclasses(class_hierarchy)
+getbaseclasses(target)
+getbaseclasses(build_progress_document)
+getbaseclasses(target_file)
+getbaseclasses(ToolServer_worksheet)
+getbaseclasses(single_class_hierarchy)
 
 #
 # Indices of types declared in this module
@@ -124,23 +123,6 @@
 	'capp' : application,
 	'cins' : insertion_point,
 	'docu' : document,
-	'1BRW' : single_class_browser,
-	'PRJD' : project_document,
-	'SYMB' : symbol_browser,
-	'EDIT' : editor_document,
-	'COMP' : file_compare_document,
-	'BROW' : class_browser,
-	'SBTG' : subtarget,
-	'MSSG' : message_document,
-	'INSP' : project_inspector,
-	'TXTD' : text_document,
-	'CTLG' : catalog_document,
-	'HIER' : class_hierarchy,
-	'TRGT' : target,
-	'PRGS' : build_progress_document,
-	'SRCF' : target_file,
-	'TOOL' : ToolServer_worksheet,
-	'1HIR' : single_class_hierarchy,
 	'FMap' : File_Mapping,
 	'Cata' : browser_catalog,
 	'BSTG' : Build_Settings,
@@ -177,6 +159,23 @@
 	'TSTs' : Target_Source_Trees,
 	'DbDS' : Debugger_Display,
 	'Clas' : class_,
+	'1BRW' : single_class_browser,
+	'PRJD' : project_document,
+	'SYMB' : symbol_browser,
+	'EDIT' : editor_document,
+	'COMP' : file_compare_document,
+	'BROW' : class_browser,
+	'SBTG' : subtarget,
+	'MSSG' : message_document,
+	'INSP' : project_inspector,
+	'TXTD' : text_document,
+	'CTLG' : catalog_document,
+	'HIER' : class_hierarchy,
+	'TRGT' : target,
+	'PRGS' : build_progress_document,
+	'SRCF' : target_file,
+	'TOOL' : ToolServer_worksheet,
+	'1HIR' : single_class_hierarchy,
 }
 
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Explorer/Microsoft_Internet_Explorer.py b/Lib/plat-mac/lib-scriptpackages/Explorer/Microsoft_Internet_Explorer.py
index 3488abb..9ee1691 100644
--- a/Lib/plat-mac/lib-scriptpackages/Explorer/Microsoft_Internet_Explorer.py
+++ b/Lib/plat-mac/lib-scriptpackages/Explorer/Microsoft_Internet_Explorer.py
@@ -1,7 +1,7 @@
 """Suite Microsoft Internet Explorer Suite: Events defined by Internet Explorer
 Level 1, version 1
 
-Generated from /Volumes/Moes/Applications (Mac OS 9)/Internet Explorer 5/Internet Explorer
+Generated from /Applications/Internet Explorer.app
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Explorer/Netscape_Suite.py b/Lib/plat-mac/lib-scriptpackages/Explorer/Netscape_Suite.py
index 1062cd1..45b11c6 100644
--- a/Lib/plat-mac/lib-scriptpackages/Explorer/Netscape_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Explorer/Netscape_Suite.py
@@ -1,7 +1,7 @@
 """Suite Netscape Suite: Events defined by Netscape
 Level 1, version 1
 
-Generated from /Volumes/Moes/Applications (Mac OS 9)/Internet Explorer 5/Internet Explorer
+Generated from /Applications/Internet Explorer.app
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Explorer/Required_Suite.py b/Lib/plat-mac/lib-scriptpackages/Explorer/Required_Suite.py
index 0d15049..83f1851 100644
--- a/Lib/plat-mac/lib-scriptpackages/Explorer/Required_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Explorer/Required_Suite.py
@@ -1,7 +1,7 @@
 """Suite Required Suite: Events that every application should support
 Level 1, version 1
 
-Generated from /Volumes/Moes/Applications (Mac OS 9)/Internet Explorer 5/Internet Explorer
+Generated from /Applications/Internet Explorer.app
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Explorer/Standard_Suite.py b/Lib/plat-mac/lib-scriptpackages/Explorer/Standard_Suite.py
index 7c275d3..9dee0e9 100644
--- a/Lib/plat-mac/lib-scriptpackages/Explorer/Standard_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Explorer/Standard_Suite.py
@@ -1,7 +1,7 @@
 """Suite Standard Suite: Common terms for most applications
 Level 1, version 1
 
-Generated from /Volumes/Moes/Applications (Mac OS 9)/Internet Explorer 5/Internet Explorer
+Generated from /Applications/Internet Explorer.app
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Explorer/URL_Suite.py b/Lib/plat-mac/lib-scriptpackages/Explorer/URL_Suite.py
index 7635270..c3e8c44 100644
--- a/Lib/plat-mac/lib-scriptpackages/Explorer/URL_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Explorer/URL_Suite.py
@@ -1,7 +1,7 @@
 """Suite URL Suite: Standard suite for Uniform Resource Locators
 Level 1, version 1
 
-Generated from /Volumes/Moes/Applications (Mac OS 9)/Internet Explorer 5/Internet Explorer
+Generated from /Applications/Internet Explorer.app
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Explorer/Web_Browser_Suite.py b/Lib/plat-mac/lib-scriptpackages/Explorer/Web_Browser_Suite.py
index 9392e08..d4241b4 100644
--- a/Lib/plat-mac/lib-scriptpackages/Explorer/Web_Browser_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Explorer/Web_Browser_Suite.py
@@ -1,7 +1,7 @@
 """Suite Web Browser Suite: Class of events supported by Web Browser applications
 Level 1, version 1
 
-Generated from /Volumes/Moes/Applications (Mac OS 9)/Internet Explorer 5/Internet Explorer
+Generated from /Applications/Internet Explorer.app
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Explorer/__init__.py b/Lib/plat-mac/lib-scriptpackages/Explorer/__init__.py
index ed805e2..3fac0f82 100644
--- a/Lib/plat-mac/lib-scriptpackages/Explorer/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/Explorer/__init__.py
@@ -1,6 +1,5 @@
 """
-Package generated from /Volumes/Moes/Applications (Mac OS 9)/Internet Explorer 5/Internet Explorer
-Resource aete resid 0 
+Package generated from /Applications/Internet Explorer.app
 """
 import aetools
 Error = aetools.Error
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Containers_and_folders.py b/Lib/plat-mac/lib-scriptpackages/Finder/Containers_and_folders.py
index f599298..94218fa 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Containers_and_folders.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Containers_and_folders.py
@@ -1,7 +1,7 @@
 """Suite Containers and folders: Classes that can contain other file system items
 Level 1, version 1
 
-Generated from /Volumes/Moes/Systeemmap/Finder
+Generated from /System/Library/CoreServices/Finder.app
 AETE/AEUT resource version 0/144, language 0, script 0
 """
 
@@ -23,64 +23,41 @@
 	which = 'c@#^'
 	want = 'cobj'
 class completely_expanded(aetools.NProperty):
-	"""completely expanded - Are the container and all of its children opened as outlines? (can only be set for containers viewed as lists) """
+	"""completely expanded - (NOT AVAILABLE YET) Are the container and all of its children opened as outlines? (can only be set for containers viewed as lists) """
 	which = 'pexc'
 	want = 'bool'
+class container_window(aetools.NProperty):
+	"""container window - the container window for this folder """
+	which = 'cwnd'
+	want = 'obj '
 class entire_contents(aetools.NProperty):
 	"""entire contents - the entire contents of the container, including the contents of its children """
 	which = 'ects'
 	want = 'obj '
 class expandable(aetools.NProperty):
-	"""expandable - Is the container capable of being expanded as an outline? """
+	"""expandable - (NOT AVAILABLE YET) Is the container capable of being expanded as an outline? """
 	which = 'pexa'
 	want = 'bool'
 class expanded(aetools.NProperty):
-	"""expanded - Is the container opened as an outline? (can only be set for containers viewed as lists) """
+	"""expanded - (NOT AVAILABLE YET) Is the container opened as an outline? (can only be set for containers viewed as lists) """
 	which = 'pexp'
 	want = 'bool'
-class icon_size(aetools.NProperty):
-	"""icon size - ... alternatively, you can specify the icons size as a constant """
-	which = 'lvis'
-	want = 'isiz'
-class selection(aetools.NProperty):
-	"""selection - the selection visible to the user """
-	which = 'sele'
-	want = 'obj '
-class view_options_window(aetools.NProperty):
-	"""view options window - the view options window for the container (can only be opened when the container window is open) """
-	which = 'vwnd'
-	want = 'vwnd'
 #        element 'alia' as ['indx', 'name']
 #        element 'appf' as ['indx', 'name', 'ID  ']
 #        element 'cfol' as ['indx', 'name', 'ID  ']
 #        element 'clpf' as ['indx', 'name']
 #        element 'cobj' as ['indx', 'name']
 #        element 'ctnr' as ['indx', 'name']
-#        element 'dafi' as ['indx', 'name']
 #        element 'docf' as ['indx', 'name']
-#        element 'dsut' as ['indx', 'name']
 #        element 'file' as ['indx', 'name']
-#        element 'fntf' as ['indx', 'name']
-#        element 'fsut' as ['indx', 'name']
 #        element 'inlf' as ['indx', 'name']
 #        element 'pack' as ['indx', 'name']
-#        element 'sctr' as ['indx', 'name']
-#        element 'sndf' as ['indx', 'name']
-#        element 'stcs' as ['indx', 'name']
 
 containers = container
 
 class desktop_2d_object(aetools.ComponentItem):
 	"""desktop-object - Desktop-object is the class of the \xd2desktop\xd3 object """
 	want = 'cdsk'
-class startup_disk(aetools.NProperty):
-	"""startup disk - the startup disk """
-	which = 'sdsk'
-	want = 'cdis'
-class trash(aetools.NProperty):
-	"""trash - the trash """
-	which = 'trsh'
-	want = 'ctrs'
 #        element 'alia' as ['indx', 'name']
 #        element 'appf' as ['indx', 'name', 'ID  ']
 #        element 'cdis' as ['indx', 'name']
@@ -88,17 +65,10 @@
 #        element 'clpf' as ['indx', 'name']
 #        element 'cobj' as ['indx', 'name']
 #        element 'ctnr' as ['indx', 'name']
-#        element 'dafi' as ['indx', 'name']
 #        element 'docf' as ['indx', 'name']
-#        element 'dsut' as ['indx', 'name']
 #        element 'file' as ['indx', 'name']
-#        element 'fntf' as ['indx', 'name']
-#        element 'fsut' as ['indx', 'name']
 #        element 'inlf' as ['indx', 'name']
 #        element 'pack' as ['indx', 'name']
-#        element 'sctr' as ['indx', 'name']
-#        element 'sndf' as ['indx', 'name']
-#        element 'stcs' as ['indx', 'name']
 
 class disk(aetools.ComponentItem):
 	"""disk - A disk """
@@ -106,15 +76,23 @@
 class capacity(aetools.NProperty):
 	"""capacity - the total number of bytes (free or used) on the disk """
 	which = 'capa'
-	want = 'long'
+	want = 'comp'
 class ejectable(aetools.NProperty):
 	"""ejectable - Can the media be ejected (floppies, CD's, and so on)? """
 	which = 'isej'
 	want = 'bool'
+class format(aetools.NProperty):
+	"""format - the filesystem format of this disk """
+	which = 'dfmt'
+	want = 'edfm'
 class free_space(aetools.NProperty):
 	"""free space - the number of free bytes left on the disk """
 	which = 'frsp'
-	want = 'long'
+	want = 'comp'
+class ignore_privileges(aetools.NProperty):
+	"""ignore privileges - Ignore permissions on this disk? """
+	which = 'igpr'
+	want = 'bool'
 class local_volume(aetools.NProperty):
 	"""local volume - Is the media a local volume (as opposed to a file server)? """
 	which = 'isrv'
@@ -129,17 +107,10 @@
 #        element 'clpf' as ['indx', 'name']
 #        element 'cobj' as ['indx', 'name']
 #        element 'ctnr' as ['indx', 'name']
-#        element 'dafi' as ['indx', 'name']
 #        element 'docf' as ['indx', 'name']
-#        element 'dsut' as ['indx', 'name']
 #        element 'file' as ['indx', 'name']
-#        element 'fntf' as ['indx', 'name']
-#        element 'fsut' as ['indx', 'name']
 #        element 'inlf' as ['indx', 'name']
 #        element 'pack' as ['indx', 'name']
-#        element 'sctr' as ['indx', 'name']
-#        element 'sndf' as ['indx', 'name']
-#        element 'stcs' as ['indx', 'name']
 
 disks = disk
 
@@ -152,99 +123,13 @@
 #        element 'clpf' as ['indx', 'name']
 #        element 'cobj' as ['indx', 'name']
 #        element 'ctnr' as ['indx', 'name']
-#        element 'dafi' as ['indx', 'name']
 #        element 'docf' as ['indx', 'name']
-#        element 'dsut' as ['indx', 'name']
 #        element 'file' as ['indx', 'name']
-#        element 'fntf' as ['indx', 'name']
-#        element 'fsut' as ['indx', 'name']
 #        element 'inlf' as ['indx', 'name']
 #        element 'pack' as ['indx', 'name']
-#        element 'sctr' as ['indx', 'name']
-#        element 'sndf' as ['indx', 'name']
-#        element 'stcs' as ['indx', 'name']
 
 folders = folder
 
-class sharable_container(aetools.ComponentItem):
-	"""sharable container - A container that may be shared (disks and folders) """
-	want = 'sctr'
-class exported(aetools.NProperty):
-	"""exported - Is the container a share point or inside a share point, i.e., can the container be shared? (file sharing must be on to use this property) """
-	which = 'sexp'
-	want = 'bool'
-class group(aetools.NProperty):
-	"""group - the user or group that has special access to the container (file sharing must be on to use this property) """
-	which = 'sgrp'
-	want = 'itxt'
-class group_privileges(aetools.NProperty):
-	"""group privileges - the see folders/see files/make changes privileges for the group (file sharing must be on to use this property) """
-	which = 'gppr'
-	want = 'priv'
-class guest_privileges(aetools.NProperty):
-	"""guest privileges - the see folders/see files/make changes privileges for everyone (file sharing must be on to use this property) """
-	which = 'gstp'
-	want = 'priv'
-class mounted(aetools.NProperty):
-	"""mounted - Is the container mounted on another machine's desktop? (file sharing must be on to use this property) """
-	which = 'smou'
-	want = 'bool'
-class owner(aetools.NProperty):
-	"""owner - the user that owns the container (file sharing must be on to use this property) """
-	which = 'sown'
-	want = 'itxt'
-class owner_privileges(aetools.NProperty):
-	"""owner privileges - the see folders/see files/make changes privileges for the owner (file sharing must be on to use this property) """
-	which = 'ownr'
-	want = 'priv'
-class privileges_inherited(aetools.NProperty):
-	"""privileges inherited - Are the privileges of the container always the same as the container in which it is stored? (file sharing must be on to use this property) """
-	which = 'iprv'
-	want = 'bool'
-class protected(aetools.NProperty):
-	"""protected - Is the container protected from being moved, renamed and deleted? (file sharing must be on to use this property) """
-	which = 'spro'
-	want = 'bool'
-class shared(aetools.NProperty):
-	"""shared - Is the container a share point, i.e., is the container currently being shared? (file sharing must be on to use this property) """
-	which = 'shar'
-	want = 'bool'
-#        element 'alia' as ['indx', 'name']
-#        element 'appf' as ['indx', 'name', 'ID  ']
-#        element 'cfol' as ['indx', 'name', 'ID  ']
-#        element 'clpf' as ['indx', 'name']
-#        element 'cobj' as ['indx', 'name']
-#        element 'ctnr' as ['indx', 'name']
-#        element 'dafi' as ['indx', 'name']
-#        element 'docf' as ['indx', 'name']
-#        element 'dsut' as ['indx', 'name']
-#        element 'file' as ['indx', 'name']
-#        element 'fntf' as ['indx', 'name']
-#        element 'fsut' as ['indx', 'name']
-#        element 'inlf' as ['indx', 'name']
-#        element 'pack' as ['indx', 'name']
-#        element 'sctr' as ['indx', 'name']
-#        element 'sndf' as ['indx', 'name']
-#        element 'stcs' as ['indx', 'name']
-
-sharable_containers = sharable_container
-
-class sharing_privileges(aetools.ComponentItem):
-	"""sharing privileges - A set of sharing properties (used in sharable containers) """
-	want = 'priv'
-class make_changes(aetools.NProperty):
-	"""make changes - Can changes be made? """
-	which = 'prvw'
-	want = 'bool'
-class see_files(aetools.NProperty):
-	"""see files - Can files be seen? """
-	which = 'prvr'
-	want = 'bool'
-class see_folders(aetools.NProperty):
-	"""see folders - Can folders be seen? """
-	which = 'prvs'
-	want = 'bool'
-
 class trash_2d_object(aetools.ComponentItem):
 	"""trash-object - Trash-object is the class of the \xd2trash\xd3 object """
 	want = 'ctrs'
@@ -258,167 +143,88 @@
 #        element 'clpf' as ['indx', 'name']
 #        element 'cobj' as ['indx', 'name']
 #        element 'ctnr' as ['indx', 'name']
-#        element 'dafi' as ['indx', 'name']
 #        element 'docf' as ['indx', 'name']
-#        element 'dsut' as ['indx', 'name']
 #        element 'file' as ['indx', 'name']
-#        element 'fntf' as ['indx', 'name']
-#        element 'fsut' as ['indx', 'name']
 #        element 'inlf' as ['indx', 'name']
 #        element 'pack' as ['indx', 'name']
-#        element 'sctr' as ['indx', 'name']
-#        element 'sndf' as ['indx', 'name']
-#        element 'stcs' as ['indx', 'name']
-import Earlier_terms
+import Finder_items
 container._superclassnames = ['item']
-import Files_and_suitcases
+import Files
 container._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
 	'completely_expanded' : completely_expanded,
+	'container_window' : container_window,
 	'entire_contents' : entire_contents,
 	'expandable' : expandable,
 	'expanded' : expanded,
-	'icon_size' : icon_size,
-	'icon_size' : icon_size,
-	'selection' : selection,
-	'view_options_window' : view_options_window,
 }
 container._privelemdict = {
-	'accessory_suitcase' : Earlier_terms.accessory_suitcase,
-	'alias_file' : Files_and_suitcases.alias_file,
-	'application_file' : Earlier_terms.application_file,
-	'clipping' : Files_and_suitcases.clipping,
+	'alias_file' : Files.alias_file,
+	'application_file' : Files.application_file,
+	'clipping' : Files.clipping,
 	'container' : container,
-	'desk_accessory_file' : Files_and_suitcases.desk_accessory_file,
-	'document_file' : Files_and_suitcases.document_file,
-	'file' : Files_and_suitcases.file,
+	'document_file' : Files.document_file,
+	'file' : Files.file,
 	'folder' : folder,
-	'font_file' : Files_and_suitcases.font_file,
-	'font_suitcase' : Files_and_suitcases.font_suitcase,
-	'internet_location' : Earlier_terms.internet_location,
-	'item' : Earlier_terms.item,
-	'package' : Files_and_suitcases.package,
-	'sharable_container' : sharable_container,
-	'sound_file' : Files_and_suitcases.sound_file,
-	'suitcase' : Files_and_suitcases.suitcase,
+	'internet_location_file' : Files.internet_location_file,
+	'item' : Finder_items.item,
+	'package' : Files.package,
 }
 desktop_2d_object._superclassnames = ['container']
 desktop_2d_object._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'startup_disk' : startup_disk,
-	'trash' : trash,
 }
 desktop_2d_object._privelemdict = {
-	'accessory_suitcase' : Earlier_terms.accessory_suitcase,
-	'alias_file' : Files_and_suitcases.alias_file,
-	'application_file' : Earlier_terms.application_file,
-	'clipping' : Files_and_suitcases.clipping,
+	'alias_file' : Files.alias_file,
+	'application_file' : Files.application_file,
+	'clipping' : Files.clipping,
 	'container' : container,
-	'desk_accessory_file' : Files_and_suitcases.desk_accessory_file,
 	'disk' : disk,
-	'document_file' : Files_and_suitcases.document_file,
-	'file' : Files_and_suitcases.file,
+	'document_file' : Files.document_file,
+	'file' : Files.file,
 	'folder' : folder,
-	'font_file' : Files_and_suitcases.font_file,
-	'font_suitcase' : Files_and_suitcases.font_suitcase,
-	'internet_location' : Earlier_terms.internet_location,
-	'item' : Earlier_terms.item,
-	'package' : Files_and_suitcases.package,
-	'sharable_container' : sharable_container,
-	'sound_file' : Files_and_suitcases.sound_file,
-	'suitcase' : Files_and_suitcases.suitcase,
+	'internet_location_file' : Files.internet_location_file,
+	'item' : Finder_items.item,
+	'package' : Files.package,
 }
-disk._superclassnames = ['sharable_container']
+disk._superclassnames = ['container']
 disk._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
 	'capacity' : capacity,
 	'ejectable' : ejectable,
+	'format' : format,
 	'free_space' : free_space,
+	'ignore_privileges' : ignore_privileges,
 	'local_volume' : local_volume,
 	'startup' : startup,
 }
 disk._privelemdict = {
-	'accessory_suitcase' : Earlier_terms.accessory_suitcase,
-	'alias_file' : Files_and_suitcases.alias_file,
-	'application_file' : Earlier_terms.application_file,
-	'clipping' : Files_and_suitcases.clipping,
+	'alias_file' : Files.alias_file,
+	'application_file' : Files.application_file,
+	'clipping' : Files.clipping,
 	'container' : container,
-	'desk_accessory_file' : Files_and_suitcases.desk_accessory_file,
-	'document_file' : Files_and_suitcases.document_file,
-	'file' : Files_and_suitcases.file,
+	'document_file' : Files.document_file,
+	'file' : Files.file,
 	'folder' : folder,
-	'font_file' : Files_and_suitcases.font_file,
-	'font_suitcase' : Files_and_suitcases.font_suitcase,
-	'internet_location' : Earlier_terms.internet_location,
-	'item' : Earlier_terms.item,
-	'package' : Files_and_suitcases.package,
-	'sharable_container' : sharable_container,
-	'sound_file' : Files_and_suitcases.sound_file,
-	'suitcase' : Files_and_suitcases.suitcase,
+	'internet_location_file' : Files.internet_location_file,
+	'item' : Finder_items.item,
+	'package' : Files.package,
 }
-folder._superclassnames = ['sharable_container']
+folder._superclassnames = ['container']
 folder._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
 }
 folder._privelemdict = {
-	'accessory_suitcase' : Earlier_terms.accessory_suitcase,
-	'alias_file' : Files_and_suitcases.alias_file,
-	'application_file' : Earlier_terms.application_file,
-	'clipping' : Files_and_suitcases.clipping,
+	'alias_file' : Files.alias_file,
+	'application_file' : Files.application_file,
+	'clipping' : Files.clipping,
 	'container' : container,
-	'desk_accessory_file' : Files_and_suitcases.desk_accessory_file,
-	'document_file' : Files_and_suitcases.document_file,
-	'file' : Files_and_suitcases.file,
+	'document_file' : Files.document_file,
+	'file' : Files.file,
 	'folder' : folder,
-	'font_file' : Files_and_suitcases.font_file,
-	'font_suitcase' : Files_and_suitcases.font_suitcase,
-	'internet_location' : Earlier_terms.internet_location,
-	'item' : Earlier_terms.item,
-	'package' : Files_and_suitcases.package,
-	'sharable_container' : sharable_container,
-	'sound_file' : Files_and_suitcases.sound_file,
-	'suitcase' : Files_and_suitcases.suitcase,
-}
-sharable_container._superclassnames = ['container']
-sharable_container._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'exported' : exported,
-	'group' : group,
-	'group_privileges' : group_privileges,
-	'guest_privileges' : guest_privileges,
-	'mounted' : mounted,
-	'owner' : owner,
-	'owner_privileges' : owner_privileges,
-	'privileges_inherited' : privileges_inherited,
-	'protected' : protected,
-	'shared' : shared,
-}
-sharable_container._privelemdict = {
-	'accessory_suitcase' : Earlier_terms.accessory_suitcase,
-	'alias_file' : Files_and_suitcases.alias_file,
-	'application_file' : Earlier_terms.application_file,
-	'clipping' : Files_and_suitcases.clipping,
-	'container' : container,
-	'desk_accessory_file' : Files_and_suitcases.desk_accessory_file,
-	'document_file' : Files_and_suitcases.document_file,
-	'file' : Files_and_suitcases.file,
-	'folder' : folder,
-	'font_file' : Files_and_suitcases.font_file,
-	'font_suitcase' : Files_and_suitcases.font_suitcase,
-	'internet_location' : Earlier_terms.internet_location,
-	'item' : Earlier_terms.item,
-	'package' : Files_and_suitcases.package,
-	'sharable_container' : sharable_container,
-	'sound_file' : Files_and_suitcases.sound_file,
-	'suitcase' : Files_and_suitcases.suitcase,
-}
-sharing_privileges._superclassnames = []
-sharing_privileges._privpropdict = {
-	'make_changes' : make_changes,
-	'see_files' : see_files,
-	'see_folders' : see_folders,
-}
-sharing_privileges._privelemdict = {
+	'internet_location_file' : Files.internet_location_file,
+	'item' : Finder_items.item,
+	'package' : Files.package,
 }
 trash_2d_object._superclassnames = ['container']
 trash_2d_object._privpropdict = {
@@ -426,23 +232,16 @@
 	'warns_before_emptying' : warns_before_emptying,
 }
 trash_2d_object._privelemdict = {
-	'accessory_suitcase' : Earlier_terms.accessory_suitcase,
-	'alias_file' : Files_and_suitcases.alias_file,
-	'application_file' : Earlier_terms.application_file,
-	'clipping' : Files_and_suitcases.clipping,
+	'alias_file' : Files.alias_file,
+	'application_file' : Files.application_file,
+	'clipping' : Files.clipping,
 	'container' : container,
-	'desk_accessory_file' : Files_and_suitcases.desk_accessory_file,
-	'document_file' : Files_and_suitcases.document_file,
-	'file' : Files_and_suitcases.file,
+	'document_file' : Files.document_file,
+	'file' : Files.file,
 	'folder' : folder,
-	'font_file' : Files_and_suitcases.font_file,
-	'font_suitcase' : Files_and_suitcases.font_suitcase,
-	'internet_location' : Earlier_terms.internet_location,
-	'item' : Earlier_terms.item,
-	'package' : Files_and_suitcases.package,
-	'sharable_container' : sharable_container,
-	'sound_file' : Files_and_suitcases.sound_file,
-	'suitcase' : Files_and_suitcases.suitcase,
+	'internet_location_file' : Files.internet_location_file,
+	'item' : Finder_items.item,
+	'package' : Files.package,
 }
 
 #
@@ -454,39 +253,22 @@
 	'cfol' : folder,
 	'ctnr' : container,
 	'ctrs' : trash_2d_object,
-	'priv' : sharing_privileges,
-	'sctr' : sharable_container,
 }
 
 _propdeclarations = {
 	'c@#^' : _3c_Inheritance_3e_,
 	'capa' : capacity,
+	'cwnd' : container_window,
+	'dfmt' : format,
 	'ects' : entire_contents,
 	'frsp' : free_space,
-	'gppr' : group_privileges,
-	'gstp' : guest_privileges,
-	'iprv' : privileges_inherited,
+	'igpr' : ignore_privileges,
 	'isej' : ejectable,
 	'isrv' : local_volume,
 	'istd' : startup,
-	'lvis' : icon_size,
-	'ownr' : owner_privileges,
 	'pexa' : expandable,
 	'pexc' : completely_expanded,
 	'pexp' : expanded,
-	'prvr' : see_files,
-	'prvs' : see_folders,
-	'prvw' : make_changes,
-	'sdsk' : startup_disk,
-	'sele' : selection,
-	'sexp' : exported,
-	'sgrp' : group,
-	'shar' : shared,
-	'smou' : mounted,
-	'sown' : owner,
-	'spro' : protected,
-	'trsh' : trash,
-	'vwnd' : view_options_window,
 	'warn' : warns_before_emptying,
 }
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Earlier_terms.py b/Lib/plat-mac/lib-scriptpackages/Finder/Earlier_terms.py
deleted file mode 100644
index b38246e..0000000
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Earlier_terms.py
+++ /dev/null
@@ -1,746 +0,0 @@
-"""Suite Earlier terms: Terms that have been renamed
-Level 1, version 1
-
-Generated from /Volumes/Moes/Systeemmap/Finder
-AETE/AEUT resource version 0/144, language 0, script 0
-"""
-
-import aetools
-import MacOS
-
-_code = 'tpnm'
-
-from StdSuites.Type_Names_Suite import *
-class Earlier_terms_Events(Type_Names_Suite_Events):
-
-	pass
-
-
-class accessory_process(aetools.ComponentItem):
-	"""accessory process - A process launched from a desk accessory file """
-	want = 'pcda'
-
-accessory_processes = accessory_process
-
-class accessory_suitcase(aetools.ComponentItem):
-	"""accessory suitcase - A desk accessory suitcase """
-	want = 'dsut'
-
-accessory_suitcases = accessory_suitcase
-
-class application(aetools.ComponentItem):
-	"""application - The Finder """
-	want = 'capp'
-class Finder_preferences(aetools.NProperty):
-	"""Finder preferences - Various preferences that apply to the Finder as a whole """
-	which = 'pfrp'
-	want = 'obj '
-class about_this_computer(aetools.NProperty):
-	"""about this computer - the \xd2About this Computer\xd3 dialog and the list of running processes displayed in it """
-	which = 'abbx'
-	want = 'obj '
-class clipboard(aetools.NProperty):
-	"""clipboard - the Finder\xd5s clipboard window """
-	which = 'pcli'
-	want = 'obj '
-class desktop(aetools.NProperty):
-	"""desktop - the desktop """
-	which = 'desk'
-	want = 'cdsk'
-class file_sharing(aetools.NProperty):
-	"""file sharing - Is file sharing on? """
-	which = 'fshr'
-	want = 'bool'
-class frontmost(aetools.NProperty):
-	"""frontmost - Is the Finder the frontmost process? """
-	which = 'pisf'
-	want = 'bool'
-class insertion_location(aetools.NProperty):
-	"""insertion location - the container in which a new folder would appear if \xd2New Folder\xd3 was selected """
-	which = 'pins'
-	want = 'obj '
-class largest_free_block(aetools.NProperty):
-	"""largest free block - the largest free block of process memory available to launch an application """
-	which = 'mfre'
-	want = 'long'
-class name(aetools.NProperty):
-	"""name - the Finder\xd5s name """
-	which = 'pnam'
-	want = 'itxt'
-class product_version(aetools.NProperty):
-	"""product version - the version of the System software running on this computer """
-	which = 'ver2'
-	want = 'itxt'
-class properties(aetools.NProperty):
-	"""properties - property that allows getting and setting of multiple properties """
-	which = 'qpro'
-	want = 'reco'
-class selection(aetools.NProperty):
-	"""selection - the selection visible to the user """
-	which = 'sele'
-	want = 'obj '
-class sharing_starting_up(aetools.NProperty):
-	"""sharing starting up - Is file sharing in the process of starting up? """
-	which = 'fsup'
-	want = 'bool'
-class version(aetools.NProperty):
-	"""version - the version of the Finder """
-	which = 'vers'
-	want = 'itxt'
-class visible(aetools.NProperty):
-	"""visible - Is the Finder\xd5s layer visible? """
-	which = 'pvis'
-	want = 'bool'
-
-class application_file(aetools.ComponentItem):
-	"""application file - An application's file on disk """
-	want = 'appf'
-class _3c_Inheritance_3e_(aetools.NProperty):
-	"""<Inheritance> - inherits some of its properties from the file class """
-	which = 'c@#^'
-	want = 'file'
-class minimum_partition_size(aetools.NProperty):
-	"""minimum partition size - the smallest memory size with which the application can be launched """
-	which = 'mprt'
-	want = 'long'
-class partition_size(aetools.NProperty):
-	"""partition size - the memory size with which the application will be launched """
-	which = 'appt'
-	want = 'long'
-class scriptable(aetools.NProperty):
-	"""scriptable - Is the application high-level event aware? """
-	which = 'isab'
-	want = 'bool'
-class suggested_partition_size(aetools.NProperty):
-	"""suggested partition size - the memory size with which the developer recommends the application be launched """
-	which = 'sprt'
-	want = 'long'
-
-class container_window(aetools.ComponentItem):
-	"""container window - A window that contains items """
-	want = 'cwnd'
-class button_view_arrangement(aetools.NProperty):
-	"""button view arrangement - the property by which to keep icons arranged within a button view window """
-	which = 'barr'
-	want = 'earr'
-class calculate_folder_sizes(aetools.NProperty):
-	"""calculate folder sizes - Are folder sizes calculated and displayed in the window? (does not apply to suitcase windows) """
-	which = 'sfsz'
-	want = 'bool'
-class container(aetools.NProperty):
-	"""container - the container from which the window was opened """
-	which = 'ctnr'
-	want = 'obj '
-class has_custom_view_settings(aetools.NProperty):
-	"""has custom view settings - Does the folder have custom view settings or is it using the default global settings? """
-	which = 'cuss'
-	want = 'long'
-class item(aetools.NProperty):
-	"""item - the item from which the window was opened (always returns something) """
-	which = 'cobj'
-	want = 'obj '
-class previous_list_view(aetools.NProperty):
-	"""previous list view - the last non-icon view (by name, by date, etc.) selected for the container (forgotten as soon as the window is closed and only available when the window is open) """
-	which = 'svew'
-	want = 'enum'
-class show_comments(aetools.NProperty):
-	"""show comments - Are comments displayed in the window? (does not apply to suitcases) """
-	which = 'scom'
-	want = 'bool'
-class show_creation_date(aetools.NProperty):
-	"""show creation date - Are creation dates displayed in the window? """
-	which = 'scda'
-	want = 'bool'
-class show_kind(aetools.NProperty):
-	"""show kind - Are document kinds displayed in the window? """
-	which = 'sknd'
-	want = 'bool'
-class show_label(aetools.NProperty):
-	"""show label - Are labels displayed in the window? """
-	which = 'slbl'
-	want = 'bool'
-class show_modification_date(aetools.NProperty):
-	"""show modification date - Are modification dates displayed in the window? """
-	which = 'sdat'
-	want = 'bool'
-class show_size(aetools.NProperty):
-	"""show size - Are file sizes displayed in the window? """
-	which = 'ssiz'
-	want = 'bool'
-class show_version(aetools.NProperty):
-	"""show version - Are file versions displayed in the window? (does not apply to suitcase windows) """
-	which = 'svrs'
-	want = 'bool'
-class sort_direction(aetools.NProperty):
-	"""sort direction - The direction in which the window is sorted """
-	which = 'sord'
-	want = 'sodr'
-class spatial_view_arrangement(aetools.NProperty):
-	"""spatial view arrangement - the property by which to keep icons arranged within a spatial view window """
-	which = 'iarr'
-	want = 'earr'
-class use_relative_dates(aetools.NProperty):
-	"""use relative dates - Are relative dates (e.g., today, yesterday) shown in the window? """
-	which = 'urdt'
-	want = 'bool'
-class view(aetools.NProperty):
-	"""view - the current view for the window (icon, name, date, etc.) """
-	which = 'pvew'
-	want = 'long'
-
-class information_window(aetools.ComponentItem):
-	"""information window - An information window (opened by \xd2Get Info\xd3) """
-	want = 'iwnd'
-class comment(aetools.NProperty):
-	"""comment - the comment """
-	which = 'comt'
-	want = 'itxt'
-class creation_date(aetools.NProperty):
-	"""creation date - the date on which the item was created """
-	which = 'ascd'
-	want = 'ldt '
-class icon(aetools.NProperty):
-	"""icon - the icon bitmap of the item """
-	which = 'iimg'
-	want = 'ifam'
-class locked(aetools.NProperty):
-	"""locked - Is the item locked (applies only to file and application information windows)? """
-	which = 'aslk'
-	want = 'bool'
-class modification_date(aetools.NProperty):
-	"""modification date - the date on which the item was last modified """
-	which = 'asmo'
-	want = 'ldt '
-class physical_size(aetools.NProperty):
-	"""physical size - the actual space used by the item on disk """
-	which = 'phys'
-	want = 'long'
-class size(aetools.NProperty):
-	"""size - the logical size of the item """
-	which = 'ptsz'
-	want = 'long'
-class stationery(aetools.NProperty):
-	"""stationery - Is the item a stationery pad? """
-	which = 'pspd'
-	want = 'bool'
-class warn_before_emptying(aetools.NProperty):
-	"""warn before emptying - Display a dialog when emptying the trash (only valid for trash info window)? """
-	which = 'warn'
-	want = 'bool'
-
-class internet_location(aetools.ComponentItem):
-	"""internet location - An file containing an internet location """
-	want = 'inlf'
-
-internet_locations = internet_location
-
-class item(aetools.ComponentItem):
-	"""item - An item """
-	want = 'cobj'
-class bounds(aetools.NProperty):
-	"""bounds - the bounding rectangle of the item (can only be set for an item in a window viewed as icons or buttons) """
-	which = 'pbnd'
-	want = 'qdrt'
-class content_space(aetools.NProperty):
-	"""content space - the window that would open if the item was opened """
-	which = 'dwnd'
-	want = 'obj '
-class description(aetools.NProperty):
-	"""description - a description of the item """
-	which = 'dscr'
-	want = 'itxt'
-class disk(aetools.NProperty):
-	"""disk - the disk on which the item is stored """
-	which = 'cdis'
-	want = 'obj '
-class folder(aetools.NProperty):
-	"""folder - the folder in which the item is stored """
-	which = 'asdr'
-	want = 'obj '
-class id(aetools.NProperty):
-	"""id - an id that identifies the item """
-	which = 'ID  '
-	want = 'long'
-class index(aetools.NProperty):
-	"""index - the index in the front-to-back ordering within its container """
-	which = 'pidx'
-	want = 'long'
-class information_window(aetools.NProperty):
-	"""information window - the information window for the item """
-	which = 'iwnd'
-	want = 'obj '
-class kind(aetools.NProperty):
-	"""kind - the kind of the item """
-	which = 'kind'
-	want = 'itxt'
-class label_index(aetools.NProperty):
-	"""label index - the label of the item """
-	which = 'labi'
-	want = 'long'
-class position(aetools.NProperty):
-	"""position - the position of the item within its parent window (can only be set for an item in a window viewed as icons or buttons) """
-	which = 'posn'
-	want = 'QDpt'
-class selected(aetools.NProperty):
-	"""selected - Is the item selected? """
-	which = 'issl'
-	want = 'bool'
-class window(aetools.NProperty):
-	"""window - the window that would open if the item was opened """
-	which = 'cwin'
-	want = 'obj '
-
-class preferences(aetools.ComponentItem):
-	"""preferences - The Finder Preferences """
-	want = 'cprf'
-class delay_before_springing(aetools.NProperty):
-	"""delay before springing - the delay before springing open a container in ticks (1/60th of a second) (12 is shortest delay, 60 is longest delay) """
-	which = 'dela'
-	want = 'shor'
-class spring_open_folders(aetools.NProperty):
-	"""spring open folders - Spring open folders after the specified delay? """
-	which = 'sprg'
-	want = 'bool'
-class use_simple_menus(aetools.NProperty):
-	"""use simple menus - Use simplified Finder menus? """
-	which = 'usme'
-	want = 'bool'
-class use_wide_grid(aetools.NProperty):
-	"""use wide grid - Space icons on a wide grid? """
-	which = 'uswg'
-	want = 'bool'
-
-class process(aetools.ComponentItem):
-	"""process - A process running on this computer """
-	want = 'prcs'
-class creator_type(aetools.NProperty):
-	"""creator type - the OSType of the creator of the process (the signature) """
-	which = 'fcrt'
-	want = 'type'
-class file(aetools.NProperty):
-	"""file - the file from which the process was launched """
-	which = 'file'
-	want = 'obj '
-class file_type(aetools.NProperty):
-	"""file type - the OSType of the file type of the process """
-	which = 'asty'
-	want = 'type'
-class partition_space_used(aetools.NProperty):
-	"""partition space used - the number of bytes currently used in the process' partition """
-	which = 'pusd'
-	want = 'long'
-class remote_events(aetools.NProperty):
-	"""remote events - Does the process accept remote events? """
-	which = 'revt'
-	want = 'bool'
-
-class sharable_container(aetools.ComponentItem):
-	"""sharable container - A container that may be shared (disks and folders) """
-	want = 'sctr'
-class exported(aetools.NProperty):
-	"""exported - Is the container a share point or inside a share point, i.e., can the container be shared? (file sharing must be on to use this property) """
-	which = 'sexp'
-	want = 'bool'
-class group(aetools.NProperty):
-	"""group - the user or group that has special access to the container (file sharing must be on to use this property) """
-	which = 'sgrp'
-	want = 'itxt'
-class group_privileges(aetools.NProperty):
-	"""group privileges - the see folders/see files/make changes privileges for the group (file sharing must be on to use this property) """
-	which = 'gppr'
-	want = 'priv'
-class guest_privileges(aetools.NProperty):
-	"""guest privileges - the see folders/see files/make changes privileges for everyone (file sharing must be on to use this property) """
-	which = 'gstp'
-	want = 'priv'
-class inherited_privileges(aetools.NProperty):
-	"""inherited privileges - Are the privileges of the container always the same as the container in which it is stored? (file sharing must be on to use this property) """
-	which = 'iprv'
-	want = 'bool'
-class mounted(aetools.NProperty):
-	"""mounted - Is the container mounted on another machine's desktop? (file sharing must be on to use this property) """
-	which = 'smou'
-	want = 'bool'
-class owner(aetools.NProperty):
-	"""owner - the user that owns the container (file sharing must be on to use this property) """
-	which = 'sown'
-	want = 'itxt'
-class owner_privileges(aetools.NProperty):
-	"""owner privileges - the see folders/see files/make changes privileges for the owner (file sharing must be on to use this property) """
-	which = 'ownr'
-	want = 'priv'
-class protected(aetools.NProperty):
-	"""protected - Is the container protected from being moved, renamed and deleted? (file sharing must be on to use this property) """
-	which = 'spro'
-	want = 'bool'
-class shared(aetools.NProperty):
-	"""shared - Is the container a share point, i.e., is the container currently being shared? (file sharing must be on to use this property) """
-	which = 'shar'
-	want = 'bool'
-
-class trash_2d_object(aetools.ComponentItem):
-	"""trash-object - Trash-object is the class of the \xd2trash\xd3 object """
-	want = 'ctrs'
-
-class window(aetools.ComponentItem):
-	"""window - A window """
-	want = 'cwin'
-class closeable(aetools.NProperty):
-	"""closeable - Does the window have a close box? """
-	which = 'hclb'
-	want = 'bool'
-class collapsed(aetools.NProperty):
-	"""collapsed - Is the window collapsed (only applies to open non-pop-up windows)? """
-	which = 'wshd'
-	want = 'bool'
-class floating(aetools.NProperty):
-	"""floating - Does the window have a title bar? """
-	which = 'isfl'
-	want = 'bool'
-class modal(aetools.NProperty):
-	"""modal - Is the window modal? """
-	which = 'pmod'
-	want = 'bool'
-class popup(aetools.NProperty):
-	"""popup - Is the window is a pop-up window? (only applies to open container windows in the Finder and can only be set when the Finder is the front application) """
-	which = 'drwr'
-	want = 'bool'
-class pulled_open(aetools.NProperty):
-	"""pulled open - Is the window pulled open (only applies to pop-up windows and can only be set when the Finder is the front application)? """
-	which = 'pull'
-	want = 'bool'
-class resizable(aetools.NProperty):
-	"""resizable - Is the window resizable? """
-	which = 'prsz'
-	want = 'bool'
-class titled(aetools.NProperty):
-	"""titled - Does the window have a title bar? """
-	which = 'ptit'
-	want = 'bool'
-class zoomable(aetools.NProperty):
-	"""zoomable - Is the window zoomable? """
-	which = 'iszm'
-	want = 'bool'
-class zoomed(aetools.NProperty):
-	"""zoomed - Is the window zoomed? """
-	which = 'pzum'
-	want = 'bool'
-class zoomed_full_size(aetools.NProperty):
-	"""zoomed full size - Is the window zoomed to the full size of the screen? (can only be set, not read, and only applies to open non-pop-up windows) """
-	which = 'zumf'
-	want = 'bool'
-accessory_process._superclassnames = []
-accessory_process._privpropdict = {
-}
-accessory_process._privelemdict = {
-}
-accessory_suitcase._superclassnames = []
-accessory_suitcase._privpropdict = {
-}
-accessory_suitcase._privelemdict = {
-}
-application._superclassnames = []
-application._privpropdict = {
-	'Finder_preferences' : Finder_preferences,
-	'about_this_computer' : about_this_computer,
-	'clipboard' : clipboard,
-	'desktop' : desktop,
-	'file_sharing' : file_sharing,
-	'frontmost' : frontmost,
-	'insertion_location' : insertion_location,
-	'largest_free_block' : largest_free_block,
-	'name' : name,
-	'product_version' : product_version,
-	'properties' : properties,
-	'selection' : selection,
-	'sharing_starting_up' : sharing_starting_up,
-	'version' : version,
-	'visible' : visible,
-}
-application._privelemdict = {
-}
-import Files_and_suitcases
-application_file._superclassnames = ['file']
-application_file._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'minimum_partition_size' : minimum_partition_size,
-	'partition_size' : partition_size,
-	'scriptable' : scriptable,
-	'suggested_partition_size' : suggested_partition_size,
-}
-application_file._privelemdict = {
-}
-container_window._superclassnames = ['window']
-container_window._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'button_view_arrangement' : button_view_arrangement,
-	'calculate_folder_sizes' : calculate_folder_sizes,
-	'container' : container,
-	'has_custom_view_settings' : has_custom_view_settings,
-	'item' : item,
-	'previous_list_view' : previous_list_view,
-	'show_comments' : show_comments,
-	'show_creation_date' : show_creation_date,
-	'show_kind' : show_kind,
-	'show_label' : show_label,
-	'show_modification_date' : show_modification_date,
-	'show_size' : show_size,
-	'show_version' : show_version,
-	'sort_direction' : sort_direction,
-	'spatial_view_arrangement' : spatial_view_arrangement,
-	'use_relative_dates' : use_relative_dates,
-	'view' : view,
-}
-container_window._privelemdict = {
-}
-information_window._superclassnames = ['window']
-information_window._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'comment' : comment,
-	'creation_date' : creation_date,
-	'icon' : icon,
-	'item' : item,
-	'locked' : locked,
-	'minimum_partition_size' : minimum_partition_size,
-	'modification_date' : modification_date,
-	'partition_size' : partition_size,
-	'physical_size' : physical_size,
-	'product_version' : product_version,
-	'size' : size,
-	'stationery' : stationery,
-	'suggested_partition_size' : suggested_partition_size,
-	'version' : version,
-	'warn_before_emptying' : warn_before_emptying,
-}
-information_window._privelemdict = {
-}
-internet_location._superclassnames = []
-internet_location._privpropdict = {
-}
-internet_location._privelemdict = {
-}
-item._superclassnames = []
-item._privpropdict = {
-	'bounds' : bounds,
-	'comment' : comment,
-	'container' : container,
-	'content_space' : content_space,
-	'creation_date' : creation_date,
-	'description' : description,
-	'disk' : disk,
-	'folder' : folder,
-	'icon' : icon,
-	'id' : id,
-	'index' : index,
-	'information_window' : information_window,
-	'kind' : kind,
-	'label_index' : label_index,
-	'modification_date' : modification_date,
-	'name' : name,
-	'physical_size' : physical_size,
-	'position' : position,
-	'properties' : properties,
-	'selected' : selected,
-	'size' : size,
-	'window' : window,
-}
-item._privelemdict = {
-}
-preferences._superclassnames = []
-preferences._privpropdict = {
-	'calculate_folder_sizes' : calculate_folder_sizes,
-	'delay_before_springing' : delay_before_springing,
-	'show_comments' : show_comments,
-	'show_creation_date' : show_creation_date,
-	'show_kind' : show_kind,
-	'show_label' : show_label,
-	'show_modification_date' : show_modification_date,
-	'show_size' : show_size,
-	'show_version' : show_version,
-	'spring_open_folders' : spring_open_folders,
-	'use_relative_dates' : use_relative_dates,
-	'use_simple_menus' : use_simple_menus,
-	'use_wide_grid' : use_wide_grid,
-	'window' : window,
-}
-preferences._privelemdict = {
-}
-process._superclassnames = []
-process._privpropdict = {
-	'creator_type' : creator_type,
-	'file' : file,
-	'file_type' : file_type,
-	'frontmost' : frontmost,
-	'name' : name,
-	'partition_size' : partition_size,
-	'partition_space_used' : partition_space_used,
-	'properties' : properties,
-	'remote_events' : remote_events,
-	'scriptable' : scriptable,
-	'visible' : visible,
-}
-process._privelemdict = {
-}
-import Containers_and_folders
-sharable_container._superclassnames = ['container']
-sharable_container._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'exported' : exported,
-	'group' : group,
-	'group_privileges' : group_privileges,
-	'guest_privileges' : guest_privileges,
-	'inherited_privileges' : inherited_privileges,
-	'mounted' : mounted,
-	'owner' : owner,
-	'owner_privileges' : owner_privileges,
-	'protected' : protected,
-	'shared' : shared,
-}
-sharable_container._privelemdict = {
-}
-trash_2d_object._superclassnames = ['container']
-trash_2d_object._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'warn_before_emptying' : warn_before_emptying,
-}
-trash_2d_object._privelemdict = {
-}
-window._superclassnames = []
-window._privpropdict = {
-	'bounds' : bounds,
-	'closeable' : closeable,
-	'collapsed' : collapsed,
-	'floating' : floating,
-	'index' : index,
-	'modal' : modal,
-	'name' : name,
-	'popup' : popup,
-	'position' : position,
-	'properties' : properties,
-	'pulled_open' : pulled_open,
-	'resizable' : resizable,
-	'titled' : titled,
-	'visible' : visible,
-	'zoomable' : zoomable,
-	'zoomed' : zoomed,
-	'zoomed_full_size' : zoomed_full_size,
-}
-window._privelemdict = {
-}
-
-#
-# Indices of types declared in this module
-#
-_classdeclarations = {
-	'appf' : application_file,
-	'capp' : application,
-	'cobj' : item,
-	'cprf' : preferences,
-	'ctrs' : trash_2d_object,
-	'cwin' : window,
-	'cwnd' : container_window,
-	'dsut' : accessory_suitcase,
-	'inlf' : internet_location,
-	'iwnd' : information_window,
-	'pcda' : accessory_process,
-	'prcs' : process,
-	'sctr' : sharable_container,
-}
-
-_propdeclarations = {
-	'ID  ' : id,
-	'abbx' : about_this_computer,
-	'appt' : partition_size,
-	'ascd' : creation_date,
-	'asdr' : folder,
-	'aslk' : locked,
-	'asmo' : modification_date,
-	'asty' : file_type,
-	'barr' : button_view_arrangement,
-	'c@#^' : _3c_Inheritance_3e_,
-	'cdis' : disk,
-	'cobj' : item,
-	'comt' : comment,
-	'ctnr' : container,
-	'cuss' : has_custom_view_settings,
-	'cwin' : window,
-	'dela' : delay_before_springing,
-	'desk' : desktop,
-	'drwr' : popup,
-	'dscr' : description,
-	'dwnd' : content_space,
-	'fcrt' : creator_type,
-	'file' : file,
-	'fshr' : file_sharing,
-	'fsup' : sharing_starting_up,
-	'gppr' : group_privileges,
-	'gstp' : guest_privileges,
-	'hclb' : closeable,
-	'iarr' : spatial_view_arrangement,
-	'iimg' : icon,
-	'iprv' : inherited_privileges,
-	'isab' : scriptable,
-	'isfl' : floating,
-	'issl' : selected,
-	'iszm' : zoomable,
-	'iwnd' : information_window,
-	'kind' : kind,
-	'labi' : label_index,
-	'mfre' : largest_free_block,
-	'mprt' : minimum_partition_size,
-	'ownr' : owner_privileges,
-	'pbnd' : bounds,
-	'pcli' : clipboard,
-	'pfrp' : Finder_preferences,
-	'phys' : physical_size,
-	'pidx' : index,
-	'pins' : insertion_location,
-	'pisf' : frontmost,
-	'pmod' : modal,
-	'pnam' : name,
-	'posn' : position,
-	'prsz' : resizable,
-	'pspd' : stationery,
-	'ptit' : titled,
-	'ptsz' : size,
-	'pull' : pulled_open,
-	'pusd' : partition_space_used,
-	'pvew' : view,
-	'pvis' : visible,
-	'pzum' : zoomed,
-	'qpro' : properties,
-	'revt' : remote_events,
-	'scda' : show_creation_date,
-	'scom' : show_comments,
-	'sdat' : show_modification_date,
-	'sele' : selection,
-	'sexp' : exported,
-	'sfsz' : calculate_folder_sizes,
-	'sgrp' : group,
-	'shar' : shared,
-	'sknd' : show_kind,
-	'slbl' : show_label,
-	'smou' : mounted,
-	'sord' : sort_direction,
-	'sown' : owner,
-	'sprg' : spring_open_folders,
-	'spro' : protected,
-	'sprt' : suggested_partition_size,
-	'ssiz' : show_size,
-	'svew' : previous_list_view,
-	'svrs' : show_version,
-	'urdt' : use_relative_dates,
-	'usme' : use_simple_menus,
-	'uswg' : use_wide_grid,
-	'ver2' : product_version,
-	'vers' : version,
-	'warn' : warn_before_emptying,
-	'wshd' : collapsed,
-	'zumf' : zoomed_full_size,
-}
-
-_compdeclarations = {
-}
-
-_enumdeclarations = {
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Enumerations.py b/Lib/plat-mac/lib-scriptpackages/Finder/Enumerations.py
index 5621120..44eab6d 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Enumerations.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Enumerations.py
@@ -1,7 +1,7 @@
 """Suite Enumerations: Enumerations for the Finder
 Level 1, version 1
 
-Generated from /Volumes/Moes/Systeemmap/Finder
+Generated from /System/Library/CoreServices/Finder.app
 AETE/AEUT resource version 0/144, language 0, script 0
 """
 
@@ -26,32 +26,54 @@
 	'arranged_by_label' : 'laba',	# 
 }
 
-_Enum_ese0 = {
-	'starting_up' : 'ese2',	# 
-	'running' : 'ese3',	# 
-	'rebuilding_desktop' : 'ese5',	# 
-	'copying' : 'ese4',	# 
-	'restarting' : 'ese6',	# 
-	'quitting' : 'ese7',	# 
+_Enum_ecvw = {
+	'icon_view' : 'icnv',	# 
+	'list_view' : 'lsvw',	# 
+	'column_view' : 'clvw',	# 
 }
 
-_Enum_gsen = {
-	'CPU' : 'proc',	# 
-	'FPU' : 'fpu ',	# 
-	'MMU' : 'mmu ',	# 
-	'hardware' : 'hdwr',	# 
-	'operating_system' : 'os  ',	# 
-	'sound_system' : 'snd ',	# 
-	'memory_available' : 'lram',	# 
-	'memory_installed' : 'ram ',	# 
+_Enum_edfm = {
+	'Mac_OS_format' : 'dfhf',	# 
+	'Mac_OS_Extended_format' : 'dfh+',	# 
+	'UFS_format' : 'dfuf',	# 
+	'NFS_format' : 'dfnf',	# 
+	'audio_format' : 'dfau',	# 
+	'ProDOS_format' : 'dfpr',	# 
+	'MS_2d_DOS_format' : 'dfms',	# 
+	'ISO_9660_format' : 'df96',	# 
+	'High_Sierra_format' : 'dfhs',	# 
+	'QuickTake_format' : 'dfqt',	# 
+	'Apple_Photo_format' : 'dfph',	# 
+	'AppleShare_format' : 'dfas',	# 
+	'UDF_format' : 'dfud',	# 
+	'WebDAV_format' : 'dfwd',	# 
+	'FTP_format' : 'dfft',	# 
+	'Packet_2d_written_UDF_format' : 'dfpu',	# 
+	'unknown_format' : 'df??',	# 
+}
+
+_Enum_elsv = {
+	'name_column' : 'elsn',	# 
+	'modification_date_column' : 'elsm',	# 
+	'creation_date_column' : 'elsc',	# 
+	'size_column' : 'elss',	# 
+	'kind_column' : 'elsk',	# 
+	'label_column' : 'elsl',	# 
+	'version_column' : 'elsv',	# 
+	'comment_column' : 'elsC',	# 
 }
 
 _Enum_ipnl = {
 	'General_Information_panel' : 'gpnl',	# 
 	'Sharing_panel' : 'spnl',	# 
 	'Memory_panel' : 'mpnl',	# 
-	'Status_and_Configuration_panel' : 'scnl',	# 
-	'Fonts_panel' : 'fpnl',	# 
+	'Preview_panel' : 'vpnl',	# 
+	'Application_panel' : 'apnl',	# 
+	'Languages_panel' : 'pklg',	# 
+	'Plugins_panel' : 'pkpg',	# 
+	'Name__26__Extension_panel' : 'npnl',	# 
+	'Comments_panel' : 'cpnl',	# 
+	'Content_Index_panel' : 'cinl',	# 
 }
 
 _Enum_isiz = {
@@ -60,12 +82,16 @@
 	'large' : 'lgic',	# 
 }
 
-_Enum_pple = {
-	'General_Preferences_panel' : 'pgnp',	# 
-	'Label_Preferences_panel' : 'plbp',	# 
-	'Icon_View_Preferences_panel' : 'pivp',	# 
-	'Button_View_Preferences_panel' : 'pbvp',	# 
-	'List_View_Preferences_panel' : 'plvp',	# 
+_Enum_lvic = {
+	'small_icon' : 'smic',	# 
+	'large_icon' : 'lgic',	# 
+}
+
+_Enum_priv = {
+	'read_only' : 'read',	# 
+	'read_write' : 'rdwr',	# 
+	'write_only' : 'writ',	# 
+	'none' : 'none',	# 
 }
 
 _Enum_sodr = {
@@ -107,11 +133,13 @@
 
 _enumdeclarations = {
 	'earr' : _Enum_earr,
-	'ese0' : _Enum_ese0,
-	'gsen' : _Enum_gsen,
+	'ecvw' : _Enum_ecvw,
+	'edfm' : _Enum_edfm,
+	'elsv' : _Enum_elsv,
 	'ipnl' : _Enum_ipnl,
 	'isiz' : _Enum_isiz,
-	'pple' : _Enum_pple,
+	'lvic' : _Enum_lvic,
+	'priv' : _Enum_priv,
 	'sodr' : _Enum_sodr,
 	'vwby' : _Enum_vwby,
 }
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Files_and_suitcases.py b/Lib/plat-mac/lib-scriptpackages/Finder/Files.py
similarity index 65%
rename from Lib/plat-mac/lib-scriptpackages/Finder/Files_and_suitcases.py
rename to Lib/plat-mac/lib-scriptpackages/Finder/Files.py
index 6978d3e..b754e6b 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Files_and_suitcases.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Files.py
@@ -1,7 +1,7 @@
-"""Suite Files and suitcases: Classes representing files and suitcases
+"""Suite Files: Classes representing files
 Level 1, version 1
 
-Generated from /Volumes/Moes/Systeemmap/Finder
+Generated from /System/Library/CoreServices/Finder.app
 AETE/AEUT resource version 0/144, language 0, script 0
 """
 
@@ -10,7 +10,7 @@
 
 _code = 'fndr'
 
-class Files_and_suitcases_Events:
+class Files_Events:
 
 	pass
 
@@ -33,7 +33,7 @@
 	"""application file - An application's file on disk """
 	want = 'appf'
 class accepts_high_level_events(aetools.NProperty):
-	"""accepts high level events - Is the application high-level event aware? """
+	"""accepts high level events - Is the application high-level event aware? (OBSOLETE: always returns true) """
 	which = 'isab'
 	want = 'bool'
 class has_scripting_terminology(aetools.NProperty):
@@ -44,6 +44,10 @@
 	"""minimum size - the smallest memory size with which the application can be launched """
 	which = 'mprt'
 	want = 'long'
+class opens_in_Classic(aetools.NProperty):
+	"""opens in Classic - Should the application launch in the Classic environment? """
+	which = 'Clsc'
+	want = 'bool'
 class preferred_size(aetools.NProperty):
 	"""preferred size - the memory size with which the application will be launched """
 	which = 'appt'
@@ -58,22 +62,13 @@
 class clipping(aetools.ComponentItem):
 	"""clipping - A clipping """
 	want = 'clpf'
+class clipping_window(aetools.NProperty):
+	"""clipping window - (NOT AVAILABLE YET) the clipping window for this clipping """
+	which = 'lwnd'
+	want = 'obj '
 
 clippings = clipping
 
-class desk_accessory_file(aetools.ComponentItem):
-	"""desk accessory file - A desk accessory file """
-	want = 'dafi'
-
-desk_accessory_files = desk_accessory_file
-
-class desk_accessory_suitcase(aetools.ComponentItem):
-	"""desk accessory suitcase - A desk accessory suitcase """
-	want = 'dsut'
-#        element 'cobj' as ['indx', 'name']
-
-desk_accessory_suitcases = desk_accessory_suitcase
-
 class document_file(aetools.ComponentItem):
 	"""document file - A document file """
 	want = 'docf'
@@ -91,14 +86,10 @@
 	"""file type - the OSType identifying the type of data contained in the item """
 	which = 'asty'
 	want = 'type'
-class locked(aetools.NProperty):
-	"""locked - Is the file locked? """
-	which = 'aslk'
-	want = 'bool'
 class product_version(aetools.NProperty):
 	"""product version - the version of the product (visible at the top of the \xd2Get Info\xd3 window) """
 	which = 'ver2'
-	want = 'itxt'
+	want = 'utxt'
 class stationery(aetools.NProperty):
 	"""stationery - Is the file a stationery pad? """
 	which = 'pspd'
@@ -106,30 +97,17 @@
 class version(aetools.NProperty):
 	"""version - the version of the file (visible at the bottom of the \xd2Get Info\xd3 window) """
 	which = 'vers'
-	want = 'itxt'
+	want = 'utxt'
 
 files = file
 
-class font_file(aetools.ComponentItem):
-	"""font file - A font file """
-	want = 'fntf'
-
-font_files = font_file
-
-class font_suitcase(aetools.ComponentItem):
-	"""font suitcase - A font suitcase """
-	want = 'fsut'
-#        element 'cobj' as ['indx', 'name']
-
-font_suitcases = font_suitcase
-
 class internet_location_file(aetools.ComponentItem):
 	"""internet location file - An file containing an internet location """
 	want = 'inlf'
 class location(aetools.NProperty):
 	"""location - the internet location """
 	which = 'iloc'
-	want = 'itxt'
+	want = 'utxt'
 
 internet_location_files = internet_location_file
 
@@ -138,23 +116,6 @@
 	want = 'pack'
 
 packages = package
-
-class sound_file(aetools.ComponentItem):
-	"""sound file - A sound file """
-	want = 'sndf'
-class sound(aetools.NProperty):
-	"""sound - the sound data """
-	which = 'snd '
-	want = 'snd '
-
-sound_files = sound_file
-
-class suitcase(aetools.ComponentItem):
-	"""suitcase - A font or desk accessory suitcase """
-	want = 'stcs'
-#        element 'cobj' as ['indx', 'name']
-
-suitcases = suitcase
 alias_file._superclassnames = ['file']
 alias_file._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
@@ -168,6 +129,7 @@
 	'accepts_high_level_events' : accepts_high_level_events,
 	'has_scripting_terminology' : has_scripting_terminology,
 	'minimum_size' : minimum_size,
+	'opens_in_Classic' : opens_in_Classic,
 	'preferred_size' : preferred_size,
 	'suggested_size' : suggested_size,
 }
@@ -176,54 +138,28 @@
 clipping._superclassnames = ['file']
 clipping._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'clipping_window' : clipping_window,
 }
 clipping._privelemdict = {
 }
-desk_accessory_file._superclassnames = ['file']
-desk_accessory_file._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-}
-desk_accessory_file._privelemdict = {
-}
-desk_accessory_suitcase._superclassnames = ['suitcase']
-import Earlier_terms
-desk_accessory_suitcase._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-}
-desk_accessory_suitcase._privelemdict = {
-	'item' : Earlier_terms.item,
-}
 document_file._superclassnames = ['file']
 document_file._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
 }
 document_file._privelemdict = {
 }
+import Finder_items
 file._superclassnames = ['item']
 file._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
 	'creator_type' : creator_type,
 	'file_type' : file_type,
-	'locked' : locked,
 	'product_version' : product_version,
 	'stationery' : stationery,
 	'version' : version,
 }
 file._privelemdict = {
 }
-font_file._superclassnames = ['file']
-font_file._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-}
-font_file._privelemdict = {
-}
-font_suitcase._superclassnames = ['suitcase']
-font_suitcase._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-}
-font_suitcase._privelemdict = {
-	'item' : Earlier_terms.item,
-}
 internet_location_file._superclassnames = ['file']
 internet_location_file._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
@@ -237,20 +173,6 @@
 }
 package._privelemdict = {
 }
-sound_file._superclassnames = ['file']
-sound_file._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'sound' : sound,
-}
-sound_file._privelemdict = {
-}
-suitcase._superclassnames = ['file']
-suitcase._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-}
-suitcase._privelemdict = {
-	'item' : Earlier_terms.item,
-}
 
 #
 # Indices of types declared in this module
@@ -259,31 +181,25 @@
 	'alia' : alias_file,
 	'appf' : application_file,
 	'clpf' : clipping,
-	'dafi' : desk_accessory_file,
 	'docf' : document_file,
-	'dsut' : desk_accessory_suitcase,
 	'file' : file,
-	'fntf' : font_file,
-	'fsut' : font_suitcase,
 	'inlf' : internet_location_file,
 	'pack' : package,
-	'sndf' : sound_file,
-	'stcs' : suitcase,
 }
 
 _propdeclarations = {
+	'Clsc' : opens_in_Classic,
 	'appt' : preferred_size,
-	'aslk' : locked,
 	'asty' : file_type,
 	'c@#^' : _3c_Inheritance_3e_,
 	'fcrt' : creator_type,
 	'hscr' : has_scripting_terminology,
 	'iloc' : location,
 	'isab' : accepts_high_level_events,
+	'lwnd' : clipping_window,
 	'mprt' : minimum_size,
 	'orig' : original_item,
 	'pspd' : stationery,
-	'snd ' : sound,
 	'sprt' : suggested_size,
 	'ver2' : product_version,
 	'vers' : version,
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Finder_Basics.py b/Lib/plat-mac/lib-scriptpackages/Finder/Finder_Basics.py
index eb44205..cd9b10d 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Finder_Basics.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Finder_Basics.py
@@ -1,7 +1,7 @@
 """Suite Finder Basics: Commonly-used Finder commands and object classes
 Level 1, version 1
 
-Generated from /Volumes/Moes/Systeemmap/Finder
+Generated from /System/Library/CoreServices/Finder.app
 AETE/AEUT resource version 0/144, language 0, script 0
 """
 
@@ -12,34 +12,8 @@
 
 class Finder_Basics_Events:
 
-	_argmap_computer = {
-		'has' : 'has ',
-	}
-
-	def computer(self, _object, _attributes={}, **_arguments):
-		"""computer: Test attributes of this computer
-		Required argument: the attribute to test
-		Keyword argument has: test specific bits of response
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: the result of the query
-		"""
-		_code = 'fndr'
-		_subcode = 'gstl'
-
-		aetools.keysubst(_arguments, self._argmap_computer)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
 	def copy(self, _no_object=None, _attributes={}, **_arguments):
-		"""copy: Copy the selected items to the clipboard (the Finder must be the front application)
+		"""copy: (NOT AVAILABLE YET) Copy the selected items to the clipboard (the Finder must be the front application)
 		Keyword argument _attributes: AppleEvent attribute dictionary
 		"""
 		_code = 'misc'
@@ -57,69 +31,12 @@
 		if _arguments.has_key('----'):
 			return _arguments['----']
 
-	def restart(self, _no_object=None, _attributes={}, **_arguments):
-		"""restart: Restart the computer
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'fndr'
-		_subcode = 'rest'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def shut_down(self, _no_object=None, _attributes={}, **_arguments):
-		"""shut down: Shut Down the computer
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'fndr'
-		_subcode = 'shut'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def sleep(self, _no_object=None, _attributes={}, **_arguments):
-		"""sleep: Put the computer to sleep
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'fndr'
-		_subcode = 'slep'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
 	_argmap_sort = {
 		'by' : 'by  ',
 	}
 
 	def sort(self, _object, _attributes={}, **_arguments):
-		"""sort: Return the specified object(s) in a sorted list
+		"""sort: (NOT AVAILABLE YET) Return the specified object(s) in a sorted list
 		Required argument: a list of finder objects to sort
 		Keyword argument by: the property to sort the items by (name, index, date, etc.)
 		Keyword argument _attributes: AppleEvent attribute dictionary
@@ -145,41 +62,29 @@
 	"""application - The Finder """
 	want = 'capp'
 class Finder_preferences(aetools.NProperty):
-	"""Finder preferences - Various preferences that apply to the Finder as a whole """
+	"""Finder preferences - (NOT AVAILABLE YET) Various preferences that apply to the Finder as a whole """
 	which = 'pfrp'
 	want = 'cprf'
-class about_this_computer(aetools.NProperty):
-	"""about this computer - the \xd2About this Computer\xd3 dialog and the list of running processes displayed in it """
-	which = 'abbx'
-	want = 'obj '
 class clipboard(aetools.NProperty):
-	"""clipboard - the Finder\xd5s clipboard window """
+	"""clipboard - (NOT AVAILABLE YET) the Finder\xd5s clipboard window """
 	which = 'pcli'
 	want = 'obj '
 class desktop(aetools.NProperty):
 	"""desktop - the desktop """
 	which = 'desk'
 	want = 'cdsk'
-class execution_state(aetools.NProperty):
-	"""execution state - the current execution state of the Finder """
-	which = 'exec'
-	want = 'ese0'
-class file_sharing(aetools.NProperty):
-	"""file sharing - Is file sharing on? """
-	which = 'fshr'
-	want = 'bool'
 class frontmost(aetools.NProperty):
 	"""frontmost - Is the Finder the frontmost process? """
 	which = 'pisf'
 	want = 'bool'
+class home(aetools.NProperty):
+	"""home - the home directory """
+	which = 'home'
+	want = 'cfol'
 class insertion_location(aetools.NProperty):
 	"""insertion location - the container in which a new folder would appear if \xd2New Folder\xd3 was selected """
 	which = 'pins'
 	want = 'obj '
-class largest_free_block(aetools.NProperty):
-	"""largest free block - the largest free block of process memory available to launch an application """
-	which = 'mfre'
-	want = 'long'
 class name(aetools.NProperty):
 	"""name - the Finder\xd5s name """
 	which = 'pnam'
@@ -187,155 +92,76 @@
 class product_version(aetools.NProperty):
 	"""product version - the version of the System software running on this computer """
 	which = 'ver2'
-	want = 'itxt'
+	want = 'utxt'
 class selection(aetools.NProperty):
-	"""selection - the selection visible to the user """
+	"""selection - the selection in the frontmost Finder window """
 	which = 'sele'
 	want = 'obj '
-class sharing_starting_up(aetools.NProperty):
-	"""sharing starting up - Is file sharing in the process of starting up? """
-	which = 'fsup'
-	want = 'bool'
+class startup_disk(aetools.NProperty):
+	"""startup disk - the startup disk """
+	which = 'sdsk'
+	want = 'cdis'
+class trash(aetools.NProperty):
+	"""trash - the trash """
+	which = 'trsh'
+	want = 'ctrs'
 class version(aetools.NProperty):
 	"""version - the version of the Finder """
 	which = 'vers'
-	want = 'itxt'
+	want = 'utxt'
 class visible(aetools.NProperty):
 	"""visible - Is the Finder\xd5s layer visible? """
 	which = 'pvis'
 	want = 'bool'
 #        element 'alia' as ['indx', 'name']
 #        element 'appf' as ['indx', 'name', 'ID  ']
+#        element 'brow' as ['indx', 'ID  ']
 #        element 'cdis' as ['indx', 'name', 'ID  ']
 #        element 'cfol' as ['indx', 'name', 'ID  ']
 #        element 'clpf' as ['indx', 'name']
-#        element 'cobj' as ['indx', 'name']
+#        element 'cobj' as ['indx', 'rele', 'name', 'rang', 'test']
 #        element 'ctnr' as ['indx', 'name']
 #        element 'cwin' as ['indx', 'name']
-#        element 'cwnd' as ['indx', 'name']
-#        element 'dafi' as ['indx', 'name']
 #        element 'docf' as ['indx', 'name']
-#        element 'dsut' as ['indx', 'name']
-#        element 'dwnd' as ['indx', 'name']
 #        element 'file' as ['indx', 'name']
-#        element 'fntf' as ['indx', 'name']
-#        element 'fsut' as ['indx', 'name']
 #        element 'inlf' as ['indx', 'name']
-#        element 'iwnd' as ['indx', 'name']
 #        element 'lwnd' as ['indx', 'name']
 #        element 'pack' as ['indx', 'name']
-#        element 'pcap' as ['indx', 'name']
-#        element 'pcda' as ['indx', 'name']
-#        element 'prcs' as ['indx', 'name']
-#        element 'sctr' as ['indx', 'name']
-#        element 'sndf' as ['indx', 'name']
-#        element 'stcs' as ['indx', 'name']
-#        element 'vwnd' as ['indx', 'name']
-
-class special_folders(aetools.ComponentItem):
-	"""special folders - The special folders used by the Mac OS """
-	want = 'spfl'
-class apple_menu_items_folder(aetools.NProperty):
-	"""apple menu items folder - the special folder named \xd2Apple Menu Items,\xd3 the contents of which appear in the Apple menu """
-	which = 'amnu'
-	want = 'obj '
-class control_panels_folder(aetools.NProperty):
-	"""control panels folder - the special folder named \xd2Control Panels\xd3 """
-	which = 'ctrl'
-	want = 'obj '
-class extensions_folder(aetools.NProperty):
-	"""extensions folder - the special folder named \xd2Extensions\xd3 """
-	which = 'extn'
-	want = 'obj '
-class fonts_folder(aetools.NProperty):
-	"""fonts folder - the special folder named \xd2Fonts\xd3 """
-	which = 'font'
-	want = 'obj '
-class preferences_folder(aetools.NProperty):
-	"""preferences folder - the special folder named \xd2Preferences\xd3 """
-	which = 'pref'
-	want = 'obj '
-class shutdown_items_folder(aetools.NProperty):
-	"""shutdown items folder - the special folder named \xd2Shutdown Items\xd3 """
-	which = 'shdf'
-	want = 'obj '
-class startup_items_folder(aetools.NProperty):
-	"""startup items folder - the special folder named \xd2Startup Items\xd3 """
-	which = 'strt'
-	want = 'obj '
-class system_folder(aetools.NProperty):
-	"""system folder - the System folder """
-	which = 'macs'
-	want = 'obj '
-class temporary_items_folder(aetools.NProperty):
-	"""temporary items folder - the special folder named \xd2Temporary Items\xd3 (invisible) """
-	which = 'temp'
-	want = 'obj '
 application._superclassnames = []
-import Files_and_suitcases
-import Containers_and_folders
-import Earlier_terms
+import Files
 import Window_classes
-import Process_classes
+import Containers_and_folders
+import Finder_items
 application._privpropdict = {
 	'Finder_preferences' : Finder_preferences,
-	'about_this_computer' : about_this_computer,
 	'clipboard' : clipboard,
 	'desktop' : desktop,
-	'execution_state' : execution_state,
-	'file_sharing' : file_sharing,
 	'frontmost' : frontmost,
+	'home' : home,
 	'insertion_location' : insertion_location,
-	'largest_free_block' : largest_free_block,
 	'name' : name,
 	'product_version' : product_version,
 	'selection' : selection,
-	'sharing_starting_up' : sharing_starting_up,
+	'startup_disk' : startup_disk,
+	'trash' : trash,
 	'version' : version,
 	'visible' : visible,
 }
 application._privelemdict = {
-	'accessory_process' : Earlier_terms.accessory_process,
-	'alias_file' : Files_and_suitcases.alias_file,
-	'application_file' : Files_and_suitcases.application_file,
-	'application_process' : Process_classes.application_process,
-	'clipping' : Files_and_suitcases.clipping,
+	'Finder_window' : Window_classes.Finder_window,
+	'alias_file' : Files.alias_file,
+	'application_file' : Files.application_file,
+	'clipping' : Files.clipping,
 	'clipping_window' : Window_classes.clipping_window,
 	'container' : Containers_and_folders.container,
-	'container_window' : Earlier_terms.container_window,
-	'content_space' : Window_classes.content_space,
-	'desk_accessory_file' : Files_and_suitcases.desk_accessory_file,
-	'desk_accessory_suitcase' : Files_and_suitcases.desk_accessory_suitcase,
 	'disk' : Containers_and_folders.disk,
-	'document_file' : Files_and_suitcases.document_file,
-	'file' : Files_and_suitcases.file,
+	'document_file' : Files.document_file,
+	'file' : Files.file,
 	'folder' : Containers_and_folders.folder,
-	'font_file' : Files_and_suitcases.font_file,
-	'font_suitcase' : Files_and_suitcases.font_suitcase,
-	'information_window' : Earlier_terms.information_window,
-	'internet_location_file' : Files_and_suitcases.internet_location_file,
-	'item' : Earlier_terms.item,
-	'package' : Files_and_suitcases.package,
-	'process' : Earlier_terms.process,
-	'sharable_container' : Containers_and_folders.sharable_container,
-	'sound_file' : Files_and_suitcases.sound_file,
-	'suitcase' : Files_and_suitcases.suitcase,
-	'view_options_window' : Window_classes.view_options_window,
-	'window' : Earlier_terms.window,
-}
-special_folders._superclassnames = []
-special_folders._privpropdict = {
-	'apple_menu_items_folder' : apple_menu_items_folder,
-	'control_panels_folder' : control_panels_folder,
-	'extensions_folder' : extensions_folder,
-	'fonts_folder' : fonts_folder,
-	'preferences_folder' : preferences_folder,
-	'shutdown_items_folder' : shutdown_items_folder,
-	'startup_items_folder' : startup_items_folder,
-	'system_folder' : system_folder,
-	'temporary_items_folder' : temporary_items_folder,
-}
-special_folders._privelemdict = {
+	'internet_location_file' : Files.internet_location_file,
+	'item' : Finder_items.item,
+	'package' : Files.package,
+	'window' : Window_classes.window,
 }
 
 #
@@ -343,32 +169,20 @@
 #
 _classdeclarations = {
 	'capp' : application,
-	'spfl' : special_folders,
 }
 
 _propdeclarations = {
-	'abbx' : about_this_computer,
-	'amnu' : apple_menu_items_folder,
-	'ctrl' : control_panels_folder,
 	'desk' : desktop,
-	'exec' : execution_state,
-	'extn' : extensions_folder,
-	'font' : fonts_folder,
-	'fshr' : file_sharing,
-	'fsup' : sharing_starting_up,
-	'macs' : system_folder,
-	'mfre' : largest_free_block,
+	'home' : home,
 	'pcli' : clipboard,
 	'pfrp' : Finder_preferences,
 	'pins' : insertion_location,
 	'pisf' : frontmost,
 	'pnam' : name,
-	'pref' : preferences_folder,
 	'pvis' : visible,
+	'sdsk' : startup_disk,
 	'sele' : selection,
-	'shdf' : shutdown_items_folder,
-	'strt' : startup_items_folder,
-	'temp' : temporary_items_folder,
+	'trsh' : trash,
 	'ver2' : product_version,
 	'vers' : version,
 }
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Finder_items.py b/Lib/plat-mac/lib-scriptpackages/Finder/Finder_items.py
index 68f1b38..c7856cf 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Finder_items.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Finder_items.py
@@ -1,7 +1,7 @@
 """Suite Finder items: Commands used with file system items, and basic item definition
 Level 1, version 1
 
-Generated from /Volumes/Moes/Systeemmap/Finder
+Generated from /System/Library/CoreServices/Finder.app
 AETE/AEUT resource version 0/144, language 0, script 0
 """
 
@@ -13,7 +13,7 @@
 class Finder_items_Events:
 
 	def add_to_favorites(self, _object, _attributes={}, **_arguments):
-		"""add to favorites: Add the items to the Favorites menu in the Apple Menu and in Open and Save dialogs
+		"""add to favorites: (NOT AVAILABLE YET) Add the items to the user\xd5s Favorites
 		Required argument: the items to add to the collection of Favorites
 		Keyword argument _attributes: AppleEvent attribute dictionary
 		"""
@@ -37,7 +37,7 @@
 	}
 
 	def clean_up(self, _object, _attributes={}, **_arguments):
-		"""clean up: Arrange items in window nicely (only applies to open windows in icon or button views that are not kept arranged)
+		"""clean up: (NOT AVAILABLE YET) Arrange items in window nicely (only applies to open windows in icon view that are not kept arranged)
 		Required argument: the window to clean up
 		Keyword argument by: the order in which to clean up the objects (name, index, date, etc.)
 		Keyword argument _attributes: AppleEvent attribute dictionary
@@ -58,8 +58,8 @@
 			return _arguments['----']
 
 	def eject(self, _object=None, _attributes={}, **_arguments):
-		"""eject: Eject the specified disk(s), or every ejectable disk if no parameter is specified
-		Required argument: the items to eject
+		"""eject: Eject the specified disk(s)
+		Required argument: the disk(s) to eject
 		Keyword argument _attributes: AppleEvent attribute dictionary
 		"""
 		_code = 'fndr'
@@ -98,7 +98,7 @@
 			return _arguments['----']
 
 	def erase(self, _object, _attributes={}, **_arguments):
-		"""erase: Erase the specified disk(s)
+		"""erase: (NOT AVAILABLE) Erase the specified disk(s)
 		Required argument: the items to erase
 		Keyword argument _attributes: AppleEvent attribute dictionary
 		"""
@@ -117,33 +117,6 @@
 		if _arguments.has_key('----'):
 			return _arguments['----']
 
-	_argmap_put_away = {
-		'asking' : 'fask',
-	}
-
-	def put_away(self, _object, _attributes={}, **_arguments):
-		"""put away: Put away the specified object(s)
-		Required argument: the items to put away
-		Keyword argument asking: Specifies whether or not to present a dialog to confirm putting this item away.
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: the object put away in its put-away location
-		"""
-		_code = 'fndr'
-		_subcode = 'ptwy'
-
-		aetools.keysubst(_arguments, self._argmap_put_away)
-		_arguments['----'] = _object
-
-		aetools.enumsubst(_arguments, 'fask', _Enum_bool)
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
 	def reveal(self, _object, _attributes={}, **_arguments):
 		"""reveal: Bring the specified object(s) into view
 		Required argument: the object to be made visible
@@ -164,15 +137,22 @@
 		if _arguments.has_key('----'):
 			return _arguments['----']
 
+	_argmap_update = {
+		'necessity' : 'nec?',
+		'registering_applications' : 'reg?',
+	}
+
 	def update(self, _object, _attributes={}, **_arguments):
 		"""update: Update the display of the specified object(s) to match their on-disk representation
 		Required argument: the item to update
+		Keyword argument necessity: only update if necessary (i.e. a finder window is open).  default is false
+		Keyword argument registering_applications: register applications. default is true
 		Keyword argument _attributes: AppleEvent attribute dictionary
 		"""
 		_code = 'fndr'
 		_subcode = 'fupd'
 
-		if _arguments: raise TypeError, 'No optional args expected'
+		aetools.keysubst(_arguments, self._argmap_update)
 		_arguments['----'] = _object
 
 
@@ -195,15 +175,11 @@
 class comment(aetools.NProperty):
 	"""comment - the comment of the item, displayed in the \xd2Get Info\xd3 window """
 	which = 'comt'
-	want = 'itxt'
+	want = 'utxt'
 class container(aetools.NProperty):
 	"""container - the container of the item """
 	which = 'ctnr'
 	want = 'obj '
-class content_space(aetools.NProperty):
-	"""content space - the window that would open if the item was opened """
-	which = 'dwnd'
-	want = 'obj '
 class creation_date(aetools.NProperty):
 	"""creation date - the date on which the item was created """
 	which = 'ascd'
@@ -211,23 +187,35 @@
 class description(aetools.NProperty):
 	"""description - a description of the item """
 	which = 'dscr'
-	want = 'itxt'
+	want = 'utxt'
 class disk(aetools.NProperty):
 	"""disk - the disk on which the item is stored """
 	which = 'cdis'
 	want = 'obj '
-class folder(aetools.NProperty):
-	"""folder - the folder in which the item is stored """
-	which = 'asdr'
-	want = 'obj '
+class displayed_name(aetools.NProperty):
+	"""displayed name - the user-visible name of the item """
+	which = 'dnam'
+	want = 'utxt'
+class everyones_privileges(aetools.NProperty):
+	"""everyones privileges -  """
+	which = 'gstp'
+	want = 'priv'
+class extension_hidden(aetools.NProperty):
+	"""extension hidden - Is the item's extension hidden from the user? """
+	which = 'hidx'
+	want = 'bool'
+class group(aetools.NProperty):
+	"""group - the user or group that has special access to the container """
+	which = 'sgrp'
+	want = 'utxt'
+class group_privileges(aetools.NProperty):
+	"""group privileges -  """
+	which = 'gppr'
+	want = 'priv'
 class icon(aetools.NProperty):
 	"""icon - the icon bitmap of the item """
 	which = 'iimg'
 	want = 'ifam'
-class id(aetools.NProperty):
-	"""id - an id that identifies the item """
-	which = 'ID  '
-	want = 'long'
 class index(aetools.NProperty):
 	"""index - the index in the front-to-back ordering within its container """
 	which = 'pidx'
@@ -239,11 +227,15 @@
 class kind(aetools.NProperty):
 	"""kind - the kind of the item """
 	which = 'kind'
-	want = 'itxt'
+	want = 'utxt'
 class label_index(aetools.NProperty):
 	"""label index - the label of the item """
 	which = 'labi'
 	want = 'long'
+class locked(aetools.NProperty):
+	"""locked - Is the file locked? """
+	which = 'aslk'
+	want = 'bool'
 class modification_date(aetools.NProperty):
 	"""modification date - the date on which the item was last modified """
 	which = 'asmo'
@@ -251,27 +243,39 @@
 class name(aetools.NProperty):
 	"""name - the name of the item """
 	which = 'pnam'
-	want = 'itxt'
+	want = 'utxt'
+class name_extension(aetools.NProperty):
+	"""name extension - the name extension of the item (such as \xd2txt\xd3) """
+	which = 'nmxt'
+	want = 'utxt'
+class owner(aetools.NProperty):
+	"""owner - the user that owns the container """
+	which = 'sown'
+	want = 'utxt'
+class owner_privileges(aetools.NProperty):
+	"""owner privileges -  """
+	which = 'ownr'
+	want = 'priv'
 class physical_size(aetools.NProperty):
 	"""physical size - the actual space used by the item on disk """
 	which = 'phys'
-	want = 'long'
+	want = 'comp'
 class position(aetools.NProperty):
 	"""position - the position of the item within its parent window (can only be set for an item in a window viewed as icons or buttons) """
 	which = 'posn'
 	want = 'QDpt'
-class selected(aetools.NProperty):
-	"""selected - Is the item selected? """
-	which = 'issl'
-	want = 'bool'
+class properties(aetools.NProperty):
+	"""properties - every property of an item """
+	which = 'pALL'
+	want = 'reco'
 class size(aetools.NProperty):
 	"""size - the logical size of the item """
 	which = 'ptsz'
-	want = 'long'
-class window(aetools.NProperty):
-	"""window - the window that would open if the item was opened """
-	which = 'cwin'
-	want = 'obj '
+	want = 'comp'
+class url(aetools.NProperty):
+	"""url - the url of the item """
+	which = 'pURL'
+	want = 'utxt'
 
 items = item
 item._superclassnames = []
@@ -279,28 +283,33 @@
 	'bounds' : bounds,
 	'comment' : comment,
 	'container' : container,
-	'content_space' : content_space,
 	'creation_date' : creation_date,
 	'description' : description,
 	'disk' : disk,
-	'folder' : folder,
+	'displayed_name' : displayed_name,
+	'everyones_privileges' : everyones_privileges,
+	'extension_hidden' : extension_hidden,
+	'group' : group,
+	'group_privileges' : group_privileges,
 	'icon' : icon,
-	'id' : id,
 	'index' : index,
 	'information_window' : information_window,
 	'kind' : kind,
 	'label_index' : label_index,
+	'locked' : locked,
 	'modification_date' : modification_date,
 	'name' : name,
+	'name_extension' : name_extension,
+	'owner' : owner,
+	'owner_privileges' : owner_privileges,
 	'physical_size' : physical_size,
 	'position' : position,
-	'selected' : selected,
+	'properties' : properties,
 	'size' : size,
-	'window' : window,
+	'url' : url,
 }
 item._privelemdict = {
 }
-_Enum_bool = None # XXXX enum bool not found!!
 
 #
 # Indices of types declared in this module
@@ -310,27 +319,33 @@
 }
 
 _propdeclarations = {
-	'ID  ' : id,
 	'ascd' : creation_date,
-	'asdr' : folder,
+	'aslk' : locked,
 	'asmo' : modification_date,
 	'cdis' : disk,
 	'comt' : comment,
 	'ctnr' : container,
-	'cwin' : window,
+	'dnam' : displayed_name,
 	'dscr' : description,
-	'dwnd' : content_space,
+	'gppr' : group_privileges,
+	'gstp' : everyones_privileges,
+	'hidx' : extension_hidden,
 	'iimg' : icon,
-	'issl' : selected,
 	'iwnd' : information_window,
 	'kind' : kind,
 	'labi' : label_index,
+	'nmxt' : name_extension,
+	'ownr' : owner_privileges,
+	'pALL' : properties,
+	'pURL' : url,
 	'pbnd' : bounds,
 	'phys' : physical_size,
 	'pidx' : index,
 	'pnam' : name,
 	'posn' : position,
 	'ptsz' : size,
+	'sgrp' : group,
+	'sown' : owner,
 }
 
 _compdeclarations = {
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Process_classes.py b/Lib/plat-mac/lib-scriptpackages/Finder/Legacy_suite.py
similarity index 63%
rename from Lib/plat-mac/lib-scriptpackages/Finder/Process_classes.py
rename to Lib/plat-mac/lib-scriptpackages/Finder/Legacy_suite.py
index 3ca857f..cfbb650 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Process_classes.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Legacy_suite.py
@@ -1,19 +1,82 @@
-"""Suite Process classes: Classes representing processes that are running
+"""Suite Legacy suite: Operations formerly handled by the Finder, but now automatically delegated to other applications
 Level 1, version 1
 
-Generated from /Volumes/Moes/Systeemmap/Finder
+Generated from /System/Library/CoreServices/Finder.app
 AETE/AEUT resource version 0/144, language 0, script 0
 """
 
 import aetools
 import MacOS
 
-_code = 'fndr'
+_code = 'fleg'
 
-class Process_classes_Events:
+class Legacy_suite_Events:
 
-	pass
+	def restart(self, _no_object=None, _attributes={}, **_arguments):
+		"""restart: Restart the computer
+		Keyword argument _attributes: AppleEvent attribute dictionary
+		"""
+		_code = 'fndr'
+		_subcode = 'rest'
 
+		if _arguments: raise TypeError, 'No optional args expected'
+		if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+		_reply, _arguments, _attributes = self.send(_code, _subcode,
+				_arguments, _attributes)
+		if _arguments.get('errn', 0):
+			raise aetools.Error, aetools.decodeerror(_arguments)
+		# XXXX Optionally decode result
+		if _arguments.has_key('----'):
+			return _arguments['----']
+
+	def shut_down(self, _no_object=None, _attributes={}, **_arguments):
+		"""shut down: Shut Down the computer
+		Keyword argument _attributes: AppleEvent attribute dictionary
+		"""
+		_code = 'fndr'
+		_subcode = 'shut'
+
+		if _arguments: raise TypeError, 'No optional args expected'
+		if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+		_reply, _arguments, _attributes = self.send(_code, _subcode,
+				_arguments, _attributes)
+		if _arguments.get('errn', 0):
+			raise aetools.Error, aetools.decodeerror(_arguments)
+		# XXXX Optionally decode result
+		if _arguments.has_key('----'):
+			return _arguments['----']
+
+	def sleep(self, _no_object=None, _attributes={}, **_arguments):
+		"""sleep: Put the computer to sleep
+		Keyword argument _attributes: AppleEvent attribute dictionary
+		"""
+		_code = 'fndr'
+		_subcode = 'slep'
+
+		if _arguments: raise TypeError, 'No optional args expected'
+		if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+		_reply, _arguments, _attributes = self.send(_code, _subcode,
+				_arguments, _attributes)
+		if _arguments.get('errn', 0):
+			raise aetools.Error, aetools.decodeerror(_arguments)
+		# XXXX Optionally decode result
+		if _arguments.has_key('----'):
+			return _arguments['----']
+
+
+class application(aetools.ComponentItem):
+	"""application - The Finder """
+	want = 'capp'
+class desktop_picture(aetools.NProperty):
+	"""desktop picture - the desktop picture of the main monitor """
+	which = 'dpic'
+	want = 'file'
 
 class application_process(aetools.ComponentItem):
 	"""application process - A process launched from an application file """
@@ -88,6 +151,12 @@
 	want = 'bool'
 
 processes = process
+application._superclassnames = []
+application._privpropdict = {
+	'desktop_picture' : desktop_picture,
+}
+application._privelemdict = {
+}
 application_process._superclassnames = ['process']
 application_process._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
@@ -123,6 +192,7 @@
 # Indices of types declared in this module
 #
 _classdeclarations = {
+	'capp' : application,
 	'pcap' : application_process,
 	'pcda' : desk_accessory_process,
 	'prcs' : process,
@@ -134,6 +204,7 @@
 	'asty' : file_type,
 	'c@#^' : _3c_Inheritance_3e_,
 	'dafi' : desk_accessory_file,
+	'dpic' : desktop_picture,
 	'fcrt' : creator_type,
 	'file' : file,
 	'hscr' : has_scripting_terminology,
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Obsolete_terms.py b/Lib/plat-mac/lib-scriptpackages/Finder/Obsolete_terms.py
deleted file mode 100644
index 6904586..0000000
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Obsolete_terms.py
+++ /dev/null
@@ -1,220 +0,0 @@
-"""Suite Obsolete terms: Terms that have been deprecated
-Level 1, version 1
-
-Generated from /Volumes/Moes/Systeemmap/Finder
-AETE/AEUT resource version 0/144, language 0, script 0
-"""
-
-import aetools
-import MacOS
-
-_code = 'tpnm'
-
-from StdSuites.Type_Names_Suite import *
-class Obsolete_terms_Events(Type_Names_Suite_Events):
-
-	pass
-
-
-class application(aetools.ComponentItem):
-	"""application - The Finder """
-	want = 'capp'
-class view_preferences(aetools.NProperty):
-	"""view preferences - backwards compatibility with Finder Scripting Extension. DEPRECATED -- not supported after Finder 8.0 """
-	which = 'pvwp'
-	want = 'obj '
-
-class container(aetools.ComponentItem):
-	"""container - An item that contains other items """
-	want = 'ctnr'
-class container_window(aetools.NProperty):
-	"""container window - the main window for the container """
-	which = 'cwnd'
-	want = 'obj '
-
-class container_window(aetools.ComponentItem):
-	"""container window - A window that contains items """
-	want = 'cwnd'
-class folder_obsolete(aetools.NProperty):
-	"""folder obsolete - the folder from which the window was opened (DEPRECATED - for use with scripts compiled before Finder 8.0. Will be removed in the next release.) """
-	which = 'cfol'
-	want = 'obj '
-
-class control_panel(aetools.ComponentItem):
-	"""control panel - A control panel """
-	want = 'ccdv'
-
-control_panels = control_panel
-
-class file(aetools.ComponentItem):
-	"""file - A file """
-	want = 'file'
-class file_type_obsolete(aetools.NProperty):
-	"""file type obsolete - the OSType identifying the type of data contained in the item (DEPRECATED - for use with scripts compiled before Finder 8.0. Will be removed in the next release) """
-	which = 'fitp'
-	want = 'type'
-class locked_obsolete(aetools.NProperty):
-	"""locked obsolete - Is the file locked? (DEPRECATED - for use with scripts compiled before Finder 8.0. Will be removed in the next release) """
-	which = 'islk'
-	want = 'bool'
-
-class information_window(aetools.ComponentItem):
-	"""information window - An information window (opened by \xd2Get Info\xd3) """
-	want = 'iwnd'
-class creation_date_obsolete(aetools.NProperty):
-	"""creation date obsolete - the date on which the item was created (DEPRECATED - for use with scripts compiled before Finder 8.0. Will be removed in the next release) """
-	which = 'crtd'
-	want = 'ldt '
-class modification_date_obsolete(aetools.NProperty):
-	"""modification date obsolete - the date on which the item was last modified (DEPRECATED - for use with scripts compiled before Finder 8.0. Will be removed in the next release) """
-	which = 'modd'
-	want = 'ldt '
-
-class item(aetools.ComponentItem):
-	"""item - An item """
-	want = 'cobj'
-
-class process(aetools.ComponentItem):
-	"""process - A process running on this computer """
-	want = 'prcs'
-
-class sharable_container(aetools.ComponentItem):
-	"""sharable container - A container that may be shared (disks and folders) """
-	want = 'sctr'
-class sharing_window(aetools.NProperty):
-	"""sharing window - the sharing window for the container (file sharing must be on to use this property) """
-	which = 'swnd'
-	want = 'obj '
-
-class sharing_window(aetools.ComponentItem):
-	"""sharing window - A sharing window (opened by \xd2Sharing\xc9\xd3) """
-	want = 'swnd'
-class container(aetools.NProperty):
-	"""container - the container from which this window was opened """
-	which = 'ctnr'
-	want = 'obj '
-class item(aetools.NProperty):
-	"""item - the item from which this window was opened """
-	which = 'cobj'
-	want = 'obj '
-class sharable_container(aetools.NProperty):
-	"""sharable container - the sharable container from which the window was opened """
-	which = 'sctr'
-	want = 'obj '
-
-sharing_windows = sharing_window
-
-class status_window(aetools.ComponentItem):
-	"""status window - Progress dialogs (e.g., copy window, rebuild desktop database, empty trash) """
-	want = 'qwnd'
-
-status_windows = status_window
-application._superclassnames = []
-application._privpropdict = {
-	'view_preferences' : view_preferences,
-}
-application._privelemdict = {
-}
-container._superclassnames = []
-container._privpropdict = {
-	'container_window' : container_window,
-}
-container._privelemdict = {
-}
-container_window._superclassnames = []
-container_window._privpropdict = {
-	'folder_obsolete' : folder_obsolete,
-}
-container_window._privelemdict = {
-}
-control_panel._superclassnames = []
-control_panel._privpropdict = {
-}
-control_panel._privelemdict = {
-}
-file._superclassnames = []
-file._privpropdict = {
-	'file_type_obsolete' : file_type_obsolete,
-	'locked_obsolete' : locked_obsolete,
-}
-file._privelemdict = {
-}
-information_window._superclassnames = []
-information_window._privpropdict = {
-	'creation_date_obsolete' : creation_date_obsolete,
-	'locked_obsolete' : locked_obsolete,
-	'modification_date_obsolete' : modification_date_obsolete,
-}
-information_window._privelemdict = {
-}
-item._superclassnames = []
-item._privpropdict = {
-	'creation_date_obsolete' : creation_date_obsolete,
-	'folder_obsolete' : folder_obsolete,
-	'modification_date_obsolete' : modification_date_obsolete,
-}
-item._privelemdict = {
-}
-process._superclassnames = []
-process._privpropdict = {
-	'file_type_obsolete' : file_type_obsolete,
-}
-process._privelemdict = {
-}
-sharable_container._superclassnames = []
-sharable_container._privpropdict = {
-	'sharing_window' : sharing_window,
-}
-sharable_container._privelemdict = {
-}
-sharing_window._superclassnames = []
-sharing_window._privpropdict = {
-	'container' : container,
-	'folder_obsolete' : folder_obsolete,
-	'item' : item,
-	'sharable_container' : sharable_container,
-}
-sharing_window._privelemdict = {
-}
-status_window._superclassnames = []
-status_window._privpropdict = {
-}
-status_window._privelemdict = {
-}
-
-#
-# Indices of types declared in this module
-#
-_classdeclarations = {
-	'capp' : application,
-	'ccdv' : control_panel,
-	'cobj' : item,
-	'ctnr' : container,
-	'cwnd' : container_window,
-	'file' : file,
-	'iwnd' : information_window,
-	'prcs' : process,
-	'qwnd' : status_window,
-	'sctr' : sharable_container,
-	'swnd' : sharing_window,
-}
-
-_propdeclarations = {
-	'cfol' : folder_obsolete,
-	'cobj' : item,
-	'crtd' : creation_date_obsolete,
-	'ctnr' : container,
-	'cwnd' : container_window,
-	'fitp' : file_type_obsolete,
-	'islk' : locked_obsolete,
-	'modd' : modification_date_obsolete,
-	'pvwp' : view_preferences,
-	'sctr' : sharable_container,
-	'swnd' : sharing_window,
-}
-
-_compdeclarations = {
-}
-
-_enumdeclarations = {
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Standard_Suite.py b/Lib/plat-mac/lib-scriptpackages/Finder/Standard_Suite.py
index ff2a1dc..bbd4705 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Standard_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Standard_Suite.py
@@ -1,7 +1,7 @@
 """Suite Standard Suite: Common terms that most applications should support
 Level 1, version 1
 
-Generated from /Volumes/Moes/Systeemmap/Finder
+Generated from /System/Library/CoreServices/Finder.app
 AETE/AEUT resource version 0/144, language 0, script 0
 """
 
@@ -170,7 +170,7 @@
 		"""make: Make a new element
 		Keyword argument new: the class of the new element
 		Keyword argument at: the location at which to insert the element
-		Keyword argument to: when creating an alias file, the original item to create an alias to
+		Keyword argument to: when creating an alias file, the original item to create an alias to or when creating a file viewer window, the target of the window
 		Keyword argument with_properties: the initial values for the properties of the element
 		Keyword argument _attributes: AppleEvent attribute dictionary
 		Returns: to the new object(s)
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Type_Definitions.py b/Lib/plat-mac/lib-scriptpackages/Finder/Type_Definitions.py
index d12a0ed..3a74758 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Type_Definitions.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Type_Definitions.py
@@ -1,7 +1,7 @@
 """Suite Type Definitions: Definitions of records used in scripting the Finder
 Level 1, version 1
 
-Generated from /Volumes/Moes/Systeemmap/Finder
+Generated from /System/Library/CoreServices/Finder.app
 AETE/AEUT resource version 0/144, language 0, script 0
 """
 
@@ -19,8 +19,34 @@
 	"""alias list - A list of aliases.  Use \xd4as alias list\xd5 when a list of aliases is needed (instead of a list of file system item references). """
 	want = 'alst'
 
+class column(aetools.ComponentItem):
+	"""column - a column of a list view """
+	want = 'lvcl'
+class index(aetools.NProperty):
+	"""index - the index in the front-to-back ordering within its container """
+	which = 'pidx'
+	want = 'long'
+class name(aetools.NProperty):
+	"""name - the column name """
+	which = 'pnam'
+	want = 'elsv'
+class sort_direction(aetools.NProperty):
+	"""sort direction - The direction in which the window is sorted """
+	which = 'sord'
+	want = 'sodr'
+class visible(aetools.NProperty):
+	"""visible - is this column visible """
+	which = 'pvis'
+	want = 'bool'
+class width(aetools.NProperty):
+	"""width - the width of this column """
+	which = 'clwd'
+	want = 'shor'
+
+columns = column
+
 class icon_family(aetools.ComponentItem):
-	"""icon family - A family of icons """
+	"""icon family - (NOT AVAILABLE YET) A family of icons """
 	want = 'ifam'
 class large_32_bit_icon(aetools.NProperty):
 	"""large 32 bit icon - the large 32-bit color icon """
@@ -61,24 +87,45 @@
 	which = 'ics#'
 	want = 'ics#'
 
+class icon_view_options(aetools.ComponentItem):
+	"""icon view options - the icon view options """
+	want = 'icop'
+class arrangement(aetools.NProperty):
+	"""arrangement - the property by which to keep icons arranged """
+	which = 'iarr'
+	want = 'earr'
+class icon_size(aetools.NProperty):
+	"""icon size - the size of icons displayed in the icon view """
+	which = 'lvis'
+	want = 'shor'
+
 class label(aetools.ComponentItem):
-	"""label - A Finder label (name and color) """
+	"""label - (NOT AVAILABLE YET) A Finder label (name and color) """
 	want = 'clbl'
 class color(aetools.NProperty):
 	"""color - the color associated with the label """
 	which = 'colr'
 	want = 'cRGB'
-class index(aetools.NProperty):
-	"""index - the index in the front-to-back ordering within its container """
-	which = 'pidx'
-	want = 'long'
-class name(aetools.NProperty):
-	"""name - the name associated with the label """
-	which = 'pnam'
-	want = 'itxt'
+
+class list_view_options(aetools.ComponentItem):
+	"""list view options - the list view options """
+	want = 'lvop'
+class calculates_folder_sizes(aetools.NProperty):
+	"""calculates folder sizes - Are folder sizes calculated and displayed in the window? """
+	which = 'sfsz'
+	want = 'bool'
+class sort_column(aetools.NProperty):
+	"""sort column - the column that the list view is sorted on """
+	which = 'srtc'
+	want = 'lvcl'
+class uses_relative_dates(aetools.NProperty):
+	"""uses relative dates - Are relative dates (e.g., today, yesterday) shown in the list view? """
+	which = 'urdt'
+	want = 'bool'
+#        element 'lvcl' as ['indx', 'rele', 'rang', 'test']
 
 class preferences(aetools.ComponentItem):
-	"""preferences - The Finder Preferences """
+	"""preferences - (NOT AVAILABLE, SUBJECT TO CHANGE) The Finder Preferences """
 	want = 'cprf'
 class button_view_arrangement(aetools.NProperty):
 	"""button view arrangement - the method of arrangement of icons in default Finder button view windows """
@@ -88,10 +135,6 @@
 	"""button view icon size - the size of icons displayed in Finder button view windows. """
 	which = 'bisz'
 	want = 'long'
-class calculates_folder_sizes(aetools.NProperty):
-	"""calculates folder sizes - Are folder sizes calculated and displayed in Finder list view windows? """
-	which = 'sfsz'
-	want = 'bool'
 class delay_before_springing(aetools.NProperty):
 	"""delay before springing - the delay before springing open a container in ticks (1/60th of a second) (12 is shortest delay, 60 is longest delay) """
 	which = 'dela'
@@ -128,10 +171,8 @@
 	"""shows version - Are file versions displayed in default Finder list view windows? """
 	which = 'svrs'
 	want = 'bool'
-class spatial_view_arrangement(aetools.NProperty):
-	"""spatial view arrangement - the method of arrangement of icons in default Finder spatial view windows """
-	which = 'iarr'
-	want = 'earr'
+
+spatial_view_arrangement = arrangement
 class spatial_view_icon_size(aetools.NProperty):
 	"""spatial view icon size - the size of icons displayed in Finder spatial view windows. """
 	which = 'iisz'
@@ -140,10 +181,6 @@
 	"""spring open folders - Spring open folders after the specified delay? """
 	which = 'sprg'
 	want = 'bool'
-class uses_relative_dates(aetools.NProperty):
-	"""uses relative dates - Are relative dates (e.g., today, yesterday) shown  in Finder list view windows? """
-	which = 'urdt'
-	want = 'bool'
 class uses_simple_menus(aetools.NProperty):
 	"""uses simple menus - Use simplified Finder menus? """
 	which = 'usme'
@@ -170,6 +207,16 @@
 }
 alias_list._privelemdict = {
 }
+column._superclassnames = []
+column._privpropdict = {
+	'index' : index,
+	'name' : name,
+	'sort_direction' : sort_direction,
+	'visible' : visible,
+	'width' : width,
+}
+column._privelemdict = {
+}
 icon_family._superclassnames = []
 icon_family._privpropdict = {
 	'large_32_bit_icon' : large_32_bit_icon,
@@ -185,6 +232,13 @@
 }
 icon_family._privelemdict = {
 }
+icon_view_options._superclassnames = []
+icon_view_options._privpropdict = {
+	'arrangement' : arrangement,
+	'icon_size' : icon_size,
+}
+icon_view_options._privelemdict = {
+}
 label._superclassnames = []
 label._privpropdict = {
 	'color' : color,
@@ -193,6 +247,16 @@
 }
 label._privelemdict = {
 }
+list_view_options._superclassnames = []
+list_view_options._privpropdict = {
+	'calculates_folder_sizes' : calculates_folder_sizes,
+	'icon_size' : icon_size,
+	'sort_column' : sort_column,
+	'uses_relative_dates' : uses_relative_dates,
+}
+list_view_options._privelemdict = {
+	'column' : column,
+}
 preferences._superclassnames = []
 preferences._privpropdict = {
 	'button_view_arrangement' : button_view_arrangement,
@@ -228,17 +292,21 @@
 	'alst' : alias_list,
 	'clbl' : label,
 	'cprf' : preferences,
+	'icop' : icon_view_options,
 	'ifam' : icon_family,
+	'lvcl' : column,
+	'lvop' : list_view_options,
 }
 
 _propdeclarations = {
 	'ICN#' : large_monochrome_icon_and_mask,
 	'barr' : button_view_arrangement,
 	'bisz' : button_view_icon_size,
+	'clwd' : width,
 	'colr' : color,
 	'cwin' : window,
 	'dela' : delay_before_springing,
-	'iarr' : spatial_view_arrangement,
+	'iarr' : arrangement,
 	'icl4' : large_4_bit_icon,
 	'icl8' : large_8_bit_icon,
 	'ics#' : small_monochrome_icon_and_mask,
@@ -249,15 +317,19 @@
 	'is32' : small_32_bit_icon,
 	'l8mk' : large_8_bit_mask,
 	'lisz' : list_view_icon_size,
+	'lvis' : icon_size,
 	'pidx' : index,
 	'pnam' : name,
+	'pvis' : visible,
 	'scda' : shows_creation_date,
 	'scom' : shows_comments,
 	'sdat' : shows_modification_date,
 	'sfsz' : calculates_folder_sizes,
 	'sknd' : shows_kind,
 	'slbl' : shows_label,
+	'sord' : sort_direction,
 	'sprg' : spring_open_folders,
+	'srtc' : sort_column,
 	'ssiz' : shows_size,
 	'svrs' : shows_version,
 	'urdt' : uses_relative_dates,
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Window_classes.py b/Lib/plat-mac/lib-scriptpackages/Finder/Window_classes.py
index 9c70beb..c09283c 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Window_classes.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Window_classes.py
@@ -1,7 +1,7 @@
 """Suite Window classes: Classes representing windows
 Level 1, version 1
 
-Generated from /Volumes/Moes/Systeemmap/Finder
+Generated from /System/Library/CoreServices/Finder.app
 AETE/AEUT resource version 0/144, language 0, script 0
 """
 
@@ -15,172 +15,54 @@
 	pass
 
 
-class clipping_window(aetools.ComponentItem):
-	"""clipping window - The window containing a clipping """
-	want = 'lwnd'
+class Finder_window(aetools.ComponentItem):
+	"""Finder window - A file viewer window """
+	want = 'brow'
 class _3c_Inheritance_3e_(aetools.NProperty):
 	"""<Inheritance> - inherits some of its properties from the window class """
 	which = 'c@#^'
 	want = 'cwin'
+class current_view(aetools.NProperty):
+	"""current view - the current view for the container window """
+	which = 'pvew'
+	want = 'ecvw'
+class icon_view_options(aetools.NProperty):
+	"""icon view options - the icon view options for the container window """
+	which = 'icop'
+	want = 'icop'
+class list_view_options(aetools.NProperty):
+	"""list view options - the list view options for the container window """
+	which = 'lvop'
+	want = 'lvop'
+class target(aetools.NProperty):
+	"""target - the container at which this file viewer is targeted """
+	which = 'fvtg'
+	want = 'obj '
+
+Finder_windows = Finder_window
+
+class clipping_window(aetools.ComponentItem):
+	"""clipping window - The window containing a clipping """
+	want = 'lwnd'
 
 clipping_windows = clipping_window
 
-class container_window(aetools.ComponentItem):
-	"""container window - A window that contains items """
-	want = 'cwnd'
-class button_view_arrangement(aetools.NProperty):
-	"""button view arrangement - the property by which to keep icons arranged within a button view window """
-	which = 'barr'
-	want = 'earr'
-class calculates_folder_sizes(aetools.NProperty):
-	"""calculates folder sizes - Are folder sizes calculated and displayed in the window? (does not apply to suitcase windows) """
-	which = 'sfsz'
-	want = 'bool'
-class container(aetools.NProperty):
-	"""container - the container from which the window was opened """
-	which = 'ctnr'
-	want = 'obj '
-class has_custom_view_settings(aetools.NProperty):
-	"""has custom view settings - Does the folder have custom view settings or is it using the default global settings? """
-	which = 'cuss'
-	want = 'bool'
-class item(aetools.NProperty):
-	"""item - the item from which the window was opened (always returns something) """
-	which = 'cobj'
-	want = 'obj '
-class previous_list_view(aetools.NProperty):
-	"""previous list view - the last non-icon view (by name, by date, etc.) selected for the container (forgotten as soon as the window is closed and only available when the window is open) """
-	which = 'svew'
-	want = 'enum'
-class shows_comments(aetools.NProperty):
-	"""shows comments - Are comments displayed in the window? (does not apply to suitcases) """
-	which = 'scom'
-	want = 'bool'
-class shows_creation_date(aetools.NProperty):
-	"""shows creation date - Are creation dates displayed in the window? """
-	which = 'scda'
-	want = 'bool'
-class shows_kind(aetools.NProperty):
-	"""shows kind - Are document kinds displayed in the window? """
-	which = 'sknd'
-	want = 'bool'
-class shows_label(aetools.NProperty):
-	"""shows label - Are labels displayed in the window? """
-	which = 'slbl'
-	want = 'bool'
-class shows_modification_date(aetools.NProperty):
-	"""shows modification date - Are modification dates displayed in the window? """
-	which = 'sdat'
-	want = 'bool'
-class shows_size(aetools.NProperty):
-	"""shows size - Are file sizes displayed in the window? """
-	which = 'ssiz'
-	want = 'bool'
-class shows_version(aetools.NProperty):
-	"""shows version - Are file versions displayed in the window? (does not apply to suitcase windows) """
-	which = 'svrs'
-	want = 'bool'
-class sort_direction(aetools.NProperty):
-	"""sort direction - The direction in which the window is sorted """
-	which = 'sord'
-	want = 'sodr'
-class spatial_view_arrangement(aetools.NProperty):
-	"""spatial view arrangement - the property by which to keep icons arranged within a spatial view window """
-	which = 'iarr'
-	want = 'earr'
-class uses_relative_dates(aetools.NProperty):
-	"""uses relative dates - Are relative dates (e.g., today, yesterday) shown in the window? """
-	which = 'urdt'
-	want = 'bool'
-class view(aetools.NProperty):
-	"""view - the current view for the window (icon, name, date, etc.) """
-	which = 'pvew'
-	want = 'long'
-
-container_windows = container_window
-
-class content_space(aetools.ComponentItem):
-	"""content space - All windows, including the desktop window (\xd2Window\xd3 does not include the desktop window) """
-	want = 'dwnd'
-
-content_spaces = content_space
-
 class information_window(aetools.ComponentItem):
-	"""information window - An information window (opened by \xd2Get Info\xd3) """
+	"""information window - An inspector window (opened by \xd2Show Info\xd3) """
 	want = 'iwnd'
-class comment(aetools.NProperty):
-	"""comment - the comment """
-	which = 'comt'
-	want = 'itxt'
-class creation_date(aetools.NProperty):
-	"""creation date - the date on which the item was created """
-	which = 'ascd'
-	want = 'ldt '
 class current_panel(aetools.NProperty):
 	"""current panel - the current panel in the information window """
 	which = 'panl'
 	want = 'ipnl'
-class icon(aetools.NProperty):
-	"""icon - the icon bitmap of the item """
-	which = 'iimg'
-	want = 'ifam'
-class locked(aetools.NProperty):
-	"""locked - Is the item locked (applies only to file and application information windows)? """
-	which = 'aslk'
-	want = 'bool'
-class minimum_size(aetools.NProperty):
-	"""minimum size - the smallest memory size with which the application can be launched (only applies to information windows for applications) """
-	which = 'mprt'
-	want = 'long'
-class modification_date(aetools.NProperty):
-	"""modification date - the date on which the item was last modified """
-	which = 'asmo'
-	want = 'ldt '
-class physical_size(aetools.NProperty):
-	"""physical size - the actual space used by the item on disk """
-	which = 'phys'
-	want = 'long'
-class preferred_size(aetools.NProperty):
-	"""preferred size - the memory size with which the application will be launched (only applies to information windows for applications) """
-	which = 'appt'
-	want = 'long'
-class product_version(aetools.NProperty):
-	"""product version - the version of the product (visible at the top of the \xd2Get Info\xd3 window) """
-	which = 'ver2'
-	want = 'itxt'
-class size(aetools.NProperty):
-	"""size - the logical size of the item """
-	which = 'ptsz'
-	want = 'long'
-class stationery(aetools.NProperty):
-	"""stationery - Is the item a stationery pad? """
-	which = 'pspd'
-	want = 'bool'
-class suggested_size(aetools.NProperty):
-	"""suggested size - the memory size with which the developer recommends the application be launched """
-	which = 'sprt'
-	want = 'long'
-class version(aetools.NProperty):
-	"""version - the version of the file (visible at the bottom of the \xd2Get Info\xd3 window) """
-	which = 'vers'
-	want = 'itxt'
-class warns_before_emptying(aetools.NProperty):
-	"""warns before emptying - Display a dialog when emptying the trash (only valid for trash info window)? """
-	which = 'warn'
-	want = 'bool'
-
-information_windows = information_window
+class item(aetools.NProperty):
+	"""item - the item from which this window was opened """
+	which = 'cobj'
+	want = 'obj '
 
 class preferences_window(aetools.ComponentItem):
-	"""preferences window - The Finder Preferences window """
+	"""preferences window - (NOT AVAILABLE YET) The Finder Preferences window """
 	want = 'pwnd'
 
-class view_options_window(aetools.ComponentItem):
-	"""view options window - A View Options window """
-	want = 'vwnd'
-
-view_options_windows = view_options_window
-
 class window(aetools.ComponentItem):
 	"""window - A window """
 	want = 'cwin'
@@ -193,13 +75,17 @@
 	which = 'hclb'
 	want = 'bool'
 class collapsed(aetools.NProperty):
-	"""collapsed - Is the window collapsed (only applies to open non-pop-up windows)? """
+	"""collapsed - Is the window collapsed """
 	which = 'wshd'
 	want = 'bool'
 class floating(aetools.NProperty):
 	"""floating - Does the window have a title bar? """
 	which = 'isfl'
 	want = 'bool'
+class id(aetools.NProperty):
+	"""id - the unique id for this window """
+	which = 'ID  '
+	want = 'magn'
 class index(aetools.NProperty):
 	"""index - the number of the window in the front-to-back layer ordering """
 	which = 'pidx'
@@ -211,19 +97,15 @@
 class name(aetools.NProperty):
 	"""name - the name of the window """
 	which = 'pnam'
-	want = 'itxt'
-class popup(aetools.NProperty):
-	"""popup - Is the window is a pop-up window? (only applies to open container windows in the Finder and can only be set when the Finder is the front application) """
-	which = 'drwr'
-	want = 'bool'
+	want = 'utxt'
 class position(aetools.NProperty):
 	"""position - the upper left position of the window """
 	which = 'posn'
 	want = 'QDpt'
-class pulled_open(aetools.NProperty):
-	"""pulled open - Is the window pulled open (only applies to pop-up windows and can only be set when the Finder is the front application)? """
-	which = 'pull'
-	want = 'bool'
+class properties(aetools.NProperty):
+	"""properties - every property of a window """
+	which = 'pALL'
+	want = 'reco'
 class resizable(aetools.NProperty):
 	"""resizable - Is the window resizable? """
 	which = 'prsz'
@@ -245,64 +127,32 @@
 	which = 'pzum'
 	want = 'bool'
 class zoomed_full_size(aetools.NProperty):
-	"""zoomed full size - Is the window zoomed to the full size of the screen? (can only be set, not read, and only applies to open non-pop-up windows) """
+	"""zoomed full size - Is the window zoomed to the full size of the screen? (can only be set, not read) """
 	which = 'zumf'
 	want = 'bool'
 
 windows = window
+Finder_window._superclassnames = ['window']
+Finder_window._privpropdict = {
+	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'current_view' : current_view,
+	'icon_view_options' : icon_view_options,
+	'list_view_options' : list_view_options,
+	'target' : target,
+}
+Finder_window._privelemdict = {
+}
 clipping_window._superclassnames = ['window']
 clipping_window._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
 }
 clipping_window._privelemdict = {
 }
-container_window._superclassnames = ['window']
-container_window._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'button_view_arrangement' : button_view_arrangement,
-	'calculates_folder_sizes' : calculates_folder_sizes,
-	'container' : container,
-	'has_custom_view_settings' : has_custom_view_settings,
-	'item' : item,
-	'previous_list_view' : previous_list_view,
-	'shows_comments' : shows_comments,
-	'shows_creation_date' : shows_creation_date,
-	'shows_kind' : shows_kind,
-	'shows_label' : shows_label,
-	'shows_modification_date' : shows_modification_date,
-	'shows_size' : shows_size,
-	'shows_version' : shows_version,
-	'sort_direction' : sort_direction,
-	'spatial_view_arrangement' : spatial_view_arrangement,
-	'uses_relative_dates' : uses_relative_dates,
-	'view' : view,
-}
-container_window._privelemdict = {
-}
-content_space._superclassnames = []
-content_space._privpropdict = {
-}
-content_space._privelemdict = {
-}
 information_window._superclassnames = ['window']
 information_window._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'comment' : comment,
-	'creation_date' : creation_date,
 	'current_panel' : current_panel,
-	'icon' : icon,
 	'item' : item,
-	'locked' : locked,
-	'minimum_size' : minimum_size,
-	'modification_date' : modification_date,
-	'physical_size' : physical_size,
-	'preferred_size' : preferred_size,
-	'product_version' : product_version,
-	'size' : size,
-	'stationery' : stationery,
-	'suggested_size' : suggested_size,
-	'version' : version,
-	'warns_before_emptying' : warns_before_emptying,
 }
 information_window._privelemdict = {
 }
@@ -313,25 +163,18 @@
 }
 preferences_window._privelemdict = {
 }
-view_options_window._superclassnames = ['window']
-view_options_window._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'item' : item,
-}
-view_options_window._privelemdict = {
-}
 window._superclassnames = []
 window._privpropdict = {
 	'bounds' : bounds,
 	'closeable' : closeable,
 	'collapsed' : collapsed,
 	'floating' : floating,
+	'id' : id,
 	'index' : index,
 	'modal' : modal,
 	'name' : name,
-	'popup' : popup,
 	'position' : position,
-	'pulled_open' : pulled_open,
+	'properties' : properties,
 	'resizable' : resizable,
 	'titled' : titled,
 	'visible' : visible,
@@ -346,63 +189,35 @@
 # Indices of types declared in this module
 #
 _classdeclarations = {
+	'brow' : Finder_window,
 	'cwin' : window,
-	'cwnd' : container_window,
-	'dwnd' : content_space,
 	'iwnd' : information_window,
 	'lwnd' : clipping_window,
 	'pwnd' : preferences_window,
-	'vwnd' : view_options_window,
 }
 
 _propdeclarations = {
-	'appt' : preferred_size,
-	'ascd' : creation_date,
-	'aslk' : locked,
-	'asmo' : modification_date,
-	'barr' : button_view_arrangement,
+	'ID  ' : id,
 	'c@#^' : _3c_Inheritance_3e_,
 	'cobj' : item,
-	'comt' : comment,
-	'ctnr' : container,
-	'cuss' : has_custom_view_settings,
-	'drwr' : popup,
+	'fvtg' : target,
 	'hclb' : closeable,
-	'iarr' : spatial_view_arrangement,
-	'iimg' : icon,
+	'icop' : icon_view_options,
 	'isfl' : floating,
 	'iszm' : zoomable,
-	'mprt' : minimum_size,
+	'lvop' : list_view_options,
+	'pALL' : properties,
 	'panl' : current_panel,
 	'pbnd' : bounds,
-	'phys' : physical_size,
 	'pidx' : index,
 	'pmod' : modal,
 	'pnam' : name,
 	'posn' : position,
 	'prsz' : resizable,
-	'pspd' : stationery,
 	'ptit' : titled,
-	'ptsz' : size,
-	'pull' : pulled_open,
-	'pvew' : view,
+	'pvew' : current_view,
 	'pvis' : visible,
 	'pzum' : zoomed,
-	'scda' : shows_creation_date,
-	'scom' : shows_comments,
-	'sdat' : shows_modification_date,
-	'sfsz' : calculates_folder_sizes,
-	'sknd' : shows_kind,
-	'slbl' : shows_label,
-	'sord' : sort_direction,
-	'sprt' : suggested_size,
-	'ssiz' : shows_size,
-	'svew' : previous_list_view,
-	'svrs' : shows_version,
-	'urdt' : uses_relative_dates,
-	'ver2' : product_version,
-	'vers' : version,
-	'warn' : warns_before_emptying,
 	'wshd' : collapsed,
 	'zumf' : zoomed_full_size,
 }
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/__init__.py b/Lib/plat-mac/lib-scriptpackages/Finder/__init__.py
index 9432c3e..40f3e4e 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/__init__.py
@@ -1,63 +1,54 @@
 """
-Package generated from /Volumes/Moes/Systeemmap/Finder
-Resource aete resid 0 
+Package generated from /System/Library/CoreServices/Finder.app
 """
 import aetools
 Error = aetools.Error
 import Standard_Suite
+import Legacy_suite
 import Containers_and_folders
-import Files_and_suitcases
+import Files
 import Finder_Basics
 import Finder_items
-import Process_classes
 import Window_classes
 import Type_Definitions
-import Earlier_terms
 import Enumerations
-import Obsolete_terms
 
 
 _code_to_module = {
 	'CoRe' : Standard_Suite,
+	'fleg' : Legacy_suite,
 	'fndr' : Containers_and_folders,
-	'fndr' : Files_and_suitcases,
+	'fndr' : Files,
 	'fndr' : Finder_Basics,
 	'fndr' : Finder_items,
-	'fndr' : Process_classes,
 	'fndr' : Window_classes,
 	'tpdf' : Type_Definitions,
-	'tpnm' : Earlier_terms,
 	'tpnm' : Enumerations,
-	'tpnm' : Obsolete_terms,
 }
 
 
 
 _code_to_fullname = {
 	'CoRe' : ('Finder.Standard_Suite', 'Standard_Suite'),
+	'fleg' : ('Finder.Legacy_suite', 'Legacy_suite'),
 	'fndr' : ('Finder.Containers_and_folders', 'Containers_and_folders'),
-	'fndr' : ('Finder.Files_and_suitcases', 'Files_and_suitcases'),
+	'fndr' : ('Finder.Files', 'Files'),
 	'fndr' : ('Finder.Finder_Basics', 'Finder_Basics'),
 	'fndr' : ('Finder.Finder_items', 'Finder_items'),
-	'fndr' : ('Finder.Process_classes', 'Process_classes'),
 	'fndr' : ('Finder.Window_classes', 'Window_classes'),
 	'tpdf' : ('Finder.Type_Definitions', 'Type_Definitions'),
-	'tpnm' : ('Finder.Earlier_terms', 'Earlier_terms'),
 	'tpnm' : ('Finder.Enumerations', 'Enumerations'),
-	'tpnm' : ('Finder.Obsolete_terms', 'Obsolete_terms'),
 }
 
 from Standard_Suite import *
+from Legacy_suite import *
 from Containers_and_folders import *
-from Files_and_suitcases import *
+from Files import *
 from Finder_Basics import *
 from Finder_items import *
-from Process_classes import *
 from Window_classes import *
 from Type_Definitions import *
-from Earlier_terms import *
 from Enumerations import *
-from Obsolete_terms import *
 
 def getbaseclasses(v):
 	if not getattr(v, '_propdict', None):
@@ -76,387 +67,163 @@
 #
 # Set property and element dictionaries now that all classes have been defined
 #
-getbaseclasses(StdSuites.Type_Names_Suite.small_integer)
-getbaseclasses(StdSuites.Type_Names_Suite.RGB16_color)
-getbaseclasses(StdSuites.Type_Names_Suite.system_dictionary)
-getbaseclasses(StdSuites.Type_Names_Suite.color_table)
-getbaseclasses(StdSuites.Type_Names_Suite.fixed_point)
-getbaseclasses(StdSuites.Type_Names_Suite.plain_text)
-getbaseclasses(StdSuites.Type_Names_Suite.type_element_info)
-getbaseclasses(StdSuites.Type_Names_Suite.location_reference)
-getbaseclasses(StdSuites.Type_Names_Suite.version)
-getbaseclasses(StdSuites.Type_Names_Suite.PostScript_picture)
-getbaseclasses(StdSuites.Type_Names_Suite.machine_location)
-getbaseclasses(StdSuites.Type_Names_Suite.menu_item)
-getbaseclasses(StdSuites.Type_Names_Suite.pixel_map_record)
-getbaseclasses(StdSuites.Type_Names_Suite.application_dictionary)
-getbaseclasses(StdSuites.Type_Names_Suite.unsigned_integer)
-getbaseclasses(StdSuites.Type_Names_Suite.menu)
-getbaseclasses(StdSuites.Type_Names_Suite.fixed_rectangle)
-getbaseclasses(StdSuites.Type_Names_Suite.long_fixed_rectangle)
-getbaseclasses(StdSuites.Type_Names_Suite.type_event_info)
-getbaseclasses(StdSuites.Type_Names_Suite.small_real)
-getbaseclasses(StdSuites.Type_Names_Suite.type_suite_info)
-getbaseclasses(StdSuites.Type_Names_Suite.rotation)
-getbaseclasses(StdSuites.Type_Names_Suite.fixed)
-getbaseclasses(StdSuites.Type_Names_Suite.scrap_styles)
-getbaseclasses(StdSuites.Type_Names_Suite.long_point)
-getbaseclasses(StdSuites.Type_Names_Suite.type_class_info)
-getbaseclasses(StdSuites.Type_Names_Suite.TIFF_picture)
-getbaseclasses(StdSuites.Type_Names_Suite.RGB96_color)
-getbaseclasses(StdSuites.Type_Names_Suite.dash_style)
-getbaseclasses(StdSuites.Type_Names_Suite.type_property_info)
-getbaseclasses(StdSuites.Type_Names_Suite.type_parameter_info)
-getbaseclasses(StdSuites.Type_Names_Suite.long_fixed_point)
-getbaseclasses(StdSuites.Type_Names_Suite.long_rectangle)
-getbaseclasses(StdSuites.Type_Names_Suite.extended_real)
-getbaseclasses(StdSuites.Type_Names_Suite.double_integer)
-getbaseclasses(StdSuites.Type_Names_Suite.long_fixed)
-getbaseclasses(StdSuites.Type_Names_Suite.null)
-getbaseclasses(StdSuites.Type_Names_Suite.target_id)
-getbaseclasses(StdSuites.Type_Names_Suite.point)
-getbaseclasses(StdSuites.Type_Names_Suite.bounding_rectangle)
-getbaseclasses(accessory_suitcase)
-getbaseclasses(preferences)
-getbaseclasses(sharable_container)
+getbaseclasses(item)
 getbaseclasses(application)
-getbaseclasses(trash_2d_object)
-getbaseclasses(accessory_process)
-getbaseclasses(window)
-getbaseclasses(information_window)
-getbaseclasses(process)
+getbaseclasses(package)
+getbaseclasses(file)
 getbaseclasses(application_file)
-getbaseclasses(internet_location)
-getbaseclasses(container_window)
-getbaseclasses(item)
-getbaseclasses(item)
+getbaseclasses(alias_file)
+getbaseclasses(internet_location_file)
+getbaseclasses(document_file)
+getbaseclasses(clipping)
+getbaseclasses(process)
+getbaseclasses(application_process)
+getbaseclasses(desk_accessory_process)
+getbaseclasses(application)
+getbaseclasses(preferences_window)
+getbaseclasses(Finder_window)
+getbaseclasses(window)
+getbaseclasses(clipping_window)
+getbaseclasses(information_window)
 getbaseclasses(trash_2d_object)
 getbaseclasses(desktop_2d_object)
-getbaseclasses(sharable_container)
-getbaseclasses(sharing_privileges)
-getbaseclasses(disk)
+getbaseclasses(container)
 getbaseclasses(folder)
-getbaseclasses(container)
-getbaseclasses(sound_file)
-getbaseclasses(font_file)
-getbaseclasses(internet_location_file)
-getbaseclasses(clipping)
-getbaseclasses(alias_file)
-getbaseclasses(desk_accessory_file)
-getbaseclasses(desk_accessory_suitcase)
-getbaseclasses(font_suitcase)
-getbaseclasses(file)
-getbaseclasses(application_file)
-getbaseclasses(suitcase)
-getbaseclasses(document_file)
-getbaseclasses(package)
-getbaseclasses(application)
-getbaseclasses(special_folders)
-getbaseclasses(preferences_window)
-getbaseclasses(view_options_window)
-getbaseclasses(window)
-getbaseclasses(container_window)
-getbaseclasses(content_space)
-getbaseclasses(information_window)
-getbaseclasses(clipping_window)
-getbaseclasses(status_window)
-getbaseclasses(application)
-getbaseclasses(sharing_window)
-getbaseclasses(control_panel)
-getbaseclasses(process)
-getbaseclasses(item)
-getbaseclasses(file)
-getbaseclasses(sharable_container)
-getbaseclasses(container_window)
-getbaseclasses(container)
-getbaseclasses(information_window)
-getbaseclasses(process)
-getbaseclasses(desk_accessory_process)
-getbaseclasses(application_process)
+getbaseclasses(disk)
+getbaseclasses(icon_view_options)
+getbaseclasses(label)
+getbaseclasses(column)
 getbaseclasses(preferences)
 getbaseclasses(alias_list)
 getbaseclasses(icon_family)
-getbaseclasses(label)
-getbaseclasses(StdSuites.Type_Names_Suite.small_integer)
+getbaseclasses(list_view_options)
+getbaseclasses(StdSuites.Type_Names_Suite.double_integer)
+getbaseclasses(StdSuites.Type_Names_Suite.version)
 getbaseclasses(StdSuites.Type_Names_Suite.RGB16_color)
 getbaseclasses(StdSuites.Type_Names_Suite.system_dictionary)
 getbaseclasses(StdSuites.Type_Names_Suite.color_table)
 getbaseclasses(StdSuites.Type_Names_Suite.fixed_point)
-getbaseclasses(StdSuites.Type_Names_Suite.plain_text)
+getbaseclasses(StdSuites.Type_Names_Suite.TIFF_picture)
 getbaseclasses(StdSuites.Type_Names_Suite.type_element_info)
-getbaseclasses(StdSuites.Type_Names_Suite.location_reference)
-getbaseclasses(StdSuites.Type_Names_Suite.version)
-getbaseclasses(StdSuites.Type_Names_Suite.PostScript_picture)
+getbaseclasses(StdSuites.Type_Names_Suite.type_event_info)
 getbaseclasses(StdSuites.Type_Names_Suite.machine_location)
+getbaseclasses(StdSuites.Type_Names_Suite.PostScript_picture)
+getbaseclasses(StdSuites.Type_Names_Suite.point)
+getbaseclasses(StdSuites.Type_Names_Suite.long_fixed_point)
 getbaseclasses(StdSuites.Type_Names_Suite.menu_item)
-getbaseclasses(StdSuites.Type_Names_Suite.pixel_map_record)
+getbaseclasses(StdSuites.Type_Names_Suite.scrap_styles)
 getbaseclasses(StdSuites.Type_Names_Suite.application_dictionary)
 getbaseclasses(StdSuites.Type_Names_Suite.unsigned_integer)
 getbaseclasses(StdSuites.Type_Names_Suite.menu)
 getbaseclasses(StdSuites.Type_Names_Suite.fixed_rectangle)
+getbaseclasses(StdSuites.Type_Names_Suite.type_property_info)
 getbaseclasses(StdSuites.Type_Names_Suite.long_fixed_rectangle)
-getbaseclasses(StdSuites.Type_Names_Suite.type_event_info)
-getbaseclasses(StdSuites.Type_Names_Suite.small_real)
+getbaseclasses(StdSuites.Type_Names_Suite.long_fixed)
 getbaseclasses(StdSuites.Type_Names_Suite.type_suite_info)
 getbaseclasses(StdSuites.Type_Names_Suite.rotation)
-getbaseclasses(StdSuites.Type_Names_Suite.fixed)
-getbaseclasses(StdSuites.Type_Names_Suite.scrap_styles)
-getbaseclasses(StdSuites.Type_Names_Suite.long_point)
-getbaseclasses(StdSuites.Type_Names_Suite.type_class_info)
-getbaseclasses(StdSuites.Type_Names_Suite.TIFF_picture)
-getbaseclasses(StdSuites.Type_Names_Suite.RGB96_color)
-getbaseclasses(StdSuites.Type_Names_Suite.dash_style)
-getbaseclasses(StdSuites.Type_Names_Suite.type_property_info)
-getbaseclasses(StdSuites.Type_Names_Suite.type_parameter_info)
-getbaseclasses(StdSuites.Type_Names_Suite.long_fixed_point)
-getbaseclasses(StdSuites.Type_Names_Suite.long_rectangle)
-getbaseclasses(StdSuites.Type_Names_Suite.extended_real)
-getbaseclasses(StdSuites.Type_Names_Suite.double_integer)
-getbaseclasses(StdSuites.Type_Names_Suite.long_fixed)
-getbaseclasses(StdSuites.Type_Names_Suite.null)
-getbaseclasses(StdSuites.Type_Names_Suite.target_id)
-getbaseclasses(StdSuites.Type_Names_Suite.point)
-getbaseclasses(StdSuites.Type_Names_Suite.bounding_rectangle)
 getbaseclasses(StdSuites.Type_Names_Suite.small_integer)
-getbaseclasses(StdSuites.Type_Names_Suite.RGB16_color)
-getbaseclasses(StdSuites.Type_Names_Suite.system_dictionary)
-getbaseclasses(StdSuites.Type_Names_Suite.color_table)
-getbaseclasses(StdSuites.Type_Names_Suite.fixed_point)
-getbaseclasses(StdSuites.Type_Names_Suite.plain_text)
-getbaseclasses(StdSuites.Type_Names_Suite.type_element_info)
-getbaseclasses(StdSuites.Type_Names_Suite.location_reference)
-getbaseclasses(StdSuites.Type_Names_Suite.version)
-getbaseclasses(StdSuites.Type_Names_Suite.PostScript_picture)
-getbaseclasses(StdSuites.Type_Names_Suite.machine_location)
-getbaseclasses(StdSuites.Type_Names_Suite.menu_item)
-getbaseclasses(StdSuites.Type_Names_Suite.pixel_map_record)
-getbaseclasses(StdSuites.Type_Names_Suite.application_dictionary)
-getbaseclasses(StdSuites.Type_Names_Suite.unsigned_integer)
-getbaseclasses(StdSuites.Type_Names_Suite.menu)
-getbaseclasses(StdSuites.Type_Names_Suite.fixed_rectangle)
-getbaseclasses(StdSuites.Type_Names_Suite.long_fixed_rectangle)
-getbaseclasses(StdSuites.Type_Names_Suite.type_event_info)
-getbaseclasses(StdSuites.Type_Names_Suite.small_real)
-getbaseclasses(StdSuites.Type_Names_Suite.type_suite_info)
-getbaseclasses(StdSuites.Type_Names_Suite.rotation)
 getbaseclasses(StdSuites.Type_Names_Suite.fixed)
-getbaseclasses(StdSuites.Type_Names_Suite.scrap_styles)
 getbaseclasses(StdSuites.Type_Names_Suite.long_point)
 getbaseclasses(StdSuites.Type_Names_Suite.type_class_info)
-getbaseclasses(StdSuites.Type_Names_Suite.TIFF_picture)
 getbaseclasses(StdSuites.Type_Names_Suite.RGB96_color)
-getbaseclasses(StdSuites.Type_Names_Suite.dash_style)
-getbaseclasses(StdSuites.Type_Names_Suite.type_property_info)
-getbaseclasses(StdSuites.Type_Names_Suite.type_parameter_info)
-getbaseclasses(StdSuites.Type_Names_Suite.long_fixed_point)
-getbaseclasses(StdSuites.Type_Names_Suite.long_rectangle)
-getbaseclasses(StdSuites.Type_Names_Suite.extended_real)
-getbaseclasses(StdSuites.Type_Names_Suite.double_integer)
-getbaseclasses(StdSuites.Type_Names_Suite.long_fixed)
-getbaseclasses(StdSuites.Type_Names_Suite.null)
 getbaseclasses(StdSuites.Type_Names_Suite.target_id)
-getbaseclasses(StdSuites.Type_Names_Suite.point)
+getbaseclasses(StdSuites.Type_Names_Suite.pixel_map_record)
+getbaseclasses(StdSuites.Type_Names_Suite.type_parameter_info)
+getbaseclasses(StdSuites.Type_Names_Suite.extended_real)
+getbaseclasses(StdSuites.Type_Names_Suite.long_rectangle)
+getbaseclasses(StdSuites.Type_Names_Suite.dash_style)
+getbaseclasses(StdSuites.Type_Names_Suite.plain_text)
+getbaseclasses(StdSuites.Type_Names_Suite.small_real)
+getbaseclasses(StdSuites.Type_Names_Suite.null)
+getbaseclasses(StdSuites.Type_Names_Suite.location_reference)
 getbaseclasses(StdSuites.Type_Names_Suite.bounding_rectangle)
 
 #
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'shor' : StdSuites.Type_Names_Suite.small_integer,
-	'tr16' : StdSuites.Type_Names_Suite.RGB16_color,
-	'aeut' : StdSuites.Type_Names_Suite.system_dictionary,
-	'clrt' : StdSuites.Type_Names_Suite.color_table,
-	'fpnt' : StdSuites.Type_Names_Suite.fixed_point,
-	'TEXT' : StdSuites.Type_Names_Suite.plain_text,
-	'elin' : StdSuites.Type_Names_Suite.type_element_info,
-	'insl' : StdSuites.Type_Names_Suite.location_reference,
-	'vers' : StdSuites.Type_Names_Suite.version,
-	'EPS ' : StdSuites.Type_Names_Suite.PostScript_picture,
-	'mLoc' : StdSuites.Type_Names_Suite.machine_location,
-	'cmen' : StdSuites.Type_Names_Suite.menu_item,
-	'tpmm' : StdSuites.Type_Names_Suite.pixel_map_record,
-	'aete' : StdSuites.Type_Names_Suite.application_dictionary,
-	'magn' : StdSuites.Type_Names_Suite.unsigned_integer,
-	'cmnu' : StdSuites.Type_Names_Suite.menu,
-	'frct' : StdSuites.Type_Names_Suite.fixed_rectangle,
-	'lfrc' : StdSuites.Type_Names_Suite.long_fixed_rectangle,
-	'evin' : StdSuites.Type_Names_Suite.type_event_info,
-	'sing' : StdSuites.Type_Names_Suite.small_real,
-	'suin' : StdSuites.Type_Names_Suite.type_suite_info,
-	'trot' : StdSuites.Type_Names_Suite.rotation,
-	'fixd' : StdSuites.Type_Names_Suite.fixed,
-	'styl' : StdSuites.Type_Names_Suite.scrap_styles,
-	'lpnt' : StdSuites.Type_Names_Suite.long_point,
-	'gcli' : StdSuites.Type_Names_Suite.type_class_info,
-	'TIFF' : StdSuites.Type_Names_Suite.TIFF_picture,
-	'tr96' : StdSuites.Type_Names_Suite.RGB96_color,
-	'tdas' : StdSuites.Type_Names_Suite.dash_style,
-	'pinf' : StdSuites.Type_Names_Suite.type_property_info,
-	'pmin' : StdSuites.Type_Names_Suite.type_parameter_info,
-	'lfpt' : StdSuites.Type_Names_Suite.long_fixed_point,
-	'lrct' : StdSuites.Type_Names_Suite.long_rectangle,
-	'exte' : StdSuites.Type_Names_Suite.extended_real,
-	'comp' : StdSuites.Type_Names_Suite.double_integer,
-	'lfxd' : StdSuites.Type_Names_Suite.long_fixed,
-	'null' : StdSuites.Type_Names_Suite.null,
-	'targ' : StdSuites.Type_Names_Suite.target_id,
-	'QDpt' : StdSuites.Type_Names_Suite.point,
-	'qdrt' : StdSuites.Type_Names_Suite.bounding_rectangle,
-	'dsut' : accessory_suitcase,
-	'cprf' : preferences,
-	'sctr' : sharable_container,
+	'cobj' : item,
 	'capp' : application,
-	'ctrs' : trash_2d_object,
-	'pcda' : accessory_process,
-	'cwin' : window,
-	'iwnd' : information_window,
-	'prcs' : process,
+	'pack' : package,
+	'file' : file,
 	'appf' : application_file,
-	'inlf' : internet_location,
-	'cwnd' : container_window,
-	'cobj' : item,
-	'cobj' : item,
+	'alia' : alias_file,
+	'inlf' : internet_location_file,
+	'docf' : document_file,
+	'clpf' : clipping,
+	'prcs' : process,
+	'pcap' : application_process,
+	'pcda' : desk_accessory_process,
+	'capp' : application,
+	'pwnd' : preferences_window,
+	'brow' : Finder_window,
+	'cwin' : window,
+	'lwnd' : clipping_window,
+	'iwnd' : information_window,
 	'ctrs' : trash_2d_object,
 	'cdsk' : desktop_2d_object,
-	'sctr' : sharable_container,
-	'priv' : sharing_privileges,
-	'cdis' : disk,
+	'ctnr' : container,
 	'cfol' : folder,
-	'ctnr' : container,
-	'sndf' : sound_file,
-	'fntf' : font_file,
-	'inlf' : internet_location_file,
-	'clpf' : clipping,
-	'alia' : alias_file,
-	'dafi' : desk_accessory_file,
-	'dsut' : desk_accessory_suitcase,
-	'fsut' : font_suitcase,
-	'file' : file,
-	'appf' : application_file,
-	'stcs' : suitcase,
-	'docf' : document_file,
-	'pack' : package,
-	'capp' : application,
-	'spfl' : special_folders,
-	'pwnd' : preferences_window,
-	'vwnd' : view_options_window,
-	'cwin' : window,
-	'cwnd' : container_window,
-	'dwnd' : content_space,
-	'iwnd' : information_window,
-	'lwnd' : clipping_window,
-	'qwnd' : status_window,
-	'capp' : application,
-	'swnd' : sharing_window,
-	'ccdv' : control_panel,
-	'prcs' : process,
-	'cobj' : item,
-	'file' : file,
-	'sctr' : sharable_container,
-	'cwnd' : container_window,
-	'ctnr' : container,
-	'iwnd' : information_window,
-	'prcs' : process,
-	'pcda' : desk_accessory_process,
-	'pcap' : application_process,
+	'cdis' : disk,
+	'icop' : icon_view_options,
+	'clbl' : label,
+	'lvcl' : column,
 	'cprf' : preferences,
 	'alst' : alias_list,
 	'ifam' : icon_family,
-	'clbl' : label,
-	'shor' : StdSuites.Type_Names_Suite.small_integer,
+	'lvop' : list_view_options,
+	'comp' : StdSuites.Type_Names_Suite.double_integer,
+	'vers' : StdSuites.Type_Names_Suite.version,
 	'tr16' : StdSuites.Type_Names_Suite.RGB16_color,
 	'aeut' : StdSuites.Type_Names_Suite.system_dictionary,
 	'clrt' : StdSuites.Type_Names_Suite.color_table,
 	'fpnt' : StdSuites.Type_Names_Suite.fixed_point,
-	'TEXT' : StdSuites.Type_Names_Suite.plain_text,
+	'TIFF' : StdSuites.Type_Names_Suite.TIFF_picture,
 	'elin' : StdSuites.Type_Names_Suite.type_element_info,
-	'insl' : StdSuites.Type_Names_Suite.location_reference,
-	'vers' : StdSuites.Type_Names_Suite.version,
-	'EPS ' : StdSuites.Type_Names_Suite.PostScript_picture,
+	'evin' : StdSuites.Type_Names_Suite.type_event_info,
 	'mLoc' : StdSuites.Type_Names_Suite.machine_location,
+	'EPS ' : StdSuites.Type_Names_Suite.PostScript_picture,
+	'QDpt' : StdSuites.Type_Names_Suite.point,
+	'lfpt' : StdSuites.Type_Names_Suite.long_fixed_point,
 	'cmen' : StdSuites.Type_Names_Suite.menu_item,
-	'tpmm' : StdSuites.Type_Names_Suite.pixel_map_record,
+	'styl' : StdSuites.Type_Names_Suite.scrap_styles,
 	'aete' : StdSuites.Type_Names_Suite.application_dictionary,
 	'magn' : StdSuites.Type_Names_Suite.unsigned_integer,
 	'cmnu' : StdSuites.Type_Names_Suite.menu,
 	'frct' : StdSuites.Type_Names_Suite.fixed_rectangle,
+	'pinf' : StdSuites.Type_Names_Suite.type_property_info,
 	'lfrc' : StdSuites.Type_Names_Suite.long_fixed_rectangle,
-	'evin' : StdSuites.Type_Names_Suite.type_event_info,
-	'sing' : StdSuites.Type_Names_Suite.small_real,
+	'lfxd' : StdSuites.Type_Names_Suite.long_fixed,
 	'suin' : StdSuites.Type_Names_Suite.type_suite_info,
 	'trot' : StdSuites.Type_Names_Suite.rotation,
-	'fixd' : StdSuites.Type_Names_Suite.fixed,
-	'styl' : StdSuites.Type_Names_Suite.scrap_styles,
-	'lpnt' : StdSuites.Type_Names_Suite.long_point,
-	'gcli' : StdSuites.Type_Names_Suite.type_class_info,
-	'TIFF' : StdSuites.Type_Names_Suite.TIFF_picture,
-	'tr96' : StdSuites.Type_Names_Suite.RGB96_color,
-	'tdas' : StdSuites.Type_Names_Suite.dash_style,
-	'pinf' : StdSuites.Type_Names_Suite.type_property_info,
-	'pmin' : StdSuites.Type_Names_Suite.type_parameter_info,
-	'lfpt' : StdSuites.Type_Names_Suite.long_fixed_point,
-	'lrct' : StdSuites.Type_Names_Suite.long_rectangle,
-	'exte' : StdSuites.Type_Names_Suite.extended_real,
-	'comp' : StdSuites.Type_Names_Suite.double_integer,
-	'lfxd' : StdSuites.Type_Names_Suite.long_fixed,
-	'null' : StdSuites.Type_Names_Suite.null,
-	'targ' : StdSuites.Type_Names_Suite.target_id,
-	'QDpt' : StdSuites.Type_Names_Suite.point,
-	'qdrt' : StdSuites.Type_Names_Suite.bounding_rectangle,
 	'shor' : StdSuites.Type_Names_Suite.small_integer,
-	'tr16' : StdSuites.Type_Names_Suite.RGB16_color,
-	'aeut' : StdSuites.Type_Names_Suite.system_dictionary,
-	'clrt' : StdSuites.Type_Names_Suite.color_table,
-	'fpnt' : StdSuites.Type_Names_Suite.fixed_point,
-	'TEXT' : StdSuites.Type_Names_Suite.plain_text,
-	'elin' : StdSuites.Type_Names_Suite.type_element_info,
-	'insl' : StdSuites.Type_Names_Suite.location_reference,
-	'vers' : StdSuites.Type_Names_Suite.version,
-	'EPS ' : StdSuites.Type_Names_Suite.PostScript_picture,
-	'mLoc' : StdSuites.Type_Names_Suite.machine_location,
-	'cmen' : StdSuites.Type_Names_Suite.menu_item,
-	'tpmm' : StdSuites.Type_Names_Suite.pixel_map_record,
-	'aete' : StdSuites.Type_Names_Suite.application_dictionary,
-	'magn' : StdSuites.Type_Names_Suite.unsigned_integer,
-	'cmnu' : StdSuites.Type_Names_Suite.menu,
-	'frct' : StdSuites.Type_Names_Suite.fixed_rectangle,
-	'lfrc' : StdSuites.Type_Names_Suite.long_fixed_rectangle,
-	'evin' : StdSuites.Type_Names_Suite.type_event_info,
-	'sing' : StdSuites.Type_Names_Suite.small_real,
-	'suin' : StdSuites.Type_Names_Suite.type_suite_info,
-	'trot' : StdSuites.Type_Names_Suite.rotation,
 	'fixd' : StdSuites.Type_Names_Suite.fixed,
-	'styl' : StdSuites.Type_Names_Suite.scrap_styles,
 	'lpnt' : StdSuites.Type_Names_Suite.long_point,
 	'gcli' : StdSuites.Type_Names_Suite.type_class_info,
-	'TIFF' : StdSuites.Type_Names_Suite.TIFF_picture,
 	'tr96' : StdSuites.Type_Names_Suite.RGB96_color,
-	'tdas' : StdSuites.Type_Names_Suite.dash_style,
-	'pinf' : StdSuites.Type_Names_Suite.type_property_info,
-	'pmin' : StdSuites.Type_Names_Suite.type_parameter_info,
-	'lfpt' : StdSuites.Type_Names_Suite.long_fixed_point,
-	'lrct' : StdSuites.Type_Names_Suite.long_rectangle,
-	'exte' : StdSuites.Type_Names_Suite.extended_real,
-	'comp' : StdSuites.Type_Names_Suite.double_integer,
-	'lfxd' : StdSuites.Type_Names_Suite.long_fixed,
-	'null' : StdSuites.Type_Names_Suite.null,
 	'targ' : StdSuites.Type_Names_Suite.target_id,
-	'QDpt' : StdSuites.Type_Names_Suite.point,
+	'tpmm' : StdSuites.Type_Names_Suite.pixel_map_record,
+	'pmin' : StdSuites.Type_Names_Suite.type_parameter_info,
+	'exte' : StdSuites.Type_Names_Suite.extended_real,
+	'lrct' : StdSuites.Type_Names_Suite.long_rectangle,
+	'tdas' : StdSuites.Type_Names_Suite.dash_style,
+	'TEXT' : StdSuites.Type_Names_Suite.plain_text,
+	'sing' : StdSuites.Type_Names_Suite.small_real,
+	'null' : StdSuites.Type_Names_Suite.null,
+	'insl' : StdSuites.Type_Names_Suite.location_reference,
 	'qdrt' : StdSuites.Type_Names_Suite.bounding_rectangle,
 }
 
 
 class Finder(Standard_Suite_Events,
+		Legacy_suite_Events,
 		Containers_and_folders_Events,
-		Files_and_suitcases_Events,
+		Files_Events,
 		Finder_Basics_Events,
 		Finder_items_Events,
-		Process_classes_Events,
 		Window_classes_Events,
 		Type_Definitions_Events,
-		Earlier_terms_Events,
 		Enumerations_Events,
-		Obsolete_terms_Events,
 		aetools.TalkTo):
 	_signature = 'MACS'
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Netscape/__init__.py b/Lib/plat-mac/lib-scriptpackages/Netscape/__init__.py
index 67240d4..8a82216 100644
--- a/Lib/plat-mac/lib-scriptpackages/Netscape/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/Netscape/__init__.py
@@ -1,6 +1,5 @@
 """
-Package generated from /Volumes/Moes/Applications (Mac OS 9)/Netscape Communicator™ Folder/Netscape Communicator™
-Resource aete resid 0 
+Package generated from /Volumes/Moes/Applications (Mac OS 9)/Netscape Communicator\xe2\x84\xa2 Folder/Netscape Communicator\xe2\x84\xa2
 """
 import aetools
 Error = aetools.Error
@@ -62,12 +61,12 @@
 #
 getbaseclasses(window)
 getbaseclasses(application)
-getbaseclasses(StdSuites.Text_Suite.paragraph)
+getbaseclasses(StdSuites.Text_Suite.text_flow)
 getbaseclasses(StdSuites.Text_Suite.character)
 getbaseclasses(StdSuites.Text_Suite.text_style_info)
-getbaseclasses(StdSuites.Text_Suite.word)
-getbaseclasses(StdSuites.Text_Suite.text_flow)
 getbaseclasses(StdSuites.Text_Suite.line)
+getbaseclasses(StdSuites.Text_Suite.word)
+getbaseclasses(StdSuites.Text_Suite.paragraph)
 getbaseclasses(StdSuites.Text_Suite.text)
 getbaseclasses(text)
 getbaseclasses(styleset)
@@ -78,12 +77,12 @@
 _classdeclarations = {
 	'cwin' : window,
 	'capp' : application,
-	'cpar' : StdSuites.Text_Suite.paragraph,
+	'cflo' : StdSuites.Text_Suite.text_flow,
 	'cha ' : StdSuites.Text_Suite.character,
 	'tsty' : StdSuites.Text_Suite.text_style_info,
-	'cwor' : StdSuites.Text_Suite.word,
-	'cflo' : StdSuites.Text_Suite.text_flow,
 	'clin' : StdSuites.Text_Suite.line,
+	'cwor' : StdSuites.Text_Suite.word,
+	'cpar' : StdSuites.Text_Suite.paragraph,
 	'ctxt' : StdSuites.Text_Suite.text,
 	'ctxt' : text,
 	'stys' : styleset,
diff --git a/Lib/plat-mac/lib-scriptpackages/StdSuites/__init__.py b/Lib/plat-mac/lib-scriptpackages/StdSuites/__init__.py
index e65f368..85ea47a 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/__init__.py
@@ -68,44 +68,6 @@
 #
 # Set property and element dictionaries now that all classes have been defined
 #
-getbaseclasses(paragraph)
-getbaseclasses(character)
-getbaseclasses(text_flow)
-getbaseclasses(text_style_info)
-getbaseclasses(line)
-getbaseclasses(word)
-getbaseclasses(text)
-getbaseclasses(graphic_group)
-getbaseclasses(oval)
-getbaseclasses(graphic_text)
-getbaseclasses(graphic_shape)
-getbaseclasses(graphic_line)
-getbaseclasses(graphic_object)
-getbaseclasses(drawing_area)
-getbaseclasses(polygon)
-getbaseclasses(pixel)
-getbaseclasses(rounded_rectangle)
-getbaseclasses(arc)
-getbaseclasses(pixel_map)
-getbaseclasses(rectangle)
-getbaseclasses(graphic_group)
-getbaseclasses(drawing_area)
-getbaseclasses(cell)
-getbaseclasses(column)
-getbaseclasses(table)
-getbaseclasses(row)
-getbaseclasses(AppleTalk_address)
-getbaseclasses(address_specification)
-getbaseclasses(Token_Ring_address)
-getbaseclasses(FireWire_address)
-getbaseclasses(bus_slot)
-getbaseclasses(SCSI_address)
-getbaseclasses(ADB_address)
-getbaseclasses(USB_address)
-getbaseclasses(device_specification)
-getbaseclasses(LocalTalk_address)
-getbaseclasses(IP_address)
-getbaseclasses(Ethernet_address)
 getbaseclasses(July)
 getbaseclasses(May)
 getbaseclasses(string)
@@ -211,13 +173,24 @@
 getbaseclasses(September)
 getbaseclasses(file_specification)
 getbaseclasses(text)
-getbaseclasses(window)
-getbaseclasses(file)
-getbaseclasses(selection_2d_object)
-getbaseclasses(alias)
-getbaseclasses(application)
-getbaseclasses(insertion_point)
-getbaseclasses(document)
+getbaseclasses(graphic_group)
+getbaseclasses(drawing_area)
+getbaseclasses(cell)
+getbaseclasses(column)
+getbaseclasses(table)
+getbaseclasses(row)
+getbaseclasses(AppleTalk_address)
+getbaseclasses(address_specification)
+getbaseclasses(Token_Ring_address)
+getbaseclasses(FireWire_address)
+getbaseclasses(bus_slot)
+getbaseclasses(SCSI_address)
+getbaseclasses(ADB_address)
+getbaseclasses(USB_address)
+getbaseclasses(device_specification)
+getbaseclasses(LocalTalk_address)
+getbaseclasses(IP_address)
+getbaseclasses(Ethernet_address)
 getbaseclasses(small_integer)
 getbaseclasses(RGB16_color)
 getbaseclasses(version)
@@ -258,49 +231,38 @@
 getbaseclasses(long_fixed)
 getbaseclasses(null)
 getbaseclasses(target_id)
+getbaseclasses(paragraph)
+getbaseclasses(character)
+getbaseclasses(text_flow)
+getbaseclasses(text_style_info)
+getbaseclasses(line)
+getbaseclasses(word)
+getbaseclasses(text)
+getbaseclasses(window)
+getbaseclasses(file)
+getbaseclasses(selection_2d_object)
+getbaseclasses(alias)
+getbaseclasses(application)
+getbaseclasses(insertion_point)
+getbaseclasses(document)
+getbaseclasses(graphic_group)
+getbaseclasses(oval)
+getbaseclasses(graphic_text)
+getbaseclasses(graphic_shape)
+getbaseclasses(graphic_line)
+getbaseclasses(graphic_object)
+getbaseclasses(drawing_area)
+getbaseclasses(polygon)
+getbaseclasses(pixel)
+getbaseclasses(rounded_rectangle)
+getbaseclasses(arc)
+getbaseclasses(pixel_map)
+getbaseclasses(rectangle)
 
 #
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'cpar' : paragraph,
-	'cha ' : character,
-	'cflo' : text_flow,
-	'tsty' : text_style_info,
-	'clin' : line,
-	'cwor' : word,
-	'ctxt' : text,
-	'cpic' : graphic_group,
-	'covl' : oval,
-	'cgtx' : graphic_text,
-	'cgsh' : graphic_shape,
-	'glin' : graphic_line,
-	'cgob' : graphic_object,
-	'cdrw' : drawing_area,
-	'cpgn' : polygon,
-	'cpxl' : pixel,
-	'crrc' : rounded_rectangle,
-	'carc' : arc,
-	'cpix' : pixel_map,
-	'crec' : rectangle,
-	'cpic' : graphic_group,
-	'cdrw' : drawing_area,
-	'ccel' : cell,
-	'ccol' : column,
-	'ctbl' : table,
-	'crow' : row,
-	'cat ' : AppleTalk_address,
-	'cadr' : address_specification,
-	'ctok' : Token_Ring_address,
-	'cfw ' : FireWire_address,
-	'cbus' : bus_slot,
-	'cscs' : SCSI_address,
-	'cadb' : ADB_address,
-	'cusb' : USB_address,
-	'cdev' : device_specification,
-	'clt ' : LocalTalk_address,
-	'cip ' : IP_address,
-	'cen ' : Ethernet_address,
 	'jul ' : July,
 	'may ' : May,
 	'TEXT' : string,
@@ -406,13 +368,24 @@
 	'sep ' : September,
 	'fss ' : file_specification,
 	'ctxt' : text,
-	'cwin' : window,
-	'file' : file,
-	'csel' : selection_2d_object,
-	'alis' : alias,
-	'capp' : application,
-	'cins' : insertion_point,
-	'docu' : document,
+	'cpic' : graphic_group,
+	'cdrw' : drawing_area,
+	'ccel' : cell,
+	'ccol' : column,
+	'ctbl' : table,
+	'crow' : row,
+	'cat ' : AppleTalk_address,
+	'cadr' : address_specification,
+	'ctok' : Token_Ring_address,
+	'cfw ' : FireWire_address,
+	'cbus' : bus_slot,
+	'cscs' : SCSI_address,
+	'cadb' : ADB_address,
+	'cusb' : USB_address,
+	'cdev' : device_specification,
+	'clt ' : LocalTalk_address,
+	'cip ' : IP_address,
+	'cen ' : Ethernet_address,
 	'shor' : small_integer,
 	'tr16' : RGB16_color,
 	'vers' : version,
@@ -453,6 +426,33 @@
 	'lfxd' : long_fixed,
 	'null' : null,
 	'targ' : target_id,
+	'cpar' : paragraph,
+	'cha ' : character,
+	'cflo' : text_flow,
+	'tsty' : text_style_info,
+	'clin' : line,
+	'cwor' : word,
+	'ctxt' : text,
+	'cwin' : window,
+	'file' : file,
+	'csel' : selection_2d_object,
+	'alis' : alias,
+	'capp' : application,
+	'cins' : insertion_point,
+	'docu' : document,
+	'cpic' : graphic_group,
+	'covl' : oval,
+	'cgtx' : graphic_text,
+	'cgsh' : graphic_shape,
+	'glin' : graphic_line,
+	'cgob' : graphic_object,
+	'cdrw' : drawing_area,
+	'cpgn' : polygon,
+	'cpxl' : pixel,
+	'crrc' : rounded_rectangle,
+	'carc' : arc,
+	'cpix' : pixel_map,
+	'crec' : rectangle,
 }
 
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Terminal/Invisible_Suite.py b/Lib/plat-mac/lib-scriptpackages/Terminal/Invisible_Suite.py
deleted file mode 100644
index 2a311c5..0000000
--- a/Lib/plat-mac/lib-scriptpackages/Terminal/Invisible_Suite.py
+++ /dev/null
@@ -1,48 +0,0 @@
-"""Suite Invisible Suite: Terms and Events for controlling the application
-Level 1, version 1
-
-Generated from /Applications/Utilities/Terminal.app/Contents/Resources/Terminal.rsrc
-AETE/AEUT resource version 1/0, language 0, script 0
-"""
-
-import aetools
-import MacOS
-
-_code = 'tpnm'
-
-from StdSuites.Type_Names_Suite import *
-class Invisible_Suite_Events(Type_Names_Suite_Events):
-
-	pass
-
-
-class application(aetools.ComponentItem):
-	"""application - The application """
-	want = 'capp'
-class properties(aetools.NProperty):
-	"""properties - every property of the application """
-	which = 'pALL'
-	want = 'reco'
-application._superclassnames = []
-application._privpropdict = {
-	'properties' : properties,
-}
-application._privelemdict = {
-}
-
-#
-# Indices of types declared in this module
-#
-_classdeclarations = {
-	'capp' : application,
-}
-
-_propdeclarations = {
-	'pALL' : properties,
-}
-
-_compdeclarations = {
-}
-
-_enumdeclarations = {
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/Terminal/Standard_Suite.py b/Lib/plat-mac/lib-scriptpackages/Terminal/Standard_Suite.py
new file mode 100644
index 0000000..e17b7fb
--- /dev/null
+++ b/Lib/plat-mac/lib-scriptpackages/Terminal/Standard_Suite.py
@@ -0,0 +1,578 @@
+"""Suite Standard Suite: Common classes and commands for most applications.
+Level 1, version 1
+
+Generated from /Applications/Utilities/Terminal.app
+AETE/AEUT resource version 1/0, language 0, script 0
+"""
+
+import aetools
+import MacOS
+
+_code = '????'
+
+class Standard_Suite_Events:
+
+	_argmap_close = {
+		'saving_in' : 'kfil',
+		'saving' : 'savo',
+	}
+
+	def close(self, _object, _attributes={}, **_arguments):
+		"""close: Close an object.
+		Required argument: the object for the command
+		Keyword argument saving_in: The file in which to save the object.
+		Keyword argument saving: Specifies whether changes should be saved before closing.
+		Keyword argument _attributes: AppleEvent attribute dictionary
+		"""
+		_code = 'core'
+		_subcode = 'clos'
+
+		aetools.keysubst(_arguments, self._argmap_close)
+		_arguments['----'] = _object
+
+		aetools.enumsubst(_arguments, 'savo', _Enum_savo)
+
+		_reply, _arguments, _attributes = self.send(_code, _subcode,
+				_arguments, _attributes)
+		if _arguments.get('errn', 0):
+			raise aetools.Error, aetools.decodeerror(_arguments)
+		# XXXX Optionally decode result
+		if _arguments.has_key('----'):
+			return _arguments['----']
+
+	_argmap_count = {
+		'each' : 'kocl',
+	}
+
+	def count(self, _object, _attributes={}, **_arguments):
+		"""count: Return the number of elements of a particular class within an object.
+		Required argument: the object for the command
+		Keyword argument each: The class of objects to be counted.
+		Keyword argument _attributes: AppleEvent attribute dictionary
+		Returns: the reply for the command
+		"""
+		_code = 'core'
+		_subcode = 'cnte'
+
+		aetools.keysubst(_arguments, self._argmap_count)
+		_arguments['----'] = _object
+
+
+		_reply, _arguments, _attributes = self.send(_code, _subcode,
+				_arguments, _attributes)
+		if _arguments.get('errn', 0):
+			raise aetools.Error, aetools.decodeerror(_arguments)
+		# XXXX Optionally decode result
+		if _arguments.has_key('----'):
+			return _arguments['----']
+
+	def delete(self, _object, _attributes={}, **_arguments):
+		"""delete: Delete an object.
+		Required argument: the object for the command
+		Keyword argument _attributes: AppleEvent attribute dictionary
+		"""
+		_code = 'core'
+		_subcode = 'delo'
+
+		if _arguments: raise TypeError, 'No optional args expected'
+		_arguments['----'] = _object
+
+
+		_reply, _arguments, _attributes = self.send(_code, _subcode,
+				_arguments, _attributes)
+		if _arguments.get('errn', 0):
+			raise aetools.Error, aetools.decodeerror(_arguments)
+		# XXXX Optionally decode result
+		if _arguments.has_key('----'):
+			return _arguments['----']
+
+	_argmap_duplicate = {
+		'to' : 'insh',
+		'with_properties' : 'prdt',
+	}
+
+	def duplicate(self, _object, _attributes={}, **_arguments):
+		"""duplicate: Copy object(s) and put the copies at a new location.
+		Required argument: the object for the command
+		Keyword argument to: The location for the new object(s).
+		Keyword argument with_properties: Properties to be set in the new duplicated object(s).
+		Keyword argument _attributes: AppleEvent attribute dictionary
+		"""
+		_code = 'core'
+		_subcode = 'clon'
+
+		aetools.keysubst(_arguments, self._argmap_duplicate)
+		_arguments['----'] = _object
+
+
+		_reply, _arguments, _attributes = self.send(_code, _subcode,
+				_arguments, _attributes)
+		if _arguments.get('errn', 0):
+			raise aetools.Error, aetools.decodeerror(_arguments)
+		# XXXX Optionally decode result
+		if _arguments.has_key('----'):
+			return _arguments['----']
+
+	def exists(self, _object, _attributes={}, **_arguments):
+		"""exists: Verify if an object exists.
+		Required argument: the object for the command
+		Keyword argument _attributes: AppleEvent attribute dictionary
+		Returns: the reply for the command
+		"""
+		_code = 'core'
+		_subcode = 'doex'
+
+		if _arguments: raise TypeError, 'No optional args expected'
+		_arguments['----'] = _object
+
+
+		_reply, _arguments, _attributes = self.send(_code, _subcode,
+				_arguments, _attributes)
+		if _arguments.get('errn', 0):
+			raise aetools.Error, aetools.decodeerror(_arguments)
+		# XXXX Optionally decode result
+		if _arguments.has_key('----'):
+			return _arguments['----']
+
+	def get(self, _object, _attributes={}, **_arguments):
+		"""get: Get the data for an object.
+		Required argument: the object for the command
+		Keyword argument _attributes: AppleEvent attribute dictionary
+		Returns: the reply for the command
+		"""
+		_code = 'core'
+		_subcode = 'getd'
+
+		if _arguments: raise TypeError, 'No optional args expected'
+		_arguments['----'] = _object
+
+
+		_reply, _arguments, _attributes = self.send(_code, _subcode,
+				_arguments, _attributes)
+		if _arguments.get('errn', 0):
+			raise aetools.Error, aetools.decodeerror(_arguments)
+		# XXXX Optionally decode result
+		if _arguments.has_key('----'):
+			return _arguments['----']
+
+	_argmap_make = {
+		'at' : 'insh',
+		'new' : 'kocl',
+		'with_data' : 'data',
+		'with_properties' : 'prdt',
+	}
+
+	def make(self, _no_object=None, _attributes={}, **_arguments):
+		"""make: Make a new object.
+		Keyword argument at: The location at which to insert the object.
+		Keyword argument new: The class of the new object.
+		Keyword argument with_data: The initial data for the object.
+		Keyword argument with_properties: The initial values for properties of the object.
+		Keyword argument _attributes: AppleEvent attribute dictionary
+		Returns: the reply for the command
+		"""
+		_code = 'core'
+		_subcode = 'crel'
+
+		aetools.keysubst(_arguments, self._argmap_make)
+		if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+		_reply, _arguments, _attributes = self.send(_code, _subcode,
+				_arguments, _attributes)
+		if _arguments.get('errn', 0):
+			raise aetools.Error, aetools.decodeerror(_arguments)
+		# XXXX Optionally decode result
+		if _arguments.has_key('----'):
+			return _arguments['----']
+
+	_argmap_move = {
+		'to' : 'insh',
+	}
+
+	def move(self, _object, _attributes={}, **_arguments):
+		"""move: Move object(s) to a new location.
+		Required argument: the object for the command
+		Keyword argument to: The new location for the object(s).
+		Keyword argument _attributes: AppleEvent attribute dictionary
+		"""
+		_code = 'core'
+		_subcode = 'move'
+
+		aetools.keysubst(_arguments, self._argmap_move)
+		_arguments['----'] = _object
+
+
+		_reply, _arguments, _attributes = self.send(_code, _subcode,
+				_arguments, _attributes)
+		if _arguments.get('errn', 0):
+			raise aetools.Error, aetools.decodeerror(_arguments)
+		# XXXX Optionally decode result
+		if _arguments.has_key('----'):
+			return _arguments['----']
+
+	def open(self, _object=None, _attributes={}, **_arguments):
+		"""open: Open an object.
+		Required argument: list of objects
+		Keyword argument _attributes: AppleEvent attribute dictionary
+		"""
+		_code = 'aevt'
+		_subcode = 'odoc'
+
+		if _arguments: raise TypeError, 'No optional args expected'
+		_arguments['----'] = _object
+
+
+		_reply, _arguments, _attributes = self.send(_code, _subcode,
+				_arguments, _attributes)
+		if _arguments.get('errn', 0):
+			raise aetools.Error, aetools.decodeerror(_arguments)
+		# XXXX Optionally decode result
+		if _arguments.has_key('----'):
+			return _arguments['----']
+
+	def print_(self, _object=None, _attributes={}, **_arguments):
+		"""print: Print an object.
+		Required argument: list of objects
+		Keyword argument _attributes: AppleEvent attribute dictionary
+		"""
+		_code = 'aevt'
+		_subcode = 'pdoc'
+
+		if _arguments: raise TypeError, 'No optional args expected'
+		_arguments['----'] = _object
+
+
+		_reply, _arguments, _attributes = self.send(_code, _subcode,
+				_arguments, _attributes)
+		if _arguments.get('errn', 0):
+			raise aetools.Error, aetools.decodeerror(_arguments)
+		# XXXX Optionally decode result
+		if _arguments.has_key('----'):
+			return _arguments['----']
+
+	_argmap_quit = {
+		'saving' : 'savo',
+	}
+
+	def quit(self, _object, _attributes={}, **_arguments):
+		"""quit: Quit an application.
+		Required argument: the object for the command
+		Keyword argument saving: Specifies whether changes should be saved before quitting.
+		Keyword argument _attributes: AppleEvent attribute dictionary
+		"""
+		_code = 'aevt'
+		_subcode = 'quit'
+
+		aetools.keysubst(_arguments, self._argmap_quit)
+		_arguments['----'] = _object
+
+		aetools.enumsubst(_arguments, 'savo', _Enum_savo)
+
+		_reply, _arguments, _attributes = self.send(_code, _subcode,
+				_arguments, _attributes)
+		if _arguments.get('errn', 0):
+			raise aetools.Error, aetools.decodeerror(_arguments)
+		# XXXX Optionally decode result
+		if _arguments.has_key('----'):
+			return _arguments['----']
+
+	_argmap_save = {
+		'in_' : 'kfil',
+		'as' : 'fltp',
+	}
+
+	def save(self, _object, _attributes={}, **_arguments):
+		"""save: Save an object.
+		Required argument: the object for the command
+		Keyword argument in_: The file in which to save the object.
+		Keyword argument as: The file type in which to save the data.
+		Keyword argument _attributes: AppleEvent attribute dictionary
+		"""
+		_code = 'core'
+		_subcode = 'save'
+
+		aetools.keysubst(_arguments, self._argmap_save)
+		_arguments['----'] = _object
+
+
+		_reply, _arguments, _attributes = self.send(_code, _subcode,
+				_arguments, _attributes)
+		if _arguments.get('errn', 0):
+			raise aetools.Error, aetools.decodeerror(_arguments)
+		# XXXX Optionally decode result
+		if _arguments.has_key('----'):
+			return _arguments['----']
+
+	_argmap_set = {
+		'to' : 'data',
+	}
+
+	def set(self, _object, _attributes={}, **_arguments):
+		"""set: Set an object's data.
+		Required argument: the object for the command
+		Keyword argument to: The new value.
+		Keyword argument _attributes: AppleEvent attribute dictionary
+		"""
+		_code = 'core'
+		_subcode = 'setd'
+
+		aetools.keysubst(_arguments, self._argmap_set)
+		_arguments['----'] = _object
+
+
+		_reply, _arguments, _attributes = self.send(_code, _subcode,
+				_arguments, _attributes)
+		if _arguments.get('errn', 0):
+			raise aetools.Error, aetools.decodeerror(_arguments)
+		# XXXX Optionally decode result
+		if _arguments.has_key('----'):
+			return _arguments['----']
+
+
+class application(aetools.ComponentItem):
+	"""application - An application's top level scripting object. """
+	want = 'capp'
+class _3c_Inheritance_3e_(aetools.NProperty):
+	"""<Inheritance> - All of the properties of the superclass. """
+	which = 'c@#^'
+	want = 'cobj'
+class frontmost(aetools.NProperty):
+	"""frontmost - Is this the frontmost (active) application? """
+	which = 'pisf'
+	want = 'bool'
+class name(aetools.NProperty):
+	"""name - The name of the application. """
+	which = 'pnam'
+	want = 'utxt'
+class version(aetools.NProperty):
+	"""version - The version of the application. """
+	which = 'vers'
+	want = 'utxt'
+#        element 'cwin' as ['name', 'indx', 'rele', 'rang', 'test', 'ID  ']
+#        element 'docu' as ['name', 'indx', 'rele', 'rang', 'test']
+
+applications = application
+
+class color(aetools.ComponentItem):
+	"""color - A color. """
+	want = 'colr'
+
+colors = color
+
+class document(aetools.ComponentItem):
+	"""document - A document. """
+	want = 'docu'
+class modified(aetools.NProperty):
+	"""modified - Has the document been modified since the last save? """
+	which = 'imod'
+	want = 'bool'
+class path(aetools.NProperty):
+	"""path - The document's path. """
+	which = 'ppth'
+	want = 'utxt'
+
+documents = document
+
+class item(aetools.ComponentItem):
+	"""item - A scriptable object. """
+	want = 'cobj'
+class class_(aetools.NProperty):
+	"""class - The class of the object. """
+	which = 'pcls'
+	want = 'type'
+class properties(aetools.NProperty):
+	"""properties - All of the object's properties. """
+	which = 'pALL'
+	want = 'reco'
+
+items = item
+
+class window(aetools.ComponentItem):
+	"""window - A window. """
+	want = 'cwin'
+class bounds(aetools.NProperty):
+	"""bounds - The bounding rectangle of the window. """
+	which = 'pbnd'
+	want = 'qdrt'
+class closeable(aetools.NProperty):
+	"""closeable - Whether the window has a close box. """
+	which = 'hclb'
+	want = 'bool'
+class document(aetools.NProperty):
+	"""document - The document whose contents are being displayed in the window. """
+	which = 'docu'
+	want = 'docu'
+class floating(aetools.NProperty):
+	"""floating - Whether the window floats. """
+	which = 'isfl'
+	want = 'bool'
+class id(aetools.NProperty):
+	"""id - The unique identifier of the window. """
+	which = 'ID  '
+	want = 'long'
+class index(aetools.NProperty):
+	"""index - The index of the window in the back-to-front window ordering. """
+	which = 'pidx'
+	want = 'long'
+class miniaturizable(aetools.NProperty):
+	"""miniaturizable - Whether the window can be miniaturized. """
+	which = 'ismn'
+	want = 'bool'
+class miniaturized(aetools.NProperty):
+	"""miniaturized - Whether the window is currently miniaturized. """
+	which = 'pmnd'
+	want = 'bool'
+class modal(aetools.NProperty):
+	"""modal - Whether the window is the application's current modal window. """
+	which = 'pmod'
+	want = 'bool'
+class resizable(aetools.NProperty):
+	"""resizable - Whether the window can be resized. """
+	which = 'prsz'
+	want = 'bool'
+class titled(aetools.NProperty):
+	"""titled - Whether the window has a title bar. """
+	which = 'ptit'
+	want = 'bool'
+class visible(aetools.NProperty):
+	"""visible - Whether the window is currently visible. """
+	which = 'pvis'
+	want = 'bool'
+class zoomable(aetools.NProperty):
+	"""zoomable - Whether the window can be zoomed. """
+	which = 'iszm'
+	want = 'bool'
+class zoomed(aetools.NProperty):
+	"""zoomed - Whether the window is currently zoomed. """
+	which = 'pzum'
+	want = 'bool'
+
+windows = window
+application._superclassnames = ['item']
+application._privpropdict = {
+	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'frontmost' : frontmost,
+	'name' : name,
+	'version' : version,
+}
+application._privelemdict = {
+	'document' : document,
+	'window' : window,
+}
+color._superclassnames = ['item']
+color._privpropdict = {
+	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+}
+color._privelemdict = {
+}
+document._superclassnames = ['item']
+document._privpropdict = {
+	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'modified' : modified,
+	'name' : name,
+	'path' : path,
+}
+document._privelemdict = {
+}
+item._superclassnames = []
+item._privpropdict = {
+	'class_' : class_,
+	'properties' : properties,
+}
+item._privelemdict = {
+}
+window._superclassnames = ['item']
+window._privpropdict = {
+	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'bounds' : bounds,
+	'closeable' : closeable,
+	'document' : document,
+	'floating' : floating,
+	'id' : id,
+	'index' : index,
+	'miniaturizable' : miniaturizable,
+	'miniaturized' : miniaturized,
+	'modal' : modal,
+	'name' : name,
+	'resizable' : resizable,
+	'titled' : titled,
+	'visible' : visible,
+	'zoomable' : zoomable,
+	'zoomed' : zoomed,
+}
+window._privelemdict = {
+}
+class _3c_(aetools.NComparison):
+	"""< - Less than """
+class _3d_(aetools.NComparison):
+	"""= - Equal """
+class _3e_(aetools.NComparison):
+	"""> - Greater than """
+class contains(aetools.NComparison):
+	"""contains - Contains """
+class ends_with(aetools.NComparison):
+	"""ends with - Ends with """
+class starts_with(aetools.NComparison):
+	"""starts with - Starts with """
+class _b2_(aetools.NComparison):
+	"""\xb2 - Less than or equal to """
+class _b3_(aetools.NComparison):
+	"""\xb3 - Greater than or equal to """
+_Enum_savo = {
+	'ask' : 'ask ',	# Ask the user whether or not to save the file.
+	'yes' : 'yes ',	# Save the file.
+	'no' : 'no  ',	# Do not save the file.
+}
+
+
+#
+# Indices of types declared in this module
+#
+_classdeclarations = {
+	'capp' : application,
+	'cobj' : item,
+	'colr' : color,
+	'cwin' : window,
+	'docu' : document,
+}
+
+_propdeclarations = {
+	'ID  ' : id,
+	'c@#^' : _3c_Inheritance_3e_,
+	'docu' : document,
+	'hclb' : closeable,
+	'imod' : modified,
+	'isfl' : floating,
+	'ismn' : miniaturizable,
+	'iszm' : zoomable,
+	'pALL' : properties,
+	'pbnd' : bounds,
+	'pcls' : class_,
+	'pidx' : index,
+	'pisf' : frontmost,
+	'pmnd' : miniaturized,
+	'pmod' : modal,
+	'pnam' : name,
+	'ppth' : path,
+	'prsz' : resizable,
+	'ptit' : titled,
+	'pvis' : visible,
+	'pzum' : zoomed,
+	'vers' : version,
+}
+
+_compdeclarations = {
+	'<   ' : _3c_,
+	'<=  ' : _b2_,
+	'=   ' : _3d_,
+	'>   ' : _3e_,
+	'>=  ' : _b3_,
+	'bgwt' : starts_with,
+	'cont' : contains,
+	'ends' : ends_with,
+}
+
+_enumdeclarations = {
+	'savo' : _Enum_savo,
+}
diff --git a/Lib/plat-mac/lib-scriptpackages/Terminal/Terminal_Suite.py b/Lib/plat-mac/lib-scriptpackages/Terminal/Terminal_Suite.py
index cc35a01..a724e7f 100644
--- a/Lib/plat-mac/lib-scriptpackages/Terminal/Terminal_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Terminal/Terminal_Suite.py
@@ -1,7 +1,7 @@
 """Suite Terminal Suite: Terms and Events for controlling the Terminal application
 Level 1, version 1
 
-Generated from /Applications/Utilities/Terminal.app/Contents/Resources/Terminal.rsrc
+Generated from /Applications/Utilities/Terminal.app
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
@@ -12,14 +12,13 @@
 
 class Terminal_Suite_Events:
 
-	def count(self, _object=None, _attributes={}, **_arguments):
-		"""count: Return the number of elements of a particular class within an object
-		Required argument: a reference to the objects to be counted
+	def GetURL(self, _object, _attributes={}, **_arguments):
+		"""GetURL: Opens a telnet: URL
+		Required argument: the object for the command
 		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: the number of objects counted
 		"""
-		_code = 'core'
-		_subcode = 'cnte'
+		_code = 'GURL'
+		_subcode = 'GURL'
 
 		if _arguments: raise TypeError, 'No optional args expected'
 		_arguments['----'] = _object
@@ -34,16 +33,17 @@
 			return _arguments['----']
 
 	_argmap_do_script = {
-		'with_command' : 'cmnd',
 		'in_' : 'kfil',
+		'with_command' : 'cmnd',
 	}
 
 	def do_script(self, _object, _attributes={}, **_arguments):
 		"""do script: Run a UNIX shell script or command
-		Required argument: data to be passed to the Terminal application as the command line
-		Keyword argument with_command: data to be passed to the Terminal application as the command line, deprecated, use direct parameter
+		Required argument: the object for the command
 		Keyword argument in_: the window in which to execute the command
+		Keyword argument with_command: data to be passed to the Terminal application as the command line, deprecated, use direct parameter
 		Keyword argument _attributes: AppleEvent attribute dictionary
+		Returns: the reply for the command
 		"""
 		_code = 'core'
 		_subcode = 'dosc'
@@ -60,61 +60,20 @@
 		if _arguments.has_key('----'):
 			return _arguments['----']
 
-	def quit(self, _no_object=None, _attributes={}, **_arguments):
-		"""quit: Quit the Terminal application
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'aevt'
-		_subcode = 'quit'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def run(self, _no_object=None, _attributes={}, **_arguments):
-		"""run: Run the Terminal application
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'aevt'
-		_subcode = 'oapp'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
 
 class application(aetools.ComponentItem):
 	"""application - The Terminal program """
 	want = 'capp'
-class frontmost(aetools.NProperty):
-	"""frontmost - Is this the active application? """
-	which = 'pisf'
-	want = 'bool'
-class name(aetools.NProperty):
-	"""name - the name of the application """
-	which = 'pnam'
-	want = 'TEXT'
-class version(aetools.NProperty):
-	"""version - the version of the application """
-	which = 'vers'
-	want = 'vers'
-#        element 'cwin' as ['name', 'indx']
+class _3c_Inheritance_3e_(aetools.NProperty):
+	"""<Inheritance> - All of the properties of the superclass. """
+	which = 'c@#^'
+	want = 'capp'
+class properties(aetools.NProperty):
+	"""properties - every property of the Terminal program """
+	which = 'pALL'
+	want = '****'
+#        element 'cwin' as ['name', 'indx', 'rele', 'rang', 'test', 'ID  ']
+#        element 'docu' as ['name', 'indx', 'rele', 'rang', 'test']
 
 applications = application
 
@@ -124,15 +83,15 @@
 class background_color(aetools.NProperty):
 	"""background color - the background color for the window """
 	which = 'pbcl'
-	want = 'TEXT'
+	want = '****'
 class bold_text_color(aetools.NProperty):
 	"""bold text color - the bold text color for the window """
 	which = 'pbtc'
-	want = 'TEXT'
+	want = '****'
 class bounds(aetools.NProperty):
 	"""bounds - the boundary rectangle for the window, relative to the upper left corner of the screen """
 	which = 'pbnd'
-	want = 'qdrt'
+	want = '****'
 class busy(aetools.NProperty):
 	"""busy - Is the window busy running a process? """
 	which = 'busy'
@@ -140,55 +99,31 @@
 class contents(aetools.NProperty):
 	"""contents - the currently visible contents of the window """
 	which = 'pcnt'
-	want = 'TEXT'
+	want = 'utxt'
 class cursor_color(aetools.NProperty):
 	"""cursor color - the cursor color for the window """
 	which = 'pcuc'
-	want = 'TEXT'
+	want = '****'
 class custom_title(aetools.NProperty):
 	"""custom title - the custom title for the window """
 	which = 'titl'
-	want = 'TEXT'
-class floating(aetools.NProperty):
-	"""floating - Does the window float? """
-	which = 'isfl'
-	want = 'bool'
+	want = 'utxt'
 class frame(aetools.NProperty):
 	"""frame - the origin and size of the window """
 	which = 'pfra'
-	want = 'list'
-class has_close_box(aetools.NProperty):
-	"""has close box - Does the window have a close box? """
-	which = 'hclb'
-	want = 'bool'
-class has_title_bar(aetools.NProperty):
-	"""has title bar - Does the window have a title bar? """
-	which = 'ptit'
+	want = '****'
+class frontmost(aetools.NProperty):
+	"""frontmost - Is the window in front of the other Terminal windows? """
+	which = 'pisf'
 	want = 'bool'
 class history(aetools.NProperty):
 	"""history - the contents of the entire scrolling buffer of the window """
 	which = 'hist'
-	want = 'TEXT'
-class index(aetools.NProperty):
-	"""index - the number of the window """
-	which = 'pidx'
-	want = 'long'
-class miniaturizable(aetools.NProperty):
-	"""miniaturizable - Is the window miniaturizable? """
-	which = 'ismn'
-	want = 'bool'
-class miniaturized(aetools.NProperty):
-	"""miniaturized - Is the window miniaturized? """
-	which = 'pmnd'
-	want = 'bool'
-class modal(aetools.NProperty):
-	"""modal - Is the window modal? """
-	which = 'pmod'
-	want = 'bool'
+	want = 'utxt'
 class normal_text_color(aetools.NProperty):
 	"""normal text color - the normal text color for the window """
 	which = 'ptxc'
-	want = 'TEXT'
+	want = '****'
 class number_of_columns(aetools.NProperty):
 	"""number of columns - the number of columns in the window """
 	which = 'ccol'
@@ -200,23 +135,19 @@
 class origin(aetools.NProperty):
 	"""origin - the lower left coordinates of the window, relative to the lower left corner of the screen """
 	which = 'pori'
-	want = 'list'
+	want = '****'
 class position(aetools.NProperty):
 	"""position - the upper left coordinates of the window, relative to the upper left corner of the screen """
 	which = 'ppos'
-	want = 'QDpt'
+	want = '****'
 class processes(aetools.NProperty):
 	"""processes - a list of the currently running processes """
 	which = 'prcs'
-	want = 'list'
-class resizable(aetools.NProperty):
-	"""resizable - Is the window resizable? """
-	which = 'prsz'
-	want = 'bool'
+	want = 'utxt'
 class size(aetools.NProperty):
 	"""size - the width and height of the window """
 	which = 'psiz'
-	want = 'list'
+	want = '****'
 class title_displays_custom_title(aetools.NProperty):
 	"""title displays custom title - Does the title for the window contain a custom title? """
 	which = 'tdct'
@@ -237,31 +168,21 @@
 	"""title displays window size - Does the title for the window contain the window size? """
 	which = 'tdws'
 	want = 'bool'
-class visible(aetools.NProperty):
-	"""visible - Is the window visible? """
-	which = 'pvis'
-	want = 'bool'
-class zoomable(aetools.NProperty):
-	"""zoomable - Is the window zoomable? """
-	which = 'iszm'
-	want = 'bool'
-class zoomed(aetools.NProperty):
-	"""zoomed - Is the window zoomed? """
-	which = 'pzum'
-	want = 'bool'
 
 windows = window
 application._superclassnames = []
+import Standard_Suite
 application._privpropdict = {
-	'frontmost' : frontmost,
-	'name' : name,
-	'version' : version,
+	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'properties' : properties,
 }
 application._privelemdict = {
+	'document' : Standard_Suite.document,
 	'window' : window,
 }
 window._superclassnames = []
 window._privpropdict = {
+	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
 	'background_color' : background_color,
 	'bold_text_color' : bold_text_color,
 	'bounds' : bounds,
@@ -269,33 +190,22 @@
 	'contents' : contents,
 	'cursor_color' : cursor_color,
 	'custom_title' : custom_title,
-	'floating' : floating,
 	'frame' : frame,
 	'frontmost' : frontmost,
-	'has_close_box' : has_close_box,
-	'has_title_bar' : has_title_bar,
 	'history' : history,
-	'index' : index,
-	'miniaturizable' : miniaturizable,
-	'miniaturized' : miniaturized,
-	'modal' : modal,
-	'name' : name,
 	'normal_text_color' : normal_text_color,
 	'number_of_columns' : number_of_columns,
 	'number_of_rows' : number_of_rows,
 	'origin' : origin,
 	'position' : position,
 	'processes' : processes,
-	'resizable' : resizable,
+	'properties' : properties,
 	'size' : size,
 	'title_displays_custom_title' : title_displays_custom_title,
 	'title_displays_device_name' : title_displays_device_name,
 	'title_displays_file_name' : title_displays_file_name,
 	'title_displays_shell_path' : title_displays_shell_path,
 	'title_displays_window_size' : title_displays_window_size,
-	'visible' : visible,
-	'zoomable' : zoomable,
-	'zoomed' : zoomed,
 }
 window._privelemdict = {
 }
@@ -310,40 +220,29 @@
 
 _propdeclarations = {
 	'busy' : busy,
+	'c@#^' : _3c_Inheritance_3e_,
 	'ccol' : number_of_columns,
 	'crow' : number_of_rows,
-	'hclb' : has_close_box,
 	'hist' : history,
-	'isfl' : floating,
-	'ismn' : miniaturizable,
-	'iszm' : zoomable,
+	'pALL' : properties,
 	'pbcl' : background_color,
 	'pbnd' : bounds,
 	'pbtc' : bold_text_color,
 	'pcnt' : contents,
 	'pcuc' : cursor_color,
 	'pfra' : frame,
-	'pidx' : index,
 	'pisf' : frontmost,
-	'pmnd' : miniaturized,
-	'pmod' : modal,
-	'pnam' : name,
 	'pori' : origin,
 	'ppos' : position,
 	'prcs' : processes,
-	'prsz' : resizable,
 	'psiz' : size,
-	'ptit' : has_title_bar,
 	'ptxc' : normal_text_color,
-	'pvis' : visible,
-	'pzum' : zoomed,
 	'tdct' : title_displays_custom_title,
 	'tddn' : title_displays_device_name,
 	'tdfn' : title_displays_file_name,
 	'tdsp' : title_displays_shell_path,
 	'tdws' : title_displays_window_size,
 	'titl' : custom_title,
-	'vers' : version,
 }
 
 _compdeclarations = {
diff --git a/Lib/plat-mac/lib-scriptpackages/Terminal/Text_Suite.py b/Lib/plat-mac/lib-scriptpackages/Terminal/Text_Suite.py
new file mode 100644
index 0000000..3b4fb29
--- /dev/null
+++ b/Lib/plat-mac/lib-scriptpackages/Terminal/Text_Suite.py
@@ -0,0 +1,195 @@
+"""Suite Text Suite: A set of basic classes for text processing.
+Level 1, version 1
+
+Generated from /Applications/Utilities/Terminal.app
+AETE/AEUT resource version 1/0, language 0, script 0
+"""
+
+import aetools
+import MacOS
+
+_code = '????'
+
+class Text_Suite_Events:
+
+	pass
+
+
+class attachment(aetools.ComponentItem):
+	"""attachment - Represents an inline text attachment.  This class is used mainly for make commands. """
+	want = 'atts'
+class _3c_Inheritance_3e_(aetools.NProperty):
+	"""<Inheritance> - All of the properties of the superclass. """
+	which = 'c@#^'
+	want = 'ctxt'
+class file_name(aetools.NProperty):
+	"""file name - The path to the file for the attachment """
+	which = 'atfn'
+	want = 'utxt'
+#        element 'catr' as ['indx', 'rele', 'rang', 'test']
+#        element 'cha ' as ['indx', 'rele', 'rang', 'test']
+#        element 'cpar' as ['indx', 'rele', 'rang', 'test']
+#        element 'cwor' as ['indx', 'rele', 'rang', 'test']
+
+class attribute_run(aetools.ComponentItem):
+	"""attribute run - This subdivides the text into chunks that all have the same attributes. """
+	want = 'catr'
+class color(aetools.NProperty):
+	"""color - The color of the first character. """
+	which = 'colr'
+	want = 'colr'
+class font(aetools.NProperty):
+	"""font - The name of the font of the first character. """
+	which = 'font'
+	want = 'utxt'
+class size(aetools.NProperty):
+	"""size - The size in points of the first character. """
+	which = 'ptsz'
+	want = 'long'
+#        element 'catr' as ['indx', 'rele', 'rang', 'test']
+#        element 'cha ' as ['indx', 'rele', 'rang', 'test']
+#        element 'cpar' as ['indx', 'rele', 'rang', 'test']
+#        element 'cwor' as ['indx', 'rele', 'rang', 'test']
+
+attribute_runs = attribute_run
+
+class character(aetools.ComponentItem):
+	"""character - This subdivides the text into characters. """
+	want = 'cha '
+#        element 'catr' as ['indx', 'rele', 'rang', 'test']
+#        element 'cha ' as ['indx', 'rele', 'rang', 'test']
+#        element 'cpar' as ['indx', 'rele', 'rang', 'test']
+#        element 'cwor' as ['indx', 'rele', 'rang', 'test']
+
+characters = character
+
+class paragraph(aetools.ComponentItem):
+	"""paragraph - This subdivides the text into paragraphs. """
+	want = 'cpar'
+#        element 'catr' as ['indx', 'rele', 'rang', 'test']
+#        element 'cha ' as ['indx', 'rele', 'rang', 'test']
+#        element 'cpar' as ['indx', 'rele', 'rang', 'test']
+#        element 'cwor' as ['indx', 'rele', 'rang', 'test']
+
+paragraphs = paragraph
+
+class text(aetools.ComponentItem):
+	"""text - Rich (styled) text """
+	want = 'ctxt'
+#        element 'catr' as ['indx', 'rele', 'rang', 'test']
+#        element 'cha ' as ['indx', 'rele', 'rang', 'test']
+#        element 'cpar' as ['indx', 'rele', 'rang', 'test']
+#        element 'cwor' as ['indx', 'rele', 'rang', 'test']
+
+class word(aetools.ComponentItem):
+	"""word - This subdivides the text into words. """
+	want = 'cwor'
+#        element 'catr' as ['indx', 'rele', 'rang', 'test']
+#        element 'cha ' as ['indx', 'rele', 'rang', 'test']
+#        element 'cpar' as ['indx', 'rele', 'rang', 'test']
+#        element 'cwor' as ['indx', 'rele', 'rang', 'test']
+
+words = word
+attachment._superclassnames = ['text']
+attachment._privpropdict = {
+	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'file_name' : file_name,
+}
+attachment._privelemdict = {
+	'attribute_run' : attribute_run,
+	'character' : character,
+	'paragraph' : paragraph,
+	'word' : word,
+}
+import Standard_Suite
+attribute_run._superclassnames = ['item']
+attribute_run._privpropdict = {
+	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'color' : color,
+	'font' : font,
+	'size' : size,
+}
+attribute_run._privelemdict = {
+	'attribute_run' : attribute_run,
+	'character' : character,
+	'paragraph' : paragraph,
+	'word' : word,
+}
+character._superclassnames = ['item']
+character._privpropdict = {
+	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'color' : color,
+	'font' : font,
+	'size' : size,
+}
+character._privelemdict = {
+	'attribute_run' : attribute_run,
+	'character' : character,
+	'paragraph' : paragraph,
+	'word' : word,
+}
+paragraph._superclassnames = ['item']
+paragraph._privpropdict = {
+	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'color' : color,
+	'font' : font,
+	'size' : size,
+}
+paragraph._privelemdict = {
+	'attribute_run' : attribute_run,
+	'character' : character,
+	'paragraph' : paragraph,
+	'word' : word,
+}
+text._superclassnames = ['item']
+text._privpropdict = {
+	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'color' : color,
+	'font' : font,
+	'size' : size,
+}
+text._privelemdict = {
+	'attribute_run' : attribute_run,
+	'character' : character,
+	'paragraph' : paragraph,
+	'word' : word,
+}
+word._superclassnames = ['item']
+word._privpropdict = {
+	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'color' : color,
+	'font' : font,
+	'size' : size,
+}
+word._privelemdict = {
+	'attribute_run' : attribute_run,
+	'character' : character,
+	'paragraph' : paragraph,
+	'word' : word,
+}
+
+#
+# Indices of types declared in this module
+#
+_classdeclarations = {
+	'atts' : attachment,
+	'catr' : attribute_run,
+	'cha ' : character,
+	'cpar' : paragraph,
+	'ctxt' : text,
+	'cwor' : word,
+}
+
+_propdeclarations = {
+	'atfn' : file_name,
+	'c@#^' : _3c_Inheritance_3e_,
+	'colr' : color,
+	'font' : font,
+	'ptsz' : size,
+}
+
+_compdeclarations = {
+}
+
+_enumdeclarations = {
+}
diff --git a/Lib/plat-mac/lib-scriptpackages/Terminal/__init__.py b/Lib/plat-mac/lib-scriptpackages/Terminal/__init__.py
index d472961..10d2baf 100644
--- a/Lib/plat-mac/lib-scriptpackages/Terminal/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/Terminal/__init__.py
@@ -1,26 +1,29 @@
 """
-Package generated from /Applications/Utilities/Terminal.app/Contents/Resources/Terminal.rsrc
-Resource aete resid 0 Terminal Terminology
+Package generated from /Applications/Utilities/Terminal.app
 """
 import aetools
 Error = aetools.Error
-import Invisible_Suite
+import Standard_Suite
+import Text_Suite
 import Terminal_Suite
 
 
 _code_to_module = {
-	'tpnm' : Invisible_Suite,
+	'????' : Standard_Suite,
+	'????' : Text_Suite,
 	'trmx' : Terminal_Suite,
 }
 
 
 
 _code_to_fullname = {
-	'tpnm' : ('Terminal.Invisible_Suite', 'Invisible_Suite'),
+	'????' : ('Terminal.Standard_Suite', 'Standard_Suite'),
+	'????' : ('Terminal.Text_Suite', 'Text_Suite'),
 	'trmx' : ('Terminal.Terminal_Suite', 'Terminal_Suite'),
 }
 
-from Invisible_Suite import *
+from Standard_Suite import *
+from Text_Suite import *
 from Terminal_Suite import *
 
 def getbaseclasses(v):
@@ -42,47 +45,17 @@
 #
 getbaseclasses(window)
 getbaseclasses(application)
+getbaseclasses(character)
+getbaseclasses(attachment)
+getbaseclasses(paragraph)
+getbaseclasses(word)
+getbaseclasses(attribute_run)
+getbaseclasses(text)
+getbaseclasses(color)
+getbaseclasses(window)
 getbaseclasses(application)
-getbaseclasses(StdSuites.Type_Names_Suite.small_integer)
-getbaseclasses(StdSuites.Type_Names_Suite.RGB16_color)
-getbaseclasses(StdSuites.Type_Names_Suite.system_dictionary)
-getbaseclasses(StdSuites.Type_Names_Suite.color_table)
-getbaseclasses(StdSuites.Type_Names_Suite.fixed_point)
-getbaseclasses(StdSuites.Type_Names_Suite.plain_text)
-getbaseclasses(StdSuites.Type_Names_Suite.type_element_info)
-getbaseclasses(StdSuites.Type_Names_Suite.location_reference)
-getbaseclasses(StdSuites.Type_Names_Suite.version)
-getbaseclasses(StdSuites.Type_Names_Suite.PostScript_picture)
-getbaseclasses(StdSuites.Type_Names_Suite.machine_location)
-getbaseclasses(StdSuites.Type_Names_Suite.menu_item)
-getbaseclasses(StdSuites.Type_Names_Suite.pixel_map_record)
-getbaseclasses(StdSuites.Type_Names_Suite.application_dictionary)
-getbaseclasses(StdSuites.Type_Names_Suite.unsigned_integer)
-getbaseclasses(StdSuites.Type_Names_Suite.menu)
-getbaseclasses(StdSuites.Type_Names_Suite.fixed_rectangle)
-getbaseclasses(StdSuites.Type_Names_Suite.long_fixed_rectangle)
-getbaseclasses(StdSuites.Type_Names_Suite.type_event_info)
-getbaseclasses(StdSuites.Type_Names_Suite.small_real)
-getbaseclasses(StdSuites.Type_Names_Suite.type_suite_info)
-getbaseclasses(StdSuites.Type_Names_Suite.rotation)
-getbaseclasses(StdSuites.Type_Names_Suite.fixed)
-getbaseclasses(StdSuites.Type_Names_Suite.scrap_styles)
-getbaseclasses(StdSuites.Type_Names_Suite.long_point)
-getbaseclasses(StdSuites.Type_Names_Suite.type_class_info)
-getbaseclasses(StdSuites.Type_Names_Suite.TIFF_picture)
-getbaseclasses(StdSuites.Type_Names_Suite.RGB96_color)
-getbaseclasses(StdSuites.Type_Names_Suite.dash_style)
-getbaseclasses(StdSuites.Type_Names_Suite.type_property_info)
-getbaseclasses(StdSuites.Type_Names_Suite.type_parameter_info)
-getbaseclasses(StdSuites.Type_Names_Suite.long_fixed_point)
-getbaseclasses(StdSuites.Type_Names_Suite.long_rectangle)
-getbaseclasses(StdSuites.Type_Names_Suite.extended_real)
-getbaseclasses(StdSuites.Type_Names_Suite.double_integer)
-getbaseclasses(StdSuites.Type_Names_Suite.long_fixed)
-getbaseclasses(StdSuites.Type_Names_Suite.null)
-getbaseclasses(StdSuites.Type_Names_Suite.target_id)
-getbaseclasses(StdSuites.Type_Names_Suite.point)
-getbaseclasses(StdSuites.Type_Names_Suite.bounding_rectangle)
+getbaseclasses(item)
+getbaseclasses(document)
 
 #
 # Indices of types declared in this module
@@ -90,51 +63,22 @@
 _classdeclarations = {
 	'cwin' : window,
 	'capp' : application,
+	'cha ' : character,
+	'atts' : attachment,
+	'cpar' : paragraph,
+	'cwor' : word,
+	'catr' : attribute_run,
+	'ctxt' : text,
+	'colr' : color,
+	'cwin' : window,
 	'capp' : application,
-	'shor' : StdSuites.Type_Names_Suite.small_integer,
-	'tr16' : StdSuites.Type_Names_Suite.RGB16_color,
-	'aeut' : StdSuites.Type_Names_Suite.system_dictionary,
-	'clrt' : StdSuites.Type_Names_Suite.color_table,
-	'fpnt' : StdSuites.Type_Names_Suite.fixed_point,
-	'TEXT' : StdSuites.Type_Names_Suite.plain_text,
-	'elin' : StdSuites.Type_Names_Suite.type_element_info,
-	'insl' : StdSuites.Type_Names_Suite.location_reference,
-	'vers' : StdSuites.Type_Names_Suite.version,
-	'EPS ' : StdSuites.Type_Names_Suite.PostScript_picture,
-	'mLoc' : StdSuites.Type_Names_Suite.machine_location,
-	'cmen' : StdSuites.Type_Names_Suite.menu_item,
-	'tpmm' : StdSuites.Type_Names_Suite.pixel_map_record,
-	'aete' : StdSuites.Type_Names_Suite.application_dictionary,
-	'magn' : StdSuites.Type_Names_Suite.unsigned_integer,
-	'cmnu' : StdSuites.Type_Names_Suite.menu,
-	'frct' : StdSuites.Type_Names_Suite.fixed_rectangle,
-	'lfrc' : StdSuites.Type_Names_Suite.long_fixed_rectangle,
-	'evin' : StdSuites.Type_Names_Suite.type_event_info,
-	'sing' : StdSuites.Type_Names_Suite.small_real,
-	'suin' : StdSuites.Type_Names_Suite.type_suite_info,
-	'trot' : StdSuites.Type_Names_Suite.rotation,
-	'fixd' : StdSuites.Type_Names_Suite.fixed,
-	'styl' : StdSuites.Type_Names_Suite.scrap_styles,
-	'lpnt' : StdSuites.Type_Names_Suite.long_point,
-	'gcli' : StdSuites.Type_Names_Suite.type_class_info,
-	'TIFF' : StdSuites.Type_Names_Suite.TIFF_picture,
-	'tr96' : StdSuites.Type_Names_Suite.RGB96_color,
-	'tdas' : StdSuites.Type_Names_Suite.dash_style,
-	'pinf' : StdSuites.Type_Names_Suite.type_property_info,
-	'pmin' : StdSuites.Type_Names_Suite.type_parameter_info,
-	'lfpt' : StdSuites.Type_Names_Suite.long_fixed_point,
-	'lrct' : StdSuites.Type_Names_Suite.long_rectangle,
-	'exte' : StdSuites.Type_Names_Suite.extended_real,
-	'comp' : StdSuites.Type_Names_Suite.double_integer,
-	'lfxd' : StdSuites.Type_Names_Suite.long_fixed,
-	'null' : StdSuites.Type_Names_Suite.null,
-	'targ' : StdSuites.Type_Names_Suite.target_id,
-	'QDpt' : StdSuites.Type_Names_Suite.point,
-	'qdrt' : StdSuites.Type_Names_Suite.bounding_rectangle,
+	'cobj' : item,
+	'docu' : document,
 }
 
 
-class Terminal(Invisible_Suite_Events,
+class Terminal(Standard_Suite_Events,
+		Text_Suite_Events,
 		Terminal_Suite_Events,
 		aetools.TalkTo):
 	_signature = 'trmx'