       default:
         src: [
           ".tmp"
+          "<%= config.dist %>"
+          "<%= config.app %>/.jekyll-metadata"
           "<%= amsf.theme.assets %>/css/"
           "<%= amsf.theme.assets %>/js/"
+          "<%= amsf.user.assets %>/css/"
           "<%= amsf.user.assets %>/js/"
         ]
 
-      jekyllMetadata:
+      amsf__theme__cleanup:
         src: [
-          "<%= config.dist %>"
-          "<%= config.app %>/.jekyll-metadata"
+          "<%= copy.amsf__theme__to_cache.files.1.cwd %>"
+          "<%= copy.amsf__theme__to_cache.files.2.cwd %>"
+          "<%= copy.amsf__theme__to_cache.files.3.cwd %>"
+          "<%= copy.amsf__theme__to_cache.files.4.cwd %>"
         ]
 
     cleanempty:

        push: false

  grunt.registerTask "serve", "Fire up a server on local machine for development", [
    "clean"
    "copy:serve"
    "less:serve"
    "postcss:serve"

          }
        ]

    gitclone:
      amsf__core__add_remote:
        options:
