         options:
           repository: "https://github.com/sparanoid/almace-scaffolding.git"
           branch: "master"
-          directory: "<%= config.amsf_base %>/core/"
+          directory: "<%= amsf.base %>/core/"
 
       amsf__theme__add_remote:
         options:
-          repository: "https://github.com/<%= config.amsf_theme_new_author %>/amsf-<%= config.amsf_theme_new %>.git"
+          repository: "https://github.com/<%= amsf.theme.new_author %>/amsf-<%= amsf.theme.new_name %>.git"
           branch: "master"
-          directory: "<%= config.amsf_base %>/themes/<%= config.amsf_theme_new %>/"
+          directory: "<%= amsf.base %>/themes/<%= amsf.theme.new_name %>/"
 
     gitpull:
       amsf__core__update_remote:
         options:
-          cwd: "<%= config.amsf_base %>/core/"
+          cwd: "<%= amsf.base %>/core/"
 
       amsf__theme__update_remote:
         options:
-          cwd: "<%= config.amsf_base %>/themes/<%= config.amsf_theme %>/"
+          cwd: "<%= amsf.base %>/themes/<%= amsf.theme.current %>/"
 
     gitclean:
       options:

      amsf__theme__to_app:
        files: [
          {
            src: ["<%= config.amsf_base %>/themes/<%= config.amsf_theme_new %>/config.yml"]
            dest: "<%= config.app %>/_data/<%= config.amsf_theme_new %>.yml"
          }
          {
            expand: true
            dot: true
            cwd: "<%= config.amsf_base %>/themes/<%= config.amsf_theme_new %>/includes/"
            src: ["**"]
            dest: "<%= config.app %>/_includes/themes/<%= config.amsf_theme_new %>/includes/"
          }
          {
            expand: true
            dot: true
            cwd: "<%= config.amsf_base %>/themes/<%= config.amsf_theme_new %>/layouts/"
            src: ["**"]
            dest: "<%= config.app %>/_includes/themes/<%= config.amsf_theme_new %>/layouts/"
          }
          {
            expand: true
            dot: true
            cwd: "<%= config.amsf_base %>/themes/<%= config.amsf_theme_new %>/assets/"
            src: ["**"]
            dest: "<%= config.app %>/assets/themes/<%= config.amsf_theme_new %>/"
          }
          {
            expand: true
            dot: true
            cwd: "<%= config.amsf_base %>/themes/<%= config.amsf_theme_new %>/pages/"
            src: ["**"]
            dest: "<%= config.app %>/_pages/themes/<%= config.amsf_theme_new %>/"
          }
        ]

      amsf__theme__to_cache:
        files: [
          {
            src: ["<%= config.app %>/_data/<%= config.amsf_theme %>.yml"]
            dest: "<%= config.amsf_base %>/themes/<%= config.amsf_theme %>/config.yml"
          }
          {
            expand: true
            dot: true
            cwd: "<%= config.app %>/_includes/themes/<%= config.amsf_theme %>/includes/"
            src: ["**"]
            dest: "<%= config.amsf_base %>/themes/<%= config.amsf_theme %>/includes/"
          }
          {
            expand: true
            dot: true
            cwd: "<%= config.app %>/_includes/themes/<%= config.amsf_theme %>/layouts/"
            src: ["**"]
            dest: "<%= config.amsf_base %>/themes/<%= config.amsf_theme %>/layouts/"
          }
          {
            expand: true
            dot: true
            cwd: "<%= config.app %>/assets/themes/<%= config.amsf_theme %>/"
            src: ["**"]
            dest: "<%= config.amsf_base %>/themes/<%= config.amsf_theme %>/assets/"
          }
          {
            expand: true
            dot: true
            cwd: "<%= config.app %>/_pages/themes/<%= config.amsf_theme %>/"
            src: ["**"]
            dest: "<%= config.amsf_base %>/themes/<%= config.amsf_theme %>/pages/"
          }
        ]


          {
            expand: true
            dot: true
            cwd: "<%= amsf.core %>/"
            src: [
              ".*"
              "*.json"
