diff --git a/pkg/Templates/Apple IIgs/C Classic Desk Accessory.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple IIgs/ORCAC Classic Desk Accessory.xctemplate/TemplateInfo.plist
similarity index 100%
rename from pkg/Templates/Apple IIgs/C Classic Desk Accessory.xctemplate/TemplateInfo.plist
rename to pkg/Templates/Apple IIgs/ORCAC Classic Desk Accessory.xctemplate/TemplateInfo.plist
diff --git a/pkg/Templates/Apple IIgs/C Classic Desk Accessory.xctemplate/___PACKAGENAME___.xcscheme b/pkg/Templates/Apple IIgs/ORCAC Classic Desk Accessory.xctemplate/___PACKAGENAME___.xcscheme
similarity index 100%
rename from pkg/Templates/Apple IIgs/C Classic Desk Accessory.xctemplate/___PACKAGENAME___.xcscheme
rename to pkg/Templates/Apple IIgs/ORCAC Classic Desk Accessory.xctemplate/___PACKAGENAME___.xcscheme
diff --git a/pkg/Templates/Apple IIgs/C Classic Desk Accessory.xctemplate/main.c b/pkg/Templates/Apple IIgs/ORCAC Classic Desk Accessory.xctemplate/main.c
similarity index 100%
rename from pkg/Templates/Apple IIgs/C Classic Desk Accessory.xctemplate/main.c
rename to pkg/Templates/Apple IIgs/ORCAC Classic Desk Accessory.xctemplate/main.c
diff --git a/pkg/Templates/Apple IIgs/C Control Panel.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple IIgs/ORCAC Control Panel.xctemplate/TemplateInfo.plist
similarity index 100%
rename from pkg/Templates/Apple IIgs/C Control Panel.xctemplate/TemplateInfo.plist
rename to pkg/Templates/Apple IIgs/ORCAC Control Panel.xctemplate/TemplateInfo.plist
diff --git a/pkg/Templates/Apple IIgs/C Control Panel.xctemplate/___PACKAGENAME___.xcscheme b/pkg/Templates/Apple IIgs/ORCAC Control Panel.xctemplate/___PACKAGENAME___.xcscheme
similarity index 100%
rename from pkg/Templates/Apple IIgs/C Control Panel.xctemplate/___PACKAGENAME___.xcscheme
rename to pkg/Templates/Apple IIgs/ORCAC Control Panel.xctemplate/___PACKAGENAME___.xcscheme
diff --git a/pkg/Templates/Apple IIgs/C Control Panel.xctemplate/main.c b/pkg/Templates/Apple IIgs/ORCAC Control Panel.xctemplate/main.c
similarity index 100%
rename from pkg/Templates/Apple IIgs/C Control Panel.xctemplate/main.c
rename to pkg/Templates/Apple IIgs/ORCAC Control Panel.xctemplate/main.c
diff --git a/pkg/Templates/Apple IIgs/C Control Panel.xctemplate/main.h b/pkg/Templates/Apple IIgs/ORCAC Control Panel.xctemplate/main.h
similarity index 100%
rename from pkg/Templates/Apple IIgs/C Control Panel.xctemplate/main.h
rename to pkg/Templates/Apple IIgs/ORCAC Control Panel.xctemplate/main.h
diff --git a/pkg/Templates/Apple IIgs/C Control Panel.xctemplate/main.rez b/pkg/Templates/Apple IIgs/ORCAC Control Panel.xctemplate/main.rez
similarity index 100%
rename from pkg/Templates/Apple IIgs/C Control Panel.xctemplate/main.rez
rename to pkg/Templates/Apple IIgs/ORCAC Control Panel.xctemplate/main.rez
diff --git a/pkg/Templates/Apple IIgs/C Desktop Application.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple IIgs/ORCAC Desktop Application.xctemplate/TemplateInfo.plist
similarity index 100%
rename from pkg/Templates/Apple IIgs/C Desktop Application.xctemplate/TemplateInfo.plist
rename to pkg/Templates/Apple IIgs/ORCAC Desktop Application.xctemplate/TemplateInfo.plist
diff --git a/pkg/Templates/Apple IIgs/C Desktop Application.xctemplate/___PACKAGENAME___.xcscheme b/pkg/Templates/Apple IIgs/ORCAC Desktop Application.xctemplate/___PACKAGENAME___.xcscheme
similarity index 100%
rename from pkg/Templates/Apple IIgs/C Desktop Application.xctemplate/___PACKAGENAME___.xcscheme
rename to pkg/Templates/Apple IIgs/ORCAC Desktop Application.xctemplate/___PACKAGENAME___.xcscheme
diff --git a/pkg/Templates/Apple IIgs/C Desktop Application.xctemplate/main.c b/pkg/Templates/Apple IIgs/ORCAC Desktop Application.xctemplate/main.c
similarity index 100%
rename from pkg/Templates/Apple IIgs/C Desktop Application.xctemplate/main.c
rename to pkg/Templates/Apple IIgs/ORCAC Desktop Application.xctemplate/main.c
diff --git a/pkg/Templates/Apple IIgs/C Desktop Application.xctemplate/main.h b/pkg/Templates/Apple IIgs/ORCAC Desktop Application.xctemplate/main.h
similarity index 100%
rename from pkg/Templates/Apple IIgs/C Desktop Application.xctemplate/main.h
rename to pkg/Templates/Apple IIgs/ORCAC Desktop Application.xctemplate/main.h
diff --git a/pkg/Templates/Apple IIgs/C Desktop Application.xctemplate/main.rez b/pkg/Templates/Apple IIgs/ORCAC Desktop Application.xctemplate/main.rez
similarity index 100%
rename from pkg/Templates/Apple IIgs/C Desktop Application.xctemplate/main.rez
rename to pkg/Templates/Apple IIgs/ORCAC Desktop Application.xctemplate/main.rez
diff --git a/pkg/Templates/Apple IIgs/C GNO Shell Command.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple IIgs/ORCAC GNO Shell Command.xctemplate/TemplateInfo.plist
similarity index 100%
rename from pkg/Templates/Apple IIgs/C GNO Shell Command.xctemplate/TemplateInfo.plist
rename to pkg/Templates/Apple IIgs/ORCAC GNO Shell Command.xctemplate/TemplateInfo.plist
diff --git a/pkg/Templates/Apple IIgs/C GNO Shell Command.xctemplate/___PACKAGENAME___.xcscheme b/pkg/Templates/Apple IIgs/ORCAC GNO Shell Command.xctemplate/___PACKAGENAME___.xcscheme
similarity index 100%
rename from pkg/Templates/Apple IIgs/C GNO Shell Command.xctemplate/___PACKAGENAME___.xcscheme
rename to pkg/Templates/Apple IIgs/ORCAC GNO Shell Command.xctemplate/___PACKAGENAME___.xcscheme
diff --git a/pkg/Templates/Apple IIgs/C GNO Shell Command.xctemplate/main.c b/pkg/Templates/Apple IIgs/ORCAC GNO Shell Command.xctemplate/main.c
similarity index 100%
rename from pkg/Templates/Apple IIgs/C GNO Shell Command.xctemplate/main.c
rename to pkg/Templates/Apple IIgs/ORCAC GNO Shell Command.xctemplate/main.c
diff --git a/pkg/Templates/Apple IIgs/C New Desk Accessory.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple IIgs/ORCAC New Desk Accessory.xctemplate/TemplateInfo.plist
similarity index 100%
rename from pkg/Templates/Apple IIgs/C New Desk Accessory.xctemplate/TemplateInfo.plist
rename to pkg/Templates/Apple IIgs/ORCAC New Desk Accessory.xctemplate/TemplateInfo.plist
diff --git a/pkg/Templates/Apple IIgs/C New Desk Accessory.xctemplate/___PACKAGENAME___.xcscheme b/pkg/Templates/Apple IIgs/ORCAC New Desk Accessory.xctemplate/___PACKAGENAME___.xcscheme
similarity index 100%
rename from pkg/Templates/Apple IIgs/C New Desk Accessory.xctemplate/___PACKAGENAME___.xcscheme
rename to pkg/Templates/Apple IIgs/ORCAC New Desk Accessory.xctemplate/___PACKAGENAME___.xcscheme
diff --git a/pkg/Templates/Apple IIgs/C New Desk Accessory.xctemplate/main.c b/pkg/Templates/Apple IIgs/ORCAC New Desk Accessory.xctemplate/main.c
similarity index 100%
rename from pkg/Templates/Apple IIgs/C New Desk Accessory.xctemplate/main.c
rename to pkg/Templates/Apple IIgs/ORCAC New Desk Accessory.xctemplate/main.c
diff --git a/pkg/Templates/Apple IIgs/C New Desk Accessory.xctemplate/main.h b/pkg/Templates/Apple IIgs/ORCAC New Desk Accessory.xctemplate/main.h
similarity index 100%
rename from pkg/Templates/Apple IIgs/C New Desk Accessory.xctemplate/main.h
rename to pkg/Templates/Apple IIgs/ORCAC New Desk Accessory.xctemplate/main.h
diff --git a/pkg/Templates/Apple IIgs/C New Desk Accessory.xctemplate/main.rez b/pkg/Templates/Apple IIgs/ORCAC New Desk Accessory.xctemplate/main.rez
similarity index 100%
rename from pkg/Templates/Apple IIgs/C New Desk Accessory.xctemplate/main.rez
rename to pkg/Templates/Apple IIgs/ORCAC New Desk Accessory.xctemplate/main.rez
diff --git a/pkg/Templates/Apple IIgs/C ORCA Shell Command.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple IIgs/ORCAC Shell Command.xctemplate/TemplateInfo.plist
similarity index 100%
rename from pkg/Templates/Apple IIgs/C ORCA Shell Command.xctemplate/TemplateInfo.plist
rename to pkg/Templates/Apple IIgs/ORCAC Shell Command.xctemplate/TemplateInfo.plist
diff --git a/pkg/Templates/Apple IIgs/Asm ORCA Shell Command.xctemplate/___PACKAGENAME___.xcscheme b/pkg/Templates/Apple IIgs/ORCAC Shell Command.xctemplate/___PACKAGENAME___.xcscheme
similarity index 100%
rename from pkg/Templates/Apple IIgs/Asm ORCA Shell Command.xctemplate/___PACKAGENAME___.xcscheme
rename to pkg/Templates/Apple IIgs/ORCAC Shell Command.xctemplate/___PACKAGENAME___.xcscheme
diff --git a/pkg/Templates/Apple IIgs/C ORCA Shell Command.xctemplate/main.c b/pkg/Templates/Apple IIgs/ORCAC Shell Command.xctemplate/main.c
similarity index 100%
rename from pkg/Templates/Apple IIgs/C ORCA Shell Command.xctemplate/main.c
rename to pkg/Templates/Apple IIgs/ORCAC Shell Command.xctemplate/main.c
diff --git a/pkg/Templates/Apple IIgs/ORCAM Classic Desk Accessory.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple IIgs/ORCAM Classic Desk Accessory.xctemplate/TemplateInfo.plist
new file mode 100644
index 0000000..2094a13
--- /dev/null
+++ b/pkg/Templates/Apple IIgs/ORCAM Classic Desk Accessory.xctemplate/TemplateInfo.plist
@@ -0,0 +1,204 @@
+
+
+
+
+ Nodes
+
+ main.s
+ Makefile
+ make/config.txt
+ make/createDiskImage
+ make/head.mk
+ make/launchEmulator
+ make/orca-asm
+ make/orca-cc
+ make/orca-macgen
+ make/orca-rez
+ make/system601.2mg
+ make/tail.mk
+ ../___PACKAGENAME___.xcodeproj/xcshareddata/xcschemes/___PACKAGENAME___.xcscheme
+
+ Definitions
+
+ main.s
+
+ Path
+ main.s
+
+ make/config.txt
+
+ Group
+ make
+ Path
+ make/config.txt
+
+ make/createDiskImage
+
+ Group
+ make
+ Path
+ make/createDiskImage
+
+ make/head.mk
+
+ Group
+ make
+ Path
+ make/head.mk
+
+ make/launchEmulator
+
+ Group
+ make
+ Path
+ make/launchEmulator
+
+ make/orca-asm
+
+ Group
+ make
+ Path
+ make/orca-asm
+
+ make/orca-cc
+
+ Group
+ make
+ Path
+ make/orca-cc
+
+ make/orca-macgen
+
+ Group
+ make
+ Path
+ make/orca-macgen
+
+ make/orca-rez
+
+ Group
+ make
+ Path
+ make/orca-rez
+
+ make/system601.2mg
+
+ Group
+ make
+ Path
+ make/system601.2mg
+
+ make/tail.mk
+
+ Group
+ make
+ Path
+ make/tail.mk
+
+ Makefile
+
+ Path
+ Makefile
+
+ ../___PACKAGENAME___.xcodeproj/xcshareddata/xcschemes/___PACKAGENAME___.xcscheme
+
+ Group
+
+ Supporting Files
+
+ Path
+ ___PACKAGENAME___.xcscheme
+
+
+ Kind
+ Xcode.Xcode3.ProjectTemplateUnitKind
+ Identifier
+ com.halcyontouch.apple2gsOrcaMCDA
+ Ancestors
+
+ com.apple.dt.unit.externalBuildSystem
+
+ Concrete
+
+ Description
+ This template creates an Apple IIgs ORCA/M code project to build a classic desk accessory. The project starts with a single assembly file which you can modify. You can also add more assembly or C files as you may like.
+ Options
+
+ Targets
+
+
+ TargetType
+ Legacy
+ TargetIdentifier
+ com.apple.dt.cocoaLegacyTarget
+ BuildToolPath
+ ___VARIABLE_buildToolPath___
+ BuildToolArgsString
+ -C ___PACKAGENAME___ $(ACTION)
+ SharedSettings
+
+ OTHER_CFLAGS
+
+ OTHER_LDFLAGS
+
+
+ Configurations
+
+ Debug
+
+ DEBUGGING_SYMBOLS
+ YES
+ GCC_GENERATE_DEBUGGING_SYMBOLS
+ YES
+ GCC_OPTIMIZATION_LEVEL
+ 0
+
+ Release
+
+
+
+
+ ProductType
+ com.apple.product-type.tool
+ TargetIdentifier
+ com.apple.dt.commandLineToolTarget
+ Name
+ doNotBuild
+ SharedSettings
+
+ PRODUCT_NAME
+ doNotBuild
+ GCC_PREPROCESSOR_DEFINITIONS
+ inline(X,Y)=""
+ pascal=""
+ HEADER_SEARCH_PATHS
+ $GOLDEN_GATE/Libraries/ORCACDefs
+ ~/Library/GoldenGate/Libraries/ORCACDefs
+ /Library/GoldenGate/Libraries/ORCACDefs
+ ~/GoldenGate/Libraries/ORCACDefs
+
+ BuildPhases
+
+
+ Class
+ Sources
+
+
+ Class
+ Frameworks
+
+
+ Class
+ CopyFiles
+ DstPath
+ /usr/share/man/man1/
+ DstSubfolderSpec
+ 0
+ RunOnlyForDeploymentPostprocessing
+ YES
+
+
+
+
+
+
diff --git a/pkg/Templates/Apple IIgs/ORCAM Classic Desk Accessory.xctemplate/___PACKAGENAME___.xcscheme b/pkg/Templates/Apple IIgs/ORCAM Classic Desk Accessory.xctemplate/___PACKAGENAME___.xcscheme
new file mode 100644
index 0000000..61815a2
--- /dev/null
+++ b/pkg/Templates/Apple IIgs/ORCAM Classic Desk Accessory.xctemplate/___PACKAGENAME___.xcscheme
@@ -0,0 +1,98 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pkg/Templates/Apple IIgs/ORCAM Classic Desk Accessory.xctemplate/main.s b/pkg/Templates/Apple IIgs/ORCAM Classic Desk Accessory.xctemplate/main.s
new file mode 100644
index 0000000..d6bd361
--- /dev/null
+++ b/pkg/Templates/Apple IIgs/ORCAM Classic Desk Accessory.xctemplate/main.s
@@ -0,0 +1,85 @@
+;
+; ___FILENAME___
+; ___PROJECTNAME___
+;
+; Created by ___FULLUSERNAME___ on ___DATE___.
+;___COPYRIGHT___
+;
+
+ mcopy main.macros
+ keep main
+
+Main start
+
+ dw '___PROJECTNAME___'
+ dc i4'startCda'
+ dc i4'shutdownCda'
+ end
+
+startCda start
+
+ using CDAData
+
+ phb
+ phk
+ plb
+
+ pha ; Save the old text tool state to the stack
+ pha
+ pha
+ ~GetInputDevice
+
+ pha
+ pha
+ ~GetInGlobals
+
+ pha
+ pha
+ pha
+ ~GetOutputDevice
+
+ pha
+ pha
+ ~GetOutGlobals
+
+ ~SetInputDevice #0,#3 ; Setup input and output device to the console
+ ~SetInGlobals #$7f,#$00
+ ~SetOutputDevice #0,#3
+ ~SetOutGlobals #$ff,#$80
+ ~InitTextDev #0
+ ~InitTextDev #1
+
+ ~WriteChar #$0c
+
+ ~WriteCString #message
+
+ pha
+ ~ReadChar #0
+ pla
+
+ ~SetOutGlobals *,* ; Restore the old text tool state from the stack
+ ~SetOutputDevice *,*
+ ~SetInGlobals *,*
+ ~SetInputDevice *,*
+ ~InitTextDev #0
+ ~InitTextDev #1
+
+ plb
+ rtl
+
+shutdownCda entry
+ rtl
+
+ end
+
+
+CDAData data
+
+message dc c'Hello, world!'
+ dc i1'$0d'
+ dc i1'$0d'
+ dc c' Press ENTER to quit...'
+ dc i1'$00'
+
+ end
+
diff --git a/pkg/Templates/Apple IIgs/Asm ORCA Shell Command.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple IIgs/ORCAM Shell Command.xctemplate/TemplateInfo.plist
similarity index 100%
rename from pkg/Templates/Apple IIgs/Asm ORCA Shell Command.xctemplate/TemplateInfo.plist
rename to pkg/Templates/Apple IIgs/ORCAM Shell Command.xctemplate/TemplateInfo.plist
diff --git a/pkg/Templates/Apple IIgs/C ORCA Shell Command.xctemplate/___PACKAGENAME___.xcscheme b/pkg/Templates/Apple IIgs/ORCAM Shell Command.xctemplate/___PACKAGENAME___.xcscheme
similarity index 100%
rename from pkg/Templates/Apple IIgs/C ORCA Shell Command.xctemplate/___PACKAGENAME___.xcscheme
rename to pkg/Templates/Apple IIgs/ORCAM Shell Command.xctemplate/___PACKAGENAME___.xcscheme
diff --git a/pkg/Templates/Apple IIgs/Asm ORCA Shell Command.xctemplate/main.s b/pkg/Templates/Apple IIgs/ORCAM Shell Command.xctemplate/main.s
similarity index 100%
rename from pkg/Templates/Apple IIgs/Asm ORCA Shell Command.xctemplate/main.s
rename to pkg/Templates/Apple IIgs/ORCAM Shell Command.xctemplate/main.s
diff --git a/pkg/Templates/File Templates/Apple IIgs/Assembly File.xctemplate/TemplateIcon.png b/pkg/Templates/File Templates/Apple IIgs/ORCAM Assembly File.xctemplate/TemplateIcon.png
similarity index 100%
rename from pkg/Templates/File Templates/Apple IIgs/Assembly File.xctemplate/TemplateIcon.png
rename to pkg/Templates/File Templates/Apple IIgs/ORCAM Assembly File.xctemplate/TemplateIcon.png
diff --git a/pkg/Templates/File Templates/Apple IIgs/Assembly File.xctemplate/TemplateIcon@2x.png b/pkg/Templates/File Templates/Apple IIgs/ORCAM Assembly File.xctemplate/TemplateIcon@2x.png
similarity index 100%
rename from pkg/Templates/File Templates/Apple IIgs/Assembly File.xctemplate/TemplateIcon@2x.png
rename to pkg/Templates/File Templates/Apple IIgs/ORCAM Assembly File.xctemplate/TemplateIcon@2x.png
diff --git a/pkg/Templates/File Templates/Apple IIgs/Assembly File.xctemplate/TemplateInfo.plist b/pkg/Templates/File Templates/Apple IIgs/ORCAM Assembly File.xctemplate/TemplateInfo.plist
similarity index 91%
rename from pkg/Templates/File Templates/Apple IIgs/Assembly File.xctemplate/TemplateInfo.plist
rename to pkg/Templates/File Templates/Apple IIgs/ORCAM Assembly File.xctemplate/TemplateInfo.plist
index 10030b9..99d8233 100644
--- a/pkg/Templates/File Templates/Apple IIgs/Assembly File.xctemplate/TemplateInfo.plist
+++ b/pkg/Templates/File Templates/Apple IIgs/ORCAM Assembly File.xctemplate/TemplateInfo.plist
@@ -15,6 +15,6 @@
MainTemplateFile
___FILEBASENAME___.s
Summary
- An assembly source file
+ An ORCA/M assembly source file
diff --git a/pkg/Templates/File Templates/Apple IIgs/Assembly File.xctemplate/___FILEBASENAME___.s b/pkg/Templates/File Templates/Apple IIgs/ORCAM Assembly File.xctemplate/___FILEBASENAME___.s
similarity index 100%
rename from pkg/Templates/File Templates/Apple IIgs/Assembly File.xctemplate/___FILEBASENAME___.s
rename to pkg/Templates/File Templates/Apple IIgs/ORCAM Assembly File.xctemplate/___FILEBASENAME___.s
diff --git a/pkg/createPackage b/pkg/createPackage
index 9e14a98..ac7bdac 100755
--- a/pkg/createPackage
+++ b/pkg/createPackage
@@ -9,13 +9,14 @@ cp -R pkg/Plug-ins $TMPDIR
PROJECTS=/tmp/projects.$$
cat > $PROJECTS << EOF
-cda:orca:C Classic Desk Accessory
-cdev:orca:C Control Panel
-desktop:orca:C Desktop Application
-shell:gno:C GNO Shell Command
-nda:orca:C New Desk Accessory
-shell:orca:C ORCA Shell Command
-shell:orca:Asm ORCA Shell Command
+cda:orca:ORCAC Classic Desk Accessory
+cda:orca:ORCAM Classic Desk Accessory
+cdev:orca:ORCAC Control Panel
+desktop:orca:ORCAC Desktop Application
+shell:gno:ORCAC GNO Shell Command
+nda:orca:ORCAC New Desk Accessory
+shell:orca:ORCAC Shell Command
+shell:orca:ORCAM Shell Command
EOF
while read PROJECT