diff --git a/src/cf_ui/templates/jinja/bootstrap/Button.jinja b/src/cf_ui/templates/jinja/bootstrap/Button.jinja
index 7dbf0fc..014b961 100644
--- a/src/cf_ui/templates/jinja/bootstrap/Button.jinja
+++ b/src/cf_ui/templates/jinja/bootstrap/Button.jinja
@@ -10,7 +10,24 @@
{% set extra_class = extra_class if extra_class is defined else "" %}
{{ cf_ui_validate("button", variant=variant, size=size, state=state, type=type) }}
{%- set cf_tag = "a" if href else "button" -%}
- <{{ cf_tag }} class="btn{% if variant == 'primary' %} btn-primary{% elif variant == 'secondary' %} btn-secondary{% elif variant == 'success' %} btn-success{% elif variant == 'warning' %} btn-warning{% elif variant == 'danger' %} btn-danger{% elif variant == 'info' %} btn-info{% elif variant == 'neutral' %} btn-light{% endif %}{% if size == 'small' %} btn-sm{% elif size == 'large' %} btn-lg{% endif %}{% if state == 'disabled' %} disabled{% endif %}{% if full_width %} w-100{% endif %}{% if extra_class %} {{ extra_class }}{% endif %}"
+ <{{ cf_tag }} class="btn
+ {%- if variant == 'primary' %} btn-primary
+ {%- elif variant == 'secondary' %} btn-secondary
+ {%- elif variant == 'success' %} btn-success
+ {%- elif variant == 'warning' %} btn-warning
+ {%- elif variant == 'danger' %} btn-danger
+ {%- elif variant == 'info' %} btn-info
+ {%- elif variant == 'neutral' %} btn-light
+ {%- endif -%}
+ {%- if size == 'small' %} btn-sm
+ {%- elif size == 'large' %} btn-lg
+ {%- endif -%}
+ {%- if state == 'disabled' %} disabled
+ {%- endif -%}
+ {%- if full_width %} w-100
+ {%- endif -%}
+ {%- if extra_class %} {{ extra_class }}
+ {%- endif -%}"
{%- if href %}{% if state == 'disabled' %} role="link" aria-disabled="true"{% else %} href="{{ href }}"{% endif %}
{%- else %} type="{{ type }}"{% if state == 'disabled' %} disabled{% endif %}{% endif %}>{% if state == 'loading' %} {% endif %}{{ content }}{{ cf_tag }}>
{% endautoescape %}
diff --git a/src/cf_ui/templates/jinja/bulma/Button.jinja b/src/cf_ui/templates/jinja/bulma/Button.jinja
index 830245c..8126bff 100644
--- a/src/cf_ui/templates/jinja/bulma/Button.jinja
+++ b/src/cf_ui/templates/jinja/bulma/Button.jinja
@@ -10,7 +10,23 @@
{% set extra_class = extra_class if extra_class is defined else "" %}
{{ cf_ui_validate("button", variant=variant, size=size, state=state, type=type) }}
{%- set cf_tag = "a" if href else "button" -%}
- <{{ cf_tag }} class="button{% if variant == 'primary' %} is-primary{% elif variant == 'secondary' %} is-link{% elif variant == 'success' %} is-success{% elif variant == 'warning' %} is-warning{% elif variant == 'danger' %} is-danger{% elif variant == 'info' %} is-info{% endif %}{% if size == 'small' %} is-small{% elif size == 'large' %} is-large{% endif %}{% if state == 'loading' %} is-loading{% endif %}{% if full_width %} is-fullwidth{% endif %}{% if extra_class %} {{ extra_class }}{% endif %}"
+ <{{ cf_tag }} class="button
+ {%- if variant == 'primary' %} is-primary
+ {%- elif variant == 'secondary' %} is-link
+ {%- elif variant == 'success' %} is-success
+ {%- elif variant == 'warning' %} is-warning
+ {%- elif variant == 'danger' %} is-danger
+ {%- elif variant == 'info' %} is-info
+ {%- endif -%}
+ {%- if size == 'small' %} is-small
+ {%- elif size == 'large' %} is-large
+ {%- endif -%}
+ {%- if state == 'loading' %} is-loading
+ {%- endif -%}
+ {%- if full_width %} is-fullwidth
+ {%- endif -%}
+ {%- if extra_class %} {{ extra_class }}
+ {%- endif -%}"
{%- if href %}{% if state == 'disabled' %} role="link" aria-disabled="true"{% else %} href="{{ href }}"{% endif %}
{%- else %} type="{{ type }}"{% if state == 'disabled' %} disabled{% endif %}{% endif %}>{{ content }}{{ cf_tag }}>
{% endautoescape %}
diff --git a/src/cf_ui/templates/jinja/daisy/Button.jinja b/src/cf_ui/templates/jinja/daisy/Button.jinja
index d0550b6..e113edc 100644
--- a/src/cf_ui/templates/jinja/daisy/Button.jinja
+++ b/src/cf_ui/templates/jinja/daisy/Button.jinja
@@ -10,7 +10,24 @@
{% set extra_class = extra_class if extra_class is defined else "" %}
{{ cf_ui_validate("button", variant=variant, size=size, state=state, type=type) }}
{%- set cf_tag = "a" if href else "button" -%}
- <{{ cf_tag }} class="btn{% if variant == 'primary' %} btn-primary{% elif variant == 'secondary' %} btn-secondary{% elif variant == 'success' %} btn-success{% elif variant == 'warning' %} btn-warning{% elif variant == 'danger' %} btn-error{% elif variant == 'info' %} btn-info{% elif variant == 'neutral' %} btn-neutral{% endif %}{% if size == 'small' %} btn-sm{% elif size == 'large' %} btn-lg{% endif %}{% if state == 'disabled' %} btn-disabled{% endif %}{% if full_width %} btn-block{% endif %}{% if extra_class %} {{ extra_class }}{% endif %}"
+ <{{ cf_tag }} class="btn
+ {%- if variant == 'primary' %} btn-primary
+ {%- elif variant == 'secondary' %} btn-secondary
+ {%- elif variant == 'success' %} btn-success
+ {%- elif variant == 'warning' %} btn-warning
+ {%- elif variant == 'danger' %} btn-error
+ {%- elif variant == 'info' %} btn-info
+ {%- elif variant == 'neutral' %} btn-neutral
+ {%- endif -%}
+ {%- if size == 'small' %} btn-sm
+ {%- elif size == 'large' %} btn-lg
+ {%- endif -%}
+ {%- if state == 'disabled' %} btn-disabled
+ {%- endif -%}
+ {%- if full_width %} btn-block
+ {%- endif -%}
+ {%- if extra_class %} {{ extra_class }}
+ {%- endif -%}"
{%- if href %}{% if state == 'disabled' %} role="link" aria-disabled="true"{% else %} href="{{ href }}"{% endif %}
{%- else %} type="{{ type }}"{% if state == 'disabled' %} disabled{% endif %}{% endif %}>{% if state == 'loading' %} {% endif %}{{ content }}{{ cf_tag }}>
{% endautoescape %}
diff --git a/src/cf_ui/templates/jinja/fomantic/Button.jinja b/src/cf_ui/templates/jinja/fomantic/Button.jinja
index 072d0fb..b04a6d8 100644
--- a/src/cf_ui/templates/jinja/fomantic/Button.jinja
+++ b/src/cf_ui/templates/jinja/fomantic/Button.jinja
@@ -10,7 +10,24 @@
{% set extra_class = extra_class if extra_class is defined else "" %}
{{ cf_ui_validate("button", variant=variant, size=size, state=state, type=type) }}
{%- set cf_tag = "a" if href else "button" -%}
- <{{ cf_tag }} class="ui button{% if variant == 'primary' %} primary{% elif variant == 'secondary' %} secondary{% elif variant == 'success' %} positive{% elif variant == 'warning' %} yellow{% elif variant == 'danger' %} negative{% elif variant == 'info' %} teal{% endif %}{% if size == 'small' %} small{% elif size == 'large' %} large{% endif %}{% if state == 'loading' %} loading{% elif state == 'disabled' %} disabled{% endif %}{% if full_width %} fluid{% endif %}{% if extra_class %} {{ extra_class }}{% endif %}"
+ <{{ cf_tag }} class="ui button
+ {%- if variant == 'primary' %} primary
+ {%- elif variant == 'secondary' %} secondary
+ {%- elif variant == 'success' %} positive
+ {%- elif variant == 'warning' %} yellow
+ {%- elif variant == 'danger' %} negative
+ {%- elif variant == 'info' %} teal
+ {%- endif -%}
+ {%- if size == 'small' %} small
+ {%- elif size == 'large' %} large
+ {%- endif -%}
+ {%- if state == 'loading' %} loading
+ {%- elif state == 'disabled' %} disabled
+ {%- endif -%}
+ {%- if full_width %} fluid
+ {%- endif -%}
+ {%- if extra_class %} {{ extra_class }}
+ {%- endif -%}"
{%- if href %}{% if state == 'disabled' %} role="link" aria-disabled="true"{% else %} href="{{ href }}"{% endif %}
{%- else %} type="{{ type }}"{% if state == 'disabled' %} disabled{% endif %}{% endif %}>{{ content }}{{ cf_tag }}>
{% endautoescape %}
diff --git a/src/cf_ui/templates/jinja/foundation/Button.jinja b/src/cf_ui/templates/jinja/foundation/Button.jinja
index 935d14a..b73babb 100644
--- a/src/cf_ui/templates/jinja/foundation/Button.jinja
+++ b/src/cf_ui/templates/jinja/foundation/Button.jinja
@@ -10,7 +10,23 @@
{% set extra_class = extra_class if extra_class is defined else "" %}
{{ cf_ui_validate("button", variant=variant, size=size, state=state, type=type) }}
{%- set cf_tag = "a" if href else "button" -%}
- <{{ cf_tag }} class="button{% if variant == 'primary' %} primary{% elif variant == 'secondary' %} secondary{% elif variant == 'success' %} success{% elif variant == 'warning' %} warning{% elif variant == 'danger' %} alert{% elif variant == 'info' %} secondary{% endif %}{% if size == 'small' %} small{% elif size == 'large' %} large{% endif %}{% if state == 'disabled' %} disabled{% endif %}{% if full_width %} expanded{% endif %}{% if extra_class %} {{ extra_class }}{% endif %}"
+ <{{ cf_tag }} class="button
+ {%- if variant == 'primary' %} primary
+ {%- elif variant == 'secondary' %} secondary
+ {%- elif variant == 'success' %} success
+ {%- elif variant == 'warning' %} warning
+ {%- elif variant == 'danger' %} alert
+ {%- elif variant == 'info' %} secondary
+ {%- endif -%}
+ {%- if size == 'small' %} small
+ {%- elif size == 'large' %} large
+ {%- endif -%}
+ {%- if state == 'disabled' %} disabled
+ {%- endif -%}
+ {%- if full_width %} expanded
+ {%- endif -%}
+ {%- if extra_class %} {{ extra_class }}
+ {%- endif -%}"
{%- if href %}{% if state == 'disabled' %} role="link" aria-disabled="true"{% else %} href="{{ href }}"{% endif %}
{%- else %} type="{{ type }}"{% if state == 'disabled' %} disabled{% endif %}{% endif %}>{{ content }}{{ cf_tag }}>
{% endautoescape %}