diff --git a/templates.xml b/templates.xml
index a2c22f4..e11b9eb 100644
--- a/templates.xml
+++ b/templates.xml
@@ -122,6 +122,30 @@
           <option name="groupName" value="Kotlin" />
           <option name="key" value="object" />
         </TemplateKey>
+        <TemplateKey>
+          <option name="groupName" value="Flutter riverpod snippets" />
+          <option name="key" value="riverpodGeneratorNotiferProvider" />
+        </TemplateKey>
+        <TemplateKey>
+          <option name="groupName" value="Flutter riverpod snippets" />
+          <option name="key" value="consumerWidget" />
+        </TemplateKey>
+        <TemplateKey>
+          <option name="groupName" value="Flutter riverpod snippets" />
+          <option name="key" value="consumerStatefulWidget" />
+        </TemplateKey>
+        <TemplateKey>
+          <option name="groupName" value="Flutter generator snippets" />
+          <option name="key" value="freezed" />
+        </TemplateKey>
+        <TemplateKey>
+          <option name="groupName" value="Flutter generator snippets" />
+          <option name="key" value="freezedAbstract" />
+        </TemplateKey>
+        <TemplateKey>
+          <option name="groupName" value="Flutter generator snippets" />
+          <option name="key" value="part" />
+        </TemplateKey>
       </list>
     </option>
   </component>
diff --git a/templates/DebuggerX.xml b/templates/DebuggerX.xml
index e8758bd..dce9235 100644
--- a/templates/DebuggerX.xml
+++ b/templates/DebuggerX.xml
@@ -8,12 +8,6 @@
       <option name="JAVA_CODE" value="true" />
     </context>
   </template>
-  <template name="mhan" value="Handler mHandler = new Handler(){&#10;    @Override&#10;    public void handleMessage(Message msg) {&#10;        super.handleMessage(msg);&#10;        $options$&#10;    }&#10;};" description="MyHandler" toReformat="false" toShortenFQNames="true" useStaticImport="true" deactivated="true">
-    <variable name="options" expression="" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="JAVA_CODE" value="true" />
-    </context>
-  </template>
   <template name="resp" value="/// $comment$&#10;Future&lt;$type$&gt; $name$({@required $params$}) =&gt; _post&lt;$type$&gt;(&#10;    $path$,&#10;    (json) =&gt; $type$(json),&#10;    data: {'$params$': $params$},&#10;);" description="create a request function" toReformat="false" toShortenFQNames="true" deactivated="true">
     <variable name="type" expression="" defaultValue="&quot;TYPE&quot;" alwaysStopAt="true" />
     <variable name="name" expression="lowercaseAndDash(type)" defaultValue="" alwaysStopAt="false" />
@@ -24,10 +18,55 @@
       <option name="DART" value="true" />
     </context>
   </template>
-  <template name="cc" value="Color(0x$hex$)" description="" toReformat="false" toShortenFQNames="true">
-    <variable name="hex" expression="groovyScript(&quot;_1.startsWith('#') ? _1.substring(7, 9) + _1.substring(1, 3) + _1.substring(3, 5) + _1.substring(5, 7) : ''&quot;, clipboard())" defaultValue="" alwaysStopAt="true" />
+  <template name="cc" value="AGIColors.argb(0x$hex$)" description="" toReformat="false" toShortenFQNames="true">
+    <variable name="hex" expression="groovyScript(&quot;_1.startsWith('#') ? _1.substring(1, 3) + _1.substring(3, 5) + _1.substring(5, 7) + _1.substring(7, 9) : ''&quot;, clipboard())" defaultValue="" alwaysStopAt="true" />
     <context>
       <option name="DART" value="true" />
     </context>
   </template>
+  <template name="freezed" value="import 'package:flutter/foundation.dart';&#10;import 'package:freezed_annotation/freezed_annotation.dart';&#10;&#10;part '$fileName$.freezed.dart';&#10;part '$fileName$.g.dart';&#10;&#10;@freezed&#10;class $ClassName$ with _$$$ClassName$ {&#10;  const factory $ClassName$({&#10;    $Params$,&#10;  }) = _$ClassName$;&#10;  &#10;  $code$&#10;&#10;  factory $ClassName$.fromJson(Map&lt;String, dynamic&gt; json) =&gt;&#10;      _$$$ClassName$FromJson(json);&#10;}" description="Create feezed template" toReformat="false" toShortenFQNames="true">
+    <variable name="fileName" expression="fileNameWithoutExtension()" defaultValue="" alwaysStopAt="true" />
+    <variable name="ClassName" expression="dartClassName()" defaultValue="" alwaysStopAt="true" />
+    <variable name="Params" expression="dartSuggestVariableName()" defaultValue="" alwaysStopAt="true" />
+    <variable name="code" expression="" defaultValue="" alwaysStopAt="true" />
+    <context>
+      <option name="DART_TOPLEVEL" value="true" />
+    </context>
+  </template>
+  <template name="freezedAbstract" value="import 'package:freezed_annotation/freezed_annotation.dart';&#10;&#10;part '$fileName$.freezed.dart';&#10;&#10;@freezed&#10;abstract class $ClassName$ with _$$$ClassName$ {&#10;  const factory $ClassName$({&#10;    $Params$,&#10;  }) = _$ClassName$;&#10;  &#10;  $code$&#10;}" description="Create feezed template" toReformat="false" toShortenFQNames="true">
+    <variable name="fileName" expression="fileNameWithoutExtension()" defaultValue="" alwaysStopAt="true" />
+    <variable name="ClassName" expression="dartClassName()" defaultValue="" alwaysStopAt="true" />
+    <variable name="Params" expression="dartSuggestVariableName()" defaultValue="" alwaysStopAt="true" />
+    <variable name="code" expression="" defaultValue="" alwaysStopAt="true" />
+    <context>
+      <option name="DART_TOPLEVEL" value="true" />
+    </context>
+  </template>
+  <template name="part" value="part '$fileName$.g.dart';" description="Declare part for .g.dart and .freezed.dart" toReformat="true" toShortenFQNames="true">
+    <variable name="fileName" expression="fileNameWithoutExtension()" defaultValue="" alwaysStopAt="true" />
+    <context>
+      <option name="DART_TOPLEVEL" value="true" />
+    </context>
+  </template>
+  <template name="consumerStatefulWidget" value="class $class_name$ extends ConsumerStatefulWidget {&#10;  const $class_name$({super.key});&#10;&#10;  @override&#10;  ConsumerState createState() =&gt; _$class_name$State();&#10;}&#10;&#10;class _$class_name$State extends ConsumerState&lt;$class_name$&gt; {&#10;  @override&#10;  Widget build(BuildContext context) {&#10;    return Container();&#10;  }&#10;}&#10;" description="New ConsumerStatefulWidget (Riverpod)." toReformat="true" toShortenFQNames="true">
+    <variable name="class_name" expression="" defaultValue="" alwaysStopAt="true" />
+    <context>
+      <option name="DART_TOPLEVEL" value="true" />
+    </context>
+  </template>
+  <template name="consumerWidget" value="class $class_name$ extends ConsumerWidget {&#10;  const $class_name$({super.key});&#10;  &#10;  @override&#10;  Widget build(BuildContext context, WidgetRef ref) {&#10;    return $code$;&#10;  }&#10;}" description="New ConsumerWidget (Riverpod)." toReformat="true" toShortenFQNames="true">
+    <variable name="class_name" expression="" defaultValue="" alwaysStopAt="true" />
+    <variable name="code" expression="" defaultValue="" alwaysStopAt="true" />
+    <context>
+      <option name="DART_TOPLEVEL" value="true" />
+    </context>
+  </template>
+  <template name="riverpodGeneratorNotiferProvider" value="@riverpod&#10;class $NAME$ extends _$$$NAME$ {&#10;  @override&#10;  $TYPE$ build() {&#10;    return $Content$;&#10;  }&#10;}" description="Create a NotifierProvider using generator (Riverpod)." toReformat="true" toShortenFQNames="true">
+    <variable name="NAME" expression="dartSuggestVariableName()" defaultValue="Name" alwaysStopAt="true" />
+    <variable name="TYPE" expression="dartSuggestVariableName()" defaultValue="Type" alwaysStopAt="true" />
+    <variable name="Content" expression="" defaultValue="Content" alwaysStopAt="true" />
+    <context>
+      <option name="DART_TOPLEVEL" value="true" />
+    </context>
+  </template>
 </templateSet>
\ No newline at end of file
diff --git a/templates/Flutter generator snippets.xml b/templates/Flutter generator snippets.xml
deleted file mode 100644
index ac8da89..0000000
--- a/templates/Flutter generator snippets.xml	
+++ /dev/null
@@ -1,13 +0,0 @@
-<templateSet group="Flutter generator snippets">
-  <template name="freezedAbstract" value="import 'package:freezed_annotation/freezed_annotation.dart';&#10;&#10;part '$fileName$.freezed.dart';&#10;&#10;@freezed&#10;abstract class $ClassName$ with _$$$ClassName$ {&#10;  const factory $ClassName$({&#10;    $Params$,&#10;  }) = _$ClassName$;&#10;  &#10;  $code$&#10;}" description="Create feezed template" toReformat="false" toShortenFQNames="true">
-    <variable name="fileName" expression="fileNameWithoutExtension()" defaultValue="" alwaysStopAt="true" />
-    <variable name="ClassName" expression="dartClassName()" defaultValue="" alwaysStopAt="true" />
-    <variable name="Params" expression="dartSuggestVariableName()" defaultValue="" alwaysStopAt="true" />
-    <variable name="code" expression="" defaultValue="" alwaysStopAt="true" />
-    <context />
-  </template>
-  <template name="part" value="part '$fileName$.g.dart';" description="Declare part for .g.dart and .freezed.dart" toReformat="true" toShortenFQNames="true">
-    <variable name="fileName" expression="fileNameWithoutExtension()" defaultValue="" alwaysStopAt="true" />
-    <context />
-  </template>
-</templateSet>
\ No newline at end of file