diff --git a/tailbone/forms/core.py b/tailbone/forms/core.py
index 2238cb06..18c6a8c7 100644
--- a/tailbone/forms/core.py
+++ b/tailbone/forms/core.py
@@ -684,10 +684,8 @@ class Form(object):
 
     def render(self, template=None, **kwargs):
         if not template:
-            if self.readonly:
+            if self.readonly and not self.use_buefy:
                 template = '/forms/form_readonly.mako'
-            elif self.use_buefy:
-                template = '/forms/form_buefy.mako'
             else:
                 template = '/forms/form.mako'
         context = kwargs
@@ -727,7 +725,13 @@ class Form(object):
 
         return self.deform_form
 
-    def render_deform(self, dform=None, template='/forms/deform.mako', **kwargs):
+    def render_deform(self, dform=None, template=None, **kwargs):
+        if not template:
+            if self.use_buefy:
+                template = '/forms/deform_buefy.mako'
+            else:
+                template = '/forms/deform.mako'
+
         if dform is None:
             dform = self.make_deform_form()
 
diff --git a/tailbone/static/themes/falafel/css/forms.css b/tailbone/static/themes/falafel/css/forms.css
new file mode 100644
index 00000000..d23205d2
--- /dev/null
+++ b/tailbone/static/themes/falafel/css/forms.css
@@ -0,0 +1,15 @@
+
+/******************************
+ * forms
+ ******************************/
+
+/* TODO: replace this with bulma equivalent */
+.form {
+    padding-left: 5em;
+}
+
+.field.is-horizontal .field-label .label {
+    text-align: left;
+    white-space: nowrap;
+    width: 18em;
+}
diff --git a/tailbone/templates/forms/deform_buefy.mako b/tailbone/templates/forms/deform_buefy.mako
index 7557743f..9a45e597 100644
--- a/tailbone/templates/forms/deform_buefy.mako
+++ b/tailbone/templates/forms/deform_buefy.mako
@@ -1,23 +1,32 @@
 ## -*- coding: utf-8; -*-
 
 <script type="text/x-template" id="buefy-form-template">
-  % if not readonly:
+  % if not form.readonly:
   ${h.form(form.action_url, id=dform.formid, method='post', enctype='multipart/form-data', **form_kwargs)}
   ${h.csrf_token(request)}
   % endif
 
   <section>
     % for field in form.fields:
-        <% field = dform[field] %>
+        % if form.readonly or (field not in dform and field in form.readonly_fields):
+            <b-field horizontal
+                     label="${form.get_label(field)}">
+              ${form.render_field_value(field)}
+            </b-field>
 
-        <b-field label="${form.get_label(field.name)}"
-                 % if field.error:
-                 type="is-danger"
-                 :message='${form.messages_json(field.error.messages())|n}'
-                 % endif
-                 >
-          ${field.serialize(use_buefy=True)|n}
-        </b-field>
+        % elif field in dform:
+            <% field = dform[field] %>
+
+            <b-field horizontal
+                     label="${form.get_label(field.name)}"
+                     % if field.error:
+                     type="is-danger"
+                     :message='${form.messages_json(field.error.messages())|n}'
+                     % endif
+                     >
+              ${field.serialize(use_buefy=True)|n}
+            </b-field>
+        % endif
 
     % endfor
   </section>
@@ -25,7 +34,7 @@
   % if buttons:
       <br />
       ${buttons|n}
-  % elif not readonly and (buttons is Undefined or (buttons is not None and buttons is not False)):
+  % elif not form.readonly and (buttons is Undefined or (buttons is not None and buttons is not False)):
       <br />
       <div class="buttons">
         ${h.submit('save', getattr(form, 'submit_label', getattr(form, 'save_label', "Submit")), class_='button is-primary')}
@@ -42,7 +51,7 @@
       </div>
   % endif
 
-  % if not readonly:
+  % if not form.readonly:
   ${h.end_form()}
   % endif
 </script>
diff --git a/tailbone/templates/forms/form_buefy.mako b/tailbone/templates/forms/form_buefy.mako
deleted file mode 100644
index 1aaa25a9..00000000
--- a/tailbone/templates/forms/form_buefy.mako
+++ /dev/null
@@ -1,5 +0,0 @@
-## -*- coding: utf-8; -*-
-
-<div class="form">
-  ${form.render_deform(template='/forms/deform_buefy.mako')|n}
-</div>
diff --git a/tailbone/templates/themes/falafel/base.mako b/tailbone/templates/themes/falafel/base.mako
index 9ba2cd7d..b4187b67 100644
--- a/tailbone/templates/themes/falafel/base.mako
+++ b/tailbone/templates/themes/falafel/base.mako
@@ -339,7 +339,7 @@
   ${h.stylesheet_link(request.static_url('tailbone:static/themes/falafel/css/grids.rowstatus.css') + '?ver={}'.format(tailbone.__version__))}
 ##   ${h.stylesheet_link(request.static_url('tailbone:static/css/filters.css') + '?ver={}'.format(tailbone.__version__))}
   ${h.stylesheet_link(request.static_url('tailbone:static/themes/falafel/css/filters.css') + '?ver={}'.format(tailbone.__version__))}
-  ${h.stylesheet_link(request.static_url('tailbone:static/themes/bobcat/css/forms.css') + '?ver={}'.format(tailbone.__version__))}
+  ${h.stylesheet_link(request.static_url('tailbone:static/themes/falafel/css/forms.css') + '?ver={}'.format(tailbone.__version__))}
   ${h.stylesheet_link(request.static_url('tailbone:static/css/diffs.css') + '?ver={}'.format(tailbone.__version__))}
 
   <style type="text/css">