diff --git a/templates/_layout/input.twig b/templates/_layout/input.twig
index 5bf6fe72..a7696ae3 100644
--- a/templates/_layout/input.twig
+++ b/templates/_layout/input.twig
@@ -26,12 +26,12 @@
 {% macro input_checkbox_raw(name, checked, class, value, radio, attributes) %}
 {% spaceless %}
     <input type="{{ radio ? 'radio' : 'checkbox' }}" class="{{ class|length > 0 ? class : 'input__checkbox__input' }}"
-            {% if name|length > 0 %}name="{{ name }}"{% endif %}
-            {% if checked %}checked{% endif %}
-            {% if value|length > 0 %}value="{{ value }}"{% endif %}
-            {% for name, value in attributes|default([]) %}
-                {{ name }}{% if value|length > 0 %}="{{ value }}"{% endif %}
-            {% endfor %}>
+        {% if name|length > 0 %}name="{{ name }}"{% endif %}
+        {% if checked %}checked{% endif %}
+        {% if value|length > 0 %}value="{{ value }}"{% endif %}
+        {% for name, value in attributes|default([]) %}
+            {{ name }}{% if value|length > 0 %}="{{ value }}"{% endif %}
+        {% endfor %}>
 {% endspaceless %}
 {% endmacro %}
 
diff --git a/templates/manage/changelog/action_edit.twig b/templates/manage/changelog/action_edit.twig
index 49301b9f..c009a914 100644
--- a/templates/manage/changelog/action_edit.twig
+++ b/templates/manage/changelog/action_edit.twig
@@ -35,21 +35,21 @@
             <label class="form__label">
                 <div class="form__label__text">Red</div>
                 <div class="form__label__input">
-                    <input class="input input--number" type="number" value="{{ edit_action is defined ? edit_action.action_colour|colour_get_red : '0' }}" min="0" max="255" name="action[colour][red]">
+                    {{ input_text('action[colour][red]', '', edit_action is defined ? edit_action.action_colour|colour_get_red : '0', 'number', '', false, {'min':0,'max':255}) }}
                 </div>
             </label>
 
             <label class="form__label">
                 <div class="form__label__text">Green</div>
                 <div class="form__label__input">
-                    <input class="input input--number" type="number" value="{{ edit_action is defined ? edit_action.action_colour|colour_get_green : '0' }}" min="0" max="255" name="action[colour][green]">
+                    {{ input_text('action[colour][green]', '', edit_action is defined ? edit_action.action_colour|colour_get_green : '0', 'number', '', false, {'min':0,'max':255}) }}
                 </div>
             </label>
 
             <label class="form__label">
                 <div class="form__label__text">Blue</div>
                 <div class="form__label__input">
-                    <input class="input input--number" type="number" value="{{ edit_action is defined ? edit_action.action_colour|colour_get_blue : '0' }}" min="0" max="255" name="action[colour][blue]">
+                    {{ input_text('action[colour][blue]', '', edit_action is defined ? edit_action.action_colour|colour_get_blue : '0', 'number', '', false, {'min':0,'max':255}) }}
                 </div>
             </label>
 
diff --git a/templates/manage/changelog/change_edit.twig b/templates/manage/changelog/change_edit.twig
index b8975afb..5048707d 100644
--- a/templates/manage/changelog/change_edit.twig
+++ b/templates/manage/changelog/change_edit.twig
@@ -43,7 +43,7 @@
             <label class="form__label">
                 <div class="form__label__text">Contributor Id</div>
                 <div class="form__label__input">
-                    <input class="input__text" type="number" value="{{ edit_change is defined ? edit_change.user_id : current_user.user_id }}" name="change[user]" min="1">
+                    {{ input_text('change[user]', '', edit_change.user_id|default(current_user.user_id), 'number', '', false, {'min':1}) }}
                 </div>
             </label>
 
diff --git a/templates/manage/general/quotes.twig b/templates/manage/general/quotes.twig
index 2ef24b87..1ec033ea 100644
--- a/templates/manage/general/quotes.twig
+++ b/templates/manage/general/quotes.twig
@@ -17,12 +17,12 @@
                 <table style="color:inherit">
                     <tr>
                         <td>Parent ID*</td>
-                        <td><input type="number" name="quote[parent]" value="{{ current_quote.quote_parent|default(quote_parent) }}" class="input__text"></td>
+                        <td>{{ input_text('quote[parent]', '', current_quote.quote_parent|default(quote_parent), 'number') }}</td>
                     </tr>
 
                     <tr>
                         <td>User ID*</td>
-                        <td><input type="number" name="quote[user][id]" class="input__text" value="{{ current_quote.quote_user_id|default(0) }}"></td>
+                        <td>{{ input_text('quote[user][id]', '', current_quote.quote_user_id|default(0), 'number') }}</td>
                     </tr>
 
                     <tr>
@@ -37,7 +37,7 @@
 
                     <tr>
                         <td>User Colour</td>
-                        <td><input type="number" required name="quote[user][colour]" class="input__text" value="{{ current_quote.quote_user_colour|default(constant('MSZ_COLOUR_INHERIT')) }}"></td>
+                        <td>{{ input_text('quote[user][colour]', '', current_quote.quote_user_colour|default(constant('MSZ_COLOUR_INHERIT')), 'number', '', true) }}</td>
                     </tr>
 
                     <tr>
diff --git a/templates/manage/users/roles_create.twig b/templates/manage/users/roles_create.twig
index 3d13d3c8..11f0d2b6 100644
--- a/templates/manage/users/roles_create.twig
+++ b/templates/manage/users/roles_create.twig
@@ -27,7 +27,7 @@
             <label class="form__label">
                 <div class="form__label__text">Hierarchy</div>
                 <div class="form__label__input">
-                    <input class="input input--number" type="number" value="{{ edit_role is defined ? edit_role.role_hierarchy : '1' }}" min="1" max="100" name="role[hierarchy]">
+                    {{ input_text('role[hierarchy]', '', edit_role.role_hierarchy|default(1), 'number', '', true) }}
                 </div>
             </label>
 
@@ -53,21 +53,21 @@
             <label class="form__label">
                 <div class="form__label__text">Red</div>
                 <div class="form__label__input">
-                    <input class="input input--number" type="number" value="{{ edit_role is defined ? edit_role.role_colour|colour_get_red : '0' }}" min="0" max="255" name="role[colour][red]">
+                    {{ input_text('role[colour][red]', '', edit_role is defined ? edit_role.role_colour|colour_get_red : '0', 'number', '', false, {'min':0,'max':255}) }}
                 </div>
             </label>
 
             <label class="form__label">
                 <div class="form__label__text">Green</div>
                 <div class="form__label__input">
-                    <input class="input input--number" type="number" value="{{ edit_role is defined ? edit_role.role_colour|colour_get_green : '0' }}" min="0" max="255" name="role[colour][green]">
+                    {{ input_text('role[colour][green]', '', edit_role is defined ? edit_role.role_colour|colour_get_green : '0', 'number', '', false, {'min':0,'max':255}) }}
                 </div>
             </label>
 
             <label class="form__label">
                 <div class="form__label__text">Blue</div>
                 <div class="form__label__input">
-                    <input class="input input--number" type="number" value="{{ edit_role is defined ? edit_role.role_colour|colour_get_blue : '0' }}" min="0" max="255" name="role[colour][blue]">
+                    {{ input_text('role[colour][blue]', '', edit_role is defined ? edit_role.role_colour|colour_get_blue : '0', 'number', '', false, {'min':0,'max':255}) }}
                 </div>
             </label>
 
diff --git a/templates/manage/users/view.twig b/templates/manage/users/view.twig
index 20add17a..9d975f1d 100644
--- a/templates/manage/users/view.twig
+++ b/templates/manage/users/view.twig
@@ -121,21 +121,21 @@
                 <label class="form__label">
                     <div class="form__label__text">Red</div>
                     <div class="form__label__input">
-                        <input class="input input--number" type="number" value="{{ colour_is_defined ? view_user.user_colour|colour_get_red : '0' }}" min="0" max="255" name="colour[red]">
+                        {{ input_text('colour[red]', '', colour_is_defined ? view_user.user_colour|colour_get_red : '0', 'number', '', false, {'min':0,'max':255}) }}
                     </div>
                 </label>
 
                 <label class="form__label">
                     <div class="form__label__text">Green</div>
                     <div class="form__label__input">
-                        <input class="input input--number" type="number" value="{{ colour_is_defined ? view_user.user_colour|colour_get_green : '0' }}" min="0" max="255" name="colour[green]">
+                        {{ input_text('colour[green]', '', colour_is_defined ? view_user.user_colour|colour_get_green : '0', 'number', '', false, {'min':0,'max':255}) }}
                     </div>
                 </label>
 
                 <label class="form__label">
                     <div class="form__label__text">Blue</div>
                     <div class="form__label__input">
-                        <input class="input input--number" type="number" value="{{ colour_is_defined ? view_user.user_colour|colour_get_blue : '0' }}" min="0" max="255" name="colour[blue]">
+                        {{ input_text('colour[blue]', '', colour_is_defined ? view_user.user_colour|colour_get_blue : '0', 'number', '', false, {'min':0,'max':255}) }}
                     </div>
                 </label>
             </div>