diff --git a/layouts/partials/bergamotparseinputmodes.js b/layouts/partials/bergamotparseinputmodes.js
new file mode 100644
index 0000000..b43263e
--- /dev/null
+++ b/layouts/partials/bergamotparseinputmodes.js
@@ -0,0 +1,17 @@
+{
+{{ if . }}
+{{ range $name := split . ";" }}
+{{ if eq $name "query" }}
+    "Query": "query",
+{{ else }}
+    {{ $pieces := split $name ":" }}
+    {{ $name := index $pieces 0 }}
+    {{ $modestring := index $pieces 1 }}
+    "{{ $name }}": { "custom": "{{ $modestring }}" },
+{{ end }}
+{{ end }}
+{{ else }}
+    "Languge Term": { "custom": "Bergamot Object Language" },
+    "Query": "query",
+{{ end }}
+}
diff --git a/layouts/shortcodes/bergamot_widget.html b/layouts/shortcodes/bergamot_widget.html
index 6ea2ca6..8d3f2a9 100644
--- a/layouts/shortcodes/bergamot_widget.html
+++ b/layouts/shortcodes/bergamot_widget.html
@@ -1,6 +1,8 @@
 <div id="{{ .Get "id" }}"></div>
 <script>
     window.addEventListener('load', function() {
-        window.Bergamot.run(null, '{{ .Get "id" }}', '{{ .Get "prompt" }}', '{{ .Inner }}', '{{ default "default" (.Get "rendering") }}', '{{ .Get "query" }}');
+        window.Bergamot.run(null, '{{ .Get "id" }}',
+            {{ partial "bergamotparseinputmodes.js" (.Get "modes") | safeJS }},
+            '{{ .Get "prompt" }}', '{{ .Inner }}', '{{ default "default" (.Get "rendering") }}', '{{ .Get "query" }}');
     });
 </script>
diff --git a/themes/vanilla b/themes/vanilla
index 84278b2..aae8912 160000
--- a/themes/vanilla
+++ b/themes/vanilla
@@ -1 +1 @@
-Subproject commit 84278b2e91c9bcfcc08b34c08daa355e7c8f336a
+Subproject commit aae8912c089e25e33b0f9f94196a09f5e9501323