diff --git a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/CodeWarrior_suite.py b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/CodeWarrior_suite.py
index d8c420a..c14037b 100644
--- a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/CodeWarrior_suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/CodeWarrior_suite.py
@@ -328,14 +328,14 @@
 class subtarget(aetools.ComponentItem):
 	"""subtarget - a target that is prerequisite for another target """
 	want = 'SBTG'
-class target(aetools.NProperty):
-	"""target - the target that is dependent on this subtarget """
-	which = 'TrgT'
-	want = 'TRGT'
 class link_against_output(aetools.NProperty):
 	"""link against output - is the output of this subtarget linked into its dependent target? """
 	which = 'LNKO'
 	want = 'bool'
+class target(aetools.NProperty):
+	"""target - the target that is dependent on this subtarget """
+	which = 'TrgT'
+	want = 'TRGT'
 
 subtargets = subtarget
 
@@ -356,48 +356,20 @@
 	"""project document - the project document that contains this target """
 	which = 'PrjD'
 	want = 'PRJD'
-#        element 'SRCF' as ['indx', 'test', 'rang']
 #        element 'SBTG' as ['indx', 'test', 'rang']
+#        element 'SRCF' as ['indx', 'test', 'rang']
 
 class target_file(aetools.ComponentItem):
 	"""target file - a source or header file in a target """
 	want = 'SRCF'
-class id(aetools.NProperty):
-	"""id - the unique ID number of the target file """
-	which = 'ID  '
-	want = 'long'
-class type(aetools.NProperty):
-	"""type - the type of source file """
-	which = 'FTYP'
-	want = 'FTYP'
-class location(aetools.NProperty):
-	"""location - the location of the target file on disk """
-	which = 'FILE'
-	want = 'fss '
-class path(aetools.NProperty):
-	"""path - the path of the source file on disk """
-	which = 'Path'
-	want = 'itxt'
-class linked(aetools.NProperty):
-	"""linked - is the source file in the link order of its target? """
-	which = 'LINK'
-	want = 'bool'
-class link_index(aetools.NProperty):
-	"""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):
-	"""modified date - the date and time this source file was last modified """
-	which = 'MODD'
-	want = 'ldt '
-class compiled_date(aetools.NProperty):
-	"""compiled date - the date and this source file was last compiled """
-	which = 'CMPD'
-	want = 'ldt '
 class code_size(aetools.NProperty):
 	"""code size - the size of the code (in bytes) produced by compiling this source file """
 	which = 'CSZE'
 	want = 'long'
+class compiled_date(aetools.NProperty):
+	"""compiled date - the date and this source file was last compiled """
+	which = 'CMPD'
+	want = 'ldt '
 class data_size(aetools.NProperty):
 	"""data size - the size of the date (in bytes) produced by compiling this source file """
 	which = 'DSZE'
@@ -406,26 +378,54 @@
 	"""debug - is debugging information generated for this source file? """
 	which = 'DBUG'
 	want = 'bool'
-class weak_link(aetools.NProperty):
-	"""weak link - is this shared library linked weakly? """
-	which = 'WEAK'
-	want = 'bool'
-class init_before(aetools.NProperty):
-	"""init before - is the \xd4initialize before\xd5 flag set for this shared library? """
-	which = 'INIT'
-	want = 'bool'
-class merge_output(aetools.NProperty):
-	"""merge output - is this shared library merged into another code fragment? """
-	which = 'MRGE'
-	want = 'bool'
-class prerequisites(aetools.NProperty):
-	"""prerequisites - the source files needed to build this source file """
-	which = 'PRER'
-	want = 'list'
 class dependents(aetools.NProperty):
 	"""dependents - the source files that need this source file in order to build """
 	which = 'DPND'
 	want = 'list'
+class id(aetools.NProperty):
+	"""id - the unique ID number of the target file """
+	which = 'ID  '
+	want = 'long'
+class init_before(aetools.NProperty):
+	"""init before - is the \xd4initialize before\xd5 flag set for this shared library? """
+	which = 'INIT'
+	want = 'bool'
+class link_index(aetools.NProperty):
+	"""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 linked(aetools.NProperty):
+	"""linked - is the source file in the link order of its target? """
+	which = 'LINK'
+	want = 'bool'
+class location(aetools.NProperty):
+	"""location - the location of the target file on disk """
+	which = 'FILE'
+	want = 'fss '
+class merge_output(aetools.NProperty):
+	"""merge output - is this shared library merged into another code fragment? """
+	which = 'MRGE'
+	want = 'bool'
+class modified_date(aetools.NProperty):
+	"""modified date - the date and time this source file was last modified """
+	which = 'MODD'
+	want = 'ldt '
+class path(aetools.NProperty):
+	"""path - the path of the source file on disk """
+	which = 'Path'
+	want = 'itxt'
+class prerequisites(aetools.NProperty):
+	"""prerequisites - the source files needed to build this source file """
+	which = 'PRER'
+	want = 'list'
+class type(aetools.NProperty):
+	"""type - the type of source file """
+	which = 'FTYP'
+	want = 'FTYP'
+class weak_link(aetools.NProperty):
+	"""weak link - is this shared library linked weakly? """
+	which = 'WEAK'
+	want = 'bool'
 
 target_files = target_file
 
@@ -498,8 +498,8 @@
 }
 project_document._superclassnames = ['document']
 project_document._privpropdict = {
-	'inherits' : inherits,
 	'current_target' : current_target,
+	'inherits' : inherits,
 }
 project_document._privelemdict = {
 	'target' : target,
@@ -524,8 +524,8 @@
 subtarget._superclassnames = ['target']
 subtarget._privpropdict = {
 	'inherits' : inherits,
-	'target' : target,
 	'link_against_output' : link_against_output,
+	'target' : target,
 }
 subtarget._privelemdict = {
 }
@@ -541,27 +541,27 @@
 	'project_document' : project_document,
 }
 target._privelemdict = {
-	'target_file' : target_file,
 	'subtarget' : subtarget,
+	'target_file' : target_file,
 }
 target_file._superclassnames = []
 target_file._privpropdict = {
-	'id' : id,
-	'type' : type,
-	'location' : location,
-	'path' : path,
-	'linked' : linked,
-	'link_index' : link_index,
-	'modified_date' : modified_date,
-	'compiled_date' : compiled_date,
 	'code_size' : code_size,
+	'compiled_date' : compiled_date,
 	'data_size' : data_size,
 	'debug' : debug,
-	'weak_link' : weak_link,
-	'init_before' : init_before,
-	'merge_output' : merge_output,
-	'prerequisites' : prerequisites,
 	'dependents' : dependents,
+	'id' : id,
+	'init_before' : init_before,
+	'link_index' : link_index,
+	'linked' : linked,
+	'location' : location,
+	'merge_output' : merge_output,
+	'modified_date' : modified_date,
+	'path' : path,
+	'prerequisites' : prerequisites,
+	'type' : type,
+	'weak_link' : weak_link,
 }
 target_file._privelemdict = {
 }
@@ -624,57 +624,57 @@
 #
 _classdeclarations = {
 	'1BRW' : single_class_browser,
-	'PRJD' : project_document,
-	'SYMB' : symbol_browser,
-	'EDIT' : editor_document,
-	'COMP' : file_compare_document,
-	'TOOL' : ToolServer_worksheet,
-	'SBTG' : subtarget,
-	'MSSG' : message_document,
-	'INSP' : project_inspector,
-	'TXTD' : text_document,
-	'CTLG' : catalog_document,
-	'HIER' : class_hierarchies,
-	'TRGT' : target,
-	'PRGS' : build_progress_document,
-	'SRCF' : target_file,
-	'BROW' : class_browser,
 	'1HIR' : single_class_hierarchies,
+	'BROW' : class_browser,
+	'COMP' : file_compare_document,
+	'CTLG' : catalog_document,
+	'EDIT' : editor_document,
+	'HIER' : class_hierarchies,
+	'INSP' : project_inspector,
+	'MSSG' : message_document,
+	'PRGS' : build_progress_document,
+	'PRJD' : project_document,
+	'SBTG' : subtarget,
+	'SRCF' : target_file,
+	'SYMB' : symbol_browser,
+	'TOOL' : ToolServer_worksheet,
+	'TRGT' : target,
+	'TXTD' : text_document,
 }
 
 _propdeclarations = {
-	'CURT' : current_target,
-	'PrjD' : project_document,
-	'MRGE' : merge_output,
-	'WEAK' : weak_link,
-	'DPND' : dependents,
-	'c@#^' : inherits,
-	'ID  ' : id,
 	'CMPD' : compiled_date,
-	'LIDX' : link_index,
-	'FILE' : location,
-	'Path' : path,
-	'LNKO' : link_against_output,
-	'imod' : modified,
-	'sele' : selection,
-	'DSZE' : data_size,
-	'INIT' : init_before,
-	'MODD' : modified_date,
-	'FTYP' : type,
-	'TrgT' : target,
-	'pnam' : name,
-	'LINK' : linked,
 	'CSZE' : code_size,
+	'CURT' : current_target,
 	'DBUG' : debug,
+	'DPND' : dependents,
+	'DSZE' : data_size,
+	'FILE' : location,
+	'FTYP' : type,
+	'ID  ' : id,
+	'INIT' : init_before,
+	'LIDX' : link_index,
+	'LINK' : linked,
+	'LNKO' : link_against_output,
+	'MODD' : modified_date,
+	'MRGE' : merge_output,
 	'PRER' : prerequisites,
+	'Path' : path,
+	'PrjD' : project_document,
+	'TrgT' : target,
+	'WEAK' : weak_link,
+	'c@#^' : inherits,
+	'imod' : modified,
+	'pnam' : name,
+	'sele' : selection,
 }
 
 _compdeclarations = {
 }
 
 _enumdeclarations = {
-	'Inte' : _Enum_Inte,
 	'DKND' : _Enum_DKND,
 	'FTYP' : _Enum_FTYP,
+	'Inte' : _Enum_Inte,
 	'PERM' : _Enum_PERM,
 }
diff --git a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/Metrowerks_Shell_Suite.py b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/Metrowerks_Shell_Suite.py
index 086990a..648cab7 100644
--- a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/Metrowerks_Shell_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/Metrowerks_Shell_Suite.py
@@ -793,14 +793,6 @@
 class Access_Paths(aetools.ComponentItem):
 	"""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. """
-	which = 'PA01'
-	want = 'PInf'
-class System_Paths(aetools.NProperty):
-	"""System Paths - To add an access path for the include files. (Not supported in Pascal) """
-	which = 'PA03'
-	want = 'PInf'
 class Always_Full_Search(aetools.NProperty):
 	"""Always Full Search - To force the compiler to search for system includes like it searches for user includes. """
 	which = 'PA02'
@@ -813,6 +805,14 @@
 	"""Require Framework Includes - Causes the IDE to only look in the framework access paths if a Mac OS X framework style include (i.e. <Carbon/Carbon.h> ) is used. """
 	which = 'PA05'
 	want = 'bool'
+class System_Paths(aetools.NProperty):
+	"""System Paths - To add an access path for the include files. (Not supported in Pascal) """
+	which = 'PA03'
+	want = 'PInf'
+class User_Paths(aetools.NProperty):
+	"""User Paths - To add an access path for the source files. """
+	which = 'PA01'
+	want = 'PInf'
 
 class Browser_Coloring(aetools.ComponentItem):
 	"""Browser Coloring - Colors for Browser symbols. """
@@ -845,6 +845,10 @@
 	"""Macros Color - The color for macros. """
 	which = 'BW06'
 	want = 'cRGB'
+class Template_Commands_in_Menu(aetools.NProperty):
+	"""Template Commands in Menu - Include template commands in context menus """
+	which = 'BW10'
+	want = 'bool'
 class Templates_Color(aetools.NProperty):
 	"""Templates Color - Set color for templates. """
 	which = 'BW07'
@@ -853,10 +857,6 @@
 	"""Typedefs Color - The color for typedefs. """
 	which = 'BW08'
 	want = 'cRGB'
-class Template_Commands_in_Menu(aetools.NProperty):
-	"""Template Commands in Menu - Include template commands in context menus """
-	which = 'BW10'
-	want = 'bool'
 
 class Build_Extras(aetools.ComponentItem):
 	"""Build Extras -  """
@@ -865,50 +865,50 @@
 	"""Browser Active - Allow the collection of browser information. """
 	which = 'EX09'
 	want = 'bool'
-class Modification_Date_Caching(aetools.NProperty):
-	"""Modification Date Caching -  """
-	which = 'EX04'
+class Cache_Subproject_Data(aetools.NProperty):
+	"""Cache Subproject Data -  """
+	which = 'EX31'
 	want = 'bool'
 class Dump_Browser_Info(aetools.NProperty):
 	"""Dump Browser Info -  """
 	which = 'EX30'
 	want = 'bool'
-class Cache_Subproject_Data(aetools.NProperty):
-	"""Cache Subproject Data -  """
-	which = 'EX31'
+class Modification_Date_Caching(aetools.NProperty):
+	"""Modification Date Caching -  """
+	which = 'EX04'
 	want = 'bool'
 
 class Build_Settings(aetools.ComponentItem):
 	"""Build Settings - Build Settings preferences. """
 	want = 'BSTG'
+class Build_Before_Running(aetools.NProperty):
+	"""Build Before Running - Build the target before running. """
+	which = 'BX04'
+	want = 'BXbr'
+class Compiler_Thread_Stack_Size(aetools.NProperty):
+	"""Compiler Thread Stack Size - Compiler Thread Stack Size """
+	which = 'BX06'
+	want = 'long'
 class Completion_Sound(aetools.NProperty):
 	"""Completion Sound - Play a sound when finished a Bring Up To Date or Make command. """
 	which = 'BX01'
 	want = 'bool'
+class Failure_Sound(aetools.NProperty):
+	"""Failure Sound - The sound CodeWarrior plays when it cannot finish a Bring Up To Date or Make command. """
+	which = 'BX03'
+	want = 'TEXT'
+class Include_Cache_Size(aetools.NProperty):
+	"""Include Cache Size - Include file cache size. """
+	which = 'BX05'
+	want = 'long'
+class Save_Before_Building(aetools.NProperty):
+	"""Save Before Building - Save open editor files before build operations """
+	which = 'BX07'
+	want = 'bool'
 class Success_Sound(aetools.NProperty):
 	"""Success Sound - The sound CodeWarrior plays when it successfully finishes a Bring Up To Date or Make command. """
 	which = 'BX02'
 	want = 'TEXT'
-class Failure_Sound(aetools.NProperty):
-	"""Failure Sound - The sound CodeWarrior plays when it cannot finish a Bring Up To Date or Make command. """
-	which = 'BX03'
-	want = 'TEXT'
-class Save_Before_Building(aetools.NProperty):
-	"""Save Before Building - Save open editor files before build operations """
-	which = 'BX07'
-	want = 'bool'
-class Build_Before_Running(aetools.NProperty):
-	"""Build Before Running - Build the target before running. """
-	which = 'BX04'
-	want = 'BXbr'
-class Include_Cache_Size(aetools.NProperty):
-	"""Include Cache Size - Include file cache size. """
-	which = 'BX05'
-	want = 'long'
-class Compiler_Thread_Stack_Size(aetools.NProperty):
-	"""Compiler Thread Stack Size - Compiler Thread Stack Size """
-	which = 'BX06'
-	want = 'long'
 
 class Custom_Keywords(aetools.ComponentItem):
 	"""Custom Keywords -  """
@@ -933,38 +933,6 @@
 class Debugger_Display(aetools.ComponentItem):
 	"""Debugger Display - Debugger Display preferences """
 	want = 'DbDS'
-class Show_Variable_Types(aetools.NProperty):
-	"""Show Variable Types - Show variable types by default. """
-	which = 'Db01'
-	want = 'bool'
-class Show_Locals(aetools.NProperty):
-	"""Show Locals - Show locals by default """
-	which = 'Db09'
-	want = 'bool'
-class Sort_By_Method(aetools.NProperty):
-	"""Sort By Method - Sort functions by method. """
-	which = 'Db02'
-	want = 'bool'
-class Use_RTTI(aetools.NProperty):
-	"""Use RTTI - Enable RunTime Type Information. """
-	which = 'Db03'
-	want = 'bool'
-class Threads_in_Window(aetools.NProperty):
-	"""Threads in Window - Show threads in separate windows. """
-	which = 'Db04'
-	want = 'bool'
-class Variable_Hints(aetools.NProperty):
-	"""Variable Hints - Show variable hints. """
-	which = 'Db05'
-	want = 'bool'
-class Watchpoint_Hilite(aetools.NProperty):
-	"""Watchpoint Hilite - Watchpoint hilite color. """
-	which = 'Db06'
-	want = 'cRGB'
-class Variable_Changed_Hilite(aetools.NProperty):
-	"""Variable Changed Hilite - Variable changed hilite color. """
-	which = 'Db07'
-	want = 'cRGB'
 class Default_Array_Size(aetools.NProperty):
 	"""Default Array Size - Controls whether CodeWarrior uses its own integrated editor or an external application for editing text files. """
 	which = 'Db08'
@@ -973,14 +941,58 @@
 	"""Show As Decimal - Show variable values as decimal by default """
 	which = 'Db10'
 	want = 'bool'
+class Show_Locals(aetools.NProperty):
+	"""Show Locals - Show locals by default """
+	which = 'Db09'
+	want = 'bool'
+class Show_Variable_Types(aetools.NProperty):
+	"""Show Variable Types - Show variable types by default. """
+	which = 'Db01'
+	want = 'bool'
+class Sort_By_Method(aetools.NProperty):
+	"""Sort By Method - Sort functions by method. """
+	which = 'Db02'
+	want = 'bool'
+class Threads_in_Window(aetools.NProperty):
+	"""Threads in Window - Show threads in separate windows. """
+	which = 'Db04'
+	want = 'bool'
+class Use_RTTI(aetools.NProperty):
+	"""Use RTTI - Enable RunTime Type Information. """
+	which = 'Db03'
+	want = 'bool'
+class Variable_Changed_Hilite(aetools.NProperty):
+	"""Variable Changed Hilite - Variable changed hilite color. """
+	which = 'Db07'
+	want = 'cRGB'
+class Variable_Hints(aetools.NProperty):
+	"""Variable Hints - Show variable hints. """
+	which = 'Db05'
+	want = 'bool'
+class Watchpoint_Hilite(aetools.NProperty):
+	"""Watchpoint Hilite - Watchpoint hilite color. """
+	which = 'Db06'
+	want = 'cRGB'
 
 class Debugger_Global(aetools.ComponentItem):
 	"""Debugger Global - Debugger Global preferences """
 	want = 'DbGL'
+class Auto_Target_Libraries(aetools.NProperty):
+	"""Auto Target Libraries - Automatically target libraries when debugging """
+	which = 'Dg11'
+	want = 'bool'
 class Cache_Edited_Files(aetools.NProperty):
 	"""Cache Edited Files - Cache edit files between debug sessions """
 	which = 'Dg12'
 	want = 'bool'
+class Confirm_Kill(aetools.NProperty):
+	"""Confirm Kill - Confirm the \xd4killing\xd5 of the process. """
+	which = 'Dg04'
+	want = 'bool'
+class Dont_Step_in_Runtime(aetools.NProperty):
+	"""Dont Step in Runtime - Don\xd5t step into runtime code when debugging. """
+	which = 'Dg07'
+	want = 'bool'
 class File_Cache_Duration(aetools.NProperty):
 	"""File Cache Duration - Duration to keep files in cache (in days) """
 	which = 'Dg13'
@@ -989,38 +1001,34 @@
 	"""Ignore Mod Dates - Ignore modification dates of files. """
 	which = 'Dg01'
 	want = 'bool'
-class Open_All_Classes(aetools.NProperty):
-	"""Open All Classes - Open all Java class files. """
-	which = 'Dg02'
-	want = 'bool'
 class Launch_Apps_on_Open(aetools.NProperty):
 	"""Launch Apps on Open - Launch applications on the opening of sym files. """
 	which = 'Dg03'
 	want = 'bool'
-class Confirm_Kill(aetools.NProperty):
-	"""Confirm Kill - Confirm the \xd4killing\xd5 of the process. """
-	which = 'Dg04'
-	want = 'bool'
-class Stop_at_Main(aetools.NProperty):
-	"""Stop at Main - Stop to debug on the main() function. """
-	which = 'Dg05'
+class Open_All_Classes(aetools.NProperty):
+	"""Open All Classes - Open all Java class files. """
+	which = 'Dg02'
 	want = 'bool'
 class Select_Stack_Crawl(aetools.NProperty):
 	"""Select Stack Crawl - Select the stack crawl. """
 	which = 'Dg06'
 	want = 'bool'
-class Dont_Step_in_Runtime(aetools.NProperty):
-	"""Dont Step in Runtime - Don\xd5t step into runtime code when debugging. """
-	which = 'Dg07'
-	want = 'bool'
-class Auto_Target_Libraries(aetools.NProperty):
-	"""Auto Target Libraries - Automatically target libraries when debugging """
-	which = 'Dg11'
+class Stop_at_Main(aetools.NProperty):
+	"""Stop at Main - Stop to debug on the main() function. """
+	which = 'Dg05'
 	want = 'bool'
 
 class Debugger_Target(aetools.ComponentItem):
 	"""Debugger Target - Debugger Target preferences """
 	want = 'DbTG'
+class Cache_symbolics(aetools.NProperty):
+	"""Cache symbolics - Cache symbolics between runs when executable doesn\xd5t change, else release symbolics files after killing process. """
+	which = 'Dt15'
+	want = 'bool'
+class Data_Update_Interval(aetools.NProperty):
+	"""Data Update Interval - How often to update the data while running (in seconds) """
+	which = 'Dt09'
+	want = 'long'
 class Log_System_Messages(aetools.NProperty):
 	"""Log System Messages - Log all system messages while debugging. """
 	which = 'Dt02'
@@ -1029,30 +1037,22 @@
 	"""Relocated Executable Path - Path to location of relocated libraries, code resources or remote debugging folder """
 	which = 'Dt10'
 	want = 'RlPt'
-class Update_Data_While_Running(aetools.NProperty):
-	"""Update Data While Running - Should pause to update data while running """
-	which = 'Dt08'
-	want = 'bool'
-class Data_Update_Interval(aetools.NProperty):
-	"""Data Update Interval - How often to update the data while running (in seconds) """
-	which = 'Dt09'
-	want = 'long'
 class Stop_at_temp_breakpoint(aetools.NProperty):
 	"""Stop at temp breakpoint - Stop at a temp breakpoint on program launch. Set breakpoint type in Temp Breakpoint Type AppleEvent. """
 	which = 'Dt13'
 	want = 'bool'
-class Temp_breakpoint_names(aetools.NProperty):
-	"""Temp breakpoint names - Comma separated list of names to attempt to stop at on program launch. First symbol to resolve in list is the temp BP that will be set. """
-	which = 'Dt14'
-	want = 'ctxt'
-class Cache_symbolics(aetools.NProperty):
-	"""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):
 	"""Temp Breakpoint Type - Type of temp breakpoint to set on program launch. """
 	which = 'Dt16'
 	want = 'TmpB'
+class Temp_breakpoint_names(aetools.NProperty):
+	"""Temp breakpoint names - Comma separated list of names to attempt to stop at on program launch. First symbol to resolve in list is the temp BP that will be set. """
+	which = 'Dt14'
+	want = 'ctxt'
+class Update_Data_While_Running(aetools.NProperty):
+	"""Update Data While Running - Should pause to update data while running """
+	which = 'Dt08'
+	want = 'bool'
 
 class Debugger_Windowing(aetools.ComponentItem):
 	"""Debugger Windowing -  """
@@ -1069,42 +1069,42 @@
 class Editor(aetools.ComponentItem):
 	"""Editor -  """
 	want = 'EDTR'
-class Flash_Delay(aetools.NProperty):
-	"""Flash Delay - The amount of time, in sixtieths of a second, the editor highlights a matching bracket. """
-	which = 'ED01'
-	want = 'long'
-class Dynamic_Scroll(aetools.NProperty):
-	"""Dynamic Scroll - Display a window\xd5s contents as you move the scroll box. """
-	which = 'ED02'
-	want = 'bool'
+class Background_Color(aetools.NProperty):
+	"""Background Color - Color of the background of editor windows. """
+	which = 'ED13'
+	want = 'cRGB'
 class Balance(aetools.NProperty):
 	"""Balance - Flash the matching opening bracket when you type a closing bracket. """
 	which = 'ED03'
 	want = 'bool'
-class Use_Drag__26__Drop_Editing(aetools.NProperty):
-	"""Use Drag & Drop Editing - Use Drag & Drop text editing. """
-	which = 'ED04'
-	want = 'bool'
-class Sort_Function_Popup(aetools.NProperty):
-	"""Sort Function Popup -  """
-	which = 'ED06'
-	want = 'bool'
-class Use_Multiple_Undo(aetools.NProperty):
-	"""Use Multiple Undo -  """
-	which = 'ED07'
-	want = 'bool'
-class Relaxed_C_Popup_Parsing(aetools.NProperty):
-	"""Relaxed C Popup Parsing - Relax the function parser for C source files """
-	which = 'ED15'
-	want = 'bool'
-class Left_Margin_Line_Select(aetools.NProperty):
-	"""Left Margin Line Select - Clicking in the left margin selects lines """
-	which = 'ED16'
-	want = 'bool'
+class Context_Popup_Delay(aetools.NProperty):
+	"""Context Popup Delay - The amount of time, in sixtieths of a second, before the context popup is displayed if you click and hold on a browser symbol. """
+	which = 'ED14'
+	want = 'long'
 class Default_Text_File_Format(aetools.NProperty):
 	"""Default Text File Format - Default text file format (i.e. which type of line endings to use) """
 	which = 'ED17'
 	want = 'TxtF'
+class Dynamic_Scroll(aetools.NProperty):
+	"""Dynamic Scroll - Display a window\xd5s contents as you move the scroll box. """
+	which = 'ED02'
+	want = 'bool'
+class Flash_Delay(aetools.NProperty):
+	"""Flash Delay - The amount of time, in sixtieths of a second, the editor highlights a matching bracket. """
+	which = 'ED01'
+	want = 'long'
+class Left_Margin_Line_Select(aetools.NProperty):
+	"""Left Margin Line Select - Clicking in the left margin selects lines """
+	which = 'ED16'
+	want = 'bool'
+class Main_Text_Color(aetools.NProperty):
+	"""Main Text Color - Main, default, color for text. """
+	which = 'ED12'
+	want = 'cRGB'
+class Relaxed_C_Popup_Parsing(aetools.NProperty):
+	"""Relaxed C Popup Parsing - Relax the function parser for C source files """
+	which = 'ED15'
+	want = 'bool'
 class Remember_Font(aetools.NProperty):
 	"""Remember Font - Display a source file with its own font settings. """
 	which = 'ED08'
@@ -1117,18 +1117,18 @@
 	"""Remember Window - Restore the last size and position for a source file window when you open it. """
 	which = 'ED10'
 	want = 'bool'
-class Main_Text_Color(aetools.NProperty):
-	"""Main Text Color - Main, default, color for text. """
-	which = 'ED12'
-	want = 'cRGB'
-class Background_Color(aetools.NProperty):
-	"""Background Color - Color of the background of editor windows. """
-	which = 'ED13'
-	want = 'cRGB'
-class Context_Popup_Delay(aetools.NProperty):
-	"""Context Popup Delay - The amount of time, in sixtieths of a second, before the context popup is displayed if you click and hold on a browser symbol. """
-	which = 'ED14'
-	want = 'long'
+class Sort_Function_Popup(aetools.NProperty):
+	"""Sort Function Popup -  """
+	which = 'ED06'
+	want = 'bool'
+class Use_Drag__26__Drop_Editing(aetools.NProperty):
+	"""Use Drag & Drop Editing - Use Drag & Drop text editing. """
+	which = 'ED04'
+	want = 'bool'
+class Use_Multiple_Undo(aetools.NProperty):
+	"""Use Multiple Undo -  """
+	which = 'ED07'
+	want = 'bool'
 
 class Environment_Variable(aetools.ComponentItem):
 	"""Environment Variable - Environment variable for host OS """
@@ -1145,14 +1145,6 @@
 class Error_Information(aetools.ComponentItem):
 	"""Error Information - Describes a single error or warning from the compiler or the linker. """
 	want = 'ErrM'
-class messageKind(aetools.NProperty):
-	"""messageKind - The type of error or warning. """
-	which = 'ErrT'
-	want = 'ErrT'
-class message(aetools.NProperty):
-	"""message - The error or warning message. """
-	which = 'ErrS'
-	want = 'TEXT'
 class disk_file(aetools.NProperty):
 	"""disk file - The file where the error occurred.  May not be returned for certain kinds of errors (eg, link errors). """
 	which = 'file'
@@ -1161,6 +1153,14 @@
 	"""lineNumber - The line in the file where the error occurred.  May not be returned for certain kinds of errors (eg, link errors). """
 	which = 'ErrL'
 	want = 'long'
+class message(aetools.NProperty):
+	"""message - The error or warning message. """
+	which = 'ErrS'
+	want = 'TEXT'
+class messageKind(aetools.NProperty):
+	"""messageKind - The type of error or warning. """
+	which = 'ErrT'
+	want = 'ErrT'
 
 class Extras(aetools.ComponentItem):
 	"""Extras -  """
@@ -1205,14 +1205,26 @@
 class File_Mapping(aetools.ComponentItem):
 	"""File Mapping -  """
 	want = 'FMap'
-class File_Type(aetools.NProperty):
-	"""File Type -  """
-	which = 'PR04'
+class Compiler(aetools.NProperty):
+	"""Compiler -  """
+	which = 'TA07'
 	want = 'TEXT'
 class Extension(aetools.NProperty):
 	"""Extension -  """
 	which = 'TA02'
 	want = 'TEXT'
+class File_Type(aetools.NProperty):
+	"""File Type -  """
+	which = 'PR04'
+	want = 'TEXT'
+class Ignored_by_Make(aetools.NProperty):
+	"""Ignored by Make -  """
+	which = 'TA06'
+	want = 'bool'
+class Launchable(aetools.NProperty):
+	"""Launchable -  """
+	which = 'TA05'
+	want = 'bool'
 class Precompiled(aetools.NProperty):
 	"""Precompiled -  """
 	which = 'TA03'
@@ -1221,18 +1233,6 @@
 	"""Resource File -  """
 	which = 'TA04'
 	want = 'bool'
-class Launchable(aetools.NProperty):
-	"""Launchable -  """
-	which = 'TA05'
-	want = 'bool'
-class Ignored_by_Make(aetools.NProperty):
-	"""Ignored by Make -  """
-	which = 'TA06'
-	want = 'bool'
-class Compiler(aetools.NProperty):
-	"""Compiler -  """
-	which = 'TA07'
-	want = 'TEXT'
 
 class File_Mappings(aetools.ComponentItem):
 	"""File Mappings - Mappings of extensions & file types to compilers """
@@ -1249,10 +1249,6 @@
 	"""Auto Indent - Indent new lines automatically. """
 	which = 'FN01'
 	want = 'bool'
-class Tab_Size(aetools.NProperty):
-	"""Tab Size -  """
-	which = 'FN02'
-	want = 'shor'
 class Tab_Indents_Selection(aetools.NProperty):
 	"""Tab Indents Selection - Tab indents selection when multiple lines are selected """
 	which = 'FN03'
@@ -1261,6 +1257,10 @@
 	"""Tab Inserts Spaces - Insert spaces instead of tab character """
 	which = 'FN04'
 	want = 'bool'
+class Tab_Size(aetools.NProperty):
+	"""Tab Size -  """
+	which = 'FN02'
+	want = 'shor'
 class Text_Font(aetools.NProperty):
 	"""Text Font - The font used in editing windows. """
 	which = 'ptxf'
@@ -1289,18 +1289,6 @@
 	"""format - Format of the a """
 	which = 'Frmt'
 	want = 'PthF'
-class origin(aetools.NProperty):
-	"""origin -  """
-	which = 'Orig'
-	want = 'PPrm'
-class root(aetools.NProperty):
-	"""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):
-	"""recursive - Will the path be searched recursively?  (Default is true) """
-	which = 'Recu'
-	want = 'bool'
 class framework(aetools.NProperty):
 	"""framework - Is the path a Mac OS X framework style path?  (This flag is readable but not writeable from AppleScript.) """
 	which = 'Frmw'
@@ -1309,26 +1297,34 @@
 	"""host flags - Bit fields enabling the access path for each host OS (1 = Mac OS, 2 = Windows) """
 	which = 'HstF'
 	want = 'long'
+class origin(aetools.NProperty):
+	"""origin -  """
+	which = 'Orig'
+	want = 'PPrm'
+class recursive(aetools.NProperty):
+	"""recursive - Will the path be searched recursively?  (Default is true) """
+	which = 'Recu'
+	want = 'bool'
+class root(aetools.NProperty):
+	"""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 Plugin_Settings(aetools.ComponentItem):
 	"""Plugin Settings - Settings for plugin tools """
 	want = 'PSTG'
-class Plugin_Diagnostics_Level(aetools.NProperty):
-	"""Plugin Diagnostics Level - Plugin Diagnostics Level is for those who are developing plugins for the IDE and need to debug them. """
-	which = 'PX01'
-	want = 'PXdg'
 class Disable_Third_Party_COM_Plugins(aetools.NProperty):
 	"""Disable Third Party COM Plugins - Disable COM plugins from third parties """
 	which = 'PX02'
 	want = 'bool'
+class Plugin_Diagnostics_Level(aetools.NProperty):
+	"""Plugin Diagnostics Level - Plugin Diagnostics Level is for those who are developing plugins for the IDE and need to debug them. """
+	which = 'PX01'
+	want = 'PXdg'
 
 class ProjectFile(aetools.ComponentItem):
 	"""ProjectFile - A file contained in a project """
 	want = 'SrcF'
-class filetype(aetools.NProperty):
-	"""filetype - What kind of file is this ? """
-	which = 'SrcT'
-	want = 'SrcT'
 class codesize(aetools.NProperty):
 	"""codesize - The size of this file\xd5s code. """
 	which = 'CSiz'
@@ -1337,26 +1333,30 @@
 	"""datasize - The size of this file\xd5s data. """
 	which = 'DSiz'
 	want = 'long'
-class up_to_date(aetools.NProperty):
-	"""up to date - Has the file been compiled since its last modification ? """
-	which = 'UpTD'
+class filetype(aetools.NProperty):
+	"""filetype - What kind of file is this ? """
+	which = 'SrcT'
+	want = 'SrcT'
+class includes(aetools.NProperty):
+	"""includes -  """
+	which = 'IncF'
+	want = 'fss '
+class initialize_before(aetools.NProperty):
+	"""initialize before - Initialize the shared library before the main application. """
+	which = 'Bfor'
 	want = 'bool'
 class symbols(aetools.NProperty):
 	"""symbols - Are debugging symbols generated for this file ? """
 	which = 'SymG'
 	want = 'bool'
+class up_to_date(aetools.NProperty):
+	"""up to date - Has the file been compiled since its last modification ? """
+	which = 'UpTD'
+	want = 'bool'
 class weak_link(aetools.NProperty):
 	"""weak link - Is this file imported weakly into the project ? [PowerPC only] """
 	which = 'Weak'
 	want = 'bool'
-class initialize_before(aetools.NProperty):
-	"""initialize before - Initialize the shared library before the main application. """
-	which = 'Bfor'
-	want = 'bool'
-class includes(aetools.NProperty):
-	"""includes -  """
-	which = 'IncF'
-	want = 'fss '
 
 class Relative_Path(aetools.ComponentItem):
 	"""Relative Path - Relative path from some root """
@@ -1365,22 +1365,22 @@
 class Runtime_Settings(aetools.ComponentItem):
 	"""Runtime Settings - Runtime settings """
 	want = 'RSTG'
-class Host_Application(aetools.NProperty):
-	"""Host Application - Host application for running/debugging libraries and code resources """
-	which = 'RS01'
-	want = 'RlPt'
 class Command_Line_Arguments(aetools.NProperty):
 	"""Command Line Arguments - Extra command line args to pass to executable """
 	which = 'RS02'
 	want = 'TEXT'
-class Working_Directory(aetools.NProperty):
-	"""Working Directory - Working directory to use when running the executable """
-	which = 'RS03'
-	want = 'TEXT'
 class Environment_Variables(aetools.NProperty):
 	"""Environment Variables - Environment variables to use when running the executable """
 	which = 'RS04'
 	want = 'EnvV'
+class Host_Application(aetools.NProperty):
+	"""Host Application - Host application for running/debugging libraries and code resources """
+	which = 'RS01'
+	want = 'RlPt'
+class Working_Directory(aetools.NProperty):
+	"""Working Directory - Working directory to use when running the executable """
+	which = 'RS03'
+	want = 'TEXT'
 
 class Segment(aetools.ComponentItem):
 	"""Segment - A segment or group in the project """
@@ -1389,6 +1389,10 @@
 	"""filecount -  """
 	which = 'NumF'
 	want = 'shor'
+class seg_2d_locked(aetools.NProperty):
+	"""seg-locked - Is the segment locked ? [68K only] """
+	which = 'PLck'
+	want = 'bool'
 class seg_2d_preloaded(aetools.NProperty):
 	"""seg-preloaded - Is the segment preloaded ? [68K only] """
 	which = 'Prel'
@@ -1397,10 +1401,6 @@
 	"""seg-protected - Is the segment protected ? [68K only] """
 	which = 'Prot'
 	want = 'bool'
-class seg_2d_locked(aetools.NProperty):
-	"""seg-locked - Is the segment locked ? [68K only] """
-	which = 'PLck'
-	want = 'bool'
 class seg_2d_purgeable(aetools.NProperty):
 	"""seg-purgeable - Is the segment purgeable ? [68K only] """
 	which = 'Purg'
@@ -1417,14 +1417,14 @@
 	"""Expression To Match - Regular expression which describes folders to skip """
 	which = 'SF01'
 	want = 'TEXT'
-class Skip_Project_Operations(aetools.NProperty):
-	"""Skip Project Operations - Matching folders will be skipped during project operations """
-	which = 'SF02'
-	want = 'bool'
 class Skip_Find_And_Compare_Operations(aetools.NProperty):
 	"""Skip Find And Compare Operations - Matching folders will be skipped during find and compare operations """
 	which = 'SF03'
 	want = 'bool'
+class Skip_Project_Operations(aetools.NProperty):
+	"""Skip Project Operations - Matching folders will be skipped during project operations """
+	which = 'SF02'
+	want = 'bool'
 
 class Shielded_Folders(aetools.ComponentItem):
 	"""Shielded Folders - Folders skipped when performing project and find-and-compare operations """
@@ -1449,10 +1449,6 @@
 class Syntax_Coloring(aetools.ComponentItem):
 	"""Syntax Coloring -  """
 	want = 'SNTX'
-class Syntax_Coloring(aetools.NProperty):
-	"""Syntax Coloring - Mark keywords and comments with color. """
-	which = 'GH01'
-	want = 'bool'
 class Comment_Color(aetools.NProperty):
 	"""Comment Color - The color for comments. """
 	which = 'GH02'
@@ -1465,6 +1461,10 @@
 	"""String Color - The color for strings. """
 	which = 'GH04'
 	want = 'cRGB'
+class Syntax_Coloring(aetools.NProperty):
+	"""Syntax Coloring - Mark keywords and comments with color. """
+	which = 'GH01'
+	want = 'bool'
 
 class Target_Settings(aetools.ComponentItem):
 	"""Target Settings - Contains the definitions of a project\xd5s target. """
@@ -1473,30 +1473,30 @@
 	"""Linker - The name of the current linker. """
 	which = 'TA01'
 	want = 'TEXT'
-class Pre_Linker(aetools.NProperty):
-	"""Pre Linker -  """
-	which = 'TA13'
+class Output_Directory_Location(aetools.NProperty):
+	"""Output Directory Location - Location of output directory """
+	which = 'TA16'
+	want = 'RlPt'
+class Output_Directory_Origin(aetools.NProperty):
+	"""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_Path(aetools.NProperty):
+	"""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 Post_Linker(aetools.NProperty):
 	"""Post Linker -  """
 	which = 'TA09'
 	want = 'TEXT'
+class Pre_Linker(aetools.NProperty):
+	"""Pre Linker -  """
+	which = 'TA13'
+	want = 'TEXT'
 class Target_Name(aetools.NProperty):
 	"""Target Name -  """
 	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 \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 \xd2Output Directory Location\xd3 property instead. """
-	which = 'TA12'
-	want = 'PPrm'
-class Output_Directory_Location(aetools.NProperty):
-	"""Output Directory Location - Location of output directory """
-	which = 'TA16'
-	want = 'RlPt'
 class Use_Relative_Paths(aetools.NProperty):
 	"""Use Relative Paths - Save project entries using relative paths """
 	which = 'TA15'
@@ -1509,42 +1509,18 @@
 class VCS_Setup(aetools.ComponentItem):
 	"""VCS Setup - The version control system preferences. """
 	want = 'VCSs'
-class VCS_Active(aetools.NProperty):
-	"""VCS Active - Use Version Control """
-	which = 'VC01'
+class Always_Prompt(aetools.NProperty):
+	"""Always Prompt - Always show login dialog """
+	which = 'VC07'
 	want = 'bool'
-class Use_Global_Settings(aetools.NProperty):
-	"""Use Global Settings - Use the global VCS settings by default """
-	which = 'VC11'
+class Auto_Connect(aetools.NProperty):
+	"""Auto Connect - Automatically connect to database when starting. """
+	which = 'VC05'
 	want = 'bool'
 class Connection_Method(aetools.NProperty):
 	"""Connection Method - Name of Version Control System to use. """
 	which = 'VC02'
 	want = 'TEXT'
-class Username(aetools.NProperty):
-	"""Username - The user name for the VCS. """
-	which = 'VC03'
-	want = 'TEXT'
-class Password(aetools.NProperty):
-	"""Password - The password for the VCS. """
-	which = 'VC04'
-	want = 'TEXT'
-class Auto_Connect(aetools.NProperty):
-	"""Auto Connect - Automatically connect to database when starting. """
-	which = 'VC05'
-	want = 'bool'
-class Store_Password(aetools.NProperty):
-	"""Store Password - Store the password. """
-	which = 'VC06'
-	want = 'bool'
-class Always_Prompt(aetools.NProperty):
-	"""Always Prompt - Always show login dialog """
-	which = 'VC07'
-	want = 'bool'
-class Mount_Volume(aetools.NProperty):
-	"""Mount Volume - Attempt to mount the database volume if it isn't available. """
-	which = 'VC08'
-	want = 'bool'
 class Database_Path(aetools.NProperty):
 	"""Database Path - Path to the VCS database. """
 	which = 'VC09'
@@ -1553,18 +1529,42 @@
 	"""Local Path - Path to the local root """
 	which = 'VC10'
 	want = 'RlPt'
+class Mount_Volume(aetools.NProperty):
+	"""Mount Volume - Attempt to mount the database volume if it isn't available. """
+	which = 'VC08'
+	want = 'bool'
+class Password(aetools.NProperty):
+	"""Password - The password for the VCS. """
+	which = 'VC04'
+	want = 'TEXT'
+class Store_Password(aetools.NProperty):
+	"""Store Password - Store the password. """
+	which = 'VC06'
+	want = 'bool'
+class Use_Global_Settings(aetools.NProperty):
+	"""Use Global Settings - Use the global VCS settings by default """
+	which = 'VC11'
+	want = 'bool'
+class Username(aetools.NProperty):
+	"""Username - The user name for the VCS. """
+	which = 'VC03'
+	want = 'TEXT'
+class VCS_Active(aetools.NProperty):
+	"""VCS Active - Use Version Control """
+	which = 'VC01'
+	want = 'bool'
 
 class base_class(aetools.ComponentItem):
 	"""base class - A base class or super class of a class """
 	want = 'BsCl'
-class class_(aetools.NProperty):
-	"""class - The class object corresponding to this base class """
-	which = 'Clas'
-	want = 'obj '
 class access(aetools.NProperty):
 	"""access -  """
 	which = 'Acce'
 	want = 'Acce'
+class class_(aetools.NProperty):
+	"""class - The class object corresponding to this base class """
+	which = 'Clas'
+	want = 'obj '
 class virtual(aetools.NProperty):
 	"""virtual -  """
 	which = 'Virt'
@@ -1580,10 +1580,14 @@
 class class_(aetools.ComponentItem):
 	"""class - A class, struct, or record type in the current project. """
 	want = 'Clas'
-class language(aetools.NProperty):
-	"""language - Implementation language of this class """
-	which = 'Lang'
-	want = 'Lang'
+class all_subclasses(aetools.NProperty):
+	"""all subclasses - the classes directly or indirectly derived from this class """
+	which = 'SubA'
+	want = 'Clas'
+class declaration_end_offset(aetools.NProperty):
+	"""declaration end offset - End of class declaration """
+	which = 'DcEn'
+	want = 'long'
 class declaration_file(aetools.NProperty):
 	"""declaration file - Source file containing the class declaration """
 	which = 'DcFl'
@@ -1592,21 +1596,17 @@
 	"""declaration start offset - Start of class declaration source code """
 	which = 'DcSt'
 	want = 'long'
-class declaration_end_offset(aetools.NProperty):
-	"""declaration end offset - End of class declaration """
-	which = 'DcEn'
-	want = 'long'
+class language(aetools.NProperty):
+	"""language - Implementation language of this class """
+	which = 'Lang'
+	want = 'Lang'
 class subclasses(aetools.NProperty):
 	"""subclasses - the immediate subclasses of this class """
 	which = 'SubC'
 	want = 'Clas'
-class all_subclasses(aetools.NProperty):
-	"""all subclasses - the classes directly or indirectly derived from this class """
-	which = 'SubA'
-	want = 'Clas'
 #        element 'BsCl' as ['indx']
-#        element 'MbFn' as ['indx', 'name']
 #        element 'DtMb' as ['indx', 'name']
+#        element 'MbFn' as ['indx', 'name']
 
 classes = class_
 
@@ -1623,6 +1623,10 @@
 class member_function(aetools.ComponentItem):
 	"""member function - A class member function or method. """
 	want = 'MbFn'
+class implementation_end_offset(aetools.NProperty):
+	"""implementation end offset - end of member function definition """
+	which = 'DfEn'
+	want = 'long'
 class implementation_file(aetools.NProperty):
 	"""implementation file - Source file containing the member function definition """
 	which = 'DfFl'
@@ -1631,19 +1635,15 @@
 	"""implementation start offset - start of member function definition source code """
 	which = 'DfSt'
 	want = 'long'
-class implementation_end_offset(aetools.NProperty):
-	"""implementation end offset - end of member function definition """
-	which = 'DfEn'
-	want = 'long'
 
 member_functions = member_function
 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,
+	'System_Paths' : System_Paths,
+	'User_Paths' : User_Paths,
 }
 Access_Paths._privelemdict = {
 }
@@ -1656,30 +1656,30 @@
 	'Functions_Color' : Functions_Color,
 	'Globals_Color' : Globals_Color,
 	'Macros_Color' : Macros_Color,
+	'Template_Commands_in_Menu' : Template_Commands_in_Menu,
 	'Templates_Color' : Templates_Color,
 	'Typedefs_Color' : Typedefs_Color,
-	'Template_Commands_in_Menu' : Template_Commands_in_Menu,
 }
 Browser_Coloring._privelemdict = {
 }
 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,
+	'Dump_Browser_Info' : Dump_Browser_Info,
+	'Modification_Date_Caching' : Modification_Date_Caching,
 }
 Build_Extras._privelemdict = {
 }
 Build_Settings._superclassnames = []
 Build_Settings._privpropdict = {
-	'Completion_Sound' : Completion_Sound,
-	'Success_Sound' : Success_Sound,
-	'Failure_Sound' : Failure_Sound,
-	'Save_Before_Building' : Save_Before_Building,
 	'Build_Before_Running' : Build_Before_Running,
-	'Include_Cache_Size' : Include_Cache_Size,
 	'Compiler_Thread_Stack_Size' : Compiler_Thread_Stack_Size,
+	'Completion_Sound' : Completion_Sound,
+	'Failure_Sound' : Failure_Sound,
+	'Include_Cache_Size' : Include_Cache_Size,
+	'Save_Before_Building' : Save_Before_Building,
+	'Success_Sound' : Success_Sound,
 }
 Build_Settings._privelemdict = {
 }
@@ -1694,45 +1694,45 @@
 }
 Debugger_Display._superclassnames = []
 Debugger_Display._privpropdict = {
-	'Show_Variable_Types' : Show_Variable_Types,
-	'Show_Locals' : Show_Locals,
-	'Sort_By_Method' : Sort_By_Method,
-	'Use_RTTI' : Use_RTTI,
-	'Threads_in_Window' : Threads_in_Window,
-	'Variable_Hints' : Variable_Hints,
-	'Watchpoint_Hilite' : Watchpoint_Hilite,
-	'Variable_Changed_Hilite' : Variable_Changed_Hilite,
 	'Default_Array_Size' : Default_Array_Size,
 	'Show_As_Decimal' : Show_As_Decimal,
+	'Show_Locals' : Show_Locals,
+	'Show_Variable_Types' : Show_Variable_Types,
+	'Sort_By_Method' : Sort_By_Method,
+	'Threads_in_Window' : Threads_in_Window,
+	'Use_RTTI' : Use_RTTI,
+	'Variable_Changed_Hilite' : Variable_Changed_Hilite,
+	'Variable_Hints' : Variable_Hints,
+	'Watchpoint_Hilite' : Watchpoint_Hilite,
 }
 Debugger_Display._privelemdict = {
 }
 Debugger_Global._superclassnames = []
 Debugger_Global._privpropdict = {
+	'Auto_Target_Libraries' : Auto_Target_Libraries,
 	'Cache_Edited_Files' : Cache_Edited_Files,
+	'Confirm_Kill' : Confirm_Kill,
+	'Dont_Step_in_Runtime' : Dont_Step_in_Runtime,
 	'File_Cache_Duration' : File_Cache_Duration,
 	'Ignore_Mod_Dates' : Ignore_Mod_Dates,
-	'Open_All_Classes' : Open_All_Classes,
 	'Launch_Apps_on_Open' : Launch_Apps_on_Open,
-	'Confirm_Kill' : Confirm_Kill,
-	'Stop_at_Main' : Stop_at_Main,
+	'Open_All_Classes' : Open_All_Classes,
 	'Select_Stack_Crawl' : Select_Stack_Crawl,
-	'Dont_Step_in_Runtime' : Dont_Step_in_Runtime,
-	'Auto_Target_Libraries' : Auto_Target_Libraries,
+	'Stop_at_Main' : Stop_at_Main,
 }
 Debugger_Global._privelemdict = {
 }
 Debugger_Target._superclassnames = []
 Debugger_Target._privpropdict = {
+	'Auto_Target_Libraries' : Auto_Target_Libraries,
+	'Cache_symbolics' : Cache_symbolics,
+	'Data_Update_Interval' : Data_Update_Interval,
 	'Log_System_Messages' : Log_System_Messages,
 	'Relocated_Executable_Path' : Relocated_Executable_Path,
-	'Update_Data_While_Running' : Update_Data_While_Running,
-	'Data_Update_Interval' : Data_Update_Interval,
-	'Auto_Target_Libraries' : Auto_Target_Libraries,
 	'Stop_at_temp_breakpoint' : Stop_at_temp_breakpoint,
-	'Temp_breakpoint_names' : Temp_breakpoint_names,
-	'Cache_symbolics' : Cache_symbolics,
 	'Temp_Breakpoint_Type' : Temp_Breakpoint_Type,
+	'Temp_breakpoint_names' : Temp_breakpoint_names,
+	'Update_Data_While_Running' : Update_Data_While_Running,
 }
 Debugger_Target._privelemdict = {
 }
@@ -1745,21 +1745,21 @@
 }
 Editor._superclassnames = []
 Editor._privpropdict = {
-	'Flash_Delay' : Flash_Delay,
-	'Dynamic_Scroll' : Dynamic_Scroll,
+	'Background_Color' : Background_Color,
 	'Balance' : Balance,
-	'Use_Drag__26__Drop_Editing' : Use_Drag__26__Drop_Editing,
-	'Sort_Function_Popup' : Sort_Function_Popup,
-	'Use_Multiple_Undo' : Use_Multiple_Undo,
-	'Relaxed_C_Popup_Parsing' : Relaxed_C_Popup_Parsing,
-	'Left_Margin_Line_Select' : Left_Margin_Line_Select,
+	'Context_Popup_Delay' : Context_Popup_Delay,
 	'Default_Text_File_Format' : Default_Text_File_Format,
+	'Dynamic_Scroll' : Dynamic_Scroll,
+	'Flash_Delay' : Flash_Delay,
+	'Left_Margin_Line_Select' : Left_Margin_Line_Select,
+	'Main_Text_Color' : Main_Text_Color,
+	'Relaxed_C_Popup_Parsing' : Relaxed_C_Popup_Parsing,
 	'Remember_Font' : Remember_Font,
 	'Remember_Selection' : Remember_Selection,
 	'Remember_Window' : Remember_Window,
-	'Main_Text_Color' : Main_Text_Color,
-	'Background_Color' : Background_Color,
-	'Context_Popup_Delay' : Context_Popup_Delay,
+	'Sort_Function_Popup' : Sort_Function_Popup,
+	'Use_Drag__26__Drop_Editing' : Use_Drag__26__Drop_Editing,
+	'Use_Multiple_Undo' : Use_Multiple_Undo,
 }
 Editor._privelemdict = {
 }
@@ -1772,10 +1772,10 @@
 }
 Error_Information._superclassnames = []
 Error_Information._privpropdict = {
-	'messageKind' : messageKind,
-	'message' : message,
 	'disk_file' : disk_file,
 	'lineNumber' : lineNumber,
+	'message' : message,
+	'messageKind' : messageKind,
 }
 Error_Information._privelemdict = {
 }
@@ -1795,13 +1795,13 @@
 }
 File_Mapping._superclassnames = []
 File_Mapping._privpropdict = {
-	'File_Type' : File_Type,
+	'Compiler' : Compiler,
 	'Extension' : Extension,
+	'File_Type' : File_Type,
+	'Ignored_by_Make' : Ignored_by_Make,
+	'Launchable' : Launchable,
 	'Precompiled' : Precompiled,
 	'Resource_File' : Resource_File,
-	'Launchable' : Launchable,
-	'Ignored_by_Make' : Ignored_by_Make,
-	'Compiler' : Compiler,
 }
 File_Mapping._privelemdict = {
 }
@@ -1814,9 +1814,9 @@
 Font._superclassnames = []
 Font._privpropdict = {
 	'Auto_Indent' : Auto_Indent,
-	'Tab_Size' : Tab_Size,
 	'Tab_Indents_Selection' : Tab_Indents_Selection,
 	'Tab_Inserts_Spaces' : Tab_Inserts_Spaces,
+	'Tab_Size' : Tab_Size,
 	'Text_Font' : Text_Font,
 	'Text_Size' : Text_Size,
 }
@@ -1837,42 +1837,42 @@
 }
 Path_Information._superclassnames = []
 Path_Information._privpropdict = {
-	'name' : name,
 	'format' : format,
-	'origin' : origin,
-	'root' : root,
-	'recursive' : recursive,
 	'framework' : framework,
 	'host_flags' : host_flags,
+	'name' : name,
+	'origin' : origin,
+	'recursive' : recursive,
+	'root' : root,
 }
 Path_Information._privelemdict = {
 }
 Plugin_Settings._superclassnames = []
 Plugin_Settings._privpropdict = {
-	'Plugin_Diagnostics_Level' : Plugin_Diagnostics_Level,
 	'Disable_Third_Party_COM_Plugins' : Disable_Third_Party_COM_Plugins,
+	'Plugin_Diagnostics_Level' : Plugin_Diagnostics_Level,
 }
 Plugin_Settings._privelemdict = {
 }
 ProjectFile._superclassnames = []
 ProjectFile._privpropdict = {
-	'filetype' : filetype,
-	'name' : name,
-	'disk_file' : disk_file,
 	'codesize' : codesize,
 	'datasize' : datasize,
-	'up_to_date' : up_to_date,
-	'symbols' : symbols,
-	'weak_link' : weak_link,
-	'initialize_before' : initialize_before,
+	'disk_file' : disk_file,
+	'filetype' : filetype,
 	'includes' : includes,
+	'initialize_before' : initialize_before,
+	'name' : name,
+	'symbols' : symbols,
+	'up_to_date' : up_to_date,
+	'weak_link' : weak_link,
 }
 ProjectFile._privelemdict = {
 }
 Relative_Path._superclassnames = []
 Relative_Path._privpropdict = {
-	'name' : name,
 	'format' : format,
+	'name' : name,
 	'origin' : origin,
 	'root' : root,
 }
@@ -1880,20 +1880,20 @@
 }
 Runtime_Settings._superclassnames = []
 Runtime_Settings._privpropdict = {
-	'Host_Application' : Host_Application,
 	'Command_Line_Arguments' : Command_Line_Arguments,
-	'Working_Directory' : Working_Directory,
 	'Environment_Variables' : Environment_Variables,
+	'Host_Application' : Host_Application,
+	'Working_Directory' : Working_Directory,
 }
 Runtime_Settings._privelemdict = {
 }
 Segment._superclassnames = []
 Segment._privpropdict = {
-	'name' : name,
 	'filecount' : filecount,
+	'name' : name,
+	'seg_2d_locked' : seg_2d_locked,
 	'seg_2d_preloaded' : seg_2d_preloaded,
 	'seg_2d_protected' : seg_2d_protected,
-	'seg_2d_locked' : seg_2d_locked,
 	'seg_2d_purgeable' : seg_2d_purgeable,
 	'seg_2d_system_heap' : seg_2d_system_heap,
 }
@@ -1902,8 +1902,8 @@
 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,
+	'Skip_Project_Operations' : Skip_Project_Operations,
 }
 Shielded_Folder._privelemdict = {
 }
@@ -1915,35 +1915,35 @@
 }
 Source_Tree._superclassnames = []
 Source_Tree._privpropdict = {
+	'format' : format,
 	'name' : name,
 	'path' : path,
 	'path_kind' : path_kind,
-	'format' : format,
 }
 Source_Tree._privelemdict = {
 }
 Syntax_Coloring._superclassnames = []
 Syntax_Coloring._privpropdict = {
-	'Syntax_Coloring' : Syntax_Coloring,
 	'Comment_Color' : Comment_Color,
-	'Keyword_Color' : Keyword_Color,
-	'String_Color' : String_Color,
 	'Custom_Color_1' : Custom_Color_1,
 	'Custom_Color_2' : Custom_Color_2,
 	'Custom_Color_3' : Custom_Color_3,
 	'Custom_Color_4' : Custom_Color_4,
+	'Keyword_Color' : Keyword_Color,
+	'String_Color' : String_Color,
+	'Syntax_Coloring' : Syntax_Coloring,
 }
 Syntax_Coloring._privelemdict = {
 }
 Target_Settings._superclassnames = []
 Target_Settings._privpropdict = {
 	'Linker' : Linker,
-	'Pre_Linker' : Pre_Linker,
-	'Post_Linker' : Post_Linker,
-	'Target_Name' : Target_Name,
-	'Output_Directory_Path' : Output_Directory_Path,
-	'Output_Directory_Origin' : Output_Directory_Origin,
 	'Output_Directory_Location' : Output_Directory_Location,
+	'Output_Directory_Origin' : Output_Directory_Origin,
+	'Output_Directory_Path' : Output_Directory_Path,
+	'Post_Linker' : Post_Linker,
+	'Pre_Linker' : Pre_Linker,
+	'Target_Name' : Target_Name,
 	'Use_Relative_Paths' : Use_Relative_Paths,
 }
 Target_Settings._privelemdict = {
@@ -1956,24 +1956,24 @@
 }
 VCS_Setup._superclassnames = []
 VCS_Setup._privpropdict = {
-	'VCS_Active' : VCS_Active,
-	'Use_Global_Settings' : Use_Global_Settings,
-	'Connection_Method' : Connection_Method,
-	'Username' : Username,
-	'Password' : Password,
-	'Auto_Connect' : Auto_Connect,
-	'Store_Password' : Store_Password,
 	'Always_Prompt' : Always_Prompt,
-	'Mount_Volume' : Mount_Volume,
+	'Auto_Connect' : Auto_Connect,
+	'Connection_Method' : Connection_Method,
 	'Database_Path' : Database_Path,
 	'Local_Path' : Local_Path,
+	'Mount_Volume' : Mount_Volume,
+	'Password' : Password,
+	'Store_Password' : Store_Password,
+	'Use_Global_Settings' : Use_Global_Settings,
+	'Username' : Username,
+	'VCS_Active' : VCS_Active,
 }
 VCS_Setup._privelemdict = {
 }
 base_class._superclassnames = []
 base_class._privpropdict = {
-	'class_' : class_,
 	'access' : access,
+	'class_' : class_,
 	'virtual' : virtual,
 }
 base_class._privelemdict = {
@@ -1986,41 +1986,41 @@
 }
 class_._superclassnames = []
 class_._privpropdict = {
-	'name' : name,
-	'language' : language,
+	'all_subclasses' : all_subclasses,
+	'declaration_end_offset' : declaration_end_offset,
 	'declaration_file' : declaration_file,
 	'declaration_start_offset' : declaration_start_offset,
-	'declaration_end_offset' : declaration_end_offset,
+	'language' : language,
+	'name' : name,
 	'subclasses' : subclasses,
-	'all_subclasses' : all_subclasses,
 }
 class_._privelemdict = {
 	'base_class' : base_class,
-	'member_function' : member_function,
 	'data_member' : data_member,
+	'member_function' : member_function,
 }
 data_member._superclassnames = []
 data_member._privpropdict = {
-	'name' : name,
 	'access' : access,
-	'static' : static,
-	'declaration_start_offset' : declaration_start_offset,
 	'declaration_end_offset' : declaration_end_offset,
+	'declaration_start_offset' : declaration_start_offset,
+	'name' : name,
+	'static' : static,
 }
 data_member._privelemdict = {
 }
 member_function._superclassnames = []
 member_function._privpropdict = {
-	'name' : name,
 	'access' : access,
-	'virtual' : virtual,
-	'static' : static,
+	'declaration_end_offset' : declaration_end_offset,
 	'declaration_file' : declaration_file,
 	'declaration_start_offset' : declaration_start_offset,
-	'declaration_end_offset' : declaration_end_offset,
+	'implementation_end_offset' : implementation_end_offset,
 	'implementation_file' : implementation_file,
 	'implementation_start_offset' : implementation_start_offset,
-	'implementation_end_offset' : implementation_end_offset,
+	'name' : name,
+	'static' : static,
+	'virtual' : virtual,
 }
 member_function._privelemdict = {
 }
@@ -2136,238 +2136,238 @@
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'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,
+	'BSTG' : Build_Settings,
 	'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,
+	'CUKW' : Custom_Keywords,
+	'Cata' : browser_catalog,
 	'Clas' : class_,
+	'DbDS' : Debugger_Display,
+	'DbGL' : Debugger_Global,
+	'DbTG' : Debugger_Target,
+	'DbWN' : Debugger_Windowing,
+	'DtMb' : data_member,
+	'EDTR' : Editor,
+	'EnvV' : Environment_Variable,
+	'ErrM' : Error_Information,
+	'FDef' : Function_Information,
+	'FLMP' : File_Mappings,
+	'FMap' : File_Mapping,
+	'GSTs' : Global_Source_Trees,
+	'GXTR' : Extras,
+	'LXTR' : Build_Extras,
+	'MbFn' : member_function,
+	'PATH' : Access_Paths,
+	'PInf' : Path_Information,
+	'PSTG' : Plugin_Settings,
+	'RSTG' : Runtime_Settings,
+	'RlPt' : Relative_Path,
+	'SFit' : Shielded_Folder,
+	'SHFL' : Shielded_Folders,
+	'SNTX' : Syntax_Coloring,
+	'Seg ' : Segment,
+	'SrcF' : ProjectFile,
+	'SrcT' : Source_Tree,
+	'TARG' : Target_Settings,
+	'TSTs' : Target_Source_Trees,
+	'VCSs' : VCS_Setup,
+	'mFNT' : Font,
 }
 
 _propdeclarations = {
-	'SymG' : symbols,
+	'Acce' : access,
+	'BW00' : Browser_Keywords,
+	'BW01' : Classes_Color,
+	'BW02' : Constants_Color,
+	'BW03' : Enums_Color,
+	'BW04' : Functions_Color,
+	'BW05' : Globals_Color,
+	'BW06' : Macros_Color,
+	'BW07' : Templates_Color,
+	'BW08' : Typedefs_Color,
+	'BW10' : Template_Commands_in_Menu,
+	'BX01' : Completion_Sound,
 	'BX02' : Success_Sound,
 	'BX03' : Failure_Sound,
-	'BX01' : Completion_Sound,
-	'BX06' : Compiler_Thread_Stack_Size,
-	'BX07' : Save_Before_Building,
 	'BX04' : Build_Before_Running,
 	'BX05' : Include_Cache_Size,
-	'NumF' : filecount,
-	'Frmw' : framework,
-	'Frmt' : format,
-	'FN01' : Auto_Indent,
-	'FN02' : Tab_Size,
-	'FN03' : Tab_Indents_Selection,
-	'FN04' : Tab_Inserts_Spaces,
-	'Dg07' : Dont_Step_in_Runtime,
-	'Dg06' : Select_Stack_Crawl,
-	'Dg05' : Stop_at_Main,
-	'Dg04' : Confirm_Kill,
-	'Dg03' : Launch_Apps_on_Open,
-	'Dg02' : Open_All_Classes,
-	'Dg01' : Ignore_Mod_Dates,
-	'Weak' : weak_link,
-	'DcFl' : declaration_file,
-	'Path' : path,
-	'Recu' : recursive,
-	'TA16' : Output_Directory_Location,
-	'Db10' : Show_As_Decimal,
+	'BX06' : Compiler_Thread_Stack_Size,
+	'BX07' : Save_Before_Building,
+	'Bfor' : initialize_before,
 	'CSiz' : codesize,
-	'ErrL' : lineNumber,
+	'Clas' : class_,
+	'DSiz' : datasize,
+	'Db01' : Show_Variable_Types,
+	'Db02' : Sort_By_Method,
+	'Db03' : Use_RTTI,
+	'Db04' : Threads_in_Window,
+	'Db05' : Variable_Hints,
+	'Db06' : Watchpoint_Hilite,
+	'Db07' : Variable_Changed_Hilite,
+	'Db08' : Default_Array_Size,
+	'Db09' : Show_Locals,
+	'Db10' : Show_As_Decimal,
+	'DcEn' : declaration_end_offset,
+	'DcFl' : declaration_file,
+	'DcSt' : declaration_start_offset,
+	'DfEn' : implementation_end_offset,
+	'DfFl' : implementation_file,
+	'DfSt' : implementation_start_offset,
+	'Dg01' : Ignore_Mod_Dates,
+	'Dg02' : Open_All_Classes,
+	'Dg03' : Launch_Apps_on_Open,
+	'Dg04' : Confirm_Kill,
+	'Dg05' : Stop_at_Main,
+	'Dg06' : Select_Stack_Crawl,
+	'Dg07' : Dont_Step_in_Runtime,
+	'Dg11' : Auto_Target_Libraries,
+	'Dg12' : Cache_Edited_Files,
+	'Dg13' : File_Cache_Duration,
+	'Dt02' : Log_System_Messages,
+	'Dt08' : Update_Data_While_Running,
+	'Dt09' : Data_Update_Interval,
+	'Dt10' : Relocated_Executable_Path,
+	'Dt13' : Stop_at_temp_breakpoint,
+	'Dt14' : Temp_breakpoint_names,
+	'Dt15' : Cache_symbolics,
 	'Dt16' : Temp_Breakpoint_Type,
-	'ErrS' : message,
-	'BW07' : Templates_Color,
-	'ErrT' : messageKind,
-	'EX18' : Use_ToolServer_Menu,
-	'EX19' : Automatic_Toolbar_Help,
-	'TA15' : Use_Relative_Paths,
-	'TA12' : Output_Directory_Origin,
-	'TA13' : Pre_Linker,
-	'TA10' : Target_Name,
-	'TA11' : Output_Directory_Path,
+	'Dw01' : Debugging_Start_Action,
+	'Dw02' : Do_Nothing_To_Projects,
+	'ED01' : Flash_Delay,
+	'ED02' : Dynamic_Scroll,
+	'ED03' : Balance,
+	'ED04' : Use_Drag__26__Drop_Editing,
+	'ED06' : Sort_Function_Popup,
+	'ED07' : Use_Multiple_Undo,
+	'ED08' : Remember_Font,
+	'ED09' : Remember_Selection,
+	'ED10' : Remember_Window,
+	'ED12' : Main_Text_Color,
+	'ED13' : Background_Color,
+	'ED14' : Context_Popup_Delay,
+	'ED15' : Relaxed_C_Popup_Parsing,
+	'ED16' : Left_Margin_Line_Select,
+	'ED17' : Default_Text_File_Format,
+	'EX04' : Modification_Date_Caching,
+	'EX07' : Full_Screen_Zoom,
+	'EX08' : External_Reference,
+	'EX09' : Browser_Active,
 	'EX10' : Use_Editor_Extensions,
 	'EX11' : Use_External_Editor,
 	'EX12' : Use_Script_Menu,
 	'EX16' : Recent_Editor_Count,
 	'EX17' : Recent_Project_Count,
-	'DfEn' : implementation_end_offset,
-	'Acce' : access,
-	'BW02' : Constants_Color,
-	'Kind' : path_kind,
-	'Db08' : Default_Array_Size,
-	'Db09' : Show_Locals,
-	'SrcT' : filetype,
-	'Db02' : Sort_By_Method,
-	'Db03' : Use_RTTI,
-	'Db01' : Show_Variable_Types,
-	'Db06' : Watchpoint_Hilite,
-	'Db07' : Variable_Changed_Hilite,
-	'Db04' : Threads_in_Window,
-	'Db05' : Variable_Hints,
-	'TA01' : Linker,
-	'EX09' : Browser_Active,
-	'EX08' : External_Reference,
-	'TA05' : Launchable,
-	'TA04' : Resource_File,
-	'TA07' : Compiler,
-	'TA06' : Ignored_by_Make,
-	'RS01' : Host_Application,
-	'RS03' : Working_Directory,
-	'RS02' : Command_Line_Arguments,
-	'EX07' : Full_Screen_Zoom,
-	'RS04' : Environment_Variables,
-	'EX04' : Modification_Date_Caching,
-	'PR04' : File_Type,
-	'DfSt' : implementation_start_offset,
-	'pnam' : name,
-	'GH01' : Syntax_Coloring,
-	'GH03' : Keyword_Color,
-	'GH02' : Comment_Color,
-	'GH05' : Custom_Color_1,
-	'GH04' : String_Color,
-	'GH07' : Custom_Color_3,
-	'GH06' : Custom_Color_2,
-	'GH08' : Custom_Color_4,
-	'ST01' : Source_Trees,
+	'EX18' : Use_ToolServer_Menu,
+	'EX19' : Automatic_Toolbar_Help,
 	'EX30' : Dump_Browser_Info,
 	'EX31' : Cache_Subproject_Data,
-	'Clas' : class_,
-	'DSiz' : datasize,
-	'ED14' : Context_Popup_Delay,
-	'ED15' : Relaxed_C_Popup_Parsing,
-	'ED16' : Left_Margin_Line_Select,
-	'ED17' : Default_Text_File_Format,
-	'ED10' : Remember_Window,
-	'ED12' : Main_Text_Color,
-	'ED13' : Background_Color,
-	'Prot' : seg_2d_protected,
-	'Purg' : seg_2d_purgeable,
+	'ErrL' : lineNumber,
+	'ErrS' : message,
+	'ErrT' : messageKind,
+	'FMps' : Mappings,
+	'FN01' : Auto_Indent,
+	'FN02' : Tab_Size,
+	'FN03' : Tab_Indents_Selection,
+	'FN04' : Tab_Inserts_Spaces,
+	'Frmt' : format,
+	'Frmw' : framework,
+	'GH01' : Syntax_Coloring,
+	'GH02' : Comment_Color,
+	'GH03' : Keyword_Color,
+	'GH04' : String_Color,
+	'GH05' : Custom_Color_1,
+	'GH06' : Custom_Color_2,
+	'GH07' : Custom_Color_3,
+	'GH08' : Custom_Color_4,
 	'HstF' : host_flags,
-	'Stat' : static,
-	'ptps' : Text_Size,
-	'PA01' : User_Paths,
-	'DcSt' : declaration_start_offset,
 	'IncF' : includes,
-	'Valu' : value,
-	'ED07' : Use_Multiple_Undo,
-	'ED06' : Sort_Function_Popup,
-	'ED04' : Use_Drag__26__Drop_Editing,
-	'ED03' : Balance,
-	'ED02' : Dynamic_Scroll,
-	'ED01' : Flash_Delay,
-	'ED09' : Remember_Selection,
-	'ED08' : Remember_Font,
-	'SF03' : Skip_Find_And_Compare_Operations,
-	'SF02' : Skip_Project_Operations,
-	'SF01' : Expression_To_Match,
-	'SubC' : subclasses,
-	'SubA' : all_subclasses,
-	'ptxf' : Text_Font,
-	'Dg11' : Auto_Target_Libraries,
+	'Kind' : path_kind,
+	'Lang' : language,
+	'NumF' : filecount,
+	'Orig' : origin,
+	'PA01' : User_Paths,
+	'PA02' : Always_Full_Search,
+	'PA03' : System_Paths,
+	'PA04' : Convert_Paths,
+	'PA05' : Require_Framework_Includes,
+	'PLck' : seg_2d_locked,
+	'PR04' : File_Type,
 	'PX01' : Plugin_Diagnostics_Level,
 	'PX02' : Disable_Third_Party_COM_Plugins,
-	'Lang' : language,
-	'BW10' : Template_Commands_in_Menu,
-	'Dt08' : Update_Data_While_Running,
-	'Dt09' : Data_Update_Interval,
-	'VC04' : Password,
-	'Dt02' : Log_System_Messages,
-	'Orig' : origin,
+	'Path' : path,
 	'Prel' : seg_2d_preloaded,
-	'UpTD' : up_to_date,
-	'Dw02' : Do_Nothing_To_Projects,
+	'Prot' : seg_2d_protected,
+	'Purg' : seg_2d_purgeable,
+	'RS01' : Host_Application,
+	'RS02' : Command_Line_Arguments,
+	'RS03' : Working_Directory,
+	'RS04' : Environment_Variables,
+	'Recu' : recursive,
+	'Root' : root,
+	'SF01' : Expression_To_Match,
+	'SF02' : Skip_Project_Operations,
+	'SF03' : Skip_Find_And_Compare_Operations,
 	'SFis' : Shielded_Items,
+	'ST01' : Source_Trees,
+	'SrcT' : filetype,
+	'Stat' : static,
+	'SubA' : all_subclasses,
+	'SubC' : subclasses,
+	'SymG' : symbols,
 	'SysH' : seg_2d_system_heap,
-	'file' : disk_file,
-	'Bfor' : initialize_before,
+	'TA01' : Linker,
+	'TA02' : Extension,
+	'TA03' : Precompiled,
+	'TA04' : Resource_File,
+	'TA05' : Launchable,
+	'TA06' : Ignored_by_Make,
+	'TA07' : Compiler,
+	'TA09' : Post_Linker,
+	'TA10' : Target_Name,
+	'TA11' : Output_Directory_Path,
+	'TA12' : Output_Directory_Origin,
+	'TA13' : Pre_Linker,
+	'TA15' : Use_Relative_Paths,
+	'TA16' : Output_Directory_Location,
+	'UpTD' : up_to_date,
+	'VC01' : VCS_Active,
+	'VC02' : Connection_Method,
+	'VC03' : Username,
+	'VC04' : Password,
+	'VC05' : Auto_Connect,
+	'VC06' : Store_Password,
+	'VC07' : Always_Prompt,
+	'VC08' : Mount_Volume,
+	'VC09' : Database_Path,
 	'VC10' : Local_Path,
 	'VC11' : Use_Global_Settings,
-	'PLck' : seg_2d_locked,
-	'BW06' : Macros_Color,
-	'BW08' : Typedefs_Color,
-	'Dw01' : Debugging_Start_Action,
-	'BW05' : Globals_Color,
-	'BW04' : Functions_Color,
-	'Dt15' : Cache_symbolics,
-	'Dt14' : Temp_breakpoint_names,
-	'Dt13' : Stop_at_temp_breakpoint,
-	'BW00' : Browser_Keywords,
-	'BW03' : Enums_Color,
-	'Dt10' : Relocated_Executable_Path,
-	'DfFl' : implementation_file,
-	'BW01' : Classes_Color,
-	'TA03' : Precompiled,
-	'TA02' : Extension,
-	'PA05' : Require_Framework_Includes,
-	'PA04' : Convert_Paths,
-	'Root' : root,
-	'PA03' : System_Paths,
-	'PA02' : Always_Full_Search,
-	'VC09' : Database_Path,
-	'VC08' : Mount_Volume,
-	'Dg12' : Cache_Edited_Files,
-	'Dg13' : File_Cache_Duration,
-	'VC05' : Auto_Connect,
+	'Valu' : value,
 	'Virt' : virtual,
-	'VC07' : Always_Prompt,
-	'VC06' : Store_Password,
-	'VC01' : VCS_Active,
-	'VC03' : Username,
-	'VC02' : Connection_Method,
-	'FMps' : Mappings,
-	'TA09' : Post_Linker,
-	'DcEn' : declaration_end_offset,
+	'Weak' : weak_link,
+	'file' : disk_file,
+	'pnam' : name,
+	'ptps' : Text_Size,
+	'ptxf' : Text_Font,
 }
 
 _compdeclarations = {
 }
 
 _enumdeclarations = {
-	'Inte' : _Enum_Inte,
-	'DgBL' : _Enum_DgBL,
-	'STKd' : _Enum_STKd,
 	'Acce' : _Enum_Acce,
-	'RefP' : _Enum_RefP,
-	'TxtF' : _Enum_TxtF,
-	'PthF' : _Enum_PthF,
-	'TmpB' : _Enum_TmpB,
-	'Lang' : _Enum_Lang,
-	'savo' : _Enum_savo,
-	'DbSA' : _Enum_DbSA,
-	'SrcT' : _Enum_SrcT,
-	'PXdg' : _Enum_PXdg,
-	'ErrT' : _Enum_ErrT,
 	'BXbr' : _Enum_BXbr,
+	'DbSA' : _Enum_DbSA,
+	'DgBL' : _Enum_DgBL,
+	'ErrT' : _Enum_ErrT,
+	'Inte' : _Enum_Inte,
+	'Lang' : _Enum_Lang,
 	'PPrm' : _Enum_PPrm,
+	'PXdg' : _Enum_PXdg,
+	'PthF' : _Enum_PthF,
+	'RefP' : _Enum_RefP,
+	'STKd' : _Enum_STKd,
+	'SrcT' : _Enum_SrcT,
+	'TmpB' : _Enum_TmpB,
+	'TxtF' : _Enum_TxtF,
+	'savo' : _Enum_savo,
 }
diff --git a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/Standard_Suite.py b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/Standard_Suite.py
index c1b132d..676b7e1 100644
--- a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/Standard_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/Standard_Suite.py
@@ -179,44 +179,44 @@
 	"""user interaction - user interaction level """
 	which = 'inte'
 	want = 'Inte'
-#        element 'docu' as ['indx', 'name', 'rang']
 #        element 'cwin' as ['indx', 'name', 'rang']
+#        element 'docu' as ['indx', 'name', 'rang']
 
 class character(aetools.ComponentItem):
 	"""character - a character """
 	want = 'cha '
-class offset(aetools.NProperty):
-	"""offset - offset of a text object from the beginning of the document (first char has offset 1) """
-	which = 'pOff'
-	want = 'long'
 class length(aetools.NProperty):
 	"""length - length in characters of this object """
 	which = 'pLen'
 	want = 'long'
+class offset(aetools.NProperty):
+	"""offset - offset of a text object from the beginning of the document (first char has offset 1) """
+	which = 'pOff'
+	want = 'long'
 
 class document(aetools.ComponentItem):
 	"""document - a document """
 	want = 'docu'
-class name(aetools.NProperty):
-	"""name - the title of the document """
-	which = 'pnam'
-	want = 'itxt'
-class kind(aetools.NProperty):
-	"""kind - the kind of document """
-	which = 'DKND'
-	want = 'DKND'
-class index(aetools.NProperty):
-	"""index - the number of the document """
-	which = 'pidx'
-	want = 'long'
-class location(aetools.NProperty):
-	"""location - the file of the document """
-	which = 'FILE'
-	want = 'fss '
 class file_permissions(aetools.NProperty):
 	"""file permissions - the file permissions for the document """
 	which = 'PERM'
 	want = 'PERM'
+class index(aetools.NProperty):
+	"""index - the number of the document """
+	which = 'pidx'
+	want = 'long'
+class kind(aetools.NProperty):
+	"""kind - the kind of document """
+	which = 'DKND'
+	want = 'DKND'
+class location(aetools.NProperty):
+	"""location - the file of the document """
+	which = 'FILE'
+	want = 'fss '
+class name(aetools.NProperty):
+	"""name - the title of the document """
+	which = 'pnam'
+	want = 'itxt'
 class window(aetools.NProperty):
 	"""window - the window of the document. """
 	which = 'cwin'
@@ -295,18 +295,18 @@
 }
 character._superclassnames = []
 character._privpropdict = {
-	'offset' : offset,
 	'length' : length,
+	'offset' : offset,
 }
 character._privelemdict = {
 }
 document._superclassnames = []
 document._privpropdict = {
-	'name' : name,
-	'kind' : kind,
-	'index' : index,
-	'location' : location,
 	'file_permissions' : file_permissions,
+	'index' : index,
+	'kind' : kind,
+	'location' : location,
+	'name' : name,
 	'window' : window,
 }
 document._privelemdict = {
@@ -326,8 +326,8 @@
 line._superclassnames = []
 line._privpropdict = {
 	'index' : index,
-	'offset' : offset,
 	'length' : length,
+	'offset' : offset,
 }
 line._privelemdict = {
 	'character' : character,
@@ -356,10 +356,10 @@
 }
 window._superclassnames = []
 window._privpropdict = {
-	'name' : name,
-	'index' : index,
 	'bounds' : bounds,
 	'document' : document,
+	'index' : index,
+	'name' : name,
 	'position' : position,
 	'visible' : visible,
 	'zoomed' : zoomed,
@@ -371,33 +371,33 @@
 # Indices of types declared in this module
 #
 _classdeclarations = {
+	'capp' : application,
 	'cha ' : character,
-	'ctxt' : text,
-	'cwin' : window,
-	'file' : file,
+	'cins' : insertion_point,
 	'clin' : line,
 	'csel' : selection_2d_object,
-	'capp' : application,
-	'cins' : insertion_point,
+	'ctxt' : text,
+	'cwin' : window,
 	'docu' : document,
+	'file' : file,
 }
 
 _propdeclarations = {
-	'inte' : user_interaction,
-	'pvis' : visible,
 	'DKND' : kind,
-	'pbnd' : bounds,
-	'PERM' : file_permissions,
-	'docu' : document,
-	'pidx' : index,
-	'pOff' : offset,
-	'cwin' : window,
 	'FILE' : location,
-	'pnam' : name,
+	'PERM' : file_permissions,
+	'cwin' : window,
+	'docu' : document,
+	'inte' : user_interaction,
 	'pLen' : length,
-	'ppos' : position,
-	'pzum' : zoomed,
+	'pOff' : offset,
+	'pbnd' : bounds,
 	'pcnt' : contents,
+	'pidx' : index,
+	'pnam' : name,
+	'ppos' : position,
+	'pvis' : visible,
+	'pzum' : zoomed,
 }
 
 _compdeclarations = {
diff --git a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/__init__.py b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/__init__.py
index 0c98839..06a3485 100644
--- a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/__init__.py
@@ -48,6 +48,32 @@
 #
 # 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)
@@ -84,37 +110,37 @@
 getbaseclasses(Target_Source_Trees)
 getbaseclasses(Debugger_Display)
 getbaseclasses(class_)
-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)
 
 #
 # 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,
@@ -151,32 +177,6 @@
 	'TSTs' : Target_Source_Trees,
 	'DbDS' : Debugger_Display,
 	'Clas' : class_,
-	'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,
 }
 
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Containers_and_folders.py b/Lib/plat-mac/lib-scriptpackages/Finder/Containers_and_folders.py
index 4868fc7..f599298 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Containers_and_folders.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Containers_and_folders.py
@@ -22,10 +22,10 @@
 	"""<Inheritance> - inherits some of its properties from the item class """
 	which = 'c@#^'
 	want = 'cobj'
-class selection(aetools.NProperty):
-	"""selection - the selection visible to the user """
-	which = 'sele'
-	want = 'obj '
+class completely_expanded(aetools.NProperty):
+	"""completely expanded - Are the container and all of its children opened as outlines? (can only be set for containers viewed as lists) """
+	which = 'pexc'
+	want = 'bool'
 class entire_contents(aetools.NProperty):
 	"""entire contents - the entire contents of the container, including the contents of its children """
 	which = 'ects'
@@ -38,35 +38,35 @@
 	"""expanded - Is the container opened as an outline? (can only be set for containers viewed as lists) """
 	which = 'pexp'
 	want = 'bool'
-class completely_expanded(aetools.NProperty):
-	"""completely expanded - Are the container and all of its children opened as outlines? (can only be set for containers viewed as lists) """
-	which = 'pexc'
-	want = 'bool'
 class icon_size(aetools.NProperty):
-	"""icon size - the size of icons displayed in the window. Can be specified as a number, or ... """
+	"""icon size - ... alternatively, you can specify the icons size as a constant """
 	which = 'lvis'
-	want = 'long'
+	want = 'isiz'
+class selection(aetools.NProperty):
+	"""selection - the selection visible to the user """
+	which = 'sele'
+	want = 'obj '
 class view_options_window(aetools.NProperty):
 	"""view options window - the view options window for the container (can only be opened when the container window is open) """
 	which = 'vwnd'
 	want = 'vwnd'
-#        element 'cobj' as ['indx', 'name']
-#        element 'ctnr' as ['indx', 'name']
-#        element 'sctr' as ['indx', 'name']
-#        element 'cfol' as ['indx', 'name', 'ID  ']
-#        element 'file' as ['indx', 'name']
 #        element 'alia' as ['indx', 'name']
 #        element 'appf' as ['indx', 'name', 'ID  ']
-#        element 'docf' as ['indx', 'name']
-#        element 'fntf' as ['indx', 'name']
-#        element 'dafi' as ['indx', 'name']
-#        element 'inlf' as ['indx', 'name']
-#        element 'sndf' as ['indx', 'name']
+#        element 'cfol' as ['indx', 'name', 'ID  ']
 #        element 'clpf' as ['indx', 'name']
-#        element 'pack' as ['indx', 'name']
-#        element 'stcs' as ['indx', 'name']
-#        element 'fsut' as ['indx', 'name']
+#        element 'cobj' as ['indx', 'name']
+#        element 'ctnr' as ['indx', 'name']
+#        element 'dafi' as ['indx', 'name']
+#        element 'docf' as ['indx', 'name']
 #        element 'dsut' as ['indx', 'name']
+#        element 'file' as ['indx', 'name']
+#        element 'fntf' as ['indx', 'name']
+#        element 'fsut' as ['indx', 'name']
+#        element 'inlf' as ['indx', 'name']
+#        element 'pack' as ['indx', 'name']
+#        element 'sctr' as ['indx', 'name']
+#        element 'sndf' as ['indx', 'name']
+#        element 'stcs' as ['indx', 'name']
 
 containers = container
 
@@ -81,24 +81,24 @@
 	"""trash - the trash """
 	which = 'trsh'
 	want = 'ctrs'
-#        element 'cobj' as ['indx', 'name']
-#        element 'ctnr' as ['indx', 'name']
-#        element 'sctr' as ['indx', 'name']
-#        element 'cdis' as ['indx', 'name']
-#        element 'cfol' as ['indx', 'name', 'ID  ']
-#        element 'file' as ['indx', 'name']
 #        element 'alia' as ['indx', 'name']
 #        element 'appf' as ['indx', 'name', 'ID  ']
-#        element 'docf' as ['indx', 'name']
-#        element 'fntf' as ['indx', 'name']
-#        element 'dafi' as ['indx', 'name']
-#        element 'inlf' as ['indx', 'name']
-#        element 'sndf' as ['indx', 'name']
+#        element 'cdis' as ['indx', 'name']
+#        element 'cfol' as ['indx', 'name', 'ID  ']
 #        element 'clpf' as ['indx', 'name']
-#        element 'pack' as ['indx', 'name']
-#        element 'stcs' as ['indx', 'name']
-#        element 'fsut' as ['indx', 'name']
+#        element 'cobj' as ['indx', 'name']
+#        element 'ctnr' as ['indx', 'name']
+#        element 'dafi' as ['indx', 'name']
+#        element 'docf' as ['indx', 'name']
 #        element 'dsut' as ['indx', 'name']
+#        element 'file' as ['indx', 'name']
+#        element 'fntf' as ['indx', 'name']
+#        element 'fsut' as ['indx', 'name']
+#        element 'inlf' as ['indx', 'name']
+#        element 'pack' as ['indx', 'name']
+#        element 'sctr' as ['indx', 'name']
+#        element 'sndf' as ['indx', 'name']
+#        element 'stcs' as ['indx', 'name']
 
 class disk(aetools.ComponentItem):
 	"""disk - A disk """
@@ -107,14 +107,14 @@
 	"""capacity - the total number of bytes (free or used) on the disk """
 	which = 'capa'
 	want = 'long'
-class free_space(aetools.NProperty):
-	"""free space - the number of free bytes left on the disk """
-	which = 'frsp'
-	want = 'long'
 class ejectable(aetools.NProperty):
 	"""ejectable - Can the media be ejected (floppies, CD's, and so on)? """
 	which = 'isej'
 	want = 'bool'
+class free_space(aetools.NProperty):
+	"""free space - the number of free bytes left on the disk """
+	which = 'frsp'
+	want = 'long'
 class local_volume(aetools.NProperty):
 	"""local volume - Is the media a local volume (as opposed to a file server)? """
 	which = 'isrv'
@@ -123,64 +123,60 @@
 	"""startup - Is this disk the boot disk? """
 	which = 'istd'
 	want = 'bool'
-#        element 'cobj' as ['indx', 'name']
-#        element 'ctnr' as ['indx', 'name']
-#        element 'sctr' as ['indx', 'name']
-#        element 'cfol' as ['indx', 'name', 'ID  ']
-#        element 'file' as ['indx', 'name']
 #        element 'alia' as ['indx', 'name']
 #        element 'appf' as ['indx', 'name', 'ID  ']
-#        element 'docf' as ['indx', 'name']
-#        element 'fntf' as ['indx', 'name']
-#        element 'dafi' as ['indx', 'name']
-#        element 'inlf' as ['indx', 'name']
-#        element 'sndf' as ['indx', 'name']
+#        element 'cfol' as ['indx', 'name', 'ID  ']
 #        element 'clpf' as ['indx', 'name']
-#        element 'pack' as ['indx', 'name']
-#        element 'stcs' as ['indx', 'name']
-#        element 'fsut' as ['indx', 'name']
+#        element 'cobj' as ['indx', 'name']
+#        element 'ctnr' as ['indx', 'name']
+#        element 'dafi' as ['indx', 'name']
+#        element 'docf' as ['indx', 'name']
 #        element 'dsut' as ['indx', 'name']
+#        element 'file' as ['indx', 'name']
+#        element 'fntf' as ['indx', 'name']
+#        element 'fsut' as ['indx', 'name']
+#        element 'inlf' as ['indx', 'name']
+#        element 'pack' as ['indx', 'name']
+#        element 'sctr' as ['indx', 'name']
+#        element 'sndf' as ['indx', 'name']
+#        element 'stcs' as ['indx', 'name']
 
 disks = disk
 
 class folder(aetools.ComponentItem):
 	"""folder - A folder """
 	want = 'cfol'
-#        element 'cobj' as ['indx', 'name']
-#        element 'ctnr' as ['indx', 'name']
-#        element 'sctr' as ['indx', 'name']
-#        element 'cfol' as ['indx', 'name', 'ID  ']
-#        element 'file' as ['indx', 'name']
 #        element 'alia' as ['indx', 'name']
 #        element 'appf' as ['indx', 'name', 'ID  ']
-#        element 'docf' as ['indx', 'name']
-#        element 'fntf' as ['indx', 'name']
-#        element 'dafi' as ['indx', 'name']
-#        element 'inlf' as ['indx', 'name']
-#        element 'sndf' as ['indx', 'name']
+#        element 'cfol' as ['indx', 'name', 'ID  ']
 #        element 'clpf' as ['indx', 'name']
-#        element 'pack' as ['indx', 'name']
-#        element 'stcs' as ['indx', 'name']
-#        element 'fsut' as ['indx', 'name']
+#        element 'cobj' as ['indx', 'name']
+#        element 'ctnr' as ['indx', 'name']
+#        element 'dafi' as ['indx', 'name']
+#        element 'docf' as ['indx', 'name']
 #        element 'dsut' as ['indx', 'name']
+#        element 'file' as ['indx', 'name']
+#        element 'fntf' as ['indx', 'name']
+#        element 'fsut' as ['indx', 'name']
+#        element 'inlf' as ['indx', 'name']
+#        element 'pack' as ['indx', 'name']
+#        element 'sctr' as ['indx', 'name']
+#        element 'sndf' as ['indx', 'name']
+#        element 'stcs' as ['indx', 'name']
 
 folders = folder
 
 class sharable_container(aetools.ComponentItem):
 	"""sharable container - A container that may be shared (disks and folders) """
 	want = 'sctr'
-class owner(aetools.NProperty):
-	"""owner - the user that owns the container (file sharing must be on to use this property) """
-	which = 'sown'
-	want = 'itxt'
+class exported(aetools.NProperty):
+	"""exported - Is the container a share point or inside a share point, i.e., can the container be shared? (file sharing must be on to use this property) """
+	which = 'sexp'
+	want = 'bool'
 class group(aetools.NProperty):
 	"""group - the user or group that has special access to the container (file sharing must be on to use this property) """
 	which = 'sgrp'
 	want = 'itxt'
-class owner_privileges(aetools.NProperty):
-	"""owner privileges - the see folders/see files/make changes privileges for the owner (file sharing must be on to use this property) """
-	which = 'ownr'
-	want = 'priv'
 class group_privileges(aetools.NProperty):
 	"""group privileges - the see folders/see files/make changes privileges for the group (file sharing must be on to use this property) """
 	which = 'gppr'
@@ -189,60 +185,64 @@
 	"""guest privileges - the see folders/see files/make changes privileges for everyone (file sharing must be on to use this property) """
 	which = 'gstp'
 	want = 'priv'
-class privileges_inherited(aetools.NProperty):
-	"""privileges inherited - Are the privileges of the container always the same as the container in which it is stored? (file sharing must be on to use this property) """
-	which = 'iprv'
-	want = 'bool'
 class mounted(aetools.NProperty):
 	"""mounted - Is the container mounted on another machine's desktop? (file sharing must be on to use this property) """
 	which = 'smou'
 	want = 'bool'
-class exported(aetools.NProperty):
-	"""exported - Is the container a share point or inside a share point, i.e., can the container be shared? (file sharing must be on to use this property) """
-	which = 'sexp'
-	want = 'bool'
-class shared(aetools.NProperty):
-	"""shared - Is the container a share point, i.e., is the container currently being shared? (file sharing must be on to use this property) """
-	which = 'shar'
+class owner(aetools.NProperty):
+	"""owner - the user that owns the container (file sharing must be on to use this property) """
+	which = 'sown'
+	want = 'itxt'
+class owner_privileges(aetools.NProperty):
+	"""owner privileges - the see folders/see files/make changes privileges for the owner (file sharing must be on to use this property) """
+	which = 'ownr'
+	want = 'priv'
+class privileges_inherited(aetools.NProperty):
+	"""privileges inherited - Are the privileges of the container always the same as the container in which it is stored? (file sharing must be on to use this property) """
+	which = 'iprv'
 	want = 'bool'
 class protected(aetools.NProperty):
 	"""protected - Is the container protected from being moved, renamed and deleted? (file sharing must be on to use this property) """
 	which = 'spro'
 	want = 'bool'
-#        element 'cobj' as ['indx', 'name']
-#        element 'ctnr' as ['indx', 'name']
-#        element 'sctr' as ['indx', 'name']
-#        element 'cfol' as ['indx', 'name', 'ID  ']
-#        element 'file' as ['indx', 'name']
+class shared(aetools.NProperty):
+	"""shared - Is the container a share point, i.e., is the container currently being shared? (file sharing must be on to use this property) """
+	which = 'shar'
+	want = 'bool'
 #        element 'alia' as ['indx', 'name']
 #        element 'appf' as ['indx', 'name', 'ID  ']
-#        element 'docf' as ['indx', 'name']
-#        element 'fntf' as ['indx', 'name']
-#        element 'dafi' as ['indx', 'name']
-#        element 'inlf' as ['indx', 'name']
-#        element 'sndf' as ['indx', 'name']
+#        element 'cfol' as ['indx', 'name', 'ID  ']
 #        element 'clpf' as ['indx', 'name']
-#        element 'pack' as ['indx', 'name']
-#        element 'stcs' as ['indx', 'name']
-#        element 'fsut' as ['indx', 'name']
+#        element 'cobj' as ['indx', 'name']
+#        element 'ctnr' as ['indx', 'name']
+#        element 'dafi' as ['indx', 'name']
+#        element 'docf' as ['indx', 'name']
 #        element 'dsut' as ['indx', 'name']
+#        element 'file' as ['indx', 'name']
+#        element 'fntf' as ['indx', 'name']
+#        element 'fsut' as ['indx', 'name']
+#        element 'inlf' as ['indx', 'name']
+#        element 'pack' as ['indx', 'name']
+#        element 'sctr' as ['indx', 'name']
+#        element 'sndf' as ['indx', 'name']
+#        element 'stcs' as ['indx', 'name']
 
 sharable_containers = sharable_container
 
 class sharing_privileges(aetools.ComponentItem):
 	"""sharing privileges - A set of sharing properties (used in sharable containers) """
 	want = 'priv'
-class see_folders(aetools.NProperty):
-	"""see folders - Can folders be seen? """
-	which = 'prvs'
+class make_changes(aetools.NProperty):
+	"""make changes - Can changes be made? """
+	which = 'prvw'
 	want = 'bool'
 class see_files(aetools.NProperty):
 	"""see files - Can files be seen? """
 	which = 'prvr'
 	want = 'bool'
-class make_changes(aetools.NProperty):
-	"""make changes - Can changes be made? """
-	which = 'prvw'
+class see_folders(aetools.NProperty):
+	"""see folders - Can folders be seen? """
+	which = 'prvs'
 	want = 'bool'
 
 class trash_2d_object(aetools.ComponentItem):
@@ -252,55 +252,55 @@
 	"""warns before emptying - Display a dialog when emptying the trash? """
 	which = 'warn'
 	want = 'bool'
-#        element 'cobj' as ['indx', 'name']
-#        element 'ctnr' as ['indx', 'name']
-#        element 'sctr' as ['indx', 'name']
-#        element 'cfol' as ['indx', 'name', 'ID  ']
-#        element 'file' as ['indx', 'name']
 #        element 'alia' as ['indx', 'name']
 #        element 'appf' as ['indx', 'name', 'ID  ']
-#        element 'docf' as ['indx', 'name']
-#        element 'fntf' as ['indx', 'name']
-#        element 'dafi' as ['indx', 'name']
-#        element 'inlf' as ['indx', 'name']
-#        element 'sndf' as ['indx', 'name']
+#        element 'cfol' as ['indx', 'name', 'ID  ']
 #        element 'clpf' as ['indx', 'name']
-#        element 'pack' as ['indx', 'name']
-#        element 'stcs' as ['indx', 'name']
-#        element 'fsut' as ['indx', 'name']
+#        element 'cobj' as ['indx', 'name']
+#        element 'ctnr' as ['indx', 'name']
+#        element 'dafi' as ['indx', 'name']
+#        element 'docf' as ['indx', 'name']
 #        element 'dsut' as ['indx', 'name']
+#        element 'file' as ['indx', 'name']
+#        element 'fntf' as ['indx', 'name']
+#        element 'fsut' as ['indx', 'name']
+#        element 'inlf' as ['indx', 'name']
+#        element 'pack' as ['indx', 'name']
+#        element 'sctr' as ['indx', 'name']
+#        element 'sndf' as ['indx', 'name']
+#        element 'stcs' as ['indx', 'name']
 import Earlier_terms
 container._superclassnames = ['item']
 import Files_and_suitcases
 container._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'selection' : selection,
+	'completely_expanded' : completely_expanded,
 	'entire_contents' : entire_contents,
 	'expandable' : expandable,
 	'expanded' : expanded,
-	'completely_expanded' : completely_expanded,
 	'icon_size' : icon_size,
 	'icon_size' : icon_size,
+	'selection' : selection,
 	'view_options_window' : view_options_window,
 }
 container._privelemdict = {
-	'item' : Earlier_terms.item,
-	'container' : container,
-	'sharable_container' : sharable_container,
-	'folder' : folder,
-	'file' : Files_and_suitcases.file,
+	'accessory_suitcase' : Earlier_terms.accessory_suitcase,
 	'alias_file' : Files_and_suitcases.alias_file,
 	'application_file' : Earlier_terms.application_file,
-	'document_file' : Files_and_suitcases.document_file,
-	'font_file' : Files_and_suitcases.font_file,
-	'desk_accessory_file' : Files_and_suitcases.desk_accessory_file,
-	'internet_location' : Earlier_terms.internet_location,
-	'sound_file' : Files_and_suitcases.sound_file,
 	'clipping' : Files_and_suitcases.clipping,
-	'package' : Files_and_suitcases.package,
-	'suitcase' : Files_and_suitcases.suitcase,
+	'container' : container,
+	'desk_accessory_file' : Files_and_suitcases.desk_accessory_file,
+	'document_file' : Files_and_suitcases.document_file,
+	'file' : Files_and_suitcases.file,
+	'folder' : folder,
+	'font_file' : Files_and_suitcases.font_file,
 	'font_suitcase' : Files_and_suitcases.font_suitcase,
-	'accessory_suitcase' : Earlier_terms.accessory_suitcase,
+	'internet_location' : Earlier_terms.internet_location,
+	'item' : Earlier_terms.item,
+	'package' : Files_and_suitcases.package,
+	'sharable_container' : sharable_container,
+	'sound_file' : Files_and_suitcases.sound_file,
+	'suitcase' : Files_and_suitcases.suitcase,
 }
 desktop_2d_object._superclassnames = ['container']
 desktop_2d_object._privpropdict = {
@@ -309,114 +309,114 @@
 	'trash' : trash,
 }
 desktop_2d_object._privelemdict = {
-	'item' : Earlier_terms.item,
-	'container' : container,
-	'sharable_container' : sharable_container,
-	'disk' : disk,
-	'folder' : folder,
-	'file' : Files_and_suitcases.file,
+	'accessory_suitcase' : Earlier_terms.accessory_suitcase,
 	'alias_file' : Files_and_suitcases.alias_file,
 	'application_file' : Earlier_terms.application_file,
-	'document_file' : Files_and_suitcases.document_file,
-	'font_file' : Files_and_suitcases.font_file,
-	'desk_accessory_file' : Files_and_suitcases.desk_accessory_file,
-	'internet_location' : Earlier_terms.internet_location,
-	'sound_file' : Files_and_suitcases.sound_file,
 	'clipping' : Files_and_suitcases.clipping,
-	'package' : Files_and_suitcases.package,
-	'suitcase' : Files_and_suitcases.suitcase,
+	'container' : container,
+	'desk_accessory_file' : Files_and_suitcases.desk_accessory_file,
+	'disk' : disk,
+	'document_file' : Files_and_suitcases.document_file,
+	'file' : Files_and_suitcases.file,
+	'folder' : folder,
+	'font_file' : Files_and_suitcases.font_file,
 	'font_suitcase' : Files_and_suitcases.font_suitcase,
-	'accessory_suitcase' : Earlier_terms.accessory_suitcase,
+	'internet_location' : Earlier_terms.internet_location,
+	'item' : Earlier_terms.item,
+	'package' : Files_and_suitcases.package,
+	'sharable_container' : sharable_container,
+	'sound_file' : Files_and_suitcases.sound_file,
+	'suitcase' : Files_and_suitcases.suitcase,
 }
 disk._superclassnames = ['sharable_container']
 disk._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
 	'capacity' : capacity,
-	'free_space' : free_space,
 	'ejectable' : ejectable,
+	'free_space' : free_space,
 	'local_volume' : local_volume,
 	'startup' : startup,
 }
 disk._privelemdict = {
-	'item' : Earlier_terms.item,
-	'container' : container,
-	'sharable_container' : sharable_container,
-	'folder' : folder,
-	'file' : Files_and_suitcases.file,
+	'accessory_suitcase' : Earlier_terms.accessory_suitcase,
 	'alias_file' : Files_and_suitcases.alias_file,
 	'application_file' : Earlier_terms.application_file,
-	'document_file' : Files_and_suitcases.document_file,
-	'font_file' : Files_and_suitcases.font_file,
-	'desk_accessory_file' : Files_and_suitcases.desk_accessory_file,
-	'internet_location' : Earlier_terms.internet_location,
-	'sound_file' : Files_and_suitcases.sound_file,
 	'clipping' : Files_and_suitcases.clipping,
-	'package' : Files_and_suitcases.package,
-	'suitcase' : Files_and_suitcases.suitcase,
+	'container' : container,
+	'desk_accessory_file' : Files_and_suitcases.desk_accessory_file,
+	'document_file' : Files_and_suitcases.document_file,
+	'file' : Files_and_suitcases.file,
+	'folder' : folder,
+	'font_file' : Files_and_suitcases.font_file,
 	'font_suitcase' : Files_and_suitcases.font_suitcase,
-	'accessory_suitcase' : Earlier_terms.accessory_suitcase,
+	'internet_location' : Earlier_terms.internet_location,
+	'item' : Earlier_terms.item,
+	'package' : Files_and_suitcases.package,
+	'sharable_container' : sharable_container,
+	'sound_file' : Files_and_suitcases.sound_file,
+	'suitcase' : Files_and_suitcases.suitcase,
 }
 folder._superclassnames = ['sharable_container']
 folder._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
 }
 folder._privelemdict = {
-	'item' : Earlier_terms.item,
-	'container' : container,
-	'sharable_container' : sharable_container,
-	'folder' : folder,
-	'file' : Files_and_suitcases.file,
+	'accessory_suitcase' : Earlier_terms.accessory_suitcase,
 	'alias_file' : Files_and_suitcases.alias_file,
 	'application_file' : Earlier_terms.application_file,
-	'document_file' : Files_and_suitcases.document_file,
-	'font_file' : Files_and_suitcases.font_file,
-	'desk_accessory_file' : Files_and_suitcases.desk_accessory_file,
-	'internet_location' : Earlier_terms.internet_location,
-	'sound_file' : Files_and_suitcases.sound_file,
 	'clipping' : Files_and_suitcases.clipping,
-	'package' : Files_and_suitcases.package,
-	'suitcase' : Files_and_suitcases.suitcase,
+	'container' : container,
+	'desk_accessory_file' : Files_and_suitcases.desk_accessory_file,
+	'document_file' : Files_and_suitcases.document_file,
+	'file' : Files_and_suitcases.file,
+	'folder' : folder,
+	'font_file' : Files_and_suitcases.font_file,
 	'font_suitcase' : Files_and_suitcases.font_suitcase,
-	'accessory_suitcase' : Earlier_terms.accessory_suitcase,
+	'internet_location' : Earlier_terms.internet_location,
+	'item' : Earlier_terms.item,
+	'package' : Files_and_suitcases.package,
+	'sharable_container' : sharable_container,
+	'sound_file' : Files_and_suitcases.sound_file,
+	'suitcase' : Files_and_suitcases.suitcase,
 }
 sharable_container._superclassnames = ['container']
 sharable_container._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'owner' : owner,
+	'exported' : exported,
 	'group' : group,
-	'owner_privileges' : owner_privileges,
 	'group_privileges' : group_privileges,
 	'guest_privileges' : guest_privileges,
-	'privileges_inherited' : privileges_inherited,
 	'mounted' : mounted,
-	'exported' : exported,
-	'shared' : shared,
+	'owner' : owner,
+	'owner_privileges' : owner_privileges,
+	'privileges_inherited' : privileges_inherited,
 	'protected' : protected,
+	'shared' : shared,
 }
 sharable_container._privelemdict = {
-	'item' : Earlier_terms.item,
-	'container' : container,
-	'sharable_container' : sharable_container,
-	'folder' : folder,
-	'file' : Files_and_suitcases.file,
+	'accessory_suitcase' : Earlier_terms.accessory_suitcase,
 	'alias_file' : Files_and_suitcases.alias_file,
 	'application_file' : Earlier_terms.application_file,
-	'document_file' : Files_and_suitcases.document_file,
-	'font_file' : Files_and_suitcases.font_file,
-	'desk_accessory_file' : Files_and_suitcases.desk_accessory_file,
-	'internet_location' : Earlier_terms.internet_location,
-	'sound_file' : Files_and_suitcases.sound_file,
 	'clipping' : Files_and_suitcases.clipping,
-	'package' : Files_and_suitcases.package,
-	'suitcase' : Files_and_suitcases.suitcase,
+	'container' : container,
+	'desk_accessory_file' : Files_and_suitcases.desk_accessory_file,
+	'document_file' : Files_and_suitcases.document_file,
+	'file' : Files_and_suitcases.file,
+	'folder' : folder,
+	'font_file' : Files_and_suitcases.font_file,
 	'font_suitcase' : Files_and_suitcases.font_suitcase,
-	'accessory_suitcase' : Earlier_terms.accessory_suitcase,
+	'internet_location' : Earlier_terms.internet_location,
+	'item' : Earlier_terms.item,
+	'package' : Files_and_suitcases.package,
+	'sharable_container' : sharable_container,
+	'sound_file' : Files_and_suitcases.sound_file,
+	'suitcase' : Files_and_suitcases.suitcase,
 }
 sharing_privileges._superclassnames = []
 sharing_privileges._privpropdict = {
-	'see_folders' : see_folders,
-	'see_files' : see_files,
 	'make_changes' : make_changes,
+	'see_files' : see_files,
+	'see_folders' : see_folders,
 }
 sharing_privileges._privelemdict = {
 }
@@ -426,68 +426,68 @@
 	'warns_before_emptying' : warns_before_emptying,
 }
 trash_2d_object._privelemdict = {
-	'item' : Earlier_terms.item,
-	'container' : container,
-	'sharable_container' : sharable_container,
-	'folder' : folder,
-	'file' : Files_and_suitcases.file,
+	'accessory_suitcase' : Earlier_terms.accessory_suitcase,
 	'alias_file' : Files_and_suitcases.alias_file,
 	'application_file' : Earlier_terms.application_file,
-	'document_file' : Files_and_suitcases.document_file,
-	'font_file' : Files_and_suitcases.font_file,
-	'desk_accessory_file' : Files_and_suitcases.desk_accessory_file,
-	'internet_location' : Earlier_terms.internet_location,
-	'sound_file' : Files_and_suitcases.sound_file,
 	'clipping' : Files_and_suitcases.clipping,
-	'package' : Files_and_suitcases.package,
-	'suitcase' : Files_and_suitcases.suitcase,
+	'container' : container,
+	'desk_accessory_file' : Files_and_suitcases.desk_accessory_file,
+	'document_file' : Files_and_suitcases.document_file,
+	'file' : Files_and_suitcases.file,
+	'folder' : folder,
+	'font_file' : Files_and_suitcases.font_file,
 	'font_suitcase' : Files_and_suitcases.font_suitcase,
-	'accessory_suitcase' : Earlier_terms.accessory_suitcase,
+	'internet_location' : Earlier_terms.internet_location,
+	'item' : Earlier_terms.item,
+	'package' : Files_and_suitcases.package,
+	'sharable_container' : sharable_container,
+	'sound_file' : Files_and_suitcases.sound_file,
+	'suitcase' : Files_and_suitcases.suitcase,
 }
 
 #
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'ctrs' : trash_2d_object,
-	'cdsk' : desktop_2d_object,
-	'sctr' : sharable_container,
 	'cdis' : disk,
-	'ctnr' : container,
+	'cdsk' : desktop_2d_object,
 	'cfol' : folder,
+	'ctnr' : container,
+	'ctrs' : trash_2d_object,
 	'priv' : sharing_privileges,
+	'sctr' : sharable_container,
 }
 
 _propdeclarations = {
-	'pexp' : expanded,
-	'iprv' : privileges_inherited,
-	'gstp' : guest_privileges,
+	'c@#^' : _3c_Inheritance_3e_,
+	'capa' : capacity,
 	'ects' : entire_contents,
-	'lvis' : icon_size,
+	'frsp' : free_space,
 	'gppr' : group_privileges,
+	'gstp' : guest_privileges,
+	'iprv' : privileges_inherited,
+	'isej' : ejectable,
 	'isrv' : local_volume,
-	'prvs' : see_folders,
+	'istd' : startup,
+	'lvis' : icon_size,
+	'ownr' : owner_privileges,
 	'pexa' : expandable,
 	'pexc' : completely_expanded,
+	'pexp' : expanded,
+	'prvr' : see_files,
+	'prvs' : see_folders,
+	'prvw' : make_changes,
+	'sdsk' : startup_disk,
+	'sele' : selection,
+	'sexp' : exported,
+	'sgrp' : group,
+	'shar' : shared,
+	'smou' : mounted,
+	'sown' : owner,
+	'spro' : protected,
+	'trsh' : trash,
 	'vwnd' : view_options_window,
 	'warn' : warns_before_emptying,
-	'sown' : owner,
-	'prvw' : make_changes,
-	'isej' : ejectable,
-	'capa' : capacity,
-	'shar' : shared,
-	'sexp' : exported,
-	'sdsk' : startup_disk,
-	'istd' : startup,
-	'prvr' : see_files,
-	'c@#^' : _3c_Inheritance_3e_,
-	'smou' : mounted,
-	'sele' : selection,
-	'trsh' : trash,
-	'sgrp' : group,
-	'frsp' : free_space,
-	'spro' : protected,
-	'ownr' : owner_privileges,
 }
 
 _compdeclarations = {
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Earlier_terms.py b/Lib/plat-mac/lib-scriptpackages/Finder/Earlier_terms.py
index aef824b..b38246e 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Earlier_terms.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Earlier_terms.py
@@ -31,14 +31,34 @@
 class application(aetools.ComponentItem):
 	"""application - The Finder """
 	want = 'capp'
-class properties(aetools.NProperty):
-	"""properties - property that allows getting and setting of multiple properties """
-	which = 'qpro'
-	want = 'reco'
+class Finder_preferences(aetools.NProperty):
+	"""Finder preferences - Various preferences that apply to the Finder as a whole """
+	which = 'pfrp'
+	want = 'obj '
+class about_this_computer(aetools.NProperty):
+	"""about this computer - the \xd2About this Computer\xd3 dialog and the list of running processes displayed in it """
+	which = 'abbx'
+	want = 'obj '
 class clipboard(aetools.NProperty):
 	"""clipboard - the Finder\xd5s clipboard window """
 	which = 'pcli'
 	want = 'obj '
+class desktop(aetools.NProperty):
+	"""desktop - the desktop """
+	which = 'desk'
+	want = 'cdsk'
+class file_sharing(aetools.NProperty):
+	"""file sharing - Is file sharing on? """
+	which = 'fshr'
+	want = 'bool'
+class frontmost(aetools.NProperty):
+	"""frontmost - Is the Finder the frontmost process? """
+	which = 'pisf'
+	want = 'bool'
+class insertion_location(aetools.NProperty):
+	"""insertion location - the container in which a new folder would appear if \xd2New Folder\xd3 was selected """
+	which = 'pins'
+	want = 'obj '
 class largest_free_block(aetools.NProperty):
 	"""largest free block - the largest free block of process memory available to launch an application """
 	which = 'mfre'
@@ -47,50 +67,30 @@
 	"""name - the Finder\xd5s name """
 	which = 'pnam'
 	want = 'itxt'
-class visible(aetools.NProperty):
-	"""visible - Is the Finder\xd5s layer visible? """
-	which = 'pvis'
-	want = 'bool'
-class frontmost(aetools.NProperty):
-	"""frontmost - Is the Finder the frontmost process? """
-	which = 'pisf'
-	want = 'bool'
-class selection(aetools.NProperty):
-	"""selection - the selection visible to the user """
-	which = 'sele'
-	want = 'obj '
-class insertion_location(aetools.NProperty):
-	"""insertion location - the container in which a new folder would appear if \xd2New Folder\xd3 was selected """
-	which = 'pins'
-	want = 'obj '
-class file_sharing(aetools.NProperty):
-	"""file sharing - Is file sharing on? """
-	which = 'fshr'
-	want = 'bool'
-class sharing_starting_up(aetools.NProperty):
-	"""sharing starting up - Is file sharing in the process of starting up? """
-	which = 'fsup'
-	want = 'bool'
 class product_version(aetools.NProperty):
 	"""product version - the version of the System software running on this computer """
 	which = 'ver2'
 	want = 'itxt'
+class properties(aetools.NProperty):
+	"""properties - property that allows getting and setting of multiple properties """
+	which = 'qpro'
+	want = 'reco'
+class selection(aetools.NProperty):
+	"""selection - the selection visible to the user """
+	which = 'sele'
+	want = 'obj '
+class sharing_starting_up(aetools.NProperty):
+	"""sharing starting up - Is file sharing in the process of starting up? """
+	which = 'fsup'
+	want = 'bool'
 class version(aetools.NProperty):
 	"""version - the version of the Finder """
 	which = 'vers'
 	want = 'itxt'
-class about_this_computer(aetools.NProperty):
-	"""about this computer - the \xd2About this Computer\xd3 dialog and the list of running processes displayed in it """
-	which = 'abbx'
-	want = 'obj '
-class desktop(aetools.NProperty):
-	"""desktop - the desktop """
-	which = 'desk'
-	want = 'cdsk'
-class Finder_preferences(aetools.NProperty):
-	"""Finder preferences - Various preferences that apply to the Finder as a whole """
-	which = 'pfrp'
-	want = 'obj '
+class visible(aetools.NProperty):
+	"""visible - Is the Finder\xd5s layer visible? """
+	which = 'pvis'
+	want = 'bool'
 
 class application_file(aetools.ComponentItem):
 	"""application file - An application's file on disk """
@@ -107,54 +107,42 @@
 	"""partition size - the memory size with which the application will be launched """
 	which = 'appt'
 	want = 'long'
-class suggested_partition_size(aetools.NProperty):
-	"""suggested partition size - the memory size with which the developer recommends the application be launched """
-	which = 'sprt'
-	want = 'long'
 class scriptable(aetools.NProperty):
 	"""scriptable - Is the application high-level event aware? """
 	which = 'isab'
 	want = 'bool'
+class suggested_partition_size(aetools.NProperty):
+	"""suggested partition size - the memory size with which the developer recommends the application be launched """
+	which = 'sprt'
+	want = 'long'
 
 class container_window(aetools.ComponentItem):
 	"""container window - A window that contains items """
 	want = 'cwnd'
+class button_view_arrangement(aetools.NProperty):
+	"""button view arrangement - the property by which to keep icons arranged within a button view window """
+	which = 'barr'
+	want = 'earr'
+class calculate_folder_sizes(aetools.NProperty):
+	"""calculate folder sizes - Are folder sizes calculated and displayed in the window? (does not apply to suitcase windows) """
+	which = 'sfsz'
+	want = 'bool'
 class container(aetools.NProperty):
 	"""container - the container from which the window was opened """
 	which = 'ctnr'
 	want = 'obj '
-class item(aetools.NProperty):
-	"""item - the item from which the window was opened (always returns something) """
-	which = 'cobj'
-	want = 'obj '
 class has_custom_view_settings(aetools.NProperty):
 	"""has custom view settings - Does the folder have custom view settings or is it using the default global settings? """
 	which = 'cuss'
 	want = 'long'
-class view(aetools.NProperty):
-	"""view - the current view for the window (icon, name, date, etc.) """
-	which = 'pvew'
-	want = 'long'
+class item(aetools.NProperty):
+	"""item - the item from which the window was opened (always returns something) """
+	which = 'cobj'
+	want = 'obj '
 class previous_list_view(aetools.NProperty):
 	"""previous list view - the last non-icon view (by name, by date, etc.) selected for the container (forgotten as soon as the window is closed and only available when the window is open) """
 	which = 'svew'
 	want = 'enum'
-class button_view_arrangement(aetools.NProperty):
-	"""button view arrangement - the property by which to keep icons arranged within a button view window """
-	which = 'barr'
-	want = 'earr'
-class spatial_view_arrangement(aetools.NProperty):
-	"""spatial view arrangement - the property by which to keep icons arranged within a spatial view window """
-	which = 'iarr'
-	want = 'earr'
-class sort_direction(aetools.NProperty):
-	"""sort direction - The direction in which the window is sorted """
-	which = 'sord'
-	want = 'sodr'
-class calculate_folder_sizes(aetools.NProperty):
-	"""calculate folder sizes - Are folder sizes calculated and displayed in the window? (does not apply to suitcase windows) """
-	which = 'sfsz'
-	want = 'bool'
 class show_comments(aetools.NProperty):
 	"""show comments - Are comments displayed in the window? (does not apply to suitcases) """
 	which = 'scom'
@@ -183,10 +171,22 @@
 	"""show version - Are file versions displayed in the window? (does not apply to suitcase windows) """
 	which = 'svrs'
 	want = 'bool'
+class sort_direction(aetools.NProperty):
+	"""sort direction - The direction in which the window is sorted """
+	which = 'sord'
+	want = 'sodr'
+class spatial_view_arrangement(aetools.NProperty):
+	"""spatial view arrangement - the property by which to keep icons arranged within a spatial view window """
+	which = 'iarr'
+	want = 'earr'
 class use_relative_dates(aetools.NProperty):
 	"""use relative dates - Are relative dates (e.g., today, yesterday) shown in the window? """
 	which = 'urdt'
 	want = 'bool'
+class view(aetools.NProperty):
+	"""view - the current view for the window (icon, name, date, etc.) """
+	which = 'pvew'
+	want = 'long'
 
 class information_window(aetools.ComponentItem):
 	"""information window - An information window (opened by \xd2Get Info\xd3) """
@@ -195,22 +195,10 @@
 	"""comment - the comment """
 	which = 'comt'
 	want = 'itxt'
-class size(aetools.NProperty):
-	"""size - the logical size of the item """
-	which = 'ptsz'
-	want = 'long'
-class physical_size(aetools.NProperty):
-	"""physical size - the actual space used by the item on disk """
-	which = 'phys'
-	want = 'long'
 class creation_date(aetools.NProperty):
 	"""creation date - the date on which the item was created """
 	which = 'ascd'
 	want = 'ldt '
-class modification_date(aetools.NProperty):
-	"""modification date - the date on which the item was last modified """
-	which = 'asmo'
-	want = 'ldt '
 class icon(aetools.NProperty):
 	"""icon - the icon bitmap of the item """
 	which = 'iimg'
@@ -219,6 +207,18 @@
 	"""locked - Is the item locked (applies only to file and application information windows)? """
 	which = 'aslk'
 	want = 'bool'
+class modification_date(aetools.NProperty):
+	"""modification date - the date on which the item was last modified """
+	which = 'asmo'
+	want = 'ldt '
+class physical_size(aetools.NProperty):
+	"""physical size - the actual space used by the item on disk """
+	which = 'phys'
+	want = 'long'
+class size(aetools.NProperty):
+	"""size - the logical size of the item """
+	which = 'ptsz'
+	want = 'long'
 class stationery(aetools.NProperty):
 	"""stationery - Is the item a stationery pad? """
 	which = 'pspd'
@@ -237,14 +237,18 @@
 class item(aetools.ComponentItem):
 	"""item - An item """
 	want = 'cobj'
-class index(aetools.NProperty):
-	"""index - the index in the front-to-back ordering within its container """
-	which = 'pidx'
-	want = 'long'
-class id(aetools.NProperty):
-	"""id - an id that identifies the item """
-	which = 'ID  '
-	want = 'long'
+class bounds(aetools.NProperty):
+	"""bounds - the bounding rectangle of the item (can only be set for an item in a window viewed as icons or buttons) """
+	which = 'pbnd'
+	want = 'qdrt'
+class content_space(aetools.NProperty):
+	"""content space - the window that would open if the item was opened """
+	which = 'dwnd'
+	want = 'obj '
+class description(aetools.NProperty):
+	"""description - a description of the item """
+	which = 'dscr'
+	want = 'itxt'
 class disk(aetools.NProperty):
 	"""disk - the disk on which the item is stored """
 	which = 'cdis'
@@ -253,42 +257,38 @@
 	"""folder - the folder in which the item is stored """
 	which = 'asdr'
 	want = 'obj '
-class position(aetools.NProperty):
-	"""position - the position of the item within its parent window (can only be set for an item in a window viewed as icons or buttons) """
-	which = 'posn'
-	want = 'QDpt'
-class bounds(aetools.NProperty):
-	"""bounds - the bounding rectangle of the item (can only be set for an item in a window viewed as icons or buttons) """
-	which = 'pbnd'
-	want = 'qdrt'
-class label_index(aetools.NProperty):
-	"""label index - the label of the item """
-	which = 'labi'
+class id(aetools.NProperty):
+	"""id - an id that identifies the item """
+	which = 'ID  '
 	want = 'long'
+class index(aetools.NProperty):
+	"""index - the index in the front-to-back ordering within its container """
+	which = 'pidx'
+	want = 'long'
+class information_window(aetools.NProperty):
+	"""information window - the information window for the item """
+	which = 'iwnd'
+	want = 'obj '
 class kind(aetools.NProperty):
 	"""kind - the kind of the item """
 	which = 'kind'
 	want = 'itxt'
-class description(aetools.NProperty):
-	"""description - a description of the item """
-	which = 'dscr'
-	want = 'itxt'
+class label_index(aetools.NProperty):
+	"""label index - the label of the item """
+	which = 'labi'
+	want = 'long'
+class position(aetools.NProperty):
+	"""position - the position of the item within its parent window (can only be set for an item in a window viewed as icons or buttons) """
+	which = 'posn'
+	want = 'QDpt'
 class selected(aetools.NProperty):
 	"""selected - Is the item selected? """
 	which = 'issl'
 	want = 'bool'
-class content_space(aetools.NProperty):
-	"""content space - the window that would open if the item was opened """
-	which = 'dwnd'
-	want = 'obj '
 class window(aetools.NProperty):
 	"""window - the window that would open if the item was opened """
 	which = 'cwin'
 	want = 'obj '
-class information_window(aetools.NProperty):
-	"""information window - the information window for the item """
-	which = 'iwnd'
-	want = 'obj '
 
 class preferences(aetools.ComponentItem):
 	"""preferences - The Finder Preferences """
@@ -313,6 +313,10 @@
 class process(aetools.ComponentItem):
 	"""process - A process running on this computer """
 	want = 'prcs'
+class creator_type(aetools.NProperty):
+	"""creator type - the OSType of the creator of the process (the signature) """
+	which = 'fcrt'
+	want = 'type'
 class file(aetools.NProperty):
 	"""file - the file from which the process was launched """
 	which = 'file'
@@ -321,34 +325,26 @@
 	"""file type - the OSType of the file type of the process """
 	which = 'asty'
 	want = 'type'
-class creator_type(aetools.NProperty):
-	"""creator type - the OSType of the creator of the process (the signature) """
-	which = 'fcrt'
-	want = 'type'
-class remote_events(aetools.NProperty):
-	"""remote events - Does the process accept remote events? """
-	which = 'revt'
-	want = 'bool'
 class partition_space_used(aetools.NProperty):
 	"""partition space used - the number of bytes currently used in the process' partition """
 	which = 'pusd'
 	want = 'long'
+class remote_events(aetools.NProperty):
+	"""remote events - Does the process accept remote events? """
+	which = 'revt'
+	want = 'bool'
 
 class sharable_container(aetools.ComponentItem):
 	"""sharable container - A container that may be shared (disks and folders) """
 	want = 'sctr'
-class owner(aetools.NProperty):
-	"""owner - the user that owns the container (file sharing must be on to use this property) """
-	which = 'sown'
-	want = 'itxt'
+class exported(aetools.NProperty):
+	"""exported - Is the container a share point or inside a share point, i.e., can the container be shared? (file sharing must be on to use this property) """
+	which = 'sexp'
+	want = 'bool'
 class group(aetools.NProperty):
 	"""group - the user or group that has special access to the container (file sharing must be on to use this property) """
 	which = 'sgrp'
 	want = 'itxt'
-class owner_privileges(aetools.NProperty):
-	"""owner privileges - the see folders/see files/make changes privileges for the owner (file sharing must be on to use this property) """
-	which = 'ownr'
-	want = 'priv'
 class group_privileges(aetools.NProperty):
 	"""group privileges - the see folders/see files/make changes privileges for the group (file sharing must be on to use this property) """
 	which = 'gppr'
@@ -365,18 +361,22 @@
 	"""mounted - Is the container mounted on another machine's desktop? (file sharing must be on to use this property) """
 	which = 'smou'
 	want = 'bool'
-class exported(aetools.NProperty):
-	"""exported - Is the container a share point or inside a share point, i.e., can the container be shared? (file sharing must be on to use this property) """
-	which = 'sexp'
+class owner(aetools.NProperty):
+	"""owner - the user that owns the container (file sharing must be on to use this property) """
+	which = 'sown'
+	want = 'itxt'
+class owner_privileges(aetools.NProperty):
+	"""owner privileges - the see folders/see files/make changes privileges for the owner (file sharing must be on to use this property) """
+	which = 'ownr'
+	want = 'priv'
+class protected(aetools.NProperty):
+	"""protected - Is the container protected from being moved, renamed and deleted? (file sharing must be on to use this property) """
+	which = 'spro'
 	want = 'bool'
 class shared(aetools.NProperty):
 	"""shared - Is the container a share point, i.e., is the container currently being shared? (file sharing must be on to use this property) """
 	which = 'shar'
 	want = 'bool'
-class protected(aetools.NProperty):
-	"""protected - Is the container protected from being moved, renamed and deleted? (file sharing must be on to use this property) """
-	which = 'spro'
-	want = 'bool'
 
 class trash_2d_object(aetools.ComponentItem):
 	"""trash-object - Trash-object is the class of the \xd2trash\xd3 object """
@@ -385,14 +385,14 @@
 class window(aetools.ComponentItem):
 	"""window - A window """
 	want = 'cwin'
-class titled(aetools.NProperty):
-	"""titled - Does the window have a title bar? """
-	which = 'ptit'
-	want = 'bool'
 class closeable(aetools.NProperty):
 	"""closeable - Does the window have a close box? """
 	which = 'hclb'
 	want = 'bool'
+class collapsed(aetools.NProperty):
+	"""collapsed - Is the window collapsed (only applies to open non-pop-up windows)? """
+	which = 'wshd'
+	want = 'bool'
 class floating(aetools.NProperty):
 	"""floating - Does the window have a title bar? """
 	which = 'isfl'
@@ -401,10 +401,22 @@
 	"""modal - Is the window modal? """
 	which = 'pmod'
 	want = 'bool'
+class popup(aetools.NProperty):
+	"""popup - Is the window is a pop-up window? (only applies to open container windows in the Finder and can only be set when the Finder is the front application) """
+	which = 'drwr'
+	want = 'bool'
+class pulled_open(aetools.NProperty):
+	"""pulled open - Is the window pulled open (only applies to pop-up windows and can only be set when the Finder is the front application)? """
+	which = 'pull'
+	want = 'bool'
 class resizable(aetools.NProperty):
 	"""resizable - Is the window resizable? """
 	which = 'prsz'
 	want = 'bool'
+class titled(aetools.NProperty):
+	"""titled - Does the window have a title bar? """
+	which = 'ptit'
+	want = 'bool'
 class zoomable(aetools.NProperty):
 	"""zoomable - Is the window zoomable? """
 	which = 'iszm'
@@ -417,18 +429,6 @@
 	"""zoomed full size - Is the window zoomed to the full size of the screen? (can only be set, not read, and only applies to open non-pop-up windows) """
 	which = 'zumf'
 	want = 'bool'
-class popup(aetools.NProperty):
-	"""popup - Is the window is a pop-up window? (only applies to open container windows in the Finder and can only be set when the Finder is the front application) """
-	which = 'drwr'
-	want = 'bool'
-class pulled_open(aetools.NProperty):
-	"""pulled open - Is the window pulled open (only applies to pop-up windows and can only be set when the Finder is the front application)? """
-	which = 'pull'
-	want = 'bool'
-class collapsed(aetools.NProperty):
-	"""collapsed - Is the window collapsed (only applies to open non-pop-up windows)? """
-	which = 'wshd'
-	want = 'bool'
 accessory_process._superclassnames = []
 accessory_process._privpropdict = {
 }
@@ -441,21 +441,21 @@
 }
 application._superclassnames = []
 application._privpropdict = {
-	'properties' : properties,
+	'Finder_preferences' : Finder_preferences,
+	'about_this_computer' : about_this_computer,
 	'clipboard' : clipboard,
+	'desktop' : desktop,
+	'file_sharing' : file_sharing,
+	'frontmost' : frontmost,
+	'insertion_location' : insertion_location,
 	'largest_free_block' : largest_free_block,
 	'name' : name,
-	'visible' : visible,
-	'frontmost' : frontmost,
-	'selection' : selection,
-	'insertion_location' : insertion_location,
-	'file_sharing' : file_sharing,
-	'sharing_starting_up' : sharing_starting_up,
 	'product_version' : product_version,
+	'properties' : properties,
+	'selection' : selection,
+	'sharing_starting_up' : sharing_starting_up,
 	'version' : version,
-	'about_this_computer' : about_this_computer,
-	'desktop' : desktop,
-	'Finder_preferences' : Finder_preferences,
+	'visible' : visible,
 }
 application._privelemdict = {
 }
@@ -465,23 +465,20 @@
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
 	'minimum_partition_size' : minimum_partition_size,
 	'partition_size' : partition_size,
-	'suggested_partition_size' : suggested_partition_size,
 	'scriptable' : scriptable,
+	'suggested_partition_size' : suggested_partition_size,
 }
 application_file._privelemdict = {
 }
 container_window._superclassnames = ['window']
 container_window._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'container' : container,
-	'item' : item,
-	'has_custom_view_settings' : has_custom_view_settings,
-	'view' : view,
-	'previous_list_view' : previous_list_view,
 	'button_view_arrangement' : button_view_arrangement,
-	'spatial_view_arrangement' : spatial_view_arrangement,
-	'sort_direction' : sort_direction,
 	'calculate_folder_sizes' : calculate_folder_sizes,
+	'container' : container,
+	'has_custom_view_settings' : has_custom_view_settings,
+	'item' : item,
+	'previous_list_view' : previous_list_view,
 	'show_comments' : show_comments,
 	'show_creation_date' : show_creation_date,
 	'show_kind' : show_kind,
@@ -489,28 +486,31 @@
 	'show_modification_date' : show_modification_date,
 	'show_size' : show_size,
 	'show_version' : show_version,
+	'sort_direction' : sort_direction,
+	'spatial_view_arrangement' : spatial_view_arrangement,
 	'use_relative_dates' : use_relative_dates,
+	'view' : view,
 }
 container_window._privelemdict = {
 }
 information_window._superclassnames = ['window']
 information_window._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'item' : item,
 	'comment' : comment,
-	'size' : size,
-	'physical_size' : physical_size,
 	'creation_date' : creation_date,
-	'modification_date' : modification_date,
-	'suggested_partition_size' : suggested_partition_size,
-	'minimum_partition_size' : minimum_partition_size,
-	'partition_size' : partition_size,
 	'icon' : icon,
+	'item' : item,
 	'locked' : locked,
-	'stationery' : stationery,
-	'warn_before_emptying' : warn_before_emptying,
+	'minimum_partition_size' : minimum_partition_size,
+	'modification_date' : modification_date,
+	'partition_size' : partition_size,
+	'physical_size' : physical_size,
 	'product_version' : product_version,
+	'size' : size,
+	'stationery' : stationery,
+	'suggested_partition_size' : suggested_partition_size,
 	'version' : version,
+	'warn_before_emptying' : warn_before_emptying,
 }
 information_window._privelemdict = {
 }
@@ -521,34 +521,33 @@
 }
 item._superclassnames = []
 item._privpropdict = {
-	'properties' : properties,
-	'name' : name,
-	'index' : index,
-	'id' : id,
+	'bounds' : bounds,
+	'comment' : comment,
 	'container' : container,
+	'content_space' : content_space,
+	'creation_date' : creation_date,
+	'description' : description,
 	'disk' : disk,
 	'folder' : folder,
-	'position' : position,
-	'bounds' : bounds,
-	'label_index' : label_index,
-	'kind' : kind,
-	'description' : description,
-	'comment' : comment,
-	'size' : size,
-	'physical_size' : physical_size,
-	'creation_date' : creation_date,
-	'modification_date' : modification_date,
 	'icon' : icon,
-	'selected' : selected,
-	'content_space' : content_space,
-	'window' : window,
+	'id' : id,
+	'index' : index,
 	'information_window' : information_window,
+	'kind' : kind,
+	'label_index' : label_index,
+	'modification_date' : modification_date,
+	'name' : name,
+	'physical_size' : physical_size,
+	'position' : position,
+	'properties' : properties,
+	'selected' : selected,
+	'size' : size,
+	'window' : window,
 }
 item._privelemdict = {
 }
 preferences._superclassnames = []
 preferences._privpropdict = {
-	'window' : window,
 	'calculate_folder_sizes' : calculate_folder_sizes,
 	'delay_before_springing' : delay_before_springing,
 	'show_comments' : show_comments,
@@ -562,22 +561,23 @@
 	'use_relative_dates' : use_relative_dates,
 	'use_simple_menus' : use_simple_menus,
 	'use_wide_grid' : use_wide_grid,
+	'window' : window,
 }
 preferences._privelemdict = {
 }
 process._superclassnames = []
 process._privpropdict = {
-	'properties' : properties,
-	'name' : name,
-	'visible' : visible,
-	'frontmost' : frontmost,
+	'creator_type' : creator_type,
 	'file' : file,
 	'file_type' : file_type,
-	'creator_type' : creator_type,
-	'scriptable' : scriptable,
-	'remote_events' : remote_events,
+	'frontmost' : frontmost,
+	'name' : name,
 	'partition_size' : partition_size,
 	'partition_space_used' : partition_space_used,
+	'properties' : properties,
+	'remote_events' : remote_events,
+	'scriptable' : scriptable,
+	'visible' : visible,
 }
 process._privelemdict = {
 }
@@ -585,16 +585,16 @@
 sharable_container._superclassnames = ['container']
 sharable_container._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'owner' : owner,
+	'exported' : exported,
 	'group' : group,
-	'owner_privileges' : owner_privileges,
 	'group_privileges' : group_privileges,
 	'guest_privileges' : guest_privileges,
 	'inherited_privileges' : inherited_privileges,
 	'mounted' : mounted,
-	'exported' : exported,
-	'shared' : shared,
+	'owner' : owner,
+	'owner_privileges' : owner_privileges,
 	'protected' : protected,
+	'shared' : shared,
 }
 sharable_container._privelemdict = {
 }
@@ -607,23 +607,23 @@
 }
 window._superclassnames = []
 window._privpropdict = {
-	'properties' : properties,
-	'position' : position,
 	'bounds' : bounds,
-	'titled' : titled,
-	'name' : name,
-	'index' : index,
 	'closeable' : closeable,
+	'collapsed' : collapsed,
 	'floating' : floating,
+	'index' : index,
 	'modal' : modal,
+	'name' : name,
+	'popup' : popup,
+	'position' : position,
+	'properties' : properties,
+	'pulled_open' : pulled_open,
 	'resizable' : resizable,
+	'titled' : titled,
+	'visible' : visible,
 	'zoomable' : zoomable,
 	'zoomed' : zoomed,
 	'zoomed_full_size' : zoomed_full_size,
-	'visible' : visible,
-	'popup' : popup,
-	'pulled_open' : pulled_open,
-	'collapsed' : collapsed,
 }
 window._privelemdict = {
 }
@@ -632,111 +632,111 @@
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'ctrs' : trash_2d_object,
-	'dsut' : accessory_suitcase,
-	'cprf' : preferences,
-	'capp' : application,
-	'sctr' : sharable_container,
-	'pcda' : accessory_process,
-	'cwin' : window,
-	'iwnd' : information_window,
-	'prcs' : process,
 	'appf' : application_file,
-	'inlf' : internet_location,
-	'cwnd' : container_window,
+	'capp' : application,
 	'cobj' : item,
+	'cprf' : preferences,
+	'ctrs' : trash_2d_object,
+	'cwin' : window,
+	'cwnd' : container_window,
+	'dsut' : accessory_suitcase,
+	'inlf' : internet_location,
+	'iwnd' : information_window,
+	'pcda' : accessory_process,
+	'prcs' : process,
+	'sctr' : sharable_container,
 }
 
 _propdeclarations = {
-	'ver2' : product_version,
-	'pbnd' : bounds,
-	'asdr' : folder,
-	'gppr' : group_privileges,
-	'pidx' : index,
-	'isfl' : floating,
-	'sown' : owner,
-	'fsup' : sharing_starting_up,
-	'urdt' : use_relative_dates,
-	'scom' : show_comments,
-	'appt' : partition_size,
-	'iimg' : icon,
-	'asty' : file_type,
-	'uswg' : use_wide_grid,
-	'ptit' : titled,
-	'dela' : delay_before_springing,
-	'cuss' : has_custom_view_settings,
-	'gstp' : guest_privileges,
-	'isab' : scriptable,
-	'iszm' : zoomable,
-	'sord' : sort_direction,
-	'pins' : insertion_location,
-	'pspd' : stationery,
-	'desk' : desktop,
-	'ascd' : creation_date,
-	'ctnr' : container,
-	'abbx' : about_this_computer,
-	'pull' : pulled_open,
-	'kind' : kind,
-	'ptsz' : size,
-	'hclb' : closeable,
-	'sgrp' : group,
-	'mfre' : largest_free_block,
-	'revt' : remote_events,
-	'drwr' : popup,
-	'iwnd' : information_window,
-	'ownr' : owner_privileges,
-	'pzum' : zoomed,
-	'prsz' : resizable,
-	'barr' : button_view_arrangement,
-	'pfrp' : Finder_preferences,
-	'zumf' : zoomed_full_size,
-	'iprv' : inherited_privileges,
-	'vers' : version,
-	'c@#^' : _3c_Inheritance_3e_,
 	'ID  ' : id,
-	'sfsz' : calculate_folder_sizes,
-	'file' : file,
-	'dwnd' : content_space,
-	'shar' : shared,
-	'pmod' : modal,
-	'sele' : selection,
-	'pisf' : frontmost,
-	'sprt' : suggested_partition_size,
-	'spro' : protected,
-	'pcli' : clipboard,
-	'cwin' : window,
-	'mprt' : minimum_partition_size,
-	'sprg' : spring_open_folders,
-	'ssiz' : show_size,
+	'abbx' : about_this_computer,
+	'appt' : partition_size,
+	'ascd' : creation_date,
+	'asdr' : folder,
+	'aslk' : locked,
 	'asmo' : modification_date,
-	'svrs' : show_version,
-	'cobj' : item,
-	'posn' : position,
-	'iarr' : spatial_view_arrangement,
-	'phys' : physical_size,
-	'sknd' : show_kind,
-	'labi' : label_index,
-	'svew' : previous_list_view,
-	'dscr' : description,
-	'comt' : comment,
-	'sexp' : exported,
-	'usme' : use_simple_menus,
+	'asty' : file_type,
+	'barr' : button_view_arrangement,
+	'c@#^' : _3c_Inheritance_3e_,
 	'cdis' : disk,
-	'wshd' : collapsed,
-	'slbl' : show_label,
-	'warn' : warn_before_emptying,
-	'scda' : show_creation_date,
-	'pvis' : visible,
-	'issl' : selected,
-	'smou' : mounted,
-	'sdat' : show_modification_date,
+	'cobj' : item,
+	'comt' : comment,
+	'ctnr' : container,
+	'cuss' : has_custom_view_settings,
+	'cwin' : window,
+	'dela' : delay_before_springing,
+	'desk' : desktop,
+	'drwr' : popup,
+	'dscr' : description,
+	'dwnd' : content_space,
 	'fcrt' : creator_type,
+	'file' : file,
+	'fshr' : file_sharing,
+	'fsup' : sharing_starting_up,
+	'gppr' : group_privileges,
+	'gstp' : guest_privileges,
+	'hclb' : closeable,
+	'iarr' : spatial_view_arrangement,
+	'iimg' : icon,
+	'iprv' : inherited_privileges,
+	'isab' : scriptable,
+	'isfl' : floating,
+	'issl' : selected,
+	'iszm' : zoomable,
+	'iwnd' : information_window,
+	'kind' : kind,
+	'labi' : label_index,
+	'mfre' : largest_free_block,
+	'mprt' : minimum_partition_size,
+	'ownr' : owner_privileges,
+	'pbnd' : bounds,
+	'pcli' : clipboard,
+	'pfrp' : Finder_preferences,
+	'phys' : physical_size,
+	'pidx' : index,
+	'pins' : insertion_location,
+	'pisf' : frontmost,
+	'pmod' : modal,
+	'pnam' : name,
+	'posn' : position,
+	'prsz' : resizable,
+	'pspd' : stationery,
+	'ptit' : titled,
+	'ptsz' : size,
+	'pull' : pulled_open,
 	'pusd' : partition_space_used,
 	'pvew' : view,
-	'fshr' : file_sharing,
+	'pvis' : visible,
+	'pzum' : zoomed,
 	'qpro' : properties,
-	'aslk' : locked,
-	'pnam' : name,
+	'revt' : remote_events,
+	'scda' : show_creation_date,
+	'scom' : show_comments,
+	'sdat' : show_modification_date,
+	'sele' : selection,
+	'sexp' : exported,
+	'sfsz' : calculate_folder_sizes,
+	'sgrp' : group,
+	'shar' : shared,
+	'sknd' : show_kind,
+	'slbl' : show_label,
+	'smou' : mounted,
+	'sord' : sort_direction,
+	'sown' : owner,
+	'sprg' : spring_open_folders,
+	'spro' : protected,
+	'sprt' : suggested_partition_size,
+	'ssiz' : show_size,
+	'svew' : previous_list_view,
+	'svrs' : show_version,
+	'urdt' : use_relative_dates,
+	'usme' : use_simple_menus,
+	'uswg' : use_wide_grid,
+	'ver2' : product_version,
+	'vers' : version,
+	'warn' : warn_before_emptying,
+	'wshd' : collapsed,
+	'zumf' : zoomed_full_size,
 }
 
 _compdeclarations = {
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Enumerations.py b/Lib/plat-mac/lib-scriptpackages/Finder/Enumerations.py
index ba333fb..5621120 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Enumerations.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Enumerations.py
@@ -106,12 +106,12 @@
 }
 
 _enumdeclarations = {
-	'ipnl' : _Enum_ipnl,
-	'sodr' : _Enum_sodr,
-	'pple' : _Enum_pple,
-	'ese0' : _Enum_ese0,
-	'vwby' : _Enum_vwby,
-	'isiz' : _Enum_isiz,
 	'earr' : _Enum_earr,
+	'ese0' : _Enum_ese0,
 	'gsen' : _Enum_gsen,
+	'ipnl' : _Enum_ipnl,
+	'isiz' : _Enum_isiz,
+	'pple' : _Enum_pple,
+	'sodr' : _Enum_sodr,
+	'vwby' : _Enum_vwby,
 }
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Files_and_suitcases.py b/Lib/plat-mac/lib-scriptpackages/Finder/Files_and_suitcases.py
index 6f41754..6978d3e 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Files_and_suitcases.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Files_and_suitcases.py
@@ -32,18 +32,6 @@
 class application_file(aetools.ComponentItem):
 	"""application file - An application's file on disk """
 	want = 'appf'
-class suggested_size(aetools.NProperty):
-	"""suggested size - the memory size with which the developer recommends the application be launched """
-	which = 'sprt'
-	want = 'long'
-class minimum_size(aetools.NProperty):
-	"""minimum size - the smallest memory size with which the application can be launched """
-	which = 'mprt'
-	want = 'long'
-class preferred_size(aetools.NProperty):
-	"""preferred size - the memory size with which the application will be launched """
-	which = 'appt'
-	want = 'long'
 class accepts_high_level_events(aetools.NProperty):
 	"""accepts high level events - Is the application high-level event aware? """
 	which = 'isab'
@@ -52,6 +40,18 @@
 	"""has scripting terminology - Does the process have a scripting terminology, i.e., can it be scripted? """
 	which = 'hscr'
 	want = 'bool'
+class minimum_size(aetools.NProperty):
+	"""minimum size - the smallest memory size with which the application can be launched """
+	which = 'mprt'
+	want = 'long'
+class preferred_size(aetools.NProperty):
+	"""preferred size - the memory size with which the application will be launched """
+	which = 'appt'
+	want = 'long'
+class suggested_size(aetools.NProperty):
+	"""suggested size - the memory size with which the developer recommends the application be launched """
+	which = 'sprt'
+	want = 'long'
 
 application_files = application_file
 
@@ -83,26 +83,26 @@
 class file(aetools.ComponentItem):
 	"""file - A file """
 	want = 'file'
-class file_type(aetools.NProperty):
-	"""file type - the OSType identifying the type of data contained in the item """
-	which = 'asty'
-	want = 'type'
 class creator_type(aetools.NProperty):
 	"""creator type - the OSType identifying the application that created the item """
 	which = 'fcrt'
 	want = 'type'
+class file_type(aetools.NProperty):
+	"""file type - the OSType identifying the type of data contained in the item """
+	which = 'asty'
+	want = 'type'
 class locked(aetools.NProperty):
 	"""locked - Is the file locked? """
 	which = 'aslk'
 	want = 'bool'
-class stationery(aetools.NProperty):
-	"""stationery - Is the file a stationery pad? """
-	which = 'pspd'
-	want = 'bool'
 class product_version(aetools.NProperty):
 	"""product version - the version of the product (visible at the top of the \xd2Get Info\xd3 window) """
 	which = 'ver2'
 	want = 'itxt'
+class stationery(aetools.NProperty):
+	"""stationery - Is the file a stationery pad? """
+	which = 'pspd'
+	want = 'bool'
 class version(aetools.NProperty):
 	"""version - the version of the file (visible at the bottom of the \xd2Get Info\xd3 window) """
 	which = 'vers'
@@ -165,11 +165,11 @@
 application_file._superclassnames = ['file']
 application_file._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'suggested_size' : suggested_size,
-	'minimum_size' : minimum_size,
-	'preferred_size' : preferred_size,
 	'accepts_high_level_events' : accepts_high_level_events,
 	'has_scripting_terminology' : has_scripting_terminology,
+	'minimum_size' : minimum_size,
+	'preferred_size' : preferred_size,
+	'suggested_size' : suggested_size,
 }
 application_file._privelemdict = {
 }
@@ -202,11 +202,11 @@
 file._superclassnames = ['item']
 file._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'file_type' : file_type,
 	'creator_type' : creator_type,
+	'file_type' : file_type,
 	'locked' : locked,
-	'stationery' : stationery,
 	'product_version' : product_version,
+	'stationery' : stationery,
 	'version' : version,
 }
 file._privelemdict = {
@@ -256,37 +256,37 @@
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'sndf' : sound_file,
-	'fntf' : font_file,
-	'stcs' : suitcase,
-	'clpf' : clipping,
-	'dsut' : desk_accessory_suitcase,
 	'alia' : alias_file,
-	'dafi' : desk_accessory_file,
-	'fsut' : font_suitcase,
-	'file' : file,
 	'appf' : application_file,
-	'inlf' : internet_location_file,
+	'clpf' : clipping,
+	'dafi' : desk_accessory_file,
 	'docf' : document_file,
+	'dsut' : desk_accessory_suitcase,
+	'file' : file,
+	'fntf' : font_file,
+	'fsut' : font_suitcase,
+	'inlf' : internet_location_file,
 	'pack' : package,
+	'sndf' : sound_file,
+	'stcs' : suitcase,
 }
 
 _propdeclarations = {
-	'ver2' : product_version,
-	'vers' : version,
 	'appt' : preferred_size,
-	'snd ' : sound,
-	'pspd' : stationery,
-	'sprt' : suggested_size,
-	'isab' : accepts_high_level_events,
-	'hscr' : has_scripting_terminology,
+	'aslk' : locked,
 	'asty' : file_type,
 	'c@#^' : _3c_Inheritance_3e_,
 	'fcrt' : creator_type,
-	'mprt' : minimum_size,
+	'hscr' : has_scripting_terminology,
 	'iloc' : location,
-	'aslk' : locked,
+	'isab' : accepts_high_level_events,
+	'mprt' : minimum_size,
 	'orig' : original_item,
+	'pspd' : stationery,
+	'snd ' : sound,
+	'sprt' : suggested_size,
+	'ver2' : product_version,
+	'vers' : version,
 }
 
 _compdeclarations = {
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Finder_Basics.py b/Lib/plat-mac/lib-scriptpackages/Finder/Finder_Basics.py
index ea384d3..eb44205 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Finder_Basics.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Finder_Basics.py
@@ -144,54 +144,18 @@
 class application(aetools.ComponentItem):
 	"""application - The Finder """
 	want = 'capp'
-class clipboard(aetools.NProperty):
-	"""clipboard - the Finder\xd5s clipboard window """
-	which = 'pcli'
-	want = 'obj '
-class largest_free_block(aetools.NProperty):
-	"""largest free block - the largest free block of process memory available to launch an application """
-	which = 'mfre'
-	want = 'long'
-class name(aetools.NProperty):
-	"""name - the Finder\xd5s name """
-	which = 'pnam'
-	want = 'itxt'
-class visible(aetools.NProperty):
-	"""visible - Is the Finder\xd5s layer visible? """
-	which = 'pvis'
-	want = 'bool'
-class frontmost(aetools.NProperty):
-	"""frontmost - Is the Finder the frontmost process? """
-	which = 'pisf'
-	want = 'bool'
-class selection(aetools.NProperty):
-	"""selection - the selection visible to the user """
-	which = 'sele'
-	want = 'obj '
-class insertion_location(aetools.NProperty):
-	"""insertion location - the container in which a new folder would appear if \xd2New Folder\xd3 was selected """
-	which = 'pins'
-	want = 'obj '
-class file_sharing(aetools.NProperty):
-	"""file sharing - Is file sharing on? """
-	which = 'fshr'
-	want = 'bool'
-class sharing_starting_up(aetools.NProperty):
-	"""sharing starting up - Is file sharing in the process of starting up? """
-	which = 'fsup'
-	want = 'bool'
-class product_version(aetools.NProperty):
-	"""product version - the version of the System software running on this computer """
-	which = 'ver2'
-	want = 'itxt'
-class version(aetools.NProperty):
-	"""version - the version of the Finder """
-	which = 'vers'
-	want = 'itxt'
+class Finder_preferences(aetools.NProperty):
+	"""Finder preferences - Various preferences that apply to the Finder as a whole """
+	which = 'pfrp'
+	want = 'cprf'
 class about_this_computer(aetools.NProperty):
 	"""about this computer - the \xd2About this Computer\xd3 dialog and the list of running processes displayed in it """
 	which = 'abbx'
 	want = 'obj '
+class clipboard(aetools.NProperty):
+	"""clipboard - the Finder\xd5s clipboard window """
+	which = 'pcli'
+	want = 'obj '
 class desktop(aetools.NProperty):
 	"""desktop - the desktop """
 	which = 'desk'
@@ -200,45 +164,77 @@
 	"""execution state - the current execution state of the Finder """
 	which = 'exec'
 	want = 'ese0'
-class Finder_preferences(aetools.NProperty):
-	"""Finder preferences - Various preferences that apply to the Finder as a whole """
-	which = 'pfrp'
-	want = 'cprf'
-#        element 'cobj' as ['indx', 'name']
-#        element 'ctnr' as ['indx', 'name']
-#        element 'sctr' as ['indx', 'name']
-#        element 'cdis' as ['indx', 'name', 'ID  ']
-#        element 'cfol' as ['indx', 'name', 'ID  ']
-#        element 'file' as ['indx', 'name']
+class file_sharing(aetools.NProperty):
+	"""file sharing - Is file sharing on? """
+	which = 'fshr'
+	want = 'bool'
+class frontmost(aetools.NProperty):
+	"""frontmost - Is the Finder the frontmost process? """
+	which = 'pisf'
+	want = 'bool'
+class insertion_location(aetools.NProperty):
+	"""insertion location - the container in which a new folder would appear if \xd2New Folder\xd3 was selected """
+	which = 'pins'
+	want = 'obj '
+class largest_free_block(aetools.NProperty):
+	"""largest free block - the largest free block of process memory available to launch an application """
+	which = 'mfre'
+	want = 'long'
+class name(aetools.NProperty):
+	"""name - the Finder\xd5s name """
+	which = 'pnam'
+	want = 'itxt'
+class product_version(aetools.NProperty):
+	"""product version - the version of the System software running on this computer """
+	which = 'ver2'
+	want = 'itxt'
+class selection(aetools.NProperty):
+	"""selection - the selection visible to the user """
+	which = 'sele'
+	want = 'obj '
+class sharing_starting_up(aetools.NProperty):
+	"""sharing starting up - Is file sharing in the process of starting up? """
+	which = 'fsup'
+	want = 'bool'
+class version(aetools.NProperty):
+	"""version - the version of the Finder """
+	which = 'vers'
+	want = 'itxt'
+class visible(aetools.NProperty):
+	"""visible - Is the Finder\xd5s layer visible? """
+	which = 'pvis'
+	want = 'bool'
 #        element 'alia' as ['indx', 'name']
 #        element 'appf' as ['indx', 'name', 'ID  ']
-#        element 'docf' as ['indx', 'name']
-#        element 'fntf' as ['indx', 'name']
-#        element 'dafi' as ['indx', 'name']
-#        element 'inlf' as ['indx', 'name']
-#        element 'sndf' as ['indx', 'name']
+#        element 'cdis' as ['indx', 'name', 'ID  ']
+#        element 'cfol' as ['indx', 'name', 'ID  ']
 #        element 'clpf' as ['indx', 'name']
-#        element 'pack' as ['indx', 'name']
-#        element 'stcs' as ['indx', 'name']
-#        element 'fsut' as ['indx', 'name']
-#        element 'dsut' as ['indx', 'name']
-#        element 'prcs' as ['indx', 'name']
-#        element 'pcap' as ['indx', 'name']
-#        element 'pcda' as ['indx', 'name']
+#        element 'cobj' as ['indx', 'name']
+#        element 'ctnr' as ['indx', 'name']
 #        element 'cwin' as ['indx', 'name']
 #        element 'cwnd' as ['indx', 'name']
-#        element 'iwnd' as ['indx', 'name']
-#        element 'vwnd' as ['indx', 'name']
-#        element 'lwnd' as ['indx', 'name']
+#        element 'dafi' as ['indx', 'name']
+#        element 'docf' as ['indx', 'name']
+#        element 'dsut' as ['indx', 'name']
 #        element 'dwnd' as ['indx', 'name']
+#        element 'file' as ['indx', 'name']
+#        element 'fntf' as ['indx', 'name']
+#        element 'fsut' as ['indx', 'name']
+#        element 'inlf' as ['indx', 'name']
+#        element 'iwnd' as ['indx', 'name']
+#        element 'lwnd' as ['indx', 'name']
+#        element 'pack' as ['indx', 'name']
+#        element 'pcap' as ['indx', 'name']
+#        element 'pcda' as ['indx', 'name']
+#        element 'prcs' as ['indx', 'name']
+#        element 'sctr' as ['indx', 'name']
+#        element 'sndf' as ['indx', 'name']
+#        element 'stcs' as ['indx', 'name']
+#        element 'vwnd' as ['indx', 'name']
 
 class special_folders(aetools.ComponentItem):
 	"""special folders - The special folders used by the Mac OS """
 	want = 'spfl'
-class system_folder(aetools.NProperty):
-	"""system folder - the System folder """
-	which = 'macs'
-	want = 'obj '
 class apple_menu_items_folder(aetools.NProperty):
 	"""apple menu items folder - the special folder named \xd2Apple Menu Items,\xd3 the contents of which appear in the Apple menu """
 	which = 'amnu'
@@ -267,65 +263,68 @@
 	"""startup items folder - the special folder named \xd2Startup Items\xd3 """
 	which = 'strt'
 	want = 'obj '
+class system_folder(aetools.NProperty):
+	"""system folder - the System folder """
+	which = 'macs'
+	want = 'obj '
 class temporary_items_folder(aetools.NProperty):
 	"""temporary items folder - the special folder named \xd2Temporary Items\xd3 (invisible) """
 	which = 'temp'
 	want = 'obj '
 application._superclassnames = []
-import Earlier_terms
-import Containers_and_folders
 import Files_and_suitcases
-import Process_classes
+import Containers_and_folders
+import Earlier_terms
 import Window_classes
+import Process_classes
 application._privpropdict = {
-	'clipboard' : clipboard,
-	'largest_free_block' : largest_free_block,
-	'name' : name,
-	'visible' : visible,
-	'frontmost' : frontmost,
-	'selection' : selection,
-	'insertion_location' : insertion_location,
-	'file_sharing' : file_sharing,
-	'sharing_starting_up' : sharing_starting_up,
-	'product_version' : product_version,
-	'version' : version,
+	'Finder_preferences' : Finder_preferences,
 	'about_this_computer' : about_this_computer,
+	'clipboard' : clipboard,
 	'desktop' : desktop,
 	'execution_state' : execution_state,
-	'Finder_preferences' : Finder_preferences,
+	'file_sharing' : file_sharing,
+	'frontmost' : frontmost,
+	'insertion_location' : insertion_location,
+	'largest_free_block' : largest_free_block,
+	'name' : name,
+	'product_version' : product_version,
+	'selection' : selection,
+	'sharing_starting_up' : sharing_starting_up,
+	'version' : version,
+	'visible' : visible,
 }
 application._privelemdict = {
-	'item' : Earlier_terms.item,
-	'container' : Containers_and_folders.container,
-	'sharable_container' : Earlier_terms.sharable_container,
-	'disk' : Containers_and_folders.disk,
-	'folder' : Containers_and_folders.folder,
-	'file' : Files_and_suitcases.file,
-	'alias_file' : Files_and_suitcases.alias_file,
-	'application_file' : Earlier_terms.application_file,
-	'document_file' : Files_and_suitcases.document_file,
-	'font_file' : Files_and_suitcases.font_file,
-	'desk_accessory_file' : Files_and_suitcases.desk_accessory_file,
-	'internet_location' : Earlier_terms.internet_location,
-	'sound_file' : Files_and_suitcases.sound_file,
-	'clipping' : Files_and_suitcases.clipping,
-	'package' : Files_and_suitcases.package,
-	'suitcase' : Files_and_suitcases.suitcase,
-	'font_suitcase' : Files_and_suitcases.font_suitcase,
-	'accessory_suitcase' : Earlier_terms.accessory_suitcase,
-	'process' : Earlier_terms.process,
-	'application_process' : Process_classes.application_process,
 	'accessory_process' : Earlier_terms.accessory_process,
-	'window' : Earlier_terms.window,
-	'container_window' : Earlier_terms.container_window,
-	'information_window' : Earlier_terms.information_window,
-	'view_options_window' : Window_classes.view_options_window,
+	'alias_file' : Files_and_suitcases.alias_file,
+	'application_file' : Files_and_suitcases.application_file,
+	'application_process' : Process_classes.application_process,
+	'clipping' : Files_and_suitcases.clipping,
 	'clipping_window' : Window_classes.clipping_window,
+	'container' : Containers_and_folders.container,
+	'container_window' : Earlier_terms.container_window,
 	'content_space' : Window_classes.content_space,
+	'desk_accessory_file' : Files_and_suitcases.desk_accessory_file,
+	'desk_accessory_suitcase' : Files_and_suitcases.desk_accessory_suitcase,
+	'disk' : Containers_and_folders.disk,
+	'document_file' : Files_and_suitcases.document_file,
+	'file' : Files_and_suitcases.file,
+	'folder' : Containers_and_folders.folder,
+	'font_file' : Files_and_suitcases.font_file,
+	'font_suitcase' : Files_and_suitcases.font_suitcase,
+	'information_window' : Earlier_terms.information_window,
+	'internet_location_file' : Files_and_suitcases.internet_location_file,
+	'item' : Earlier_terms.item,
+	'package' : Files_and_suitcases.package,
+	'process' : Earlier_terms.process,
+	'sharable_container' : Containers_and_folders.sharable_container,
+	'sound_file' : Files_and_suitcases.sound_file,
+	'suitcase' : Files_and_suitcases.suitcase,
+	'view_options_window' : Window_classes.view_options_window,
+	'window' : Earlier_terms.window,
 }
 special_folders._superclassnames = []
 special_folders._privpropdict = {
-	'system_folder' : system_folder,
 	'apple_menu_items_folder' : apple_menu_items_folder,
 	'control_panels_folder' : control_panels_folder,
 	'extensions_folder' : extensions_folder,
@@ -333,6 +332,7 @@
 	'preferences_folder' : preferences_folder,
 	'shutdown_items_folder' : shutdown_items_folder,
 	'startup_items_folder' : startup_items_folder,
+	'system_folder' : system_folder,
 	'temporary_items_folder' : temporary_items_folder,
 }
 special_folders._privelemdict = {
@@ -347,30 +347,30 @@
 }
 
 _propdeclarations = {
-	'vers' : version,
-	'ver2' : product_version,
-	'pfrp' : Finder_preferences,
-	'exec' : execution_state,
-	'pins' : insertion_location,
-	'mfre' : largest_free_block,
-	'fsup' : sharing_starting_up,
-	'desk' : desktop,
-	'ctrl' : control_panels_folder,
-	'macs' : system_folder,
-	'font' : fonts_folder,
 	'abbx' : about_this_computer,
-	'shdf' : shutdown_items_folder,
-	'temp' : temporary_items_folder,
+	'amnu' : apple_menu_items_folder,
+	'ctrl' : control_panels_folder,
+	'desk' : desktop,
+	'exec' : execution_state,
+	'extn' : extensions_folder,
+	'font' : fonts_folder,
+	'fshr' : file_sharing,
+	'fsup' : sharing_starting_up,
+	'macs' : system_folder,
+	'mfre' : largest_free_block,
+	'pcli' : clipboard,
+	'pfrp' : Finder_preferences,
+	'pins' : insertion_location,
+	'pisf' : frontmost,
+	'pnam' : name,
+	'pref' : preferences_folder,
 	'pvis' : visible,
 	'sele' : selection,
-	'pisf' : frontmost,
-	'pref' : preferences_folder,
+	'shdf' : shutdown_items_folder,
 	'strt' : startup_items_folder,
-	'pcli' : clipboard,
-	'fshr' : file_sharing,
-	'pnam' : name,
-	'extn' : extensions_folder,
-	'amnu' : apple_menu_items_folder,
+	'temp' : temporary_items_folder,
+	'ver2' : product_version,
+	'vers' : version,
 }
 
 _compdeclarations = {
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Finder_items.py b/Lib/plat-mac/lib-scriptpackages/Finder/Finder_items.py
index 1e3781f..68f1b38 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Finder_items.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Finder_items.py
@@ -188,22 +188,30 @@
 class item(aetools.ComponentItem):
 	"""item - An item """
 	want = 'cobj'
-class name(aetools.NProperty):
-	"""name - the name of the item """
-	which = 'pnam'
+class bounds(aetools.NProperty):
+	"""bounds - the bounding rectangle of the item (can only be set for an item in a window viewed as icons or buttons) """
+	which = 'pbnd'
+	want = 'qdrt'
+class comment(aetools.NProperty):
+	"""comment - the comment of the item, displayed in the \xd2Get Info\xd3 window """
+	which = 'comt'
 	want = 'itxt'
-class index(aetools.NProperty):
-	"""index - the index in the front-to-back ordering within its container """
-	which = 'pidx'
-	want = 'long'
-class id(aetools.NProperty):
-	"""id - an id that identifies the item """
-	which = 'ID  '
-	want = 'long'
 class container(aetools.NProperty):
 	"""container - the container of the item """
 	which = 'ctnr'
 	want = 'obj '
+class content_space(aetools.NProperty):
+	"""content space - the window that would open if the item was opened """
+	which = 'dwnd'
+	want = 'obj '
+class creation_date(aetools.NProperty):
+	"""creation date - the date on which the item was created """
+	which = 'ascd'
+	want = 'ldt '
+class description(aetools.NProperty):
+	"""description - a description of the item """
+	which = 'dscr'
+	want = 'itxt'
 class disk(aetools.NProperty):
 	"""disk - the disk on which the item is stored """
 	which = 'cdis'
@@ -212,91 +220,83 @@
 	"""folder - the folder in which the item is stored """
 	which = 'asdr'
 	want = 'obj '
-class position(aetools.NProperty):
-	"""position - the position of the item within its parent window (can only be set for an item in a window viewed as icons or buttons) """
-	which = 'posn'
-	want = 'QDpt'
-class bounds(aetools.NProperty):
-	"""bounds - the bounding rectangle of the item (can only be set for an item in a window viewed as icons or buttons) """
-	which = 'pbnd'
-	want = 'qdrt'
-class label_index(aetools.NProperty):
-	"""label index - the label of the item """
-	which = 'labi'
-	want = 'long'
-class kind(aetools.NProperty):
-	"""kind - the kind of the item """
-	which = 'kind'
-	want = 'itxt'
-class description(aetools.NProperty):
-	"""description - a description of the item """
-	which = 'dscr'
-	want = 'itxt'
-class comment(aetools.NProperty):
-	"""comment - the comment of the item, displayed in the \xd2Get Info\xd3 window """
-	which = 'comt'
-	want = 'itxt'
-class size(aetools.NProperty):
-	"""size - the logical size of the item """
-	which = 'ptsz'
-	want = 'long'
-class physical_size(aetools.NProperty):
-	"""physical size - the actual space used by the item on disk """
-	which = 'phys'
-	want = 'long'
-class creation_date(aetools.NProperty):
-	"""creation date - the date on which the item was created """
-	which = 'ascd'
-	want = 'ldt '
-class modification_date(aetools.NProperty):
-	"""modification date - the date on which the item was last modified """
-	which = 'asmo'
-	want = 'ldt '
 class icon(aetools.NProperty):
 	"""icon - the icon bitmap of the item """
 	which = 'iimg'
 	want = 'ifam'
+class id(aetools.NProperty):
+	"""id - an id that identifies the item """
+	which = 'ID  '
+	want = 'long'
+class index(aetools.NProperty):
+	"""index - the index in the front-to-back ordering within its container """
+	which = 'pidx'
+	want = 'long'
+class information_window(aetools.NProperty):
+	"""information window - the information window for the item """
+	which = 'iwnd'
+	want = 'obj '
+class kind(aetools.NProperty):
+	"""kind - the kind of the item """
+	which = 'kind'
+	want = 'itxt'
+class label_index(aetools.NProperty):
+	"""label index - the label of the item """
+	which = 'labi'
+	want = 'long'
+class modification_date(aetools.NProperty):
+	"""modification date - the date on which the item was last modified """
+	which = 'asmo'
+	want = 'ldt '
+class name(aetools.NProperty):
+	"""name - the name of the item """
+	which = 'pnam'
+	want = 'itxt'
+class physical_size(aetools.NProperty):
+	"""physical size - the actual space used by the item on disk """
+	which = 'phys'
+	want = 'long'
+class position(aetools.NProperty):
+	"""position - the position of the item within its parent window (can only be set for an item in a window viewed as icons or buttons) """
+	which = 'posn'
+	want = 'QDpt'
 class selected(aetools.NProperty):
 	"""selected - Is the item selected? """
 	which = 'issl'
 	want = 'bool'
-class content_space(aetools.NProperty):
-	"""content space - the window that would open if the item was opened """
-	which = 'dwnd'
-	want = 'obj '
+class size(aetools.NProperty):
+	"""size - the logical size of the item """
+	which = 'ptsz'
+	want = 'long'
 class window(aetools.NProperty):
 	"""window - the window that would open if the item was opened """
 	which = 'cwin'
 	want = 'obj '
-class information_window(aetools.NProperty):
-	"""information window - the information window for the item """
-	which = 'iwnd'
-	want = 'obj '
 
 items = item
 item._superclassnames = []
 item._privpropdict = {
-	'name' : name,
-	'index' : index,
-	'id' : id,
+	'bounds' : bounds,
+	'comment' : comment,
 	'container' : container,
+	'content_space' : content_space,
+	'creation_date' : creation_date,
+	'description' : description,
 	'disk' : disk,
 	'folder' : folder,
-	'position' : position,
-	'bounds' : bounds,
-	'label_index' : label_index,
-	'kind' : kind,
-	'description' : description,
-	'comment' : comment,
-	'size' : size,
-	'physical_size' : physical_size,
-	'creation_date' : creation_date,
-	'modification_date' : modification_date,
 	'icon' : icon,
-	'selected' : selected,
-	'content_space' : content_space,
-	'window' : window,
+	'id' : id,
+	'index' : index,
 	'information_window' : information_window,
+	'kind' : kind,
+	'label_index' : label_index,
+	'modification_date' : modification_date,
+	'name' : name,
+	'physical_size' : physical_size,
+	'position' : position,
+	'selected' : selected,
+	'size' : size,
+	'window' : window,
 }
 item._privelemdict = {
 }
@@ -310,27 +310,27 @@
 }
 
 _propdeclarations = {
-	'posn' : position,
-	'kind' : kind,
-	'ptsz' : size,
-	'phys' : physical_size,
-	'dwnd' : content_space,
-	'pbnd' : bounds,
-	'issl' : selected,
-	'labi' : label_index,
-	'dscr' : description,
+	'ID  ' : id,
+	'ascd' : creation_date,
+	'asdr' : folder,
+	'asmo' : modification_date,
+	'cdis' : disk,
 	'comt' : comment,
 	'ctnr' : container,
-	'pidx' : index,
-	'iimg' : icon,
-	'ID  ' : id,
 	'cwin' : window,
-	'pnam' : name,
-	'ascd' : creation_date,
-	'cdis' : disk,
-	'asmo' : modification_date,
-	'asdr' : folder,
+	'dscr' : description,
+	'dwnd' : content_space,
+	'iimg' : icon,
+	'issl' : selected,
 	'iwnd' : information_window,
+	'kind' : kind,
+	'labi' : label_index,
+	'pbnd' : bounds,
+	'phys' : physical_size,
+	'pidx' : index,
+	'pnam' : name,
+	'posn' : position,
+	'ptsz' : size,
 }
 
 _compdeclarations = {
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Obsolete_terms.py b/Lib/plat-mac/lib-scriptpackages/Finder/Obsolete_terms.py
index ddf1647..6904586 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Obsolete_terms.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Obsolete_terms.py
@@ -89,17 +89,17 @@
 class sharing_window(aetools.ComponentItem):
 	"""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 """
-	which = 'sctr'
+class container(aetools.NProperty):
+	"""container - the container from which this window was opened """
+	which = 'ctnr'
 	want = 'obj '
 class item(aetools.NProperty):
 	"""item - the item from which this window was opened """
 	which = 'cobj'
 	want = 'obj '
-class container(aetools.NProperty):
-	"""container - the container from which this window was opened """
-	which = 'ctnr'
+class sharable_container(aetools.NProperty):
+	"""sharable container - the sharable container from which the window was opened """
+	which = 'sctr'
 	want = 'obj '
 
 sharing_windows = sharing_window
@@ -169,10 +169,10 @@
 }
 sharing_window._superclassnames = []
 sharing_window._privpropdict = {
-	'sharable_container' : sharable_container,
-	'item' : item,
 	'container' : container,
 	'folder_obsolete' : folder_obsolete,
+	'item' : item,
+	'sharable_container' : sharable_container,
 }
 sharing_window._privelemdict = {
 }
@@ -186,31 +186,31 @@
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'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,
+	'cwnd' : container_window,
+	'file' : file,
 	'iwnd' : information_window,
+	'prcs' : process,
+	'qwnd' : status_window,
+	'sctr' : sharable_container,
+	'swnd' : sharing_window,
 }
 
 _propdeclarations = {
-	'fitp' : file_type_obsolete,
-	'swnd' : sharing_window,
 	'cfol' : folder_obsolete,
+	'cobj' : item,
 	'crtd' : creation_date_obsolete,
+	'ctnr' : container,
+	'cwnd' : container_window,
+	'fitp' : file_type_obsolete,
 	'islk' : locked_obsolete,
 	'modd' : modification_date_obsolete,
-	'sctr' : sharable_container,
 	'pvwp' : view_preferences,
-	'cwnd' : container_window,
-	'ctnr' : container,
-	'cobj' : item,
+	'sctr' : sharable_container,
+	'swnd' : sharing_window,
 }
 
 _compdeclarations = {
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Process_classes.py b/Lib/plat-mac/lib-scriptpackages/Finder/Process_classes.py
index 541abf6..3ca857f 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Process_classes.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Process_classes.py
@@ -42,30 +42,6 @@
 class process(aetools.ComponentItem):
 	"""process - A process running on this computer """
 	want = 'prcs'
-class name(aetools.NProperty):
-	"""name - the name of the process """
-	which = 'pnam'
-	want = 'itxt'
-class visible(aetools.NProperty):
-	"""visible - Is the process' layer visible? """
-	which = 'pvis'
-	want = 'bool'
-class frontmost(aetools.NProperty):
-	"""frontmost - Is the process the frontmost process? """
-	which = 'pisf'
-	want = 'bool'
-class file(aetools.NProperty):
-	"""file - the file from which the process was launched """
-	which = 'file'
-	want = 'obj '
-class file_type(aetools.NProperty):
-	"""file type - the OSType of the file type of the process """
-	which = 'asty'
-	want = 'type'
-class creator_type(aetools.NProperty):
-	"""creator type - the OSType of the creator of the process (the signature) """
-	which = 'fcrt'
-	want = 'type'
 class accepts_high_level_events(aetools.NProperty):
 	"""accepts high level events - Is the process high-level event aware (accepts open application, open document, print document, and quit)? """
 	which = 'isab'
@@ -74,18 +50,42 @@
 	"""accepts remote events - Does the process accept remote events? """
 	which = 'revt'
 	want = 'bool'
+class creator_type(aetools.NProperty):
+	"""creator type - the OSType of the creator of the process (the signature) """
+	which = 'fcrt'
+	want = 'type'
+class file(aetools.NProperty):
+	"""file - the file from which the process was launched """
+	which = 'file'
+	want = 'obj '
+class file_type(aetools.NProperty):
+	"""file type - the OSType of the file type of the process """
+	which = 'asty'
+	want = 'type'
+class frontmost(aetools.NProperty):
+	"""frontmost - Is the process the frontmost process? """
+	which = 'pisf'
+	want = 'bool'
 class has_scripting_terminology(aetools.NProperty):
 	"""has scripting terminology - Does the process have a scripting terminology, i.e., can it be scripted? """
 	which = 'hscr'
 	want = 'bool'
-class total_partition_size(aetools.NProperty):
-	"""total partition size - the size of the partition with which the process was launched """
-	which = 'appt'
-	want = 'long'
+class name(aetools.NProperty):
+	"""name - the name of the process """
+	which = 'pnam'
+	want = 'itxt'
 class partition_space_used(aetools.NProperty):
 	"""partition space used - the number of bytes currently used in the process' partition """
 	which = 'pusd'
 	want = 'long'
+class total_partition_size(aetools.NProperty):
+	"""total partition size - the size of the partition with which the process was launched """
+	which = 'appt'
+	want = 'long'
+class visible(aetools.NProperty):
+	"""visible - Is the process' layer visible? """
+	which = 'pvis'
+	want = 'bool'
 
 processes = process
 application_process._superclassnames = ['process']
@@ -104,17 +104,17 @@
 }
 process._superclassnames = []
 process._privpropdict = {
-	'name' : name,
-	'visible' : visible,
-	'frontmost' : frontmost,
-	'file' : file,
-	'file_type' : file_type,
-	'creator_type' : creator_type,
 	'accepts_high_level_events' : accepts_high_level_events,
 	'accepts_remote_events' : accepts_remote_events,
+	'creator_type' : creator_type,
+	'file' : file,
+	'file_type' : file_type,
+	'frontmost' : frontmost,
 	'has_scripting_terminology' : has_scripting_terminology,
-	'total_partition_size' : total_partition_size,
+	'name' : name,
 	'partition_space_used' : partition_space_used,
+	'total_partition_size' : total_partition_size,
+	'visible' : visible,
 }
 process._privelemdict = {
 }
@@ -123,25 +123,25 @@
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'prcs' : process,
-	'pcda' : desk_accessory_process,
 	'pcap' : application_process,
+	'pcda' : desk_accessory_process,
+	'prcs' : process,
 }
 
 _propdeclarations = {
-	'pvis' : visible,
-	'pisf' : frontmost,
+	'appf' : application_file,
 	'appt' : total_partition_size,
-	'isab' : accepts_high_level_events,
-	'dafi' : desk_accessory_file,
-	'hscr' : has_scripting_terminology,
 	'asty' : file_type,
 	'c@#^' : _3c_Inheritance_3e_,
+	'dafi' : desk_accessory_file,
 	'fcrt' : creator_type,
-	'pusd' : partition_space_used,
 	'file' : file,
+	'hscr' : has_scripting_terminology,
+	'isab' : accepts_high_level_events,
+	'pisf' : frontmost,
 	'pnam' : name,
-	'appf' : application_file,
+	'pusd' : partition_space_used,
+	'pvis' : visible,
 	'revt' : accepts_remote_events,
 }
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Type_Definitions.py b/Lib/plat-mac/lib-scriptpackages/Finder/Type_Definitions.py
index 4742078..d12a0ed 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Type_Definitions.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Type_Definitions.py
@@ -22,68 +22,64 @@
 class icon_family(aetools.ComponentItem):
 	"""icon family - A family of icons """
 	want = 'ifam'
-class large_monochrome_icon_and_mask(aetools.NProperty):
-	"""large monochrome icon and mask - the large black-and-white icon and the mask for large icons """
-	which = 'ICN#'
-	want = 'ICN#'
-class large_8_bit_mask(aetools.NProperty):
-	"""large 8 bit mask - the large 8-bit mask for large 32-bit icons """
-	which = 'l8mk'
-	want = 'l8mk'
 class large_32_bit_icon(aetools.NProperty):
 	"""large 32 bit icon - the large 32-bit color icon """
 	which = 'il32'
 	want = 'il32'
-class large_8_bit_icon(aetools.NProperty):
-	"""large 8 bit icon - the large 8-bit color icon """
-	which = 'icl8'
-	want = 'icl8'
 class large_4_bit_icon(aetools.NProperty):
 	"""large 4 bit icon - the large 4-bit color icon """
 	which = 'icl4'
 	want = 'icl4'
-class small_monochrome_icon_and_mask(aetools.NProperty):
-	"""small monochrome icon and mask - the small black-and-white icon and the mask for small icons """
-	which = 'ics#'
-	want = 'ics#'
-class small_8_bit_mask(aetools.NProperty):
-	"""small 8 bit mask - the small 8-bit mask for small 32-bit icons """
-	which = 'ics8'
-	want = 's8mk'
+class large_8_bit_icon(aetools.NProperty):
+	"""large 8 bit icon - the large 8-bit color icon """
+	which = 'icl8'
+	want = 'icl8'
+class large_8_bit_mask(aetools.NProperty):
+	"""large 8 bit mask - the large 8-bit mask for large 32-bit icons """
+	which = 'l8mk'
+	want = 'l8mk'
+class large_monochrome_icon_and_mask(aetools.NProperty):
+	"""large monochrome icon and mask - the large black-and-white icon and the mask for large icons """
+	which = 'ICN#'
+	want = 'ICN#'
 class small_32_bit_icon(aetools.NProperty):
 	"""small 32 bit icon - the small 32-bit color icon """
 	which = 'is32'
 	want = 'is32'
-
-small_8_bit_icon = small_8_bit_mask
 class small_4_bit_icon(aetools.NProperty):
 	"""small 4 bit icon - the small 4-bit color icon """
 	which = 'ics4'
 	want = 'ics4'
+class small_8_bit_icon(aetools.NProperty):
+	"""small 8 bit icon - the small 8-bit color icon """
+	which = 'ics8'
+	want = 'ics8'
+
+small_8_bit_mask = small_8_bit_icon
+class small_monochrome_icon_and_mask(aetools.NProperty):
+	"""small monochrome icon and mask - the small black-and-white icon and the mask for small icons """
+	which = 'ics#'
+	want = 'ics#'
 
 class label(aetools.ComponentItem):
 	"""label - A Finder label (name and color) """
 	want = 'clbl'
-class name(aetools.NProperty):
-	"""name - the name associated with the label """
-	which = 'pnam'
-	want = 'itxt'
-class index(aetools.NProperty):
-	"""index - the index in the front-to-back ordering within its container """
-	which = 'pidx'
-	want = 'long'
 class color(aetools.NProperty):
 	"""color - the color associated with the label """
 	which = 'colr'
 	want = 'cRGB'
+class index(aetools.NProperty):
+	"""index - the index in the front-to-back ordering within its container """
+	which = 'pidx'
+	want = 'long'
+class name(aetools.NProperty):
+	"""name - the name associated with the label """
+	which = 'pnam'
+	want = 'itxt'
 
 class preferences(aetools.ComponentItem):
 	"""preferences - The Finder Preferences """
 	want = 'cprf'
-class window(aetools.NProperty):
-	"""window - the window that would open if Finder preferences was opened """
-	which = 'cwin'
-	want = 'pwnd'
 class button_view_arrangement(aetools.NProperty):
 	"""button view arrangement - the method of arrangement of icons in default Finder button view windows """
 	which = 'barr'
@@ -92,18 +88,14 @@
 	"""button view icon size - the size of icons displayed in Finder button view windows. """
 	which = 'bisz'
 	want = 'long'
-class spatial_view_arrangement(aetools.NProperty):
-	"""spatial view arrangement - the method of arrangement of icons in default Finder spatial view windows """
-	which = 'iarr'
-	want = 'earr'
-class spatial_view_icon_size(aetools.NProperty):
-	"""spatial view icon size - the size of icons displayed in Finder spatial view windows. """
-	which = 'iisz'
-	want = 'long'
 class calculates_folder_sizes(aetools.NProperty):
 	"""calculates folder sizes - Are folder sizes calculated and displayed in Finder list view windows? """
 	which = 'sfsz'
 	want = 'bool'
+class delay_before_springing(aetools.NProperty):
+	"""delay before springing - the delay before springing open a container in ticks (1/60th of a second) (12 is shortest delay, 60 is longest delay) """
+	which = 'dela'
+	want = 'shor'
 class list_view_icon_size(aetools.NProperty):
 	"""list view icon size - the size of icons displayed in Finder list view windows. """
 	which = 'lisz'
@@ -136,6 +128,18 @@
 	"""shows version - Are file versions displayed in default Finder list view windows? """
 	which = 'svrs'
 	want = 'bool'
+class spatial_view_arrangement(aetools.NProperty):
+	"""spatial view arrangement - the method of arrangement of icons in default Finder spatial view windows """
+	which = 'iarr'
+	want = 'earr'
+class spatial_view_icon_size(aetools.NProperty):
+	"""spatial view icon size - the size of icons displayed in Finder spatial view windows. """
+	which = 'iisz'
+	want = 'long'
+class spring_open_folders(aetools.NProperty):
+	"""spring open folders - Spring open folders after the specified delay? """
+	which = 'sprg'
+	want = 'bool'
 class uses_relative_dates(aetools.NProperty):
 	"""uses relative dates - Are relative dates (e.g., today, yesterday) shown  in Finder list view windows? """
 	which = 'urdt'
@@ -148,14 +152,6 @@
 	"""uses wide grid - Space icons on a wide grid? """
 	which = 'uswg'
 	want = 'bool'
-class spring_open_folders(aetools.NProperty):
-	"""spring open folders - Spring open folders after the specified delay? """
-	which = 'sprg'
-	want = 'bool'
-class delay_before_springing(aetools.NProperty):
-	"""delay before springing - the delay before springing open a container in ticks (1/60th of a second) (12 is shortest delay, 60 is longest delay) """
-	which = 'dela'
-	want = 'shor'
 class view_font(aetools.NProperty):
 	"""view font - the id of the font used in Finder views. """
 	which = 'vfnt'
@@ -164,6 +160,10 @@
 	"""view font size - the size of the font used in Finder views """
 	which = 'vfsz'
 	want = 'long'
+class window(aetools.NProperty):
+	"""window - the window that would open if Finder preferences was opened """
+	which = 'cwin'
+	want = 'pwnd'
 #        element 'clbl' as ['indx', 'name']
 alias_list._superclassnames = []
 alias_list._privpropdict = {
@@ -172,35 +172,33 @@
 }
 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,
-	'large_8_bit_icon' : large_8_bit_icon,
 	'large_4_bit_icon' : large_4_bit_icon,
-	'small_monochrome_icon_and_mask' : small_monochrome_icon_and_mask,
-	'small_8_bit_mask' : small_8_bit_mask,
+	'large_8_bit_icon' : large_8_bit_icon,
+	'large_8_bit_mask' : large_8_bit_mask,
+	'large_monochrome_icon_and_mask' : large_monochrome_icon_and_mask,
 	'small_32_bit_icon' : small_32_bit_icon,
-	'small_8_bit_icon' : small_8_bit_icon,
 	'small_4_bit_icon' : small_4_bit_icon,
+	'small_8_bit_icon' : small_8_bit_icon,
+	'small_8_bit_mask' : small_8_bit_mask,
+	'small_monochrome_icon_and_mask' : small_monochrome_icon_and_mask,
 }
 icon_family._privelemdict = {
 }
 label._superclassnames = []
 label._privpropdict = {
-	'name' : name,
-	'index' : index,
 	'color' : color,
+	'index' : index,
+	'name' : name,
 }
 label._privelemdict = {
 }
 preferences._superclassnames = []
 preferences._privpropdict = {
-	'window' : window,
 	'button_view_arrangement' : button_view_arrangement,
 	'button_view_icon_size' : button_view_icon_size,
-	'spatial_view_arrangement' : spatial_view_arrangement,
-	'spatial_view_icon_size' : spatial_view_icon_size,
 	'calculates_folder_sizes' : calculates_folder_sizes,
+	'delay_before_springing' : delay_before_springing,
 	'list_view_icon_size' : list_view_icon_size,
 	'shows_comments' : shows_comments,
 	'shows_creation_date' : shows_creation_date,
@@ -209,13 +207,15 @@
 	'shows_modification_date' : shows_modification_date,
 	'shows_size' : shows_size,
 	'shows_version' : shows_version,
+	'spatial_view_arrangement' : spatial_view_arrangement,
+	'spatial_view_icon_size' : spatial_view_icon_size,
+	'spring_open_folders' : spring_open_folders,
 	'uses_relative_dates' : uses_relative_dates,
 	'uses_simple_menus' : uses_simple_menus,
 	'uses_wide_grid' : uses_wide_grid,
-	'spring_open_folders' : spring_open_folders,
-	'delay_before_springing' : delay_before_springing,
 	'view_font' : view_font,
 	'view_font_size' : view_font_size,
+	'window' : window,
 }
 preferences._privelemdict = {
 	'label' : label,
@@ -225,46 +225,46 @@
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'cprf' : preferences,
 	'alst' : alias_list,
-	'ifam' : icon_family,
 	'clbl' : label,
+	'cprf' : preferences,
+	'ifam' : icon_family,
 }
 
 _propdeclarations = {
-	'dela' : delay_before_springing,
-	'ics4' : small_4_bit_icon,
-	'iarr' : spatial_view_arrangement,
-	'barr' : button_view_arrangement,
-	'vfnt' : view_font,
-	'sknd' : shows_kind,
-	'svrs' : shows_version,
-	'colr' : color,
-	'ics8' : small_8_bit_mask,
-	'icl8' : large_8_bit_icon,
-	'pidx' : index,
-	'vfsz' : view_font_size,
-	'sfsz' : calculates_folder_sizes,
-	'ics#' : small_monochrome_icon_and_mask,
-	'urdt' : uses_relative_dates,
-	'bisz' : button_view_icon_size,
-	'usme' : uses_simple_menus,
-	'sprg' : spring_open_folders,
-	'icl4' : large_4_bit_icon,
-	'slbl' : shows_label,
-	'lisz' : list_view_icon_size,
-	'ssiz' : shows_size,
-	'l8mk' : large_8_bit_mask,
-	'scom' : shows_comments,
-	'iisz' : spatial_view_icon_size,
-	'sdat' : shows_modification_date,
-	'cwin' : window,
 	'ICN#' : large_monochrome_icon_and_mask,
-	'is32' : small_32_bit_icon,
-	'pnam' : name,
+	'barr' : button_view_arrangement,
+	'bisz' : button_view_icon_size,
+	'colr' : color,
+	'cwin' : window,
+	'dela' : delay_before_springing,
+	'iarr' : spatial_view_arrangement,
+	'icl4' : large_4_bit_icon,
+	'icl8' : large_8_bit_icon,
+	'ics#' : small_monochrome_icon_and_mask,
+	'ics4' : small_4_bit_icon,
+	'ics8' : small_8_bit_icon,
+	'iisz' : spatial_view_icon_size,
 	'il32' : large_32_bit_icon,
-	'uswg' : uses_wide_grid,
+	'is32' : small_32_bit_icon,
+	'l8mk' : large_8_bit_mask,
+	'lisz' : list_view_icon_size,
+	'pidx' : index,
+	'pnam' : name,
 	'scda' : shows_creation_date,
+	'scom' : shows_comments,
+	'sdat' : shows_modification_date,
+	'sfsz' : calculates_folder_sizes,
+	'sknd' : shows_kind,
+	'slbl' : shows_label,
+	'sprg' : spring_open_folders,
+	'ssiz' : shows_size,
+	'svrs' : shows_version,
+	'urdt' : uses_relative_dates,
+	'usme' : uses_simple_menus,
+	'uswg' : uses_wide_grid,
+	'vfnt' : view_font,
+	'vfsz' : view_font_size,
 }
 
 _compdeclarations = {
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Window_classes.py b/Lib/plat-mac/lib-scriptpackages/Finder/Window_classes.py
index dad3e35..9c70beb 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Window_classes.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Window_classes.py
@@ -28,42 +28,30 @@
 class container_window(aetools.ComponentItem):
 	"""container window - A window that contains items """
 	want = 'cwnd'
+class button_view_arrangement(aetools.NProperty):
+	"""button view arrangement - the property by which to keep icons arranged within a button view window """
+	which = 'barr'
+	want = 'earr'
+class calculates_folder_sizes(aetools.NProperty):
+	"""calculates folder sizes - Are folder sizes calculated and displayed in the window? (does not apply to suitcase windows) """
+	which = 'sfsz'
+	want = 'bool'
 class container(aetools.NProperty):
 	"""container - the container from which the window was opened """
 	which = 'ctnr'
 	want = 'obj '
-class item(aetools.NProperty):
-	"""item - the item from which the window was opened (always returns something) """
-	which = 'cobj'
-	want = 'obj '
 class has_custom_view_settings(aetools.NProperty):
 	"""has custom view settings - Does the folder have custom view settings or is it using the default global settings? """
 	which = 'cuss'
 	want = 'bool'
-class view(aetools.NProperty):
-	"""view - the current view for the window (icon, name, date, etc.) """
-	which = 'pvew'
-	want = 'long'
+class item(aetools.NProperty):
+	"""item - the item from which the window was opened (always returns something) """
+	which = 'cobj'
+	want = 'obj '
 class previous_list_view(aetools.NProperty):
 	"""previous list view - the last non-icon view (by name, by date, etc.) selected for the container (forgotten as soon as the window is closed and only available when the window is open) """
 	which = 'svew'
 	want = 'enum'
-class button_view_arrangement(aetools.NProperty):
-	"""button view arrangement - the property by which to keep icons arranged within a button view window """
-	which = 'barr'
-	want = 'earr'
-class spatial_view_arrangement(aetools.NProperty):
-	"""spatial view arrangement - the property by which to keep icons arranged within a spatial view window """
-	which = 'iarr'
-	want = 'earr'
-class sort_direction(aetools.NProperty):
-	"""sort direction - The direction in which the window is sorted """
-	which = 'sord'
-	want = 'sodr'
-class calculates_folder_sizes(aetools.NProperty):
-	"""calculates folder sizes - Are folder sizes calculated and displayed in the window? (does not apply to suitcase windows) """
-	which = 'sfsz'
-	want = 'bool'
 class shows_comments(aetools.NProperty):
 	"""shows comments - Are comments displayed in the window? (does not apply to suitcases) """
 	which = 'scom'
@@ -92,10 +80,22 @@
 	"""shows version - Are file versions displayed in the window? (does not apply to suitcase windows) """
 	which = 'svrs'
 	want = 'bool'
+class sort_direction(aetools.NProperty):
+	"""sort direction - The direction in which the window is sorted """
+	which = 'sord'
+	want = 'sodr'
+class spatial_view_arrangement(aetools.NProperty):
+	"""spatial view arrangement - the property by which to keep icons arranged within a spatial view window """
+	which = 'iarr'
+	want = 'earr'
 class uses_relative_dates(aetools.NProperty):
 	"""uses relative dates - Are relative dates (e.g., today, yesterday) shown in the window? """
 	which = 'urdt'
 	want = 'bool'
+class view(aetools.NProperty):
+	"""view - the current view for the window (icon, name, date, etc.) """
+	which = 'pvew'
+	want = 'long'
 
 container_windows = container_window
 
@@ -108,42 +108,18 @@
 class information_window(aetools.ComponentItem):
 	"""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 """
-	which = 'panl'
-	want = 'ipnl'
 class comment(aetools.NProperty):
 	"""comment - the comment """
 	which = 'comt'
 	want = 'itxt'
-class size(aetools.NProperty):
-	"""size - the logical size of the item """
-	which = 'ptsz'
-	want = 'long'
-class physical_size(aetools.NProperty):
-	"""physical size - the actual space used by the item on disk """
-	which = 'phys'
-	want = 'long'
 class creation_date(aetools.NProperty):
 	"""creation date - the date on which the item was created """
 	which = 'ascd'
 	want = 'ldt '
-class modification_date(aetools.NProperty):
-	"""modification date - the date on which the item was last modified """
-	which = 'asmo'
-	want = 'ldt '
-class suggested_size(aetools.NProperty):
-	"""suggested size - the memory size with which the developer recommends the application be launched """
-	which = 'sprt'
-	want = 'long'
-class minimum_size(aetools.NProperty):
-	"""minimum size - the smallest memory size with which the application can be launched (only applies to information windows for applications) """
-	which = 'mprt'
-	want = 'long'
-class preferred_size(aetools.NProperty):
-	"""preferred size - the memory size with which the application will be launched (only applies to information windows for applications) """
-	which = 'appt'
-	want = 'long'
+class current_panel(aetools.NProperty):
+	"""current panel - the current panel in the information window """
+	which = 'panl'
+	want = 'ipnl'
 class icon(aetools.NProperty):
 	"""icon - the icon bitmap of the item """
 	which = 'iimg'
@@ -152,22 +128,46 @@
 	"""locked - Is the item locked (applies only to file and application information windows)? """
 	which = 'aslk'
 	want = 'bool'
-class stationery(aetools.NProperty):
-	"""stationery - Is the item a stationery pad? """
-	which = 'pspd'
-	want = 'bool'
-class warns_before_emptying(aetools.NProperty):
-	"""warns before emptying - Display a dialog when emptying the trash (only valid for trash info window)? """
-	which = 'warn'
-	want = 'bool'
+class minimum_size(aetools.NProperty):
+	"""minimum size - the smallest memory size with which the application can be launched (only applies to information windows for applications) """
+	which = 'mprt'
+	want = 'long'
+class modification_date(aetools.NProperty):
+	"""modification date - the date on which the item was last modified """
+	which = 'asmo'
+	want = 'ldt '
+class physical_size(aetools.NProperty):
+	"""physical size - the actual space used by the item on disk """
+	which = 'phys'
+	want = 'long'
+class preferred_size(aetools.NProperty):
+	"""preferred size - the memory size with which the application will be launched (only applies to information windows for applications) """
+	which = 'appt'
+	want = 'long'
 class product_version(aetools.NProperty):
 	"""product version - the version of the product (visible at the top of the \xd2Get Info\xd3 window) """
 	which = 'ver2'
 	want = 'itxt'
+class size(aetools.NProperty):
+	"""size - the logical size of the item """
+	which = 'ptsz'
+	want = 'long'
+class stationery(aetools.NProperty):
+	"""stationery - Is the item a stationery pad? """
+	which = 'pspd'
+	want = 'bool'
+class suggested_size(aetools.NProperty):
+	"""suggested size - the memory size with which the developer recommends the application be launched """
+	which = 'sprt'
+	want = 'long'
 class version(aetools.NProperty):
 	"""version - the version of the file (visible at the bottom of the \xd2Get Info\xd3 window) """
 	which = 'vers'
 	want = 'itxt'
+class warns_before_emptying(aetools.NProperty):
+	"""warns before emptying - Display a dialog when emptying the trash (only valid for trash info window)? """
+	which = 'warn'
+	want = 'bool'
 
 information_windows = information_window
 
@@ -184,42 +184,58 @@
 class window(aetools.ComponentItem):
 	"""window - A window """
 	want = 'cwin'
-class position(aetools.NProperty):
-	"""position - the upper left position of the window """
-	which = 'posn'
-	want = 'QDpt'
 class bounds(aetools.NProperty):
 	"""bounds - the boundary rectangle for the window """
 	which = 'pbnd'
 	want = 'qdrt'
-class titled(aetools.NProperty):
-	"""titled - Does the window have a title bar? """
-	which = 'ptit'
-	want = 'bool'
-class name(aetools.NProperty):
-	"""name - the name of the window """
-	which = 'pnam'
-	want = 'itxt'
-class index(aetools.NProperty):
-	"""index - the number of the window in the front-to-back layer ordering """
-	which = 'pidx'
-	want = 'long'
 class closeable(aetools.NProperty):
 	"""closeable - Does the window have a close box? """
 	which = 'hclb'
 	want = 'bool'
+class collapsed(aetools.NProperty):
+	"""collapsed - Is the window collapsed (only applies to open non-pop-up windows)? """
+	which = 'wshd'
+	want = 'bool'
 class floating(aetools.NProperty):
 	"""floating - Does the window have a title bar? """
 	which = 'isfl'
 	want = 'bool'
+class index(aetools.NProperty):
+	"""index - the number of the window in the front-to-back layer ordering """
+	which = 'pidx'
+	want = 'long'
 class modal(aetools.NProperty):
 	"""modal - Is the window modal? """
 	which = 'pmod'
 	want = 'bool'
+class name(aetools.NProperty):
+	"""name - the name of the window """
+	which = 'pnam'
+	want = 'itxt'
+class popup(aetools.NProperty):
+	"""popup - Is the window is a pop-up window? (only applies to open container windows in the Finder and can only be set when the Finder is the front application) """
+	which = 'drwr'
+	want = 'bool'
+class position(aetools.NProperty):
+	"""position - the upper left position of the window """
+	which = 'posn'
+	want = 'QDpt'
+class pulled_open(aetools.NProperty):
+	"""pulled open - Is the window pulled open (only applies to pop-up windows and can only be set when the Finder is the front application)? """
+	which = 'pull'
+	want = 'bool'
 class resizable(aetools.NProperty):
 	"""resizable - Is the window resizable? """
 	which = 'prsz'
 	want = 'bool'
+class titled(aetools.NProperty):
+	"""titled - Does the window have a title bar? """
+	which = 'ptit'
+	want = 'bool'
+class visible(aetools.NProperty):
+	"""visible - Is the window visible (always true for open Finder windows)? """
+	which = 'pvis'
+	want = 'bool'
 class zoomable(aetools.NProperty):
 	"""zoomable - Is the window zoomable? """
 	which = 'iszm'
@@ -232,22 +248,6 @@
 	"""zoomed full size - Is the window zoomed to the full size of the screen? (can only be set, not read, and only applies to open non-pop-up windows) """
 	which = 'zumf'
 	want = 'bool'
-class visible(aetools.NProperty):
-	"""visible - Is the window visible (always true for open Finder windows)? """
-	which = 'pvis'
-	want = 'bool'
-class popup(aetools.NProperty):
-	"""popup - Is the window is a pop-up window? (only applies to open container windows in the Finder and can only be set when the Finder is the front application) """
-	which = 'drwr'
-	want = 'bool'
-class pulled_open(aetools.NProperty):
-	"""pulled open - Is the window pulled open (only applies to pop-up windows and can only be set when the Finder is the front application)? """
-	which = 'pull'
-	want = 'bool'
-class collapsed(aetools.NProperty):
-	"""collapsed - Is the window collapsed (only applies to open non-pop-up windows)? """
-	which = 'wshd'
-	want = 'bool'
 
 windows = window
 clipping_window._superclassnames = ['window']
@@ -259,15 +259,12 @@
 container_window._superclassnames = ['window']
 container_window._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'container' : container,
-	'item' : item,
-	'has_custom_view_settings' : has_custom_view_settings,
-	'view' : view,
-	'previous_list_view' : previous_list_view,
 	'button_view_arrangement' : button_view_arrangement,
-	'spatial_view_arrangement' : spatial_view_arrangement,
-	'sort_direction' : sort_direction,
 	'calculates_folder_sizes' : calculates_folder_sizes,
+	'container' : container,
+	'has_custom_view_settings' : has_custom_view_settings,
+	'item' : item,
+	'previous_list_view' : previous_list_view,
 	'shows_comments' : shows_comments,
 	'shows_creation_date' : shows_creation_date,
 	'shows_kind' : shows_kind,
@@ -275,7 +272,10 @@
 	'shows_modification_date' : shows_modification_date,
 	'shows_size' : shows_size,
 	'shows_version' : shows_version,
+	'sort_direction' : sort_direction,
+	'spatial_view_arrangement' : spatial_view_arrangement,
 	'uses_relative_dates' : uses_relative_dates,
+	'view' : view,
 }
 container_window._privelemdict = {
 }
@@ -287,22 +287,22 @@
 information_window._superclassnames = ['window']
 information_window._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'item' : item,
-	'current_panel' : current_panel,
 	'comment' : comment,
-	'size' : size,
-	'physical_size' : physical_size,
 	'creation_date' : creation_date,
-	'modification_date' : modification_date,
-	'suggested_size' : suggested_size,
-	'minimum_size' : minimum_size,
-	'preferred_size' : preferred_size,
+	'current_panel' : current_panel,
 	'icon' : icon,
+	'item' : item,
 	'locked' : locked,
-	'stationery' : stationery,
-	'warns_before_emptying' : warns_before_emptying,
+	'minimum_size' : minimum_size,
+	'modification_date' : modification_date,
+	'physical_size' : physical_size,
+	'preferred_size' : preferred_size,
 	'product_version' : product_version,
+	'size' : size,
+	'stationery' : stationery,
+	'suggested_size' : suggested_size,
 	'version' : version,
+	'warns_before_emptying' : warns_before_emptying,
 }
 information_window._privelemdict = {
 }
@@ -322,22 +322,22 @@
 }
 window._superclassnames = []
 window._privpropdict = {
-	'position' : position,
 	'bounds' : bounds,
-	'titled' : titled,
-	'name' : name,
-	'index' : index,
 	'closeable' : closeable,
+	'collapsed' : collapsed,
 	'floating' : floating,
+	'index' : index,
 	'modal' : modal,
+	'name' : name,
+	'popup' : popup,
+	'position' : position,
+	'pulled_open' : pulled_open,
 	'resizable' : resizable,
+	'titled' : titled,
+	'visible' : visible,
 	'zoomable' : zoomable,
 	'zoomed' : zoomed,
 	'zoomed_full_size' : zoomed_full_size,
-	'visible' : visible,
-	'popup' : popup,
-	'pulled_open' : pulled_open,
-	'collapsed' : collapsed,
 }
 window._privelemdict = {
 }
@@ -346,65 +346,65 @@
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'pwnd' : preferences_window,
 	'cwin' : window,
-	'vwnd' : view_options_window,
-	'lwnd' : clipping_window,
 	'cwnd' : container_window,
 	'dwnd' : content_space,
 	'iwnd' : information_window,
+	'lwnd' : clipping_window,
+	'pwnd' : preferences_window,
+	'vwnd' : view_options_window,
 }
 
 _propdeclarations = {
-	'prsz' : resizable,
-	'barr' : button_view_arrangement,
-	'pbnd' : bounds,
 	'appt' : preferred_size,
-	'iarr' : spatial_view_arrangement,
-	'hclb' : closeable,
-	'c@#^' : _3c_Inheritance_3e_,
-	'ver2' : product_version,
-	'cuss' : has_custom_view_settings,
-	'sprt' : suggested_size,
-	'zumf' : zoomed_full_size,
-	'urdt' : uses_relative_dates,
-	'panl' : current_panel,
-	'pmod' : modal,
-	'scom' : shows_comments,
-	'pspd' : stationery,
-	'aslk' : locked,
-	'pzum' : zoomed,
-	'iimg' : icon,
-	'mprt' : minimum_size,
-	'pnam' : name,
-	'ssiz' : shows_size,
-	'asmo' : modification_date,
-	'cobj' : item,
-	'ptit' : titled,
-	'posn' : position,
-	'vers' : version,
-	'phys' : physical_size,
-	'pull' : pulled_open,
-	'sknd' : shows_kind,
-	'svrs' : shows_version,
-	'svew' : previous_list_view,
-	'comt' : comment,
-	'iszm' : zoomable,
-	'sord' : sort_direction,
 	'ascd' : creation_date,
+	'aslk' : locked,
+	'asmo' : modification_date,
+	'barr' : button_view_arrangement,
+	'c@#^' : _3c_Inheritance_3e_,
+	'cobj' : item,
+	'comt' : comment,
 	'ctnr' : container,
-	'wshd' : collapsed,
-	'slbl' : shows_label,
-	'warn' : warns_before_emptying,
-	'ptsz' : size,
-	'pvis' : visible,
-	'pidx' : index,
-	'isfl' : floating,
+	'cuss' : has_custom_view_settings,
 	'drwr' : popup,
-	'sdat' : shows_modification_date,
+	'hclb' : closeable,
+	'iarr' : spatial_view_arrangement,
+	'iimg' : icon,
+	'isfl' : floating,
+	'iszm' : zoomable,
+	'mprt' : minimum_size,
+	'panl' : current_panel,
+	'pbnd' : bounds,
+	'phys' : physical_size,
+	'pidx' : index,
+	'pmod' : modal,
+	'pnam' : name,
+	'posn' : position,
+	'prsz' : resizable,
+	'pspd' : stationery,
+	'ptit' : titled,
+	'ptsz' : size,
+	'pull' : pulled_open,
 	'pvew' : view,
-	'sfsz' : calculates_folder_sizes,
+	'pvis' : visible,
+	'pzum' : zoomed,
 	'scda' : shows_creation_date,
+	'scom' : shows_comments,
+	'sdat' : shows_modification_date,
+	'sfsz' : calculates_folder_sizes,
+	'sknd' : shows_kind,
+	'slbl' : shows_label,
+	'sord' : sort_direction,
+	'sprt' : suggested_size,
+	'ssiz' : shows_size,
+	'svew' : previous_list_view,
+	'svrs' : shows_version,
+	'urdt' : uses_relative_dates,
+	'ver2' : product_version,
+	'vers' : version,
+	'warn' : warns_before_emptying,
+	'wshd' : collapsed,
+	'zumf' : zoomed_full_size,
 }
 
 _compdeclarations = {
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/__init__.py b/Lib/plat-mac/lib-scriptpackages/Finder/__init__.py
index dd7dc52..9432c3e 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/__init__.py
@@ -76,19 +76,6 @@
 #
 # 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)
@@ -129,6 +116,20 @@
 getbaseclasses(StdSuites.Type_Names_Suite.target_id)
 getbaseclasses(StdSuites.Type_Names_Suite.point)
 getbaseclasses(StdSuites.Type_Names_Suite.bounding_rectangle)
+getbaseclasses(accessory_suitcase)
+getbaseclasses(preferences)
+getbaseclasses(sharable_container)
+getbaseclasses(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(item)
 getbaseclasses(trash_2d_object)
 getbaseclasses(desktop_2d_object)
 getbaseclasses(sharable_container)
@@ -136,9 +137,6 @@
 getbaseclasses(disk)
 getbaseclasses(folder)
 getbaseclasses(container)
-getbaseclasses(application)
-getbaseclasses(special_folders)
-getbaseclasses(item)
 getbaseclasses(sound_file)
 getbaseclasses(font_file)
 getbaseclasses(internet_location_file)
@@ -152,6 +150,8 @@
 getbaseclasses(suitcase)
 getbaseclasses(document_file)
 getbaseclasses(package)
+getbaseclasses(application)
+getbaseclasses(special_folders)
 getbaseclasses(preferences_window)
 getbaseclasses(view_options_window)
 getbaseclasses(window)
@@ -159,6 +159,17 @@
 getbaseclasses(content_space)
 getbaseclasses(information_window)
 getbaseclasses(clipping_window)
+getbaseclasses(status_window)
+getbaseclasses(application)
+getbaseclasses(sharing_window)
+getbaseclasses(control_panel)
+getbaseclasses(process)
+getbaseclasses(item)
+getbaseclasses(file)
+getbaseclasses(sharable_container)
+getbaseclasses(container_window)
+getbaseclasses(container)
+getbaseclasses(information_window)
 getbaseclasses(process)
 getbaseclasses(desk_accessory_process)
 getbaseclasses(application_process)
@@ -246,35 +257,11 @@
 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)
 
 #
 # 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,
@@ -315,6 +302,20 @@
 	'targ' : StdSuites.Type_Names_Suite.target_id,
 	'QDpt' : StdSuites.Type_Names_Suite.point,
 	'qdrt' : StdSuites.Type_Names_Suite.bounding_rectangle,
+	'dsut' : accessory_suitcase,
+	'cprf' : preferences,
+	'sctr' : sharable_container,
+	'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,
+	'cobj' : item,
 	'ctrs' : trash_2d_object,
 	'cdsk' : desktop_2d_object,
 	'sctr' : sharable_container,
@@ -322,9 +323,6 @@
 	'cdis' : disk,
 	'cfol' : folder,
 	'ctnr' : container,
-	'capp' : application,
-	'spfl' : special_folders,
-	'cobj' : item,
 	'sndf' : sound_file,
 	'fntf' : font_file,
 	'inlf' : internet_location_file,
@@ -338,6 +336,8 @@
 	'stcs' : suitcase,
 	'docf' : document_file,
 	'pack' : package,
+	'capp' : application,
+	'spfl' : special_folders,
 	'pwnd' : preferences_window,
 	'vwnd' : view_options_window,
 	'cwin' : window,
@@ -345,6 +345,17 @@
 	'dwnd' : content_space,
 	'iwnd' : information_window,
 	'lwnd' : clipping_window,
+	'qwnd' : status_window,
+	'capp' : application,
+	'swnd' : sharing_window,
+	'ccdv' : control_panel,
+	'prcs' : process,
+	'cobj' : item,
+	'file' : file,
+	'sctr' : sharable_container,
+	'cwnd' : container_window,
+	'ctnr' : container,
+	'iwnd' : information_window,
 	'prcs' : process,
 	'pcda' : desk_accessory_process,
 	'pcap' : application_process,
@@ -432,17 +443,6 @@
 	'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,
 }
 
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Netscape/Mozilla_suite.py b/Lib/plat-mac/lib-scriptpackages/Netscape/Mozilla_suite.py
index ede7189..c179154 100644
--- a/Lib/plat-mac/lib-scriptpackages/Netscape/Mozilla_suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Netscape/Mozilla_suite.py
@@ -264,6 +264,6 @@
 
 _enumdeclarations = {
 	'comp' : _Enum_comp,
-	'ncmd' : _Enum_ncmd,
 	'dire' : _Enum_dire,
+	'ncmd' : _Enum_ncmd,
 }
diff --git a/Lib/plat-mac/lib-scriptpackages/Netscape/Standard_Suite.py b/Lib/plat-mac/lib-scriptpackages/Netscape/Standard_Suite.py
index aa1d087..5e62104 100644
--- a/Lib/plat-mac/lib-scriptpackages/Netscape/Standard_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Netscape/Standard_Suite.py
@@ -117,34 +117,58 @@
 class window(aetools.ComponentItem):
 	"""window - A Window """
 	want = 'cwin'
+class URL(aetools.NProperty):
+	"""URL - Current URL """
+	which = 'curl'
+	want = 'TEXT'
 class bounds(aetools.NProperty):
 	"""bounds - the boundary rectangle for the window """
 	which = 'pbnd'
 	want = 'qdrt'
+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'
 class closeable(aetools.NProperty):
 	"""closeable - Does the window have a close box? """
 	which = 'hclb'
 	want = 'bool'
-class titled(aetools.NProperty):
-	"""titled - Does the window have a title bar? """
-	which = 'ptit'
+class floating(aetools.NProperty):
+	"""floating - Does the window float? """
+	which = 'isfl'
 	want = 'bool'
 class index(aetools.NProperty):
 	"""index - the number of the window """
 	which = 'pidx'
 	want = 'long'
-class floating(aetools.NProperty):
-	"""floating - Does the window float? """
-	which = 'isfl'
-	want = 'bool'
 class modal(aetools.NProperty):
 	"""modal - Is the window modal? """
 	which = 'pmod'
 	want = 'bool'
+class name(aetools.NProperty):
+	"""name - the title of the window """
+	which = 'pnam'
+	want = 'itxt'
+class position(aetools.NProperty):
+	"""position - upper left coordinates of window """
+	which = 'ppos'
+	want = 'QDpt'
 class resizable(aetools.NProperty):
 	"""resizable - Is the window resizable? """
 	which = 'prsz'
 	want = 'bool'
+class titled(aetools.NProperty):
+	"""titled - Does the window have a title bar? """
+	which = 'ptit'
+	want = 'bool'
+class unique_ID(aetools.NProperty):
+	"""unique ID - Window\xd5s unique ID (a bridge between WWW! suite window id\xd5s and standard AE windows) """
+	which = 'wiid'
+	want = 'long'
+class visible(aetools.NProperty):
+	"""visible - is the window visible? """
+	which = 'pvis'
+	want = 'bool'
 class zoomable(aetools.NProperty):
 	"""zoomable - Is the window zoomable? """
 	which = 'iszm'
@@ -153,30 +177,6 @@
 	"""zoomed - Is the window zoomed? """
 	which = 'pzum'
 	want = 'bool'
-class name(aetools.NProperty):
-	"""name - the title of the window """
-	which = 'pnam'
-	want = 'itxt'
-class visible(aetools.NProperty):
-	"""visible - is the window visible? """
-	which = 'pvis'
-	want = 'bool'
-class position(aetools.NProperty):
-	"""position - upper left coordinates of window """
-	which = 'ppos'
-	want = 'QDpt'
-class URL(aetools.NProperty):
-	"""URL - Current URL """
-	which = 'curl'
-	want = 'TEXT'
-class unique_ID(aetools.NProperty):
-	"""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._superclassnames = []
 application._privpropdict = {
 	'alert_application' : alert_application,
@@ -187,21 +187,21 @@
 }
 window._superclassnames = []
 window._privpropdict = {
+	'URL' : URL,
 	'bounds' : bounds,
+	'busy' : busy,
 	'closeable' : closeable,
-	'titled' : titled,
-	'index' : index,
 	'floating' : floating,
+	'index' : index,
 	'modal' : modal,
+	'name' : name,
+	'position' : position,
 	'resizable' : resizable,
+	'titled' : titled,
+	'unique_ID' : unique_ID,
+	'visible' : visible,
 	'zoomable' : zoomable,
 	'zoomed' : zoomed,
-	'name' : name,
-	'visible' : visible,
-	'position' : position,
-	'URL' : URL,
-	'unique_ID' : unique_ID,
-	'busy' : busy,
 }
 window._privelemdict = {
 }
@@ -210,28 +210,28 @@
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'cwin' : window,
 	'capp' : application,
+	'cwin' : window,
 }
 
 _propdeclarations = {
-	'prsz' : resizable,
-	'busy' : busy,
-	'KOSK' : kiosk_mode,
-	'pvis' : visible,
-	'hclb' : closeable,
-	'pmod' : modal,
-	'wiid' : unique_ID,
-	'pbnd' : bounds,
-	'iszm' : zoomable,
 	'ALAP' : alert_application,
-	'pidx' : index,
+	'KOSK' : kiosk_mode,
+	'busy' : busy,
+	'curl' : URL,
+	'hclb' : closeable,
 	'isfl' : floating,
+	'iszm' : zoomable,
+	'pbnd' : bounds,
+	'pidx' : index,
+	'pmod' : modal,
 	'pnam' : name,
 	'ppos' : position,
-	'curl' : URL,
-	'pzum' : zoomed,
+	'prsz' : resizable,
 	'ptit' : titled,
+	'pvis' : visible,
+	'pzum' : zoomed,
+	'wiid' : unique_ID,
 }
 
 _compdeclarations = {
diff --git a/Lib/plat-mac/lib-scriptpackages/Netscape/Text.py b/Lib/plat-mac/lib-scriptpackages/Netscape/Text.py
index 7a36509..82bcd3c 100644
--- a/Lib/plat-mac/lib-scriptpackages/Netscape/Text.py
+++ b/Lib/plat-mac/lib-scriptpackages/Netscape/Text.py
@@ -19,10 +19,6 @@
 class styleset(aetools.ComponentItem):
 	"""styleset - A style \xd2set\xd3 that may be used repeatedly in text objects. """
 	want = 'stys'
-class name(aetools.NProperty):
-	"""name - style name """
-	which = 'pnam'
-	want = 'TEXT'
 class color(aetools.NProperty):
 	"""color - the color """
 	which = 'colr'
@@ -31,28 +27,28 @@
 	"""font - font name """
 	which = 'font'
 	want = 'TEXT'
+class name(aetools.NProperty):
+	"""name - style name """
+	which = 'pnam'
+	want = 'TEXT'
 class size(aetools.NProperty):
 	"""size - the size in points """
 	which = 'ptsz'
 	want = 'long'
-class writing_code(aetools.NProperty):
-	"""writing code - the script system and language """
-	which = 'psct'
-	want = 'tsty'
 class style(aetools.NProperty):
 	"""style - the text styles or face attributes """
 	which = 'txst'
 	want = 'tsty'
+class writing_code(aetools.NProperty):
+	"""writing code - the script system and language """
+	which = 'psct'
+	want = 'tsty'
 
 stylesets = styleset
 
 class text(aetools.ComponentItem):
 	"""text - independent text view objects """
 	want = 'ctxt'
-class updateLevel(aetools.NProperty):
-	"""updateLevel - updating level.  Can only be incremented or decremented.  Do so only in a try block -- if the level is greater than zero, visual text updating will cease. """
-	which = 'pUpL'
-	want = 'long'
 class beginning(aetools.NProperty):
 	"""beginning - Beginning of element """
 	which = 'bgng'
@@ -69,25 +65,29 @@
 	"""justbehind - Immediately after element """
 	which = 'pAft'
 	want = 'obj '
+class updateLevel(aetools.NProperty):
+	"""updateLevel - updating level.  Can only be incremented or decremented.  Do so only in a try block -- if the level is greater than zero, visual text updating will cease. """
+	which = 'pUpL'
+	want = 'long'
 #        element 'stys' as ['indx', 'name']
 styleset._superclassnames = []
 styleset._privpropdict = {
-	'name' : name,
 	'color' : color,
 	'font' : font,
+	'name' : name,
 	'size' : size,
-	'writing_code' : writing_code,
 	'style' : style,
+	'writing_code' : writing_code,
 }
 styleset._privelemdict = {
 }
 text._superclassnames = []
 text._privpropdict = {
-	'updateLevel' : updateLevel,
 	'beginning' : beginning,
 	'end' : end,
 	'infront' : infront,
 	'justbehind' : justbehind,
+	'updateLevel' : updateLevel,
 }
 text._privelemdict = {
 	'styleset' : styleset,
@@ -97,22 +97,22 @@
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'stys' : styleset,
 	'ctxt' : text,
+	'stys' : styleset,
 }
 
 _propdeclarations = {
-	'ptsz' : size,
 	'bgng' : beginning,
 	'colr' : color,
-	'txst' : style,
-	'psct' : writing_code,
-	'pAft' : justbehind,
-	'font' : font,
 	'end ' : end,
+	'font' : font,
+	'pAft' : justbehind,
+	'pBef' : infront,
 	'pUpL' : updateLevel,
 	'pnam' : name,
-	'pBef' : infront,
+	'psct' : writing_code,
+	'ptsz' : size,
+	'txst' : style,
 }
 
 _compdeclarations = {
diff --git a/Lib/plat-mac/lib-scriptpackages/StdSuites/AppleScript_Suite.py b/Lib/plat-mac/lib-scriptpackages/StdSuites/AppleScript_Suite.py
index ee76567..28bc0ed 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/AppleScript_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/AppleScript_Suite.py
@@ -863,58 +863,58 @@
 	want = 'capp'
 
 application = app
-class result(aetools.NProperty):
-	"""result - the last result of evaluation """
-	which = 'rslt'
-	want = '****'
-class space(aetools.NProperty):
-	"""space - a space character """
-	which = 'spac'
-	want = 'cha '
-class return_(aetools.NProperty):
-	"""return - a return character """
-	which = 'ret '
-	want = 'cha '
-class tab(aetools.NProperty):
-	"""tab - a tab character """
-	which = 'tab '
-	want = 'cha '
-class minutes(aetools.NProperty):
-	"""minutes - the number of seconds in a minute """
-	which = 'min '
+class AppleScript(aetools.NProperty):
+	"""AppleScript - the top-level script object """
+	which = 'ascr'
+	want = 'scpt'
+class days(aetools.NProperty):
+	"""days - the number of seconds in a day """
+	which = 'days'
 	want = 'long'
 class hours(aetools.NProperty):
 	"""hours - the number of seconds in an hour """
 	which = 'hour'
 	want = 'long'
-class days(aetools.NProperty):
-	"""days - the number of seconds in a day """
-	which = 'days'
-	want = 'long'
-class weeks(aetools.NProperty):
-	"""weeks - the number of seconds in a week """
-	which = 'week'
+class minutes(aetools.NProperty):
+	"""minutes - the number of seconds in a minute """
+	which = 'min '
 	want = 'long'
 class pi(aetools.NProperty):
 	"""pi - the constant pi """
 	which = 'pi  '
 	want = 'doub'
-class print_length(aetools.NProperty):
-	"""print length - the maximum length to print """
-	which = 'prln'
-	want = 'long'
 class print_depth(aetools.NProperty):
 	"""print depth - the maximum depth to print """
 	which = 'prdp'
 	want = 'long'
+class print_length(aetools.NProperty):
+	"""print length - the maximum length to print """
+	which = 'prln'
+	want = 'long'
+class result(aetools.NProperty):
+	"""result - the last result of evaluation """
+	which = 'rslt'
+	want = '****'
+class return_(aetools.NProperty):
+	"""return - a return character """
+	which = 'ret '
+	want = 'cha '
+class space(aetools.NProperty):
+	"""space - a space character """
+	which = 'spac'
+	want = 'cha '
+class tab(aetools.NProperty):
+	"""tab - a tab character """
+	which = 'tab '
+	want = 'cha '
 class text_item_delimiters(aetools.NProperty):
 	"""text item delimiters - the text item delimiters of a string """
 	which = 'txdl'
 	want = 'list'
-class AppleScript(aetools.NProperty):
-	"""AppleScript - the top-level script object """
-	which = 'ascr'
-	want = 'scpt'
+class weeks(aetools.NProperty):
+	"""weeks - the number of seconds in a week """
+	which = 'week'
+	want = 'long'
 
 applications = app
 
@@ -983,34 +983,34 @@
 class date(aetools.ComponentItem):
 	"""date - Absolute date and time values """
 	want = 'ldt '
-class weekday(aetools.NProperty):
-	"""weekday - the day of a week of a date """
-	which = 'wkdy'
-	want = 'wkdy'
-class month(aetools.NProperty):
-	"""month - the month of a date """
-	which = 'mnth'
-	want = 'mnth'
-class day(aetools.NProperty):
-	"""day - the day of the month of a date """
-	which = 'day '
-	want = 'long'
-class year(aetools.NProperty):
-	"""year - the year of a date """
-	which = 'year'
-	want = 'long'
-class time(aetools.NProperty):
-	"""time - the time since midnight of a date """
-	which = 'time'
-	want = 'long'
 class date_string(aetools.NProperty):
 	"""date string - the date portion of a date-time value as text """
 	which = 'dstr'
 	want = 'TEXT'
+class day(aetools.NProperty):
+	"""day - the day of the month of a date """
+	which = 'day '
+	want = 'long'
+class month(aetools.NProperty):
+	"""month - the month of a date """
+	which = 'mnth'
+	want = 'mnth'
+class time(aetools.NProperty):
+	"""time - the time since midnight of a date """
+	which = 'time'
+	want = 'long'
 class time_string(aetools.NProperty):
 	"""time string - the time portion of a date-time value as text """
 	which = 'tstr'
 	want = 'TEXT'
+class weekday(aetools.NProperty):
+	"""weekday - the day of a week of a date """
+	which = 'wkdy'
+	want = 'wkdy'
+class year(aetools.NProperty):
+	"""year - the year of a date """
+	which = 'year'
+	want = 'long'
 
 dates = date
 
@@ -1095,14 +1095,14 @@
 	"""key - the character for the key was pressed (ignoring modifiers) """
 	which = 'kMsg'
 	want = 'cha '
-class modifiers(aetools.NProperty):
-	"""modifiers - the modifier keys pressed in combination """
-	which = 'kMod'
-	want = 'eMds'
 class key_kind(aetools.NProperty):
 	"""key kind - the kind of key that was pressed """
 	which = 'kknd'
 	want = 'ekst'
+class modifiers(aetools.NProperty):
+	"""modifiers - the modifier keys pressed in combination """
+	which = 'kMod'
+	want = 'eMds'
 
 keystrokes = keystroke
 
@@ -1129,14 +1129,14 @@
 class list(aetools.ComponentItem):
 	"""list - An ordered collection of items """
 	want = 'list'
-class reverse(aetools.NProperty):
-	"""reverse - the items of the list in reverse order """
-	which = 'rvse'
-	want = 'list'
 class rest(aetools.NProperty):
 	"""rest - all items of the list excluding first """
 	which = 'rest'
 	want = 'list'
+class reverse(aetools.NProperty):
+	"""reverse - the items of the list in reverse order """
+	which = 'rvse'
+	want = 'list'
 
 class list_or_record(aetools.ComponentItem):
 	"""list or record - a list or record """
@@ -1371,14 +1371,14 @@
 class writing_code_info(aetools.ComponentItem):
 	"""writing code info - script code and language code of text run """
 	want = 'citl'
-class script_code(aetools.NProperty):
-	"""script code - the script code for the text """
-	which = 'pscd'
-	want = 'shor'
 class language_code(aetools.NProperty):
 	"""language code - the language code for the text """
 	which = 'plcd'
 	want = 'shor'
+class script_code(aetools.NProperty):
+	"""script code - the script code for the text """
+	which = 'pscd'
+	want = 'shor'
 
 writing_code_infos = writing_code_info
 
@@ -1594,13 +1594,13 @@
 }
 date._superclassnames = []
 date._privpropdict = {
-	'weekday' : weekday,
-	'month' : month,
-	'day' : day,
-	'year' : year,
-	'time' : time,
 	'date_string' : date_string,
+	'day' : day,
+	'month' : month,
+	'time' : time,
 	'time_string' : time_string,
+	'weekday' : weekday,
+	'year' : year,
 }
 date._privelemdict = {
 }
@@ -1683,8 +1683,8 @@
 keystroke._superclassnames = []
 keystroke._privpropdict = {
 	'key' : key,
-	'modifiers' : modifiers,
 	'key_kind' : key_kind,
+	'modifiers' : modifiers,
 }
 keystroke._privelemdict = {
 }
@@ -1707,8 +1707,8 @@
 list._superclassnames = []
 list._privpropdict = {
 	'length' : length,
-	'reverse' : reverse,
 	'rest' : rest,
+	'reverse' : reverse,
 }
 list._privelemdict = {
 }
@@ -1947,8 +1947,8 @@
 }
 writing_code_info._superclassnames = []
 writing_code_info._privpropdict = {
-	'script_code' : script_code,
 	'language_code' : language_code,
+	'script_code' : script_code,
 }
 writing_code_info._privelemdict = {
 }
@@ -2028,155 +2028,155 @@
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'jul ' : July,
-	'may ' : May,
-	'TEXT' : string,
-	'cmet' : cubic_meters,
-	'STXT' : styled_text,
-	'nds ' : number_2c__date_or_text,
-	'feet' : feet,
-	'feb ' : February,
-	'degc' : degrees_Celsius,
-	'kprs' : keystroke,
-	'psct' : writing_code,
-	'degf' : degrees_Fahrenheit,
-	'lrs ' : list_2c__record_or_text,
-	'ldt ' : date,
-	'degk' : degrees_Kelvin,
-	'sun ' : Sunday,
-	'oct ' : October,
-	'evnt' : event,
-	'pstr' : Pascal_string,
-	'cyrd' : cubic_yards,
+	'****' : anything,
 	'PICT' : picture,
-	'ls  ' : list_or_string,
-	'long' : integer,
-	'prop' : properties,
-	'nmbr' : number,
+	'STXT' : styled_text,
+	'TEXT' : string,
+	'alis' : alias,
+	'apr ' : April,
+	'aug ' : August,
+	'bool' : boolean,
+	'cRGB' : RGB_color,
+	'capp' : app,
+	'case' : upper_case,
+	'ccmt' : cubic_centimeters,
+	'cfet' : cubic_feet,
+	'cha ' : character,
 	'citl' : writing_code_info,
 	'citm' : text_item,
-	'apr ' : April,
-	'thu ' : Thursday,
-	'type' : type_class,
-	'prep' : preposition,
-	'tue ' : Tuesday,
-	'case' : upper_case,
-	'vers' : version,
-	'wed ' : Wednesday,
-	'capp' : app,
-	'sqkm' : square_kilometers,
-	'obj ' : reference,
-	'vect' : vector,
-	'wkdy' : weekday,
-	'cRGB' : RGB_color,
-	'nd  ' : number_or_date,
-	'itxt' : international_text,
-	'scnd' : seconds,
-	'mar ' : March,
-	'kmtr' : kilometers,
-	'sqft' : square_feet,
-	'list' : list,
-	'styl' : styled_Clipboard_text,
-	'nov ' : November,
-	'qrts' : quarts,
-	'mile' : miles,
-	'msng' : missing_value,
-	'alis' : alias,
-	'jan ' : January,
-	'metr' : meters,
-	'mnth' : month,
-	'ns  ' : number_or_string,
-	'jun ' : June,
-	'aug ' : August,
-	'llst' : linked_list,
+	'cmet' : cubic_meters,
+	'cmtr' : centimeters,
+	'cobj' : item,
+	'cstr' : C_string,
+	'ctxt' : text,
+	'cuin' : cubic_inches,
+	'cyrd' : cubic_yards,
+	'dec ' : December,
+	'degc' : degrees_Celsius,
+	'degf' : degrees_Fahrenheit,
+	'degk' : degrees_Kelvin,
 	'doub' : real,
 	'encs' : encoded_string,
-	'galn' : gallons,
-	'cuin' : cubic_inches,
-	'fri ' : Friday,
-	'sf  ' : alias_or_string,
-	'lr  ' : list_or_record,
-	'mon ' : Monday,
-	'snd ' : sound,
-	'sep ' : September,
-	'kgrm' : kilograms,
-	'scpt' : script,
-	'****' : anything,
-	'litr' : liters,
-	'bool' : boolean,
-	'cmtr' : centimeters,
-	'sqrm' : square_meters,
-	'inch' : inches,
-	'zone' : zone,
-	'kfrm' : reference_form,
-	'cobj' : item,
-	'gram' : grams,
-	'cha ' : character,
-	'reco' : record,
-	'undf' : empty_ae_name_,
-	'dec ' : December,
 	'enum' : constant,
-	'hand' : handler,
-	'sqmi' : square_miles,
-	'rdat' : data,
-	'cstr' : C_string,
-	'utxt' : Unicode_text,
-	'sutx' : styled_Unicode_text,
-	'mach' : machine,
-	'sqyd' : square_yards,
-	'yard' : yards,
-	'ozs ' : ounces,
-	'lbs ' : pounds,
-	'cfet' : cubic_feet,
-	'ccmt' : cubic_centimeters,
-	'sat ' : Saturday,
-	'pcls' : class_,
+	'evnt' : event,
+	'feb ' : February,
+	'feet' : feet,
+	'fri ' : Friday,
 	'fss ' : file_specification,
-	'ctxt' : text,
+	'galn' : gallons,
+	'gram' : grams,
+	'hand' : handler,
+	'inch' : inches,
+	'itxt' : international_text,
+	'jan ' : January,
+	'jul ' : July,
+	'jun ' : June,
+	'kfrm' : reference_form,
+	'kgrm' : kilograms,
+	'kmtr' : kilometers,
+	'kprs' : keystroke,
+	'lbs ' : pounds,
+	'ldt ' : date,
+	'list' : list,
+	'litr' : liters,
+	'llst' : linked_list,
+	'long' : integer,
+	'lr  ' : list_or_record,
+	'lrs ' : list_2c__record_or_text,
+	'ls  ' : list_or_string,
+	'mach' : machine,
+	'mar ' : March,
+	'may ' : May,
+	'metr' : meters,
+	'mile' : miles,
+	'mnth' : month,
+	'mon ' : Monday,
+	'msng' : missing_value,
+	'nd  ' : number_or_date,
+	'nds ' : number_2c__date_or_text,
+	'nmbr' : number,
+	'nov ' : November,
+	'ns  ' : number_or_string,
+	'obj ' : reference,
+	'oct ' : October,
+	'ozs ' : ounces,
+	'pcls' : class_,
+	'prep' : preposition,
+	'prop' : properties,
+	'psct' : writing_code,
+	'pstr' : Pascal_string,
+	'qrts' : quarts,
+	'rdat' : data,
+	'reco' : record,
+	'sat ' : Saturday,
+	'scnd' : seconds,
+	'scpt' : script,
+	'sep ' : September,
+	'sf  ' : alias_or_string,
+	'snd ' : sound,
+	'sqft' : square_feet,
+	'sqkm' : square_kilometers,
+	'sqmi' : square_miles,
+	'sqrm' : square_meters,
+	'sqyd' : square_yards,
+	'styl' : styled_Clipboard_text,
+	'sun ' : Sunday,
+	'sutx' : styled_Unicode_text,
+	'thu ' : Thursday,
+	'tue ' : Tuesday,
+	'type' : type_class,
+	'undf' : empty_ae_name_,
+	'utxt' : Unicode_text,
+	'vect' : vector,
+	'vers' : version,
+	'wed ' : Wednesday,
+	'wkdy' : weekday,
+	'yard' : yards,
+	'zone' : zone,
 }
 
 _propdeclarations = {
-	'week' : weeks,
+	'ID  ' : id,
+	'ascr' : AppleScript,
+	'c@#^' : _3c_Inheritance_3e_,
+	'day ' : day,
+	'days' : days,
+	'dstr' : date_string,
+	'hour' : hours,
+	'kMod' : modifiers,
+	'kMsg' : key,
+	'kknd' : key_kind,
+	'leng' : length,
+	'min ' : minutes,
 	'mnth' : month,
 	'pare' : parent,
-	'leng' : length,
 	'pi  ' : pi,
-	'kMod' : modifiers,
-	'min ' : minutes,
-	'wkdy' : weekday,
-	'dstr' : date_string,
-	'rest' : rest,
-	'ascr' : AppleScript,
-	'kknd' : key_kind,
-	'c@#^' : _3c_Inheritance_3e_,
-	'ID  ' : id,
-	'year' : year,
-	'rvse' : reverse,
-	'tab ' : tab,
-	'tstr' : time_string,
 	'plcd' : language_code,
-	'ret ' : return_,
-	'kMsg' : key,
-	'hour' : hours,
-	'spac' : space,
-	'days' : days,
-	'txdl' : text_item_delimiters,
+	'pnam' : name,
 	'prdp' : print_depth,
 	'prln' : print_length,
 	'pscd' : script_code,
-	'time' : time,
-	'pnam' : name,
+	'rest' : rest,
+	'ret ' : return_,
 	'rslt' : result,
-	'day ' : day,
+	'rvse' : reverse,
+	'spac' : space,
+	'tab ' : tab,
+	'time' : time,
+	'tstr' : time_string,
+	'txdl' : text_item_delimiters,
+	'week' : weeks,
+	'wkdy' : weekday,
+	'year' : year,
 }
 
 _compdeclarations = {
 }
 
 _enumdeclarations = {
-	'eMds' : _Enum_eMds,
-	'cons' : _Enum_cons,
-	'misc' : _Enum_misc,
-	'ekst' : _Enum_ekst,
 	'boov' : _Enum_boov,
+	'cons' : _Enum_cons,
+	'eMds' : _Enum_eMds,
+	'ekst' : _Enum_ekst,
+	'misc' : _Enum_misc,
 }
diff --git a/Lib/plat-mac/lib-scriptpackages/StdSuites/Macintosh_Connectivity_Clas.py b/Lib/plat-mac/lib-scriptpackages/StdSuites/Macintosh_Connectivity_Clas.py
index 6d3087b..c49fdfb 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/Macintosh_Connectivity_Clas.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/Macintosh_Connectivity_Clas.py
@@ -36,14 +36,14 @@
 	"""AppleTalk machine - the machine name part of the address """
 	which = 'patm'
 	want = 'TEXT'
-class AppleTalk_zone(aetools.NProperty):
-	"""AppleTalk zone - the zone part of the address """
-	which = 'patz'
-	want = 'TEXT'
 class AppleTalk_type(aetools.NProperty):
 	"""AppleTalk type - the type part of the AppleTalk address """
 	which = 'patt'
 	want = 'TEXT'
+class AppleTalk_zone(aetools.NProperty):
+	"""AppleTalk zone - the zone part of the address """
+	which = 'patz'
+	want = 'TEXT'
 
 AppleTalk_addresses = AppleTalk_address
 
@@ -94,14 +94,14 @@
 class SCSI_address(aetools.ComponentItem):
 	"""SCSI address - Addresses a SCSI device """
 	want = 'cscs'
-class SCSI_bus(aetools.NProperty):
-	"""SCSI bus - the SCSI bus number """
-	which = 'pscb'
-	want = 'shor'
 class LUN(aetools.NProperty):
 	"""LUN - the SCSI logical unit number """
 	which = 'pslu'
 	want = 'shor'
+class SCSI_bus(aetools.NProperty):
+	"""SCSI bus - the SCSI bus number """
+	which = 'pscb'
+	want = 'shor'
 
 SCSI_addresses = SCSI_address
 
@@ -124,14 +124,14 @@
 class address_specification(aetools.ComponentItem):
 	"""address specification - Unique designation of a device or service connected to this computer """
 	want = 'cadr'
-class properties(aetools.NProperty):
-	"""properties - property that allows getting and setting of multiple properties """
-	which = 'pALL'
-	want = 'reco'
 class conduit(aetools.NProperty):
 	"""conduit - How the addressee is physically connected """
 	which = 'pcon'
 	want = 'econ'
+class properties(aetools.NProperty):
+	"""properties - property that allows getting and setting of multiple properties """
+	which = 'pALL'
+	want = 'reco'
 class protocol(aetools.NProperty):
 	"""protocol - How to talk to this addressee """
 	which = 'pprt'
@@ -148,51 +148,51 @@
 class device_specification(aetools.ComponentItem):
 	"""device specification - A device connected to a computer """
 	want = 'cdev'
-class device_type(aetools.NProperty):
-	"""device type - the kind of device """
-	which = 'pdvt'
-	want = 'edvt'
 class device_address(aetools.NProperty):
 	"""device address - the address of the device """
 	which = 'pdva'
 	want = 'cadr'
+class device_type(aetools.NProperty):
+	"""device type - the kind of device """
+	which = 'pdvt'
+	want = 'edvt'
 
 device_specifications = device_specification
 ADB_address._superclassnames = ['address_specification']
 ADB_address._privpropdict = {
-	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
 	'ID' : ID,
+	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
 }
 ADB_address._privelemdict = {
 }
 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_zone' : AppleTalk_zone,
+	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
 }
 AppleTalk_address._privelemdict = {
 }
 Ethernet_address._superclassnames = ['address_specification']
 Ethernet_address._privpropdict = {
-	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
 	'ID' : ID,
+	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
 }
 Ethernet_address._privelemdict = {
 }
 FireWire_address._superclassnames = ['address_specification']
 FireWire_address._privpropdict = {
-	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
 	'ID' : ID,
+	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
 }
 FireWire_address._privelemdict = {
 }
 IP_address._superclassnames = ['address_specification']
 IP_address._privpropdict = {
-	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
-	'ID' : ID,
 	'DNS_form' : DNS_form,
+	'ID' : ID,
+	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
 	'port' : port,
 }
 IP_address._privelemdict = {
@@ -208,17 +208,17 @@
 }
 SCSI_address._superclassnames = ['address_specification']
 SCSI_address._privpropdict = {
-	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
-	'SCSI_bus' : SCSI_bus,
 	'ID' : ID,
 	'LUN' : LUN,
+	'SCSI_bus' : SCSI_bus,
+	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
 }
 SCSI_address._privelemdict = {
 }
 Token_Ring_address._superclassnames = ['address_specification']
 Token_Ring_address._privpropdict = {
-	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
 	'ID' : ID,
+	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
 }
 Token_Ring_address._privelemdict = {
 }
@@ -229,24 +229,24 @@
 }
 address_specification._superclassnames = []
 address_specification._privpropdict = {
-	'properties' : properties,
 	'conduit' : conduit,
+	'properties' : properties,
 	'protocol' : protocol,
 }
 address_specification._privelemdict = {
 }
 bus_slot._superclassnames = ['address_specification']
 bus_slot._privpropdict = {
-	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
 	'ID' : ID,
+	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
 }
 bus_slot._privelemdict = {
 }
 device_specification._superclassnames = []
 device_specification._privpropdict = {
-	'properties' : properties,
-	'device_type' : device_type,
 	'device_address' : device_address,
+	'device_type' : device_type,
+	'properties' : properties,
 }
 device_specification._privelemdict = {
 }
@@ -326,39 +326,39 @@
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'cat ' : AppleTalk_address,
-	'cadr' : address_specification,
-	'ctok' : Token_Ring_address,
-	'cfw ' : FireWire_address,
-	'cbus' : bus_slot,
-	'cscs' : SCSI_address,
 	'cadb' : ADB_address,
-	'cusb' : USB_Addresses,
-	'cip ' : IP_address,
-	'clt ' : LocalTalk_address,
+	'cadr' : address_specification,
+	'cat ' : AppleTalk_address,
+	'cbus' : bus_slot,
 	'cdev' : device_specification,
 	'cen ' : Ethernet_address,
+	'cfw ' : FireWire_address,
+	'cip ' : IP_address,
+	'clt ' : LocalTalk_address,
+	'cscs' : SCSI_address,
+	'ctok' : Token_Ring_address,
+	'cusb' : USB_Addresses,
 }
 
 _propdeclarations = {
+	'ID  ' : ID,
+	'c@#^' : _3c_inheritance_3e_,
+	'pALL' : properties,
+	'patm' : AppleTalk_machine,
+	'patt' : AppleTalk_type,
+	'patz' : AppleTalk_zone,
+	'pcon' : conduit,
 	'pdns' : DNS_form,
 	'pdva' : device_address,
-	'patt' : AppleTalk_type,
-	'pprt' : protocol,
-	'pcon' : conduit,
-	'patz' : AppleTalk_zone,
-	'pnet' : network,
 	'pdvt' : device_type,
 	'pnam' : name,
-	'c@#^' : _3c_inheritance_3e_,
-	'ID  ' : ID,
-	'pALL' : properties,
-	'psoc' : socket,
-	'pscb' : SCSI_bus,
-	'ppor' : port,
-	'patm' : AppleTalk_machine,
-	'pslu' : LUN,
+	'pnet' : network,
 	'pnod' : node,
+	'ppor' : port,
+	'pprt' : protocol,
+	'pscb' : SCSI_bus,
+	'pslu' : LUN,
+	'psoc' : socket,
 }
 
 _compdeclarations = {
diff --git a/Lib/plat-mac/lib-scriptpackages/StdSuites/QuickDraw_Graphics_Suite.py b/Lib/plat-mac/lib-scriptpackages/StdSuites/QuickDraw_Graphics_Suite.py
index fbf24d2..bf78ea1 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/QuickDraw_Graphics_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/QuickDraw_Graphics_Suite.py
@@ -76,46 +76,46 @@
 	"""color table - the color table """
 	which = 'cltb'
 	want = 'clrt'
-class ordering(aetools.NProperty):
-	"""ordering - the ordered list of graphic objects in the drawing area """
-	which = 'gobs'
-	want = 'obj '
-class name(aetools.NProperty):
-	"""name - the name """
-	which = 'pnam'
+class default_font(aetools.NProperty):
+	"""default font - the name of the default font for text objects """
+	which = 'ptxf'
 	want = 'itxt'
 class default_location(aetools.NProperty):
 	"""default location - the default location of each new graphic object """
 	which = 'pnel'
 	want = 'QDpt'
-class pixel_depth(aetools.NProperty):
-	"""pixel depth - the number of bits per pixel """
-	which = 'pdpt'
-	want = 'shor'
-class writing_code(aetools.NProperty):
-	"""writing code - the script system and language of text objects in the drawing area """
-	which = 'psct'
-	want = 'intl'
-class text_color(aetools.NProperty):
-	"""text color - the default color for text objects """
-	which = 'ptxc'
-	want = 'cRGB'
-class default_font(aetools.NProperty):
-	"""default font - the name of the default font for text objects """
-	which = 'ptxf'
-	want = 'itxt'
 class default_size(aetools.NProperty):
 	"""default size - the default size for text objects """
 	which = 'ptps'
 	want = 'fixd'
+class name(aetools.NProperty):
+	"""name - the name """
+	which = 'pnam'
+	want = 'itxt'
+class ordering(aetools.NProperty):
+	"""ordering - the ordered list of graphic objects in the drawing area """
+	which = 'gobs'
+	want = 'obj '
+class pixel_depth(aetools.NProperty):
+	"""pixel depth - the number of bits per pixel """
+	which = 'pdpt'
+	want = 'shor'
 class style(aetools.NProperty):
 	"""style - the default text style for text objects """
 	which = 'txst'
 	want = 'tsty'
+class text_color(aetools.NProperty):
+	"""text color - the default color for text objects """
+	which = 'ptxc'
+	want = 'cRGB'
 class update_on_change(aetools.NProperty):
 	"""update on change - Redraw after each change? """
 	which = 'pupd'
 	want = 'bool'
+class writing_code(aetools.NProperty):
+	"""writing code - the script system and language of text objects in the drawing area """
+	which = 'psct'
+	want = 'intl'
 
 drawing_areas = drawing_area
 
@@ -128,22 +128,22 @@
 class graphic_line(aetools.ComponentItem):
 	"""graphic line - A graphic line """
 	want = 'glin'
-class start_point(aetools.NProperty):
-	"""start point - the starting point of the line """
-	which = 'pstp'
-	want = 'QDpt'
-class end_point(aetools.NProperty):
-	"""end point - the ending point of the line """
-	which = 'pend'
-	want = 'QDpt'
-class dash_style(aetools.NProperty):
-	"""dash style - the dash style """
-	which = 'pdst'
-	want = 'tdas'
 class arrow_style(aetools.NProperty):
 	"""arrow style - the arrow style """
 	which = 'arro'
 	want = 'arro'
+class dash_style(aetools.NProperty):
+	"""dash style - the dash style """
+	which = 'pdst'
+	want = 'tdas'
+class end_point(aetools.NProperty):
+	"""end point - the ending point of the line """
+	which = 'pend'
+	want = 'QDpt'
+class start_point(aetools.NProperty):
+	"""start point - the starting point of the line """
+	which = 'pstp'
+	want = 'QDpt'
 
 graphic_lines = graphic_line
 
@@ -246,16 +246,16 @@
 	'background_color' : background_color,
 	'background_pattern' : background_pattern,
 	'color_table' : color_table,
-	'ordering' : ordering,
-	'name' : name,
-	'default_location' : default_location,
-	'pixel_depth' : pixel_depth,
-	'writing_code' : writing_code,
-	'text_color' : text_color,
 	'default_font' : default_font,
+	'default_location' : default_location,
 	'default_size' : default_size,
+	'name' : name,
+	'ordering' : ordering,
+	'pixel_depth' : pixel_depth,
 	'style' : style,
+	'text_color' : text_color,
 	'update_on_change' : update_on_change,
+	'writing_code' : writing_code,
 }
 drawing_area._privelemdict = {
 }
@@ -266,10 +266,10 @@
 }
 graphic_line._superclassnames = []
 graphic_line._privpropdict = {
-	'start_point' : start_point,
-	'end_point' : end_point,
-	'dash_style' : dash_style,
 	'arrow_style' : arrow_style,
+	'dash_style' : dash_style,
+	'end_point' : end_point,
+	'start_point' : start_point,
 }
 graphic_line._privelemdict = {
 }
@@ -356,56 +356,56 @@
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'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,
+	'cdrw' : drawing_area,
+	'cgob' : graphic_object,
+	'cgsh' : graphic_shape,
+	'cgtx' : graphic_text,
+	'covl' : oval,
+	'cpgn' : polygon,
+	'cpic' : graphic_group,
 	'cpix' : pixel_map,
+	'cpxl' : pixel,
 	'crec' : rectangle,
+	'crrc' : rounded_rectangle,
+	'glin' : graphic_line,
 }
 
 _propdeclarations = {
-	'pbpt' : background_pattern,
-	'flcl' : fill_color,
-	'parc' : arc_angle,
-	'pbnd' : bounds,
-	'colr' : color,
-	'flpt' : fill_pattern,
-	'ustl' : uniform_styles,
-	'font' : font,
-	'pend' : end_point,
-	'pstp' : start_point,
-	'pang' : start_angle,
-	'pptm' : transfer_mode,
+	'arro' : arrow_style,
 	'cltb' : color_table,
+	'colr' : color,
+	'flcl' : fill_color,
+	'flpt' : fill_pattern,
+	'font' : font,
+	'gobs' : ordering,
+	'pang' : start_angle,
+	'parc' : arc_angle,
+	'pbcl' : background_color,
+	'pbnd' : bounds,
+	'pbpt' : background_pattern,
+	'pchd' : corner_curve_height,
+	'pcwd' : corner_curve_width,
+	'pdpt' : pixel_depth,
+	'pdrt' : definition_rect,
+	'pdst' : dash_style,
+	'pend' : end_point,
+	'pnam' : name,
+	'pnel' : default_location,
+	'ppcl' : pen_color,
+	'pppa' : pen_pattern,
+	'pptm' : transfer_mode,
+	'ppwd' : pen_width,
+	'psct' : writing_code,
+	'pstp' : start_point,
+	'ptlt' : point_list,
+	'ptps' : default_size,
+	'ptsz' : size,
 	'ptxc' : text_color,
 	'ptxf' : default_font,
-	'ppcl' : pen_color,
-	'ptps' : default_size,
-	'ppwd' : pen_width,
-	'arro' : arrow_style,
-	'pcwd' : corner_curve_width,
-	'txst' : style,
-	'psct' : writing_code,
-	'pdst' : dash_style,
-	'ptlt' : point_list,
-	'gobs' : ordering,
-	'pdpt' : pixel_depth,
-	'pnel' : default_location,
-	'pchd' : corner_curve_height,
-	'pbcl' : background_color,
-	'pnam' : name,
-	'pdrt' : definition_rect,
-	'ptsz' : size,
 	'pupd' : update_on_change,
-	'pppa' : pen_pattern,
+	'txst' : style,
+	'ustl' : uniform_styles,
 }
 
 _compdeclarations = {
diff --git a/Lib/plat-mac/lib-scriptpackages/StdSuites/QuickDraw_Graphics_Suppleme.py b/Lib/plat-mac/lib-scriptpackages/StdSuites/QuickDraw_Graphics_Suppleme.py
index eeba27f..b74c60b 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/QuickDraw_Graphics_Suppleme.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/QuickDraw_Graphics_Suppleme.py
@@ -56,14 +56,14 @@
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'cpic' : graphic_group,
 	'cdrw' : drawing_area,
+	'cpic' : graphic_group,
 }
 
 _propdeclarations = {
 	'prot' : rotation,
-	'ptrs' : translation,
 	'pscl' : scale,
+	'ptrs' : translation,
 }
 
 _compdeclarations = {
diff --git a/Lib/plat-mac/lib-scriptpackages/StdSuites/Standard_Suite.py b/Lib/plat-mac/lib-scriptpackages/StdSuites/Standard_Suite.py
index cdd9d04..59d336b 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/Standard_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/Standard_Suite.py
@@ -457,22 +457,22 @@
 class application(aetools.ComponentItem):
 	"""application - An application program """
 	want = 'capp'
-class name(aetools.NProperty):
-	"""name - the name of the application """
-	which = 'pnam'
-	want = 'itxt'
-class frontmost(aetools.NProperty):
-	"""frontmost - Is this the frontmost application? """
-	which = 'pisf'
-	want = 'bool'
-class selection(aetools.NProperty):
-	"""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):
 	"""clipboard - the contents of the clipboard for this application """
 	which = 'pcli'
 	want = '****'
+class frontmost(aetools.NProperty):
+	"""frontmost - Is this the frontmost application? """
+	which = 'pisf'
+	want = 'bool'
+class name(aetools.NProperty):
+	"""name - the name of the application """
+	which = 'pnam'
+	want = 'itxt'
+class selection(aetools.NProperty):
+	"""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 version(aetools.NProperty):
 	"""version - the version of the application """
 	which = 'vers'
@@ -525,18 +525,14 @@
 	"""closeable - Does the window have a close box? """
 	which = 'hclb'
 	want = 'bool'
-class titled(aetools.NProperty):
-	"""titled - Does the window have a title bar? """
-	which = 'ptit'
+class floating(aetools.NProperty):
+	"""floating - Does the window float? """
+	which = 'isfl'
 	want = 'bool'
 class index(aetools.NProperty):
 	"""index - the number of the window """
 	which = 'pidx'
 	want = 'long'
-class floating(aetools.NProperty):
-	"""floating - Does the window float? """
-	which = 'isfl'
-	want = 'bool'
 class modal(aetools.NProperty):
 	"""modal - Is the window modal? """
 	which = 'pmod'
@@ -545,6 +541,14 @@
 	"""resizable - Is the window resizable? """
 	which = 'prsz'
 	want = 'bool'
+class titled(aetools.NProperty):
+	"""titled - Does the window have a title bar? """
+	which = 'ptit'
+	want = 'bool'
+class visible(aetools.NProperty):
+	"""visible - Is the window visible? """
+	which = 'pvis'
+	want = 'bool'
 class zoomable(aetools.NProperty):
 	"""zoomable - Is the window zoomable? """
 	which = 'iszm'
@@ -553,10 +557,6 @@
 	"""zoomed - Is the window zoomed? """
 	which = 'pzum'
 	want = 'bool'
-class visible(aetools.NProperty):
-	"""visible - Is the window visible? """
-	which = 'pvis'
-	want = 'bool'
 
 windows = window
 alias._superclassnames = []
@@ -566,10 +566,10 @@
 }
 application._superclassnames = []
 application._privpropdict = {
-	'name' : name,
-	'frontmost' : frontmost,
-	'selection' : selection,
 	'clipboard' : clipboard,
+	'frontmost' : frontmost,
+	'name' : name,
+	'selection' : selection,
 	'version' : version,
 }
 application._privelemdict = {
@@ -601,14 +601,14 @@
 window._privpropdict = {
 	'bounds' : bounds,
 	'closeable' : closeable,
-	'titled' : titled,
-	'index' : index,
 	'floating' : floating,
+	'index' : index,
 	'modal' : modal,
 	'resizable' : resizable,
+	'titled' : titled,
+	'visible' : visible,
 	'zoomable' : zoomable,
 	'zoomed' : zoomed,
-	'visible' : visible,
 }
 window._privelemdict = {
 }
@@ -663,49 +663,49 @@
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'cwin' : window,
-	'file' : file,
-	'csel' : selection_2d_object,
 	'alis' : alias,
 	'capp' : application,
 	'cins' : insertion_point,
+	'csel' : selection_2d_object,
+	'cwin' : window,
 	'docu' : document,
+	'file' : file,
 }
 
 _propdeclarations = {
-	'prsz' : resizable,
-	'vers' : version,
-	'pidx' : index,
-	'pvis' : visible,
+	'hclb' : closeable,
 	'imod' : modified,
-	'pbnd' : bounds,
-	'sele' : selection,
-	'pisf' : frontmost,
-	'pspd' : stationery,
 	'isfl' : floating,
 	'iszm' : zoomable,
-	'hclb' : closeable,
+	'pbnd' : bounds,
 	'pcli' : clipboard,
-	'pmod' : modal,
 	'pcnt' : contents,
+	'pidx' : index,
+	'pisf' : frontmost,
+	'pmod' : modal,
 	'pnam' : name,
-	'pzum' : zoomed,
+	'prsz' : resizable,
+	'pspd' : stationery,
 	'ptit' : titled,
+	'pvis' : visible,
+	'pzum' : zoomed,
+	'sele' : selection,
+	'vers' : version,
 }
 
 _compdeclarations = {
 	'<   ' : _3c_,
-	'ends' : ends_with,
-	'>=  ' : _b3_,
-	'cont' : contains,
 	'<=  ' : _b2_,
 	'=   ' : _3d_,
-	'bgwt' : starts_with,
 	'>   ' : _3e_,
+	'>=  ' : _b3_,
+	'bgwt' : starts_with,
+	'cont' : contains,
+	'ends' : ends_with,
 }
 
 _enumdeclarations = {
+	'kfrm' : _Enum_kfrm,
 	'savo' : _Enum_savo,
 	'styl' : _Enum_styl,
-	'kfrm' : _Enum_kfrm,
 }
diff --git a/Lib/plat-mac/lib-scriptpackages/StdSuites/Table_Suite.py b/Lib/plat-mac/lib-scriptpackages/StdSuites/Table_Suite.py
index 7984132..522f04c 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/Table_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/Table_Suite.py
@@ -86,13 +86,13 @@
 _classdeclarations = {
 	'ccel' : cell,
 	'ccol' : column,
-	'ctbl' : table,
 	'crow' : row,
+	'ctbl' : table,
 }
 
 _propdeclarations = {
-	'pnam' : name,
 	'pfor' : formula,
+	'pnam' : name,
 	'ppro' : protection,
 }
 
diff --git a/Lib/plat-mac/lib-scriptpackages/StdSuites/Text_Suite.py b/Lib/plat-mac/lib-scriptpackages/StdSuites/Text_Suite.py
index dd5b3f4..bdf1baa 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/Text_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/Text_Suite.py
@@ -54,10 +54,6 @@
 	"""size - the size in points of the first character """
 	which = 'ptsz'
 	want = 'fixd'
-class writing_code(aetools.NProperty):
-	"""writing code - the script system and language """
-	which = 'psct'
-	want = 'intl'
 class style(aetools.NProperty):
 	"""style - the text style of the first character of the first character """
 	which = 'txst'
@@ -66,6 +62,10 @@
 	"""uniform styles - the text styles that are uniform throughout the text """
 	which = 'ustl'
 	want = 'tsty'
+class writing_code(aetools.NProperty):
+	"""writing code - the script system and language """
+	which = 'psct'
+	want = 'intl'
 #        element 'cha ' as ['indx']
 #        element 'clin' as ['indx']
 #        element 'cpar' as ['indx']
@@ -85,14 +85,14 @@
 class text_style_info(aetools.ComponentItem):
 	"""text style info - On and Off styles of text run """
 	want = 'tsty'
-class on_styles(aetools.NProperty):
-	"""on styles - the styles that are on for the text """
-	which = 'onst'
-	want = 'styl'
 class off_styles(aetools.NProperty):
 	"""off styles - the styles that are off for the text """
 	which = 'ofst'
 	want = 'styl'
+class on_styles(aetools.NProperty):
+	"""on styles - the styles that are on for the text """
+	which = 'onst'
+	want = 'styl'
 
 text_style_infos = text_style_info
 
@@ -125,9 +125,9 @@
 	'color' : color,
 	'font' : font,
 	'size' : size,
-	'writing_code' : writing_code,
 	'style' : style,
 	'uniform_styles' : uniform_styles,
+	'writing_code' : writing_code,
 }
 text._privelemdict = {
 	'character' : character,
@@ -145,8 +145,8 @@
 }
 text_style_info._superclassnames = []
 text_style_info._privpropdict = {
-	'on_styles' : on_styles,
 	'off_styles' : off_styles,
+	'on_styles' : on_styles,
 }
 text_style_info._privelemdict = {
 }
@@ -186,33 +186,33 @@
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'cpar' : paragraph,
-	'cha ' : character,
 	'cflo' : text_flow,
-	'tsty' : text_style_info,
+	'cha ' : character,
 	'clin' : line,
-	'cwor' : word,
+	'cpar' : paragraph,
 	'ctxt' : text,
+	'cwor' : word,
+	'tsty' : text_style_info,
 }
 
 _propdeclarations = {
-	'ptsz' : size,
-	'ofst' : off_styles,
-	'pjst' : justification,
-	'colr' : color,
-	'txst' : style,
-	'psct' : writing_code,
-	'ustl' : uniform_styles,
 	'c@#^' : _3c_inheritance_3e_,
-	'pnam' : name,
+	'colr' : color,
 	'font' : font,
+	'ofst' : off_styles,
 	'onst' : on_styles,
+	'pjst' : justification,
+	'pnam' : name,
+	'psct' : writing_code,
+	'ptsz' : size,
+	'txst' : style,
+	'ustl' : uniform_styles,
 }
 
 _compdeclarations = {
 }
 
 _enumdeclarations = {
-	'styl' : _Enum_styl,
 	'just' : _Enum_just,
+	'styl' : _Enum_styl,
 }
diff --git a/Lib/plat-mac/lib-scriptpackages/StdSuites/Type_Names_Suite.py b/Lib/plat-mac/lib-scriptpackages/StdSuites/Type_Names_Suite.py
index 2aabb5f..eb616d6 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/Type_Names_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/Type_Names_Suite.py
@@ -388,46 +388,46 @@
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'shor' : small_integer,
-	'tr16' : RGB16_color,
-	'vers' : version,
-	'aeut' : system_dictionary,
-	'clrt' : color_table,
-	'fpnt' : fixed_point,
-	'TIFF' : TIFF_picture,
-	'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,
 	'TEXT' : plain_text,
-	'magn' : unsigned_integer,
+	'TIFF' : TIFF_picture,
+	'aete' : application_dictionary,
+	'aeut' : system_dictionary,
+	'clrt' : color_table,
+	'cmen' : menu_item,
 	'cmnu' : menu,
-	'frct' : fixed_rectangle,
-	'pinf' : type_property_info,
-	'lfrc' : long_fixed_rectangle,
-	'evin' : type_event_info,
-	'sing' : small_real,
-	'suin' : type_suite_info,
-	'trot' : rotation,
-	'fixd' : fixed,
-	'styl' : scrap_styles,
-	'lpnt' : long_point,
-	'gcli' : type_class_info,
-	'tr96' : RGB96_color,
-	'tdas' : dash_style,
-	'exte' : extended_real,
-	'pmin' : type_parameter_info,
-	'lfpt' : long_fixed_point,
-	'lrct' : long_rectangle,
-	'qdrt' : bounding_rectangle,
 	'comp' : double_integer,
+	'elin' : type_element_info,
+	'evin' : type_event_info,
+	'exte' : extended_real,
+	'fixd' : fixed,
+	'fpnt' : fixed_point,
+	'frct' : fixed_rectangle,
+	'gcli' : type_class_info,
+	'insl' : location_reference,
+	'lfpt' : long_fixed_point,
+	'lfrc' : long_fixed_rectangle,
 	'lfxd' : long_fixed,
+	'lpnt' : long_point,
+	'lrct' : long_rectangle,
+	'mLoc' : machine_location,
+	'magn' : unsigned_integer,
 	'null' : null,
+	'pinf' : type_property_info,
+	'pmin' : type_parameter_info,
+	'qdrt' : bounding_rectangle,
+	'shor' : small_integer,
+	'sing' : small_real,
+	'styl' : scrap_styles,
+	'suin' : type_suite_info,
 	'targ' : target_id,
+	'tdas' : dash_style,
+	'tpmm' : pixel_map_record,
+	'tr16' : RGB16_color,
+	'tr96' : RGB96_color,
+	'trot' : rotation,
+	'vers' : version,
 }
 
 _propdeclarations = {
diff --git a/Lib/plat-mac/lib-scriptpackages/StdSuites/__init__.py b/Lib/plat-mac/lib-scriptpackages/StdSuites/__init__.py
index d01a0b5..e65f368 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/__init__.py
@@ -68,53 +68,6 @@
 #
 # Set property and element dictionaries now that all classes have been defined
 #
-getbaseclasses(window)
-getbaseclasses(file)
-getbaseclasses(selection_2d_object)
-getbaseclasses(alias)
-getbaseclasses(application)
-getbaseclasses(insertion_point)
-getbaseclasses(document)
-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)
 getbaseclasses(paragraph)
 getbaseclasses(character)
 getbaseclasses(text_flow)
@@ -258,58 +211,58 @@
 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(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 = {
-	'cwin' : window,
-	'file' : file,
-	'csel' : selection_2d_object,
-	'alis' : alias,
-	'capp' : application,
-	'cins' : insertion_point,
-	'docu' : document,
-	'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,
 	'cpar' : paragraph,
 	'cha ' : character,
 	'cflo' : text_flow,
@@ -453,6 +406,53 @@
 	'sep ' : September,
 	'fss ' : file_specification,
 	'ctxt' : text,
+	'cwin' : window,
+	'file' : file,
+	'csel' : selection_2d_object,
+	'alis' : alias,
+	'capp' : application,
+	'cins' : insertion_point,
+	'docu' : document,
+	'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,
 }
 
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Terminal/Terminal_Suite.py b/Lib/plat-mac/lib-scriptpackages/Terminal/Terminal_Suite.py
index ec064ee..cc35a01 100644
--- a/Lib/plat-mac/lib-scriptpackages/Terminal/Terminal_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Terminal/Terminal_Suite.py
@@ -102,6 +102,10 @@
 class application(aetools.ComponentItem):
 	"""application - The Terminal program """
 	want = 'capp'
+class frontmost(aetools.NProperty):
+	"""frontmost - Is this the active application? """
+	which = 'pisf'
+	want = 'bool'
 class name(aetools.NProperty):
 	"""name - the name of the application """
 	which = 'pnam'
@@ -110,10 +114,6 @@
 	"""version - the version of the application """
 	which = 'vers'
 	want = 'vers'
-class frontmost(aetools.NProperty):
-	"""frontmost - Is this the active application? """
-	which = 'pisf'
-	want = 'bool'
 #        element 'cwin' as ['name', 'indx']
 
 applications = application
@@ -121,14 +121,42 @@
 class window(aetools.ComponentItem):
 	"""window - A Terminal window """
 	want = 'cwin'
-class index(aetools.NProperty):
-	"""index - the number of the window """
-	which = 'pidx'
-	want = 'long'
+class background_color(aetools.NProperty):
+	"""background color - the background color for the window """
+	which = 'pbcl'
+	want = 'TEXT'
+class bold_text_color(aetools.NProperty):
+	"""bold text color - the bold text color for the window """
+	which = 'pbtc'
+	want = 'TEXT'
 class bounds(aetools.NProperty):
 	"""bounds - the boundary rectangle for the window, relative to the upper left corner of the screen """
 	which = 'pbnd'
 	want = 'qdrt'
+class busy(aetools.NProperty):
+	"""busy - Is the window busy running a process? """
+	which = 'busy'
+	want = 'bool'
+class contents(aetools.NProperty):
+	"""contents - the currently visible contents of the window """
+	which = 'pcnt'
+	want = 'TEXT'
+class cursor_color(aetools.NProperty):
+	"""cursor color - the cursor color for the window """
+	which = 'pcuc'
+	want = 'TEXT'
+class custom_title(aetools.NProperty):
+	"""custom title - the custom title for the window """
+	which = 'titl'
+	want = 'TEXT'
+class floating(aetools.NProperty):
+	"""floating - Does the window float? """
+	which = 'isfl'
+	want = 'bool'
+class frame(aetools.NProperty):
+	"""frame - the origin and size of the window """
+	which = 'pfra'
+	want = 'list'
 class has_close_box(aetools.NProperty):
 	"""has close box - Does the window have a close box? """
 	which = 'hclb'
@@ -137,10 +165,14 @@
 	"""has title bar - Does the window have a title bar? """
 	which = 'ptit'
 	want = 'bool'
-class floating(aetools.NProperty):
-	"""floating - Does the window float? """
-	which = 'isfl'
-	want = 'bool'
+class history(aetools.NProperty):
+	"""history - the contents of the entire scrolling buffer of the window """
+	which = 'hist'
+	want = 'TEXT'
+class index(aetools.NProperty):
+	"""index - the number of the window """
+	which = 'pidx'
+	want = 'long'
 class miniaturizable(aetools.NProperty):
 	"""miniaturizable - Is the window miniaturizable? """
 	which = 'ismn'
@@ -153,10 +185,58 @@
 	"""modal - Is the window modal? """
 	which = 'pmod'
 	want = 'bool'
+class normal_text_color(aetools.NProperty):
+	"""normal text color - the normal text color for the window """
+	which = 'ptxc'
+	want = 'TEXT'
+class number_of_columns(aetools.NProperty):
+	"""number of columns - the number of columns in the window """
+	which = 'ccol'
+	want = 'long'
+class number_of_rows(aetools.NProperty):
+	"""number of rows - the number of rows in the window """
+	which = 'crow'
+	want = 'long'
+class origin(aetools.NProperty):
+	"""origin - the lower left coordinates of the window, relative to the lower left corner of the screen """
+	which = 'pori'
+	want = 'list'
+class position(aetools.NProperty):
+	"""position - the upper left coordinates of the window, relative to the upper left corner of the screen """
+	which = 'ppos'
+	want = 'QDpt'
+class processes(aetools.NProperty):
+	"""processes - a list of the currently running processes """
+	which = 'prcs'
+	want = 'list'
 class resizable(aetools.NProperty):
 	"""resizable - Is the window resizable? """
 	which = 'prsz'
 	want = 'bool'
+class size(aetools.NProperty):
+	"""size - the width and height of the window """
+	which = 'psiz'
+	want = 'list'
+class title_displays_custom_title(aetools.NProperty):
+	"""title displays custom title - Does the title for the window contain a custom title? """
+	which = 'tdct'
+	want = 'bool'
+class title_displays_device_name(aetools.NProperty):
+	"""title displays device name - Does the title for the window contain the device name? """
+	which = 'tddn'
+	want = 'bool'
+class title_displays_file_name(aetools.NProperty):
+	"""title displays file name - Does the title for the window contain the file name? """
+	which = 'tdfn'
+	want = 'bool'
+class title_displays_shell_path(aetools.NProperty):
+	"""title displays shell path - Does the title for the window contain the shell path? """
+	which = 'tdsp'
+	want = 'bool'
+class title_displays_window_size(aetools.NProperty):
+	"""title displays window size - Does the title for the window contain the window size? """
+	which = 'tdws'
+	want = 'bool'
 class visible(aetools.NProperty):
 	"""visible - Is the window visible? """
 	which = 'pvis'
@@ -169,133 +249,53 @@
 	"""zoomed - Is the window zoomed? """
 	which = 'pzum'
 	want = 'bool'
-class position(aetools.NProperty):
-	"""position - the upper left coordinates of the window, relative to the upper left corner of the screen """
-	which = 'ppos'
-	want = 'QDpt'
-class origin(aetools.NProperty):
-	"""origin - the lower left coordinates of the window, relative to the lower left corner of the screen """
-	which = 'pori'
-	want = 'list'
-class size(aetools.NProperty):
-	"""size - the width and height of the window """
-	which = 'psiz'
-	want = 'list'
-class frame(aetools.NProperty):
-	"""frame - the origin and size of the window """
-	which = 'pfra'
-	want = 'list'
-class title_displays_device_name(aetools.NProperty):
-	"""title displays device name - Does the title for the window contain the device name? """
-	which = 'tddn'
-	want = 'bool'
-class title_displays_shell_path(aetools.NProperty):
-	"""title displays shell path - Does the title for the window contain the shell path? """
-	which = 'tdsp'
-	want = 'bool'
-class title_displays_window_size(aetools.NProperty):
-	"""title displays window size - Does the title for the window contain the window size? """
-	which = 'tdws'
-	want = 'bool'
-class title_displays_file_name(aetools.NProperty):
-	"""title displays file name - Does the title for the window contain the file name? """
-	which = 'tdfn'
-	want = 'bool'
-class title_displays_custom_title(aetools.NProperty):
-	"""title displays custom title - Does the title for the window contain a custom title? """
-	which = 'tdct'
-	want = 'bool'
-class custom_title(aetools.NProperty):
-	"""custom title - the custom title for the window """
-	which = 'titl'
-	want = 'TEXT'
-class contents(aetools.NProperty):
-	"""contents - the currently visible contents of the window """
-	which = 'pcnt'
-	want = 'TEXT'
-class history(aetools.NProperty):
-	"""history - the contents of the entire scrolling buffer of the window """
-	which = 'hist'
-	want = 'TEXT'
-class number_of_rows(aetools.NProperty):
-	"""number of rows - the number of rows in the window """
-	which = 'crow'
-	want = 'long'
-class number_of_columns(aetools.NProperty):
-	"""number of columns - the number of columns in the window """
-	which = 'ccol'
-	want = 'long'
-class cursor_color(aetools.NProperty):
-	"""cursor color - the cursor color for the window """
-	which = 'pcuc'
-	want = 'TEXT'
-class background_color(aetools.NProperty):
-	"""background color - the background color for the window """
-	which = 'pbcl'
-	want = 'TEXT'
-class normal_text_color(aetools.NProperty):
-	"""normal text color - the normal text color for the window """
-	which = 'ptxc'
-	want = 'TEXT'
-class bold_text_color(aetools.NProperty):
-	"""bold text color - the bold text color for the window """
-	which = 'pbtc'
-	want = 'TEXT'
-class busy(aetools.NProperty):
-	"""busy - Is the window busy running a process? """
-	which = 'busy'
-	want = 'bool'
-class processes(aetools.NProperty):
-	"""processes - a list of the currently running processes """
-	which = 'prcs'
-	want = 'list'
 
 windows = window
 application._superclassnames = []
 application._privpropdict = {
+	'frontmost' : frontmost,
 	'name' : name,
 	'version' : version,
-	'frontmost' : frontmost,
 }
 application._privelemdict = {
 	'window' : window,
 }
 window._superclassnames = []
 window._privpropdict = {
-	'name' : name,
-	'index' : index,
+	'background_color' : background_color,
+	'bold_text_color' : bold_text_color,
 	'bounds' : bounds,
+	'busy' : busy,
+	'contents' : contents,
+	'cursor_color' : cursor_color,
+	'custom_title' : custom_title,
+	'floating' : floating,
+	'frame' : frame,
+	'frontmost' : frontmost,
 	'has_close_box' : has_close_box,
 	'has_title_bar' : has_title_bar,
-	'floating' : floating,
+	'history' : history,
+	'index' : index,
 	'miniaturizable' : miniaturizable,
 	'miniaturized' : miniaturized,
 	'modal' : modal,
+	'name' : name,
+	'normal_text_color' : normal_text_color,
+	'number_of_columns' : number_of_columns,
+	'number_of_rows' : number_of_rows,
+	'origin' : origin,
+	'position' : position,
+	'processes' : processes,
 	'resizable' : resizable,
+	'size' : size,
+	'title_displays_custom_title' : title_displays_custom_title,
+	'title_displays_device_name' : title_displays_device_name,
+	'title_displays_file_name' : title_displays_file_name,
+	'title_displays_shell_path' : title_displays_shell_path,
+	'title_displays_window_size' : title_displays_window_size,
 	'visible' : visible,
 	'zoomable' : zoomable,
 	'zoomed' : zoomed,
-	'position' : position,
-	'origin' : origin,
-	'size' : size,
-	'frame' : frame,
-	'title_displays_device_name' : title_displays_device_name,
-	'title_displays_shell_path' : title_displays_shell_path,
-	'title_displays_window_size' : title_displays_window_size,
-	'title_displays_file_name' : title_displays_file_name,
-	'title_displays_custom_title' : title_displays_custom_title,
-	'custom_title' : custom_title,
-	'contents' : contents,
-	'history' : history,
-	'number_of_rows' : number_of_rows,
-	'number_of_columns' : number_of_columns,
-	'cursor_color' : cursor_color,
-	'background_color' : background_color,
-	'normal_text_color' : normal_text_color,
-	'bold_text_color' : bold_text_color,
-	'busy' : busy,
-	'processes' : processes,
-	'frontmost' : frontmost,
 }
 window._privelemdict = {
 }
@@ -304,46 +304,46 @@
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'cwin' : window,
 	'capp' : application,
+	'cwin' : window,
 }
 
 _propdeclarations = {
-	'pori' : origin,
-	'prsz' : resizable,
-	'vers' : version,
-	'prcs' : processes,
-	'pbtc' : bold_text_color,
-	'pbnd' : bounds,
-	'crow' : number_of_rows,
-	'pcnt' : contents,
-	'tddn' : title_displays_device_name,
-	'iszm' : zoomable,
-	'hclb' : has_close_box,
-	'isfl' : floating,
 	'busy' : busy,
-	'pfra' : frame,
-	'ppos' : position,
-	'ptxc' : normal_text_color,
-	'tdfn' : title_displays_file_name,
+	'ccol' : number_of_columns,
+	'crow' : number_of_rows,
+	'hclb' : has_close_box,
+	'hist' : history,
+	'isfl' : floating,
+	'ismn' : miniaturizable,
+	'iszm' : zoomable,
+	'pbcl' : background_color,
+	'pbnd' : bounds,
+	'pbtc' : bold_text_color,
+	'pcnt' : contents,
 	'pcuc' : cursor_color,
-	'tdsp' : title_displays_shell_path,
-	'pvis' : visible,
+	'pfra' : frame,
 	'pidx' : index,
-	'pmod' : modal,
-	'titl' : custom_title,
 	'pisf' : frontmost,
 	'pmnd' : miniaturized,
-	'tdct' : title_displays_custom_title,
-	'hist' : history,
-	'pzum' : zoomed,
-	'ismn' : miniaturizable,
-	'pbcl' : background_color,
+	'pmod' : modal,
 	'pnam' : name,
-	'ccol' : number_of_columns,
-	'tdws' : title_displays_window_size,
+	'pori' : origin,
+	'ppos' : position,
+	'prcs' : processes,
+	'prsz' : resizable,
 	'psiz' : size,
 	'ptit' : has_title_bar,
+	'ptxc' : normal_text_color,
+	'pvis' : visible,
+	'pzum' : zoomed,
+	'tdct' : title_displays_custom_title,
+	'tddn' : title_displays_device_name,
+	'tdfn' : title_displays_file_name,
+	'tdsp' : title_displays_shell_path,
+	'tdws' : title_displays_window_size,
+	'titl' : custom_title,
+	'vers' : version,
 }
 
 _compdeclarations = {
diff --git a/Lib/plat-mac/lib-scriptpackages/Terminal/__init__.py b/Lib/plat-mac/lib-scriptpackages/Terminal/__init__.py
index e01da71..d472961 100644
--- a/Lib/plat-mac/lib-scriptpackages/Terminal/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/Terminal/__init__.py
@@ -42,6 +42,7 @@
 #
 getbaseclasses(window)
 getbaseclasses(application)
+getbaseclasses(application)
 getbaseclasses(StdSuites.Type_Names_Suite.small_integer)
 getbaseclasses(StdSuites.Type_Names_Suite.RGB16_color)
 getbaseclasses(StdSuites.Type_Names_Suite.system_dictionary)
@@ -82,7 +83,6 @@
 getbaseclasses(StdSuites.Type_Names_Suite.target_id)
 getbaseclasses(StdSuites.Type_Names_Suite.point)
 getbaseclasses(StdSuites.Type_Names_Suite.bounding_rectangle)
-getbaseclasses(application)
 
 #
 # Indices of types declared in this module
@@ -90,6 +90,7 @@
 _classdeclarations = {
 	'cwin' : window,
 	'capp' : application,
+	'capp' : application,
 	'shor' : StdSuites.Type_Names_Suite.small_integer,
 	'tr16' : StdSuites.Type_Names_Suite.RGB16_color,
 	'aeut' : StdSuites.Type_Names_Suite.system_dictionary,
@@ -130,7 +131,6 @@
 	'targ' : StdSuites.Type_Names_Suite.target_id,
 	'QDpt' : StdSuites.Type_Names_Suite.point,
 	'qdrt' : StdSuites.Type_Names_Suite.bounding_rectangle,
-	'capp' : application,
 }