diff --git a/assets/javascripts/discourse/connectors/bread-crumbs-right/solved-status-filter.hbs b/assets/javascripts/discourse/connectors/bread-crumbs-right/solved-status-filter.hbs
index ed7b806..68ddff1 100644
--- a/assets/javascripts/discourse/connectors/bread-crumbs-right/solved-status-filter.hbs
+++ b/assets/javascripts/discourse/connectors/bread-crumbs-right/solved-status-filter.hbs
@@ -1,10 +1,10 @@
 {{#if siteSettings.solved_enabled}}
-  {{combo-box
-    class="solved-status-filter"
-    content=statuses
-    value=status
-    valueProperty="value"
-    onChange=(action "changeStatus")
-    options=(hash caretDownIcon="caret-right" caretUpIcon="caret-down")
-  }}
+  <ComboBox
+    @class="solved-status-filter"
+    @content={{statuses}}
+    @value={{status}}
+    @valueProperty="value"
+    @options={{hash caretDownIcon="caret-right" caretUpIcon="caret-down"}}
+    @onChange={{(action "changeStatus")}}
+  />
 {{/if}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/connectors/category-custom-settings/solved-settings.hbs b/assets/javascripts/discourse/connectors/category-custom-settings/solved-settings.hbs
index aaf30ae..53e7077 100644
--- a/assets/javascripts/discourse/connectors/category-custom-settings/solved-settings.hbs
+++ b/assets/javascripts/discourse/connectors/category-custom-settings/solved-settings.hbs
@@ -4,11 +4,11 @@
   <section class="field">
     <div class="enable-accepted-answer">
       <label class="checkbox-label">
-        {{input
-          type="checkbox"
-          checked=(readonly category.enable_accepted_answers)
-          change=(action "onChangeSetting" value="target.checked")
-        }}
+        <Input
+          @type="checkbox"
+          @checked={{readonly category.enable_accepted_answers}}
+          {{on "change" (action "onChangeSetting" value="target.checked")}}
+        />
         {{i18n "solved.allow_accepted_answers"}}
       </label>
     </div>
diff --git a/assets/javascripts/discourse/connectors/topic-navigation/no-answer.hbs b/assets/javascripts/discourse/connectors/topic-navigation/no-answer.hbs
index 9605a51..34cea38 100644
--- a/assets/javascripts/discourse/connectors/topic-navigation/no-answer.hbs
+++ b/assets/javascripts/discourse/connectors/topic-navigation/no-answer.hbs
@@ -1,6 +1,6 @@
 {{#if show}}
-  {{#topic-navigation-popup popupId="solved-notice" dismissDuration=oneWeek}}
+  <TopicNavigationPopup @popupId="solved-notice" @dismissDuration={{oneWeek}}>
     <h3>{{i18n "solved.no_answer.title"}}</h3>
     <p>{{i18n "solved.no_answer.description"}}</p>
-  {{/topic-navigation-popup}}
+  </TopicNavigationPopup>
 {{/if}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/connectors/user-activity-bottom/solved-list.hbs b/assets/javascripts/discourse/connectors/user-activity-bottom/solved-list.hbs
index 02385b5..23e48f3 100644
--- a/assets/javascripts/discourse/connectors/user-activity-bottom/solved-list.hbs
+++ b/assets/javascripts/discourse/connectors/user-activity-bottom/solved-list.hbs
@@ -1,4 +1,4 @@
-{{#link-to "userActivity.solved"}}
+<LinkTo @route="userActivity.solved">
   {{d-icon "check-square"}}
   {{i18n "solved.title"}}
-{{/link-to}}
\ No newline at end of file
+</LinkTo>
\ No newline at end of file
diff --git a/assets/javascripts/discourse/connectors/user-summary-stat/solved-count.hbs b/assets/javascripts/discourse/connectors/user-summary-stat/solved-count.hbs
index 5226d2f..9743c85 100644
--- a/assets/javascripts/discourse/connectors/user-summary-stat/solved-count.hbs
+++ b/assets/javascripts/discourse/connectors/user-summary-stat/solved-count.hbs
@@ -1,7 +1,7 @@
-{{#link-to "userActivity.solved"}}
-  {{user-stat
-    value=model.solved_count
-    label="solved.solution_summary"
-    icon="check-square"
-  }}
-{{/link-to}}
\ No newline at end of file
+<LinkTo @route="userActivity.solved">
+  <UserStat
+    @value={{model.solved_count}}
+    @label="solved.solution_summary"
+    @icon="check-square"
+  />
+</LinkTo>
\ No newline at end of file