diff --git a/.idea/file.template.settings.xml b/.idea/file.template.settings.xml
index 2c3dda55a9..1e6d153677 100644
--- a/.idea/file.template.settings.xml
+++ b/.idea/file.template.settings.xml
@@ -1,10 +1,13 @@
 <application>
   <component name="ExportableFileTemplateSettings">
+    <includes_templates>
+      <template name="Insert package.java" file-name="InsertPackage" reformat="true" live-template-enabled="false" />
+    </includes_templates>
     <default_templates>
       <template name="Decompose component.kt" file-name="${NAME}Component" reformat="true" live-template-enabled="false">
-        <template name="Decompose component.kt.child.5.kt" file-name="di/${NAME}ModelModule" reformat="true" live-template-enabled="false" />
-        <template name="Decompose component.kt.child.4.kt" file-name="di/${NAME}ComponentModule" reformat="true" live-template-enabled="false" />
         <template name="Decompose component.kt.child.0.kt" file-name="entity/${NAME}UM" reformat="true" live-template-enabled="false" />
+        <template name="Decompose component.kt.child.4.kt" file-name="di/${NAME}ComponentModule" reformat="true" live-template-enabled="false" />
+        <template name="Decompose component.kt.child.5.kt" file-name="di/${NAME}ModelModule" reformat="true" live-template-enabled="false" />
         <template name="Decompose component.kt.child.1.kt" file-name="ui/${NAME}Content" reformat="true" live-template-enabled="false" />
         <template name="Decompose component.kt.child.2.kt" file-name="model/${NAME}Model" reformat="true" live-template-enabled="false" />
         <template name="Decompose component.kt.child.3.kt" file-name="Default${NAME}Component" reformat="true" live-template-enabled="false" />
@@ -16,17 +19,19 @@
       <template name="Decompose component.kt.child.4.kt" file-name="di/${NAME}ComponentModule" reformat="true" live-template-enabled="false" />
       <template name="Decompose component.kt.child.5.kt" file-name="di/${NAME}ModelModule" reformat="true" live-template-enabled="false" />
       <template name="FeatureToggles.kt" file-name="${NAME}FeatureToggles" reformat="true" live-template-enabled="false">
-        <template name="FeatureToggles.kt.child.0.kt" file-name="Default${NAME}FeatureToggles" reformat="true" live-template-enabled="false" />
+        <template name="FeatureToggles.kt.child.0.kt" file-name="di/${NAME}FeatureTogglesModule" reformat="true" live-template-enabled="false" />
+        <template name="FeatureToggles.kt.child.1.kt" file-name="Default${NAME}FeatureToggles" reformat="true" live-template-enabled="false" />
       </template>
-      <template name="FeatureToggles.kt.child.0.kt" file-name="Default${NAME}FeatureToggles" reformat="true" live-template-enabled="false" />
+      <template name="FeatureToggles.kt.child.0.kt" file-name="di/${NAME}FeatureTogglesModule" reformat="true" live-template-enabled="false" />
+      <template name="FeatureToggles.kt.child.1.kt" file-name="Default${NAME}FeatureToggles" reformat="true" live-template-enabled="false" />
       <template name="FlowPackaging.kt" file-name="producer/${NAME}Producer" reformat="true" live-template-enabled="false">
-        <template name="FlowPackaging.kt.child.0.kt" file-name="di/${NAME}FetcherModule" reformat="true" live-template-enabled="false" />
-        <template name="FlowPackaging.kt.child.1.kt" file-name="di/${NAME}ProducerFactoryModule" reformat="true" live-template-enabled="false" />
-        <template name="FlowPackaging.kt.child.2.kt" file-name="di/${NAME}SupplierModule" reformat="true" live-template-enabled="false" />
-        <template name="FlowPackaging.kt.child.3.kt" file-name="fetcher/Default${NAME}Fetcher" reformat="true" live-template-enabled="false" />
-        <template name="FlowPackaging.kt.child.4.kt" file-name="producer/Default${NAME}Producer" reformat="true" live-template-enabled="false" />
         <template name="FlowPackaging.kt.child.5.kt" file-name="fetcher/${NAME}Fetcher" reformat="true" live-template-enabled="false" />
+        <template name="FlowPackaging.kt.child.1.kt" file-name="di/${NAME}ProducerFactoryModule" reformat="true" live-template-enabled="false" />
+        <template name="FlowPackaging.kt.child.0.kt" file-name="di/${NAME}FetcherModule" reformat="true" live-template-enabled="false" />
+        <template name="FlowPackaging.kt.child.4.kt" file-name="producer/Default${NAME}Producer" reformat="true" live-template-enabled="false" />
+        <template name="FlowPackaging.kt.child.3.kt" file-name="fetcher/Default${NAME}Fetcher" reformat="true" live-template-enabled="false" />
         <template name="FlowPackaging.kt.child.6.kt" file-name="supplier/${NAME}Supplier" reformat="true" live-template-enabled="false" />
+        <template name="FlowPackaging.kt.child.2.kt" file-name="di/${NAME}SupplierModule" reformat="true" live-template-enabled="false" />
       </template>
       <template name="FlowPackaging.kt.child.0.kt" file-name="di/${NAME}FetcherModule" reformat="true" live-template-enabled="false" />
       <template name="FlowPackaging.kt.child.1.kt" file-name="di/${NAME}ProducerFactoryModule" reformat="true" live-template-enabled="false" />
diff --git a/.idea/fileTemplates/FeatureToggles.kt b/.idea/fileTemplates/FeatureToggles.kt
index a5606b1361..df39541c54 100644
--- a/.idea/fileTemplates/FeatureToggles.kt
+++ b/.idea/fileTemplates/FeatureToggles.kt
@@ -1,9 +1,4 @@
-#if ($TOGGLE_NAME && $TOGGLE_NAME != "")
-    #set($TOGGLE = $TOGGLE_NAME)
-#else
-    #set($TOGGLE = "TODO")
-#end
-#if (${PACKAGE_NAME} != "")package ${PACKAGE_NAME};#end
+#if (${PACKAGE_NAME} != "")package ${PACKAGE_NAME}#end
 
 interface ${NAME}FeatureToggles {
 
diff --git a/.idea/fileTemplates/FeatureToggles.kt.child.0.kt b/.idea/fileTemplates/FeatureToggles.kt.child.0.kt
index 4078ac6093..a99559a3f9 100644
--- a/.idea/fileTemplates/FeatureToggles.kt.child.0.kt
+++ b/.idea/fileTemplates/FeatureToggles.kt.child.0.kt
@@ -1,16 +1,18 @@
-#if ($TOGGLE_NAME && $TOGGLE_NAME != "")
-    #set($TOGGLE = $TOGGLE_NAME)
-#else
-    #set($TOGGLE = "TODO")
-#end
-#if (${PACKAGE_NAME} != "")package ${PACKAGE_NAME};#end
+#if (${PACKAGE_NAME} != "")package ${PACKAGE_NAME}.di#end
 
-import com.tangem.core.configtoggle.feature.FeatureTogglesManager
+import ${PACKAGE_NAME}.Default${NAME}FeatureToggles
+import ${PACKAGE_NAME}.${NAME}FeatureToggles
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
 
-internal class Default${NAME}FeatureToggles(
-    private val featureTogglesManager: FeatureTogglesManager,
-) : ${NAME}FeatureToggles {
+@Module
+@InstallIn(SingletonComponent::class)
+internal interface ${NAME}FeatureTogglesModule {
 
-    override val isFeatureEnabled: Boolean
-        get() = featureTogglesManager.isFeatureEnabled(name = "$TOGGLE")
+    @Binds
+    @Singleton
+    fun bind${NAME}FeatureToggles(impl: Default${NAME}FeatureToggles): ${NAME}FeatureToggles
 }
\ No newline at end of file
diff --git a/.idea/fileTemplates/FeatureToggles.kt.child.1.kt b/.idea/fileTemplates/FeatureToggles.kt.child.1.kt
new file mode 100644
index 0000000000..fcb900f9df
--- /dev/null
+++ b/.idea/fileTemplates/FeatureToggles.kt.child.1.kt
@@ -0,0 +1,13 @@
+#if (${PACKAGE_NAME} != "")package ${PACKAGE_NAME}#end
+
+import com.tangem.core.configtoggle.FeatureToggles
+import com.tangem.core.configtoggle.feature.FeatureTogglesManager
+import javax.inject.Inject
+
+internal class Default${NAME}FeatureToggles @Inject constructor(
+    private val featureTogglesManager: FeatureTogglesManager,
+) : ${NAME}FeatureToggles {
+
+    override val isFeatureEnabled: Boolean
+        get() = featureTogglesManager.isFeatureEnabled(toggle = FeatureToggles.)
+}
\ No newline at end of file