diff --git a/templates/parts/sheet-attributes.html b/templates/parts/sheet-attributes.html
index eb7ba89..41320e2 100644
--- a/templates/parts/sheet-attributes.html
+++ b/templates/parts/sheet-attributes.html
@@ -41,11 +41,7 @@
             <input class="attribute-label" type="text" name="system.attributes.{{#if attr.group}}{{attr.group}}.{{/if}}{{key}}.label" value="{{attr.label}}"
                 placeholder="{{localize "SIMPLE.AttributeLabel"}}"/>
             <select class="attribute-dtype" name="system.attributes.{{#if attr.group}}{{attr.group}}.{{/if}}{{key}}.dtype">
-                {{#select attr.dtype}}
-                {{#each ../dtypes as |t|}}
-                <option value="{{t}}">{{t}}</option>
-                {{/each}}
-                {{/select}}
+	        {{selectOptions ../dtypes selected=attr.dtype valueAttr="label" labelAttr="label"}}
             </select>
             <input type="hidden" name="system.attributes.{{#if attr.group}}{{attr.group}}.{{/if}}{{key}}.group" value="{{attr.group}}" />
             <a class="attribute-control" data-action="delete"><i class="fas fa-trash"></i></a>
diff --git a/templates/parts/sheet-groups.html b/templates/parts/sheet-groups.html
index 0309ecc..6414107 100644
--- a/templates/parts/sheet-groups.html
+++ b/templates/parts/sheet-groups.html
@@ -5,11 +5,7 @@
             <input class="group-key" type="text" readonly name="system.groups.{{groupKey}}.key" value="{{groupKey}}" />
             <input class="group-label" type="text" name="system.groups.{{groupKey}}.label" value="{{group.label}}" placeholder="Group Label" />
             <select class="group-dtype" name="system.groups.{{groupKey}}.dtype">
-                {{#select group.dtype}}
-                {{#each ../dtypes as |t|}}
-                <option value="{{t}}">{{t}}</option>
-                {{/each}}
-                {{/select}}
+	        {{selectOptions ../dtypes selected=group.dtype valueAttr="label" labelAttr="label"}}
             </select>
             <a class="attribute-control" data-action="create" data-group="{{groupKey}}" data-dtype="{{group.dtype}}"><i class="fas fa-plus"></i></a>
             <a class="group-control" data-action="delete-group"><i class="fas fa-trash"></i></a>