This depends on a core PR.

Gruntfile.js

@@ -18,7 +18,8 @@ module.exports = function(grunt) {
           "app/views/archetype.config.fieldset.dialog_versioned.html": "app/views/archetype.config.fieldset.dialog.html",
           "app/views/archetype.config_versioned.html": "app/views/archetype.config.html",
           "app/views/archetype_versioned.html": "app/views/archetype.html",
-          "app/views/archetype.default_versioned.html": "app/views/archetype.default.html"
+          "app/views/archetype.default_versioned.html": "app/views/archetype.default.html",
+          
         },
         options: {
           replacements: [{
@@ -151,7 +152,7 @@ module.exports = function(grunt) {
           {
             cwd: '<%= dest %>/bin',
             src: ['*.dll'],
-            dest: 'tmp/nuget_binaries/lib/net40',
+            dest: 'tmp/nuget/lib/net40',
             expand: true
           }
         ]
@@ -168,10 +169,6 @@ module.exports = function(grunt) {
         dist: {
             src: 'tmp/nuget/package.nuspec',
             dest: 'pkg'
-        },
-        dist_binaries: {
-            src: 'tmp/nuget_binaries/package_binaries.nuspec',
-            dest: 'pkg'
         }
     },
 
@@ -185,45 +182,29 @@ module.exports = function(grunt) {
                     license: '<%= pkgMeta.license %>',
                     licenseUrl: '<%= pkgMeta.licenseUrl %>',
                     author: '<%= pkgMeta.author %>',
-                    authorUrl: '<%= pkgMeta.authorUrl %>'
+                    authorUrl: '<%= pkgMeta.authorUrl %>',
+                    files: [{ path: 'tmp/nuget/**', target: 'content/App_Plugins/Archetype'}]
                 }
             },
             'files': { 
                 'tmp/nuget/package.nuspec': ['config/package.nuspec']
             }
-        },
-        'nuspec_binaries': {
-            'options': {
-                'data': { 
-                    name: '<%= pkgMeta.name %>.Binaries',
-                    version: '<%= pkgMeta.version %>',
-                    url: '<%= pkgMeta.url %>',
-                    license: '<%= pkgMeta.license %>',
-                    licenseUrl: '<%= pkgMeta.licenseUrl %>',
-                    author: '<%= pkgMeta.author %>',
-                    authorUrl: '<%= pkgMeta.authorUrl %>'
-                }
-            },
-            'files': { 
-                'tmp/nuget_binaries/package_binaries.nuspec': ['config/package_binaries.nuspec']
-            }
         }
     },
 
     umbracoPackage: {
-      dist: {
-        src: 'tmp/umbraco',
-        dest: 'pkg',
-        options: {
-          name: "<%= pkgMeta.name %>",
-          version: '<%= pkgMeta.version %>',
-          url: '<%= pkgMeta.url %>',
-          license: '<%= pkgMeta.license %>',
-          licenseUrl: '<%= pkgMeta.licenseUrl %>',
-          author: '<%= pkgMeta.author %>',
-          authorUrl: '<%= pkgMeta.authorUrl %>',
-          readme: '<%= grunt.file.read("config/readme.txt") %>'
-        }
+      options: {
+        name: "<%= pkgMeta.name %>",
+        version: '<%= pkgMeta.version %>',
+        url: '<%= pkgMeta.url %>',
+        license: '<%= pkgMeta.license %>',
+        licenseUrl: '<%= pkgMeta.licenseUrl %>',
+        author: '<%= pkgMeta.author %>',
+        authorUrl: '<%= pkgMeta.authorUrl %>',
+        manifest: 'config/package.xml',
+        readme: 'config/readme.txt',
+        sourceDir: 'tmp/umbraco',
+        outputDir: 'pkg',
       }
     },
 
@@ -267,6 +248,15 @@ module.exports = function(grunt) {
         src: ['<%= grunt.option("target") %>\\Web.config']
       }
     },
+    
+    jshint: {
+      options: {
+        jshintrc: '.jshintrc'
+      },
+      src: {
+        src: ['app/**/*.js', 'lib/**/*.js']
+      }
+    },
 
     msbuild: {
       options: {
@@ -290,7 +280,8 @@ module.exports = function(grunt) {
   });
 
   grunt.registerTask('default', ['clean', 'string-replace', 'less', 'concat', 'assemblyinfo', 'msbuild:dist', 'copy:dll', 'copy:assets', 'copy:html', 'copy:config', 'clean:html', 'clean:js', 'clean:less']);
-  grunt.registerTask('nuget',   ['clean:tmp', 'default', 'copy:nuget', 'template:nuspec', 'template:nuspec_binaries', 'nugetpack']);
+
+  grunt.registerTask('nuget',   ['clean:tmp', 'default', 'copy:nuget', 'template:nuspec', 'nugetpack', 'clean:tmp']);
   grunt.registerTask('umbraco', ['clean:tmp', 'default', 'copy:umbraco', 'umbracoPackage', 'clean:tmp']);
-  grunt.registerTask('package', ['clean:tmp', 'default', 'copy:nuget', 'template:nuspec', 'template:nuspec_binaries', 'nugetpack', 'copy:umbraco', 'umbracoPackage']);
+  grunt.registerTask('package', ['clean:tmp', 'default', 'copy:nuget', 'template:nuspec', 'nugetpack', 'copy:umbraco', 'umbracoPackage', 'clean:tmp']);
 };

app/Umbraco/Umbraco.Archetype/Properties/VersionInfo.cs

@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("1.12.2")]
-[assembly: AssemblyFileVersion("1.12.2")]
+[assembly: AssemblyVersion("1.12.1")]
+[assembly: AssemblyFileVersion("1.12.1")]

app/controllers/controller.js

@@ -468,7 +468,7 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc
         $scope.activeSubmitWatcher++;
         return $scope.activeSubmitWatcher;
     }
-    $scope.submitWatcherOnSubmit = function () {
-        $scope.$broadcast("archetypeFormSubmitting");
+    $scope.submitWatcherOnSubmit = function (args) {
+        $scope.$broadcast("archetypeFormSubmitting", args);
     }
 });

app/directives/archetypeproperty.js

@@ -93,8 +93,8 @@ angular.module("umbraco.directives").directive('archetypeProperty', function ($c
                         }
                     }
 
-                    //upload, colorpicker datatype hack
-                    if(view.indexOf('fileupload.html') != -1 || view.indexOf('colorpicker.html') != -1) {
+                    //upload datatype hack
+                    if(view.indexOf('fileupload.html') != -1) {
                         scope.propertyForm = scope.form;
                         scope.model.validation = {};
                         scope.model.validation.mandatory = 0;
@@ -115,14 +115,16 @@ angular.module("umbraco.directives").directive('archetypeProperty', function ($c
                     });
 
                     scope.$on('archetypeFormSubmitting', function (ev, args) {
-                        // validate all fieldset properties
-                        _.each(scope.fieldset.properties, function (property) {
-                            archetypeService.validateProperty(scope.fieldset, property, configFieldsetModel);
-                        });
+                        if(args.action !== 'save') {
+                            // validate all fieldset properties
+                            _.each(scope.fieldset.properties, function (property) {
+                                archetypeService.validateProperty(scope.fieldset, property, configFieldsetModel);
+                            });
 
-                        var validationKey = "validation-f" + scope.fieldsetIndex;
+                            var validationKey = "validation-f" + scope.fieldsetIndex;
 
-                        ngModelCtrl.$setValidity(validationKey, scope.fieldset.isValid);
+                            ngModelCtrl.$setValidity(validationKey, scope.fieldset.isValid);
+                        }
 
                         // did the value change (if it did, it most likely did so during the "formSubmitting" event)
                         var property = archetypeService.getFieldsetProperty(scope);

app/directives/archetypesubmitwatcher.js

@@ -3,9 +3,10 @@ angular.module("umbraco.directives").directive('archetypeSubmitWatcher', functio
         // call the load callback on scope to obtain the ID of this submit watcher
         var id = scope.loadCallback();
         scope.$on("formSubmitting", function (ev, args) {
+
             // on the "formSubmitting" event, call the submit callback on scope to notify the Archetype controller to do it's magic
             if (id == scope.activeSubmitWatcher) {
-                scope.submitCallback();
+                scope.submitCallback(args);
             }
         });
     }

config/meta.json

@@ -1,6 +1,6 @@
 {
 	"name": "Archetype",
-	"version": "1.12.2",
+	"version": "1.12.1",
 	"url": "http://github.com/imulus/archetype/",
 	"author": "Imulus - Kevin Giszewski - Tom Fulton - Lee Kelleher - Matt Brailsford - Kenn Jacobsen - Et. Al.",
 	"authorUrl": "http://imulus.com/",

config/package.nuspec

@@ -12,7 +12,7 @@
         <iconUrl>http://github.com/imulus/archetype/raw/master/assets/logo.png</iconUrl>
         <licenseUrl><%= licenseUrl %></licenseUrl>
         <dependencies>
-            <dependency id="Archetype.Binaries" version="<%= version %>" />
+            <dependency id="UmbracoCms.Core" version="7.2.2" />
         </dependencies>
     </metadata>
 </package>

config/package.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<umbPackage>
+  <info>
+    <package>
+      <name><%= name %></name>
+      <version><%= version %></version>
+      <license url="<%= licenseUrl %>"><%= license %></license>
+      <url><%= url %></url>
+      <requirements>
+        <major>0</major>
+        <minor>0</minor>
+        <patch>0</patch>
+      </requirements>
+    </package>
+    <author>
+      <name><%= author %></name>
+      <website><%= authorUrl %></website>
+    </author>
+    <readme><![CDATA[<%= readmeContents %>]]></readme>
+  </info>
+  <DocumentTypes />
+  <Templates />
+  <Stylesheets />
+  <Macros />
+  <DictionaryItems />
+  <Languages />
+  <DataTypes />
+  <control />
+  <Actions />
+  <files>
+  	<% files.forEach(function(file) { %>
+  	<file>
+      <guid><%= file.guid %>.<%= file.ext %></guid>
+      <orgPath><%= file.dir %></orgPath>
+      <orgName><%= file.name %></orgName>
+    </file>
+	<% }); %>
+  </files>
+</umbPackage>

config/package_binaries.nuspec

@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
-    <metadata>
-        <id>Archetype.Binaries</id>
-        <version><%= version %></version>
-        <title><%= name %></title>
-        <authors>imulus, kgiszewski, tomfulton</authors>
-        <owners>imulus, kgiszewski, tomfulton</owners>
-        <projectUrl>http://github.com/imulus/archetype</projectUrl>
-        <description><![CDATA[Archetype binaries for Umbraco]]></description>
-        <tags>umbraco</tags>
-        <iconUrl>http://github.com/imulus/archetype/raw/master/assets/logo.png</iconUrl>
-        <licenseUrl><%= licenseUrl %></licenseUrl>
-        <dependencies>
-            <dependency id="UmbracoCms.Core" version="7.2.2" />
-        </dependencies>
-    </metadata>
-</package>

package.json

@@ -22,7 +22,7 @@
     "grunt-msbuild": "~0.1.9",
     "grunt-dotnet-assembly-info": "~1.0.9",
     "load-grunt-tasks": "~0.4.0",
-    "grunt-umbraco-package": "^1.0.0"
+    "grunt-umbraco-package": "0.0.6"
   },
   "repository": {
     "type": "git",