diff --git a/Build/Configurations/SRB2_22Doom.cfg b/Build/Configurations/SRB2_22Doom.cfg
deleted file mode 100644
index 9e733aa394581a8d48dab2c592e46008b2142f11..0000000000000000000000000000000000000000
--- a/Build/Configurations/SRB2_22Doom.cfg
+++ /dev/null
@@ -1,32 +0,0 @@
-/************************************************************************\
- Ultimate Doom Builder Game Configuration for Sonic Robo Blast 2 Version 2.2
-\************************************************************************/
-
-// This is required to prevent accidental use of a different configuration
-type = "Doom Builder 2 Game Configuration";
-
-// This is the title to show for this game
-game = "Sonic Robo Blast 2 - 2.2 (Doom format)";
-
-// This is the simplified game engine/sourceport name
-engine = "zdoom";
-
-// Settings common to all games and all map formats
-include("Includes\\SRB222_common.cfg", "common");
-
-// Settings common to Doom map format
-include("Includes\\SRB222_common.cfg", "mapformat_doom");
-
-include("Includes\\Game_SRB222.cfg");
-
-// Script lumps detection
-scriptlumpnames
-{
- include("Includes\\SRB222_misc.cfg", "scriptlumpnames");
-}
-
-//Default things filters
-thingsfilters
-{
- include("Includes\\SRB222_misc.cfg", "thingsfilters");
-}
\ No newline at end of file
diff --git a/Setup/UZB-large.bmp b/Setup/UZB-large.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..d5725a62c888b3aaa7a1dc2b8725e02ebe9a64ea
Binary files /dev/null and b/Setup/UZB-large.bmp differ
diff --git a/Setup/UZB-small.bmp b/Setup/UZB-small.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..061f0242be4393bbe62194cb5ab9ccbde5cc229b
Binary files /dev/null and b/Setup/UZB-small.bmp differ
diff --git a/Setup/UZBuilder_setup.iss b/Setup/UZBuilder_setup.iss
new file mode 100644
index 0000000000000000000000000000000000000000..fc1aeb9a1ec680cdec5bce7a38b96265713630e0
--- /dev/null
+++ b/Setup/UZBuilder_setup.iss
@@ -0,0 +1,152 @@
+; Script generated by the Inno Setup Script Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
+#define public Dependency_NoExampleSetup
+#include "CodeDependencies.iss"
+
+#define UDB_arch "x64"
+#define UDB_GetVersionString() \
+ Local[0] = GetVersionNumbersString("..\Build\Builder.exe"), \
+ Delete(Local[0], 0, RPos(".", Local[0])+1), \
+ "R" + Local[0]
+
+[Setup]
+AppName=Ultimate Zone Builder
+AppVerName=Ultimate Zone Builder v0.1 ({#UDB_arch})
+;AppVerName=Ultimate Doom Builder {#UDB_GetVersionString} ({#UDB_arch})
+AppPublisher=Sonic Team Junior
+AppPublisherURL=https://www.srb2.org/
+AppSupportURL=https://git.do.srb2.org/STJr/UltimateZoneBuilder
+AppUpdatesURL=https://git.do.srb2.org/STJr/UltimateZoneBuilder
+DefaultDirName={commonpf}\Ultimate Zone Builder
+DefaultGroupName=Ultimate Zone Builder
+AllowNoIcons=true
+LicenseFile=..\LICENSE.txt
+OutputDir=..\Release
+OutputBaseFilename=Setup
+Compression=lzma/ultra64
+SolidCompression=true
+SourceDir=..\Build
+SetupLogging=false
+AppMutex=ultimatezonebuilder
+PrivilegesRequired=admin
+ShowLanguageDialog=no
+LanguageDetectionMethod=none
+MinVersion=0,6.1sp1
+UninstallDisplayIcon={app}\Updater.exe
+WizardImageFile=..\Setup\UZB-large.bmp
+WizardSmallImageFile=..\Setup\UZB-small.bmp
+WizardImageAlphaFormat=defined
+WizardImageStretch=false
+#if UDB_arch != "x86"
+ArchitecturesInstallIn64BitMode=x64
+ArchitecturesAllowed=x64
+#endif
+
+[Languages]
+Name: english; MessagesFile: compiler:Default.isl
+
+[Tasks]
+Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked
+
+[Files]
+Source: Builder.exe; DestDir: {app}; Flags: ignoreversion
+Source: Builder.pdb; DestDir: {app}; Flags: ignoreversion
+Source: Builder.exe.config; DestDir: {app}; Flags: ignoreversion
+Source: UDBuilder.default.cfg; DestDir: {app}; Flags: ignoreversion
+//Source: Updater.exe; DestDir: {app}; Flags: ignoreversion
+Source: Updater.ini; DestDir: {app}; Flags: ignoreversion
+Source: Refmanual.chm; DestDir: {app}; Flags: ignoreversion
+Source: BuilderNative.dll; DestDir: {app}; Flags: ignoreversion
+Source: BuilderNative.pdb; DestDir: {app}; Flags: ignoreversion
+Source: SharpCompress.dll; DestDir: {app}; Flags: ignoreversion
+Source: ScintillaNET.dll; DestDir: {app}; Flags: ignoreversion
+Source: TabControlEX.dll; DestDir: {app}; Flags: ignoreversion
+Source: System.Buffers.dll; DestDir: {app}; Flags: ignoreversion
+Source: System.Memory.dll; DestDir: {app}; Flags: ignoreversion
+Source: System.Numerics.Vectors.dll; DestDir: {app}; Flags: ignoreversion
+Source: System.Runtime.CompilerServices.Unsafe.dll; DestDir: {app}; Flags: ignoreversion
+Source: LICENSE.txt; DestDir: {app}; Flags: ignoreversion
+Source: Compilers\*; DestDir: {app}\Compilers; Flags: ignoreversion recursesubdirs
+Source: Configurations\*; DestDir: {app}\Configurations; Flags: ignoreversion recursesubdirs
+Source: Scripting\*; DestDir: {app}\Scripting; Flags: ignoreversion recursesubdirs
+Source: Snippets\*; DestDir: {app}\Snippets; Flags: ignoreversion recursesubdirs
+Source: UDBScript\udbscript.d.ts; DestDir: {app}\UDBScript; Flags: ignoreversion
+Source: UDBScript\Libraries\*; DestDir: {app}\UDBScript\Libraries; Flags: ignoreversion recursesubdirs
+Source: UDBScript\Scripts\Examples\*; DestDir: {app}\UDBScript\Scripts\Examples; Flags: ignoreversion recursesubdirs
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+Source: Plugins\AutomapMode.dll; DestDir: {app}\Plugins; Flags: ignoreversion
+Source: Plugins\AutomapMode.pdb; DestDir: {app}\Plugins; Flags: ignoreversion
+Source: Plugins\BuilderModes.dll; DestDir: {app}\Plugins; Flags: ignoreversion
+Source: Plugins\BuilderModes.pdb; DestDir: {app}\Plugins; Flags: ignoreversion
+Source: Plugins\BuilderEffects.dll; DestDir: {app}\Plugins; Flags: ignoreversion
+Source: Plugins\BuilderEffects.pdb; DestDir: {app}\Plugins; Flags: ignoreversion
+Source: Plugins\ColorPicker.dll; DestDir: {app}\Plugins; Flags: ignoreversion
+Source: Plugins\ColorPicker.pdb; DestDir: {app}\Plugins; Flags: ignoreversion
+Source: Plugins\CommentsPanel.dll; DestDir: {app}\Plugins; Flags: ignoreversion
+Source: Plugins\CommentsPanel.pdb; DestDir: {app}\Plugins; Flags: ignoreversion
+Source: Plugins\NodesViewer.dll; DestDir: {app}\Plugins; Flags: ignoreversion
+Source: Plugins\NodesViewer.pdb; DestDir: {app}\Plugins; Flags: ignoreversion
+Source: Plugins\SoundPropagationMode.dll; DestDir: {app}\Plugins; Flags: ignoreversion
+Source: Plugins\SoundPropagationMode.pdb; DestDir: {app}\Plugins; Flags: ignoreversion
+Source: Plugins\StairSectorBuilder.dll; DestDir: {app}\Plugins; Flags: ignoreversion
+Source: Plugins\StairSectorBuilder.pdb; DestDir: {app}\Plugins; Flags: ignoreversion
+Source: Plugins\TagExplorer.dll; DestDir: {app}\Plugins; Flags: ignoreversion
+Source: Plugins\TagExplorer.pdb; DestDir: {app}\Plugins; Flags: ignoreversion
+Source: Plugins\TagRange.dll; DestDir: {app}\Plugins; Flags: ignoreversion
+Source: Plugins\TagRange.pdb; DestDir: {app}\Plugins; Flags: ignoreversion
+Source: Plugins\ThreeDFloorMode.dll; DestDir: {app}\Plugins; Flags: ignoreversion
+Source: Plugins\ThreeDFloorMode.pdb; DestDir: {app}\Plugins; Flags: ignoreversion
+Source: Plugins\UDBScript.dll; DestDir: {app}\Plugins; Flags: ignoreversion
+Source: Plugins\UDBScript.pdb; DestDir: {app}\Plugins; Flags: ignoreversion
+Source: Plugins\VisplaneExplorer.dll; DestDir: {app}\Plugins; Flags: ignoreversion
+Source: Plugins\VisplaneExplorer.pdb; DestDir: {app}\Plugins; Flags: ignoreversion
+Source: Plugins\Loadorder.cfg; DestDir: {app}\Plugins; Flags: ignoreversion onlyifdoesntexist
+Source: Plugins\Dependencies\*; DestDir: {app}\Plugins\Dependencies; Flags: ignoreversion
+Source: Sprites\*; DestDir: {app}\Sprites; Flags: ignoreversion recursesubdirs
+Source: Textures\*; DestDir: {app}\Textures; Flags: ignoreversion
+
+[Icons]
+Name: {group}\Ultimate Zone Builder; Filename: {app}\Builder.exe
+Name: {group}\{cm:UninstallProgram,Ultimate Zone Builder}; Filename: {uninstallexe}
+Name: {autodesktop}\Ultimate Zone Builder; Filename: {app}\Builder.exe; Tasks: desktopicon
+
+[Run]
+Filename: {app}\Builder.exe; Description: Run {#SetupSetting("AppName")}; Flags: postinstall skipifsilent
+
+[UninstallDelete]
+Name: {app}; Type: filesandordirs
+
+;[InstallDelete]
+;Name: {app}\Builder.pdb; Type: files
+;Name: {app}\Builder.xml; Type: files
+
+[Registry]
+Root: HKCU; Subkey: SOFTWARE\Ultimate Zone Builder\; ValueType: string; ValueName: Location; ValueData: {app}; Flags: uninsdeletevalue
+
+[Messages]
+ReadyLabel2a=Continue to begin with the installation, or click Back if you want to review or change any settings.
+
+[Code]
+// When the wizard initializes
+procedure InitializeWizard();
+begin
+ // .Net and VC Redistributables. Those come from CodeDependencies.iss
+ Dependency_AddDotNet47;
+ //Dependency_AddVC2015To2022;
+end;
+
+//Remove configs?
+procedure DeinitializeUninstall();
+begin
+ if MsgBox('Delete map restore data and program configuration files?', mbConfirmation, MB_YESNO) = IDYES then
+ begin
+ // Remove restore data
+ DelTree(ExpandConstant('{localappdata}\Doom Builder\Restore'), True, True, True);
+
+ // Remove configs
+ DeleteFile(ExpandConstant('{localappdata}\Doom Builder\UDBuilder.cfg'));
+ DeleteFile(ExpandConstant('{localappdata}\Doom Builder\UDBuilder.log'));
+ DeleteFile(ExpandConstant('{localappdata}\Doom Builder\UDBCrash.txt'));
+ end;
+end;
\ No newline at end of file
diff --git a/Source/Core/Config/ProgramConfiguration.cs b/Source/Core/Config/ProgramConfiguration.cs
index 2743d835da4442f95da4bd919dfdd018291a9372..e13b6d0c80338442fcc995840f44e46c8a394661 100644
--- a/Source/Core/Config/ProgramConfiguration.cs
+++ b/Source/Core/Config/ProgramConfiguration.cs
@@ -415,7 +415,8 @@ namespace CodeImp.DoomBuilder.Config
maxRecentFiles = cfg.ReadSetting("maxrecentfiles", 8);
autoClearSideTextures = cfg.ReadSetting("autoclearsidetextures", true);
storeSelectedEditTab = cfg.ReadSetting("storeselectededittab", true);
- checkforupdates = cfg.ReadSetting("checkforupdates", true); //mxd
+ //checkforupdates = cfg.ReadSetting("checkforupdates", true); //mxd
+ checkforupdates = false;
rendercomments = cfg.ReadSetting("rendercomments", true); //mxd
fixedthingsscale = cfg.ReadSetting("fixedthingsscale", false); //mxd
rendergrid = cfg.ReadSetting("rendergrid", true); //mxd
diff --git a/Source/Core/Windows/PreferencesForm.Designer.cs b/Source/Core/Windows/PreferencesForm.Designer.cs
index 787bf2df26dbd8bf39773c9784cacc7d3af35c98..1396704c513db0f2bcd73b27b9aff8a8388543b4 100755
--- a/Source/Core/Windows/PreferencesForm.Designer.cs
+++ b/Source/Core/Windows/PreferencesForm.Designer.cs
@@ -342,6 +342,7 @@ namespace CodeImp.DoomBuilder.Windows
//
// checkforupdates
//
+ this.checkforupdates.Enabled = false;
this.checkforupdates.AutoSize = true;
this.checkforupdates.Location = new System.Drawing.Point(16, 369);
this.checkforupdates.Name = "checkforupdates";