diff --git a/web/lib/MRBS/Form/Element.php b/web/lib/MRBS/Form/Element.php
index 9a1d5da8f8..543bbbe097 100644
--- a/web/lib/MRBS/Form/Element.php
+++ b/web/lib/MRBS/Form/Element.php
@@ -1,5 +1,5 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 // This is a limited implementation of the HTML5 DOM and is optimised for use by
@@ -397,7 +397,17 @@ public function toHTML($no_whitespace=false)
       if (isset($value) && ($value !== true))
       {
         // boolean attributes, eg 'required', don't need a value
-        $html .= '="' . htmlspecialchars($value) . '"';
+        $html .= '="';
+        if (is_int($value))
+        {
+          // No need to escape these
+          $html .= $value;
+        }
+        else
+        {
+          $html .= htmlspecialchars($value);
+        }
+        $html .= '"';
       }
     }
 
@@ -448,7 +458,12 @@ public function toHTML($no_whitespace=false)
 
   private static function escapeText($text, $raw=false)
   {
-    return ($raw) ? $text : htmlspecialchars($text);
+    if ($raw || is_int($text))
+    {
+      return $text;
+    }
+
+    return htmlspecialchars($text);
   }
 
 }
diff --git a/web/lib/MRBS/Form/ElementA.php b/web/lib/MRBS/Form/ElementA.php
index 36c8307ac0..71f3ca56b3 100644
--- a/web/lib/MRBS/Form/ElementA.php
+++ b/web/lib/MRBS/Form/ElementA.php
@@ -1,13 +1,13 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 class ElementA extends Element
 {
-  
+
   public function __construct()
   {
     parent::__construct('a');
   }
- 
-}
\ No newline at end of file
+
+}
diff --git a/web/lib/MRBS/Form/ElementButton.php b/web/lib/MRBS/Form/ElementButton.php
index bbfaa2c3f8..50d6f1eaf5 100644
--- a/web/lib/MRBS/Form/ElementButton.php
+++ b/web/lib/MRBS/Form/ElementButton.php
@@ -1,13 +1,13 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 class ElementButton extends Element
 {
-  
+
   public function __construct()
   {
     parent::__construct('button');
   }
- 
-}
\ No newline at end of file
+
+}
diff --git a/web/lib/MRBS/Form/ElementDatalist.php b/web/lib/MRBS/Form/ElementDatalist.php
index c459a403b9..80531dc2ee 100644
--- a/web/lib/MRBS/Form/ElementDatalist.php
+++ b/web/lib/MRBS/Form/ElementDatalist.php
@@ -1,5 +1,5 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 class ElementDatalist extends Element
@@ -9,5 +9,5 @@ public function __construct()
   {
     parent::__construct('datalist');
   }
- 
-}
\ No newline at end of file
+
+}
diff --git a/web/lib/MRBS/Form/ElementDiv.php b/web/lib/MRBS/Form/ElementDiv.php
index 9aecd805c2..e668c0ed6a 100644
--- a/web/lib/MRBS/Form/ElementDiv.php
+++ b/web/lib/MRBS/Form/ElementDiv.php
@@ -1,5 +1,5 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 class ElementDiv extends Element
@@ -9,5 +9,5 @@ public function __construct()
   {
     parent::__construct('div');
   }
- 
-}
\ No newline at end of file
+
+}
diff --git a/web/lib/MRBS/Form/ElementFieldset.php b/web/lib/MRBS/Form/ElementFieldset.php
index 6b01394c89..6d67e9673e 100644
--- a/web/lib/MRBS/Form/ElementFieldset.php
+++ b/web/lib/MRBS/Form/ElementFieldset.php
@@ -1,17 +1,17 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 
 class ElementFieldset extends Element
 {
-  
+
   public function __construct()
   {
     parent::__construct('fieldset');
   }
-  
-  
+
+
   // $legend can be
   //    (a) an ElementLegend object, or
   //    (b) another element, or
@@ -27,7 +27,7 @@ public function addLegend($legend)
     else
     {
       $element = new ElementLegend();
-      
+
       if (is_string($legend))
       {
         $element->setText($legend);
@@ -38,9 +38,9 @@ public function addLegend($legend)
         $element->addElement($legend);
       }
     }
-    
+
     $this->addElement($element);
     return $this;
   }
-  
-}
\ No newline at end of file
+
+}
diff --git a/web/lib/MRBS/Form/ElementImg.php b/web/lib/MRBS/Form/ElementImg.php
index fadf08ac08..73cbc2ed08 100644
--- a/web/lib/MRBS/Form/ElementImg.php
+++ b/web/lib/MRBS/Form/ElementImg.php
@@ -1,13 +1,13 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 class ElementImg extends Element
 {
-  
+
   public function __construct()
   {
     parent::__construct('img', true);
   }
- 
-}
\ No newline at end of file
+
+}
diff --git a/web/lib/MRBS/Form/ElementInput.php b/web/lib/MRBS/Form/ElementInput.php
index cef3c971d1..d8d1767829 100644
--- a/web/lib/MRBS/Form/ElementInput.php
+++ b/web/lib/MRBS/Form/ElementInput.php
@@ -1,14 +1,14 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 abstract class ElementInput extends Element
 {
-  
+
   public function __construct()
   {
     parent::__construct('input', $self_closing=true);
     $this->setAttribute('type', 'text');
   }
- 
-}
\ No newline at end of file
+
+}
diff --git a/web/lib/MRBS/Form/ElementInputCheckbox.php b/web/lib/MRBS/Form/ElementInputCheckbox.php
index 6fd640b88d..c9bd989434 100644
--- a/web/lib/MRBS/Form/ElementInputCheckbox.php
+++ b/web/lib/MRBS/Form/ElementInputCheckbox.php
@@ -1,5 +1,5 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 class ElementInputCheckbox extends ElementInput
@@ -10,8 +10,8 @@ public function __construct()
     parent::__construct();
     $this->setAttribute('type', 'checkbox');
   }
-  
-  
+
+
   public function setChecked($checked=true)
   {
     if ($checked)
@@ -22,8 +22,8 @@ public function setChecked($checked=true)
     {
       $this->removeAttribute('checked');
     }
-    
+
     return $this;
   }
- 
-}
\ No newline at end of file
+
+}
diff --git a/web/lib/MRBS/Form/ElementInputDatalist.php b/web/lib/MRBS/Form/ElementInputDatalist.php
index 086f79df2f..32cd5042d8 100644
--- a/web/lib/MRBS/Form/ElementInputDatalist.php
+++ b/web/lib/MRBS/Form/ElementInputDatalist.php
@@ -1,12 +1,12 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 class ElementInputDatalist extends ElementInput
 {
   private static $list_prefix = "mrbs_";
   private static $list_number = 1;
-  
+
   public function __construct()
   {
     // One problem with using a datalist with an input element is the way different browsers
@@ -20,34 +20,34 @@ public function __construct()
     // tied to the visible input, but this isn't as important for a text input as it is, say, for a checkbox
     // or radio button.
     parent::__construct();
-    
+
     // Provide a unique id to link the list with the input.
     // Doesn't matter what it is as it won't be used elsewhere.
     $list_id = self::$list_prefix . self::$list_number;
     self::$list_number++;
-    
+
     $this->setAttributes(array('type' => 'text',
                                'list' => $list_id));
-                         
+
     $datalist = new ElementDatalist();
     $datalist->setAttribute('id', $list_id);
-    
+
     $this->next($datalist);
   }
-  
-  
+
+
   public function addDatalistOptions(array $options, $associative=null)
-  { 
+  {
     // Put a <select> wrapper around the options so that browsers that don't
     // support <datalist> will still have the options in their DOM and then
     // the JavaScript polyfill can find them and do something with them
     $select = new ElementSelect();
     $select->addClass('none');
     $select->addSelectOptions($options, null, $associative);
-    
+
     $this->next($this->next()->addElement($select));
-    
+
     return $this;
   }
- 
-}
\ No newline at end of file
+
+}
diff --git a/web/lib/MRBS/Form/ElementInputDate.php b/web/lib/MRBS/Form/ElementInputDate.php
index a12d6cecde..bbb0381fc9 100644
--- a/web/lib/MRBS/Form/ElementInputDate.php
+++ b/web/lib/MRBS/Form/ElementInputDate.php
@@ -1,5 +1,5 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 class ElementInputDate extends ElementInput
@@ -10,5 +10,5 @@ public function __construct()
     parent::__construct();
     $this->setAttribute('type', 'date');
   }
- 
-}
\ No newline at end of file
+
+}
diff --git a/web/lib/MRBS/Form/ElementInputEmail.php b/web/lib/MRBS/Form/ElementInputEmail.php
index 6bbe974a0e..f095a607a4 100644
--- a/web/lib/MRBS/Form/ElementInputEmail.php
+++ b/web/lib/MRBS/Form/ElementInputEmail.php
@@ -1,5 +1,5 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 class ElementInputEmail extends ElementInput
@@ -10,5 +10,5 @@ public function __construct()
     parent::__construct();
     $this->setAttribute('type', 'email');
   }
- 
-}
\ No newline at end of file
+
+}
diff --git a/web/lib/MRBS/Form/ElementInputFile.php b/web/lib/MRBS/Form/ElementInputFile.php
index ae39de110a..90c5441e62 100644
--- a/web/lib/MRBS/Form/ElementInputFile.php
+++ b/web/lib/MRBS/Form/ElementInputFile.php
@@ -1,5 +1,5 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 class ElementInputFile extends ElementInput
@@ -10,5 +10,5 @@ public function __construct()
     parent::__construct();
     $this->setAttribute('type', 'file');
   }
- 
-}
\ No newline at end of file
+
+}
diff --git a/web/lib/MRBS/Form/ElementInputHidden.php b/web/lib/MRBS/Form/ElementInputHidden.php
index 1a22cf3fee..b597462611 100644
--- a/web/lib/MRBS/Form/ElementInputHidden.php
+++ b/web/lib/MRBS/Form/ElementInputHidden.php
@@ -1,5 +1,5 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 class ElementInputHidden extends ElementInput
diff --git a/web/lib/MRBS/Form/ElementInputImage.php b/web/lib/MRBS/Form/ElementInputImage.php
index 899b6a0ba9..b6d5fbd853 100644
--- a/web/lib/MRBS/Form/ElementInputImage.php
+++ b/web/lib/MRBS/Form/ElementInputImage.php
@@ -1,5 +1,5 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 class ElementInputImage extends ElementInput
@@ -10,5 +10,5 @@ public function __construct()
     parent::__construct();
     $this->setAttribute('type', 'image');
   }
- 
-}
\ No newline at end of file
+
+}
diff --git a/web/lib/MRBS/Form/ElementInputNumber.php b/web/lib/MRBS/Form/ElementInputNumber.php
index ef03532354..bd649ca191 100644
--- a/web/lib/MRBS/Form/ElementInputNumber.php
+++ b/web/lib/MRBS/Form/ElementInputNumber.php
@@ -1,5 +1,5 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 class ElementInputNumber extends ElementInput
@@ -11,5 +11,5 @@ public function __construct()
     $this->setAttributes(array('type' => 'number',
                                'step' => '1'));
   }
- 
-}
\ No newline at end of file
+
+}
diff --git a/web/lib/MRBS/Form/ElementInputPassword.php b/web/lib/MRBS/Form/ElementInputPassword.php
index 9e77e58d9b..35e25ca33b 100644
--- a/web/lib/MRBS/Form/ElementInputPassword.php
+++ b/web/lib/MRBS/Form/ElementInputPassword.php
@@ -1,5 +1,5 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 class ElementInputPassword extends ElementInput
@@ -10,5 +10,5 @@ public function __construct()
     parent::__construct();
     $this->setAttribute('type', 'password');
   }
- 
-}
\ No newline at end of file
+
+}
diff --git a/web/lib/MRBS/Form/ElementInputRadio.php b/web/lib/MRBS/Form/ElementInputRadio.php
index dbb91e7563..ab567efe13 100644
--- a/web/lib/MRBS/Form/ElementInputRadio.php
+++ b/web/lib/MRBS/Form/ElementInputRadio.php
@@ -1,5 +1,5 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 class ElementInputRadio extends ElementInput
@@ -10,5 +10,5 @@ public function __construct()
     parent::__construct();
     $this->setAttribute('type', 'radio');
   }
-  
+
 }
diff --git a/web/lib/MRBS/Form/ElementInputSearch.php b/web/lib/MRBS/Form/ElementInputSearch.php
index 78f6c26e0e..775c38a550 100644
--- a/web/lib/MRBS/Form/ElementInputSearch.php
+++ b/web/lib/MRBS/Form/ElementInputSearch.php
@@ -1,5 +1,5 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 class ElementInputSearch extends ElementInput
@@ -10,5 +10,5 @@ public function __construct()
     parent::__construct();
     $this->setAttribute('type', 'search');
   }
- 
-}
\ No newline at end of file
+
+}
diff --git a/web/lib/MRBS/Form/ElementInputSubmit.php b/web/lib/MRBS/Form/ElementInputSubmit.php
index e7f72e021b..6f4adcd0e7 100644
--- a/web/lib/MRBS/Form/ElementInputSubmit.php
+++ b/web/lib/MRBS/Form/ElementInputSubmit.php
@@ -1,5 +1,5 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 class ElementInputSubmit extends ElementInput
@@ -10,5 +10,5 @@ public function __construct()
     parent::__construct();
     $this->setAttribute('type', 'submit');
   }
- 
-}
\ No newline at end of file
+
+}
diff --git a/web/lib/MRBS/Form/ElementInputText.php b/web/lib/MRBS/Form/ElementInputText.php
index 4b6b708c78..85de4535e8 100644
--- a/web/lib/MRBS/Form/ElementInputText.php
+++ b/web/lib/MRBS/Form/ElementInputText.php
@@ -1,5 +1,5 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 class ElementInputText extends ElementInput
@@ -10,5 +10,5 @@ public function __construct()
     parent::__construct();
     $this->setAttribute('type', 'text');
   }
- 
-}
\ No newline at end of file
+
+}
diff --git a/web/lib/MRBS/Form/ElementInputTime.php b/web/lib/MRBS/Form/ElementInputTime.php
index 219c914266..917eae6553 100644
--- a/web/lib/MRBS/Form/ElementInputTime.php
+++ b/web/lib/MRBS/Form/ElementInputTime.php
@@ -1,5 +1,5 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 class ElementInputTime extends ElementInput
@@ -10,5 +10,5 @@ public function __construct()
     parent::__construct();
     $this->setAttribute('type', 'time');
   }
- 
-}
\ No newline at end of file
+
+}
diff --git a/web/lib/MRBS/Form/ElementInputUrl.php b/web/lib/MRBS/Form/ElementInputUrl.php
index ceb44030bd..3f52b83892 100644
--- a/web/lib/MRBS/Form/ElementInputUrl.php
+++ b/web/lib/MRBS/Form/ElementInputUrl.php
@@ -1,5 +1,5 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 class ElementInputUrl extends ElementInput
@@ -10,5 +10,5 @@ public function __construct()
     parent::__construct();
     $this->setAttribute('type', 'url');
   }
- 
-}
\ No newline at end of file
+
+}
diff --git a/web/lib/MRBS/Form/ElementLabel.php b/web/lib/MRBS/Form/ElementLabel.php
index 0cf1c42bc5..cb8447abe5 100644
--- a/web/lib/MRBS/Form/ElementLabel.php
+++ b/web/lib/MRBS/Form/ElementLabel.php
@@ -1,5 +1,5 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 class ElementLabel extends Element
@@ -9,5 +9,5 @@ public function __construct()
   {
     parent::__construct('label');
   }
- 
-}
\ No newline at end of file
+
+}
diff --git a/web/lib/MRBS/Form/ElementLegend.php b/web/lib/MRBS/Form/ElementLegend.php
index 39d3c4b345..c3d75a2bad 100644
--- a/web/lib/MRBS/Form/ElementLegend.php
+++ b/web/lib/MRBS/Form/ElementLegend.php
@@ -1,5 +1,5 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 class ElementLegend extends Element
@@ -9,5 +9,5 @@ public function __construct()
   {
     parent::__construct('legend');
   }
- 
-}
\ No newline at end of file
+
+}
diff --git a/web/lib/MRBS/Form/ElementOptgroup.php b/web/lib/MRBS/Form/ElementOptgroup.php
index 6dbfe0be82..e9b0b347a6 100644
--- a/web/lib/MRBS/Form/ElementOptgroup.php
+++ b/web/lib/MRBS/Form/ElementOptgroup.php
@@ -1,14 +1,14 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 
 class ElementOptgroup extends Element
 {
-  
+
   public function __construct()
   {
     parent::__construct('optgroup');
   }
-  
-}
\ No newline at end of file
+
+}
diff --git a/web/lib/MRBS/Form/ElementOption.php b/web/lib/MRBS/Form/ElementOption.php
index f7cae5b45e..45cff2f038 100644
--- a/web/lib/MRBS/Form/ElementOption.php
+++ b/web/lib/MRBS/Form/ElementOption.php
@@ -1,14 +1,14 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 
 class ElementOption extends Element
 {
-  
+
   public function __construct()
   {
     parent::__construct('option');
   }
-  
-}
\ No newline at end of file
+
+}
diff --git a/web/lib/MRBS/Form/ElementP.php b/web/lib/MRBS/Form/ElementP.php
index 7a65192c05..1358287ee8 100644
--- a/web/lib/MRBS/Form/ElementP.php
+++ b/web/lib/MRBS/Form/ElementP.php
@@ -1,13 +1,13 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 class ElementP extends Element
 {
-  
+
   public function __construct()
   {
     parent::__construct('p');
   }
- 
-}
\ No newline at end of file
+
+}
diff --git a/web/lib/MRBS/Form/ElementSelect.php b/web/lib/MRBS/Form/ElementSelect.php
index 806cbb5947..eafce3f8b7 100644
--- a/web/lib/MRBS/Form/ElementSelect.php
+++ b/web/lib/MRBS/Form/ElementSelect.php
@@ -1,5 +1,5 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 class ElementSelect extends Element
@@ -9,5 +9,5 @@ public function __construct()
   {
     parent::__construct('select');
   }
- 
-}
\ No newline at end of file
+
+}
diff --git a/web/lib/MRBS/Form/ElementSpan.php b/web/lib/MRBS/Form/ElementSpan.php
index b33ad83494..61a7550c6f 100644
--- a/web/lib/MRBS/Form/ElementSpan.php
+++ b/web/lib/MRBS/Form/ElementSpan.php
@@ -1,13 +1,13 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 class ElementSpan extends Element
 {
-  
+
   public function __construct()
   {
     parent::__construct('span');
   }
- 
-}
\ No newline at end of file
+
+}
diff --git a/web/lib/MRBS/Form/ElementTextarea.php b/web/lib/MRBS/Form/ElementTextarea.php
index 3c9dd78498..b53bffe848 100644
--- a/web/lib/MRBS/Form/ElementTextarea.php
+++ b/web/lib/MRBS/Form/ElementTextarea.php
@@ -1,5 +1,5 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 class ElementTextarea extends Element
@@ -9,5 +9,5 @@ public function __construct()
   {
     parent::__construct('textarea');
   }
- 
-}
\ No newline at end of file
+
+}
diff --git a/web/lib/MRBS/Form/Field.php b/web/lib/MRBS/Form/Field.php
index 2d8536122c..b71f365e85 100644
--- a/web/lib/MRBS/Form/Field.php
+++ b/web/lib/MRBS/Form/Field.php
@@ -1,5 +1,5 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 
diff --git a/web/lib/MRBS/Form/FieldButton.php b/web/lib/MRBS/Form/FieldButton.php
index a360977c88..4e782e2c38 100644
--- a/web/lib/MRBS/Form/FieldButton.php
+++ b/web/lib/MRBS/Form/FieldButton.php
@@ -1,15 +1,15 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 
 class FieldButton extends Field
 {
-  
+
   public function __construct()
   {
     parent::__construct();
     $this->addControl(new ElementButton());
   }
-  
-}
\ No newline at end of file
+
+}
diff --git a/web/lib/MRBS/Form/FieldDiv.php b/web/lib/MRBS/Form/FieldDiv.php
index 02320f0572..99405f4fe3 100644
--- a/web/lib/MRBS/Form/FieldDiv.php
+++ b/web/lib/MRBS/Form/FieldDiv.php
@@ -1,15 +1,15 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 
 class FieldDiv extends Field
 {
-  
+
   public function __construct()
   {
     parent::__construct();
     $this->addControl(new ElementDiv());
   }
-  
-}
\ No newline at end of file
+
+}
diff --git a/web/lib/MRBS/Form/FieldInputCheckbox.php b/web/lib/MRBS/Form/FieldInputCheckbox.php
index 980d07ff34..cd27358c29 100644
--- a/web/lib/MRBS/Form/FieldInputCheckbox.php
+++ b/web/lib/MRBS/Form/FieldInputCheckbox.php
@@ -1,21 +1,21 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 
 class FieldInputCheckbox extends Field
 {
-  
+
   public function __construct()
   {
     parent::__construct();
     $this->addControl(new ElementInputCheckbox());
   }
-  
+
   public function setChecked($checked=true)
   {
     $control = $this->getControl();
     $control->setChecked($checked);
     $this->setControl($control);
   }
-}
\ No newline at end of file
+}
diff --git a/web/lib/MRBS/Form/FieldInputCheckboxGroup.php b/web/lib/MRBS/Form/FieldInputCheckboxGroup.php
index 70d3030531..06074340c9 100644
--- a/web/lib/MRBS/Form/FieldInputCheckboxGroup.php
+++ b/web/lib/MRBS/Form/FieldInputCheckboxGroup.php
@@ -1,11 +1,11 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 
 class FieldInputCheckboxGroup extends Field
 {
-  
+
   public function __construct()
   {
     parent::__construct();
@@ -13,8 +13,8 @@ public function __construct()
          ->setControlAttributes(array('class' => 'group'));
     $this->is_group = true;
   }
-  
-  
+
+
   public function addCheckboxOptions(array $options, $name, $checked=null, $associative=null, $disabled=false)
   {
     $element = $this->getControl();
@@ -22,5 +22,5 @@ public function addCheckboxOptions(array $options, $name, $checked=null, $associ
     $this->setControl($element);
     return $this;
   }
-  
-}
\ No newline at end of file
+
+}
diff --git a/web/lib/MRBS/Form/FieldInputDatalist.php b/web/lib/MRBS/Form/FieldInputDatalist.php
index 249415e61d..903ecd20cd 100644
--- a/web/lib/MRBS/Form/FieldInputDatalist.php
+++ b/web/lib/MRBS/Form/FieldInputDatalist.php
@@ -1,18 +1,18 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 
 class FieldInputDatalist extends Field
 {
-  
+
   public function __construct()
   {
     parent::__construct();
     $this->addControl(new ElementInputDatalist());
   }
-  
-  
+
+
   public function addDatalistOptions(array $options, $associative=null)
   {
     $datalist = $this->getControl();
@@ -20,5 +20,5 @@ public function addDatalistOptions(array $options, $associative=null)
     $this->setControl($datalist);
     return $this;
   }
-  
-}
\ No newline at end of file
+
+}
diff --git a/web/lib/MRBS/Form/FieldInputDate.php b/web/lib/MRBS/Form/FieldInputDate.php
index 13980d777a..3b4565378f 100644
--- a/web/lib/MRBS/Form/FieldInputDate.php
+++ b/web/lib/MRBS/Form/FieldInputDate.php
@@ -1,15 +1,15 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 
 class FieldInputDate extends Field
 {
-  
+
   public function __construct()
   {
     parent::__construct();
     $this->addControl(new ElementInputDate());
   }
-  
-}
\ No newline at end of file
+
+}
diff --git a/web/lib/MRBS/Form/FieldInputEmail.php b/web/lib/MRBS/Form/FieldInputEmail.php
index 50fef257a9..cb1881c4dd 100644
--- a/web/lib/MRBS/Form/FieldInputEmail.php
+++ b/web/lib/MRBS/Form/FieldInputEmail.php
@@ -1,15 +1,15 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 
 class FieldInputEmail extends Field
 {
-  
+
   public function __construct()
   {
     parent::__construct();
     $this->addControl(new ElementInputEmail());
   }
-  
-}
\ No newline at end of file
+
+}
diff --git a/web/lib/MRBS/Form/FieldInputFile.php b/web/lib/MRBS/Form/FieldInputFile.php
index b12e72bba6..28c3067fe4 100644
--- a/web/lib/MRBS/Form/FieldInputFile.php
+++ b/web/lib/MRBS/Form/FieldInputFile.php
@@ -1,15 +1,15 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 
 class FieldInputFile extends Field
 {
-  
+
   public function __construct()
   {
     parent::__construct();
     $this->addControl(new ElementInputFile());
   }
-  
-}
\ No newline at end of file
+
+}
diff --git a/web/lib/MRBS/Form/FieldInputNumber.php b/web/lib/MRBS/Form/FieldInputNumber.php
index 3fea3c0f20..a5811cf2c2 100644
--- a/web/lib/MRBS/Form/FieldInputNumber.php
+++ b/web/lib/MRBS/Form/FieldInputNumber.php
@@ -1,15 +1,15 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 // Defaults to step="1"
 class FieldInputNumber extends Field
 {
-  
+
   public function __construct()
   {
     parent::__construct();
     $this->addControl(new ElementInputNumber());
   }
-  
-}
\ No newline at end of file
+
+}
diff --git a/web/lib/MRBS/Form/FieldInputPassword.php b/web/lib/MRBS/Form/FieldInputPassword.php
index c83d89c0e2..93bfc6e881 100644
--- a/web/lib/MRBS/Form/FieldInputPassword.php
+++ b/web/lib/MRBS/Form/FieldInputPassword.php
@@ -1,15 +1,15 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 
 class FieldInputPassword extends Field
 {
-  
+
   public function __construct()
   {
     parent::__construct();
     $this->addControl(new ElementInputPassword());
   }
-  
-}
\ No newline at end of file
+
+}
diff --git a/web/lib/MRBS/Form/FieldInputRadioGroup.php b/web/lib/MRBS/Form/FieldInputRadioGroup.php
index 458679592d..d5851d73af 100644
--- a/web/lib/MRBS/Form/FieldInputRadioGroup.php
+++ b/web/lib/MRBS/Form/FieldInputRadioGroup.php
@@ -1,11 +1,11 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 
 class FieldInputRadioGroup extends Field
 {
-  
+
   public function __construct()
   {
     parent::__construct();
@@ -13,8 +13,8 @@ public function __construct()
          ->setControlAttributes(array('class' => 'group'));
     $this->is_group = true;
   }
-  
-  
+
+
   public function addRadioOptions(array $options, $name, $checked=null, $associative=null, $disabled=false)
   {
     $element = $this->getControl();
@@ -22,5 +22,5 @@ public function addRadioOptions(array $options, $name, $checked=null, $associati
     $this->setControl($element);
     return $this;
   }
-  
-}
\ No newline at end of file
+
+}
diff --git a/web/lib/MRBS/Form/FieldInputSearch.php b/web/lib/MRBS/Form/FieldInputSearch.php
index 9d2a6c1ec2..5c73286b19 100644
--- a/web/lib/MRBS/Form/FieldInputSearch.php
+++ b/web/lib/MRBS/Form/FieldInputSearch.php
@@ -1,15 +1,15 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 
 class FieldInputSearch extends Field
 {
-  
+
   public function __construct()
   {
     parent::__construct();
     $this->addControl(new ElementInputSearch());
   }
-  
-}
\ No newline at end of file
+
+}
diff --git a/web/lib/MRBS/Form/FieldInputSubmit.php b/web/lib/MRBS/Form/FieldInputSubmit.php
index a4e0689150..d1b498d43d 100644
--- a/web/lib/MRBS/Form/FieldInputSubmit.php
+++ b/web/lib/MRBS/Form/FieldInputSubmit.php
@@ -1,15 +1,15 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 
 class FieldInputSubmit extends Field
 {
-  
+
   public function __construct()
   {
     parent::__construct();
     $this->addControl(new ElementInputSubmit());
   }
-  
-}
\ No newline at end of file
+
+}
diff --git a/web/lib/MRBS/Form/FieldInputText.php b/web/lib/MRBS/Form/FieldInputText.php
index 0fc50f6b0d..cee3583f84 100644
--- a/web/lib/MRBS/Form/FieldInputText.php
+++ b/web/lib/MRBS/Form/FieldInputText.php
@@ -1,15 +1,15 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 
 class FieldInputText extends Field
 {
-  
+
   public function __construct()
   {
     parent::__construct();
     $this->addControl(new ElementInputText());
   }
-  
-}
\ No newline at end of file
+
+}
diff --git a/web/lib/MRBS/Form/FieldInputTime.php b/web/lib/MRBS/Form/FieldInputTime.php
index 5d70ab0d01..4d9651bb00 100644
--- a/web/lib/MRBS/Form/FieldInputTime.php
+++ b/web/lib/MRBS/Form/FieldInputTime.php
@@ -1,15 +1,15 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 
 class FieldInputTime extends Field
 {
-  
+
   public function __construct()
   {
     parent::__construct();
     $this->addControl(new ElementInputTime());
   }
-  
-}
\ No newline at end of file
+
+}
diff --git a/web/lib/MRBS/Form/FieldInputUrl.php b/web/lib/MRBS/Form/FieldInputUrl.php
index c1780ca68e..51e392093e 100644
--- a/web/lib/MRBS/Form/FieldInputUrl.php
+++ b/web/lib/MRBS/Form/FieldInputUrl.php
@@ -1,15 +1,15 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 
 class FieldInputUrl extends Field
 {
-  
+
   public function __construct()
   {
     parent::__construct();
     $this->addControl(new ElementInputUrl());
   }
-  
-}
\ No newline at end of file
+
+}
diff --git a/web/lib/MRBS/Form/FieldSelect.php b/web/lib/MRBS/Form/FieldSelect.php
index fc7e524e79..1a5cfc57b0 100644
--- a/web/lib/MRBS/Form/FieldSelect.php
+++ b/web/lib/MRBS/Form/FieldSelect.php
@@ -1,18 +1,18 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 
 class FieldSelect extends Field
 {
-  
+
   public function __construct()
   {
     parent::__construct();
     $this->addControl(new ElementSelect());
   }
-  
-  
+
+
   public function addSelectOptions(array $options, $selected=null, $associative=null)
   {
     $select = $this->getControl();
@@ -20,5 +20,5 @@ public function addSelectOptions(array $options, $selected=null, $associative=nu
     $this->setControl($select);
     return $this;
   }
-  
-}
\ No newline at end of file
+
+}
diff --git a/web/lib/MRBS/Form/FieldSpan.php b/web/lib/MRBS/Form/FieldSpan.php
index 925caa947a..bdb531a5e1 100644
--- a/web/lib/MRBS/Form/FieldSpan.php
+++ b/web/lib/MRBS/Form/FieldSpan.php
@@ -1,15 +1,15 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 
 class FieldSpan extends Field
 {
-  
+
   public function __construct()
   {
     parent::__construct();
     $this->addControl(new ElementSpan());
   }
-  
-}
\ No newline at end of file
+
+}
diff --git a/web/lib/MRBS/Form/FieldTextarea.php b/web/lib/MRBS/Form/FieldTextarea.php
index 69a50b6da3..aa52795462 100644
--- a/web/lib/MRBS/Form/FieldTextarea.php
+++ b/web/lib/MRBS/Form/FieldTextarea.php
@@ -1,16 +1,16 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 
 class FieldTextarea extends Field
 {
-  
+
   public function __construct()
   {
     parent::__construct();
     $this->setAttribute('class', 'field_text_area')
          ->addControl(new ElementTextarea());
   }
-  
-}
\ No newline at end of file
+
+}
diff --git a/web/lib/MRBS/Form/FieldTimeWithUnits.php b/web/lib/MRBS/Form/FieldTimeWithUnits.php
index a32f33293f..e81e0ad0c7 100644
--- a/web/lib/MRBS/Form/FieldTimeWithUnits.php
+++ b/web/lib/MRBS/Form/FieldTimeWithUnits.php
@@ -1,5 +1,5 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 
diff --git a/web/lib/MRBS/Form/Form.php b/web/lib/MRBS/Form/Form.php
index a4a427bc98..e6e089bc1b 100644
--- a/web/lib/MRBS/Form/Form.php
+++ b/web/lib/MRBS/Form/Form.php
@@ -1,5 +1,5 @@
 <?php
-
+declare(strict_types=1);
 namespace MRBS\Form;
 
 use function MRBS\fatal_error;