--- a/ckanext/datagovau/templates/package/snippets/package_metadata_fields.html
+++ b/ckanext/datagovau/templates/package/snippets/package_metadata_fields.html
@@ -9,10 +9,22 @@
 
 {# https://github.com/okfn/ckan/blob/master/ckan/templates/macros/form.html documents the macros for fields #}
 
-{% block package_metadata_fields %}
-
-
-{{ super() }}
-
+{% block dataset_fields %}
+{% if data.groups %}
+<div class="control-group">
+    <label class="control-label">Groups/Themes</label>
+    <div class="controls">
+        {% for group in data.groups %}
+        <label class="checkbox" for="field-group-{{ loop.index0 }}">
+            <input id="field-group-{{ loop.index0 }}" type="checkbox" name="groups__{{ loop.index0 }}__id" value="{{ group.id }}" checked="checked" />
+            {{ group.title }}
+        </label>
+        {% endfor %}
+    </div>
+</div>
+{% endif %}
+{% set group_name = 'groups__%s__id' % data.groups|length %}
+{% set group_attrs = {'data-module': 'autocomplete', 'data-module-source': '/api/2/util/group/autocomplete?q=?', 'data-module-key': 'id', 'data-module-label': 'title'} %}
+{{ form.input(group_name, label=_('Add Group/Theme'), id="field-group", value=data[group_name], classes=['control-medium'], attrs=group_attrs) }}
 {% endblock %}