diff --git a/build.gradle.kts b/build.gradle.kts
index e2d6415..8a7111f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "com.gregorybednov"
-version = "1.0.0"
+version = "1.0.1"
 
 repositories {
     mavenCentral()
diff --git a/src/main/kotlin/org/gregorybednov/NewCFileAction.kt b/src/main/kotlin/org/gregorybednov/NewCFileAction.kt
new file mode 100644
index 0000000..2abbe19
--- /dev/null
+++ b/src/main/kotlin/org/gregorybednov/NewCFileAction.kt
@@ -0,0 +1,25 @@
+package org.gregorybednov
+
+import com.intellij.ide.actions.CreateFileFromTemplateAction
+import com.intellij.ide.actions.CreateFileFromTemplateDialog
+import com.intellij.openapi.project.Project
+import com.intellij.psi.PsiDirectory
+import org.gregorybednov.clsp.CIcon
+
+
+class NewCFileAction :
+    CreateFileFromTemplateAction("C File", "Creates new C file", CIcon.FILE ) {
+        override fun buildDialog(project: Project, directory: PsiDirectory, builder: CreateFileFromTemplateDialog.Builder) {
+            builder
+                .setTitle("New C File")
+                .addKind("My file", CIcon.FILE, "DefaultTemplate.c")
+        }
+
+        override fun getActionName(directory: PsiDirectory?, newName: String, templateName: String?): String {
+            return "C File"
+        }
+
+    override fun getDefaultTemplateProperty(): String {
+        return "DefaultTemplate.c";
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/org/gregorybednov/NewCppFileAction.kt b/src/main/kotlin/org/gregorybednov/NewCppFileAction.kt
new file mode 100644
index 0000000..18e8c03
--- /dev/null
+++ b/src/main/kotlin/org/gregorybednov/NewCppFileAction.kt
@@ -0,0 +1,26 @@
+package org.gregorybednov
+
+import com.intellij.ide.actions.CreateFileFromTemplateAction
+import com.intellij.ide.actions.CreateFileFromTemplateDialog
+import com.intellij.openapi.project.Project
+import com.intellij.psi.PsiDirectory
+import org.gregorybednov.clsp.CIcon
+import org.gregorybednov.clsp.CppIcon
+
+
+class NewCppFileAction :
+    CreateFileFromTemplateAction("C++ File", "Creates new C++ file", CppIcon.FILE ) {
+        override fun buildDialog(project: Project, directory: PsiDirectory, builder: CreateFileFromTemplateDialog.Builder) {
+            builder
+                .setTitle("New C++ File")
+                .addKind("My file", CIcon.FILE, "DefaultTemplate.cpp")
+        }
+
+        override fun getActionName(directory: PsiDirectory?, newName: String, templateName: String?): String {
+            return "C++ File"
+        }
+
+    override fun getDefaultTemplateProperty(): String {
+        return "DefaultTemplate.cpp";
+    }
+}
\ No newline at end of file
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index 177e38d..d8f0010 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -10,7 +10,18 @@
     <depends>com.redhat.devtools.lsp4ij</depends>
     <depends>org.jetbrains.plugins.textmate</depends>
 
+    <actions>
+        <action id="NewCFileAction" class="org.gregorybednov.NewCFileAction" >
+            <add-to-group group-id="NewGroup" relative-to-action="NewFile" anchor="before"/>
+        </action>
+        <action id="NewCppFileAction" class="org.gregorybednov.NewCppFileAction">
+            <add-to-group group-id="NewGroup" relative-to-action="NewFile" anchor="before"/>
+        </action>
+    </actions>
+
     <extensions defaultExtensionNs="com.intellij">
+        <internalFileTemplate name="DefaultTemplate.c"/>
+        <internalFileTemplate name="DefaultTemplate.cpp"/>
         <notificationGroup id="C/C++ notifications"
                            displayType="BALLOON" />
         <fileType
@@ -20,7 +31,6 @@
                 fieldName="INSTANCE"
                 implementationClass="org.gregorybednov.clsp.CFileType"/>
 
-        <!-- F*** $YourFileLanguage!!!!!  I spent f**ing week trying to understand what's wrong!!!-->
         <editorHighlighterProvider
                 filetype="C File"
                 implementationClass="org.jetbrains.plugins.textmate.language.syntax.highlighting.TextMateEditorHighlighterProvider" />
diff --git a/src/main/resources/fileTemplates/internal/DefaultTemplate.c.ft b/src/main/resources/fileTemplates/internal/DefaultTemplate.c.ft
new file mode 100644
index 0000000..c1a6458
--- /dev/null
+++ b/src/main/resources/fileTemplates/internal/DefaultTemplate.c.ft
@@ -0,0 +1,6 @@
+\#include <stdio.h>
+
+int main() {
+  printf("Hello world");
+  return 0;
+}
\ No newline at end of file
diff --git a/src/main/resources/fileTemplates/internal/DefaultTemplate.cpp.ft b/src/main/resources/fileTemplates/internal/DefaultTemplate.cpp.ft
new file mode 100644
index 0000000..29bdc26
--- /dev/null
+++ b/src/main/resources/fileTemplates/internal/DefaultTemplate.cpp.ft
@@ -0,0 +1,6 @@
+\#include <iostream>
+
+int main() {
+  std::cout << "Hello world";
+  return 0;
+}
\ No newline at end of file