Flush.

16 files changed, 195 insertions, 378 deletions

diff --git a/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.AddinDescriptionWidget.cs b/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.AddinDescriptionWidget.cs
index 20b4ddbdf1..88ff92856e 100644
--- a/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.AddinDescriptionWidget.cs
+++ b/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.AddinDescriptionWidget.cs
@@ -5,73 +5,39 @@ namespace MonoDevelop.AddinAuthoring
 	public partial class AddinDescriptionWidget
 	{
 		private global::Gtk.UIManager UIManager;
-
 		private global::Gtk.VBox mainBox;
-
 		private global::Gtk.Notebook notebook;
-
 		private global::Gtk.VBox vbox3;
-
 		private global::Gtk.Table table1;
-
 		private global::Gtk.CheckButton checkIsRoot;
-
 		private global::Gtk.ComboBoxEntry comboNs;
-
 		private global::Gtk.Entry entryAuthor;
-
 		private global::Gtk.Entry entryIdentifier;
-
 		private global::Gtk.Entry entryLicense;
-
 		private global::Gtk.Entry entryName;
-
 		private global::Gtk.Entry entryUrl;
-
 		private global::Gtk.HBox hbox9;
-
 		private global::Gtk.Entry entryVersion;
-
 		private global::Gtk.Label label4;
-
 		private global::Gtk.Entry entryCompatVersion;
-
 		private global::Gtk.HSeparator hseparator1;
-
 		private global::Gtk.HSeparator hseparator2;
-
 		private global::Gtk.Label label12;
-
 		private global::Gtk.Label label13;
-
 		private global::Gtk.Label label14;
-
 		private global::Gtk.Label label15;
-
 		private global::Gtk.Label label2;
-
 		private global::Gtk.Label label3;
-
 		private global::Gtk.Label label7;
-
 		private global::Gtk.Label label8;
-
 		private global::Gtk.ScrolledWindow scrolledwindow1;
-
 		private global::Gtk.TextView textviewDesc;
-
 		private global::Gtk.HSeparator hseparator3;
-
 		private global::Gtk.Label label5;
-
 		private global::MonoDevelop.AddinAuthoring.ExtensionPointsEditorWidget extensionPointsEditor;
-
 		private global::Gtk.Label label9;
-
 		private global::Gtk.HBox hbox5;
-
 		private global::MonoDevelop.AddinAuthoring.ExtensionEditorWidget extensionEditor;
-
 		private global::Gtk.Label label10;
 
 		protected virtual void Build ()
@@ -111,7 +77,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.checkIsRoot.DrawIndicator = true;
 			this.checkIsRoot.UseUnderline = true;
 			this.table1.Add (this.checkIsRoot);
-			global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1[this.checkIsRoot]));
+			global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1 [this.checkIsRoot]));
 			w3.TopAttach = ((uint)(3));
 			w3.BottomAttach = ((uint)(4));
 			w3.RightAttach = ((uint)(2));
@@ -120,7 +86,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.comboNs = global::Gtk.ComboBoxEntry.NewText ();
 			this.comboNs.Name = "comboNs";
 			this.table1.Add (this.comboNs);
-			global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table1[this.comboNs]));
+			global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table1 [this.comboNs]));
 			w4.TopAttach = ((uint)(1));
 			w4.BottomAttach = ((uint)(2));
 			w4.LeftAttach = ((uint)(1));
@@ -133,7 +99,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.entryAuthor.IsEditable = true;
 			this.entryAuthor.InvisibleChar = '●';
 			this.table1.Add (this.entryAuthor);
-			global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table1[this.entryAuthor]));
+			global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table1 [this.entryAuthor]));
 			w5.TopAttach = ((uint)(8));
 			w5.BottomAttach = ((uint)(9));
 			w5.LeftAttach = ((uint)(1));
@@ -146,7 +112,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.entryIdentifier.IsEditable = true;
 			this.entryIdentifier.InvisibleChar = '●';
 			this.table1.Add (this.entryIdentifier);
-			global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table1[this.entryIdentifier]));
+			global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table1 [this.entryIdentifier]));
 			w6.LeftAttach = ((uint)(1));
 			w6.RightAttach = ((uint)(2));
 			w6.YOptions = ((global::Gtk.AttachOptions)(4));
@@ -157,7 +123,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.entryLicense.IsEditable = true;
 			this.entryLicense.InvisibleChar = '●';
 			this.table1.Add (this.entryLicense);
-			global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table1[this.entryLicense]));
+			global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table1 [this.entryLicense]));
 			w7.TopAttach = ((uint)(9));
 			w7.BottomAttach = ((uint)(10));
 			w7.LeftAttach = ((uint)(1));
@@ -170,7 +136,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.entryName.IsEditable = true;
 			this.entryName.InvisibleChar = '●';
 			this.table1.Add (this.entryName);
-			global::Gtk.Table.TableChild w8 = ((global::Gtk.Table.TableChild)(this.table1[this.entryName]));
+			global::Gtk.Table.TableChild w8 = ((global::Gtk.Table.TableChild)(this.table1 [this.entryName]));
 			w8.TopAttach = ((uint)(5));
 			w8.BottomAttach = ((uint)(6));
 			w8.LeftAttach = ((uint)(1));
@@ -183,7 +149,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.entryUrl.IsEditable = true;
 			this.entryUrl.InvisibleChar = '●';
 			this.table1.Add (this.entryUrl);
-			global::Gtk.Table.TableChild w9 = ((global::Gtk.Table.TableChild)(this.table1[this.entryUrl]));
+			global::Gtk.Table.TableChild w9 = ((global::Gtk.Table.TableChild)(this.table1 [this.entryUrl]));
 			w9.TopAttach = ((uint)(10));
 			w9.BottomAttach = ((uint)(11));
 			w9.LeftAttach = ((uint)(1));
@@ -201,7 +167,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.entryVersion.WidthChars = 15;
 			this.entryVersion.InvisibleChar = '●';
 			this.hbox9.Add (this.entryVersion);
-			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.hbox9[this.entryVersion]));
+			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.hbox9 [this.entryVersion]));
 			w10.Position = 0;
 			w10.Expand = false;
 			w10.Fill = false;
@@ -210,7 +176,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.label4.Name = "label4";
 			this.label4.LabelProp = global::Mono.Addins.AddinManager.CurrentLocalizer.GetString ("Compatible Version:");
 			this.hbox9.Add (this.label4);
-			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.hbox9[this.label4]));
+			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.hbox9 [this.label4]));
 			w11.Position = 1;
 			w11.Expand = false;
 			w11.Fill = false;
@@ -222,12 +188,12 @@ namespace MonoDevelop.AddinAuthoring
 			this.entryCompatVersion.WidthChars = 15;
 			this.entryCompatVersion.InvisibleChar = '●';
 			this.hbox9.Add (this.entryCompatVersion);
-			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.hbox9[this.entryCompatVersion]));
+			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.hbox9 [this.entryCompatVersion]));
 			w12.Position = 2;
 			w12.Expand = false;
 			w12.Fill = false;
 			this.table1.Add (this.hbox9);
-			global::Gtk.Table.TableChild w13 = ((global::Gtk.Table.TableChild)(this.table1[this.hbox9]));
+			global::Gtk.Table.TableChild w13 = ((global::Gtk.Table.TableChild)(this.table1 [this.hbox9]));
 			w13.TopAttach = ((uint)(2));
 			w13.BottomAttach = ((uint)(3));
 			w13.LeftAttach = ((uint)(1));
@@ -238,7 +204,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.hseparator1 = new global::Gtk.HSeparator ();
 			this.hseparator1.Name = "hseparator1";
 			this.table1.Add (this.hseparator1);
-			global::Gtk.Table.TableChild w14 = ((global::Gtk.Table.TableChild)(this.table1[this.hseparator1]));
+			global::Gtk.Table.TableChild w14 = ((global::Gtk.Table.TableChild)(this.table1 [this.hseparator1]));
 			w14.TopAttach = ((uint)(7));
 			w14.BottomAttach = ((uint)(8));
 			w14.RightAttach = ((uint)(2));
@@ -248,7 +214,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.hseparator2 = new global::Gtk.HSeparator ();
 			this.hseparator2.Name = "hseparator2";
 			this.table1.Add (this.hseparator2);
-			global::Gtk.Table.TableChild w15 = ((global::Gtk.Table.TableChild)(this.table1[this.hseparator2]));
+			global::Gtk.Table.TableChild w15 = ((global::Gtk.Table.TableChild)(this.table1 [this.hseparator2]));
 			w15.TopAttach = ((uint)(4));
 			w15.BottomAttach = ((uint)(5));
 			w15.RightAttach = ((uint)(2));
@@ -257,10 +223,10 @@ namespace MonoDevelop.AddinAuthoring
 			// Container child table1.Gtk.Table+TableChild
 			this.label12 = new global::Gtk.Label ();
 			this.label12.Name = "label12";
-			this.label12.Xalign = 0f;
+			this.label12.Xalign = 0F;
 			this.label12.LabelProp = global::Mono.Addins.AddinManager.CurrentLocalizer.GetString ("License:");
 			this.table1.Add (this.label12);
-			global::Gtk.Table.TableChild w16 = ((global::Gtk.Table.TableChild)(this.table1[this.label12]));
+			global::Gtk.Table.TableChild w16 = ((global::Gtk.Table.TableChild)(this.table1 [this.label12]));
 			w16.TopAttach = ((uint)(9));
 			w16.BottomAttach = ((uint)(10));
 			w16.XOptions = ((global::Gtk.AttachOptions)(4));
@@ -268,10 +234,10 @@ namespace MonoDevelop.AddinAuthoring
 			// Container child table1.Gtk.Table+TableChild
 			this.label13 = new global::Gtk.Label ();
 			this.label13.Name = "label13";
-			this.label13.Xalign = 0f;
+			this.label13.Xalign = 0F;
 			this.label13.LabelProp = global::Mono.Addins.AddinManager.CurrentLocalizer.GetString ("Author:");
 			this.table1.Add (this.label13);
-			global::Gtk.Table.TableChild w17 = ((global::Gtk.Table.TableChild)(this.table1[this.label13]));
+			global::Gtk.Table.TableChild w17 = ((global::Gtk.Table.TableChild)(this.table1 [this.label13]));
 			w17.TopAttach = ((uint)(8));
 			w17.BottomAttach = ((uint)(9));
 			w17.XOptions = ((global::Gtk.AttachOptions)(4));
@@ -279,10 +245,10 @@ namespace MonoDevelop.AddinAuthoring
 			// Container child table1.Gtk.Table+TableChild
 			this.label14 = new global::Gtk.Label ();
 			this.label14.Name = "label14";
-			this.label14.Xalign = 0f;
+			this.label14.Xalign = 0F;
 			this.label14.LabelProp = global::Mono.Addins.AddinManager.CurrentLocalizer.GetString ("Name:");
 			this.table1.Add (this.label14);
-			global::Gtk.Table.TableChild w18 = ((global::Gtk.Table.TableChild)(this.table1[this.label14]));
+			global::Gtk.Table.TableChild w18 = ((global::Gtk.Table.TableChild)(this.table1 [this.label14]));
 			w18.TopAttach = ((uint)(5));
 			w18.BottomAttach = ((uint)(6));
 			w18.XOptions = ((global::Gtk.AttachOptions)(4));
@@ -290,11 +256,11 @@ namespace MonoDevelop.AddinAuthoring
 			// Container child table1.Gtk.Table+TableChild
 			this.label15 = new global::Gtk.Label ();
 			this.label15.Name = "label15";
-			this.label15.Xalign = 0f;
-			this.label15.Yalign = 0f;
+			this.label15.Xalign = 0F;
+			this.label15.Yalign = 0F;
 			this.label15.LabelProp = global::Mono.Addins.AddinManager.CurrentLocalizer.GetString ("Description:");
 			this.table1.Add (this.label15);
-			global::Gtk.Table.TableChild w19 = ((global::Gtk.Table.TableChild)(this.table1[this.label15]));
+			global::Gtk.Table.TableChild w19 = ((global::Gtk.Table.TableChild)(this.table1 [this.label15]));
 			w19.TopAttach = ((uint)(6));
 			w19.BottomAttach = ((uint)(7));
 			w19.XOptions = ((global::Gtk.AttachOptions)(4));
@@ -302,10 +268,10 @@ namespace MonoDevelop.AddinAuthoring
 			// Container child table1.Gtk.Table+TableChild
 			this.label2 = new global::Gtk.Label ();
 			this.label2.Name = "label2";
-			this.label2.Xalign = 0f;
+			this.label2.Xalign = 0F;
 			this.label2.LabelProp = global::Mono.Addins.AddinManager.CurrentLocalizer.GetString ("Namespace:");
 			this.table1.Add (this.label2);
-			global::Gtk.Table.TableChild w20 = ((global::Gtk.Table.TableChild)(this.table1[this.label2]));
+			global::Gtk.Table.TableChild w20 = ((global::Gtk.Table.TableChild)(this.table1 [this.label2]));
 			w20.TopAttach = ((uint)(1));
 			w20.BottomAttach = ((uint)(2));
 			w20.XOptions = ((global::Gtk.AttachOptions)(4));
@@ -313,10 +279,10 @@ namespace MonoDevelop.AddinAuthoring
 			// Container child table1.Gtk.Table+TableChild
 			this.label3 = new global::Gtk.Label ();
 			this.label3.Name = "label3";
-			this.label3.Xalign = 0f;
+			this.label3.Xalign = 0F;
 			this.label3.LabelProp = global::Mono.Addins.AddinManager.CurrentLocalizer.GetString ("Version:");
 			this.table1.Add (this.label3);
-			global::Gtk.Table.TableChild w21 = ((global::Gtk.Table.TableChild)(this.table1[this.label3]));
+			global::Gtk.Table.TableChild w21 = ((global::Gtk.Table.TableChild)(this.table1 [this.label3]));
 			w21.TopAttach = ((uint)(2));
 			w21.BottomAttach = ((uint)(3));
 			w21.XOptions = ((global::Gtk.AttachOptions)(4));
@@ -324,10 +290,10 @@ namespace MonoDevelop.AddinAuthoring
 			// Container child table1.Gtk.Table+TableChild
 			this.label7 = new global::Gtk.Label ();
 			this.label7.Name = "label7";
-			this.label7.Xalign = 0f;
+			this.label7.Xalign = 0F;
 			this.label7.LabelProp = global::Mono.Addins.AddinManager.CurrentLocalizer.GetString ("URL:");
 			this.table1.Add (this.label7);
-			global::Gtk.Table.TableChild w22 = ((global::Gtk.Table.TableChild)(this.table1[this.label7]));
+			global::Gtk.Table.TableChild w22 = ((global::Gtk.Table.TableChild)(this.table1 [this.label7]));
 			w22.TopAttach = ((uint)(10));
 			w22.BottomAttach = ((uint)(11));
 			w22.XOptions = ((global::Gtk.AttachOptions)(4));
@@ -335,10 +301,10 @@ namespace MonoDevelop.AddinAuthoring
 			// Container child table1.Gtk.Table+TableChild
 			this.label8 = new global::Gtk.Label ();
 			this.label8.Name = "label8";
-			this.label8.Xalign = 0f;
+			this.label8.Xalign = 0F;
 			this.label8.LabelProp = global::Mono.Addins.AddinManager.CurrentLocalizer.GetString ("Identifier:");
 			this.table1.Add (this.label8);
-			global::Gtk.Table.TableChild w23 = ((global::Gtk.Table.TableChild)(this.table1[this.label8]));
+			global::Gtk.Table.TableChild w23 = ((global::Gtk.Table.TableChild)(this.table1 [this.label8]));
 			w23.XOptions = ((global::Gtk.AttachOptions)(4));
 			w23.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
@@ -352,14 +318,14 @@ namespace MonoDevelop.AddinAuthoring
 			this.textviewDesc.Name = "textviewDesc";
 			this.scrolledwindow1.Add (this.textviewDesc);
 			this.table1.Add (this.scrolledwindow1);
-			global::Gtk.Table.TableChild w25 = ((global::Gtk.Table.TableChild)(this.table1[this.scrolledwindow1]));
+			global::Gtk.Table.TableChild w25 = ((global::Gtk.Table.TableChild)(this.table1 [this.scrolledwindow1]));
 			w25.TopAttach = ((uint)(6));
 			w25.BottomAttach = ((uint)(7));
 			w25.LeftAttach = ((uint)(1));
 			w25.RightAttach = ((uint)(2));
 			w25.YOptions = ((global::Gtk.AttachOptions)(4));
 			this.vbox3.Add (this.table1);
-			global::Gtk.Box.BoxChild w26 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.table1]));
+			global::Gtk.Box.BoxChild w26 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.table1]));
 			w26.Position = 0;
 			w26.Expand = false;
 			w26.Fill = false;
@@ -367,7 +333,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.hseparator3 = new global::Gtk.HSeparator ();
 			this.hseparator3.Name = "hseparator3";
 			this.vbox3.Add (this.hseparator3);
-			global::Gtk.Box.BoxChild w27 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.hseparator3]));
+			global::Gtk.Box.BoxChild w27 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.hseparator3]));
 			w27.PackType = ((global::Gtk.PackType)(1));
 			w27.Position = 1;
 			w27.Expand = false;
@@ -380,11 +346,9 @@ namespace MonoDevelop.AddinAuthoring
 			this.notebook.SetTabLabel (this.vbox3, this.label5);
 			this.label5.ShowAll ();
 			// Container child notebook.Gtk.Notebook+NotebookChild
-			this.extensionPointsEditor = new global::MonoDevelop.AddinAuthoring.ExtensionPointsEditorWidget ();
-			this.extensionPointsEditor.Events = ((global::Gdk.EventMask)(256));
-			this.extensionPointsEditor.Name = "extensionPointsEditor";
+			this.extensionPointsEditor = null;
 			this.notebook.Add (this.extensionPointsEditor);
-			global::Gtk.Notebook.NotebookChild w29 = ((global::Gtk.Notebook.NotebookChild)(this.notebook[this.extensionPointsEditor]));
+			global::Gtk.Notebook.NotebookChild w29 = ((global::Gtk.Notebook.NotebookChild)(this.notebook [this.extensionPointsEditor]));
 			w29.Position = 1;
 			// Notebook tab
 			this.label9 = new global::Gtk.Label ();
@@ -398,14 +362,12 @@ namespace MonoDevelop.AddinAuthoring
 			this.hbox5.Spacing = 6;
 			this.hbox5.BorderWidth = ((uint)(6));
 			// Container child hbox5.Gtk.Box+BoxChild
-			this.extensionEditor = new global::MonoDevelop.AddinAuthoring.ExtensionEditorWidget ();
-			this.extensionEditor.Events = ((global::Gdk.EventMask)(256));
-			this.extensionEditor.Name = "extensionEditor";
+			this.extensionEditor = null;
 			this.hbox5.Add (this.extensionEditor);
-			global::Gtk.Box.BoxChild w30 = ((global::Gtk.Box.BoxChild)(this.hbox5[this.extensionEditor]));
+			global::Gtk.Box.BoxChild w30 = ((global::Gtk.Box.BoxChild)(this.hbox5 [this.extensionEditor]));
 			w30.Position = 0;
 			this.notebook.Add (this.hbox5);
-			global::Gtk.Notebook.NotebookChild w31 = ((global::Gtk.Notebook.NotebookChild)(this.notebook[this.hbox5]));
+			global::Gtk.Notebook.NotebookChild w31 = ((global::Gtk.Notebook.NotebookChild)(this.notebook [this.hbox5]));
 			w31.Position = 2;
 			// Notebook tab
 			this.label10 = new global::Gtk.Label ();
@@ -414,7 +376,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.notebook.SetTabLabel (this.hbox5, this.label10);
 			this.label10.ShowAll ();
 			this.mainBox.Add (this.notebook);
-			global::Gtk.Box.BoxChild w32 = ((global::Gtk.Box.BoxChild)(this.mainBox[this.notebook]));
+			global::Gtk.Box.BoxChild w32 = ((global::Gtk.Box.BoxChild)(this.mainBox [this.notebook]));
 			w32.Position = 0;
 			this.Add (this.mainBox);
 			if ((this.Child != null)) {
diff --git a/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.AddinFeatureWidget.cs b/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.AddinFeatureWidget.cs
index f4d750e602..899c83a775 100644
--- a/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.AddinFeatureWidget.cs
+++ b/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.AddinFeatureWidget.cs
@@ -5,45 +5,25 @@ namespace MonoDevelop.AddinAuthoring
 	public partial class AddinFeatureWidget
 	{
 		private global::Gtk.VBox vbox2;
-
 		private global::Gtk.VBox boxLibraryType;
-
 		private global::Gtk.Label labelExtensibleApp;
-
 		private global::Gtk.Label label2;
-
 		private global::Gtk.Alignment alignment1;
-
 		private global::Gtk.VBox vbox3;
-
 		private global::Gtk.RadioButton radiobuttonLibrary;
-
 		private global::Gtk.RadioButton radiobuttonAddin;
-
 		private global::Gtk.HBox boxRepo;
-
 		private global::Gtk.Label label3;
-
 		private global::MonoDevelop.AddinAuthoring.RegistrySelector regSelector;
-
 		private global::Gtk.HSeparator hseparator;
-
 		private global::Gtk.Label labelAddinInfo;
-
 		private global::Gtk.Alignment alignment3;
-
 		private global::Gtk.Table tableNames;
-
 		private global::Gtk.ComboBoxEntry comboNs;
-
 		private global::Gtk.Entry entryId;
-
 		private global::Gtk.Entry entryName;
-
 		private global::Gtk.Label label7;
-
 		private global::Gtk.Label label9;
-
 		private global::Gtk.Label labelName;
 
 		protected virtual void Build ()
@@ -63,25 +43,25 @@ namespace MonoDevelop.AddinAuthoring
 			// Container child boxLibraryType.Gtk.Box+BoxChild
 			this.labelExtensibleApp = new global::Gtk.Label ();
 			this.labelExtensibleApp.Name = "labelExtensibleApp";
-			this.labelExtensibleApp.Xalign = 0f;
+			this.labelExtensibleApp.Xalign = 0F;
 			this.labelExtensibleApp.LabelProp = global::Mono.Addins.AddinManager.CurrentLocalizer.GetString ("Allow the application to be extended by add-ins.");
 			this.boxLibraryType.Add (this.labelExtensibleApp);
-			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.boxLibraryType[this.labelExtensibleApp]));
+			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.boxLibraryType [this.labelExtensibleApp]));
 			w1.Position = 0;
 			w1.Expand = false;
 			w1.Fill = false;
 			// Container child boxLibraryType.Gtk.Box+BoxChild
 			this.label2 = new global::Gtk.Label ();
 			this.label2.Name = "label2";
-			this.label2.Xalign = 0f;
+			this.label2.Xalign = 0F;
 			this.label2.LabelProp = global::Mono.Addins.AddinManager.CurrentLocalizer.GetString ("Which kind of library you want to create?");
 			this.boxLibraryType.Add (this.label2);
-			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.boxLibraryType[this.label2]));
+			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.boxLibraryType [this.label2]));
 			w2.Position = 1;
 			w2.Expand = false;
 			w2.Fill = false;
 			// Container child boxLibraryType.Gtk.Box+BoxChild
-			this.alignment1 = new global::Gtk.Alignment (0.5f, 0.5f, 1f, 1f);
+			this.alignment1 = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F);
 			this.alignment1.Name = "alignment1";
 			this.alignment1.LeftPadding = ((uint)(12));
 			// Container child alignment1.Gtk.Container+ContainerChild
@@ -92,11 +72,12 @@ namespace MonoDevelop.AddinAuthoring
 			this.radiobuttonLibrary = new global::Gtk.RadioButton (global::Mono.Addins.AddinManager.CurrentLocalizer.GetString ("A library which can be extended by add-ins"));
 			this.radiobuttonLibrary.CanFocus = true;
 			this.radiobuttonLibrary.Name = "radiobuttonLibrary";
+			this.radiobuttonLibrary.Active = true;
 			this.radiobuttonLibrary.DrawIndicator = true;
 			this.radiobuttonLibrary.UseUnderline = true;
 			this.radiobuttonLibrary.Group = new global::GLib.SList (global::System.IntPtr.Zero);
 			this.vbox3.Add (this.radiobuttonLibrary);
-			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.radiobuttonLibrary]));
+			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.radiobuttonLibrary]));
 			w3.Position = 0;
 			w3.Expand = false;
 			w3.Fill = false;
@@ -108,18 +89,18 @@ namespace MonoDevelop.AddinAuthoring
 			this.radiobuttonAddin.UseUnderline = true;
 			this.radiobuttonAddin.Group = this.radiobuttonLibrary.Group;
 			this.vbox3.Add (this.radiobuttonAddin);
-			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.radiobuttonAddin]));
+			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.radiobuttonAddin]));
 			w4.Position = 1;
 			w4.Expand = false;
 			w4.Fill = false;
 			this.alignment1.Add (this.vbox3);
 			this.boxLibraryType.Add (this.alignment1);
-			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.boxLibraryType[this.alignment1]));
+			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.boxLibraryType [this.alignment1]));
 			w6.Position = 2;
 			w6.Expand = false;
 			w6.Fill = false;
 			this.vbox2.Add (this.boxLibraryType);
-			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.boxLibraryType]));
+			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.boxLibraryType]));
 			w7.Position = 0;
 			w7.Expand = false;
 			w7.Fill = false;
@@ -130,22 +111,20 @@ namespace MonoDevelop.AddinAuthoring
 			// Container child boxRepo.Gtk.Box+BoxChild
 			this.label3 = new global::Gtk.Label ();
 			this.label3.Name = "label3";
-			this.label3.Xalign = 0f;
+			this.label3.Xalign = 0F;
 			this.label3.LabelProp = global::Mono.Addins.AddinManager.CurrentLocalizer.GetString ("Extended Application:");
 			this.boxRepo.Add (this.label3);
-			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.boxRepo[this.label3]));
+			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.boxRepo [this.label3]));
 			w8.Position = 0;
 			w8.Expand = false;
 			w8.Fill = false;
 			// Container child boxRepo.Gtk.Box+BoxChild
-			this.regSelector = new global::MonoDevelop.AddinAuthoring.RegistrySelector ();
-			this.regSelector.Events = ((global::Gdk.EventMask)(256));
-			this.regSelector.Name = "regSelector";
+			this.regSelector = null;
 			this.boxRepo.Add (this.regSelector);
-			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.boxRepo[this.regSelector]));
+			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.boxRepo [this.regSelector]));
 			w9.Position = 1;
 			this.vbox2.Add (this.boxRepo);
-			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.boxRepo]));
+			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.boxRepo]));
 			w10.Position = 1;
 			w10.Expand = false;
 			w10.Fill = false;
@@ -153,22 +132,22 @@ namespace MonoDevelop.AddinAuthoring
 			this.hseparator = new global::Gtk.HSeparator ();
 			this.hseparator.Name = "hseparator";
 			this.vbox2.Add (this.hseparator);
-			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.hseparator]));
+			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hseparator]));
 			w11.Position = 2;
 			w11.Expand = false;
 			w11.Fill = false;
 			// Container child vbox2.Gtk.Box+BoxChild
 			this.labelAddinInfo = new global::Gtk.Label ();
 			this.labelAddinInfo.Name = "labelAddinInfo";
-			this.labelAddinInfo.Xalign = 0f;
+			this.labelAddinInfo.Xalign = 0F;
 			this.labelAddinInfo.LabelProp = global::Mono.Addins.AddinManager.CurrentLocalizer.GetString ("Add-in module information:");
 			this.vbox2.Add (this.labelAddinInfo);
-			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.labelAddinInfo]));
+			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.labelAddinInfo]));
 			w12.Position = 3;
 			w12.Expand = false;
 			w12.Fill = false;
 			// Container child vbox2.Gtk.Box+BoxChild
-			this.alignment3 = new global::Gtk.Alignment (0.5f, 0.5f, 1f, 1f);
+			this.alignment3 = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F);
 			this.alignment3.Name = "alignment3";
 			this.alignment3.LeftPadding = ((uint)(24));
 			// Container child alignment3.Gtk.Container+ContainerChild
@@ -180,7 +159,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.comboNs = global::Gtk.ComboBoxEntry.NewText ();
 			this.comboNs.Name = "comboNs";
 			this.tableNames.Add (this.comboNs);
-			global::Gtk.Table.TableChild w13 = ((global::Gtk.Table.TableChild)(this.tableNames[this.comboNs]));
+			global::Gtk.Table.TableChild w13 = ((global::Gtk.Table.TableChild)(this.tableNames [this.comboNs]));
 			w13.TopAttach = ((uint)(1));
 			w13.BottomAttach = ((uint)(2));
 			w13.LeftAttach = ((uint)(1));
@@ -193,7 +172,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.entryId.IsEditable = true;
 			this.entryId.InvisibleChar = '●';
 			this.tableNames.Add (this.entryId);
-			global::Gtk.Table.TableChild w14 = ((global::Gtk.Table.TableChild)(this.tableNames[this.entryId]));
+			global::Gtk.Table.TableChild w14 = ((global::Gtk.Table.TableChild)(this.tableNames [this.entryId]));
 			w14.TopAttach = ((uint)(2));
 			w14.BottomAttach = ((uint)(3));
 			w14.LeftAttach = ((uint)(1));
@@ -207,7 +186,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.entryName.IsEditable = true;
 			this.entryName.InvisibleChar = '●';
 			this.tableNames.Add (this.entryName);
-			global::Gtk.Table.TableChild w15 = ((global::Gtk.Table.TableChild)(this.tableNames[this.entryName]));
+			global::Gtk.Table.TableChild w15 = ((global::Gtk.Table.TableChild)(this.tableNames [this.entryName]));
 			w15.LeftAttach = ((uint)(1));
 			w15.RightAttach = ((uint)(2));
 			w15.XOptions = ((global::Gtk.AttachOptions)(4));
@@ -215,10 +194,10 @@ namespace MonoDevelop.AddinAuthoring
 			// Container child tableNames.Gtk.Table+TableChild
 			this.label7 = new global::Gtk.Label ();
 			this.label7.Name = "label7";
-			this.label7.Xalign = 0f;
+			this.label7.Xalign = 0F;
 			this.label7.LabelProp = global::Mono.Addins.AddinManager.CurrentLocalizer.GetString ("Namespace:");
 			this.tableNames.Add (this.label7);
-			global::Gtk.Table.TableChild w16 = ((global::Gtk.Table.TableChild)(this.tableNames[this.label7]));
+			global::Gtk.Table.TableChild w16 = ((global::Gtk.Table.TableChild)(this.tableNames [this.label7]));
 			w16.TopAttach = ((uint)(1));
 			w16.BottomAttach = ((uint)(2));
 			w16.XOptions = ((global::Gtk.AttachOptions)(4));
@@ -226,10 +205,10 @@ namespace MonoDevelop.AddinAuthoring
 			// Container child tableNames.Gtk.Table+TableChild
 			this.label9 = new global::Gtk.Label ();
 			this.label9.Name = "label9";
-			this.label9.Xalign = 0f;
+			this.label9.Xalign = 0F;
 			this.label9.LabelProp = global::Mono.Addins.AddinManager.CurrentLocalizer.GetString ("Identifier:");
 			this.tableNames.Add (this.label9);
-			global::Gtk.Table.TableChild w17 = ((global::Gtk.Table.TableChild)(this.tableNames[this.label9]));
+			global::Gtk.Table.TableChild w17 = ((global::Gtk.Table.TableChild)(this.tableNames [this.label9]));
 			w17.TopAttach = ((uint)(2));
 			w17.BottomAttach = ((uint)(3));
 			w17.XOptions = ((global::Gtk.AttachOptions)(4));
@@ -237,15 +216,15 @@ namespace MonoDevelop.AddinAuthoring
 			// Container child tableNames.Gtk.Table+TableChild
 			this.labelName = new global::Gtk.Label ();
 			this.labelName.Name = "labelName";
-			this.labelName.Xalign = 0f;
+			this.labelName.Xalign = 0F;
 			this.labelName.LabelProp = global::Mono.Addins.AddinManager.CurrentLocalizer.GetString ("Display name:");
 			this.tableNames.Add (this.labelName);
-			global::Gtk.Table.TableChild w18 = ((global::Gtk.Table.TableChild)(this.tableNames[this.labelName]));
+			global::Gtk.Table.TableChild w18 = ((global::Gtk.Table.TableChild)(this.tableNames [this.labelName]));
 			w18.XOptions = ((global::Gtk.AttachOptions)(4));
 			w18.YOptions = ((global::Gtk.AttachOptions)(4));
 			this.alignment3.Add (this.tableNames);
 			this.vbox2.Add (this.alignment3);
-			global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.alignment3]));
+			global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.alignment3]));
 			w20.Position = 4;
 			w20.Expand = false;
 			w20.Fill = false;
@@ -256,7 +235,6 @@ namespace MonoDevelop.AddinAuthoring
 			this.labelExtensibleApp.Hide ();
 			this.Show ();
 			this.radiobuttonLibrary.Toggled += new global::System.EventHandler (this.OnRadiobuttonLibraryToggled);
-			this.regSelector.Changed += new global::System.EventHandler (this.OnRegSelectorChanged);
 			this.entryName.Changed += new global::System.EventHandler (this.OnEntryNameChanged);
 			this.entryId.Changed += new global::System.EventHandler (this.OnEntryIdChanged);
 			this.comboNs.Changed += new global::System.EventHandler (this.OnComboNsChanged);
diff --git a/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.AddinOptionPanelWidget.cs b/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.AddinOptionPanelWidget.cs
index cbd4e51433..c4a1b648a3 100644
--- a/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.AddinOptionPanelWidget.cs
+++ b/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.AddinOptionPanelWidget.cs
@@ -5,11 +5,8 @@ namespace MonoDevelop.AddinAuthoring
 	public partial class AddinOptionPanelWidget
 	{
 		private global::Gtk.VBox vbox2;
-
 		private global::Gtk.CheckButton checkEnable;
-
 		private global::Gtk.HSeparator hseparator1;
-
 		private global::MonoDevelop.AddinAuthoring.AddinFeatureWidget optionsWidget;
 
 		protected virtual void Build ()
@@ -30,7 +27,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.checkEnable.DrawIndicator = true;
 			this.checkEnable.UseUnderline = true;
 			this.vbox2.Add (this.checkEnable);
-			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.checkEnable]));
+			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.checkEnable]));
 			w1.Position = 0;
 			w1.Expand = false;
 			w1.Fill = false;
@@ -38,16 +35,14 @@ namespace MonoDevelop.AddinAuthoring
 			this.hseparator1 = new global::Gtk.HSeparator ();
 			this.hseparator1.Name = "hseparator1";
 			this.vbox2.Add (this.hseparator1);
-			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.hseparator1]));
+			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hseparator1]));
 			w2.Position = 1;
 			w2.Expand = false;
 			w2.Fill = false;
 			// Container child vbox2.Gtk.Box+BoxChild
-			this.optionsWidget = new global::MonoDevelop.AddinAuthoring.AddinFeatureWidget ();
-			this.optionsWidget.Events = ((global::Gdk.EventMask)(256));
-			this.optionsWidget.Name = "optionsWidget";
+			this.optionsWidget = null;
 			this.vbox2.Add (this.optionsWidget);
-			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.optionsWidget]));
+			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.optionsWidget]));
 			w3.Position = 2;
 			w3.Expand = false;
 			w3.Fill = false;
diff --git a/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.ExtensionEditorWidget.cs b/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.ExtensionEditorWidget.cs
index 89f4054537..4aef6d9537 100644
--- a/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.ExtensionEditorWidget.cs
+++ b/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.ExtensionEditorWidget.cs
@@ -5,31 +5,18 @@ namespace MonoDevelop.AddinAuthoring
 	public partial class ExtensionEditorWidget
 	{
 		private global::Gtk.VBox vbox2;
-
 		private global::Gtk.HBox hbox1;
-
 		private global::Gtk.Button buttonAdd;
-
 		private global::Gtk.Button addNodeButton;
-
 		private global::Gtk.HBox hbox2;
-
 		private global::Gtk.Image image445;
-
 		private global::Gtk.Label label1;
-
 		private global::Gtk.Arrow arrow1;
-
 		private global::Gtk.Button buttonRemove;
-
 		private global::Gtk.HBox hbox4;
-
 		private global::Gtk.HPaned hpaned1;
-
 		private global::Gtk.ScrolledWindow scrolledwindow6;
-
 		private global::Gtk.TreeView tree;
-
 		private global::Gtk.ScrolledWindow editorBox;
 
 		protected virtual void Build ()
@@ -53,7 +40,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.buttonAdd.UseUnderline = true;
 			this.buttonAdd.Relief = ((global::Gtk.ReliefStyle)(2));
 			// Container child buttonAdd.Gtk.Container+ContainerChild
-			global::Gtk.Alignment w1 = new global::Gtk.Alignment (0.5f, 0.5f, 0f, 0f);
+			global::Gtk.Alignment w1 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
 			// Container child GtkAlignment.Gtk.Container+ContainerChild
 			global::Gtk.HBox w2 = new global::Gtk.HBox ();
 			w2.Spacing = 2;
@@ -69,7 +56,7 @@ namespace MonoDevelop.AddinAuthoring
 			w1.Add (w2);
 			this.buttonAdd.Add (w1);
 			this.hbox1.Add (this.buttonAdd);
-			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.buttonAdd]));
+			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.buttonAdd]));
 			w9.Position = 0;
 			w9.Expand = false;
 			w9.Fill = false;
@@ -87,7 +74,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.image445.Name = "image445";
 			this.image445.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-add", global::Gtk.IconSize.Menu);
 			this.hbox2.Add (this.image445);
-			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.image445]));
+			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.image445]));
 			w10.Position = 0;
 			w10.Expand = false;
 			w10.Fill = false;
@@ -96,7 +83,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.label1.Name = "label1";
 			this.label1.LabelProp = global::Mono.Addins.AddinManager.CurrentLocalizer.GetString ("Add Node");
 			this.hbox2.Add (this.label1);
-			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.label1]));
+			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.label1]));
 			w11.Position = 1;
 			w11.Expand = false;
 			w11.Fill = false;
@@ -104,14 +91,14 @@ namespace MonoDevelop.AddinAuthoring
 			this.arrow1 = new global::Gtk.Arrow (((global::Gtk.ArrowType)(1)), ((global::Gtk.ShadowType)(2)));
 			this.arrow1.Name = "arrow1";
 			this.hbox2.Add (this.arrow1);
-			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.arrow1]));
+			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.arrow1]));
 			w12.Position = 2;
 			w12.Expand = false;
 			w12.Fill = false;
 			this.addNodeButton.Add (this.hbox2);
 			this.addNodeButton.Label = null;
 			this.hbox1.Add (this.addNodeButton);
-			global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.addNodeButton]));
+			global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.addNodeButton]));
 			w14.Position = 1;
 			w14.Expand = false;
 			w14.Fill = false;
@@ -122,7 +109,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.buttonRemove.UseUnderline = true;
 			this.buttonRemove.Relief = ((global::Gtk.ReliefStyle)(2));
 			// Container child buttonRemove.Gtk.Container+ContainerChild
-			global::Gtk.Alignment w15 = new global::Gtk.Alignment (0.5f, 0.5f, 0f, 0f);
+			global::Gtk.Alignment w15 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
 			// Container child GtkAlignment.Gtk.Container+ContainerChild
 			global::Gtk.HBox w16 = new global::Gtk.HBox ();
 			w16.Spacing = 2;
@@ -138,12 +125,12 @@ namespace MonoDevelop.AddinAuthoring
 			w15.Add (w16);
 			this.buttonRemove.Add (w15);
 			this.hbox1.Add (this.buttonRemove);
-			global::Gtk.Box.BoxChild w23 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.buttonRemove]));
+			global::Gtk.Box.BoxChild w23 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.buttonRemove]));
 			w23.Position = 2;
 			w23.Expand = false;
 			w23.Fill = false;
 			this.vbox2.Add (this.hbox1);
-			global::Gtk.Box.BoxChild w24 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.hbox1]));
+			global::Gtk.Box.BoxChild w24 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hbox1]));
 			w24.Position = 0;
 			w24.Expand = false;
 			w24.Fill = false;
@@ -167,7 +154,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.tree.Name = "tree";
 			this.scrolledwindow6.Add (this.tree);
 			this.hpaned1.Add (this.scrolledwindow6);
-			global::Gtk.Paned.PanedChild w26 = ((global::Gtk.Paned.PanedChild)(this.hpaned1[this.scrolledwindow6]));
+			global::Gtk.Paned.PanedChild w26 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.scrolledwindow6]));
 			w26.Resize = false;
 			// Container child hpaned1.Gtk.Paned+PanedChild
 			this.editorBox = new global::Gtk.ScrolledWindow ();
@@ -176,10 +163,10 @@ namespace MonoDevelop.AddinAuthoring
 			this.editorBox.HscrollbarPolicy = ((global::Gtk.PolicyType)(2));
 			this.hpaned1.Add (this.editorBox);
 			this.hbox4.Add (this.hpaned1);
-			global::Gtk.Box.BoxChild w28 = ((global::Gtk.Box.BoxChild)(this.hbox4[this.hpaned1]));
+			global::Gtk.Box.BoxChild w28 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.hpaned1]));
 			w28.Position = 0;
 			this.vbox2.Add (this.hbox4);
-			global::Gtk.Box.BoxChild w29 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.hbox4]));
+			global::Gtk.Box.BoxChild w29 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hbox4]));
 			w29.Position = 1;
 			this.Add (this.vbox2);
 			if ((this.Child != null)) {
diff --git a/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.ExtensionPointsEditorWidget.cs b/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.ExtensionPointsEditorWidget.cs
index bd60ece296..c3b60b4d51 100644
--- a/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.ExtensionPointsEditorWidget.cs
+++ b/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.ExtensionPointsEditorWidget.cs
@@ -5,19 +5,12 @@ namespace MonoDevelop.AddinAuthoring
 	public partial class ExtensionPointsEditorWidget
 	{
 		private global::Gtk.VBox vbox2;
-
 		private global::Gtk.HBox hbox1;
-
 		private global::Gtk.Button buttonNew;
-
 		private global::Gtk.Button buttonRemove;
-
 		private global::Gtk.Button buttonProperties;
-
 		private global::Gtk.HBox hbox4;
-
 		private global::Gtk.ScrolledWindow scrolledwindow6;
-
 		private global::Gtk.TreeView tree;
 
 		protected virtual void Build ()
@@ -42,7 +35,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.buttonNew.UseUnderline = true;
 			this.buttonNew.Relief = ((global::Gtk.ReliefStyle)(2));
 			// Container child buttonNew.Gtk.Container+ContainerChild
-			global::Gtk.Alignment w1 = new global::Gtk.Alignment (0.5f, 0.5f, 0f, 0f);
+			global::Gtk.Alignment w1 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
 			// Container child GtkAlignment.Gtk.Container+ContainerChild
 			global::Gtk.HBox w2 = new global::Gtk.HBox ();
 			w2.Spacing = 2;
@@ -58,7 +51,7 @@ namespace MonoDevelop.AddinAuthoring
 			w1.Add (w2);
 			this.buttonNew.Add (w1);
 			this.hbox1.Add (this.buttonNew);
-			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.buttonNew]));
+			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.buttonNew]));
 			w9.Position = 0;
 			w9.Expand = false;
 			w9.Fill = false;
@@ -71,7 +64,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.buttonRemove.Relief = ((global::Gtk.ReliefStyle)(2));
 			this.buttonRemove.Label = "gtk-delete";
 			this.hbox1.Add (this.buttonRemove);
-			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.buttonRemove]));
+			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.buttonRemove]));
 			w10.Position = 1;
 			w10.Expand = false;
 			w10.Fill = false;
@@ -82,7 +75,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.buttonProperties.UseUnderline = true;
 			this.buttonProperties.Relief = ((global::Gtk.ReliefStyle)(2));
 			// Container child buttonProperties.Gtk.Container+ContainerChild
-			global::Gtk.Alignment w11 = new global::Gtk.Alignment (0.5f, 0.5f, 0f, 0f);
+			global::Gtk.Alignment w11 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
 			// Container child GtkAlignment.Gtk.Container+ContainerChild
 			global::Gtk.HBox w12 = new global::Gtk.HBox ();
 			w12.Spacing = 2;
@@ -98,12 +91,12 @@ namespace MonoDevelop.AddinAuthoring
 			w11.Add (w12);
 			this.buttonProperties.Add (w11);
 			this.hbox1.Add (this.buttonProperties);
-			global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.buttonProperties]));
+			global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.buttonProperties]));
 			w19.Position = 2;
 			w19.Expand = false;
 			w19.Fill = false;
 			this.vbox2.Add (this.hbox1);
-			global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.hbox1]));
+			global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hbox1]));
 			w20.Position = 0;
 			w20.Expand = false;
 			w20.Fill = false;
@@ -123,10 +116,10 @@ namespace MonoDevelop.AddinAuthoring
 			this.tree.HeadersVisible = false;
 			this.scrolledwindow6.Add (this.tree);
 			this.hbox4.Add (this.scrolledwindow6);
-			global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(this.hbox4[this.scrolledwindow6]));
+			global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.scrolledwindow6]));
 			w22.Position = 0;
 			this.vbox2.Add (this.hbox4);
-			global::Gtk.Box.BoxChild w23 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.hbox4]));
+			global::Gtk.Box.BoxChild w23 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hbox4]));
 			w23.Position = 1;
 			this.Add (this.vbox2);
 			if ((this.Child != null)) {
diff --git a/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.ExtensionSelectorDialog.cs b/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.ExtensionSelectorDialog.cs
index 11a998b1ff..3851cfbfcb 100644
--- a/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.ExtensionSelectorDialog.cs
+++ b/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.ExtensionSelectorDialog.cs
@@ -5,15 +5,10 @@ namespace MonoDevelop.AddinAuthoring
 	public partial class ExtensionSelectorDialog
 	{
 		private global::Gtk.VBox vbox5;
-
 		private global::Gtk.Label label13;
-
 		private global::Gtk.ScrolledWindow scrolledwindow5;
-
 		private global::Gtk.TreeView tree;
-
 		private global::Gtk.Button button785;
-
 		private global::Gtk.Button button789;
 
 		protected virtual void Build ()
@@ -37,10 +32,10 @@ namespace MonoDevelop.AddinAuthoring
 			// Container child vbox5.Gtk.Box+BoxChild
 			this.label13 = new global::Gtk.Label ();
 			this.label13.Name = "label13";
-			this.label13.Xalign = 0f;
+			this.label13.Xalign = 0F;
 			this.label13.LabelProp = global::Mono.Addins.AddinManager.CurrentLocalizer.GetString ("Select the extension points to be extended:");
 			this.vbox5.Add (this.label13);
-			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.label13]));
+			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.label13]));
 			w2.Position = 0;
 			w2.Expand = false;
 			w2.Fill = false;
@@ -55,10 +50,10 @@ namespace MonoDevelop.AddinAuthoring
 			this.tree.Name = "tree";
 			this.scrolledwindow5.Add (this.tree);
 			this.vbox5.Add (this.scrolledwindow5);
-			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.scrolledwindow5]));
+			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.scrolledwindow5]));
 			w4.Position = 1;
 			w1.Add (this.vbox5);
-			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(w1[this.vbox5]));
+			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox5]));
 			w5.Position = 0;
 			// Internal child MonoDevelop.AddinAuthoring.ExtensionSelectorDialog.ActionArea
 			global::Gtk.HButtonBox w6 = this.ActionArea;
@@ -75,7 +70,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.button785.UseUnderline = true;
 			this.button785.Label = "gtk-cancel";
 			this.AddActionWidget (this.button785, -6);
-			global::Gtk.ButtonBox.ButtonBoxChild w7 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w6[this.button785]));
+			global::Gtk.ButtonBox.ButtonBoxChild w7 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w6 [this.button785]));
 			w7.Expand = false;
 			w7.Fill = false;
 			// Container child MonoDevelop.AddinAuthoring.ExtensionSelectorDialog_ActionArea.Gtk.ButtonBox+ButtonBoxChild
@@ -87,7 +82,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.button789.UseUnderline = true;
 			this.button789.Label = "gtk-ok";
 			this.AddActionWidget (this.button789, -5);
-			global::Gtk.ButtonBox.ButtonBoxChild w8 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w6[this.button789]));
+			global::Gtk.ButtonBox.ButtonBoxChild w8 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w6 [this.button789]));
 			w8.Position = 1;
 			w8.Expand = false;
 			w8.Fill = false;
diff --git a/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.NewExtensionPointDialog.cs b/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.NewExtensionPointDialog.cs
index 1787f67870..70597a0b3f 100644
--- a/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.NewExtensionPointDialog.cs
+++ b/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.NewExtensionPointDialog.cs
@@ -5,57 +5,31 @@ namespace MonoDevelop.AddinAuthoring
 	public partial class NewExtensionPointDialog
 	{
 		private global::Gtk.VBox vbox2;
-
 		private global::Gtk.Table table2;
-
 		private global::Gtk.Entry entryDesc;
-
 		private global::Gtk.Entry entryName;
-
 		private global::Gtk.Entry entryPath;
-
 		private global::Gtk.Label label6;
-
 		private global::Gtk.Label label7;
-
 		private global::Gtk.Label label8;
-
 		private global::Gtk.VBox vbox3;
-
 		private global::Gtk.Label label2;
-
 		private global::Gtk.HBox hbox2;
-
 		private global::Gtk.RadioButton radioTypeExtension;
-
 		private global::Gtk.RadioButton radioCustomExtension;
-
 		private global::Gtk.HSeparator hseparator2;
-
 		private global::Gtk.Notebook notebook;
-
 		private global::Gtk.Table table1;
-
 		private global::MonoDevelop.AddinAuthoring.TypeSelector baseTypeSelector;
-
 		private global::Gtk.Entry entryNodeDescription;
-
 		private global::Gtk.Entry entryNodeName;
-
 		private global::Gtk.Label label3;
-
 		private global::Gtk.Label label4;
-
 		private global::Gtk.Label label5;
-
 		private global::Gtk.Label label9;
-
 		private global::MonoDevelop.AddinAuthoring.NodeSetEditorWidget nodeseteditorwidget;
-
 		private global::Gtk.Label label10;
-
 		private global::Gtk.Button buttonCancel;
-
 		private global::Gtk.Button buttonOk;
 
 		protected virtual void Build ()
@@ -86,7 +60,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.entryDesc.IsEditable = true;
 			this.entryDesc.InvisibleChar = '●';
 			this.table2.Add (this.entryDesc);
-			global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table2[this.entryDesc]));
+			global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table2 [this.entryDesc]));
 			w2.TopAttach = ((uint)(2));
 			w2.BottomAttach = ((uint)(3));
 			w2.LeftAttach = ((uint)(1));
@@ -99,7 +73,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.entryName.IsEditable = true;
 			this.entryName.InvisibleChar = '●';
 			this.table2.Add (this.entryName);
-			global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table2[this.entryName]));
+			global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table2 [this.entryName]));
 			w3.TopAttach = ((uint)(1));
 			w3.BottomAttach = ((uint)(2));
 			w3.LeftAttach = ((uint)(1));
@@ -112,17 +86,17 @@ namespace MonoDevelop.AddinAuthoring
 			this.entryPath.IsEditable = true;
 			this.entryPath.InvisibleChar = '●';
 			this.table2.Add (this.entryPath);
-			global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table2[this.entryPath]));
+			global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table2 [this.entryPath]));
 			w4.LeftAttach = ((uint)(1));
 			w4.RightAttach = ((uint)(2));
 			w4.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table2.Gtk.Table+TableChild
 			this.label6 = new global::Gtk.Label ();
 			this.label6.Name = "label6";
-			this.label6.Xalign = 0f;
+			this.label6.Xalign = 0F;
 			this.label6.LabelProp = global::Mono.Addins.AddinManager.CurrentLocalizer.GetString ("Description:");
 			this.table2.Add (this.label6);
-			global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table2[this.label6]));
+			global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table2 [this.label6]));
 			w5.TopAttach = ((uint)(2));
 			w5.BottomAttach = ((uint)(3));
 			w5.XOptions = ((global::Gtk.AttachOptions)(4));
@@ -130,25 +104,25 @@ namespace MonoDevelop.AddinAuthoring
 			// Container child table2.Gtk.Table+TableChild
 			this.label7 = new global::Gtk.Label ();
 			this.label7.Name = "label7";
-			this.label7.Xalign = 0f;
+			this.label7.Xalign = 0F;
 			this.label7.LabelProp = global::Mono.Addins.AddinManager.CurrentLocalizer.GetString ("Extension path:");
 			this.table2.Add (this.label7);
-			global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table2[this.label7]));
+			global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table2 [this.label7]));
 			w6.XOptions = ((global::Gtk.AttachOptions)(4));
 			w6.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table2.Gtk.Table+TableChild
 			this.label8 = new global::Gtk.Label ();
 			this.label8.Name = "label8";
-			this.label8.Xalign = 0f;
+			this.label8.Xalign = 0F;
 			this.label8.LabelProp = global::Mono.Addins.AddinManager.CurrentLocalizer.GetString ("Name:");
 			this.table2.Add (this.label8);
-			global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table2[this.label8]));
+			global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table2 [this.label8]));
 			w7.TopAttach = ((uint)(1));
 			w7.BottomAttach = ((uint)(2));
 			w7.XOptions = ((global::Gtk.AttachOptions)(4));
 			w7.YOptions = ((global::Gtk.AttachOptions)(4));
 			this.vbox2.Add (this.table2);
-			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.table2]));
+			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.table2]));
 			w8.Position = 0;
 			w8.Expand = false;
 			w8.Fill = false;
@@ -159,10 +133,10 @@ namespace MonoDevelop.AddinAuthoring
 			// Container child vbox3.Gtk.Box+BoxChild
 			this.label2 = new global::Gtk.Label ();
 			this.label2.Name = "label2";
-			this.label2.Xalign = 0f;
+			this.label2.Xalign = 0F;
 			this.label2.LabelProp = global::Mono.Addins.AddinManager.CurrentLocalizer.GetString ("Select the kind of extension point to create:");
 			this.vbox3.Add (this.label2);
-			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.label2]));
+			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.label2]));
 			w9.Position = 0;
 			w9.Expand = false;
 			w9.Fill = false;
@@ -178,7 +152,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.radioTypeExtension.UseUnderline = true;
 			this.radioTypeExtension.Group = new global::GLib.SList (global::System.IntPtr.Zero);
 			this.hbox2.Add (this.radioTypeExtension);
-			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.radioTypeExtension]));
+			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.radioTypeExtension]));
 			w10.Position = 0;
 			w10.Expand = false;
 			w10.Fill = false;
@@ -190,15 +164,15 @@ namespace MonoDevelop.AddinAuthoring
 			this.radioCustomExtension.UseUnderline = true;
 			this.radioCustomExtension.Group = this.radioTypeExtension.Group;
 			this.hbox2.Add (this.radioCustomExtension);
-			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.radioCustomExtension]));
+			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.radioCustomExtension]));
 			w11.Position = 1;
 			this.vbox3.Add (this.hbox2);
-			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.hbox2]));
+			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.hbox2]));
 			w12.Position = 1;
 			w12.Expand = false;
 			w12.Fill = false;
 			this.vbox2.Add (this.vbox3);
-			global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.vbox3]));
+			global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.vbox3]));
 			w13.Position = 1;
 			w13.Expand = false;
 			w13.Fill = false;
@@ -206,7 +180,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.hseparator2 = new global::Gtk.HSeparator ();
 			this.hseparator2.Name = "hseparator2";
 			this.vbox2.Add (this.hseparator2);
-			global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.hseparator2]));
+			global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hseparator2]));
 			w14.Position = 2;
 			w14.Expand = false;
 			w14.Fill = false;
@@ -223,13 +197,9 @@ namespace MonoDevelop.AddinAuthoring
 			this.table1.RowSpacing = ((uint)(6));
 			this.table1.ColumnSpacing = ((uint)(6));
 			// Container child table1.Gtk.Table+TableChild
-			this.baseTypeSelector = new global::MonoDevelop.AddinAuthoring.TypeSelector ();
-			this.baseTypeSelector.Events = ((global::Gdk.EventMask)(256));
-			this.baseTypeSelector.Name = "baseTypeSelector";
-			this.baseTypeSelector.AllowCreate = false;
-			this.baseTypeSelector.AllowCreateInterface = false;
+			this.baseTypeSelector = null;
 			this.table1.Add (this.baseTypeSelector);
-			global::Gtk.Table.TableChild w15 = ((global::Gtk.Table.TableChild)(this.table1[this.baseTypeSelector]));
+			global::Gtk.Table.TableChild w15 = ((global::Gtk.Table.TableChild)(this.table1 [this.baseTypeSelector]));
 			w15.TopAttach = ((uint)(1));
 			w15.BottomAttach = ((uint)(2));
 			w15.LeftAttach = ((uint)(1));
@@ -242,7 +212,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.entryNodeDescription.IsEditable = true;
 			this.entryNodeDescription.InvisibleChar = '●';
 			this.table1.Add (this.entryNodeDescription);
-			global::Gtk.Table.TableChild w16 = ((global::Gtk.Table.TableChild)(this.table1[this.entryNodeDescription]));
+			global::Gtk.Table.TableChild w16 = ((global::Gtk.Table.TableChild)(this.table1 [this.entryNodeDescription]));
 			w16.TopAttach = ((uint)(2));
 			w16.BottomAttach = ((uint)(3));
 			w16.LeftAttach = ((uint)(1));
@@ -255,26 +225,26 @@ namespace MonoDevelop.AddinAuthoring
 			this.entryNodeName.IsEditable = true;
 			this.entryNodeName.InvisibleChar = '●';
 			this.table1.Add (this.entryNodeName);
-			global::Gtk.Table.TableChild w17 = ((global::Gtk.Table.TableChild)(this.table1[this.entryNodeName]));
+			global::Gtk.Table.TableChild w17 = ((global::Gtk.Table.TableChild)(this.table1 [this.entryNodeName]));
 			w17.LeftAttach = ((uint)(1));
 			w17.RightAttach = ((uint)(2));
 			w17.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
 			this.label3 = new global::Gtk.Label ();
 			this.label3.Name = "label3";
-			this.label3.Xalign = 0f;
+			this.label3.Xalign = 0F;
 			this.label3.LabelProp = global::Mono.Addins.AddinManager.CurrentLocalizer.GetString ("Node name:");
 			this.table1.Add (this.label3);
-			global::Gtk.Table.TableChild w18 = ((global::Gtk.Table.TableChild)(this.table1[this.label3]));
+			global::Gtk.Table.TableChild w18 = ((global::Gtk.Table.TableChild)(this.table1 [this.label3]));
 			w18.XOptions = ((global::Gtk.AttachOptions)(4));
 			w18.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
 			this.label4 = new global::Gtk.Label ();
 			this.label4.Name = "label4";
-			this.label4.Xalign = 0f;
+			this.label4.Xalign = 0F;
 			this.label4.LabelProp = global::Mono.Addins.AddinManager.CurrentLocalizer.GetString ("Description:");
 			this.table1.Add (this.label4);
-			global::Gtk.Table.TableChild w19 = ((global::Gtk.Table.TableChild)(this.table1[this.label4]));
+			global::Gtk.Table.TableChild w19 = ((global::Gtk.Table.TableChild)(this.table1 [this.label4]));
 			w19.TopAttach = ((uint)(2));
 			w19.BottomAttach = ((uint)(3));
 			w19.XOptions = ((global::Gtk.AttachOptions)(4));
@@ -282,10 +252,10 @@ namespace MonoDevelop.AddinAuthoring
 			// Container child table1.Gtk.Table+TableChild
 			this.label5 = new global::Gtk.Label ();
 			this.label5.Name = "label5";
-			this.label5.Xalign = 0f;
+			this.label5.Xalign = 0F;
 			this.label5.LabelProp = global::Mono.Addins.AddinManager.CurrentLocalizer.GetString ("Base type:");
 			this.table1.Add (this.label5);
-			global::Gtk.Table.TableChild w20 = ((global::Gtk.Table.TableChild)(this.table1[this.label5]));
+			global::Gtk.Table.TableChild w20 = ((global::Gtk.Table.TableChild)(this.table1 [this.label5]));
 			w20.TopAttach = ((uint)(1));
 			w20.BottomAttach = ((uint)(2));
 			w20.XOptions = ((global::Gtk.AttachOptions)(4));
@@ -298,12 +268,9 @@ namespace MonoDevelop.AddinAuthoring
 			this.notebook.SetTabLabel (this.table1, this.label9);
 			this.label9.ShowAll ();
 			// Container child notebook.Gtk.Notebook+NotebookChild
-			this.nodeseteditorwidget = new global::MonoDevelop.AddinAuthoring.NodeSetEditorWidget ();
-			this.nodeseteditorwidget.Events = ((global::Gdk.EventMask)(256));
-			this.nodeseteditorwidget.Name = "nodeseteditorwidget";
-			this.nodeseteditorwidget.AllowEditing = true;
+			this.nodeseteditorwidget = null;
 			this.notebook.Add (this.nodeseteditorwidget);
-			global::Gtk.Notebook.NotebookChild w22 = ((global::Gtk.Notebook.NotebookChild)(this.notebook[this.nodeseteditorwidget]));
+			global::Gtk.Notebook.NotebookChild w22 = ((global::Gtk.Notebook.NotebookChild)(this.notebook [this.nodeseteditorwidget]));
 			w22.Position = 1;
 			// Notebook tab
 			this.label10 = new global::Gtk.Label ();
@@ -312,10 +279,10 @@ namespace MonoDevelop.AddinAuthoring
 			this.notebook.SetTabLabel (this.nodeseteditorwidget, this.label10);
 			this.label10.ShowAll ();
 			this.vbox2.Add (this.notebook);
-			global::Gtk.Box.BoxChild w23 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.notebook]));
+			global::Gtk.Box.BoxChild w23 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.notebook]));
 			w23.Position = 3;
 			w1.Add (this.vbox2);
-			global::Gtk.Box.BoxChild w24 = ((global::Gtk.Box.BoxChild)(w1[this.vbox2]));
+			global::Gtk.Box.BoxChild w24 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox2]));
 			w24.Position = 0;
 			// Internal child MonoDevelop.AddinAuthoring.NewExtensionPointDialog.ActionArea
 			global::Gtk.HButtonBox w25 = this.ActionArea;
@@ -332,7 +299,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.buttonCancel.UseUnderline = true;
 			this.buttonCancel.Label = "gtk-cancel";
 			this.AddActionWidget (this.buttonCancel, -6);
-			global::Gtk.ButtonBox.ButtonBoxChild w26 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w25[this.buttonCancel]));
+			global::Gtk.ButtonBox.ButtonBoxChild w26 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w25 [this.buttonCancel]));
 			w26.Expand = false;
 			w26.Fill = false;
 			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
@@ -344,7 +311,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.buttonOk.UseUnderline = true;
 			this.buttonOk.Label = "gtk-ok";
 			this.AddActionWidget (this.buttonOk, -5);
-			global::Gtk.ButtonBox.ButtonBoxChild w27 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w25[this.buttonOk]));
+			global::Gtk.ButtonBox.ButtonBoxChild w27 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w25 [this.buttonOk]));
 			w27.Position = 1;
 			w27.Expand = false;
 			w27.Fill = false;
diff --git a/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.NewRegistryDialog.cs b/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.NewRegistryDialog.cs
index 049d12786d..a1631e19e8 100644
--- a/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.NewRegistryDialog.cs
+++ b/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.NewRegistryDialog.cs
@@ -5,17 +5,11 @@ namespace MonoDevelop.AddinAuthoring
 	public partial class NewRegistryDialog
 	{
 		private global::Gtk.Table table1;
-
 		private global::Gtk.Entry entryName;
-
 		private global::MonoDevelop.Components.FolderEntry entryRegPath;
-
 		private global::Gtk.Label label1;
-
 		private global::Gtk.Label label2;
-
 		private global::Gtk.Button buttonCancel;
-
 		private global::Gtk.Button buttonOk;
 
 		protected virtual void Build ()
@@ -44,15 +38,14 @@ namespace MonoDevelop.AddinAuthoring
 			this.entryName.IsEditable = true;
 			this.entryName.InvisibleChar = '●';
 			this.table1.Add (this.entryName);
-			global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table1[this.entryName]));
+			global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table1 [this.entryName]));
 			w2.LeftAttach = ((uint)(1));
 			w2.RightAttach = ((uint)(2));
 			w2.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
-			this.entryRegPath = new global::MonoDevelop.Components.FolderEntry ();
-			this.entryRegPath.Name = "entryRegPath";
+			this.entryRegPath = null;
 			this.table1.Add (this.entryRegPath);
-			global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1[this.entryRegPath]));
+			global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1 [this.entryRegPath]));
 			w3.TopAttach = ((uint)(1));
 			w3.BottomAttach = ((uint)(2));
 			w3.LeftAttach = ((uint)(1));
@@ -62,25 +55,25 @@ namespace MonoDevelop.AddinAuthoring
 			// Container child table1.Gtk.Table+TableChild
 			this.label1 = new global::Gtk.Label ();
 			this.label1.Name = "label1";
-			this.label1.Xalign = 0f;
+			this.label1.Xalign = 0F;
 			this.label1.LabelProp = global::Mono.Addins.AddinManager.CurrentLocalizer.GetString ("Application Name:");
 			this.table1.Add (this.label1);
-			global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table1[this.label1]));
+			global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table1 [this.label1]));
 			w4.XOptions = ((global::Gtk.AttachOptions)(4));
 			w4.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
 			this.label2 = new global::Gtk.Label ();
 			this.label2.Name = "label2";
-			this.label2.Xalign = 0f;
+			this.label2.Xalign = 0F;
 			this.label2.LabelProp = global::Mono.Addins.AddinManager.CurrentLocalizer.GetString ("Registry Path:");
 			this.table1.Add (this.label2);
-			global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table1[this.label2]));
+			global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table1 [this.label2]));
 			w5.TopAttach = ((uint)(1));
 			w5.BottomAttach = ((uint)(2));
 			w5.XOptions = ((global::Gtk.AttachOptions)(4));
 			w5.YOptions = ((global::Gtk.AttachOptions)(4));
 			w1.Add (this.table1);
-			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(w1[this.table1]));
+			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(w1 [this.table1]));
 			w6.Position = 0;
 			w6.Expand = false;
 			w6.Fill = false;
@@ -99,7 +92,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.buttonCancel.UseUnderline = true;
 			this.buttonCancel.Label = "gtk-cancel";
 			this.AddActionWidget (this.buttonCancel, -6);
-			global::Gtk.ButtonBox.ButtonBoxChild w8 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w7[this.buttonCancel]));
+			global::Gtk.ButtonBox.ButtonBoxChild w8 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w7 [this.buttonCancel]));
 			w8.Expand = false;
 			w8.Fill = false;
 			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
@@ -111,7 +104,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.buttonOk.UseUnderline = true;
 			this.buttonOk.Label = "gtk-ok";
 			this.AddActionWidget (this.buttonOk, -5);
-			global::Gtk.ButtonBox.ButtonBoxChild w9 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w7[this.buttonOk]));
+			global::Gtk.ButtonBox.ButtonBoxChild w9 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w7 [this.buttonOk]));
 			w9.Position = 1;
 			w9.Expand = false;
 			w9.Fill = false;
diff --git a/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.NodeSetEditorDialog.cs b/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.NodeSetEditorDialog.cs
index 1794acef9a..d821c363dc 100644
--- a/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.NodeSetEditorDialog.cs
+++ b/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.NodeSetEditorDialog.cs
@@ -5,7 +5,6 @@ namespace MonoDevelop.AddinAuthoring
 	public partial class NodeSetEditorDialog
 	{
 		private global::Gtk.Button buttonCancel;
-
 		private global::Gtk.Button buttonOk;
 
 		protected virtual void Build ()
@@ -33,7 +32,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.buttonCancel.UseUnderline = true;
 			this.buttonCancel.Label = "gtk-cancel";
 			this.AddActionWidget (this.buttonCancel, -6);
-			global::Gtk.ButtonBox.ButtonBoxChild w3 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w2[this.buttonCancel]));
+			global::Gtk.ButtonBox.ButtonBoxChild w3 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w2 [this.buttonCancel]));
 			w3.Expand = false;
 			w3.Fill = false;
 			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
@@ -45,7 +44,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.buttonOk.UseUnderline = true;
 			this.buttonOk.Label = "gtk-ok";
 			this.AddActionWidget (this.buttonOk, -5);
-			global::Gtk.ButtonBox.ButtonBoxChild w4 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w2[this.buttonOk]));
+			global::Gtk.ButtonBox.ButtonBoxChild w4 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w2 [this.buttonOk]));
 			w4.Position = 1;
 			w4.Expand = false;
 			w4.Fill = false;
diff --git a/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.NodeSetEditorWidget.cs b/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.NodeSetEditorWidget.cs
index 42d5622210..b6c63ad7fd 100644
--- a/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.NodeSetEditorWidget.cs
+++ b/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.NodeSetEditorWidget.cs
@@ -5,19 +5,12 @@ namespace MonoDevelop.AddinAuthoring
 	public partial class NodeSetEditorWidget
 	{
 		private global::Gtk.HBox hbox4;
-
 		private global::Gtk.ScrolledWindow GtkScrolledWindow;
-
 		private global::Gtk.TreeView tree;
-
 		private global::Gtk.VBox buttonBox;
-
 		private global::Gtk.Button addNodeButton;
-
 		private global::Gtk.Button addSetButton;
-
 		private global::Gtk.Button removeNodeButton;
-
 		private global::Gtk.Button editNodeButton;
 
 		protected virtual void Build ()
@@ -40,7 +33,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.tree.Name = "tree";
 			this.GtkScrolledWindow.Add (this.tree);
 			this.hbox4.Add (this.GtkScrolledWindow);
-			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox4[this.GtkScrolledWindow]));
+			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.GtkScrolledWindow]));
 			w2.Position = 0;
 			// Container child hbox4.Gtk.Box+BoxChild
 			this.buttonBox = new global::Gtk.VBox ();
@@ -52,7 +45,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.addNodeButton.Name = "addNodeButton";
 			this.addNodeButton.UseUnderline = true;
 			// Container child addNodeButton.Gtk.Container+ContainerChild
-			global::Gtk.Alignment w3 = new global::Gtk.Alignment (0.5f, 0.5f, 0f, 0f);
+			global::Gtk.Alignment w3 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
 			// Container child GtkAlignment.Gtk.Container+ContainerChild
 			global::Gtk.HBox w4 = new global::Gtk.HBox ();
 			w4.Spacing = 2;
@@ -68,7 +61,7 @@ namespace MonoDevelop.AddinAuthoring
 			w3.Add (w4);
 			this.addNodeButton.Add (w3);
 			this.buttonBox.Add (this.addNodeButton);
-			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.buttonBox[this.addNodeButton]));
+			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.buttonBox [this.addNodeButton]));
 			w11.Position = 0;
 			w11.Expand = false;
 			w11.Fill = false;
@@ -78,7 +71,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.addSetButton.Name = "addSetButton";
 			this.addSetButton.UseUnderline = true;
 			// Container child addSetButton.Gtk.Container+ContainerChild
-			global::Gtk.Alignment w12 = new global::Gtk.Alignment (0.5f, 0.5f, 0f, 0f);
+			global::Gtk.Alignment w12 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
 			// Container child GtkAlignment.Gtk.Container+ContainerChild
 			global::Gtk.HBox w13 = new global::Gtk.HBox ();
 			w13.Spacing = 2;
@@ -94,7 +87,7 @@ namespace MonoDevelop.AddinAuthoring
 			w12.Add (w13);
 			this.addSetButton.Add (w12);
 			this.buttonBox.Add (this.addSetButton);
-			global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.buttonBox[this.addSetButton]));
+			global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.buttonBox [this.addSetButton]));
 			w20.Position = 1;
 			w20.Expand = false;
 			w20.Fill = false;
@@ -106,7 +99,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.removeNodeButton.UseUnderline = true;
 			this.removeNodeButton.Label = "gtk-remove";
 			this.buttonBox.Add (this.removeNodeButton);
-			global::Gtk.Box.BoxChild w21 = ((global::Gtk.Box.BoxChild)(this.buttonBox[this.removeNodeButton]));
+			global::Gtk.Box.BoxChild w21 = ((global::Gtk.Box.BoxChild)(this.buttonBox [this.removeNodeButton]));
 			w21.Position = 2;
 			w21.Expand = false;
 			w21.Fill = false;
@@ -118,12 +111,12 @@ namespace MonoDevelop.AddinAuthoring
 			this.editNodeButton.UseUnderline = true;
 			this.editNodeButton.Label = "gtk-edit";
 			this.buttonBox.Add (this.editNodeButton);
-			global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(this.buttonBox[this.editNodeButton]));
+			global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(this.buttonBox [this.editNodeButton]));
 			w22.Position = 3;
 			w22.Expand = false;
 			w22.Fill = false;
 			this.hbox4.Add (this.buttonBox);
-			global::Gtk.Box.BoxChild w23 = ((global::Gtk.Box.BoxChild)(this.hbox4[this.buttonBox]));
+			global::Gtk.Box.BoxChild w23 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.buttonBox]));
 			w23.Position = 1;
 			w23.Expand = false;
 			w23.Fill = false;
diff --git a/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.NodeTypeEditorDialog.cs b/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.NodeTypeEditorDialog.cs
index 5e06cf4ea4..c3e8309757 100644
--- a/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.NodeTypeEditorDialog.cs
+++ b/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.NodeTypeEditorDialog.cs
@@ -5,25 +5,15 @@ namespace MonoDevelop.AddinAuthoring
 	public partial class NodeTypeEditorDialog
 	{
 		private global::Gtk.Table table1;
-
 		private global::MonoDevelop.AddinAuthoring.TypeSelector baseType;
-
 		private global::Gtk.Entry entryDesc;
-
 		private global::Gtk.Entry entryName;
-
 		private global::Gtk.Label label3;
-
 		private global::Gtk.Label label4;
-
 		private global::Gtk.Label label5;
-
 		private global::Gtk.Label label6;
-
 		private global::MonoDevelop.AddinAuthoring.TypeSelector nodeType;
-
 		private global::Gtk.Button buttonCancel;
-
 		private global::Gtk.Button buttonOk;
 
 		protected virtual void Build ()
@@ -45,13 +35,9 @@ namespace MonoDevelop.AddinAuthoring
 			this.table1.ColumnSpacing = ((uint)(6));
 			this.table1.BorderWidth = ((uint)(9));
 			// Container child table1.Gtk.Table+TableChild
-			this.baseType = new global::MonoDevelop.AddinAuthoring.TypeSelector ();
-			this.baseType.Events = ((global::Gdk.EventMask)(256));
-			this.baseType.Name = "baseType";
-			this.baseType.AllowCreate = false;
-			this.baseType.AllowCreateInterface = false;
+			this.baseType = null;
 			this.table1.Add (this.baseType);
-			global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table1[this.baseType]));
+			global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table1 [this.baseType]));
 			w2.TopAttach = ((uint)(2));
 			w2.BottomAttach = ((uint)(3));
 			w2.LeftAttach = ((uint)(1));
@@ -64,7 +50,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.entryDesc.IsEditable = true;
 			this.entryDesc.InvisibleChar = '●';
 			this.table1.Add (this.entryDesc);
-			global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1[this.entryDesc]));
+			global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1 [this.entryDesc]));
 			w3.TopAttach = ((uint)(3));
 			w3.BottomAttach = ((uint)(4));
 			w3.LeftAttach = ((uint)(1));
@@ -77,7 +63,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.entryName.IsEditable = true;
 			this.entryName.InvisibleChar = '●';
 			this.table1.Add (this.entryName);
-			global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table1[this.entryName]));
+			global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table1 [this.entryName]));
 			w4.TopAttach = ((uint)(1));
 			w4.BottomAttach = ((uint)(2));
 			w4.LeftAttach = ((uint)(1));
@@ -86,19 +72,19 @@ namespace MonoDevelop.AddinAuthoring
 			// Container child table1.Gtk.Table+TableChild
 			this.label3 = new global::Gtk.Label ();
 			this.label3.Name = "label3";
-			this.label3.Xalign = 0f;
+			this.label3.Xalign = 0F;
 			this.label3.LabelProp = global::Mono.Addins.AddinManager.CurrentLocalizer.GetString ("Node type:");
 			this.table1.Add (this.label3);
-			global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table1[this.label3]));
+			global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table1 [this.label3]));
 			w5.XOptions = ((global::Gtk.AttachOptions)(4));
 			w5.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
 			this.label4 = new global::Gtk.Label ();
 			this.label4.Name = "label4";
-			this.label4.Xalign = 0f;
+			this.label4.Xalign = 0F;
 			this.label4.LabelProp = global::Mono.Addins.AddinManager.CurrentLocalizer.GetString ("Description:");
 			this.table1.Add (this.label4);
-			global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table1[this.label4]));
+			global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table1 [this.label4]));
 			w6.TopAttach = ((uint)(3));
 			w6.BottomAttach = ((uint)(4));
 			w6.XOptions = ((global::Gtk.AttachOptions)(4));
@@ -106,10 +92,10 @@ namespace MonoDevelop.AddinAuthoring
 			// Container child table1.Gtk.Table+TableChild
 			this.label5 = new global::Gtk.Label ();
 			this.label5.Name = "label5";
-			this.label5.Xalign = 0f;
+			this.label5.Xalign = 0F;
 			this.label5.LabelProp = global::Mono.Addins.AddinManager.CurrentLocalizer.GetString ("Base type:");
 			this.table1.Add (this.label5);
-			global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table1[this.label5]));
+			global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table1 [this.label5]));
 			w7.TopAttach = ((uint)(2));
 			w7.BottomAttach = ((uint)(3));
 			w7.XOptions = ((global::Gtk.AttachOptions)(4));
@@ -117,28 +103,24 @@ namespace MonoDevelop.AddinAuthoring
 			// Container child table1.Gtk.Table+TableChild
 			this.label6 = new global::Gtk.Label ();
 			this.label6.Name = "label6";
-			this.label6.Xalign = 0f;
+			this.label6.Xalign = 0F;
 			this.label6.LabelProp = global::Mono.Addins.AddinManager.CurrentLocalizer.GetString ("Node name:");
 			this.table1.Add (this.label6);
-			global::Gtk.Table.TableChild w8 = ((global::Gtk.Table.TableChild)(this.table1[this.label6]));
+			global::Gtk.Table.TableChild w8 = ((global::Gtk.Table.TableChild)(this.table1 [this.label6]));
 			w8.TopAttach = ((uint)(1));
 			w8.BottomAttach = ((uint)(2));
 			w8.XOptions = ((global::Gtk.AttachOptions)(4));
 			w8.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
-			this.nodeType = new global::MonoDevelop.AddinAuthoring.TypeSelector ();
-			this.nodeType.Events = ((global::Gdk.EventMask)(256));
-			this.nodeType.Name = "nodeType";
-			this.nodeType.AllowCreate = false;
-			this.nodeType.AllowCreateInterface = false;
+			this.nodeType = null;
 			this.table1.Add (this.nodeType);
-			global::Gtk.Table.TableChild w9 = ((global::Gtk.Table.TableChild)(this.table1[this.nodeType]));
+			global::Gtk.Table.TableChild w9 = ((global::Gtk.Table.TableChild)(this.table1 [this.nodeType]));
 			w9.LeftAttach = ((uint)(1));
 			w9.RightAttach = ((uint)(2));
 			w9.XOptions = ((global::Gtk.AttachOptions)(4));
 			w9.YOptions = ((global::Gtk.AttachOptions)(4));
 			w1.Add (this.table1);
-			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(w1[this.table1]));
+			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(w1 [this.table1]));
 			w10.Position = 0;
 			w10.Expand = false;
 			w10.Fill = false;
@@ -157,7 +139,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.buttonCancel.UseUnderline = true;
 			this.buttonCancel.Label = "gtk-cancel";
 			this.AddActionWidget (this.buttonCancel, -6);
-			global::Gtk.ButtonBox.ButtonBoxChild w12 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w11[this.buttonCancel]));
+			global::Gtk.ButtonBox.ButtonBoxChild w12 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w11 [this.buttonCancel]));
 			w12.Expand = false;
 			w12.Fill = false;
 			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
@@ -169,7 +151,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.buttonOk.UseUnderline = true;
 			this.buttonOk.Label = "gtk-ok";
 			this.AddActionWidget (this.buttonOk, -5);
-			global::Gtk.ButtonBox.ButtonBoxChild w13 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w11[this.buttonOk]));
+			global::Gtk.ButtonBox.ButtonBoxChild w13 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w11 [this.buttonOk]));
 			w13.Position = 1;
 			w13.Expand = false;
 			w13.Fill = false;
@@ -179,7 +161,6 @@ namespace MonoDevelop.AddinAuthoring
 			this.DefaultWidth = 543;
 			this.DefaultHeight = 251;
 			this.Show ();
-			this.nodeType.Changed += new global::System.EventHandler (this.OnNodeTypeChanged);
 			this.entryName.Changed += new global::System.EventHandler (this.OnEntryNameChanged);
 			this.buttonOk.Clicked += new global::System.EventHandler (this.OnButtonOkClicked);
 		}
diff --git a/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.RegistrySelector.cs b/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.RegistrySelector.cs
index 872f96bc65..15031491ee 100644
--- a/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.RegistrySelector.cs
+++ b/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.RegistrySelector.cs
@@ -5,13 +5,9 @@ namespace MonoDevelop.AddinAuthoring
 	public partial class RegistrySelector
 	{
 		private global::Gtk.Button buttonBrowse;
-
 		private global::Gtk.HBox hbox2;
-
 		private global::Gtk.Label label;
-
 		private global::Gtk.VSeparator vseparator1;
-
 		private global::Gtk.Image image131;
 
 		protected virtual void Build ()
@@ -31,16 +27,16 @@ namespace MonoDevelop.AddinAuthoring
 			// Container child hbox2.Gtk.Box+BoxChild
 			this.label = new global::Gtk.Label ();
 			this.label.Name = "label";
-			this.label.Xalign = 0f;
+			this.label.Xalign = 0F;
 			this.label.Ellipsize = ((global::Pango.EllipsizeMode)(3));
 			this.hbox2.Add (this.label);
-			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.label]));
+			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.label]));
 			w1.Position = 0;
 			// Container child hbox2.Gtk.Box+BoxChild
 			this.vseparator1 = new global::Gtk.VSeparator ();
 			this.vseparator1.Name = "vseparator1";
 			this.hbox2.Add (this.vseparator1);
-			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.vseparator1]));
+			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.vseparator1]));
 			w2.Position = 1;
 			w2.Expand = false;
 			w2.Fill = false;
@@ -49,7 +45,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.image131.Name = "image131";
 			this.image131.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-open", global::Gtk.IconSize.Menu);
 			this.hbox2.Add (this.image131);
-			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.image131]));
+			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.image131]));
 			w3.Position = 2;
 			w3.Expand = false;
 			w3.Fill = false;
diff --git a/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.SelectNodeSetDialog.cs b/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.SelectNodeSetDialog.cs
index ece93a3f8c..a575733b06 100644
--- a/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.SelectNodeSetDialog.cs
+++ b/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.SelectNodeSetDialog.cs
@@ -5,17 +5,11 @@ namespace MonoDevelop.AddinAuthoring
 	public partial class SelectNodeSetDialog
 	{
 		private global::Gtk.VBox vbox3;
-
 		private global::Gtk.HBox hbox1;
-
 		private global::Gtk.Label label1;
-
 		private global::Gtk.ComboBoxEntry combo;
-
 		private global::MonoDevelop.AddinAuthoring.NodeSetEditorWidget nodeseteditor;
-
 		private global::Gtk.Button buttonCancel;
-
 		private global::Gtk.Button buttonOk;
 
 		protected virtual void Build ()
@@ -42,10 +36,10 @@ namespace MonoDevelop.AddinAuthoring
 			// Container child hbox1.Gtk.Box+BoxChild
 			this.label1 = new global::Gtk.Label ();
 			this.label1.Name = "label1";
-			this.label1.Xalign = 0f;
+			this.label1.Xalign = 0F;
 			this.label1.LabelProp = global::Mono.Addins.AddinManager.CurrentLocalizer.GetString ("Node Set:");
 			this.hbox1.Add (this.label1);
-			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.label1]));
+			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.label1]));
 			w2.Position = 0;
 			w2.Expand = false;
 			w2.Fill = false;
@@ -53,23 +47,20 @@ namespace MonoDevelop.AddinAuthoring
 			this.combo = global::Gtk.ComboBoxEntry.NewText ();
 			this.combo.Name = "combo";
 			this.hbox1.Add (this.combo);
-			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.combo]));
+			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.combo]));
 			w3.Position = 1;
 			this.vbox3.Add (this.hbox1);
-			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.hbox1]));
+			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.hbox1]));
 			w4.Position = 0;
 			w4.Expand = false;
 			w4.Fill = false;
 			// Container child vbox3.Gtk.Box+BoxChild
-			this.nodeseteditor = new global::MonoDevelop.AddinAuthoring.NodeSetEditorWidget ();
-			this.nodeseteditor.Events = ((global::Gdk.EventMask)(256));
-			this.nodeseteditor.Name = "nodeseteditor";
-			this.nodeseteditor.AllowEditing = false;
+			this.nodeseteditor = null;
 			this.vbox3.Add (this.nodeseteditor);
-			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.nodeseteditor]));
+			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.nodeseteditor]));
 			w5.Position = 1;
 			w1.Add (this.vbox3);
-			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(w1[this.vbox3]));
+			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox3]));
 			w6.Position = 0;
 			// Internal child MonoDevelop.AddinAuthoring.SelectNodeSetDialog.ActionArea
 			global::Gtk.HButtonBox w7 = this.ActionArea;
@@ -86,7 +77,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.buttonCancel.UseUnderline = true;
 			this.buttonCancel.Label = "gtk-cancel";
 			this.AddActionWidget (this.buttonCancel, -6);
-			global::Gtk.ButtonBox.ButtonBoxChild w8 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w7[this.buttonCancel]));
+			global::Gtk.ButtonBox.ButtonBoxChild w8 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w7 [this.buttonCancel]));
 			w8.Expand = false;
 			w8.Fill = false;
 			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
@@ -98,7 +89,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.buttonOk.UseUnderline = true;
 			this.buttonOk.Label = "gtk-ok";
 			this.AddActionWidget (this.buttonOk, -5);
-			global::Gtk.ButtonBox.ButtonBoxChild w9 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w7[this.buttonOk]));
+			global::Gtk.ButtonBox.ButtonBoxChild w9 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w7 [this.buttonOk]));
 			w9.Position = 1;
 			w9.Expand = false;
 			w9.Fill = false;
diff --git a/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.SelectRepositoryDialog.cs b/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.SelectRepositoryDialog.cs
index 23d75e0c34..d216cf976d 100644
--- a/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.SelectRepositoryDialog.cs
+++ b/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.SelectRepositoryDialog.cs
@@ -5,23 +5,14 @@ namespace MonoDevelop.AddinAuthoring
 	public partial class SelectRepositoryDialog
 	{
 		private global::Gtk.VBox vbox4;
-
 		private global::Gtk.Label label11;
-
 		private global::Gtk.HBox hbox1;
-
 		private global::Gtk.ScrolledWindow scrolledwindow4;
-
 		private global::Gtk.TreeView tree;
-
 		private global::Gtk.VBox vbox2;
-
 		private global::Gtk.Button buttonAdd;
-
 		private global::Gtk.Button buttonRemove;
-
 		private global::Gtk.Button button155;
-
 		private global::Gtk.Button buttonOk;
 
 		protected virtual void Build ()
@@ -46,10 +37,10 @@ namespace MonoDevelop.AddinAuthoring
 			// Container child vbox4.Gtk.Box+BoxChild
 			this.label11 = new global::Gtk.Label ();
 			this.label11.Name = "label11";
-			this.label11.Xalign = 0f;
+			this.label11.Xalign = 0F;
 			this.label11.LabelProp = global::Mono.Addins.AddinManager.CurrentLocalizer.GetString ("Select the application you want to extend:");
 			this.vbox4.Add (this.label11);
-			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.label11]));
+			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.label11]));
 			w2.Position = 0;
 			w2.Expand = false;
 			w2.Fill = false;
@@ -68,7 +59,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.tree.Name = "tree";
 			this.scrolledwindow4.Add (this.tree);
 			this.hbox1.Add (this.scrolledwindow4);
-			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.scrolledwindow4]));
+			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.scrolledwindow4]));
 			w4.Position = 0;
 			// Container child hbox1.Gtk.Box+BoxChild
 			this.vbox2 = new global::Gtk.VBox ();
@@ -82,7 +73,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.buttonAdd.UseUnderline = true;
 			this.buttonAdd.Label = "gtk-add";
 			this.vbox2.Add (this.buttonAdd);
-			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.buttonAdd]));
+			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.buttonAdd]));
 			w5.Position = 0;
 			w5.Expand = false;
 			w5.Fill = false;
@@ -94,20 +85,20 @@ namespace MonoDevelop.AddinAuthoring
 			this.buttonRemove.UseUnderline = true;
 			this.buttonRemove.Label = "gtk-remove";
 			this.vbox2.Add (this.buttonRemove);
-			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.buttonRemove]));
+			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.buttonRemove]));
 			w6.Position = 1;
 			w6.Expand = false;
 			w6.Fill = false;
 			this.hbox1.Add (this.vbox2);
-			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.vbox2]));
+			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.vbox2]));
 			w7.Position = 1;
 			w7.Expand = false;
 			w7.Fill = false;
 			this.vbox4.Add (this.hbox1);
-			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.hbox1]));
+			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.hbox1]));
 			w8.Position = 1;
 			w1.Add (this.vbox4);
-			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(w1[this.vbox4]));
+			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox4]));
 			w9.Position = 0;
 			// Internal child MonoDevelop.AddinAuthoring.SelectRepositoryDialog.ActionArea
 			global::Gtk.HButtonBox w10 = this.ActionArea;
@@ -124,7 +115,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.button155.UseUnderline = true;
 			this.button155.Label = "gtk-cancel";
 			this.AddActionWidget (this.button155, -6);
-			global::Gtk.ButtonBox.ButtonBoxChild w11 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w10[this.button155]));
+			global::Gtk.ButtonBox.ButtonBoxChild w11 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w10 [this.button155]));
 			w11.Expand = false;
 			w11.Fill = false;
 			// Container child MonoDevelop.AddinAuthoring.SelectRepositoryDialog_ActionArea.Gtk.ButtonBox+ButtonBoxChild
@@ -136,7 +127,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.buttonOk.UseUnderline = true;
 			this.buttonOk.Label = "gtk-ok";
 			this.AddActionWidget (this.buttonOk, -5);
-			global::Gtk.ButtonBox.ButtonBoxChild w12 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w10[this.buttonOk]));
+			global::Gtk.ButtonBox.ButtonBoxChild w12 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w10 [this.buttonOk]));
 			w12.Position = 1;
 			w12.Expand = false;
 			w12.Fill = false;
diff --git a/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.TypeSelector.cs b/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.TypeSelector.cs
index 69956d541d..ab3c03bc79 100644
--- a/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.TypeSelector.cs
+++ b/extras/MonoDevelop.AddinAuthoring/gtk-gui/MonoDevelop.AddinAuthoring.TypeSelector.cs
@@ -5,11 +5,8 @@ namespace MonoDevelop.AddinAuthoring
 	public partial class TypeSelector
 	{
 		private global::Gtk.HBox hbox3;
-
 		private global::Gtk.EventBox eventbox;
-
 		private global::Gtk.Image typeImage;
-
 		private global::Gtk.ComboBoxEntry combo;
 
 		protected virtual void Build ()
@@ -31,7 +28,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.typeImage.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "md-addinauthoring-newclass", global::Gtk.IconSize.Menu);
 			this.eventbox.Add (this.typeImage);
 			this.hbox3.Add (this.eventbox);
-			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox3[this.eventbox]));
+			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.eventbox]));
 			w2.Position = 0;
 			w2.Expand = false;
 			w2.Fill = false;
@@ -39,7 +36,7 @@ namespace MonoDevelop.AddinAuthoring
 			this.combo = global::Gtk.ComboBoxEntry.NewText ();
 			this.combo.Name = "combo";
 			this.hbox3.Add (this.combo);
-			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox3[this.combo]));
+			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.combo]));
 			w3.Position = 1;
 			this.Add (this.hbox3);
 			if ((this.Child != null)) {
diff --git a/extras/MonoDevelop.AddinAuthoring/gtk-gui/generated.cs b/extras/MonoDevelop.AddinAuthoring/gtk-gui/generated.cs
index 559a39ec59..0ada9fc5f0 100644
--- a/extras/MonoDevelop.AddinAuthoring/gtk-gui/generated.cs
+++ b/extras/MonoDevelop.AddinAuthoring/gtk-gui/generated.cs
@@ -6,7 +6,7 @@ namespace Stetic
 	{
 		private static bool initialized;
 
-		static internal void Initialize (Gtk.Widget iconRenderer)
+		internal static void Initialize (Gtk.Widget iconRenderer)
 		{
 			if ((Stetic.Gui.initialized == false)) {
 				Stetic.Gui.initialized = true;
@@ -17,7 +17,6 @@ namespace Stetic
 	internal class BinContainer
 	{
 		private Gtk.Widget child;
-
 		private Gtk.UIManager uimanager;
 
 		public static BinContainer Attach (Gtk.Bin bin)
@@ -77,7 +76,7 @@ namespace Stetic
 			} else {
 				int sz;
 				int sy;
-				global::Gtk.Icon.SizeLookup (size, out sz, out sy);
+				global::Gtk.Icon.SizeLookup (size, out  sz, out  sy);
 				try {
 					return Gtk.IconTheme.Default.LoadIcon (name, sz, 0);
 				} catch (System.Exception) {