diff --git a/Source/Templates/NetCore/GtkSharp.Template.CSharp/GtkSharp.Template.CSharp.nuspec b/Source/Templates/NetCore/GtkSharp.Template.CSharp/GtkSharp.Template.CSharp.nuspec
index 3b960f935..d7993ef42 100755
--- a/Source/Templates/NetCore/GtkSharp.Template.CSharp/GtkSharp.Template.CSharp.nuspec
+++ b/Source/Templates/NetCore/GtkSharp.Template.CSharp/GtkSharp.Template.CSharp.nuspec
@@ -4,8 +4,8 @@
     <id>GtkSharp.Template.CSharp</id>
     <version>3.0.0</version>
     <title>Gtk template for CSharp</title>
-    <summary>A simple C# template for your .Net Core Gtk Application.</summary>
-    <description>A simple C# template for your .Net Core Gtk Application.</description>
+    <summary>A set of C# templates for your .Net Core Gtk Application.</summary>
+    <description>A set of C# templates for your .Net Core Gtk Application.</description>
     <authors>GtkSharp Contributors</authors>
     <owners>GtkSharp Contributors</owners>
     <projectUrl>https://github.com/GtkSharp/GtkSharp</projectUrl>
diff --git a/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/.template.config/template.json b/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Application.CSharp/.template.config/template.json
similarity index 72%
rename from Source/Templates/NetCore/GtkSharp.Template.CSharp/content/.template.config/template.json
rename to Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Application.CSharp/.template.config/template.json
index be14f43a6..eed8e6c92 100755
--- a/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/.template.config/template.json
+++ b/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Application.CSharp/.template.config/template.json
@@ -2,11 +2,12 @@
   "$schema": "http://json.schemastore.org/template",
   "author": "GtkSharp Contributors",
   "classifications": [
-    "Console"
+    "Gtk",
+    "GUI App"
   ],
   "name": "Gtk Application",
-  "identity": "GtkSharp.Template.CSharp",
-  "groupIdentity": "GtkSharp.Template",
+  "identity": "GtkSharp.Application.CSharp",
+  "groupIdentity": "GtkSharp.Application",
   "shortName": "gtkapp",
   "tags": {
     "language": "C#",
diff --git a/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkNamespace.csproj b/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Application.CSharp/GtkNamespace.csproj
similarity index 75%
rename from Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkNamespace.csproj
rename to Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Application.CSharp/GtkNamespace.csproj
index 610f1d295..0db25f31a 100755
--- a/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkNamespace.csproj
+++ b/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Application.CSharp/GtkNamespace.csproj
@@ -4,8 +4,8 @@
     <TargetFramework>netcoreapp2.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <EmbeddedResource Include="MainWindow.glade">
-      <LogicalName>MainWindow.glade</LogicalName>
+    <EmbeddedResource Include="**/*.glade">
+      <LogicalName>%(Filename)%(Extension)</LogicalName>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
diff --git a/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/MainWindow.cs b/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Application.CSharp/MainWindow.cs
similarity index 100%
rename from Source/Templates/NetCore/GtkSharp.Template.CSharp/content/MainWindow.cs
rename to Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Application.CSharp/MainWindow.cs
diff --git a/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/MainWindow.glade b/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Application.CSharp/MainWindow.glade
similarity index 100%
rename from Source/Templates/NetCore/GtkSharp.Template.CSharp/content/MainWindow.glade
rename to Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Application.CSharp/MainWindow.glade
diff --git a/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/Program.cs b/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Application.CSharp/Program.cs
similarity index 100%
rename from Source/Templates/NetCore/GtkSharp.Template.CSharp/content/Program.cs
rename to Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Application.CSharp/Program.cs
diff --git a/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Dialog.CSharp/.template.config/template.json b/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Dialog.CSharp/.template.config/template.json
new file mode 100755
index 000000000..494b4f7fe
--- /dev/null
+++ b/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Dialog.CSharp/.template.config/template.json
@@ -0,0 +1,32 @@
+{
+  "$schema": "http://json.schemastore.org/template",
+  "author": "GtkSharp Contributors",
+  "classifications": [
+    "Gtk",
+    "UI"
+  ],
+  "name": "Gtk Dialog",
+  "identity": "GtkSharp.Dialog.CSharp",
+  "groupIdentity": "GtkSharp.Dialog",
+  "shortName": "gtkdialog",
+  "tags": {
+    "language": "C#"
+  },
+  "sourceName": "Gtk_Dialog",
+  "primaryOutputs": [
+    {
+      "path": "Gtk_Dialog.cs"
+    },
+    {
+      "path": "Gtk_Dialog.glade"
+    }
+  ],
+  "defaultName": "Gtk_Dialog",
+  "symbols": {
+    "namespace": {
+      "description": "Namespace for the generated files",
+      "replaces": "GtkNamespace",
+      "type": "parameter"
+    }
+  }
+}
\ No newline at end of file
diff --git a/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Dialog.CSharp/Gtk_Dialog.cs b/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Dialog.CSharp/Gtk_Dialog.cs
new file mode 100755
index 000000000..7d0fcd7e7
--- /dev/null
+++ b/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Dialog.CSharp/Gtk_Dialog.cs
@@ -0,0 +1,23 @@
+using System;
+using Gtk;
+using UI = Gtk.Builder.ObjectAttribute;
+
+namespace GtkNamespace
+{
+    class Gtk_Dialog : Dialog
+    {
+        public Gtk_Dialog() : this(new Builder("Gtk_Dialog.glade")) { }
+
+        private Gtk_Dialog(Builder builder) : base(builder.GetObject("Gtk_Dialog").Handle)
+        {
+            DefaultResponse = ResponseType.Cancel;
+
+            Response += OnResponse;
+        }
+
+        private void OnResponse(object o, ResponseArgs args)
+        {
+            Hide();
+        }
+    }
+}
diff --git a/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Dialog.CSharp/Gtk_Dialog.glade b/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Dialog.CSharp/Gtk_Dialog.glade
new file mode 100755
index 000000000..8cc7c549a
--- /dev/null
+++ b/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Dialog.CSharp/Gtk_Dialog.glade
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk+" version="3.18"/>
+  <object class="GtkDialog" id="Gtk_Dialog">
+    <property name="can_focus">False</property>
+    <property name="default_width">320</property>
+    <property name="default_height">260</property>
+    <property name="type_hint">dialog</property>
+    <child internal-child="vbox">
+      <object class="GtkBox">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <object class="GtkButton" id="button1">
+                <property name="label">gtk-close</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="-7">button1</action-widget>
+    </action-widgets>
+  </object>
+</interface>
diff --git a/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Widget.CSharp/.template.config/template.json b/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Widget.CSharp/.template.config/template.json
new file mode 100755
index 000000000..d1a20cf21
--- /dev/null
+++ b/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Widget.CSharp/.template.config/template.json
@@ -0,0 +1,32 @@
+{
+  "$schema": "http://json.schemastore.org/template",
+  "author": "GtkSharp Contributors",
+  "classifications": [
+    "Gtk",
+    "UI"
+  ],
+  "name": "Gtk Widget",
+  "identity": "GtkSharp.Widget.CSharp",
+  "groupIdentity": "GtkSharp.Widget",
+  "shortName": "gtkwidget",
+  "tags": {
+    "language": "C#"
+  },
+  "sourceName": "Gtk_Widget",
+  "primaryOutputs": [
+    {
+      "path": "Gtk_Widget.cs"
+    },
+    {
+      "path": "Gtk_Widget.glade"
+    }
+  ],
+  "defaultName": "Gtk_Widget",
+  "symbols": {
+    "namespace": {
+      "description": "Namespace for the generated files",
+      "replaces": "GtkNamespace",
+      "type": "parameter"
+    }
+  }
+}
\ No newline at end of file
diff --git a/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Widget.CSharp/Gtk_Widget.cs b/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Widget.CSharp/Gtk_Widget.cs
new file mode 100755
index 000000000..e64f3eb33
--- /dev/null
+++ b/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Widget.CSharp/Gtk_Widget.cs
@@ -0,0 +1,16 @@
+using System;
+using Gtk;
+using UI = Gtk.Builder.ObjectAttribute;
+
+namespace GtkNamespace
+{
+    public class Gtk_Widget : Box
+    {
+        public Gtk_Widget() : this(new Builder("Gtk_Widget.glade")) { }
+
+        private Gtk_Widget(Builder builder) : base(builder.GetObject("Gtk_Widget").Handle)
+        {
+            
+        }
+    }
+}
diff --git a/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Widget.CSharp/Gtk_Widget.glade b/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Widget.CSharp/Gtk_Widget.glade
new file mode 100755
index 000000000..7a1be14d1
--- /dev/null
+++ b/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Widget.CSharp/Gtk_Widget.glade
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk+" version="3.18"/>
+  <object class="GtkBox" id="${EscapedIdentifier}">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <child>
+      <placeholder/>
+    </child>
+  </object>
+</interface>
diff --git a/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Window.CSharp/.template.config/template.json b/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Window.CSharp/.template.config/template.json
new file mode 100755
index 000000000..d15b4e48e
--- /dev/null
+++ b/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Window.CSharp/.template.config/template.json
@@ -0,0 +1,32 @@
+{
+  "$schema": "http://json.schemastore.org/template",
+  "author": "GtkSharp Contributors",
+  "classifications": [
+    "Gtk",
+    "UI"
+  ],
+  "name": "Gtk Window",
+  "identity": "GtkSharp.Window.CSharp",
+  "groupIdentity": "GtkSharp.Window",
+  "shortName": "gtkwindow",
+  "tags": {
+    "language": "C#"
+  },
+  "sourceName": "Gtk_Window",
+  "primaryOutputs": [
+    {
+      "path": "Gtk_Window.cs"
+    },
+    {
+      "path": "Gtk_Window.glade"
+    }
+  ],
+  "defaultName": "Gtk_Window",
+  "symbols": {
+    "namespace": {
+      "description": "Namespace for the generated files",
+      "replaces": "GtkNamespace",
+      "type": "parameter"
+    }
+  }
+}
\ No newline at end of file
diff --git a/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Window.CSharp/Gtk_Window.cs b/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Window.CSharp/Gtk_Window.cs
new file mode 100755
index 000000000..95a6ba5ac
--- /dev/null
+++ b/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Window.CSharp/Gtk_Window.cs
@@ -0,0 +1,23 @@
+using System;
+using Gtk;
+using UI = Gtk.Builder.ObjectAttribute;
+
+namespace GtkNamespace
+{
+    class Gtk_Window : Window
+    {
+        public Gtk_Window() : this(new Builder("Gtk_Window.glade")) { }
+
+        private Gtk_Window(Builder builder) : base(builder.GetObject("Gtk_Window").Handle)
+        {
+            builder.Autoconnect(this);
+
+            DeleteEvent += OnDeleteEvent;
+        }
+
+        private void OnDeleteEvent(object sender, DeleteEventArgs a)
+        {
+            Application.Quit();
+        }
+    }
+}
diff --git a/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Window.CSharp/Gtk_Window.glade b/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Window.CSharp/Gtk_Window.glade
new file mode 100755
index 000000000..44e554e80
--- /dev/null
+++ b/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Window.CSharp/Gtk_Window.glade
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk+" version="3.18"/>
+  <object class="GtkWindow" id="Gtk_Window">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Gtk_Window</property>
+    <child>
+      <placeholder/>
+    </child>
+  </object>
+</interface>
diff --git a/build.cake b/build.cake
index 548f5e1f4..41ae54ed5 100755
--- a/build.cake
+++ b/build.cake
@@ -6,7 +6,7 @@
 // VARS
 
 Settings.Cake = Context;
-Settings.Version = "3.22.24.11";
+Settings.Version = "3.22.24.12";
 Settings.BuildTarget = Argument("BuildTarget", "Default");
 Settings.Assembly = Argument("Assembly", "");