diff --git a/Templates/Empty/game/art/gui/mainMenuGui.gui b/Templates/Empty/game/art/gui/mainMenuGui.gui
index a0e3c7e13..bed700a83 100644
--- a/Templates/Empty/game/art/gui/mainMenuGui.gui
+++ b/Templates/Empty/game/art/gui/mainMenuGui.gui
@@ -1,121 +1,162 @@
 //--- OBJECT WRITE BEGIN ---
 %guiContent = new GuiChunkedBitmapCtrl(MainMenuGui) {
-   canSaveDynamicFields = "0";
-   Enabled = "1";
-   isContainer = "1";
-   Profile = "GuiContentProfile";
-   HorizSizing = "width";
-   VertSizing = "height";
-   Position = "0 0";
-   Extent = "1024 768";
-   MinExtent = "8 8";
-   canSave = "1";
-   isDecoy = "0";
-   Visible = "1";
-   tooltipprofile = "GuiToolTipProfile";
-   hovertime = "1000";
    bitmap = "art/gui/background";
    useVariable = "0";
    tile = "0";
+   position = "0 0";
+   extent = "1024 768";
+   minExtent = "8 8";
+   horizSizing = "width";
+   vertSizing = "height";
+   profile = "GuiDefaultProfile";
+   visible = "1";
+   active = "1";
+   tooltipProfile = "GuiToolTipProfile";
+   hovertime = "1000";
+   isContainer = "1";
+   canSave = "1";
+   canSaveDynamicFields = "1";
+      enabled = "1";
+      isDecoy = "0";
 
    new GuiBitmapCtrl(MainMenuAppLogo) {
-      canSaveDynamicFields = "1";
-      Enabled = "1";
-      isContainer = "0";
-      Profile = "GuiDefaultProfile";
-      HorizSizing = "left";
-      VertSizing = "bottom";
-      Position = "540 30";
-      Extent = "443 139";
-      MinExtent = "8 2";
-      canSave = "1";
-      isDecoy = "0";
-      Visible = "1";
-      tooltipprofile = "GuiToolTipProfile";
-      hovertime = "1000";
       bitmap = "art/gui/Torque-3D-logo.png";
       wrap = "0";
+      position = "540 30";
+      extent = "443 139";
+      minExtent = "8 2";
+      horizSizing = "left";
+      vertSizing = "bottom";
+      profile = "GuiDefaultProfile";
+      visible = "1";
+      active = "1";
+      tooltipProfile = "GuiToolTipProfile";
+      hovertime = "1000";
+      isContainer = "0";
+      canSave = "1";
+      canSaveDynamicFields = "1";
+         enabled = "1";
+         isDecoy = "0";
    };
    new GuiControl() {
-      canSaveDynamicFields = "0";
-      Enabled = "1";
-      isContainer = "1";
-      Profile = "GuiDefaultProfile";
-      HorizSizing = "center";
-      VertSizing = "center";
-      Position = "359 171";
-      Extent = "306 425";
-      MinExtent = "8 2";
-      canSave = "1";
-      isDecoy = "0";
-      Visible = "1";
-      tooltipprofile = "GuiToolTipProfile";
+      position = "359 171";
+      extent = "306 425";
+      minExtent = "8 2";
+      horizSizing = "center";
+      vertSizing = "center";
+      profile = "GuiDefaultProfile";
+      visible = "1";
+      active = "1";
+      tooltipProfile = "GuiToolTipProfile";
       hovertime = "1000";
+      isContainer = "1";
+      canSave = "1";
+      canSaveDynamicFields = "0";
 
       new GuiButtonCtrl() {
-         canSaveDynamicFields = "0";
-         Enabled = "1";
-         isContainer = "0";
-         Profile = "GuiMenuButtonProfile";
-         HorizSizing = "relative";
-         VertSizing = "bottom";
-         Position = "9 114";
-         Extent = "289 75";
-         MinExtent = "8 8";
-         canSave = "1";
-         isDecoy = "0";
-         Visible = "1";
-         Command = "Canvas.pushDialog(ChooseLevelDlg);";
-         tooltipprofile = "GuiToolTipProfile";
-         hovertime = "1000";
          text = "Play";
          groupNum = "-1";
          buttonType = "PushButton";
          useMouseEvents = "1";
+         position = "9 26";
+         extent = "289 75";
+         minExtent = "8 8";
+         horizSizing = "relative";
+         vertSizing = "bottom";
+         profile = "GuiMenuButtonProfile";
+         visible = "1";
+         active = "1";
+         command = "Canvas.pushDialog(ChooseLevelDlg);";
+         tooltipProfile = "GuiToolTipProfile";
+         hovertime = "1000";
+         isContainer = "0";
+         canSave = "1";
+         canSaveDynamicFields = "0";
       };
       new GuiButtonCtrl() {
-         canSaveDynamicFields = "0";
-         Enabled = "1";
-         isContainer = "0";
-         Profile = "GuiMenuButtonProfile";
-         HorizSizing = "relative";
-         VertSizing = "bottom";
-         Position = "9 190";
-         Extent = "289 75";
-         MinExtent = "8 8";
-         canSave = "1";
-         isDecoy = "0";
-         Visible = "1";
-         Command = "Canvas.pushDialog(optionsDlg);";
-         tooltipprofile = "GuiToolTipProfile";
-         hovertime = "1000";
          text = "Options";
          groupNum = "-1";
          buttonType = "PushButton";
          useMouseEvents = "0";
-
+         position = "9 104";
+         extent = "289 75";
+         minExtent = "8 8";
+         horizSizing = "relative";
+         vertSizing = "bottom";
+         profile = "GuiMenuButtonProfile";
+         visible = "1";
+         active = "1";
+         command = "Canvas.pushDialog(optionsDlg);";
+         tooltipProfile = "GuiToolTipProfile";
+         hovertime = "1000";
+         isContainer = "0";
+         canSave = "1";
+         canSaveDynamicFields = "0";
       };
       new GuiButtonCtrl() {
-         canSaveDynamicFields = "0";
-         Enabled = "1";
-         internalName = "ExitButton";
-         isContainer = "0";
-         Profile = "GuiMenuButtonProfile";
-         HorizSizing = "relative";
-         VertSizing = "bottom";
-         Position = "9 267";
-         Extent = "289 75";
-         MinExtent = "8 8";
-         canSave = "1";
-         isDecoy = "0";
-         Visible = "1";
-         Command = "quit();";
-         tooltipprofile = "GuiToolTipProfile";
+         text = "Gui Editor";
+         groupNum = "-1";
+         buttonType = "PushButton";
+         useMouseEvents = "0";
+         position = "9 182";
+         extent = "289 75";
+         minExtent = "8 8";
+         horizSizing = "relative";
+         vertSizing = "bottom";
+         profile = "GuiMenuButtonProfile";
+         visible = "1";
+         active = "1";
+         command = "GuiEdit();";
+         tooltipProfile = "GuiToolTipProfile";
+         tooltip = "The GUI Editor is accessible in-game by pressing F10";
          hovertime = "1000";
+         isContainer = "0";
+         internalName = "GuiEditorButton";
+         canSave = "1";
+         canSaveDynamicFields = "0";
+      };
+      new GuiButtonCtrl() {
+         text = "World Editor";
+         groupNum = "-1";
+         buttonType = "PushButton";
+         useMouseEvents = "0";
+         position = "9 260";
+         extent = "289 75";
+         minExtent = "8 8";
+         horizSizing = "relative";
+         vertSizing = "bottom";
+         profile = "GuiMenuButtonProfile";
+         visible = "1";
+         active = "1";
+         command = "toggleEditor(1);";
+         tooltipProfile = "GuiToolTipProfile";
+         tooltip = "The World Editor is accessible in-game by pressing F11";
+         hovertime = "1000";
+         isContainer = "0";
+         internalName = "WorldEditorButton";
+         canSave = "1";
+         canSaveDynamicFields = "0";
+      };
+      new GuiButtonCtrl() {
          text = "Exit";
          groupNum = "-1";
          buttonType = "PushButton";
          useMouseEvents = "0";
+         position = "9 338";
+         extent = "289 75";
+         minExtent = "8 8";
+         horizSizing = "relative";
+         vertSizing = "bottom";
+         profile = "GuiMenuButtonProfile";
+         visible = "1";
+         active = "1";
+         command = "quit();";
+         tooltipProfile = "GuiToolTipProfile";
+         hovertime = "1000";
+         isContainer = "0";
+         internalName = "ExitButton";
+         canSave = "1";
+         canSaveDynamicFields = "0";
       };
    };
 };
@@ -127,4 +168,4 @@ function MainMenuGui::onWake(%this)
        getWebDeployment() &&
        isObject(%this-->ExitButton))
       %this-->ExitButton.setVisible(false);
-}
\ No newline at end of file
+}
diff --git a/Templates/Full/game/art/gui/mainMenuGui.gui b/Templates/Full/game/art/gui/mainMenuGui.gui
index 4c326662c..ac38976d3 100644
--- a/Templates/Full/game/art/gui/mainMenuGui.gui
+++ b/Templates/Full/game/art/gui/mainMenuGui.gui
@@ -1,142 +1,182 @@
 //--- OBJECT WRITE BEGIN ---
 %guiContent = new GuiChunkedBitmapCtrl(MainMenuGui) {
-   canSaveDynamicFields = "0";
-   Enabled = "1";
-   isContainer = "1";
-   Profile = "GuiContentProfile";
-   HorizSizing = "width";
-   VertSizing = "height";
-   Position = "0 0";
-   Extent = "1024 768";
-   MinExtent = "8 8";
-   canSave = "1";
-   isDecoy = "0";
-   Visible = "1";
-   tooltipprofile = "GuiToolTipProfile";
-   hovertime = "1000";
    bitmap = "art/gui/background";
    useVariable = "0";
    tile = "0";
+   position = "0 0";
+   extent = "1024 768";
+   minExtent = "8 8";
+   horizSizing = "width";
+   vertSizing = "height";
+   profile = "GuiDefaultProfile";
+   visible = "1";
+   active = "1";
+   tooltipProfile = "GuiToolTipProfile";
+   hovertime = "1000";
+   isContainer = "1";
+   canSave = "1";
+   canSaveDynamicFields = "1";
+      enabled = "1";
+      isDecoy = "0";
 
    new GuiBitmapCtrl(MainMenuAppLogo) {
-      canSaveDynamicFields = "1";
-      Enabled = "1";
-      isContainer = "0";
-      Profile = "GuiDefaultProfile";
-      HorizSizing = "left";
-      VertSizing = "bottom";
-      Position = "540 30";
-      Extent = "443 139";
-      MinExtent = "8 2";
-      canSave = "1";
-      isDecoy = "0";
-      Visible = "1";
-      tooltipprofile = "GuiToolTipProfile";
-      hovertime = "1000";
       bitmap = "art/gui/Torque-3D-logo.png";
       wrap = "0";
+      position = "540 30";
+      extent = "443 139";
+      minExtent = "8 2";
+      horizSizing = "left";
+      vertSizing = "bottom";
+      profile = "GuiDefaultProfile";
+      visible = "1";
+      active = "1";
+      tooltipProfile = "GuiToolTipProfile";
+      hovertime = "1000";
+      isContainer = "0";
+      canSave = "1";
+      canSaveDynamicFields = "1";
+         enabled = "1";
+         isDecoy = "0";
    };
    new GuiControl() {
-      canSaveDynamicFields = "0";
-      Enabled = "1";
-      isContainer = "1";
-      Profile = "GuiDefaultProfile";
-      HorizSizing = "center";
-      VertSizing = "center";
-      Position = "359 171";
-      Extent = "306 425";
-      MinExtent = "8 2";
-      canSave = "1";
-      isDecoy = "0";
-      Visible = "1";
-      tooltipprofile = "GuiToolTipProfile";
+      position = "359 157";
+      extent = "306 454";
+      minExtent = "8 2";
+      horizSizing = "center";
+      vertSizing = "center";
+      profile = "GuiDefaultProfile";
+      visible = "1";
+      active = "1";
+      tooltipProfile = "GuiToolTipProfile";
       hovertime = "1000";
+      isContainer = "1";
+      canSave = "1";
+      canSaveDynamicFields = "0";
 
       new GuiButtonCtrl() {
-         canSaveDynamicFields = "0";
-         Enabled = "1";
-         isContainer = "0";
-         Profile = "GuiMenuButtonProfile";
-         HorizSizing = "relative";
-         VertSizing = "bottom";
-         Position = "9 114";
-         Extent = "289 75";
-         MinExtent = "8 8";
-         canSave = "1";
-         isDecoy = "0";
-         Visible = "1";
-         Command = "Canvas.pushDialog(ChooseLevelDlg);";
-         tooltipprofile = "GuiToolTipProfile";
-         hovertime = "1000";
          text = "Play";
          groupNum = "-1";
          buttonType = "PushButton";
          useMouseEvents = "1";
+         position = "9 18";
+         extent = "289 75";
+         minExtent = "8 8";
+         horizSizing = "relative";
+         vertSizing = "bottom";
+         profile = "GuiMenuButtonProfile";
+         visible = "1";
+         active = "1";
+         command = "Canvas.pushDialog(ChooseLevelDlg);";
+         tooltipProfile = "GuiToolTipProfile";
+         hovertime = "1000";
+         isContainer = "0";
+         canSave = "1";
+         canSaveDynamicFields = "0";
       };
       new GuiButtonCtrl() {
-         canSaveDynamicFields = "0";
-         Enabled = "1";
-         isContainer = "0";
-         Profile = "GuiMenuButtonProfile";
-         HorizSizing = "relative";
-         VertSizing = "bottom";
-         Position = "9 190";
-         Extent = "289 75";
-         MinExtent = "8 8";
-         canSave = "1";
-         isDecoy = "0";
-         Visible = "1";
-         Command = "Canvas.pushDialog(JoinServerDlg);";
-         tooltipprofile = "GuiToolTipProfile";
-         hovertime = "1000";
          text = "Join";
          groupNum = "-1";
          buttonType = "PushButton";
          useMouseEvents = "0";
+         position = "9 90";
+         extent = "289 75";
+         minExtent = "8 8";
+         horizSizing = "relative";
+         vertSizing = "bottom";
+         profile = "GuiMenuButtonProfile";
+         visible = "1";
+         active = "1";
+         command = "Canvas.pushDialog(JoinServerDlg);";
+         tooltipProfile = "GuiToolTipProfile";
+         hovertime = "1000";
+         isContainer = "0";
+         canSave = "1";
+         canSaveDynamicFields = "0";
       };
       new GuiButtonCtrl() {
-         canSaveDynamicFields = "0";
-         Enabled = "1";
-         isContainer = "0";
-         Profile = "GuiMenuButtonProfile";
-         HorizSizing = "relative";
-         VertSizing = "bottom";
-         Position = "9 267";
-         Extent = "289 75";
-         MinExtent = "8 8";
-         canSave = "1";
-         isDecoy = "0";
-         Visible = "1";
-         Command = "Canvas.pushDialog(optionsDlg);";
-         tooltipprofile = "GuiToolTipProfile";
-         hovertime = "1000";
          text = "Options";
          groupNum = "-1";
          buttonType = "PushButton";
          useMouseEvents = "0";
-
+         position = "9 162";
+         extent = "289 75";
+         minExtent = "8 8";
+         horizSizing = "relative";
+         vertSizing = "bottom";
+         profile = "GuiMenuButtonProfile";
+         visible = "1";
+         active = "1";
+         command = "Canvas.pushDialog(optionsDlg);";
+         tooltipProfile = "GuiToolTipProfile";
+         hovertime = "1000";
+         isContainer = "0";
+         canSave = "1";
+         canSaveDynamicFields = "0";
       };
       new GuiButtonCtrl() {
-         canSaveDynamicFields = "0";
-         Enabled = "1";
-         internalName = "ExitButton";
-         isContainer = "0";
-         Profile = "GuiMenuButtonProfile";
-         HorizSizing = "relative";
-         VertSizing = "bottom";
-         Position = "9 344";
-         Extent = "289 75";
-         MinExtent = "8 8";
-         canSave = "1";
-         isDecoy = "0";
-         Visible = "1";
-         Command = "quit();";
-         tooltipprofile = "GuiToolTipProfile";
+         text = "Gui Editor";
+         groupNum = "-1";
+         buttonType = "PushButton";
+         useMouseEvents = "0";
+         position = "9 234";
+         extent = "289 75";
+         minExtent = "8 8";
+         horizSizing = "relative";
+         vertSizing = "bottom";
+         profile = "GuiMenuButtonProfile";
+         visible = "1";
+         active = "1";
+         command = "GuiEdit();";
+         tooltipProfile = "GuiToolTipProfile";
+         tooltip = "The GUI Editor is accessible in-game by pressing F10";
          hovertime = "1000";
+         isContainer = "0";
+         internalName = "GuiEditorButton";
+         canSave = "1";
+         canSaveDynamicFields = "0";
+      };
+      new GuiButtonCtrl() {
+         text = "World Editor";
+         groupNum = "-1";
+         buttonType = "PushButton";
+         useMouseEvents = "0";
+         position = "9 306";
+         extent = "289 75";
+         minExtent = "8 8";
+         horizSizing = "relative";
+         vertSizing = "bottom";
+         profile = "GuiMenuButtonProfile";
+         visible = "1";
+         active = "1";
+         command = "toggleEditor(1);";
+         tooltipProfile = "GuiToolTipProfile";
+         tooltip = "The World Editor is accessible in-game by pressing F11";
+         hovertime = "1000";
+         isContainer = "0";
+         internalName = "WorldEditorButton";
+         canSave = "1";
+         canSaveDynamicFields = "0";
+      };
+      new GuiButtonCtrl() {
          text = "Exit";
          groupNum = "-1";
          buttonType = "PushButton";
          useMouseEvents = "0";
+         position = "9 378";
+         extent = "289 75";
+         minExtent = "8 8";
+         horizSizing = "relative";
+         vertSizing = "bottom";
+         profile = "GuiMenuButtonProfile";
+         visible = "1";
+         active = "1";
+         command = "quit();";
+         tooltipProfile = "GuiToolTipProfile";
+         hovertime = "1000";
+         isContainer = "0";
+         internalName = "ExitButton";
+         canSave = "1";
+         canSaveDynamicFields = "0";
       };
    };
 };
@@ -148,4 +188,4 @@ function MainMenuGui::onWake(%this)
        getWebDeployment() &&
        isObject(%this-->ExitButton))
       %this-->ExitButton.setVisible(false);
-}
\ No newline at end of file
+}