diff --git a/flatfilecms/templates/macros.jinja2 b/flatfilecms/templates/macros.jinja2
index 7b1adcd..712e6b1 100644
--- a/flatfilecms/templates/macros.jinja2
+++ b/flatfilecms/templates/macros.jinja2
@@ -1,8 +1,5 @@
-{% macro b(class=None, tag="div", id=None) -%}
-<{{ tag }}
-{%- if class is not none %} class="{{class}}" {%- endif -%}
-{%- if id is not none %} id="{{id}}" {%- endif -%}
->
+{% macro b(tag="div", attributes=None) -%}
+<{{ tag }}{% if attributes %} {{attributes|safe}}{%endif%}{% for name, value in kwargs.items() %} {{name}}="{{value}}"{% endfor -%}>
 {%- if caller %}
     {{ caller() }}
 {% endif -%}