diff --git a/Build/Setup/dxwebsetup.exe b/Build/Setup/dxwebsetup.exe
deleted file mode 100644
index 53d2415e8ac2b4c3972c2e2452b403ee7399a0cd..0000000000000000000000000000000000000000
Binary files a/Build/Setup/dxwebsetup.exe and /dev/null differ
diff --git a/Setup/builder2_setup.iss b/Setup/builder2_setup.iss
index 60a1d4e20563b9eca9b500ff7dc050631a629bc5..198e2b2bd4dd80252f11e28c6d53dceea9847c53 100644
--- a/Setup/builder2_setup.iss
+++ b/Setup/builder2_setup.iss
@@ -35,7 +35,6 @@ Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:Ad
 
 [Files]
 Source: Setup\dotnetfx35setup.exe; DestDir: {tmp}; Flags: dontcopy
-Source: Setup\dxwebsetup.exe; DestDir: {tmp}; Flags: dontcopy
 Source: Setup\slimdx.msi; DestDir: {tmp}; Flags: dontcopy
 Source: Builder.exe; DestDir: {app}; Flags: ignoreversion
 Source: Builder.cfg; DestDir: {app}; Flags: ignoreversion
@@ -148,8 +147,6 @@ begin
 		if(componentsinstalled = false) then
 		begin
 			page_setup_components.Show;
-			ExtractTemporaryFile('dxwebsetup.exe');
-			Exec(ExpandConstant('{tmp}\dxwebsetup.exe'), '/Q', '', SW_SHOW, ewWaitUntilTerminated, errorcode);
 			ExtractTemporaryFile('slimdx.msi');
 			ShellExec('open', 'msiexec', ExpandConstant('/passive /i "{tmp}\slimdx.msi"'), '', SW_SHOW, ewWaitUntilTerminated, errorcode);
 			componentsinstalled := true;
@@ -246,5 +243,6 @@ end;
 
 
 
+
 
 
diff --git a/Source/Plugins/BuilderModes/Interface/PreferencesForm.Designer.cs b/Source/Plugins/BuilderModes/Interface/PreferencesForm.Designer.cs
index d44275a60d5283da920a1e1824031bf726e00f44..788499640206f4c7d6ce3743efc8d25f80d8ca62 100644
--- a/Source/Plugins/BuilderModes/Interface/PreferencesForm.Designer.cs
+++ b/Source/Plugins/BuilderModes/Interface/PreferencesForm.Designer.cs
@@ -105,7 +105,8 @@ namespace CodeImp.DoomBuilder.BuilderModes
 			this.heightbysidedef.Items.AddRange(new object[] {
             "Do nothing",
             "Change the ceiling height",
-            "Change the floor height"});
+            "Change the floor height",
+            "Change both floor and ceiling height"});
 			this.heightbysidedef.Location = new System.Drawing.Point(353, 16);
 			this.heightbysidedef.Name = "heightbysidedef";
 			this.heightbysidedef.Size = new System.Drawing.Size(199, 22);
diff --git a/Source/Plugins/BuilderModes/VisualModes/BaseVisualGeometrySector.cs b/Source/Plugins/BuilderModes/VisualModes/BaseVisualGeometrySector.cs
index a58cc1ffba1212e661c3da28b2ac577e85cb91ba..4eb8a07812558789b3d3ecd39ccba350859e6827 100644
--- a/Source/Plugins/BuilderModes/VisualModes/BaseVisualGeometrySector.cs
+++ b/Source/Plugins/BuilderModes/VisualModes/BaseVisualGeometrySector.cs
@@ -58,7 +58,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 		#region ================== Properties
 		
 		new public BaseVisualSector Sector { get { return (BaseVisualSector)base.Sector; } }
-		public bool Changed { get { return changed; } set { changed |= value; } }
+		public bool Changed { get { return changed; } set { changed = value; } }
 
 		#endregion
 
diff --git a/Source/Plugins/BuilderModes/VisualModes/BaseVisualGeometrySidedef.cs b/Source/Plugins/BuilderModes/VisualModes/BaseVisualGeometrySidedef.cs
index 23a38acae48eb0a6b2da3056135f4e5400e78e72..982383db958a10c6ad871ee5033c5ea440254f1b 100644
--- a/Source/Plugins/BuilderModes/VisualModes/BaseVisualGeometrySidedef.cs
+++ b/Source/Plugins/BuilderModes/VisualModes/BaseVisualGeometrySidedef.cs
@@ -191,6 +191,14 @@ namespace CodeImp.DoomBuilder.BuilderModes
 					if(!this.Sector.Floor.Changed)
 						this.Sector.Floor.OnChangeTargetHeight(amount);
 					break;
+
+				// Change both
+				case 3:
+					if(!this.Sector.Floor.Changed)
+						this.Sector.Floor.OnChangeTargetHeight(amount);
+					if(!this.Sector.Ceiling.Changed)
+						this.Sector.Ceiling.OnChangeTargetHeight(amount);
+					break;
 			}
 		}
 		
diff --git a/Source/Plugins/BuilderModes/VisualModes/BaseVisualMode.cs b/Source/Plugins/BuilderModes/VisualModes/BaseVisualMode.cs
index 1081a1229131cbd7d4f001e804e6d65cd139b2fb..4528114045b89dafcdc3756014a22a5f17448693 100644
--- a/Source/Plugins/BuilderModes/VisualModes/BaseVisualMode.cs
+++ b/Source/Plugins/BuilderModes/VisualModes/BaseVisualMode.cs
@@ -187,7 +187,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 				bvs.Floor.Changed = false;
 				bvs.Ceiling.Changed = false;
 			}
-
+			
 			selectionchanged = false;
 			
 			if(singleselection)