diff --git a/src/wuttaweb/templates/appinfo/configure.mako b/src/wuttaweb/templates/appinfo/configure.mako
index 556d76d..9d52a7b 100644
--- a/src/wuttaweb/templates/appinfo/configure.mako
+++ b/src/wuttaweb/templates/appinfo/configure.mako
@@ -112,36 +112,31 @@
       <b-field label="Default Sender">
         <b-input name="${app.appname}.email.default.sender"
                  v-model="simpleSettings['${app.appname}.email.default.sender']"
-                 @input="settingsNeedSaved = true"
-                 expanded />
+                 @input="settingsNeedSaved = true" />
       </b-field>
 
       <b-field label="Default Recipient(s)">
         <b-input name="${app.appname}.email.default.to"
                  v-model="simpleSettings['${app.appname}.email.default.to']"
-                 @input="settingsNeedSaved = true"
-                 expanded />
+                 @input="settingsNeedSaved = true" />
       </b-field>
 
       <b-field label="Default Subject (optional)">
         <b-input name="${app.appname}.email.default.subject"
                  v-model="simpleSettings['${app.appname}.email.default.subject']"
-                 @input="settingsNeedSaved = true"
-                 expanded />
+                 @input="settingsNeedSaved = true" />
       </b-field>
 
       <b-field label="Feedback Recipient(s) (optional)">
         <b-input name="${app.appname}.email.feedback.to"
                  v-model="simpleSettings['${app.appname}.email.feedback.to']"
-                 @input="settingsNeedSaved = true"
-                 expanded />
+                 @input="settingsNeedSaved = true" />
       </b-field>
 
       <b-field label="Feedback Subject (optional)">
         <b-input name="${app.appname}.email.feedback.subject"
                  v-model="simpleSettings['${app.appname}.email.feedback.subject']"
-                 @input="settingsNeedSaved = true"
-                 expanded />
+                 @input="settingsNeedSaved = true" />
       </b-field>
 
     </div>
diff --git a/src/wuttaweb/templates/base.mako b/src/wuttaweb/templates/base.mako
index 4f65595..a1130ef 100644
--- a/src/wuttaweb/templates/base.mako
+++ b/src/wuttaweb/templates/base.mako
@@ -498,26 +498,23 @@
                        % if request.user:
                            disabled
                        % endif
-                       expanded />
+                       />
             </b-field>
 
             <b-field label="Referring URL">
               <b-input v-model="referrer"
-                       disabled="true"
-                       expanded />
+                       disabled="true" />
             </b-field>
 
             <b-field label="Message"
                      :type="message && message.trim() ? null : 'is-danger'">
               <b-input type="textarea"
                        v-model="message"
-                       ref="textarea"
-                       expanded />
+                       ref="textarea" />
             </b-field>
           </section>
 
           <footer class="modal-card-foot">
-            <div style="display: flex; gap: 0.5rem;">
             <b-button @click="showDialog = false">
               Cancel
             </b-button>
@@ -528,7 +525,6 @@
                       :disabled="submitDisabled">
               {{ sendingFeedback ? "Working, please wait..." : "Send Message" }}
             </b-button>
-            </div>
           </footer>
         </div>
       </${b}-modal>
diff --git a/src/wuttaweb/templates/deform/checked_password.pt b/src/wuttaweb/templates/deform/checked_password.pt
index d610e88..8a009df 100644
--- a/src/wuttaweb/templates/deform/checked_password.pt
+++ b/src/wuttaweb/templates/deform/checked_password.pt
@@ -5,12 +5,10 @@
   <b-input name="${name}"
            value="${field.widget.redisplay and cstruct or ''}"
            type="password"
-           expanded
            placeholder="Password" />
   <b-input name="${name}-confirm"
            value="${field.widget.redisplay and confirm or ''}"
            type="password"
-           expanded
            placeholder="Confirm Password" />
   ${field.end_mapping()}
 </div>
diff --git a/src/wuttaweb/templates/deform/dateinput.pt b/src/wuttaweb/templates/deform/dateinput.pt
index bd80882..b0e1285 100644
--- a/src/wuttaweb/templates/deform/dateinput.pt
+++ b/src/wuttaweb/templates/deform/dateinput.pt
@@ -1,7 +1,6 @@
 <div>
   ${field.start_mapping()}
   <wutta-datepicker name="date"
-                    value="${cstruct}"
-                    expanded />
+                    value="${cstruct}" />
   ${field.end_mapping()}
 </div>
diff --git a/src/wuttaweb/templates/deform/datetimeinput.pt b/src/wuttaweb/templates/deform/datetimeinput.pt
index 25748b6..b617929 100644
--- a/src/wuttaweb/templates/deform/datetimeinput.pt
+++ b/src/wuttaweb/templates/deform/datetimeinput.pt
@@ -2,11 +2,9 @@
   ${field.start_mapping()}
   <wutta-datepicker name="date"
                     style="flex-grow: 1;"
-                    expanded
                     value="${date}" />
   <wutta-timepicker name="time"
                     style="flex-grow: 1;"
-                    expanded
                     value="${time}" />
   ${field.end_mapping()}
 </div>
diff --git a/src/wuttaweb/templates/deform/moneyinput.pt b/src/wuttaweb/templates/deform/moneyinput.pt
index 5536369..532a823 100644
--- a/src/wuttaweb/templates/deform/moneyinput.pt
+++ b/src/wuttaweb/templates/deform/moneyinput.pt
@@ -3,6 +3,5 @@
                       vmodel vmodel|'modelData.'+oid;">
   <b-input name="${name}"
            v-model="${vmodel}"
-           expanded
            tal:attributes="attributes|field.widget.attributes|{};" />
 </tal:omit>
diff --git a/src/wuttaweb/templates/deform/password.pt b/src/wuttaweb/templates/deform/password.pt
index 987dafb..8a56790 100644
--- a/src/wuttaweb/templates/deform/password.pt
+++ b/src/wuttaweb/templates/deform/password.pt
@@ -5,6 +5,5 @@
   <b-input name="${name}"
            v-model="${vmodel}"
            type="password"
-           expanded
            tal:attributes="attributes|field.widget.attributes|{};" />
 </div>
diff --git a/src/wuttaweb/templates/deform/textarea.pt b/src/wuttaweb/templates/deform/textarea.pt
index 7bf393b..00c82b5 100644
--- a/src/wuttaweb/templates/deform/textarea.pt
+++ b/src/wuttaweb/templates/deform/textarea.pt
@@ -7,6 +7,5 @@
   <b-input name="${name}"
            v-model="${vmodel}"
            type="textarea"
-           expanded
            tal:attributes="attributes|field.widget.attributes|{};" />
 </div>
diff --git a/src/wuttaweb/templates/deform/textinput.pt b/src/wuttaweb/templates/deform/textinput.pt
index bf6d7ee..89c8c0f 100644
--- a/src/wuttaweb/templates/deform/textinput.pt
+++ b/src/wuttaweb/templates/deform/textinput.pt
@@ -4,6 +4,5 @@
                  vmodel vmodel|'modelData.'+oid;">
   <b-input name="${name}"
            v-model="${vmodel}"
-           expanded
            tal:attributes="attributes|field.widget.attributes|{};" />
 </div>
diff --git a/src/wuttaweb/templates/themes/butterfly/buefy-components.mako b/src/wuttaweb/templates/themes/butterfly/buefy-components.mako
index 1d7e3af..a7dd72c 100644
--- a/src/wuttaweb/templates/themes/butterfly/buefy-components.mako
+++ b/src/wuttaweb/templates/themes/butterfly/buefy-components.mako
@@ -5,7 +5,6 @@
   ${self.make_b_checkbox_component()}
   ${self.make_b_collapse_component()}
   ${self.make_b_datepicker_component()}
-  ${self.make_b_timepicker_component()}
   ${self.make_b_dropdown_component()}
   ${self.make_b_dropdown_item_component()}
   ${self.make_b_field_component()}
@@ -92,7 +91,7 @@
   <script type="text/x-template" id="b-button-template">
     <o-button :variant="variant"
               :size="orugaSize"
-              :type="nativeType"
+              :native-type="nativeType"
               :tag="tag"
               :href="href"
               :icon-left="iconLeft">
@@ -191,8 +190,8 @@
                   @update:model-value="orugaValueUpdated"
                   :value="value"
                   :placeholder="placeholder"
-                  :formatter="dateFormatter"
-                  :parser="dateParser"
+                  :date-formatter="dateFormatter"
+                  :date-parser="dateParser"
                   :disabled="disabled"
                   :editable="editable"
                   :icon="icon"
@@ -238,45 +237,6 @@
   <% request.register_component('b-datepicker', 'BDatepicker') %>
 </%def>
 
-<%def name="make_b_timepicker_component()">
-  <script type="text/x-template" id="b-timepicker-template">
-    <o-timepicker v-model="orugaValue"
-                  @update:model-value="orugaValueUpdated"
-                  :formatter="timeFormatter"
-                  :parser="timeParser" />
-  </script>
-  <script>
-    const BTimepicker = {
-        template: '#b-timepicker-template',
-        props: {
-            modelValue: null,
-            timeFormatter: null,
-            timeParser: null,
-        },
-        data() {
-            return {
-                orugaValue: this.modelValue,
-            }
-        },
-        watch: {
-            modelValue(to, from) {
-                if (this.orugaValue != to) {
-                    this.orugaValue = to
-                }
-            },
-        },
-        methods: {
-            orugaValueUpdate(value) {
-                if (this.modelValue != value) {
-                    this.$emit('update:modelValue', value)
-                }
-            },
-        },
-    }
-  </script>
-  <% request.register_component('b-timepicker', 'BTimepicker') %>
-</%def>
-
 <%def name="make_b_dropdown_component()">
   <script type="text/x-template" id="b-dropdown-template">
     <o-dropdown :position="buefyPosition"
@@ -413,7 +373,15 @@
         },
         methods: {
             focus() {
-                this.$refs.input.focus()
+                if (this.type == 'textarea') {
+                    // TODO: this does not always work right?
+                    this.$refs.input.$el.querySelector('textarea').focus()
+                } else {
+                    // TODO: pretty sure we can rely on the <o-input> focus()
+                    // here, but not sure why we weren't already doing that?
+                    //this.$refs.input.$el.querySelector('input').focus()
+                    this.$refs.input.focus()
+                }
             },
         },
     }