diff --git a/extensions/intellij/intellij_generator_plugin/src/main/java/com/bloc/intellij_generator_plugin/intention_action/BlocWrapWithBlocBuilderIntentionAction.kt b/extensions/intellij/intellij_generator_plugin/src/main/java/com/bloc/intellij_generator_plugin/intention_action/BlocWrapWithBlocBuilderIntentionAction.kt
index 1a43c88922c..d9121f714dc 100644
--- a/extensions/intellij/intellij_generator_plugin/src/main/java/com/bloc/intellij_generator_plugin/intention_action/BlocWrapWithBlocBuilderIntentionAction.kt
+++ b/extensions/intellij/intellij_generator_plugin/src/main/java/com/bloc/intellij_generator_plugin/intention_action/BlocWrapWithBlocBuilderIntentionAction.kt
@@ -7,4 +7,12 @@ class BlocWrapWithBlocBuilderIntentionAction : BlocWrapWithIntentionAction(Snipp
     override fun getText(): String {
         return "Wrap with BlocBuilder"
     }
+}
+class BlocWrapWithCubitBuilderIntentionAction : BlocWrapWithIntentionAction(SnippetType.CubitBuilder) {
+    /**
+     * If this action is applicable, returns the text to be shown in the list of intention actions available.
+     */
+    override fun getText(): String {
+        return "Wrap with BlocBuilder (Cubit)"
+    }
 }
\ No newline at end of file
diff --git a/extensions/intellij/intellij_generator_plugin/src/main/java/com/bloc/intellij_generator_plugin/intention_action/BlocWrapWithBlocConsumerIntentionAction.kt b/extensions/intellij/intellij_generator_plugin/src/main/java/com/bloc/intellij_generator_plugin/intention_action/BlocWrapWithBlocConsumerIntentionAction.kt
index 63f94cc84f6..6c1f45c234e 100644
--- a/extensions/intellij/intellij_generator_plugin/src/main/java/com/bloc/intellij_generator_plugin/intention_action/BlocWrapWithBlocConsumerIntentionAction.kt
+++ b/extensions/intellij/intellij_generator_plugin/src/main/java/com/bloc/intellij_generator_plugin/intention_action/BlocWrapWithBlocConsumerIntentionAction.kt
@@ -7,4 +7,12 @@ class BlocWrapWithBlocConsumerIntentionAction : BlocWrapWithIntentionAction(Snip
     override fun getText(): String {
         return "Wrap with BlocConsumer"
     }
+}
+class BlocWrapWithCubitConsumerIntentionAction : BlocWrapWithIntentionAction(SnippetType.CubitConsumer) {
+    /**
+     * If this action is applicable, returns the text to be shown in the list of intention actions available.
+     */
+    override fun getText(): String {
+        return "Wrap with BlocConsumer (Cubit)"
+    }
 }
\ No newline at end of file
diff --git a/extensions/intellij/intellij_generator_plugin/src/main/java/com/bloc/intellij_generator_plugin/intention_action/BlocWrapWithBlocListenerIntentionAction.kt b/extensions/intellij/intellij_generator_plugin/src/main/java/com/bloc/intellij_generator_plugin/intention_action/BlocWrapWithBlocListenerIntentionAction.kt
index 3c831041de4..610da6e9c3a 100644
--- a/extensions/intellij/intellij_generator_plugin/src/main/java/com/bloc/intellij_generator_plugin/intention_action/BlocWrapWithBlocListenerIntentionAction.kt
+++ b/extensions/intellij/intellij_generator_plugin/src/main/java/com/bloc/intellij_generator_plugin/intention_action/BlocWrapWithBlocListenerIntentionAction.kt
@@ -7,4 +7,12 @@ class BlocWrapWithBlocListenerIntentionAction : BlocWrapWithIntentionAction(Snip
     override fun getText(): String {
         return "Wrap with BlocListener"
     }
+}
+class BlocWrapWithCubitListenerIntentionAction : BlocWrapWithIntentionAction(SnippetType.CubitListener) {
+    /**
+     * If this action is applicable, returns the text to be shown in the list of intention actions available.
+     */
+    override fun getText(): String {
+        return "Wrap with BlocListener (Cubit)"
+    }
 }
\ No newline at end of file
diff --git a/extensions/intellij/intellij_generator_plugin/src/main/java/com/bloc/intellij_generator_plugin/intention_action/BlocWrapWithBlocProviderIntentionAction.kt b/extensions/intellij/intellij_generator_plugin/src/main/java/com/bloc/intellij_generator_plugin/intention_action/BlocWrapWithBlocProviderIntentionAction.kt
index c774498fb55..5b583267773 100644
--- a/extensions/intellij/intellij_generator_plugin/src/main/java/com/bloc/intellij_generator_plugin/intention_action/BlocWrapWithBlocProviderIntentionAction.kt
+++ b/extensions/intellij/intellij_generator_plugin/src/main/java/com/bloc/intellij_generator_plugin/intention_action/BlocWrapWithBlocProviderIntentionAction.kt
@@ -7,4 +7,12 @@ class BlocWrapWithBlocProviderIntentionAction : BlocWrapWithIntentionAction(Snip
     override fun getText(): String {
         return "Wrap with BlocProvider"
     }
+}
+class BlocWrapWithCubitProviderIntentionAction : BlocWrapWithIntentionAction(SnippetType.CubitProvider) {
+    /**
+     * If this action is applicable, returns the text to be shown in the list of intention actions available.
+     */
+    override fun getText(): String {
+        return "Wrap with BlocProvider (Cubit)"
+    }
 }
\ No newline at end of file
diff --git a/extensions/intellij/intellij_generator_plugin/src/main/java/com/bloc/intellij_generator_plugin/intention_action/BlocWrapWithBlocSelectorIntentionAction.kt b/extensions/intellij/intellij_generator_plugin/src/main/java/com/bloc/intellij_generator_plugin/intention_action/BlocWrapWithBlocSelectorIntentionAction.kt
index e0792f3e81c..2938e0f5b1a 100644
--- a/extensions/intellij/intellij_generator_plugin/src/main/java/com/bloc/intellij_generator_plugin/intention_action/BlocWrapWithBlocSelectorIntentionAction.kt
+++ b/extensions/intellij/intellij_generator_plugin/src/main/java/com/bloc/intellij_generator_plugin/intention_action/BlocWrapWithBlocSelectorIntentionAction.kt
@@ -7,4 +7,12 @@ class BlocWrapWithBlocSelectorIntentionAction : BlocWrapWithIntentionAction(Snip
     override fun getText(): String {
         return "Wrap with BlocSelector"
     }
+}
+class BlocWrapWithCubitSelectorIntentionAction : BlocWrapWithIntentionAction(SnippetType.CubitSelector) {
+    /**
+     * If this action is applicable, returns the text to be shown in the list of intention actions available.
+     */
+    override fun getText(): String {
+        return "Wrap with BlocSelector (Cubit)"
+    }
 }
\ No newline at end of file
diff --git a/extensions/intellij/intellij_generator_plugin/src/main/java/com/bloc/intellij_generator_plugin/intention_action/SnippetType.kt b/extensions/intellij/intellij_generator_plugin/src/main/java/com/bloc/intellij_generator_plugin/intention_action/SnippetType.kt
index 5812c7efbe6..cbd23a4488d 100644
--- a/extensions/intellij/intellij_generator_plugin/src/main/java/com/bloc/intellij_generator_plugin/intention_action/SnippetType.kt
+++ b/extensions/intellij/intellij_generator_plugin/src/main/java/com/bloc/intellij_generator_plugin/intention_action/SnippetType.kt
@@ -2,4 +2,5 @@ package com.bloc.intellij_generator_plugin.intention_action
 
 enum class SnippetType {
     BlocBuilder, BlocSelector, BlocListener, BlocProvider, BlocConsumer, RepositoryProvider, MultiBlocProvider, MultiRepositoryProvider, MultiBlocListener,
+    CubitBuilder, CubitSelector, CubitListener, CubitProvider, CubitConsumer
 }
\ No newline at end of file
diff --git a/extensions/intellij/intellij_generator_plugin/src/main/java/com/bloc/intellij_generator_plugin/intention_action/Snippets.kt b/extensions/intellij/intellij_generator_plugin/src/main/java/com/bloc/intellij_generator_plugin/intention_action/Snippets.kt
index 783e2cb306e..964b216498d 100644
--- a/extensions/intellij/intellij_generator_plugin/src/main/java/com/bloc/intellij_generator_plugin/intention_action/Snippets.kt
+++ b/extensions/intellij/intellij_generator_plugin/src/main/java/com/bloc/intellij_generator_plugin/intention_action/Snippets.kt
@@ -4,6 +4,7 @@ object Snippets {
     const val PREFIX_SELECTION = "Subject"
 
     private const val SUFFIX_BLOC = "Bloc"
+    private const val SUFFIX_CUBIT = "Cubit"
     private const val SUFFIX_STATE = "State"
     private const val SUFFIX_REPOSITORY = "Repository"
 
@@ -16,9 +17,13 @@ object Snippets {
     fun getSnippet(snippetType: SnippetType?, blocWidget: String, widget: String): String {
         return when (snippetType) {
             SnippetType.BlocSelector -> blocSelectorSnippet(widget)
+            SnippetType.CubitSelector -> blocSelectorSnippet(widget, SUFFIX_CUBIT)
             SnippetType.BlocListener -> blocListenerSnippet(widget)
+            SnippetType.CubitListener -> blocListenerSnippet(widget, SUFFIX_CUBIT)
             SnippetType.BlocProvider -> blocProviderSnippet(widget)
+            SnippetType.CubitProvider -> blocProviderSnippet(widget, SUFFIX_CUBIT)
             SnippetType.BlocConsumer -> blocConsumerSnippet(widget)
+            SnippetType.CubitConsumer -> blocConsumerSnippet(widget, SUFFIX_CUBIT)
             SnippetType.RepositoryProvider -> repositoryProviderSnippet(widget)
             SnippetType.MultiBlocProvider -> multiBlocProviderSnippet(blocWidget, widget)
             SnippetType.MultiBlocListener -> multiBlocListenerSnippet(blocWidget, widget)
@@ -27,16 +32,16 @@ object Snippets {
         }
     }
 
-    private fun blocBuilderSnippet(widget: String): String {
-        return "BlocBuilder<$BLOC_SNIPPET_KEY, $STATE_SNIPPET_KEY>(\n" +
+    private fun blocBuilderSnippet(widget: String, type: String = SUFFIX_BLOC): String {
+        return "BlocBuilder<$PREFIX_SELECTION$type, $STATE_SNIPPET_KEY>(\n" +
                 "  builder: (context, state) {\n" +
                 "    return $widget;\n" +
                 "  },\n" +
                 ")"
     }
 
-    private fun blocSelectorSnippet(widget: String): String {
-        return "BlocSelector<$BLOC_SNIPPET_KEY, $STATE_SNIPPET_KEY, $SELECTED_STATE_SNIPPET_KEY>(\n" +
+    private fun blocSelectorSnippet(widget: String, type: String = SUFFIX_BLOC): String {
+        return "BlocSelector<$PREFIX_SELECTION$type, $STATE_SNIPPET_KEY, $SELECTED_STATE_SNIPPET_KEY>(\n" +
                 "  selector: (state) {\n" +
                 "    // TODO: return selected state\n" +
                 "  },\n" +
@@ -46,8 +51,8 @@ object Snippets {
                 ")"
     }
 
-    private fun blocListenerSnippet(widget: String): String {
-        return "BlocListener<$BLOC_SNIPPET_KEY, $STATE_SNIPPET_KEY>(\n" +
+    private fun blocListenerSnippet(widget: String, type: String = SUFFIX_BLOC): String {
+        return "BlocListener<$PREFIX_SELECTION$type, $STATE_SNIPPET_KEY>(\n" +
                 "  listener: (context, state) {\n" +
                 "    // TODO: implement listener\n" +
                 "  },\n" +
@@ -55,15 +60,15 @@ object Snippets {
                 ")"
     }
 
-    private fun blocProviderSnippet(widget: String): String {
+    private fun blocProviderSnippet(widget: String, type: String = SUFFIX_BLOC): String {
         return "BlocProvider(\n" +
-                "  create: (context) => $BLOC_SNIPPET_KEY(),\n" +
+                "  create: (context) => $PREFIX_SELECTION$type(),\n" +
                 "  child: $widget,\n" +
                 ")"
     }
 
-    private fun blocConsumerSnippet(widget: String): String {
-        return "BlocConsumer<$BLOC_SNIPPET_KEY, $STATE_SNIPPET_KEY>(\n" +
+    private fun blocConsumerSnippet(widget: String, type: String = SUFFIX_BLOC): String {
+        return "BlocConsumer<$PREFIX_SELECTION$type, $STATE_SNIPPET_KEY>(\n" +
                 "  listener: (context, state) {\n" +
                 "    // TODO: implement listener\n" +
                 "  },\n" +
diff --git a/extensions/intellij/intellij_generator_plugin/src/main/resources/META-INF/plugin.xml b/extensions/intellij/intellij_generator_plugin/src/main/resources/META-INF/plugin.xml
index 28f4cfd02ce..5c3ba1805f5 100644
--- a/extensions/intellij/intellij_generator_plugin/src/main/resources/META-INF/plugin.xml
+++ b/extensions/intellij/intellij_generator_plugin/src/main/resources/META-INF/plugin.xml
@@ -101,26 +101,51 @@
             </className>
             <category>Bloc</category>
         </intentionAction>
+        <intentionAction>
+            <className>com.bloc.intellij_generator_plugin.intention_action.BlocWrapWithCubitProviderIntentionAction
+            </className>
+            <category>Bloc</category>
+        </intentionAction>
         <intentionAction>
             <className>com.bloc.intellij_generator_plugin.intention_action.BlocWrapWithBlocBuilderIntentionAction
             </className>
             <category>Bloc</category>
         </intentionAction>
+        <intentionAction>
+            <className>com.bloc.intellij_generator_plugin.intention_action.BlocWrapWithCubitBuilderIntentionAction
+            </className>
+            <category>Bloc</category>
+        </intentionAction>
         <intentionAction>
             <className>com.bloc.intellij_generator_plugin.intention_action.BlocWrapWithBlocSelectorIntentionAction
             </className>
             <category>Bloc</category>
         </intentionAction>
+        <intentionAction>
+            <className>com.bloc.intellij_generator_plugin.intention_action.BlocWrapWithCubitSelectorIntentionAction
+            </className>
+            <category>Bloc</category>
+        </intentionAction>
         <intentionAction>
             <className>com.bloc.intellij_generator_plugin.intention_action.BlocWrapWithBlocListenerIntentionAction
             </className>
             <category>Bloc</category>
         </intentionAction>
+        <intentionAction>
+            <className>com.bloc.intellij_generator_plugin.intention_action.BlocWrapWithCubitListenerIntentionAction
+            </className>
+            <category>Bloc</category>
+        </intentionAction>
         <intentionAction>
             <className>com.bloc.intellij_generator_plugin.intention_action.BlocWrapWithBlocConsumerIntentionAction
             </className>
             <category>Bloc</category>
         </intentionAction>
+        <intentionAction>
+            <className>com.bloc.intellij_generator_plugin.intention_action.BlocWrapWithCubitConsumerIntentionAction
+            </className>
+            <category>Bloc</category>
+        </intentionAction>
         <intentionAction>
             <className>
                 com.bloc.intellij_generator_plugin.intention_action.BlocWrapWithRepositoryProviderIntentionAction
diff --git a/extensions/intellij/intellij_generator_plugin/src/main/resources/intentionDescriptions/BlocWrapWithCubitBuilderIntentionAction/after.java.template b/extensions/intellij/intellij_generator_plugin/src/main/resources/intentionDescriptions/BlocWrapWithCubitBuilderIntentionAction/after.java.template
new file mode 100644
index 00000000000..f2be759181d
--- /dev/null
+++ b/extensions/intellij/intellij_generator_plugin/src/main/resources/intentionDescriptions/BlocWrapWithCubitBuilderIntentionAction/after.java.template
@@ -0,0 +1,14 @@
+class CounterScreen extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Center(
+        child: BlocBuilder<SubjectCubit, SubjectState>(
+          builder: (context, state) {
+            return Text('Example');
+          },
+        ),
+      ),
+    );
+  }
+}
\ No newline at end of file
diff --git a/extensions/intellij/intellij_generator_plugin/src/main/resources/intentionDescriptions/BlocWrapWithCubitBuilderIntentionAction/before.java.template b/extensions/intellij/intellij_generator_plugin/src/main/resources/intentionDescriptions/BlocWrapWithCubitBuilderIntentionAction/before.java.template
new file mode 100644
index 00000000000..1272248dc5c
--- /dev/null
+++ b/extensions/intellij/intellij_generator_plugin/src/main/resources/intentionDescriptions/BlocWrapWithCubitBuilderIntentionAction/before.java.template
@@ -0,0 +1,10 @@
+class CounterScreen extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Center(
+        child: Text('Example'),
+      ),
+    );
+  }
+}
\ No newline at end of file
diff --git a/extensions/intellij/intellij_generator_plugin/src/main/resources/intentionDescriptions/BlocWrapWithCubitBuilderIntentionAction/description.html b/extensions/intellij/intellij_generator_plugin/src/main/resources/intentionDescriptions/BlocWrapWithCubitBuilderIntentionAction/description.html
new file mode 100644
index 00000000000..f59e1a108fd
--- /dev/null
+++ b/extensions/intellij/intellij_generator_plugin/src/main/resources/intentionDescriptions/BlocWrapWithCubitBuilderIntentionAction/description.html
@@ -0,0 +1,3 @@
+<html>
+<body>Wraps the current widget in a BlocBuilder with Cubit-template.</body>
+</html>
\ No newline at end of file
diff --git a/extensions/intellij/intellij_generator_plugin/src/main/resources/intentionDescriptions/BlocWrapWithCubitConsumerIntentionAction/after.java.template b/extensions/intellij/intellij_generator_plugin/src/main/resources/intentionDescriptions/BlocWrapWithCubitConsumerIntentionAction/after.java.template
new file mode 100644
index 00000000000..b26172c1939
--- /dev/null
+++ b/extensions/intellij/intellij_generator_plugin/src/main/resources/intentionDescriptions/BlocWrapWithCubitConsumerIntentionAction/after.java.template
@@ -0,0 +1,17 @@
+class CounterScreen extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Center(
+        child: BlocConsumer<SubjectCubit, SubjectState>(
+          listener: (context, state) {
+            // TODO: implement listener
+          },
+          builder: (context, state) {
+            return Text('Example');
+          },
+        ),
+      ),
+    );
+  }
+}
\ No newline at end of file
diff --git a/extensions/intellij/intellij_generator_plugin/src/main/resources/intentionDescriptions/BlocWrapWithCubitConsumerIntentionAction/before.java.template b/extensions/intellij/intellij_generator_plugin/src/main/resources/intentionDescriptions/BlocWrapWithCubitConsumerIntentionAction/before.java.template
new file mode 100644
index 00000000000..1272248dc5c
--- /dev/null
+++ b/extensions/intellij/intellij_generator_plugin/src/main/resources/intentionDescriptions/BlocWrapWithCubitConsumerIntentionAction/before.java.template
@@ -0,0 +1,10 @@
+class CounterScreen extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Center(
+        child: Text('Example'),
+      ),
+    );
+  }
+}
\ No newline at end of file
diff --git a/extensions/intellij/intellij_generator_plugin/src/main/resources/intentionDescriptions/BlocWrapWithCubitConsumerIntentionAction/description.html b/extensions/intellij/intellij_generator_plugin/src/main/resources/intentionDescriptions/BlocWrapWithCubitConsumerIntentionAction/description.html
new file mode 100644
index 00000000000..09e9508d833
--- /dev/null
+++ b/extensions/intellij/intellij_generator_plugin/src/main/resources/intentionDescriptions/BlocWrapWithCubitConsumerIntentionAction/description.html
@@ -0,0 +1,3 @@
+<html>
+<body>Wraps the current widget in a BlocConsumer with Cubit-template.</body>
+</html>
\ No newline at end of file
diff --git a/extensions/intellij/intellij_generator_plugin/src/main/resources/intentionDescriptions/BlocWrapWithCubitListenerIntentionAction/after.java.template b/extensions/intellij/intellij_generator_plugin/src/main/resources/intentionDescriptions/BlocWrapWithCubitListenerIntentionAction/after.java.template
new file mode 100644
index 00000000000..10fe8a48871
--- /dev/null
+++ b/extensions/intellij/intellij_generator_plugin/src/main/resources/intentionDescriptions/BlocWrapWithCubitListenerIntentionAction/after.java.template
@@ -0,0 +1,15 @@
+class CounterScreen extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Center(
+        child: BlocListener<SubjectCubit, SubjectState>(
+          listener: (context, state) {
+            // TODO: implement listener
+          },
+          child: Text('Example'),
+        ),
+      ),
+    );
+  }
+}
\ No newline at end of file
diff --git a/extensions/intellij/intellij_generator_plugin/src/main/resources/intentionDescriptions/BlocWrapWithCubitListenerIntentionAction/before.java.template b/extensions/intellij/intellij_generator_plugin/src/main/resources/intentionDescriptions/BlocWrapWithCubitListenerIntentionAction/before.java.template
new file mode 100644
index 00000000000..1272248dc5c
--- /dev/null
+++ b/extensions/intellij/intellij_generator_plugin/src/main/resources/intentionDescriptions/BlocWrapWithCubitListenerIntentionAction/before.java.template
@@ -0,0 +1,10 @@
+class CounterScreen extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Center(
+        child: Text('Example'),
+      ),
+    );
+  }
+}
\ No newline at end of file
diff --git a/extensions/intellij/intellij_generator_plugin/src/main/resources/intentionDescriptions/BlocWrapWithCubitListenerIntentionAction/description.html b/extensions/intellij/intellij_generator_plugin/src/main/resources/intentionDescriptions/BlocWrapWithCubitListenerIntentionAction/description.html
new file mode 100644
index 00000000000..e899b281555
--- /dev/null
+++ b/extensions/intellij/intellij_generator_plugin/src/main/resources/intentionDescriptions/BlocWrapWithCubitListenerIntentionAction/description.html
@@ -0,0 +1,3 @@
+<html>
+<body>Wraps the current widget in a BlocListener with Cubit-template.</body>
+</html>
\ No newline at end of file
diff --git a/extensions/intellij/intellij_generator_plugin/src/main/resources/intentionDescriptions/BlocWrapWithCubitProviderIntentionAction/after.java.template b/extensions/intellij/intellij_generator_plugin/src/main/resources/intentionDescriptions/BlocWrapWithCubitProviderIntentionAction/after.java.template
new file mode 100644
index 00000000000..2bc32f1f0dd
--- /dev/null
+++ b/extensions/intellij/intellij_generator_plugin/src/main/resources/intentionDescriptions/BlocWrapWithCubitProviderIntentionAction/after.java.template
@@ -0,0 +1,13 @@
+class CounterScreen extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Center(
+        child: BlocProvider(
+          create: (context) => SubjectCubit(),
+          child: Text('Example'),
+        ),
+      ),
+    );
+  }
+}
\ No newline at end of file
diff --git a/extensions/intellij/intellij_generator_plugin/src/main/resources/intentionDescriptions/BlocWrapWithCubitProviderIntentionAction/before.java.template b/extensions/intellij/intellij_generator_plugin/src/main/resources/intentionDescriptions/BlocWrapWithCubitProviderIntentionAction/before.java.template
new file mode 100644
index 00000000000..1272248dc5c
--- /dev/null
+++ b/extensions/intellij/intellij_generator_plugin/src/main/resources/intentionDescriptions/BlocWrapWithCubitProviderIntentionAction/before.java.template
@@ -0,0 +1,10 @@
+class CounterScreen extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Center(
+        child: Text('Example'),
+      ),
+    );
+  }
+}
\ No newline at end of file
diff --git a/extensions/intellij/intellij_generator_plugin/src/main/resources/intentionDescriptions/BlocWrapWithCubitProviderIntentionAction/description.html b/extensions/intellij/intellij_generator_plugin/src/main/resources/intentionDescriptions/BlocWrapWithCubitProviderIntentionAction/description.html
new file mode 100644
index 00000000000..a19f3835602
--- /dev/null
+++ b/extensions/intellij/intellij_generator_plugin/src/main/resources/intentionDescriptions/BlocWrapWithCubitProviderIntentionAction/description.html
@@ -0,0 +1,3 @@
+<html>
+<body>Wraps the current widget in a BlocProvider with Cubit-template.</body>
+</html>
\ No newline at end of file
diff --git a/extensions/intellij/intellij_generator_plugin/src/main/resources/intentionDescriptions/BlocWrapWithCubitSelectorIntentionAction/after.java.template b/extensions/intellij/intellij_generator_plugin/src/main/resources/intentionDescriptions/BlocWrapWithCubitSelectorIntentionAction/after.java.template
new file mode 100644
index 00000000000..a1f7fd69bb1
--- /dev/null
+++ b/extensions/intellij/intellij_generator_plugin/src/main/resources/intentionDescriptions/BlocWrapWithCubitSelectorIntentionAction/after.java.template
@@ -0,0 +1,17 @@
+class CounterScreen extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Center(
+        child: BlocSelector<SubjectCubit, SubjectState, SelectedState>(
+          selector: (state) {
+            // TODO: return selected state
+          },
+          builder: (state) {
+            return Text('Example');
+          },
+        ),
+      ),
+    );
+  }
+}
\ No newline at end of file
diff --git a/extensions/intellij/intellij_generator_plugin/src/main/resources/intentionDescriptions/BlocWrapWithCubitSelectorIntentionAction/before.java.template b/extensions/intellij/intellij_generator_plugin/src/main/resources/intentionDescriptions/BlocWrapWithCubitSelectorIntentionAction/before.java.template
new file mode 100644
index 00000000000..1272248dc5c
--- /dev/null
+++ b/extensions/intellij/intellij_generator_plugin/src/main/resources/intentionDescriptions/BlocWrapWithCubitSelectorIntentionAction/before.java.template
@@ -0,0 +1,10 @@
+class CounterScreen extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Center(
+        child: Text('Example'),
+      ),
+    );
+  }
+}
\ No newline at end of file
diff --git a/extensions/intellij/intellij_generator_plugin/src/main/resources/intentionDescriptions/BlocWrapWithCubitSelectorIntentionAction/description.html b/extensions/intellij/intellij_generator_plugin/src/main/resources/intentionDescriptions/BlocWrapWithCubitSelectorIntentionAction/description.html
new file mode 100644
index 00000000000..5a52c7dae1e
--- /dev/null
+++ b/extensions/intellij/intellij_generator_plugin/src/main/resources/intentionDescriptions/BlocWrapWithCubitSelectorIntentionAction/description.html
@@ -0,0 +1,3 @@
+<html>
+<body>Wraps the current widget in a BlocSelector with Cubit-template.</body>
+</html>
\ No newline at end of file