Regenerated with OSA class inheritance and fix for non-ascii chars.

42 files changed, 2217 insertions, 818 deletions

diff --git a/Mac/Lib/lib-scriptpackages/CodeWarrior/CodeWarrior_suite.py b/Mac/Lib/lib-scriptpackages/CodeWarrior/CodeWarrior_suite.py
index 4e82b67..7bc5b19 100644
--- a/Mac/Lib/lib-scriptpackages/CodeWarrior/CodeWarrior_suite.py
+++ b/Mac/Lib/lib-scriptpackages/CodeWarrior/CodeWarrior_suite.py
@@ -1,7 +1,7 @@
 """Suite CodeWarrior suite: Terms for scripting the CodeWarrior IDE
 Level 0, version 0
 
-Generated from Moes:Applications (Mac OS 9):Metrowerks CodeWarrior 7.0:Metrowerks CodeWarrior:CodeWarrior IDE 4.2.6
+Generated from /Volumes/Sap/Applications (Mac OS 9)/Metrowerks CodeWarrior 7.0/Metrowerks CodeWarrior/CodeWarrior IDE 4.2.5
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
@@ -44,12 +44,12 @@ class CodeWarrior_suite_Events:
 			return _arguments['----']
 
 	_argmap_export = {
-		'_in' : 'kfil',
+		'in_' : 'kfil',
 	}
 
 	def export(self, _no_object=None, _attributes={}, **_arguments):
 		"""export: Export the project file as an XML file
-		Keyword argument _in: the XML file in which to export the project
+		Keyword argument in_: the XML file in which to export the project
 		Keyword argument _attributes: AppleEvent attribute dictionary
 		"""
 		_code = 'CWIE'
@@ -379,7 +379,7 @@ class linked(aetools.NProperty):
 	which = 'LINK'
 	want = 'bool'
 class link_index(aetools.NProperty):
-	"""link index - the index of the source file in its targetÕs link order (-1 if source file is not in link order) """
+	"""link index - the index of the source file in its target\xd5s link order (-1 if source file is not in link order) """
 	which = 'LIDX'
 	want = 'long'
 class modified_date(aetools.NProperty):
@@ -407,7 +407,7 @@ class weak_link(aetools.NProperty):
 	which = 'WEAK'
 	want = 'bool'
 class init_before(aetools.NProperty):
-	"""init before - is the •initialize beforeÕ flag set for this shared library? """
+	"""init before - is the \xd4initialize before\xd5 flag set for this shared library? """
 	which = 'INIT'
 	want = 'bool'
 class merge_output(aetools.NProperty):
@@ -448,84 +448,100 @@ class ToolServer_worksheet(aetools.ComponentItem):
 	want = 'TOOL'
 
 ToolServer_worksheets = ToolServer_worksheet
-build_progress_document._propdict = {
+import Standard_Suite
+build_progress_document._superclassnames = ['document']
+build_progress_document._privpropdict = {
 	'inherits' : inherits,
 }
-build_progress_document._elemdict = {
+build_progress_document._privelemdict = {
 }
-catalog_document._propdict = {
+catalog_document._superclassnames = ['text_document']
+catalog_document._privpropdict = {
 	'inherits' : inherits,
 }
-catalog_document._elemdict = {
+catalog_document._privelemdict = {
 }
-class_browser._propdict = {
+class_browser._superclassnames = ['text_document']
+class_browser._privpropdict = {
 	'inherits' : inherits,
 }
-class_browser._elemdict = {
+class_browser._privelemdict = {
 }
-class_hierarchy._propdict = {
+class_hierarchy._superclassnames = ['document']
+class_hierarchy._privpropdict = {
 	'inherits' : inherits,
 }
-class_hierarchy._elemdict = {
+class_hierarchy._privelemdict = {
 }
-editor_document._propdict = {
+editor_document._superclassnames = ['text_document']
+editor_document._privpropdict = {
 	'inherits' : inherits,
 }
-editor_document._elemdict = {
+editor_document._privelemdict = {
 }
-file_compare_document._propdict = {
+file_compare_document._superclassnames = ['text_document']
+file_compare_document._privpropdict = {
 	'inherits' : inherits,
 }
-file_compare_document._elemdict = {
+file_compare_document._privelemdict = {
 }
-message_document._propdict = {
+message_document._superclassnames = ['text_document']
+message_document._privpropdict = {
 	'inherits' : inherits,
 }
-message_document._elemdict = {
+message_document._privelemdict = {
 }
-project_document._propdict = {
+project_document._superclassnames = ['document']
+project_document._privpropdict = {
 	'inherits' : inherits,
 	'current_target' : current_target,
 }
-project_document._elemdict = {
+project_document._privelemdict = {
 	'target' : target,
 }
-project_inspector._propdict = {
+project_inspector._superclassnames = ['document']
+project_inspector._privpropdict = {
 	'inherits' : inherits,
 }
-project_inspector._elemdict = {
+project_inspector._privelemdict = {
 }
-single_class_browser._propdict = {
+single_class_browser._superclassnames = ['text_document']
+single_class_browser._privpropdict = {
 	'inherits' : inherits,
 }
-single_class_browser._elemdict = {
+single_class_browser._privelemdict = {
 }
-single_class_hierarchy._propdict = {
+single_class_hierarchy._superclassnames = ['document']
+single_class_hierarchy._privpropdict = {
 	'inherits' : inherits,
 }
-single_class_hierarchy._elemdict = {
+single_class_hierarchy._privelemdict = {
 }
-subtarget._propdict = {
+subtarget._superclassnames = ['target']
+subtarget._privpropdict = {
 	'inherits' : inherits,
 	'target' : target,
 	'link_against_output' : link_against_output,
 }
-subtarget._elemdict = {
+subtarget._privelemdict = {
 }
-symbol_browser._propdict = {
+symbol_browser._superclassnames = ['text_document']
+symbol_browser._privpropdict = {
 	'inherits' : inherits,
 }
-symbol_browser._elemdict = {
+symbol_browser._privelemdict = {
 }
-target._propdict = {
+target._superclassnames = []
+target._privpropdict = {
 	'name' : name,
 	'project_document' : project_document,
 }
-target._elemdict = {
+target._privelemdict = {
 	'target_file' : target_file,
 	'subtarget' : subtarget,
 }
-target_file._propdict = {
+target_file._superclassnames = []
+target_file._privpropdict = {
 	'id' : id,
 	'type' : type,
 	'location' : location,
@@ -543,24 +559,25 @@ target_file._propdict = {
 	'prerequisites' : prerequisites,
 	'dependents' : dependents,
 }
-target_file._elemdict = {
+target_file._privelemdict = {
 }
-import Standard_Suite
-text_document._propdict = {
+text_document._superclassnames = ['document']
+text_document._privpropdict = {
 	'inherits' : inherits,
 	'modified' : modified,
 	'selection' : selection,
 }
-text_document._elemdict = {
+text_document._privelemdict = {
 	'character' : Standard_Suite.character,
 	'insertion_point' : Standard_Suite.insertion_point,
 	'line' : Standard_Suite.line,
 	'text' : Standard_Suite.text,
 }
-ToolServer_worksheet._propdict = {
+ToolServer_worksheet._superclassnames = ['text_document']
+ToolServer_worksheet._privpropdict = {
 	'inherits' : inherits,
 }
-ToolServer_worksheet._elemdict = {
+ToolServer_worksheet._privelemdict = {
 }
 _Enum_Inte = {
 	'never_interact' : 'eNvr',	# never allow user interactions
diff --git a/Mac/Lib/lib-scriptpackages/CodeWarrior/Metrowerks_Shell_Suite.py b/Mac/Lib/lib-scriptpackages/CodeWarrior/Metrowerks_Shell_Suite.py
index cfac353..b8a60e2 100644
--- a/Mac/Lib/lib-scriptpackages/CodeWarrior/Metrowerks_Shell_Suite.py
+++ b/Mac/Lib/lib-scriptpackages/CodeWarrior/Metrowerks_Shell_Suite.py
@@ -1,7 +1,7 @@
 """Suite Metrowerks Shell Suite: Events supported by the Metrowerks Project Shell
 Level 1, version 1
 
-Generated from Moes:Applications (Mac OS 9):Metrowerks CodeWarrior 7.0:Metrowerks CodeWarrior:CodeWarrior IDE 4.2.6
+Generated from /Volumes/Sap/Applications (Mac OS 9)/Metrowerks CodeWarrior 7.0/Metrowerks CodeWarrior/CodeWarrior IDE 4.2.5
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
@@ -791,7 +791,7 @@ class Metrowerks_Shell_Suite_Events:
 
 
 class Access_Paths(aetools.ComponentItem):
-	"""Access Paths - Contains the definitions of a projectÕs access (search) paths. """
+	"""Access Paths - Contains the definitions of a project\xd5s access (search) paths. """
 	want = 'PATH'
 class User_Paths(aetools.NProperty):
 	"""User Paths - To add an access path for the source files. """
@@ -998,7 +998,7 @@ class Launch_Apps_on_Open(aetools.NProperty):
 	which = 'Dg03'
 	want = 'bool'
 class Confirm_Kill(aetools.NProperty):
-	"""Confirm Kill - Confirm the •killingÕ of the process. """
+	"""Confirm Kill - Confirm the \xd4killing\xd5 of the process. """
 	which = 'Dg04'
 	want = 'bool'
 class Stop_at_Main(aetools.NProperty):
@@ -1010,7 +1010,7 @@ class Select_Stack_Crawl(aetools.NProperty):
 	which = 'Dg06'
 	want = 'bool'
 class Dont_Step_in_Runtime(aetools.NProperty):
-	"""Dont Step in Runtime - DonÕt step into runtime code when debugging. """
+	"""Dont Step in Runtime - Don\xd5t step into runtime code when debugging. """
 	which = 'Dg07'
 	want = 'bool'
 class Auto_Target_Libraries(aetools.NProperty):
@@ -1046,7 +1046,7 @@ class Temp_breakpoint_names(aetools.NProperty):
 	which = 'Dt14'
 	want = 'ctxt'
 class Cache_symbolics(aetools.NProperty):
-	"""Cache symbolics - Cache symbolics between runs when executable doesnÕt change, else release symbolics files after killing process. """
+	"""Cache symbolics - Cache symbolics between runs when executable doesn\xd5t change, else release symbolics files after killing process. """
 	which = 'Dt15'
 	want = 'bool'
 class Temp_Breakpoint_Type(aetools.NProperty):
@@ -1074,7 +1074,7 @@ class Flash_Delay(aetools.NProperty):
 	which = 'ED01'
 	want = 'long'
 class Dynamic_Scroll(aetools.NProperty):
-	"""Dynamic Scroll - Display a windowÕs contents as you move the scroll box. """
+	"""Dynamic Scroll - Display a window\xd5s contents as you move the scroll box. """
 	which = 'ED02'
 	want = 'bool'
 class Balance(aetools.NProperty):
@@ -1178,11 +1178,11 @@ class Full_Screen_Zoom(aetools.NProperty):
 	which = 'EX07'
 	want = 'bool'
 class Recent_Editor_Count(aetools.NProperty):
-	"""Recent Editor Count - Maximum number of editor documents to show in the –Open Recent” menu """
+	"""Recent Editor Count - Maximum number of editor documents to show in the \xd2Open Recent\xd3 menu """
 	which = 'EX16'
 	want = 'shor'
 class Recent_Project_Count(aetools.NProperty):
-	"""Recent Project Count - Maximum number of project documents to show in the –Open Recent” menu """
+	"""Recent Project Count - Maximum number of project documents to show in the \xd2Open Recent\xd3 menu """
 	which = 'EX17'
 	want = 'shor'
 class Use_Editor_Extensions(aetools.NProperty):
@@ -1294,7 +1294,7 @@ class origin(aetools.NProperty):
 	which = 'Orig'
 	want = 'PPrm'
 class root(aetools.NProperty):
-	"""root - Name of the root of the relative path. Pre-defined values are –Absolute”, –Project”, –CodeWarrior”, and  –System”. Anything else is a user-defined root. """
+	"""root - Name of the root of the relative path. Pre-defined values are \xd2Absolute\xd3, \xd2Project\xd3, \xd2CodeWarrior\xd3, and  \xd2System\xd3. Anything else is a user-defined root. """
 	which = 'Root'
 	want = 'TEXT'
 class recursive(aetools.NProperty):
@@ -1330,11 +1330,11 @@ class filetype(aetools.NProperty):
 	which = 'SrcT'
 	want = 'SrcT'
 class codesize(aetools.NProperty):
-	"""codesize - The size of this fileÕs code. """
+	"""codesize - The size of this file\xd5s code. """
 	which = 'CSiz'
 	want = 'long'
 class datasize(aetools.NProperty):
-	"""datasize - The size of this fileÕs data. """
+	"""datasize - The size of this file\xd5s data. """
 	which = 'DSiz'
 	want = 'long'
 class up_to_date(aetools.NProperty):
@@ -1467,7 +1467,7 @@ class String_Color(aetools.NProperty):
 	want = 'cRGB'
 
 class Target_Settings(aetools.ComponentItem):
-	"""Target Settings - Contains the definitions of a projectÕs target. """
+	"""Target Settings - Contains the definitions of a project\xd5s target. """
 	want = 'TARG'
 class Linker(aetools.NProperty):
 	"""Linker - The name of the current linker. """
@@ -1486,11 +1486,11 @@ class Target_Name(aetools.NProperty):
 	which = 'TA10'
 	want = 'TEXT'
 class Output_Directory_Path(aetools.NProperty):
-	"""Output Directory Path - Path to output directory. Usage of this property is deprecated. Use the –Output Directory Location” property instead. """
+	"""Output Directory Path - Path to output directory. Usage of this property is deprecated. Use the \xd2Output Directory Location\xd3 property instead. """
 	which = 'TA11'
 	want = 'TEXT'
 class Output_Directory_Origin(aetools.NProperty):
-	"""Output Directory Origin - Origin of path to output directory. Usage of this property is deprecated. Use the –Output Directory Location” property instead. """
+	"""Output Directory Origin - Origin of path to output directory. Usage of this property is deprecated. Use the \xd2Output Directory Location\xd3 property instead. """
 	which = 'TA12'
 	want = 'PPrm'
 class Output_Directory_Location(aetools.NProperty):
@@ -1554,7 +1554,7 @@ class Local_Path(aetools.NProperty):
 	which = 'VC10'
 	want = 'RlPt'
 
-class _class(aetools.ComponentItem):
+class class_(aetools.ComponentItem):
 	"""class - A class, struct, or record type in the current project. """
 	want = 'Clas'
 class language(aetools.NProperty):
@@ -1585,7 +1585,7 @@ class all_subclasses(aetools.NProperty):
 #        element 'MbFn' as ['indx', 'name']
 #        element 'DtMb' as ['indx', 'name']
 
-classes = _class
+classes = class_
 
 class member_function(aetools.ComponentItem):
 	"""member function - A class member function or method. """
@@ -1626,7 +1626,7 @@ data_members = data_member
 class base_class(aetools.ComponentItem):
 	"""base class - A base class or super class of a class """
 	want = 'BsCl'
-class _class(aetools.NProperty):
+class class_(aetools.NProperty):
 	"""class - The class object corresponding to this base class """
 	which = 'Clas'
 	want = 'obj '
@@ -1637,16 +1637,18 @@ class browser_catalog(aetools.ComponentItem):
 	"""browser catalog - The browser symbol catalog for the current project """
 	want = 'Cata'
 #        element 'Clas' as ['indx', 'name']
-Access_Paths._propdict = {
+Access_Paths._superclassnames = []
+Access_Paths._privpropdict = {
 	'User_Paths' : User_Paths,
 	'System_Paths' : System_Paths,
 	'Always_Full_Search' : Always_Full_Search,
 	'Convert_Paths' : Convert_Paths,
 	'Require_Framework_Includes' : Require_Framework_Includes,
 }
-Access_Paths._elemdict = {
+Access_Paths._privelemdict = {
 }
-Browser_Coloring._propdict = {
+Browser_Coloring._superclassnames = []
+Browser_Coloring._privpropdict = {
 	'Browser_Keywords' : Browser_Keywords,
 	'Classes_Color' : Classes_Color,
 	'Constants_Color' : Constants_Color,
@@ -1658,17 +1660,19 @@ Browser_Coloring._propdict = {
 	'Typedefs_Color' : Typedefs_Color,
 	'Template_Commands_in_Menu' : Template_Commands_in_Menu,
 }
-Browser_Coloring._elemdict = {
+Browser_Coloring._privelemdict = {
 }
-Build_Extras._propdict = {
+Build_Extras._superclassnames = []
+Build_Extras._privpropdict = {
 	'Browser_Active' : Browser_Active,
 	'Modification_Date_Caching' : Modification_Date_Caching,
 	'Dump_Browser_Info' : Dump_Browser_Info,
 	'Cache_Subproject_Data' : Cache_Subproject_Data,
 }
-Build_Extras._elemdict = {
+Build_Extras._privelemdict = {
 }
-Build_Settings._propdict = {
+Build_Settings._superclassnames = []
+Build_Settings._privpropdict = {
 	'Completion_Sound' : Completion_Sound,
 	'Success_Sound' : Success_Sound,
 	'Failure_Sound' : Failure_Sound,
@@ -1677,17 +1681,19 @@ Build_Settings._propdict = {
 	'Include_Cache_Size' : Include_Cache_Size,
 	'Compiler_Thread_Stack_Size' : Compiler_Thread_Stack_Size,
 }
-Build_Settings._elemdict = {
+Build_Settings._privelemdict = {
 }
-Custom_Keywords._propdict = {
+Custom_Keywords._superclassnames = []
+Custom_Keywords._privpropdict = {
 	'Custom_Color_1' : Custom_Color_1,
 	'Custom_Color_2' : Custom_Color_2,
 	'Custom_Color_3' : Custom_Color_3,
 	'Custom_Color_4' : Custom_Color_4,
 }
-Custom_Keywords._elemdict = {
+Custom_Keywords._privelemdict = {
 }
-Debugger_Display._propdict = {
+Debugger_Display._superclassnames = []
+Debugger_Display._privpropdict = {
 	'Show_Variable_Types' : Show_Variable_Types,
 	'Show_Locals' : Show_Locals,
 	'Sort_By_Method' : Sort_By_Method,
@@ -1699,9 +1705,10 @@ Debugger_Display._propdict = {
 	'Default_Array_Size' : Default_Array_Size,
 	'Show_As_Decimal' : Show_As_Decimal,
 }
-Debugger_Display._elemdict = {
+Debugger_Display._privelemdict = {
 }
-Debugger_Global._propdict = {
+Debugger_Global._superclassnames = []
+Debugger_Global._privpropdict = {
 	'Cache_Edited_Files' : Cache_Edited_Files,
 	'File_Cache_Duration' : File_Cache_Duration,
 	'Ignore_Mod_Dates' : Ignore_Mod_Dates,
@@ -1713,9 +1720,10 @@ Debugger_Global._propdict = {
 	'Dont_Step_in_Runtime' : Dont_Step_in_Runtime,
 	'Auto_Target_Libraries' : Auto_Target_Libraries,
 }
-Debugger_Global._elemdict = {
+Debugger_Global._privelemdict = {
 }
-Debugger_Target._propdict = {
+Debugger_Target._superclassnames = []
+Debugger_Target._privpropdict = {
 	'Log_System_Messages' : Log_System_Messages,
 	'Relocated_Executable_Path' : Relocated_Executable_Path,
 	'Update_Data_While_Running' : Update_Data_While_Running,
@@ -1726,15 +1734,17 @@ Debugger_Target._propdict = {
 	'Cache_symbolics' : Cache_symbolics,
 	'Temp_Breakpoint_Type' : Temp_Breakpoint_Type,
 }
-Debugger_Target._elemdict = {
+Debugger_Target._privelemdict = {
 }
-Debugger_Windowing._propdict = {
+Debugger_Windowing._superclassnames = []
+Debugger_Windowing._privpropdict = {
 	'Debugging_Start_Action' : Debugging_Start_Action,
 	'Do_Nothing_To_Projects' : Do_Nothing_To_Projects,
 }
-Debugger_Windowing._elemdict = {
+Debugger_Windowing._privelemdict = {
 }
-Editor._propdict = {
+Editor._superclassnames = []
+Editor._privpropdict = {
 	'Flash_Delay' : Flash_Delay,
 	'Dynamic_Scroll' : Dynamic_Scroll,
 	'Balance' : Balance,
@@ -1751,23 +1761,26 @@ Editor._propdict = {
 	'Background_Color' : Background_Color,
 	'Context_Popup_Delay' : Context_Popup_Delay,
 }
-Editor._elemdict = {
+Editor._privelemdict = {
 }
-Environment_Variable._propdict = {
+Environment_Variable._superclassnames = []
+Environment_Variable._privpropdict = {
 	'name' : name,
 	'value' : value,
 }
-Environment_Variable._elemdict = {
+Environment_Variable._privelemdict = {
 }
-Error_Information._propdict = {
+Error_Information._superclassnames = []
+Error_Information._privpropdict = {
 	'messageKind' : messageKind,
 	'message' : message,
 	'disk_file' : disk_file,
 	'lineNumber' : lineNumber,
 }
-Error_Information._elemdict = {
+Error_Information._privelemdict = {
 }
-Extras._propdict = {
+Extras._superclassnames = []
+Extras._privpropdict = {
 	'Automatic_Toolbar_Help' : Automatic_Toolbar_Help,
 	'External_Reference' : External_Reference,
 	'Full_Screen_Zoom' : Full_Screen_Zoom,
@@ -1778,9 +1791,10 @@ Extras._propdict = {
 	'Use_Script_Menu' : Use_Script_Menu,
 	'Use_ToolServer_Menu' : Use_ToolServer_Menu,
 }
-Extras._elemdict = {
+Extras._privelemdict = {
 }
-File_Mapping._propdict = {
+File_Mapping._superclassnames = []
+File_Mapping._privpropdict = {
 	'File_Type' : File_Type,
 	'Extension' : Extension,
 	'Precompiled' : Precompiled,
@@ -1789,14 +1803,16 @@ File_Mapping._propdict = {
 	'Ignored_by_Make' : Ignored_by_Make,
 	'Compiler' : Compiler,
 }
-File_Mapping._elemdict = {
+File_Mapping._privelemdict = {
 }
-File_Mappings._propdict = {
+File_Mappings._superclassnames = []
+File_Mappings._privpropdict = {
 	'Mappings' : Mappings,
 }
-File_Mappings._elemdict = {
+File_Mappings._privelemdict = {
 }
-Font._propdict = {
+Font._superclassnames = []
+Font._privpropdict = {
 	'Auto_Indent' : Auto_Indent,
 	'Tab_Size' : Tab_Size,
 	'Tab_Indents_Selection' : Tab_Indents_Selection,
@@ -1804,20 +1820,23 @@ Font._propdict = {
 	'Text_Font' : Text_Font,
 	'Text_Size' : Text_Size,
 }
-Font._elemdict = {
+Font._privelemdict = {
 }
-Function_Information._propdict = {
+Function_Information._superclassnames = []
+Function_Information._privpropdict = {
 	'disk_file' : disk_file,
 	'lineNumber' : lineNumber,
 }
-Function_Information._elemdict = {
+Function_Information._privelemdict = {
 }
-Global_Source_Trees._propdict = {
+Global_Source_Trees._superclassnames = []
+Global_Source_Trees._privpropdict = {
 	'Source_Trees' : Source_Trees,
 }
-Global_Source_Trees._elemdict = {
+Global_Source_Trees._privelemdict = {
 }
-Path_Information._propdict = {
+Path_Information._superclassnames = []
+Path_Information._privpropdict = {
 	'name' : name,
 	'format' : format,
 	'origin' : origin,
@@ -1826,15 +1845,17 @@ Path_Information._propdict = {
 	'framework' : framework,
 	'host_flags' : host_flags,
 }
-Path_Information._elemdict = {
+Path_Information._privelemdict = {
 }
-Plugin_Settings._propdict = {
+Plugin_Settings._superclassnames = []
+Plugin_Settings._privpropdict = {
 	'Plugin_Diagnostics_Level' : Plugin_Diagnostics_Level,
 	'Disable_Third_Party_COM_Plugins' : Disable_Third_Party_COM_Plugins,
 }
-Plugin_Settings._elemdict = {
+Plugin_Settings._privelemdict = {
 }
-ProjectFile._propdict = {
+ProjectFile._superclassnames = []
+ProjectFile._privpropdict = {
 	'filetype' : filetype,
 	'name' : name,
 	'disk_file' : disk_file,
@@ -1846,25 +1867,28 @@ ProjectFile._propdict = {
 	'initialize_before' : initialize_before,
 	'includes' : includes,
 }
-ProjectFile._elemdict = {
+ProjectFile._privelemdict = {
 }
-Relative_Path._propdict = {
+Relative_Path._superclassnames = []
+Relative_Path._privpropdict = {
 	'name' : name,
 	'format' : format,
 	'origin' : origin,
 	'root' : root,
 }
-Relative_Path._elemdict = {
+Relative_Path._privelemdict = {
 }
-Runtime_Settings._propdict = {
+Runtime_Settings._superclassnames = []
+Runtime_Settings._privpropdict = {
 	'Host_Application' : Host_Application,
 	'Command_Line_Arguments' : Command_Line_Arguments,
 	'Working_Directory' : Working_Directory,
 	'Environment_Variables' : Environment_Variables,
 }
-Runtime_Settings._elemdict = {
+Runtime_Settings._privelemdict = {
 }
-Segment._propdict = {
+Segment._superclassnames = []
+Segment._privpropdict = {
 	'name' : name,
 	'filecount' : filecount,
 	'seg_2d_preloaded' : seg_2d_preloaded,
@@ -1873,29 +1897,33 @@ Segment._propdict = {
 	'seg_2d_purgeable' : seg_2d_purgeable,
 	'seg_2d_system_heap' : seg_2d_system_heap,
 }
-Segment._elemdict = {
+Segment._privelemdict = {
 }
-Shielded_Folder._propdict = {
+Shielded_Folder._superclassnames = []
+Shielded_Folder._privpropdict = {
 	'Expression_To_Match' : Expression_To_Match,
 	'Skip_Project_Operations' : Skip_Project_Operations,
 	'Skip_Find_And_Compare_Operations' : Skip_Find_And_Compare_Operations,
 }
-Shielded_Folder._elemdict = {
+Shielded_Folder._privelemdict = {
 }
-Shielded_Folders._propdict = {
+Shielded_Folders._superclassnames = []
+Shielded_Folders._privpropdict = {
 	'Shielded_Items' : Shielded_Items,
 }
-Shielded_Folders._elemdict = {
+Shielded_Folders._privelemdict = {
 }
-Source_Tree._propdict = {
+Source_Tree._superclassnames = []
+Source_Tree._privpropdict = {
 	'name' : name,
 	'path' : path,
 	'path_kind' : path_kind,
 	'format' : format,
 }
-Source_Tree._elemdict = {
+Source_Tree._privelemdict = {
 }
-Syntax_Coloring._propdict = {
+Syntax_Coloring._superclassnames = []
+Syntax_Coloring._privpropdict = {
 	'Syntax_Coloring' : Syntax_Coloring,
 	'Comment_Color' : Comment_Color,
 	'Keyword_Color' : Keyword_Color,
@@ -1905,9 +1933,10 @@ Syntax_Coloring._propdict = {
 	'Custom_Color_3' : Custom_Color_3,
 	'Custom_Color_4' : Custom_Color_4,
 }
-Syntax_Coloring._elemdict = {
+Syntax_Coloring._privelemdict = {
 }
-Target_Settings._propdict = {
+Target_Settings._superclassnames = []
+Target_Settings._privpropdict = {
 	'Linker' : Linker,
 	'Pre_Linker' : Pre_Linker,
 	'Post_Linker' : Post_Linker,
@@ -1917,14 +1946,16 @@ Target_Settings._propdict = {
 	'Output_Directory_Location' : Output_Directory_Location,
 	'Use_Relative_Paths' : Use_Relative_Paths,
 }
-Target_Settings._elemdict = {
+Target_Settings._privelemdict = {
 }
-Target_Source_Trees._propdict = {
+Target_Source_Trees._superclassnames = []
+Target_Source_Trees._privpropdict = {
 	'Source_Trees' : Source_Trees,
 }
-Target_Source_Trees._elemdict = {
+Target_Source_Trees._privelemdict = {
 }
-VCS_Setup._propdict = {
+VCS_Setup._superclassnames = []
+VCS_Setup._privpropdict = {
 	'VCS_Active' : VCS_Active,
 	'Use_Global_Settings' : Use_Global_Settings,
 	'Connection_Method' : Connection_Method,
@@ -1937,9 +1968,10 @@ VCS_Setup._propdict = {
 	'Database_Path' : Database_Path,
 	'Local_Path' : Local_Path,
 }
-VCS_Setup._elemdict = {
+VCS_Setup._privelemdict = {
 }
-_class._propdict = {
+class_._superclassnames = []
+class_._privpropdict = {
 	'name' : name,
 	'language' : language,
 	'declaration_file' : declaration_file,
@@ -1948,12 +1980,13 @@ _class._propdict = {
 	'subclasses' : subclasses,
 	'all_subclasses' : all_subclasses,
 }
-_class._elemdict = {
+class_._privelemdict = {
 	'base_class' : base_class,
 	'member_function' : member_function,
 	'data_member' : data_member,
 }
-member_function._propdict = {
+member_function._superclassnames = []
+member_function._privpropdict = {
 	'name' : name,
 	'access' : access,
 	'virtual' : virtual,
@@ -1965,28 +1998,31 @@ member_function._propdict = {
 	'implementation_start_offset' : implementation_start_offset,
 	'implementation_end_offset' : implementation_end_offset,
 }
-member_function._elemdict = {
+member_function._privelemdict = {
 }
-data_member._propdict = {
+data_member._superclassnames = []
+data_member._privpropdict = {
 	'name' : name,
 	'access' : access,
 	'static' : static,
 	'declaration_start_offset' : declaration_start_offset,
 	'declaration_end_offset' : declaration_end_offset,
 }
-data_member._elemdict = {
+data_member._privelemdict = {
 }
-base_class._propdict = {
-	'_class' : _class,
+base_class._superclassnames = []
+base_class._privpropdict = {
+	'class_' : class_,
 	'access' : access,
 	'virtual' : virtual,
 }
-base_class._elemdict = {
+base_class._privelemdict = {
 }
-browser_catalog._propdict = {
+browser_catalog._superclassnames = []
+browser_catalog._privpropdict = {
 }
-browser_catalog._elemdict = {
-	'_class' : _class,
+browser_catalog._privelemdict = {
+	'class_' : class_,
 }
 _Enum_TmpB = {
 	'User_Specified' : 'Usrs',	# Use user specified symbols when setting temporary breakpoints on program launch.
@@ -2023,14 +2059,14 @@ _Enum_SrcT = {
 
 _Enum_PPrm = {
 	'absolute' : 'Abso',	# An absolute path name, including volume name.
-	'project_relative' : 'PRel',	# A path relative to the current projectÕs folder.
-	'shell_relative' : 'SRel',	# A path relative to the CodeWarriorŽ folder.
+	'project_relative' : 'PRel',	# A path relative to the current project\xd5s folder.
+	'shell_relative' : 'SRel',	# A path relative to the CodeWarrior\xaa folder.
 	'system_relative' : 'YRel',	# A path relative to the system folder
 	'root_relative' : 'RRel',	# 
 }
 
 _Enum_DbSA = {
-	'No_Action' : 'DSA1',	# DonÕt do anything to non-debug windows
+	'No_Action' : 'DSA1',	# Don\xd5t do anything to non-debug windows
 	'Hide_Windows' : 'DSA2',	# Hide non-debugging windows
 	'Collapse_Windows' : 'DSA3',	# Collapse non-debugging windows
 	'Close_Windows' : 'DSA4',	# Close non-debugging windows
@@ -2083,9 +2119,9 @@ _Enum_BXbr = {
 }
 
 _Enum_STKd = {
-	'Absolute_Path' : 'STK0',	# The –path” property is an absolute path to the location of the source tree.
-	'Registry_Key' : 'STK1',	# The –path” property is the name of a registry key that contains the path to the root.
-	'Environment_Variable' : 'STK2',	# The –path” property is the name of an environment variable that contains the path to the root.
+	'Absolute_Path' : 'STK0',	# The \xd2path\xd3 property is an absolute path to the location of the source tree.
+	'Registry_Key' : 'STK1',	# The \xd2path\xd3 property is the name of a registry key that contains the path to the root.
+	'Environment_Variable' : 'STK2',	# The \xd2path\xd3 property is the name of an environment variable that contains the path to the root.
 }
 
 _Enum_PthF = {
@@ -2135,7 +2171,7 @@ _classdeclarations = {
 	'mFNT' : Font,
 	'TSTs' : Target_Source_Trees,
 	'DbDS' : Debugger_Display,
-	'Clas' : _class,
+	'Clas' : class_,
 }
 
 _propdeclarations = {
@@ -2226,7 +2262,7 @@ _propdeclarations = {
 	'ST01' : Source_Trees,
 	'EX30' : Dump_Browser_Info,
 	'EX31' : Cache_Subproject_Data,
-	'Clas' : _class,
+	'Clas' : class_,
 	'DSiz' : datasize,
 	'ED14' : Context_Popup_Delay,
 	'ED15' : Relaxed_C_Popup_Parsing,
diff --git a/Mac/Lib/lib-scriptpackages/CodeWarrior/Required.py b/Mac/Lib/lib-scriptpackages/CodeWarrior/Required.py
index 56d10bb..779c7d3 100644
--- a/Mac/Lib/lib-scriptpackages/CodeWarrior/Required.py
+++ b/Mac/Lib/lib-scriptpackages/CodeWarrior/Required.py
@@ -1,7 +1,7 @@
 """Suite Required: Terms that every application should support
 Level 1, version 1
 
-Generated from Moes:Applications (Mac OS 9):Metrowerks CodeWarrior 7.0:Metrowerks CodeWarrior:CodeWarrior IDE 4.2.6
+Generated from /Volumes/Sap/Applications (Mac OS 9)/Metrowerks CodeWarrior 7.0/Metrowerks CodeWarrior/CodeWarrior IDE 4.2.5
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
diff --git a/Mac/Lib/lib-scriptpackages/CodeWarrior/Standard_Suite.py b/Mac/Lib/lib-scriptpackages/CodeWarrior/Standard_Suite.py
index ffe121e..0213b98 100644
--- a/Mac/Lib/lib-scriptpackages/CodeWarrior/Standard_Suite.py
+++ b/Mac/Lib/lib-scriptpackages/CodeWarrior/Standard_Suite.py
@@ -1,7 +1,7 @@
 """Suite Standard Suite: Common terms for most applications
 Level 1, version 1
 
-Generated from Moes:Applications (Mac OS 9):Metrowerks CodeWarrior 7.0:Metrowerks CodeWarrior:CodeWarrior IDE 4.2.6
+Generated from /Volumes/Sap/Applications (Mac OS 9)/Metrowerks CodeWarrior 7.0/Metrowerks CodeWarrior/CodeWarrior IDE 4.2.5
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
@@ -103,7 +103,7 @@ class Standard_Suite_Events(Standard_Suite_Events):
 
 	def make(self, _no_object=None, _attributes={}, **_arguments):
 		"""make: make a new element
-		Keyword argument new: the class of the new element„keyword 'new' is optional in AppleScript
+		Keyword argument new: the class of the new element\xd1keyword 'new' is optional in AppleScript
 		Keyword argument as: the desired types for the data, in order of preference
 		Keyword argument at: the location at which to insert the element
 		Keyword argument with_data: the initial data for the element
@@ -285,20 +285,23 @@ class zoomed(aetools.NProperty):
 	want = 'bool'
 
 windows = window
-application._propdict = {
+application._superclassnames = []
+application._privpropdict = {
 	'user_interaction' : user_interaction,
 }
-application._elemdict = {
+application._privelemdict = {
 	'document' : document,
 	'window' : window,
 }
-character._propdict = {
+character._superclassnames = []
+character._privpropdict = {
 	'offset' : offset,
 	'length' : length,
 }
-character._elemdict = {
+character._privelemdict = {
 }
-document._propdict = {
+document._superclassnames = []
+document._privpropdict = {
 	'name' : name,
 	'kind' : kind,
 	'index' : index,
@@ -306,47 +309,53 @@ document._propdict = {
 	'file_permissions' : file_permissions,
 	'window' : window,
 }
-document._elemdict = {
+document._privelemdict = {
 }
-file._propdict = {
+file._superclassnames = []
+file._privpropdict = {
 }
-file._elemdict = {
+file._privelemdict = {
 }
-insertion_point._propdict = {
+insertion_point._superclassnames = []
+insertion_point._privpropdict = {
 	'length' : length,
 	'offset' : offset,
 }
-insertion_point._elemdict = {
+insertion_point._privelemdict = {
 }
-line._propdict = {
+line._superclassnames = []
+line._privpropdict = {
 	'index' : index,
 	'offset' : offset,
 	'length' : length,
 }
-line._elemdict = {
+line._privelemdict = {
 	'character' : character,
 }
-selection_2d_object._propdict = {
+selection_2d_object._superclassnames = []
+selection_2d_object._privpropdict = {
 	'contents' : contents,
 	'length' : length,
 	'offset' : offset,
 }
-selection_2d_object._elemdict = {
+selection_2d_object._privelemdict = {
 	'character' : character,
 	'line' : line,
 	'text' : text,
 }
-text._propdict = {
+text._superclassnames = []
+text._privpropdict = {
 	'length' : length,
 	'offset' : offset,
 }
-text._elemdict = {
+text._privelemdict = {
 	'character' : character,
 	'insertion_point' : insertion_point,
 	'line' : line,
 	'text' : text,
 }
-window._propdict = {
+window._superclassnames = []
+window._privpropdict = {
 	'name' : name,
 	'index' : index,
 	'bounds' : bounds,
@@ -355,7 +364,7 @@ window._propdict = {
 	'visible' : visible,
 	'zoomed' : zoomed,
 }
-window._elemdict = {
+window._privelemdict = {
 }
 
 #
diff --git a/Mac/Lib/lib-scriptpackages/CodeWarrior/__init__.py b/Mac/Lib/lib-scriptpackages/CodeWarrior/__init__.py
index 74866ca..4b27d96 100644
--- a/Mac/Lib/lib-scriptpackages/CodeWarrior/__init__.py
+++ b/Mac/Lib/lib-scriptpackages/CodeWarrior/__init__.py
@@ -1,5 +1,5 @@
 """
-Package generated from Moes:Applications (Mac OS 9):Metrowerks CodeWarrior 7.0:Metrowerks CodeWarrior:CodeWarrior IDE 4.2.6
+Package generated from /Volumes/Sap/Applications (Mac OS 9)/Metrowerks CodeWarrior 7.0/Metrowerks CodeWarrior/CodeWarrior IDE 4.2.5
 Resource aete resid 0 AppleEvent Suites
 """
 import aetools
@@ -30,6 +30,151 @@ from Required import *
 from Standard_Suite import *
 from CodeWarrior_suite import *
 from Metrowerks_Shell_Suite import *
+def getbaseclasses(v):
+	if hasattr(v, '_superclassnames') and not hasattr(v, '_propdict'):
+		v._propdict = {}
+		v._elemdict = {}
+		for superclass in v._superclassnames:
+			v._propdict.update(getattr(eval(superclass), '_privpropdict', {}))
+			v._elemdict.update(getattr(eval(superclass), '_privelemdict', {}))
+		v._propdict.update(v._privpropdict)
+		v._elemdict.update(v._privelemdict)
+
+import StdSuites
+
+#
+# Set property and element dictionaries now that all classes have been defined
+#
+getbaseclasses(character)
+getbaseclasses(text)
+getbaseclasses(window)
+getbaseclasses(file)
+getbaseclasses(line)
+getbaseclasses(selection_2d_object)
+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)
+getbaseclasses(ProjectFile)
+getbaseclasses(Browser_Coloring)
+getbaseclasses(Error_Information)
+getbaseclasses(VCS_Setup)
+getbaseclasses(Editor)
+getbaseclasses(Shielded_Folders)
+getbaseclasses(Shielded_Folder)
+getbaseclasses(Custom_Keywords)
+getbaseclasses(Path_Information)
+getbaseclasses(File_Mappings)
+getbaseclasses(Segment)
+getbaseclasses(Debugger_Target)
+getbaseclasses(Function_Information)
+getbaseclasses(Access_Paths)
+getbaseclasses(Extras)
+getbaseclasses(Debugger_Windowing)
+getbaseclasses(Global_Source_Trees)
+getbaseclasses(Syntax_Coloring)
+getbaseclasses(base_class)
+getbaseclasses(Relative_Path)
+getbaseclasses(Target_Settings)
+getbaseclasses(Environment_Variable)
+getbaseclasses(Source_Tree)
+getbaseclasses(Debugger_Global)
+getbaseclasses(member_function)
+getbaseclasses(Runtime_Settings)
+getbaseclasses(Plugin_Settings)
+getbaseclasses(data_member)
+getbaseclasses(Build_Extras)
+getbaseclasses(Font)
+getbaseclasses(Target_Source_Trees)
+getbaseclasses(Debugger_Display)
+getbaseclasses(class_)
+
+#
+# Indices of types declared in this module
+#
+_classdeclarations = {
+	'cha ' : character,
+	'ctxt' : text,
+	'cwin' : window,
+	'file' : file,
+	'clin' : line,
+	'csel' : selection_2d_object,
+	'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,
+	'SrcF' : ProjectFile,
+	'BRKW' : Browser_Coloring,
+	'ErrM' : Error_Information,
+	'VCSs' : VCS_Setup,
+	'EDTR' : Editor,
+	'SHFL' : Shielded_Folders,
+	'SFit' : Shielded_Folder,
+	'CUKW' : Custom_Keywords,
+	'PInf' : Path_Information,
+	'FLMP' : File_Mappings,
+	'Seg ' : Segment,
+	'DbTG' : Debugger_Target,
+	'FDef' : Function_Information,
+	'PATH' : Access_Paths,
+	'GXTR' : Extras,
+	'DbWN' : Debugger_Windowing,
+	'GSTs' : Global_Source_Trees,
+	'SNTX' : Syntax_Coloring,
+	'BsCl' : base_class,
+	'RlPt' : Relative_Path,
+	'TARG' : Target_Settings,
+	'EnvV' : Environment_Variable,
+	'SrcT' : Source_Tree,
+	'DbGL' : Debugger_Global,
+	'MbFn' : member_function,
+	'RSTG' : Runtime_Settings,
+	'PSTG' : Plugin_Settings,
+	'DtMb' : data_member,
+	'LXTR' : Build_Extras,
+	'mFNT' : Font,
+	'TSTs' : Target_Source_Trees,
+	'DbDS' : Debugger_Display,
+	'Clas' : class_,
+}
 
 
 class CodeWarrior(Required_Events,
@@ -39,3 +184,5 @@ class CodeWarrior(Required_Events,
 		aetools.TalkTo):
 	_signature = 'CWIE'
 
+	_moduleName = 'CodeWarrior'
+
diff --git a/Mac/Lib/lib-scriptpackages/Explorer/Microsoft_Internet_Explorer.py b/Mac/Lib/lib-scriptpackages/Explorer/Microsoft_Internet_Explorer.py
index 167378e..ac8013d 100644
--- a/Mac/Lib/lib-scriptpackages/Explorer/Microsoft_Internet_Explorer.py
+++ b/Mac/Lib/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 Moes:Applications (Mac OS 9):Internet Explorer 5:Internet Explorer
+Generated from /Volumes/Sap/Applications (Mac OS 9)/Internet Explorer 5/Internet Explorer
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
diff --git a/Mac/Lib/lib-scriptpackages/Explorer/Netscape_Suite.py b/Mac/Lib/lib-scriptpackages/Explorer/Netscape_Suite.py
index 588cd8f..5076ce4 100644
--- a/Mac/Lib/lib-scriptpackages/Explorer/Netscape_Suite.py
+++ b/Mac/Lib/lib-scriptpackages/Explorer/Netscape_Suite.py
@@ -1,7 +1,7 @@
 """Suite Netscape Suite: Events defined by Netscape
 Level 1, version 1
 
-Generated from Moes:Applications (Mac OS 9):Internet Explorer 5:Internet Explorer
+Generated from /Volumes/Sap/Applications (Mac OS 9)/Internet Explorer 5/Internet Explorer
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
diff --git a/Mac/Lib/lib-scriptpackages/Explorer/Required_Suite.py b/Mac/Lib/lib-scriptpackages/Explorer/Required_Suite.py
index 7497f37..05cfa19 100644
--- a/Mac/Lib/lib-scriptpackages/Explorer/Required_Suite.py
+++ b/Mac/Lib/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 Moes:Applications (Mac OS 9):Internet Explorer 5:Internet Explorer
+Generated from /Volumes/Sap/Applications (Mac OS 9)/Internet Explorer 5/Internet Explorer
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
@@ -52,7 +52,7 @@ class Required_Suite_Events(Required_Suite_Events):
 		if _arguments.has_key('----'):
 			return _arguments['----']
 
-	def _print(self, _object, _attributes={}, **_arguments):
+	def print_(self, _object, _attributes={}, **_arguments):
 		"""print: Print documents
 		Required argument: undocumented, typecode 'alis'
 		Keyword argument _attributes: AppleEvent attribute dictionary
diff --git a/Mac/Lib/lib-scriptpackages/Explorer/Standard_Suite.py b/Mac/Lib/lib-scriptpackages/Explorer/Standard_Suite.py
new file mode 100644
index 0000000..101afe7
--- /dev/null
+++ b/Mac/Lib/lib-scriptpackages/Explorer/Standard_Suite.py
@@ -0,0 +1,71 @@
+"""Suite Standard Suite: Common terms for most applications
+Level 1, version 1
+
+Generated from /Volumes/Sap/Applications (Mac OS 9)/Internet Explorer 5/Internet Explorer
+AETE/AEUT resource version 1/0, language 0, script 0
+"""
+
+import aetools
+import MacOS
+
+_code = '****'
+
+class Standard_Suite_Events:
+
+	_argmap_get = {
+		'as' : 'rtyp',
+	}
+
+	def get(self, _object, _attributes={}, **_arguments):
+		"""get: 
+		Required argument: an AE object reference
+		Keyword argument as: undocumented, typecode 'type'
+		Keyword argument _attributes: AppleEvent attribute dictionary
+		Returns: anything
+		"""
+		_code = 'core'
+		_subcode = 'getd'
+
+		aetools.keysubst(_arguments, self._argmap_get)
+		_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 program """
+	want = 'capp'
+class selected_text(aetools.NProperty):
+	"""selected text - the selected text """
+	which = 'stxt'
+	want = 'TEXT'
+application._superclassnames = []
+application._privpropdict = {
+	'selected_text' : selected_text,
+}
+application._privelemdict = {
+}
+
+#
+# Indices of types declared in this module
+#
+_classdeclarations = {
+	'capp' : application,
+}
+
+_propdeclarations = {
+	'stxt' : selected_text,
+}
+
+_compdeclarations = {
+}
+
+_enumdeclarations = {
+}
diff --git a/Mac/Lib/lib-scriptpackages/Explorer/URL_Suite.py b/Mac/Lib/lib-scriptpackages/Explorer/URL_Suite.py
index 4f78802..a89913f 100644
--- a/Mac/Lib/lib-scriptpackages/Explorer/URL_Suite.py
+++ b/Mac/Lib/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 Moes:Applications (Mac OS 9):Internet Explorer 5:Internet Explorer
+Generated from /Volumes/Sap/Applications (Mac OS 9)/Internet Explorer 5/Internet Explorer
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
diff --git a/Mac/Lib/lib-scriptpackages/Explorer/Web_Browser_Suite.py b/Mac/Lib/lib-scriptpackages/Explorer/Web_Browser_Suite.py
index b95083d..96f4ec0 100644
--- a/Mac/Lib/lib-scriptpackages/Explorer/Web_Browser_Suite.py
+++ b/Mac/Lib/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 Moes:Applications (Mac OS 9):Internet Explorer 5:Internet Explorer
+Generated from /Volumes/Sap/Applications (Mac OS 9)/Internet Explorer 5/Internet Explorer
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
diff --git a/Mac/Lib/lib-scriptpackages/Explorer/__init__.py b/Mac/Lib/lib-scriptpackages/Explorer/__init__.py
index fd917cc..15e8b21 100644
--- a/Mac/Lib/lib-scriptpackages/Explorer/__init__.py
+++ b/Mac/Lib/lib-scriptpackages/Explorer/__init__.py
@@ -1,5 +1,5 @@
 """
-Package generated from Moes:Applications (Mac OS 9):Internet Explorer 5:Internet Explorer
+Package generated from /Volumes/Sap/Applications (Mac OS 9)/Internet Explorer 5/Internet Explorer
 Resource aete resid 0 
 """
 import aetools
@@ -38,6 +38,29 @@ from Web_Browser_Suite import *
 from URL_Suite import *
 from Microsoft_Internet_Explorer import *
 from Netscape_Suite import *
+def getbaseclasses(v):
+	if hasattr(v, '_superclassnames') and not hasattr(v, '_propdict'):
+		v._propdict = {}
+		v._elemdict = {}
+		for superclass in v._superclassnames:
+			v._propdict.update(getattr(eval(superclass), '_privpropdict', {}))
+			v._elemdict.update(getattr(eval(superclass), '_privelemdict', {}))
+		v._propdict.update(v._privpropdict)
+		v._elemdict.update(v._privelemdict)
+
+import StdSuites
+
+#
+# Set property and element dictionaries now that all classes have been defined
+#
+getbaseclasses(application)
+
+#
+# Indices of types declared in this module
+#
+_classdeclarations = {
+	'capp' : application,
+}
 
 
 class Explorer(Required_Suite_Events,
@@ -49,3 +72,5 @@ class Explorer(Required_Suite_Events,
 		aetools.TalkTo):
 	_signature = 'MSIE'
 
+	_moduleName = 'Explorer'
+
diff --git a/Mac/Lib/lib-scriptpackages/Finder/Containers_and_folders.py b/Mac/Lib/lib-scriptpackages/Finder/Containers_and_folders.py
index 2914cc3..c3aac16 100644
--- a/Mac/Lib/lib-scriptpackages/Finder/Containers_and_folders.py
+++ b/Mac/Lib/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 Moes:Systeemmap:Finder
+Generated from /Volumes/Sap/System Folder/Finder
 AETE/AEUT resource version 0/144, language 0, script 0
 """
 
@@ -216,7 +216,7 @@ class folder(aetools.ComponentItem):
 folders = folder
 
 class desktop_2d_object(aetools.ComponentItem):
-	"""desktop-object - Desktop-object is the class of the –desktop” object """
+	"""desktop-object - Desktop-object is the class of the \xd2desktop\xd3 object """
 	want = 'cdsk'
 class startup_disk(aetools.NProperty):
 	"""startup disk - the startup disk """
@@ -246,7 +246,7 @@ class trash(aetools.NProperty):
 #        element 'dsut' as ['indx', 'name']
 
 class trash_2d_object(aetools.ComponentItem):
-	"""trash-object - Trash-object is the class of the –trash” object """
+	"""trash-object - Trash-object is the class of the \xd2trash\xd3 object """
 	want = 'ctrs'
 class warns_before_emptying(aetools.NProperty):
 	"""warns before emptying - Display a dialog when emptying the trash? """
@@ -270,8 +270,9 @@ class warns_before_emptying(aetools.NProperty):
 #        element 'fsut' as ['indx', 'name']
 #        element 'dsut' as ['indx', 'name']
 import Earlier_terms
+container._superclassnames = ['item']
 import Files_and_suitcases
-container._propdict = {
+container._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
 	'selection' : selection,
 	'entire_contents' : entire_contents,
@@ -282,7 +283,7 @@ container._propdict = {
 	'icon_size' : icon_size,
 	'view_options_window' : view_options_window,
 }
-container._elemdict = {
+container._privelemdict = {
 	'item' : Earlier_terms.item,
 	'container' : container,
 	'sharable_container' : sharable_container,
@@ -301,7 +302,8 @@ container._elemdict = {
 	'font_suitcase' : Files_and_suitcases.font_suitcase,
 	'accessory_suitcase' : Earlier_terms.accessory_suitcase,
 }
-sharable_container._propdict = {
+sharable_container._superclassnames = ['container']
+sharable_container._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
 	'owner' : owner,
 	'group' : group,
@@ -314,7 +316,7 @@ sharable_container._propdict = {
 	'shared' : shared,
 	'protected' : protected,
 }
-sharable_container._elemdict = {
+sharable_container._privelemdict = {
 	'item' : Earlier_terms.item,
 	'container' : container,
 	'sharable_container' : sharable_container,
@@ -333,14 +335,16 @@ sharable_container._elemdict = {
 	'font_suitcase' : Files_and_suitcases.font_suitcase,
 	'accessory_suitcase' : Earlier_terms.accessory_suitcase,
 }
-sharing_privileges._propdict = {
+sharing_privileges._superclassnames = []
+sharing_privileges._privpropdict = {
 	'see_folders' : see_folders,
 	'see_files' : see_files,
 	'make_changes' : make_changes,
 }
-sharing_privileges._elemdict = {
+sharing_privileges._privelemdict = {
 }
-disk._propdict = {
+disk._superclassnames = ['sharable_container']
+disk._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
 	'capacity' : capacity,
 	'free_space' : free_space,
@@ -348,7 +352,7 @@ disk._propdict = {
 	'local_volume' : local_volume,
 	'startup' : startup,
 }
-disk._elemdict = {
+disk._privelemdict = {
 	'item' : Earlier_terms.item,
 	'container' : container,
 	'sharable_container' : sharable_container,
@@ -367,10 +371,11 @@ disk._elemdict = {
 	'font_suitcase' : Files_and_suitcases.font_suitcase,
 	'accessory_suitcase' : Earlier_terms.accessory_suitcase,
 }
-folder._propdict = {
+folder._superclassnames = ['sharable_container']
+folder._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
 }
-folder._elemdict = {
+folder._privelemdict = {
 	'item' : Earlier_terms.item,
 	'container' : container,
 	'sharable_container' : sharable_container,
@@ -389,12 +394,13 @@ folder._elemdict = {
 	'font_suitcase' : Files_and_suitcases.font_suitcase,
 	'accessory_suitcase' : Earlier_terms.accessory_suitcase,
 }
-desktop_2d_object._propdict = {
+desktop_2d_object._superclassnames = ['container']
+desktop_2d_object._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
 	'startup_disk' : startup_disk,
 	'trash' : trash,
 }
-desktop_2d_object._elemdict = {
+desktop_2d_object._privelemdict = {
 	'item' : Earlier_terms.item,
 	'container' : container,
 	'sharable_container' : sharable_container,
@@ -414,11 +420,12 @@ desktop_2d_object._elemdict = {
 	'font_suitcase' : Files_and_suitcases.font_suitcase,
 	'accessory_suitcase' : Earlier_terms.accessory_suitcase,
 }
-trash_2d_object._propdict = {
+trash_2d_object._superclassnames = ['container']
+trash_2d_object._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
 	'warns_before_emptying' : warns_before_emptying,
 }
-trash_2d_object._elemdict = {
+trash_2d_object._privelemdict = {
 	'item' : Earlier_terms.item,
 	'container' : container,
 	'sharable_container' : sharable_container,
diff --git a/Mac/Lib/lib-scriptpackages/Finder/Earlier_terms.py b/Mac/Lib/lib-scriptpackages/Finder/Earlier_terms.py
index d65043d..2f72d0f 100644
--- a/Mac/Lib/lib-scriptpackages/Finder/Earlier_terms.py
+++ b/Mac/Lib/lib-scriptpackages/Finder/Earlier_terms.py
@@ -1,7 +1,7 @@
 """Suite Earlier terms: Terms that have been renamed
 Level 1, version 1
 
-Generated from Moes:Systeemmap:Finder
+Generated from /Volumes/Sap/System Folder/Finder
 AETE/AEUT resource version 0/144, language 0, script 0
 """
 
@@ -24,7 +24,7 @@ class properties(aetools.NProperty):
 	which = 'qpro'
 	want = 'reco'
 class clipboard(aetools.NProperty):
-	"""clipboard - the FinderÕs clipboard window """
+	"""clipboard - the Finder\xd5s clipboard window """
 	which = 'pcli'
 	want = 'obj '
 class largest_free_block(aetools.NProperty):
@@ -32,11 +32,11 @@ class largest_free_block(aetools.NProperty):
 	which = 'mfre'
 	want = 'long'
 class name(aetools.NProperty):
-	"""name - the FinderÕs name """
+	"""name - the Finder\xd5s name """
 	which = 'pnam'
 	want = 'itxt'
 class visible(aetools.NProperty):
-	"""visible - Is the FinderÕs layer visible? """
+	"""visible - Is the Finder\xd5s layer visible? """
 	which = 'pvis'
 	want = 'bool'
 class frontmost(aetools.NProperty):
@@ -48,7 +48,7 @@ class selection(aetools.NProperty):
 	which = 'sele'
 	want = 'obj '
 class insertion_location(aetools.NProperty):
-	"""insertion location - the container in which a new folder would appear if –New Folder” was selected """
+	"""insertion location - the container in which a new folder would appear if \xd2New Folder\xd3 was selected """
 	which = 'pins'
 	want = 'obj '
 class file_sharing(aetools.NProperty):
@@ -68,7 +68,7 @@ class version(aetools.NProperty):
 	which = 'vers'
 	want = 'itxt'
 class about_this_computer(aetools.NProperty):
-	"""about this computer - the –About this Computer” dialog and the list of running processes displayed in it """
+	"""about this computer - the \xd2About this Computer\xd3 dialog and the list of running processes displayed in it """
 	which = 'abbx'
 	want = 'obj '
 class desktop(aetools.NProperty):
@@ -195,7 +195,7 @@ class internet_location(aetools.ComponentItem):
 internet_locations = internet_location
 
 class information_window(aetools.ComponentItem):
-	"""information window - An information window (opened by –Get Info”) """
+	"""information window - An information window (opened by \xd2Get Info\xd3) """
 	want = 'iwnd'
 class comment(aetools.NProperty):
 	"""comment - the comment """
@@ -359,7 +359,7 @@ class protected(aetools.NProperty):
 	want = 'bool'
 
 class trash_2d_object(aetools.ComponentItem):
-	"""trash-object - Trash-object is the class of the –trash” object """
+	"""trash-object - Trash-object is the class of the \xd2trash\xd3 object """
 	want = 'ctrs'
 
 class preferences(aetools.ComponentItem):
@@ -429,7 +429,8 @@ class collapsed(aetools.NProperty):
 	"""collapsed - Is the window collapsed (only applies to open non-pop-up windows)? """
 	which = 'wshd'
 	want = 'bool'
-application._propdict = {
+application._superclassnames = []
+application._privpropdict = {
 	'properties' : properties,
 	'clipboard' : clipboard,
 	'largest_free_block' : largest_free_block,
@@ -446,18 +447,21 @@ application._propdict = {
 	'desktop' : desktop,
 	'Finder_preferences' : Finder_preferences,
 }
-application._elemdict = {
+application._privelemdict = {
 }
-application_file._propdict = {
+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,
 	'suggested_partition_size' : suggested_partition_size,
 	'scriptable' : scriptable,
 }
-application_file._elemdict = {
+application_file._privelemdict = {
 }
-container_window._propdict = {
+container_window._superclassnames = ['window']
+container_window._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
 	'container' : container,
 	'item' : item,
@@ -477,21 +481,25 @@ container_window._propdict = {
 	'show_version' : show_version,
 	'use_relative_dates' : use_relative_dates,
 }
-container_window._elemdict = {
+container_window._privelemdict = {
 }
-accessory_process._propdict = {
+accessory_process._superclassnames = []
+accessory_process._privpropdict = {
 }
-accessory_process._elemdict = {
+accessory_process._privelemdict = {
 }
-accessory_suitcase._propdict = {
+accessory_suitcase._superclassnames = []
+accessory_suitcase._privpropdict = {
 }
-accessory_suitcase._elemdict = {
+accessory_suitcase._privelemdict = {
 }
-internet_location._propdict = {
+internet_location._superclassnames = []
+internet_location._privpropdict = {
 }
-internet_location._elemdict = {
+internet_location._privelemdict = {
 }
-information_window._propdict = {
+information_window._superclassnames = ['window']
+information_window._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
 	'item' : item,
 	'comment' : comment,
@@ -509,9 +517,10 @@ information_window._propdict = {
 	'product_version' : product_version,
 	'version' : version,
 }
-information_window._elemdict = {
+information_window._privelemdict = {
 }
-item._propdict = {
+item._superclassnames = []
+item._privpropdict = {
 	'properties' : properties,
 	'name' : name,
 	'index' : index,
@@ -535,9 +544,10 @@ item._propdict = {
 	'window' : window,
 	'information_window' : information_window,
 }
-item._elemdict = {
+item._privelemdict = {
 }
-process._propdict = {
+process._superclassnames = []
+process._privpropdict = {
 	'properties' : properties,
 	'name' : name,
 	'visible' : visible,
@@ -550,9 +560,11 @@ process._propdict = {
 	'partition_size' : partition_size,
 	'partition_space_used' : partition_space_used,
 }
-process._elemdict = {
+process._privelemdict = {
 }
-sharable_container._propdict = {
+import Containers_and_folders
+sharable_container._superclassnames = ['container']
+sharable_container._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
 	'owner' : owner,
 	'group' : group,
@@ -565,15 +577,17 @@ sharable_container._propdict = {
 	'shared' : shared,
 	'protected' : protected,
 }
-sharable_container._elemdict = {
+sharable_container._privelemdict = {
 }
-trash_2d_object._propdict = {
+trash_2d_object._superclassnames = ['container']
+trash_2d_object._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
 	'warn_before_emptying' : warn_before_emptying,
 }
-trash_2d_object._elemdict = {
+trash_2d_object._privelemdict = {
 }
-preferences._propdict = {
+preferences._superclassnames = []
+preferences._privpropdict = {
 	'window' : window,
 	'calculate_folder_sizes' : calculate_folder_sizes,
 	'delay_before_springing' : delay_before_springing,
@@ -589,9 +603,10 @@ preferences._propdict = {
 	'use_simple_menus' : use_simple_menus,
 	'use_wide_grid' : use_wide_grid,
 }
-preferences._elemdict = {
+preferences._privelemdict = {
 }
-window._propdict = {
+window._superclassnames = []
+window._privpropdict = {
 	'properties' : properties,
 	'position' : position,
 	'bounds' : bounds,
@@ -610,7 +625,7 @@ window._propdict = {
 	'pulled_open' : pulled_open,
 	'collapsed' : collapsed,
 }
-window._elemdict = {
+window._privelemdict = {
 }
 
 #
diff --git a/Mac/Lib/lib-scriptpackages/Finder/Enumerations.py b/Mac/Lib/lib-scriptpackages/Finder/Enumerations.py
index 9ef08a8..97cfbfb 100644
--- a/Mac/Lib/lib-scriptpackages/Finder/Enumerations.py
+++ b/Mac/Lib/lib-scriptpackages/Finder/Enumerations.py
@@ -1,7 +1,7 @@
 """Suite Enumerations: Enumerations for the Finder
 Level 1, version 1
 
-Generated from Moes:Systeemmap:Finder
+Generated from /Volumes/Sap/System Folder/Finder
 AETE/AEUT resource version 0/144, language 0, script 0
 """
 
diff --git a/Mac/Lib/lib-scriptpackages/Finder/Files_and_suitcases.py b/Mac/Lib/lib-scriptpackages/Finder/Files_and_suitcases.py
index 24e963e..0e85539 100644
--- a/Mac/Lib/lib-scriptpackages/Finder/Files_and_suitcases.py
+++ b/Mac/Lib/lib-scriptpackages/Finder/Files_and_suitcases.py
@@ -1,7 +1,7 @@
 """Suite Files and suitcases: Classes representing files and suitcases
 Level 1, version 1
 
-Generated from Moes:Systeemmap:Finder
+Generated from /Volumes/Sap/System Folder/Finder
 AETE/AEUT resource version 0/144, language 0, script 0
 """
 
@@ -39,18 +39,18 @@ class stationery(aetools.NProperty):
 	which = 'pspd'
 	want = 'bool'
 class product_version(aetools.NProperty):
-	"""product version - the version of the product (visible at the top of the –Get Info” window) """
+	"""product version - the version of the product (visible at the top of the \xd2Get Info\xd3 window) """
 	which = 'ver2'
 	want = 'itxt'
 class version(aetools.NProperty):
-	"""version - the version of the file (visible at the bottom of the –Get Info” window) """
+	"""version - the version of the file (visible at the bottom of the \xd2Get Info\xd3 window) """
 	which = 'vers'
 	want = 'itxt'
 
 files = file
 
 class alias_file(aetools.ComponentItem):
-	"""alias file - An alias file (created with –Make Alias”) """
+	"""alias file - An alias file (created with \xd2Make Alias\xd3) """
 	want = 'alia'
 class original_item(aetools.NProperty):
 	"""original item - the original item pointed to by the alias """
@@ -155,7 +155,9 @@ class desk_accessory_suitcase(aetools.ComponentItem):
 #        element 'cobj' as ['indx', 'name']
 
 desk_accessory_suitcases = desk_accessory_suitcase
-file._propdict = {
+import Earlier_terms
+file._superclassnames = ['item']
+file._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
 	'file_type' : file_type,
 	'creator_type' : creator_type,
@@ -164,15 +166,17 @@ file._propdict = {
 	'product_version' : product_version,
 	'version' : version,
 }
-file._elemdict = {
+file._privelemdict = {
 }
-alias_file._propdict = {
+alias_file._superclassnames = ['file']
+alias_file._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
 	'original_item' : original_item,
 }
-alias_file._elemdict = {
+alias_file._privelemdict = {
 }
-application_file._propdict = {
+application_file._superclassnames = ['file']
+application_file._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
 	'suggested_size' : suggested_size,
 	'minimum_size' : minimum_size,
@@ -180,62 +184,71 @@ application_file._propdict = {
 	'accepts_high_level_events' : accepts_high_level_events,
 	'has_scripting_terminology' : has_scripting_terminology,
 }
-application_file._elemdict = {
+application_file._privelemdict = {
 }
-document_file._propdict = {
+document_file._superclassnames = ['file']
+document_file._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
 }
-document_file._elemdict = {
+document_file._privelemdict = {
 }
-font_file._propdict = {
+font_file._superclassnames = ['file']
+font_file._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
 }
-font_file._elemdict = {
+font_file._privelemdict = {
 }
-desk_accessory_file._propdict = {
+desk_accessory_file._superclassnames = ['file']
+desk_accessory_file._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
 }
-desk_accessory_file._elemdict = {
+desk_accessory_file._privelemdict = {
 }
-internet_location_file._propdict = {
+internet_location_file._superclassnames = ['file']
+internet_location_file._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
 	'location' : location,
 }
-internet_location_file._elemdict = {
+internet_location_file._privelemdict = {
 }
-sound_file._propdict = {
+sound_file._superclassnames = ['file']
+sound_file._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
 	'sound' : sound,
 }
-sound_file._elemdict = {
+sound_file._privelemdict = {
 }
-clipping._propdict = {
+clipping._superclassnames = ['file']
+clipping._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
 }
-clipping._elemdict = {
+clipping._privelemdict = {
 }
-package._propdict = {
+package._superclassnames = ['item']
+package._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
 }
-package._elemdict = {
+package._privelemdict = {
 }
-import Earlier_terms
-suitcase._propdict = {
+suitcase._superclassnames = ['file']
+suitcase._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
 }
-suitcase._elemdict = {
+suitcase._privelemdict = {
 	'item' : Earlier_terms.item,
 }
-font_suitcase._propdict = {
+font_suitcase._superclassnames = ['suitcase']
+font_suitcase._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
 }
-font_suitcase._elemdict = {
+font_suitcase._privelemdict = {
 	'item' : Earlier_terms.item,
 }
-desk_accessory_suitcase._propdict = {
+desk_accessory_suitcase._superclassnames = ['suitcase']
+desk_accessory_suitcase._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
 }
-desk_accessory_suitcase._elemdict = {
+desk_accessory_suitcase._privelemdict = {
 	'item' : Earlier_terms.item,
 }
 
diff --git a/Mac/Lib/lib-scriptpackages/Finder/Finder_Basics.py b/Mac/Lib/lib-scriptpackages/Finder/Finder_Basics.py
index d858466..3589126 100644
--- a/Mac/Lib/lib-scriptpackages/Finder/Finder_Basics.py
+++ b/Mac/Lib/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 Moes:Systeemmap:Finder
+Generated from /Volumes/Sap/System Folder/Finder
 AETE/AEUT resource version 0/144, language 0, script 0
 """
 
@@ -145,7 +145,7 @@ class application(aetools.ComponentItem):
 	"""application - The Finder """
 	want = 'capp'
 class clipboard(aetools.NProperty):
-	"""clipboard - the FinderÕs clipboard window """
+	"""clipboard - the Finder\xd5s clipboard window """
 	which = 'pcli'
 	want = 'obj '
 class largest_free_block(aetools.NProperty):
@@ -153,11 +153,11 @@ class largest_free_block(aetools.NProperty):
 	which = 'mfre'
 	want = 'long'
 class name(aetools.NProperty):
-	"""name - the FinderÕs name """
+	"""name - the Finder\xd5s name """
 	which = 'pnam'
 	want = 'itxt'
 class visible(aetools.NProperty):
-	"""visible - Is the FinderÕs layer visible? """
+	"""visible - Is the Finder\xd5s layer visible? """
 	which = 'pvis'
 	want = 'bool'
 class frontmost(aetools.NProperty):
@@ -169,7 +169,7 @@ class selection(aetools.NProperty):
 	which = 'sele'
 	want = 'obj '
 class insertion_location(aetools.NProperty):
-	"""insertion location - the container in which a new folder would appear if –New Folder” was selected """
+	"""insertion location - the container in which a new folder would appear if \xd2New Folder\xd3 was selected """
 	which = 'pins'
 	want = 'obj '
 class file_sharing(aetools.NProperty):
@@ -189,7 +189,7 @@ class version(aetools.NProperty):
 	which = 'vers'
 	want = 'itxt'
 class about_this_computer(aetools.NProperty):
-	"""about this computer - the –About this Computer” dialog and the list of running processes displayed in it """
+	"""about this computer - the \xd2About this Computer\xd3 dialog and the list of running processes displayed in it """
 	which = 'abbx'
 	want = 'obj '
 class desktop(aetools.NProperty):
@@ -240,43 +240,44 @@ class system_folder(aetools.NProperty):
 	which = 'macs'
 	want = 'obj '
 class apple_menu_items_folder(aetools.NProperty):
-	"""apple menu items folder - the special folder named –Apple Menu Items,” the contents of which appear in the Apple menu """
+	"""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 –Control Panels” """
+	"""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 –Extensions” """
+	"""extensions folder - the special folder named \xd2Extensions\xd3 """
 	which = 'extn'
 	want = 'obj '
 class fonts_folder(aetools.NProperty):
-	"""fonts folder - the special folder named –Fonts” """
+	"""fonts folder - the special folder named \xd2Fonts\xd3 """
 	which = 'font'
 	want = 'obj '
 class preferences_folder(aetools.NProperty):
-	"""preferences folder - the special folder named –Preferences” """
+	"""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 –Shutdown Items” """
+	"""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 –Startup Items” """
+	"""startup items folder - the special folder named \xd2Startup Items\xd3 """
 	which = 'strt'
 	want = 'obj '
 class temporary_items_folder(aetools.NProperty):
-	"""temporary items folder - the special folder named –Temporary Items” (invisible) """
+	"""temporary items folder - the special folder named \xd2Temporary Items\xd3 (invisible) """
 	which = 'temp'
 	want = 'obj '
+application._superclassnames = []
 import Earlier_terms
 import Containers_and_folders
 import Files_and_suitcases
 import Process_classes
 import Window_classes
-application._propdict = {
+application._privpropdict = {
 	'clipboard' : clipboard,
 	'largest_free_block' : largest_free_block,
 	'name' : name,
@@ -293,7 +294,7 @@ application._propdict = {
 	'execution_state' : execution_state,
 	'Finder_preferences' : Finder_preferences,
 }
-application._elemdict = {
+application._privelemdict = {
 	'item' : Earlier_terms.item,
 	'container' : Containers_and_folders.container,
 	'sharable_container' : Earlier_terms.sharable_container,
@@ -322,7 +323,8 @@ application._elemdict = {
 	'clipping_window' : Window_classes.clipping_window,
 	'content_space' : Window_classes.content_space,
 }
-special_folders._propdict = {
+special_folders._superclassnames = []
+special_folders._privpropdict = {
 	'system_folder' : system_folder,
 	'apple_menu_items_folder' : apple_menu_items_folder,
 	'control_panels_folder' : control_panels_folder,
@@ -333,7 +335,7 @@ special_folders._propdict = {
 	'startup_items_folder' : startup_items_folder,
 	'temporary_items_folder' : temporary_items_folder,
 }
-special_folders._elemdict = {
+special_folders._privelemdict = {
 }
 
 #
diff --git a/Mac/Lib/lib-scriptpackages/Finder/Finder_items.py b/Mac/Lib/lib-scriptpackages/Finder/Finder_items.py
index 986ecba..1475fa6 100644
--- a/Mac/Lib/lib-scriptpackages/Finder/Finder_items.py
+++ b/Mac/Lib/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 Moes:Systeemmap:Finder
+Generated from /Volumes/Sap/System Folder/Finder
 AETE/AEUT resource version 0/144, language 0, script 0
 """
 
@@ -79,7 +79,7 @@ class Finder_items_Events:
 
 	def empty(self, _object=None, _attributes={}, **_arguments):
 		"""empty: Empty the trash
-		Required argument: –empty” and –empty trash” both do the same thing
+		Required argument: \xd2empty\xd3 and \xd2empty trash\xd3 both do the same thing
 		Keyword argument _attributes: AppleEvent attribute dictionary
 		"""
 		_code = 'fndr'
@@ -233,7 +233,7 @@ class description(aetools.NProperty):
 	which = 'dscr'
 	want = 'itxt'
 class comment(aetools.NProperty):
-	"""comment - the comment of the item, displayed in the –Get Info” window """
+	"""comment - the comment of the item, displayed in the \xd2Get Info\xd3 window """
 	which = 'comt'
 	want = 'itxt'
 class size(aetools.NProperty):
@@ -274,7 +274,8 @@ class information_window(aetools.NProperty):
 	want = 'obj '
 
 items = item
-item._propdict = {
+item._superclassnames = []
+item._privpropdict = {
 	'name' : name,
 	'index' : index,
 	'id' : id,
@@ -297,7 +298,7 @@ item._propdict = {
 	'window' : window,
 	'information_window' : information_window,
 }
-item._elemdict = {
+item._privelemdict = {
 }
 _Enum_bool = None # XXXX enum bool not found!!
 
diff --git a/Mac/Lib/lib-scriptpackages/Finder/Obsolete_terms.py b/Mac/Lib/lib-scriptpackages/Finder/Obsolete_terms.py
index a30653d..58db611 100644
--- a/Mac/Lib/lib-scriptpackages/Finder/Obsolete_terms.py
+++ b/Mac/Lib/lib-scriptpackages/Finder/Obsolete_terms.py
@@ -1,7 +1,7 @@
 """Suite Obsolete terms: Terms that have been deprecated
 Level 1, version 1
 
-Generated from Moes:Systeemmap:Finder
+Generated from /Volumes/Sap/System Folder/Finder
 AETE/AEUT resource version 0/144, language 0, script 0
 """
 
@@ -59,7 +59,7 @@ class locked_obsolete(aetools.NProperty):
 	want = 'bool'
 
 class information_window(aetools.ComponentItem):
-	"""information window - An information window (opened by –Get Info”) """
+	"""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) """
@@ -87,7 +87,7 @@ class sharing_window(aetools.NProperty):
 	want = 'obj '
 
 class sharing_window(aetools.ComponentItem):
-	"""sharing window - A sharing window (opened by –Sharingƒ”) """
+	"""sharing window - A sharing window (opened by \xd2Sharing\xc9\xd3) """
 	want = 'swnd'
 class sharable_container(aetools.NProperty):
 	"""sharable container - the sharable container from which the window was opened """
@@ -109,66 +109,77 @@ class status_window(aetools.ComponentItem):
 	want = 'qwnd'
 
 status_windows = status_window
-application._propdict = {
+application._superclassnames = []
+application._privpropdict = {
 	'view_preferences' : view_preferences,
 }
-application._elemdict = {
+application._privelemdict = {
 }
-container._propdict = {
+container._superclassnames = []
+container._privpropdict = {
 	'container_window' : container_window,
 }
-container._elemdict = {
+container._privelemdict = {
 }
-container_window._propdict = {
+container_window._superclassnames = []
+container_window._privpropdict = {
 	'folder_obsolete' : folder_obsolete,
 }
-container_window._elemdict = {
+container_window._privelemdict = {
 }
-control_panel._propdict = {
+control_panel._superclassnames = []
+control_panel._privpropdict = {
 }
-control_panel._elemdict = {
+control_panel._privelemdict = {
 }
-file._propdict = {
+file._superclassnames = []
+file._privpropdict = {
 	'file_type_obsolete' : file_type_obsolete,
 	'locked_obsolete' : locked_obsolete,
 }
-file._elemdict = {
+file._privelemdict = {
 }
-information_window._propdict = {
+information_window._superclassnames = []
+information_window._privpropdict = {
 	'creation_date_obsolete' : creation_date_obsolete,
 	'locked_obsolete' : locked_obsolete,
 	'modification_date_obsolete' : modification_date_obsolete,
 }
-information_window._elemdict = {
+information_window._privelemdict = {
 }
-item._propdict = {
+item._superclassnames = []
+item._privpropdict = {
 	'creation_date_obsolete' : creation_date_obsolete,
 	'folder_obsolete' : folder_obsolete,
 	'modification_date_obsolete' : modification_date_obsolete,
 }
-item._elemdict = {
+item._privelemdict = {
 }
-process._propdict = {
+process._superclassnames = []
+process._privpropdict = {
 	'file_type_obsolete' : file_type_obsolete,
 }
-process._elemdict = {
+process._privelemdict = {
 }
-sharable_container._propdict = {
+sharable_container._superclassnames = []
+sharable_container._privpropdict = {
 	'sharing_window' : sharing_window,
 }
-sharable_container._elemdict = {
+sharable_container._privelemdict = {
 }
-sharing_window._propdict = {
+sharing_window._superclassnames = []
+sharing_window._privpropdict = {
 	'sharable_container' : sharable_container,
 	'item' : item,
 	'container' : container,
 	'folder_obsolete' : folder_obsolete,
 }
-sharing_window._elemdict = {
+sharing_window._privelemdict = {
 }
-status_window._propdict = {
+status_window._superclassnames = []
+status_window._privpropdict = {
 }
-status_window._elemdict = {
+status_window._privelemdict = {
 }
 
 #
diff --git a/Mac/Lib/lib-scriptpackages/Finder/Process_classes.py b/Mac/Lib/lib-scriptpackages/Finder/Process_classes.py
index 60d098d..a54741c 100644
--- a/Mac/Lib/lib-scriptpackages/Finder/Process_classes.py
+++ b/Mac/Lib/lib-scriptpackages/Finder/Process_classes.py
@@ -1,7 +1,7 @@
 """Suite Process classes: Classes representing processes that are running
 Level 1, version 1
 
-Generated from Moes:Systeemmap:Finder
+Generated from /Volumes/Sap/System Folder/Finder
 AETE/AEUT resource version 0/144, language 0, script 0
 """
 
@@ -88,7 +88,8 @@ class desk_accessory_file(aetools.NProperty):
 	want = 'obj '
 
 desk_accessory_processes = desk_accessory_process
-process._propdict = {
+process._superclassnames = []
+process._privpropdict = {
 	'name' : name,
 	'visible' : visible,
 	'frontmost' : frontmost,
@@ -101,19 +102,21 @@ process._propdict = {
 	'total_partition_size' : total_partition_size,
 	'partition_space_used' : partition_space_used,
 }
-process._elemdict = {
+process._privelemdict = {
 }
-application_process._propdict = {
+application_process._superclassnames = ['process']
+application_process._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
 	'application_file' : application_file,
 }
-application_process._elemdict = {
+application_process._privelemdict = {
 }
-desk_accessory_process._propdict = {
+desk_accessory_process._superclassnames = ['process']
+desk_accessory_process._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
 	'desk_accessory_file' : desk_accessory_file,
 }
-desk_accessory_process._elemdict = {
+desk_accessory_process._privelemdict = {
 }
 
 #
diff --git a/Mac/Lib/lib-scriptpackages/Finder/Standard_Suite.py b/Mac/Lib/lib-scriptpackages/Finder/Standard_Suite.py
index 2840fb4..df23487 100644
--- a/Mac/Lib/lib-scriptpackages/Finder/Standard_Suite.py
+++ b/Mac/Lib/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 Moes:Systeemmap:Finder
+Generated from /Volumes/Sap/System Folder/Finder
 AETE/AEUT resource version 0/144, language 0, script 0
 """
 
@@ -40,11 +40,11 @@ class Standard_Suite_Events(Standard_Suite_Events):
 		if _arguments.has_key('----'):
 			return _arguments['----']
 
-	_argmap__print = {
+	_argmap_print_ = {
 		'with_properties' : 'prdt',
 	}
 
-	def _print(self, _object, _attributes={}, **_arguments):
+	def print_(self, _object, _attributes={}, **_arguments):
 		"""print: Print the specified object(s)
 		Required argument: list of objects to print
 		Keyword argument with_properties: optional properties to be included with the print command sent to the application that prints the direct object
@@ -53,7 +53,7 @@ class Standard_Suite_Events(Standard_Suite_Events):
 		_code = 'aevt'
 		_subcode = 'pdoc'
 
-		aetools.keysubst(_arguments, self._argmap__print)
+		aetools.keysubst(_arguments, self._argmap_print_)
 		_arguments['----'] = _object
 
 
diff --git a/Mac/Lib/lib-scriptpackages/Finder/Type_Definitions.py b/Mac/Lib/lib-scriptpackages/Finder/Type_Definitions.py
index a74c330..0445c2c 100644
--- a/Mac/Lib/lib-scriptpackages/Finder/Type_Definitions.py
+++ b/Mac/Lib/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 Moes:Systeemmap:Finder
+Generated from /Volumes/Sap/System Folder/Finder
 AETE/AEUT resource version 0/144, language 0, script 0
 """
 
@@ -163,9 +163,10 @@ class small_4_bit_icon(aetools.NProperty):
 	want = 'ics4'
 
 class alias_list(aetools.ComponentItem):
-	"""alias list - A list of aliases.  Use •as alias listÕ when a list of aliases is needed (instead of a list of file system item references). """
+	"""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'
-preferences._propdict = {
+preferences._superclassnames = []
+preferences._privpropdict = {
 	'window' : window,
 	'button_view_arrangement' : button_view_arrangement,
 	'button_view_icon_size' : button_view_icon_size,
@@ -188,17 +189,19 @@ preferences._propdict = {
 	'view_font' : view_font,
 	'view_font_size' : view_font_size,
 }
-preferences._elemdict = {
+preferences._privelemdict = {
 	'label' : label,
 }
-label._propdict = {
+label._superclassnames = []
+label._privpropdict = {
 	'name' : name,
 	'index' : index,
 	'color' : color,
 }
-label._elemdict = {
+label._privelemdict = {
 }
-icon_family._propdict = {
+icon_family._superclassnames = []
+icon_family._privpropdict = {
 	'large_monochrome_icon_and_mask' : large_monochrome_icon_and_mask,
 	'large_8_bit_mask' : large_8_bit_mask,
 	'large_32_bit_icon' : large_32_bit_icon,
@@ -210,11 +213,12 @@ icon_family._propdict = {
 	'small_8_bit_icon' : small_8_bit_icon,
 	'small_4_bit_icon' : small_4_bit_icon,
 }
-icon_family._elemdict = {
+icon_family._privelemdict = {
 }
-alias_list._propdict = {
+alias_list._superclassnames = []
+alias_list._privpropdict = {
 }
-alias_list._elemdict = {
+alias_list._privelemdict = {
 }
 
 #
diff --git a/Mac/Lib/lib-scriptpackages/Finder/Window_classes.py b/Mac/Lib/lib-scriptpackages/Finder/Window_classes.py
index 88e737b..bbfc46e 100644
--- a/Mac/Lib/lib-scriptpackages/Finder/Window_classes.py
+++ b/Mac/Lib/lib-scriptpackages/Finder/Window_classes.py
@@ -1,7 +1,7 @@
 """Suite Window classes: Classes representing windows
 Level 1, version 1
 
-Generated from Moes:Systeemmap:Finder
+Generated from /Volumes/Sap/System Folder/Finder
 AETE/AEUT resource version 0/144, language 0, script 0
 """
 
@@ -164,7 +164,7 @@ class uses_relative_dates(aetools.NProperty):
 container_windows = container_window
 
 class information_window(aetools.ComponentItem):
-	"""information window - An information window (opened by –Get Info”) """
+	"""information window - An information window (opened by \xd2Get Info\xd3) """
 	want = 'iwnd'
 class current_panel(aetools.NProperty):
 	"""current panel - the current panel in the information window """
@@ -219,11 +219,11 @@ class warns_before_emptying(aetools.NProperty):
 	which = 'warn'
 	want = 'bool'
 class product_version(aetools.NProperty):
-	"""product version - the version of the product (visible at the top of the –Get Info” window) """
+	"""product version - the version of the product (visible at the top of the \xd2Get Info\xd3 window) """
 	which = 'ver2'
 	want = 'itxt'
 class version(aetools.NProperty):
-	"""version - the version of the file (visible at the bottom of the –Get Info” window) """
+	"""version - the version of the file (visible at the bottom of the \xd2Get Info\xd3 window) """
 	which = 'vers'
 	want = 'itxt'
 
@@ -246,11 +246,12 @@ class clipping_window(aetools.ComponentItem):
 clipping_windows = clipping_window
 
 class content_space(aetools.ComponentItem):
-	"""content space - All windows, including the desktop window (–Window” does not include the desktop window) """
+	"""content space - All windows, including the desktop window (\xd2Window\xd3 does not include the desktop window) """
 	want = 'dwnd'
 
 content_spaces = content_space
-window._propdict = {
+window._superclassnames = []
+window._privpropdict = {
 	'position' : position,
 	'bounds' : bounds,
 	'titled' : titled,
@@ -268,9 +269,10 @@ window._propdict = {
 	'pulled_open' : pulled_open,
 	'collapsed' : collapsed,
 }
-window._elemdict = {
+window._privelemdict = {
 }
-container_window._propdict = {
+container_window._superclassnames = ['window']
+container_window._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
 	'container' : container,
 	'item' : item,
@@ -290,9 +292,10 @@ container_window._propdict = {
 	'shows_version' : shows_version,
 	'uses_relative_dates' : uses_relative_dates,
 }
-container_window._elemdict = {
+container_window._privelemdict = {
 }
-information_window._propdict = {
+information_window._superclassnames = ['window']
+information_window._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
 	'item' : item,
 	'current_panel' : current_panel,
@@ -311,28 +314,32 @@ information_window._propdict = {
 	'product_version' : product_version,
 	'version' : version,
 }
-information_window._elemdict = {
+information_window._privelemdict = {
 }
-view_options_window._propdict = {
+view_options_window._superclassnames = ['window']
+view_options_window._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
 	'item' : item,
 }
-view_options_window._elemdict = {
+view_options_window._privelemdict = {
 }
-preferences_window._propdict = {
+preferences_window._superclassnames = ['window']
+preferences_window._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
 	'current_panel' : current_panel,
 }
-preferences_window._elemdict = {
+preferences_window._privelemdict = {
 }
-clipping_window._propdict = {
+clipping_window._superclassnames = ['window']
+clipping_window._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
 }
-clipping_window._elemdict = {
+clipping_window._privelemdict = {
 }
-content_space._propdict = {
+content_space._superclassnames = []
+content_space._privpropdict = {
 }
-content_space._elemdict = {
+content_space._privelemdict = {
 }
 
 #
diff --git a/Mac/Lib/lib-scriptpackages/Finder/__init__.py b/Mac/Lib/lib-scriptpackages/Finder/__init__.py
index ede499b..8ea742f 100644
--- a/Mac/Lib/lib-scriptpackages/Finder/__init__.py
+++ b/Mac/Lib/lib-scriptpackages/Finder/__init__.py
@@ -1,5 +1,5 @@
 """
-Package generated from Moes:Systeemmap:Finder
+Package generated from /Volumes/Sap/System Folder/Finder
 Resource aete resid 0 
 """
 import aetools
@@ -58,6 +58,389 @@ from Process_classes import *
 from Type_Definitions import *
 from Enumerations import *
 from Obsolete_terms import *
+def getbaseclasses(v):
+	if hasattr(v, '_superclassnames') and not hasattr(v, '_propdict'):
+		v._propdict = {}
+		v._elemdict = {}
+		for superclass in v._superclassnames:
+			v._propdict.update(getattr(eval(superclass), '_privpropdict', {}))
+			v._elemdict.update(getattr(eval(superclass), '_privelemdict', {}))
+		v._propdict.update(v._privpropdict)
+		v._elemdict.update(v._privelemdict)
+
+import StdSuites
+
+#
+# Set property and element dictionaries now that all classes have been defined
+#
+getbaseclasses(accessory_suitcase)
+getbaseclasses(preferences)
+getbaseclasses(sharable_container)
+getbaseclasses(application)
+getbaseclasses(trash_2d_object)
+getbaseclasses(accessory_process)
+getbaseclasses(window)
+getbaseclasses(information_window)
+getbaseclasses(process)
+getbaseclasses(application_file)
+getbaseclasses(internet_location)
+getbaseclasses(container_window)
+getbaseclasses(item)
+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(application)
+getbaseclasses(special_folders)
+getbaseclasses(item)
+getbaseclasses(trash_2d_object)
+getbaseclasses(desktop_2d_object)
+getbaseclasses(sharable_container)
+getbaseclasses(sharing_privileges)
+getbaseclasses(disk)
+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(preferences_window)
+getbaseclasses(view_options_window)
+getbaseclasses(window)
+getbaseclasses(container_window)
+getbaseclasses(content_space)
+getbaseclasses(information_window)
+getbaseclasses(clipping_window)
+getbaseclasses(process)
+getbaseclasses(desk_accessory_process)
+getbaseclasses(application_process)
+getbaseclasses(preferences)
+getbaseclasses(alias_list)
+getbaseclasses(icon_family)
+getbaseclasses(label)
+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(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(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)
+
+#
+# Indices of types declared in this module
+#
+_classdeclarations = {
+	'dsut' : accessory_suitcase,
+	'cprf' : preferences,
+	'sctr' : sharable_container,
+	'capp' : application,
+	'ctrs' : trash_2d_object,
+	'pcda' : accessory_process,
+	'cwin' : window,
+	'iwnd' : information_window,
+	'prcs' : process,
+	'appf' : application_file,
+	'inlf' : internet_location,
+	'cwnd' : container_window,
+	'cobj' : item,
+	'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,
+	'capp' : application,
+	'spfl' : special_folders,
+	'cobj' : item,
+	'ctrs' : trash_2d_object,
+	'cdsk' : desktop_2d_object,
+	'sctr' : sharable_container,
+	'priv' : sharing_privileges,
+	'cdis' : disk,
+	'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,
+	'pwnd' : preferences_window,
+	'vwnd' : view_options_window,
+	'cwin' : window,
+	'cwnd' : container_window,
+	'dwnd' : content_space,
+	'iwnd' : information_window,
+	'lwnd' : clipping_window,
+	'prcs' : process,
+	'pcda' : desk_accessory_process,
+	'pcap' : application_process,
+	'cprf' : preferences,
+	'alst' : alias_list,
+	'ifam' : icon_family,
+	'clbl' : label,
+	'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,
+	'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,
+	'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,
+}
 
 
 class Finder(Standard_Suite_Events,
@@ -74,3 +457,5 @@ class Finder(Standard_Suite_Events,
 		aetools.TalkTo):
 	_signature = 'MACS'
 
+	_moduleName = 'Finder'
+
diff --git a/Mac/Lib/lib-scriptpackages/Netscape/Mozilla_suite.py b/Mac/Lib/lib-scriptpackages/Netscape/Mozilla_suite.py
index c67b3ea..45f8ffd 100644
--- a/Mac/Lib/lib-scriptpackages/Netscape/Mozilla_suite.py
+++ b/Mac/Lib/lib-scriptpackages/Netscape/Mozilla_suite.py
@@ -1,7 +1,7 @@
 """Suite Mozilla suite: Experimental Mozilla suite
 Level 1, version 1
 
-Generated from Moes:Applications (Mac OS 9):Netscape CommunicatorŽ Folder:Netscape CommunicatorŽ
+Generated from /Volumes/Sap/Applications (Mac OS 9)/Netscape Communicator\xe2\x84\xa2 Folder/Netscape Communicator\xe2\x84\xa2
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
@@ -20,7 +20,7 @@ class Mozilla_suite_Events:
 	def Read_help_file(self, _object, _attributes={}, **_arguments):
 		"""Read help file: Reads in the help file (file should be in the help file format)
 		Required argument: undocumented, typecode 'alis'
-		Keyword argument with_index: Index to the help file. Defaults to  •DEFAULTÕ)
+		Keyword argument with_index: Index to the help file. Defaults to  \xd4DEFAULT\xd5)
 		Keyword argument search_text: Optional text to search for
 		Keyword argument _attributes: AppleEvent attribute dictionary
 		"""
@@ -88,7 +88,7 @@ class Mozilla_suite_Events:
 	def Get_workingURL(self, _no_object=None, _attributes={}, **_arguments):
 		"""Get workingURL: Get the path to the running application in URL format.  This will allow a script to construct a relative URL
 		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: Will return text of the from –FILE://foo/applicationname”
+		Returns: Will return text of the from \xd2FILE://foo/applicationname\xd3
 		"""
 		_code = 'MOSS'
 		_subcode = 'wurl'
@@ -127,7 +127,7 @@ class Mozilla_suite_Events:
 	def Get_Import_Data(self, _no_object=None, _attributes={}, **_arguments):
 		"""Get Import Data: Returns a structure containing information that is of use to an external module in importing data from an external mail application into Communicator.
 		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: vRefNum and dirID of profile folder (2+4 bytes), vRefNum and DirID of the local mail folder (2+4 bytes), window type of front window (0 if none, •BrwzÕ browser, •AddrÕ addressbook, •MesgÕ messenger, etc., 4 bytes)
+		Returns: vRefNum and dirID of profile folder (2+4 bytes), vRefNum and DirID of the local mail folder (2+4 bytes), window type of front window (0 if none, \xd4Brwz\xd5 browser, \xd4Addr\xd5 addressbook, \xd4Mesg\xd5 messenger, etc., 4 bytes)
 		"""
 		_code = 'MOSS'
 		_subcode = 'Impt'
@@ -147,7 +147,7 @@ class Mozilla_suite_Events:
 	def Get_Profile_Name(self, _no_object=None, _attributes={}, **_arguments):
 		"""Get Profile Name: Get the current User Profile
 		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: Name of the current profile, like –Joe Bloggs”. This is the name of the profile folder in the Netscape Users folder.
+		Returns: Name of the current profile, like \xd2Joe Bloggs\xd3. This is the name of the profile folder in the Netscape Users folder.
 		"""
 		_code = 'MOSS'
 		_subcode = 'upro'
diff --git a/Mac/Lib/lib-scriptpackages/Netscape/PowerPlant.py b/Mac/Lib/lib-scriptpackages/Netscape/PowerPlant.py
index 98672e5..e21242b 100644
--- a/Mac/Lib/lib-scriptpackages/Netscape/PowerPlant.py
+++ b/Mac/Lib/lib-scriptpackages/Netscape/PowerPlant.py
@@ -1,7 +1,7 @@
 """Suite PowerPlant: 
 Level 0, version 0
 
-Generated from Moes:Applications (Mac OS 9):Netscape CommunicatorŽ Folder:Netscape CommunicatorŽ
+Generated from /Volumes/Sap/Applications (Mac OS 9)/Netscape Communicator\xe2\x84\xa2 Folder/Netscape Communicator\xe2\x84\xa2
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
@@ -42,7 +42,7 @@ class PowerPlant_Events:
 	}
 
 	def SwitchTellTarget(self, _no_object=None, _attributes={}, **_arguments):
-		"""SwitchTellTarget: Makes an object the –focus” of AppleEvents
+		"""SwitchTellTarget: Makes an object the \xd2focus\xd3 of AppleEvents
 		Keyword argument to: reference to new focus of AppleEvents
 		Keyword argument _attributes: AppleEvent attribute dictionary
 		"""
diff --git a/Mac/Lib/lib-scriptpackages/Netscape/Required_suite.py b/Mac/Lib/lib-scriptpackages/Netscape/Required_suite.py
index b1a4f82..8da57b6 100644
--- a/Mac/Lib/lib-scriptpackages/Netscape/Required_suite.py
+++ b/Mac/Lib/lib-scriptpackages/Netscape/Required_suite.py
@@ -1,7 +1,7 @@
 """Suite Required suite: 
 Level 0, version 0
 
-Generated from Moes:Applications (Mac OS 9):Netscape CommunicatorŽ Folder:Netscape CommunicatorŽ
+Generated from /Volumes/Sap/Applications (Mac OS 9)/Netscape Communicator\xe2\x84\xa2 Folder/Netscape Communicator\xe2\x84\xa2
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
@@ -33,7 +33,7 @@ class Required_suite_Events(Required_Suite_Events):
 		if _arguments.has_key('----'):
 			return _arguments['----']
 
-	def _print(self, _object, _attributes={}, **_arguments):
+	def print_(self, _object, _attributes={}, **_arguments):
 		"""print: Print the specified object(s)
 		Required argument: list of objects to print
 		Keyword argument _attributes: AppleEvent attribute dictionary
diff --git a/Mac/Lib/lib-scriptpackages/Netscape/Standard_Suite.py b/Mac/Lib/lib-scriptpackages/Netscape/Standard_Suite.py
index fd624a8..5bf2d18 100644
--- a/Mac/Lib/lib-scriptpackages/Netscape/Standard_Suite.py
+++ b/Mac/Lib/lib-scriptpackages/Netscape/Standard_Suite.py
@@ -1,7 +1,7 @@
 """Suite Standard Suite: Common terms for most applications
 Level 1, version 1
 
-Generated from Moes:Applications (Mac OS 9):Netscape CommunicatorŽ Folder:Netscape CommunicatorŽ
+Generated from /Volumes/Sap/Applications (Mac OS 9)/Netscape Communicator\xe2\x84\xa2 Folder/Netscape Communicator\xe2\x84\xa2
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
@@ -80,7 +80,7 @@ class Standard_Suite_Events(Standard_Suite_Events):
 	}
 
 	def set(self, _object, _attributes={}, **_arguments):
-		"""set: Set an objectÕs data
+		"""set: Set an object\xd5s data
 		Required argument: the object to change
 		Keyword argument to: the new value
 		Keyword argument _attributes: AppleEvent attribute dictionary
@@ -105,7 +105,7 @@ class application(aetools.ComponentItem):
 	"""application - An application program """
 	want = 'capp'
 class alert_application(aetools.NProperty):
-	"""alert application - Most of the alerts will be sent to this application using yet unspecified AE interface. We need a few alert boxes: alert, confirm and notify. Any ideas on how to design this event? mailto:atotic@netscape.com. IÕd like to conform to the standard. """
+	"""alert application - Most of the alerts will be sent to this application using yet unspecified AE interface. We need a few alert boxes: alert, confirm and notify. Any ideas on how to design this event? mailto:atotic@netscape.com. I\xd5d like to conform to the standard. """
 	which = 'ALAP'
 	want = 'type'
 class kiosk_mode(aetools.NProperty):
@@ -170,21 +170,23 @@ class URL(aetools.NProperty):
 	which = 'curl'
 	want = 'TEXT'
 class unique_ID(aetools.NProperty):
-	"""unique ID - WindowÕs unique ID (a bridge between WWW! suite window idÕs and standard AE windows) """
+	"""unique ID - Window\xd5s unique ID (a bridge between WWW! suite window id\xd5s and standard AE windows) """
 	which = 'wiid'
 	want = 'long'
 class busy(aetools.NProperty):
 	"""busy - Is window loading something right now. 2, window is busy and will reject load requests. 1, window is busy, but will interrupt outstanding loads """
 	which = 'busy'
 	want = 'long'
-application._propdict = {
+application._superclassnames = []
+application._privpropdict = {
 	'alert_application' : alert_application,
 	'kiosk_mode' : kiosk_mode,
 }
-application._elemdict = {
+application._privelemdict = {
 	'window' : window,
 }
-window._propdict = {
+window._superclassnames = []
+window._privpropdict = {
 	'bounds' : bounds,
 	'closeable' : closeable,
 	'titled' : titled,
@@ -201,7 +203,7 @@ window._propdict = {
 	'unique_ID' : unique_ID,
 	'busy' : busy,
 }
-window._elemdict = {
+window._privelemdict = {
 }
 
 #
diff --git a/Mac/Lib/lib-scriptpackages/Netscape/Standard_URL_suite.py b/Mac/Lib/lib-scriptpackages/Netscape/Standard_URL_suite.py
index e0abd05..66d359e 100644
--- a/Mac/Lib/lib-scriptpackages/Netscape/Standard_URL_suite.py
+++ b/Mac/Lib/lib-scriptpackages/Netscape/Standard_URL_suite.py
@@ -1,10 +1,9 @@
 """Suite Standard URL suite: Mac URL standard, supported by many apps
 
 
-
 Level 1, version 1
 
-Generated from Moes:Applications (Mac OS 9):Netscape CommunicatorŽ Folder:Netscape CommunicatorŽ
+Generated from /Volumes/Sap/Applications (Mac OS 9)/Netscape Communicator\xe2\x84\xa2 Folder/Netscape Communicator\xe2\x84\xa2
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
@@ -18,16 +17,15 @@ class Standard_URL_suite_Events:
 	_argmap_GetURL = {
 		'to' : 'dest',
 		'inside' : 'HWIN',
-		'_from' : 'refe',
+		'from_' : 'refe',
 	}
 
 	def GetURL(self, _object, _attributes={}, **_arguments):
 		"""GetURL: Loads the URL (optionally to disk)
-
 		Required argument: The url 
 		Keyword argument to: file the URL should be loaded into  
 		Keyword argument inside: Window the URL should be loaded to
-		Keyword argument _from: Referrer, to be sent with the HTTP request
+		Keyword argument from_: Referrer, to be sent with the HTTP request
 		Keyword argument _attributes: AppleEvent attribute dictionary
 		"""
 		_code = 'GURL'
diff --git a/Mac/Lib/lib-scriptpackages/Netscape/Text.py b/Mac/Lib/lib-scriptpackages/Netscape/Text.py
index 50288d0..1620c8c 100644
--- a/Mac/Lib/lib-scriptpackages/Netscape/Text.py
+++ b/Mac/Lib/lib-scriptpackages/Netscape/Text.py
@@ -1,7 +1,7 @@
 """Suite Text: 
 Level 0, version 0
 
-Generated from Moes:Applications (Mac OS 9):Netscape CommunicatorŽ Folder:Netscape CommunicatorŽ
+Generated from /Volumes/Sap/Applications (Mac OS 9)/Netscape Communicator\xe2\x84\xa2 Folder/Netscape Communicator\xe2\x84\xa2
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
@@ -42,7 +42,7 @@ class justbehind(aetools.NProperty):
 #        element 'stys' as ['indx', 'name']
 
 class styleset(aetools.ComponentItem):
-	"""styleset - A style –set” that may be used repeatedly in text objects. """
+	"""styleset - A style \xd2set\xd3 that may be used repeatedly in text objects. """
 	want = 'stys'
 class name(aetools.NProperty):
 	"""name - style name """
@@ -70,17 +70,19 @@ class style(aetools.NProperty):
 	want = 'tsty'
 
 stylesets = styleset
-text._propdict = {
+text._superclassnames = []
+text._privpropdict = {
 	'updateLevel' : updateLevel,
 	'beginning' : beginning,
 	'end' : end,
 	'infront' : infront,
 	'justbehind' : justbehind,
 }
-text._elemdict = {
+text._privelemdict = {
 	'styleset' : styleset,
 }
-styleset._propdict = {
+styleset._superclassnames = []
+styleset._privpropdict = {
 	'name' : name,
 	'color' : color,
 	'font' : font,
@@ -88,7 +90,7 @@ styleset._propdict = {
 	'writing_code' : writing_code,
 	'style' : style,
 }
-styleset._elemdict = {
+styleset._privelemdict = {
 }
 
 #
diff --git a/Mac/Lib/lib-scriptpackages/Netscape/WorldWideWeb_suite.py b/Mac/Lib/lib-scriptpackages/Netscape/WorldWideWeb_suite.py
index 1c0c04f..c9c4fde 100644
--- a/Mac/Lib/lib-scriptpackages/Netscape/WorldWideWeb_suite.py
+++ b/Mac/Lib/lib-scriptpackages/Netscape/WorldWideWeb_suite.py
@@ -1,7 +1,7 @@
 """Suite WorldWideWeb suite, as defined in Spyglass spec.: 
 Level 1, version 1
 
-Generated from Moes:Applications (Mac OS 9):Netscape CommunicatorŽ Folder:Netscape CommunicatorŽ
+Generated from /Volumes/Sap/Applications (Mac OS 9)/Netscape Communicator\xe2\x84\xa2 Folder/Netscape Communicator\xe2\x84\xa2
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
@@ -212,7 +212,7 @@ class WorldWideWeb_suite_Events:
 			return _arguments['----']
 
 	def register_URL_echo(self, _object=None, _attributes={}, **_arguments):
-		"""register URL echo: Registers the –echo” application. Each download from now on will be echoed to this application.
+		"""register URL echo: Registers the \xd2echo\xd3 application. Each download from now on will be echoed to this application.
 		Required argument: Application signature
 		Keyword argument _attributes: AppleEvent attribute dictionary
 		"""
@@ -257,7 +257,7 @@ class WorldWideWeb_suite_Events:
 	}
 
 	def register_viewer(self, _object, _attributes={}, **_arguments):
-		"""register viewer: Registers an application as a •specialÕ viewer for this MIME type. The application will be launched with ViewDoc events
+		"""register viewer: Registers an application as a \xd4special\xd5 viewer for this MIME type. The application will be launched with ViewDoc events
 		Required argument: Application sig
 		Keyword argument MIME_type: MIME type viewer is registering for
 		Keyword argument with_file_type: Mac file type for the downloaded files
@@ -310,9 +310,9 @@ class WorldWideWeb_suite_Events:
 	}
 
 	def register_protocol(self, _object=None, _attributes={}, **_arguments):
-		"""register protocol: Registers application as a –handler” for this protocol with a given prefix. The handler will receive –OpenURL”, or if that fails, –GetURL” event.
+		"""register protocol: Registers application as a \xd2handler\xd3 for this protocol with a given prefix. The handler will receive \xd2OpenURL\xd3, or if that fails, \xd2GetURL\xd3 event.
 		Required argument: Application sig
-		Keyword argument for_protocol: protocol prefix: –finger:”, –file”,
+		Keyword argument for_protocol: protocol prefix: \xd2finger:\xd3, \xd2file\xd3,
 		Keyword argument _attributes: AppleEvent attribute dictionary
 		Returns: TRUE if registration has been successful
 		"""
@@ -336,7 +336,7 @@ class WorldWideWeb_suite_Events:
 	}
 
 	def unregister_protocol(self, _object=None, _attributes={}, **_arguments):
-		"""unregister protocol: reverses the effects of –register protocol”
+		"""unregister protocol: reverses the effects of \xd2register protocol\xd3
 		Required argument: Application sig. 
 		Keyword argument for_protocol: protocol prefix. If none, unregister for all protocols
 		Keyword argument _attributes: AppleEvent attribute dictionary
diff --git a/Mac/Lib/lib-scriptpackages/Netscape/__init__.py b/Mac/Lib/lib-scriptpackages/Netscape/__init__.py
index 4ce340c..40cca88 100644
--- a/Mac/Lib/lib-scriptpackages/Netscape/__init__.py
+++ b/Mac/Lib/lib-scriptpackages/Netscape/__init__.py
@@ -1,5 +1,5 @@
 """
-Package generated from Moes:Applications (Mac OS 9):Netscape CommunicatorŽ Folder:Netscape CommunicatorŽ
+Package generated from /Volumes/Sap/Applications (Mac OS 9)/Netscape Communicatorâ„¢ Folder/Netscape Communicatorâ„¢
 Resource aete resid 0 
 """
 import aetools
@@ -42,6 +42,49 @@ from WorldWideWeb_suite import *
 from Mozilla_suite import *
 from PowerPlant import *
 from Text import *
+def getbaseclasses(v):
+	if hasattr(v, '_superclassnames') and not hasattr(v, '_propdict'):
+		v._propdict = {}
+		v._elemdict = {}
+		for superclass in v._superclassnames:
+			v._propdict.update(getattr(eval(superclass), '_privpropdict', {}))
+			v._elemdict.update(getattr(eval(superclass), '_privelemdict', {}))
+		v._propdict.update(v._privpropdict)
+		v._elemdict.update(v._privelemdict)
+
+import StdSuites
+
+#
+# Set property and element dictionaries now that all classes have been defined
+#
+getbaseclasses(window)
+getbaseclasses(application)
+getbaseclasses(text)
+getbaseclasses(styleset)
+getbaseclasses(StdSuites.Text_Suite.paragraph)
+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.text)
+
+#
+# Indices of types declared in this module
+#
+_classdeclarations = {
+	'cwin' : window,
+	'capp' : application,
+	'ctxt' : text,
+	'stys' : styleset,
+	'cpar' : StdSuites.Text_Suite.paragraph,
+	'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,
+	'ctxt' : StdSuites.Text_Suite.text,
+}
 
 
 class Netscape(Required_suite_Events,
@@ -54,3 +97,5 @@ class Netscape(Required_suite_Events,
 		aetools.TalkTo):
 	_signature = 'MOSS'
 
+	_moduleName = 'Netscape'
+
diff --git a/Mac/Lib/lib-scriptpackages/StdSuites/AppleScript_Suite.py b/Mac/Lib/lib-scriptpackages/StdSuites/AppleScript_Suite.py
index f583991..51d4212 100644
--- a/Mac/Lib/lib-scriptpackages/StdSuites/AppleScript_Suite.py
+++ b/Mac/Lib/lib-scriptpackages/StdSuites/AppleScript_Suite.py
@@ -1,7 +1,7 @@
 """Suite AppleScript Suite: Standard terms for AppleScript
 Level 1, version 1
 
-Generated from Moes:Systeemmap:Extensies:AppleScript
+Generated from /Volumes/Sap/System Folder/Extensions/AppleScript
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
@@ -129,7 +129,7 @@ class AppleScript_Suite_Events:
 			return _arguments['----']
 
 	def tell(self, _no_object=None, _attributes={}, **_arguments):
-		"""tell: Record or log a •tellÕ statement
+		"""tell: Record or log a \xd4tell\xd5 statement
 		Keyword argument _attributes: AppleEvent attribute dictionary
 		"""
 		_code = 'ascr'
@@ -148,7 +148,7 @@ class AppleScript_Suite_Events:
 			return _arguments['----']
 
 	def end_tell(self, _no_object=None, _attributes={}, **_arguments):
-		"""end tell: Record or log an •end tellÕ statement
+		"""end tell: Record or log an \xd4end tell\xd5 statement
 		Keyword argument _attributes: AppleEvent attribute dictionary
 		"""
 		_code = 'ascr'
@@ -169,7 +169,7 @@ class AppleScript_Suite_Events:
 	_argmap_error = {
 		'number' : 'errn',
 		'partial_result' : 'ptlr',
-		'_from' : 'erob',
+		'from_' : 'erob',
 		'to' : 'errt',
 	}
 
@@ -178,7 +178,7 @@ class AppleScript_Suite_Events:
 		Required argument: anything
 		Keyword argument number: an error number
 		Keyword argument partial_result: any partial result occurring before the error
-		Keyword argument _from: the object that caused the error
+		Keyword argument from_: the object that caused the error
 		Keyword argument to: the desired class for a failed coercion
 		Keyword argument _attributes: AppleEvent attribute dictionary
 		"""
@@ -199,8 +199,8 @@ class AppleScript_Suite_Events:
 
 	_argmap_Call_a5_subroutine = {
 		'at' : 'at  ',
-		'_from' : 'from',
-		'_for' : 'for ',
+		'from_' : 'from',
+		'for_' : 'for ',
 		'to' : 'to  ',
 		'thru' : 'thru',
 		'through' : 'thgh',
@@ -229,11 +229,11 @@ class AppleScript_Suite_Events:
 	}
 
 	def Call_a5_subroutine(self, _object=None, _attributes={}, **_arguments):
-		"""Call‚subroutine: A subroutine call
+		"""Call\xa5subroutine: A subroutine call
 		Required argument: anything
 		Keyword argument at: a preposition
-		Keyword argument _from: a preposition
-		Keyword argument _for: a preposition
+		Keyword argument from_: a preposition
+		Keyword argument for_: a preposition
 		Keyword argument to: a preposition
 		Keyword argument thru: a preposition
 		Keyword argument through: a preposition
@@ -299,7 +299,7 @@ class AppleScript_Suite_Events:
 			return _arguments['----']
 
 	def _ad_(self, _object, _attributes={}, **_arguments):
-		"""­: Inequality
+		"""\xad: Inequality
 		Required argument: an AE object reference
 		Keyword argument _attributes: AppleEvent attribute dictionary
 		Returns: anything
@@ -383,7 +383,7 @@ class AppleScript_Suite_Events:
 			return _arguments['----']
 
 	def _d6_(self, _object, _attributes={}, **_arguments):
-		"""÷: Division
+		"""\xd6: Division
 		Required argument: an AE object reference
 		Keyword argument _attributes: AppleEvent attribute dictionary
 		Returns: anything
@@ -488,7 +488,7 @@ class AppleScript_Suite_Events:
 			return _arguments['----']
 
 	def _b3_(self, _object, _attributes={}, **_arguments):
-		"""³: Greater than or equal to
+		"""\xb3: Greater than or equal to
 		Required argument: an AE object reference
 		Keyword argument _attributes: AppleEvent attribute dictionary
 		Returns: anything
@@ -530,7 +530,7 @@ class AppleScript_Suite_Events:
 			return _arguments['----']
 
 	def _b2_(self, _object, _attributes={}, **_arguments):
-		"""²: Less than or equal to
+		"""\xb2: Less than or equal to
 		Required argument: an AE object reference
 		Keyword argument _attributes: AppleEvent attribute dictionary
 		Returns: anything
@@ -634,7 +634,7 @@ class AppleScript_Suite_Events:
 		if _arguments.has_key('----'):
 			return _arguments['----']
 
-	def _and(self, _object, _attributes={}, **_arguments):
+	def and_(self, _object, _attributes={}, **_arguments):
 		"""and: Logical conjunction
 		Required argument: an AE object reference
 		Keyword argument _attributes: AppleEvent attribute dictionary
@@ -655,7 +655,7 @@ class AppleScript_Suite_Events:
 		if _arguments.has_key('----'):
 			return _arguments['----']
 
-	def _or(self, _object, _attributes={}, **_arguments):
+	def or_(self, _object, _attributes={}, **_arguments):
 		"""or: Logical disjunction
 		Required argument: an AE object reference
 		Keyword argument _attributes: AppleEvent attribute dictionary
@@ -697,7 +697,7 @@ class AppleScript_Suite_Events:
 		if _arguments.has_key('----'):
 			return _arguments['----']
 
-	def _not(self, _object, _attributes={}, **_arguments):
+	def not_(self, _object, _attributes={}, **_arguments):
 		"""not: Logical negation
 		Required argument: an AE object reference
 		Keyword argument _attributes: AppleEvent attribute dictionary
@@ -818,7 +818,7 @@ class name(aetools.NProperty):
 	which = 'pnam'
 	want = 'TEXT'
 class parent(aetools.NProperty):
-	"""parent - its parent, i.e. the script that will handle events that this script doesnÕt """
+	"""parent - its parent, i.e. the script that will handle events that this script doesn\xd5t """
 	which = 'pare'
 	want = 'scpt'
 
@@ -852,7 +852,7 @@ class number_2c__date_or_text(aetools.ComponentItem):
 	"""number, date or text - a number, date or text """
 	want = 'nds '
 
-class _class(aetools.ComponentItem):
+class class_(aetools.ComponentItem):
 	"""class - the type of a value """
 	want = 'pcls'
 class _3c_Inheritance_3e_(aetools.NProperty):
@@ -860,7 +860,7 @@ class _3c_Inheritance_3e_(aetools.NProperty):
 	which = 'c@#^'
 	want = 'type'
 
-classes = _class
+classes = class_
 
 class event(aetools.ComponentItem):
 	"""event - an AppleEvents event """
@@ -990,7 +990,7 @@ class language_code(aetools.NProperty):
 
 writing_code_infos = writing_code_info
 
-class _empty_ae_name(aetools.ComponentItem):
+class empty_ae_name_(aetools.ComponentItem):
 	""" - the undefined value """
 	want = 'undf'
 
@@ -1345,7 +1345,7 @@ class space(aetools.NProperty):
 	"""space - a space character """
 	which = 'spac'
 	want = 'cha '
-class _return(aetools.NProperty):
+class return_(aetools.NProperty):
 	"""return - a return character """
 	which = 'ret '
 	want = 'cha '
@@ -1391,257 +1391,317 @@ class AppleScript(aetools.NProperty):
 	want = 'scpt'
 
 applications = app
-boolean._propdict = {
+boolean._superclassnames = []
+boolean._privpropdict = {
 }
-boolean._elemdict = {
+boolean._privelemdict = {
 }
-integer._propdict = {
+integer._superclassnames = []
+integer._privpropdict = {
 }
-integer._elemdict = {
+integer._privelemdict = {
 }
-real._propdict = {
+real._superclassnames = []
+real._privpropdict = {
 }
-real._elemdict = {
+real._privelemdict = {
 }
-number._propdict = {
+number._superclassnames = []
+number._privpropdict = {
 }
-number._elemdict = {
+number._privelemdict = {
 }
-list._propdict = {
+list._superclassnames = []
+list._privpropdict = {
 	'length' : length,
 	'reverse' : reverse,
 	'rest' : rest,
 }
-list._elemdict = {
+list._privelemdict = {
 }
-linked_list._propdict = {
+linked_list._superclassnames = []
+linked_list._privpropdict = {
 	'length' : length,
 }
-linked_list._elemdict = {
+linked_list._privelemdict = {
 }
-vector._propdict = {
+vector._superclassnames = []
+vector._privpropdict = {
 	'length' : length,
 }
-vector._elemdict = {
+vector._privelemdict = {
 }
-record._propdict = {
+record._superclassnames = []
+record._privpropdict = {
 }
-record._elemdict = {
+record._privelemdict = {
 }
-item._propdict = {
+item._superclassnames = []
+item._privpropdict = {
 	'id' : id,
 }
-item._elemdict = {
+item._privelemdict = {
 }
-script._propdict = {
+script._superclassnames = []
+script._privpropdict = {
 	'name' : name,
 	'parent' : parent,
 }
-script._elemdict = {
+script._privelemdict = {
 }
-list_or_record._propdict = {
+list_or_record._superclassnames = []
+list_or_record._privpropdict = {
 }
-list_or_record._elemdict = {
+list_or_record._privelemdict = {
 }
-list_or_string._propdict = {
+list_or_string._superclassnames = []
+list_or_string._privpropdict = {
 }
-list_or_string._elemdict = {
+list_or_string._privelemdict = {
 }
-number_or_string._propdict = {
+number_or_string._superclassnames = []
+number_or_string._privpropdict = {
 }
-number_or_string._elemdict = {
+number_or_string._privelemdict = {
 }
-alias_or_string._propdict = {
+alias_or_string._superclassnames = []
+alias_or_string._privpropdict = {
 }
-alias_or_string._elemdict = {
+alias_or_string._privelemdict = {
 }
-list_2c__record_or_text._propdict = {
+list_2c__record_or_text._superclassnames = []
+list_2c__record_or_text._privpropdict = {
 }
-list_2c__record_or_text._elemdict = {
+list_2c__record_or_text._privelemdict = {
 }
-number_or_date._propdict = {
+number_or_date._superclassnames = []
+number_or_date._privpropdict = {
 }
-number_or_date._elemdict = {
+number_or_date._privelemdict = {
 }
-number_2c__date_or_text._propdict = {
+number_2c__date_or_text._superclassnames = []
+number_2c__date_or_text._privpropdict = {
 }
-number_2c__date_or_text._elemdict = {
+number_2c__date_or_text._privelemdict = {
 }
-_class._propdict = {
+class_._superclassnames = ['type_class']
+class_._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
 }
-_class._elemdict = {
+class_._privelemdict = {
 }
-event._propdict = {
+event._superclassnames = []
+event._privpropdict = {
 }
-event._elemdict = {
+event._privelemdict = {
 }
-property._propdict = {
+property._superclassnames = []
+property._privpropdict = {
 }
-property._elemdict = {
+property._privelemdict = {
 }
-constant._propdict = {
+constant._superclassnames = []
+constant._privpropdict = {
 }
-constant._elemdict = {
+constant._privelemdict = {
 }
-preposition._propdict = {
+preposition._superclassnames = []
+preposition._privpropdict = {
 }
-preposition._elemdict = {
+preposition._privelemdict = {
 }
-reference_form._propdict = {
+reference_form._superclassnames = []
+reference_form._privpropdict = {
 }
-reference_form._elemdict = {
+reference_form._privelemdict = {
 }
-handler._propdict = {
+handler._superclassnames = []
+handler._privpropdict = {
 }
-handler._elemdict = {
+handler._privelemdict = {
 }
-data._propdict = {
+data._superclassnames = []
+data._privpropdict = {
 }
-data._elemdict = {
+data._privelemdict = {
 }
-text._propdict = {
+text._superclassnames = []
+text._privpropdict = {
 }
-text._elemdict = {
+text._privelemdict = {
 }
-international_text._propdict = {
+international_text._superclassnames = []
+international_text._privpropdict = {
 }
-international_text._elemdict = {
+international_text._privelemdict = {
 }
-international_text._propdict = {
+international_text._superclassnames = []
+international_text._privpropdict = {
 }
-international_text._elemdict = {
+international_text._privelemdict = {
 }
-string._propdict = {
+string._superclassnames = []
+string._privpropdict = {
 }
-string._elemdict = {
+string._privelemdict = {
 }
-styled_text._propdict = {
+styled_text._superclassnames = []
+styled_text._privpropdict = {
 }
-styled_text._elemdict = {
+styled_text._privelemdict = {
 }
-styled_text._propdict = {
+styled_text._superclassnames = []
+styled_text._privpropdict = {
 }
-styled_text._elemdict = {
+styled_text._privelemdict = {
 }
-styled_Clipboard_text._propdict = {
+styled_Clipboard_text._superclassnames = []
+styled_Clipboard_text._privpropdict = {
 }
-styled_Clipboard_text._elemdict = {
+styled_Clipboard_text._privelemdict = {
 }
-styled_Clipboard_text._propdict = {
+styled_Clipboard_text._superclassnames = []
+styled_Clipboard_text._privpropdict = {
 }
-styled_Clipboard_text._elemdict = {
+styled_Clipboard_text._privelemdict = {
 }
-Unicode_text._propdict = {
+Unicode_text._superclassnames = []
+Unicode_text._privpropdict = {
 }
-Unicode_text._elemdict = {
+Unicode_text._privelemdict = {
 }
-Unicode_text._propdict = {
+Unicode_text._superclassnames = []
+Unicode_text._privpropdict = {
 }
-Unicode_text._elemdict = {
+Unicode_text._privelemdict = {
 }
-styled_Unicode_text._propdict = {
+styled_Unicode_text._superclassnames = []
+styled_Unicode_text._privpropdict = {
 }
-styled_Unicode_text._elemdict = {
+styled_Unicode_text._privelemdict = {
 }
-styled_Unicode_text._propdict = {
+styled_Unicode_text._superclassnames = []
+styled_Unicode_text._privpropdict = {
 }
-styled_Unicode_text._elemdict = {
+styled_Unicode_text._privelemdict = {
 }
-encoded_string._propdict = {
+encoded_string._superclassnames = []
+encoded_string._privpropdict = {
 }
-encoded_string._elemdict = {
+encoded_string._privelemdict = {
 }
-C_string._propdict = {
+C_string._superclassnames = []
+C_string._privpropdict = {
 }
-C_string._elemdict = {
+C_string._privelemdict = {
 }
-Pascal_string._propdict = {
+Pascal_string._superclassnames = []
+Pascal_string._privpropdict = {
 }
-Pascal_string._elemdict = {
+Pascal_string._privelemdict = {
 }
-character._propdict = {
+character._superclassnames = []
+character._privpropdict = {
 }
-character._elemdict = {
+character._privelemdict = {
 }
-text_item._propdict = {
+text_item._superclassnames = []
+text_item._privpropdict = {
 }
-text_item._elemdict = {
+text_item._privelemdict = {
 }
-writing_code._propdict = {
+writing_code._superclassnames = []
+writing_code._privpropdict = {
 }
-writing_code._elemdict = {
+writing_code._privelemdict = {
 }
-writing_code_info._propdict = {
+writing_code_info._superclassnames = []
+writing_code_info._privpropdict = {
 	'script_code' : script_code,
 	'language_code' : language_code,
 }
-writing_code_info._elemdict = {
+writing_code_info._privelemdict = {
 }
-_empty_ae_name._propdict = {
+empty_ae_name_._superclassnames = []
+empty_ae_name_._privpropdict = {
 }
-_empty_ae_name._elemdict = {
+empty_ae_name_._privelemdict = {
 }
-missing_value._propdict = {
+missing_value._superclassnames = []
+missing_value._privpropdict = {
 }
-missing_value._elemdict = {
+missing_value._privelemdict = {
 }
-reference._propdict = {
+reference._superclassnames = []
+reference._privpropdict = {
 }
-reference._elemdict = {
+reference._privelemdict = {
 }
-anything._propdict = {
+anything._superclassnames = []
+anything._privpropdict = {
 }
-anything._elemdict = {
+anything._privelemdict = {
 }
-type_class._propdict = {
+type_class._superclassnames = []
+type_class._privpropdict = {
 }
-type_class._elemdict = {
+type_class._privelemdict = {
 }
-RGB_color._propdict = {
+RGB_color._superclassnames = []
+RGB_color._privpropdict = {
 }
-RGB_color._elemdict = {
+RGB_color._privelemdict = {
 }
-picture._propdict = {
+picture._superclassnames = []
+picture._privpropdict = {
 }
-picture._elemdict = {
+picture._privelemdict = {
 }
-sound._propdict = {
+sound._superclassnames = []
+sound._privpropdict = {
 }
-sound._elemdict = {
+sound._privelemdict = {
 }
-version._propdict = {
+version._superclassnames = []
+version._privpropdict = {
 }
-version._elemdict = {
+version._privelemdict = {
 }
-file_specification._propdict = {
+file_specification._superclassnames = []
+file_specification._privpropdict = {
 }
-file_specification._elemdict = {
+file_specification._privelemdict = {
 }
-alias._propdict = {
+alias._superclassnames = []
+alias._privpropdict = {
 }
-alias._elemdict = {
+alias._privelemdict = {
 }
-machine._propdict = {
+machine._superclassnames = []
+machine._privpropdict = {
 }
-machine._elemdict = {
+machine._privelemdict = {
 }
-zone._propdict = {
+zone._superclassnames = []
+zone._privpropdict = {
 }
-zone._elemdict = {
+zone._privelemdict = {
 }
-keystroke._propdict = {
+keystroke._superclassnames = []
+keystroke._privpropdict = {
 	'key' : key,
 	'modifiers' : modifiers,
 	'key_kind' : key_kind,
 }
-keystroke._elemdict = {
+keystroke._privelemdict = {
 }
-seconds._propdict = {
+seconds._superclassnames = []
+seconds._privpropdict = {
 }
-seconds._elemdict = {
+seconds._privelemdict = {
 }
-date._propdict = {
+date._superclassnames = []
+date._privpropdict = {
 	'weekday' : weekday,
 	'month' : month,
 	'day' : day,
@@ -1650,207 +1710,257 @@ date._propdict = {
 	'date_string' : date_string,
 	'time_string' : time_string,
 }
-date._elemdict = {
+date._privelemdict = {
 }
-month._propdict = {
+month._superclassnames = []
+month._privpropdict = {
 }
-month._elemdict = {
+month._privelemdict = {
 }
-January._propdict = {
+January._superclassnames = []
+January._privpropdict = {
 }
-January._elemdict = {
+January._privelemdict = {
 }
-February._propdict = {
+February._superclassnames = []
+February._privpropdict = {
 }
-February._elemdict = {
+February._privelemdict = {
 }
-March._propdict = {
+March._superclassnames = []
+March._privpropdict = {
 }
-March._elemdict = {
+March._privelemdict = {
 }
-April._propdict = {
+April._superclassnames = []
+April._privpropdict = {
 }
-April._elemdict = {
+April._privelemdict = {
 }
-May._propdict = {
+May._superclassnames = []
+May._privpropdict = {
 }
-May._elemdict = {
+May._privelemdict = {
 }
-June._propdict = {
+June._superclassnames = []
+June._privpropdict = {
 }
-June._elemdict = {
+June._privelemdict = {
 }
-July._propdict = {
+July._superclassnames = []
+July._privpropdict = {
 }
-July._elemdict = {
+July._privelemdict = {
 }
-August._propdict = {
+August._superclassnames = []
+August._privpropdict = {
 }
-August._elemdict = {
+August._privelemdict = {
 }
-September._propdict = {
+September._superclassnames = []
+September._privpropdict = {
 }
-September._elemdict = {
+September._privelemdict = {
 }
-October._propdict = {
+October._superclassnames = []
+October._privpropdict = {
 }
-October._elemdict = {
+October._privelemdict = {
 }
-November._propdict = {
+November._superclassnames = []
+November._privpropdict = {
 }
-November._elemdict = {
+November._privelemdict = {
 }
-December._propdict = {
+December._superclassnames = []
+December._privpropdict = {
 }
-December._elemdict = {
+December._privelemdict = {
 }
-weekday._propdict = {
+weekday._superclassnames = []
+weekday._privpropdict = {
 }
-weekday._elemdict = {
+weekday._privelemdict = {
 }
-Sunday._propdict = {
+Sunday._superclassnames = []
+Sunday._privpropdict = {
 }
-Sunday._elemdict = {
+Sunday._privelemdict = {
 }
-Monday._propdict = {
+Monday._superclassnames = []
+Monday._privpropdict = {
 }
-Monday._elemdict = {
+Monday._privelemdict = {
 }
-Tuesday._propdict = {
+Tuesday._superclassnames = []
+Tuesday._privpropdict = {
 }
-Tuesday._elemdict = {
+Tuesday._privelemdict = {
 }
-Wednesday._propdict = {
+Wednesday._superclassnames = []
+Wednesday._privpropdict = {
 }
-Wednesday._elemdict = {
+Wednesday._privelemdict = {
 }
-Thursday._propdict = {
+Thursday._superclassnames = []
+Thursday._privpropdict = {
 }
-Thursday._elemdict = {
+Thursday._privelemdict = {
 }
-Friday._propdict = {
+Friday._superclassnames = []
+Friday._privpropdict = {
 }
-Friday._elemdict = {
+Friday._privelemdict = {
 }
-Saturday._propdict = {
+Saturday._superclassnames = []
+Saturday._privpropdict = {
 }
-Saturday._elemdict = {
+Saturday._privelemdict = {
 }
-metres._propdict = {
+metres._superclassnames = []
+metres._privpropdict = {
 }
-metres._elemdict = {
+metres._privelemdict = {
 }
-inches._propdict = {
+inches._superclassnames = []
+inches._privpropdict = {
 }
-inches._elemdict = {
+inches._privelemdict = {
 }
-feet._propdict = {
+feet._superclassnames = []
+feet._privpropdict = {
 }
-feet._elemdict = {
+feet._privelemdict = {
 }
-yards._propdict = {
+yards._superclassnames = []
+yards._privpropdict = {
 }
-yards._elemdict = {
+yards._privelemdict = {
 }
-miles._propdict = {
+miles._superclassnames = []
+miles._privpropdict = {
 }
-miles._elemdict = {
+miles._privelemdict = {
 }
-kilometres._propdict = {
+kilometres._superclassnames = []
+kilometres._privpropdict = {
 }
-kilometres._elemdict = {
+kilometres._privelemdict = {
 }
-centimetres._propdict = {
+centimetres._superclassnames = []
+centimetres._privpropdict = {
 }
-centimetres._elemdict = {
+centimetres._privelemdict = {
 }
-square_metres._propdict = {
+square_metres._superclassnames = []
+square_metres._privpropdict = {
 }
-square_metres._elemdict = {
+square_metres._privelemdict = {
 }
-square_feet._propdict = {
+square_feet._superclassnames = []
+square_feet._privpropdict = {
 }
-square_feet._elemdict = {
+square_feet._privelemdict = {
 }
-square_yards._propdict = {
+square_yards._superclassnames = []
+square_yards._privpropdict = {
 }
-square_yards._elemdict = {
+square_yards._privelemdict = {
 }
-square_miles._propdict = {
+square_miles._superclassnames = []
+square_miles._privpropdict = {
 }
-square_miles._elemdict = {
+square_miles._privelemdict = {
 }
-square_kilometres._propdict = {
+square_kilometres._superclassnames = []
+square_kilometres._privpropdict = {
 }
-square_kilometres._elemdict = {
+square_kilometres._privelemdict = {
 }
-litres._propdict = {
+litres._superclassnames = []
+litres._privpropdict = {
 }
-litres._elemdict = {
+litres._privelemdict = {
 }
-gallons._propdict = {
+gallons._superclassnames = []
+gallons._privpropdict = {
 }
-gallons._elemdict = {
+gallons._privelemdict = {
 }
-quarts._propdict = {
+quarts._superclassnames = []
+quarts._privpropdict = {
 }
-quarts._elemdict = {
+quarts._privelemdict = {
 }
-cubic_metres._propdict = {
+cubic_metres._superclassnames = []
+cubic_metres._privpropdict = {
 }
-cubic_metres._elemdict = {
+cubic_metres._privelemdict = {
 }
-cubic_centimetres._propdict = {
+cubic_centimetres._superclassnames = []
+cubic_centimetres._privpropdict = {
 }
-cubic_centimetres._elemdict = {
+cubic_centimetres._privelemdict = {
 }
-cubic_feet._propdict = {
+cubic_feet._superclassnames = []
+cubic_feet._privpropdict = {
 }
-cubic_feet._elemdict = {
+cubic_feet._privelemdict = {
 }
-cubic_inches._propdict = {
+cubic_inches._superclassnames = []
+cubic_inches._privpropdict = {
 }
-cubic_inches._elemdict = {
+cubic_inches._privelemdict = {
 }
-cubic_yards._propdict = {
+cubic_yards._superclassnames = []
+cubic_yards._privpropdict = {
 }
-cubic_yards._elemdict = {
+cubic_yards._privelemdict = {
 }
-kilograms._propdict = {
+kilograms._superclassnames = []
+kilograms._privpropdict = {
 }
-kilograms._elemdict = {
+kilograms._privelemdict = {
 }
-grams._propdict = {
+grams._superclassnames = []
+grams._privpropdict = {
 }
-grams._elemdict = {
+grams._privelemdict = {
 }
-ounces._propdict = {
+ounces._superclassnames = []
+ounces._privpropdict = {
 }
-ounces._elemdict = {
+ounces._privelemdict = {
 }
-pounds._propdict = {
+pounds._superclassnames = []
+pounds._privpropdict = {
 }
-pounds._elemdict = {
+pounds._privelemdict = {
 }
-degrees_Celsius._propdict = {
+degrees_Celsius._superclassnames = []
+degrees_Celsius._privpropdict = {
 }
-degrees_Celsius._elemdict = {
+degrees_Celsius._privelemdict = {
 }
-degrees_Fahrenheit._propdict = {
+degrees_Fahrenheit._superclassnames = []
+degrees_Fahrenheit._privpropdict = {
 }
-degrees_Fahrenheit._elemdict = {
+degrees_Fahrenheit._privelemdict = {
 }
-degrees_Kelvin._propdict = {
+degrees_Kelvin._superclassnames = []
+degrees_Kelvin._privpropdict = {
 }
-degrees_Kelvin._elemdict = {
+degrees_Kelvin._privelemdict = {
 }
-upper_case._propdict = {
+upper_case._superclassnames = []
+upper_case._privpropdict = {
 }
-upper_case._elemdict = {
+upper_case._privelemdict = {
 }
-app._propdict = {
+app._superclassnames = []
+app._privpropdict = {
 }
-app._elemdict = {
+app._privelemdict = {
 }
 _Enum_cons = {
 	'case' : 'case',	# case
@@ -1988,7 +2098,7 @@ _classdeclarations = {
 	'degk' : degrees_Kelvin,
 	'mon ' : Monday,
 	'snd ' : sound,
-	'pcls' : _class,
+	'pcls' : class_,
 	'kgrm' : kilograms,
 	'scpt' : script,
 	'****' : anything,
@@ -2003,7 +2113,7 @@ _classdeclarations = {
 	'gram' : grams,
 	'cha ' : character,
 	'apr ' : April,
-	'undf' : _empty_ae_name,
+	'undf' : empty_ae_name_,
 	'capp' : app,
 	'enum' : constant,
 	'hand' : handler,
@@ -2045,7 +2155,7 @@ _propdeclarations = {
 	'tab ' : tab,
 	'tstr' : time_string,
 	'pi  ' : pi,
-	'ret ' : _return,
+	'ret ' : return_,
 	'plcd' : language_code,
 	'kMsg' : key,
 	'spac' : space,
diff --git a/Mac/Lib/lib-scriptpackages/StdSuites/Macintosh_Connectivity_Clas.py b/Mac/Lib/lib-scriptpackages/StdSuites/Macintosh_Connectivity_Clas.py
index 9eb9f7f..8dbd6e0 100644
--- a/Mac/Lib/lib-scriptpackages/StdSuites/Macintosh_Connectivity_Clas.py
+++ b/Mac/Lib/lib-scriptpackages/StdSuites/Macintosh_Connectivity_Clas.py
@@ -1,7 +1,7 @@
 """Suite Macintosh Connectivity Classes: Classes relating to Apple Macintosh personal computer connectivity
 Level 1, version 1
 
-Generated from Moes:Systeemmap:Extensies:AppleScript
+Generated from /Volumes/Sap/System Folder/Extensions/AppleScript
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
@@ -158,87 +158,99 @@ class name(aetools.NProperty):
 	want = 'TEXT'
 
 USB_Addresses = USB_address
-device_specification._propdict = {
+device_specification._superclassnames = []
+device_specification._privpropdict = {
 	'properties' : properties,
 	'device_type' : device_type,
 	'device_address' : device_address,
 }
-device_specification._elemdict = {
+device_specification._privelemdict = {
 }
-address_specification._propdict = {
+address_specification._superclassnames = []
+address_specification._privpropdict = {
 	'properties' : properties,
 	'conduit' : conduit,
 	'protocol' : protocol,
 }
-address_specification._elemdict = {
+address_specification._privelemdict = {
 }
-ADB_address._propdict = {
+ADB_address._superclassnames = ['address_specification']
+ADB_address._privpropdict = {
 	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
 	'ID' : ID,
 }
-ADB_address._elemdict = {
+ADB_address._privelemdict = {
 }
-AppleTalk_address._propdict = {
+AppleTalk_address._superclassnames = ['address_specification']
+AppleTalk_address._privpropdict = {
 	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
 	'AppleTalk_machine' : AppleTalk_machine,
 	'AppleTalk_zone' : AppleTalk_zone,
 	'AppleTalk_type' : AppleTalk_type,
 }
-AppleTalk_address._elemdict = {
+AppleTalk_address._privelemdict = {
 }
-bus_slot._propdict = {
+bus_slot._superclassnames = ['address_specification']
+bus_slot._privpropdict = {
 	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
 	'ID' : ID,
 }
-bus_slot._elemdict = {
+bus_slot._privelemdict = {
 }
-Ethernet_address._propdict = {
+Ethernet_address._superclassnames = ['address_specification']
+Ethernet_address._privpropdict = {
 	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
 	'ID' : ID,
 }
-Ethernet_address._elemdict = {
+Ethernet_address._privelemdict = {
 }
-FireWire_address._propdict = {
+FireWire_address._superclassnames = ['address_specification']
+FireWire_address._privpropdict = {
 	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
 	'ID' : ID,
 }
-FireWire_address._elemdict = {
+FireWire_address._privelemdict = {
 }
-IP_address._propdict = {
+IP_address._superclassnames = ['address_specification']
+IP_address._privpropdict = {
 	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
 	'ID' : ID,
 	'DNS_form' : DNS_form,
 	'port' : port,
 }
-IP_address._elemdict = {
+IP_address._privelemdict = {
 }
-LocalTalk_address._propdict = {
+LocalTalk_address._superclassnames = ['address_specification']
+LocalTalk_address._privpropdict = {
 	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
 	'network' : network,
 	'node' : node,
 	'socket' : socket,
 }
-LocalTalk_address._elemdict = {
+LocalTalk_address._privelemdict = {
 }
-SCSI_address._propdict = {
+SCSI_address._superclassnames = ['address_specification']
+SCSI_address._privpropdict = {
 	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
 	'SCSI_bus' : SCSI_bus,
 	'ID' : ID,
 	'LUN' : LUN,
 }
-SCSI_address._elemdict = {
+SCSI_address._privelemdict = {
 }
-Token_Ring_address._propdict = {
+Token_Ring_address._superclassnames = ['address_specification']
+Token_Ring_address._privpropdict = {
 	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
 	'ID' : ID,
 }
-Token_Ring_address._elemdict = {
+Token_Ring_address._privelemdict = {
 }
-USB_address._propdict = {
+USB_address._superclassnames = ['address_specification']
+USB_address._privpropdict = {
 	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
 	'name' : name,
 }
-USB_address._elemdict = {
+USB_address._privelemdict = {
 }
 _Enum_edvt = {
 	'hard_disk_drive' : 'ehd ',	# 
diff --git a/Mac/Lib/lib-scriptpackages/StdSuites/QuickDraw_Graphics_Suite.py b/Mac/Lib/lib-scriptpackages/StdSuites/QuickDraw_Graphics_Suite.py
index cf29e47..253cf0b 100644
--- a/Mac/Lib/lib-scriptpackages/StdSuites/QuickDraw_Graphics_Suite.py
+++ b/Mac/Lib/lib-scriptpackages/StdSuites/QuickDraw_Graphics_Suite.py
@@ -1,7 +1,7 @@
 """Suite QuickDraw Graphics Suite: A set of basic classes for graphics
 Level 1, version 1
 
-Generated from Moes:Systeemmap:Extensies:AppleScript
+Generated from /Volumes/Sap/System Folder/Extensions/AppleScript
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
@@ -226,7 +226,8 @@ class corner_curve_width(aetools.NProperty):
 	want = 'shor'
 
 rounded_rectangles = rounded_rectangle
-arc._propdict = {
+arc._superclassnames = []
+arc._privpropdict = {
 	'arc_angle' : arc_angle,
 	'bounds' : bounds,
 	'definition_rect' : definition_rect,
@@ -238,9 +239,10 @@ arc._propdict = {
 	'start_angle' : start_angle,
 	'transfer_mode' : transfer_mode,
 }
-arc._elemdict = {
+arc._privelemdict = {
 }
-drawing_area._propdict = {
+drawing_area._superclassnames = []
+drawing_area._privpropdict = {
 	'background_color' : background_color,
 	'background_pattern' : background_pattern,
 	'color_table' : color_table,
@@ -255,63 +257,74 @@ drawing_area._propdict = {
 	'style' : style,
 	'update_on_change' : update_on_change,
 }
-drawing_area._elemdict = {
+drawing_area._privelemdict = {
 }
-graphic_line._propdict = {
+graphic_line._superclassnames = []
+graphic_line._privpropdict = {
 	'start_point' : start_point,
 	'end_point' : end_point,
 	'dash_style' : dash_style,
 	'arrow_style' : arrow_style,
 }
-graphic_line._elemdict = {
+graphic_line._privelemdict = {
 }
-graphic_object._propdict = {
+graphic_object._superclassnames = []
+graphic_object._privpropdict = {
 }
-graphic_object._elemdict = {
+graphic_object._privelemdict = {
 }
-graphic_shape._propdict = {
+graphic_shape._superclassnames = []
+graphic_shape._privpropdict = {
 }
-graphic_shape._elemdict = {
+graphic_shape._privelemdict = {
 }
-graphic_text._propdict = {
+graphic_text._superclassnames = []
+graphic_text._privpropdict = {
 	'color' : color,
 	'font' : font,
 	'size' : size,
 	'uniform_styles' : uniform_styles,
 }
-graphic_text._elemdict = {
+graphic_text._privelemdict = {
 }
-graphic_group._propdict = {
+graphic_group._superclassnames = []
+graphic_group._privpropdict = {
 }
-graphic_group._elemdict = {
+graphic_group._privelemdict = {
 }
-oval._propdict = {
+oval._superclassnames = []
+oval._privpropdict = {
 }
-oval._elemdict = {
+oval._privelemdict = {
 }
-pixel._propdict = {
+pixel._superclassnames = []
+pixel._privpropdict = {
 	'color' : color,
 }
-pixel._elemdict = {
+pixel._privelemdict = {
 }
-pixel_map._propdict = {
+pixel_map._superclassnames = []
+pixel_map._privpropdict = {
 }
-pixel_map._elemdict = {
+pixel_map._privelemdict = {
 }
-polygon._propdict = {
+polygon._superclassnames = []
+polygon._privpropdict = {
 	'point_list' : point_list,
 }
-polygon._elemdict = {
+polygon._privelemdict = {
 }
-rectangle._propdict = {
+rectangle._superclassnames = []
+rectangle._privpropdict = {
 }
-rectangle._elemdict = {
+rectangle._privelemdict = {
 }
-rounded_rectangle._propdict = {
+rounded_rectangle._superclassnames = []
+rounded_rectangle._privpropdict = {
 	'corner_curve_height' : corner_curve_height,
 	'corner_curve_width' : corner_curve_width,
 }
-rounded_rectangle._elemdict = {
+rounded_rectangle._privelemdict = {
 }
 _Enum_tran = {
 	'copy_pixels' : 'cpy ',	# 
diff --git a/Mac/Lib/lib-scriptpackages/StdSuites/QuickDraw_Graphics_Suppleme.py b/Mac/Lib/lib-scriptpackages/StdSuites/QuickDraw_Graphics_Suppleme.py
index 74ef6da..b640cdc 100644
--- a/Mac/Lib/lib-scriptpackages/StdSuites/QuickDraw_Graphics_Suppleme.py
+++ b/Mac/Lib/lib-scriptpackages/StdSuites/QuickDraw_Graphics_Suppleme.py
@@ -1,7 +1,7 @@
 """Suite QuickDraw Graphics Supplemental Suite: Defines transformations of graphic objects
 Level 1, version 1
 
-Generated from Moes:Systeemmap:Extensies:AppleScript
+Generated from /Volumes/Sap/System Folder/Extensions/AppleScript
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
@@ -38,16 +38,18 @@ class graphic_group(aetools.ComponentItem):
 	want = 'cpic'
 
 graphic_groups = graphic_group
-drawing_area._propdict = {
+drawing_area._superclassnames = []
+drawing_area._privpropdict = {
 	'rotation' : rotation,
 	'scale' : scale,
 	'translation' : translation,
 }
-drawing_area._elemdict = {
+drawing_area._privelemdict = {
 }
-graphic_group._propdict = {
+graphic_group._superclassnames = []
+graphic_group._privpropdict = {
 }
-graphic_group._elemdict = {
+graphic_group._privelemdict = {
 }
 
 #
diff --git a/Mac/Lib/lib-scriptpackages/StdSuites/Required_Suite.py b/Mac/Lib/lib-scriptpackages/StdSuites/Required_Suite.py
index cb84ffe..be26c92 100644
--- a/Mac/Lib/lib-scriptpackages/StdSuites/Required_Suite.py
+++ b/Mac/Lib/lib-scriptpackages/StdSuites/Required_Suite.py
@@ -1,7 +1,7 @@
 """Suite Required Suite: Every application supports open, print, run, and quit
 Level 1, version 1
 
-Generated from Moes:Systeemmap:Extensies:AppleScript
+Generated from /Volumes/Sap/System Folder/Extensions/AppleScript
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
diff --git a/Mac/Lib/lib-scriptpackages/StdSuites/Standard_Suite.py b/Mac/Lib/lib-scriptpackages/StdSuites/Standard_Suite.py
index 652824c..444a0f0 100644
--- a/Mac/Lib/lib-scriptpackages/StdSuites/Standard_Suite.py
+++ b/Mac/Lib/lib-scriptpackages/StdSuites/Standard_Suite.py
@@ -1,7 +1,7 @@
 """Suite Standard Suite: Common terms for most applications
 Level 1, version 1
 
-Generated from Moes:Systeemmap:Extensies:AppleScript
+Generated from /Volumes/Sap/System Folder/Extensions/AppleScript
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
@@ -71,7 +71,7 @@ class Standard_Suite_Events(builtin_Suite_Events):
 		if _arguments.has_key('----'):
 			return _arguments['----']
 
-	def _print(self, _object, _attributes={}, **_arguments):
+	def print_(self, _object, _attributes={}, **_arguments):
 		"""print: Print the specified object(s)
 		Required argument: list of objects to print
 		Keyword argument _attributes: AppleEvent attribute dictionary
@@ -297,14 +297,14 @@ class Standard_Suite_Events(builtin_Suite_Events):
 			return _arguments['----']
 
 	_argmap_save = {
-		'_in' : 'kfil',
+		'in_' : 'kfil',
 		'as' : 'fltp',
 	}
 
 	def save(self, _object, _attributes={}, **_arguments):
 		"""save: Save an object
 		Required argument: the object to save, usually a document or window
-		Keyword argument _in: the file in which to save the object
+		Keyword argument in_: the file in which to save the object
 		Keyword argument as: the file type of the document in which to save the data
 		Keyword argument _attributes: AppleEvent attribute dictionary
 		"""
@@ -370,13 +370,13 @@ class Standard_Suite_Events(builtin_Suite_Events):
 			return _arguments['----']
 
 	_argmap_suite_info = {
-		'_in' : 'wrcd',
+		'in_' : 'wrcd',
 	}
 
 	def suite_info(self, _object, _attributes={}, **_arguments):
 		"""suite info: (optional) Get information about event suite(s)
 		Required argument: the suite for which to return information
-		Keyword argument _in: the human language and script system in which to return information
+		Keyword argument in_: the human language and script system in which to return information
 		Keyword argument _attributes: AppleEvent attribute dictionary
 		Returns: a record containing the suites and their versions
 		"""
@@ -396,13 +396,13 @@ class Standard_Suite_Events(builtin_Suite_Events):
 			return _arguments['----']
 
 	_argmap_event_info = {
-		'_in' : 'wrcd',
+		'in_' : 'wrcd',
 	}
 
 	def event_info(self, _object, _attributes={}, **_arguments):
 		"""event info: (optional) Get information about the Apple events in a suite
 		Required argument: the event class of the Apple events for which to return information
-		Keyword argument _in: the human language and script system in which to return information
+		Keyword argument in_: the human language and script system in which to return information
 		Keyword argument _attributes: AppleEvent attribute dictionary
 		Returns: a record containing the events and their parameters
 		"""
@@ -422,15 +422,15 @@ class Standard_Suite_Events(builtin_Suite_Events):
 			return _arguments['----']
 
 	_argmap_class_info = {
-		'_in' : 'wrcd',
+		'in_' : 'wrcd',
 	}
 
 	def class_info(self, _object=None, _attributes={}, **_arguments):
 		"""class info: (optional) Get information about an object class
 		Required argument: the object class about which information is requested
-		Keyword argument _in: the human language and script system in which to return information
+		Keyword argument in_: the human language and script system in which to return information
 		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: a record containing the objectÕs properties and elements
+		Returns: a record containing the object\xd5s properties and elements
 		"""
 		_code = 'core'
 		_subcode = 'qobj'
@@ -460,7 +460,7 @@ class frontmost(aetools.NProperty):
 	which = 'pisf'
 	want = 'bool'
 class selection(aetools.NProperty):
-	"""selection - the selection visible to the user.  Use the •selectÕ command to set a new selection; use •contents of selectionÕ to get or change information in the document. """
+	"""selection - the selection visible to the user.  Use the \xd4select\xd5 command to set a new selection; use \xd4contents of selection\xd5 to get or change information in the document. """
 	which = 'sele'
 	want = 'csel'
 class clipboard(aetools.NProperty):
@@ -501,10 +501,10 @@ class alias(aetools.ComponentItem):
 aliases = alias
 
 class selection_2d_object(aetools.ComponentItem):
-	"""selection-object - A way to refer to the state of the current of the selection.  Use the •selectÕ command to make a new selection. """
+	"""selection-object - A way to refer to the state of the current of the selection.  Use the \xd4select\xd5 command to make a new selection. """
 	want = 'csel'
 class contents(aetools.NProperty):
-	"""contents - the information currently selected.  Use •contents of selectionÕ to get or change information in a document. """
+	"""contents - the information currently selected.  Use \xd4contents of selection\xd5 to get or change information in a document. """
 	which = 'pcnt'
 	want = '****'
 
@@ -559,35 +559,41 @@ class insertion_point(aetools.ComponentItem):
 	want = 'cins'
 
 insertion_points = insertion_point
-application._propdict = {
+application._superclassnames = []
+application._privpropdict = {
 	'name' : name,
 	'frontmost' : frontmost,
 	'selection' : selection,
 	'clipboard' : clipboard,
 	'version' : version,
 }
-application._elemdict = {
+application._privelemdict = {
 }
-document._propdict = {
+document._superclassnames = []
+document._privpropdict = {
 	'modified' : modified,
 }
-document._elemdict = {
+document._privelemdict = {
 }
-file._propdict = {
+file._superclassnames = []
+file._privpropdict = {
 	'stationery' : stationery,
 }
-file._elemdict = {
+file._privelemdict = {
 }
-alias._propdict = {
+alias._superclassnames = []
+alias._privpropdict = {
 }
-alias._elemdict = {
+alias._privelemdict = {
 }
-selection_2d_object._propdict = {
+selection_2d_object._superclassnames = []
+selection_2d_object._privpropdict = {
 	'contents' : contents,
 }
-selection_2d_object._elemdict = {
+selection_2d_object._privelemdict = {
 }
-window._propdict = {
+window._superclassnames = []
+window._privpropdict = {
 	'bounds' : bounds,
 	'closeable' : closeable,
 	'titled' : titled,
@@ -599,11 +605,12 @@ window._propdict = {
 	'zoomed' : zoomed,
 	'visible' : visible,
 }
-window._elemdict = {
+window._privelemdict = {
 }
-insertion_point._propdict = {
+insertion_point._superclassnames = []
+insertion_point._privpropdict = {
 }
-insertion_point._elemdict = {
+insertion_point._privelemdict = {
 }
 class starts_with(aetools.NComparison):
 	"""starts with - Starts with """
@@ -616,11 +623,11 @@ class _3d_(aetools.NComparison):
 class _3e_(aetools.NComparison):
 	"""> - Greater than """
 class _b3_(aetools.NComparison):
-	"""³ - Greater than or equal to """
+	"""\xb3 - Greater than or equal to """
 class _3c_(aetools.NComparison):
 	"""< - Less than """
 class _b2_(aetools.NComparison):
-	"""² - Less than or equal to """
+	"""\xb2 - Less than or equal to """
 _Enum_savo = {
 	'yes' : 'yes ',	# Save objects now
 	'no' : 'no  ',	# Do not save objects
diff --git a/Mac/Lib/lib-scriptpackages/StdSuites/Table_Suite.py b/Mac/Lib/lib-scriptpackages/StdSuites/Table_Suite.py
index db3bca3..cfeee32 100644
--- a/Mac/Lib/lib-scriptpackages/StdSuites/Table_Suite.py
+++ b/Mac/Lib/lib-scriptpackages/StdSuites/Table_Suite.py
@@ -1,7 +1,7 @@
 """Suite Table Suite: Classes for manipulating tables
 Level 1, version 1
 
-Generated from Moes:Systeemmap:Extensies:AppleScript
+Generated from /Volumes/Sap/System Folder/Extensions/AppleScript
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
@@ -50,27 +50,31 @@ class table(aetools.ComponentItem):
 	want = 'ctbl'
 
 tables = table
-cell._propdict = {
+cell._superclassnames = []
+cell._privpropdict = {
 	'formula' : formula,
 	'protection' : protection,
 }
-cell._elemdict = {
+cell._privelemdict = {
 }
-column._propdict = {
+column._superclassnames = []
+column._privpropdict = {
 	'name' : name,
 }
-column._elemdict = {
+column._privelemdict = {
 }
-row._propdict = {
+row._superclassnames = []
+row._privpropdict = {
 }
-row._elemdict = {
+row._privelemdict = {
 }
-table._propdict = {
+table._superclassnames = []
+table._privpropdict = {
 }
-table._elemdict = {
+table._privelemdict = {
 }
 _Enum_prtn = {
-	'read_only' : 'nmod',	# CanÕt change values or formulas
+	'read_only' : 'nmod',	# Can\xd5t change values or formulas
 	'formulas_protected' : 'fpro',	# Can changes values but not formulas
 	'read_2f_write' : 'modf',	# Can change values and formulas
 }
diff --git a/Mac/Lib/lib-scriptpackages/StdSuites/Text_Suite.py b/Mac/Lib/lib-scriptpackages/StdSuites/Text_Suite.py
index 997adc8..9b7f5d5 100644
--- a/Mac/Lib/lib-scriptpackages/StdSuites/Text_Suite.py
+++ b/Mac/Lib/lib-scriptpackages/StdSuites/Text_Suite.py
@@ -1,7 +1,7 @@
 """Suite Text Suite: A set of basic classes for text processing
 Level 1, version 1
 
-Generated from Moes:Systeemmap:Extensies:AppleScript
+Generated from /Volumes/Sap/System Folder/Extensions/AppleScript
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
@@ -73,7 +73,7 @@ class uniform_styles(aetools.NProperty):
 #        element 'cwor' as ['indx']
 
 class text_flow(aetools.ComponentItem):
-	"""text flow - A contiguous block of text.  Page layout applications call this a •story.Õ """
+	"""text flow - A contiguous block of text.  Page layout applications call this a \xd4story.\xd5 """
 	want = 'cflo'
 class name(aetools.NProperty):
 	"""name - the name """
@@ -101,23 +101,27 @@ class word(aetools.ComponentItem):
 	want = 'cwor'
 
 words = word
-character._propdict = {
+character._superclassnames = ['text']
+character._privpropdict = {
 	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
 }
-character._elemdict = {
+character._privelemdict = {
 }
-line._propdict = {
+line._superclassnames = ['text']
+line._privpropdict = {
 	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
 	'justification' : justification,
 }
-line._elemdict = {
+line._privelemdict = {
 }
-paragraph._propdict = {
+paragraph._superclassnames = ['text']
+paragraph._privpropdict = {
 	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
 }
-paragraph._elemdict = {
+paragraph._privelemdict = {
 }
-text._propdict = {
+text._superclassnames = []
+text._privpropdict = {
 	'color' : color,
 	'font' : font,
 	'size' : size,
@@ -125,29 +129,32 @@ text._propdict = {
 	'style' : style,
 	'uniform_styles' : uniform_styles,
 }
-text._elemdict = {
+text._privelemdict = {
 	'character' : character,
 	'line' : line,
 	'paragraph' : paragraph,
 	'text' : text,
 	'word' : word,
 }
-text_flow._propdict = {
+text_flow._superclassnames = ['text']
+text_flow._privpropdict = {
 	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
 	'name' : name,
 }
-text_flow._elemdict = {
+text_flow._privelemdict = {
 }
-text_style_info._propdict = {
+text_style_info._superclassnames = []
+text_style_info._privpropdict = {
 	'on_styles' : on_styles,
 	'off_styles' : off_styles,
 }
-text_style_info._elemdict = {
+text_style_info._privelemdict = {
 }
-word._propdict = {
+word._superclassnames = ['text']
+word._privpropdict = {
 	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
 }
-word._elemdict = {
+word._privelemdict = {
 }
 _Enum_just = {
 	'left' : 'left',	# Align with left margin
diff --git a/Mac/Lib/lib-scriptpackages/StdSuites/Type_Names_Suite.py b/Mac/Lib/lib-scriptpackages/StdSuites/Type_Names_Suite.py
index 54f5f75..939c6ee 100644
--- a/Mac/Lib/lib-scriptpackages/StdSuites/Type_Names_Suite.py
+++ b/Mac/Lib/lib-scriptpackages/StdSuites/Type_Names_Suite.py
@@ -1,7 +1,7 @@
 """Suite Type Names Suite: Terminology for Registry data types
 Level 1, version 1
 
-Generated from Moes:Systeemmap:Extensies:AppleScript
+Generated from /Volumes/Sap/System Folder/Extensions/AppleScript
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
@@ -178,169 +178,210 @@ class type_suite_info(aetools.ComponentItem):
 class target_id(aetools.ComponentItem):
 	"""target id -  """
 	want = 'targ'
-type_class_info._propdict = {
+type_class_info._superclassnames = []
+type_class_info._privpropdict = {
 }
-type_class_info._elemdict = {
+type_class_info._privelemdict = {
 }
-type_event_info._propdict = {
+type_event_info._superclassnames = []
+type_event_info._privpropdict = {
 }
-type_event_info._elemdict = {
+type_event_info._privelemdict = {
 }
-plain_text._propdict = {
+plain_text._superclassnames = []
+plain_text._privpropdict = {
 }
-plain_text._elemdict = {
+plain_text._privelemdict = {
 }
-plain_text._propdict = {
+plain_text._superclassnames = []
+plain_text._privpropdict = {
 }
-plain_text._elemdict = {
+plain_text._privelemdict = {
 }
-bounding_rectangle._propdict = {
+bounding_rectangle._superclassnames = []
+bounding_rectangle._privpropdict = {
 }
-bounding_rectangle._elemdict = {
+bounding_rectangle._privelemdict = {
 }
-point._propdict = {
+point._superclassnames = []
+point._privpropdict = {
 }
-point._elemdict = {
+point._privelemdict = {
 }
-fixed._propdict = {
+fixed._superclassnames = []
+fixed._privpropdict = {
 }
-fixed._elemdict = {
+fixed._privelemdict = {
 }
-location_reference._propdict = {
+location_reference._superclassnames = []
+location_reference._privpropdict = {
 }
-location_reference._elemdict = {
+location_reference._privelemdict = {
 }
-application_dictionary._propdict = {
+application_dictionary._superclassnames = []
+application_dictionary._privpropdict = {
 }
-application_dictionary._elemdict = {
+application_dictionary._privelemdict = {
 }
-color_table._propdict = {
+color_table._superclassnames = []
+color_table._privpropdict = {
 }
-color_table._elemdict = {
+color_table._privelemdict = {
 }
-dash_style._propdict = {
+dash_style._superclassnames = []
+dash_style._privpropdict = {
 }
-dash_style._elemdict = {
+dash_style._privelemdict = {
 }
-double_integer._propdict = {
+double_integer._superclassnames = []
+double_integer._privpropdict = {
 }
-double_integer._elemdict = {
+double_integer._privelemdict = {
 }
-extended_real._propdict = {
+extended_real._superclassnames = []
+extended_real._privpropdict = {
 }
-extended_real._elemdict = {
+extended_real._privelemdict = {
 }
-fixed_point._propdict = {
+fixed_point._superclassnames = []
+fixed_point._privpropdict = {
 }
-fixed_point._elemdict = {
+fixed_point._privelemdict = {
 }
-fixed_rectangle._propdict = {
+fixed_rectangle._superclassnames = []
+fixed_rectangle._privpropdict = {
 }
-fixed_rectangle._elemdict = {
+fixed_rectangle._privelemdict = {
 }
-long_fixed._propdict = {
+long_fixed._superclassnames = []
+long_fixed._privpropdict = {
 }
-long_fixed._elemdict = {
+long_fixed._privelemdict = {
 }
-long_fixed_point._propdict = {
+long_fixed_point._superclassnames = []
+long_fixed_point._privpropdict = {
 }
-long_fixed_point._elemdict = {
+long_fixed_point._privelemdict = {
 }
-long_fixed_rectangle._propdict = {
+long_fixed_rectangle._superclassnames = []
+long_fixed_rectangle._privpropdict = {
 }
-long_fixed_rectangle._elemdict = {
+long_fixed_rectangle._privelemdict = {
 }
-long_point._propdict = {
+long_point._superclassnames = []
+long_point._privpropdict = {
 }
-long_point._elemdict = {
+long_point._privelemdict = {
 }
-long_rectangle._propdict = {
+long_rectangle._superclassnames = []
+long_rectangle._privpropdict = {
 }
-long_rectangle._elemdict = {
+long_rectangle._privelemdict = {
 }
-machine_location._propdict = {
+machine_location._superclassnames = []
+machine_location._privpropdict = {
 }
-machine_location._elemdict = {
+machine_location._privelemdict = {
 }
-menu._propdict = {
+menu._superclassnames = []
+menu._privpropdict = {
 }
-menu._elemdict = {
+menu._privelemdict = {
 }
-menu_item._propdict = {
+menu_item._superclassnames = []
+menu_item._privpropdict = {
 }
-menu_item._elemdict = {
+menu_item._privelemdict = {
 }
-null._propdict = {
+null._superclassnames = []
+null._privpropdict = {
 }
-null._elemdict = {
+null._privelemdict = {
 }
-pixel_map_record._propdict = {
+pixel_map_record._superclassnames = []
+pixel_map_record._privpropdict = {
 }
-pixel_map_record._elemdict = {
+pixel_map_record._privelemdict = {
 }
-PostScript_picture._propdict = {
+PostScript_picture._superclassnames = []
+PostScript_picture._privpropdict = {
 }
-PostScript_picture._elemdict = {
+PostScript_picture._privelemdict = {
 }
-RGB16_color._propdict = {
+RGB16_color._superclassnames = []
+RGB16_color._privpropdict = {
 }
-RGB16_color._elemdict = {
+RGB16_color._privelemdict = {
 }
-RGB96_color._propdict = {
+RGB96_color._superclassnames = []
+RGB96_color._privpropdict = {
 }
-RGB96_color._elemdict = {
+RGB96_color._privelemdict = {
 }
-small_integer._propdict = {
+small_integer._superclassnames = []
+small_integer._privpropdict = {
 }
-small_integer._elemdict = {
+small_integer._privelemdict = {
 }
-small_real._propdict = {
+small_real._superclassnames = []
+small_real._privpropdict = {
 }
-small_real._elemdict = {
+small_real._privelemdict = {
 }
-system_dictionary._propdict = {
+system_dictionary._superclassnames = []
+system_dictionary._privpropdict = {
 }
-system_dictionary._elemdict = {
+system_dictionary._privelemdict = {
 }
-rotation._propdict = {
+rotation._superclassnames = []
+rotation._privpropdict = {
 }
-rotation._elemdict = {
+rotation._privelemdict = {
 }
-scrap_styles._propdict = {
+scrap_styles._superclassnames = []
+scrap_styles._privpropdict = {
 }
-scrap_styles._elemdict = {
+scrap_styles._privelemdict = {
 }
-TIFF_picture._propdict = {
+TIFF_picture._superclassnames = []
+TIFF_picture._privpropdict = {
 }
-TIFF_picture._elemdict = {
+TIFF_picture._privelemdict = {
 }
-version._propdict = {
+version._superclassnames = []
+version._privpropdict = {
 }
-version._elemdict = {
+version._privelemdict = {
 }
-unsigned_integer._propdict = {
+unsigned_integer._superclassnames = []
+unsigned_integer._privpropdict = {
 }
-unsigned_integer._elemdict = {
+unsigned_integer._privelemdict = {
 }
-type_property_info._propdict = {
+type_property_info._superclassnames = []
+type_property_info._privpropdict = {
 }
-type_property_info._elemdict = {
+type_property_info._privelemdict = {
 }
-type_element_info._propdict = {
+type_element_info._superclassnames = []
+type_element_info._privpropdict = {
 }
-type_element_info._elemdict = {
+type_element_info._privelemdict = {
 }
-type_parameter_info._propdict = {
+type_parameter_info._superclassnames = []
+type_parameter_info._privpropdict = {
 }
-type_parameter_info._elemdict = {
+type_parameter_info._privelemdict = {
 }
-type_suite_info._propdict = {
+type_suite_info._superclassnames = []
+type_suite_info._privpropdict = {
 }
-type_suite_info._elemdict = {
+type_suite_info._privelemdict = {
 }
-target_id._propdict = {
+target_id._superclassnames = []
+target_id._privpropdict = {
 }
-target_id._elemdict = {
+target_id._privelemdict = {
 }
 
 #
diff --git a/Mac/Lib/lib-scriptpackages/StdSuites/__init__.py b/Mac/Lib/lib-scriptpackages/StdSuites/__init__.py
index ac21829..09667f8 100644
--- a/Mac/Lib/lib-scriptpackages/StdSuites/__init__.py
+++ b/Mac/Lib/lib-scriptpackages/StdSuites/__init__.py
@@ -1,5 +1,5 @@
 """
-Package generated from Moes:Systeemmap:Extensies:AppleScript
+Package generated from /Volumes/Sap/System Folder/Extensions/AppleScript
 Resource aeut resid 0 Standard Event Suites for English
 """
 import aetools
@@ -50,6 +50,407 @@ from QuickDraw_Graphics_Suppleme import *
 from Table_Suite import *
 from Macintosh_Connectivity_Clas import *
 from Type_Names_Suite import *
+def getbaseclasses(v):
+	if hasattr(v, '_superclassnames') and not hasattr(v, '_propdict'):
+		v._propdict = {}
+		v._elemdict = {}
+		for superclass in v._superclassnames:
+			v._propdict.update(getattr(eval(superclass), '_privpropdict', {}))
+			v._elemdict.update(getattr(eval(superclass), '_privelemdict', {}))
+		v._propdict.update(v._privpropdict)
+		v._elemdict.update(v._privelemdict)
+
+import StdSuites
+
+#
+# Set property and element dictionaries now that all classes have been defined
+#
+getbaseclasses(July)
+getbaseclasses(May)
+getbaseclasses(string)
+getbaseclasses(cubic_metres)
+getbaseclasses(styled_text)
+getbaseclasses(number_2c__date_or_text)
+getbaseclasses(feet)
+getbaseclasses(February)
+getbaseclasses(number)
+getbaseclasses(miles)
+getbaseclasses(keystroke)
+getbaseclasses(writing_code)
+getbaseclasses(degrees_Fahrenheit)
+getbaseclasses(list_2c__record_or_text)
+getbaseclasses(date)
+getbaseclasses(litres)
+getbaseclasses(number_or_date)
+getbaseclasses(centimetres)
+getbaseclasses(event)
+getbaseclasses(Pascal_string)
+getbaseclasses(zone)
+getbaseclasses(picture)
+getbaseclasses(list_or_string)
+getbaseclasses(integer)
+getbaseclasses(alias_or_string)
+getbaseclasses(writing_code_info)
+getbaseclasses(text_item)
+getbaseclasses(machine)
+getbaseclasses(type_class)
+getbaseclasses(preposition)
+getbaseclasses(Tuesday)
+getbaseclasses(upper_case)
+getbaseclasses(version)
+getbaseclasses(Wednesday)
+getbaseclasses(December)
+getbaseclasses(square_kilometres)
+getbaseclasses(reference)
+getbaseclasses(vector)
+getbaseclasses(weekday)
+getbaseclasses(RGB_color)
+getbaseclasses(Sunday)
+getbaseclasses(international_text)
+getbaseclasses(seconds)
+getbaseclasses(March)
+getbaseclasses(kilometres)
+getbaseclasses(square_feet)
+getbaseclasses(list)
+getbaseclasses(real)
+getbaseclasses(November)
+getbaseclasses(quarts)
+getbaseclasses(degrees_Celsius)
+getbaseclasses(missing_value)
+getbaseclasses(alias)
+getbaseclasses(January)
+getbaseclasses(metres)
+getbaseclasses(month)
+getbaseclasses(number_or_string)
+getbaseclasses(June)
+getbaseclasses(August)
+getbaseclasses(linked_list)
+getbaseclasses(styled_Clipboard_text)
+getbaseclasses(encoded_string)
+getbaseclasses(gallons)
+getbaseclasses(cubic_inches)
+getbaseclasses(Friday)
+getbaseclasses(styled_Unicode_text)
+getbaseclasses(list_or_record)
+getbaseclasses(degrees_Kelvin)
+getbaseclasses(Monday)
+getbaseclasses(sound)
+getbaseclasses(class_)
+getbaseclasses(kilograms)
+getbaseclasses(script)
+getbaseclasses(anything)
+getbaseclasses(property)
+getbaseclasses(record)
+getbaseclasses(boolean)
+getbaseclasses(October)
+getbaseclasses(square_metres)
+getbaseclasses(inches)
+getbaseclasses(reference_form)
+getbaseclasses(item)
+getbaseclasses(grams)
+getbaseclasses(character)
+getbaseclasses(April)
+getbaseclasses(empty_ae_name_)
+getbaseclasses(app)
+getbaseclasses(constant)
+getbaseclasses(handler)
+getbaseclasses(square_miles)
+getbaseclasses(data)
+getbaseclasses(C_string)
+getbaseclasses(Unicode_text)
+getbaseclasses(Thursday)
+getbaseclasses(square_yards)
+getbaseclasses(yards)
+getbaseclasses(cubic_yards)
+getbaseclasses(ounces)
+getbaseclasses(pounds)
+getbaseclasses(cubic_feet)
+getbaseclasses(cubic_centimetres)
+getbaseclasses(Saturday)
+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(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(small_integer)
+getbaseclasses(RGB16_color)
+getbaseclasses(version)
+getbaseclasses(system_dictionary)
+getbaseclasses(color_table)
+getbaseclasses(fixed_point)
+getbaseclasses(plain_text)
+getbaseclasses(type_element_info)
+getbaseclasses(location_reference)
+getbaseclasses(machine_location)
+getbaseclasses(PostScript_picture)
+getbaseclasses(point)
+getbaseclasses(menu_item)
+getbaseclasses(pixel_map_record)
+getbaseclasses(application_dictionary)
+getbaseclasses(unsigned_integer)
+getbaseclasses(menu)
+getbaseclasses(fixed_rectangle)
+getbaseclasses(long_fixed_rectangle)
+getbaseclasses(type_event_info)
+getbaseclasses(small_real)
+getbaseclasses(type_suite_info)
+getbaseclasses(rotation)
+getbaseclasses(type_parameter_info)
+getbaseclasses(fixed)
+getbaseclasses(scrap_styles)
+getbaseclasses(long_point)
+getbaseclasses(type_class_info)
+getbaseclasses(TIFF_picture)
+getbaseclasses(RGB96_color)
+getbaseclasses(dash_style)
+getbaseclasses(extended_real)
+getbaseclasses(type_property_info)
+getbaseclasses(long_fixed_point)
+getbaseclasses(long_rectangle)
+getbaseclasses(bounding_rectangle)
+getbaseclasses(double_integer)
+getbaseclasses(long_fixed)
+getbaseclasses(null)
+getbaseclasses(target_id)
+
+#
+# Indices of types declared in this module
+#
+_classdeclarations = {
+	'jul ' : July,
+	'may ' : May,
+	'TEXT' : string,
+	'cmet' : cubic_metres,
+	'STXT' : styled_text,
+	'nds ' : number_2c__date_or_text,
+	'feet' : feet,
+	'feb ' : February,
+	'nmbr' : number,
+	'mile' : miles,
+	'kprs' : keystroke,
+	'psct' : writing_code,
+	'degf' : degrees_Fahrenheit,
+	'lrs ' : list_2c__record_or_text,
+	'ldt ' : date,
+	'litr' : litres,
+	'nd  ' : number_or_date,
+	'cmtr' : centimetres,
+	'evnt' : event,
+	'pstr' : Pascal_string,
+	'zone' : zone,
+	'PICT' : picture,
+	'ls  ' : list_or_string,
+	'long' : integer,
+	'sf  ' : alias_or_string,
+	'citl' : writing_code_info,
+	'citm' : text_item,
+	'mach' : machine,
+	'type' : type_class,
+	'prep' : preposition,
+	'tue ' : Tuesday,
+	'case' : upper_case,
+	'vers' : version,
+	'wed ' : Wednesday,
+	'dec ' : December,
+	'sqkm' : square_kilometres,
+	'obj ' : reference,
+	'vect' : vector,
+	'wkdy' : weekday,
+	'cRGB' : RGB_color,
+	'sun ' : Sunday,
+	'itxt' : international_text,
+	'scnd' : seconds,
+	'mar ' : March,
+	'kmtr' : kilometres,
+	'sqft' : square_feet,
+	'list' : list,
+	'doub' : real,
+	'nov ' : November,
+	'qrts' : quarts,
+	'degc' : degrees_Celsius,
+	'msng' : missing_value,
+	'alis' : alias,
+	'jan ' : January,
+	'metr' : metres,
+	'mnth' : month,
+	'ns  ' : number_or_string,
+	'jun ' : June,
+	'aug ' : August,
+	'llst' : linked_list,
+	'styl' : styled_Clipboard_text,
+	'encs' : encoded_string,
+	'galn' : gallons,
+	'cuin' : cubic_inches,
+	'fri ' : Friday,
+	'sutx' : styled_Unicode_text,
+	'lr  ' : list_or_record,
+	'degk' : degrees_Kelvin,
+	'mon ' : Monday,
+	'snd ' : sound,
+	'pcls' : class_,
+	'kgrm' : kilograms,
+	'scpt' : script,
+	'****' : anything,
+	'prop' : property,
+	'reco' : record,
+	'bool' : boolean,
+	'oct ' : October,
+	'sqrm' : square_metres,
+	'inch' : inches,
+	'kfrm' : reference_form,
+	'cobj' : item,
+	'gram' : grams,
+	'cha ' : character,
+	'apr ' : April,
+	'undf' : empty_ae_name_,
+	'capp' : app,
+	'enum' : constant,
+	'hand' : handler,
+	'sqmi' : square_miles,
+	'rdat' : data,
+	'cstr' : C_string,
+	'utxt' : Unicode_text,
+	'thu ' : Thursday,
+	'sqyd' : square_yards,
+	'yard' : yards,
+	'cyrd' : cubic_yards,
+	'ozs ' : ounces,
+	'lbs ' : pounds,
+	'cfet' : cubic_feet,
+	'ccmt' : cubic_centimetres,
+	'sat ' : Saturday,
+	'sep ' : September,
+	'fss ' : file_specification,
+	'ctxt' : text,
+	'cwin' : window,
+	'file' : file,
+	'csel' : selection_2d_object,
+	'alis' : alias,
+	'capp' : application,
+	'cins' : insertion_point,
+	'docu' : document,
+	'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,
+	'shor' : small_integer,
+	'tr16' : RGB16_color,
+	'vers' : version,
+	'aeut' : system_dictionary,
+	'clrt' : color_table,
+	'fpnt' : fixed_point,
+	'TEXT' : plain_text,
+	'elin' : type_element_info,
+	'insl' : location_reference,
+	'mLoc' : machine_location,
+	'EPS ' : PostScript_picture,
+	'QDpt' : point,
+	'cmen' : menu_item,
+	'tpmm' : pixel_map_record,
+	'aete' : application_dictionary,
+	'magn' : unsigned_integer,
+	'cmnu' : menu,
+	'frct' : fixed_rectangle,
+	'lfrc' : long_fixed_rectangle,
+	'evin' : type_event_info,
+	'sing' : small_real,
+	'suin' : type_suite_info,
+	'trot' : rotation,
+	'pmin' : type_parameter_info,
+	'fixd' : fixed,
+	'styl' : scrap_styles,
+	'lpnt' : long_point,
+	'gcli' : type_class_info,
+	'TIFF' : TIFF_picture,
+	'tr96' : RGB96_color,
+	'tdas' : dash_style,
+	'exte' : extended_real,
+	'pinf' : type_property_info,
+	'lfpt' : long_fixed_point,
+	'lrct' : long_rectangle,
+	'qdrt' : bounding_rectangle,
+	'comp' : double_integer,
+	'lfxd' : long_fixed,
+	'null' : null,
+	'targ' : target_id,
+}
 
 
 class StdSuites(AppleScript_Suite_Events,
@@ -64,3 +465,5 @@ class StdSuites(AppleScript_Suite_Events,
 		aetools.TalkTo):
 	_signature = 'ascr'
 
+	_moduleName = 'StdSuites'
+