diff --git a/.github/workflows/DevBuild.yml b/.github/workflows/DevBuild.yml
index 0561e2635..48c43bb7d 100644
--- a/.github/workflows/DevBuild.yml
+++ b/.github/workflows/DevBuild.yml
@@ -9,6 +9,10 @@ name: HeliosDev Build & Create MSI Files
 on:
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
+
+# needed to publish the installers as a GitHub Release
+permissions:
+  contents: write
   
 jobs:  
   build:    
@@ -22,6 +26,26 @@ jobs:
           fetch-tags: true
           fetch-depth: 0
 
+      - name: Stage clean source for the download package
+        # copy every tracked file (including submodules) before the build creates or changes anything
+        shell: cmd
+        run: |
+          git -c core.quotepath=off ls-files --recurse-submodules > "%RUNNER_TEMP%\source-files.txt"
+          tar -c -f "%RUNNER_TEMP%\source.tar" -T "%RUNNER_TEMP%\source-files.txt"
+          mkdir "%RUNNER_TEMP%\package\Helios-Developer-Edition"
+          tar -x -f "%RUNNER_TEMP%\source.tar" -C "%RUNNER_TEMP%\package\Helios-Developer-Edition"
+
+      - name: Choose version number
+        # every build gets the next number (1.6.1001.0, 1.6.1002.0, ...) so a new installer replaces the previous one;
+        # it stays in the 1.6.1xxx.x range that the installer scripts treat as a development build
+        shell: pwsh
+        run: |
+          $build = 1000 + ${{ github.run_number }}
+          if ($build -gt 1999) { throw "Developer Edition version numbers are exhausted; change the numbering in DevBuild.yml." }
+          $version = "1.6.$build.0"
+          echo "DEV_VERSION=$version" >> $env:GITHUB_ENV
+          echo "Building Helios Developer Edition $version"
+
       - name: Setup MSBuild
         uses: microsoft/setup-msbuild@v2
 
@@ -53,7 +77,7 @@ jobs:
         continue-on-error: true
         shell: cmd
         run: |
-          build.cmd test
+          build.cmd dev %DEV_VERSION%
           echo "rc=%errorlevel%" >> $env:GITHUB_ENV
 
       - name: zip up build logs
@@ -82,6 +106,44 @@ jobs:
           tar -a -c -f "./Assets/HeliosDev32Bit_Installers.zip" -C "Helios Installer/Release32" *.msi
           tar -a -c -f "./Assets/HeliosDev_StreamDeck_Alpha.zip" -C "bin/x64/Release" Plugins/OpenMacroBoard.SDK.dll Plugins/OpenMacroBoard.VirtualBoard.dll Plugins/StreamDeckSharp.dll Plugins/HeliosMacroBoard.dll
     
+      - name: Publish installers as a GitHub Release
+        # each build becomes a Release on the repository's main page with:
+        #   - the 64-bit and 32-bit Developer Edition installers
+        #   - one zip with the full source and an Installers folder holding both installers
+        env:
+          GH_TOKEN: ${{ github.token }}
+        shell: pwsh
+        run: |
+          $msi64 = Get-ChildItem "Helios Installer/Release/Helios.*.msi" | Select-Object -First 1
+          $msi32 = Get-ChildItem "Helios Installer/Release32/Helios32bit.*.msi" | Select-Object -First 1
+          if (-not $msi64 -or -not $msi32) { throw "Installers were not built, nothing to publish." }
+
+          $out = Join-Path $env:RUNNER_TEMP "release"
+          New-Item -ItemType Directory -Force -Path $out | Out-Null
+          Copy-Item $msi64.FullName (Join-Path $out "Helios-Developer-Edition-64bit.msi")
+          Copy-Item $msi32.FullName (Join-Path $out "Helios-Developer-Edition-32bit.msi")
+
+          $pkg = Join-Path $env:RUNNER_TEMP "package/Helios-Developer-Edition"
+          $inst = Join-Path $pkg "Installers"
+          New-Item -ItemType Directory -Force -Path $inst | Out-Null
+          Copy-Item (Join-Path $out "Helios-Developer-Edition-64bit.msi") $inst
+          Copy-Item (Join-Path $out "Helios-Developer-Edition-32bit.msi") $inst
+          tar -a -c -f (Join-Path $out "Helios-Developer-Edition-source-and-installers.zip") -C (Join-Path $env:RUNNER_TEMP "package") "Helios-Developer-Edition"
+
+          $tag = "developer-edition-$env:DEV_VERSION"
+          $notes = "Helios Developer Edition $env:DEV_VERSION built from commit ${{ github.sha }} on branch ${{ github.ref_name }}.`n`n" +
+                   "- Helios-Developer-Edition-64bit.msi: installer for 64-bit Windows (most PCs)`n" +
+                   "- Helios-Developer-Edition-32bit.msi: installer for 32-bit Windows`n" +
+                   "- Helios-Developer-Edition-source-and-installers.zip: full source code with both installers in its Installers folder`n`n" +
+                   "Installs to Program Files\Helios Development alongside regular Helios and adds a Developer Edition shortcut to the desktop."
+          gh release create $tag `
+            (Join-Path $out "Helios-Developer-Edition-64bit.msi") `
+            (Join-Path $out "Helios-Developer-Edition-32bit.msi") `
+            (Join-Path $out "Helios-Developer-Edition-source-and-installers.zip") `
+            --repo "${{ github.repository }}" --target "${{ github.sha }}" `
+            --title "Helios Developer Edition $env:DEV_VERSION" --notes $notes
+          if ($LASTEXITCODE -ne 0) { throw "Publishing the release failed." }
+
       - name: Upload Helios_Installers 1
         uses: actions/upload-artifact@v4
         with:
diff --git a/BUILD-DEVELOPER-EDITION.txt b/BUILD-DEVELOPER-EDITION.txt
new file mode 100644
index 000000000..a87d4d0ac
--- /dev/null
+++ b/BUILD-DEVELOPER-EDITION.txt
@@ -0,0 +1,46 @@
+Helios Developer Edition - how to build the installer
+=====================================================
+
+This folder is the complete source for Helios Developer Edition
+(branch helios-developer-edition), including the third-party submodules.
+
+Ready-made installers
+  Every GitHub build publishes a Release on https://github.com/mphillippi7804/Helios/releases with:
+    Helios-Developer-Edition-64bit.msi              installer for 64-bit Windows (most PCs)
+    Helios-Developer-Edition-32bit.msi              installer for 32-bit Windows
+    Helios-Developer-Edition-source-and-installers.zip
+                                                    this source, with both installers in its Installers folder
+  If this folder came from that zip, the installers are already in the Installers folder.
+
+Option A - GitHub (no software needed on your PC)
+  Your fork mphillippi7804/Helios already has this branch.
+  1. On github.com open your fork > Actions > "HeliosDev Build & Create MSI Files".
+  2. Click "Run workflow", choose branch helios-developer-edition, Run.
+  3. When it finishes, the installers appear as a new Release on your fork's Releases page
+     (they are also attached to the run page as artifacts for 2 days).
+
+Option B - build on a Windows PC
+  Requirements:
+    - Windows 10/11
+    - Visual Studio 2022 or newer with the ".NET desktop development" workload
+      and the .NET Framework 4.7.2 targeting pack
+    - Visual Studio extension "Microsoft Visual Studio Installer Projects"
+    - NuGet command line (nuget.exe) on PATH
+  Steps, from a "Developer Command Prompt for VS" in this folder:
+    nuget restore BuildMeFirst.sln
+    nuget restore "KeyPressReceiver/Keypress Receiver.csproj"
+    nuget restore Thirdparty/StreamDeckSharp/src/StreamDeckSharp/StreamDeckSharp.csproj
+    nuget restore Thirdparty/OpenMacroBoard.SDK/src/OpenMacroBoard.SDK/OpenMacroBoard.SDK.csproj
+    nuget restore Thirdparty/OpenMacroBoard.SDK/src/OpenMacroBoard.VirtualBoard/OpenMacroBoard.VirtualBoard.csproj
+    nuget restore Helios.sln
+    build.cmd test
+  or, to give the build its own version number (needed for a new installer to replace an older one):
+    build.cmd dev 1.6.1500.0
+  (keep the third number between 1000 and 1999 and higher than the version you have installed;
+   GitHub builds count up automatically: 1.6.1005.0, 1.6.1006.0, ...)
+  The installers are written to:
+    Helios Installer\Release\Helios.<version>.msi      (64-bit)
+    Helios Installer\Release32\Helios32bit.<version>.msi (32-bit)
+  (The file is named Helios...msi because the build scripts expect that name;
+   it installs as "Helios Developer Edition" in Program Files\Helios Development,
+   alongside regular Helios.)
diff --git a/Helios Installer/Helios Installer.vdproj b/Helios Installer/Helios Installer.vdproj
index d42fd95d1..bf9f3b737 100644
--- a/Helios Installer/Helios Installer.vdproj	
+++ b/Helios Installer/Helios Installer.vdproj	
@@ -3924,7 +3924,7 @@
                 {
                     "{9EF0B969-E518-4E46-987F-47570745A589}:_937487924C53439892F37CF38F2AF25A"
                     {
-                    "Name" = "8:Helios"
+                    "Name" = "8:Helios Developer Edition"
                     "AlwaysCreate" = "11:FALSE"
                     "Condition" = "8:"
                     "Transitive" = "11:FALSE"
@@ -3948,7 +3948,7 @@
             }
             "{3C67513D-01DD-4637-8A68-80971EB9504F}:_E384890BFB804E8DBFE6ADCE0EDB8172"
             {
-            "DefaultLocation" = "8:[ProgramFiles64Folder][Manufacturer]\\[ProductName]"
+            "DefaultLocation" = "8:[ProgramFiles64Folder]Helios Development"
             "Name" = "8:#1925"
             "AlwaysCreate" = "11:TRUE"
             "Condition" = "8:"
@@ -4116,10 +4116,10 @@
         "Product"
         {
         "Name" = "8:Microsoft Visual Studio"
-        "ProductName" = "8:Helios"
-        "ProductCode" = "8:{421509D7-A828-4190-8C5E-8E1D34BAA66F}"
-        "PackageCode" = "8:{531526BD-654F-45DC-B26B-0F01475637F3}"
-        "UpgradeCode" = "8:{589D8667-3ED9-478B-8F67-A56E4FADBC63}"
+        "ProductName" = "8:Helios Developer Edition"
+        "ProductCode" = "8:{D9EDC67F-BB34-499C-B559-F16B1A8D9425}"
+        "PackageCode" = "8:{9F425DB3-5AC3-4E56-8A7D-428CEAED4085}"
+        "UpgradeCode" = "8:{61ABF5C4-2190-4DF7-8D49-7203DFD55DE0}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
@@ -4129,7 +4129,7 @@
         "Manufacturer" = "8:Helios Virtual Cockpit"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:https://github.com/HeliosVirtualCockpit/Helios/issues/"
-        "Title" = "8:Helios"
+        "Title" = "8:Helios Developer Edition"
         "Subject" = "8:"
         "ARPCONTACT" = "8:Helios Contributors"
         "Keywords" = "8:Helios DCS BMS Cockpit"
@@ -4240,7 +4240,7 @@
         {
             "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_04C07E0DE5FE4A0EB4EDFB607E9D253D"
             {
-            "Name" = "8:Helios Profile Editor"
+            "Name" = "8:Developer Edition"
             "Arguments" = "8:"
             "Description" = "8:"
             "ShowCmd" = "3:1"
@@ -4268,7 +4268,7 @@
             }
             "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_4959DA6DB3794FBA92F8B9F85C1ACFC9"
             {
-            "Name" = "8:Helios Profile Editor"
+            "Name" = "8:Developer Edition"
             "Arguments" = "8:"
             "Description" = "8:"
             "ShowCmd" = "3:1"
@@ -4280,25 +4280,11 @@
             "Icon" = "8:_0772EF6D6A1143D284A5C9123C4C6E66"
             "Feature" = "8:"
             }
-            "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_4BAAECF7E41641BDB7D05D98A8B87D5D"
-            {
-            "Name" = "8:Helios Control Center"
-            "Arguments" = "8:"
-            "Description" = "8:"
-            "ShowCmd" = "3:1"
-            "IconIndex" = "3:0"
-            "Transitive" = "11:FALSE"
-            "Target" = "8:_60AF79F40A8140E9B89B3252BF8A567C"
-            "Folder" = "8:_AD59734AD6DF48A39047EBE90EC7C76E"
-            "WorkingFolder" = "8:_E384890BFB804E8DBFE6ADCE0EDB8172"
-            "Icon" = "8:_732146C3695F4256A3FBB284936E4563"
-            "Feature" = "8:"
-            }
             "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_53AFDF753B84467AB063EF6F037857AC"
             {
-            "Name" = "8:Profile Editor Debug"
+            "Name" = "8:Developer Edition Debug"
             "Arguments" = "8:-l Debug"
-            "Description" = "8:Profile Editor with Loglevel Debug"
+            "Description" = "8:Developer Edition with Loglevel Debug"
             "ShowCmd" = "3:1"
             "IconIndex" = "3:0"
             "Transitive" = "11:FALSE"
@@ -4818,7 +4804,7 @@
             }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_0C23ED5842AB4CD4BE1266E39F55D6D2"
             {
-            "SourcePath" = "8:..\\Profile Editor\\obj\\x64\\Release\\Profile Editor.exe"
+            "SourcePath" = "8:..\\Profile Editor\\obj\\x64\\Release\\Developer Edition.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_E384890BFB804E8DBFE6ADCE0EDB8172"
diff --git a/Helios Installer/Helios32bit Installer.vdproj b/Helios Installer/Helios32bit Installer.vdproj
index f37ea015f..ceb4efa83 100644
--- a/Helios Installer/Helios32bit Installer.vdproj	
+++ b/Helios Installer/Helios32bit Installer.vdproj	
@@ -3903,7 +3903,7 @@
                 {
                     "{9EF0B969-E518-4E46-987F-47570745A589}:_937487924C53439892F37CF38F2AF25A"
                     {
-                    "Name" = "8:Helios"
+                    "Name" = "8:Helios Developer Edition"
                     "AlwaysCreate" = "11:FALSE"
                     "Condition" = "8:"
                     "Transitive" = "11:FALSE"
@@ -3927,7 +3927,7 @@
             }
             "{3C67513D-01DD-4637-8A68-80971EB9504F}:_E384890BFB804E8DBFE6ADCE0EDB8172"
             {
-            "DefaultLocation" = "8:[ProgramFilesFolder][Manufacturer]\\[ProductName]"
+            "DefaultLocation" = "8:[ProgramFilesFolder]Helios Development"
             "Name" = "8:#1925"
             "AlwaysCreate" = "11:TRUE"
             "Condition" = "8:"
@@ -4095,10 +4095,10 @@
         "Product"
         {
         "Name" = "8:Microsoft Visual Studio"
-        "ProductName" = "8:Helios"
-        "ProductCode" = "8:{421509D7-A828-4190-8C5E-8E1D34BAA66F}"
-        "PackageCode" = "8:{14E07531-7433-4D31-8378-1E336DD197ED}"
-        "UpgradeCode" = "8:{589D8667-3ED9-478B-8F67-A56E4FADBC63}"
+        "ProductName" = "8:Helios Developer Edition"
+        "ProductCode" = "8:{D9EDC67F-BB34-499C-B559-F16B1A8D9425}"
+        "PackageCode" = "8:{C9D446CE-A9BA-4AFE-87E7-87F45B0C86F4}"
+        "UpgradeCode" = "8:{61ABF5C4-2190-4DF7-8D49-7203DFD55DE0}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
@@ -4108,7 +4108,7 @@
         "Manufacturer" = "8:Helios Virtual Cockpit"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:https://github.com/HeliosVirtualCockpit/Helios/issues/"
-        "Title" = "8:Helios"
+        "Title" = "8:Helios Developer Edition"
         "Subject" = "8:"
         "ARPCONTACT" = "8:Helios Contributors"
         "Keywords" = "8:Helios DCS BMS Cockpit"
@@ -4219,7 +4219,7 @@
         {
             "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_04C07E0DE5FE4A0EB4EDFB607E9D253D"
             {
-            "Name" = "8:Helios Profile Editor"
+            "Name" = "8:Developer Edition"
             "Arguments" = "8:"
             "Description" = "8:"
             "ShowCmd" = "3:1"
@@ -4247,7 +4247,7 @@
             }
             "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_4959DA6DB3794FBA92F8B9F85C1ACFC9"
             {
-            "Name" = "8:Helios Profile Editor"
+            "Name" = "8:Developer Edition"
             "Arguments" = "8:"
             "Description" = "8:"
             "ShowCmd" = "3:1"
@@ -4259,25 +4259,11 @@
             "Icon" = "8:_0772EF6D6A1143D284A5C9123C4C6E66"
             "Feature" = "8:"
             }
-            "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_4BAAECF7E41641BDB7D05D98A8B87D5D"
-            {
-            "Name" = "8:Helios Control Center"
-            "Arguments" = "8:"
-            "Description" = "8:"
-            "ShowCmd" = "3:1"
-            "IconIndex" = "3:0"
-            "Transitive" = "11:FALSE"
-            "Target" = "8:_60AF79F40A8140E9B89B3252BF8A567C"
-            "Folder" = "8:_AD59734AD6DF48A39047EBE90EC7C76E"
-            "WorkingFolder" = "8:_E384890BFB804E8DBFE6ADCE0EDB8172"
-            "Icon" = "8:_732146C3695F4256A3FBB284936E4563"
-            "Feature" = "8:"
-            }
             "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_53AFDF753B84467AB063EF6F037857AC"
             {
-            "Name" = "8:Profile Editor Debug"
+            "Name" = "8:Developer Edition Debug"
             "Arguments" = "8:-l Debug"
-            "Description" = "8:Profile Editor with Loglevel Debug"
+            "Description" = "8:Developer Edition with Loglevel Debug"
             "ShowCmd" = "3:1"
             "IconIndex" = "3:0"
             "Transitive" = "11:FALSE"
@@ -4797,7 +4783,7 @@
             }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_0C23ED5842AB4CD4BE1266E39F55D6D2"
             {
-            "SourcePath" = "8:..\\Profile Editor\\obj\\AnyCPU32\\Release\\Profile Editor.exe"
+            "SourcePath" = "8:..\\Profile Editor\\obj\\AnyCPU32\\Release\\Developer Edition.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_E384890BFB804E8DBFE6ADCE0EDB8172"
diff --git a/Helios Installer/HeliosInstallAdjustments.vbs b/Helios Installer/HeliosInstallAdjustments.vbs
index 1c1bb8a07..c284826b9 100644
--- a/Helios Installer/HeliosInstallAdjustments.vbs	
+++ b/Helios Installer/HeliosInstallAdjustments.vbs	
@@ -25,6 +25,10 @@ else
    Dim toolsUpgrade:toolsUpgrade = "{1A6DEA70-100A-4C3B-A9D9-64340BEAC520}"
    Dim upgradeCode:upgradeCode = heliosUpgrade
    
+   ' upgrade code for Helios Developer Edition, which installs alongside regular Helios
+   ' in Program Files\Helios Development (must match UpgradeCode in the Helios installer projects)
+   Dim heliosDevEditionUpgrade:heliosDevEditionUpgrade = "{61ABF5C4-2190-4DF7-8D49-7203DFD55DE0}"
+
    ' upgrade code for Helios Development Prototypes
    Dim heliosDevUpgrade:heliosDevUpgrade = "{BA7FFC56-BDB7-4B02-8A12-089A630CCF96}"
 
@@ -34,7 +38,10 @@ else
    Dim session : Set session = installer.OpenPackage(database,1) : If Err <> 0 Then Fail "Installer: '" & msiPackage & "' has invalid installer package format"
 
    ' check product (this script is shared)
-   if session.Property("ProductName") = "Helios Keypress Receiver" then
+   if session.Property("ProductName") = "Helios Developer Edition" then
+        Wscript.Echo "configuring Helios Developer Edition"
+        upgradeCode = heliosDevEditionUpgrade
+   elseif session.Property("ProductName") = "Helios Keypress Receiver" then
         Wscript.Echo "configuring Helios Keypress Receiver Installer"
         upgradeCode = keypressUpgrade
    elseif session.Property("ProductName") = "Helios Developer Tools" then
@@ -55,7 +62,7 @@ else
    ' run custom actions as user instead of system
    Execute database, "UPDATE CustomAction SET `Type` = 1025 WHERE `Type` = 3073"
 
-   if session.Property("ProductName") = "Helios" then
+   if session.Property("ProductName") = "Helios" or session.Property("ProductName") = "Helios Developer Edition" then
 		if not RemoveProblemComponent( database, "PATCHING.DLL|patching.dll") then 
             ' if lowercase was not found then try mixed case
             if not RemoveProblemComponent( database, "PATCHING.DLL|Patching.dll") then
@@ -70,7 +77,11 @@ else
    Set devBuild = New RegExp
    devBuild.Pattern = "[0-9]+\.[0-9]+\.1...\.[0-9]+"
    if devBuild.Test(version) then
-     Execute database, "DELETE FROM Shortcut WHERE `Directory_` = 'DesktopFolder' " 
+     ' development builds normally get no desktop shortcuts, but Helios Developer Edition keeps
+     ' its "Developer Edition" desktop shortcut (it is the only desktop shortcut it installs)
+     if session.Property("ProductName") <> "Helios Developer Edition" then
+         Execute database, "DELETE FROM Shortcut WHERE `Directory_` = 'DesktopFolder' " 
+     end if
      Execute database, "UPDATE Shortcut SET `Name` = 'CONTRO~1|Dev Control Center Debug' WHERE `Name` = 'CONTRO~1|Control Center Debug'"
      Execute database, "UPDATE Shortcut SET `Name` = 'PROFIL~1|Dev Profile Editor Debug' WHERE `Name` = 'PROFIL~1|Profile Editor Debug'"
      Execute database, "UPDATE Shortcut SET `Name` = 'HELIOS~2|Dev Helios Profile Editor' WHERE `Name` = 'HELIOS~2|Helios Profile Editor'"
diff --git a/Helios/ConfigManager.cs b/Helios/ConfigManager.cs
index f3eb2405e..8d6f1f028 100644
--- a/Helios/ConfigManager.cs
+++ b/Helios/ConfigManager.cs
@@ -109,7 +109,7 @@ private static void ReportFatalWriteFailureAndExit(string path)
             MessageBox.Show($"Helios could not write to its own data folder at '{path}'.  " 
                 + "Most likely you have an anti virus or 'application firewall' that is trying to protect your 'Documents' folder.\n\n"
                 + "These types of features are sometimes called 'Ransomware Protection' or 'Controlled Folder Access' (in Windows).\n\n"
-                + "You will need to give permission to 'Profile Editor.exe', 'HeliosPatching.exe' and 'Control Center.exe' so that\n"
+                + "You will need to give permission to 'Profile Editor.exe' (or 'Developer Edition.exe'), 'HeliosPatching.exe' and 'Control Center.exe' so that\n"
                 + "Helios can use its own folders.\n\n"
                 + "Helios will now exit.",
                 "Write Access to Helios Folder Denied");
diff --git a/Helios/Controls/ImageDecorationBase.cs b/Helios/Controls/ImageDecorationBase.cs
index 562051d38..b85396088 100644
--- a/Helios/Controls/ImageDecorationBase.cs
+++ b/Helios/Controls/ImageDecorationBase.cs
@@ -143,20 +143,58 @@ public string Image
                     }
                     else
                     {
+                        // when an existing image is replaced in the Profile Editor, keep the control's size and scale the
+                        // new image to fit it; the first image a control receives (new control, profile load, template)
+                        // still sizes the control, and outside the editor (Control Center) behavior is unchanged
                         image = ConfigManager.ImageManager.LoadImage(_imageFile);
-                        if (image != null)
+                        if (image != null && (string.IsNullOrEmpty(oldValue) || !DesignMode))
                         {
                             Width = image.Width;
                             Height = image.Height;
                         }
                     }
 
-                    OnPropertyChanged("Image", oldValue, value, true);
+                    NotifyImageChanged(oldValue, value);
                     Refresh();
                 }
             }
         }
 
+        /// <summary>
+        /// Report the image change.  A centered image is drawn at its own size, so when an existing image is
+        /// replaced, alignment switches to stretched so the new image scales to the size of the control.
+        /// Both changes are one undo step.
+        /// </summary>
+        private void NotifyImageChanged(string oldValue, string newValue)
+        {
+            UndoManager undo = ConfigManager.UndoManager;
+            bool switchAlignment = !string.IsNullOrEmpty(oldValue)
+                                   && !string.IsNullOrEmpty(newValue)
+                                   && _alignment == ImageAlignment.Centered
+                                   && DesignMode
+                                   && !(undo?.Working ?? false);
+            bool ownBatch = switchAlignment && undo != null && !undo.InBatch;
+            if (ownBatch)
+            {
+                undo.StartBatch();
+            }
+            try
+            {
+                OnPropertyChanged("Image", oldValue, newValue, true);
+                if (switchAlignment)
+                {
+                    Alignment = ImageAlignment.Stretched;
+                }
+            }
+            finally
+            {
+                if (ownBatch)
+                {
+                    undo.CloseBatch();
+                }
+            }
+        }
+
         public ImageAlignment Alignment
         {
             get
diff --git a/Helios/Controls/ImageTranslucent.cs b/Helios/Controls/ImageTranslucent.cs
index 8bf0fc808..b3598f051 100644
--- a/Helios/Controls/ImageTranslucent.cs
+++ b/Helios/Controls/ImageTranslucent.cs
@@ -76,8 +76,11 @@ public string Image
                             image = refreshCapableImage.LoadImage(Image, Convert.ToInt32(Width), Convert.ToInt32(Height), LoadImageOptions.ReloadIfChangedExternally);
                         }
                     }
-                    else
+                    else if (string.IsNullOrEmpty(oldValue) || !DesignMode)
                     {
+                        // when an existing image is replaced in the Profile Editor, keep the control's size and scale the
+                        // new image to fit it; the first image a control receives (new control, profile load, template)
+                        // still sizes the control, and outside the editor (Control Center) behavior is unchanged
                         image = ConfigManager.ImageManager.LoadImage(_imageFile);
                         if (image != null)
                         {
@@ -90,12 +93,47 @@ public string Image
                             Height = 100d;
                         }
                     }
-                    OnPropertyChanged("Image", oldValue, value, true);
+                    NotifyImageChanged(oldValue, value);
                     Refresh();
                 }
             }
         }
 
+        /// <summary>
+        /// Report the image change.  A centered image is drawn at its own size, so when an existing image is
+        /// replaced, alignment switches to stretched so the new image scales to the size of the control.
+        /// Both changes are one undo step.
+        /// </summary>
+        private void NotifyImageChanged(string oldValue, string newValue)
+        {
+            UndoManager undo = ConfigManager.UndoManager;
+            bool switchAlignment = !string.IsNullOrEmpty(oldValue)
+                                   && !string.IsNullOrEmpty(newValue)
+                                   && _alignment == ImageAlignment.Centered
+                                   && DesignMode
+                                   && !(undo?.Working ?? false);
+            bool ownBatch = switchAlignment && undo != null && !undo.InBatch;
+            if (ownBatch)
+            {
+                undo.StartBatch();
+            }
+            try
+            {
+                OnPropertyChanged("Image", oldValue, newValue, true);
+                if (switchAlignment)
+                {
+                    Alignment = ImageAlignment.Stretched;
+                }
+            }
+            finally
+            {
+                if (ownBatch)
+                {
+                    undo.CloseBatch();
+                }
+            }
+        }
+
         public ImageAlignment Alignment
         {
             get
diff --git a/Helios/Controls/KneeBoard.cs b/Helios/Controls/KneeBoard.cs
index e52ae68f3..c40e37ce3 100644
--- a/Helios/Controls/KneeBoard.cs
+++ b/Helios/Controls/KneeBoard.cs
@@ -92,7 +92,8 @@ public string Image
 
                     ImageSource image = ConfigManager.ImageManager.LoadImage(_positions[0].Name); //_imageFile
 
-                    if (image != null)
+                    // in the Profile Editor, only size to the image the first time; afterwards the image scales to the control
+                    if (image != null && (string.IsNullOrEmpty(oldValue) || !DesignMode))
                     {
                         Width = image.Width;
                         Height = image.Height;
diff --git a/Helios/HeliosVisualContainer.cs b/Helios/HeliosVisualContainer.cs
index 9ec7ef8f0..09e26f3d8 100644
--- a/Helios/HeliosVisualContainer.cs
+++ b/Helios/HeliosVisualContainer.cs
@@ -40,22 +40,23 @@ public override void ScaleChildren(double scaleX, double scaleY)
         {
             foreach (HeliosVisual visual in Children)
             {
-                if (visual.Left > 0)
-                {
-                    double locXDif = visual.Left;
-                    visual.Left += (locXDif * scaleX) - locXDif;
-                }
+                // position scales with the container, including devices that hang off the left or top edge
+                visual.Left *= scaleX;
+                visual.Top *= scaleY;
 
-                if (visual.Top > 0)
+                // a device turned 90 degrees has its own width running along the container's height
+                double childScaleX = scaleX;
+                double childScaleY = scaleY;
+                if (visual.Rotation != HeliosVisualRotation.None && visual.Rotation != HeliosVisualRotation.ROT180)
                 {
-                    double locYDif = visual.Top;
-                    visual.Top += (locYDif * scaleY) - locYDif;
+                    childScaleX = scaleY;
+                    childScaleY = scaleX;
                 }
 
-                visual.Width = Math.Max(visual.Width * scaleX, 1d);
-                visual.Height = Math.Max(visual.Height * scaleY, 1d);
+                visual.Width = Math.Max(visual.Width * childScaleX, 1d);
+                visual.Height = Math.Max(visual.Height * childScaleY, 1d);
 
-                visual.ScaleChildren(scaleX, scaleY);
+                visual.ScaleChildren(childScaleX, childScaleY);
             }
         }
 
diff --git a/Helios/UndoManager.cs b/Helios/UndoManager.cs
index 7991d5dda..a07f54ce9 100644
--- a/Helios/UndoManager.cs
+++ b/Helios/UndoManager.cs
@@ -62,6 +62,12 @@ public UndoManager()
         /// </summary>
         public bool CanRedo => _redoEvents.Count > 0 && !Working && _batch == null;
 
+        /// <summary>
+        /// Gets a value indicating whether a batch is currently open, so callers that want to group
+        /// several changes into one undo step know whether they need to open (and close) their own.
+        /// </summary>
+        public bool InBatch => _batch != null;
+
         /// <summary>
         /// Rollback the last command.
         /// </summary>
diff --git a/HeliosInstallAdjustments.vbs b/HeliosInstallAdjustments.vbs
index 6e4b72b85..75c300566 100644
--- a/HeliosInstallAdjustments.vbs
+++ b/HeliosInstallAdjustments.vbs
@@ -26,6 +26,10 @@ else
    Dim heliosF15EPluginUpgrade:heliosF15EPluginUpgrade = "{CCACC9F3-3F71-4CE5-8A7E-3CCF3746FC46}"
    Dim upgradeCode:upgradeCode = heliosUpgrade
    
+   ' upgrade code for Helios Developer Edition, which installs alongside regular Helios
+   ' in Program Files\Helios Development (must match UpgradeCode in the Helios installer projects)
+   Dim heliosDevEditionUpgrade:heliosDevEditionUpgrade = "{61ABF5C4-2190-4DF7-8D49-7203DFD55DE0}"
+
    ' upgrade code for Helios Development Prototypes
    Dim heliosDevUpgrade:heliosDevUpgrade = "{BA7FFC56-BDB7-4B02-8A12-089A630CCF96}"
    Dim heliosDevF15EPluginUpgrade:heliosDevF15EPluginUpgrade = "{FF1DE3B4-D0F2-4BC6-AE4C-DCD07C7FFF24}"
@@ -36,7 +40,10 @@ else
    Dim session : Set session = installer.OpenPackage(database,1) : If Err <> 0 Then Fail "Installer: '" & msiPackage & "' has invalid installer package format"
 
    ' check product (this script is shared)
-   if session.Property("ProductName") = "Helios Keypress Receiver" then
+   if session.Property("ProductName") = "Helios Developer Edition" then
+        Wscript.Echo "configuring Helios Developer Edition"
+        upgradeCode = heliosDevEditionUpgrade
+   elseif session.Property("ProductName") = "Helios Keypress Receiver" then
         Wscript.Echo "configuring Helios Keypress Receiver Installer"
         upgradeCode = keypressUpgrade
    elseif session.Property("ProductName") = "Helios Developer Tools" then
diff --git a/Profile Editor/ArchiveInstall/Welcome.xaml b/Profile Editor/ArchiveInstall/Welcome.xaml
index acd9a69d2..16b55471a 100644
--- a/Profile Editor/ArchiveInstall/Welcome.xaml	
+++ b/Profile Editor/ArchiveInstall/Welcome.xaml	
@@ -26,7 +26,7 @@
         <TextBlock Grid.Row="2" Grid.Column="0" Margin="10,10,10,0" Padding="0" TextWrapping="Wrap">Work through the Interface Status until all the interfaces shown there have a green "check mark" status.</TextBlock>
         <TextBlock Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" Margin="10,5,10,10" Padding="0" TextWrapping="Wrap">Use the button on the right to get started.  When you are done, return here via the "Installlation Mode" tab shown at the bottom.</TextBlock>
         <Button Grid.Row="3" Grid.Column="1" VerticalAlignment="Center" Margin="10,5,10,10" Content="Start" Command="{x:Static profileEditor:ProfileEditorCommands.ViewInterfaceStatus}" Style="{StaticResource InterfaceEditorButton}"/>
-        <TextBlock Grid.Row="4" Grid.Column="0" VerticalAlignment="Center" Margin="10" Padding="0" TextWrapping="Wrap">Then use the button on the right to switch to the regular Profile Editor interface or simply exit the program.</TextBlock>
+        <TextBlock Grid.Row="4" Grid.Column="0" VerticalAlignment="Center" Margin="10" Padding="0" TextWrapping="Wrap">Then use the button on the right to switch to the regular Developer Edition interface or simply exit the program.</TextBlock>
         <Button Grid.Row="4" Grid.Column="1" VerticalAlignment="Center" Margin="10" Content="Reset UI" Command="{x:Static profileEditor:ProfileEditorCommands.RestoreDefaultLayout}" Style="{StaticResource InterfaceEditorButton}"/>
         <TextBlock Grid.Row="5" Grid.Column="0" VerticalAlignment="Center" Margin="10" Padding="0" TextWrapping="Wrap">To use the profile you just installed, please run Helios Control Center from the Windows Start menu.</TextBlock>
     </Grid>
diff --git a/Profile Editor/BindingsPanel.xaml b/Profile Editor/BindingsPanel.xaml
index 513ccb3eb..dc66bc116 100644
--- a/Profile Editor/BindingsPanel.xaml	
+++ b/Profile Editor/BindingsPanel.xaml	
@@ -94,13 +94,16 @@
             <ColumnDefinition Width="*" />
             <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
-        <TabControl Name="IOTab" Grid.RowSpan="2" Grid.ColumnSpan="3" Margin="6,6,6,6" SelectedValuePath="Tag" SelectedValue="{Binding BindingType}">
-            <TabItem Header="Input" Tag="Input" />
-            <TabItem Header="Output" Tag="Output" />
-        </TabControl>
-        <Label Grid.Row="0" Grid.Column="0" Margin="12,29,0,0" Style="{StaticResource ActionTriggerLabel}">Actions</Label>
-        <Label Grid.Row="0" Grid.Column="1" Margin="3,29,0,0" Style="{StaticResource Heading1Label}">Bindings</Label>
-        <Label Grid.Row="0" Grid.Column="2" Margin="3,29,0,0" Style="{StaticResource Heading1Label}">Properties</Label>
+        <!-- Input and Output are shown together: triggers and actions on the left, all bindings of the selected item in the middle -->
+        <Label Grid.Row="0" Grid.Column="0" Margin="12,6,0,0" Style="{StaticResource Heading1Label}">
+            <Label.ToolTip>Everything in the profile that can be bound.  Drag a trigger onto an action, or an action onto a trigger, in the Bindings list.</Label.ToolTip>
+            Actions &amp; Triggers
+        </Label>
+        <Label Grid.Row="0" Grid.Column="1" Margin="3,6,0,0" Style="{StaticResource Heading1Label}">
+            <Label.ToolTip>The selected item's actions with their input bindings, and its triggers with their output bindings.</Label.ToolTip>
+            Bindings
+        </Label>
+        <Label Grid.Row="0" Grid.Column="2" Margin="3,6,0,0" Style="{StaticResource Heading1Label}">Properties</Label>
         <TreeView Grid.Row="1" Grid.Column="0" Margin="12,0,3,12" ItemsSource="{Binding ProfileExplorerItems}" Style="{StaticResource ProfileExplorerTreeStyle}" local:DragAndDropManager.DragSourceAdvisor="{StaticResource DropAdvisor}" />
         <TreeView Grid.Row="1" Grid.Column="1" Margin="3,0,6,12" Name="BindingTree" ItemsSource="{Binding BindingItems}" Style="{StaticResource ProfileExplorerTreeStyle}" local:DragAndDropManager.DropTargetAdvisor="{StaticResource DropAdvisor}" SelectedItemChanged="BindingsTree_SelectedItemChanged" />
         <ScrollViewer Grid.Row="1" Grid.Column="2" Margin="0,0,12,12" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
diff --git a/Profile Editor/BindingsPanel.xaml.cs b/Profile Editor/BindingsPanel.xaml.cs
index 263462ab8..57d0db88a 100644
--- a/Profile Editor/BindingsPanel.xaml.cs	
+++ b/Profile Editor/BindingsPanel.xaml.cs	
@@ -39,8 +39,11 @@ public partial class BindingsPanel : UserControl
         private static readonly NLog.Logger Logger = NLog.LogManager.GetCurrentClassLogger();
 
         private HeliosProfile _actionTriggerProfile = null;
-        private ProfileExplorerTreeItem _actionsList = null;
-        private ProfileExplorerTreeItem _triggerList = null;
+
+        /// <summary>
+        /// everything in the profile that can be bound: triggers and actions together
+        /// </summary>
+        private ProfileExplorerTreeItem _sourceList = null;
 
         static BindingsPanel()
         {
@@ -150,6 +153,10 @@ public void Clear()
             ClearSources();
         }
 
+        /// <summary>
+        /// the selected object's actions with their input bindings and its triggers with their output bindings,
+        /// shown together (formerly the separate Input and Output tabs)
+        /// </summary>
         private void LoadBindings()
         {
             if (BindingObject != null)
@@ -157,28 +164,20 @@ private void LoadBindings()
                 ClearBindings();
                 BindingItems = new ProfileExplorerTreeItemCollection();
 
-                if (BindingType == BindingPanelType.Input)
+                // "Input": the actions that feed this device; "Output": the triggers it sends out
+                ProfileExplorerTreeItem bindings = new ProfileExplorerTreeItem(BindingObject,
+                    ProfileExplorerTreeItemType.Action | ProfileExplorerTreeItemType.Trigger | ProfileExplorerTreeItemType.Binding |
+                    ProfileExplorerTreeItemType.GroupInputOutput);
+                if (bindings.HasChildren)
                 {
-                    ProfileExplorerTreeItem inputBindings = new ProfileExplorerTreeItem(BindingObject, ProfileExplorerTreeItemType.Action | ProfileExplorerTreeItemType.Binding);
-                    if (inputBindings.HasChildren)
+                    foreach (ProfileExplorerTreeItem item in bindings.Children)
                     {
-                        foreach (ProfileExplorerTreeItem item in inputBindings.Children)
-                        {
-                            BindingItems.Add(item);
-                        }
-                    }
-                }
-                else if (BindingType == BindingPanelType.Output)
-                {
-                    ProfileExplorerTreeItem outputBindings = new ProfileExplorerTreeItem(BindingObject, ProfileExplorerTreeItemType.Trigger | ProfileExplorerTreeItemType.Binding);
-                    if (outputBindings.HasChildren)
-                    {
-                        foreach (ProfileExplorerTreeItem item in outputBindings.Children)
-                        {
-                            BindingItems.Add(item);
-                        }
+                        BindingItems.Add(item);
                     }
                 }
+
+                // alphabetical at every level; for the same name, input before output
+                AlphabeticalTreeSort.AttachAll(BindingItems, AlphabeticalTreeSort.InputBindingsFirst);
             }
             else
             {
@@ -195,64 +194,43 @@ private void ClearBindings()
             }
         }
 
+        /// <summary>
+        /// everything in the profile that can be bound, triggers and actions together (formerly the separate
+        /// Input and Output tabs); drag a trigger onto an action, or an action onto a trigger, in the Bindings list
+        /// </summary>
         private void LoadSources()
         {
-            ProfileExplorerTreeItemType triggerTypes = ProfileExplorerTreeItemType.Interface | ProfileExplorerTreeItemType.Monitor | ProfileExplorerTreeItemType.Panel | ProfileExplorerTreeItemType.Visual | ProfileExplorerTreeItemType.Trigger;
-            ProfileExplorerTreeItemType actionTypes = ProfileExplorerTreeItemType.Interface | ProfileExplorerTreeItemType.Monitor | ProfileExplorerTreeItemType.Panel | ProfileExplorerTreeItemType.Visual | ProfileExplorerTreeItemType.Action;
-
-            if (BindingObject != null)
+            ProfileExplorerTreeItemType sourceTypes = ProfileExplorerTreeItemType.Interface | ProfileExplorerTreeItemType.Monitor |
+                                                      ProfileExplorerTreeItemType.Panel | ProfileExplorerTreeItemType.Visual |
+                                                      ProfileExplorerTreeItemType.Trigger | ProfileExplorerTreeItemType.Action |
+                                                      // device > name of the thing > "Input" (triggers providing data) / "Output" (actions sending data)
+                                                      ProfileExplorerTreeItemType.GroupByElementName | ProfileExplorerTreeItemType.GroupInputOutput |
+                                                      ProfileExplorerTreeItemType.TriggersAreInput;
+
+            if (BindingObject != null && BindingObject.Profile != _actionTriggerProfile)
             {
-                if (BindingObject.Profile != _actionTriggerProfile)
+                ClearSources();
+                HeliosProfile newProfile = BindingObject.Profile;
+                if (newProfile != null)
                 {
-                    ClearSources();
-                    HeliosProfile newProfile = BindingObject.Profile;
-                    if (newProfile != null)
-                    {
-                        Logger.Debug("loading actions for bindings");
-                        _actionsList = new ProfileExplorerTreeItem(newProfile, actionTypes);
-                        Logger.Debug("loading triggers for bindings");
-                        _triggerList = new ProfileExplorerTreeItem(newProfile, triggerTypes);
-                    }
-                    _actionTriggerProfile = newProfile;
-                }
-            }
+                    Logger.Debug("loading triggers and actions for bindings");
+                    _sourceList = new ProfileExplorerTreeItem(newProfile, sourceTypes);
 
-            if (BindingType == BindingPanelType.Input)
-            {
-                if (_triggerList == null)
-                {
-                    ProfileExplorerItems = null;
-                }
-                else
-                {
-                    ProfileExplorerItems = _triggerList.Children;
-                }
-            }
-            else if (BindingType == BindingPanelType.Output)
-            {
-                if (_actionsList == null)
-                {
-                    ProfileExplorerItems = null;
-                }
-                else
-                {
-                    ProfileExplorerItems = _actionsList.Children;
+                    // alphabetical at every level; for the same name, input (triggers) before output (actions)
+                    AlphabeticalTreeSort.AttachAll(_sourceList.Children, AlphabeticalTreeSort.TriggersFirst);
                 }
+                _actionTriggerProfile = newProfile;
             }
+
+            ProfileExplorerItems = _sourceList?.Children;
         }
 
         private void ClearSources()
         {
-            if (_actionsList != null)
-            {
-                _actionsList.Disconnect();
-                _actionsList = null;
-            }
-
-            if (_triggerList != null)
+            if (_sourceList != null)
             {
-                _triggerList.Disconnect();
-                _triggerList = null;
+                _sourceList.Disconnect();
+                _sourceList = null;
             }
         }
 
diff --git a/Profile Editor/CommandLineOptions.cs b/Profile Editor/CommandLineOptions.cs
index ac3face86..0da2b7f92 100644
--- a/Profile Editor/CommandLineOptions.cs	
+++ b/Profile Editor/CommandLineOptions.cs	
@@ -34,7 +34,7 @@ public IEnumerable<string> Profiles
             get;
             set;
         } = new List<string>();
-        [Usage(ApplicationAlias = "\"Profile Editor.exe\"")]
+        [Usage(ApplicationAlias = "\"Developer Edition.exe\"")]
         public static IEnumerable<Example> Examples
         {
             get
diff --git a/Profile Editor/EditorMouseWheel.cs b/Profile Editor/EditorMouseWheel.cs
new file mode 100644
index 000000000..33e5e0aa5
--- /dev/null
+++ b/Profile Editor/EditorMouseWheel.cs	
@@ -0,0 +1,211 @@
+//  Copyright 2020 Helios Contributors
+//
+//  Helios is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  Helios is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace GadrocsWorkshop.Helios.ProfileEditor
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Windows;
+    using System.Windows.Controls;
+    using System.Windows.Input;
+    using System.Windows.Interop;
+    using System.Windows.Media;
+
+    /// <summary>
+    /// Mouse wheel behavior for the monitor and panel editor tabs:
+    ///
+    /// - Ctrl + wheel zooms in and out, keeping the point under the mouse pointer in place
+    /// - side (tilt) wheel scrolls left and right
+    /// - Shift + wheel also scrolls left and right, for mice that send their side wheel that way
+    /// - plain wheel keeps scrolling up and down as before
+    /// </summary>
+    internal class EditorMouseWheel
+    {
+        /// <summary>
+        /// Windows message for the horizontal (tilt / side) mouse wheel, which WPF on .NET Framework does not
+        /// turn into an event
+        /// </summary>
+        private const int WM_MOUSEHWHEEL = 0x020E;
+
+        /// <summary>
+        /// one wheel notch as reported by Windows
+        /// </summary>
+        private const double WHEEL_DELTA = 120d;
+
+        /// <summary>
+        /// pixels scrolled per wheel notch, matching WPF's own vertical scrolling (3 lines of 16 pixels)
+        /// </summary>
+        private const double PIXELS_PER_NOTCH = 48d;
+
+        private const double ZOOM_STEP = 0.25d;
+        private const double ZOOM_MIN = -4d;
+        private const double ZOOM_MAX = 4d;
+
+        /// <summary>
+        /// all live editor tabs, so the window message hook can find the one under the mouse
+        /// </summary>
+        private static readonly List<WeakReference<EditorMouseWheel>> Instances = new List<WeakReference<EditorMouseWheel>>();
+
+        /// <summary>
+        /// windows we have already hooked; a tab dragged out into a floating window gets a new one
+        /// </summary>
+        private static readonly HashSet<HwndSource> HookedSources = new HashSet<HwndSource>();
+
+        private readonly FrameworkElement _document;
+        private readonly ScrollViewer _scroller;
+        private readonly HeliosVisualContainerEditor _editor;
+
+        private EditorMouseWheel(FrameworkElement document, ScrollViewer scroller, HeliosVisualContainerEditor editor)
+        {
+            _document = document;
+            _scroller = scroller;
+            _editor = editor;
+        }
+
+        /// <summary>
+        /// add zoom and horizontal scroll handling to an editor tab
+        /// </summary>
+        /// <param name="document">the tab content</param>
+        /// <param name="scroller">the scroll viewer around the editor</param>
+        /// <param name="editor">the editor that is zoomed</param>
+        public static void Attach(FrameworkElement document, ScrollViewer scroller, HeliosVisualContainerEditor editor)
+        {
+            EditorMouseWheel handler = new EditorMouseWheel(document, scroller, editor);
+            Instances.Add(new WeakReference<EditorMouseWheel>(handler));
+
+            document.PreviewMouseWheel += handler.Document_PreviewMouseWheel;
+
+            // the window is only known once the tab is shown, and changes if the tab is floated or docked again
+            document.Loaded += (sender, e) => HookWindow(document);
+        }
+
+        private void Document_PreviewMouseWheel(object sender, MouseWheelEventArgs e)
+        {
+            switch (Keyboard.Modifiers)
+            {
+                case ModifierKeys.Control:
+                    Zoom(e.Delta);
+                    e.Handled = true;
+                    break;
+                case ModifierKeys.Shift:
+                    // tilting right scrolls right, but the vertical wheel rolled "down" (negative) should too
+                    ScrollHorizontally(-e.Delta);
+                    e.Handled = true;
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// change zoom level by one step per wheel notch, keeping the point under the mouse pointer still
+        /// </summary>
+        private void Zoom(int wheelDelta)
+        {
+            double steps = Math.Round(wheelDelta / WHEEL_DELTA);
+            if (steps == 0d)
+            {
+                // high resolution wheels send small deltas; still move one step in that direction
+                steps = Math.Sign(wheelDelta);
+            }
+
+            double oldLevel = _editor.ZoomLevel;
+            double newLevel = Math.Max(ZOOM_MIN, Math.Min(ZOOM_MAX, oldLevel + steps * ZOOM_STEP));
+            if (newLevel == oldLevel)
+            {
+                return;
+            }
+
+            // where the pointer is on the editor, in zoomed pixels, before the change
+            Point pointer = Mouse.GetPosition(_editor);
+            double oldFactor = _editor.ZoomFactor;
+            double oldHorizontalOffset = _scroller.HorizontalOffset;
+            double oldVerticalOffset = _scroller.VerticalOffset;
+
+            // changing the level recalculates ZoomFactor immediately
+            _editor.ZoomLevel = newLevel;
+            double newFactor = _editor.ZoomFactor;
+            if (oldFactor <= 0d || newFactor <= 0d)
+            {
+                return;
+            }
+
+            // let the scroll viewer learn the new size of the editor before scrolling within it
+            _scroller.UpdateLayout();
+
+            // the same spot on the profile is now (ratio) times further from the editor's corner,
+            // so scroll by the difference to keep it under the pointer
+            double ratio = newFactor / oldFactor;
+            _scroller.ScrollToHorizontalOffset(oldHorizontalOffset + pointer.X * (ratio - 1d));
+            _scroller.ScrollToVerticalOffset(oldVerticalOffset + pointer.Y * (ratio - 1d));
+        }
+
+        /// <summary>
+        /// scroll sideways; positive delta scrolls to the right
+        /// </summary>
+        private void ScrollHorizontally(int wheelDelta)
+        {
+            double offset = _scroller.HorizontalOffset + wheelDelta / WHEEL_DELTA * PIXELS_PER_NOTCH;
+            _scroller.ScrollToHorizontalOffset(Math.Max(0d, Math.Min(offset, _scroller.ScrollableWidth)));
+        }
+
+        private static void HookWindow(Visual visual)
+        {
+            if (!(PresentationSource.FromVisual(visual) is HwndSource source) || HookedSources.Contains(source))
+            {
+                return;
+            }
+            HookedSources.Add(source);
+            source.AddHook(WndProc);
+            source.Disposed += (sender, e) => HookedSources.Remove(source);
+        }
+
+        private static IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
+        {
+            if (msg != WM_MOUSEHWHEEL)
+            {
+                return IntPtr.Zero;
+            }
+
+            EditorMouseWheel target = FindTabUnderMouse();
+            if (target == null)
+            {
+                return IntPtr.Zero;
+            }
+
+            // high word of wParam is the signed wheel delta; positive means tilted to the right
+            int delta = unchecked((short)((wParam.ToInt64() >> 16) & 0xFFFF));
+            target.ScrollHorizontally(delta);
+
+            // mark it handled so nothing else scrolls as well; Windows expects zero when the message is processed
+            handled = true;
+            return IntPtr.Zero;
+        }
+
+        private static EditorMouseWheel FindTabUnderMouse()
+        {
+            Instances.RemoveAll(reference => !reference.TryGetTarget(out _));
+            foreach (WeakReference<EditorMouseWheel> reference in Instances.ToList())
+            {
+                if (reference.TryGetTarget(out EditorMouseWheel handler)
+                    && handler._document.IsVisible
+                    && handler._scroller.IsMouseOver)
+                {
+                    return handler;
+                }
+            }
+            return null;
+        }
+    }
+}
diff --git a/Profile Editor/FindReplace/FindResultsWindow.xaml b/Profile Editor/FindReplace/FindResultsWindow.xaml
new file mode 100644
index 000000000..c44f166a2
--- /dev/null
+++ b/Profile Editor/FindReplace/FindResultsWindow.xaml	
@@ -0,0 +1,70 @@
+<Window x:Class="GadrocsWorkshop.Helios.ProfileEditor.FindReplace.FindResultsWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        Title="Find All Results"
+        Height="520" Width="1100"
+        MinHeight="300" MinWidth="600"
+        WindowStartupLocation="CenterOwner"
+        ShowInTaskbar="False">
+    <Window.Resources>
+        <Style x:Key="WrappedCell" TargetType="TextBlock">
+            <Setter Property="TextWrapping" Value="Wrap" />
+            <Setter Property="VerticalAlignment" Value="Top" />
+            <Setter Property="Margin" Value="2,1" />
+        </Style>
+    </Window.Resources>
+    <Grid Margin="8">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+
+        <TextBlock x:Name="SummaryText" Grid.Row="0" Margin="0,0,0,6" />
+
+        <DataGrid x:Name="ResultsGrid" Grid.Row="1"
+                  AutoGenerateColumns="False"
+                  IsReadOnly="True"
+                  SelectionMode="Extended"
+                  SelectionUnit="FullRow"
+                  CanUserAddRows="False"
+                  CanUserDeleteRows="False"
+                  HeadersVisibility="Column"
+                  GridLinesVisibility="All"
+                  VerticalScrollBarVisibility="Auto"
+                  HorizontalScrollBarVisibility="Auto"
+                  MouseDoubleClick="ResultsGrid_MouseDoubleClick"
+                  SelectionChanged="ResultsGrid_SelectionChanged">
+            <DataGrid.Columns>
+                <DataGridTextColumn Header="Panel" Binding="{Binding Panel}" Width="140" ElementStyle="{StaticResource WrappedCell}" />
+                <DataGridTextColumn Header="Device" Binding="{Binding Device}" Width="160" ElementStyle="{StaticResource WrappedCell}" />
+                <DataGridTextColumn Header="Binding" Binding="{Binding Bindings}" Width="2*" ElementStyle="{StaticResource WrappedCell}" />
+                <DataGridTextColumn Header="Path" Binding="{Binding Path}" Width="2*" ElementStyle="{StaticResource WrappedCell}" />
+                <DataGridTextColumn Header="Images" Binding="{Binding Images}" Width="2*" ElementStyle="{StaticResource WrappedCell}" />
+            </DataGrid.Columns>
+        </DataGrid>
+
+        <StackPanel Grid.Row="2" Orientation="Horizontal" Margin="0,8,0,0">
+            <Button x:Name="GoToButton" Content="Go To" MinWidth="80" Padding="8,2" Click="GoTo_Click" IsEnabled="False"
+                    ToolTip="Open the tab containing each selected device and select it." />
+        </StackPanel>
+
+        <Grid Grid.Row="3" Margin="0,8,0,0">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
+            <TextBox x:Name="ReplaceTextBox" Grid.Column="0" VerticalContentAlignment="Center" MinHeight="22"
+                     ToolTip="Text that will replace the Find value." />
+            <Button x:Name="ReplaceButton" Grid.Column="1" Content="Replace" MinWidth="80" Padding="8,2" Margin="6,0,0,0" Click="Replace_Click" IsEnabled="False"
+                    ToolTip="Replace the Find value in the selected rows only." />
+            <Button x:Name="ReplaceAllButton" Grid.Column="2" Content="Replace All" MinWidth="80" Padding="8,2" Margin="6,0,0,0" Click="ReplaceAll_Click"
+                    ToolTip="Replace every instance of the Find value in the whole profile." />
+        </Grid>
+
+        <TextBlock x:Name="StatusText" Grid.Row="4" Margin="0,6,0,0" Foreground="DimGray" TextWrapping="Wrap" />
+    </Grid>
+</Window>
diff --git a/Profile Editor/FindReplace/FindResultsWindow.xaml.cs b/Profile Editor/FindReplace/FindResultsWindow.xaml.cs
new file mode 100644
index 000000000..21afd893b
--- /dev/null
+++ b/Profile Editor/FindReplace/FindResultsWindow.xaml.cs	
@@ -0,0 +1,173 @@
+//  Copyright 2020 Helios Contributors
+//
+//  Helios is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  Helios is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace GadrocsWorkshop.Helios.ProfileEditor.FindReplace
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Collections.ObjectModel;
+    using System.Linq;
+    using System.Windows;
+    using System.Windows.Controls;
+    using System.Windows.Input;
+    using System.Windows.Media;
+
+    /// <summary>
+    /// Popup listing every device that contains the Find value, with Go To, Replace and Replace All.
+    /// </summary>
+    public partial class FindResultsWindow : Window
+    {
+        private readonly Func<HeliosProfile> _getProfile;
+        private readonly Action<IList<HeliosVisual>> _goTo;
+        private readonly ObservableCollection<SearchResultRow> _rows = new ObservableCollection<SearchResultRow>();
+
+        /// <param name="getProfile">returns the profile currently loaded in the editor</param>
+        /// <param name="goTo">opens the tabs containing the given devices and selects them</param>
+        public FindResultsWindow(Func<HeliosProfile> getProfile, Action<IList<HeliosVisual>> goTo)
+        {
+            _getProfile = getProfile;
+            _goTo = goTo;
+            InitializeComponent();
+            ResultsGrid.ItemsSource = _rows;
+        }
+
+        /// <summary>
+        /// the value from the main window's Find input that these results are for
+        /// </summary>
+        public string SearchText { get; private set; }
+
+        /// <summary>
+        /// show a new set of results
+        /// </summary>
+        public void ShowResults(string searchText, IEnumerable<SearchResultRow> rows)
+        {
+            SearchText = searchText;
+            _rows.Clear();
+            foreach (SearchResultRow row in rows)
+            {
+                _rows.Add(row);
+            }
+            Title = $"Find All Results - \"{searchText}\"";
+            StatusText.Text = "";
+            UpdateSummary();
+            UpdateButtons();
+        }
+
+        private void UpdateSummary()
+        {
+            int occurrences = _rows.Sum(r => r.MatchCount);
+            SummaryText.Text = $"Found \"{SearchText}\" in {_rows.Count} device(s), {occurrences} value(s).";
+        }
+
+        private void UpdateButtons()
+        {
+            bool hasSelection = ResultsGrid.SelectedItems.Count > 0;
+            GoToButton.IsEnabled = hasSelection;
+            ReplaceButton.IsEnabled = hasSelection;
+            ReplaceAllButton.IsEnabled = _rows.Count > 0;
+        }
+
+        private List<SearchResultRow> SelectedRows => ResultsGrid.SelectedItems.OfType<SearchResultRow>().ToList();
+
+        private void ResultsGrid_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            UpdateButtons();
+        }
+
+        private void ResultsGrid_MouseDoubleClick(object sender, MouseButtonEventArgs e)
+        {
+            // only react to double clicks on a row, not on headers or scroll bars
+            DependencyObject source = e.OriginalSource as DependencyObject;
+            while (source != null && !(source is DataGridRow))
+            {
+                source = VisualTreeHelper.GetParent(source);
+            }
+            if (source is DataGridRow row && row.Item is SearchResultRow result)
+            {
+                _goTo(new List<HeliosVisual> { result.Visual });
+            }
+        }
+
+        private void GoTo_Click(object sender, RoutedEventArgs e)
+        {
+            List<SearchResultRow> selected = SelectedRows;
+            if (selected.Count == 0)
+            {
+                return;
+            }
+            _goTo(selected.Select(r => r.Visual).ToList());
+        }
+
+        private void Replace_Click(object sender, RoutedEventArgs e)
+        {
+            List<SearchResultRow> selected = SelectedRows;
+            if (selected.Count == 0)
+            {
+                return;
+            }
+            ReplaceResult result = ProfileSearch.Replace(selected.Select(r => r.Visual), SearchText, ReplaceTextBox.Text);
+            AfterReplace(result);
+        }
+
+        private void ReplaceAll_Click(object sender, RoutedEventArgs e)
+        {
+            HeliosProfile profile = _getProfile();
+            if (profile == null)
+            {
+                return;
+            }
+
+            MessageBoxResult answer = MessageBox.Show(this,
+                $"Replace every instance of \"{SearchText}\" with \"{ReplaceTextBox.Text}\" in the whole profile?\n\nThis can be undone with Edit > Undo.",
+                "Replace All", MessageBoxButton.OKCancel, MessageBoxImage.Question);
+            if (answer != MessageBoxResult.OK)
+            {
+                return;
+            }
+
+            // newly matching devices may exist that were not in the list (e.g. added since the search)
+            List<SearchResultRow> current = ProfileSearch.Find(profile, SearchText);
+            foreach (SearchResultRow row in current.Where(r => _rows.All(existing => existing.Visual != r.Visual)))
+            {
+                _rows.Add(row);
+            }
+
+            ReplaceResult result = ProfileSearch.ReplaceAll(profile, SearchText, ReplaceTextBox.Text);
+            AfterReplace(result);
+        }
+
+        private void AfterReplace(ReplaceResult result)
+        {
+            // keep the rows so the user can see what changed, but refresh their contents
+            foreach (SearchResultRow row in _rows)
+            {
+                row.Refresh(SearchText);
+            }
+            UpdateSummary();
+            UpdateButtons();
+
+            string status = $"Replaced {result.Occurrences} occurrence(s) in {result.Devices} device(s).";
+            if (result.ReadOnlySkipped > 0)
+            {
+                status += $" {result.ReadOnlySkipped} match(es) were skipped because they are generated names (for example interface binding names) and cannot be edited here.";
+            }
+            if (result.InvalidNameSkipped > 0)
+            {
+                status += $" {result.InvalidNameSkipped} device name(s) were left unchanged because the new name would be blank, contain characters other than letters, digits, spaces, '-' or '_', or match another device in the same panel.";
+            }
+            StatusText.Text = status;
+        }
+    }
+}
diff --git a/Profile Editor/FindReplace/ProfileSearch.cs b/Profile Editor/FindReplace/ProfileSearch.cs
new file mode 100644
index 000000000..5eaf891c5
--- /dev/null
+++ b/Profile Editor/FindReplace/ProfileSearch.cs	
@@ -0,0 +1,550 @@
+//  Copyright 2020 Helios Contributors
+//
+//  Helios is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  Helios is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace GadrocsWorkshop.Helios.ProfileEditor.FindReplace
+{
+    using System;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.ComponentModel;
+    using System.Linq;
+    using System.Reflection;
+    using System.Text.RegularExpressions;
+    using GadrocsWorkshop.Helios.Controls;
+
+    /// <summary>
+    /// One searchable text value somewhere on a device: a property of the control, a property of an
+    /// item in one of its collections (e.g. a rotary switch position), or a field of one of its bindings.
+    /// </summary>
+    internal class SearchField
+    {
+        public SearchField(object source, PropertyInfo property, string label, bool isImage, bool forceReadOnly = false)
+        {
+            Source = source;
+            Property = property;
+            Label = label;
+            IsImage = isImage;
+            IsWritable = !forceReadOnly && property.CanWrite && property.GetSetMethod() != null;
+        }
+
+        public object Source { get; }
+        public PropertyInfo Property { get; }
+        public string Label { get; }
+        public bool IsImage { get; }
+        public bool IsWritable { get; }
+
+        public string Value
+        {
+            get
+            {
+                try
+                {
+                    return Property.GetValue(Source) as string;
+                }
+                catch (Exception)
+                {
+                    // some computed properties throw when the control is not fully configured
+                    return null;
+                }
+            }
+        }
+    }
+
+    /// <summary>
+    /// One row in the Find All results: a device (control) that contains at least one match.
+    /// </summary>
+    public class SearchResultRow : NotifyPropertyChanged
+    {
+        private string _panel;
+        private string _device;
+        private string _bindings;
+        private string _path;
+        private string _images;
+        private int _matchCount;
+
+        public SearchResultRow(HeliosVisual visual)
+        {
+            Visual = visual;
+        }
+
+        /// <summary>
+        /// the device this row represents
+        /// </summary>
+        public HeliosVisual Visual { get; }
+
+        public string Panel
+        {
+            get => _panel;
+            private set => SetField(ref _panel, value, nameof(Panel));
+        }
+
+        public string Device
+        {
+            get => _device;
+            private set => SetField(ref _device, value, nameof(Device));
+        }
+
+        public string Bindings
+        {
+            get => _bindings;
+            private set => SetField(ref _bindings, value, nameof(Bindings));
+        }
+
+        public string Path
+        {
+            get => _path;
+            private set => SetField(ref _path, value, nameof(Path));
+        }
+
+        public string Images
+        {
+            get => _images;
+            private set => SetField(ref _images, value, nameof(Images));
+        }
+
+        /// <summary>
+        /// number of fields on this device that contain the search text
+        /// </summary>
+        public int MatchCount
+        {
+            get => _matchCount;
+            private set => SetField(ref _matchCount, value, nameof(MatchCount));
+        }
+
+        /// <summary>
+        /// recalculate all displayed columns from the current state of the device
+        /// </summary>
+        public void Refresh(string searchText)
+        {
+            Panel = ProfileSearch.GetPanelName(Visual);
+            Device = Visual.Name;
+            Path = ProfileSearch.GetPath(Visual);
+            Bindings = string.Join(Environment.NewLine, ProfileSearch.GetInterfaceBindingNames(Visual));
+
+            List<SearchField> fields = ProfileSearch.GetFields(Visual).ToList();
+            Images = string.Join(Environment.NewLine, fields
+                .Where(f => f.IsImage)
+                .Select(f => f.Value)
+                .Where(v => !string.IsNullOrWhiteSpace(v))
+                .Distinct(StringComparer.OrdinalIgnoreCase));
+            MatchCount = string.IsNullOrEmpty(searchText)
+                ? 0
+                : fields.Count(f => ProfileSearch.Contains(f.Value, searchText));
+        }
+    }
+
+    /// <summary>
+    /// minimal INotifyPropertyChanged base so the results grid updates after a replace
+    /// </summary>
+    public abstract class NotifyPropertyChanged : INotifyPropertyChanged
+    {
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        protected void SetField<T>(ref T field, T value, string propertyName)
+        {
+            if (EqualityComparer<T>.Default.Equals(field, value))
+            {
+                return;
+            }
+            field = value;
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+    }
+
+    /// <summary>
+    /// outcome of a replace operation
+    /// </summary>
+    public class ReplaceResult
+    {
+        /// <summary>
+        /// number of text occurrences replaced
+        /// </summary>
+        public int Occurrences { get; set; }
+
+        /// <summary>
+        /// number of devices that were changed
+        /// </summary>
+        public int Devices { get; set; }
+
+        /// <summary>
+        /// number of matching values that could not be changed because they are generated
+        /// (for example binding descriptions that come from interface names)
+        /// </summary>
+        public int ReadOnlySkipped { get; set; }
+
+        /// <summary>
+        /// number of device names that were not changed because the result would not be a valid name
+        /// (blank, characters other than letters, digits, space, '-' and '_', or the same as a sibling's name);
+        /// such names would break binding references in the saved profile
+        /// </summary>
+        public int InvalidNameSkipped { get; set; }
+    }
+
+    /// <summary>
+    /// Searches every device in a profile for a piece of text and replaces it.
+    /// </summary>
+    public static class ProfileSearch
+    {
+        /// <summary>
+        /// properties that are plumbing rather than user data and must never be searched or replaced
+        /// </summary>
+        private static readonly HashSet<string> ExcludedProperties = new HashSet<string>
+        {
+            nameof(HeliosObject.TypeIdentifier),
+            nameof(HeliosVisual.Children),
+            nameof(HeliosVisual.Parent),
+            nameof(HeliosVisual.Monitor),
+            nameof(HeliosObject.Profile),
+            nameof(HeliosObject.Actions),
+            nameof(HeliosObject.Triggers),
+            nameof(HeliosObject.Values),
+            nameof(HeliosObject.InputBindings),
+            nameof(HeliosObject.OutputBindings),
+            nameof(HeliosObject.OpaqueHandles),
+            nameof(HeliosVisual.NonClickableZones),
+            nameof(HeliosVisual.Renderer)
+        };
+
+        /// <summary>
+        /// the same rule the Properties panel enforces for device names
+        /// </summary>
+        private static readonly Regex ValidName = new Regex("^[a-zA-Z0-9-_ ]*$");
+
+        /// <summary>
+        /// true if a device could be renamed to this without breaking the profile: same rules as the Properties panel,
+        /// and no sibling already uses the name
+        /// </summary>
+        internal static bool IsValidNewName(HeliosVisual visual, string newName)
+        {
+            if (string.IsNullOrWhiteSpace(newName) || !ValidName.IsMatch(newName))
+            {
+                return false;
+            }
+            if (visual.Parent != null && !newName.Equals(visual.Name) && visual.Parent.Children.ContainsKey(newName))
+            {
+                return false;
+            }
+            return true;
+        }
+
+        internal static bool Contains(string value, string searchText) =>
+            !string.IsNullOrEmpty(value)
+            && !string.IsNullOrEmpty(searchText)
+            && value.IndexOf(searchText, StringComparison.OrdinalIgnoreCase) >= 0;
+
+        /// <summary>
+        /// Find every device in the profile that contains the search text anywhere (name, text properties,
+        /// image paths, collection items, binding values, binding conditions and binding names).
+        /// Matching is case insensitive.
+        /// </summary>
+        public static List<SearchResultRow> Find(HeliosProfile profile, string searchText)
+        {
+            List<SearchResultRow> rows = new List<SearchResultRow>();
+            if (profile == null || string.IsNullOrEmpty(searchText))
+            {
+                return rows;
+            }
+
+            foreach (HeliosVisual visual in AllVisuals(profile))
+            {
+                if (!GetFields(visual).Any(f => Contains(f.Value, searchText)))
+                {
+                    continue;
+                }
+                SearchResultRow row = new SearchResultRow(visual);
+                row.Refresh(searchText);
+                rows.Add(row);
+            }
+            return rows;
+        }
+
+        /// <summary>
+        /// Replace the search text in the given devices only.  All changes form a single undo step.
+        /// </summary>
+        public static ReplaceResult Replace(IEnumerable<HeliosVisual> visuals, string searchText, string replacement)
+        {
+            ReplaceResult result = new ReplaceResult();
+            if (string.IsNullOrEmpty(searchText))
+            {
+                return result;
+            }
+            replacement = replacement ?? "";
+            Regex pattern = new Regex(Regex.Escape(searchText), RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
+
+            UndoManager undo = ConfigManager.UndoManager;
+            undo?.StartBatch();
+            try
+            {
+                foreach (HeliosVisual visual in visuals.Distinct().ToList())
+                {
+                    bool changed = false;
+
+                    // snapshot the field list first, because renaming can change derived values
+                    foreach (SearchField field in GetFields(visual).ToList())
+                    {
+                        string oldValue = field.Value;
+                        if (!Contains(oldValue, searchText))
+                        {
+                            continue;
+                        }
+                        if (!field.IsWritable)
+                        {
+                            result.ReadOnlySkipped++;
+                            continue;
+                        }
+
+                        int occurrences = pattern.Matches(oldValue).Count;
+                        string newValue = pattern.Replace(oldValue, _ => replacement);
+
+                        if (field.Source is HeliosVisual namedVisual
+                            && field.Property.Name == nameof(HeliosObject.Name)
+                            && !IsValidNewName(namedVisual, newValue))
+                        {
+                            result.InvalidNameSkipped++;
+                            continue;
+                        }
+                        try
+                        {
+                            field.Property.SetValue(field.Source, newValue);
+                        }
+                        catch (Exception ex)
+                        {
+                            ConfigManager.LogManager.LogError($"Find/Replace could not set {field.Label} on {visual.Name}", ex);
+                            continue;
+                        }
+
+                        // changes to controls propagate up to the profile and are recorded automatically,
+                        // but bindings and collection items do not, so record those explicitly
+                        if (!(field.Source is HeliosVisual))
+                        {
+                            undo?.AddPropertyChange(field.Source, field.Property.Name, oldValue, newValue);
+                        }
+
+                        result.Occurrences += occurrences;
+                        changed = true;
+                    }
+
+                    if (changed)
+                    {
+                        result.Devices++;
+                    }
+                }
+            }
+            finally
+            {
+                undo?.CloseBatch();
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// Replace the search text everywhere in the profile.  All changes form a single undo step.
+        /// </summary>
+        public static ReplaceResult ReplaceAll(HeliosProfile profile, string searchText, string replacement)
+        {
+            return Replace(Find(profile, searchText).Select(r => r.Visual), searchText, replacement);
+        }
+
+        /// <summary>
+        /// every device in the profile, depth first, starting with each monitor
+        /// </summary>
+        public static IEnumerable<HeliosVisual> AllVisuals(HeliosProfile profile)
+        {
+            foreach (Monitor monitor in profile.Monitors)
+            {
+                foreach (HeliosVisual visual in Descendants(monitor))
+                {
+                    yield return visual;
+                }
+            }
+        }
+
+        private static IEnumerable<HeliosVisual> Descendants(HeliosVisual root)
+        {
+            yield return root;
+            if (!root.PersistChildren)
+            {
+                // internal parts of a composite control that are rebuilt by code and never saved;
+                // editing them would be lost on reload, so they are not searched
+                yield break;
+            }
+            foreach (HeliosVisual child in root.Children.ToList())
+            {
+                foreach (HeliosVisual visual in Descendants(child))
+                {
+                    yield return visual;
+                }
+            }
+        }
+
+        /// <summary>
+        /// name of the nearest panel containing the device, or empty if it sits directly on a monitor
+        /// </summary>
+        public static string GetPanelName(HeliosVisual visual)
+        {
+            for (HeliosVisual parent = visual.Parent; parent != null; parent = parent.Parent)
+            {
+                if (parent is HeliosPanel)
+                {
+                    return parent.Name;
+                }
+            }
+            return "";
+        }
+
+        /// <summary>
+        /// parent/child path from the monitor down to the device, formatted like a file path
+        /// </summary>
+        public static string GetPath(HeliosVisual visual)
+        {
+            List<string> parts = new List<string>();
+            for (HeliosVisual current = visual; current != null; current = current.Parent)
+            {
+                parts.Add(current.Name);
+            }
+            parts.Reverse();
+            return string.Join("\\", parts);
+        }
+
+        /// <summary>
+        /// names of all bindings between this device and any interface
+        /// </summary>
+        public static IEnumerable<string> GetInterfaceBindingNames(HeliosVisual visual)
+        {
+            foreach (HeliosBinding binding in AllBindings(visual))
+            {
+                string description = null;
+                try
+                {
+                    if (binding.Trigger?.Owner is HeliosInterface || binding.Action?.Owner is HeliosInterface)
+                    {
+                        description = binding.Description;
+                    }
+                }
+                catch (Exception)
+                {
+                    // binding to something no longer loaded; ignore
+                }
+                if (!string.IsNullOrWhiteSpace(description))
+                {
+                    yield return description;
+                }
+            }
+        }
+
+        private static IEnumerable<HeliosBinding> AllBindings(HeliosObject heliosObject) =>
+            heliosObject.InputBindings.Concat(heliosObject.OutputBindings).Distinct().ToList();
+
+        /// <summary>
+        /// all searchable text values belonging to a device
+        /// </summary>
+        internal static IEnumerable<SearchField> GetFields(HeliosVisual visual)
+        {
+            foreach (PropertyInfo property in visual.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance))
+            {
+                if (property.GetIndexParameters().Length > 0 || ExcludedProperties.Contains(property.Name) || property.GetGetMethod() == null)
+                {
+                    continue;
+                }
+
+                if (property.PropertyType == typeof(string))
+                {
+                    // only user-editable text is interesting; read-only strings are computed
+                    if (property.CanWrite && property.GetSetMethod() != null)
+                    {
+                        yield return new SearchField(visual, property, property.Name, IsImageProperty(property));
+                    }
+                    continue;
+                }
+
+                if (!typeof(IEnumerable).IsAssignableFrom(property.PropertyType))
+                {
+                    continue;
+                }
+
+                // collections of configuration items, such as rotary switch positions
+                foreach (SearchField field in GetCollectionFields(visual, property))
+                {
+                    yield return field;
+                }
+            }
+
+            // bindings attached to this device
+            PropertyInfo valueProperty = typeof(HeliosBinding).GetProperty(nameof(HeliosBinding.Value));
+            PropertyInfo conditionProperty = typeof(HeliosBinding).GetProperty(nameof(HeliosBinding.Condition));
+            PropertyInfo descriptionProperty = typeof(HeliosBinding).GetProperty(nameof(HeliosBinding.Description));
+            foreach (HeliosBinding binding in AllBindings(visual))
+            {
+                yield return new SearchField(binding, valueProperty, "Binding Value", false);
+                yield return new SearchField(binding, conditionProperty, "Binding Condition", false);
+                yield return new SearchField(binding, descriptionProperty, "Binding", false, forceReadOnly: true);
+            }
+        }
+
+        private static IEnumerable<SearchField> GetCollectionFields(HeliosVisual visual, PropertyInfo property)
+        {
+            IEnumerable collection;
+            try
+            {
+                collection = property.GetValue(visual) as IEnumerable;
+            }
+            catch (Exception)
+            {
+                yield break;
+            }
+            if (collection == null)
+            {
+                yield break;
+            }
+
+            List<object> items;
+            try
+            {
+                items = collection.Cast<object>().ToList();
+            }
+            catch (Exception)
+            {
+                yield break;
+            }
+
+            for (int index = 0; index < items.Count; index++)
+            {
+                object item = items[index];
+
+                // never descend into other Helios objects here; child controls are visited on their own
+                if (item == null || item is HeliosObject || item is string || item.GetType().IsPrimitive)
+                {
+                    continue;
+                }
+
+                foreach (PropertyInfo itemProperty in item.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance))
+                {
+                    if (itemProperty.PropertyType != typeof(string)
+                        || itemProperty.GetIndexParameters().Length > 0
+                        || itemProperty.GetGetMethod() == null
+                        || !itemProperty.CanWrite
+                        || itemProperty.GetSetMethod() == null)
+                    {
+                        continue;
+                    }
+                    yield return new SearchField(item, itemProperty, $"{property.Name}[{index}].{itemProperty.Name}", IsImageProperty(itemProperty));
+                }
+            }
+        }
+
+        private static bool IsImageProperty(PropertyInfo property) =>
+            property.Name.IndexOf("Image", StringComparison.OrdinalIgnoreCase) >= 0;
+    }
+}
diff --git a/Profile Editor/GlobalOptionsWindow.xaml b/Profile Editor/GlobalOptionsWindow.xaml
index bbfea223c..825c233ae 100644
--- a/Profile Editor/GlobalOptionsWindow.xaml	
+++ b/Profile Editor/GlobalOptionsWindow.xaml	
@@ -5,7 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:GadrocsWorkshop.Helios.ProfileEditor"
              mc:Ignorable="d" 
-             Title="Profile Editor Options"
+             Title="Developer Edition Options"
              SizeToContent="WidthAndHeight"
              d:DataContext="{d:DesignInstance Type={x:Type local:GlobalOptions}}">
     <WrapPanel Orientation="Vertical" Margin="6">
diff --git a/Profile Editor/GroupCommands.cs b/Profile Editor/GroupCommands.cs
new file mode 100644
index 000000000..f0bdebde4
--- /dev/null
+++ b/Profile Editor/GroupCommands.cs	
@@ -0,0 +1,264 @@
+//  Copyright 2020 Helios Contributors
+//
+//  Helios is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  Helios is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace GadrocsWorkshop.Helios.ProfileEditor
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Windows;
+    using GadrocsWorkshop.Helios.Controls;
+    using GadrocsWorkshop.Helios.ProfileEditor.UndoEvents;
+
+    /// <summary>
+    /// Group (Ctrl+G) and Ungroup (Ctrl+U) for the monitor and panel editors.
+    ///
+    /// Group:
+    /// - no panel selected: all selected devices are placed in a new panel
+    /// - a panel and other devices selected: the first selected panel grows to include the other devices,
+    ///   which are moved into it
+    /// - two or more panels selected: they merge into the first selected panel, which keeps its name
+    ///
+    /// The panel starts at the smallest Left and smallest Top of all grouped devices, and is sized to reach
+    /// the largest Left + Width and largest Top + Height.  Each device keeps its position on screen, so its
+    /// location inside the panel is its old location minus the panel's starting point.
+    ///
+    /// Ungroup: every device in each selected panel is moved out to the panel's level, at the panel's
+    /// location plus its location inside the panel, and then the empty panel is deleted.
+    ///
+    /// Only generic panels ("Generic Bezel") are treated as panels here.  Specialized panels such as the
+    /// Timer Panel and gauges built from several parts are treated as single devices, so they are never
+    /// merged or taken apart.
+    ///
+    /// Each command is one undo step.
+    /// </summary>
+    internal static class GroupCommands
+    {
+        private const string NewPanelName = "Group";
+
+        internal static bool IsGroupPanel(HeliosVisual visual) => visual != null && visual.GetType() == typeof(HeliosPanel);
+
+        internal static bool CanGroup(HeliosVisualContainerEditor editor) =>
+            editor?.VisualContainer != null && editor.SelectedItems != null && editor.SelectedItems.Count >= 2;
+
+        internal static bool CanUngroup(HeliosVisualContainerEditor editor) =>
+            editor?.VisualContainer != null && editor.SelectedItems != null && editor.SelectedItems.Any(IsGroupPanel);
+
+        /// <summary>
+        /// the area covered by a set of devices in their container's coordinates
+        /// </summary>
+        internal static Rect GetBounds(IEnumerable<HeliosVisual> visuals)
+        {
+            Rect bounds = Rect.Empty;
+            foreach (HeliosVisual visual in visuals)
+            {
+                // DisplayRectangle is the same as (Left, Top, Width, Height) unless the device is rotated,
+                // in which case it is the area it actually covers
+                bounds.Union(visual.DisplayRectangle);
+            }
+            if (bounds.IsEmpty)
+            {
+                return bounds;
+            }
+
+            // Helios stores whole-pixel positions and sizes, so grow the area outward to whole pixels
+            // (a rotated device can cover a half pixel) to match what every other edit produces
+            double left = Math.Floor(bounds.Left);
+            double top = Math.Floor(bounds.Top);
+            double right = Math.Ceiling(bounds.Right);
+            double bottom = Math.Ceiling(bounds.Bottom);
+            return new Rect(left, top, right - left, bottom - top);
+        }
+
+        public static void Group(HeliosVisualContainerEditor editor)
+        {
+            if (!CanGroup(editor))
+            {
+                return;
+            }
+
+            HeliosVisual container = editor.VisualContainer;
+
+            // selection order decides which panel is kept; container order decides layering
+            List<HeliosVisual> selected = editor.SelectedItems.Where(v => v.Parent == container).ToList();
+            if (selected.Count < 2)
+            {
+                return;
+            }
+            List<HeliosVisual> inLayerOrder = selected.OrderBy(v => container.Children.IndexOf(v)).ToList();
+            HeliosPanel target = selected.FirstOrDefault(IsGroupPanel) as HeliosPanel;
+            Rect bounds = GetBounds(selected);
+            if (bounds.IsEmpty)
+            {
+                return;
+            }
+
+            UndoManager undo = ConfigManager.UndoManager;
+            editor.SelectedItems.Clear();
+            undo.StartBatch();
+            try
+            {
+                if (target == null)
+                {
+                    target = CreatePanel(container, bounds, container.Children.IndexOf(inLayerOrder[0]));
+                }
+                else
+                {
+                    ExpandPanel(target, bounds);
+                }
+
+                foreach (HeliosVisual visual in inLayerOrder)
+                {
+                    if (visual == target)
+                    {
+                        continue;
+                    }
+
+                    if (IsGroupPanel(visual))
+                    {
+                        // merge: move this panel's contents into the target, then remove the empty panel
+                        foreach (HeliosVisual child in visual.Children.ToList())
+                        {
+                            MoveInto(child, target, new Point(
+                                visual.Left + child.Left - target.Left,
+                                visual.Top + child.Top - target.Top));
+                        }
+                        DeletePanel(visual, editor);
+                    }
+                    else
+                    {
+                        MoveInto(visual, target, new Point(visual.Left - target.Left, visual.Top - target.Top));
+                    }
+                }
+            }
+            finally
+            {
+                undo.CloseBatch();
+            }
+
+            editor.SelectedItems.Add(target);
+        }
+
+        public static void Ungroup(HeliosVisualContainerEditor editor)
+        {
+            if (!CanUngroup(editor))
+            {
+                return;
+            }
+
+            HeliosVisual container = editor.VisualContainer;
+            List<HeliosVisual> panels = editor.SelectedItems.Where(v => IsGroupPanel(v) && v.Parent == container).ToList();
+            List<HeliosVisual> released = new List<HeliosVisual>();
+
+            UndoManager undo = ConfigManager.UndoManager;
+            editor.SelectedItems.Clear();
+            undo.StartBatch();
+            try
+            {
+                foreach (HeliosVisual panel in panels)
+                {
+                    // the panel's contents take its place in the layer order, keeping their own order
+                    int index = container.Children.IndexOf(panel) + 1;
+                    foreach (HeliosVisual child in panel.Children.ToList())
+                    {
+                        Point location = new Point(panel.Left + child.Left, panel.Top + child.Top);
+                        Apply(new ReparentControlUndoEvent(child, container, index++, UniqueName(container, child.Name), location));
+                        released.Add(child);
+                    }
+                    DeletePanel(panel, editor);
+                }
+            }
+            finally
+            {
+                undo.CloseBatch();
+            }
+
+            foreach (HeliosVisual visual in released)
+            {
+                editor.SelectedItems.Add(visual);
+            }
+        }
+
+        private static HeliosPanel CreatePanel(HeliosVisual container, Rect bounds, int index)
+        {
+            // invisible panel so the grouped devices look exactly as before
+            HeliosPanel panel = new HeliosPanel
+            {
+                DrawBorder = false,
+                FillBackground = false
+            };
+            panel.Name = NewPanelName;
+            Apply(new ReparentControlUndoEvent(panel, container, index, UniqueName(container, NewPanelName), bounds.TopLeft));
+
+            // now attached, so the size change is recorded normally
+            panel.Width = bounds.Width;
+            panel.Height = bounds.Height;
+            return panel;
+        }
+
+        /// <summary>
+        /// grow an existing panel to cover the bounds of the selection, keeping its current contents in place on screen
+        /// </summary>
+        private static void ExpandPanel(HeliosPanel panel, Rect bounds)
+        {
+            double shiftX = panel.Left - bounds.Left;
+            double shiftY = panel.Top - bounds.Top;
+            if (shiftX != 0d || shiftY != 0d)
+            {
+                foreach (HeliosVisual child in panel.Children)
+                {
+                    child.Left += shiftX;
+                    child.Top += shiftY;
+                }
+            }
+
+            // bounds already includes the panel itself, so the panel only ever grows
+            panel.Rectangle = bounds;
+        }
+
+        private static void MoveInto(HeliosVisual visual, HeliosVisual panel, Point location)
+        {
+            Apply(new ReparentControlUndoEvent(visual, panel, panel.Children.Count, UniqueName(panel, visual.Name), location));
+        }
+
+        private static void DeletePanel(HeliosVisual panel, HeliosVisualContainerEditor editor)
+        {
+            // close its editor tab, as Delete does
+            ProfileEditorCommands.CloseProfileItem.Execute(panel, editor);
+            Apply(new ReparentControlUndoEvent(panel, null, 0, panel.Name, new Point(panel.Left, panel.Top)));
+        }
+
+        private static void Apply(IUndoItem item)
+        {
+            item.Do();
+            ConfigManager.UndoManager.AddUndoItem(item);
+        }
+
+        /// <summary>
+        /// names must be unique among siblings, so add a number if the name is already used in the destination
+        /// </summary>
+        private static string UniqueName(HeliosVisual container, string name)
+        {
+            string candidate = name;
+            int suffix = 0;
+            while (container.Children.ContainsKey(candidate))
+            {
+                suffix++;
+                candidate = $"{name} {suffix}";
+            }
+            return candidate;
+        }
+    }
+}
diff --git a/Profile Editor/HeliosVisualContainerEditor.cs b/Profile Editor/HeliosVisualContainerEditor.cs
index d3c8b7158..f130d1371 100644
--- a/Profile Editor/HeliosVisualContainerEditor.cs	
+++ b/Profile Editor/HeliosVisualContainerEditor.cs	
@@ -85,6 +85,9 @@ static HeliosVisualContainerEditor()
             CommandManager.RegisterClassCommandBinding(ownerType, new CommandBinding(ProfileEditorCommands.SpaceHorizontal, SpaceHorizontal_Executed, Distribute_CanExecute));
             CommandManager.RegisterClassCommandBinding(ownerType, new CommandBinding(ProfileEditorCommands.SpaceVertical, SpaceVertical_Executed, Distribute_CanExecute));
 
+            CommandManager.RegisterClassCommandBinding(ownerType, new CommandBinding(ProfileEditorCommands.Group, Group_Executed, Group_CanExecute));
+            CommandManager.RegisterClassCommandBinding(ownerType, new CommandBinding(ProfileEditorCommands.Ungroup, Ungroup_Executed, Ungroup_CanExecute));
+
             CommandManager.RegisterClassCommandBinding(ownerType, new CommandBinding(ProfileEditorCommands.SaveTemplate, SaveTemplate_Executed, SaveTemplate_CanExecute));
 
             CommandManager.RegisterClassCommandBinding(ownerType, new CommandBinding(ApplicationCommands.Copy, Copy_Executed, Copy_CanExecute));
@@ -791,6 +794,26 @@ private static void Distribute_CanExecute(object target, CanExecuteRoutedEventAr
             e.CanExecute = editor != null && editor.SelectedItems != null && editor.SelectedItems.Count > 2;
         }
 
+        private static void Group_CanExecute(object target, CanExecuteRoutedEventArgs e)
+        {
+            e.CanExecute = GroupCommands.CanGroup(target as HeliosVisualContainerEditor);
+        }
+
+        private static void Group_Executed(object target, ExecutedRoutedEventArgs e)
+        {
+            GroupCommands.Group(target as HeliosVisualContainerEditor);
+        }
+
+        private static void Ungroup_CanExecute(object target, CanExecuteRoutedEventArgs e)
+        {
+            e.CanExecute = GroupCommands.CanUngroup(target as HeliosVisualContainerEditor);
+        }
+
+        private static void Ungroup_Executed(object target, ExecutedRoutedEventArgs e)
+        {
+            GroupCommands.Ungroup(target as HeliosVisualContainerEditor);
+        }
+
         private static void Delete_Executed(object target, ExecutedRoutedEventArgs e)
         {
             HeliosVisualContainerEditor editor = target as HeliosVisualContainerEditor;
diff --git a/Profile Editor/MainWindow.xaml b/Profile Editor/MainWindow.xaml
index 0e50839b7..44e4c9c0e 100644
--- a/Profile Editor/MainWindow.xaml	
+++ b/Profile Editor/MainWindow.xaml	
@@ -6,7 +6,7 @@
         xmlns:heliosViewModel="clr-namespace:GadrocsWorkshop.Helios.Windows.ViewModel;assembly=Helios"
         xmlns:ad="https://github.com/Dirkster99/AvalonDock"
         xmlns:tools="clr-namespace:GadrocsWorkshop.Helios.Tools;assembly=Helios"
-        Title="{Binding ElementName=ProfileEditorWindow,Path=Profile.Name}" 
+        Title="{Binding ElementName=ProfileEditorWindow,Path=Profile.Name,StringFormat='Developer Edition - {0}',TargetNullValue='Developer Edition',FallbackValue='Developer Edition'}" 
         Height="900" 
         Width="1400" 
         Name="ProfileEditorWindow" 
@@ -117,6 +117,13 @@
                         <Label FontFamily="Segoe MDL2 Assets" FontSize="16" Margin="0" Padding="0" Content="&#xE74D;"/>
                     </MenuItem.Icon>
                 </MenuItem>
+                <Separator />
+                <MenuItem Header="_Group" Command="local:ProfileEditorCommands.Group" InputGestureText="Ctrl+G">
+                    <MenuItem.ToolTip>Place the selected items in one panel, or merge them into the first selected panel.</MenuItem.ToolTip>
+                </MenuItem>
+                <MenuItem Header="U_ngroup" Command="local:ProfileEditorCommands.Ungroup" InputGestureText="Ctrl+U">
+                    <MenuItem.ToolTip>Move everything out of the selected panels and delete the empty panels.</MenuItem.ToolTip>
+                </MenuItem>
             </MenuItem>
             <MenuItem Header="_View">
                 <MenuItem Header="Interface _Status" Command="{x:Static local:ProfileEditorCommands.ViewInterfaceStatus}" />
@@ -210,6 +217,13 @@
                     <Image Source="ToolbarGraphics\SpaceVertical.png" />
                     <Button.ToolTip>Space evenly selected controls verticaly.</Button.ToolTip>
                 </Button>
+                <Separator />
+                <TextBox x:Name="FindTextBox" Width="200" VerticalContentAlignment="Center" Margin="2,0" KeyDown="FindTextBox_KeyDown">
+                    <TextBox.ToolTip>Text to search for in device names, properties, image paths and bindings.</TextBox.ToolTip>
+                </TextBox>
+                <Button x:Name="FindAllButton" Content="Find All" Padding="6,0" Click="FindAll_Click">
+                    <Button.ToolTip>Find every instance of this value in the profile.</Button.ToolTip>
+                </Button>
             </ToolBar>
         </ToolBarTray>
 
diff --git a/Profile Editor/MainWindow.xaml.cs b/Profile Editor/MainWindow.xaml.cs
index ddcaef03a..8bb4c1236 100644
--- a/Profile Editor/MainWindow.xaml.cs	
+++ b/Profile Editor/MainWindow.xaml.cs	
@@ -87,6 +87,11 @@ private class DocumentMeta
         private LoadingAdorner _loadingAdorner;
         private readonly List<DocumentMeta> _documents = new List<DocumentMeta>();
 
+        /// <summary>
+        /// the Find All results popup, if currently open
+        /// </summary>
+        private FindReplace.FindResultsWindow _findResultsWindow;
+
         private readonly InterfaceStatusScanner _configurationCheck = new InterfaceStatusScanner();
 
         /// <summary>
@@ -422,6 +427,9 @@ protected override void OnPropertyChanged(DependencyPropertyChangedEventArgs e)
                 }
                 _documents.Clear();
 
+                // search results refer to devices in the old profile
+                _findResultsWindow?.Close();
+
                 if (Profile != null)
                 {
                     Profile.PropertyChanged += new PropertyChangedEventHandler(Profile_PropertyChanged);
@@ -1177,6 +1185,160 @@ public void CloseProfileItem(object item)
             meta.hobj.PropertyChanged -= DocumentObject_PropertyChanged;
         }
 
+        #region Find All / Replace
+
+        private void FindTextBox_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Enter)
+            {
+                FindAll();
+                e.Handled = true;
+            }
+        }
+
+        private void FindAll_Click(object sender, RoutedEventArgs e)
+        {
+            FindAll();
+        }
+
+        private void FindAll()
+        {
+            string searchText = FindTextBox.Text;
+            if (string.IsNullOrEmpty(searchText) || Profile == null)
+            {
+                return;
+            }
+
+            List<FindReplace.SearchResultRow> rows = FindReplace.ProfileSearch.Find(Profile, searchText);
+            switch (rows.Count)
+            {
+                case 0:
+                    MessageBox.Show(this, $"\"{searchText}\" was not found in this profile.", "Find All",
+                        MessageBoxButton.OK, MessageBoxImage.Information);
+                    return;
+                case 1:
+                    // a single instance goes straight to the layer containing the device
+                    _findResultsWindow?.Close();
+                    GoToVisuals(new List<HeliosVisual> { rows[0].Visual });
+                    return;
+            }
+
+            if (_findResultsWindow == null)
+            {
+                _findResultsWindow = new FindReplace.FindResultsWindow(() => Profile, GoToVisuals) { Owner = this };
+                _findResultsWindow.Closed += (s, args) => _findResultsWindow = null;
+            }
+            _findResultsWindow.ShowResults(searchText, rows);
+            _findResultsWindow.Show();
+            _findResultsWindow.Activate();
+        }
+
+        /// <summary>
+        /// Open (or switch to) the tab for the monitor or panel each device is placed on, and select the devices there.
+        /// </summary>
+        private void GoToVisuals(IList<HeliosVisual> visuals)
+        {
+            // group the devices by the layer (monitor or panel tab) they are placed on
+            Dictionary<HeliosVisual, List<HeliosVisual>> byContainer = new Dictionary<HeliosVisual, List<HeliosVisual>>();
+            List<HeliosVisual> containerOrder = new List<HeliosVisual>();
+            foreach (HeliosVisual visual in visuals)
+            {
+                HeliosVisual container = FindEditableContainer(visual, out HeliosVisual selectable);
+                if (container == null)
+                {
+                    continue;
+                }
+                if (!byContainer.TryGetValue(container, out List<HeliosVisual> selection))
+                {
+                    selection = new List<HeliosVisual>();
+                    byContainer.Add(container, selection);
+                    containerOrder.Add(container);
+                }
+                if (selectable != null && !selection.Contains(selectable))
+                {
+                    selection.Add(selectable);
+                }
+            }
+
+            DocumentMeta first = null;
+            foreach (HeliosVisual container in containerOrder)
+            {
+                DocumentMeta meta = AddNewDocument(container);
+                if (meta == null)
+                {
+                    continue;
+                }
+                first = first ?? meta;
+                List<HeliosVisual> selection = byContainer[container];
+
+                // a newly created tab has not built its visual views yet, so select after layout
+                Dispatcher.BeginInvoke(DispatcherPriority.Loaded, new Action(() => SelectInEditor(meta, selection)));
+            }
+
+            if (first != null)
+            {
+                first.document.IsActive = true;
+            }
+        }
+
+        /// <summary>
+        /// Find the monitor or panel whose tab shows this device, and the item on that tab that should be selected
+        /// (the device itself, or its top level ancestor if it is a part of a composite control).
+        /// </summary>
+        private static HeliosVisual FindEditableContainer(HeliosVisual visual, out HeliosVisual selectable)
+        {
+            selectable = null;
+            if (visual == null)
+            {
+                return null;
+            }
+
+            HeliosVisual child = visual;
+            HeliosVisual parent = visual.Parent;
+            while (parent != null && !(parent is Monitor) && !(parent is HeliosPanel))
+            {
+                child = parent;
+                parent = parent.Parent;
+            }
+
+            if (parent == null)
+            {
+                // the device is a monitor itself
+                return visual is Monitor ? visual : null;
+            }
+
+            selectable = child;
+            return parent;
+        }
+
+        private static void SelectInEditor(DocumentMeta meta, List<HeliosVisual> selection)
+        {
+            HeliosVisualContainerEditor editor;
+            switch (meta.editor)
+            {
+                case PanelDocument panelDocument:
+                    editor = panelDocument.PanelEditor;
+                    break;
+                case MonitorDocument monitorDocument:
+                    editor = monitorDocument.MonitorEditor;
+                    break;
+                default:
+                    return;
+            }
+
+            editor.UpdateLayout();
+            editor.SelectedItems.Clear();
+            foreach (HeliosVisual visual in selection)
+            {
+                editor.SelectedItems.Add(visual);
+            }
+
+            HeliosVisualView view = selection.Count > 0 ? editor.GetViewerForVisual(selection[0]) : null;
+            view?.BringIntoView();
+        }
+
+        #endregion
+
         public void OnExecuteUndo(object sender, ExecutedRoutedEventArgs e)
         {
             ConfigManager.UndoManager.Undo();
diff --git a/Profile Editor/MonitorDocument.xaml b/Profile Editor/MonitorDocument.xaml
index 2d838ad45..8eb2e38ab 100644
--- a/Profile Editor/MonitorDocument.xaml	
+++ b/Profile Editor/MonitorDocument.xaml	
@@ -17,7 +17,7 @@
             <Label FontSize="8" FontWeight="Bold" Foreground="White">Zoom</Label>
             <Slider Orientation="Vertical" Height="150" HorizontalAlignment="Center" Minimum="-4" Maximum="4" Value="{Binding ElementName=MonitorEditor,Path=ZoomLevel}" TickFrequency="1" TickPlacement="BottomRight" IsMoveToPointEnabled="False" IsSnapToTickEnabled="False" SmallChange="0.25" />
         </StackPanel>
-        <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
+        <ScrollViewer Name="MonitorScroller" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
             <local:HeliosVisualContainerEditor x:Name="MonitorEditor" Margin="14" HorizontalAlignment="Left" VerticalAlignment="Top" VisualContainer="{Binding ElementName=MonitorEditorDocument,Path=Monitor}" local:DragAndDropManager.DropTargetAdvisor="{StaticResource DropAdvisor}" />
         </ScrollViewer>
     </DockPanel>
diff --git a/Profile Editor/MonitorDocument.xaml.cs b/Profile Editor/MonitorDocument.xaml.cs
index 523e72c92..87ae3f154 100644
--- a/Profile Editor/MonitorDocument.xaml.cs	
+++ b/Profile Editor/MonitorDocument.xaml.cs	
@@ -31,35 +31,8 @@ public MonitorDocument()
             InitializeComponent();
 
             MonitorEditor.SelectedItems.CollectionChanged += new System.Collections.Specialized.NotifyCollectionChangedEventHandler(SelectedItems_CollectionChanged);
-            PreviewMouseWheel += Window_PreviewMouseWheel;
-        }
-
-        private void Window_PreviewMouseWheel(object sender, MouseWheelEventArgs e)
-        {
-            if (Keyboard.Modifiers != ModifierKeys.Control)
-                return;
-
-            const double zoomChange = 0.25;
-            if (e.Delta > 0)
-            {
-                if (!(MonitorEditor.ZoomLevel < 4d))
-                {
-                    return;
-                }
-
-                MonitorEditor.ZoomLevel = Math.Min(MonitorEditor.ZoomLevel + zoomChange, 4d);
-                e.Handled = true;
-            }
-            else if (e.Delta < 0)
-            {
-                if (!(MonitorEditor.ZoomLevel > -4d))
-                {
-                    return;
-                }
-
-                MonitorEditor.ZoomLevel = Math.Max(MonitorEditor.ZoomLevel - zoomChange, -4d);
-                e.Handled = true;
-            }
+            // Ctrl + wheel zooms toward the mouse pointer, side wheel or Shift + wheel scrolls left and right
+            EditorMouseWheel.Attach(this, MonitorScroller, MonitorEditor);
         }
 
         public MonitorDocument(Monitor monitor) : this()
diff --git a/Profile Editor/PanelDocument.xaml.cs b/Profile Editor/PanelDocument.xaml.cs
index ee7ae8ff3..2ba27b889 100644
--- a/Profile Editor/PanelDocument.xaml.cs	
+++ b/Profile Editor/PanelDocument.xaml.cs	
@@ -34,35 +34,8 @@ public PanelDocument()
             InitializeComponent();
 
             PanelEditor.SelectedItems.CollectionChanged += SelectedItems_CollectionChanged;
-            PreviewMouseWheel += Window_PreviewMouseWheel;
-        }
-
-        private void Window_PreviewMouseWheel(object sender, MouseWheelEventArgs e)
-        {
-            if (Keyboard.Modifiers != ModifierKeys.Control)
-                return;
-
-            const double zoomChange = 0.25;
-            if (e.Delta > 0)
-            {
-                if (!(PanelEditor.ZoomLevel < 4d))
-                {
-                    return;
-                }
-
-                PanelEditor.ZoomLevel = Math.Min(PanelEditor.ZoomLevel + zoomChange, 4d);
-                e.Handled = true;
-            }
-            else if (e.Delta < 0)
-            {
-                if (!(PanelEditor.ZoomLevel > -4d))
-                {
-                    return;
-                }
-
-                PanelEditor.ZoomLevel = Math.Max(PanelEditor.ZoomLevel - zoomChange, -4d);
-                e.Handled = true;
-            }
+            // Ctrl + wheel zooms toward the mouse pointer, side wheel or Shift + wheel scrolls left and right
+            EditorMouseWheel.Attach(this, PanelScroller, PanelEditor);
         }
 
         public PanelDocument(HeliosPanel panel)
diff --git a/Profile Editor/Profile Editor.csproj b/Profile Editor/Profile Editor.csproj
index 66c03b7e4..54942f2e8 100644
--- a/Profile Editor/Profile Editor.csproj	
+++ b/Profile Editor/Profile Editor.csproj	
@@ -6,7 +6,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>GadrocsWorkshop.Helios.ProfileEditor</RootNamespace>
-    <AssemblyName>Profile Editor</AssemblyName>
+    <AssemblyName>Developer Edition</AssemblyName>
     <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -110,10 +110,12 @@
     <Compile Include="DragAndDropManager.cs" />
     <Compile Include="DragSelectionAdorner.cs" />
     <Compile Include="DropPreviewAdorner.cs" />
+    <Compile Include="EditorMouseWheel.cs" />
     <Compile Include="EditorMouseState.cs" />
     <Compile Include="GlassCockpitEditor.xaml.cs">
       <DependentUpon>GlassCockpitEditor.xaml</DependentUpon>
     </Compile>
+    <Compile Include="GroupCommands.cs" />
     <Compile Include="HeliosVisualContainerEditor.cs" />
     <Compile Include="IDragSourceAdvisor.cs" />
     <Compile Include="IDropTargetAdvisor.cs" />
@@ -147,6 +149,11 @@
     <Compile Include="PropertyPanel.xaml.cs">
       <DependentUpon>PropertyPanel.xaml</DependentUpon>
     </Compile>
+    <Compile Include="FindReplace\FindResultsWindow.xaml.cs">
+      <DependentUpon>FindResultsWindow.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="FindReplace\ProfileSearch.cs" />
+    <Compile Include="ProportionalResize.cs" />
     <Compile Include="ResetMonitors.xaml.cs">
       <DependentUpon>ResetMonitors.xaml</DependentUpon>
     </Compile>
@@ -170,6 +177,7 @@
     <Compile Include="UndoEvents\BindingAddUndoEvent.cs" />
     <Compile Include="UndoEvents\BindingDeleteUndoEvent.cs" />
     <Compile Include="UndoEvents\ControlAddUndoEvent.cs" />
+    <Compile Include="UndoEvents\ReparentControlUndoEvent.cs" />
     <Compile Include="UndoEvents\ControlDeleteUndoEvent.cs" />
     <Compile Include="UndoEvents\DeleteMonitorUndoEvent.cs" />
     <Compile Include="UndoEvents\DisplayOrderUndoItem.cs" />
@@ -179,6 +187,7 @@
     <Compile Include="ViewModel\DescriptorToolboxItem.cs" />
     <Compile Include="GlobalOptions.cs" />
     <Compile Include="ViewModel\MonitorResetItem.cs" />
+    <Compile Include="ViewModel\AlphabeticalTreeSort.cs" />
     <Compile Include="ViewModel\ProfileExplorerTreeItem.cs" />
     <Compile Include="ViewModel\ProfileExplorerTreeItemCollection.cs" />
     <Compile Include="ViewModel\ProfileExplorerTreeItemType.cs" />
@@ -278,6 +287,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="FindReplace\FindResultsWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="ResetMonitors.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/Profile Editor/ProfileEditorCommands.cs b/Profile Editor/ProfileEditorCommands.cs
index 2604e3cee..650979434 100644
--- a/Profile Editor/ProfileEditorCommands.cs	
+++ b/Profile Editor/ProfileEditorCommands.cs	
@@ -30,6 +30,8 @@ public static class ProfileEditorCommands
         private static RoutedUICommand DistributeHorizontalCenterCommand = new RoutedUICommand("Distrubute Horizontal Center", "DistributeHorizontalCenter", typeof(ProfileEditorCommands));
         private static RoutedUICommand DistributeVerticalCenterCommand = new RoutedUICommand("Distrubute Vertical Center", "DistrubuteVerticalCenter", typeof(ProfileEditorCommands));
         private static RoutedUICommand SpaceHorizontalCommand = new RoutedUICommand("Evenly space horizontaly", "SpaceHorizontal", typeof(ProfileEditorCommands));
+        private static RoutedUICommand GroupCommand = new RoutedUICommand("Group", "Group", typeof(ProfileEditorCommands), new InputGestureCollection() { new KeyGesture(Key.G, ModifierKeys.Control) });
+        private static RoutedUICommand UngroupCommand = new RoutedUICommand("Ungroup", "Ungroup", typeof(ProfileEditorCommands), new InputGestureCollection() { new KeyGesture(Key.U, ModifierKeys.Control) });
         private static RoutedUICommand SpaceVerticalCommand = new RoutedUICommand("Evenlly space verticaly", "SpaceVertical", typeof(ProfileEditorCommands));
         private static RoutedUICommand SaveTemplateCommand = new RoutedUICommand("Save Current Item as a Template", "SaveTemplate", typeof(ProfileEditorCommands));
         private static RoutedUICommand OpenProfileItemCommand = new RoutedUICommand("Opens a document window to the given item.", "OpenProfileItem", typeof(ProfileEditorCommands));
@@ -52,6 +54,8 @@ public static class ProfileEditorCommands
         public static RoutedUICommand DistributeVerticalCenter { get { return DistributeVerticalCenterCommand; } }
         public static RoutedUICommand SpaceHorizontal { get { return SpaceHorizontalCommand; } }
         public static RoutedUICommand SpaceVertical { get { return SpaceVerticalCommand; } }
+        public static RoutedUICommand Group { get { return GroupCommand; } }
+        public static RoutedUICommand Ungroup { get { return UngroupCommand; } }
         public static RoutedUICommand SaveTemplate { get { return SaveTemplateCommand; } }
         public static RoutedUICommand OpenProfileItem { get { return OpenProfileItemCommand; } }
         public static RoutedUICommand CloseProfileItem { get { return CloseProfileItemCommand; } }
diff --git a/Profile Editor/ProfileExplorerPanel.xaml.cs b/Profile Editor/ProfileExplorerPanel.xaml.cs
index 53df91417..862bd651b 100644
--- a/Profile Editor/ProfileExplorerPanel.xaml.cs	
+++ b/Profile Editor/ProfileExplorerPanel.xaml.cs	
@@ -94,6 +94,9 @@ private void LoadItems()
             item.ExpandAll();
             ProfileExplorerItems = item.Children;
 
+            // show every level alphabetically (display only; the profile's own order is unchanged)
+            AlphabeticalTreeSort.AttachAll(ProfileExplorerItems);
+
             ButtonItemExpand.IsEnabled = false;
             ButtonItemCollapse.IsEnabled = false;
             ButtonBranchExpand.IsEnabled = false;
diff --git a/Profile Editor/Properties/AssemblyInfo.cs b/Profile Editor/Properties/AssemblyInfo.cs
index 798d57404..b7bff97a6 100644
--- a/Profile Editor/Properties/AssemblyInfo.cs	
+++ b/Profile Editor/Properties/AssemblyInfo.cs	
@@ -7,11 +7,11 @@
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Profile Editor")]
-[assembly: AssemblyDescription("Helios Profile Editor")]
+[assembly: AssemblyTitle("Developer Edition")]
+[assembly: AssemblyDescription("Developer Edition")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("github.com/HeliosVirtualCockpit")]
-[assembly: AssemblyProduct("Profile Editor")]
+[assembly: AssemblyProduct("Developer Edition")]
 [assembly: AssemblyCopyright("Copyright (c) 2014 Craig Courtney, 2020 Helios Contributors")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/Profile Editor/PropertyEditors/LayoutPropertyEditor.xaml b/Profile Editor/PropertyEditors/LayoutPropertyEditor.xaml
index f27d64b42..8d73b7c00 100644
--- a/Profile Editor/PropertyEditors/LayoutPropertyEditor.xaml	
+++ b/Profile Editor/PropertyEditors/LayoutPropertyEditor.xaml	
@@ -77,9 +77,13 @@
         <Label Grid.Column="0" Grid.Row="3" FontSize="10" HorizontalAlignment="Right">Top</Label>
         <HeliosSdk:HeliosTextBox Grid.Column="1" Grid.Row="3" VerticalContentAlignment="Center" FontSize="10" Text="{Binding Path=Control.Top, Mode=TwoWay}" Margin="2" />
         <Label Grid.Column="0" Grid.Row="4" FontSize="10" HorizontalAlignment="Right">Width</Label>
-        <HeliosSdk:HeliosTextBox Grid.Column="1" Grid.Row="4" VerticalContentAlignment="Center" FontSize="10" Text="{Binding Path=Control.Width,Mode=TwoWay}" Margin="2" />
+        <HeliosSdk:HeliosTextBox Grid.Column="1" Grid.Row="4" VerticalContentAlignment="Center" FontSize="10" Text="{Binding Path=EditWidth,Mode=TwoWay}" Margin="2">
+            <HeliosSdk:HeliosTextBox.ToolTip>Changing the width also scales everything inside this control.</HeliosSdk:HeliosTextBox.ToolTip>
+        </HeliosSdk:HeliosTextBox>
         <Label Grid.Column="0" Grid.Row="5" FontSize="10" HorizontalAlignment="Right">Height</Label>
-        <HeliosSdk:HeliosTextBox Grid.Column="1" Grid.Row="5" VerticalContentAlignment="Center" FontSize="10" Text="{Binding Path=Control.Height,Mode=TwoWay}" Margin="2" />
+        <HeliosSdk:HeliosTextBox Grid.Column="1" Grid.Row="5" VerticalContentAlignment="Center" FontSize="10" Text="{Binding Path=EditHeight,Mode=TwoWay}" Margin="2">
+            <HeliosSdk:HeliosTextBox.ToolTip>Changing the height also scales everything inside this control.</HeliosSdk:HeliosTextBox.ToolTip>
+        </HeliosSdk:HeliosTextBox>
         <Label Grid.Column="0" Grid.Row="6" FontSize="10" HorizontalAlignment="Right" Content="Rotation" Visibility="{Binding Path=IsRotateable}">
             <Label.ToolTip>Rotates display of this control.</Label.ToolTip>
         </Label>
diff --git a/Profile Editor/PropertyEditors/LayoutPropertyEditor.xaml.cs b/Profile Editor/PropertyEditors/LayoutPropertyEditor.xaml.cs
index 01d0908e0..04b35d543 100644
--- a/Profile Editor/PropertyEditors/LayoutPropertyEditor.xaml.cs	
+++ b/Profile Editor/PropertyEditors/LayoutPropertyEditor.xaml.cs	
@@ -34,6 +34,12 @@ public partial class LayoutPropertyEditor : HeliosPropertyEditor, IDataErrorInfo
         /// </summary>
         protected bool _loading;
 
+        /// <summary>
+        /// set while the Width and Height boxes are being updated from the control, so that is not
+        /// mistaken for the user typing a new size
+        /// </summary>
+        private bool _syncingSize;
+
         public LayoutPropertyEditor()
         {
             InitializeComponent();
@@ -94,6 +100,32 @@ public Visibility NoEffects
             DependencyProperty.Register("NoEffects", typeof(Visibility), typeof(LayoutPropertyEditor),
                 new PropertyMetadata(null));
 
+        /// <summary>
+        /// width shown in the Width box; typing a new value resizes the control and scales its contents
+        /// </summary>
+        public double EditWidth
+        {
+            get => (double)GetValue(EditWidthProperty);
+            set => SetValue(EditWidthProperty, value);
+        }
+
+        public static readonly DependencyProperty EditWidthProperty =
+            DependencyProperty.Register("EditWidth", typeof(double), typeof(LayoutPropertyEditor),
+                new PropertyMetadata(0d));
+
+        /// <summary>
+        /// height shown in the Height box; typing a new value resizes the control and scales its contents
+        /// </summary>
+        public double EditHeight
+        {
+            get => (double)GetValue(EditHeightProperty);
+            set => SetValue(EditHeightProperty, value);
+        }
+
+        public static readonly DependencyProperty EditHeightProperty =
+            DependencyProperty.Register("EditHeight", typeof(double), typeof(LayoutPropertyEditor),
+                new PropertyMetadata(0d));
+
         #endregion
 
         protected override void OnPropertyChanged(DependencyPropertyChangedEventArgs e)
@@ -106,6 +138,15 @@ protected override void OnPropertyChanged(DependencyPropertyChangedEventArgs e)
 
             if (e.Property == ControlProperty)
             {
+                if (e.OldValue is HeliosVisual oldControl)
+                {
+                    oldControl.Resized -= Control_Resized;
+                }
+                if (e.NewValue is HeliosVisual newControl)
+                {
+                    newControl.Resized += Control_Resized;
+                }
+
                 _loading = true;
                 try
                 {
@@ -116,6 +157,21 @@ protected override void OnPropertyChanged(DependencyPropertyChangedEventArgs e)
                 {
                     _loading = false;
                 }
+                SyncSize();
+            }
+
+            if (!_syncingSize && Control != null)
+            {
+                if (e.Property == EditWidthProperty)
+                {
+                    ProportionalResize.Resize(Control, EditWidth, null);
+                    SyncSize();
+                }
+                else if (e.Property == EditHeightProperty)
+                {
+                    ProportionalResize.Resize(Control, null, EditHeight);
+                    SyncSize();
+                }
             }
 
             if (e.Property == VisualNameProperty)
@@ -129,6 +185,26 @@ protected override void OnPropertyChanged(DependencyPropertyChangedEventArgs e)
             base.OnPropertyChanged(e);
         }
 
+        private void Control_Resized(object sender, EventArgs e)
+        {
+            // dragged, undone, or changed by aspect lock: show the current size
+            SyncSize();
+        }
+
+        private void SyncSize()
+        {
+            _syncingSize = true;
+            try
+            {
+                EditWidth = Control?.Width ?? 0d;
+                EditHeight = Control?.Height ?? 0d;
+            }
+            finally
+            {
+                _syncingSize = false;
+            }
+        }
+
         private void LoadControlTypeName()
         {
             Type controlType = Control.GetType();
diff --git a/Profile Editor/ProportionalResize.cs b/Profile Editor/ProportionalResize.cs
new file mode 100644
index 000000000..28cfefc6c
--- /dev/null
+++ b/Profile Editor/ProportionalResize.cs	
@@ -0,0 +1,82 @@
+//  Copyright 2020 Helios Contributors
+//
+//  Helios is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  Helios is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace GadrocsWorkshop.Helios.ProfileEditor
+{
+    /// <summary>
+    /// Resizes a control and scales everything inside it by the same proportion, the same way dragging
+    /// the resize handles does.  For example a panel going from 100 to 90 wide makes each contained
+    /// device 10% narrower and moves its Left 10% closer to the panel's left edge.
+    /// </summary>
+    internal static class ProportionalResize
+    {
+        /// <summary>
+        /// set a new width and/or height (null leaves that dimension alone), then scale the contents
+        /// by however much the control actually changed (aspect lock may change the other dimension too).
+        /// The whole change is one undo step.
+        /// </summary>
+        public static void Resize(HeliosVisual control, double? width, double? height)
+        {
+            if (control == null || control is Monitor)
+            {
+                // monitors match physical displays; their contents are never rescaled by typing a size
+                if (control != null)
+                {
+                    if (width.HasValue) control.Width = width.Value;
+                    if (height.HasValue) control.Height = height.Value;
+                }
+                return;
+            }
+
+            double oldWidth = control.Width;
+            double oldHeight = control.Height;
+
+            UndoManager undo = ConfigManager.UndoManager;
+            bool ownBatch = undo != null && !undo.InBatch;
+            if (ownBatch)
+            {
+                undo.StartBatch();
+            }
+            try
+            {
+                if (width.HasValue)
+                {
+                    control.Width = width.Value;
+                }
+                if (height.HasValue)
+                {
+                    control.Height = height.Value;
+                }
+
+                double scaleX = oldWidth > 0d ? control.Width / oldWidth : 1d;
+                double scaleY = oldHeight > 0d ? control.Height / oldHeight : 1d;
+
+                // ReSharper disable CompareOfFloatsByEqualityOperator exact comparison is intended
+                if (scaleX != 1d || scaleY != 1d)
+                {
+                    control.ScaleChildren(scaleX, scaleY);
+                }
+                // ReSharper restore CompareOfFloatsByEqualityOperator
+            }
+            finally
+            {
+                if (ownBatch)
+                {
+                    undo.CloseBatch();
+                }
+            }
+        }
+    }
+}
diff --git a/Profile Editor/UndoEvents/ReparentControlUndoEvent.cs b/Profile Editor/UndoEvents/ReparentControlUndoEvent.cs
new file mode 100644
index 000000000..a46518ffb
--- /dev/null
+++ b/Profile Editor/UndoEvents/ReparentControlUndoEvent.cs	
@@ -0,0 +1,90 @@
+//  Copyright 2020 Helios Contributors
+//
+//  Helios is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  Helios is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace GadrocsWorkshop.Helios.ProfileEditor.UndoEvents
+{
+    using System;
+    using System.Windows;
+
+    /// <summary>
+    /// Moves one control from one container to another (or adds it, or deletes it), changing its name
+    /// and location at the same time.  The same control instance is moved, so its bindings are kept.
+    ///
+    /// The control is changed only while it is detached from the profile, so these changes are not
+    /// also recorded as separate property changes.
+    /// </summary>
+    internal class ReparentControlUndoEvent : IUndoItem
+    {
+        private readonly HeliosVisual _control;
+
+        private readonly HeliosVisual _from;
+        private readonly int _fromIndex;
+        private readonly string _fromName;
+        private readonly Point _fromLocation;
+
+        private readonly HeliosVisual _to;
+        private readonly int _toIndex;
+        private readonly string _toName;
+        private readonly Point _toLocation;
+
+        /// <param name="control">the control to move</param>
+        /// <param name="to">new container, or null to delete the control</param>
+        /// <param name="toIndex">position in the new container's children (z-order); clamped to the end</param>
+        /// <param name="toName">name in the new container</param>
+        /// <param name="toLocation">Left and Top in the new container</param>
+        public ReparentControlUndoEvent(HeliosVisual control, HeliosVisual to, int toIndex, string toName, Point toLocation)
+        {
+            _control = control;
+
+            _from = control.Parent;
+            _fromIndex = _from?.Children.IndexOf(control) ?? -1;
+            _fromName = control.Name;
+            _fromLocation = new Point(control.Left, control.Top);
+
+            _to = to;
+            _toIndex = toIndex;
+            _toName = toName;
+            _toLocation = toLocation;
+        }
+
+        public void Do()
+        {
+            Move(_from, _to, _toIndex, _toName, _toLocation);
+        }
+
+        public void Undo()
+        {
+            Move(_to, _from, _fromIndex, _fromName, _fromLocation);
+        }
+
+        private void Move(HeliosVisual source, HeliosVisual destination, int index, string name, Point location)
+        {
+            source?.Children.Remove(_control);
+
+            // detached now, so none of this is recorded separately
+            _control.Name = name;
+            _control.Left = location.X;
+            _control.Top = location.Y;
+
+            if (destination == null)
+            {
+                return;
+            }
+
+            int clamped = Math.Max(0, Math.Min(index, destination.Children.Count));
+            destination.Children.Insert(clamped, _control);
+        }
+    }
+}
diff --git a/Profile Editor/ViewModel/AlphabeticalTreeSort.cs b/Profile Editor/ViewModel/AlphabeticalTreeSort.cs
new file mode 100644
index 000000000..35314bc10
--- /dev/null
+++ b/Profile Editor/ViewModel/AlphabeticalTreeSort.cs	
@@ -0,0 +1,189 @@
+//  Copyright 2020 Helios Contributors
+//
+//  Helios is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  Helios is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace GadrocsWorkshop.Helios.ProfileEditor.ViewModel
+{
+    using System;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Collections.Specialized;
+    using System.Globalization;
+    using System.Windows.Data;
+
+    /// <summary>
+    /// Shows every level of a tree in alphabetical order, with numbers compared by value
+    /// ("Panel 2" before "Panel 10").  Items with the same name are then ordered by an optional rank,
+    /// which the Bindings panel uses to put input items before output items.
+    ///
+    /// Only the on-screen order changes; the tree items themselves keep their order, so layering and
+    /// everything saved in the profile are not affected.  Items added or renamed later are kept in order too.
+    /// </summary>
+    internal class AlphabeticalTreeSort
+    {
+        private readonly HashSet<ProfileExplorerTreeItemCollection> _sorted = new HashSet<ProfileExplorerTreeItemCollection>();
+        private readonly NaturalNameComparer _comparer;
+
+        private AlphabeticalTreeSort(Func<ProfileExplorerTreeItem, int> rank)
+        {
+            _comparer = new NaturalNameComparer(rank);
+        }
+
+        /// <summary>
+        /// sort every level of the tree whose top level is the given collection
+        /// </summary>
+        /// <param name="topLevel">the collection shown at the top of the tree view</param>
+        /// <param name="rank">optional secondary order for items with the same name; lower comes first</param>
+        public static void AttachAll(ProfileExplorerTreeItemCollection topLevel, Func<ProfileExplorerTreeItem, int> rank = null)
+        {
+            if (topLevel == null)
+            {
+                return;
+            }
+            new AlphabeticalTreeSort(rank).SortLevelAndBelow(topLevel);
+        }
+
+        /// <summary>
+        /// rank for lists of things to bind: triggers (the Input side) before actions (the Output side)
+        /// </summary>
+        public static int TriggersFirst(ProfileExplorerTreeItem item) =>
+            item.ItemType.HasFlag(ProfileExplorerTreeItemType.Trigger) ? 0 :
+            item.ItemType.HasFlag(ProfileExplorerTreeItemType.Action) ? 1 : 0;
+
+        /// <summary>
+        /// rank for a device's bindings: its actions and their input bindings before its triggers and their output bindings
+        /// </summary>
+        public static int InputBindingsFirst(ProfileExplorerTreeItem item)
+        {
+            if (item.ItemType.HasFlag(ProfileExplorerTreeItemType.Binding))
+            {
+                return item.Parent != null && item.Parent.ItemType.HasFlag(ProfileExplorerTreeItemType.Trigger) ? 1 : 0;
+            }
+            return item.ItemType.HasFlag(ProfileExplorerTreeItemType.Trigger) ? 1 : 0;
+        }
+
+        private void SortLevelAndBelow(ProfileExplorerTreeItemCollection children)
+        {
+            SortLevel(children);
+            foreach (ProfileExplorerTreeItem child in children)
+            {
+                SortLevelAndBelow(child.Children);
+            }
+        }
+
+        private void SortLevel(ProfileExplorerTreeItemCollection children)
+        {
+            if (children == null || !_sorted.Add(children))
+            {
+                return;
+            }
+
+            // the tree view shows this collection through its default view, so sorting the view sorts the display
+            if (CollectionViewSource.GetDefaultView(children) is ListCollectionView view)
+            {
+                view.CustomSort = _comparer;
+                view.IsLiveSorting = true;
+                view.LiveSortingProperties.Add(nameof(ProfileExplorerTreeItem.Name));
+            }
+
+            // things appearing later (new panels, devices, folders, bindings) get sorted as well
+            children.CollectionChanged += Level_CollectionChanged;
+        }
+
+        private void Level_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            if (e.NewItems == null)
+            {
+                return;
+            }
+            foreach (ProfileExplorerTreeItem item in e.NewItems)
+            {
+                SortLevelAndBelow(item.Children);
+            }
+        }
+
+        private class NaturalNameComparer : IComparer
+        {
+            private readonly Func<ProfileExplorerTreeItem, int> _rank;
+
+            public NaturalNameComparer(Func<ProfileExplorerTreeItem, int> rank)
+            {
+                _rank = rank;
+            }
+
+            public int Compare(object x, object y)
+            {
+                ProfileExplorerTreeItem a = x as ProfileExplorerTreeItem;
+                ProfileExplorerTreeItem b = y as ProfileExplorerTreeItem;
+                int result = CompareNames(a?.Name, b?.Name);
+                if (result != 0 || _rank == null || a == null || b == null)
+                {
+                    return result;
+                }
+                return _rank(a).CompareTo(_rank(b));
+            }
+
+            /// <summary>
+            /// alphabetical, ignoring case, with numbers compared by value so "Panel 2" comes before "Panel 10"
+            /// </summary>
+            internal static int CompareNames(string a, string b)
+            {
+                a = a ?? "";
+                b = b ?? "";
+                int i = 0;
+                int j = 0;
+                while (i < a.Length && j < b.Length)
+                {
+                    if (char.IsDigit(a[i]) && char.IsDigit(b[j]))
+                    {
+                        int startA = i;
+                        int startB = j;
+                        while (i < a.Length && char.IsDigit(a[i])) i++;
+                        while (j < b.Length && char.IsDigit(b[j])) j++;
+                        string numberA = a.Substring(startA, i - startA).TrimStart('0');
+                        string numberB = b.Substring(startB, j - startB).TrimStart('0');
+                        if (numberA.Length != numberB.Length)
+                        {
+                            return numberA.Length.CompareTo(numberB.Length);
+                        }
+                        int numberCompare = string.CompareOrdinal(numberA, numberB);
+                        if (numberCompare != 0)
+                        {
+                            return numberCompare;
+                        }
+                        continue;
+                    }
+
+                    int startTextA = i;
+                    int startTextB = j;
+                    while (i < a.Length && !char.IsDigit(a[i])) i++;
+                    while (j < b.Length && !char.IsDigit(b[j])) j++;
+                    int textCompare = string.Compare(
+                        a.Substring(startTextA, i - startTextA),
+                        b.Substring(startTextB, j - startTextB),
+                        CultureInfo.CurrentCulture,
+                        CompareOptions.IgnoreCase);
+                    if (textCompare != 0)
+                    {
+                        return textCompare;
+                    }
+                }
+
+                // shorter wins when one is a prefix of the other; names that differ only by case keep a stable order
+                int lengthCompare = (a.Length - i).CompareTo(b.Length - j);
+                return lengthCompare != 0 ? lengthCompare : string.CompareOrdinal(a, b);
+            }
+        }
+    }
+}
diff --git a/Profile Editor/ViewModel/ProfileExplorerTreeItem.cs b/Profile Editor/ViewModel/ProfileExplorerTreeItem.cs
index 4d7a84276..d7ee304d7 100644
--- a/Profile Editor/ViewModel/ProfileExplorerTreeItem.cs	
+++ b/Profile Editor/ViewModel/ProfileExplorerTreeItem.cs	
@@ -456,12 +456,36 @@ private void StructuredContentsChanged<THeliosObject>(IEnumerable removedChildre
 
         private void Triggers_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
         {
-            StructuredContentsChanged<IBindingTrigger>(e.OldItems, e.NewItems, GetDeviceNameForUserInterface, AddTrigger);
+            BindingElementsChanged<IBindingTrigger>(e.OldItems, e.NewItems, true, AddTrigger);
         }
 
         private void Actions_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
         {
-            StructuredContentsChanged<IBindingAction>(e.OldItems, e.NewItems, GetDeviceNameForUserInterface, AddAction);
+            BindingElementsChanged<IBindingAction>(e.OldItems, e.NewItems, false, AddAction);
+        }
+
+        /// <summary>
+        /// keep the tree in step with actions or triggers being added to or removed from an object,
+        /// wherever in the folder structure they are shown
+        /// </summary>
+        private void BindingElementsChanged<TElement>(IEnumerable removedChildren, IEnumerable addedChildren, bool isTrigger,
+            Action<TElement, ProfileExplorerTreeItemType> addItemHandler) where TElement : IBindingElement
+        {
+            if (removedChildren != null)
+            {
+                foreach (TElement removed in removedChildren.OfType<TElement>())
+                {
+                    RemoveBindingElement(removed, isTrigger);
+                }
+            }
+
+            if (addedChildren != null)
+            {
+                foreach (TElement added in addedChildren.OfType<TElement>())
+                {
+                    addItemHandler(added, _includeTypes);
+                }
+            }
         }
 
         private void Binding_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
@@ -616,27 +640,114 @@ private void AddBindingElement(IBindingElement child, ProfileExplorerTreeItemTyp
         {
             if (childItem.HasChildren || includeTypes.HasFlag(requiredFlags))
             {
-                string deviceName = GetDeviceNameForUserInterface(child);
-                if (deviceName.Length > 0)
+                // walk (and create as needed) the folders this item belongs in
+                ProfileExplorerTreeItem container = this;
+                foreach (string folderName in GetFolderPath(child, requiredFlags == ProfileExplorerTreeItemType.Trigger))
                 {
-                    if (!HasFolder(deviceName))
+                    ProfileExplorerTreeItem folder = container.GetFolder(folderName);
+                    if (folder == null)
                     {
-                        Children.Add(new ProfileExplorerTreeItem(deviceName, "", this, includeTypes));
+                        folder = new ProfileExplorerTreeItem(folderName, "", container, includeTypes);
+                        container.Children.Add(folder);
                     }
+                    container = folder;
+                }
+
+                childItem.Parent = container;
+                container.Children.Add(childItem);
+            }
+            else
+            {
+                // let it die
+                childItem.Disconnect();
+            }
+        }
+
+        internal const string InputFolderName = "Input";
+        internal const string OutputFolderName = "Output";
+
+        /// <summary>
+        /// the folders, from this item down, that an action or trigger is shown in:
+        /// - by default only its device folder (if it has a device)
+        /// - with GroupInputOutput: "Input"/"Output", then the device folder
+        /// - with GroupByElementName as well: the device folder, then the element's name, then "Input"/"Output"
+        /// </summary>
+        private List<string> GetFolderPath(IBindingElement element, bool isTrigger)
+        {
+            List<string> path = new List<string>();
+            string deviceName = GetDeviceNameForUserInterface(element) ?? "";
+
+            string direction = null;
+            if (_includeTypes.HasFlag(ProfileExplorerTreeItemType.GroupInputOutput))
+            {
+                bool isInput = isTrigger == _includeTypes.HasFlag(ProfileExplorerTreeItemType.TriggersAreInput);
+                direction = isInput ? InputFolderName : OutputFolderName;
+            }
 
-                    ProfileExplorerTreeItem deviceItem = GetFolder(deviceName);
-                    childItem.Parent = deviceItem;
-                    deviceItem.Children.Add(childItem);
+            if (_includeTypes.HasFlag(ProfileExplorerTreeItemType.GroupByElementName))
+            {
+                if (deviceName.Length > 0)
+                {
+                    path.Add(deviceName);
                 }
-                else
+                if (!string.IsNullOrWhiteSpace(element.Name))
                 {
-                    Children.Add(childItem);
+                    path.Add(element.Name);
+                }
+                if (direction != null)
+                {
+                    path.Add(direction);
                 }
             }
             else
             {
-                // let it die
-                childItem.Disconnect();
+                if (direction != null)
+                {
+                    path.Add(direction);
+                }
+                if (deviceName.Length > 0)
+                {
+                    path.Add(deviceName);
+                }
+            }
+            return path;
+        }
+
+        /// <summary>
+        /// remove the tree item for an action or trigger that went away, and any folders left empty
+        /// </summary>
+        private void RemoveBindingElement(IBindingElement element, bool isTrigger)
+        {
+            List<ProfileExplorerTreeItem> folders = new List<ProfileExplorerTreeItem>();
+            ProfileExplorerTreeItem container = this;
+            foreach (string folderName in GetFolderPath(element, isTrigger))
+            {
+                container = container.GetFolder(folderName);
+                if (container == null)
+                {
+                    // not shown
+                    return;
+                }
+                folders.Add(container);
+            }
+
+            ProfileExplorerTreeItem childItem = container.GetChildObject(element);
+            if (childItem == null)
+            {
+                return;
+            }
+            container.Children.Remove(childItem);
+            childItem.Disconnect();
+
+            // prune empty folders from the bottom up
+            for (int i = folders.Count - 1; i >= 0; i--)
+            {
+                if (folders[i].Children.Count > 0)
+                {
+                    break;
+                }
+                ProfileExplorerTreeItem parent = i == 0 ? this : folders[i - 1];
+                parent.Children.Remove(folders[i]);
             }
         }
 
diff --git a/Profile Editor/ViewModel/ProfileExplorerTreeItemType.cs b/Profile Editor/ViewModel/ProfileExplorerTreeItemType.cs
index 0549d019e..ccd9e9dde 100644
--- a/Profile Editor/ViewModel/ProfileExplorerTreeItemType.cs	
+++ b/Profile Editor/ViewModel/ProfileExplorerTreeItemType.cs	
@@ -34,6 +34,26 @@ public enum ProfileExplorerTreeItemType
         Trigger =   0x040,
         Value =     0x080,
         Binding =   0x100,
-        Profile =   0x200
+        Profile =   0x200,
+
+        // the following are never item types; they only change how actions and triggers are arranged
+        // when included in the mask used to build a subtree
+
+        /// <summary>
+        /// put actions and triggers in "Input" and "Output" folders
+        /// </summary>
+        GroupInputOutput = 0x400,
+
+        /// <summary>
+        /// group actions and triggers by the name of the thing they control (for example "Hook Handle"),
+        /// with the "Input" and "Output" folders under that name instead of at the top
+        /// </summary>
+        GroupByElementName = 0x800,
+
+        /// <summary>
+        /// treat triggers as "Input" and actions as "Output" (the view of things available to bind);
+        /// without this, actions feeding the device are "Input" and its triggers are "Output"
+        /// </summary>
+        TriggersAreInput = 0x1000
     }
 }
diff --git a/build.cmd b/build.cmd
index c279babf1..65eda051a 100644
--- a/build.cmd
+++ b/build.cmd
@@ -2,6 +2,10 @@
 @echo off
 if "%1" == "test" (
 	set HELIOS_BUILT_VERSION=1.6.1000.0
+) else if "%1" == "dev" (
+	REM Developer Edition build with an explicit version, e.g. "build.cmd dev 1.6.1005.0",
+	REM without the release checks (clean working directory, git tag) below
+	set HELIOS_BUILT_VERSION=%2
 ) else (
 	set HELIOS_BUILT_VERSION=%1
 	REM make sure clean working directory