From 3523dd534f35bd7660479191c81936f7db7c589e Mon Sep 17 00:00:00 2001
From: mstrhakr <mstrhakr@gmail.com>
Date: Thu, 8 Oct 2026 09:26:23 -0400
Subject: [PATCH] fix(compatibility): require Unraid 6.12 and remove legacy
 WebUI patches

Align documented requirements with the plugin's PHP 8 dependency. Remove obsolete patch scripts, assets, installer hooks, settings and action handling, while retaining the pre-7.0 Ace fallback and Git patch features.

Add installer compatibility regression coverage for the minimum version and Ace fallback. Fixes #170.
---
 README.md                                     |   2 +-
 compose.manager.plg                           |  50 +-
 docs/configuration.md                         |  21 +-
 docs/getting-started.md                       |   2 +-
 docs/user-guide.md                            |   6 +-
 .../compose.manager.settings.page             |  83 ----
 source/compose.manager/default.cfg            |   1 -
 source/compose.manager/include/Exec.php       |  21 -
 .../patches/6.10/docker_client.patch          | 119 -----
 .../patches/6.11/docker_client.patch          | 103 ----
 .../patches/6.9/docker_client.patch           | 128 -----
 .../compose.manager/scripts/install-patch.sh  |  54 --
 source/compose.manager/scripts/patch.sh       | 462 ------------------
 source/pkg_build.sh                           |   2 +-
 tests/unit/ComposeFilterTest.php              |   2 +-
 tests/unit/InstallerCompatibilityTest.php     |  42 ++
 tests/unit/patch.bats                         |  98 ----
 17 files changed, 49 insertions(+), 1147 deletions(-)
 delete mode 100644 source/compose.manager/patches/6.10/docker_client.patch
 delete mode 100644 source/compose.manager/patches/6.11/docker_client.patch
 delete mode 100644 source/compose.manager/patches/6.9/docker_client.patch
 delete mode 100644 source/compose.manager/scripts/install-patch.sh
 delete mode 100644 source/compose.manager/scripts/patch.sh
 create mode 100644 tests/unit/InstallerCompatibilityTest.php
 delete mode 100644 tests/unit/patch.bats

diff --git a/README.md b/README.md
index c69b6944..e4ffc63b 100644
--- a/README.md
+++ b/README.md
@@ -172,7 +172,7 @@ With dcflachs Docker Compose Manager being depreciated, if you want to go back t
 
 ## Requirements
 
-- unRAID 6.9.0 or later
+- unRAID 6.12.0 or later (PHP 8 is required; first included in Unraid 6.12.0)
 
 > NOTE: This is untested on anything older than 7.2.3 currently. I will remove this note if I get a report that this IS compatible that far back. I am working on getting a machine setup for testing on the older versions. Any advice would be welcome, eg how to VM unraid easily.
 
diff --git a/compose.manager.plg b/compose.manager.plg
index 4dfaec28..0bb0dbe4 100644
--- a/compose.manager.plg
+++ b/compose.manager.plg
@@ -29,7 +29,7 @@
          launch="&launch;"
          pluginURL="&pluginURL;"
          icon="cubes"
-         min="6.9.0"
+         min="6.12.0"
          support="https://forums.unraid.net/topic/197334-plugin-compose-manager-plus/"
          project="https://github.com/mstrhakr/compose_plugin"
          readme="https://github.com/mstrhakr/compose_plugin#readme"
@@ -103,30 +103,6 @@ rm -f /tmp/ace-editor-install.sh
 </INLINE>
 </FILE>
 
-<FILE Run="/bin/bash">
-<INLINE>
-echo ""
-echo "----------------------------------------------------"
-echo ""
-echo "          Patches are only installed for"
-echo "             pre-6.12 Unraid versions."
-echo ""
-echo "     If on 6.12 or later, patches are not needed"
-echo "          and skips will be shown below."
-echo ""
-echo "----------------------------------------------------"
-echo ""
-</INLINE>
-</FILE>
-
-<!-- Patch utility installation for pre-6.12: install or remove patches -->
-<FILE Name="/tmp/patch-util-install.sh" Run="/bin/bash" Max="6.11.99">
-<INLINE>
-&emhttpLOC;/scripts/install-patch.sh install &emhttpLOC; &pluginLOC;
-rm -f /tmp/patch-util-install.sh
-</INLINE>
-</FILE>
-
 <FILE Run="/bin/bash">
 <INLINE>
 echo ""
@@ -140,30 +116,6 @@ echo ""
 </INLINE>
 </FILE>
 
-<FILE Run="/bin/bash" Method="remove">
-<INLINE>
-echo ""
-echo "----------------------------------------------------"
-echo ""
-echo "           Patches are only modified for"
-echo "             pre-6.12 Unraid versions."
-echo ""
-echo "     If on 6.12 or later, patches are not needed"
-echo "          and skips will be shown below."
-echo ""
-echo "----------------------------------------------------"
-echo ""
-</INLINE>
-</FILE>
-
-<!-- Patch utility removal for pre-6.12: remove patches -->
-<FILE Name="/tmp/patch-util-remove.sh" Run="/bin/bash" Method="remove" Max="6.11.99">
-<INLINE>
-&emhttpLOC;/scripts/install-patch.sh remove &emhttpLOC; &pluginLOC;
-rm -f /tmp/patch-util-remove.sh
-</INLINE>
-</FILE>
-
 <!-- Uninstall script; plus cleanup old/unused packages -->
 <FILE Run="/bin/bash" Method="remove">
 <INLINE>
diff --git a/docs/configuration.md b/docs/configuration.md
index 4a95a3fd..6101cacb 100755
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -23,7 +23,7 @@ Access settings via **Settings → Compose** in the Unraid web UI.
 | **Show in Header Menu** | No | Display Compose Manager as a separate page in the header navigation bar. |
 | **Show Dashboard Tile** | Yes | Display a Compose Stacks tile on the Dashboard showing stack status at a glance. |
 | **Hide Compose Containers (Dashboard Tile)** | No | Hide containers managed by Compose stacks from Unraid's Docker Containers dashboard tile. This avoids duplicate entries when both tiles are visible. Requires "Show Dashboard Tile". |
-| **Hide Compose Containers (Docker Page)** | No | Patch the native Docker UI to hide or filter Compose-managed containers. See the Web UI Patches section for version limitations. |
+| **Hide Compose Containers (Docker Page)** | No | Hide Compose-managed containers from the Docker Containers table to avoid duplicate entries when Compose stacks appear on the same page. Requires "Show in Header Menu" to be disabled (inline mode). |
 | **Show Compose Above Docker Containers** | No | When the Docker page is displayed without tabs, move the Compose Stacks section above the built-in Docker Containers section. |
 | **Expand Stacks by Default** | No | Automatically expand all stack detail rows when the page loads. |
 
@@ -39,7 +39,6 @@ Access settings via **Settings → Compose** in the Unraid web UI.
 
 | Setting | Default | Description |
 |---------|---------|-------------|
-| **Legacy Patch Web UI** | No | Enable integration patches for the native Docker manager UI on Unraid ≤ 6.11. Not required on Unraid 6.12 and later. Use the Patch/Unpatch buttons to apply or remove the patch. |
 | **Debug to Log** | No | Enable debug logging to syslog to troubleshoot Compose command output. |
 
 ### Backup Settings
@@ -90,24 +89,6 @@ The default location stores all compose configurations on the USB flash drive, e
 
 Compose Manager supports all four standard Compose file names and preserves the filenames already present in each stack.
 
-## Web UI Patches
-
-This setting controls small compatibility patches that change how Compose-managed containers are presented in Unraid's native Docker UI. These patches only affect UI rendering and metadata — they do **not** stop containers or change how they run.
-
-### Legacy UI Patch
-
-- **Legacy behavior (Unraid < 6.12)** — On older Unraid releases the patch adds Compose-specific metadata (e.g. `net.unraid.docker.managed`) and tweaks the Docker manager so Compose-managed containers are recognized. Practical effects include skipping native update checks for those containers and preventing them from being treated like native Docker-managed containers in the UI. Use this when running an older Unraid release so Compose can interoperate cleanly with the Docker manager. This is enabled in the settings under "Patch UI"
-
-### Hide Compose Containers from Docker UI via Patch
-
-- **Hide patches (Unraid 6.12–7.2)** — For Unraid 6.12 through 7.2 we offer a different patch that **removes** Compose-managed containers from the Docker page and Dashboard tile entirely (they remain visible through the Compose Stacks tile). Use the hide patch to remove duplicate entries and declutter the Docker UI when you prefer to manage Compose stacks separately. This is enabled in the settings under "Hide Compose Containers from Docker UI via Patch"
-
-Notes and version limitations:
-
-- Unraid 6.12 and later integrate the basic "ignore" behavior natively; the legacy patch is not required for that functionality.
-- The explicit "hide" patches are provided only for **6.12–7.2**. If you are on a version outside this range, check compatibility before enabling the hide option.
-- Patch files are stored under `source/compose.manager/patches/` and are applied only when a matching Unraid version is detected.
-
 ## Debug Logging
 
 Enable debug logging to troubleshoot issues. Logs are written to the Unraid syslog.
diff --git a/docs/getting-started.md b/docs/getting-started.md
index b738824d..b2ca7f0d 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -2,7 +2,7 @@
 
 ## Requirements
 
-- Unraid 6.9.0 or later
+- Unraid 6.12.0 or later (PHP 8 is required; first included in Unraid 6.12.0)
 - Docker service enabled
 
 ## Installation
diff --git a/docs/user-guide.md b/docs/user-guide.md
index a670c1b8..bfe690f6 100644
--- a/docs/user-guide.md
+++ b/docs/user-guide.md
@@ -81,7 +81,7 @@ Compose Manager provides a Backup & Restore interface under **Settings → Compo
 
 ### Hiding and Filtering Compose Containers
 
-You can optionally hide compose-managed containers from the native Docker manager and Dashboard. Use the setting to toggle patching of the Docker page and enable server-side filters so only the desired containers/stacks are shown.
+Use **Hide Compose Containers from Docker Page** to hide Compose-managed containers from the native Docker Containers table when **Show Compose in Header Menu** is disabled (inline mode). Use **Hide Compose Containers from Docker Dashboard Tile** to hide them from the native Dashboard tile when **Show Dashboard Tile** is enabled. These display options avoid duplicate entries without changing how containers run; no legacy WebUI patch is required.
 
 ### Display Options
 
@@ -119,7 +119,3 @@ services:
 ```
 
 The **Web UI** tab in the editor provides a visual interface for adding these labels.
-
-### Patching the Native UI
-
-Enable "Patch Web UI" in settings to show compose containers in the native Docker manager with stack grouping.
diff --git a/source/compose.manager/compose.manager.settings.page b/source/compose.manager/compose.manager.settings.page
index 30103498..f2033cf1 100755
--- a/source/compose.manager/compose.manager.settings.page
+++ b/source/compose.manager/compose.manager.settings.page
@@ -9,12 +9,6 @@ Lock="true"
 include "/usr/local/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php";
 require_once("/usr/local/emhttp/plugins/compose.manager/include/Defines.php");
 $cfg = parse_plugin_cfg($sName);
-$ui_patch_button_type = (!$option_patch_ui && strcmp($cfg['PATCH_UI'], "true") == 0 && !isset($composemanDockerClientPatch)) ? "Button" : "Hidden";
-$ui_unpatch_button_type = (!$option_patch_ui && strcmp($cfg['PATCH_UI'], "false") == 0 && isset($composemanDockerClientPatch)) ? "Button" : "Hidden";
-
-$option_patch_ui = version_compare(parse_ini_file('/etc/unraid-version')['version'], '6.12.0-RC0', '>=');
-$ui_patch_help_class = $option_patch_ui ? "hidden" : "inline_help"; // hide help on 6.12+ (integration built-in) //
-
 
 $projects_exist = intval(shell_exec("ls -l " . $compose_root . " | grep ^d | wc -l")) != 0;
 
@@ -658,7 +652,6 @@ $acePath = file_exists('/usr/local/emhttp/plugins/dynamix/javascript/ace/ace.js'
 <script src="<?php autov('/plugins/compose.manager/javascript/common.js'); ?>"></script>
 <script>
     var caURL = "/plugins/compose.manager/include/Exec.php";
-    var skipPatchUI = <?php echo json_encode($option_patch_ui); ?>; // true when Unraid >= 6.12
     var logRefreshInterval = null;
     var autoScroll = true;
 
@@ -670,30 +663,6 @@ $acePath = file_exists('/usr/local/emhttp/plugins/dynamix/javascript/ace/ace.js'
         }
     }
 
-    function patchWebui() {
-        if (skipPatchUI) {
-            swal('Not available', 'Patch Docker Page is not needed on Unraid 6.12+ (integration is built-in).', 'info');
-            return;
-        }
-        $.post(caURL, {
-            action: 'patchUI'
-        }, function(data) {
-            window.location.reload();
-        })
-    }
-
-    function unpatchWebui() {
-        if (skipPatchUI) {
-            swal('Not available', 'Unpatching the Docker page is not supported on Unraid 6.12+.', 'info');
-            return;
-        }
-        $.post(caURL, {
-            action: 'unPatchUI'
-        }, function(data) {
-            window.location.reload();
-        })
-    }
-
     function clearAllIconCache() {
         swal({
             title: 'Clear Icon Cache',
@@ -865,7 +834,6 @@ $acePath = file_exists('/usr/local/emhttp/plugins/dynamix/javascript/ace/ace.js'
             });
         }
 
-        var _ignorePatchUIChange = true; // prevent change handler from firing during initialization
         $('#PROJECTS_FOLDER').on("input change", null, null, checkProjectFolder);
 
         // Helper to initialize toggles as switchButton (only once)
@@ -907,41 +875,6 @@ $acePath = file_exists('/usr/local/emhttp/plugins/dynamix/javascript/ace/ace.js'
             }
         }
 
-
-        // Patch UI toggle: confirm action and run patch.sh via server (uses existing ajax handlers)
-        if (!skipPatchUI) {
-            $('.compose-toggle[name="PATCH_UI"]').on('change', function(e) {
-                if (_ignorePatchUIChange) {
-                    _ignorePatchUIChange = false;
-                    return;
-                }
-                var $cb = $(this);
-                var checked = $cb.is(':checked');
-                swal({
-                    title: checked ? 'Patch Docker Page' : 'Unpatch Docker Page',
-                    text: checked ? 'This will patch the Docker page to better display compose-managed containers. Apply now?' : 'This will remove the Docker page patch and restore the original UI. Proceed?',
-                    type: 'warning',
-                    showCancelButton: true,
-                    confirmButtonText: 'Yes, proceed'
-                }, function(confirmed) {
-                    if (!confirmed) {
-                        // revert UI to previous state
-                        _ignorePatchUIChange = true;
-                        $cb.prop('checked', !checked);
-                        // reload to ensure switch UI reflects actual state
-                        window.location.reload();
-                        return;
-                    }
-                    // Call existing ajax helpers which execute patch.sh on the server and reload
-                    if (checked) patchWebui();
-                    else unpatchWebui();
-                });
-            });
-        } else {
-            // If Unraid >=6.12 then patch UI option is not applicable — keep checkbox disabled and show inline message
-            $('.compose-toggle[name="PATCH_UI"]').prop('disabled', true);
-        }
-
         // Handle header menu toggle -> disable/enable compose-on-top and hide-from-docker
         // Saves and restores the original checked state of dependent settings so toggling
         // the header menu on then off preserves the user's previous selections.
@@ -1741,8 +1674,6 @@ $acePath = file_exists('/usr/local/emhttp/plugins/dynamix/javascript/ace/ace.js'
         $('#AUTO_CHECK_UPDATES_DAYS_CUSTOM').on('input', onAutoCheckCustomDaysInput);
         $('#AUTO_CHECK_UPDATES_DAYS_CUSTOM').on('change', onAutoCheckCustomDaysChanged);
 
-        // allow patch UI change handler to run now that switches are initialized
-        _ignorePatchUIChange = false;
         var savedTab = localStorage.getItem('compose-settings-tab') || 'settings';
         // Remove all active classes first
         $('.compose-tab, .compose-tab-content').removeClass('active');
@@ -3024,20 +2955,6 @@ $acePath = file_exists('/usr/local/emhttp/plugins/dynamix/javascript/ace/ace.js'
             </dd>
         </dl>
 
-        <?php if (!$option_patch_ui): ?>
-            <dl>
-                <dt style="cursor: help;" onclick="toggleHelp(this)">_(Patch Docker Page)_:</dt>
-                <dd>
-                    <input type="checkbox" name="PATCH_UI" class="compose-toggle" <?= $cfg['PATCH_UI'] == 'true' ? 'checked' : '' ?>>
-                    <input type="button" value="_(Patch Now)_" onclick="patchWebui()" class="slim-button" style="margin-left:15px;">
-                    <input type="button" value="_(Unpatch)_" onclick="unpatchWebui()" class="slim-button" style="margin-left:15px;">
-                    <blockquote class="inline_help">
-                        <strong>(Unraid 6.11 and earlier only)</strong> Patch the Docker page to better display compose-managed containers.
-                    </blockquote>
-                </dd>
-            </dl>
-        <?php endif; ?>
-
         <dl class="settings-actions settings-actions-hidden">
             <dd>
                 <input type="submit" id="settings-submit-default" name="#default" value="_(Default)_">
diff --git a/source/compose.manager/default.cfg b/source/compose.manager/default.cfg
index ffb4817e..b7d6d471 100755
--- a/source/compose.manager/default.cfg
+++ b/source/compose.manager/default.cfg
@@ -1,4 +1,3 @@
-PATCH_UI="false"
 DEBUG_TO_LOG="false"
 PROJECTS_FOLDER="/boot/config/plugins/compose.manager/projects"
 AUTOSTART_FORCE_RECREATE="false"
diff --git a/source/compose.manager/include/Exec.php b/source/compose.manager/include/Exec.php
index 48a68b9c..13a3c646 100644
--- a/source/compose.manager/include/Exec.php
+++ b/source/compose.manager/include/Exec.php
@@ -895,27 +895,6 @@ function composeResolveContainerIcon(string $containerName, string $service, arr
         echo json_encode(['result' => 'success']);
         break;
 
-    case 'runPatch':
-        $cmd = isset($_POST['cmd']) ? $_POST['cmd'] : 'apply';
-        if (!in_array($cmd, ['apply', 'remove'])) {
-            echo json_encode(['result' => 'error', 'message' => 'Invalid command']);
-            break;
-        }
-        $script = "$plugin_root/scripts/patch.sh";
-        // Quote each argument to preserve spaces and special characters and avoid the fragility of escapeshellcmd()
-        $fullcmd = escapeshellarg($script) . ' ' . escapeshellarg($cmd) . ' ' . escapeshellarg('--verbose') . ' 2>&1';
-        exec($fullcmd, $output, $rc);
-        // Save a copy to plugin log file
-        $logfile = "/boot/config/plugins/compose.manager/patch_last_run.log";
-        $ts = date('c');
-        $entry = "[{$ts}] runPatch {$cmd} exit={$rc}\n" . implode("\n", $output) . "\n\n";
-        @file_put_contents($logfile, $entry, FILE_APPEND);
-        foreach ($output as $line) {
-            composeLogger(escapeshellarg($cmd) . ' ' . $line, null, 'user', 'debug', 'patch.sh');
-        }
-        echo json_encode(['result' => $rc === 0 ? 'success' : 'error', 'output' => implode("\n", $output), 'rc' => $rc]);
-        break;
-
     case 'clearUpdateCache':
         // Clear the compose manager update status cache
         $composeUpdateStatusFile = COMPOSE_UPDATE_STATUS_FILE;
diff --git a/source/compose.manager/patches/6.10/docker_client.patch b/source/compose.manager/patches/6.10/docker_client.patch
deleted file mode 100644
index 8e358244..00000000
--- a/source/compose.manager/patches/6.10/docker_client.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-diff --git a/dockerClient-6.10.3.php b/dockerClient-6.10.3.patched.php
-index 3c6b87b..ecd1e0c 100644
---- a/dockerClient-6.10.3.php
-+++ b/dockerClient-6.10.3.patched.php
-@@ -10,6 +10,7 @@
-  * The above copyright notice and this permission notice shall be included in
-  * all copies or substantial portions of the Software.
-  */
-+$composemanDockerClientPatch = true;
- ?>
- <?
- libxml_use_internal_errors(true); # Suppress any warnings from xml errors.
-@@ -301,12 +302,14 @@ class DockerTemplates {
- 			// read docker label for WebUI & Icon
- 			if ($ct['Url'] && !$tmp['url']) $tmp['url'] = $ct['Url'];
- 			if ($ct['Icon']) $tmp['icon'] = $ct['Icon'];
-+			if ($ct['Shell']) $tmp['shell'] = $ct['Shell'];
-+			
- 			if ( ! $communityApplications ) {
--				if (!is_file($tmp['icon']) || $reload) $tmp['icon'] = $this->getIcon($image,$name,$tmp['icon']);
-+				if (!is_file($tmp['icon']) || $reload) $tmp['icon'] = $this->getIcon($image,$name,$ct['Icon']);
- 			}
- 			if ($ct['Running']) {
- 				$port = &$ct['Ports'][0];
--				$webui = $this->getTemplateValue($ct['Image'], 'WebUI');
-+				$webui = $tmp['url'] ?: $this->getTemplateValue($ct['Image'], 'WebUI');
- 				if (strlen($webui) > 0 && !preg_match("%\[(IP|PORT:(\d+))\]%", $webui)) {
- 					// non-templated webui, user specified
- 					$tmp['url'] = $webui;
-@@ -321,6 +324,7 @@ class DockerTemplates {
- 			$tmp['Project'] = $tmp['Project'] ?? $this->getTemplateValue($image, 'Project');
- 			$tmp['DonateLink'] = $tmp['DonateLink'] ?? $this->getTemplateValue($image, 'DonateLink');
- 			$tmp['ReadMe'] = $tmp['ReadMe'] ?? $this->getTemplateValue($image, 'ReadMe');
-+			if (strpos($ct['Manager'],"composeman")!==false) $tmp['updated'] = 'undef';
- 			if (!$tmp['updated'] || $reload) {
- 				if ($reload) $DockerUpdate->reloadUpdateStatus($image);
- 				$tmp['updated'] = var_export($DockerUpdate->getUpdateStatus($image),true);
-@@ -335,15 +339,16 @@ class DockerTemplates {
- 		return $info;
- 	}
- 
--	public function getIcon($Repository,$contName,$tmpIconUrl='') {
-+	public function getIcon($Repository,$contName,$iconUrl='') {
- 		global $docroot, $dockerManPaths;
--		$imgUrl = $this->getTemplateValue($Repository, 'Icon','all',$contName);
--		if (!$imgUrl) $imgUrl = $tmpIconUrl;
-+		$imgUrl = $iconUrl ?: $this->getTemplateValue($Repository, 'Icon','all',$contName);
- 		if (!$imgUrl || trim($imgUrl) == "/plugins/dynamix.docker.manager/images/question.png") return '';
- 
--		$imageName = $contName ?: $name;
--		$iconRAM = sprintf('%s/%s-%s.png', $dockerManPaths['images-ram'], $contName, 'icon');
--		$icon    = sprintf('%s/%s-%s.png', $dockerManPaths['images'], $contName, 'icon');
-+		$imgUrlHash = sha1($imgUrl);
-+		$iconFile = sprintf('%s-%s.png', 'icon', $imgUrlHash);
-+
-+		$iconRAM = sprintf('%s/%s-%s', $dockerManPaths['images-ram'], $contName, $iconFile);
-+		$icon    = sprintf('%s/%s', $dockerManPaths['images'], $iconFile);
- 		
- 		if (!is_dir(dirname($iconRAM))) mkdir(dirname($iconRAM), 0755, true);
- 		if (!is_dir(dirname($icon))) mkdir(dirname($icon), 0755, true);
-@@ -353,14 +358,47 @@ class DockerTemplates {
- 			@copy($icon, $iconRAM);
- 		}
- 		if (!is_file($icon) && is_file($iconRAM)) {
--			@copy($iconRAM,$icon);
-+			@copy($iconRAM, $icon);
- 		}
- 		if ( !is_file($iconRAM) ) {
--			exec("/usr/bin/logger ".escapeshellarg("$imageName: Could not download icon $imgUrl"));
-+			exec("/usr/bin/logger ".escapeshellarg("$contName: Could not download icon $imgUrl"));
-+		}
-+		else {
-+			$this->purgeUnusedIconFiles($contName, $iconFile);
- 		}
- 
- 		return (is_file($iconRAM)) ? str_replace($docroot, '', $iconRAM) : '';
- 	}
-+
-+	public function purgeUnusedIconFiles($contName, $keepIcon='') {
-+		global $docroot, $dockerManPaths;
-+
-+		$icon_glob = sprintf('%s/%s-*.png', $dockerManPaths['images-ram'], $contName);
-+		$ramFiles = glob($icon_glob);
-+		foreach ($ramFiles as $filename) {
-+			if ( ($keepIcon === '') || !(strpos($filename, $keepIcon) !== false) ) {
-+				@unlink($filename);
-+			}
-+		}
-+
-+		// $icon_glob = sprintf('%s/%s*.png', $dockerManPaths['images'], $contName);
-+		// foreach (glob($icon_glob) as $filename) {
-+		// 	if ( ($keepIcon === '') || !(strpos($filename, $keepIcon) !== false) ) {
-+		// 		@unlink($filename);
-+		// 	}
-+		// }	
-+
-+		$icon_glob = sprintf('%s/%s*.png', $dockerManPaths['images'], $contName);
-+		foreach ($ramFiles as $ramFile) {
-+			if ( strpos($ramFile, '-icon-') !== false ) {
-+				$suffix = end(explode('-', $ramFile));
-+				if ( !glob($dockerManPaths['images-ram'].'/*icon-'.$suffix) ) {
-+					$filename = sprintf('%s/icon-%s', $dockerManPaths['images'], $suffix);
-+					@unlink($filename);
-+				}
-+			}
-+		}
-+	}
- }
- 
- ####################################
-@@ -912,6 +950,8 @@ class DockerClient {
- 			$c['BaseImage']   = $ct['Labels']['BASEIMAGE'] ?? false;
- 			$c['Icon']        = $info['Config']['Labels']['net.unraid.docker.icon'] ?? false;
- 			$c['Url']         = $info['Config']['Labels']['net.unraid.docker.webui'] ?? false;
-+			$c['Shell']       = $info['Config']['Labels']['net.unraid.docker.shell'] ?? false;
-+			$c['Manager']  	  = $info['Config']['Labels']['net.unraid.docker.managed'] ?? false;
- 			$c['Ports']       = [];
- 			if ($id) $c['NetworkMode'] = $net.str_replace('/',':',DockerUtil::ctMap($id)?:'/???');
- 			if ($driver[$c['NetworkMode']]=='bridge') {
diff --git a/source/compose.manager/patches/6.11/docker_client.patch b/source/compose.manager/patches/6.11/docker_client.patch
deleted file mode 100644
index 0f9f2c54..00000000
--- a/source/compose.manager/patches/6.11/docker_client.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-diff --git a/usr/local/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php b/usr/local/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php
-index 26dd1fa..e2f78af 100644
---- a/usr/local/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php
-+++ b/usr/local/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php
-@@ -10,6 +10,7 @@
-  * The above copyright notice and this permission notice shall be included in
-  * all copies or substantial portions of the Software.
-  */
-+$composemanDockerClientPatch = true;
- ?>
- <?
- libxml_use_internal_errors(true); # Suppress any warnings from xml errors.
-@@ -323,6 +324,7 @@ class DockerTemplates {
- 			$tmp['Project'] = $tmp['Project'] ?? $this->getTemplateValue($image, 'Project');
- 			$tmp['DonateLink'] = $tmp['DonateLink'] ?? $this->getTemplateValue($image, 'DonateLink');
- 			$tmp['ReadMe'] = $tmp['ReadMe'] ?? $this->getTemplateValue($image, 'ReadMe');
-+			if (strpos($ct['Manager'],"composeman")!==false) $tmp['updated'] = 'undef';
- 			if (!$tmp['updated'] || $reload) {
- 				if ($reload) $DockerUpdate->reloadUpdateStatus($image);
- 				$tmp['updated'] = var_export($DockerUpdate->getUpdateStatus($image),true);
-@@ -337,15 +339,16 @@ class DockerTemplates {
- 		return $info;
- 	}
- 
--	public function getIcon($Repository,$contName,$tmpIconUrl='') {
-+	public function getIcon($Repository,$contName,$iconUrl='') {
- 		global $docroot, $dockerManPaths;
--		$imgUrl = $this->getTemplateValue($Repository, 'Icon','all',$contName);
--		if (!$imgUrl) $imgUrl = $tmpIconUrl;
-+		$imgUrl = $iconUrl ?: $this->getTemplateValue($Repository, 'Icon','all',$contName);
- 		if (!$imgUrl || trim($imgUrl) == "/plugins/dynamix.docker.manager/images/question.png") return '';
- 
--		$imageName = $contName ?: $name;
--		$iconRAM = sprintf('%s/%s-%s.png', $dockerManPaths['images-ram'], $contName, 'icon');
--		$icon    = sprintf('%s/%s-%s.png', $dockerManPaths['images'], $contName, 'icon');
-+		$imgUrlHash = sha1($imgUrl);
-+		$iconFile = sprintf('%s-%s.png', 'icon', $imgUrlHash);
-+
-+		$iconRAM = sprintf('%s/%s-%s', $dockerManPaths['images-ram'], $contName, $iconFile);
-+		$icon    = sprintf('%s/%s', $dockerManPaths['images'], $iconFile);
- 		
- 		if (!is_dir(dirname($iconRAM))) mkdir(dirname($iconRAM), 0755, true);
- 		if (!is_dir(dirname($icon))) mkdir(dirname($icon), 0755, true);
-@@ -355,14 +358,47 @@ class DockerTemplates {
- 			@copy($icon, $iconRAM);
- 		}
- 		if (!is_file($icon) && is_file($iconRAM)) {
--			@copy($iconRAM,$icon);
-+			@copy($iconRAM, $icon);
- 		}
- 		if ( !is_file($iconRAM) ) {
--			exec("/usr/bin/logger ".escapeshellarg("$imageName: Could not download icon $imgUrl"));
-+			exec("/usr/bin/logger ".escapeshellarg("$contName: Could not download icon $imgUrl"));
-+		}
-+		else {
-+			$this->purgeUnusedIconFiles($contName, $iconFile);
- 		}
- 
- 		return (is_file($iconRAM)) ? str_replace($docroot, '', $iconRAM) : '';
- 	}
-+
-+	public function purgeUnusedIconFiles($contName, $keepIcon='') {
-+		global $docroot, $dockerManPaths;
-+
-+		$icon_glob = sprintf('%s/%s-*.png', $dockerManPaths['images-ram'], $contName);
-+		$ramFiles = glob($icon_glob);
-+		foreach ($ramFiles as $filename) {
-+			if ( ($keepIcon === '') || !(strpos($filename, $keepIcon) !== false) ) {
-+				@unlink($filename);
-+			}
-+		}
-+
-+		// $icon_glob = sprintf('%s/%s*.png', $dockerManPaths['images'], $contName);
-+		// foreach (glob($icon_glob) as $filename) {
-+		// 	if ( ($keepIcon === '') || !(strpos($filename, $keepIcon) !== false) ) {
-+		// 		@unlink($filename);
-+		// 	}
-+		// }	
-+
-+		$icon_glob = sprintf('%s/%s*.png', $dockerManPaths['images'], $contName);
-+		foreach ($ramFiles as $ramFile) {
-+			if ( strpos($ramFile, '-icon-') !== false ) {
-+				$suffix = end(explode('-', $ramFile));
-+				if ( !glob($dockerManPaths['images-ram'].'/*icon-'.$suffix) ) {
-+					$filename = sprintf('%s/icon-%s', $dockerManPaths['images'], $suffix);
-+					@unlink($filename);
-+				}
-+			}
-+		}
-+	}
- }
- 
- ####################################
-@@ -914,7 +950,8 @@ class DockerClient {
- 			$c['BaseImage']   = $ct['Labels']['BASEIMAGE'] ?? false;
- 			$c['Icon']        = $info['Config']['Labels']['net.unraid.docker.icon'] ?? false;
- 			$c['Url']         = $info['Config']['Labels']['net.unraid.docker.webui'] ?? false;
--			$c['Shell']         = $info['Config']['Labels']['net.unraid.docker.shell'] ?? false;
-+			$c['Shell']       = $info['Config']['Labels']['net.unraid.docker.shell'] ?? false;
-+			$c['Manager']  	  = $info['Config']['Labels']['net.unraid.docker.managed'] ?? false;
- 			$c['Ports']       = [];
- 			if ($id) $c['NetworkMode'] = $net.str_replace('/',':',DockerUtil::ctMap($id)?:'/???');
- 			if ($driver[$c['NetworkMode']]=='bridge') {
diff --git a/source/compose.manager/patches/6.9/docker_client.patch b/source/compose.manager/patches/6.9/docker_client.patch
deleted file mode 100644
index a925c3bb..00000000
--- a/source/compose.manager/patches/6.9/docker_client.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-diff --git a/usr/local/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php b/usr/local/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php
-index 08215fd..2b69ffc 100644
---- a/usr/local/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php
-+++ b/usr/local/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php
-@@ -10,6 +10,7 @@
-  * The above copyright notice and this permission notice shall be included in
-  * all copies or substantial portions of the Software.
-  */
-+$composemanDockerClientPatch = true;
- ?>
- <?
- libxml_use_internal_errors(true); # Suppress any warnings from xml errors.
-@@ -295,16 +296,29 @@ class DockerTemplates {
- 			$tmp['paused'] = $ct['Paused'];
- 			$tmp['autostart'] = in_array($name, $autoStart);
- 			$tmp['cpuset'] = $ct['CPUset'];
--			if (!is_file($tmp['icon']) || $reload) $tmp['icon'] = $this->getIcon($image,$name);
-+			// read docker label for WebUI & Icon
-+			if ($ct['Url'] && !$tmp['url']) $tmp['url'] = $ct['Url'];
-+			if ($ct['Icon']) $tmp['icon'] = $ct['Icon'];
-+			if ($ct['Shell']) $tmp['shell'] = $ct['Shell'];
-+
-+			if (!is_file($tmp['icon']) || $reload) $tmp['icon'] = $this->getIcon($image,$name,$ct['Icon']);
-+
- 			if ($ct['Running']) {
- 				$port = &$ct['Ports'][0];
--				$ip = ($ct['NetworkMode']=='host'||$port['NAT'] ? $host : $port['IP']);
--				$tmp['url'] = $ip ? (strpos($tmp['url'],$ip)!==false ? $tmp['url'] : $this->getControlURL($ct, $ip)) : $tmp['url'];
-+				$webui = $tmp['url'] ?: $this->getTemplateValue($ct['Image'], 'WebUI');
-+				if (strlen($webui) > 0 && !preg_match("%\[(IP|PORT:(\d+))\]%", $webui)) {
-+					// non-templated webui, user specified
-+					$tmp['url'] = $webui;
-+				} else {
-+					$ip = ($ct['NetworkMode']=='host'||$port['NAT'] ? $host : $port['IP']);
-+					$tmp['url'] = $ip ? (strpos($tmp['url'],$ip)!==false ? $tmp['url'] : $this->getControlURL($ct, $ip)) : $tmp['url'];
-+				}
- 				$tmp['shell'] = $tmp['shell'] ?? $this->getTemplateValue($image, 'Shell');
- 			}
- 			$tmp['registry'] = $tmp['registry'] ?? $this->getTemplateValue($image, 'Registry');
- 			$tmp['Support'] = $tmp['Support'] ?? $this->getTemplateValue($image, 'Support');
- 			$tmp['Project'] = $tmp['Project'] ?? $this->getTemplateValue($image, 'Project');
-+			if (strpos($ct['Manager'],"composeman")!==false) $tmp['updated'] = 'undef';
- 			if (!$tmp['updated'] || $reload) {
- 				if ($reload) $DockerUpdate->reloadUpdateStatus($image);
- 				$tmp['updated'] = var_export($DockerUpdate->getUpdateStatus($image),true);
-@@ -318,14 +332,16 @@ class DockerTemplates {
- 		return $info;
- 	}
- 
--	public function getIcon($Repository,$contName) {
-+	public function getIcon($Repository,$contName,$iconUrl='') {
- 		global $docroot, $dockerManPaths;
--		$imgUrl = $this->getTemplateValue($Repository, 'Icon','all',$contName);
--		if (!$imgUrl) return '';
-+		$imgUrl = $iconUrl ?: $this->getTemplateValue($Repository, 'Icon','all',$contName);
-+		if (!$imgUrl || trim($imgUrl) == "/plugins/dynamix.docker.manager/images/question.png") return '';
-+
-+		$imgUrlHash = sha1($imgUrl);
-+		$iconFile = sprintf('%s-%s.png', 'icon', $imgUrlHash);
- 
--		$imageName = $contName ?: $name;
--		$iconRAM = sprintf('%s/%s-%s.png', $dockerManPaths['images-ram'], $contName, 'icon');
--		$icon    = sprintf('%s/%s-%s.png', $dockerManPaths['images'], $contName, 'icon');
-+		$iconRAM = sprintf('%s/%s-%s', $dockerManPaths['images-ram'], $contName, $iconFile);
-+		$icon    = sprintf('%s/%s', $dockerManPaths['images'], $iconFile);
- 		
- 		if (!is_dir(dirname($iconRAM))) mkdir(dirname($iconRAM), 0755, true);
- 		if (!is_dir(dirname($icon))) mkdir(dirname($icon), 0755, true);
-@@ -335,10 +351,47 @@ class DockerTemplates {
- 			@copy($icon, $iconRAM);
- 		}
- 		if (!is_file($icon) && is_file($iconRAM)) {
--			@copy($iconRAM,$icon);
-+			@copy($iconRAM, $icon);
- 		}
-+		if ( !is_file($iconRAM) ) {
-+			exec("/usr/bin/logger ".escapeshellarg("$contName: Could not download icon $imgUrl"));
-+		}
-+		else {
-+			$this->purgeUnusedIconFiles($contName, $iconFile);
-+		}
-+
- 		return (is_file($iconRAM)) ? str_replace($docroot, '', $iconRAM) : '';
- 	}
-+
-+	public function purgeUnusedIconFiles($contName, $keepIcon='') {
-+		global $docroot, $dockerManPaths;
-+
-+		$icon_glob = sprintf('%s/%s-*.png', $dockerManPaths['images-ram'], $contName);
-+		$ramFiles = glob($icon_glob);
-+		foreach ($ramFiles as $filename) {
-+			if ( ($keepIcon === '') || !(strpos($filename, $keepIcon) !== false) ) {
-+				@unlink($filename);
-+			}
-+		}
-+
-+		// $icon_glob = sprintf('%s/%s*.png', $dockerManPaths['images'], $contName);
-+		// foreach (glob($icon_glob) as $filename) {
-+		// 	if ( ($keepIcon === '') || !(strpos($filename, $keepIcon) !== false) ) {
-+		// 		@unlink($filename);
-+		// 	}
-+		// }	
-+
-+		$icon_glob = sprintf('%s/%s*.png', $dockerManPaths['images'], $contName);
-+		foreach ($ramFiles as $ramFile) {
-+			if ( strpos($ramFile, '-icon-') !== false ) {
-+				$suffix = end(explode('-', $ramFile));
-+				if ( !glob($dockerManPaths['images-ram'].'/*icon-'.$suffix) ) {
-+					$filename = sprintf('%s/icon-%s', $dockerManPaths['images'], $suffix);
-+					@unlink($filename);
-+				}
-+			}
-+		}
-+	}
- }
- 
- ####################################
-@@ -880,6 +933,10 @@ class DockerClient {
- 			[$net, $id]       = explode(':',$c['NetworkMode']);
- 			$c['CPUset']      = $info['HostConfig']['CpusetCpus'];
- 			$c['BaseImage']   = $ct['Labels']['BASEIMAGE'] ?? false;
-+			$c['Icon']        = $info['Config']['Labels']['net.unraid.docker.icon'] ?? false;
-+			$c['Url']         = $info['Config']['Labels']['net.unraid.docker.webui'] ?? false;
-+			$c['Shell']       = $info['Config']['Labels']['net.unraid.docker.shell'] ?? false;
-+			$c['Manager']  	  = $info['Config']['Labels']['net.unraid.docker.managed'] ?? false;
- 			$c['Ports']       = [];
- 			if ($id) $c['NetworkMode'] = $net.str_replace('/',':',DockerUtil::ctMap($id)?:'/???');
- 			if ($driver[$c['NetworkMode']]=='bridge') {
diff --git a/source/compose.manager/scripts/install-patch.sh b/source/compose.manager/scripts/install-patch.sh
deleted file mode 100644
index 12c701ec..00000000
--- a/source/compose.manager/scripts/install-patch.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#! /bin/bash
-patch_script=$2/scripts/patch.sh
-config_file=$3/compose.manager.cfg
-case "$1" in
-    "install")
-    # Use the new patch utility during install to cleanup and optionally apply patches
-    if [ -f "$patch_script" ]; then
-        if [ -f "$config_file" ]; then
-            # shellcheck source=/dev/null
-            source <(grep '=' "$config_file")
-            patch_ui=${PATCH_UI:='false'}
-
-            if [ "$patch_ui" == 'true' ]; then
-                echo ""
-                echo "----------------------------------------------------"
-                echo " Applying WebUI Patches because PATCH_UI=true"
-                echo "----------------------------------------------------"
-                echo ""
-                $patch_script -r
-                $patch_script apply || true
-            else
-                echo ""
-                echo "----------------------------------------------------"
-                echo " Removing WebUI Patches because PATCH_UI=false"
-                echo " To enable the WebUI, set PATCH_UI=true in settings"
-                echo " and apply patches from the plugin settings page."
-                echo "----------------------------------------------------"
-                echo ""
-                $patch_script -r
-            fi
-        fi
-    fi
-    ;;
-    
-    "remove")
-    # Use the new patch utility during uninstall to cleanup and remove patches
-    if [ -f "$patch_script" ]; then
-        if [ -f "$config_file" ]; then
-            # shellcheck source=/dev/null
-            source <(grep '=' "$config_file")
-            patch_ui=${PATCH_UI:='false'}
-
-            if [ "$patch_ui" == 'true' ]; then
-                echo ""
-                echo "----------------------------------------------------"
-                echo " Removing WebUI Patches because plugin is being removed"
-                echo "----------------------------------------------------"
-                echo ""
-                $patch_script -r
-            fi
-        fi
-    fi
-    ;;
-esac
\ No newline at end of file
diff --git a/source/compose.manager/scripts/patch.sh b/source/compose.manager/scripts/patch.sh
deleted file mode 100644
index dd91fdd0..00000000
--- a/source/compose.manager/scripts/patch.sh
+++ /dev/null
@@ -1,462 +0,0 @@
-#!/usr/bin/env bash
-# patch.sh - robust patch installer for compose.manager (renamed from patch_ui.sh)
-# Features:
-# - apply/remove patches found under patches/<version-range>
-# - idempotent apply (treat previously-applied as success)
-# - generate reverse patch & store minimal manifest for clean remove
-# - supports --dry-run and --verbose
-
-set -uo pipefail
-
-# Source shared logging; fall back to inline logger if common.sh is unavailable
-# shellcheck disable=SC1091
-. "$(dirname "$0")/common.sh" 2>/dev/null || composeLogger() {
-    local level="${2:-info}"
-    local category="${3:-patch}"
-    local priority="user.info"
-    local displayLevel="[INFO]"
-    local debugMode="false"
-
-    if [ "${debug:-false}" = true ] || [ "${DEBUG_TO_LOG:-false}" = true ]; then
-        debugMode="true"
-    fi
-
-    case "$level" in
-        debug)
-            priority="user.debug"
-            if [ "$debugMode" = true ]; then
-                displayLevel="[user.debug]"
-            else
-                displayLevel="[DEBUG]"
-            fi
-            ;;
-        error|err)
-            priority="user.err"
-            if [ "$debugMode" = true ]; then
-                displayLevel="[user.err]"
-            else
-                displayLevel="[ERROR]"
-            fi
-            ;;
-        warning|warn)
-            priority="user.warning"
-            if [ "$debugMode" = true ]; then
-                displayLevel="[user.warning]"
-            else
-                displayLevel="[WARN]"
-            fi
-            ;;
-        info|*)
-            priority="user.info"
-            if [ "$debugMode" = true ]; then
-                displayLevel="[user.info]"
-            else
-                displayLevel="[INFO]"
-            fi
-            ;;
-    esac
-    logger -t 'compose.manager' -p "$priority" "${displayLevel} [${category}] $1"
-}
-
-usage() {
-  cat <<EOF
-Usage: $0 [apply|remove] [--dry-run] [--verbose] [--patch-dir DIR]
-
-Commands:
-  apply        Apply patches for the running Unraid version (default)
-  remove       Remove previously applied patches (clean)
-
-Options:
-  --dry-run    Show actions without making changes
-  --verbose    Verbose output
-  --patch-dir  Override the patches root directory (default: /usr/local/emhttp/plugins/compose.manager/patches)
-  -r           Shortcut for 'remove'
-
-EOF
-  exit 1
-}
-
-# Defaults
-COMMAND="apply"
-DRY_RUN=0
-VERBOSE=0
-PATCH_ROOT="/usr/local/emhttp/plugins/compose.manager/patches"
-PLUGIN_ROOT="/usr/local/emhttp/plugins/compose.manager"
-APPLIED_DIR="$PLUGIN_ROOT/patches/applied"
-
-# Parse args
-if [ "$#" -gt 0 ]; then
-  case "$1" in
-    apply|remove)
-      COMMAND="$1"; shift
-      ;;
-    -r)
-      COMMAND="remove"; shift
-      ;;
-  esac
-fi
-
-while [ "$#" -gt 0 ]; do
-  case "$1" in
-    --dry-run) DRY_RUN=1; shift ;;
-    --verbose) VERBOSE=1; shift ;;
-    --patch-dir) PATCH_ROOT="$2"; shift 2 ;;
-    -h|--help) usage ;;
-    *) echo "Unknown option: $1"; usage ;;
-  esac
-done
-
-vmsg(){ [ "$VERBOSE" -eq 1 ] && echo "$@"; }
-
-# Helpers
-ver_to_int() {
-  IFS='.' read -r maj min pat <<< "$1" || true
-  maj=${maj:-0}; min=${min:-0}; pat=${pat:-0}
-  echo $((maj*10000 + min*100 + pat))
-}
-
-parse_folder_range() {
-  local name="$1"
-  name=$(basename "$name")
-  local n="$name"
-
-  # Supported formats (strict-ish):
-  #  - major:        7                 => 7.0.0 - 7.99.99
-  #  - major.minor:  7.1               => 7.1.0 - 7.1.99
-  #  - major.minor.patch: 6.12.3       => 6.12.3 - 6.12.3
-  #  - range:        a-b where each side may be 1-3 numeric components
-  #                   e.g., 6.12-7 => 6.12.0 - 7.99.99
-  #  - suffix '+' or '-' for open ranges (>= or <=)
-
-  # Open-ended >= (X+) -> X.0.0 .. infinity
-  if [[ "$n" =~ ^([0-9]+(\.[0-9]+){0,2})\+$ ]]; then
-    local a=${BASH_REMATCH[1]}
-    IFS='.' read -r a1 a2 a3 <<< "$a"
-    a1=${a1:-0}; a2=${a2:-0}; a3=${a3:-0}
-    local minI
-    minI=$(ver_to_int "${a1}.${a2}.${a3}")
-    echo "$minI 99999999"
-    return
-  fi
-
-  # Open-ended <= (X-) -> 0 .. X.max
-  if [[ "$n" =~ ^([0-9]+(\.[0-9]+){0,2})\-$ ]]; then
-    local a=${BASH_REMATCH[1]}
-    IFS='.' read -r a1 a2 a3 <<< "$a"
-    a1=${a1:-0}; a2=${a2:-99}; a3=${a3:-99}
-    local maxI
-    maxI=$(ver_to_int "${a1}.${a2}.${a3}")
-    echo "0 $maxI"
-    return
-  fi
-
-  # Range: A-B where each side has 1-3 numeric components
-  if [[ "$n" =~ ^([0-9]+(\.[0-9]+){0,2})\-([0-9]+(\.[0-9]+){0,2})$ ]]; then
-    local a=${BASH_REMATCH[1]}
-    local b=${BASH_REMATCH[3]}
-    IFS='.' read -r a1 a2 a3 <<< "$a"
-    a1=${a1:-0}; a2=${a2:-0}; a3=${a3:-0}
-    IFS='.' read -r b1 b2 b3 <<< "$b"
-    b1=${b1:-0}; b2=${b2:-99}; b3=${b3:-99}
-    local minI
-    minI=$(ver_to_int "${a1}.${a2}.${a3}")
-    local maxI
-    maxI=$(ver_to_int "${b1}.${b2}.${b3}")
-    echo "$minI $maxI"
-    return
-  fi
-
-  # Exact minor
-  if [[ "$n" =~ ^([0-9]+)\.([0-9]+)$ ]]; then
-    local v="${BASH_REMATCH[1]}.${BASH_REMATCH[2]}"
-    local minI
-    minI=$(ver_to_int "${v}.0")
-    local maxI
-    maxI=$(ver_to_int "${v}.99")
-    echo "$minI $maxI"
-    return
-  fi
-
-  # Major only
-  if [[ "$n" =~ ^([0-9]+)$ ]]; then
-    local maj=${BASH_REMATCH[1]}
-    local minI
-    minI=$(ver_to_int "${maj}.0.0")
-    local maxI
-    maxI=$(ver_to_int "${maj}.99.99")
-    echo "$minI $maxI"
-    return
-  fi
-
-  # fallback: match all
-  echo "0 99999999"
-}
-
-# Determine host Unraid version
-UNRAID_VER=$(grep -oP "\d+\.\d+\.\d+" /etc/unraid-version || true)
-if [ -z "$UNRAID_VER" ]; then
-  composeLogger "Could not detect Unraid version; including all patch folders" warning patch
-  vmsg "Could not detect Unraid version; defaulting to include all patch folders"
-else
-  composeLogger "Detected Unraid version $UNRAID_VER, command=$COMMAND" debug patch
-fi
-
-# Build candidate patch directories ordered by min range
-candidates=()
-host_ver_int=$(ver_to_int "${UNRAID_VER:-0.0.0}")
-if [ -d "$PATCH_ROOT" ]; then
-  tmpfile=$(mktemp /tmp/patchdirs.XXXXXXXX)
-  for d in "$PATCH_ROOT"/*; do
-    [ -d "$d" ] || continue
-    read -r minI maxI <<< "$(parse_folder_range "$d")"
-    if [ "$UNRAID_VER" = "" ] || { [ "$host_ver_int" -ge "$minI" ] && [ "$host_ver_int" -le "$maxI" ]; }; then
-      printf "%s %s\n" "$minI" "$d" >> "$tmpfile"
-    fi
-  done
-  while read -r line; do
-    candidates+=("$(echo "$line" | cut -d' ' -f2-)")
-  done < <(sort -n "$tmpfile")
-  rm -f "$tmpfile"
-else
-  echo "Patch root $PATCH_ROOT not found"; exit 1
-fi
-
-mkdir -p "$APPLIED_DIR"
-
-# Utility: determine target file for a patch
-determine_target(){
-  local patchfile="$1"
-  local target=""
-  if grep -q -E "^\*\*\* Update File: " "$patchfile" 2>/dev/null; then
-    target=$(grep -m1 -E "^\*\*\* Update File: " "$patchfile" | sed -E 's/^\*\*\* Update File: //')
-  else
-    plusline=$(grep -m1 -E "^\+\+\+ " "$patchfile" || true)
-    if [ -n "$plusline" ]; then
-      target=$(echo "$plusline" | sed -E 's/^\+\+\+ [ab]\///; s/^\+\+\+ //; s/[[:space:]].*$//')
-    fi
-  fi
-  target=$(echo "$target" | sed -E 's/^[[:space:]]+//; s/[[:space:]]+$//')
-  # Normalize to absolute path if necessary
-  if [ -n "$target" ] && [[ "$target" != /* ]]; then
-    target="/$target"
-  fi
-  echo "$target"
-}
-
-APPLIED_MANIFEST="$APPLIED_DIR/applied_manifest.csv"
-
-apply_patches(){
-  local failed=0
-  local applied=0
-  local failed_list=()
-  for pdir in "${candidates[@]}"; do
-    for patchfile in "$pdir"/*.patch; do
-      [ -f "$patchfile" ] || continue
-      base=$(basename "$patchfile")
-      # skip artifacts
-      if [[ "$base" == *.reverse.patch ]] || [[ "$base" == *.orig ]]; then
-        vmsg "Skipping artifact: $patchfile"
-        continue
-      fi
-
-      vmsg "Processing patch: $patchfile"
-      target=$(determine_target "$patchfile")
-      if [ -z "$target" ]; then
-        echo "Could not determine target for $patchfile (missing header); marking as failed"
-        failed=$((failed+1))
-        failed_list+=("$patchfile")
-        continue
-      fi
-      if [ ! -f "$target" ]; then
-        echo "Target file $target does not exist for $patchfile; marking as failed"
-        failed=$((failed+1))
-        failed_list+=("$patchfile")
-        continue
-      fi
-
-      echo "==> Patch: $base -> $target"
-      if [ "$DRY_RUN" -eq 1 ]; then
-        continue
-      fi
-
-      # Apply using patch utility (non-interactive, creates .orig backup)
-      patch_output=$(patch -s -N -r - -b -Y . -z .orig "$target" "$patchfile" 2>&1)
-      rc=$?
-      if [ $rc -eq 0 ]; then
-        echo "Applied $base"
-        applied=$((applied+1))
-        # write reverse patch and manifest
-        mkdir -p "$APPLIED_DIR"
-        reverse_file="$APPLIED_DIR/${base}.reverse.patch"
-        # Always generate reverse diff from .orig to patched file
-        diff -u "$target.orig" "$target" | sed -E 's/^(--- |\+\+\+)\///' > "$reverse_file" || true
-        if [ -s "$reverse_file" ]; then
-          echo "Wrote reverse: $reverse_file"
-        else
-          rm -f "$reverse_file" || true
-        fi
-        # store original for restore path
-        cp "$target.orig" "$APPLIED_DIR/${base}.orig" 2>/dev/null || true
-        # add to manifest (replace if exists)
-        grep -v "^${base}," "$APPLIED_MANIFEST" 2>/dev/null > "$APPLIED_MANIFEST.tmp" || true
-        echo "${base},${target}" >> "$APPLIED_MANIFEST.tmp"
-        mv "$APPLIED_MANIFEST.tmp" "$APPLIED_MANIFEST" || true
-        continue
-      fi
-
-      # Treat 'previously applied' as benign
-      if echo "$patch_output" | grep -qi "Reversed (or previously applied)" || echo "$patch_output" | grep -qi "Skipping patch"; then
-        echo "Patch reported previously applied/skip: $base"
-        if [ "$DRY_RUN" -eq 1 ]; then
-          echo "(dry-run) would record manifest and attempt to generate reverse for $base"
-          continue
-        fi
-
-        # If an original backup (.orig) already exists, ensure the manifest records this patch
-        if [ -f "$target.orig" ]; then
-          grep -v "^${base}," "$APPLIED_MANIFEST" 2>/dev/null > "$APPLIED_MANIFEST.tmp" || true
-          echo "${base},${target}" >> "$APPLIED_MANIFEST.tmp"
-          mv "$APPLIED_MANIFEST.tmp" "$APPLIED_MANIFEST" || true
-          vmsg "Recorded ${base} in manifest (orig present)"
-          continue
-        fi
-
-        # Try to reconstruct the original content by reversing the patch into a temporary copy
-        tmp_orig=$(mktemp)
-        cp "$target" "$tmp_orig"
-        if patch -s -p0 -R "$tmp_orig" "$patchfile" >/dev/null 2>&1; then
-          # tmp_orig should now contain the original (pre-patched) file
-          mkdir -p "$APPLIED_DIR"
-          cp "$tmp_orig" "$APPLIED_DIR/${base}.orig" 2>/dev/null || true
-          reverse_file="$APPLIED_DIR/${base}.reverse.patch"
-          # reverse file should be original -> patched (so removal can use patch -R on it)
-          diff -u "$tmp_orig" "$target" | sed -E 's/^(--- |\+\+\+)\///' > "$reverse_file" || true
-          if [ -s "$reverse_file" ]; then
-            echo "Wrote reverse: $reverse_file"
-          else
-            rm -f "$reverse_file" || true
-          fi
-          # record manifest entry
-          grep -v "^${base}," "$APPLIED_MANIFEST" 2>/dev/null > "$APPLIED_MANIFEST.tmp" || true
-          echo "${base},${target}" >> "$APPLIED_MANIFEST.tmp"
-          mv "$APPLIED_MANIFEST.tmp" "$APPLIED_MANIFEST" || true
-        else
-          echo "Could not reconstruct original for $base; recording manifest entry without reverse. Manual revert may be required."
-          grep -v "^${base}," "$APPLIED_MANIFEST" 2>/dev/null > "$APPLIED_MANIFEST.tmp" || true
-          echo "${base},${target}" >> "$APPLIED_MANIFEST.tmp"
-          mv "$APPLIED_MANIFEST.tmp" "$APPLIED_MANIFEST" || true
-        fi
-        rm -f "$tmp_orig" || true
-        continue
-      fi
-
-      echo "Failed to apply $base (rc=$rc)"
-      echo "$patch_output"
-      failed=$((failed+1))
-      failed_list+=("$patchfile")
-    done
-  done
-
-  if [ $failed -ne 0 ]; then
-    composeLogger "Patch apply finished with $failed failure(s), $applied applied" error patch
-    echo "Finished with $failed failed patches"
-    echo "Failed patches":;
-    for f in "${failed_list[@]}"; do echo " - $f"; done
-    return 1
-  fi
-  echo "Finished: $applied patches applied"
-  composeLogger "Patch apply finished: $applied patches applied" info patch
-  return 0
-}
-
-remove_patches(){
-  local failed=0
-  local failed_unpatches_list=()
-  local to_remove=()
-  # First pass: try to apply reverse patches in applied dir
-  if [ -f "$APPLIED_MANIFEST" ]; then
-    # iterate reverse patches in the same order they were recorded
-    while IFS=',' read -r pbase tpath; do
-      [ -n "$pbase" ] || continue
-      rev="$APPLIED_DIR/${pbase}.reverse.patch"
-      orig_saved="$APPLIED_DIR/${pbase}.orig"
-      echo "Reverting: $pbase -> $tpath"
-      if [ "$DRY_RUN" -eq 1 ]; then
-        continue
-      fi
-      if [ -f "$rev" ]; then
-        if (cd / && patch -s -p0 -R < "$rev"); then
-          echo "Reverted via $rev"
-          rm -f "$rev" || true
-          rm -f "$orig_saved" || true
-          # schedule manifest removal; commit after loop to avoid in-loop file rewrite
-          to_remove+=("$pbase")
-          continue
-        else
-          echo "Reverse patch failed for $pbase"
-          failed=$((failed+1))
-          failed_unpatches_list+=("$pbase")
-          continue
-        fi
-      fi
-
-      # Fallback: if original exists in applied dir, restore it
-      if [ -f "$orig_saved" ]; then
-        cp "$orig_saved" "$tpath" || { echo "Failed to restore $tpath from ${orig_saved}"; failed=$((failed+1)); failed_unpatches_list+=("$pbase"); continue; }
-        rm -f "$orig_saved" || true
-        to_remove+=("$pbase")
-        continue
-      fi
-
-      # If we reach here, no reverse nor saved orig found
-      echo "No reverse or saved original for ${pbase}; manual restore required for ${tpath}"
-      failed=$((failed+1))
-      failed_unpatches_list+=("$pbase")
-    done < "$APPLIED_MANIFEST"
-
-    if [ ${#to_remove[@]} -ne 0 ]; then
-      cp "$APPLIED_MANIFEST" "$APPLIED_MANIFEST.tmp" 2>/dev/null || true
-      for rm_entry in "${to_remove[@]}"; do
-        awk -F',' -v entry="$rm_entry" '$1 != entry' "$APPLIED_MANIFEST.tmp" > "$APPLIED_MANIFEST.tmp2" || true
-        mv "$APPLIED_MANIFEST.tmp2" "$APPLIED_MANIFEST.tmp" || true
-      done
-      mv "$APPLIED_MANIFEST.tmp" "$APPLIED_MANIFEST" || true
-    fi
-  else
-    vmsg "No manifest found; nothing to revert via manifest"
-  fi
-
-  # At the end, report failed unpatches if any
-  if [ ${#failed_unpatches_list[@]} -ne 0 ]; then
-    echo "Failed to unpatch the following items:"
-    for p in "${failed_unpatches_list[@]}"; do echo " - $p"; done
-  fi
-
-  # Final cleanup: remove any empty manifest file
-  if [ -f "$APPLIED_MANIFEST" ] && [ ! -s "$APPLIED_MANIFEST" ]; then
-    rm -f "$APPLIED_MANIFEST" || true
-  fi
-
-  if [ $failed -ne 0 ]; then
-    composeLogger "Patch remove finished with $failed failure(s)" error patch
-    echo "Remove finished with $failed failures"
-    return 1
-  fi
-  echo "Remove finished successfully"
-  composeLogger "Patch remove finished successfully" info patch
-  return 0
-}
-
-case "$COMMAND" in
-  apply)
-    apply_patches
-    exit $?
-    ;;
-  remove)
-    remove_patches
-    exit $?
-    ;;
-  *)
-    usage
-    ;;
-esac
diff --git a/source/pkg_build.sh b/source/pkg_build.sh
index 9f35f8ee..f33fc695 100755
--- a/source/pkg_build.sh
+++ b/source/pkg_build.sh
@@ -216,7 +216,7 @@ compose.manager: compose stacks directly from the unRAID dashboard.
 compose.manager:
 compose.manager: Features: Docker Compose CLI, web-based stack management,
 compose.manager: autostart support, environment file support, profiles,
-compose.manager: built-in YAML editor, and Docker UI integration patches.
+compose.manager: built-in YAML editor, and Docker UI integration.
 compose.manager:
 compose.manager: https://github.com/mstrhakr/compose_plugin
 EOF
diff --git a/tests/unit/ComposeFilterTest.php b/tests/unit/ComposeFilterTest.php
index 432a8223..571cf693 100644
--- a/tests/unit/ComposeFilterTest.php
+++ b/tests/unit/ComposeFilterTest.php
@@ -52,7 +52,7 @@ public function testDockerContainersPageFiltersComposeContainers(): void
             ],
         ]);
 
-        // Emulate the filtering logic the patch introduces: ensure a compose-managed container would be filtered
+        // Emulate Docker UI filtering: ensure a compose-managed container would be filtered
         $containers = [
             ['Name' => 'normal', 'Manager' => ''],
             ['Name' => 'compose_app', 'Manager' => 'composeman'],
diff --git a/tests/unit/InstallerCompatibilityTest.php b/tests/unit/InstallerCompatibilityTest.php
new file mode 100644
index 00000000..f8942cf4
--- /dev/null
+++ b/tests/unit/InstallerCompatibilityTest.php
@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ComposeManager\Tests;
+
+use PHPUnit\Framework\TestCase;
+
+class InstallerCompatibilityTest extends TestCase
+{
+    public function testMinimumUnraidVersionRequiresPhp8(): void
+    {
+        $plugin = simplexml_load_file(dirname(__DIR__, 2) . '/compose.manager.plg', \SimpleXMLElement::class, LIBXML_NOENT);
+        $this->assertNotFalse($plugin);
+        $minimum = (string) $plugin['min'];
+        $this->assertSame('6.12.0', $minimum);
+
+        foreach (['6.9.0', '6.10.3', '6.11.5'] as $version) {
+            $this->assertTrue(version_compare($version, $minimum, '<'), "$version must be rejected");
+        }
+        foreach (['6.12.0', '6.12.14', '7.0.0', '7.2.3'] as $version) {
+            $this->assertTrue(version_compare($version, $minimum, '>='), "$version must meet the minimum");
+        }
+    }
+
+    public function testAceFallbackIsRetainedWithoutLegacyPatchHooks(): void
+    {
+        $plugin = simplexml_load_file(dirname(__DIR__, 2) . '/compose.manager.plg', \SimpleXMLElement::class, LIBXML_NOENT);
+        $this->assertNotFalse($plugin);
+        $aceFiles = 0;
+        foreach ($plugin->FILE as $file) {
+            $name = (string) $file['Name'];
+            if (str_contains($name, 'ace-')) {
+                $this->assertSame('6.99.99', (string) $file['Max']);
+                $aceFiles++;
+            }
+            $this->assertStringNotContainsString('patch-util', $name);
+            $this->assertStringNotContainsString('install-patch.sh', (string) $file->INLINE);
+        }
+        $this->assertSame(3, $aceFiles);
+    }
+}
\ No newline at end of file
diff --git a/tests/unit/patch.bats b/tests/unit/patch.bats
deleted file mode 100644
index 36c66abe..00000000
--- a/tests/unit/patch.bats
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/usr/bin/env bats
-# Unit tests for patch.sh helpers
-
-# Load test framework
-load '../bats_setup.bash'
-
-PATCH_SCRIPT="$BATS_TEST_DIRNAME/../../source/compose.manager/scripts/patch.sh"
-
-setup() {
-  :
-}
-
-@test "ver_to_int converts dotted version to integer" {
-  # Source function
-  source <(sed -n '/^ver_to_int()/,/^}/p' "$PATCH_SCRIPT")
-
-  run ver_to_int 6.10.3
-  [ "$status" -eq 0 ]
-  [ "$output" -eq 61003 ]
-}
-
-@test "parse_folder_range handles open-ended plus (6.10+)" {
-  source <(sed -n '/^ver_to_int()/,/^}/p' "$PATCH_SCRIPT")
-  source <(sed -n '/^parse_folder_range()/,/^}/p' "$PATCH_SCRIPT")
-
-  out=$(parse_folder_range "6.10+")
-  arr=($out)
-  [ "${arr[0]}" -eq $(ver_to_int 6.10.0) ]
-  [ "${arr[1]}" -eq 99999999 ]
-}
-
-@test "parse_folder_range handles open-ended minus (6.10-)" {
-  source <(sed -n '/^ver_to_int()/,/^}/p' "$PATCH_SCRIPT")
-  source <(sed -n '/^parse_folder_range()/,/^}/p' "$PATCH_SCRIPT")
-
-  out=$(parse_folder_range "6.10-")
-  arr=($out)
-  [ "${arr[0]}" -eq 0 ]
-  [ "${arr[1]}" -eq $(ver_to_int 6.10.99) ]
-}
-
-@test "parse_folder_range handles range A-B (6.10-6.11)" {
-  source <(sed -n '/^ver_to_int()/,/^}/p' "$PATCH_SCRIPT")
-  source <(sed -n '/^parse_folder_range()/,/^}/p' "$PATCH_SCRIPT")
-
-  out=$(parse_folder_range "6.10-6.11")
-  arr=($out)
-  [ "${arr[0]}" -eq $(ver_to_int 6.10.0) ]
-  [ "${arr[1]}" -eq $(ver_to_int 6.11.99) ]
-}
-
-@test "parse_folder_range handles exact minor (6.10)" {
-  source <(sed -n '/^ver_to_int()/,/^}/p' "$PATCH_SCRIPT")
-  source <(sed -n '/^parse_folder_range()/,/^}/p' "$PATCH_SCRIPT")
-
-  out=$(parse_folder_range "6.10")
-  arr=($out)
-  [ "${arr[0]}" -eq $(ver_to_int 6.10.0) ]
-  [ "${arr[1]}" -eq $(ver_to_int 6.10.99) ]
-}
-
-@test "parse_folder_range handles major only (6)" {
-  source <(sed -n '/^ver_to_int()/,/^}/p' "$PATCH_SCRIPT")
-  source <(sed -n '/^parse_folder_range()/,/^}/p' "$PATCH_SCRIPT")
-
-  out=$(parse_folder_range "6")
-  arr=($out)
-  [ "${arr[0]}" -eq $(ver_to_int 6.0.0) ]
-  [ "${arr[1]}" -eq $(ver_to_int 6.99.99) ]
-}
-
-@test "determine_target extracts *** Update File header" {
-  source <(sed -n '/^determine_target()/,/^}/p' "$PATCH_SCRIPT")
-
-  tmp=$(mktemp)
-  cat > "$tmp" <<'EOF'
-*** Update File: /usr/local/foo/bar.txt
-
-*** End Patch Description
-EOF
-
-  out=$(determine_target "$tmp")
-  [ "$out" = "/usr/local/foo/bar.txt" ]
-  rm -f "$tmp"
-}
-
-@test "determine_target extracts +++ header and normalizes to absolute" {
-  source <(sed -n '/^determine_target()/,/^}/p' "$PATCH_SCRIPT")
-
-  tmp=$(mktemp)
-  cat > "$tmp" <<'EOF'
-+++ b/some/relative/path/file.txt	2020-01-01
-EOF
-
-  out=$(determine_target "$tmp")
-  [ "$out" = "/some/relative/path/file.txt" ]
-  rm -f "$tmp"
-}