diff --git a/.template-lintrc.js b/.template-lintrc.js
index 3a85b721b0e..f36c6313d2c 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -7,6 +7,7 @@ module.exports = {
     "table-groups": true,
     "style-concatenation": true,
     "no-invalid-interactive": true,
-    "link-rel-noopener": true
+    "link-rel-noopener": true,
+    "no-unnecessary-concat": true
   }
 };
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-counters.hbs b/app/assets/javascripts/admin/templates/components/admin-report-counters.hbs
index 9f3882a3b49..05d456fdebb 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report-counters.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report-counters.hbs
@@ -2,7 +2,7 @@
   {{#if model.icon}}
     {{d-icon model.icon}}
   {{/if}}
-  <a href="{{model.reportUrl}}">{{model.title}}</a>
+  <a href={{model.reportUrl}}>{{model.title}}</a>
 </div>
 
 <div class="cell value today-count">{{number model.todayCount}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-counts.hbs b/app/assets/javascripts/admin/templates/components/admin-report-counts.hbs
index 4b4a406c597..a1e64441f9e 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report-counts.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report-counts.hbs
@@ -2,7 +2,7 @@
   {{#if report.icon}}
     {{d-icon report.icon}}
   {{/if}}
-  <a href="{{report.reportUrl}}">{{report.title}}</a>
+  <a href={{report.reportUrl}}>{{report.title}}</a>
 </td>
 
 <td class="value">{{number report.todayCount}}</td>
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-inline-table.hbs b/app/assets/javascripts/admin/templates/components/admin-report-inline-table.hbs
index 70138f829db..76c8eacb0be 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report-inline-table.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report-inline-table.hbs
@@ -1,6 +1,6 @@
 <div class="table-container">
   {{#each model.data as |data|}}
-    <a class="table-cell user-{{data.key}}" href="{{data.url}}">
+    <a class="table-cell user-{{data.key}}" href={{data.url}}>
       <span class="label">
         {{#if data.icon}}
           {{d-icon data.icon}}
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs b/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs
index 054b91d7078..fbb9f80a64a 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs
@@ -1,7 +1,7 @@
 {{#if showBackupStats}}
   <div class="backups">
     <h3 class="storage-stats-title">
-      <a href="{{get-url '/admin/backups'}}">{{d-icon "archive"}} {{i18n "admin.dashboard.backups"}}</a>
+      <a href={{get-url '/admin/backups'}}>{{d-icon "archive"}} {{i18n "admin.dashboard.backups"}}</a>
     </h3>
     <p>
       {{#if backupStats.free_bytes}}
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-table.hbs b/app/assets/javascripts/admin/templates/components/admin-report-table.hbs
index 6c7838e872e..f42189eb9a3 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report-table.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report-table.hbs
@@ -24,7 +24,7 @@
 
     {{#if showTotalForSample}}
       <tr class="total-row">
-        <td colspan="{{totalsForSample.length}}">
+        <td colspan={{totalsForSample.length}}>
           {{i18n 'admin.dashboard.reports.totals_for_sample'}}
         </td>
       </tr>
diff --git a/app/assets/javascripts/admin/templates/components/admin-report.hbs b/app/assets/javascripts/admin/templates/components/admin-report.hbs
index cb0f333bb02..0c7009cc820 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report.hbs
@@ -18,17 +18,17 @@
 
           {{#unless showNotFoundError}}
           <li class="item report">
-            <a href="{{model.reportUrl}}" class="report-url">
+            <a href={{model.reportUrl}} class="report-url">
               {{model.title}}
             </a>
 
             {{#if model.description}}
               {{#if model.description_link}}
-                <a target="_blank" rel="noopener" href="{{model.description_link}}" class="info" data-tooltip="{{model.description}}">
+                <a target="_blank" rel="noopener" href={{model.description_link}} class="info" data-tooltip={{model.description}}>
                   {{d-icon "question-circle"}}
                 </a>
               {{else}}
-                <span class="info" data-tooltip="{{model.description}}">
+                <span class="info" data-tooltip={{model.description}}>
                   {{d-icon "question-circle"}}
                 </span>
               {{/if}}
@@ -40,7 +40,7 @@
 
       {{#if shouldDisplayTrend}}
         <div class="trend {{model.trend}}">
-          <span class="value" title="{{model.trendTitle}}">
+          <span class="value" title={{model.trendTitle}}>
             {{#if model.average}}
               {{number model.currentAverage}}{{#if model.percent}}%{{/if}}
             {{else}}
@@ -77,7 +77,7 @@
             <div class="alert alert-info report-alert no-data">
               {{d-icon "chart-pie"}}
               {{#if model.reportUrl}}
-                <a href="{{model.reportUrl}}" class="report-url">
+                <a href={{model.reportUrl}} class="report-url">
                   <span>
                     {{#if model.title}}
                       {{model.title}} —
diff --git a/app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs b/app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs
index bf9d2fd3cbc..ad669f4d3de 100644
--- a/app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs
@@ -25,7 +25,7 @@
             <a {{action "toggleShowAdvanced"}}
                 class='no-text'
                 href
-                title="{{i18n (concat "admin.customize.theme." (if showAdvanced "hide_advanced" "show_advanced"))}}"
+                title={{i18n (concat "admin.customize.theme." (if showAdvanced "hide_advanced" "show_advanced"))}}
             >
                 {{d-icon (if showAdvanced "angle-double-left" "angle-double-right")}}
             </a>
diff --git a/app/assets/javascripts/admin/templates/components/admin-web-hook-event.hbs b/app/assets/javascripts/admin/templates/components/admin-web-hook-event.hbs
index ce952f3ec72..11977f1398a 100644
--- a/app/assets/javascripts/admin/templates/components/admin-web-hook-event.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-web-hook-event.hbs
@@ -1,5 +1,5 @@
 <div class="col first status">
-  <span class="{{statusColorClasses}}">{{model.status}}</span>
+  <span class={{statusColorClasses}}>{{model.status}}</span>
 </div>
 <div class="col event-id">{{model.id}}</div>
 <div class="col timestamp">{{createdAt}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/flag-user.hbs b/app/assets/javascripts/admin/templates/components/flag-user.hbs
index 26087789e56..a6a4ce0f95e 100644
--- a/app/assets/javascripts/admin/templates/components/flag-user.hbs
+++ b/app/assets/javascripts/admin/templates/components/flag-user.hbs
@@ -7,7 +7,7 @@
       {{#link-to 'adminUser' user.id user.username class="flag-user-username"}}
         {{user.username}}
       {{/link-to}}
-      <div class='flag-user-date' title='{{raw-date date}}'>
+      <div class='flag-user-date' title={{raw-date date}}>
         {{format-age date}}
       </div>
     </div>
diff --git a/app/assets/javascripts/admin/templates/components/install-theme-item.hbs b/app/assets/javascripts/admin/templates/components/install-theme-item.hbs
index ed4ddd242f3..2697ffe8b92 100644
--- a/app/assets/javascripts/admin/templates/components/install-theme-item.hbs
+++ b/app/assets/javascripts/admin/templates/components/install-theme-item.hbs
@@ -1,5 +1,5 @@
 {{radio-button name="install-items" id=value value=value selection=selection}}
-<label class="radio" for="{{value}}">
+<label class="radio" for={{value}}>
   {{#if showIcon}}
     {{d-icon 'plus'}}
   {{/if}}
diff --git a/app/assets/javascripts/admin/templates/customize-themes-edit.hbs b/app/assets/javascripts/admin/templates/customize-themes-edit.hbs
index 5fdaa768852..5f6d29e953b 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-edit.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-edit.hbs
@@ -15,7 +15,7 @@
     <div class='admin-footer'>
       <div class='status-actions'>
         {{#unless model.changed}}
-          <a class='preview-link' href={{previewUrl}} rel="noopener" target='_blank' title="{{i18n 'admin.customize.explain_preview'}}">
+          <a class='preview-link' href={{previewUrl}} rel="noopener" target='_blank' title={{i18n 'admin.customize.explain_preview'}}>
             {{i18n 'admin.customize.preview'}}
           </a>
         {{/unless}}
diff --git a/app/assets/javascripts/admin/templates/customize-themes-show.hbs b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
index 2687c6b692f..9fb7fcb4cf3 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-show.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
@@ -63,16 +63,16 @@
 
     {{#if model.remote_theme.remote_url}}
       {{#if sourceIsHttp}}
-        <a class="remote-url" href="{{model.remote_theme.remote_url}}">{{i18n "admin.customize.theme.source_url"}}{{d-icon "link"}}</a>
+        <a class="remote-url" href={{model.remote_theme.remote_url}}>{{i18n "admin.customize.theme.source_url"}}{{d-icon "link"}}</a>
       {{else}}
         <div class="remote-url"><code>{{model.remote_theme.remote_url}}</code></div>
       {{/if}}
     {{/if}}
     {{#if model.remote_theme.about_url}}
-      <a class="url about-url" href="{{model.remote_theme.about_url}}">{{i18n "admin.customize.theme.about_theme"}}{{d-icon "link"}}</a>
+      <a class="url about-url" href={{model.remote_theme.about_url}}>{{i18n "admin.customize.theme.about_theme"}}{{d-icon "link"}}</a>
     {{/if}}
     {{#if model.remote_theme.license_url}}
-      <a class="url license-url" href="{{model.remote_theme.license_url}}">{{i18n "admin.customize.theme.license"}}{{d-icon "link"}}</a>
+      <a class="url license-url" href={{model.remote_theme.license_url}}>{{i18n "admin.customize.theme.license"}}{{d-icon "link"}}</a>
     {{/if}}
 
     {{#if model.description}}
@@ -109,7 +109,7 @@
             {{#if model.remote_theme.commits_behind}}
               {{i18n 'admin.customize.theme.commits_behind' count=model.remote_theme.commits_behind}}
               {{#if model.remote_theme.github_diff_link}}
-                <a href="{{model.remote_theme.github_diff_link}}">
+                <a href={{model.remote_theme.github_diff_link}}>
                   {{i18n 'admin.customize.theme.compare_commits'}}
                 </a>
               {{/if}}
@@ -241,7 +241,7 @@
     </div>
   {{/if}}
 
-  <a href='{{previewUrl}}' title="{{i18n 'admin.customize.explain_preview'}}" rel="noopener" target='_blank' class='btn btn-default'>{{d-icon 'desktop'}}{{i18n 'admin.customize.theme.preview'}}</a>
+  <a href={{previewUrl}} title={{i18n 'admin.customize.explain_preview'}} rel="noopener" target='_blank' class='btn btn-default'>{{d-icon 'desktop'}}{{i18n 'admin.customize.theme.preview'}}</a>
   <a class="btn btn-default export" rel="noopener" target="_blank" href={{downloadUrl}}>{{d-icon "download"}} {{i18n 'admin.export_json.button_text'}}</a>
 
   {{d-button action=(action "switchType") label="admin.customize.theme.convert" icon=convertIcon class="btn-default btn-normal" title=convertTooltip}}
diff --git a/app/assets/javascripts/admin/templates/dashboard_general.hbs b/app/assets/javascripts/admin/templates/dashboard_general.hbs
index af0bb36ae99..19f892ab0f6 100644
--- a/app/assets/javascripts/admin/templates/dashboard_general.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard_general.hbs
@@ -5,7 +5,7 @@
     <div class="period-section">
       <div class="section-title">
         <h2>
-          <a href="{{get-url '/admin/dashboard/reports'}}">
+          <a href={{get-url '/admin/dashboard/reports'}}>
             {{i18n "admin.dashboard.community_health"}}
           </a>
         </h2>
diff --git a/app/assets/javascripts/admin/templates/dashboard_moderation.hbs b/app/assets/javascripts/admin/templates/dashboard_moderation.hbs
index c6091447ffe..019ffb5990d 100644
--- a/app/assets/javascripts/admin/templates/dashboard_moderation.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard_moderation.hbs
@@ -4,7 +4,7 @@
   <div class="moderators-activity section">
     <div class="section-title">
       <h2>
-        <a href="{{get-url '/admin/reports/moderators_activity'}}">
+        <a href={{get-url '/admin/reports/moderators_activity'}}>
           {{i18n "admin.dashboard.moderators_activity"}}
         </a>
       </h2>
diff --git a/app/assets/javascripts/admin/templates/email-received.hbs b/app/assets/javascripts/admin/templates/email-received.hbs
index e711d5a0ba2..5fc983557e7 100644
--- a/app/assets/javascripts/admin/templates/email-received.hbs
+++ b/app/assets/javascripts/admin/templates/email-received.hbs
@@ -42,7 +42,7 @@
           </td>
           <td>
             {{#if email.post_url}}
-              <a href="{{email.post_url}}">{{email.subject}}</a>
+              <a href={{email.post_url}}>{{email.subject}}</a>
             {{else}}
               {{email.subject}}
             {{/if}}
diff --git a/app/assets/javascripts/admin/templates/email-sent.hbs b/app/assets/javascripts/admin/templates/email-sent.hbs
index 5c2bf4c49ba..c1ad376b6c7 100644
--- a/app/assets/javascripts/admin/templates/email-sent.hbs
+++ b/app/assets/javascripts/admin/templates/email-sent.hbs
@@ -36,7 +36,7 @@
           <td>{{l.email_type}}</td>
           <td class='post-link'>
             {{#if l.post_url}}
-              <a href="{{l.post_url}}">{{l.post_description}}</a>
+              <a href={{l.post_url}}>{{l.post_description}}</a>
               <span class='reply-key'>{{l.reply_key}}</span>
             {{else}}
               <span class='reply-key'>{{l.reply_key}}</span>
diff --git a/app/assets/javascripts/admin/templates/email-skipped.hbs b/app/assets/javascripts/admin/templates/email-skipped.hbs
index f2463f3daf0..76ddb1197e3 100644
--- a/app/assets/javascripts/admin/templates/email-skipped.hbs
+++ b/app/assets/javascripts/admin/templates/email-skipped.hbs
@@ -33,7 +33,7 @@
           <td>{{l.email_type}}</td>
           <td>
             {{#if l.post_url}}
-              <a href="{{l.post_url}}">{{l.skipped_reason}}</a>
+              <a href={{l.post_url}}>{{l.skipped_reason}}</a>
             {{else}}
               {{l.skipped_reason}}
             {{/if}}
diff --git a/app/assets/javascripts/admin/templates/emojis.hbs b/app/assets/javascripts/admin/templates/emojis.hbs
index 6281b15c05d..d08f2ed547a 100644
--- a/app/assets/javascripts/admin/templates/emojis.hbs
+++ b/app/assets/javascripts/admin/templates/emojis.hbs
@@ -18,7 +18,7 @@
         <tbody>
           {{#each sortedEmojis as |e|}}
             <tr>
-              <th><img class="emoji emoji-custom" src="{{unbound e.url}}" title="{{unbound e.name}}"></th>
+              <th><img class="emoji emoji-custom" src={{unbound e.url}} title={{unbound e.name}}></th>
               <th>:{{e.name}}:</th>
               <th>
                 {{d-button
diff --git a/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs b/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
index 799eda905bd..02c4160b6ac 100644
--- a/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
+++ b/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
@@ -65,7 +65,7 @@
                     {{#link-to 'adminUser' item.acting_user}}{{avatar item.acting_user imageSize="tiny"}}{{/link-to}}
                     <a href {{action "filterByStaffUser" item.acting_user}}>{{item.acting_user.username}}</a>
                   {{else}}
-                    <span class="deleted-user" title="{{i18n 'admin.user.deleted'}}">
+                    <span class="deleted-user" title={{i18n 'admin.user.deleted'}}>
                       {{d-icon "far-trash-alt"}}
                     </span>
                   {{/if}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs b/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs
index eec9151f90d..aab0b17d71d 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs
@@ -11,7 +11,7 @@
         {{#each themes as |theme|}}
           <div class="popular-theme-item">
             <div class="popular-theme-name">
-              <a href="{{theme.meta_url}}" rel="noopener" target="_blank">
+              <a href={{theme.meta_url}} rel="noopener" target="_blank">
                 {{#if theme.component}}
                   {{d-icon 'puzzle-piece' title='admin.customize.theme.component'}}
                 {{/if}}
@@ -33,7 +33,7 @@
                   action=(action "installThemeFromList" theme.value)}}
 
                 {{#if theme.preview}}
-                  <a href="{{theme.preview}}" rel="noopener" target="_blank">{{d-icon "desktop"}} {{I18n "admin.customize.theme.preview"}}</a>
+                  <a href={{theme.preview}} rel="noopener" target="_blank">{{d-icon "desktop"}} {{I18n "admin.customize.theme.preview"}}</a>
                 {{/if}}
               {{/if}}
             </div>
diff --git a/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs b/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs
index 27e5cd5ec54..7a5ddc1ea71 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs
@@ -2,7 +2,7 @@
   <div class="popular-theme-name">
     {{theme.name}}
     {{#if theme.preview}}
-      <a href="{{theme.preview}}" title="Preview" rel="noopener" target="_blank">{{d-icon "far-eye"}}</a>
+      <a href={{theme.preview}} title="Preview" rel="noopener" target="_blank">{{d-icon "far-eye"}}</a>
     {{/if}}
   </div>
   <div class="popular-theme-buttons">
diff --git a/app/assets/javascripts/admin/templates/permalinks.hbs b/app/assets/javascripts/admin/templates/permalinks.hbs
index b86950bc2ac..ac933f09c33 100644
--- a/app/assets/javascripts/admin/templates/permalinks.hbs
+++ b/app/assets/javascripts/admin/templates/permalinks.hbs
@@ -27,22 +27,22 @@
             <td class="col first url">{{pl.url}}</td>
             <td class="col topic">
               {{#if pl.topic_id}}
-                <a href='{{unbound pl.topic_url}}'>{{pl.topic_title}}</a>
+                <a href={{unbound pl.topic_url}}>{{pl.topic_title}}</a>
               {{/if}}
             </td>
             <td class="col post">
               {{#if pl.post_id}}
-                <a href='{{unbound pl.post_url}}'>#{{pl.post_number}} {{pl.post_topic_title}}</a>
+                <a href={{unbound pl.post_url}}>#{{pl.post_number}} {{pl.post_topic_title}}</a>
               {{/if}}
             </td>
             <td class="col category">
               {{#if pl.category_id}}
-                <a href='{{unbound pl.category_url}}'>{{pl.category_name}}</a>
+                <a href={{unbound pl.category_url}}>{{pl.category_name}}</a>
               {{/if}}
             </td>
             <td class="col external_url">
               {{#if pl.external_url}}
-                <a href='{{unbound pl.external_url}}'>{{pl.external_url}}</a>
+                <a href={{unbound pl.external_url}}>{{pl.external_url}}</a>
               {{/if}}
             </td>
             <td class="col action">
diff --git a/app/assets/javascripts/admin/templates/search-logs-term.hbs b/app/assets/javascripts/admin/templates/search-logs-term.hbs
index 91d5d31361b..339cf2d169d 100644
--- a/app/assets/javascripts/admin/templates/search-logs-term.hbs
+++ b/app/assets/javascripts/admin/templates/search-logs-term.hbs
@@ -23,14 +23,14 @@
   {{#each model.search_result.posts as |result|}}
     <div class='fps-result'>
       <div class='author'>
-        <a href={{result.userPath}} data-user-card="{{unbound result.username}}">
+        <a href={{result.userPath}} data-user-card={{unbound result.username}}>
           {{avatar result imageSize="large"}}
         </a>
       </div>
 
       <div class='fps-topic'>
         <div class='topic'>
-          <a class='search-link' href='{{unbound result.url}}'>
+          <a class='search-link' href={{unbound result.url}}>
             {{topic-status topic=result.topic disableActions=true}}<span class='topic-title'>{{#highlight-text highlight=term}}{{{unbound result.topic.fancyTitle}}}{{/highlight-text}}</span>
           </a>
 
diff --git a/app/assets/javascripts/admin/templates/site-settings.hbs b/app/assets/javascripts/admin/templates/site-settings.hbs
index 56ddbcd5516..01264be5b51 100644
--- a/app/assets/javascripts/admin/templates/site-settings.hbs
+++ b/app/assets/javascripts/admin/templates/site-settings.hbs
@@ -16,7 +16,7 @@
 <div class="admin-nav pull-left">
   <ul class="nav nav-stacked">
     {{#each visibleSiteSettings as |category|}}
-      <li class="{{category.nameKey}}">
+      <li class={{category.nameKey}}>
         {{#link-to 'adminSiteSettingsCategory' category.nameKey class=category.nameKey}}
           {{category.name}}
           {{#if category.count}}<span class="count">({{category.count}})</span>{{/if}}
diff --git a/app/assets/javascripts/admin/templates/user-badges.hbs b/app/assets/javascripts/admin/templates/user-badges.hbs
index f919867c4df..c93e7fb4624 100644
--- a/app/assets/javascripts/admin/templates/user-badges.hbs
+++ b/app/assets/javascripts/admin/templates/user-badges.hbs
@@ -55,7 +55,7 @@
             </td>
             <td class='reason'>
               {{#if userBadge.postUrl}}
-              <a href="{{unbound userBadge.postUrl}}">{{userBadge.topic_title}}</a>
+              <a href={{unbound userBadge.postUrl}}>{{userBadge.topic_title}}</a>
               {{/if}}
             </td>
             <td>{{age-with-tooltip userBadge.granted_at}}</td>
diff --git a/app/assets/javascripts/admin/templates/user-index.hbs b/app/assets/javascripts/admin/templates/user-index.hbs
index d69f3b97062..5707142ff39 100644
--- a/app/assets/javascripts/admin/templates/user-index.hbs
+++ b/app/assets/javascripts/admin/templates/user-index.hbs
@@ -97,7 +97,7 @@
     </div>
 
     <div class="display-row bounce-score">
-      <div class="field"><a href="{{model.bounceLink}}">{{i18n "admin.user.bounce_score"}}</a></div>
+      <div class="field"><a href={{model.bounceLink}}>{{i18n "admin.user.bounce_score"}}</a></div>
       <div class="value">{{model.bounceScore}}</div>
       <div class="controls">
         {{#if model.canResetBounceScore}}
diff --git a/app/assets/javascripts/admin/templates/users-list-show.hbs b/app/assets/javascripts/admin/templates/users-list-show.hbs
index d31a38c1f64..127b7446c04 100644
--- a/app/assets/javascripts/admin/templates/users-list-show.hbs
+++ b/app/assets/javascripts/admin/templates/users-list-show.hbs
@@ -40,7 +40,7 @@
         {{#each model as |user|}}
           <tr class="user {{user.selected}} {{unless user.active 'not-activated'}}">
             <td class="username">
-              <a href="{{unbound user.path}}" data-user-card="{{unbound user.username}}">
+              <a href={{unbound user.path}} data-user-card={{unbound user.username}}>
                 {{avatar user imageSize="small"}}
               </a>
               {{#link-to 'adminUser' user}}{{unbound user.username}}{{/link-to}}
diff --git a/app/assets/javascripts/admin/templates/watched-words.hbs b/app/assets/javascripts/admin/templates/watched-words.hbs
index 5fe3946dfb5..68977211979 100644
--- a/app/assets/javascripts/admin/templates/watched-words.hbs
+++ b/app/assets/javascripts/admin/templates/watched-words.hbs
@@ -9,7 +9,7 @@
 <div class="admin-nav pull-left">
   <ul class="nav nav-stacked">
     {{#each model as |action|}}
-      <li class="{{action.nameKey}}">
+      <li class={{action.nameKey}}>
         {{#link-to 'adminWatchedWords.action' action.nameKey}}
           {{action.name}}
           {{#if action.count}}<span class="count">({{action.count}})</span>{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/badges/show.hbs b/app/assets/javascripts/discourse/templates/badges/show.hbs
index 9eeb3d7fa24..12ba951aacc 100644
--- a/app/assets/javascripts/discourse/templates/badges/show.hbs
+++ b/app/assets/javascripts/discourse/templates/badges/show.hbs
@@ -52,7 +52,7 @@
       {{#unless canLoadMore}}
         {{#if canShowOthers}}
         <div class='clearfix'>
-          <a class='btn' href='{{model.url}}'>{{i18n 'badges.others_count' count=othersCount}}</a>
+          <a class='btn' href={{model.url}}>{{i18n 'badges.others_count' count=othersCount}}</a>
         </div>
         {{/if}}
       {{/unless}}
diff --git a/app/assets/javascripts/discourse/templates/components/about-page-users.hbs b/app/assets/javascripts/discourse/templates/components/about-page-users.hbs
index 4c946af4669..f7bfd9886b5 100644
--- a/app/assets/javascripts/discourse/templates/components/about-page-users.hbs
+++ b/app/assets/javascripts/discourse/templates/components/about-page-users.hbs
@@ -1,8 +1,8 @@
 {{#each usersTemplates as |userTemplate|}}
-  <div data-username="{{userTemplate.username}}" class="user-info small">
+  <div data-username={{userTemplate.username}} class="user-info small">
     <div class="user-image">
       <div class="user-image-inner">
-        <a href="{{userTemplate.userPath}}" data-user-card="{{userTemplate.username}}">
+        <a href={{userTemplate.userPath}} data-user-card={{userTemplate.username}}>
           {{{userTemplate.avatar}}}
         </a>
       </div>
@@ -10,7 +10,7 @@
     <div class="user-detail">
       <div class="name-line">
         <span class="username">
-          <a href="{{userTemplate.userPath}}" data-user-card="{{userTemplate.username}}">
+          <a href={{userTemplate.userPath}} data-user-card={{userTemplate.username}}>
             {{userTemplate.username}}
           </a>
         </span>
diff --git a/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs b/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs
index f19538efeab..6545208bb7c 100644
--- a/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs
@@ -1,4 +1,4 @@
-<label class="btn btn-default btn-icon-text" disabled={{uploading}} title="{{i18n 'user.change_avatar.upload_title'}}">
+<label class="btn btn-default btn-icon-text" disabled={{uploading}} title={{i18n 'user.change_avatar.upload_title'}}>
   {{d-icon "far-image"}}
   {{#if uploading}}
   {{i18n 'uploading'}} {{uploadProgress}}%
diff --git a/app/assets/javascripts/discourse/templates/components/backup-uploader.hbs b/app/assets/javascripts/discourse/templates/components/backup-uploader.hbs
index 255d2f01d54..77581a35987 100644
--- a/app/assets/javascripts/discourse/templates/components/backup-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/backup-uploader.hbs
@@ -1,4 +1,4 @@
-<label class="btn" disabled={{uploading}} title="{{i18n 'admin.backups.upload.title'}}">
+<label class="btn" disabled={{uploading}} title={{i18n 'admin.backups.upload.title'}}>
   {{d-icon "upload"}}&nbsp;{{uploadButtonText}}
   <input class="hidden-upload-field" disabled={{uploading}} type="file" accept=".gz">
 </label>
diff --git a/app/assets/javascripts/discourse/templates/components/categories-boxes-topic.hbs b/app/assets/javascripts/discourse/templates/components/categories-boxes-topic.hbs
index 95ebe51a0d3..1e6fd8be893 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-boxes-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-boxes-topic.hbs
@@ -1,5 +1,5 @@
 {{d-icon topicStatusIcon}}
 
-<a class='title' href="{{unbound topic.lastUnreadUrl}}">
+<a class='title' href={{unbound topic.lastUnreadUrl}}>
   {{text-overflow class="overflow" text=topic.fancyTitle}}
 </a>
diff --git a/app/assets/javascripts/discourse/templates/components/categories-topic-list.hbs b/app/assets/javascripts/discourse/templates/components/categories-topic-list.hbs
index 4dcd89c71a5..8a70f1b6fc9 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-topic-list.hbs
@@ -7,7 +7,7 @@
     {{latest-topic-list-item topic=t}}
   {{/each}}
   <div class="more-topics">
-    <a href="{{get-url (concat '/' filter)}}" class="btn btn-default pull-right">{{i18n "more"}}</a>
+    <a href={{get-url (concat '/' filter)}} class="btn btn-default pull-right">{{i18n "more"}}</a>
   </div>
 {{else}}
   <div class='no-topics'>
diff --git a/app/assets/javascripts/discourse/templates/components/category-unread.hbs b/app/assets/javascripts/discourse/templates/components/category-unread.hbs
index a6a2251691d..16eef33fc9b 100644
--- a/app/assets/javascripts/discourse/templates/components/category-unread.hbs
+++ b/app/assets/javascripts/discourse/templates/components/category-unread.hbs
@@ -1,6 +1,6 @@
 {{#if category.unreadTopics}}
-  <a href="{{unbound category.unreadUrl}}" class='badge new-posts badge-notification' title='{{i18n 'topic.unread_topics' count=category.unreadTopics}}'>{{i18n 'filters.unread.lower_title_with_count' count=category.unreadTopics}}</a>
+  <a href={{unbound category.unreadUrl}} class='badge new-posts badge-notification' title={{i18n 'topic.unread_topics' count=category.unreadTopics}}>{{i18n 'filters.unread.lower_title_with_count' count=category.unreadTopics}}</a>
 {{/if}}
 {{#if category.newTopics}}
-  <a href="{{unbound category.newUrl}}" class='badge new-posts badge-notification' title='{{i18n 'topic.new_topics' count=category.newTopics}}'>{{i18n 'filters.new.lower_title_with_count' count=category.newTopics}}</a>
+  <a href={{unbound category.newUrl}} class='badge new-posts badge-notification' title={{i18n 'topic.new_topics' count=category.newTopics}}>{{i18n 'filters.new.lower_title_with_count' count=category.newTopics}}</a>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs b/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
index f4864b3dc81..27025bedee1 100644
--- a/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
+++ b/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
@@ -5,7 +5,7 @@
       <div id="banner-content">
         {{{content}}}
         {{#if currentUser.staff}}
-          <p><a href="{{banner.url}}">{{{i18n "banner.edit"}}}</a></p>
+          <p><a href={{banner.url}}>{{{i18n "banner.edit"}}}</a></p>
         {{/if}}
       </div>
     </div>
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
index dfb2e1c8d0d..73ca697a715 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
@@ -13,7 +13,7 @@
   {{#unless showPositionInput}}
     <section class='field'>
       {{i18n 'category.position_disabled'}}
-      <a href="{{get-url '/admin/site_settings/category/basic'}}">{{i18n 'category.position_disabled_click'}}</a>
+      <a href={{get-url '/admin/site_settings/category/basic'}}>{{i18n 'category.position_disabled_click'}}</a>
     </section>
   {{/unless}}
 
@@ -261,7 +261,7 @@
   {{#unless emailInEnabled}}
     <section class='field'>
       {{i18n 'category.email_in_disabled'}}
-      <a href="{{get-url '/admin/site_settings/category/email'}}">{{i18n 'category.email_in_disabled_click'}}</a>
+      <a href={{get-url '/admin/site_settings/category/email'}}>{{i18n 'category.email_in_disabled_click'}}</a>
     </section>
   {{/unless}}
 
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-tab.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-tab.hbs
index 7be1e910609..f56683a3f6e 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-tab.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-tab.hbs
@@ -1 +1 @@
-<a href {{action "select"}} class="{{if active 'active'}}">{{title}}</a>
+<a href {{action "select"}} class={{if active 'active'}}>{{title}}</a>
diff --git a/app/assets/javascripts/discourse/templates/components/featured-topic.hbs b/app/assets/javascripts/discourse/templates/components/featured-topic.hbs
index 7061778b8ed..aed5312bfa5 100644
--- a/app/assets/javascripts/discourse/templates/components/featured-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/featured-topic.hbs
@@ -1,12 +1,12 @@
 {{raw "topic-status" topic=topic}}
-<a class='title' href="{{unbound topic.lastUnreadUrl}}">{{{unbound topic.fancyTitle}}}</a>
+<a class='title' href={{unbound topic.lastUnreadUrl}}>{{{unbound topic.fancyTitle}}}</a>
 {{topic-post-badges newPosts=topic.totalUnread unseen=topic.unseen url=topic.lastUnreadUrl}}
 
 {{#if latestTopicOnly}}
   <div class='last-user-info'>
-    {{i18n 'categories.latest_by'}} <a href="{{{unbound topic.lastPosterUrl}}}">{{unbound topic.last_poster.username}}</a>
-    <a href="{{unbound topic.lastPostUrl}}">{{format-age topic.last_posted_at}}</a>
+    {{i18n 'categories.latest_by'}} <a href={{{unbound topic.lastPosterUrl}}}>{{unbound topic.last_poster.username}}</a>
+    <a href={{unbound topic.lastPostUrl}}>{{format-age topic.last_posted_at}}</a>
   </div>
 {{else}}
-  <a href="{{unbound topic.lastPostUrl}}" class="last-posted-at">{{format-age topic.last_posted_at}}</a>
+  <a href={{unbound topic.lastPostUrl}} class="last-posted-at">{{format-age topic.last_posted_at}}</a>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/google-search.hbs b/app/assets/javascripts/discourse/templates/components/google-search.hbs
index 766bf3a9082..28893ffff87 100644
--- a/app/assets/javascripts/discourse/templates/components/google-search.hbs
+++ b/app/assets/javascripts/discourse/templates/components/google-search.hbs
@@ -1,7 +1,7 @@
 <div>
   <form action='//google.com/search' id='google-search'>
-    <input type="text" name="q" value="{{searchTerm}}">
-    <input type='hidden' name="as_sitesearch" value="{{siteUrl}}">
+    <input type="text" name="q" value={{searchTerm}}>
+    <input type='hidden' name="as_sitesearch" value={{siteUrl}}>
     <button class="btn btn-primary">{{i18n 'search.search_google_button'}}</button>
   </form>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
index eee2b12ed09..22629d003dd 100644
--- a/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
@@ -3,7 +3,7 @@
 
     <div class="card-row first-row">
       <div class="group-card-avatar">
-        <a href="{{groupPath}}" {{action "showGroup" group}} class="card-huge-avatar">
+        <a href={{groupPath}} {{action "showGroup" group}} class="card-huge-avatar">
           {{avatar-flair
           flairURL=group.flair_url
           flairBgColor=group.flair_bg_color
@@ -13,8 +13,8 @@
       </div>
       <div class="names">
         <span>
-          <h1 class="{{group.name}}">
-            <a href="{{groupPath}}" {{action "showGroup" group}} class='group-page-link'>{{group.name}}</a>
+          <h1 class={{group.name}}>
+            <a href={{groupPath}} {{action "showGroup" group}} class='group-page-link'>{{group.name}}</a>
           </h1>
           {{#if group.full_name}}
             <h2 class='full-name'>{{group.full_name}}</h2>
@@ -74,7 +74,7 @@
             <a href {{action 'showUser' user}} class="card-tiny-avatar">{{bound-avatar user "tiny"}}</a>
           {{/each}}
           {{#if showMoreMembers}}
-            <a href="{{groupPath}}" {{action "showGroup" group}} class="more-members-link"><span
+            <a href={{groupPath}} {{action "showGroup" group}} class="more-members-link"><span
                class="more-members-count">+{{moreMembersCount}}
                 {{i18n "more"}}</span></a>
           {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-flair-inputs.hbs b/app/assets/javascripts/discourse/templates/components/group-flair-inputs.hbs
index 5436915996c..319fa808055 100644
--- a/app/assets/javascripts/discourse/templates/components/group-flair-inputs.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-flair-inputs.hbs
@@ -35,7 +35,7 @@
 
   <div class="avatar-flair-preview">
     <div class="avatar-wrapper">
-      <img width="45" height="45" src="{{demoAvatarUrl}}" class="avatar actor">
+      <img width="45" height="45" src={{demoAvatarUrl}} class="avatar actor">
     </div>
 
     {{#if flairPreviewImage}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-post.hbs b/app/assets/javascripts/discourse/templates/components/group-post.hbs
index 9e56010fad0..a39e71f9aee 100644
--- a/app/assets/javascripts/discourse/templates/components/group-post.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-post.hbs
@@ -1,5 +1,5 @@
 <div class='clearfix info'>
-    <a href="{{unbound post.user.userUrl}}" data-user-card="{{unbound post.user.username}}" class='avatar-link'>
+    <a href={{unbound post.user.userUrl}} data-user-card={{unbound post.user.username}} class='avatar-link'>
       {{avatar post.user imageSize="large" extraClasses="actor" ignoreTitle="true"}}
     </a>
     <span class='time'>{{format-date post.created_at leaveAgo="true"}}</span>
@@ -19,7 +19,7 @@
         </div>
       {{/if}}
   </div>
-  
+
 </div>
 
 <div class='excerpt'>
diff --git a/app/assets/javascripts/discourse/templates/components/images-uploader.hbs b/app/assets/javascripts/discourse/templates/components/images-uploader.hbs
index 56aca01de43..ea9a23d1e49 100644
--- a/app/assets/javascripts/discourse/templates/components/images-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/images-uploader.hbs
@@ -1,4 +1,4 @@
-<label class="btn" disabled={{uploading}} title="{{i18n "admin.site_settings.uploaded_image_list.upload.title"}}">
+<label class="btn" disabled={{uploading}} title={{i18n "admin.site_settings.uploaded_image_list.upload.title"}}>
   {{d-icon "far-image"}}&nbsp;{{uploadButtonText}}
   <input class="hidden-upload-field" disabled={{uploading}} type="file" accept="image/*" multiple>
 </label>
diff --git a/app/assets/javascripts/discourse/templates/components/latest-topic-list-item.hbs b/app/assets/javascripts/discourse/templates/components/latest-topic-list-item.hbs
index a3666f6842d..a1f459f725f 100644
--- a/app/assets/javascripts/discourse/templates/components/latest-topic-list-item.hbs
+++ b/app/assets/javascripts/discourse/templates/components/latest-topic-list-item.hbs
@@ -20,6 +20,6 @@
 <div class='topic-stats'>
   {{raw "list/posts-count-column" topic=topic tagName="div"}}
   <div class="topic-last-activity">
-    <a href="{{topic.lastPostUrl}}" title="{{topic.bumpedAtTitle}}">{{format-date topic.bumpedAt format="tiny" noTitle="true"}}</a>
+    <a href={{topic.lastPostUrl}} title={{topic.bumpedAtTitle}}>{{format-date topic.bumpedAt format="tiny" noTitle="true"}}</a>
   </div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/mobile-category-topic.hbs b/app/assets/javascripts/discourse/templates/components/mobile-category-topic.hbs
index 6cc45d2f1ec..e9d901d8807 100644
--- a/app/assets/javascripts/discourse/templates/components/mobile-category-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/mobile-category-topic.hbs
@@ -5,7 +5,7 @@
     {{#if topic.unseen}}
       <span class="badge-notification new-topic"></span>
     {{/if}}
-    <span class="{{cold-age-class topic.last_posted_at}}" title='{{raw-date topic.last_posted_at}}'>{{{format-age topic.last_posted_at}}}</span>
+    <span class={{cold-age-class topic.last_posted_at}} title={{raw-date topic.last_posted_at}}>{{{format-age topic.last_posted_at}}}</span>
   </div>
 </td>
 <td class='num posts'>{{raw "list/post-count-or-badges" topic=topic postBadgesEnabled="true"}}</td>
diff --git a/app/assets/javascripts/discourse/templates/components/nav-item.hbs b/app/assets/javascripts/discourse/templates/components/nav-item.hbs
index 1205e1b36ab..8817c4df616 100644
--- a/app/assets/javascripts/discourse/templates/components/nav-item.hbs
+++ b/app/assets/javascripts/discourse/templates/components/nav-item.hbs
@@ -3,5 +3,5 @@
 {{else if route}}
   {{#link-to route}}{{contents}}{{/link-to}}
 {{else}}
-  <a href="{{get-url path}}" data-auto-route="true">{{contents}}</a>
+  <a href={{get-url path}} data-auto-route="true">{{contents}}</a>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/share-source.hbs b/app/assets/javascripts/discourse/templates/components/share-source.hbs
index 185f80ab9c0..7680c6b8618 100644
--- a/app/assets/javascripts/discourse/templates/components/share-source.hbs
+++ b/app/assets/javascripts/discourse/templates/components/share-source.hbs
@@ -1,4 +1,4 @@
-<a href {{action "share" source}} title="{{unbound source.title}}" aria-label="{{unbound source.title}}" >
+<a href {{action "share" source}} title={{unbound source.title}} aria-label={{unbound source.title}}>
   {{#if source.icon}}
     {{d-icon source.icon}}
   {{else}}
diff --git a/app/assets/javascripts/discourse/templates/components/topic-post-badges.hbs b/app/assets/javascripts/discourse/templates/components/topic-post-badges.hbs
index 0953efa293b..1d992c500e2 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-post-badges.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-post-badges.hbs
@@ -1,9 +1,9 @@
 {{#if unread }}
-  &nbsp;<a href='{{url}}' class='badge badge-notification unread' title='{{i18n "topic.unread_posts" count=unread}}'>{{unread}}</a>
+  &nbsp;<a href={{url}} class='badge badge-notification unread' title={{i18n "topic.unread_posts" count=unread}}>{{unread}}</a>
 {{/if}}
 {{#if newPosts}}
-  &nbsp;<a href='{{url}}' class='badge badge-notification new-posts' title='{{i18n "topic.total_unread_posts" count=newPosts}}'>{{newPosts}}</a>
+  &nbsp;<a href={{url}} class='badge badge-notification new-posts' title={{i18n "topic.total_unread_posts" count=newPosts}}>{{newPosts}}</a>
 {{/if}}
 {{#if unseen}}
-  &nbsp;<a href='{{url}}' class='badge badge-notification new-topic' title='{{i18n "topic.new"}}'>{{newDotText}}</a>
+  &nbsp;<a href={{url}} class='badge badge-notification new-topic' title={{i18n "topic.new"}}>{{newDotText}}</a>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/topic-progress.hbs b/app/assets/javascripts/discourse/templates/components/topic-progress.hbs
index ab4ea02ff46..d9c0ff58023 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-progress.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-progress.hbs
@@ -8,9 +8,9 @@
   </div>
 {{/if}}
 
-<nav id='topic-progress' title="{{i18n 'topic.progress.title'}}" class="{{if hideProgress 'hidden'}}">
+<nav id='topic-progress' title={{i18n 'topic.progress.title'}} class={{if hideProgress 'hidden'}}>
   <div class='nums'>
-    <h4>{{progressPosition}}</h4><span class="{{if hugeNumberOfPosts 'hidden'}}">
+    <h4>{{progressPosition}}</h4><span class={{if hugeNumberOfPosts 'hidden'}}>
     <span>/</span>
     <h4>{{postStream.filteredPostsCount}}</h4></span>
   </div>
diff --git a/app/assets/javascripts/discourse/templates/components/topic-timer-info.hbs b/app/assets/javascripts/discourse/templates/components/topic-timer-info.hbs
index fe1f089d742..7741113b5de 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-timer-info.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-timer-info.hbs
@@ -1,10 +1,10 @@
 {{#if showTopicTimer}}
   <h3 class="topic-timer-heading">
-    <span title="{{title}}">
+    <span title={{title}}>
       {{clockIcon}} {{notice}}
     </span>
     {{#if showTrashCan}}
-      <button class="btn topic-timer-remove no-text" title="{{trashCanTitle}}">
+      <button class="btn topic-timer-remove no-text" title={{trashCanTitle}}>
         {{trashCanIcon}}
       </button>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-badge.hbs b/app/assets/javascripts/discourse/templates/components/user-badge.hbs
index 24334c6a7e2..c1af47a6da6 100644
--- a/app/assets/javascripts/discourse/templates/components/user-badge.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-badge.hbs
@@ -1,4 +1,4 @@
-<a href="{{badgeUrl}}">
+<a href={{badgeUrl}}>
   {{#badge-button badge=badge}}
     {{#if showGrantCount}}
       <span class="count">(&times;&nbsp;{{count}})</span>
diff --git a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
index ba002653925..8319d233e19 100644
--- a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
@@ -25,7 +25,7 @@
           {{#if user.profile_hidden}}
             <span class="card-huge-avatar">{{bound-avatar user "huge"}}</span>
           {{else}}
-            <a href="{{user.path}}" {{action "showUser" user}} class="card-huge-avatar">{{bound-avatar user "huge"}}</a>
+            <a href={{user.path}} {{action "showUser" user}} class="card-huge-avatar">{{bound-avatar user "huge"}}</a>
           {{/if}}
           {{#if user.primary_group_name}}
             {{avatar-flair
@@ -43,7 +43,7 @@
                 {{if nameFirst user.name (format-username username)}}
               </span>
             {{else}}
-              <a href="{{user.path}}" {{action "showUser" user}} class='user-profile-link'>
+              <a href={{user.path}} {{action "showUser" user}} class='user-profile-link'>
                 <span class="name-username-wrapper">
                   {{if nameFirst user.name (format-username username)}}
                 </span>
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
index f3bcf803c90..fe91090dde3 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
@@ -1,5 +1,5 @@
 {{#if field.name}}
-  <label class="control-label" for="{{concat 'user-' elementId}}">
+  <label class="control-label" for={{concat 'user-' elementId}}>
     {{{field.name}}}   {{#if field.required}}<span class='required'>*</span>{{/if}}
   </label>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
index 568deb553d0..136585cb036 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
@@ -1,4 +1,4 @@
-<label class="control-label" for="{{concat 'user-' elementId}}">{{{field.name}}} {{#if field.required}}<span class='required'>*</span>{{/if}}
+<label class="control-label" for={{concat 'user-' elementId}}>{{{field.name}}} {{#if field.required}}<span class='required'>*</span>{{/if}}
 </label>
 <div class='controls'>
   {{combo-box
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
index 8ed4b1ead9b..4549f721afb 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
@@ -1,4 +1,4 @@
-<label class="control-label" for="{{concat 'user-' elementId}}">{{{field.name}}} {{#if field.required}}<span class='required'>*</span>{{/if}}
+<label class="control-label" for={{concat 'user-' elementId}}>{{{field.name}}} {{#if field.required}}<span class='required'>*</span>{{/if}}
 </label>
 <div class='controls'>
   {{input id=(concat 'user-' elementId) value=value maxlength=site.user_field_max_length}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-info.hbs b/app/assets/javascripts/discourse/templates/components/user-info.hbs
index 7870de14a8e..46691e39ea6 100644
--- a/app/assets/javascripts/discourse/templates/components/user-info.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-info.hbs
@@ -1,6 +1,6 @@
 <div class="user-image">
   <div class="user-image-inner">
-    <a href="{{unbound userPath}}" data-user-card="{{unbound user.username}}">{{avatar user imageSize="large"}}</a>
+    <a href={{unbound userPath}} data-user-card={{unbound user.username}}>{{avatar user imageSize="large"}}</a>
     {{#if user.primary_group_name}}
       {{avatar-flair
         flairURL=user.primary_group_flair_url
@@ -13,7 +13,7 @@
 
 <div class="user-detail">
   <div class='name-line'>
-    <span class="username"><a href="{{unbound userPath}}" data-user-card="{{unbound user.username}}">{{format-username user.username}}</a></span>
+    <span class="username"><a href={{unbound userPath}} data-user-card={{unbound user.username}}>{{format-username user.username}}</a></span>
     <span class="name">{{unbound name}}</span>
   </div>
   <div class="title">{{unbound user.title}}</div>
diff --git a/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs b/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
index 823c447903e..a87439ad359 100644
--- a/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
@@ -35,7 +35,7 @@
   <p class='excerpt'>{{actionDescription}}</p>
 {{/if}}
 
-<p class='excerpt' data-topic-id="{{item.topic_id}}" data-post-id="{{item.post_id}}" data-user-id="{{item.user_id}}">
+<p class='excerpt' data-topic-id={{item.topic_id}} data-post-id={{item.post_id}} data-user-id={{item.user_id}}>
   {{~#if item.expandedExcerpt}}
     {{~{item.expandedExcerpt}~}}
   {{else}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs b/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
index 056b9cf0888..7b31dfff866 100644
--- a/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
@@ -6,4 +6,4 @@
   {{/if}}
 </span>
 <br>
-<a href="{{unbound url}}">{{{topic.fancyTitle}}}</a>
+<a href={{unbound url}}>{{{topic.fancyTitle}}}</a>
diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index ffc9fb49a41..987e5e714f1 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -138,7 +138,7 @@
                                        disableSubmit=disableSubmit}}
 
               {{#if site.mobileView}}
-                <a href {{action "cancel"}} class='cancel' tabindex="6" title="{{i18n 'cancel'}}">
+                <a href {{action "cancel"}} class='cancel' tabindex="6" title={{i18n 'cancel'}}>
                   {{#if canEdit}}
                     {{d-icon "times"}}
                   {{else}}
@@ -171,11 +171,11 @@
                   {{/if}}
                 </div>
               {{/if}}
-              <div id='draft-status' class="{{if isUploading 'hidden'}}">
+              <div id='draft-status' class={{if isUploading 'hidden'}}>
                 {{#if model.draftSaving}}<div class="spinner small"></div>{{/if}}
                 {{#if model.draftSaved}}{{d-icon 'check' class='save-animation'}}{{/if}}
                 {{#if model.draftStatus}}
-                  <span title="{{model.draftStatus}}">
+                  <span title={{model.draftStatus}}>
                     {{#if model.draftConflictUser}}
                       {{avatar model.draftConflictUser imageSize="small"}} {{d-icon 'user-edit'}}
                     {{else}}
@@ -196,7 +196,7 @@
                   </a>
                 {{/if}}
 
-                <a href class="btn btn-default no-text mobile-preview" title="{{i18n 'composer.show_preview'}}" {{action "togglePreview"}}>
+                <a href class="btn btn-default no-text mobile-preview" title={{i18n 'composer.show_preview'}} {{action "togglePreview"}}>
                   {{d-icon "desktop"}}
                 </a>
 
@@ -213,7 +213,7 @@
       {{else}}
         <div class='saving-text'>
           {{#if model.createdPost}}
-            {{i18n 'composer.saved'}} <a class='permalink' href="{{unbound createdPost.url}}" {{action "viewNewReply"}}>{{i18n 'composer.view_new_post'}}</a>
+            {{i18n 'composer.saved'}} <a class='permalink' href={{unbound createdPost.url}} {{action "viewNewReply"}}>{{i18n 'composer.view_new_post'}}</a>
           {{else}}
             {{i18n 'composer.saving'}} {{loading-spinner size="small"}}
           {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/templates/full-page-search.hbs
index e903c5cd02b..c60aaf0dd1d 100644
--- a/app/assets/javascripts/discourse/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/templates/full-page-search.hbs
@@ -73,7 +73,7 @@
           {{#each model.posts as |result|}}
             <div class='fps-result'>
               <div class='author'>
-                <a href={{result.userPath}} data-user-card="{{unbound result.username}}">
+                <a href={{result.userPath}} data-user-card={{unbound result.username}}>
                   {{avatar result imageSize="large"}}
                 </a>
               </div>
@@ -84,7 +84,7 @@
                     {{track-selected selectedList=selected selectedId=result.topic}}
                   {{/if}}
 
-                  <a class='search-link' href='{{unbound result.url}}' {{action "logClick" result.topic_id}}>
+                  <a class='search-link' href={{unbound result.url}} {{action "logClick" result.topic_id}}>
                     {{topic-status topic=result.topic disableActions=true showPrivateMessageIcon=true}}
                     <span class='topic-title'>{{#highlight-text highlight=q}}{{{unbound result.topic.fancyTitle}}}{{/highlight-text}}</span>
                   </a>
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
index 7c68ac0d05f..a7484723f1f 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
@@ -26,10 +26,10 @@
                 <div class="topic-excerpt">
                   {{{t.excerpt}}}
                   {{#if t.excerptTruncated}}
-                    {{#unless t.canClearPin}}<a href="{{unbound t.url}}">{{i18n 'read_more'}}</a>{{/unless}}
+                    {{#unless t.canClearPin}}<a href={{unbound t.url}}>{{i18n 'read_more'}}</a>{{/unless}}
                   {{/if}}
                   {{#if t.canClearPin}}
-                    <a href {{action "clearPin" t}} title="{{i18n 'topic.clear_pin.help'}}">{{i18n 'topic.clear_pin.title'}}</a>
+                    <a href {{action "clearPin" t}} title={{i18n 'topic.clear_pin.help'}}>{{i18n 'topic.clear_pin.title'}}</a>
                   {{/if}}
                 </div>
               {{/if}}
@@ -42,7 +42,7 @@
               {{discourse-tags t mode="list" tagsForUser=tagsForUser}}
               <div class="pull-right">
                 {{raw "list/activity-column" topic=t tagName="div" class="num activity last"}}
-                <a href="{{t.lastPostUrl}}" title='{{i18n 'last_post'}}: {{{raw-date t.bumped_at}}}'>{{t.last_poster_username}}</a>
+                <a href={{t.lastPostUrl}} title='{{i18n 'last_post'}}: {{{raw-date t.bumped_at}}}'>{{t.last_poster_username}}</a>
               </div>
               {{#unless hideCategory}}
                 <div class='category'>
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs b/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
index 41b86dda0bf..5418fcb86a1 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
@@ -61,14 +61,14 @@
         </table>
         <footer class="clearfix">
 
-          <figure title="{{i18n 'all_time_desc'}}">{{number c.topics_all_time}} <figcaption>{{i18n 'all_time'}}</figcaption></figure>
+          <figure title={{i18n 'all_time_desc'}}>{{number c.topics_all_time}} <figcaption>{{i18n 'all_time'}}</figcaption></figure>
 
           {{#if c.pickMonth}}
-          <figure title="{{i18n 'month_desc'}}">{{number c.topics_month}} <figcaption>/ {{i18n 'month'}}</figcaption></figure>
+          <figure title={{i18n 'month_desc'}}>{{number c.topics_month}} <figcaption>/ {{i18n 'month'}}</figcaption></figure>
           {{/if}}
 
           {{#if c.pickWeek}}
-            <figure title="{{i18n 'week_desc'}}">{{number c.topics_week}} <figcaption>/ {{i18n 'week'}}</figcaption></figure>
+            <figure title={{i18n 'week_desc'}}>{{number c.topics_week}} <figcaption>/ {{i18n 'week'}}</figcaption></figure>
           {{/if}}
 
         </footer>
diff --git a/app/assets/javascripts/discourse/templates/modal/history.hbs b/app/assets/javascripts/discourse/templates/modal/history.hbs
index c96f042df32..6d9dbff78ed 100644
--- a/app/assets/javascripts/discourse/templates/modal/history.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/history.hbs
@@ -47,7 +47,7 @@
       {{/unless}}
     </div>
   </div>
-  <div id="revisions" data-post-id="{{model.post_id}}" class={{hiddenClasses}}>
+  <div id="revisions" data-post-id={{model.post_id}} class={{hiddenClasses}}>
     {{#if model.title_changes}}
       <div class="row">
         <h2>{{{titleDiff}}}</h2>
@@ -109,7 +109,7 @@
     <div id="revision-controls">
       {{d-button class="btn-default" action=(action "loadFirstVersion") icon="fast-backward" title="post.revisions.controls.first" disabled=loadFirstDisabled}}
       {{d-button class="btn-default" action=(action "loadPreviousVersion") icon="backward" title="post.revisions.controls.previous" disabled=loadPreviousDisabled}}
-      <div id="revision-numbers" class="{{unless displayRevisions 'invisible'}}">
+      <div id="revision-numbers" class={{unless displayRevisions 'invisible'}}>
         {{#conditional-loading-spinner condition=loading size="small"}}
           {{{revisionsText}}}
         {{/conditional-loading-spinner}}
diff --git a/app/assets/javascripts/discourse/templates/modal/insert-hyperlink.hbs b/app/assets/javascripts/discourse/templates/modal/insert-hyperlink.hbs
index b32fdc42fa9..1be4aab6d5a 100644
--- a/app/assets/javascripts/discourse/templates/modal/insert-hyperlink.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/insert-hyperlink.hbs
@@ -14,9 +14,9 @@
           {{#each searchResults as |result|}}
             <a
               class="search-link"
-              href="{{result.url}}"
+              href={{result.url}}
               onclick={{action "linkClick"}}
-              data-title="{{result.title}}">
+              data-title={{result.title}}>
               {{topic-status topic=result disableActions=true}}
               {{replace-emoji result.fancy_title}}
               <div class="search-category">
diff --git a/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs b/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs
index 173df534af8..9461b5d3c4d 100644
--- a/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs
@@ -7,7 +7,7 @@
     </thead>
     <tbody>
     {{#each categoriesOrdered as |cat|}}
-      <tr data-category-id="{{cat.id}}">
+      <tr data-category-id={{cat.id}}>
         <td>
           <div class={{concat 'reorder-categories-depth-' cat.depth}}>
             {{category-badge cat allowUncategorized="true"}}
diff --git a/app/assets/javascripts/discourse/templates/password-reset.hbs b/app/assets/javascripts/discourse/templates/password-reset.hbs
index de7a37ce5d5..f641f8b0e04 100644
--- a/app/assets/javascripts/discourse/templates/password-reset.hbs
+++ b/app/assets/javascripts/discourse/templates/password-reset.hbs
@@ -11,7 +11,7 @@
         <p>{{i18n 'login.not_approved'}}</p>
       {{else}}
         {{#unless redirected}}
-          <a class="btn" href="{{redirectHref}}" {{action "done"}}>{{continueButtonText}}</a>
+          <a class="btn" href={{redirectHref}} {{action "done"}}>{{continueButtonText}}</a>
         {{/unless}}
       {{/if}}
     {{else}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/account.hbs b/app/assets/javascripts/discourse/templates/preferences/account.hbs
index 0aef40f2a00..2fe58dbf597 100644
--- a/app/assets/javascripts/discourse/templates/preferences/account.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/account.hbs
@@ -117,7 +117,7 @@
                   </td>
               </tr>
             {{else}}
-              <tr class="{{dasherize authProvider.method.name}}">
+              <tr class={{dasherize authProvider.method.name}}>
                 <td>{{authProvider.method.prettyName}}</td>
                   <td colspan=2>
                     {{#if authProvider.method.can_connect}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/categories.hbs b/app/assets/javascripts/discourse/templates/preferences/categories.hbs
index e5314b67457..5bb791bcc0e 100644
--- a/app/assets/javascripts/discourse/templates/preferences/categories.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/categories.hbs
@@ -4,7 +4,7 @@
   <div class="controls tracking-controls">
     <label>{{d-icon "d-watching"}} {{i18n 'user.watched_categories'}}</label>
     {{#if canSee}}
-      <a class="show-tracking" href="{{unbound model.watchingTopicsPath}}">{{i18n 'user.tracked_topics_link'}}</a>
+      <a class="show-tracking" href={{unbound model.watchingTopicsPath}}>{{i18n 'user.tracked_topics_link'}}</a>
     {{/if}}
     {{category-selector
       categories=model.watchedCategories
@@ -18,7 +18,7 @@
   <div class="controls tracking-controls">
     <label>{{d-icon "d-tracking"}} {{i18n 'user.tracked_categories'}}</label>
     {{#if canSee}}
-      <a class="show-tracking" href="{{unbound model.trackingTopicsPath}}">{{i18n 'user.tracked_topics_link'}}</a>
+      <a class="show-tracking" href={{unbound model.trackingTopicsPath}}>{{i18n 'user.tracked_topics_link'}}</a>
     {{/if}}
     {{category-selector
       categories=model.trackedCategories
@@ -43,7 +43,7 @@
     <div class="controls tracking-controls">
       <label>{{d-icon "d-muted"}} {{i18n 'user.muted_categories'}}</label>
       {{#if canSee}}
-        <a class="show-tracking" href="{{unbound model.mutedTopicsPath}}">{{i18n 'user.tracked_topics_link'}}</a>
+        <a class="show-tracking" href={{unbound model.mutedTopicsPath}}>{{i18n 'user.tracked_topics_link'}}</a>
       {{/if}}
       {{category-selector
         categories=model.mutedCategories
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index 1bd7d80f974..b2cdb56f267 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -48,7 +48,7 @@
               {{d-button action=(action "cancelEditingTopic") class="btn-default cancel-edit" icon="times"}}
 
               {{#if canRemoveTopicFeaturedLink}}
-                <a href {{action "removeFeaturedLink"}} class="remove-featured-link" title="{{i18n "composer.remove_featured_link"}}">
+                <a href {{action "removeFeaturedLink"}} class="remove-featured-link" title={{i18n "composer.remove_featured_link"}}>
                   {{d-icon "times-circle"}}
                   {{featuredLinkDomain}}
                 </a>
@@ -57,7 +57,7 @@
           </div>
 
         {{else}}
-          <h1 data-topic-id="{{unbound model.id}}">
+          <h1 data-topic-id={{unbound model.id}}>
             {{#unless model.is_warning}}
               {{#if siteSettings.enable_personal_messages}}
                 {{private-message-glyph
@@ -73,13 +73,13 @@
 
             {{#if model.details.loaded}}
               {{topic-status topic=model}}
-              <a href="{{unbound model.url}}" {{action "jumpTop"}} class="fancy-title">
+              <a href={{unbound model.url}} {{action "jumpTop"}} class="fancy-title">
                 {{{model.fancyTitle}}}
               </a>
             {{/if}}
 
             {{#if model.details.can_edit}}
-              <a href {{action "editTopic"}} class="edit-topic" title="{{i18n "edit"}}">{{d-icon "pencil-alt"}}</a>
+              <a href {{action "editTopic"}} class="edit-topic" title={{i18n "edit"}}>{{d-icon "pencil-alt"}}</a>
             {{/if}}
           </h1>
 
@@ -170,7 +170,7 @@
       {{/topic-navigation}}
 
       <div class="row">
-        <section class="topic-area" id="topic" data-topic-id="{{unbound model.id}}">
+        <section class="topic-area" id="topic" data-topic-id={{unbound model.id}}>
 
           <div class="posts-wrapper">
             {{conditional-loading-spinner condition=model.postStream.loadingAbove}}
diff --git a/app/assets/javascripts/discourse/templates/user-invited-show.hbs b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
index 5e95282ab43..e15647621b7 100644
--- a/app/assets/javascripts/discourse/templates/user-invited-show.hbs
+++ b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
@@ -74,9 +74,9 @@
                       <td>{{number invite.user.posts_read_count}}</td>
                       <td>{{{format-duration invite.user.time_read}}}</td>
                       <td>
-                        <span title="{{i18n 'user.invited.days_visited'}}">{{{unbound invite.user.days_visited}}}</span>
+                        <span title={{i18n 'user.invited.days_visited'}}>{{{unbound invite.user.days_visited}}}</span>
                           /
-                        <span title="{{i18n 'user.invited.account_age_days'}}">{{{unbound invite.user.days_since_created}}}</span>
+                        <span title={{i18n 'user.invited.account_age_days'}}>{{{unbound invite.user.days_since_created}}}</span>
                       </td>
                     {{/if}}
                   {{else}}
diff --git a/app/assets/javascripts/discourse/templates/user.hbs b/app/assets/javascripts/discourse/templates/user.hbs
index 520fb78e88e..d1c61ab805e 100644
--- a/app/assets/javascripts/discourse/templates/user.hbs
+++ b/app/assets/javascripts/discourse/templates/user.hbs
@@ -86,8 +86,8 @@
 
           <div class="primary-textual">
             <div class="user-profile-names">
-              <h1 class="{{if nameFirst "full-name" "username"}}">{{if nameFirst model.name (format-username model.username)}} {{user-status model currentUser=currentUser}}</h1>
-              <h2 class="{{if nameFirst "username" "full-name"}}">{{#if nameFirst}}{{model.username}}{{else}}{{model.name}}{{/if}}</h2>
+              <h1 class={{if nameFirst "full-name" "username"}}>{{if nameFirst model.name (format-username model.username)}} {{user-status model currentUser=currentUser}}</h1>
+              <h2 class={{if nameFirst "username" "full-name"}}>{{#if nameFirst}}{{model.username}}{{else}}{{model.name}}{{/if}}</h2>
               {{#if model.staged}}
                 <h2 class="staged">{{i18n 'user.staged'}}</h2>
               {{/if}}
diff --git a/app/assets/javascripts/wizard/templates/components/popular-themes.hbs b/app/assets/javascripts/wizard/templates/components/popular-themes.hbs
index 42756d3ceb5..6f6ddf02ed1 100644
--- a/app/assets/javascripts/wizard/templates/components/popular-themes.hbs
+++ b/app/assets/javascripts/wizard/templates/components/popular-themes.hbs
@@ -1,5 +1,5 @@
 {{#each popular_components as |theme|}}
-  <a class="popular-theme-item" href="{{theme.meta_url}}" rel="noopener" target="_blank">
+  <a class="popular-theme-item" href={{theme.meta_url}} rel="noopener" target="_blank">
     {{theme.name}}
   </a>
 {{/each}}