diff --git a/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/MainForm.cs b/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/MainForm.cs
index 829045ffb7..61d655308f 100755
--- a/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/MainForm.cs
+++ b/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/MainForm.cs
@@ -1,4 +1,8 @@
 #if (UseCode || UseCodePreview)
+using System;
+using Eto.Forms;
+using Eto.Drawing;
+
 namespace EtoApp._1
 {
 	public partial class MainForm : Form
diff --git a/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/MainForm.eto.cs b/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/MainForm.eto.cs
index e4bf1c19fc..2a2127c420 100755
--- a/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/MainForm.eto.cs
+++ b/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/MainForm.eto.cs
@@ -1,4 +1,8 @@
 #if (UseCodePreview)
+using System;
+using Eto.Forms;
+using Eto.Drawing;
+
 namespace EtoApp._1
 {
 	partial class MainForm : Form
diff --git a/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/MainForm.jeto.cs b/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/MainForm.jeto.cs
index 252c4cbdbe..c5c37514c7 100755
--- a/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/MainForm.jeto.cs
+++ b/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/MainForm.jeto.cs
@@ -1,4 +1,8 @@
 #if (UseJeto)
+using System;
+using System.Collections.Generic;
+using Eto.Forms;
+using Eto.Drawing;
 using Eto.Serialization.Json;
 
 namespace EtoApp._1
diff --git a/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/MainForm.xeto.cs b/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/MainForm.xeto.cs
index 5753bcccbe..0e96c5edca 100755
--- a/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/MainForm.xeto.cs
+++ b/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/MainForm.xeto.cs
@@ -1,4 +1,8 @@
 #if (UseXeto)
+using System;
+using System.Collections.Generic;
+using Eto.Forms;
+using Eto.Drawing;
 using Eto.Serialization.Xaml;
 
 namespace EtoApp._1
diff --git a/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/Program.cs b/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/Program.cs
index 8d76b84f8d..a42072d833 100755
--- a/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/Program.cs
+++ b/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/Program.cs
@@ -1,4 +1,8 @@
-namespace EtoApp._1
+using System;
+using Eto.Forms;
+using Eto.Drawing;
+
+namespace EtoApp._1
 {
 	class Program
 	{
diff --git a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Gtk/Program.cs b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Gtk/Program.cs
index 8719e14bff..5d6b85bdc1 100755
--- a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Gtk/Program.cs
+++ b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Gtk/Program.cs
@@ -1,4 +1,7 @@
-namespace EtoApp._1.Gtk
+using System;
+using Eto.Forms;
+
+namespace EtoApp._1.Gtk
 {
 	class Program
 	{
diff --git a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Mac/Program.cs b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Mac/Program.cs
index 79ae6ae2a6..f36b7d02d7 100755
--- a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Mac/Program.cs
+++ b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Mac/Program.cs
@@ -1,4 +1,7 @@
-namespace EtoApp._1.Mac
+using System;
+using Eto.Forms;
+
+namespace EtoApp._1.Mac
 {
 	class Program
 	{
diff --git a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.MacOS/Program.cs b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.MacOS/Program.cs
index 1010450b27..02f14fbcb9 100755
--- a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.MacOS/Program.cs
+++ b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.MacOS/Program.cs
@@ -1,4 +1,7 @@
-namespace EtoApp._1.Mac
+using System;
+using Eto.Forms;
+
+namespace EtoApp._1.Mac
 {
 	class Program
 	{
diff --git a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.WinForms/Program.cs b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.WinForms/Program.cs
index 0140f476cc..5ecbdeb5b5 100755
--- a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.WinForms/Program.cs
+++ b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.WinForms/Program.cs
@@ -1,4 +1,7 @@
-namespace EtoApp._1.WinForms
+using System;
+using Eto.Forms;
+
+namespace EtoApp._1.WinForms
 {
 	class Program
 	{
diff --git a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Wpf/Program.cs b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Wpf/Program.cs
index 6de85e49b0..3caeaf9ad0 100755
--- a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Wpf/Program.cs
+++ b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Wpf/Program.cs
@@ -1,4 +1,7 @@
-namespace EtoApp._1.Wpf
+using System;
+using Eto.Forms;
+
+namespace EtoApp._1.Wpf
 {
 	class Program
 	{
diff --git a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Program.cs b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Program.cs
index f7f6e8f4e6..fa89389543 100755
--- a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Program.cs
+++ b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Program.cs
@@ -1,4 +1,6 @@
 using AppKit;
+using Eto.Forms;
+
 namespace EtoApp._1.XamMac
 {
 	class Program
diff --git a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.Wpf/Program.cs b/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.Wpf/Program.cs
index 6de85e49b0..3caeaf9ad0 100755
--- a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.Wpf/Program.cs
+++ b/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.Wpf/Program.cs
@@ -1,4 +1,7 @@
-namespace EtoApp._1.Wpf
+using System;
+using Eto.Forms;
+
+namespace EtoApp._1.Wpf
 {
 	class Program
 	{
diff --git a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.MacOS/Program.cs b/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.MacOS/Program.cs
index 1010450b27..02f14fbcb9 100755
--- a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.MacOS/Program.cs
+++ b/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.MacOS/Program.cs
@@ -1,4 +1,7 @@
-namespace EtoApp._1.Mac
+using System;
+using Eto.Forms;
+
+namespace EtoApp._1.Mac
 {
 	class Program
 	{
diff --git a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Program.cs b/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Program.cs
index f7f6e8f4e6..fa89389543 100755
--- a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Program.cs
+++ b/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Program.cs
@@ -1,4 +1,6 @@
 using AppKit;
+using Eto.Forms;
+
 namespace EtoApp._1.XamMac
 {
 	class Program
diff --git a/src/Eto.Forms.Templates/content/File-CSharp/MainForm.cs b/src/Eto.Forms.Templates/content/File-CSharp/MainForm.cs
index c959cfb306..324bc74818 100755
--- a/src/Eto.Forms.Templates/content/File-CSharp/MainForm.cs
+++ b/src/Eto.Forms.Templates/content/File-CSharp/MainForm.cs
@@ -1,4 +1,8 @@
 #if (UseCode || UseCodePreview)
+using System;
+using Eto.Forms;
+using Eto.Drawing;
+
 namespace EtoApp._1
 {
 	public partial class MainForm : Form
diff --git a/src/Eto.Forms.Templates/content/File-CSharp/MainForm.eto.cs b/src/Eto.Forms.Templates/content/File-CSharp/MainForm.eto.cs
index e4bf1c19fc..2a2127c420 100755
--- a/src/Eto.Forms.Templates/content/File-CSharp/MainForm.eto.cs
+++ b/src/Eto.Forms.Templates/content/File-CSharp/MainForm.eto.cs
@@ -1,4 +1,8 @@
 #if (UseCodePreview)
+using System;
+using Eto.Forms;
+using Eto.Drawing;
+
 namespace EtoApp._1
 {
 	partial class MainForm : Form
diff --git a/src/Eto.Forms.Templates/content/File-CSharp/MainForm.jeto.cs b/src/Eto.Forms.Templates/content/File-CSharp/MainForm.jeto.cs
index 252c4cbdbe..c5c37514c7 100755
--- a/src/Eto.Forms.Templates/content/File-CSharp/MainForm.jeto.cs
+++ b/src/Eto.Forms.Templates/content/File-CSharp/MainForm.jeto.cs
@@ -1,4 +1,8 @@
 #if (UseJeto)
+using System;
+using System.Collections.Generic;
+using Eto.Forms;
+using Eto.Drawing;
 using Eto.Serialization.Json;
 
 namespace EtoApp._1
diff --git a/src/Eto.Forms.Templates/content/File-CSharp/MainForm.xeto.cs b/src/Eto.Forms.Templates/content/File-CSharp/MainForm.xeto.cs
index 5753bcccbe..0e96c5edca 100755
--- a/src/Eto.Forms.Templates/content/File-CSharp/MainForm.xeto.cs
+++ b/src/Eto.Forms.Templates/content/File-CSharp/MainForm.xeto.cs
@@ -1,4 +1,8 @@
 #if (UseXeto)
+using System;
+using System.Collections.Generic;
+using Eto.Forms;
+using Eto.Drawing;
 using Eto.Serialization.Xaml;
 
 namespace EtoApp._1