diff --git a/assets/javascripts/discourse/templates/admin/plugins-house-ads-index.hbs b/assets/javascripts/discourse/templates/admin/plugins-house-ads-index.hbs
index dc26d4d..14cdda0 100644
--- a/assets/javascripts/discourse/templates/admin/plugins-house-ads-index.hbs
+++ b/assets/javascripts/discourse/templates/admin/plugins-house-ads-index.hbs
@@ -1,4 +1,4 @@
-{{#d-section class="house-ads-settings content-body"}}
+<DSection @class="house-ads-settings content-body">
   <div>{{i18n "admin.adplugin.house_ads.description"}}</div>
 
   {{#if houseAds.length}}
@@ -34,12 +34,12 @@
         adSettings=adSettings
       }}
 
-      {{d-button
-        label="admin.adplugin.house_ads.more_settings"
-        icon="cog"
+      <DButton
+        @label="admin.adplugin.house_ads.more_settings"
+        @icon="cog"
         class="btn-default"
-        action=(route-action "moreSettings")
-      }}
+        @action={{route-action "moreSettings"}}
+      />
     </form>
   {{else}}
     <p>
@@ -48,4 +48,4 @@
       {{/link-to}}
     </p>
   {{/if}}
-{{/d-section}}
\ No newline at end of file
+</DSection>
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/admin/plugins-house-ads-show.hbs b/assets/javascripts/discourse/templates/admin/plugins-house-ads-show.hbs
index 478d710..93f51a6 100644
--- a/assets/javascripts/discourse/templates/admin/plugins-house-ads-show.hbs
+++ b/assets/javascripts/discourse/templates/admin/plugins-house-ads-show.hbs
@@ -1,7 +1,7 @@
-{{#d-section class="edit-house-ad content-body"}}
-  <h1>{{text-field class="house-ad-name" value=buffered.name}}</h1>
+<DSection @class="edit-house-ad content-body">
+  <h1><TextField @class="house-ad-name" @value={{buffered.name}} /></h1>
   <div class="controls">
-    {{ace-editor content=buffered.html mode="html"}}
+    <AceEditor @content={{buffered.html}} @mode="html" />
   </div>
   <div class="controls">
     <div class="visibility-settings">
@@ -24,12 +24,12 @@
       </div>
     </div>
 
-    {{d-button
-      action=(action "save")
-      disabled=disableSave
+    <DButton
+      @action={{action "save"}}
+      @disabled={{disableSave}}
       class="btn-primary save-button"
-      label="admin.adplugin.house_ads.save"
-    }}
+      @label="admin.adplugin.house_ads.save"
+    />
 
     {{#if saving}}
       {{savingStatus}}
@@ -39,10 +39,10 @@
       {{/if}}
     {{/if}}
 
-    {{d-button
-      action=(action "destroy")
+    <DButton
+      @action={{action "destroy"}}
       class="btn-danger delete-button"
-      label="admin.adplugin.house_ads.delete"
-    }}
+      @label="admin.adplugin.house_ads.delete"
+    />
   </div>
-{{/d-section}}
\ No newline at end of file
+</DSection>
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/components/house-ads-list-setting.hbs b/assets/javascripts/discourse/templates/components/house-ads-list-setting.hbs
index 08da7e4..d2678d7 100644
--- a/assets/javascripts/discourse/templates/components/house-ads-list-setting.hbs
+++ b/assets/javascripts/discourse/templates/components/house-ads-list-setting.hbs
@@ -6,8 +6,8 @@
 }}
 <div class="setting-controls">
   {{#if changed}}
-    {{d-button class="ok" action=(action "save") icon="check"}}
-    {{d-button class="cancel" action=(action "cancel") icon="times"}}
+    <DButton class="ok" @action={{action "save"}} @icon="check" />
+    <DButton class="cancel" @action={{action "cancel"}} @icon="times" />
   {{/if}}
 </div>
 <p class="help">{{help}}</p>
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/components/house-ads-setting.hbs b/assets/javascripts/discourse/templates/components/house-ads-setting.hbs
index 32e8ffe..f3c5296 100644
--- a/assets/javascripts/discourse/templates/components/house-ads-setting.hbs
+++ b/assets/javascripts/discourse/templates/components/house-ads-setting.hbs
@@ -1,9 +1,9 @@
 <label for={{name}}>{{title}}</label>
-{{text-field value=adValue classNames="house-ads-text-input"}}
+<TextField @value={{adValue}} @classNames="house-ads-text-input" />
 <div class="setting-controls">
   {{#if changed}}
-    {{d-button class="ok" action=(action "save") icon="check"}}
-    {{d-button class="cancel" action=(action "cancel") icon="times"}}
+    <DButton class="ok" @action={{action "save"}} @icon="check" />
+    <DButton class="cancel" @action={{action "cancel"}} @icon="times" />
   {{/if}}
 </div>
 <p class="help">{{help}}</p>
\ No newline at end of file