diff --git a/themes/fid_adlr/templates/Recommend/SideFacets/single-facet.phtml b/themes/fid_adlr/templates/Recommend/SideFacets/single-facet.phtml
index d19cc16bff3a5811f34157f38f7f302319ee7987..0585867e9fa9bcbf06c3421dd7dcf9a44029241e 100644
--- a/themes/fid_adlr/templates/Recommend/SideFacets/single-facet.phtml
+++ b/themes/fid_adlr/templates/Recommend/SideFacets/single-facet.phtml
@@ -60,7 +60,7 @@
     </span>
   <?php endif; ?>
 
-  <?/* php if (!$this->facet['isApplied']): ?>
+  <?php /* if (!$this->facet['isApplied']): ?>
     <span class="badge">
       <?=$this->localizedNumber($this->facet['count']) ?><span class="sr-only"><?=$this->transEsc('results') ?></span>
     </span>
diff --git a/themes/fid_adlr/templates/Recommend/SwitchTab.phtml b/themes/fid_adlr/templates/Recommend/SwitchTab.phtml
index f6b457b6432d68259d7b99315a889c40c19f744f..24e5a1f231d91f1547f3ad84caf31961310644d0 100644
--- a/themes/fid_adlr/templates/Recommend/SwitchTab.phtml
+++ b/themes/fid_adlr/templates/Recommend/SwitchTab.phtml
@@ -3,7 +3,7 @@
   $tabConfig = is_object($this->params)
     ? $this->searchTabs()->getTabConfigForParams($this->params) : [];
 ?>
-<? error_reporting(E_ALL); ini_set("display_errors", 1); ?>
+<?php error_reporting(E_ALL); ini_set("display_errors", 1); ?>
 <?php if (count($tabConfig) > 0 && ($this->recommend->getActiveTab($tabConfig)["label"] ?? "All") !== "All"): ?>
   <div class="facet-group switchtab-info flex-column-default">
         <div class="switchtab-heading"><i class="icon icon-filter2 icon-1.5x" aria-hidden="true"></i>
diff --git a/themes/fid_adlr/templates/RecordDriver/DefaultRecord/core.phtml b/themes/fid_adlr/templates/RecordDriver/DefaultRecord/core.phtml
index 0af2c6444feb1421ab7c9caec2384c8572f8c8cb..1adc31a789d8310aad4c83759befa767a3cbfd13 100644
--- a/themes/fid_adlr/templates/RecordDriver/DefaultRecord/core.phtml
+++ b/themes/fid_adlr/templates/RecordDriver/DefaultRecord/core.phtml
@@ -65,7 +65,7 @@
                   <?php /* Add to favorites; finc: keep Icon inside link - CK */ ?>
               <div class="favorite">
                 <a href="<?=$this->recordLink()->getActionUrl($this->driver, 'Save')?>" data-lightbox class="save-record result-link-label" data-id="<?=$this->escapeHtmlAttr($this->driver->getUniqueId())?>" title="<?=$this->transEsc('Add to favorites')?>">
-                  <i class="icon icon-star icon-1.5x" aria-hidden="true"></i> <span class="hidden-xs hidden-sm"><?/* =$this->transEsc('Add to favorites') */?></span>
+                  <i class="icon icon-star icon-1.5x" aria-hidden="true"></i> <span class="hidden-xs hidden-sm"><?php /* =$this->transEsc('Add to favorites') */?></span>
                 </a>
               </div>
               <div class="toolbar-menu">
@@ -105,19 +105,19 @@
     </div>
     <div class="record col-md-4 media-right-details">
 		  <?php /* finc-specific: add toolbar to sidebar - CK */ ?>
-		  <?//=$this->record($this->driver)->getToolbar()?>
+		  <?php //=$this->record($this->driver)->getToolbar()?>
 
 		  <?php /* GET IT-box refs #15930 - GG */ ?>
-		  <? if (count($this->tabs) > 0): ?>
-      <a name="tabnavi"></a><? /* Renamed, no typo, to render jump to tab ineffective */ ?>
+		  <?php if (count($this->tabs) > 0): ?>
+      <a name="tabnavi"></a><?php /* Renamed, no typo, to render jump to tab ineffective */ ?>
       <div class="record-tabs detailview-box-yellow">
-			  <? if (count($this->tabs) > 0): ?>
-          <a name="tabnavi"></a><? /* Renamed, no typo, to render jump to tab ineffective */ ?>
+			  <?php if (count($this->tabs) > 0): ?>
+          <a name="tabnavi"></a><?php /* Renamed, no typo, to render jump to tab ineffective */ ?>
           <div class="record-tabs getitbox">
-            <ul class="recordTabs detailview-tab-nav"><? /* DO NOT use standard data-tab option here as it triggers Foundation's normal tab behaviour while Vufind only uses tab appearance! FIXME CK */ ?>
-						  <? foreach ($this->tabs as $tab => $obj): ?>
-							  <? if (in_array($tab, ['Holdings', 'AcquisitionPDA'])): ?>
-								  <? // add current tab to breadcrumbs if applicable:
+            <ul class="recordTabs detailview-tab-nav"><?php /* DO NOT use standard data-tab option here as it triggers Foundation's normal tab behaviour while Vufind only uses tab appearance! FIXME CK */ ?>
+						  <?php foreach ($this->tabs as $tab => $obj): ?>
+							  <?php if (in_array($tab, ['Holdings', 'AcquisitionPDA'])): ?>
+								  <?php // add current tab to breadcrumbs if applicable:
 								  $desc = $obj->getDescription();
 								  $tab_classes = array();
 								  if (0 === strcasecmp($this->activeTab, $tab)) {
@@ -134,20 +134,20 @@
 								  }
 								  //if (!$obj->supportsAjax()) { $tab_classes[] = 'noajax'; }
 								  ?>
-							  <? endif; ?>
-						  <? endforeach; ?>
+							  <?php endif; ?>
+						  <?php endforeach; ?>
             </ul>
 
-					  <? /* next line: we need the id - CK */ ?>
+					  <?php /* next line: we need the id - CK */ ?>
             <div class="tabs-content detailview-content" id="record-tabs">
-						  <? if (!$this->loadInitialTabWithAjax || !isset($activeTabObj) || !$activeTabObj->supportsAjax()): ?>
+						  <?php if (!$this->loadInitialTabWithAjax || !isset($activeTabObj) || !$activeTabObj->supportsAjax()): ?>
                 <div class="content active <?=$this->activeTab?>-tab">
 								  <?=isset($activeTabObj) ? $this->record($this->driver)->getTab($activeTabObj) : ''?>
                 </div>
-						  <? endif; ?>
+						  <?php endif; ?>
             </div>
           </div>
-			  <? endif; ?>
+			  <?php endif; ?>
 			  <?php endif; ?>
       </div>
     </div>
diff --git a/themes/fid_adlr/templates/RecordDriver/DefaultRecord/data-format.phtml b/themes/fid_adlr/templates/RecordDriver/DefaultRecord/data-format.phtml
index 41fe7996e5d4c5501fcaedbc048875f7c289902d..1fc9c387906eccd80f8217673920802e122cc0f6 100644
--- a/themes/fid_adlr/templates/RecordDriver/DefaultRecord/data-format.phtml
+++ b/themes/fid_adlr/templates/RecordDriver/DefaultRecord/data-format.phtml
@@ -4,9 +4,9 @@
     <?php
     $translated_formats = [];
     ?>
-    <? foreach ($this->data as $format): ?>
-        <? $translated_formats[] = $this->transEsc($format); ?>
-    <? endforeach; ?>
+    <?php foreach ($this->data as $format): ?>
+        <?php $translated_formats[] = $this->transEsc($format); ?>
+    <?php endforeach; ?>
 <strong><?=implode('; ', array_map(array($this, 'escapeHtml'), $translated_formats))?></strong>
 <?php endif; ?>
 <!-- fid_adlr: RecordDriver - DefaultRecord - data-titlestatement - END -->
diff --git a/themes/fid_adlr/templates/RecordDriver/DefaultRecord/result-list.phtml b/themes/fid_adlr/templates/RecordDriver/DefaultRecord/result-list.phtml
index a2de4a0a1fe86e7afc7711790b5e61362d92d70a..0f3482724a0e65dc037140b7afcd1e16d6211775 100644
--- a/themes/fid_adlr/templates/RecordDriver/DefaultRecord/result-list.phtml
+++ b/themes/fid_adlr/templates/RecordDriver/DefaultRecord/result-list.phtml
@@ -172,7 +172,7 @@ if ($cover):
         <?php if ($this->permission()->allowDisplay('feature.Favorites')): ?>
           <?php /* Add to favorites; finc: keep Icon inside link - CK */ ?>
           <a href="<?=$this->recordLink()->getActionUrl($this->driver, 'Save')?>" data-lightbox class="save-record result-link-label" data-id="<?=$this->escapeHtmlAttr($this->driver->getUniqueId())?>" title="<?=$this->transEsc('Add to favorites')?>">
-            <i class="icon icon-star icon-1.5x" aria-hidden="true"></i> <span class="hidden-xs hidden-sm"><?/* =$this->transEsc('Add to favorites') */?></span>
+            <i class="icon icon-star icon-1.5x" aria-hidden="true"></i> <span class="hidden-xs hidden-sm"><?php /* =$this->transEsc('Add to favorites') */?></span>
           </a><br/>
         <?php elseif ($block = $this->permission()->getAlternateContent('feature.Favorites')): ?>
           <?=$block?>
diff --git a/themes/fid_adlr/templates/RecordDriver/SolrAI/core.phtml b/themes/fid_adlr/templates/RecordDriver/SolrAI/core.phtml
index 43c1a52dfe88874ff2b0c2da84865a8aafd40df4..ea6d09abe6ced2c067ab612beb7da4495663e6e7 100644
--- a/themes/fid_adlr/templates/RecordDriver/SolrAI/core.phtml
+++ b/themes/fid_adlr/templates/RecordDriver/SolrAI/core.phtml
@@ -109,19 +109,19 @@
       </div>
       <div class="record col-md-4 media-right-details">
 		  <?php /* finc-specific: add toolbar to sidebar - CK */ ?>
-		  <?//=$this->record($this->driver)->getToolbar()?>
+		  <?php //=$this->record($this->driver)->getToolbar()?>
 
 		  <?php /* GET IT-box refs #15930 - GG */ ?>
-		  <? if (count($this->tabs) > 0): ?>
-      <a name="tabnavi"></a><? /* Renamed, no typo, to render jump to tab ineffective */ ?>
+		  <?php if (count($this->tabs) > 0): ?>
+      <a name="tabnavi"></a><?php /* Renamed, no typo, to render jump to tab ineffective */ ?>
       <div class="record-tabs detailview-box-yellow">
-			  <? if (count($this->tabs) > 0): ?>
-          <a name="tabnavi"></a><? /* Renamed, no typo, to render jump to tab ineffective */ ?>
+			  <?php if (count($this->tabs) > 0): ?>
+          <a name="tabnavi"></a><?php /* Renamed, no typo, to render jump to tab ineffective */ ?>
           <div class="record-tabs getitbox">
-            <ul class="recordTabs detailview-tab-nav"><? /* DO NOT use standard data-tab option here as it triggers Foundation's normal tab behaviour while Vufind only uses tab appearance! FIXME CK */ ?>
-						  <? foreach ($this->tabs as $tab => $obj): ?>
-							  <? if (in_array($tab, ['Holdings', 'AcquisitionPDA'])): ?>
-								  <? // add current tab to breadcrumbs if applicable:
+            <ul class="recordTabs detailview-tab-nav"><?php /* DO NOT use standard data-tab option here as it triggers Foundation's normal tab behaviour while Vufind only uses tab appearance! FIXME CK */ ?>
+						  <?php foreach ($this->tabs as $tab => $obj): ?>
+							  <?php if (in_array($tab, ['Holdings', 'AcquisitionPDA'])): ?>
+								  <?php // add current tab to breadcrumbs if applicable:
 								  $desc = $obj->getDescription();
 								  $tab_classes = array();
 								  if (0 === strcasecmp($this->activeTab, $tab)) {
@@ -138,20 +138,20 @@
 								  }
 								  //if (!$obj->supportsAjax()) { $tab_classes[] = 'noajax'; }
 								  ?>
-							  <? endif; ?>
-						  <? endforeach; ?>
+							  <?php endif; ?>
+						  <?php endforeach; ?>
             </ul>
 
-					  <? /* next line: we need the id - CK */ ?>
+					  <?php /* next line: we need the id - CK */ ?>
             <div class="tabs-content detailview-content" id="record-tabs">
-						  <? if (!$this->loadInitialTabWithAjax || !isset($activeTabObj) || !$activeTabObj->supportsAjax()): ?>
+						  <?php if (!$this->loadInitialTabWithAjax || !isset($activeTabObj) || !$activeTabObj->supportsAjax()): ?>
                 <div class="content active <?=$this->activeTab?>-tab">
 								  <?=isset($activeTabObj) ? $this->record($this->driver)->getTab($activeTabObj) : ''?>
                 </div>
-						  <? endif; ?>
+						  <?php endif; ?>
             </div>
           </div>
-			  <? endif; ?>
+			  <?php endif; ?>
 			  <?php endif; ?>
       </div>
     </div>
diff --git a/themes/fid_adlr/templates/RecordDriver/SolrAI/result-list.phtml b/themes/fid_adlr/templates/RecordDriver/SolrAI/result-list.phtml
index 657e6751025989831f969f33903c32d34a6794bb..baf37345dd5028dbda8d2cf2c3981ed1fe7f1276 100644
--- a/themes/fid_adlr/templates/RecordDriver/SolrAI/result-list.phtml
+++ b/themes/fid_adlr/templates/RecordDriver/SolrAI/result-list.phtml
@@ -136,7 +136,7 @@ if ($cover):
         <?php /* Add to favorites; finc: keep Icon inside link - CK */ ?>
         <a href="<?=$this->recordLink()->getActionUrl($this->driver, 'Save')?>" data-lightbox class="save-record result-link-label" data-id="<?=$this->escapeHtmlAttr($this->driver->getUniqueId())?>"
            title="<?=$this->transEsc('Add to favorites')?>">
-          <i class="result-link-icon icon icon-star icon-1.5x" aria-hidden="true"></i> <?/* =$this->transEsc('Add to favorites') */?>
+          <i class="result-link-icon icon icon-star icon-1.5x" aria-hidden="true"></i> <?php /* =$this->transEsc('Add to favorites') */?>
         </a><br/>
       <?php elseif ($block = $this->permission()->getAlternateContent('feature.Favorites')): ?>
         <?=$block?>
diff --git a/themes/fid_adlr/templates/RecordDriver/SolrMarc/core.phtml b/themes/fid_adlr/templates/RecordDriver/SolrMarc/core.phtml
index 330edf9ca9d474ea46e954219b9d12d57bd7c728..d06e1d135a1a30fc1b98bfb7f3b19fed1077263f 100644
--- a/themes/fid_adlr/templates/RecordDriver/SolrMarc/core.phtml
+++ b/themes/fid_adlr/templates/RecordDriver/SolrMarc/core.phtml
@@ -111,19 +111,19 @@
     </div>
     <div class="record col-md-4 media-right-details">
 		  <?php /* finc-specific: add toolbar to sidebar - CK */ ?>
-		  <?//=$this->record($this->driver)->getToolbar()?>
+		  <?php //=$this->record($this->driver)->getToolbar()?>
 
 		  <?php /* GET IT-box refs #15930 - GG */ ?>
-		  <? if (count($this->tabs) > 0): ?>
-      <a name="tabnavi"></a><? /* Renamed, no typo, to render jump to tab ineffective */ ?>
+		  <?php if (count($this->tabs) > 0): ?>
+      <a name="tabnavi"></a><?php /* Renamed, no typo, to render jump to tab ineffective */ ?>
       <div class="record-tabs detailview-box-yellow">
-			  <? if (count($this->tabs) > 0): ?>
-          <a name="tabnavi"></a><? /* Renamed, no typo, to render jump to tab ineffective */ ?>
+			  <?php if (count($this->tabs) > 0): ?>
+          <a name="tabnavi"></a><?php /* Renamed, no typo, to render jump to tab ineffective */ ?>
           <div class="record-tabs getitbox">
-            <ul class="recordTabs detailview-tab-nav"><? /* DO NOT use standard data-tab option here as it triggers Foundation's normal tab behaviour while Vufind only uses tab appearance! FIXME CK */ ?>
-						  <? foreach ($this->tabs as $tab => $obj): ?>
-							  <? if (in_array($tab, ['Holdings', 'AcquisitionPDA'])): ?>
-								  <? // add current tab to breadcrumbs if applicable:
+            <ul class="recordTabs detailview-tab-nav"><?php /* DO NOT use standard data-tab option here as it triggers Foundation's normal tab behaviour while Vufind only uses tab appearance! FIXME CK */ ?>
+						  <?php foreach ($this->tabs as $tab => $obj): ?>
+							  <?php if (in_array($tab, ['Holdings', 'AcquisitionPDA'])): ?>
+								  <?php // add current tab to breadcrumbs if applicable:
 								  $desc = $obj->getDescription();
 								  $tab_classes = array();
 								  if (0 === strcasecmp($this->activeTab, $tab)) {
@@ -140,20 +140,20 @@
 								  }
 								  //if (!$obj->supportsAjax()) { $tab_classes[] = 'noajax'; }
 								  ?>
-							  <? endif; ?>
-						  <? endforeach; ?>
+							  <?php endif; ?>
+						  <?php endforeach; ?>
             </ul>
 
-					  <? /* next line: we need the id - CK */ ?>
+					  <?php /* next line: we need the id - CK */ ?>
             <div class="tabs-content detailview-content" id="record-tabs">
-						  <? if (!$this->loadInitialTabWithAjax || !isset($activeTabObj) || !$activeTabObj->supportsAjax()): ?>
+						  <?php if (!$this->loadInitialTabWithAjax || !isset($activeTabObj) || !$activeTabObj->supportsAjax()): ?>
                 <div class="content active <?=$this->activeTab?>-tab">
 								  <?=isset($activeTabObj) ? $this->record($this->driver)->getTab($activeTabObj) : ''?>
                 </div>
-						  <? endif; ?>
+						  <?php endif; ?>
             </div>
           </div>
-			  <? endif; ?>
+			  <?php endif; ?>
 			  <?php endif; ?>
       </div>
     </div>
diff --git a/themes/fid_adlr/templates/RecordTab/holdingsils.phtml b/themes/fid_adlr/templates/RecordTab/holdingsils.phtml
index fe522c6c6820db4ac3c920b6b082bc2941240de5..c93071cd733f0ac3db90d11503a4e992905750ae 100644
--- a/themes/fid_adlr/templates/RecordTab/holdingsils.phtml
+++ b/themes/fid_adlr/templates/RecordTab/holdingsils.phtml
@@ -34,7 +34,7 @@
 ?>
 
 <?php if ($user && $getitConfig['bossData']): ?>
-      <? $script = <<<JS
+      <?php $script = <<<JS
   $(document).ready(function() {
       var recordId = $('.hiddenId').val();
       var recordSource = $('.hiddenSource').val();
@@ -60,7 +60,7 @@ JS;
 <?php endif; ?>
 
 <?php if ($getitConfig['hideNotice']): ?>
-    <? $script = <<<JS
+    <?php $script = <<<JS
   $(document).ready(function() {
       $('.getitbox-notices').addClass('hidden');
     });
diff --git a/themes/fid_adlr/templates/feedback/form.phtml b/themes/fid_adlr/templates/feedback/form.phtml
index 401c615e81dccd251956fabaa15ea9eb8f2c3139..aae4e431f8ab274d36a9ec55992585cceccec5e4 100644
--- a/themes/fid_adlr/templates/feedback/form.phtml
+++ b/themes/fid_adlr/templates/feedback/form.phtml
@@ -100,7 +100,7 @@ $helpPost = isset($help['post']) ? $this->translate($help['post']) : null;
   </div>
 
     <?php /* always embed privacy policy checkbox at the end of feedback form before submit element */?>
-    <? if(++$counter == $countElements -1) : ?>
+    <?php if(++$counter == $countElements -1) : ?>
       <div class="form-group">
         <input id="confirmPrivacy" name="confirmPrivacy" type="checkbox" class="margin-r-2" required>
         <label for="confirmPrivacy">
diff --git a/themes/fid_adlr/templates/fid/admin/edit.phtml b/themes/fid_adlr/templates/fid/admin/edit.phtml
index 088275d97812d3bd0ced40f4e347022219d89748..7e3abb8b525411820717dff8608de237e3840740 100644
--- a/themes/fid_adlr/templates/fid/admin/edit.phtml
+++ b/themes/fid_adlr/templates/fid/admin/edit.phtml
@@ -59,10 +59,10 @@ $this->headTitle($title = $this->translate("fid::user_edit_form_title", [
 <?= $this->form()->openTag($form) ?>
 <br/>
 
-<? /* id */ ?>
+<?php /* id */ ?>
 <?= $this->formElement($form->get('id')) ?>
 
-<? /* salutation */ ?>
+<?php /* salutation */ ?>
 <?php
 /** @var Element\Select $elemSalutation */
 $elemSalutation = $form->get('salutation');
@@ -74,7 +74,7 @@ $elemSalutation->setAttributes(['class' => 'form-control']);
     <?= $this->formSelect($elemSalutation) ?>
 </div>
 
-<? /* academic title */ ?>
+<?php /* academic title */ ?>
 <?php
 /** @var Element\Text $elemAcademicTitle */
 $elemAcademicTitle = $form->get('academic_title');
@@ -86,7 +86,7 @@ $elemAcademicTitle->setAttributes(['class' => 'form-control']);
     <?= $this->formElement($elemAcademicTitle) ?>
 </div>
 
-<? /* firstname */ ?>
+<?php /* firstname */ ?>
 <?php
 /** @var Element\Text $elemFirstname */
 $elemFirstname = $form->get('firstname');
@@ -99,7 +99,7 @@ $elemFirstname->setAttributes(['class' => 'form-control']);
     <?= $this->formElementErrors($elemFirstname) ?>
 </div>
 
-<? /* lastname */ ?>
+<?php /* lastname */ ?>
 <?php
 /** @var Element\Text $elemLastname */
 $elemLastname = $form->get('lastname');
@@ -112,7 +112,7 @@ $elemLastname->setAttributes(['class' => 'form-control']);
     <?= $this->formElementErrors($elemLastname) ?>
 </div>
 
-<? /* home library */ ?>
+<?php /* home library */ ?>
 <?php
 /** @var Element\Select $elemHomeLibrary */
 $elemHomeLibrary = $form->get('home_library');
@@ -125,7 +125,7 @@ $elemHomeLibrary->setAttributes(['class' => 'form-control']);
     <?= $this->formElementErrors($elemHomeLibrary) ?>
 </div>
 
-<? /* user group */ ?>
+<?php /* user group */ ?>
 <?php
 /** @var Element\Radio $elemJobTitle */
 $elemJobTitle = $form->get('job_title');
@@ -138,7 +138,7 @@ $elemJobTitle->setAttributes(['class' => 'form-control']);
     <?= $this->formElementErrors($elemJobTitle) ?>
 </div>
 
-<? /* phone */ ?>
+<?php /* phone */ ?>
 <?php
 /** @var Element\Text $elemPhone */
 $elemPhone = $form->get('data')->get('phone');
@@ -151,7 +151,7 @@ $elemPhone->setAttributes(['class' => 'form-control']);
     <?= $this->formElementErrors($elemPhone) ?>
 </div>
 
-<? /* Permissions */ ?>
+<?php /* Permissions */ ?>
 <?php
 /** @var Element\Collection $elemPermissions */
 /** @var Element\Select[] $elemPermissionsElems */
@@ -170,7 +170,7 @@ foreach ($permissions as $permission) {
 
 <h3><?= $this->formLabel($elemPermissions) ?></h3>
 
-<? /* deletion */ ?>
+<?php /* deletion */ ?>
 <?php
 /** @var Checkbox $elemDeleted */
 $elemDeleted = $form->get('data')->get('deleted');
@@ -192,10 +192,10 @@ $elemDeleted->setAttribute('id', 'deleted');
 <?php endforeach; ?>
 
 
-<? /* addresses */ ?>
+<?php /* addresses */ ?>
 <?= $this->render('fid/user/address-collection.phtml') ?>
 
-<? /* newsletter */ ?>
+<?php /* newsletter */ ?>
 <?php
 /** @var Checkbox $elemNewsletter */
 $elemNewsletter = $form->get('data')->get('newsletter');
@@ -209,7 +209,7 @@ $elemNewsletter->setAttribute('id', 'newsletter');
     <?= $this->formElementErrors($elemNewsletter) ?>
 </div>
 
-<? /* submit button */ ?>
+<?php /* submit button */ ?>
 <?php
 /** @var Submit $elemSubmit */
 $elemSubmit = $form->get('submit');
diff --git a/themes/fid_adlr/templates/fid/user/create.phtml b/themes/fid_adlr/templates/fid/user/create.phtml
index d4caacac34e1371d9676546186a8cc60063fe527..63decf1fffd01b4465ab3bec247a789331aad524 100644
--- a/themes/fid_adlr/templates/fid/user/create.phtml
+++ b/themes/fid_adlr/templates/fid/user/create.phtml
@@ -56,7 +56,7 @@ $this->headTitle($title = $this->translate("fid::user_create_form_title"));
 <?= $this->form()->openTag($form) ?>
 <br/>
 
-<? /* username */ ?>
+<?php /* username */ ?>
 <?php
 /** @var Element\Text $elemUsername */
 $elemUsername = $form->get('username');
@@ -74,7 +74,7 @@ $elemUsername->setAttributes(['class' => 'form-control', 'disabled' => 1]);
     <?= $this->formElement($elemUsername) ?>
 </div>
 
-<? /* password */ ?>
+<?php /* password */ ?>
 <?php
 /** @var Element\Password $elemPassword */
 $elemPassword = $form->get('password');
@@ -88,7 +88,7 @@ $elemPassword->setAttributes(['class' => 'form-control']);
     <?= $this->formElementErrors($elemPassword) ?>
 </div>
 
-<? /* password confirmation */ ?>
+<?php /* password confirmation */ ?>
 <?php
 /** @var Element\Password $elemPasswordConfirmation */
 $elemPasswordConfirmation = $form->get('password_confirmation');
@@ -101,7 +101,7 @@ $elemPasswordConfirmation->setAttributes(['class' => 'form-control']);
     <?= $this->formElementErrors($elemPasswordConfirmation) ?>
 </div>
 
-<? /* salutation */ ?>
+<?php /* salutation */ ?>
 <?php
 /** @var Element\Select $elemSalutation */
 $elemSalutation = $form->get('salutation');
@@ -113,7 +113,7 @@ $elemSalutation->setAttributes(['class' => 'form-control']);
     <?= $this->formSelect($elemSalutation) ?>
 </div>
 
-<? /* academic title */ ?>
+<?php /* academic title */ ?>
 <?php
 /** @var Element\Text $elemAcademicTitle */
 $elemAcademicTitle = $form->get('academic_title');
@@ -125,7 +125,7 @@ $elemAcademicTitle->setAttributes(['class' => 'form-control']);
     <?= $this->formElement($elemAcademicTitle) ?>
 </div>
 
-<? /* firstname */ ?>
+<?php /* firstname */ ?>
 <?php
 /** @var Element\Text $elemFirstname */
 $elemFirstname = $form->get('firstname');
@@ -138,7 +138,7 @@ $elemFirstname->setAttributes(['class' => 'form-control']);
     <?= $this->formElementErrors($elemFirstname) ?>
 </div>
 
-<? /* lastname */ ?>
+<?php /* lastname */ ?>
 <?php
 /** @var Element\Text $elemLastname */
 $elemLastname = $form->get('lastname');
@@ -151,7 +151,7 @@ $elemLastname->setAttributes(['class' => 'form-control']);
     <?= $this->formElementErrors($elemLastname) ?>
 </div>
 
-<? /* home library */ ?>
+<?php /* home library */ ?>
 <?php
 /** @var Element\Select $elemHomeLibrary */
 $elemHomeLibrary = $form->get('home_library');
@@ -164,7 +164,7 @@ $elemHomeLibrary->setAttributes(['class' => 'form-control']);
     <?= $this->formElementErrors($elemHomeLibrary) ?>
 </div>
 
-<? /* user group */ ?>
+<?php /* user group */ ?>
 <?php
 /** @var Element\Radio $elemJobTitle */
 $elemJobTitle = $form->get('job_title');
@@ -177,7 +177,7 @@ $elemJobTitle->setAttributes(['class' => 'form-control']);
     <?= $this->formElementErrors($elemJobTitle) ?>
 </div>
 
-<? /* phone */ ?>
+<?php /* phone */ ?>
 <?php
 /** @var Element\Text $elemPhone */
 $elemPhone = $form->get('data')->get('phone');
@@ -190,10 +190,10 @@ $elemPhone->setAttributes(['class' => 'form-control']);
     <?= $this->formElementErrors($elemPhone) ?>
 </div>
 
-<? /* addresses */ ?>
+<?php /* addresses */ ?>
 <?= $this->render('address-collection.phtml') ?>
 
-<? /* newsletter */ ?>
+<?php /* newsletter */ ?>
 <?php
 /** @var Checkbox $elemNewsletter */
 $elemNewsletter = $form->get('data')->get('newsletter');
@@ -207,7 +207,7 @@ $elemNewsletter->setAttribute('id', 'newsletter');
     <?= $this->formElementErrors($elemNewsletter) ?>
 </div>
 
-<? /* eula privacy policy */ ?>
+<?php /* eula privacy policy */ ?>
 <?php
 /** @var Checkbox $elemEulaAccepted */
 $elemEulaAccepted = $form->get('eula_accepted');
@@ -230,7 +230,7 @@ $elemEulaAccepted->setAttribute('id', 'eula-accepted');
     <?= $this->formElementErrors($elemEulaAccepted) ?>
 </div>
 
-<? /* submit button */ ?>
+<?php /* submit button */ ?>
 <?php
 /** @var Submit $elemSubmit */
 $elemSubmit = $form->get('submit');
diff --git a/themes/fid_adlr/templates/fid/user/home-address-fieldset.phtml b/themes/fid_adlr/templates/fid/user/home-address-fieldset.phtml
index d2ff25ea31a79f38ec79ddd136a558fdd443a6b4..16dfcc4968993b20c8216767c14b961df66b3cd3 100644
--- a/themes/fid_adlr/templates/fid/user/home-address-fieldset.phtml
+++ b/themes/fid_adlr/templates/fid/user/home-address-fieldset.phtml
@@ -28,7 +28,7 @@ $address = $this->address;
 
 <h3><?= $this->translate('fid::' . $address->getLabel()) ?></h3>
 
-<? /* id */ ?>
+<?php /* id */ ?>
 <?php
 $elemId = $address->get('id');
 if ($elemId->getValue()) {
@@ -36,7 +36,7 @@ if ($elemId->getValue()) {
 }
 ?>
 
-<? /* phone */ ?>
+<?php /* phone */ ?>
 <?php
 /** @var Element\Text $elemDeliveryAddress */
 $elemDeliveryAddress = $this->form->get('data')->get('delivery_address');
@@ -50,7 +50,7 @@ $elemDeliveryAddress->setAttribute('id', 'delivery_address');
     <?= $this->formElementErrors($elemDeliveryAddress) ?>
 </div>
 
-<? /* first line */ ?>
+<?php /* first line */ ?>
 <?php
 /** @var Element\Text $elemLine1 */
 $elemLine1 = $address->get('line1');
@@ -63,7 +63,7 @@ $elemLine1->setAttributes(['class' => 'form-control']);
     <?= $this->formElementErrors($elemLine1) ?>
 </div>
 
-<? /* second line */ ?>
+<?php /* second line */ ?>
 <?php
 /** @var Element\Text $elemLine2 */
 $elemLine2 = $address->get('line2');
@@ -76,7 +76,7 @@ $elemLine2->setAttributes(['class' => 'form-control']);
     <?= $this->formElementErrors($elemLine2) ?>
 </div>
 
-<? /* address zip */ ?>
+<?php /* address zip */ ?>
 <?php
 /** @var Element\Text $elemZip */
 $elemZip = $address->get('zip');
@@ -89,7 +89,7 @@ $elemZip->setAttributes(['class' => 'form-control']);
     <?= $this->formElementErrors($elemZip) ?>
 </div>
 
-<? /* city */ ?>
+<?php /* city */ ?>
 <?php
 /** @var Element\Text $elemCity */
 $elemCity = $address->get('city');
@@ -102,7 +102,7 @@ $elemCity->setAttributes(['class' => 'form-control']);
     <?= $this->formElementErrors($elemCity) ?>
 </div>
 
-<? /* country */ ?>
+<?php /* country */ ?>
 <?php
 /** @var Element\Text $elemCountry */
 $elemCountry = $address->get('country');
diff --git a/themes/fid_adlr/templates/fid/user/office-address-fieldset.phtml b/themes/fid_adlr/templates/fid/user/office-address-fieldset.phtml
index c34833cc8db287f4f7dc17c27eb08b76dc2001e1..21996e486384f9e5eafee5a9be27d0da4abf3d94 100644
--- a/themes/fid_adlr/templates/fid/user/office-address-fieldset.phtml
+++ b/themes/fid_adlr/templates/fid/user/office-address-fieldset.phtml
@@ -29,10 +29,10 @@ $address = $this->address;
 
 <h3><?= $this->translate('fid::' . $address->getLabel()) ?></h3>
 
-<? /* id */ ?>
+<?php /* id */ ?>
 <?= $this->formElement($address->get('id')) ?>
 
-<? /* third line */ ?>
+<?php /* third line */ ?>
 <?php
 /** @var Element\Text $college */
 $college = $this->form->get('college');
@@ -45,7 +45,7 @@ $college->setAttributes(['class' => 'form-control']);
   <?= $this->formElementErrors($college) ?>
 </div>
 
-<? /* second line (here firstly) */ ?>
+<?php /* second line (here firstly) */ ?>
 <?php
 /** @var Element\Text $elemLine2 */
 $elemLine2 = $address->get('line2');
@@ -58,7 +58,7 @@ $elemLine2->setAttributes(['class' => 'form-control']);
   <?= $this->formElementErrors($elemLine2) ?>
 </div>
 
-<? /* first line (here secondly) */ ?>
+<?php /* first line (here secondly) */ ?>
 <?php
 /** @var Element\Text $elemLine1 */
 $elemLine1 = $address->get('line1');
@@ -71,7 +71,7 @@ $elemLine1->setAttributes(['class' => 'form-control']);
   <?= $this->formElementErrors($elemLine1) ?>
 </div>
 
-<? /* address zip */ ?>
+<?php /* address zip */ ?>
 <?php
 /** @var Element\Text $elemZip */
 $elemZip = $address->get('zip');
@@ -84,7 +84,7 @@ $elemZip->setAttributes(['class' => 'form-control']);
   <?= $this->formElementErrors($elemZip) ?>
 </div>
 
-<? /* city */ ?>
+<?php /* city */ ?>
 <?php
 /** @var Element\Text $elemCity */
 $elemCity = $address->get('city');
@@ -97,7 +97,7 @@ $elemCity->setAttributes(['class' => 'form-control']);
   <?= $this->formElementErrors($elemCity) ?>
 </div>
 
-<? /* country */ ?>
+<?php /* country */ ?>
 <?php
 /** @var Element\Text $elemCountry */
 $elemCountry = $address->get('country');
diff --git a/themes/fid_adlr/templates/fid/user/update.phtml b/themes/fid_adlr/templates/fid/user/update.phtml
index 79862f413738f24c0c7136974b8424ad675635d5..a73182197fe66ff74a299254df757a1102fb9fcf 100644
--- a/themes/fid_adlr/templates/fid/user/update.phtml
+++ b/themes/fid_adlr/templates/fid/user/update.phtml
@@ -56,10 +56,10 @@ $this->headTitle($title = $this->translate("fid::user_update_form_title"));
 <?= $this->form()->openTag($form) ?>
 <br/>
 
-<? /* id */ ?>
+<?php /* id */ ?>
 <?= $this->formElement($form->get('id')) ?>
 
-<? /* salutation */ ?>
+<?php /* salutation */ ?>
 <?php
 /** @var Element\Select $elemSalutation */
 $elemSalutation = $form->get('salutation');
@@ -71,7 +71,7 @@ $elemSalutation->setAttributes(['class' => 'form-control']);
     <?= $this->formSelect($elemSalutation) ?>
 </div>
 
-<? /* academic title */ ?>
+<?php /* academic title */ ?>
 <?php
 /** @var Element\Text $elemAcademicTitle */
 $elemAcademicTitle = $form->get('academic_title');
@@ -83,7 +83,7 @@ $elemAcademicTitle->setAttributes(['class' => 'form-control']);
     <?= $this->formElement($elemAcademicTitle) ?>
 </div>
 
-<? /* firstname */ ?>
+<?php /* firstname */ ?>
 <?php
 /** @var Element\Text $elemFirstname */
 $elemFirstname = $form->get('firstname');
@@ -96,7 +96,7 @@ $elemFirstname->setAttributes(['class' => 'form-control']);
     <?= $this->formElementErrors($elemFirstname) ?>
 </div>
 
-<? /* lastname */ ?>
+<?php /* lastname */ ?>
 <?php
 /** @var Element\Text $elemLastname */
 $elemLastname = $form->get('lastname');
@@ -109,7 +109,7 @@ $elemLastname->setAttributes(['class' => 'form-control']);
     <?= $this->formElementErrors($elemLastname) ?>
 </div>
 
-<? /* home library */ ?>
+<?php /* home library */ ?>
 <?php
 /** @var Element\Select $elemHomeLibrary */
 $elemHomeLibrary = $form->get('home_library');
@@ -122,7 +122,7 @@ $elemHomeLibrary->setAttributes(['class' => 'form-control']);
     <?= $this->formElementErrors($elemHomeLibrary) ?>
 </div>
 
-<? /* user group */ ?>
+<?php /* user group */ ?>
 <?php
 /** @var Element\Select $elemJobTitle */
 $elemJobTitle = $form->get('job_title');
@@ -143,7 +143,7 @@ $elemJobTitle->setAttributes(['class' => 'form-control']);
     </p>
 </div>
 
-<? /* phone */ ?>
+<?php /* phone */ ?>
 <?php
 /** @var Element\Text $elemPhone */
 $elemPhone = $form->get('data')->get('phone');
@@ -156,10 +156,10 @@ $elemPhone->setAttributes(['class' => 'form-control']);
     <?= $this->formElementErrors($elemPhone) ?>
 </div>
 
-<? /* addresses */ ?>
+<?php /* addresses */ ?>
 <?= $this->render('address-collection.phtml') ?>
 
-<? /* newsletter */ ?>
+<?php /* newsletter */ ?>
 <?php
 /** @var Checkbox $elemNewsletter */
 $elemNewsletter = $form->get('data')->get('newsletter');
@@ -173,7 +173,7 @@ $elemNewsletter->setAttribute('id', 'newsletter');
     <?= $this->formElementErrors($elemNewsletter) ?>
 </div>
 
-<? /* submit button */ ?>
+<?php /* submit button */ ?>
 <?php
 /** @var Submit $elemSubmit */
 $elemSubmit = $form->get('submit');
diff --git a/themes/fid_adlr/templates/layout/layout.phtml b/themes/fid_adlr/templates/layout/layout.phtml
index ea23889fc6c84f07ca5f54e11a7327d328982440..da8a1da1b0083bf5393f5c805f4712903a0fbb03 100644
--- a/themes/fid_adlr/templates/layout/layout.phtml
+++ b/themes/fid_adlr/templates/layout/layout.phtml
@@ -7,12 +7,12 @@
   ?>
   <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
   <meta name="viewport" content="width=device-width,initial-scale=1.0"/>
-  <? /* TODO: use TranslatorAwareTrait:translateString instead of using postfix [_locale]*/ ?>
+  <?php /* TODO: use TranslatorAwareTrait:translateString instead of using postfix [_locale]*/ ?>
   <meta name="description" lang="de" content="<?=$this->translate('adlr_head_description_de')?>">
   <meta name="description" lang="en" content="<?=$this->translate('adlr_head_description_en')?>">
   <meta name="keywords" lang="de" content="<?=$this->translate('adlr_head_keywords_de')?>">
   <meta name="keywords" lang="en" content="<?=$this->translate('adlr_head_keywords_en')?>">
-  <? /* END TODO */ ?>
+  <?php /* END TODO */ ?>
 
   <?=$this->headMeta()?>
   <?=$this->headTitle(' ' . $this->translate('adlr_head_title'))?>
diff --git a/themes/fid_adlr/templates/myresearch/menu.phtml b/themes/fid_adlr/templates/myresearch/menu.phtml
index 0302a1e15cac7d9ab24b430359165612b0348084..c69308811658102008f1163f5e68d3a10610ed0f 100644
--- a/themes/fid_adlr/templates/myresearch/menu.phtml
+++ b/themes/fid_adlr/templates/myresearch/menu.phtml
@@ -39,7 +39,7 @@
         <i class="icon icon-plus" aria-hidden="true"></i> <?=$this->transEsc('Create a List') ?>
       </a>
 
-      <? /* link to listing of debis databases etc. */ ?>
+      <?php /* link to listing of debis databases etc. */ ?>
       <?php if ($this->permission()->allowDisplay('access.Licenses') || $this->permission()->allowDisplay('access.DBIS')) : ?>
         <a href="<?=$this->url('myresearch/databases')?>" <?=$this->active == 'databases' ? ' class="active"' : ''?> >
           <i class="icon icon-window" aria-hidden="true"></i> <?=$this->transEsc('database_access')?>
diff --git a/themes/fid_adlr/templates/record/email.phtml b/themes/fid_adlr/templates/record/email.phtml
index d176a863fb1f13462cae618edaedc32e6af9c833..2003f61fe583aef8e85c5db8b0ff1e679e272dc6 100644
--- a/themes/fid_adlr/templates/record/email.phtml
+++ b/themes/fid_adlr/templates/record/email.phtml
@@ -1,5 +1,5 @@
 <!-- adlr-record - EMAIL.phtml -->
-<?
+<?php
   // Set page title.
   $this->headTitle($this->translate('Email Record'));
 
diff --git a/themes/fid_adlr/templates/search/email.phtml b/themes/fid_adlr/templates/search/email.phtml
index 5c5229e37753057fd410bef7c62c64f639c55c56..6c75d0ac079ef90a0343d1f4fde1fddd23ed72ca 100644
--- a/themes/fid_adlr/templates/search/email.phtml
+++ b/themes/fid_adlr/templates/search/email.phtml
@@ -1,5 +1,5 @@
 <!-- adlr-search - EMAIL.phtml -->
-<?
+<?php
   // Set page title.
   $this->headTitle($this->translate('Email this Search'));
 
diff --git a/themes/fid_adlr/templates/search/history.phtml b/themes/fid_adlr/templates/search/history.phtml
index 50ae9342bb726eebeee039a44e65aaf312a17921..f70f691348ebe273eef3079d9bb011ced4ad1373 100644
--- a/themes/fid_adlr/templates/search/history.phtml
+++ b/themes/fid_adlr/templates/search/history.phtml
@@ -1,5 +1,5 @@
 <!-- fid_adlr: search - history -->
-<?
+<?php
 // Set page title.
 $this->headTitle($this->translate('history_my_searches'));
 
@@ -8,23 +8,23 @@ $saveSupported = $this->accountCapabilities()->getSavedSearchSetting() === 'enab
 
 <div class="mainbody <?= $this->showMenu && $this->auth()->isLoggedIn() ? 'left' : 'modal-full-width' ?>">
     <?= $this->flashmessages() ?>
-    <? if ($saveSupported && !empty($this->saved)): ?>
+    <?php if ($saveSupported && !empty($this->saved)): ?>
       <h2><?= $this->transEsc("history_saved_searches") ?></h2>
       <?= $this->context()->renderInContext('search/history-table.phtml', ['showSaved' => true]); ?>
-    <? endif; ?>
+    <?php endif; ?>
 
   <h2><?= $this->transEsc("history_recent_searches") ?></h2>
-    <? if (!empty($this->unsaved)): ?>
+    <?php if (!empty($this->unsaved)): ?>
       <?= $this->context()->renderInContext('search/history-table.phtml', ['showSaved' => false]); ?>
       <a href="<?= $this->url('search-history') ?>?purge=true">
         <i class="fa fa-remove" aria-hidden="true"></i> <?= $this->transEsc("history_purge") ?>
       </a>
-    <? else: ?>
+    <?php else: ?>
       <?= $this->transEsc("history_no_searches") ?>
-    <? endif; ?>
+    <?php endif; ?>
 </div>
 
-<? if ($saveSupported && $this->showMenu && $this->auth()->isLoggedIn()): ?>
+<?php if ($saveSupported && $this->showMenu && $this->auth()->isLoggedIn()): ?>
   <div class="<?= $this->layoutClass('sidebar') ?>">
       <?= $this->context($this)->renderInContext(
           "myresearch/menu.phtml",
@@ -33,5 +33,5 @@ $saveSupported = $this->accountCapabilities()->getSavedSearchSetting() === 'enab
       );
       ?>
   </div>
-<? endif; ?>
+<?php endif; ?>
 <!-- fid_adlr: search - history - END -->
diff --git a/themes/fid_adlr/templates/search/results.phtml b/themes/fid_adlr/templates/search/results.phtml
index c07ca9231122d3331b3823c393e915a4156c726e..f18976a73b666418e9e633946e333dd7b9013da6 100644
--- a/themes/fid_adlr/templates/search/results.phtml
+++ b/themes/fid_adlr/templates/search/results.phtml
@@ -72,7 +72,7 @@ $this->headScript()->appendFile("check_save_statuses_adlr.js");
         <?php /* finc: use spans for easier to show/hide choices - CK */ ?>
         <?php if ($recordTotal > 0): ?>
             <span class="hit-stats hidden-xs hidden-sm">
-        <?/*=$this->context()->renderInContext('search/controls/showing.phtml', ['lookfor' => $lookfor, 'recordTotal' => $recordTotal])*/ ?>
+        <?php /*=$this->context()->renderInContext('search/controls/showing.phtml', ['lookfor' => $lookfor, 'recordTotal' => $recordTotal])*/ ?>
         </span>
 
         <?php else: ?>