Add FSI and Healthcare themes to archetype and update Easel and WKND themes

src/main/archetype/ui.apps.structure/pom.xml

@@ -42,8 +42,6 @@
                         <filter><root>/apps/fd/af</root></filter>
                         #if ($aemVersion == "cloud")
                         <filter><root>/apps/fd/af/themes</root></filter>
-                        #else
-                        <filter><root>/apps/fd/af/theme-clientlibs</root></filter>
                         #end
                         #end
                         <filter><root>/apps/sling</root></filter>

src/main/archetype/ui.apps/README.md

@@ -0,0 +1,23 @@
+# Code Package
+
+The `ui.apps` package contains all the code to be deployed and only deploys to `/apps`.
+
+## Common elements
+Common elements of the ui.apps package include, but are not limited to:
+
+* Component definitions and HTL scripts
+* JavaScript and CSS (via Client Libraries)
+* Overlays of /libs
+* Fallback context-aware configurations
+* ACLs (permissions)
+
+For a more information about this package please have a look to the [official documentation](https://experienceleague.adobe.com/docs/experience-manager-cloud-service/content/implementing/developing/aem-project-content-package-structure.html?lang=en#code-packages-%2F-osgi-bundles).
+
+## AEM Forms Core Component Themes
+
+The `ui.apps` package includes AEM Forms Core Component themes, packaged under the path `/apps/fd/af/themes`. Below, you'll find a list of these themes and their public sources.
+
+1. Easel - https://github.com/adobe/aem-forms-theme-easel
+2. WKND - https://github.com/adobe/aem-forms-theme-wknd
+3. FSI - https://github.com/adobe/aem-forms-theme-fsi
+4. Healthcare - https://github.com/adobe/aem-forms-theme-healthcare

src/main/archetype/ui.apps/src/main/content/META-INF/vault/filter.xml

@@ -5,10 +5,9 @@
     <filter root="/apps/${appId}/i18n"/>
 #if ( $includeForms == "y" || $includeFormsenrollment == "y" || $includeFormscommunications == "y" || $includeFormsheadless == "y")
 #if ($aemVersion == "cloud")
-    <filter root="/apps/fd/af/themes"/>
-#else
-    <filter root="/apps/fd/af/theme-clientlibs"/>
+    <filter root="/apps/fd/af/themes" mode="merge"/>
 #end
+
 #end
 #if ( $includeErrorHandler == "y" )
     <filter root="/apps/sling" />