diff --git a/app/components/add-contribution/template.hbs b/app/components/add-contribution/template.hbs
index 2174967..05fd22e 100644
--- a/app/components/add-contribution/template.hbs
+++ b/app/components/add-contribution/template.hbs
@@ -1,11 +1,11 @@
-<form {{action "submit" on="submit"}}>
+<form {{on "submit" this.submit}}>
   <label>
     <p class="label">Contributor:</p>
     <p>
-      <select required onchange={{action (mut contributorId) value="target.value"}}>
+      <select required onchange={{action (mut this.contributorId) value="target.value"}}>
         <option value="" selected disabled hidden></option>
-        {{#each contributors as |contributor|}}
-          <option value={{contributor.id}} selected={{eq contributorId contributor.id}}>{{contributor.name}}</option>
+        {{#each @contributors as |contributor|}}
+          <option value={{contributor.id}} selected={{eq this.contributorId contributor.id}}>{{contributor.name}}</option>
         {{/each}}
       </select>
     </p>
@@ -13,14 +13,14 @@
   <label>
     <p class="label">Kind:</p>
     <p>
-      <select required onchange={{action (mut kind) value="target.value"}}>
+      <select required onchange={{action (mut this.kind) value="target.value"}}>
         <option value="" selected disabled hidden></option>
-        <option value="community" selected={{eq kind "community"}}>Community</option>
-        <option value="design" selected={{eq kind "design"}}>Design</option>
-        <option value="dev" selected={{eq kind "dev"}}>Development</option>
-        <option value="docs" selected={{eq kind "docs"}}>Documentation</option>
-        <option value="ops" selected={{eq kind "ops"}}>IT Operations</option>
-        <option value="special" selected={{eq kind "special"}}>Special</option>
+        <option value="community" selected={{eq this.kind "community"}}>Community</option>
+        <option value="design" selected={{eq this.kind "design"}}>Design</option>
+        <option value="dev" selected={{eq this.kind "dev"}}>Development</option>
+        <option value="docs" selected={{eq this.kind "docs"}}>Documentation</option>
+        <option value="ops" selected={{eq this.kind "ops"}}>IT Operations</option>
+        <option value="special" selected={{eq this.kind "special"}}>Special</option>
       </select>
     </p>
   </label>
@@ -28,12 +28,12 @@
     <p class="label">Date:</p>
     <p>
       {{ember-flatpickr
-        date=date
-        defaultDate=defaultDate
-        maxDate=defaultDate
+        date=this.date
+        defaultDate=this.defaultDate
+        maxDate=this.defaultDate
         enableTime=true
         time_24hr=true
-        onChange=(action (mut date))
+        onChange=(action (mut this.date))
       }}
     </p>
   </label>
@@ -42,33 +42,33 @@
     <p>
       {{input type="text"
               placeholder="500"
-              value=amount
-              class=(if isValidAmount "valid" "")}}
+              value=this.amount
+              class=(if this.isValidAmount "valid" "")}}
     </p>
   </label>
   <label>
     <p class="label">Description:</p>
     <p>
       {{input type="text"
-              value=description
-              class=(if isValidDescription "valid" "")}}
+              value=this.description
+              class=(if this.isValidDescription "valid" "")}}
     </p>
   </label>
   <label>
     <p class="label">URL (optional):</p>
     <p>
       {{input type="text"
-              value=url
-              class=(if isValidUrl "valid" "")}}
+              value=this.url
+              class=(if this.isValidUrl "valid" "")}}
     </p>
   </label>
 
-  {{#if details}}
+  {{#if this.details}}
     <label>
       <p class="label">Details:</p>
       <p>
         <pre>
-          {{details}}
+          {{this.details}}
         </pre>
       </p>
     </label>
@@ -76,8 +76,8 @@
 
   <p class="actions">
     {{input type="submit"
-            disabled=inProgress
-            value=(if inProgress "Processing" "Save")}}
+            disabled=this.inProgress
+            value=(if this.inProgress "Processing" "Save")}}
   </p>
 </form>
 
diff --git a/app/components/add-contributor/template.hbs b/app/components/add-contributor/template.hbs
index 8eceeee..fc7c22e 100644
--- a/app/components/add-contributor/template.hbs
+++ b/app/components/add-contributor/template.hbs
@@ -1,55 +1,55 @@
-<form {{action "submit" on="submit"}}>
+<form {{on "submit" this.submit}}>
   <p>
     <label for="c-account">Ethereum account</label>
-    {{input name="account" id="c-account"
-            type="text" value=account
-            placeholder="0xF18E631Ea191aE4ebE70046Fcb01a436554421BA4"
-            class=(if isValidAccount "valid" "")}}
+      <Input @name="account" @id="c-account"
+             @type="text" value={{this.account}}
+             @placeholder="0xF18E631Ea191aE4ebE70046Fcb01a436554421BA4"
+             @class={{if this.isValidAccount "valid" ""}} />
   </p>
   <p>
     <label for="c-kind">Kind</label>
-    <select required onchange={{action (mut kind) value="target.value"}} id="c-kind">
-      <option value="person" selected={{eq kind "person"}}>Person</option>
-      <option value="organization" selected={{eq kind "organization"}}>Organization</option>
+    <select required onchange={{action (mut this.kind) value="target.value"}} id="c-kind">
+      <option value="person" selected={{eq this.kind "person"}}>Person</option>
+      <option value="organization" selected={{eq this.kind "organization"}}>Organization</option>
     </select>
   </p>
   <p>
     <label for="c-name">Name</label>
-    {{input name="name" type="text" value=name placeholder="Zero Cool"
-            class=(if isValidName "valid" "") id="c-name"}}
+    {{input name="name" type="text" value=this.name placeholder="Zero Cool"
+            class=(if this.isValidName "valid" "") id="c-name"}}
   </p>
   <p>
     <label for="c-url">URL</label>
-    {{input name="url" type="text" value=url placeholder="http://zerocool.bit"
-            class=(if isValidURL "valid" "") id="c-url"}}
+    {{input name="url" type="text" value=this.url placeholder="http://zerocool.bit"
+            class=(if this.isValidURL "valid" "") id="c-url"}}
   </p>
   <p>
     <label for="c-github-uid">GitHub UID</label>
-    {{input name="github_uid" type="text" value=github_uid placeholder="2342"
-            class=(if isValidGithubUID "valid" "") id="c-github-uid"}}
+    {{input name="github_uid" type="text" value=this.github_uid placeholder="2342"
+            class=(if this.isValidGithubUID "valid" "") id="c-github-uid"}}
   </p>
   <p>
     <label for="c-github-username">GitHub username</label>
-    {{input name="github_username" type="text" value=github_username placeholder="zerocool"
-            class=(if isValidGithubUsername "valid" "") id="c-github-username"}}
+    {{input name="github_username" type="text" value=this.github_username placeholder="zerocool"
+            class=(if this.isValidGithubUsername "valid" "") id="c-github-username"}}
   </p>
   <p>
     <label for="c-gitea-username">Gitea username</label>
-    {{input name="gitea_username" type="text" value=gitea_username placeholder="zerocool"
-            class=(if isValidGiteaUsername "valid" "") id="c-gitea-username"}}
+    {{input name="gitea_username" type="text" value=this.gitea_username placeholder="zerocool"
+            class=(if this.isValidGiteaUsername "valid" "") id="c-gitea-username"}}
   </p>
   <p>
     <label for="c-wiki-username">Wiki username</label>
-    {{input name="wiki_username" type="text" value=wiki_username placeholder="ZeroCool"
-            class=(if isValidWikiUsername "valid" "") id="c-wiki-username"}}
+    {{input name="wiki_username" type="text" value=this.wiki_username placeholder="ZeroCool"
+            class=(if this.isValidWikiUsername "valid" "") id="c-wiki-username"}}
   </p>
   <p>
     <label for="c-zoom-display-name">Zoom display name</label>
-    {{input name="zoom_display_name" type="text" value=zoom_display_name placeholder="Zero Cool"
-            class=(if isValidZoomDisplayName "valid" "") id="c-zoom-display-name"}}
+    {{input name="zoom_display_name" type="text" value=this.zoom_display_name placeholder="Zero Cool"
+            class=(if this.isValidZoomDisplayName "valid" "") id="c-zoom-display-name"}}
   </p>
   <p class="actions">
-    {{input type="submit" disabled=inProgress
-            value=(if inProgress "Processing" "Save")}}
+    {{input type="submit" disabled=this.inProgress
+            value=(if this.inProgress "Processing" "Save")}}
   </p>
 </form>
diff --git a/app/components/chart-contributions-by-type/template.hbs b/app/components/chart-contributions-by-type/template.hbs
index 56f2b44..da4906f 100644
--- a/app/components/chart-contributions-by-type/template.hbs
+++ b/app/components/chart-contributions-by-type/template.hbs
@@ -1,7 +1,6 @@
 <div class="chart">
-  {{ember-chart type="doughnut"
-                data=chartData
-                options=chartOptions
-                width=200
-                height=200}}
+  <EmberChart @type="doughnut"
+              @data={{this.chartData}}
+              @options={{this.chartOptions}}
+              @width="200" @height="200" />
 </div>
\ No newline at end of file
diff --git a/app/components/contribution-list/template.hbs b/app/components/contribution-list/template.hbs
index 49419cb..f3f4dd8 100644
--- a/app/components/contribution-list/template.hbs
+++ b/app/components/contribution-list/template.hbs
@@ -1,28 +1,28 @@
-{{#if showQuickFilter}}
+{{#if @showQuickFilter}}
   <div class="quick-filter">
     <p>
       <label class="filter-contributor">
         Contributor:
-        <select onchange={{action (mut contributorId) value="target.value"}}>
+        <select onchange={{action (mut this.contributorId) value="target.value"}}>
           <option value="" selected>all</option>
-          {{#each contributorsActive as |contributor|}}
-            <option value={{contributor.id}} selected={{eq contributorId contributor.id}}>{{contributor.name}}</option>
+          {{#each this.contributorsActive as |contributor|}}
+            <option value={{contributor.id}} selected={{eq this.contributorId contributor.id}}>{{contributor.name}}</option>
           {{/each}}
         </select>
       </label>
 
       <label class="filter-contribution-kind">
         Kind:
-        <select onchange={{action (mut contributionKind) value="target.value"}}>
+        <select onchange={{action (mut this.contributionKind) value="target.value"}}>
           <option value="" selected>all</option>
-          {{#each contributionKinds as |kind|}}
-            <option value={{kind}} selected={{eq contributionKind kind}}>{{capitalize-string kind}}</option>
+          {{#each this.contributionKinds as |kind|}}
+            <option value={{kind}} selected={{eq this.contributionKind kind}}>{{capitalize-string kind}}</option>
           {{/each}}
         </select>
       </label>
 
       <label class="filter-contribution-size">
-        {{input type="checkbox" checked=hideSmallContributions}}
+        <Input type="checkbox" @checked={{this.hideSmallContributions}} />
         Hide small contributions
       </label>
     </p>
@@ -30,12 +30,12 @@
 {{/if}}
 
 <ul class="contribution-list">
-  {{#each contributionsFiltered as |contribution|}}
-    <li role="button" {{action "openContributionDetails" contribution}}
-        data-contribution-id={{contribution.id}}
-        class="{{contribution-status contribution}}{{if (eq contribution.id selectedContributionId) " selected"}}">
+  {{#each this.contributionsFiltered as |contribution|}}
+    <li role="button" data-contribution-id={{contribution.id}}
+        {{on "click" (fn this.openContributionDetails contribution)}}
+        class="{{contribution-status contribution}}{{if (eq contribution.id @selectedContributionId) " selected"}}">
       <p class="meta">
-        <span class="recipient">{{user-avatar contributor=contribution.contributor}}</span>
+        <span class="recipient"><UserAvatar @contributor={{contribution.contributor}} /></span>
         <span class="category {{contribution.kind}}">({{contribution.kind}})</span>
         <span class="title">{{contribution.description}}</span>
       </p>
@@ -45,10 +45,9 @@
       {{#unless contribution.vetoed}}
         {{#unless (is-confirmed-contribution contribution)}}
           <p class="voting">
-            {{input type="button" class="button small danger"
-                    click=(action "veto" contribution.id)
-                    disabled=contribution.hasPendingChanges
-                    value="veto"}}
+            <Input @type="button" @class="button small danger" @value="veto"
+                   @click={{fn this.veto contribution.id}}
+                   @disabled={{contribution.hasPendingChanges}} />
           </p>
         {{/unless}}
       {{/unless}}
diff --git a/app/components/contributor-list/template.hbs b/app/components/contributor-list/template.hbs
index dfeecd5..95ec449 100644
--- a/app/components/contributor-list/template.hbs
+++ b/app/components/contributor-list/template.hbs
@@ -1,13 +1,14 @@
 <tbody>
-  {{#each contributorList as |c|}}
-    <tr role="button" {{action "openContributorDetails" c.contributor}}
-        class="{{if (is-current-user c.contributor) "current-user"}} {{if (eq c.contributor.id selectedContributorId) "selected"}}">
+  {{#each @contributorList as |c|}}
+    <tr role="button"
+        {{on "click" (fn this.openContributorDetails c.contributor)}}
+        class="{{if (is-current-user c.contributor) "current-user"}} {{if (eq c.contributor.id @selectedContributorId) "selected"}}">
       <td class="person">
-        {{user-avatar contributor=c.contributor}} {{c.contributor.name}}
+        <UserAvatar @contributor={{c.contributor}} /> {{c.contributor.name}}
       </td>
       <td class="kredits">
         <span class="amount">
-          {{#if showUnconfirmedKredits}}
+          {{#if @showUnconfirmedKredits}}
             {{c.amountTotal}}
           {{else}}
             {{c.amountConfirmed}}
diff --git a/app/components/external-account-link/template.hbs b/app/components/external-account-link/template.hbs
index 3371c9d..e63156f 100644
--- a/app/components/external-account-link/template.hbs
+++ b/app/components/external-account-link/template.hbs
@@ -1,4 +1,4 @@
-<a href={{account.url}} target="_blank" rel="noopener" title="{{account.username}} on {{account.site}}">
-  <span class="site">{{account.site}}</span>
-  {{component iconComponentName}}
+<a href={{this.account.url}} target="_blank" rel="noopener noreferrer" title="{{this.account.username}} on {{this.account.site}}">
+  <span class="site">{{this.account.site}}</span>
+  {{component this.iconComponentName}}
 </a>
\ No newline at end of file
diff --git a/app/components/topbar-account-panel/template.hbs b/app/components/topbar-account-panel/template.hbs
index 35e802c..f4d8d28 100644
--- a/app/components/topbar-account-panel/template.hbs
+++ b/app/components/topbar-account-panel/template.hbs
@@ -1,17 +1,17 @@
 <section id="user-account">
-  {{#if setupInProgress}}
+  {{#if this.setupInProgress}}
     Connecting account...
   {{else}}
-    {{#if (and kredits.hasAccounts kredits.currentUser)}}
-      {{kredits.currentUser.name}}
-      {{#if kredits.currentUserIsCore}}
+    {{#if (and this.kredits.hasAccounts this.kredits.currentUser)}}
+      {{this.kredits.currentUser.name}}
+      {{#if this.kredits.currentUserIsCore}}
         <span class="core-flag">(core)</span>
       {{/if}}
     {{else}}
       <span class="anonymous">Anonymous</span>
-      <button {{action "signup"}} class="small">Sign up</button>
-      {{#if showConnectButton}}
-        <button {{action "connectAccount"}} class="small green">Connect account</button>
+      <button {{on "click" this.signup}} class="small" type="button">Sign up</button>
+      {{#if this.showConnectButton}}
+        <button {{on "click" this.connectAccount}} class="small green" type="button">Connect account</button>
       {{/if}}
     {{/if}}
   {{/if}}
diff --git a/app/templates/contributions/new.hbs b/app/templates/contributions/new.hbs
index cbcf910..e0ecce3 100644
--- a/app/templates/contributions/new.hbs
+++ b/app/templates/contributions/new.hbs
@@ -6,7 +6,9 @@
     </header>
 
     <div class="content">
-      <AddContribution @contributors={{sortedContributors}} @attributes={{model.params}} @save={{action "save"}} />
+      <AddContribution @contributors={{this.sortedContributors}}
+                       @attributes={{this.model.params}}
+                       @save={{action "save"}} />
     </div>
   </section>
 
diff --git a/app/templates/contributions/resubmit.hbs b/app/templates/contributions/resubmit.hbs
index bd48439..1eb365d 100644
--- a/app/templates/contributions/resubmit.hbs
+++ b/app/templates/contributions/resubmit.hbs
@@ -2,11 +2,13 @@
 
   <section id="add-contribution">
     <header>
-      <h2>Re-submit contribution #{{model.id}}</h2>
+      <h2>Re-submit contribution #{{this.model.id}}</h2>
     </header>
 
     <div class="content">
-      <AddContribution @attributes={{attributes}} @contributors={{sortedContributors}} @save={{action "save"}} />
+      <AddContribution @attributes={{this.attributes}}
+                       @contributors={{this.sortedContributors}}
+                       @save={{action "save"}} />
     </div>
   </section>
 
diff --git a/app/templates/contributors/edit.hbs b/app/templates/contributors/edit.hbs
index efbe7a8..c840748 100644
--- a/app/templates/contributors/edit.hbs
+++ b/app/templates/contributors/edit.hbs
@@ -6,7 +6,7 @@
     </header>
 
     <div class="content">
-      <AddContributor @attributes={{attributes}} @save={{action "save"}} />
+      <AddContributor @attributes={{this.attributes}} @save={{action "save"}} />
     </div>
   </section>
 
diff --git a/app/templates/dashboard.hbs b/app/templates/dashboard.hbs
index af98894..31d27ec 100644
--- a/app/templates/dashboard.hbs
+++ b/app/templates/dashboard.hbs
@@ -1,40 +1,43 @@
-{{#if showIntroText}}
-  <div id="intro" class={{if showDetailsPane "with-details"}}>
+{{#if this.showIntroText}}
+  <div id="intro" class={{if this.showDetailsPane "with-details"}}>
     <h2>
       Welcome to the contribution dashboard of the
-      <a href="https://kosmos.org" target="_blank" rel="noopener">Kosmos</a> project!
+      <a href="https://kosmos.org" target="_blank" rel="noreferrer noopener">Kosmos</a> project!
     </h2>
     <p>
       If you want to learn more about what the numbers mean and how this works,
       check out the
-      <a href="https://wiki.kosmos.org/Kredits" target="_blank" rel="noopener">Kredits documentation</a>.
+      <a href="https://wiki.kosmos.org/Kredits" target="_blank" rel="noreferrer noopener">Kredits documentation</a>.
       If you want to start earning kredits for your contributions,
       <LinkTo @route="signup">create a contributor profile</LinkTo>.
     </p>
   </div>
 {{/if}}
 
-<main id="dashboard" class={{if showDetailsPane "with-details"}}>
+<main id="dashboard" class={{if this.showDetailsPane "with-details"}}>
 
   <div id="stats">
     <section id="people">
       <header class="with-nav">
         <h2>Contributors</h2>
-        {{#if kredits.hasAccounts}}
+        {{#if this.kredits.hasAccounts}}
           <nav>
             <LinkTo @route="contributors.new" @title="Add contributor profile" class="button small green">add</LinkTo>
           </nav>
         {{/if}}
       </header>
       <div class="content">
-        <ContributorList @contributorList={{kreditsToplist}} @showUnconfirmedKredits={{showUnconfirmedKredits}} @selectedContributorId={{selectedContributorId}} />
+        <ContributorList @contributorList={{this.kreditsToplist}}
+                         @showUnconfirmedKredits={{this.showUnconfirmedKredits}}
+                         @selectedContributorId={{this.selectedContributorId}} />
 
         <p class="stats">
-          <span class="number">{{await kredits.totalKreditsEarned}}</span> kredits confirmed and issued to
-          <span class="number">{{contributorsWithKredits.length}}</span> contributors
+          <span class="number">{{await this.kredits.totalKreditsEarned}}</span> kredits confirmed and issued to
+          <span class="number">{{this.contributorsWithKredits.length}}</span> contributors
         </p>
         <p class="stats">
-          <Input @type="checkbox" @id="hide-unnconfirmed-kredits" @checked={{showUnconfirmedKredits}} />
+          <Input @type="checkbox" @id="hide-unnconfirmed-kredits"
+                 @checked={{this.showUnconfirmedKredits}} />
           <label for="hide-unnconfirmed-kredits">Show unconfirmed kredits in toplist</label>
         </p>
       </div>
@@ -45,26 +48,36 @@
         <h2>Contributions by type</h2>
       </header>
       <div class="content">
-        <ChartContributionsByType @contributions={{contributions}} />
+        <ChartContributionsByType @contributions={{this.contributions}} />
       </div>
     </section>
   </div>
 
   <div id="contributions">
-    {{#if contributionsUnconfirmed}}
+    {{#if this.contributionsUnconfirmed}}
       <section id="contributions-unconfirmed">
         <header class="with-nav">
           <h2>Latest Contributions</h2>
           <nav>
-            <button {{action "toggleQuickFilterUnconfirmed"}} class="small {{if showQuickFilterUnconfirmed "active"}}">filter</button>
-            {{#if kredits.hasAccounts}}
-              <LinkTo @route="contributions.new" @title="Submit a contribution" class="button small green">add</LinkTo>
+            <button type="button"
+                    onclick={{action "toggleQuickFilterUnconfirmed"}}
+                    class="small {{if this.showQuickFilterUnconfirmed "active"}}">
+              filter
+            </button>
+            {{#if this.kredits.hasAccounts}}
+              <LinkTo @route="contributions.new"
+                      @title="Submit a contribution"
+                      class="button small green">add</LinkTo>
             {{/if}}
           </nav>
         </header>
         <div class="content">
           {{!-- TODO: We need a better naming for kredits.hasAccounts --}}
-          <ContributionList @contributions={{contributionsUnconfirmedSorted}} @vetoContribution={{action "vetoContribution"}} @contractInteractionEnabled={{kredits.hasAccounts}} @selectedContributionId={{selectedContributionId}} @showQuickFilter={{showQuickFilterUnconfirmed}} />
+          <ContributionList @contributions={{this.contributionsUnconfirmedSorted}}
+                            @vetoContribution={{action "vetoContribution"}}
+                            @contractInteractionEnabled={{this.kredits.hasAccounts}}
+                            @selectedContributionId={{this.selectedContributionId}}
+                            @showQuickFilter={{this.showQuickFilterUnconfirmed}} />
         </div>
       </section>
     {{/if}}
@@ -73,11 +86,18 @@
       <header class="with-nav">
         <h2>Confirmed Contributions</h2>
         <nav>
-          <button {{action "toggleQuickFilterConfirmed"}} class="small {{if showQuickFilterConfirmed "active"}}">filter</button>
+          <button type="button"
+                  onclick={{action "toggleQuickFilterConfirmed"}}
+                  class="small {{if this.showQuickFilterConfirmed "active"}}">
+            filter
+          </button>
         </nav>
       </header>
       <div class="content">
-        <ContributionList @contributions={{contributionsConfirmedSorted}} @vetoContribution={{action "vetoContribution"}} @selectedContributionId={{selectedContributionId}} @showQuickFilter={{showQuickFilterConfirmed}} />
+        <ContributionList @contributions={{this.contributionsConfirmedSorted}}
+                          @vetoContribution={{action "vetoContribution"}}
+                          @selectedContributionId={{this.selectedContributionId}}
+                          @showQuickFilter={{this.showQuickFilterConfirmed}} />
       </div>
     </section>
   </div>
diff --git a/app/templates/dashboard/contributions/show.hbs b/app/templates/dashboard/contributions/show.hbs
index ff22086..a447c1e 100644
--- a/app/templates/dashboard/contributions/show.hbs
+++ b/app/templates/dashboard/contributions/show.hbs
@@ -1,8 +1,8 @@
-<section id="contribution-details" class={{if model.vetoed "vetoed"}}>
+<section id="contribution-details" class={{if this.model.vetoed "vetoed"}}>
   <header class="with-nav">
-    <h2>Contribution #{{model.id}}</h2>
+    <h2>Contribution #{{this.model.id}}</h2>
     <nav>
-      <span class="amount">{{model.amount}}</span>&nbsp;
+      <span class="amount">{{this.model.amount}}</span>&nbsp;
       <span class="symbol">₭S</span>
     </nav>
   </header>
@@ -10,29 +10,29 @@
   <div class="content">
     <p class="who-what-when">
       <span class="contributor">
-        <UserAvatar @contributor={{model.contributor}} />
-        <LinkTo @route="dashboard.contributors.show" @model={{model.contributor}}>{{model.contributor.name}}</LinkTo>
+        <UserAvatar @contributor={{this.model.contributor}} />
+        <LinkTo @route="dashboard.contributors.show" @model={{this.model.contributor}}>{{this.model.contributor.name}}</LinkTo>
       </span>
       contributed
-      <span class="date" title={{model.iso8601Date}}>{{moment-from model.iso8601Date}}</span>:
+      <span class="date" title={{this.model.iso8601Date}}>{{moment-from this.model.iso8601Date}}</span>:
     </p>
-    <h3>{{model.description}}</h3>
+    <h3>{{this.model.description}}</h3>
     <p>
-      Kind: {{model.kind}}
-      <br>Status: {{contribution-status model}}
+      Kind: {{this.model.kind}}
+      <br>Status: {{contribution-status this.model}}
     </p>
-    {{#if model.url}}
+    {{#if this.model.url}}
       <p>
-        <a href={{model.url}}
-           title={{model.description}}
+        <a href={{this.model.url}}
+           title={{this.model.description}}
            class="button"
            target="_blank"
-           rel="noopener">
+           rel="noopener noreferrer">
           Open URL
         </a>
       </p>
     {{/if}}
-    {{#if model.vetoed}}
+    {{#if this.model.vetoed}}
       <div class="hint vetoed">
         <div class="icon">
           <IconWarning />
@@ -42,7 +42,7 @@
           kredits will be issued.
         </p>
         <p>
-          <LinkTo @route="contributions.resubmit" @model={{model}} class="button small green">Re-submit contribution …</LinkTo>
+          <LinkTo @route="contributions.resubmit" @model={{this.model}} class="button small green">Re-submit contribution …</LinkTo>
         </p>
       </div>
     {{/if}}
@@ -50,10 +50,10 @@
 
   <div class="actions">
     <p>
-      <LinkTo @route="contributions.resubmit" @model={{model}} class="button small">Copy & edit as new</LinkTo>
-      {{#if model.ipfsHash}}
-        <a href="{{ipfsGatewayUrl}}/{{model.ipfsHash}}"
-           class="button small" target="_blank" rel="noopener">
+      <LinkTo @route="contributions.resubmit" @model={{this.model}} class="button small">Copy & edit as new</LinkTo>
+      {{#if this.model.ipfsHash}}
+        <a href="{{this.ipfsGatewayUrl}}/{{this.model.ipfsHash}}"
+           class="button small" target="_blank" rel="noopener noreferrer">
           Inspect IPFS data
         </a>
       {{/if}}
diff --git a/app/templates/dashboard/contributors/show.hbs b/app/templates/dashboard/contributors/show.hbs
index e8978f4..241de86 100644
--- a/app/templates/dashboard/contributors/show.hbs
+++ b/app/templates/dashboard/contributors/show.hbs
@@ -1,21 +1,21 @@
 <section id="contributor-profile">
   <header>
-    <UserAvatar @contributor={{model}} @size="medium" />
+    <UserAvatar @contributor={{this.model}} @size="medium" />
   </header>
 
   <div class="content">
-    <h2>{{model.name}}</h2>
-    <p class="role">{{roleName}}</p>
+    <h2>{{this.model.name}}</h2>
+    <p class="role">{{this.roleName}}</p>
 
     <ul class="external-accounts">
-      {{#each model.accounts as |account|}}
+      {{#each this.model.accounts as |account|}}
         <li>
-          <ExternalAccountLink @account={{account}} />
+          <ExternalAccountLink @account={{this.account}} />
         </li>
       {{/each}}
-      {{#if model.url}}
+      {{#if this.model.url}}
         <li>
-          <a href={{model.url}} target="_blank" rel="noopener" title="Website">
+          <a href={{this.model.url}} target="_blank" rel="noopener noreferrer" title="Website">
             <span class="site">Web</span>
             <IconWebGlobe />
           </a>
@@ -24,18 +24,18 @@
     </ul>
     <div class="actions">
       <p>
-        <LinkTo @route="contributions.new" @query={{hash contributorId=model.id}} class="button green">♥ Give kredits</LinkTo>
+        <LinkTo @route="contributions.new" @query={{hash contributorId=this.model.id}} class="button green">♥ Give kredits</LinkTo>
       </p>
     </div>
   </div>
 
   <div class="actions">
     <p>
-      <a href="https://rinkeby.etherscan.io/address/{{model.account}}" class="button small" target="_blank" rel="noopener">Inspect Ethereum transactions</a>
-      {{#if model.ipfsHash}}
-        <a href="{{ipfsGatewayUrl}}/{{model.ipfsHash}}" class="button small" target="_blank" rel="noopener">Inspect IPFS profile</a>
+      <a href="https://rinkeby.etherscan.io/address/{{this.model.account}}" class="button small" target="_blank" rel="noopener noreferrer">Inspect Ethereum transactions</a>
+      {{#if this.model.ipfsHash}}
+        <a href="{{this.ipfsGatewayUrl}}/{{this.model.ipfsHash}}" class="button small" target="_blank" rel="noopener noreferrer">Inspect IPFS profile</a>
       {{/if}}
-      <LinkTo @route="contributors.edit" @model={{model}} class="button small">Edit profile</LinkTo>
+      <LinkTo @route="contributors.edit" @model={{this.model}} class="button small">Edit profile</LinkTo>
     </p>
   </div>
 </section>
diff --git a/app/templates/signup/eth-account.hbs b/app/templates/signup/eth-account.hbs
index 6c3f513..7f100e9 100644
--- a/app/templates/signup/eth-account.hbs
+++ b/app/templates/signup/eth-account.hbs
@@ -6,17 +6,18 @@
     Kredits allow you to take part in project governance, and to earn rewards for
     your contributions. For both, you will need an Ethereum wallet/account.
   </p>
-  <form {{action "submit" on="submit"}}>
+  <form>
     <p>
       <label>
         Ethereum account:<br>
-        <Input @type="text" @value={{ethAddress}} placeholder="0xF18E631Ea191aE4ebE70046Fcb01a436554421BA4" class={{if isValidEthAccount "valid" ""}} />
+        <Input @type="text" @value={{this.ethAddress}} placeholder="0xF18E631Ea191aE4ebE70046Fcb01a436554421BA4" class={{if this.isValidEthAccount "valid" ""}} />
       </label>
     </p>
   </form>
   <p class="actions">
-    <button disabled={{signupButtonDisabled}}
-            {{action "completeSignup"}}>
+    <button disabled={{this.signupButtonDisabled}}
+            {{on "click" this.completeSignup}}
+            type="button">
       Complete my profile
     </button>
   </p>
diff --git a/app/templates/signup/index.hbs b/app/templates/signup/index.hbs
index 1146f59..036384d 100644
--- a/app/templates/signup/index.hbs
+++ b/app/templates/signup/index.hbs
@@ -12,7 +12,7 @@
     connecting one of the following accounts:
   </p>
   <p class="actions">
-    <button {{action "connectGithub"}} class="icon">
+    <button {{on "click" this.connectGithub}} class="icon" type="button">
       <IconAccountGithubCom />
       Connect GitHub
     </button>