diff --git a/themes/bootstrap3/templates/Auth/ChoiceAuth/login.phtml b/themes/bootstrap3/templates/Auth/ChoiceAuth/login.phtml
index 1a4770e124d1a2fc1256e4488831379e14627e48..6fdaf803424d43e9802e96f7eea570dc4c07535b 100644
--- a/themes/bootstrap3/templates/Auth/ChoiceAuth/login.phtml
+++ b/themes/bootstrap3/templates/Auth/ChoiceAuth/login.phtml
@@ -2,7 +2,7 @@
 <div id="authcontainer">
 <? $methods = $this->auth()->getManager()->getSelectableAuthOptions(); ?>
 <? $count = count($methods); ?>
-<? foreach ($methods as $loop=>$method):?>
+<? foreach ($methods as $loop => $method):?>
   <div class="authmethod<?=$loop?> span<?=floor(12 / $count) ?>">
     <? $this->auth()->getManager()->setAuthMethod($method) ?>
     <?=$this->auth()->getLoginDesc() ?>
diff --git a/themes/bootstrap3/templates/Recommend/ExpandFacets.phtml b/themes/bootstrap3/templates/Recommend/ExpandFacets.phtml
index 883fe08950120bda9d714be503542e5646683560..959dd28c01ccc0bfd244ef9a259a05030e1c3fee 100644
--- a/themes/bootstrap3/templates/Recommend/ExpandFacets.phtml
+++ b/themes/bootstrap3/templates/Recommend/ExpandFacets.phtml
@@ -5,7 +5,7 @@
 ?>
 <? if ($expandFacetSet): ?>
   <div class="sidegroup">
- <? foreach ($expandFacetSet as $title=>$cluster): ?>
+ <? foreach ($expandFacetSet as $title => $cluster): ?>
     <h4><?=$this->transEsc($cluster['label']) ?></h4>
     <div class="list-group">
       <? foreach ($cluster['list'] as $thisFacet): ?>
diff --git a/themes/bootstrap3/templates/Recommend/FacetCloud.phtml b/themes/bootstrap3/templates/Recommend/FacetCloud.phtml
index e65b1bdd46c96e5a22fd712972b266d820b768c9..1650692b57ea1430f4576caa4c701c598060174e 100644
--- a/themes/bootstrap3/templates/Recommend/FacetCloud.phtml
+++ b/themes/bootstrap3/templates/Recommend/FacetCloud.phtml
@@ -6,7 +6,7 @@
 ?>
 <? if ($expandFacetSet): ?>
   <div class="sidegroup">
-    <? foreach ($expandFacetSet as $title=>$facets): ?>
+    <? foreach ($expandFacetSet as $title => $facets): ?>
       <dl class="narrowList navmenu">
         <dt><?=$this->transEsc($facets['label']) ?></dt>
         <?
diff --git a/themes/bootstrap3/templates/Recommend/PubDateVisAjax.phtml b/themes/bootstrap3/templates/Recommend/PubDateVisAjax.phtml
index 06a770e5a77bad056f657895d8ab7df8b526ad94..8f200b46f74e2a4314c95b2f6eea0664c62b6c17 100644
--- a/themes/bootstrap3/templates/Recommend/PubDateVisAjax.phtml
+++ b/themes/bootstrap3/templates/Recommend/PubDateVisAjax.phtml
@@ -8,7 +8,7 @@
   $this->headScript()->appendFile('vendor/flot/jquery.flot.selection.min.js');
   $this->headScript()->appendFile('pubdate_vis.js'); ?>
 
-  <? foreach ($visFacets as $facetField=>$facetRange): ?>
+  <? foreach ($visFacets as $facetField => $facetRange): ?>
     <div class="authorbox">
       <div id="datevis<?=$this->escapeHtml($facetField)?>xWrapper" class="hidden">
         <strong><?=$this->transEsc($facetRange['label']) ?></strong>
diff --git a/themes/bootstrap3/templates/Recommend/SideFacets/range-slider.phtml b/themes/bootstrap3/templates/Recommend/SideFacets/range-slider.phtml
index 52d6f0ab772a4b08520fcc7e781f71c0ee734ca6..da7e61e6b00a202f3fa9497b7df778392817e089 100644
--- a/themes/bootstrap3/templates/Recommend/SideFacets/range-slider.phtml
+++ b/themes/bootstrap3/templates/Recommend/SideFacets/range-slider.phtml
@@ -30,7 +30,7 @@
     $min = !empty($this->facet['values'][0]) ? min($this->facet['values'][0], 1400) : 1400;
     $future = date('Y', time() + 31536000); // next year
     $max = !empty($this->facet['values'][1]) ? max($future, $this->facet['values'][1]) : $future;
-    $low  = !empty($this->facet['values'][0]) ? $this->facet['values'][0] : $min;
+    $low = !empty($this->facet['values'][0]) ? $this->facet['values'][0] : $min;
     $high = !empty($this->facet['values'][1]) ? $this->facet['values'][1] : $max;
     $script = <<<JS
 $(document).ready(function() {
diff --git a/themes/bootstrap3/templates/RecordDriver/SolrDefault/data-tags.phtml b/themes/bootstrap3/templates/RecordDriver/SolrDefault/data-tags.phtml
index 285e4ea0d319845dc9002386936b4e7b58af630e..e469c99e773b903b1867057056ffea4f78593417 100644
--- a/themes/bootstrap3/templates/RecordDriver/SolrDefault/data-tags.phtml
+++ b/themes/bootstrap3/templates/RecordDriver/SolrDefault/data-tags.phtml
@@ -11,5 +11,5 @@
     <a class="tag-record btn btn-link pull-right flip" href="<?=$this->recordLink()->getActionUrl($this->driver, 'AddTag')?>" data-lightbox>
       <i class="fa fa-plus" aria-hidden="true"></i> <?=$this->transEsc('Add Tag')?>
     </a>
-    <?=$this->context($this)->renderInContext('record/taglist', array('tagList'=>$tagList, 'loggedin'=>$loggedin)) ?>
+    <?=$this->context($this)->renderInContext('record/taglist', array('tagList' => $tagList, 'loggedin' => $loggedin)) ?>
 <? endif; ?>
diff --git a/themes/bootstrap3/templates/RecordDriver/SolrDefault/list-entry.phtml b/themes/bootstrap3/templates/RecordDriver/SolrDefault/list-entry.phtml
index f15e1af2d9e7932bc238dc78a270cd6349d2dd9e..78ac3b191499b66d44b88e7441194bf7cc855642 100644
--- a/themes/bootstrap3/templates/RecordDriver/SolrDefault/list-entry.phtml
+++ b/themes/bootstrap3/templates/RecordDriver/SolrDefault/list-entry.phtml
@@ -107,7 +107,7 @@
 
           <? if (count($this->lists) > 0): ?>
               <strong><?=$this->transEsc('Saved in')?>:</strong>
-              <? $i=0;foreach($this->lists as $current): ?>
+              <? $i = 0;foreach($this->lists as $current): ?>
                   <a href="<?=$this->url('userList', array('id' => $current->id))?>"><?=$this->escapeHtml($current->title)?></a><? if($i++ < count($this->lists) - 1): ?>,<? endif; ?>
               <? endforeach; ?>
               <br/>
diff --git a/themes/bootstrap3/templates/RecordTab/collectionlist.phtml b/themes/bootstrap3/templates/RecordTab/collectionlist.phtml
index 6d7b52855b637dcac464e0f1356cc40265f1206d..aabec2f3215bd8923d1527f77c720e53204e0c6f 100644
--- a/themes/bootstrap3/templates/RecordTab/collectionlist.phtml
+++ b/themes/bootstrap3/templates/RecordTab/collectionlist.phtml
@@ -16,7 +16,7 @@
       <?
         $transParams = [
           '%%start%%' => $this->localizedNumber($results->getStartRecord()),
-          '%%end%%'   => $this->localizedNumber($results->getEndRecord()),
+          '%%end%%' => $this->localizedNumber($results->getEndRecord()),
           '%%total%%' => $this->localizedNumber($recordTotal)
         ];
       ?>
diff --git a/themes/bootstrap3/templates/RecordTab/similaritemscarousel.phtml b/themes/bootstrap3/templates/RecordTab/similaritemscarousel.phtml
index 942691bdfca349d925370f0259bda0c93036c55c..63999576e664eaf243c5155b618da0d9bb04e943 100644
--- a/themes/bootstrap3/templates/RecordTab/similaritemscarousel.phtml
+++ b/themes/bootstrap3/templates/RecordTab/similaritemscarousel.phtml
@@ -6,7 +6,7 @@
     <!-- Indicators -->
     <ol class="carousel-indicators">
       <li data-target="#similar-items-carousel" data-slide-to="0" class="active"></li>
-      <? for($i=1;$i < count($similarRecords) / $perPage;$i++): ?>
+      <? for($i = 1;$i < count($similarRecords) / $perPage;$i++): ?>
         <li data-target="#similar-items-carousel" data-slide-to="<?=$i ?>"></li>
       <? endfor; ?>
     </ol>
@@ -14,7 +14,7 @@
     <!-- Wrapper for slides -->
     <div class="carousel-inner">
       <div class="item active">
-        <? foreach ($similarRecords as $index=>$data): ?>
+        <? foreach ($similarRecords as $index => $data): ?>
           <div class="carousel-item">
             <a class="hover-overlay" href="<?=$this->recordLink()->getUrl($data)?>">
               <? $thumb = $this->record($data)->getThumbnail('large'); ?>
diff --git a/themes/bootstrap3/templates/breadcrumbs/default.phtml b/themes/bootstrap3/templates/breadcrumbs/default.phtml
index d3ae32c8f4449ac2c972f82cb97967fd045ab58e..cee7414b3042d60b19786deb2dd013128b38b43d 100644
--- a/themes/bootstrap3/templates/breadcrumbs/default.phtml
+++ b/themes/bootstrap3/templates/breadcrumbs/default.phtml
@@ -1,7 +1,7 @@
 <li><a href="<?=$this->url('home')?>"><?=$this->transEsc('Home')?></a></li>
 <? $current = $this->layout()->breadcrumbs; $current = current($current); ?>
-<? foreach($current as $id=>$parent): ?>
-  <li><a href="<?=$this->url('collection', ['id'=>$id]) ?>"><?=$parent ?></a></li>
+<? foreach($current as $id => $parent): ?>
+  <li><a href="<?=$this->url('collection', ['id' => $id]) ?>"><?=$parent ?></a></li>
 <? endforeach; ?>
 <? if(isset($this->layout()->end)): ?>
   <li title="<?=$this->layout()->title ?>"><?=$this->truncate($this->layout()->title, 100) ?></li>
diff --git a/themes/bootstrap3/templates/breadcrumbs/multi.phtml b/themes/bootstrap3/templates/breadcrumbs/multi.phtml
index b1b633e9371b74ebd5cda213defdfbd811375944..e43cbdb7abdfe3f0c6047fce03ddfe6fab623605 100644
--- a/themes/bootstrap3/templates/breadcrumbs/multi.phtml
+++ b/themes/bootstrap3/templates/breadcrumbs/multi.phtml
@@ -4,8 +4,8 @@
   <div class="dropdown-menu" role="menu" aria-labelledby="dLabel">
     <? foreach ($this->layout()->breadcrumbs as $trail): ?>
       <ul class="sub-breadcrumb">
-      <? foreach ($trail as $id=>$title): ?>
-        <li><a href="<?=$this->url('record', ['id'=>$id])?>"><?=$title ?></a></li>
+      <? foreach ($trail as $id => $title): ?>
+        <li><a href="<?=$this->url('record', ['id' => $id])?>"><?=$title ?></a></li>
       <? endforeach; ?>
       </ul>
     <? endforeach; ?>
diff --git a/themes/bootstrap3/templates/browse/home.phtml b/themes/bootstrap3/templates/browse/home.phtml
index 8dac7d1aa09935b411a34db6e720254c51560bc1..735cd6c0362d59dc3de935f78b8ceab7778c2b6d 100644
--- a/themes/bootstrap3/templates/browse/home.phtml
+++ b/themes/bootstrap3/templates/browse/home.phtml
@@ -12,7 +12,7 @@
 
 <div class="browse-container">
   <div class="browse-list<? if (!empty($this->categoryList) || !empty($this->secondaryList)): ?> hidden-xs<? endif ?>" id="list1">
-    <? foreach ($this->browseOptions as $item=>$currentOption): ?>
+    <? foreach ($this->browseOptions as $item => $currentOption): ?>
       <a href="<?=$this->url('browse-' . strtolower($currentOption['action'])); ?>" class="browse-item<? if($currentOption['action'] == $this->currentAction): ?> active<? endif; ?>">
         <?=$this->transEsc($currentOption['description']) ?>
         <span class="pull-right flip"><i class="fa fa-angle-right" title="<?=$this->transEsc('more') ?>"></i></span>
@@ -22,7 +22,7 @@
 
   <? if (!empty($this->categoryList)): ?>
     <div class="browse-list<? if (!empty($this->secondaryList) || !empty($this->resultList)): ?> hidden-xs<? endif ?>" id="list2">
-      <? foreach($this->categoryList as $findby=>$category): ?>
+      <? foreach($this->categoryList as $findby => $category): ?>
         <a href="<?=$BROWSE_BASE ?>?findby=<?=urlencode($findby) ?>&amp;query_field=<?=$this->browse()->getSolrField($findby, $this->currentAction) ?>" class="browse-item<? if (!is_string($category)): ?> with-badge<? endif; ?><? if ($this->findby == $findby): ?> active<? endif; ?>">
           <? if(is_string($category)): ?>
             <?=$this->transEsc($category)?>
@@ -46,7 +46,7 @@
           $url .= '&amp;facet_prefix=' . urlencode($secondary['displayText']);
         }
         if ($this->secondaryParams) {
-          foreach($this->secondaryParams as $var=>$val) {
+          foreach($this->secondaryParams as $var => $val) {
             $url .= '&amp;' . $var .'=' . urlencode($val);
           }
         }
@@ -71,7 +71,7 @@
   <? if (!empty($this->resultList)): ?>
     <div class="browse-list" id="list4">
     <? foreach($this->resultList as $result): ?>
-      <a class="browse-item with-badge" href="<?=$SEARCH_BASE ?>?<?=$this->paramTitle ?><?=urlencode($result['value']) ?><? if ($this->searchParams): foreach($this->searchParams as $var=>$val): ?>&amp;<?=$var ?>=<?=urlencode($val) ?><? endforeach;endif; ?>">
+      <a class="browse-item with-badge" href="<?=$SEARCH_BASE ?>?<?=$this->paramTitle ?><?=urlencode($result['value']) ?><? if ($this->searchParams): foreach($this->searchParams as $var => $val): ?>&amp;<?=$var ?>=<?=urlencode($val) ?><? endforeach;endif; ?>">
         <?=$this->escapeHtml($result['displayText'])?>
         <span class="badge"><?=number_format($result['count']) ?></span>
       </a>
diff --git a/themes/bootstrap3/templates/confirm/confirm.phtml b/themes/bootstrap3/templates/confirm/confirm.phtml
index 66d461969a499dcbcc48b11bae79c4c9a0685aba..ba6c8248d04265f1cd4a3ba20e7c4377211b207f 100644
--- a/themes/bootstrap3/templates/confirm/confirm.phtml
+++ b/themes/bootstrap3/templates/confirm/confirm.phtml
@@ -7,7 +7,7 @@
   <div id="popupDetails" class="confirmDialog">
     <form class="pull-left flip" action="<?=$this->escapeHtmlAttr($this->confirm)?>" method="post">
       <? if (isset($this->extras)): ?>
-        <? foreach ($this->extras as $extra=>$value): ?>
+        <? foreach ($this->extras as $extra => $value): ?>
           <? if (is_array($value)): ?>
             <? foreach ($value as $current): ?>
               <input type="hidden" name="<?=$this->escapeHtmlAttr($extra) ?>[]" value="<?=$this->escapeHtmlAttr($current) ?>" />
diff --git a/themes/bootstrap3/templates/layout/layout.phtml b/themes/bootstrap3/templates/layout/layout.phtml
index d392b86a6ceba8dd336086072e691b262a11dee0..6088db3ef6635aa6b8a9e5825a96ff027fb6ab86 100644
--- a/themes/bootstrap3/templates/layout/layout.phtml
+++ b/themes/bootstrap3/templates/layout/layout.phtml
@@ -150,13 +150,13 @@ JS;
               <? if(count($this->layout()->breadcrumbs) > 1): ?>
                 <?=$this->render('breadcrumbs/multi.phtml', [
                     'parents' => $this->layout()->breadcrumbs,
-                    'title'   => $this->layout()->title,
-                    'from'    => $this->layout()->from
+                    'title' => $this->layout()->title,
+                    'from' => $this->layout()->from
                   ]) ?>
               <? else: ?>
                 <?=$this->render('breadcrumbs/default.phtml', [
                     'parents' => $this->layout()->breadcrumbs,
-                    'title'   => $this->layout()->title
+                    'title' => $this->layout()->title
                   ]) ?>
               <? endif; ?>
             <? else: ?>
diff --git a/themes/bootstrap3/templates/myresearch/checkedout.phtml b/themes/bootstrap3/templates/myresearch/checkedout.phtml
index 41f3a8c847e20f701f1bfc9c447fd204ae8c9edb..c02a4b95c513840b0eb7ca1fabca4f61ff4cd727 100644
--- a/themes/bootstrap3/templates/myresearch/checkedout.phtml
+++ b/themes/bootstrap3/templates/myresearch/checkedout.phtml
@@ -35,7 +35,7 @@
         );
         $transParams = [
           '%%start%%' => $this->localizedNumber($paginator->getAbsoluteItemNumber(1)),
-          '%%end%%'   => $this->localizedNumber($end),
+          '%%end%%' => $this->localizedNumber($end),
           '%%total%%' => $this->localizedNumber($paginator->getTotalItemCount())
         ];
       ?>
diff --git a/themes/bootstrap3/templates/myresearch/edit.phtml b/themes/bootstrap3/templates/myresearch/edit.phtml
index 24c42c84d58e7cc70104ed4ceaa02844c72e341a..121f6b544eea33ad9a7f133ba1c0445e617ed331 100644
--- a/themes/bootstrap3/templates/myresearch/edit.phtml
+++ b/themes/bootstrap3/templates/myresearch/edit.phtml
@@ -19,7 +19,7 @@
     </p>
   <? else: ?>
     <div class="list-edit-container">
-      <? foreach ($this->savedData as $i=>$current): ?>
+      <? foreach ($this->savedData as $i => $current): ?>
         <fieldset class="list-edit-group">
           <h3><?=$this->transEsc('List') ?>: <?=$this->escapeHtml($current['listTitle'])?></h3>
           <input type="hidden" name="lists[]" value="<?=$current['listId'] ?>"/>
@@ -46,7 +46,7 @@
     <div class="form-group">
       <select name="addToList" class="form-control">
         <option value="-1">- <?=$this->transEsc('Add to another list')?> -</option>
-        <? foreach ($this->lists as $listID=>$listTitle): ?>
+        <? foreach ($this->lists as $listID => $listTitle): ?>
           <option value="<?=$listID ?>"><?=$this->escapeHtml($listTitle) ?></option>
         <? endforeach; ?>
       </select>
diff --git a/themes/bootstrap3/templates/myresearch/holds.phtml b/themes/bootstrap3/templates/myresearch/holds.phtml
index 0c2a2c044a4cf5bec0065a461ec5ad0b6f0a1238..666ade221ff8fd5157527bdd70973cf0646bde42 100644
--- a/themes/bootstrap3/templates/myresearch/holds.phtml
+++ b/themes/bootstrap3/templates/myresearch/holds.phtml
@@ -141,7 +141,7 @@
             <br />
 
             <? if (isset($this->cancelResults['items'])): ?>
-              <? foreach ($this->cancelResults['items'] as $itemId=>$cancelResult): ?>
+              <? foreach ($this->cancelResults['items'] as $itemId => $cancelResult): ?>
                 <? if ($itemId == $ilsDetails['item_id'] && $cancelResult['success'] == false): ?>
                   <div class="alert alert-danger"><?=$this->transEsc($cancelResult['status']) ?><? if ($cancelResult['sysMessage']) echo ' : ' . $this->transEsc($cancelResult['sysMessage']); ?></div>
                 <? endif; ?>
diff --git a/themes/bootstrap3/templates/myresearch/illrequests.phtml b/themes/bootstrap3/templates/myresearch/illrequests.phtml
index ae12a510a4c67c6776959bf1f1ea17c8b04c1a69..1623f30384eeef17c2165a15def0a4ecf31feedc 100644
--- a/themes/bootstrap3/templates/myresearch/illrequests.phtml
+++ b/themes/bootstrap3/templates/myresearch/illrequests.phtml
@@ -136,7 +136,7 @@
             <br />
 
             <? if (isset($this->cancelResults['items'])): ?>
-              <? foreach ($this->cancelResults['items'] as $itemId=>$cancelResult): ?>
+              <? foreach ($this->cancelResults['items'] as $itemId => $cancelResult): ?>
                 <? if ($itemId == $ilsDetails['item_id'] && $cancelResult['success'] == false): ?>
                   <div class="alert alert-danger"><?=$this->transEsc($cancelResult['status']) ?><? if ($cancelResult['sysMessage']) echo ' : ' . $this->transEsc($cancelResult['sysMessage']); ?></div>
                 <? endif; ?>
diff --git a/themes/bootstrap3/templates/myresearch/menu.phtml b/themes/bootstrap3/templates/myresearch/menu.phtml
index bee1ddcb6128b27ea07d38e7dca786e3d21851e2..7dc68d9957fa6c32844f8b4cd97e77f4317be9dc 100644
--- a/themes/bootstrap3/templates/myresearch/menu.phtml
+++ b/themes/bootstrap3/templates/myresearch/menu.phtml
@@ -79,7 +79,7 @@
         <span class="badge"><?=$list->cnt ?></span>
       </a>
     <? endforeach; ?>
-    <a href="<?=$this->url('editList', ['id'=>'NEW'])?>">
+    <a href="<?=$this->url('editList', ['id' => 'NEW'])?>">
       <i class="fa fa-fw fa-plus" aria-hidden="true"></i> <?=$this->transEsc('Create a List') ?>
     </a>
   </div>
diff --git a/themes/bootstrap3/templates/myresearch/mylist.phtml b/themes/bootstrap3/templates/myresearch/mylist.phtml
index d016adee69f1f4916c4ffda04afa9bda06b86198..c5e9fd7d90281637502e82f348e9086c32610dc4 100644
--- a/themes/bootstrap3/templates/myresearch/mylist.phtml
+++ b/themes/bootstrap3/templates/myresearch/mylist.phtml
@@ -35,7 +35,7 @@
         <?
           $transParams = [
             '%%start%%' => $this->localizedNumber($this->results->getStartRecord()),
-            '%%end%%'   => $this->localizedNumber($this->results->getEndRecord()),
+            '%%end%%' => $this->localizedNumber($this->results->getEndRecord()),
             '%%total%%' => $this->localizedNumber($recordTotal)
           ];
         ?>
@@ -69,7 +69,7 @@
   <? if ($recordTotal > 0): ?>
     <form class="form-inline" method="post" name="bulkActionForm" action="<?=$this->url('cart-myresearchbulk')?>" data-lightbox data-lightbox-onsubmit="bulkFormHandler">
       <?=$this->context($this)->renderInContext('myresearch/bulk-action-buttons.phtml', ['idPrefix' => '', 'list' => isset($list) ? $list : null, 'account' => $this->account])?>
-      <? foreach ($this->results->getResults() as $i=>$current): ?>
+      <? foreach ($this->results->getResults() as $i => $current): ?>
         <?=$this->record($current)->getListEntry($list, $user)?>
       <? endforeach; ?>
     </form>
diff --git a/themes/bootstrap3/templates/myresearch/storageretrievalrequests.phtml b/themes/bootstrap3/templates/myresearch/storageretrievalrequests.phtml
index 4944d0ac443802fe1381afd57b3308d2c8f9caea..8c18dd905ea8e8f183f5c65f7de8f05437a181a5 100644
--- a/themes/bootstrap3/templates/myresearch/storageretrievalrequests.phtml
+++ b/themes/bootstrap3/templates/myresearch/storageretrievalrequests.phtml
@@ -136,7 +136,7 @@
             <br />
 
             <? if (isset($this->cancelResults['items'])): ?>
-              <? foreach ($this->cancelResults['items'] as $itemId=>$cancelResult): ?>
+              <? foreach ($this->cancelResults['items'] as $itemId => $cancelResult): ?>
                 <? if ($itemId == $ilsDetails['item_id'] && $cancelResult['success'] == false): ?>
                   <div class="alert alert-danger"><?=$this->transEsc($cancelResult['status']) ?><? if ($cancelResult['sysMessage']) echo ' : ' . $this->transEsc($cancelResult['sysMessage']); ?></div>
                 <? endif; ?>
diff --git a/themes/bootstrap3/templates/record/save.phtml b/themes/bootstrap3/templates/record/save.phtml
index b4ddeaeae26a81ea293590f7b74a8e507d387984..76f1145768252253449503f3cd0c94b9e2b371e1 100644
--- a/themes/bootstrap3/templates/record/save.phtml
+++ b/themes/bootstrap3/templates/record/save.phtml
@@ -14,7 +14,7 @@
   <input type="hidden" name="source" value="<?=$this->escapeHtmlAttr($this->driver->getSourceIdentifier())?>" />
   <? if (!empty($this->containingLists)): ?>
     <p><?=$this->transEsc('This item is already part of the following list/lists') ?>:
-    <? foreach ($this->containingLists as $i=>$list): ?>
+    <? foreach ($this->containingLists as $i => $list): ?>
       <a href="<?=$this->url('userList', ['id' => $list['id']]) ?>" data-lightbox-ignore><?=$this->escapeHtml($list['title'])?></a><? if($i < count($this->containingLists) - 1): ?>, <? endif; ?>
     <? endforeach; ?>
     </p><hr/>
diff --git a/themes/bootstrap3/templates/search/advanced/eds.phtml b/themes/bootstrap3/templates/search/advanced/eds.phtml
index b76550a0de426dc8e19152c6c3c0744c5f4ade94..353146d3026709e775ca3a35023237d7458e0c9a 100644
--- a/themes/bootstrap3/templates/search/advanced/eds.phtml
+++ b/themes/bootstrap3/templates/search/advanced/eds.phtml
@@ -95,7 +95,7 @@
         $min = !empty($current['values'][0]) ? min($current['values'][0], 1400) : 1400;
         $future = date('Y', time() + 31536000);
         $max = !empty($current['values'][1]) ? max($future, $current['values'][1]) : $future;
-        $low  = !empty($current['values'][0]) ? $current['values'][0] : $min;
+        $low = !empty($current['values'][0]) ? $current['values'][0] : $min;
         $high = !empty($current['values'][1]) ? $current['values'][1] : $max;
         $min = intval($min);
         $max = intval($max);
diff --git a/themes/bootstrap3/templates/search/advanced/layout.phtml b/themes/bootstrap3/templates/search/advanced/layout.phtml
index 66c1624dc7733c3679fc885388d33a7316402ac8..aba0b5e19e71867ce0e062876ca8e4f0d686dba5 100644
--- a/themes/bootstrap3/templates/search/advanced/layout.phtml
+++ b/themes/bootstrap3/templates/search/advanced/layout.phtml
@@ -46,7 +46,7 @@
   $setGroupCount = 0;
   $setQueries = [];
   if (isset($searchDetails) && is_object($searchDetails)) {
-    foreach ($searchDetails->getQueries() as $group=>$searchGroup) {
+    foreach ($searchDetails->getQueries() as $group => $searchGroup) {
       $setSearchGroups[$group] = $searchGroup->isNegated() ? 'NOT' : $searchGroup->getOperator();
       if ($setGroupCount < $group) {
         $setGroupCount = $group;
@@ -93,14 +93,14 @@
         <? if(!empty($this->formOverride)): ?>
           <?=$this->formOverride ?>
         <? else: ?>
-          <? for($group=0; $group < 3 || $group <= $setGroupCount; $group++): ?>
+          <? for($group = 0; $group < 3 || $group <= $setGroupCount; $group++): ?>
             <? if($group == 0): ?>
               <div id="new_group_template">
             <? endif; ?>
             <div id="group<?=$group ?>" class="adv-group">
               <div class="adv-group-terms">
                 <label class="adv-group-label"><?=$this->transEsc("adv_search_label")?>:</label>
-                <? for($search=0; $search < 3 || (isset($setQueries[$group]) && $search < count($setQueries[$group])); $search++): ?>
+                <? for($search = 0; $search < 3 || (isset($setQueries[$group]) && $search < count($setQueries[$group])); $search++): ?>
                   <? if($group == 0 && $search == 0): ?>
                     <div id="new_search_template">
                   <? endif; ?>
diff --git a/themes/bootstrap3/templates/search/advanced/ranges.phtml b/themes/bootstrap3/templates/search/advanced/ranges.phtml
index 500b86c6c3402fbebfc5d24713eebee9c6984f3d..b24fcc390af7225e6d379225e946093d514e41b4 100644
--- a/themes/bootstrap3/templates/search/advanced/ranges.phtml
+++ b/themes/bootstrap3/templates/search/advanced/ranges.phtml
@@ -25,7 +25,7 @@
           $min = !empty($current['values'][0]) ? min($current['values'][0], 1400) : 1400;
           $future = date('Y', time() + 31536000);
           $max = !empty($current['values'][1]) ? max($future, $current['values'][1]) : $future;
-          $low  = !empty($current['values'][0]) ? $current['values'][0] : $min;
+          $low = !empty($current['values'][0]) ? $current['values'][0] : $min;
           $high = !empty($current['values'][1]) ? $current['values'][1] : $max;
           $min = intval($min);
           $max = intval($max);
diff --git a/themes/bootstrap3/templates/search/controls/showing.phtml b/themes/bootstrap3/templates/search/controls/showing.phtml
index dd21b1209bef778afd0b0a40cf7c78d0780b5de7..e2cb68cd504d57a2c3e87492e7e27e32a6d9a176 100644
--- a/themes/bootstrap3/templates/search/controls/showing.phtml
+++ b/themes/bootstrap3/templates/search/controls/showing.phtml
@@ -1,7 +1,7 @@
 <?
   $transParams = [
     '%%start%%' => $this->localizedNumber($this->results->getStartRecord()),
-    '%%end%%'   => $this->localizedNumber($this->results->getEndRecord()),
+    '%%end%%' => $this->localizedNumber($this->results->getEndRecord()),
     '%%total%%' => $this->localizedNumber($this->recordTotal),
     '%%lookfor%%' => $this->escapeHtml($this->lookfor)
   ];
diff --git a/themes/bootstrap3/templates/search/facet-list.phtml b/themes/bootstrap3/templates/search/facet-list.phtml
index 433e70d90bc0f1c03e5a6a89dcdf84ca7004a27a..27703c6005642ecfb8a139821efb74caaeffff80 100644
--- a/themes/bootstrap3/templates/search/facet-list.phtml
+++ b/themes/bootstrap3/templates/search/facet-list.phtml
@@ -12,14 +12,14 @@
   <div class="full-facet-sort-options">
     <label><?=$this->translate('Sort') ?></label>
     <div class="btn-group">
-      <? foreach ($this->sortOptions as $key=>$sort): ?>
+      <? foreach ($this->sortOptions as $key => $sort): ?>
         <a href="<?=$urlBase . '&amp;facetpage=1&amp;facetsort=' . urlencode($key) ?>" class="btn btn-default js-facet-sort<? if($this->sort == $key): ?> active<? endif; ?>" data-sort="<?=$key ?>" data-lightbox-ignore><?=$this->translate($sort) ?></a>
       <? endforeach; ?>
     </div>
   </div>
 <? endif; ?>
 <div class="lightbox-scroll full-facets">
-  <? foreach ($this->sortOptions as $key=>$sort): ?>
+  <? foreach ($this->sortOptions as $key => $sort): ?>
     <? $active = $this->sort == $key; ?>
     <div class="full-facet-list facet-group<? if(!$active): ?> hidden<? endif; ?>" id="facet-list-<?=$this->escapeHtmlAttr($key) ?>">
       <? if ($active): ?>
diff --git a/themes/bootstrap3/templates/search/reservessearch.phtml b/themes/bootstrap3/templates/search/reservessearch.phtml
index d6219e06f30cb70b4b2759a13c3c9dc5bc213314..71e4eb67f3553222d1661b040bba283570d79519 100644
--- a/themes/bootstrap3/templates/search/reservessearch.phtml
+++ b/themes/bootstrap3/templates/search/reservessearch.phtml
@@ -27,7 +27,7 @@
         <?
           $transParams = [
             '%%start%%' => $this->localizedNumber($this->results->getStartRecord()),
-            '%%end%%'   => $this->localizedNumber($this->results->getEndRecord()),
+            '%%end%%' => $this->localizedNumber($this->results->getEndRecord()),
             '%%total%%' => $this->localizedNumber($recordTotal),
             '%%lookfor%%' => $this->escapeHtml($reservesLookfor)
           ];
diff --git a/themes/root/templates/RecordDriver/AbstractBase/export-ris.phtml b/themes/root/templates/RecordDriver/AbstractBase/export-ris.phtml
index f27f8fa3fec4b477b0f09228b47c4f8de3fedb41..21273f60f5f56c9869c442e01f86e678ccd98f69 100644
--- a/themes/root/templates/RecordDriver/AbstractBase/export-ris.phtml
+++ b/themes/root/templates/RecordDriver/AbstractBase/export-ris.phtml
@@ -108,14 +108,14 @@ if (is_array($languages)) {
     }
 }
 
-$genres =  $this->driver->tryMethod('getGenres');
+$genres = $this->driver->tryMethod('getGenres');
 if (is_array($genres)) {
     foreach ($genres as $genre) {
         echo 'M3  - ' . "$genre\r\n";
     }
 }
 
-$topics =  $this->driver->tryMethod('getTopics');
+$topics = $this->driver->tryMethod('getTopics');
 if (is_array($topics)) {
     foreach ($topics as $topic) {
         echo 'KW  - ' . "$topic\r\n";