diff --git a/pom.xml b/pom.xml
index 5019471fb..6554369fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -108,7 +108,7 @@
                     <dependency>
                         <groupId>org.codehaus.groovy</groupId>
                         <artifactId>groovy-all</artifactId>
-                        <version>3.0.5</version>
+                        <version>3.0.7</version>
                         <type>pom</type> <!-- required JUST since Groovy 2.5.0 -->
                     </dependency>
                 </dependencies>
diff --git a/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/checkbox/.content.xml b/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/checkbox/.content.xml
new file mode 100644
index 000000000..7fd053abc
--- /dev/null
+++ b/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/checkbox/.content.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    jcr:description="Adaptive Form Check Box (v1) component"
+    jcr:primaryType="cq:Component"
+    jcr:title="Check Box"
+    sling:resourceSuperType="core/fd/components/form/checkbox/v1/checkbox"
+    componentGroup="${appTitle} - Adaptive Form"/>
diff --git a/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/checkbox/_cq_template.xml b/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/checkbox/_cq_template.xml
new file mode 100644
index 000000000..964e0dc8f
--- /dev/null
+++ b/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/checkbox/_cq_template.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
+  jcr:primaryType="nt:unstructured"
+  jcr:title="Check Box"
+  fieldType="checkbox"
+  checkedValue="on"
+  uncheckedValue="off"/>
+
diff --git a/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/checkboxgroup/.content.xml b/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/checkboxgroup/.content.xml
index 4ff5d5793..fc74ed78b 100644
--- a/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/checkboxgroup/.content.xml
+++ b/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/checkboxgroup/.content.xml
@@ -2,6 +2,6 @@
 <jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
     jcr:description="Adaptive Form Check Box Group (v1) component"
     jcr:primaryType="cq:Component"
-    jcr:title="Check Box"
+    jcr:title="Check Box Group"
     sling:resourceSuperType="core/fd/components/form/checkboxgroup/v1/checkboxgroup"
     componentGroup="${appTitle} - Adaptive Form"/>
diff --git a/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/verticaltabs/.content.xml b/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/verticaltabs/.content.xml
index 4a898ac93..5328d6c3e 100644
--- a/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/verticaltabs/.content.xml
+++ b/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/verticaltabs/.content.xml
@@ -4,4 +4,4 @@
     jcr:primaryType="cq:Component"
     jcr:title="Vertical Tabs"
     sling:resourceSuperType="core/fd/components/form/verticaltabs/v1/verticaltabs"
-    componentGroup="${appTitle} - Adaptive Form"/>
+    componentGroup=".${appTitle} - Adaptive Form"/>