diff --git a/classes/feeds.php b/classes/feeds.php
index 031a671ae..e6bd1459d 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -838,14 +838,14 @@ class Feeds extends Handler_Protected {
 		</script>
 
 			<div class="container">
-				<h1>Feed Debugger: <?php echo "$feed_id: " . $this->getFeedTitle($feed_id) ?></h1>
+				<h1>Feed Debugger: <?= "$feed_id: " . $this->getFeedTitle($feed_id) ?></h1>
 				<div class="content">
 					<form method="post" action="">
 						<input type="hidden" name="op" value="feeds">
 						<input type="hidden" name="method" value="update_debugger">
-						<input type="hidden" name="csrf_token" value="<?php echo $csrf_token ?>">
+						<input type="hidden" name="csrf_token" value="<?= $csrf_token ?>">
 						<input type="hidden" name="action" value="do_update">
-						<input type="hidden" name="feed_id" value="<?php echo $feed_id ?>">
+						<input type="hidden" name="feed_id" value="<?= $feed_id ?>">
 
 						<fieldset>
 							<label>
@@ -856,11 +856,11 @@ class Feeds extends Handler_Protected {
 						</fieldset>
 
 						<fieldset>
-							<label class="checkbox"><input dojoType="dijit.form.CheckBox" type="checkbox" name="force_refetch" value="1" <?php echo $refetch_checked ?>> Force refetch</label>
+							<label class="checkbox"><input dojoType="dijit.form.CheckBox" type="checkbox" name="force_refetch" value="1" <?= $refetch_checked ?>> Force refetch</label>
 						</fieldset>
 
 						<fieldset class="narrow">
-							<label class="checkbox"><input dojoType="dijit.form.CheckBox" type="checkbox" name="force_rehash" value="1" <?php echo $rehash_checked ?>> Force rehash</label>
+							<label class="checkbox"><input dojoType="dijit.form.CheckBox" type="checkbox" name="force_rehash" value="1" <?= $rehash_checked ?>> Force rehash</label>
 						</fieldset>
 
 						<button type="submit" dojoType="dijit.form.Button" class="alt-primary">Continue</button>
diff --git a/classes/handler/public.php b/classes/handler/public.php
index db8a924ad..481145606 100755
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -519,7 +519,7 @@ class Handler_Public extends Handler {
 		<!DOCTYPE html>
 		<html>
 		<head>
-			<title><?php echo __("Share with Tiny Tiny RSS") ?></title>
+			<title><?= __("Share with Tiny Tiny RSS") ?></title>
 			<?php
 			echo javascript_tag("lib/prototype.js");
 			echo javascript_tag("lib/dojo/dojo.js");
@@ -592,22 +592,22 @@ class Handler_Public extends Handler {
 					<input type="hidden" name="action" value="share">
 
 					<fieldset>
-						<label><?php echo __("Title:") ?></label>
-						<input style='width : 270px' dojoType='dijit.form.TextBox' name='title' value="<?php echo $title ?>">
+						<label><?= __("Title:") ?></label>
+						<input style='width : 270px' dojoType='dijit.form.TextBox' name='title' value="<?= $title ?>">
 					</fieldset>
 
 					<fieldset>
-						<label><?php echo __("URL:") ?></label>
-						<input style='width : 270px' name='url' dojoType='dijit.form.TextBox' value="<?php echo $url ?>">
+						<label><?= __("URL:") ?></label>
+						<input style='width : 270px' name='url' dojoType='dijit.form.TextBox' value="<?= $url ?>">
 					</fieldset>
 
 					<fieldset>
-						<label><?php echo __("Content:") ?></label>
+						<label><?= __("Content:") ?></label>
 						<input style='width : 270px' name='content' dojoType='dijit.form.TextBox' value="">
 					</fieldset>
 
 					<fieldset>
-						<label><?php echo __("Labels:") ?></label>
+						<label><?= __("Labels:") ?></label>
 						<input style='width : 270px' name='labels' dojoType='dijit.form.TextBox' id="labels_value"
 						   placeholder='Alpha, Beta, Gamma' value="">
 						<div class="autocomplete" id="labels_choices"
@@ -617,9 +617,9 @@ class Handler_Public extends Handler {
 					<hr/>
 
 					<fieldset>
-						<button dojoType='dijit.form.Button' class="alt-primary" type="submit"><?php echo __('Share') ?></button>
-						<button dojoType='dijit.form.Button' onclick="return window.close()"><?php echo __('Cancel') ?></button>
-						<span class="text-muted small"><?php echo __("Shared article will appear in the Published feed.") ?></span>
+						<button dojoType='dijit.form.Button' class="alt-primary" type="submit"><?= __('Share') ?></button>
+						<button dojoType='dijit.form.Button' onclick="return window.close()"><?= __('Cancel') ?></button>
+						<span class="text-muted small"><?= __("Shared article will appear in the Published feed.") ?></span>
 					</fieldset>
 
 				</form>
@@ -635,24 +635,24 @@ class Handler_Public extends Handler {
 
 			<?php print_error("Not logged in"); ?>
 
-			<form action="public.php?return=<?php echo $return ?>" method="post">
+			<form action="public.php?return=<?= $return ?>" method="post">
 
 				<input type="hidden" name="op" value="login">
 
 				<fieldset>
-					<label><?php echo __("Login:") ?></label>
+					<label><?= __("Login:") ?></label>
 					<input name="login" id="login" dojoType="dijit.form.TextBox" type="text"
 						   onchange="fetchProfiles()" onfocus="fetchProfiles()" onblur="fetchProfiles()"
-						   required="1" value="<?php echo $_SESSION["fake_login"] ?>" />
+						   required="1" value="<?= $_SESSION["fake_login"] ?>" />
 				</fieldset>
 
 				<fieldset>
-					<label><?php echo __("Password:") ?></label>
+					<label><?= __("Password:") ?></label>
 
 					<input type="password" name="password" required="1"
 						   dojoType="dijit.form.TextBox"
 						   class="input input-text"
-						   value="<?php echo $_SESSION["fake_password"] ?>"/>
+						   value="<?= $_SESSION["fake_password"] ?>"/>
 				</fieldset>
 
 				<hr/>
@@ -660,7 +660,7 @@ class Handler_Public extends Handler {
 				<fieldset>
 					<label> </label>
 
-					<button dojoType="dijit.form.Button" type="submit" class="alt-primary"><?php echo __('Log in') ?></button>
+					<button dojoType="dijit.form.Button" type="submit" class="alt-primary"><?= __('Log in') ?></button>
 				</fieldset>
 
 			</form>
@@ -781,7 +781,7 @@ class Handler_Public extends Handler {
 				};
 			</script>
 			<div class="container">
-			<h1><?php echo __("Subscribe to feed...") ?></h1>
+			<h1><?= __("Subscribe to feed...") ?></h1>
 			<div class='content'>
 			<?php
 
@@ -792,14 +792,14 @@ class Handler_Public extends Handler {
 					<?php print_hidden("csrf_token", $_SESSION["csrf_token"]) ?>
 					<fieldset>
 						<label>Feed or site URL:</label>
-						<input style="width: 300px" dojoType="dijit.form.ValidationTextBox" required="1" name="feed_url" value="<?php echo htmlspecialchars($feed_url) ?>">
+						<input style="width: 300px" dojoType="dijit.form.ValidationTextBox" required="1" name="feed_url" value="<?= htmlspecialchars($feed_url) ?>">
 					</fieldset>
 
 					<button class="alt-primary" dojoType="dijit.form.Button" type="submit">
-						<?php echo __("Subscribe") ?>
+						<?= __("Subscribe") ?>
 					</button>
 
-					<a href="index.php"><?php echo __("Return to Tiny Tiny RSS") ?></a>
+					<a href="index.php"><?= __("Return to Tiny Tiny RSS") ?></a>
 				</form>
 				<?php
 			} else {
@@ -1105,7 +1105,7 @@ class Handler_Public extends Handler {
 			<head>
 			<title>Database Updater</title>
 			<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-			<?php echo stylesheet_tag("themes/light.css") ?>
+			<?= stylesheet_tag("themes/light.css") ?>
 			<link rel="shortcut icon" type="image/png" href="images/favicon.png">
 			<link rel="icon" type="image/png" sizes="72x72" href="images/favicon-72px.png">
 			<?php
@@ -1135,7 +1135,7 @@ class Handler_Public extends Handler {
 			</script>
 
 			<div class="container">
-			<h1><?php echo __("Database Updater") ?></h1>
+			<h1><?= __("Database Updater") ?></h1>
 
 			<div class="content">
 
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 72a8344ad..6b5df0289 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -1223,52 +1223,52 @@ class Pref_Feeds extends Handler_Protected {
 			<div region='top' dojoType="fox.Toolbar">
 				<div style='float : right'>
 					<input dojoType="dijit.form.TextBox" id="feed_search" size="20" type="search"
-						value="<?php echo htmlspecialchars($feed_search) ?>">
+						value="<?= htmlspecialchars($feed_search) ?>">
 					<button dojoType="dijit.form.Button" onclick="dijit.byId('feedTree').reload()">
-						<?php echo __('Search') ?></button>
+						<?= __('Search') ?></button>
 				</div>
 
 				<div dojoType="fox.form.DropDownButton">
-					<span><?php echo __('Select') ?></span>
+					<span><?= __('Select') ?></span>
 					<div dojoType="dijit.Menu" style="display: none;">
 						<div onclick="dijit.byId('feedTree').model.setAllChecked(true)"
-							dojoType="dijit.MenuItem"><?php echo __('All') ?></div>
+							dojoType="dijit.MenuItem"><?= __('All') ?></div>
 						<div onclick="dijit.byId('feedTree').model.setAllChecked(false)"
-							dojoType="dijit.MenuItem"><?php echo __('None') ?></div>
+							dojoType="dijit.MenuItem"><?= __('None') ?></div>
 					</div>
 				</div>
 
 				<div dojoType="fox.form.DropDownButton">
-					<span><?php echo __('Feeds') ?></span>
+					<span><?= __('Feeds') ?></span>
 					<div dojoType="dijit.Menu" style="display: none">
 						<div onclick="CommonDialogs.quickAddFeed()"
-							dojoType="dijit.MenuItem"><?php echo __('Subscribe to feed') ?></div>
+							dojoType="dijit.MenuItem"><?= __('Subscribe to feed') ?></div>
 						<div onclick="dijit.byId('feedTree').editSelectedFeed()"
-							dojoType="dijit.MenuItem"><?php echo __('Edit selected feeds') ?></div>
+							dojoType="dijit.MenuItem"><?= __('Edit selected feeds') ?></div>
 						<div onclick="dijit.byId('feedTree').resetFeedOrder()"
-							dojoType="dijit.MenuItem"><?php echo __('Reset sort order') ?></div>
+							dojoType="dijit.MenuItem"><?= __('Reset sort order') ?></div>
 						<div onclick="dijit.byId('feedTree').batchSubscribe()"
-							dojoType="dijit.MenuItem"><?php echo __('Batch subscribe') ?></div>
+							dojoType="dijit.MenuItem"><?= __('Batch subscribe') ?></div>
 						<div dojoType="dijit.MenuItem" onclick="dijit.byId('feedTree').removeSelectedFeeds()">
-							<?php echo __('Unsubscribe') ?></div>
+							<?= __('Unsubscribe') ?></div>
 					</div>
 				</div>
 
 				<?php if (get_pref('ENABLE_FEED_CATS')) { ?>
 					<div dojoType="fox.form.DropDownButton">
-						<span><?php echo __('Categories') ?></span>
+						<span><?= __('Categories') ?></span>
 						<div dojoType="dijit.Menu" style="display: none">
 							<div onclick="dijit.byId('feedTree').createCategory()"
-								dojoType="dijit.MenuItem"><?php echo __('Add category') ?></div>
+								dojoType="dijit.MenuItem"><?= __('Add category') ?></div>
 							<div onclick="dijit.byId('feedTree').resetCatOrder()"
-								dojoType="dijit.MenuItem"><?php echo __('Reset sort order') ?></div>
+								dojoType="dijit.MenuItem"><?= __('Reset sort order') ?></div>
 							<div onclick="dijit.byId('feedTree').removeSelectedCategories()"
-								dojoType="dijit.MenuItem"><?php echo __('Remove selected') ?></div>
+								dojoType="dijit.MenuItem"><?= __('Remove selected') ?></div>
 						</div>
 					</div>
 				<?php } ?>
-				<?php echo $error_button ?>
-				<?php echo $inactive_button ?>
+				<?= $error_button ?>
+				<?= $inactive_button ?>
 			</div>
 			<div style="padding : 0px" dojoType="dijit.layout.ContentPane" region="center">
 				<div dojoType="fox.PrefFeedStore" jsId="feedStore"
@@ -1283,7 +1283,7 @@ class Pref_Feeds extends Handler_Protected {
 				<div dojoType="fox.PrefFeedTree" id="feedTree"
 					dndController="dijit.tree.dndSource"
 					betweenThreshold="5"
-					autoExpand="<?php echo (!empty($feed_search) ? "true" : "false") ?>"
+					autoExpand="<?= (!empty($feed_search) ? "true" : "false") ?>"
 					persist="true"
 					model="feedModel"
 					openOnClick="false">
@@ -1311,19 +1311,19 @@ class Pref_Feeds extends Handler_Protected {
 	private function index_opml() {
 		?>
 
-		<h3><?php echo __("Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings.") ?></h3>
+		<h3><?= __("Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings.") ?></h3>
 
 		<?php print_notice("Only main settings profile can be migrated using OPML.") ?>
 
 		<form id='opml_import_form' method='post' enctype='multipart/form-data'>
-			<label class='dijitButton'><?php echo __("Choose file...") ?>
+			<label class='dijitButton'><?= __("Choose file...") ?>
 				<input style='display : none' id='opml_file' name='opml_file' type='file'>
 			</label>
 			<input type='hidden' name='op' value='pref-feeds'>
-			<input type='hidden' name='csrf_token' value="<?php echo $_SESSION['csrf_token'] ?>">
+			<input type='hidden' name='csrf_token' value="<?= $_SESSION['csrf_token'] ?>">
 			<input type='hidden' name='method' value='importOpml'>
 			<button dojoType='dijit.form.Button' class='alt-primary' onclick="return Helpers.OPML.import()" type="submit">
-				<?php echo __('Import OPML') ?>
+				<?= __('Import OPML') ?>
 			</button>
 		</form>
 
@@ -1331,26 +1331,26 @@ class Pref_Feeds extends Handler_Protected {
 
 		<form dojoType='dijit.form.Form' id='opmlExportForm' style='display : inline-block'>
 			<button dojoType='dijit.form.Button' onclick='Helpers.OPML.export()'>
-				<?php echo __('Export OPML') ?>
+				<?= __('Export OPML') ?>
 			</button>
 
 			<label class='checkbox'>
 				<?php print_checkbox("include_settings", true, "1", "") ?>
-				<?php echo __("Include settings") ?>
+				<?= __("Include settings") ?>
 			</label>
 		</form>
 
 		<hr/>
 
-		<h2><?php echo __("Published OPML") ?></h2>
+		<h2><?= __("Published OPML") ?></h2>
 
 		<p>
-			<?php echo __('Your OPML can be published publicly and can be subscribed by anyone who knows the URL below.') ?>
-			<?php echo __("Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds.") ?>
+			<?= __('Your OPML can be published publicly and can be subscribed by anyone who knows the URL below.') ?>
+			<?= __("Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds.") ?>
 		</p>
 
 		<button dojoType='dijit.form.Button' class='alt-primary' onclick="return CommonDialogs.publishedOPML()">
-			<?php echo __('Display published OPML URL') ?>
+			<?= __('Display published OPML URL') ?>
 		</button>
 
 		<?php
@@ -1362,15 +1362,15 @@ class Pref_Feeds extends Handler_Protected {
 			"/public.php?op=rss&id=-2&view-mode=all_articles");
 		?>
 
-		<h3><?php echo __('Published articles can be subscribed by anyone who knows the following URL:') ?></h3>
+		<h3><?= __('Published articles can be subscribed by anyone who knows the following URL:') ?></h3>
 
 		<button dojoType='dijit.form.Button' class='alt-primary'
-			onclick='CommonDialogs.generatedFeed(-2, false, "<?php echo $rss_url ?>", "<?php echo __("Published articles") ?>")'>
-			<?php echo __('Display URL') ?>
+			onclick='CommonDialogs.generatedFeed(-2, false, "<?= $rss_url ?>", "<?= __("Published articles") ?>")'>
+			<?= __('Display URL') ?>
 		</button>
 
 		<button class='alt-danger' dojoType='dijit.form.Button' onclick='return Helpers.Feeds.clearFeedAccessKeys()'>
-			<?php echo __('Clear all generated URLs') ?>
+			<?= __('Clear all generated URLs') ?>
 		</button>
 
 		<?php
@@ -1382,17 +1382,17 @@ class Pref_Feeds extends Handler_Protected {
 
 		<div dojoType='dijit.layout.TabContainer' tabPosition='left-h'>
 			<div style='padding : 0px' dojoType='dijit.layout.ContentPane'
-				title="<i class='material-icons'>rss_feed</i> <?php echo __('My feeds') ?>">
+				title="<i class='material-icons'>rss_feed</i> <?= __('My feeds') ?>">
 				<?php $this->index_feeds() ?>
 			</div>
 
 			<div dojoType='dijit.layout.ContentPane'
-						title="<i class='material-icons'>import_export</i> <?php echo __('OPML') ?>">
+						title="<i class='material-icons'>import_export</i> <?= __('OPML') ?>">
 						<?php $this->index_opml() ?>
 					</div>
 
 			<div dojoType="dijit.layout.ContentPane"
-				title="<i class='material-icons'>share</i> <?php echo __('Sharing') ?>">
+				title="<i class='material-icons'>share</i> <?= __('Sharing') ?>">
 				<?php $this->index_shared() ?>
 			</div>
 
@@ -1405,10 +1405,10 @@ class Pref_Feeds extends Handler_Protected {
 
 			<?php if ($plugin_data) { ?>
 				<div dojoType='dijit.layout.ContentPane'
-					title="<i class='material-icons'>extension</i> <?php echo __('Plugins') ?>">
+					title="<i class='material-icons'>extension</i> <?= __('Plugins') ?>">
 
 					<div dojoType='dijit.layout.AccordionContainer' region='center'>
-						<?php echo $plugin_data ?>
+						<?= $plugin_data ?>
 					</div>
 				</div>
 			<?php } ?>
diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index 571ddce4a..c898a8b67 100755
--- a/classes/pref/filters.php
+++ b/classes/pref/filters.php
@@ -717,31 +717,31 @@ class Pref_Filters extends Handler_Protected {
 
 					<div style='float : right; padding-right : 4px;'>
 						<input dojoType="dijit.form.TextBox" id="filter_search" size="20" type="search"
-							value="<?php echo htmlspecialchars($filter_search) ?>">
+							value="<?= htmlspecialchars($filter_search) ?>">
 						<button dojoType="dijit.form.Button" onclick="dijit.byId('filterTree').reload()">
-							<?php echo __('Search') ?></button>
+							<?= __('Search') ?></button>
 					</div>
 
 					<div dojoType="fox.form.DropDownButton">
-						<span><?php echo __('Select') ?></span>
+						<span><?= __('Select') ?></span>
 						<div dojoType="dijit.Menu" style="display: none;">
 							<div onclick="dijit.byId('filterTree').model.setAllChecked(true)"
-								dojoType="dijit.MenuItem"><?php echo __('All') ?></div>
+								dojoType="dijit.MenuItem"><?= __('All') ?></div>
 							<div onclick="dijit.byId('filterTree').model.setAllChecked(false)"
-								dojoType="dijit.MenuItem"><?php echo __('None') ?></div>
+								dojoType="dijit.MenuItem"><?= __('None') ?></div>
 						</div>
 					</div>
 
 					<button dojoType="dijit.form.Button" onclick="return Filters.edit()">
-						<?php echo __('Create filter') ?></button>
+						<?= __('Create filter') ?></button>
 					<button dojoType="dijit.form.Button" onclick="return dijit.byId('filterTree').joinSelectedFilters()">
-						<?php echo __('Combine') ?></button>
+						<?= __('Combine') ?></button>
 					<button dojoType="dijit.form.Button" onclick="return dijit.byId('filterTree').editSelectedFilter()">
-						<?php echo __('Edit') ?></button>
+						<?= __('Edit') ?></button>
 					<button dojoType="dijit.form.Button" onclick="return dijit.byId('filterTree').resetFilterOrder()">
-						<?php echo __('Reset sort order') ?></button>
+						<?= __('Reset sort order') ?></button>
 					<button dojoType="dijit.form.Button" onclick="return dijit.byId('filterTree').removeSelectedFilters()">
-						<?php echo __('Remove') ?></button>
+						<?= __('Remove') ?></button>
 
 				</div>
 			</div>
diff --git a/classes/pref/labels.php b/classes/pref/labels.php
index 22a2dddea..d182a0995 100644
--- a/classes/pref/labels.php
+++ b/classes/pref/labels.php
@@ -195,23 +195,23 @@ class Pref_Labels extends Handler_Protected {
 			<div style='padding : 0px' dojoType='dijit.layout.ContentPane' region='top'>
 				<div dojoType='fox.Toolbar'>
 					<div dojoType='fox.form.DropDownButton'>
-						<span><?php echo __('Select') ?></span>
+						<span><?= __('Select') ?></span>
 						<div dojoType='dijit.Menu' style='display: none'>
 						<div onclick="dijit.byId('labelTree').model.setAllChecked(true)"
-							dojoType='dijit.MenuItem'><?php echo('All') ?></div>
+							dojoType='dijit.MenuItem'><?=('All') ?></div>
 						<div onclick="dijit.byId('labelTree').model.setAllChecked(false)"
-							dojoType='dijit.MenuItem'><?php echo('None') ?></div>
+							dojoType='dijit.MenuItem'><?=('None') ?></div>
 					</div>
 				</div>
 
 				<button dojoType='dijit.form.Button' onclick='CommonDialogs.addLabel()'>
-					<?php echo('Create label') ?></button dojoType='dijit.form.Button'>
+					<?=('Create label') ?></button dojoType='dijit.form.Button'>
 
 				<button dojoType='dijit.form.Button' onclick="dijit.byId('labelTree').removeSelected()">
-					<?php echo('Remove') ?></button dojoType='dijit.form.Button'>
+					<?=('Remove') ?></button dojoType='dijit.form.Button'>
 
 				<button dojoType='dijit.form.Button' onclick="dijit.byId('labelTree').resetColors()">
-					<?php echo('Clear colors') ?></button dojoType='dijit.form.Button'>
+					<?=('Clear colors') ?></button dojoType='dijit.form.Button'>
 
 				</div>
 			</div>
diff --git a/classes/pref/system.php b/classes/pref/system.php
index 72e15e4f3..1adddf116 100644
--- a/classes/pref/system.php
+++ b/classes/pref/system.php
@@ -76,30 +76,30 @@ class Pref_System extends Handler_Protected {
 			<div region='top' dojoType='fox.Toolbar'>
 
 				<button dojoType='dijit.form.Button' onclick='Helpers.EventLog.refresh()'>
-					<?php echo __('Refresh') ?>
+					<?= __('Refresh') ?>
 				</button>
 
-				<button dojoType='dijit.form.Button' <?php echo ($page <= 0 ? "disabled" : "") ?>
+				<button dojoType='dijit.form.Button' <?= ($page <= 0 ? "disabled" : "") ?>
 					onclick='Helpers.EventLog.prevPage()'>
-					<?php echo __('&lt;&lt;') ?>
+					<?= __('&lt;&lt;') ?>
 				</button>
 
 				<button dojoType='dijit.form.Button' disabled>
-					<?php echo T_sprintf('Page %d of %d', $page+1, $total_pages+1) ?>
+					<?= T_sprintf('Page %d of %d', $page+1, $total_pages+1) ?>
 				</button>
 
-				<button dojoType='dijit.form.Button' <?php echo ($page >= $total_pages ? "disabled" : "") ?>
+				<button dojoType='dijit.form.Button' <?= ($page >= $total_pages ? "disabled" : "") ?>
 					onclick='Helpers.EventLog.nextPage()'>
-					<?php echo __('&gt;&gt;') ?>
+					<?= __('&gt;&gt;') ?>
 				</button>
 
 				<button dojoType='dijit.form.Button'
 					onclick='Helpers.EventLog.clear()'>
-					<?php echo __('Clear') ?>
+					<?= __('Clear') ?>
 				</button>
 
 				<div class='pull-right'>
-					<?php echo __("Severity:") ?>
+					<?= __("Severity:") ?>
 
 					<?php print_select_hash("severity", $severity,
 						[
@@ -115,11 +115,11 @@ class Pref_System extends Handler_Protected {
 				<table width='100%' class='event-log'>
 
 					<tr class='title'>
-						<td width='5%'><?php echo __("Error") ?></td>
-						<td><?php echo __("Filename") ?></td>
-						<td><?php echo __("Message") ?></td>
-						<td width='5%'><?php echo __("User") ?></td>
-						<td width='5%'><?php echo __("Date") ?></td>
+						<td width='5%'><?= __("Error") ?></td>
+						<td><?= __("Filename") ?></td>
+						<td><?= __("Message") ?></td>
+						<td width='5%'><?= __("User") ?></td>
+						<td width='5%'><?= __("Date") ?></td>
 					</tr>
 
 					<?php
@@ -140,13 +140,13 @@ class Pref_System extends Handler_Protected {
 						?>
 						<tr>
 							<td class='errno'>
-								<?php echo Logger::$errornames[$line["errno"]] . " (" . $line["errno"] . ")" ?>
+								<?= Logger::$errornames[$line["errno"]] . " (" . $line["errno"] . ")" ?>
 							</td>
-							<td class='filename'><?php echo  $line["filename"] . ":" . $line["lineno"] ?></td>
-							<td class='errstr'><?php echo  $line["errstr"] . "\n" .  $line["context"] ?></td>
-							<td class='login'><?php echo  $line["login"] ?></td>
+							<td class='filename'><?= $line["filename"] . ":" . $line["lineno"] ?></td>
+							<td class='errstr'><?= $line["errstr"] . "\n" .  $line["context"] ?></td>
+							<td class='login'><?= $line["login"] ?></td>
 							<td class='timestamp'>
-								<?php echo TimeHelper::make_local_datetime($line["created_at"], false) ?>
+								<?= TimeHelper::make_local_datetime($line["created_at"], false) ?>
 							</td>
 						</tr>
 					<?php } ?>
@@ -162,7 +162,7 @@ class Pref_System extends Handler_Protected {
 		$page = (int) ($_REQUEST["page"] ?? 0);
 		?>
 		<div dojoType='dijit.layout.AccordionContainer' region='center'>
-			<div dojoType='dijit.layout.AccordionPane' style='padding : 0' title='<i class="material-icons">report</i> <?php echo __('Event Log') ?>'>
+			<div dojoType='dijit.layout.AccordionPane' style='padding : 0' title='<i class="material-icons">report</i> <?= __('Event Log') ?>'>
 				<?php
 					if (LOG_DESTINATION == "sql") {
 						$this->log_viewer($page, $severity);
@@ -172,11 +172,11 @@ class Pref_System extends Handler_Protected {
 				?>
 			</div>
 
-			<div dojoType='dijit.layout.AccordionPane' title='<i class="material-icons">info</i> <?php echo __('PHP Information') ?>'>
+			<div dojoType='dijit.layout.AccordionPane' title='<i class="material-icons">info</i> <?= __('PHP Information') ?>'>
 				<script type='dojo/method' event='onSelected' args='evt'>
 					Helpers.System.getPHPInfo(this);
 				</script>
-				<div class='phpinfo'><?php echo __("Loading, please wait...") ?></div>
+				<div class='phpinfo'><?= __("Loading, please wait...") ?></div>
 			</div>
 
 			<?php PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB, "prefSystem") ?>
diff --git a/include/login_form.php b/include/login_form.php
index aec305b13..aa6a72260 100755
--- a/include/login_form.php
+++ b/include/login_form.php
@@ -92,29 +92,29 @@
 
 <div class="container">
 
-	<h1><?php echo "Authentication" ?></h1>
+	<h1><?= "Authentication" ?></h1>
 	<div class="content">
-		<form action="public.php?return=<?php echo $return ?>"
+		<form action="public.php?return=<?= $return ?>"
 			  dojoType="dijit.form.Form" method="POST">
 
 			<?php print_hidden("op", "login"); ?>
 
 			<?php if (!empty($_SESSION["login_error_msg"])) { ?>
-				<?php echo format_error($_SESSION["login_error_msg"]) ?>
+				<?= format_error($_SESSION["login_error_msg"]) ?>
 				<?php $_SESSION["login_error_msg"] = ""; ?>
 			<?php } ?>
 
 			<fieldset>
-				<label><?php echo __("Login:") ?></label>
+				<label><?= __("Login:") ?></label>
 				<input name="login" id="login" dojoType="dijit.form.TextBox" type="text"
 					   onchange="UtilityApp.fetchProfiles()"
 					   onfocus="UtilityApp.fetchProfiles()"
 					   onblur="UtilityApp.fetchProfiles()"
-					   required="1" value="<?php echo $_SESSION["fake_login"] ?? "" ?>" />
+					   required="1" value="<?= $_SESSION["fake_login"] ?? "" ?>" />
 			</fieldset>
 
 			<fieldset>
-				<label><?php echo __("Password:") ?></label>
+				<label><?= __("Password:") ?></label>
 
 				<input type="password" name="password" required="1"
 					   dojoType="dijit.form.TextBox"
@@ -122,19 +122,19 @@
 					   onchange="UtilityApp.fetchProfiles()"
 					   onfocus="UtilityApp.fetchProfiles()"
 					   onblur="UtilityApp.fetchProfiles()"
-					   value="<?php echo $_SESSION["fake_password"] ?? "" ?>"/>
+					   value="<?= $_SESSION["fake_password"] ?? "" ?>"/>
 			</fieldset>
 			<?php if (strpos(PLUGINS, "auth_internal") !== false) { ?>
 				<fieldset class="align-right">
-					<a href="public.php?op=forgotpass"><?php echo __("I forgot my password") ?></a>
+					<a href="public.php?op=forgotpass"><?= __("I forgot my password") ?></a>
 				</fieldset>
 			<?php } ?>
 
 			<fieldset>
-				<label><?php echo __("Profile:") ?></label>
+				<label><?= __("Profile:") ?></label>
 
 				<select disabled='disabled' name="profile" id="profile" dojoType='dijit.form.Select'>
-					<option><?php echo __("Default profile") ?></option>
+					<option><?= __("Default profile") ?></option>
 				</select>
 			</fieldset>
 
@@ -143,11 +143,11 @@
 
 				<label id="bw_limit_label"><input dojoType="dijit.form.CheckBox" name="bw_limit" id="bw_limit"
 					  type="checkbox" onchange="UtilityApp.bwLimitChange(this)">
-					<?php echo __("Use less traffic") ?></label>
+					<?= __("Use less traffic") ?></label>
 			</fieldset>
 
 			<div dojoType="dijit.Tooltip" connectId="bw_limit_label" position="below" style="display:none">
-				<?php echo __("Does not display images in articles, reduces automatic refreshes."); ?>
+				<?= __("Does not display images in articles, reduces automatic refreshes."); ?>
 			</div>
 
 			<fieldset class="narrow">
@@ -155,11 +155,11 @@
 
 				<label id="safe_mode_label"><input dojoType="dijit.form.CheckBox" name="safe_mode" id="safe_mode"
 					  type="checkbox">
-					<?php echo __("Safe mode") ?></label>
+					<?= __("Safe mode") ?></label>
 			</fieldset>
 
 			<div dojoType="dijit.Tooltip" connectId="safe_mode_label" position="below" style="display:none">
-				<?php echo __("Uses default theme and prevents all plugins from loading."); ?>
+				<?= __("Uses default theme and prevents all plugins from loading."); ?>
 			</div>
 			<?php if (SESSION_COOKIE_LIFETIME > 0) { ?>
 
@@ -167,7 +167,7 @@
 					<label> </label>
 					<label>
 						<input dojoType="dijit.form.CheckBox" name="remember_me" id="remember_me" type="checkbox">
-						<?php echo __("Remember me") ?>
+						<?= __("Remember me") ?>
 					</label>
 				</fieldset>
 
@@ -177,7 +177,7 @@
 
 			<fieldset class="align-right">
 				<label> </label>
-				<button dojoType="dijit.form.Button" type="submit" class="alt-primary"><?php echo __('Log in') ?></button>
+				<button dojoType="dijit.form.Button" type="submit" class="alt-primary"><?= __('Log in') ?></button>
 			</fieldset>
 
 		</form>
@@ -185,7 +185,7 @@
 
 	<div class="footer">
 		<a href="https://tt-rss.org/">Tiny Tiny RSS</a>
-		&copy; 2005&ndash;<?php echo date('Y') ?> <a href="https://fakecake.org/">Andrew Dolgov</a>
+		&copy; 2005&ndash;<?= date('Y') ?> <a href="https://fakecake.org/">Andrew Dolgov</a>
 	</div>
 
 </div>
diff --git a/index.php b/index.php
index fa23570ff..8bfca1af2 100644
--- a/index.php
+++ b/index.php
@@ -47,7 +47,7 @@
 	} ?>
 
 	<script type="text/javascript">
-		const __csrf_token = "<?php echo $_SESSION["csrf_token"]; ?>";
+		const __csrf_token = "<?= $_SESSION["csrf_token"]; ?>";
 	</script>
 
 	<?php UserHelper::print_user_stylesheet() ?>
@@ -68,7 +68,7 @@
 	<script>
 		dojoConfig = {
 			async: true,
-			cacheBust: "<?php echo get_scripts_timestamp(); ?>",
+			cacheBust: "<?= get_scripts_timestamp(); ?>",
 			packages: [
 				{ name: "fox", location: "../../js" },
 			]
@@ -132,7 +132,7 @@
 
 <div id="overlay" style="display : block">
 	<div id="overlay_inner">
-		<?php echo __("Loading, please wait...") ?>
+		<?= __("Loading, please wait...") ?>
 		<div dojoType="dijit.ProgressBar" places="0" style="width : 300px" id="loading_bar"
 	     progress="0" maximum="100">
 		</div>
@@ -147,7 +147,7 @@
     <div id="feeds-holder" dojoType="dijit.layout.ContentPane" region="leading" style="width : 20%" splitter="true">
         <div id="feedlistLoading">
             <img src='images/indicator_tiny.gif'/>
-            <?php echo  __("Loading, please wait..."); ?></div>
+            <?= __("Loading, please wait..."); ?></div>
         <?php
 			 PluginHost::getInstance()->run_hooks_callback(PluginHost::HOOK_FEED_TREE, function ($result) {
 				 echo $result;
@@ -161,13 +161,13 @@
             <div id="toolbar" dojoType="fox.Toolbar">
 
             <i class="material-icons net-alert" style="display : none"
-                title="<?php echo __("Communication problem with server.") ?>">error_outline</i>
+                title="<?= __("Communication problem with server.") ?>">error_outline</i>
 
             <i class="material-icons log-alert" style="display : none" onclick="App.openPreferences('system')"
-                 title="<?php echo __("Recent entries found in event log.") ?>">warning</i>
+                 title="<?= __("Recent entries found in event log.") ?>">warning</i>
 
             <i id="updates-available" class="material-icons icon-new-version" style="display : none"
-               title="<?php echo __('Updates are available from Git.') ?>">new_releases</i>
+               title="<?= __('Updates are available from Git.') ?>">new_releases</i>
 
             <?php
 
@@ -182,26 +182,26 @@
 
             <form id="toolbar-main" action="" style="order : 20" onsubmit='return false'>
 
-            <select name="view_mode" title="<?php echo __('Show articles') ?>"
+            <select name="view_mode" title="<?= __('Show articles') ?>"
                 onchange="App.onViewModeChanged()"
                 dojoType="fox.form.Select">
-                <option selected="selected" value="adaptive"><?php echo __('Adaptive') ?></option>
-                <option value="all_articles"><?php echo __('All Articles') ?></option>
-                <option value="marked"><?php echo __('Starred') ?></option>
-                <option value="published"><?php echo __('Published') ?></option>
-                <option value="unread"><?php echo __('Unread') ?></option>
-                <option value="has_note"><?php echo __('With Note') ?></option>
-                <!-- <option value="noscores"><?php echo __('Ignore Scoring') ?></option> -->
+                <option selected="selected" value="adaptive"><?= __('Adaptive') ?></option>
+                <option value="all_articles"><?= __('All Articles') ?></option>
+                <option value="marked"><?= __('Starred') ?></option>
+                <option value="published"><?= __('Published') ?></option>
+                <option value="unread"><?= __('Unread') ?></option>
+                <option value="has_note"><?= __('With Note') ?></option>
+                <!-- <option value="noscores"><?= __('Ignore Scoring') ?></option> -->
             </select>
 
-			<select title="<?php echo __('Sort articles') ?>"
+			<select title="<?= __('Sort articles') ?>"
                 onchange="App.onViewModeChanged()"
                 dojoType="fox.form.Select" name="order_by">
 
-				<option selected="selected" value="default"><?php echo __('Default') ?></option>
-                <option value="feed_dates"><?php echo __('Newest first') ?></option>
-                <option value="date_reverse"><?php echo __('Oldest first') ?></option>
-                <option value="title"><?php echo __('Title') ?></option>
+				<option selected="selected" value="default"><?= __('Default') ?></option>
+                <option value="feed_dates"><?= __('Newest first') ?></option>
+                <option value="date_reverse"><?= __('Oldest first') ?></option>
+                <option value="title"><?= __('Title') ?></option>
 
 				<?php
 					PluginHost::getInstance()->run_hooks_callback(PluginHost::HOOK_HEADLINES_CUSTOM_SORT_MAP, function ($result) {
@@ -213,16 +213,16 @@
             </select>
 
             <div dojoType="fox.form.ComboButton" onclick="Feeds.catchupCurrent()">
-                <span><?php echo __('Mark as read') ?></span>
+                <span><?= __('Mark as read') ?></span>
                 <div dojoType="dijit.DropDownMenu">
                     <div dojoType="dijit.MenuItem" onclick="Feeds.catchupCurrent('1day')">
-                        <?php echo __('Older than one day') ?>
+                        <?= __('Older than one day') ?>
                     </div>
                     <div dojoType="dijit.MenuItem" onclick="Feeds.catchupCurrent('1week')">
-                        <?php echo __('Older than one week') ?>
+                        <?= __('Older than one week') ?>
                     </div>
                     <div dojoType="dijit.MenuItem" onclick="Feeds.catchupCurrent('2week')">
-                        <?php echo __('Older than two weeks') ?>
+                        <?= __('Older than two weeks') ?>
                     </div>
                 </div>
             </div>
@@ -237,21 +237,21 @@
 						});
                 ?>
 
-                <div dojoType="fox.form.DropDownButton" class="action-button" title="<?php echo __('Actions...') ?>">
+                <div dojoType="fox.form.DropDownButton" class="action-button" title="<?= __('Actions...') ?>">
 					<span><i class="material-icons">menu</i></span>
                     <div dojoType="dijit.Menu" style="display: none">
-                        <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcPrefs')"><?php echo __('Preferences...') ?></div>
-                        <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcSearch')"><?php echo __('Search...') ?></div>
-                        <div dojoType="dijit.MenuItem" disabled="1"><?php echo __('Feed actions:') ?></div>
-                        <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcAddFeed')"><?php echo __('Subscribe to feed...') ?></div>
-                        <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcEditFeed')"><?php echo __('Edit this feed...') ?></div>
-                        <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcRemoveFeed')"><?php echo __('Unsubscribe') ?></div>
-                        <div dojoType="dijit.MenuItem" disabled="1"><?php echo __('All feeds:') ?></div>
-                        <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcCatchupAll')"><?php echo __('Mark as read') ?></div>
-                        <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcShowOnlyUnread')"><?php echo __('(Un)hide read feeds') ?></div>
-                        <div dojoType="dijit.MenuItem" disabled="1"><?php echo __('Other actions:') ?></div>
-                        <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcToggleWidescreen')"><?php echo __('Toggle widescreen mode') ?></div>
-                        <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcHKhelp')"><?php echo __('Keyboard shortcuts help') ?></div>
+                        <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcPrefs')"><?= __('Preferences...') ?></div>
+                        <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcSearch')"><?= __('Search...') ?></div>
+                        <div dojoType="dijit.MenuItem" disabled="1"><?= __('Feed actions:') ?></div>
+                        <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcAddFeed')"><?= __('Subscribe to feed...') ?></div>
+                        <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcEditFeed')"><?= __('Edit this feed...') ?></div>
+                        <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcRemoveFeed')"><?= __('Unsubscribe') ?></div>
+                        <div dojoType="dijit.MenuItem" disabled="1"><?= __('All feeds:') ?></div>
+                        <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcCatchupAll')"><?= __('Mark as read') ?></div>
+                        <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcShowOnlyUnread')"><?= __('(Un)hide read feeds') ?></div>
+                        <div dojoType="dijit.MenuItem" disabled="1"><?= __('Other actions:') ?></div>
+                        <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcToggleWidescreen')"><?= __('Toggle widescreen mode') ?></div>
+                        <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcHKhelp')"><?= __('Keyboard shortcuts help') ?></div>
 
                         <?php
 									PluginHost::getInstance()->run_hooks_callback(PluginHost::HOOK_ACTION_ITEM, function ($result) {
@@ -260,7 +260,7 @@
                         ?>
 
                         <?php if (empty($_SESSION["hide_logout"])) { ?>
-                            <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcLogout')"><?php echo __('Logout') ?></div>
+                            <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcLogout')"><?= __('Logout') ?></div>
                         <?php } ?>
                     </div>
                 </div>
@@ -271,7 +271,7 @@
             <div id="headlines-frame" dojoType="dijit.layout.ContentPane" tabindex="0"
                     region="center">
                 <div id="headlinesInnerContainer">
-                    <div class="whiteBox"><?php echo __('Loading, please wait...') ?></div>
+                    <div class="whiteBox"><?= __('Loading, please wait...') ?></div>
                 </div>
             </div>
             <div id="content-insert" dojoType="dijit.layout.ContentPane" region="bottom"
diff --git a/plugins/af_redditimgur/init.php b/plugins/af_redditimgur/init.php
index 2e89fcdff..b9a2db68d 100755
--- a/plugins/af_redditimgur/init.php
+++ b/plugins/af_redditimgur/init.php
@@ -648,11 +648,11 @@ class Af_RedditImgur extends Plugin {
 			<form action="backend.php?op=pluginhandler&method=testurl&plugin=af_redditimgur" method="post">
 				<fieldset>
 					<label>URL:</label>
-					<input name="url" size="100" value="<?php echo htmlspecialchars($url) ?>"></input>
+					<input name="url" size="100" value="<?= htmlspecialchars($url) ?>"></input>
 				</fieldset>
 				<fieldset>
 					<label>Article URL:</label>
-					<input name="article_url" size="100" value="<?php echo htmlspecialchars($article_url) ?>"></input>
+					<input name="article_url" size="100" value="<?= htmlspecialchars($article_url) ?>"></input>
 				</fieldset>
 				<fieldset>
 					<button type="submit">Test</button>
diff --git a/plugins/auth_internal/init.php b/plugins/auth_internal/init.php
index a69ea444c..6a68534ea 100644
--- a/plugins/auth_internal/init.php
+++ b/plugins/auth_internal/init.php
@@ -63,21 +63,21 @@ class Auth_Internal extends Auth_Base {
 								<title>Tiny Tiny RSS</title>
 								<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 							</head>
-							<?php echo stylesheet_tag("themes/light.css") ?>
+							<?= stylesheet_tag("themes/light.css") ?>
 						<body class="ttrss_utility otp">
-						<h1><?php echo __("Authentication") ?></h1>
+						<h1><?= __("Authentication") ?></h1>
 						<div class="content">
-						<form action="public.php?return=<?php echo $return ?>"
+						<form action="public.php?return=<?= $return ?>"
 								method="POST" class="otpform">
 							<input type="hidden" name="op" value="login">
-							<input type="hidden" name="login" value="<?php echo htmlspecialchars($login) ?>">
-							<input type="hidden" name="password" value="<?php echo htmlspecialchars($password) ?>">
-							<input type="hidden" name="bw_limit" value="<?php echo htmlspecialchars($_POST["bw_limit"]) ?>">
-							<input type="hidden" name="remember_me" value="<?php echo htmlspecialchars($_POST["remember_me"]) ?>">
-							<input type="hidden" name="profile" value="<?php echo htmlspecialchars($_POST["profile"]) ?>">
+							<input type="hidden" name="login" value="<?= htmlspecialchars($login) ?>">
+							<input type="hidden" name="password" value="<?= htmlspecialchars($password) ?>">
+							<input type="hidden" name="bw_limit" value="<?= htmlspecialchars($_POST["bw_limit"]) ?>">
+							<input type="hidden" name="remember_me" value="<?= htmlspecialchars($_POST["remember_me"]) ?>">
+							<input type="hidden" name="profile" value="<?= htmlspecialchars($_POST["profile"]) ?>">
 
 							<fieldset>
-								<label><?php echo __("Please enter your one time password:") ?></label>
+								<label><?= __("Please enter your one time password:") ?></label>
 								<input autocomplete="off" size="6" name="otp" value=""/>
 								<input type="submit" value="Continue"/>
 							</fieldset>
diff --git a/plugins/toggle_sidebar/init.php b/plugins/toggle_sidebar/init.php
index f8ec35a91..19ca960e2 100644
--- a/plugins/toggle_sidebar/init.php
+++ b/plugins/toggle_sidebar/init.php
@@ -24,7 +24,7 @@ class Toggle_Sidebar extends Plugin {
 
 		<button dojoType="dijit.form.Button" onclick="Plugins.Toggle_Sidebar.toggle(this)">
 			<i class="material-icons toggle-sidebar-label"
-               title="<?php echo __('Toggle sidebar') ?>">chevron_left</i>
+               title="<?= __('Toggle sidebar') ?>">chevron_left</i>
 		</button>
 
 		<?php
diff --git a/prefs.php b/prefs.php
index 61e1145b7..9d5f8e499 100644
--- a/prefs.php
+++ b/prefs.php
@@ -24,7 +24,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-	<title>Tiny Tiny RSS : <?php echo __("Preferences") ?></title>
+	<title>Tiny Tiny RSS : <?= __("Preferences") ?></title>
     <meta name="viewport" content="initial-scale=1,width=device-width" />
 
 	<?php if ($_SESSION["uid"] && empty($_SESSION["safe_mode"])) {
@@ -39,7 +39,7 @@
 	} ?>
 
 	<script type="text/javascript">
-		const __csrf_token = "<?php echo $_SESSION["csrf_token"]; ?>";
+		const __csrf_token = "<?= $_SESSION["csrf_token"]; ?>";
 	</script>
 
 	<?php UserHelper::print_user_stylesheet() ?>
@@ -50,7 +50,7 @@
 	<script>
 		dojoConfig = {
 			async: true,
-			cacheBust: "<?php echo get_scripts_timestamp(); ?>",
+			cacheBust: "<?= get_scripts_timestamp(); ?>",
 			packages: [
 				{ name: "lib", location: "../" },
 				{ name: "fox", location: "../../js" },
@@ -117,7 +117,7 @@
 
 <div id="overlay">
 	<div id="overlay_inner">
-		<?php echo __("Loading, please wait...") ?>
+		<?= __("Loading, please wait...") ?>
 		<div dojoType="dijit.ProgressBar" places="0" style="width : 300px" id="loading_bar"
 	     progress="0" maximum="100">
 		</div>
@@ -126,34 +126,34 @@
 </div>
 
 <div id="header">
-	<!-- <a href='#' onclick="showHelp()"><?php echo __("Keyboard shortcuts") ?></a> | -->
-	<a href="#" onclick="document.location.href = 'index.php'"><?php echo __('Exit preferences') ?></a>
+	<!-- <a href='#' onclick="showHelp()"><?= __("Keyboard shortcuts") ?></a> | -->
+	<a href="#" onclick="document.location.href = 'index.php'"><?= __('Exit preferences') ?></a>
 </div>
 
 <div id="main" dojoType="dijit.layout.BorderContainer">
     <div dojoType="dijit.layout.TabContainer" region="center" id="pref-tabs">
         <div id="prefsTab" dojoType="dijit.layout.ContentPane"
             href="backend.php?op=pref-prefs"
-            title="<i class='material-icons'>settings</i> <?php echo __('Preferences') ?>"></div>
+            title="<i class='material-icons'>settings</i> <?= __('Preferences') ?>"></div>
         <div id="feedsTab" dojoType="dijit.layout.ContentPane"
             href="backend.php?op=pref-feeds"
-            title="<i class='material-icons'>rss_feed</i>  <?php echo __('Feeds') ?>"></div>
+            title="<i class='material-icons'>rss_feed</i>  <?= __('Feeds') ?>"></div>
         <div id="filtersTab" dojoType="dijit.layout.ContentPane"
             style="padding : 0px"
             href="backend.php?op=pref-filters"
-            title="<i class='material-icons'>filter_list1</i> <?php echo __('Filters') ?>"></div>
+            title="<i class='material-icons'>filter_list1</i> <?= __('Filters') ?>"></div>
         <div id="labelsTab" dojoType="dijit.layout.ContentPane"
             style="padding : 0px"
             href="backend.php?op=pref-labels"
-            title="<i class='material-icons'>label_outline1</i> <?php echo __('Labels') ?>"></div>
+            title="<i class='material-icons'>label_outline1</i> <?= __('Labels') ?>"></div>
         <?php if ($_SESSION["access_level"] >= 10) { ?>
             <div id="usersTab" dojoType="dijit.layout.ContentPane"
                 style="padding : 0px"
                 href="backend.php?op=pref-users"
-                title="<i class='material-icons'>person</i> <?php echo __('Users') ?>"></div>
+                title="<i class='material-icons'>person</i> <?= __('Users') ?>"></div>
             <div id="systemTab" dojoType="dijit.layout.ContentPane"
                 href="backend.php?op=pref-system"
-                title="<i class='material-icons'>info_outline</i> <?php echo __('System') ?>"></div>
+                title="<i class='material-icons'>info_outline</i> <?= __('System') ?>"></div>
         <?php } ?>
         <?php
             PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TABS);
@@ -162,8 +162,8 @@
 		<?php $version = get_version($git_commit, $git_timestamp, $last_error); ?>
 		<div id="footer" dojoType="dijit.layout.ContentPane" region="bottom">
 		<a class="text-muted" target="_blank" href="https://tt-rss.org/">Tiny Tiny RSS</a>
-			<span title="<?php echo htmlspecialchars($last_error) ?>">v<?php echo $version ?></span>
-        &copy; 2005-<?php echo date('Y') ?>
+			<span title="<?= htmlspecialchars($last_error) ?>">v<?= $version ?></span>
+        &copy; 2005-<?= date('Y') ?>
         <a class="text-muted" target="_blank"
         href="https://fakecake.org/">Andrew Dolgov</a>
     </div> <!-- footer -->
