diff --git a/source/_components/group.markdown b/source/_components/group.markdown
index 5e5232e86aa..d9e054fad52 100644
--- a/source/_components/group.markdown
+++ b/source/_components/group.markdown
@@ -55,13 +55,28 @@ group:
       - device_tracker.mom_smith
 ```
 
-Configuration variables:
-
-- **view** (*Optional*): If yes then the entry will be shown as a view (tab) at the top. Groups that are set to `view: yes` cannot be used as entities in other views.
-- **name** (*Optional*): Name of the group.
-- **icon** (*Optional*): If the group is a view, this icon will show at the top in the frontend instead of the name. If the group is a view and both name and icon have been specified, the icon will appear at the top of the frontend and the name will be displayed as the mouse-over text.  If it's not a view, then the icon shows when this group is used in another group.
-- **control** (*Optional*): Set value to `hidden`. If hidden then the group switch will be hidden.
-- **entities** (*Required*): array or comma delimited string, list of entities to group.
+{% configuration %}
+name:
+  description: Name of the group.
+  required: false
+  type: string
+view:
+  description: "If yes then the entry will be shown as a view (tab) at the top. Groups that are set to `view: yes` cannot be used as entities in other views."
+  required: false
+  type: boolean
+icon:
+  description: If the group is a view, this icon will show at the top in the frontend instead of the name. If the group is a view and both name and icon have been specified, the icon will appear at the top of the frontend and the name will be displayed as the mouse-over text. If it's not a view, then the icon shows when this group is used in another group.
+  required: false
+  type: string
+control:
+  description: Set value to `hidden`. If hidden then the group switch will be hidden.
+  required: false
+  type: string
+entities:
+  description: Array or comma delimited string, list of entities to group.
+  required: true
+  type: list
+{% endconfiguration %}
 
 <p class='img'>
 <img src='/images/blog/2016-01-release-12/views.png'>